Beautify docbook files

336 files changed, 24551 insertions, 92192 deletions

diff --git a/tde-i18n-en_GB/docs/tdebase/faq/about.docbook b/tde-i18n-en_GB/docs/tdebase/faq/about.docbook
index 02fc73b3111..e407bc656d0 100644
--- a/tde-i18n-en_GB/docs/tdebase/faq/about.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/faq/about.docbook
@@ -5,64 +5,34 @@
 -->
  
 <chapter id="about">
-<title
->About this <acronym
->FAQ</acronym
-></title>
+<title>About this <acronym>FAQ</acronym></title>
 
 <qandaset>
 <qandaentry>
 <question>
-<para
->What can I do to help out with this <acronym
->FAQ</acronym
->?</para>
+<para>What can I do to help out with this <acronym>FAQ</acronym>?</para>
 </question>
 
 <answer>
 
-<para
->First, send us any errors that you may find. Also, any suggestions that you might have, are appreciated. Better yet, send us everything that you think is unclear, and if possible, send us what you think would be a clearer solution. Our email address is <email
->kde-doc-english@kde.org</email
->. </para>
+<para>First, send us any errors that you may find. Also, any suggestions that you might have, are appreciated. Better yet, send us everything that you think is unclear, and if possible, send us what you think would be a clearer solution. Our email address is <email>kde-doc-english@kde.org</email>. </para>
 
-<para
->Second, send us your solutions of those frequently-asked questions which are still not in this <acronym
->FAQ</acronym
->. We will put them in as soon as possible.</para>
+<para>Second, send us your solutions of those frequently-asked questions which are still not in this <acronym>FAQ</acronym>. We will put them in as soon as possible.</para>
 
-<para
->Last but not least, please make full use of this <acronym
->FAQ</acronym
->. Read this <acronym
->FAQ</acronym
-> (and other relevant documentation) well before asking questions on the various &kde; mailing lists or newsgroups.</para>
+<para>Last but not least, please make full use of this <acronym>FAQ</acronym>. Read this <acronym>FAQ</acronym> (and other relevant documentation) well before asking questions on the various &kde; mailing lists or newsgroups.</para>
 
-<note
-><para
->You might also want to consider becoming a <acronym
->FAQ</acronym
-> maintainer. Please refer to <xref linkend="FAQ-maintainer-HOWTO"/> for more details. </para
-></note>
+<note><para>You might also want to consider becoming a <acronym>FAQ</acronym> maintainer. Please refer to <xref linkend="FAQ-maintainer-HOWTO"/> for more details. </para></note>
 
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question id="FAQ-maintainer-HOWTO">
-<para
->How do I become a <acronym
->FAQ</acronym
-> maintainer?</para>
+<para>How do I become a <acronym>FAQ</acronym> maintainer?</para>
 </question>
 
 <answer>
-<para
->Actually, it is very easy to become an <acronym
->FAQ</acronym
-> maintainer, and we are always in need of fresh blood. :-) Just send us an email at <email
->kde-doc-english@kde.org</email
->. </para>
+<para>Actually, it is very easy to become an <acronym>FAQ</acronym> maintainer, and we are always in need of fresh blood. :-) Just send us an email at <email>kde-doc-english@kde.org</email>. </para>
 </answer>
 </qandaentry>
 </qandaset>
diff --git a/tde-i18n-en_GB/docs/tdebase/faq/configtde.docbook b/tde-i18n-en_GB/docs/tdebase/faq/configtde.docbook
index 65168d58065..452e2bc04fd 100644
--- a/tde-i18n-en_GB/docs/tdebase/faq/configtde.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/faq/configtde.docbook
@@ -3,62 +3,24 @@
 <!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd">
 -->
 <chapter id="configure">
-<title
->Configuring &kde;</title>
+<title>Configuring &kde;</title>
 
 <qandaset>
 <qandaentry>
 <question>
-<para
->How do I set the language used by &kde;?</para>
+<para>How do I set the language used by &kde;?</para>
 </question>
 
 <answer>
-<para
->There are two ways to set the language &kde; uses in the messages it will display:</para>
+<para>There are two ways to set the language &kde; uses in the messages it will display:</para>
 
 <variablelist>
-<varlistentry
-><term
->Using the <application
->&kde; Control Centre</application
-></term>
-<listitem
-><para
->Fire up the <application
->&kde; Control Centre</application
-> and select <guimenu
->Regional &amp; Accessibility</guimenu
-> followed by <guimenuitem
->Country/Region &amp; Language</guimenuitem
->. You can select your language and location here. If &kde; cannot find a translation in the first language chosen, it will fall back on the default language. This is usually (American) English by default.</para>
-<note
-><para
->Using the <application
->&kde; Control Centre</application
-> is the preferred way of choosing languages in &kde;.</para
-></note
-></listitem>
+<varlistentry><term>Using the <application>&kde; Control Centre</application></term>
+<listitem><para>Fire up the <application>&kde; Control Centre</application> and select <guimenu>Regional &amp; Accessibility</guimenu> followed by <guimenuitem>Country/Region &amp; Language</guimenuitem>. You can select your language and location here. If &kde; cannot find a translation in the first language chosen, it will fall back on the default language. This is usually (American) English by default.</para>
+<note><para>Using the <application>&kde; Control Centre</application> is the preferred way of choosing languages in &kde;.</para></note></listitem>
 </varlistentry>
-<varlistentry
-><term
->Using the <envar
->LANG</envar
-> environment variable</term>
-<listitem
-><para
->The second method uses the standard locale setting on your system. To change the language, simply set the environment variable <envar
->LANG</envar
-> accordingly. For example, if your shell is <application
->bash</application
->, execute <userinput
-><command
->export</command
-> <envar
->LANG</envar
->=de</userinput
-> to set German as the language used.</para
-></listitem>
+<varlistentry><term>Using the <envar>LANG</envar> environment variable</term>
+<listitem><para>The second method uses the standard locale setting on your system. To change the language, simply set the environment variable <envar>LANG</envar> accordingly. For example, if your shell is <application>bash</application>, execute <userinput><command>export</command> <envar>LANG</envar>=de</userinput> to set German as the language used.</para></listitem>
 </varlistentry>
 </variablelist>
 </answer>
@@ -66,280 +28,98 @@
 
 <qandaentry>
 <question>
-<para
->Is there any keyboard switcher for international keyboards for &kde;?</para>
+<para>Is there any keyboard switcher for international keyboards for &kde;?</para>
 </question>
 <answer>
-<para
->Yes, you can configure it using the <application
->&kde; Control Centre</application
-> <guimenu
->Regional &amp; Accessibility</guimenu
-> <guimenuitem
->Keyboard Layout</guimenuitem
-> configuration page. </para>
+<para>Yes, you can configure it using the <application>&kde; Control Centre</application> <guimenu>Regional &amp; Accessibility</guimenu> <guimenuitem>Keyboard Layout</guimenuitem> configuration page. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How do I replace the standard text login screen with the &kde; login screen?</para>
+<para>How do I replace the standard text login screen with the &kde; login screen?</para>
 </question>
 <answer>
-<note
-><para
->Your distribution/&UNIX; flavour may have its own setup tools to change this (&eg; <application
->YaST</application
-> on &SuSE; &Linux;). This will be the safest way to enable the &kde; login screen. However, if for some reason you do not wish to use these tools, the following instructions may be useful.</para
-></note>
-<para
->First, you need to change to the <quote
->xdm runlevel</quote
-> (runlevel 5 on &RedHat; and &SuSE; systems) by editing your <filename
->/etc/inittab</filename
-> file. In the file, you should have a line saying <userinput
->id:3:initdefault:</userinput
->. Change it to <userinput
->id:5:initdefault:</userinput
->. Now, at the end of the file, comment out the following line: <literal
->x:5:respawn:/usr/bin/X11/xdm -nodaemon</literal
-> and replace it with <userinput
->x:5:respawn:<replaceable
->/opt/kde/</replaceable
->bin/tdm -nodaemon</userinput
->. <note
-><para
->The location of &tdm; may differ on your system.</para
-></note
-></para>
-<para
->For changes to take effect immediately, type <command
->init 5</command
-> (for &RedHat; systems) at the shell prompt. <caution
-><para
->It is risky to initiate a graphical login without checking beforehand whether it works. If it fails to work, you would be in for a hard time getting back....</para
-></caution
-></para>
+<note><para>Your distribution/&UNIX; flavour may have its own setup tools to change this (&eg; <application>YaST</application> on &SuSE; &Linux;). This will be the safest way to enable the &kde; login screen. However, if for some reason you do not wish to use these tools, the following instructions may be useful.</para></note>
+<para>First, you need to change to the <quote>xdm runlevel</quote> (runlevel 5 on &RedHat; and &SuSE; systems) by editing your <filename>/etc/inittab</filename> file. In the file, you should have a line saying <userinput>id:3:initdefault:</userinput>. Change it to <userinput>id:5:initdefault:</userinput>. Now, at the end of the file, comment out the following line: <literal>x:5:respawn:/usr/bin/X11/xdm -nodaemon</literal> and replace it with <userinput>x:5:respawn:<replaceable>/opt/kde/</replaceable>bin/tdm -nodaemon</userinput>. <note><para>The location of &tdm; may differ on your system.</para></note></para>
+<para>For changes to take effect immediately, type <command>init 5</command> (for &RedHat; systems) at the shell prompt. <caution><para>It is risky to initiate a graphical login without checking beforehand whether it works. If it fails to work, you would be in for a hard time getting back....</para></caution></para>
 </answer>
 <answer>
-<para
->For FreeBSD, you should edit the file <filename
->/etc/ttys</filename
-> and change one of the lines that look like <programlisting
->ttyv8   "/usr/X11R6/bin/xdm -nodaemon"  xterm   off secure</programlisting
-> to instead say <userinput
->ttyv8 "/usr/local/bin/tdm -nodaemon" xterm off secure</userinput
->.</para>
+<para>For FreeBSD, you should edit the file <filename>/etc/ttys</filename> and change one of the lines that look like <programlisting>ttyv8   "/usr/X11R6/bin/xdm -nodaemon"  xterm   off secure</programlisting> to instead say <userinput>ttyv8 "/usr/local/bin/tdm -nodaemon" xterm off secure</userinput>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
 
-<para
->I would like to click the &LMB; anywhere on the desktop and have the <guimenu
->K</guimenu
-> menu displayed.</para>
+<para>I would like to click the &LMB; anywhere on the desktop and have the <guimenu>K</guimenu> menu displayed.</para>
 </question>
 <answer>
-<para
->Open the <application
->&kde; Control Centre</application
-> and choose <menuchoice
-><guisubmenu
->Desktop</guisubmenu
-> <guisubmenu
->Behaviour</guisubmenu
-></menuchoice
->. You can now choose the behaviour of mouse clicks on the desktop. To have the <guimenu
->K</guimenu
-> menu open from a single &LMB; click, change the entry labelled <guilabel
->Left button</guilabel
-> to say <guilabel
->Application Menu</guilabel
->.</para>
+<para>Open the <application>&kde; Control Centre</application> and choose <menuchoice><guisubmenu>Desktop</guisubmenu> <guisubmenu>Behaviour</guisubmenu></menuchoice>. You can now choose the behaviour of mouse clicks on the desktop. To have the <guimenu>K</guimenu> menu open from a single &LMB; click, change the entry labelled <guilabel>Left button</guilabel> to say <guilabel>Application Menu</guilabel>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Where do I find information regarding &kde; themes?</para>
+<para>Where do I find information regarding &kde; themes?</para>
 </question>
 <answer>
-<para
->Go to <ulink url="http://kde.themes.org/"
->http://kde.themes.org/</ulink
-> or <ulink url="http://www.kde-look.org"
->http://www.kde-look.org</ulink
->.</para>
+<para>Go to <ulink url="http://kde.themes.org/">http://kde.themes.org/</ulink> or <ulink url="http://www.kde-look.org">http://www.kde-look.org</ulink>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How do I change &MIME; Types?</para>
+<para>How do I change &MIME; Types?</para>
 </question>
 <answer>
-<para
->If you are using &konqueror;, do this instead: first, open a &konqueror; window and choose <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Konqueror</guimenuitem
-></menuchoice
->, then <guilabel
->File Associations</guilabel
->. Find the type you want to change (&eg; <literal
->text/english</literal
-> or <literal
->image/gif</literal
->), and set the application preference order to whatever you want.</para>
+<para>If you are using &konqueror;, do this instead: first, open a &konqueror; window and choose <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Konqueror</guimenuitem></menuchoice>, then <guilabel>File Associations</guilabel>. Find the type you want to change (&eg; <literal>text/english</literal> or <literal>image/gif</literal>), and set the application preference order to whatever you want.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->&kde; (&tdm;) does not read my <filename
->.bash_profile</filename
->!</para>
+<para>&kde; (&tdm;) does not read my <filename>.bash_profile</filename>!</para>
 </question>
 <answer>
-<para
->The login managers<application
->xdm</application
-> and &tdm; do not run a login shell, so <filename
->.profile</filename
->, <filename
->.bash_profile</filename
->, &etc; are not sourced. When the user logs in, <application
->xdm</application
-> runs <command
->Xstartup</command
-> as root and then <command
->Xsession</command
-> as user. So the normal practice is to add statements in <filename
->Xsession</filename
-> to source the user profile. Please edit your <filename
->Xsession</filename
-> and <filename
->.xsession</filename
-> files.</para>
+<para>The login managers<application>xdm</application> and &tdm; do not run a login shell, so <filename>.profile</filename>, <filename>.bash_profile</filename>, &etc; are not sourced. When the user logs in, <application>xdm</application> runs <command>Xstartup</command> as root and then <command>Xsession</command> as user. So the normal practice is to add statements in <filename>Xsession</filename> to source the user profile. Please edit your <filename>Xsession</filename> and <filename>.xsession</filename> files.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How do I use &TrueType; fonts in &kde;?</para>
+<para>How do I use &TrueType; fonts in &kde;?</para>
 </question>
 <answer>
 
-<para
->You need to install &TrueType; font support into your &X-Window; configuration. Please take a look at <ulink url="http://x.themes.org/"
->x.themes.org</ulink
-> for the fonts, and <ulink url="http://www.dcs.ed.ac.uk/home/jec/programs/xfsft/"
->xfsft: &TrueType; Font Support For X11</ulink
-> or <ulink url="http://X-TT.dsl.gr.jp/"
->X-&TrueType; Server Project Home Page</ulink
-> for the font servers.</para>
+<para>You need to install &TrueType; font support into your &X-Window; configuration. Please take a look at <ulink url="http://x.themes.org/">x.themes.org</ulink> for the fonts, and <ulink url="http://www.dcs.ed.ac.uk/home/jec/programs/xfsft/">xfsft: &TrueType; Font Support For X11</ulink> or <ulink url="http://X-TT.dsl.gr.jp/">X-&TrueType; Server Project Home Page</ulink> for the font servers.</para>
 
-<para
->If you have a bunch of &TrueType; fonts from &Microsoft; &Windows;, edit the <filename
->XF86Config</filename
-> file to get the fonts from the font folder. Then just tell &kde; to use these new fonts with the font administrator utility.</para>
+<para>If you have a bunch of &TrueType; fonts from &Microsoft; &Windows;, edit the <filename>XF86Config</filename> file to get the fonts from the font folder. Then just tell &kde; to use these new fonts with the font administrator utility.</para>
 
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Is it possible to enter, show and work with the Euro Symbol in &kde;?</para>
+<para>Is it possible to enter, show and work with the Euro Symbol in &kde;?</para>
 </question>
 <answer>
-<para
->Yes and no. For details, look here: <ulink url="http://www.koffice.org/kword/euro.php"
->http://www.koffice.org/kword/euro.php</ulink
->.</para>
+<para>Yes and no. For details, look here: <ulink url="http://www.koffice.org/kword/euro.php">http://www.koffice.org/kword/euro.php</ulink>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->How do I run a program at &kde; startup?</para
-></question>
+<question><para>How do I run a program at &kde; startup?</para></question>
 
-<answer
-><para
->There are many ways to do that. If what you want to do is to run some scripts that would set some environment variables (for example, to start <command
->gpg-agent</command
->, <command
->ssh-agent</command
-> and others), you can put these scripts into <filename class="directory"
->$<envar
->TDEHOME</envar
->/env/</filename
-> and make sure their names end in <literal role="extension"
->.sh</literal
->. $<envar
->TDEHOME</envar
-> is usually a folder named <filename class="directory"
->.kde</filename
-> (note the period at the beginning) in your home folder. If you want scripts to be executed for all &kde; users, you can put them under <filename class="directory"
->$<envar
->TDEDIR</envar
->/env/</filename
->, where $<envar
->TDEDIR</envar
-> is the prefix &kde; was installed to (you can find this out using the command <userinput
-><command
->tde-config</command
-> --prefix</userinput
->).</para>
-<para
->If you wish to start a program after &kde; has started, you may want to use the <filename class="directory"
->Autostart</filename
-> folder. To add entries to the <filename class="directory"
->Autostart</filename
-> folder: <orderedlist>
-<listitem
-><para
->Open &konqueror;.</para>
+<answer><para>There are many ways to do that. If what you want to do is to run some scripts that would set some environment variables (for example, to start <command>gpg-agent</command>, <command>ssh-agent</command> and others), you can put these scripts into <filename class="directory">$<envar>TDEHOME</envar>/env/</filename> and make sure their names end in <literal role="extension">.sh</literal>. $<envar>TDEHOME</envar> is usually a folder named <filename class="directory">.kde</filename> (note the period at the beginning) in your home folder. If you want scripts to be executed for all &kde; users, you can put them under <filename class="directory">$<envar>TDEDIR</envar>/env/</filename>, where $<envar>TDEDIR</envar> is the prefix &kde; was installed to (you can find this out using the command <userinput><command>tde-config</command> --prefix</userinput>).</para>
+<para>If you wish to start a program after &kde; has started, you may want to use the <filename class="directory">Autostart</filename> folder. To add entries to the <filename class="directory">Autostart</filename> folder: <orderedlist>
+<listitem><para>Open &konqueror;.</para>
 </listitem>
-<listitem
-><para
->Select <menuchoice
-><guimenu
->Go</guimenu
-><guimenuitem
->Autostart</guimenuitem
-> </menuchoice
-> from the menubar.</para>
+<listitem><para>Select <menuchoice><guimenu>Go</guimenu><guimenuitem>Autostart</guimenuitem> </menuchoice> from the menubar.</para>
 </listitem>
-<listitem
-><para
->Right-click in the window view area and select <menuchoice
-><guisubmenu
->Create New</guisubmenu
-><guisubmenu
->File</guisubmenu
-><guimenuitem
->Link to Application</guimenuitem
-> </menuchoice
-></para>
+<listitem><para>Right-click in the window view area and select <menuchoice><guisubmenu>Create New</guisubmenu><guisubmenu>File</guisubmenu><guimenuitem>Link to Application</guimenuitem> </menuchoice></para>
 </listitem>
-<listitem
-><para
->Click on the <guilabel
->Application</guilabel
-> tab in the window that appears and enter the name of the command to run in the <guilabel
->Command</guilabel
-> text box.</para>
+<listitem><para>Click on the <guilabel>Application</guilabel> tab in the window that appears and enter the name of the command to run in the <guilabel>Command</guilabel> text box.</para>
 </listitem>
 </orderedlist>
 </para>
diff --git a/tde-i18n-en_GB/docs/tdebase/faq/contrib.docbook b/tde-i18n-en_GB/docs/tdebase/faq/contrib.docbook
index 8bff6911cd5..4a5a5a7b8ee 100644
--- a/tde-i18n-en_GB/docs/tdebase/faq/contrib.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/faq/contrib.docbook
@@ -6,241 +6,92 @@
 
 
 <chapter id="contribute">
-<title
->Contributing</title>
+<title>Contributing</title>
 
 <qandaset>
 <qandaentry>
 <question>
-<para
->How can I contribute to &kde;?</para>
+<para>How can I contribute to &kde;?</para>
 </question>
 <answer>
-<para
->&kde; is a free software project that lives from voluntary contributions. Everybody is encouraged to contribute to &kde;. Not only programmers are welcome. There are many ways in which you can help to improve &kde;:</para>
+<para>&kde; is a free software project that lives from voluntary contributions. Everybody is encouraged to contribute to &kde;. Not only programmers are welcome. There are many ways in which you can help to improve &kde;:</para>
 <itemizedlist>
-<listitem
-><para
->Test the software.</para
-></listitem>
-<listitem
-><para
->Send in bug reports. For more information on this, see <link linkend="bug-report"
->How do I submit a bug report?</link
->.</para
-></listitem>
-<listitem
-><para
->Write documentation or help files. You can get some information by visiting the <ulink url="http://i18n.kde.org/doc/"
->&kde; Editorial Team Home Page</ulink
->.</para
-></listitem>
-<listitem
-><para
->Translate programs, documentation, and help files. For more information on this, you should visit <ulink url="http://i18n.kde.org"
->The &kde; Translators' and Documenters' Web Site</ulink
->.</para
-></listitem>
-<listitem
-><para
->Draw nice icons or compose sound effects. You can visit the <ulink url="http://artist.kde.org/"
->&kde; artists page</ulink
-> to find out more.</para
-></listitem>
-<listitem
-><para
->Write articles and books about &kde;. If you want to help spread the word about &kde;, simply send an email to <email
->kde-pr@kde.org</email
->. This will get you in touch with the &kde; public relations volunteers.</para
-></listitem>
-<listitem
-><para
->Program new &kde; applications. Please refer to <xref linkend="programming"/> for more information.</para
-></listitem>
-<listitem
-><para
->Of course, sponsors are also welcome. :-)</para
-></listitem>
+<listitem><para>Test the software.</para></listitem>
+<listitem><para>Send in bug reports. For more information on this, see <link linkend="bug-report">How do I submit a bug report?</link>.</para></listitem>
+<listitem><para>Write documentation or help files. You can get some information by visiting the <ulink url="http://i18n.kde.org/doc/">&kde; Editorial Team Home Page</ulink>.</para></listitem>
+<listitem><para>Translate programs, documentation, and help files. For more information on this, you should visit <ulink url="http://i18n.kde.org">The &kde; Translators' and Documenters' Web Site</ulink>.</para></listitem>
+<listitem><para>Draw nice icons or compose sound effects. You can visit the <ulink url="http://artist.kde.org/">&kde; artists page</ulink> to find out more.</para></listitem>
+<listitem><para>Write articles and books about &kde;. If you want to help spread the word about &kde;, simply send an email to <email>kde-pr@kde.org</email>. This will get you in touch with the &kde; public relations volunteers.</para></listitem>
+<listitem><para>Program new &kde; applications. Please refer to <xref linkend="programming"/> for more information.</para></listitem>
+<listitem><para>Of course, sponsors are also welcome. :-)</para></listitem>
 </itemizedlist>
-<para
->There are several places to look for more information if you want to get involved in the development. The first step is to subscribe to some of the <ulink url="http://www.kde.org/mailinglists/"
->mailing lists</ulink
->. You will soon see something that can be improved or added.</para>
+<para>There are several places to look for more information if you want to get involved in the development. The first step is to subscribe to some of the <ulink url="http://www.kde.org/mailinglists/">mailing lists</ulink>. You will soon see something that can be improved or added.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question id="bug-report">
-<para
->How do I submit a bug report?</para>
+<para>How do I submit a bug report?</para>
 </question>
 <answer>
-<para
->There is a bug tracking system available at <ulink url="http://bugs.kde.org"
->http://bugs.kde.org</ulink
->. The system features a wizard to submit new bug reports and a list of all known bugs.</para>
-<para
->The easiest way to submit a bug is to select <menuchoice
-><guimenu
->Help</guimenu
-><guimenuitem
->Report Bug...</guimenuitem
-></menuchoice
-> from the menu bar of the application with the bug. This will open a small dialogue box with a link to the bug tracking system. Please make sure to follow the instructions of the bug reporting wizard.</para>
+<para>There is a bug tracking system available at <ulink url="http://bugs.kde.org">http://bugs.kde.org</ulink>. The system features a wizard to submit new bug reports and a list of all known bugs.</para>
+<para>The easiest way to submit a bug is to select <menuchoice><guimenu>Help</guimenu><guimenuitem>Report Bug...</guimenuitem></menuchoice> from the menu bar of the application with the bug. This will open a small dialogue box with a link to the bug tracking system. Please make sure to follow the instructions of the bug reporting wizard.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question id="programming">
-<para
->I want to program for &kde;. What should I do first?</para>
+<para>I want to program for &kde;. What should I do first?</para>
 </question>
 <answer>
-<para
->Everybody is encouraged to develop software for &kde;. What you should do first depends strongly on your experience, &eg; whether you have already learned C++ or have experience with the &Qt; toolkit and so on.</para>
-<para
->To get into &kde; programming, you will need some basic tools: <application
->automake</application
->, <application
->autoconf</application
->, and <application
->egcs</application
->. You should look to <ulink url="http://developer.kde.org/"
->http://developer.kde.org/</ulink
-> for more tips.</para>
-<para
->Another excellent resource for learning &kde; programming is the &Qt; online tutorials. These are installed along with &Qt;. To view them, open <filename
->$<envar
->QTDIR</envar
->/doc/html/index.html</filename
-> in &konqueror; and bookmark it. The tutorials can be found under "Using Qt". The source code for each lesson can be found in the <filename class="directory"
->$<envar
->QTDIR</envar
->/tutorial</filename
-> directory.</para>
-<para
->There is, however, one thing that everybody interested in programming for &kde; should do: <emphasis
->subscribe to the developers mailing list</emphasis
->. To subscribe, you have to send an email to <ulink url="mailto:kde-devel-request@kde.org"
->kde-devel-request@kde.org</ulink
-> with the subject <userinput
->subscribe <replaceable
->your_email_address</replaceable
-></userinput
->. <important
-><para
->Please read <link linkend="subscribe"
->How to subscribe/unsubscribe to these lists</link
-> carefully. Everything said there applies to the development list as well.</para
-></important
-></para>
+<para>Everybody is encouraged to develop software for &kde;. What you should do first depends strongly on your experience, &eg; whether you have already learned C++ or have experience with the &Qt; toolkit and so on.</para>
+<para>To get into &kde; programming, you will need some basic tools: <application>automake</application>, <application>autoconf</application>, and <application>egcs</application>. You should look to <ulink url="http://developer.kde.org/">http://developer.kde.org/</ulink> for more tips.</para>
+<para>Another excellent resource for learning &kde; programming is the &Qt; online tutorials. These are installed along with &Qt;. To view them, open <filename>$<envar>QTDIR</envar>/doc/html/index.html</filename> in &konqueror; and bookmark it. The tutorials can be found under "Using Qt". The source code for each lesson can be found in the <filename class="directory">$<envar>QTDIR</envar>/tutorial</filename> directory.</para>
+<para>There is, however, one thing that everybody interested in programming for &kde; should do: <emphasis>subscribe to the developers mailing list</emphasis>. To subscribe, you have to send an email to <ulink url="mailto:kde-devel-request@kde.org">kde-devel-request@kde.org</ulink> with the subject <userinput>subscribe <replaceable>your_email_address</replaceable></userinput>. <important><para>Please read <link linkend="subscribe">How to subscribe/unsubscribe to these lists</link> carefully. Everything said there applies to the development list as well.</para></important></para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How do I get access to the <acronym
->CVS</acronym
->?</para>
+<para>How do I get access to the <acronym>CVS</acronym>?</para>
 </question>
 <answer>
-<para
->The &kde; project uses <acronym
->CVS</acronym
-> to develop the core parts of the software. Usually, when you have changed one of the parts (&eg; fixed a bug), and you want to commit this change, the best way is to create a patch against a current snapshot and send this patch to the developer/maintainer of the respective program.</para>
-<para
->If you are doing this more or less regularly, you can ask Stephan Kulow, <email
->coolo@kde.org</email
-> for direct access to the <acronym
->CVS</acronym
-> server. But be aware that more users will slow down <acronym
->CVS</acronym
-> access for all developers, so we want to keep the number of people with direct <acronym
->CVS</acronym
-> access reasonably small. But feel free to ask!</para>
+<para>The &kde; project uses <acronym>CVS</acronym> to develop the core parts of the software. Usually, when you have changed one of the parts (&eg; fixed a bug), and you want to commit this change, the best way is to create a patch against a current snapshot and send this patch to the developer/maintainer of the respective program.</para>
+<para>If you are doing this more or less regularly, you can ask Stephan Kulow, <email>coolo@kde.org</email> for direct access to the <acronym>CVS</acronym> server. But be aware that more users will slow down <acronym>CVS</acronym> access for all developers, so we want to keep the number of people with direct <acronym>CVS</acronym> access reasonably small. But feel free to ask!</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->I am just curious. Can I have read-only access to the <acronym
->CVS</acronym
->?</para>
+<para>I am just curious. Can I have read-only access to the <acronym>CVS</acronym>?</para>
 </question>
 <answer>
-<para
->Yes. It is possible to get read-only access to the <acronym
->CVS</acronym
-> repository with <application
->cvsup</application
-> or <application
->cvs</application
-> utility. You can find more information about how to set up <application
->cvsup</application
-> for the &kde; repository from <ulink url="http://developer.kde.org/source/cvsup.html"
->How to use <application
->cvsup</application
-> to get &kde;</ulink
->.</para>
-<para
->In addition, anonymous <acronym
->CVS</acronym
-> service is also available. To find out more about how to set up and use anonymous <acronym
->CVS</acronym
->, please see <ulink url="http://developer.kde.org/source/anoncvs.html"
->here</ulink
->.</para>
+<para>Yes. It is possible to get read-only access to the <acronym>CVS</acronym> repository with <application>cvsup</application> or <application>cvs</application> utility. You can find more information about how to set up <application>cvsup</application> for the &kde; repository from <ulink url="http://developer.kde.org/source/cvsup.html">How to use <application>cvsup</application> to get &kde;</ulink>.</para>
+<para>In addition, anonymous <acronym>CVS</acronym> service is also available. To find out more about how to set up and use anonymous <acronym>CVS</acronym>, please see <ulink url="http://developer.kde.org/source/anoncvs.html">here</ulink>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Are there any <application
->cvs</application
-> mirror sites for &kde;?</para>
+<para>Are there any <application>cvs</application> mirror sites for &kde;?</para>
 </question>
 <answer>
-<para
->Yes. The main &kde; server is normally very busy. Please take a look at <ulink url="http://developer.kde.org/source/cvsupmirrors.html"
->http://developer.kde.org/source/cvsupmirrors.html</ulink
-> and <ulink url="http://developer.kde.org/source/anoncvs.html"
->http://developer.kde.org/source/anoncvs.html</ulink
-> for the list of available mirrors.</para
->  
-<para
->Once you have selected a new <application
->cvsup</application
-> server, simply replace <screen
-> 
+<para>Yes. The main &kde; server is normally very busy. Please take a look at <ulink url="http://developer.kde.org/source/cvsupmirrors.html">http://developer.kde.org/source/cvsupmirrors.html</ulink> and <ulink url="http://developer.kde.org/source/anoncvs.html">http://developer.kde.org/source/anoncvs.html</ulink> for the list of available mirrors.</para>  
+<para>Once you have selected a new <application>cvsup</application> server, simply replace <screen> 
 *default host=cvs.kde.org
-</screen
-> with <screen
-> 
+</screen> with <screen> 
 *default host=cvsup.your.new.host
-</screen
-> in your <application
->cvsup</application
-> script.</para>
-<para
->The instructions to change the anoncvs server can be found on <ulink url="http://developer.kde.org/source/anoncvs.html"
->http://developer.kde.org/source/anoncvs.html</ulink
->, too. </para>
+</screen> in your <application>cvsup</application> script.</para>
+<para>The instructions to change the anoncvs server can be found on <ulink url="http://developer.kde.org/source/anoncvs.html">http://developer.kde.org/source/anoncvs.html</ulink>, too. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How do I go about translating &kde; programs into my native language?</para>
+<para>How do I go about translating &kde; programs into my native language?</para>
 </question>
 <answer>
-<para
->Look at the <ulink url="http://i18n.kde.org"
->The &kde; Translators' and Documenters' Web Site</ulink
-> to see whether your program is already translated (most are). Otherwise you will find information there on how to do it yourself.</para>
+<para>Look at the <ulink url="http://i18n.kde.org">The &kde; Translators' and Documenters' Web Site</ulink> to see whether your program is already translated (most are). Otherwise you will find information there on how to do it yourself.</para>
 </answer>
 </qandaentry>
 </qandaset>
diff --git a/tde-i18n-en_GB/docs/tdebase/faq/desktop.docbook b/tde-i18n-en_GB/docs/tdebase/faq/desktop.docbook
index 93bddd4bcad..a523f222b83 100644
--- a/tde-i18n-en_GB/docs/tdebase/faq/desktop.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/faq/desktop.docbook
@@ -5,55 +5,29 @@
 -->
 
 <chapter id="desktop">
-<title
->The desktop</title>
+<title>The desktop</title>
 
 <qandaset>
 <qandaentry>
 <question>
-<para
->How do I add an application to the desktop?</para>
+<para>How do I add an application to the desktop?</para>
 </question>
 <answer>
 
-<para
->Just choose the desired application from the <guimenu
->K</guimenu
-> menu and drag and drop it to the Desktop. </para
-> 
-<para
->For applications not listed in the <guimenu
->K</guimenu
-> menu, use the &RMB; on the desktop and choose <menuchoice
-><guimenuitem
->Create New</guimenuitem
-><guisubmenu
->File</guisubmenu
-> <guimenuitem
->Link to Application...</guimenuitem
-></menuchoice
-> and fill in the configuration for the application you want to link to. </para>
+<para>Just choose the desired application from the <guimenu>K</guimenu> menu and drag and drop it to the Desktop. </para> 
+<para>For applications not listed in the <guimenu>K</guimenu> menu, use the &RMB; on the desktop and choose <menuchoice><guimenuitem>Create New</guimenuitem><guisubmenu>File</guisubmenu> <guimenuitem>Link to Application...</guimenuitem></menuchoice> and fill in the configuration for the application you want to link to. </para>
 
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How do I mount/unmount a device from the desktop?</para>
+<para>How do I mount/unmount a device from the desktop?</para>
 </question>
 <answer>
 
-<para
->First, make sure you are allowed to <command
->mount</command
->/<command
->umount</command
-> the relevant device as a user. </para>
-<para
->Then you can add any device via &RMB; on the desktop and then choosing <guimenuitem
->Create New</guimenuitem
->. </para>
+<para>First, make sure you are allowed to <command>mount</command>/<command>umount</command> the relevant device as a user. </para>
+<para>Then you can add any device via &RMB; on the desktop and then choosing <guimenuitem>Create New</guimenuitem>. </para>
 
 </answer>
 </qandaentry>
@@ -61,90 +35,48 @@
 
 <qandaentry>
 <question>
-<para
->Where are the icons kept?</para>
+<para>Where are the icons kept?</para>
 </question>
 <answer>
-<para
->The icons can be found only in <filename class="directory"
->$<envar
->TDEDIRS</envar
->/share/icons</filename
-> or <filename class="directory"
->$<envar
->HOME</envar
->/.trinity/share/icons</filename
-> or <filename class="directory"
->$<envar
->HOME</envar
->/.kde2/share/icons</filename
->. To use icons stored in other locations, you must either copy them into one of the above-mentioned fixed &kde; locations or make symlinks.</para>
+<para>The icons can be found only in <filename class="directory">$<envar>TDEDIRS</envar>/share/icons</filename> or <filename class="directory">$<envar>HOME</envar>/.trinity/share/icons</filename> or <filename class="directory">$<envar>HOME</envar>/.kde2/share/icons</filename>. To use icons stored in other locations, you must either copy them into one of the above-mentioned fixed &kde; locations or make symlinks.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How do I use the mouse scroll wheel in &kde;?</para>
+<para>How do I use the mouse scroll wheel in &kde;?</para>
 </question>
 <answer>
-<para
->Mouse wheel support comes with &Qt; 2.0 and above, so &kde; based on that will automatically support the use of the mouse scroll wheel.</para>
+<para>Mouse wheel support comes with &Qt; 2.0 and above, so &kde; based on that will automatically support the use of the mouse scroll wheel.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Why can't I get system sound to work, like for opening windows?</para>
+<para>Why can't I get system sound to work, like for opening windows?</para>
 </question>
 <answer>
-<para
->System sound currently does not work on non-FreeBSD and non-&Linux; systems. This is being worked on. If you use FreeBSD or &Linux;, you have found a bug, so please report it.</para>
+<para>System sound currently does not work on non-FreeBSD and non-&Linux; systems. This is being worked on. If you use FreeBSD or &Linux;, you have found a bug, so please report it.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How do I launch applications in a particular desktop?</para>
+<para>How do I launch applications in a particular desktop?</para>
 </question>
 <answer>
-<para
->&kde; comes with a program called &kstart;. To start an <application
->xterm</application
-> on the second desktop and then activate it use: <userinput
-><command
->kstart</command
-> <option
->--desktop 2 --activate --window "xterm" </option
->xterm</userinput
->.</para>
-<para
->Note that the <option
->--window</option
-> option is important. It takes an argument which is a regular expression matching the title of the window to apply the settings to.</para>
-<para
->Please read <command
->kstart</command
-> <option
->--help-all</option
-> for more magic available with &kstart; (and there is an abundance). </para>
+<para>&kde; comes with a program called &kstart;. To start an <application>xterm</application> on the second desktop and then activate it use: <userinput><command>kstart</command> <option>--desktop 2 --activate --window "xterm" </option>xterm</userinput>.</para>
+<para>Note that the <option>--window</option> option is important. It takes an argument which is a regular expression matching the title of the window to apply the settings to.</para>
+<para>Please read <command>kstart</command> <option>--help-all</option> for more magic available with &kstart; (and there is an abundance). </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Where do I save my files if I want them to appear directly on the desktop?</para>
+<para>Where do I save my files if I want them to appear directly on the desktop?</para>
 </question>
 <answer>
-<para
-><filename class="directory"
->$<envar
->HOME</envar
->/Desktop</filename
->. You might need to refresh your desktop after you have saved your files.</para>
+<para><filename class="directory">$<envar>HOME</envar>/Desktop</filename>. You might need to refresh your desktop after you have saved your files.</para>
 </answer>
 </qandaentry>
 </qandaset>
diff --git a/tde-i18n-en_GB/docs/tdebase/faq/filemng.docbook b/tde-i18n-en_GB/docs/tdebase/faq/filemng.docbook
index b4c08665d1b..07619947f8e 100644
--- a/tde-i18n-en_GB/docs/tdebase/faq/filemng.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/faq/filemng.docbook
@@ -1,359 +1,142 @@
 <!-- <?xml version="1.0" ?>
 <!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
- "dtd/kdex.dtd"
-> -->
+ "dtd/kdex.dtd"> -->
 	
 <chapter id="filemanager">
-<title
->The File Manager and Web Browser</title>
+<title>The File Manager and Web Browser</title>
 
-<para
->The file manager and web browser of &kde; is &konqueror;. The &konqueror; home page is located at <ulink url="http://www.konqueror.org"
->http://www.konqueror.org</ulink
-> where a &konqueror; specific <acronym
->FAQ</acronym
-> can be found.</para>
+<para>The file manager and web browser of &kde; is &konqueror;. The &konqueror; home page is located at <ulink url="http://www.konqueror.org">http://www.konqueror.org</ulink> where a &konqueror; specific <acronym>FAQ</acronym> can be found.</para>
 
 <qandaset>
 <qandaentry>
 <question>
-<para
->How do I use &konqueror; as a web browser with a proxy?</para>
+<para>How do I use &konqueror; as a web browser with a proxy?</para>
 </question>
 <answer>
-<para
->&konqueror; can be used with &HTTP; and &FTP; proxies. To set up the proxy server in &konqueror;, just select <menuchoice
-><guimenu
->Settings</guimenu
-><guisubmenu
->Configure &konqueror;...</guisubmenu
-></menuchoice
-> from the &konqueror; menu and go to the <guilabel
->Proxy</guilabel
-> tab.</para>
+<para>&konqueror; can be used with &HTTP; and &FTP; proxies. To set up the proxy server in &konqueror;, just select <menuchoice><guimenu>Settings</guimenu><guisubmenu>Configure &konqueror;...</guisubmenu></menuchoice> from the &konqueror; menu and go to the <guilabel>Proxy</guilabel> tab.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How can I change the appearance of a folder in &konqueror;?</para>
+<para>How can I change the appearance of a folder in &konqueror;?</para>
 </question>
 <answer>
-<para
->Right-click the folder, select <guimenuitem
->Properties</guimenuitem
->, click on the large icon in the dialogue which appears and choose another icon.</para>
-<para
->To change the icon displayed for entries in the <guimenu
->TDE Menu</guimenu
->, use the <application
->Menu Editor</application
->, located at <menuchoice
-><guisubmenu
->Settings</guisubmenu
-><guimenuitem
->Menu Editor</guimenuitem
-></menuchoice
->. </para>
+<para>Right-click the folder, select <guimenuitem>Properties</guimenuitem>, click on the large icon in the dialogue which appears and choose another icon.</para>
+<para>To change the icon displayed for entries in the <guimenu>TDE Menu</guimenu>, use the <application>Menu Editor</application>, located at <menuchoice><guisubmenu>Settings</guisubmenu><guimenuitem>Menu Editor</guimenuitem></menuchoice>. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How can I do non-anonymous &FTP; transfers with &konqueror;?</para>
+<para>How can I do non-anonymous &FTP; transfers with &konqueror;?</para>
 </question>
 <answer>
-<para
->Normally, if you enter a &URL; like <userinput
->ftp://<replaceable
->ftp.somehost.com</replaceable
-></userinput
->, &konqueror; will attempt an anonymous login to the &FTP; server. If you want to login as a particular user, enter a &URL; like <userinput
->ftp://<replaceable
->username@ftp.somehost.com</replaceable
-></userinput
-> instead. &konqueror; will ask for your password and connect to the server.</para>
+<para>Normally, if you enter a &URL; like <userinput>ftp://<replaceable>ftp.somehost.com</replaceable></userinput>, &konqueror; will attempt an anonymous login to the &FTP; server. If you want to login as a particular user, enter a &URL; like <userinput>ftp://<replaceable>username@ftp.somehost.com</replaceable></userinput> instead. &konqueror; will ask for your password and connect to the server.</para>
 </answer>
 </qandaentry>
 
-<qandaentry
-> <question
-> <para
->What are <option
->%i</option
-> and <option
->%m</option
-> in the Execute line?</para
-> </question
-> <answer>
-<para
->They are used by all &kde; applications (since they are implemented in <classname
->TDEApplication</classname
-> and all good &kde; programs create a <classname
->TDEApplication</classname
-> object before they even look at the command line arguments).</para
-> <para
->A standard line for a &kde; application looks like this: <userinput
-><command
->foo</command
-> <option
->... %i %m -caption \"%c\"</option
-></userinput
->. Pretty confusing, but it has been designed in that way so that it can integrate legacy, non-&kde; applications as smoothly as possible. &konqueror;, when executing the line above, will extend the command to <userinput
-><command
-><replaceable
->foo</replaceable
-></command
-> <option
->-icon something.png -miniicon something_mini.png -caption \"The Foo\"</option
-></userinput
->. Both the icon and the mini-icon as well as "The Foo" are properties defined in the <filename
->.desktop</filename
-> file. If the icons are not defined, they simply default to the executable name <replaceable
->foo</replaceable
->.</para>
+<qandaentry> <question> <para>What are <option>%i</option> and <option>%m</option> in the Execute line?</para> </question> <answer>
+<para>They are used by all &kde; applications (since they are implemented in <classname>TDEApplication</classname> and all good &kde; programs create a <classname>TDEApplication</classname> object before they even look at the command line arguments).</para> <para>A standard line for a &kde; application looks like this: <userinput><command>foo</command> <option>... %i %m -caption \"%c\"</option></userinput>. Pretty confusing, but it has been designed in that way so that it can integrate legacy, non-&kde; applications as smoothly as possible. &konqueror;, when executing the line above, will extend the command to <userinput><command><replaceable>foo</replaceable></command> <option>-icon something.png -miniicon something_mini.png -caption \"The Foo\"</option></userinput>. Both the icon and the mini-icon as well as "The Foo" are properties defined in the <filename>.desktop</filename> file. If the icons are not defined, they simply default to the executable name <replaceable>foo</replaceable>.</para>
 
-<para
->This way a user can change these things in &kmenuedit; for his or her applications. The <option
->-caption</option
-> option is important, because no user will accept that the menu item <guimenuitem
->Editor</guimenuitem
-> starts something called <guilabel
->kedit-0.9pl4-build47</guilabel
->. Instead, he expects a window called <guilabel
->Editor</guilabel
->. Furthermore these names are localised, <abbrev
->i.e.</abbrev
-> an American user launches <guimenuitem
->CD-Player</guimenuitem
-> and gets a window called <guilabel
->CD-Player</guilabel
-> while a German user launches <guimenuitem
->CD-Spieler</guimenuitem
-> and gets a window called <guilabel
->CD-Spieler</guilabel
->.</para>
+<para>This way a user can change these things in &kmenuedit; for his or her applications. The <option>-caption</option> option is important, because no user will accept that the menu item <guimenuitem>Editor</guimenuitem> starts something called <guilabel>kedit-0.9pl4-build47</guilabel>. Instead, he expects a window called <guilabel>Editor</guilabel>. Furthermore these names are localised, <abbrev>i.e.</abbrev> an American user launches <guimenuitem>CD-Player</guimenuitem> and gets a window called <guilabel>CD-Player</guilabel> while a German user launches <guimenuitem>CD-Spieler</guimenuitem> and gets a window called <guilabel>CD-Spieler</guilabel>.</para>
 
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How do I specify the startup folder for &konqueror;?</para>
+<para>How do I specify the startup folder for &konqueror;?</para>
 </question>
 <answer>
 
-<para
->Using the &RMB;, click on the Home icon and choose <guimenuitem
->Properties</guimenuitem
->. Under the <guilabel
->Application</guilabel
-> tab you will probably find something like <command
->kfmclient openProfile filemanagement</command
->; just append <filename class="directory"
->file:/whereever/you/want</filename
-> with the folder you would like &konqueror; to start in.</para>
+<para>Using the &RMB;, click on the Home icon and choose <guimenuitem>Properties</guimenuitem>. Under the <guilabel>Application</guilabel> tab you will probably find something like <command>kfmclient openProfile filemanagement</command>; just append <filename class="directory">file:/whereever/you/want</filename> with the folder you would like &konqueror; to start in.</para>
 
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question id="nsbookmark">
-<para
->How do I import &Netscape; bookmarks?</para>
+<para>How do I import &Netscape; bookmarks?</para>
 </question>
 <answer>
-<para
->There is no need to import anything at all. &Netscape; bookmarks are automatically available under the <guimenu
->Bookmarks</guimenu
-> menu in &konqueror; with no configuration on your part necessary. The <application
->Bookmark Editor</application
-> is able to convert &Netscape; bookmarks to the format used by &konqueror;, if you want this.</para>
+<para>There is no need to import anything at all. &Netscape; bookmarks are automatically available under the <guimenu>Bookmarks</guimenu> menu in &konqueror; with no configuration on your part necessary. The <application>Bookmark Editor</application> is able to convert &Netscape; bookmarks to the format used by &konqueror;, if you want this.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How do I fool a site into believing &konqueror; is &Netscape; or some other browser?</para>
+<para>How do I fool a site into believing &konqueror; is &Netscape; or some other browser?</para>
 </question>
 <answer>
-<para
->In &konqueror;, select <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Konqueror...</guimenuitem
-></menuchoice
-> and in the configuration dialogue, select <guilabel
->Browser Identification</guilabel
->. Default and site-specific browser identifications can be set from here.</para>
+<para>In &konqueror;, select <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Konqueror...</guimenuitem></menuchoice> and in the configuration dialogue, select <guilabel>Browser Identification</guilabel>. Default and site-specific browser identifications can be set from here.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How do I configure &konqueror; to run &Java; applets?</para>
+<para>How do I configure &konqueror; to run &Java; applets?</para>
 </question>
 <answer>
-<para
->Choose <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure &konqueror;...</guimenuitem
-></menuchoice
-> from &konqueror;'s menubar and then select <guilabel
->Java &amp; Javascript</guilabel
->. Set the <guilabel
->Path to Java executable</guilabel
-> correctly. If it doesn't work, please check the <ulink url="http://www.konqueror.org/javahowto/"
->Konqueror + Java HOWTO</ulink
->.</para>
+<para>Choose <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &konqueror;...</guimenuitem></menuchoice> from &konqueror;'s menubar and then select <guilabel>Java &amp; Javascript</guilabel>. Set the <guilabel>Path to Java executable</guilabel> correctly. If it doesn't work, please check the <ulink url="http://www.konqueror.org/javahowto/">Konqueror + Java HOWTO</ulink>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->What is this new <guilabel
->Smart</guilabel
-> policy for JavaScript web popups?</para>
+<para>What is this new <guilabel>Smart</guilabel> policy for JavaScript web popups?</para>
 </question>
 <answer>
-<para
->This new policy attempts to block intrusive JavaScript popup windows. If the user does not click on a button or submit a form to trigger the popup, then the popup is not permitted. Some sites will open a second new window from within the first and in that case, the second window will not show. </para>
+<para>This new policy attempts to block intrusive JavaScript popup windows. If the user does not click on a button or submit a form to trigger the popup, then the popup is not permitted. Some sites will open a second new window from within the first and in that case, the second window will not show. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Why doesn't my banking site work with &konqueror;? It pops up a new window with the login screen in other browsers, but not in &konqueror;.</para>
+<para>Why doesn't my banking site work with &konqueror;? It pops up a new window with the login screen in other browsers, but not in &konqueror;.</para>
 </question>
 <answer>
-<para
->Make sure you have Javascript enabled, and the default JavaScript web popups policy set to <guilabel
->Ask</guilabel
-> or <guilabel
->Allow</guilabel
->. The <guilabel
->Smart</guilabel
-> policy is not always sufficient for some banks. Many banks also require &Java; support. You can find more help on enabling this at <ulink url="http://www.konqueror.org/"
->http://www.konqueror.org/</ulink
->. </para>
+<para>Make sure you have Javascript enabled, and the default JavaScript web popups policy set to <guilabel>Ask</guilabel> or <guilabel>Allow</guilabel>. The <guilabel>Smart</guilabel> policy is not always sufficient for some banks. Many banks also require &Java; support. You can find more help on enabling this at <ulink url="http://www.konqueror.org/">http://www.konqueror.org/</ulink>. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Why can't &konqueror; render &GIF; images?</para>
+<para>Why can't &konqueror; render &GIF; images?</para>
 </question>
 <answer>
-<para
->It is because you did not enable &GIF; support in &Qt;. Please see <xref linkend="gif"/> for more details.</para>
+<para>It is because you did not enable &GIF; support in &Qt;. Please see <xref linkend="gif"/> for more details.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How do I rename files?</para>
+<para>How do I rename files?</para>
 </question>
 <answer>
-<para
->Simply <mousebutton
->right</mousebutton
-> click on the file and select <guimenuitem
->Rename</guimenuitem
-> or click once on an already selected file. The default keyboard shortcut to rename a file is <keycap
->F2</keycap
->.</para>
+<para>Simply <mousebutton>right</mousebutton> click on the file and select <guimenuitem>Rename</guimenuitem> or click once on an already selected file. The default keyboard shortcut to rename a file is <keycap>F2</keycap>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->When I try to open a web page with &konqueror;, I get the message: <quote
->There appears to be a configuration error. You have associated Konqueror with text/html, but it cannot handle this file type.</quote
-></para>
+<question><para>When I try to open a web page with &konqueror;, I get the message: <quote>There appears to be a configuration error. You have associated Konqueror with text/html, but it cannot handle this file type.</quote></para>
 </question>
 <answer>
-<para
->You need to make sure that the embedding settings for the text/html <acronym
->MIME</acronym
-> type are correct: <orderedlist>
-<listitem
-><para
->In &konqueror;, go to <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Konqueror</guimenuitem
-></menuchoice
-> and then to the <guilabel
->File Associations</guilabel
-> page.</para
-></listitem>
-<listitem
-><para
->Open text->html in the tree view.</para
-></listitem>
-<listitem
-><para
->Click on the <guilabel
->Embedding</guilabel
-> tab. Make sure that <guilabel
->Left Click Action</guilabel
-> is set to <guilabel
->Show file in embedded viewer</guilabel
->, and that <guilabel
->TDEHTML (tdehtml)</guilabel
-> is at the top of <guilabel
->Services Preference Order.</guilabel
-></para
-></listitem>
+<para>You need to make sure that the embedding settings for the text/html <acronym>MIME</acronym> type are correct: <orderedlist>
+<listitem><para>In &konqueror;, go to <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Konqueror</guimenuitem></menuchoice> and then to the <guilabel>File Associations</guilabel> page.</para></listitem>
+<listitem><para>Open text->html in the tree view.</para></listitem>
+<listitem><para>Click on the <guilabel>Embedding</guilabel> tab. Make sure that <guilabel>Left Click Action</guilabel> is set to <guilabel>Show file in embedded viewer</guilabel>, and that <guilabel>TDEHTML (tdehtml)</guilabel> is at the top of <guilabel>Services Preference Order.</guilabel></para></listitem>
 </orderedlist>
 </para>
-<para
->Try opening a website in Konqueror. It should now work.</para>
+<para>Try opening a website in Konqueror. It should now work.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->How do I configure the programs that &konqueror; uses to open different types of files?</para
-></question>
+<question><para>How do I configure the programs that &konqueror; uses to open different types of files?</para></question>
 <answer>
-<para
->In order to configure file associations, you should go to the &kcontrolcenter; and choose the item <guimenuitem
->File Associations</guimenuitem
-> under the category <guimenu
->TDE Components</guimenu
->.</para>
-<para
->Suppose the default <acronym
->PDF</acronym
-> viewer is now &kghostview; and you would prefer to use <application
->KPDF</application
-> as a viewer. You would simply type <userinput
->pdf</userinput
-> in the search box at the top of the dialogue, choose <guimenuitem
->pdf</guimenuitem
-> in the <guimenu
->application</guimenu
-> group and move <application
->KPDF</application
-> up. In the <guilabel
->Embedding</guilabel
-> tab you can also choose which component other applications will use to display files (for example, when viewing files in &konqueror; or using &ark;'s embedded viewer). </para>
+<para>In order to configure file associations, you should go to the &kcontrolcenter; and choose the item <guimenuitem>File Associations</guimenuitem> under the category <guimenu>TDE Components</guimenu>.</para>
+<para>Suppose the default <acronym>PDF</acronym> viewer is now &kghostview; and you would prefer to use <application>KPDF</application> as a viewer. You would simply type <userinput>pdf</userinput> in the search box at the top of the dialogue, choose <guimenuitem>pdf</guimenuitem> in the <guimenu>application</guimenu> group and move <application>KPDF</application> up. In the <guilabel>Embedding</guilabel> tab you can also choose which component other applications will use to display files (for example, when viewing files in &konqueror; or using &ark;'s embedded viewer). </para>
 </answer>
 </qandaentry>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/faq/gettde.docbook b/tde-i18n-en_GB/docs/tdebase/faq/gettde.docbook
index a059b9b7204..6f250409f90 100644
--- a/tde-i18n-en_GB/docs/tdebase/faq/gettde.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/faq/gettde.docbook
@@ -5,106 +5,68 @@
 -->
 
 <chapter id="getting-kde">
-<title
->Getting &kde;</title>
+<title>Getting &kde;</title>
 
 <qandaset>
 <qandaentry>
 <question id="where-to-get-kde">
-<para
->Where do I get &kde;?</para>
+<para>Where do I get &kde;?</para>
 </question>
 <answer>
 <!-- This needs a rewrite including informations about the latest version (link to the info page?)-->
-<para
->The main distribution site for &kde; is <ulink url="ftp://ftp.kde.org/"
->ftp.kde.org</ulink
->. However, this site is often under heavy load, so you might prefer to use <ulink url="http://download.kde.org/"
->download.kde.org</ulink
-> which automatically redirects you to the mirror nearest to you. You can also have a look at the list of <ulink url="http://www.kde.org/ftpmirrors.html"
-> &kde; mirror sites</ulink
->.</para>
+<para>The main distribution site for &kde; is <ulink url="ftp://ftp.kde.org/">ftp.kde.org</ulink>. However, this site is often under heavy load, so you might prefer to use <ulink url="http://download.kde.org/">download.kde.org</ulink> which automatically redirects you to the mirror nearest to you. You can also have a look at the list of <ulink url="http://www.kde.org/ftpmirrors.html"> &kde; mirror sites</ulink>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Are there &Linux; distributions that include &kde;?</para>
+<para>Are there &Linux; distributions that include &kde;?</para>
 </question>
 <answer>
-<para
->Yes, major &Linux; distributions already ship &kde;. As building a distribution takes some time, they might not always contain the latest version, but for a start or to avoid downloading from the Internet, they do provide a good starting point. </para>
-<para
->You can find an up-to-date list of distributions that ship with &kde; <ulink url="http://www.kde.org/download/distributions.php"
->here</ulink
->. </para>
+<para>Yes, major &Linux; distributions already ship &kde;. As building a distribution takes some time, they might not always contain the latest version, but for a start or to avoid downloading from the Internet, they do provide a good starting point. </para>
+<para>You can find an up-to-date list of distributions that ship with &kde; <ulink url="http://www.kde.org/download/distributions.php">here</ulink>. </para>
 
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->What is the current version?</para>
+<para>What is the current version?</para>
 </question>
 <answer>
 
-<para
->Currently, the latest stable version is 3.2</para>
+<para>Currently, the latest stable version is 3.2</para>
 
-<para
->The <ulink url="http://www.kde.org/info/3.2.php"
->&kde; 3.2 Info Page</ulink
-> contains a lot of information specific to this release.</para>
+<para>The <ulink url="http://www.kde.org/info/3.2.php">&kde; 3.2 Info Page</ulink> contains a lot of information specific to this release.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Where do I find &kde; snapshots?</para>
+<para>Where do I find &kde; snapshots?</para>
 </question>
 <answer>
-<para
->You can get the latest snapshots from <ulink url="ftp://ftp.kde.org/pub/kde/unstable/snapshots"
->ftp://ftp.kde.org/pub/kde/unstable/snapshots</ulink
->. You might also want to consider setting up your own <acronym
->CVS</acronym
-> client in order to maintain the latest snapshot at all times. Please refer to <ulink url="http://developer.kde.org/source/anoncvs.html"
->Anonymous <acronym
->CVS</acronym
-> and &kde;</ulink
-> for further information. </para>
+<para>You can get the latest snapshots from <ulink url="ftp://ftp.kde.org/pub/kde/unstable/snapshots">ftp://ftp.kde.org/pub/kde/unstable/snapshots</ulink>. You might also want to consider setting up your own <acronym>CVS</acronym> client in order to maintain the latest snapshot at all times. Please refer to <ulink url="http://developer.kde.org/source/anoncvs.html">Anonymous <acronym>CVS</acronym> and &kde;</ulink> for further information. </para>
 
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question id="where-to-get-qt">
-<para
->Where do I get &Qt;?</para>
+<para>Where do I get &Qt;?</para>
 </question>
 <answer>
-<para
->&Qt; is a product of the Norwegian company Trolltech. You can always get the latest &Qt; version from their <ulink url="ftp://ftp.trolltech.com"
->&FTP; server</ulink
->.</para>
-<para
->And with most up-to-date &Linux; distributions, &Qt; is already included. Please see <xref linkend="prerequisites"/> for the version of &Qt; you need.</para>
+<para>&Qt; is a product of the Norwegian company Trolltech. You can always get the latest &Qt; version from their <ulink url="ftp://ftp.trolltech.com">&FTP; server</ulink>.</para>
+<para>And with most up-to-date &Linux; distributions, &Qt; is already included. Please see <xref linkend="prerequisites"/> for the version of &Qt; you need.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question id="qt">
-<para
->What is &Qt;, by the way?</para>
+<para>What is &Qt;, by the way?</para>
 </question>
 <answer>
-<para
->&Qt; is a C++-based class library to build user interfaces. It also includes many utility classes like string classes and classes to handle input and output. It provides most of the widgets you will see in a &kde; application: menus, buttons, sliders, &etc;. &Qt; is a cross-platform library that allows you to write code that will compile on &UNIX; systems as well as &Windows; and embedded devices. You can learn more about &Qt; at <ulink url="http://www.trolltech.com"
->http://www.trolltech.com</ulink
->.</para>
+<para>&Qt; is a C++-based class library to build user interfaces. It also includes many utility classes like string classes and classes to handle input and output. It provides most of the widgets you will see in a &kde; application: menus, buttons, sliders, &etc;. &Qt; is a cross-platform library that allows you to write code that will compile on &UNIX; systems as well as &Windows; and embedded devices. You can learn more about &Qt; at <ulink url="http://www.trolltech.com">http://www.trolltech.com</ulink>.</para>
 </answer>
 </qandaentry>
 </qandaset>
diff --git a/tde-i18n-en_GB/docs/tdebase/faq/index.docbook b/tde-i18n-en_GB/docs/tdebase/faq/index.docbook
index 42bbbad73e4..ef21eec109a 100644
--- a/tde-i18n-en_GB/docs/tdebase/faq/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/faq/index.docbook
@@ -3,8 +3,7 @@
  "dtd/kdex.dtd" [
   <!ENTITY kappname "&kde; Frequently Asked Questions">
   <!ENTITY % addindex "IGNORE">
-  <!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+  <!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
   <!ENTITY faq-about SYSTEM "about.docbook">
   <!ENTITY faq-intro SYSTEM "intro.docbook">
   <!ENTITY faq-gettde SYSTEM "gettde.docbook">
@@ -29,75 +28,40 @@
 <book lang="&language;">
 
 <bookinfo>
-<title
->&kde; Frequently Asked Questions</title>
+<title>&kde; Frequently Asked Questions</title>
 
 <authorgroup>
 <author>
-<surname
->The &kde; Team</surname>
+<surname>The &kde; Team</surname>
 </author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 
 </authorgroup>
 
 <copyright>
-<year
->1997</year>
-<year
->1998</year>
-<year
->1999</year>
-<year
->2000</year>
-<year
->2001</year>
-<year
->2003</year>
-<year
->2004</year>
-<holder
->The &kde; Team</holder>
+<year>1997</year>
+<year>1998</year>
+<year>1999</year>
+<year>2000</year>
+<year>2001</year>
+<year>2003</year>
+<year>2004</year>
+<holder>The &kde; Team</holder>
 </copyright>
 
-<legalnotice
->&FDLNotice;</legalnotice>
+<legalnotice>&FDLNotice;</legalnotice>
 
-<date
->2004-09-07</date>
-<releaseinfo
->3.3</releaseinfo>
+<date>2004-09-07</date>
+<releaseinfo>3.3</releaseinfo>
 
 <abstract>
-<para
->This is a compilation of the most frequently asked questions about the K Desktop Environment. Please report any bugs, inconsistencies, or omissions you find in this &FAQ; to <email
->kde-doc-english@kde.org</email
->. Please do not mail your questions to this list. Post them to the &kde; mailing lists and newsgroups instead. They are monitored for this &FAQ;.</para
-> </abstract>
+<para>This is a compilation of the most frequently asked questions about the K Desktop Environment. Please report any bugs, inconsistencies, or omissions you find in this &FAQ; to <email>kde-doc-english@kde.org</email>. Please do not mail your questions to this list. Post them to the &kde; mailing lists and newsgroups instead. They are monitored for this &FAQ;.</para> </abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->FAQ</keyword>
-<keyword
->question</keyword>
-<keyword
->answer</keyword>
+<keyword>KDE</keyword>
+<keyword>FAQ</keyword>
+<keyword>question</keyword>
+<keyword>answer</keyword>
 </keywordset>
 </bookinfo>
 
@@ -118,35 +82,20 @@
 &faq-contrib;
 
 <chapter id="credits">
-<title
->Credits and Licence</title>
+<title>Credits and Licence</title>
 
-<para
->The current &FAQ; maintainers are:</para>
+<para>The current &FAQ; maintainers are:</para>
 
 <itemizedlist>
-<listitem
-><para
->Rainer Endres <email
->endres@kde.org</email
-></para
-></listitem>
+<listitem><para>Rainer Endres <email>endres@kde.org</email></para></listitem>
 </itemizedlist>
 
-<para
->Many of the answers in this &FAQ; are taken from the various &kde; mailing lists and newsgroups. Here is a <emphasis
->big</emphasis
-> thank you to all of you who have contributed answers that eventually appear in this &FAQ;.</para>
+<para>Many of the answers in this &FAQ; are taken from the various &kde; mailing lists and newsgroups. Here is a <emphasis>big</emphasis> thank you to all of you who have contributed answers that eventually appear in this &FAQ;.</para>
 
-<para
->Special thanks go to the former &FAQ; maintainer, who has written most of the stuff in here, and did a tremendous job: Mr. Lee Wee Tiong </para>
+<para>Special thanks go to the former &FAQ; maintainer, who has written most of the stuff in here, and did a tremendous job: Mr. Lee Wee Tiong </para>
 
 
-<para
->Conversion to British English: Malcolm Hunter <email
->malcolm.hunter@gmx.co.uk</email
-></para
-> 
+<para>Conversion to British English: Malcolm Hunter <email>malcolm.hunter@gmx.co.uk</email></para> 
 &underFDL; </chapter>
 
 &documentation.index;
diff --git a/tde-i18n-en_GB/docs/tdebase/faq/install.docbook b/tde-i18n-en_GB/docs/tdebase/faq/install.docbook
index 275f771253b..3b0d78aa90d 100644
--- a/tde-i18n-en_GB/docs/tdebase/faq/install.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/faq/install.docbook
@@ -1,21 +1,12 @@
 <!-- <?xml version="1.0" ?>
 <!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
- "dtd/kdex.dtd"
-> -->
+ "dtd/kdex.dtd"> -->
 
 
 <chapter id="install">
-<title
->Installation instructions</title>
+<title>Installation instructions</title>
 
-<para
->These are the generic installation instructions for the K Desktop Environment. Please complement your reading with the <filename
->README</filename
->s and <filename
->INSTALL</filename
->s that come along with the package. Please read them carefully and try to help yourself out if anything goes wrong. If you need further assistance, consider joining the &kde; mailing lists (see our web site instructions for joining the &kde; <ulink url="http://www.kde.org/mailinglists/"
->mailing lists</ulink
->) or newsgroups.</para>
+<para>These are the generic installation instructions for the K Desktop Environment. Please complement your reading with the <filename>README</filename>s and <filename>INSTALL</filename>s that come along with the package. Please read them carefully and try to help yourself out if anything goes wrong. If you need further assistance, consider joining the &kde; mailing lists (see our web site instructions for joining the &kde; <ulink url="http://www.kde.org/mailinglists/">mailing lists</ulink>) or newsgroups.</para>
 
 
 <qandaset>
@@ -23,396 +14,210 @@
 
 <qandaentry>
 <question>
-<para
->To the would-be converts</para>
+<para>To the would-be converts</para>
 </question>
 <answer>
 
-<para
->So you have heard the rumours. Or you have seen the screenshots. And you are dying to get hold of &kde;. But you know next to nothing about this whole <quote
->alternative OS</quote
-> business. Don't worry! You only need to do some (well, maybe not some) reading, that's all!</para>
+<para>So you have heard the rumours. Or you have seen the screenshots. And you are dying to get hold of &kde;. But you know next to nothing about this whole <quote>alternative OS</quote> business. Don't worry! You only need to do some (well, maybe not some) reading, that's all!</para>
 
-<para
->&kde; does not run on any version of &Microsoft; &Windows; or OS/2 (yet). To run &kde;, you need to have a &UNIX; system. Please refer to <xref linkend="platform"/> for more details.</para>
+<para>&kde; does not run on any version of &Microsoft; &Windows; or OS/2 (yet). To run &kde;, you need to have a &UNIX; system. Please refer to <xref linkend="platform"/> for more details.</para>
 
-<para
->Decide on a platform and set it up for your system. This <acronym
->FAQ</acronym
-> can not help you with this, since &kde;<ulink url="http://www.kde.org"
-> runs on many &UNIX;</ulink
-> platforms. </para>
+<para>Decide on a platform and set it up for your system. This <acronym>FAQ</acronym> can not help you with this, since &kde;<ulink url="http://www.kde.org"> runs on many &UNIX;</ulink> platforms. </para>
 
 <!-- Taken out because we can not help with all platforms and KDEisnotLINUX -->
 
-<para
->Finally, you are ready to commence the &kde; installation. Please start reading from the next section. To get &kde;, please refer to <xref linkend="where-to-get-kde"/>. Last but not least, if you encounter any problems while installing &kde;, please do not hesitate to make use of the &kde; <link linkend="mailing-lists"
->mailing lists</link
-> and <link linkend="newsgroups"
->newsgroups</link
->. But do bear this in mind: no question is too silly to ask, but some are too silly to answer, especially when they are already answered in this <acronym
->FAQ</acronym
->.</para>
-<para
->Good luck and have fun!</para>
+<para>Finally, you are ready to commence the &kde; installation. Please start reading from the next section. To get &kde;, please refer to <xref linkend="where-to-get-kde"/>. Last but not least, if you encounter any problems while installing &kde;, please do not hesitate to make use of the &kde; <link linkend="mailing-lists">mailing lists</link> and <link linkend="newsgroups">newsgroups</link>. But do bear this in mind: no question is too silly to ask, but some are too silly to answer, especially when they are already answered in this <acronym>FAQ</acronym>.</para>
+<para>Good luck and have fun!</para>
 
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Available package formats</para>
+<para>Available package formats</para>
 </question>
 <answer>
 
 
-<para
->You can find several kinds of binary and source packages for different distributions and operating systems on the &kde-ftp;. The binary packages are not made by the &kde; Team, but by the distributors themselves, or some dedicated individuals. Please refer to <ulink url="http://dot.kde.org/986933826/"
->&kde; Package Policy Explained</ulink
-> for information about the &kde; Package Policy. The only <quote
->official</quote
-> release is the source tar.bz2 packages. Please refer to the <filename
->README</filename
->s and <filename
->INSTALL</filename
->s in the several binaries folders. For a list of the available packages for a release, refer to the relevant info page. For the latest release this is the <ulink url="http://www.kde.org/info/3.2.php"
->&kde; 3.2 Info Page</ulink
->.</para>
+<para>You can find several kinds of binary and source packages for different distributions and operating systems on the &kde-ftp;. The binary packages are not made by the &kde; Team, but by the distributors themselves, or some dedicated individuals. Please refer to <ulink url="http://dot.kde.org/986933826/">&kde; Package Policy Explained</ulink> for information about the &kde; Package Policy. The only <quote>official</quote> release is the source tar.bz2 packages. Please refer to the <filename>README</filename>s and <filename>INSTALL</filename>s in the several binaries folders. For a list of the available packages for a release, refer to the relevant info page. For the latest release this is the <ulink url="http://www.kde.org/info/3.2.php">&kde; 3.2 Info Page</ulink>.</para>
 
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question id="prerequisites">
-<para
->Prerequisites</para>
+<para>Prerequisites</para>
 </question>
 <answer>
 
 <!-- rewrite to make it more general, pointing to the according webpages? -->
 
-<para
->For &kde; 3.2, you need the &Qt; library version 3.2 or greater. Please make sure you download the correct &Qt;. You will also need the header files, if you want to compile &kde; yourself. They are all available, at no cost, from <ulink url="http://www.trolltech.com/products/download"
->http://www.trolltech.com/download</ulink
->. In addition, there are optional libraries that might improve &kde; if installed on your system. An example is OpenSSL which will enable &konqueror; to browse web pages securely and is needed in a version 
->=0.9.6. These should be provided by your distributor; if not, ask for an update.</para>
+<para>For &kde; 3.2, you need the &Qt; library version 3.2 or greater. Please make sure you download the correct &Qt;. You will also need the header files, if you want to compile &kde; yourself. They are all available, at no cost, from <ulink url="http://www.trolltech.com/products/download">http://www.trolltech.com/download</ulink>. In addition, there are optional libraries that might improve &kde; if installed on your system. An example is OpenSSL which will enable &konqueror; to browse web pages securely and is needed in a version >=0.9.6. These should be provided by your distributor; if not, ask for an update.</para>
 
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Description of the base packages</para>
+<para>Description of the base packages</para>
 </question>
 <answer>
-<para
->The base distribution currently consists of eleven packages. Some are required, while others are optional. Each package is available in each of the aforementioned package formats.</para>
+<para>The base distribution currently consists of eleven packages. Some are required, while others are optional. Each package is available in each of the aforementioned package formats.</para>
 <variablelist>
 <varlistentry>
-<term
->tdelibs</term>
+<term>tdelibs</term>
 <listitem>
-<para
->Required</para>
-<para
->This package contains shared libraries that are needed by all &kde; applications.</para>
+<para>Required</para>
+<para>This package contains shared libraries that are needed by all &kde; applications.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->tdebase</term>
+<term>tdebase</term>
 <listitem>
-<para
->Required</para>
-<para
->This package contains the base applications that form the core of the K Desktop Environment like the window manager, the terminal emulator, the control centre, the file manager, and the panel.</para>
+<para>Required</para>
+<para>This package contains the base applications that form the core of the K Desktop Environment like the window manager, the terminal emulator, the control centre, the file manager, and the panel.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->&arts;</term>
+<term>&arts;</term>
 <listitem>
-<para
->Required</para>
-<para
->The &arts; sound server. A powerful, network transparent sound server.</para>
+<para>Required</para>
+<para>The &arts; sound server. A powerful, network transparent sound server.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->tdeaddons</term>
+<term>tdeaddons</term>
 <listitem>
-<para
->Optional</para>
-<para
->Various plugins for &kate;, &kicker;, &knewsticker;, &konqueror; and &noatun; </para>
+<para>Optional</para>
+<para>Various plugins for &kate;, &kicker;, &knewsticker;, &konqueror; and &noatun; </para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->tdeartwork</term>
+<term>tdeartwork</term>
 <listitem>
-<para
->Optional</para>
-<para
->Additional wallpapers, themes, styles, sounds ...</para>
+<para>Optional</para>
+<para>Additional wallpapers, themes, styles, sounds ...</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->tdebindings</term>
+<term>tdebindings</term>
 <listitem>
-<para
->Optional</para>
-<para
->Various bindings for other languages, including &Java;, Perl, Python, ...</para>
+<para>Optional</para>
+<para>Various bindings for other languages, including &Java;, Perl, Python, ...</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->tdegames</term>
+<term>tdegames</term>
 <listitem>
-<para
->Optional</para>
-<para
->Various games like &kmahjongg;, &ksnake;, &kasteroids;, and &kpatience;.</para>
+<para>Optional</para>
+<para>Various games like &kmahjongg;, &ksnake;, &kasteroids;, and &kpatience;.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->tdegraphics</term>
+<term>tdegraphics</term>
 <listitem>
-<para
->Optional</para>
-<para
->Various graphics-related programs like &PostScript; previewer, &DVI; previewer, and a drawing program.</para>
+<para>Optional</para>
+<para>Various graphics-related programs like &PostScript; previewer, &DVI; previewer, and a drawing program.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->tdeutils</term>
+<term>tdeutils</term>
 <listitem>
-<para
->Optional</para>
-<para
->Various desktop tools like a calculator, an editor and other nifty stuff.</para>
+<para>Optional</para>
+<para>Various desktop tools like a calculator, an editor and other nifty stuff.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->tdemultimedia</term>
+<term>tdemultimedia</term>
 <listitem>
-<para
->Optional</para>
-<para
->Multimedia applications like a &CD; player and a mixer.</para>
+<para>Optional</para>
+<para>Multimedia applications like a &CD; player and a mixer.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->tdenetwork</term>
+<term>tdenetwork</term>
 <listitem>
-<para
->Optional</para>
-<para
->Network applications. Currently contains the mail program &kmail;, the news reader &knode;, and several other network-related programs.</para>
+<para>Optional</para>
+<para>Network applications. Currently contains the mail program &kmail;, the news reader &knode;, and several other network-related programs.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->tdeadmin</term>
+<term>tdeadmin</term>
 <listitem>
-<para
->Optional</para>
-<para
->System administration programs.</para>
+<para>Optional</para>
+<para>System administration programs.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->tdeedu</term>
+<term>tdeedu</term>
 <listitem>
-<para
->Educational and entertaining applications for &kde;'s younger users. </para>
+<para>Educational and entertaining applications for &kde;'s younger users. </para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->tdetoys</term>
+<term>tdetoys</term>
 <listitem>
-<para
->Optional</para>
-<para
->Toys!</para>
+<para>Optional</para>
+<para>Toys!</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->tdevelop</term>
+<term>tdevelop</term>
 <listitem>
-<para
->Optional</para>
-<para
->A complete Integrated Development Environment for &kde; and Qt</para>
+<para>Optional</para>
+<para>A complete Integrated Development Environment for &kde; and Qt</para>
 </listitem>
 </varlistentry>
 </variablelist>
 	
-<para
->&arts; and then tdelibs should be installed before everything else, and tdeaddons last. The other packages can be installed in any arbitrary order.</para>
+<para>&arts; and then tdelibs should be installed before everything else, and tdeaddons last. The other packages can be installed in any arbitrary order.</para>
 
-<para
->Most package management tools will let you put all these packages in one folder and install them all at once, figuring out the dependencies as they go.</para>
+<para>Most package management tools will let you put all these packages in one folder and install them all at once, figuring out the dependencies as they go.</para>
 
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Installation instructions for the different package formats</para>
+<para>Installation instructions for the different package formats</para>
 </question>
 <answer>
-<para
-><important>
-<para
->Please do not forget to read the <filename
->README</filename
-> and <filename
->INSTALL</filename
-> files if they are available.</para>
-</important
-></para>
+<para><important>
+<para>Please do not forget to read the <filename>README</filename> and <filename>INSTALL</filename> files if they are available.</para>
+</important></para>
 <variablelist>
 <varlistentry>
-<term
->Installation of the Debian packages</term>
+<term>Installation of the Debian packages</term>
 <listitem>
-<para
->The Debian packages install in accordance with the upcoming <acronym
->FHS</acronym
-> (File Hierarchy Standard).</para>
+<para>The Debian packages install in accordance with the upcoming <acronym>FHS</acronym> (File Hierarchy Standard).</para>
 <procedure>
-<step performance="required"
-><para
->become superuser</para
-></step>
-<step performance="required"
-><para
->run <command
->dpkg <option
->-i <replaceable
->packagename.deb</replaceable
-></option
-></command
-> for every package you want to install.</para
-></step>
+<step performance="required"><para>become superuser</para></step>
+<step performance="required"><para>run <command>dpkg <option>-i <replaceable>packagename.deb</replaceable></option></command> for every package you want to install.</para></step>
 </procedure>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->Installation of the <acronym
->RPM</acronym
-> packages</term>
+<term>Installation of the <acronym>RPM</acronym> packages</term>
 <listitem>
 <procedure>
-<title
->To install binary <acronym
->RPM</acronym
->s</title>
-<step performance="required"
-><para
->become superuser</para
-></step>
-<step performance="required"
-><para
->execute <command
->rpm <option
->-ivh <replaceable
->packagename.rpm</replaceable
-></option
-></command
-></para
-></step>
+<title>To install binary <acronym>RPM</acronym>s</title>
+<step performance="required"><para>become superuser</para></step>
+<step performance="required"><para>execute <command>rpm <option>-ivh <replaceable>packagename.rpm</replaceable></option></command></para></step>
 </procedure>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->Installation of the source <filename
->.tar.bz2</filename
-> files</term>
+<term>Installation of the source <filename>.tar.bz2</filename> files</term>
 <listitem>
-<para
->Since there are always changes and updates to the way &kde; is compiled, please refer to <ulink url="http://developer.kde.org/build/index.html"
->Download and Install from Source</ulink
-> for the most up to date installation instructions for the source packages. </para>
-<para
->The general approach should work in most cases though. </para>
-<para
->The source <filename
->.tar.bz2</filename
-> package installs into <filename class="directory"
->/usr/local/kde</filename
-> by default. You can override this setting by using the <option
->--prefix</option
-> option of the <filename
->configure</filename
-> script.</para>
+<para>Since there are always changes and updates to the way &kde; is compiled, please refer to <ulink url="http://developer.kde.org/build/index.html">Download and Install from Source</ulink> for the most up to date installation instructions for the source packages. </para>
+<para>The general approach should work in most cases though. </para>
+<para>The source <filename>.tar.bz2</filename> package installs into <filename class="directory">/usr/local/kde</filename> by default. You can override this setting by using the <option>--prefix</option> option of the <filename>configure</filename> script.</para>
 <procedure>
-<step performance="required"
-><para
->unpack the packages with <command
->tar <option
->jxvf <replaceable
->packagename.tar.bz2</replaceable
-></option
-></command
-></para
-></step>
-<step performance="required"
-><para
->change folder to the package folder: <command
->cd <replaceable
->packagename</replaceable
-></command
-></para
-></step>
-<step performance="required"
-><para
->configure the package: <command
->./configure</command
-> <note
-><para
->Some packages (notably tdebase) have special configuration options that might be applicable to your installation. Type <command
->./configure <option
->--help</option
-></command
-> to see the available options.</para
-></note
-></para
-></step>
-<step performance="required"
-><para
->build the package: <command
->make</command
-></para
-></step>
-<step performance="required"
-><para
->install the package: <command
->su <option
->-c "make install"</option
-></command
-> (if you aren't already root). If you already are, just type <command
->make <option
->install</option
-></command
->.</para
-></step>
+<step performance="required"><para>unpack the packages with <command>tar <option>jxvf <replaceable>packagename.tar.bz2</replaceable></option></command></para></step>
+<step performance="required"><para>change folder to the package folder: <command>cd <replaceable>packagename</replaceable></command></para></step>
+<step performance="required"><para>configure the package: <command>./configure</command> <note><para>Some packages (notably tdebase) have special configuration options that might be applicable to your installation. Type <command>./configure <option>--help</option></command> to see the available options.</para></note></para></step>
+<step performance="required"><para>build the package: <command>make</command></para></step>
+<step performance="required"><para>install the package: <command>su <option>-c "make install"</option></command> (if you aren't already root). If you already are, just type <command>make <option>install</option></command>.</para></step>
 </procedure>
 </listitem>
 </varlistentry>
@@ -422,218 +227,78 @@
 
 <qandaentry>
 <question>
-<para
->Post-installation procedures</para>
+<para>Post-installation procedures</para>
 </question>
 <answer>
-<para
->First of all, please make sure that you have added &kde;'s binary installation folder (&eg; <filename class="directory"
->/usr/local/kde/bin</filename
->) to your <envar
->PATH</envar
-> and &kde;'s library installation folder to your <envar
->LD_LIBRARY_PATH</envar
-> (only necessary on systems that do not support rpath; on &Linux; &ELF;, it should work without). This environment variable may be called differently on some systems, &eg; it is called <envar
->SHLIB_PATH</envar
-> on &IRIX;. Then set the environment variable <envar
->TDEDIR</envar
-> to the base of your &kde; tree, &eg; <filename class="directory"
->/usr/local/kde</filename
->. <caution
-> <para
->Please bear in mind that it is unwise to set <envar
->LD_LIBRARY_PATH</envar
-> blindly. In the vast majority of cases it is unnecessary and can do more harm than good. There is a web page written by <ulink url="mailto:barr@cis.ohio-state.edu"
->Dave Barr</ulink
-> explaining the evils of <envar
->LD_LIBRARY_PATH</envar
-> and it can be found at <ulink url="http://www.cis.ohio-state.edu/~barr/ldpath.html"
->http://www.cis.ohio-state.edu/~barr/ldpath.html</ulink
->.</para>
+<para>First of all, please make sure that you have added &kde;'s binary installation folder (&eg; <filename class="directory">/usr/local/kde/bin</filename>) to your <envar>PATH</envar> and &kde;'s library installation folder to your <envar>LD_LIBRARY_PATH</envar> (only necessary on systems that do not support rpath; on &Linux; &ELF;, it should work without). This environment variable may be called differently on some systems, &eg; it is called <envar>SHLIB_PATH</envar> on &IRIX;. Then set the environment variable <envar>TDEDIR</envar> to the base of your &kde; tree, &eg; <filename class="directory">/usr/local/kde</filename>. <caution> <para>Please bear in mind that it is unwise to set <envar>LD_LIBRARY_PATH</envar> blindly. In the vast majority of cases it is unnecessary and can do more harm than good. There is a web page written by <ulink url="mailto:barr@cis.ohio-state.edu">Dave Barr</ulink> explaining the evils of <envar>LD_LIBRARY_PATH</envar> and it can be found at <ulink url="http://www.cis.ohio-state.edu/~barr/ldpath.html">http://www.cis.ohio-state.edu/~barr/ldpath.html</ulink>.</para>
 </caution>
 </para>
-<para
->Even though you can use most of the &kde; applications simply by calling them, you can only benefit fully from &kde;'s advanced features if you use the &kde; window manager and its helper programs.</para>
-<para
->In order to make it easy for you, we have provided a simple script called <filename
->starttde</filename
-> which gets installed in <filename class="directory"
->$<envar
->TDEDIR</envar
->/bin</filename
-> and is therefore in your path.</para>
-<para
->Edit the file <filename
->.xinitrc</filename
-> in your home folder (make a backup copy first!), remove everything that looks like calling a window manager, and insert <command
->starttde</command
-> instead. Restart the &X-Server;. If you use &tdm;/<application
->xdm</application
->, you will have to edit the file <filename
->.xsession</filename
-> instead of <filename
->.xinitrc</filename
->. And if there is no <filename
->.xinitrc</filename
-> or <filename
->.xsession</filename
-> in your home folder, simply create a new one with just one line containing <command
->starttde</command
->. <note
-> <para
->Some systems (notably &RedHat; &Linux;) use <filename
->.Xclients</filename
-> instead.</para>
-</note
-></para>
-<para
->This should present you with a new shining &kde; desktop. You can now start to explore the wonderful world of &kde;. In case you want to read some documentation first, there is a highly recommended <ulink url="http://www.kde.org/documentation/quickstart/index.html"
->Quick Start guide</ulink
-> available. Furthermore, every application has an online help that is available via the <guimenu
->help</guimenu
-> menu.</para>
+<para>Even though you can use most of the &kde; applications simply by calling them, you can only benefit fully from &kde;'s advanced features if you use the &kde; window manager and its helper programs.</para>
+<para>In order to make it easy for you, we have provided a simple script called <filename>starttde</filename> which gets installed in <filename class="directory">$<envar>TDEDIR</envar>/bin</filename> and is therefore in your path.</para>
+<para>Edit the file <filename>.xinitrc</filename> in your home folder (make a backup copy first!), remove everything that looks like calling a window manager, and insert <command>starttde</command> instead. Restart the &X-Server;. If you use &tdm;/<application>xdm</application>, you will have to edit the file <filename>.xsession</filename> instead of <filename>.xinitrc</filename>. And if there is no <filename>.xinitrc</filename> or <filename>.xsession</filename> in your home folder, simply create a new one with just one line containing <command>starttde</command>. <note> <para>Some systems (notably &RedHat; &Linux;) use <filename>.Xclients</filename> instead.</para>
+</note></para>
+<para>This should present you with a new shining &kde; desktop. You can now start to explore the wonderful world of &kde;. In case you want to read some documentation first, there is a highly recommended <ulink url="http://www.kde.org/documentation/quickstart/index.html">Quick Start guide</ulink> available. Furthermore, every application has an online help that is available via the <guimenu>help</guimenu> menu.</para>
 </answer>
 </qandaentry>
 
 
 <qandaentry>
 <question>
-<para
->Should I remove old version xyz before installing a new one?</para>
+<para>Should I remove old version xyz before installing a new one?</para>
 </question>
 <answer>
-<para
->In principle, this is not necessary. <acronym
->RPM</acronym
-> and Debian packages should take care of all dependencies.</para>
-<para
->If you compile the source code yourself, you should take more care. Instructions for running two different versions of &kde; on the same system are given at <ulink url="http://developer.kde.org/build/kde2-and-kde3.html"
->http://developer.kde.org/build/kde2-and-kde3.html</ulink
->. However, please note that running two different versions of &kde; from source can lead to problems if you are not careful. </para>
+<para>In principle, this is not necessary. <acronym>RPM</acronym> and Debian packages should take care of all dependencies.</para>
+<para>If you compile the source code yourself, you should take more care. Instructions for running two different versions of &kde; on the same system are given at <ulink url="http://developer.kde.org/build/kde2-and-kde3.html">http://developer.kde.org/build/kde2-and-kde3.html</ulink>. However, please note that running two different versions of &kde; from source can lead to problems if you are not careful. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question id="starttde">
-<para
->How do I start &kde;?</para>
+<para>How do I start &kde;?</para>
 </question>
 <answer>
-<para
->The most comfortable method to start &kde; is to use the <filename
->starttde</filename
-> script. Simply put the line <command
->starttde</command
-> at the end of your <filename
->.xsession</filename
-> file (or your <filename
->.xinitrc</filename
-> or <filename
->.Xclients</filename
-> file if you are not using &tdm; or <application
->xdm</application
->). Please also remove the lines that start your previous window manager. If there is no <filename
->.xsession</filename
->, <filename
->.xinitrc</filename
->, or <filename
->.Xclients</filename
-> in your home folder, simply create a new one that contains just one line: <command
->starttde</command
->.</para>
+<para>The most comfortable method to start &kde; is to use the <filename>starttde</filename> script. Simply put the line <command>starttde</command> at the end of your <filename>.xsession</filename> file (or your <filename>.xinitrc</filename> or <filename>.Xclients</filename> file if you are not using &tdm; or <application>xdm</application>). Please also remove the lines that start your previous window manager. If there is no <filename>.xsession</filename>, <filename>.xinitrc</filename>, or <filename>.Xclients</filename> in your home folder, simply create a new one that contains just one line: <command>starttde</command>.</para>
 </answer>
 </qandaentry>
 <!-- Still needed?
 <qandaentry>
 <question>
-<para
->Whenever I start &kde;, it complains about "shadow passwords".
+<para>Whenever I start &kde;, it complains about "shadow passwords".
 Why?</para>
 </question>
 <answer>
-<para
->When your system uses shadow passwords, the screensaver can only
+<para>When your system uses shadow passwords, the screensaver can only
 run properly if the suid bit is set.  This bit gives the screensavers
 root privileges, which are needed to access the shadow passwords.
-<caution
-><para
->The screensavers might be configured to secure the
-machine until the password is entered.</para
-></caution
-></para>
+<caution><para>The screensavers might be configured to secure the
+machine until the password is entered.</para></caution></para>
 <procedure>
-<title
->Setting the suid bit on the screensavers</title>
-<step performance="required"
-><para
->become root</para
-></step>
-<step performance="required"
-><para
-><command
->chown root
-$<envar
->TDEDIR</envar
->/bin/*.kss</command
-></para
-></step>
-<step performance="required"
-><para
-><command
->chmod u+s
-$<envar
->TDEDIR</envar
->/bin/*.kss</command
-></para
-></step>
+<title>Setting the suid bit on the screensavers</title>
+<step performance="required"><para>become root</para></step>
+<step performance="required"><para><command>chown root
+$<envar>TDEDIR</envar>/bin/*.kss</command></para></step>
+<step performance="required"><para><command>chmod u+s
+$<envar>TDEDIR</envar>/bin/*.kss</command></para></step>
 </procedure>
-<para
->Alternatively, if you compile &kde; from source, you can use
-<command
->./configure <option
->with-shadow</option
-></command
-> to
+<para>Alternatively, if you compile &kde; from source, you can use
+<command>./configure <option>with-shadow</option></command> to
 configure tdebase.  Then the suid bit is set automatically during
-<command
->make install</command
->.</para>
+<command>make install</command>.</para>
 </answer>
 </qandaentry>
 -->
 <qandaentry>
 <question>
-<para
->Is it possible to install &kde; in a user folder?</para>
+<para>Is it possible to install &kde; in a user folder?</para>
 </question>
 <answer>
-<para
->Yes, you can install &kde; in any folder you want. What you have to do depends on the kind of packages you want to install:</para>
-<procedure
-><title
->Source packages</title>
-<step performance="required"
-><para
->Configure and install the package using <command
->configure <option
->--prefix=<replaceable
->/users/myhome/kde</replaceable
-></option
->; make; make install</command
-> to install into <filename class="directory"
->/users/myhome/kde</filename
->.</para
-></step>
-<step performance="required"
-><para
->Add the following to your init files. Please note that if it is not necessary for you to set <envar
->LD_LIBRARY_PATH</envar
->, it is better to leave it out.</para>
+<para>Yes, you can install &kde; in any folder you want. What you have to do depends on the kind of packages you want to install:</para>
+<procedure><title>Source packages</title>
+<step performance="required"><para>Configure and install the package using <command>configure <option>--prefix=<replaceable>/users/myhome/kde</replaceable></option>; make; make install</command> to install into <filename class="directory">/users/myhome/kde</filename>.</para></step>
+<step performance="required"><para>Add the following to your init files. Please note that if it is not necessary for you to set <envar>LD_LIBRARY_PATH</envar>, it is better to leave it out.</para>
 
-<para
->For csh or tcsh:</para>
-<programlisting
->setenv TDEDIR /users/myhome/kde
+<para>For csh or tcsh:</para>
+<programlisting>setenv TDEDIR /users/myhome/kde
 
 if ( $?LD_LIBRARY_PATH ) then
    setenv LD_LIBRARY_PATH $TDEDIR/lib:$LD_LIBRARY_PATH
@@ -645,116 +310,54 @@ if ( ! $?LIBRARY_PATH ) then
    setenv LIBRARY_PATH $LD_LIBRARY_PATH
 endif  
 </programlisting>
-<para
->For <application
->bash</application
->:</para>
-<programlisting
->TDEDIR=/users/myhome/kde
+<para>For <application>bash</application>:</para>
+<programlisting>TDEDIR=/users/myhome/kde
 PATH=$TDEDIR/bin:$PATH
 LD_LIBRARY_PATH=$TDEDIR/lib:$LD_LIBRARY_PATH
 LIBRARY_PATH=$LD_LIBRARY_PATH
 export TDEDIR PATH LD_LIBRARY_PATH LIBRARY_PATH
-</programlisting
-></step>
+</programlisting></step>
 </procedure>
-<procedure
-><title
-><acronym
->RPM</acronym
-> packages</title>
-<step performance="required"
-><para
-><command
->rpm</command
-> allows you to use the <option
->--prefix</option
-> option to select the folder you want to install to. For example, executing <command
->rpm <option
->-i --prefix=<replaceable
->/users/myhome/kde package.rpm</replaceable
-></option
-></command
-> will install the package to <filename class="directory"
->/users/myhome/kde</filename
->.</para
-></step>
+<procedure><title><acronym>RPM</acronym> packages</title>
+<step performance="required"><para><command>rpm</command> allows you to use the <option>--prefix</option> option to select the folder you want to install to. For example, executing <command>rpm <option>-i --prefix=<replaceable>/users/myhome/kde package.rpm</replaceable></option></command> will install the package to <filename class="directory">/users/myhome/kde</filename>.</para></step>
 </procedure>
-<para
-><note>
-<para
->Although &kde; will run from a user folder, there are some problems with programs that require suid root, &eg; the programs in the tdeadmin package. But since they are not meant to be run by users in the first place, this is nothing to worry about.</para>
-<para
->However, on systems using shadow passwords, the screensavers have to be suid root to enable password access for unlocking the screen, so this option will not work.</para>
-</note
-></para>
+<para><note>
+<para>Although &kde; will run from a user folder, there are some problems with programs that require suid root, &eg; the programs in the tdeadmin package. But since they are not meant to be run by users in the first place, this is nothing to worry about.</para>
+<para>However, on systems using shadow passwords, the screensavers have to be suid root to enable password access for unlocking the screen, so this option will not work.</para>
+</note></para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
-><command
->starttde</command
-> fails with <errorname
->can not connect to X server</errorname
->. What is wrong?</para>
+<para><command>starttde</command> fails with <errorname>can not connect to X server</errorname>. What is wrong?</para>
 </question>
 <answer>
-<para
->You probably tried to start the X server with <command
->starttde</command
->. The X server is started with <command
->startx</command
->. <command
->starttde</command
-> is the script that should be run from your <filename
->.xinitrc</filename
->, <filename
->.xsession</filename
->, or <filename
->.Xclients</filename
-> to activate the window manager and the necessary server daemons for &kde;. See also <xref linkend="starttde"/>.</para>
+<para>You probably tried to start the X server with <command>starttde</command>. The X server is started with <command>startx</command>. <command>starttde</command> is the script that should be run from your <filename>.xinitrc</filename>, <filename>.xsession</filename>, or <filename>.Xclients</filename> to activate the window manager and the necessary server daemons for &kde;. See also <xref linkend="starttde"/>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->&kde; on &AIX;?</para>
+<para>&kde; on &AIX;?</para>
 </question>
 <answer>
-<para
-><acronym
->IBM</acronym
-> now officially support &kde; on &AIX;. You can find details at <ulink url="http://www.ibm.com/servers/aix/products/aixos/linux/index.html"
->http://www.ibm.com/servers/aix/products/aixos/linux/index.html</ulink
->. There is also some older information at <ulink url="http://space.twc.de/~stefan/kde/aix.html"
->http://space.twc.de/~stefan/kde/aix.html</ulink
->.</para>
+<para><acronym>IBM</acronym> now officially support &kde; on &AIX;. You can find details at <ulink url="http://www.ibm.com/servers/aix/products/aixos/linux/index.html">http://www.ibm.com/servers/aix/products/aixos/linux/index.html</ulink>. There is also some older information at <ulink url="http://space.twc.de/~stefan/kde/aix.html">http://space.twc.de/~stefan/kde/aix.html</ulink>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->&kde; on a laptop?</para>
+<para>&kde; on a laptop?</para>
 </question>
 <answer>
-<para
->If you can get &X-Window; to run on your laptop, you should not have any problem getting &kde; to run on it. In addition, you might find the following links helpful:</para>
+<para>If you can get &X-Window; to run on your laptop, you should not have any problem getting &kde; to run on it. In addition, you might find the following links helpful:</para>
 <itemizedlist>
 <listitem>
-<para
-><ulink url="http://www.linux-laptop.net/"
->http://www.linux-laptop.net/</ulink
-></para>
+<para><ulink url="http://www.linux-laptop.net/">http://www.linux-laptop.net/</ulink></para>
 </listitem>
 <listitem>
-<para
-><ulink url="http://www.sanpei.org/Laptop-X/note-list.html"
->http://www.sanpei.org/Laptop-X/note-list.html</ulink
-></para>
+<para><ulink url="http://www.sanpei.org/Laptop-X/note-list.html">http://www.sanpei.org/Laptop-X/note-list.html</ulink></para>
 </listitem>
 </itemizedlist>
 </answer>
@@ -762,273 +365,114 @@ export TDEDIR PATH LD_LIBRARY_PATH LIBRARY_PATH
 
 <qandaentry>
 <question>
-<para
->I have a neomagic chipset in my laptop. Is there anything special I should do to run &kde;?</para>
+<para>I have a neomagic chipset in my laptop. Is there anything special I should do to run &kde;?</para>
 </question>
 <answer>
-<para
->On some laptops using the 2160 chipset (MagicGraph 128XD) the following options in <filename
->XF86Config</filename
-> are needed to avoid a lock-up of the graphic engine:</para>
-<screen
->Option "XaaNoScanlineImageWriteRect"
+<para>On some laptops using the 2160 chipset (MagicGraph 128XD) the following options in <filename>XF86Config</filename> are needed to avoid a lock-up of the graphic engine:</para>
+<screen>Option "XaaNoScanlineImageWriteRect"
            Option "XaaNoScanlineCPUToScreenColorExpandFill"</screen>
 
-<para
->If you have experienced desktop hangs while using &kde; please try this option.</para
-> 
-</answer
-> 
+<para>If you have experienced desktop hangs while using &kde; please try this option.</para> 
+</answer> 
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->I do not like the default &kde; folder after installation. How do I move it without breaking anything?</para>
+<para>I do not like the default &kde; folder after installation. How do I move it without breaking anything?</para>
 </question>
 <answer>
-<para
->Assuming the default is <filename class="directory"
->/opt/kde</filename
-> and you want to move it to <filename class="directory"
->/usr/local/kde</filename
->, here's what you have to do:</para>
+<para>Assuming the default is <filename class="directory">/opt/kde</filename> and you want to move it to <filename class="directory">/usr/local/kde</filename>, here's what you have to do:</para>
 <procedure>
-<step performance="required"
-><para
->change to superuser if you aren't already</para
-></step>
-<step performance="required"
-><para
-><command
->mv /opt/kde /usr/local/kde</command
-></para
-></step>
-<step performance="required"
-><para
-><command
->ln -s /usr/local/kde /opt/kde</command
-></para
-></step>
+<step performance="required"><para>change to superuser if you aren't already</para></step>
+<step performance="required"><para><command>mv /opt/kde /usr/local/kde</command></para></step>
+<step performance="required"><para><command>ln -s /usr/local/kde /opt/kde</command></para></step>
 </procedure>
-<para
->This will put all your &kde; files in <filename class="directory"
->/usr/local/kde</filename
-> but everything is still accessible from <filename class="directory"
->/opt/kde</filename
->.</para>
+<para>This will put all your &kde; files in <filename class="directory">/usr/local/kde</filename> but everything is still accessible from <filename class="directory">/opt/kde</filename>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->What files can I delete from my &kde; install folder? Can all the <filename
->*.h</filename
->, <filename
->*.c</filename
-> and <filename
->*.o</filename
-> files be safely removed?</para>
+<para>What files can I delete from my &kde; install folder? Can all the <filename>*.h</filename>, <filename>*.c</filename> and <filename>*.o</filename> files be safely removed?</para>
 </question>
 <answer>
-<para
->There should not be any need to keep the <filename
->.c</filename
-> and <filename
->.o</filename
-> files, but you might want to keep the <filename
->.h</filename
-> files, as they are used by includes if you ever want to compile your own &kde; programs. But if you wish to add patches to the source programs as they become available (rather than downloading everything again), then they should stay.</para
-> 
+<para>There should not be any need to keep the <filename>.c</filename> and <filename>.o</filename> files, but you might want to keep the <filename>.h</filename> files, as they are used by includes if you ever want to compile your own &kde; programs. But if you wish to add patches to the source programs as they become available (rather than downloading everything again), then they should stay.</para> 
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Will I lose my current settings when I upgrade &kde;?</para>
+<para>Will I lose my current settings when I upgrade &kde;?</para>
 </question>
 <answer>
 
-<para
->No. In most cases &kde; will be able to transport your settings intact. You may need to reenter passwords in some applications (such as &kmail; or &knode;) but most other settings will be safe.</para>
+<para>No. In most cases &kde; will be able to transport your settings intact. You may need to reenter passwords in some applications (such as &kmail; or &knode;) but most other settings will be safe.</para>
 
-<para
->There were mixed reports of results between some previous versions of &kde;. To be safe, you may like to back up your entire &kde; configuration. </para>
+<para>There were mixed reports of results between some previous versions of &kde;. To be safe, you may like to back up your entire &kde; configuration. </para>
 
-<para
->Settings are kept in the <filename class="directory"
->$<envar
->HOME</envar
->/.trinity</filename
-> or <filename class="directory"
->$<envar
->HOME</envar
->/.kde2</filename
-> subfolder in your home folder. Copy your old <filename class="directory"
->.kde</filename
->/<filename class="directory"
->.kde2</filename
-> folder to a backup location, install &kde; 3.2, and then copy back any necessary mail and news settings. That said, most people can make a direct upgrade, without removing the old <filename class="directory"
->.kde</filename
-> folder, without a hitch.</para>
-<para
->You can override the use of <filename class="directory"
->$<envar
->HOME</envar
->/.trinity</filename
-> by setting the $<envar
->TDEHOME</envar
-> variable.</para
-> 
+<para>Settings are kept in the <filename class="directory">$<envar>HOME</envar>/.trinity</filename> or <filename class="directory">$<envar>HOME</envar>/.kde2</filename> subfolder in your home folder. Copy your old <filename class="directory">.kde</filename>/<filename class="directory">.kde2</filename> folder to a backup location, install &kde; 3.2, and then copy back any necessary mail and news settings. That said, most people can make a direct upgrade, without removing the old <filename class="directory">.kde</filename> folder, without a hitch.</para>
+<para>You can override the use of <filename class="directory">$<envar>HOME</envar>/.trinity</filename> by setting the $<envar>TDEHOME</envar> variable.</para> 
 </answer>
 </qandaentry>
 
 <qandaentry id="greyscreen">
 <question>
-<para
->I upgraded &kde; and it seemed to go fine, but when I start it, I get a blank grey screen, and nothing happens. There are errors in the console about DCOPserver. What's going on?</para>
+<para>I upgraded &kde; and it seemed to go fine, but when I start it, I get a blank grey screen, and nothing happens. There are errors in the console about DCOPserver. What's going on?</para>
 </question>
 
 <answer>
-<para
->&kde; uses several temporary files during its operation. These are usually to be found in the following locations:</para>
+<para>&kde; uses several temporary files during its operation. These are usually to be found in the following locations:</para>
 <itemizedlist>
-<listitem
-><para
-><filename
->~/.DCOPserver-*</filename
-> (there are usually two of these; one is a symlink to the other)</para
-></listitem>
-<listitem
-><para
-><filename
->~/.trinity/socket-<replaceable
->hostname</replaceable
-></filename
-></para
-></listitem>
-<listitem
-><para
-><filename
->~/.trinity/tmp-<replaceable
->hostname</replaceable
-></filename
-> which is normally a symlink to the next file:</para
-></listitem>
-<listitem
-><para
-><filename
->/tmp/tmp-kde-<replaceable
->USER</replaceable
-></filename
-></para
-></listitem>
-<listitem
-><para
-><filename
->~/.trinity/socket-<replaceable
->hostname</replaceable
-></filename
-> which is also normally a symlink to:</para
-></listitem>
-<listitem
-><para
-><filename
->/tmp/tdesocket-<replaceable
->USER</replaceable
-></filename
-></para
-></listitem>
+<listitem><para><filename>~/.DCOPserver-*</filename> (there are usually two of these; one is a symlink to the other)</para></listitem>
+<listitem><para><filename>~/.trinity/socket-<replaceable>hostname</replaceable></filename></para></listitem>
+<listitem><para><filename>~/.trinity/tmp-<replaceable>hostname</replaceable></filename> which is normally a symlink to the next file:</para></listitem>
+<listitem><para><filename>/tmp/tmp-kde-<replaceable>USER</replaceable></filename></para></listitem>
+<listitem><para><filename>~/.trinity/socket-<replaceable>hostname</replaceable></filename> which is also normally a symlink to:</para></listitem>
+<listitem><para><filename>/tmp/tdesocket-<replaceable>USER</replaceable></filename></para></listitem>
 </itemizedlist>
 
-<para
->If the symlinks get broken, usually because a <command
->cron</command
-> or shutdown script is emptying out the <filename class="directory"
->/tmp</filename
-> folder, then strange things will happen. These files, and the symlinks, will all be created automatically at the start of &kde; so you can safely remove them <emphasis
->while &kde; is not running</emphasis
->.</para>
+<para>If the symlinks get broken, usually because a <command>cron</command> or shutdown script is emptying out the <filename class="directory">/tmp</filename> folder, then strange things will happen. These files, and the symlinks, will all be created automatically at the start of &kde; so you can safely remove them <emphasis>while &kde; is not running</emphasis>.</para>
 
-<para
->If you are only getting a grey screen when you start &kde;, or if you get an error message telling you to <errorname
->Check your installation</errorname
->, then shut down X and delete all the files listed above, then try to restart X.</para>
+<para>If you are only getting a grey screen when you start &kde;, or if you get an error message telling you to <errorname>Check your installation</errorname>, then shut down X and delete all the files listed above, then try to restart X.</para>
 
-<para
->Normally (&ie; when not upgrading between &kde; versions) it's quite safe to leave these files intact, and you may shave a few seconds off your &kde; startup time by doing so.</para>
+<para>Normally (&ie; when not upgrading between &kde; versions) it's quite safe to leave these files intact, and you may shave a few seconds off your &kde; startup time by doing so.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Compiling tdebase gives me a <errorname
->bin/sh: msgfmt: command not found</errorname
-> error!</para>
+<para>Compiling tdebase gives me a <errorname>bin/sh: msgfmt: command not found</errorname> error!</para>
 </question>
 <answer>
-<para
->You need the &GNU; <application
->msgfmt</application
-> which is part of the &GNU; i18n package <application
->gettext</application
->. You should be able to download it from any &GNU; mirror.</para>
+<para>You need the &GNU; <application>msgfmt</application> which is part of the &GNU; i18n package <application>gettext</application>. You should be able to download it from any &GNU; mirror.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How do I uninstall &kde; applications compiled from source?</para>
+<para>How do I uninstall &kde; applications compiled from source?</para>
 </question>
 <answer>
-<para
->You can uninstall your programs by typing <command
->make uninstall</command
-> in the folder where you did <command
->make install</command
->. If you have already deleted that folder, then there is only one way, and it is not good: go to <filename class="directory"
->$<envar
->TDEDIR</envar
->/bin</filename
-> and start deleting files one by one.</para>
-<para
->If you expect to find yourself in this situation, you might want to consider a program such as &GNU; <application
->stow</application
->, found at <ulink url="http://www.gnu.org/software/stow/stow.html"
->http://www.gnu.org/software/stow/stow.html</ulink
->.</para>
+<para>You can uninstall your programs by typing <command>make uninstall</command> in the folder where you did <command>make install</command>. If you have already deleted that folder, then there is only one way, and it is not good: go to <filename class="directory">$<envar>TDEDIR</envar>/bin</filename> and start deleting files one by one.</para>
+<para>If you expect to find yourself in this situation, you might want to consider a program such as &GNU; <application>stow</application>, found at <ulink url="http://www.gnu.org/software/stow/stow.html">http://www.gnu.org/software/stow/stow.html</ulink>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question id="gif">
-<para
->What is up with &GIF; support?</para>
+<para>What is up with &GIF; support?</para>
 </question>
 <answer>
-<para
->This has to do with issues with Unisys' &LZW; patent. &GIF; support is turned off from &Qt; 1.44 onwards by default. When you want to use &GIF;s and have the relevant license, recompile &Qt; with &GIF; support. <command
->./configure <option
->-gif</option
-></command
->.</para>
+<para>This has to do with issues with Unisys' &LZW; patent. &GIF; support is turned off from &Qt; 1.44 onwards by default. When you want to use &GIF;s and have the relevant license, recompile &Qt; with &GIF; support. <command>./configure <option>-gif</option></command>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How do I install &kde; themes?</para>
+<para>How do I install &kde; themes?</para>
 </question>
 <answer>
-<para
->Theme support in &kde; has been discontinued with this version. However, there are many opportunities to personalise and add eye candy to &kde; Look at, for example, <guilabel
->Appearance &amp; Themes</guilabel
-> in &kcontrol;. </para>
+<para>Theme support in &kde; has been discontinued with this version. However, there are many opportunities to personalise and add eye candy to &kde; Look at, for example, <guilabel>Appearance &amp; Themes</guilabel> in &kcontrol;. </para>
 </answer>
 </qandaentry>
 </qandaset>
diff --git a/tde-i18n-en_GB/docs/tdebase/faq/intro.docbook b/tde-i18n-en_GB/docs/tdebase/faq/intro.docbook
index 525629c101d..6b31d8982e0 100644
--- a/tde-i18n-en_GB/docs/tdebase/faq/intro.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/faq/intro.docbook
@@ -5,94 +5,57 @@
 -->
 
 <chapter id="introduction">
-<title
->Introduction</title>
+<title>Introduction</title>
 
 <qandaset>
 <qandaentry>
 <question>
-<para
->What is &kde;?</para>
+<para>What is &kde;?</para>
 </question>
 <answer>
-<para
->&kde; is the K Desktop Environment. It is a project initiated by <ulink url="mailto:ettrich@kde.org"
->Matthias Ettrich</ulink
-> in 1996. The aim of the &kde; project is to connect the power of the &UNIX; operating systems with the comfort of a modern user interface.</para>
-<para
->In short, &kde; will bring &UNIX; to the desktop!</para>
-<para
->If you want further information about &kde;, have a look at <ulink url="http://www.kde.org/whatiskde/index.html"
->What is &kde;?</ulink
-></para>
+<para>&kde; is the K Desktop Environment. It is a project initiated by <ulink url="mailto:ettrich@kde.org">Matthias Ettrich</ulink> in 1996. The aim of the &kde; project is to connect the power of the &UNIX; operating systems with the comfort of a modern user interface.</para>
+<para>In short, &kde; will bring &UNIX; to the desktop!</para>
+<para>If you want further information about &kde;, have a look at <ulink url="http://www.kde.org/whatiskde/index.html">What is &kde;?</ulink></para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question id="platform">
-<para
->On which platforms can I expect &kde; to work?</para>
+<para>On which platforms can I expect &kde; to work?</para>
 </question>
 <answer>
-<para
->&kde; is a Desktop Environment for all flavours of &UNIX;. While it is true that most &kde; developers use &Linux;, &kde; runs smoothly on a wide range of systems. You may, however, need to tweak the source code a bit to get &kde; to compile on a not-so-popular variant of &UNIX;, or if you are not using the &GNU; development tools, in particular the &gcc; compiler.</para>
-<para
->For an almost complete list of systems &kde; is running on, please refer to <ulink url="http://promo.kde.org/kde_systems.php"
->this list of systems for KDE</ulink
-> </para>
+<para>&kde; is a Desktop Environment for all flavours of &UNIX;. While it is true that most &kde; developers use &Linux;, &kde; runs smoothly on a wide range of systems. You may, however, need to tweak the source code a bit to get &kde; to compile on a not-so-popular variant of &UNIX;, or if you are not using the &GNU; development tools, in particular the &gcc; compiler.</para>
+<para>For an almost complete list of systems &kde; is running on, please refer to <ulink url="http://promo.kde.org/kde_systems.php">this list of systems for KDE</ulink> </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Is &kde; a window manager?</para>
+<para>Is &kde; a window manager?</para>
 </question>
 <answer>
-<para
->No, &kde; is not a window manager. While &kde; includes a very sophisticated window manager (&twin;), &kde; is much more than that. It is a full-blown Integrated Desktop Environment.</para>
-<para
->&kde; provides a complete desktop environment, including a web browser, a file manager, a window manager, a help system, a configuration system, uncountable tools and utilities, and an ever increasing number of applications, including but not limited to mail and news clients, drawing programs, a &PostScript; and a &DVI; viewer and so forth.</para>
+<para>No, &kde; is not a window manager. While &kde; includes a very sophisticated window manager (&twin;), &kde; is much more than that. It is a full-blown Integrated Desktop Environment.</para>
+<para>&kde; provides a complete desktop environment, including a web browser, a file manager, a window manager, a help system, a configuration system, uncountable tools and utilities, and an ever increasing number of applications, including but not limited to mail and news clients, drawing programs, a &PostScript; and a &DVI; viewer and so forth.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Is &kde; a <acronym
->CDE</acronym
->, &Windows; 95 or &Mac; <acronym
->OS</acronym
-> clone?</para>
+<para>Is &kde; a <acronym>CDE</acronym>, &Windows; 95 or &Mac; <acronym>OS</acronym> clone?</para>
 </question>
 <answer>
-<para
->No, &kde; is not a clone. Specifically &kde; is not a <acronym
->CDE</acronym
-> or &Windows; clone. While the &kde; developers have and will continue to glean the best features from all existing desktop environments, &kde; is a truly unique environment that has and will continue to go its own way.</para>
+<para>No, &kde; is not a clone. Specifically &kde; is not a <acronym>CDE</acronym> or &Windows; clone. While the &kde; developers have and will continue to glean the best features from all existing desktop environments, &kde; is a truly unique environment that has and will continue to go its own way.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Is &kde; free software?</para>
+<para>Is &kde; free software?</para>
 </question>
 <answer>
-<para
->Yes, &kde; is free software according to the &GNU; General Public Licence. All &kde; libraries are available under the <acronym
->LGPL</acronym
-> making commercial software development for the &kde; desktop possible, but all &kde; applications are licensed under the <acronym
->GPL</acronym
->.</para>
-<para
->&kde; uses the <link linkend="qt"
->&Qt; C++ crossplatform toolkit</link
->, which is also released (since version 2.2) under the <acronym
->GPL</acronym
->.</para>
-<para
->It is absolutely legal to make &kde; and &Qt; available on &CD-ROM; free of charge. No runtime fees of any kind are incurred.</para>
+<para>Yes, &kde; is free software according to the &GNU; General Public Licence. All &kde; libraries are available under the <acronym>LGPL</acronym> making commercial software development for the &kde; desktop possible, but all &kde; applications are licensed under the <acronym>GPL</acronym>.</para>
+<para>&kde; uses the <link linkend="qt">&Qt; C++ crossplatform toolkit</link>, which is also released (since version 2.2) under the <acronym>GPL</acronym>.</para>
+<para>It is absolutely legal to make &kde; and &Qt; available on &CD-ROM; free of charge. No runtime fees of any kind are incurred.</para>
 </answer>
 </qandaentry>
 </qandaset>
diff --git a/tde-i18n-en_GB/docs/tdebase/faq/misc.docbook b/tde-i18n-en_GB/docs/tdebase/faq/misc.docbook
index 103ad37b78a..d0047f27cad 100644
--- a/tde-i18n-en_GB/docs/tdebase/faq/misc.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/faq/misc.docbook
@@ -5,321 +5,192 @@
 -->
 
 <chapter id="misc">
-<title
->Miscellaneous questions</title>
+<title>Miscellaneous questions</title>
 
 <qandaset>
 <qandaentry>
 <question>
-<para
->Why does &kde; use &Qt;?</para>
+<para>Why does &kde; use &Qt;?</para>
 </question>
 <answer>
-<para
->&Qt; is a very sophisticated toolkit that provides everything that is needed to build a modern user interface. &Qt; is written in C++, thus allowing object-oriented development which ensures efficiency and code reuse in a project the size and scope of &kde;. In our opinion there is no better toolkit available for &UNIX; systems and that it would have been a grave mistake to try to build &kde; on anything but the best.</para>
+<para>&Qt; is a very sophisticated toolkit that provides everything that is needed to build a modern user interface. &Qt; is written in C++, thus allowing object-oriented development which ensures efficiency and code reuse in a project the size and scope of &kde;. In our opinion there is no better toolkit available for &UNIX; systems and that it would have been a grave mistake to try to build &kde; on anything but the best.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Why does &kde; not use gtk, xforms, xlib, whatever?</para>
+<para>Why does &kde; not use gtk, xforms, xlib, whatever?</para>
 </question>
 <answer>
-<para
->There are a number of toolkits available. To provide a consistent user interface and to keep used resources such as memory to a minimum, &kde; can use only one of them. &Qt; was selected for the reasons mentioned above.</para>
+<para>There are a number of toolkits available. To provide a consistent user interface and to keep used resources such as memory to a minimum, &kde; can use only one of them. &Qt; was selected for the reasons mentioned above.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->But &Qt; isn't free, is it?</para>
+<para>But &Qt; isn't free, is it?</para>
 </question>
 <answer>
-<para
->It is! As of September 4, 2000, version 2.2 of the &Qt; libraries were licensed under the <acronym
->GPL</acronym
->, thereby fulfiling all aspects of <quote
->free software</quote
->.</para>
+<para>It is! As of September 4, 2000, version 2.2 of the &Qt; libraries were licensed under the <acronym>GPL</acronym>, thereby fulfiling all aspects of <quote>free software</quote>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Does &kde; have terminal emulators with transparent background?</para>
+<para>Does &kde; have terminal emulators with transparent background?</para>
 </question>
 <answer>
-<para
->Yes and no. &konsole; has the ability to simulate transparency by redrawing the background of the window inside the &konsole; window. This gives the illusion of transparency, but if you place &konsole; on top of another window, the transparency is lost. <ulink url="http://www.eterm.org"
->Eterm</ulink
-> should work fine under &kde; if you desire more complete transparency.</para>
+<para>Yes and no. &konsole; has the ability to simulate transparency by redrawing the background of the window inside the &konsole; window. This gives the illusion of transparency, but if you place &konsole; on top of another window, the transparency is lost. <ulink url="http://www.eterm.org">Eterm</ulink> should work fine under &kde; if you desire more complete transparency.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How do I create icons for non-&kde; applications that I can put in the <guimenu
->K</guimenu
-> menu? Where do these icons go?</para>
+<para>How do I create icons for non-&kde; applications that I can put in the <guimenu>K</guimenu> menu? Where do these icons go?</para>
 </question>
 <answer>
-<para
->Create them using your favourite image manipulator, for example, <application
->GIMP</application
->, or the <application
->&kde; Icon Editor</application
-> and put them in <filename class="directory"
->$<envar
->TDEDIR</envar
->/share/icons(/mini)</filename
-> or <filename class="directory"
->$<envar
->HOME</envar
->/.trinity/share/icons(/mini)</filename
->. </para>
+<para>Create them using your favourite image manipulator, for example, <application>GIMP</application>, or the <application>&kde; Icon Editor</application> and put them in <filename class="directory">$<envar>TDEDIR</envar>/share/icons(/mini)</filename> or <filename class="directory">$<envar>HOME</envar>/.trinity/share/icons(/mini)</filename>. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->What about &kde; programs that do not have icons? How do I get them into the menu?</para>
+<para>What about &kde; programs that do not have icons? How do I get them into the menu?</para>
 </question>
 <answer>
-<para
->Use &kmenuedit;. To access it use the &RMB; on the <guibutton
->K</guibutton
-> button and select <guimenu
->Menu Editor</guimenu
->.</para>
+<para>Use &kmenuedit;. To access it use the &RMB; on the <guibutton>K</guibutton> button and select <guimenu>Menu Editor</guimenu>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Does &kde; have a graphical &FTP; client?</para>
+<para>Does &kde; have a graphical &FTP; client?</para>
 </question>
 <answer>
-<para
->Yes, and it is none other than your favourite file manager, &konqueror;. You can drag and drop remote files into local folders.</para>
+<para>Yes, and it is none other than your favourite file manager, &konqueror;. You can drag and drop remote files into local folders.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How do I exit &kde;?</para>
+<para>How do I exit &kde;?</para>
 </question>
 <answer>
-<para
->Simply click on the <guibutton
->K</guibutton
-> button and select <guimenu
->Logout</guimenu
->. In addition, if you <mousebutton
->right</mousebutton
-> click on an empty area of the desktop, you will be presented with a menu containing logout as one of the options. <note
-><para
->Depending on your configuration of the &X-Window;, <keycombo action="simul"
->&Ctrl;&Alt;&Backspace;</keycombo
-> might also do the trick by killing the X server, but its use prevents session management and cannot be recommended.</para
-></note
-></para>
+<para>Simply click on the <guibutton>K</guibutton> button and select <guimenu>Logout</guimenu>. In addition, if you <mousebutton>right</mousebutton> click on an empty area of the desktop, you will be presented with a menu containing logout as one of the options. <note><para>Depending on your configuration of the &X-Window;, <keycombo action="simul">&Ctrl;&Alt;&Backspace;</keycombo> might also do the trick by killing the X server, but its use prevents session management and cannot be recommended.</para></note></para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Is there a program that checks for new mails at my <acronym
->ISP</acronym
-> if and only if I am online?</para>
+<para>Is there a program that checks for new mails at my <acronym>ISP</acronym> if and only if I am online?</para>
 </question>
 <answer>
-<para
->&korn; will do the job. If you are not connected, it will just sit there (idling).</para>
+<para>&korn; will do the job. If you are not connected, it will just sit there (idling).</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Is it really necessary to upgrade to the latest version?</para>
+<para>Is it really necessary to upgrade to the latest version?</para>
 </question>
 <answer>
-<para
->We recommend to always use the latest stable release. If you don't, it will probably be difficult to get answers to your questions. If you have a problem with an old version, the answer will probably be <quote
->Please upgrade and try again</quote
->. Note that new versions also sometimes fix security problems.</para>
+<para>We recommend to always use the latest stable release. If you don't, it will probably be difficult to get answers to your questions. If you have a problem with an old version, the answer will probably be <quote>Please upgrade and try again</quote>. Note that new versions also sometimes fix security problems.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How do I copy and paste in &kde;?</para>
+<para>How do I copy and paste in &kde;?</para>
 </question>
 <answer>
-<para
->The simplest method is to use your mouse:</para>
+<para>The simplest method is to use your mouse:</para>
 <procedure>
-<step performance="required"
-><para
->Highlight the text you want to copy by holding down the &LMB; and dragging across the text.</para
-></step>
-<step performance="required"
-><para
->Go to the destination area; depending on your configuration, you might need to click it using the &LMB; to give it focus.</para
-></step>
-<step performance="required"
-><para
->Click the &MMB; to paste. If you have a two button mouse and are emulating a three button mouse, push both buttons simultaneously.</para
-></step>
+<step performance="required"><para>Highlight the text you want to copy by holding down the &LMB; and dragging across the text.</para></step>
+<step performance="required"><para>Go to the destination area; depending on your configuration, you might need to click it using the &LMB; to give it focus.</para></step>
+<step performance="required"><para>Click the &MMB; to paste. If you have a two button mouse and are emulating a three button mouse, push both buttons simultaneously.</para></step>
 </procedure>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How do I convert the default &RedHat; menus into a menu in the <guimenu
->K</guimenu
-> menu?</para>
+<para>How do I convert the default &RedHat; menus into a menu in the <guimenu>K</guimenu> menu?</para>
 </question>
 <answer>
-<para
->Click on the <guibutton
->K</guibutton
-> button and select <menuchoice
-><guimenu
->System</guimenu
-><guimenuitem
->Appfinder</guimenuitem
-></menuchoice
->.</para>
+<para>Click on the <guibutton>K</guibutton> button and select <menuchoice><guimenu>System</guimenu><guimenuitem>Appfinder</guimenuitem></menuchoice>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question id="CVS">
-<para
->What is <acronym
->CVS</acronym
->?</para>
+<para>What is <acronym>CVS</acronym>?</para>
 </question>
 <answer>
-<para
->It stands for Concurrent Versions System. It is a version control system and is based on <acronym
->RCS</acronym
-> (Revision Control System), but offers more functionality. It is used to maintain source code under development. It will keep multiple versions of things (handy if you broke something and have to back up and get a clean old version), and allows people remote access over the Net to pick up the latest source code and even to check in new files if they have permission. It is also open source (you pay for support if you want it), and since it is free it is the system of choice for people writing more free products, such as &kde;.</para>
+<para>It stands for Concurrent Versions System. It is a version control system and is based on <acronym>RCS</acronym> (Revision Control System), but offers more functionality. It is used to maintain source code under development. It will keep multiple versions of things (handy if you broke something and have to back up and get a clean old version), and allows people remote access over the Net to pick up the latest source code and even to check in new files if they have permission. It is also open source (you pay for support if you want it), and since it is free it is the system of choice for people writing more free products, such as &kde;.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Does &kde; support dual screen (Xinerama)?</para>
+<para>Does &kde; support dual screen (Xinerama)?</para>
 </question>
 <answer>
-<para
->Yes, you need to have a multi-headed X server (&eg; MetroX or XFree86 4.0 and above) and a &kde; 
->= 2.2.1 </para>
+<para>Yes, you need to have a multi-headed X server (&eg; MetroX or XFree86 4.0 and above) and a &kde; >= 2.2.1 </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Why does Drag and Drop not work with Xinerama?</para>
+<para>Why does Drag and Drop not work with Xinerama?</para>
 </question>
 <answer>
-<para
->You should upgrade to XFree86 4.2.0 for this to work properly.</para>
+<para>You should upgrade to XFree86 4.2.0 for this to work properly.</para>
 </answer>
 </qandaentry>
 
 
 <qandaentry>
 <question>
-<para
->How do I check which version of &kde; I am using?</para>
+<para>How do I check which version of &kde; I am using?</para>
 </question>
 <answer>
-<para
->Fire up your <application
->&kde; Control Centre</application
->. It comes up with an Info Screen including the version of &kde; The &kde; version is also included in the application's <guimenuitem
->About</guimenuitem
-> dialogue. </para>
+<para>Fire up your <application>&kde; Control Centre</application>. It comes up with an Info Screen including the version of &kde; The &kde; version is also included in the application's <guimenuitem>About</guimenuitem> dialogue. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Can I write commercial software for &kde;?</para>
+<para>Can I write commercial software for &kde;?</para>
 </question>
 <answer>
-<para
->You can use the &kde; libraries to write <quote
->commercial and closed source</quote
-> as well as <quote
->commercial and open source</quote
-> software. If you write open source software you can use the &Qt; free edition. But if you write closed source software you may not use the &Qt; free edition; you need to obtain the &Qt; professional edition from Troll Tech. </para
-> <para
->If you want more information, please contact <ulink url="http://www.trolltech.com"
->Troll Tech</ulink
-> directly.</para>
+<para>You can use the &kde; libraries to write <quote>commercial and closed source</quote> as well as <quote>commercial and open source</quote> software. If you write open source software you can use the &Qt; free edition. But if you write closed source software you may not use the &Qt; free edition; you need to obtain the &Qt; professional edition from Troll Tech. </para> <para>If you want more information, please contact <ulink url="http://www.trolltech.com">Troll Tech</ulink> directly.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How do I go about creating themes and icons?</para>
+<para>How do I go about creating themes and icons?</para>
 </question>
 <answer>
-<para
->Go see <ulink url="http://artist.kde.org"
->http://artist.kde.org</ulink
->.</para>
+<para>Go see <ulink url="http://artist.kde.org">http://artist.kde.org</ulink>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Is <application
->KLyX</application
-> dead?</para>
+<para>Is <application>KLyX</application> dead?</para>
 </question>
 <answer>
-<para
->Yes. But future versions of <application
->LyX</application
-> will be &GUI; independent. Check the progress of the various &GUI; frontends <ulink url="http://devel.lyx.org/guii.php3"
->here</ulink
->.</para>
+<para>Yes. But future versions of <application>LyX</application> will be &GUI; independent. Check the progress of the various &GUI; frontends <ulink url="http://devel.lyx.org/guii.php3">here</ulink>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How can I get to know about development updates?</para>
+<para>How can I get to know about development updates?</para>
 </question>
 <answer>
-<para
->You might want to subscribe to the various &kde; mailing lists available, especially kde-cvs, which lists all commits done to the &kde; <acronym
->CVS</acronym
-> repository. Check <ulink url="http://lists.kde.org"
->http://lists.kde.org</ulink
-> if you want to read without subscribing.</para>
+<para>You might want to subscribe to the various &kde; mailing lists available, especially kde-cvs, which lists all commits done to the &kde; <acronym>CVS</acronym> repository. Check <ulink url="http://lists.kde.org">http://lists.kde.org</ulink> if you want to read without subscribing.</para>
 </answer>
 </qandaentry>
 </qandaset>
diff --git a/tde-i18n-en_GB/docs/tdebase/faq/moreinfo.docbook b/tde-i18n-en_GB/docs/tdebase/faq/moreinfo.docbook
index ee77ff73614..a5fe88c3f7a 100644
--- a/tde-i18n-en_GB/docs/tdebase/faq/moreinfo.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/faq/moreinfo.docbook
@@ -5,243 +5,108 @@
 -->
 
 <chapter id="more-info">
-<title
->Getting more information</title>
+<title>Getting more information</title>
 
 <qandaset>
 <qandaentry>
 <question>
-<para
->Where is the &kde; homepage?</para>
+<para>Where is the &kde; homepage?</para>
 </question>
 <answer>
-<para
->The &kde; homepage is located at <ulink url="http://www.kde.org"
->http://www.kde.org</ulink
->. If you prefer a local mirror, there are several to choose from. For a current list of web site mirrors sorted by location, please visit <ulink url="http://www.kde.org/mirrors/web.php"
->http://www.kde.org/mirrors/web.php</ulink
->.</para>
+<para>The &kde; homepage is located at <ulink url="http://www.kde.org">http://www.kde.org</ulink>. If you prefer a local mirror, there are several to choose from. For a current list of web site mirrors sorted by location, please visit <ulink url="http://www.kde.org/mirrors/web.php">http://www.kde.org/mirrors/web.php</ulink>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question id="mailing-lists">
-<para
->Is there a &kde; mailing list?</para>
+<para>Is there a &kde; mailing list?</para>
 </question>
 <answer>
-<para
->There are several &kde; mailing lists. Each focuses on a different aspect of &kde;. Some are for developers, so they are not discussed in detail. Some of the more important lists that users might be interested in are:</para>
+<para>There are several &kde; mailing lists. Each focuses on a different aspect of &kde;. Some are for developers, so they are not discussed in detail. Some of the more important lists that users might be interested in are:</para>
 <variablelist>
-<varlistentry
-><term
->kde</term>
-<listitem
-><para
->This is the main &kde; mailing list for general discussions.</para
-></listitem>
+<varlistentry><term>kde</term>
+<listitem><para>This is the main &kde; mailing list for general discussions.</para></listitem>
 </varlistentry>
-<varlistentry
-><term
->kde-announce</term>
-<listitem
-><para
->This list is used to announce new versions of &kde; as well as new tools and applications.</para
-></listitem>
+<varlistentry><term>kde-announce</term>
+<listitem><para>This list is used to announce new versions of &kde; as well as new tools and applications.</para></listitem>
 </varlistentry>
-<varlistentry
-><term
->kde-look</term>
-<listitem
-><para
->This is the list that deals with questions about look and feel, and general user interface considerations.</para
-></listitem>
+<varlistentry><term>kde-look</term>
+<listitem><para>This is the list that deals with questions about look and feel, and general user interface considerations.</para></listitem>
 </varlistentry>
 </variablelist>
-<para
->For the complete list of mailing lists available, please refer to <ulink url="http://www.kde.org/mailinglists/"
->http://www.kde.org/mailinglists/</ulink
->.</para>
-<para
->Please note that it is not a good idea to ask questions which are already answered in this &FAQ;.</para>
+<para>For the complete list of mailing lists available, please refer to <ulink url="http://www.kde.org/mailinglists/">http://www.kde.org/mailinglists/</ulink>.</para>
+<para>Please note that it is not a good idea to ask questions which are already answered in this &FAQ;.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question id="subscribe">
-<para
->How do I subscribe/unsubscribe to these lists?</para>
+<para>How do I subscribe/unsubscribe to these lists?</para>
 </question>
 <answer>
-<para
->To subscribe, send an email to list-request, that is:</para>
+<para>To subscribe, send an email to list-request, that is:</para>
 <itemizedlist>
-<listitem
-><para
-><ulink
-url="mailto:kde-request@kde.org"
->kde-request@kde.org</ulink
-></para
-></listitem>
-<listitem
-><para
-><ulink url="mailto:kde-announce-request@kde.org"
->kde-announce-request@kde.org</ulink
-></para
-></listitem>
-<listitem
-><para
-><ulink
-url="mailto:kde-user-request@kde.org"
->kde-user-request@kde.org</ulink
-></para
-></listitem>
-<listitem
-><para
-><ulink url="mailto:kde-look-request@kde.org"
->kde-look-request@kde.org</ulink
-></para
-></listitem>
+<listitem><para><ulink
+url="mailto:kde-request@kde.org">kde-request@kde.org</ulink></para></listitem>
+<listitem><para><ulink url="mailto:kde-announce-request@kde.org">kde-announce-request@kde.org</ulink></para></listitem>
+<listitem><para><ulink
+url="mailto:kde-user-request@kde.org">kde-user-request@kde.org</ulink></para></listitem>
+<listitem><para><ulink url="mailto:kde-look-request@kde.org">kde-look-request@kde.org</ulink></para></listitem>
 </itemizedlist>
-<para
->The email must contain <userinput
->subscribe <replaceable
->your_email_address</replaceable
-></userinput
-> in the subject.</para>
-<para
->To unsubscribe, send an email to list-request, that is:</para>
+<para>The email must contain <userinput>subscribe <replaceable>your_email_address</replaceable></userinput> in the subject.</para>
+<para>To unsubscribe, send an email to list-request, that is:</para>
 <itemizedlist>
-<listitem
-><para
-><ulink url="mailto:kde-request@kde.org"
->kde-request@kde.org</ulink
-></para
-></listitem>
-<listitem
-><para
-><ulink url="mailto:kde-announce-request@kde.org"
->kde-announce-request@kde.org</ulink
-></para
-></listitem>
-<listitem
-><para
-><ulink url="mailto:kde-user-request@kde.org"
->kde-user-request@kde.org</ulink
-></para
-></listitem>
-<listitem
-><para
-><ulink url="mailto:kde-look-request@kde.org"
->kde-look-request@kde.org</ulink
-></para
-></listitem>
+<listitem><para><ulink url="mailto:kde-request@kde.org">kde-request@kde.org</ulink></para></listitem>
+<listitem><para><ulink url="mailto:kde-announce-request@kde.org">kde-announce-request@kde.org</ulink></para></listitem>
+<listitem><para><ulink url="mailto:kde-user-request@kde.org">kde-user-request@kde.org</ulink></para></listitem>
+<listitem><para><ulink url="mailto:kde-look-request@kde.org">kde-look-request@kde.org</ulink></para></listitem>
 </itemizedlist>
-<para
->The email must contain <userinput
->unsubscribe <replaceable
->your_email_address</replaceable
-></userinput
-> in the subject. <important
-><para
->Never send subscribe/unsubscribe request to the mailing lists directly! Use the list-request instead.</para
-></important
-></para>
-<para
->There is also a complete list of all &kde;-related mailing lists, and a web interface for subscribing and unsubscribing located at <ulink url="http://master.kde.org/mailman/listinfo"
->http://master.kde.org/mailman/listinfo</ulink
->.</para>
+<para>The email must contain <userinput>unsubscribe <replaceable>your_email_address</replaceable></userinput> in the subject. <important><para>Never send subscribe/unsubscribe request to the mailing lists directly! Use the list-request instead.</para></important></para>
+<para>There is also a complete list of all &kde;-related mailing lists, and a web interface for subscribing and unsubscribing located at <ulink url="http://master.kde.org/mailman/listinfo">http://master.kde.org/mailman/listinfo</ulink>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Is there a mailing list archive?</para>
+<para>Is there a mailing list archive?</para>
 </question>
 <answer>
 
-<para
->Yes, there is a searchable mailing list archive hosted by <ulink url="http://www.progressive-comp.com"
->Progressive Computer Concepts</ulink
->. The &URL; is <ulink url="http://lists.kde.org"
->http://lists.kde.org</ulink
->. There you will see a folder listing of the mailing lists. Note that you can only do a subject/author search at this level. You probably will not find what you want doing this kind of search.</para>
+<para>Yes, there is a searchable mailing list archive hosted by <ulink url="http://www.progressive-comp.com">Progressive Computer Concepts</ulink>. The &URL; is <ulink url="http://lists.kde.org">http://lists.kde.org</ulink>. There you will see a folder listing of the mailing lists. Note that you can only do a subject/author search at this level. You probably will not find what you want doing this kind of search.</para>
 
-<para
->To do a body search, you have to enter one of the mailing lists. Just click on the folder you want to search (&eg; <quote
->kde</quote
-> or <quote
->kde-user</quote
->) and then the pull-down menu by the search box will default to <quote
->Body</quote
-> searches. To be thorough, you should probably search the <quote
->kde</quote
->, <quote
->kde-user</quote
->, and <quote
->kde-devel</quote
-> folders. </para>
+<para>To do a body search, you have to enter one of the mailing lists. Just click on the folder you want to search (&eg; <quote>kde</quote> or <quote>kde-user</quote>) and then the pull-down menu by the search box will default to <quote>Body</quote> searches. To be thorough, you should probably search the <quote>kde</quote>, <quote>kde-user</quote>, and <quote>kde-devel</quote> folders. </para>
 
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question id="newsgroups">
-<para
->Is there a newsgroup about &kde;?</para>
+<para>Is there a newsgroup about &kde;?</para>
 </question>
 <answer>
-<para
->Yes, there is! It is at <literal
->comp.windows.x.kde</literal
->. In addition, there is also a German newsgroup at <literal
->de.alt.comp.kde</literal
->. Please note that it is not a good idea to ask questions which are already answered in this &FAQ;.</para>
+<para>Yes, there is! It is at <literal>comp.windows.x.kde</literal>. In addition, there is also a German newsgroup at <literal>de.alt.comp.kde</literal>. Please note that it is not a good idea to ask questions which are already answered in this &FAQ;.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Are there any other &kde;-related &FAQ;s?</para>
+<para>Are there any other &kde;-related &FAQ;s?</para>
 </question>
 <answer>
-<para
->Yes. Here is a list of them:</para>
+<para>Yes. Here is a list of them:</para>
 <itemizedlist>
-<listitem
-><para
-><ulink
-url="http://www.kde.org/info/faq.php"
->&kde; &FAQ;</ulink
-></para
-></listitem>
-<listitem
-><para
-><ulink
-url="http://konqueror.org/faq/"
->&konqueror; &FAQ;</ulink
-></para
-></listitem>
-<listitem
-><para
-><ulink
-url="http://www.arts-project.org/doc/manual/index.html"
->aRts sound server documentation</ulink
-></para
-></listitem>
+<listitem><para><ulink
+url="http://www.kde.org/info/faq.php">&kde; &FAQ;</ulink></para></listitem>
+<listitem><para><ulink
+url="http://konqueror.org/faq/">&konqueror; &FAQ;</ulink></para></listitem>
+<listitem><para><ulink
+url="http://www.arts-project.org/doc/manual/index.html">aRts sound server documentation</ulink></para></listitem>
 
 <!-- Removed because the kmail FAQ is part of the KMail manual and not a -->
 <!-- separate document 
-<listitem
-><para
-><ulink
-url="http://kmail.kde.org/manual/faq.html"
->&kmail;
-&FAQ;</ulink
-></para
-></listitem>
+<listitem><para><ulink
+url="http://kmail.kde.org/manual/faq.html">&kmail;
+&FAQ;</ulink></para></listitem>
 -->
 
 </itemizedlist>
diff --git a/tde-i18n-en_GB/docs/tdebase/faq/nontdeapps.docbook b/tde-i18n-en_GB/docs/tdebase/faq/nontdeapps.docbook
index 8f4b3df5350..44b0272aee4 100644
--- a/tde-i18n-en_GB/docs/tdebase/faq/nontdeapps.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/faq/nontdeapps.docbook
@@ -5,59 +5,24 @@
 -->
 
 <chapter id="non-kde-apps">
-<title
->&kde; with non-&kde; applications</title>
+<title>&kde; with non-&kde; applications</title>
 
 <!-- FIXME: This seems to be obsolete. The only similar option is "Apply *colors* to -->
 <!-- non-kde apps" -->
 <qandaset>
 <qandaentry>
 <question>
-<para
->My non-&kde; applications like &Emacs; and <application
->kterm</application
-> are running amok with strange colours!</para>
+<para>My non-&kde; applications like &Emacs; and <application>kterm</application> are running amok with strange colours!</para>
 </question>
 <answer>
-<para
->Start the <application
->&kde; Control Centre</application
-> and in <guimenu
->Appearance &amp; Themes</guimenu
-><guisubmenu
->Colours</guisubmenu
-> uncheck the <guilabel
->Apply colours to non-TDE applications</guilabel
-> checkbox and click <guibutton
->Apply</guibutton
->.</para>
+<para>Start the <application>&kde; Control Centre</application> and in <guimenu>Appearance &amp; Themes</guimenu><guisubmenu>Colours</guisubmenu> uncheck the <guilabel>Apply colours to non-TDE applications</guilabel> checkbox and click <guibutton>Apply</guibutton>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->How can I set my default web browser to be something other than &konqueror;?</para
-></question>
+<question><para>How can I set my default web browser to be something other than &konqueror;?</para></question>
 <answer>
-<para
->If you are using &kde; 3.3 or later, open up the &kcontrolcenter; and navigate to the <menuchoice
-><guimenu
->TDE Components</guimenu
-><guimenuitem
->Component Chooser</guimenuitem
-></menuchoice
-> panel. Select <guilabel
->Web Browser</guilabel
-> from the list on the left, then select <guilabel
->Open http and https URLs in the following browser:</guilabel
-> and type in the name of the browser (&eg; <application
->mozilla</application
->, <application
->firefox</application
->, <application
->opera</application
->, &etc;) in the textbox.</para>
+<para>If you are using &kde; 3.3 or later, open up the &kcontrolcenter; and navigate to the <menuchoice><guimenu>TDE Components</guimenu><guimenuitem>Component Chooser</guimenuitem></menuchoice> panel. Select <guilabel>Web Browser</guilabel> from the list on the left, then select <guilabel>Open http and https URLs in the following browser:</guilabel> and type in the name of the browser (&eg; <application>mozilla</application>, <application>firefox</application>, <application>opera</application>, &etc;) in the textbox.</para>
 </answer>
 </qandaentry>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/faq/notrelated.docbook b/tde-i18n-en_GB/docs/tdebase/faq/notrelated.docbook
index b780a37ec31..c1b5011ed6c 100644
--- a/tde-i18n-en_GB/docs/tdebase/faq/notrelated.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/faq/notrelated.docbook
@@ -7,190 +7,84 @@
 -->
 
 <chapter id="not-kde">
-<title
->Not really &kde;-related, but frequently asked nevertheless.</title>
+<title>Not really &kde;-related, but frequently asked nevertheless.</title>
 
 <qandaset>
 <qandaentry>
 <question>
-<para
->How do I change the screen resolution?</para>
+<para>How do I change the screen resolution?</para>
 </question>
 <answer>
-<para
->Use <keycombo action="simul"
->&Ctrl;&Alt;<keycap
->+</keycap
-></keycombo
-> and <keycombo action="simul"
->&Ctrl;&Alt;<keycap
->-</keycap
-></keycombo
-> to cycle through the resolutions you have defined in <filename
->XF86Config</filename
-> (maybe under <filename class="directory"
->/etc/X11</filename
->; poke around first). If you prefer to get your hands dirty, you can always edit the file directly. By placing your favourite resolution at the beginning (or making it the only one listed), &X-Window; will always start up with that resolution. <caution
-><para
->Always make a backup copy of your <filename
->XF86Config</filename
-> file <emphasis
->before</emphasis
-> you start editing it. Errors in this file can render &X-Window; unusable.</para
-></caution>
-<note
-><para
->These instructions are only valid if you are running version 3.3.x of the XFree86 server. If you are running XFree86 4.x, you must consult with the <ulink url="http://xfree.org"
->XFree86(TM): Home Page</ulink
->.</para
-></note
-></para>
+<para>Use <keycombo action="simul">&Ctrl;&Alt;<keycap>+</keycap></keycombo> and <keycombo action="simul">&Ctrl;&Alt;<keycap>-</keycap></keycombo> to cycle through the resolutions you have defined in <filename>XF86Config</filename> (maybe under <filename class="directory">/etc/X11</filename>; poke around first). If you prefer to get your hands dirty, you can always edit the file directly. By placing your favourite resolution at the beginning (or making it the only one listed), &X-Window; will always start up with that resolution. <caution><para>Always make a backup copy of your <filename>XF86Config</filename> file <emphasis>before</emphasis> you start editing it. Errors in this file can render &X-Window; unusable.</para></caution>
+<note><para>These instructions are only valid if you are running version 3.3.x of the XFree86 server. If you are running XFree86 4.x, you must consult with the <ulink url="http://xfree.org">XFree86(TM): Home Page</ulink>.</para></note></para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How do I change the colour depth?</para>
+<para>How do I change the colour depth?</para>
 </question>
 <answer>
-<para
->There is no way you can do this on the fly. You can either start &X-Window; using <command
->startx <option
-> -bpp <replaceable
->number</replaceable
-></option
-></command
-> where <replaceable
->number</replaceable
-> can be 8, 16, 24 or 32, depending on the depth you want. Alternatively, if you are using <application
->xdm</application
->/&tdm;, you need to edit <filename
->/etc/X11/xdm/Xservers</filename
-> (may vary) and enter <userinput
->:0 local /usr/X11R6/bin/X -bpp 16</userinput
-> for 16 bit colour depth.</para>
-<para
->You can also edit the <filename
->XF86Config</filename
-> file and add a line like <userinput
->DefaultColorDepth <replaceable
->number</replaceable
-></userinput
-> to Section "Screen". The next time you start X, it will run with the newly-configured colour depth.</para>
+<para>There is no way you can do this on the fly. You can either start &X-Window; using <command>startx <option> -bpp <replaceable>number</replaceable></option></command> where <replaceable>number</replaceable> can be 8, 16, 24 or 32, depending on the depth you want. Alternatively, if you are using <application>xdm</application>/&tdm;, you need to edit <filename>/etc/X11/xdm/Xservers</filename> (may vary) and enter <userinput>:0 local /usr/X11R6/bin/X -bpp 16</userinput> for 16 bit colour depth.</para>
+<para>You can also edit the <filename>XF86Config</filename> file and add a line like <userinput>DefaultColorDepth <replaceable>number</replaceable></userinput> to Section "Screen". The next time you start X, it will run with the newly-configured colour depth.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->What can I do if I am using a 2-button mouse?</para>
+<para>What can I do if I am using a 2-button mouse?</para>
 </question>
 <answer>
-<para
->Go buy a 3-button one, or use third button emulation. The third button is emulated by pressing both the &LMB; and the &RMB; together. You would need to enable <option
->Emulate3Buttons</option
-> in your <filename
->XF86Config</filename
-> file. </para>
+<para>Go buy a 3-button one, or use third button emulation. The third button is emulated by pressing both the &LMB; and the &RMB; together. You would need to enable <option>Emulate3Buttons</option> in your <filename>XF86Config</filename> file. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->What is a "sticky" window?</para>
+<para>What is a "sticky" window?</para>
 </question>
 <answer>
-<para
->In a virtual desktop environment with multiple virtual desktops, a "sticky" window will stay put on the screen when you switch between desktops, as if sticking to the glass of the screen. <application
->Xclock</application
-> is a typical candidate for sticking, as you need to run only one instance of it, and it always stays with you. </para>
+<para>In a virtual desktop environment with multiple virtual desktops, a "sticky" window will stay put on the screen when you switch between desktops, as if sticking to the glass of the screen. <application>Xclock</application> is a typical candidate for sticking, as you need to run only one instance of it, and it always stays with you. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How do I replace the "X" mouse pointer with an arrow?</para>
+<para>How do I replace the "X" mouse pointer with an arrow?</para>
 </question>
 <answer>
-<para
->The various types of cursor available in X are defined in <filename class="headerfile"
->X11/cursorfont.h</filename
->. You can change it using <command
->xsetroot -cursor_name <replaceable
->name_of_cursor</replaceable
-></command
->. For example, I have the following in my <filename
->.Xclients</filename
->:</para>
-<screen
->xsetroot -cursor_name left_ptr
+<para>The various types of cursor available in X are defined in <filename class="headerfile">X11/cursorfont.h</filename>. You can change it using <command>xsetroot -cursor_name <replaceable>name_of_cursor</replaceable></command>. For example, I have the following in my <filename>.Xclients</filename>:</para>
+<screen>xsetroot -cursor_name left_ptr
 </screen>
-<para
->This will create the common left-angled pointer. To see other alternatives, type <command
->xfd -fn cursor</command
->. And of course, do not forget that <command
->man xsetroot</command
-> is your friend.</para>
+<para>This will create the common left-angled pointer. To see other alternatives, type <command>xfd -fn cursor</command>. And of course, do not forget that <command>man xsetroot</command> is your friend.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How do I extract/install diff files?</para>
+<para>How do I extract/install diff files?</para>
 </question>
 <answer>
-<para
->To generate a context-diff suitable for patching, use <command
->diff -u <replaceable
->old-file new-file</replaceable
-> &gt; <replaceable
->patchfile</replaceable
-></command
->. To apply the diff to a file (<abbrev
->i.e.</abbrev
-> "patch the file"), execute <command
->patch &lt; <replaceable
->patchfile</replaceable
-></command
->.</para>
+<para>To generate a context-diff suitable for patching, use <command>diff -u <replaceable>old-file new-file</replaceable> &gt; <replaceable>patchfile</replaceable></command>. To apply the diff to a file (<abbrev>i.e.</abbrev> "patch the file"), execute <command>patch &lt; <replaceable>patchfile</replaceable></command>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How do I get &Linux; to mount the floppy device for use with both DOS and ext2 formatted floppies?</para>
+<para>How do I get &Linux; to mount the floppy device for use with both DOS and ext2 formatted floppies?</para>
 </question>
 <answer>
-<para
->Just specify the filesystem type as auto in <filename
->/etc/fstab</filename
->. Auto detection works fine for DOS and ext2.</para>
+<para>Just specify the filesystem type as auto in <filename>/etc/fstab</filename>. Auto detection works fine for DOS and ext2.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How do I start &kde; with the <keycap
->Num Lock</keycap
-> on?</para>
+<para>How do I start &kde; with the <keycap>Num Lock</keycap> on?</para>
 </question>
 <answer>
-<para
->Have you tried <command
->man setleds</command
->? In addition, you might want to edit your <filename
->$<envar
->HOME</envar
->/.Xmodmap</filename
-> and put the following lines in:</para>
-<screen
->! redefines numeric keypad to be used without NumLock
+<para>Have you tried <command>man setleds</command>? In addition, you might want to edit your <filename>$<envar>HOME</envar>/.Xmodmap</filename> and put the following lines in:</para>
+<screen>! redefines numeric keypad to be used without NumLock
 keycode 79 = 7
 keycode 80 = 8
 keycode 81 = 9
@@ -210,76 +104,39 @@ keycode 86 = plus
 ! deactivates NumLock key
 keycode 77 =
 </screen>
-<para
->Other possible alternatives:</para>
+<para>Other possible alternatives:</para>
 <itemizedlist>
-<listitem
-><para
-><application
->xkeycaps</application
->: <mousebutton
->right</mousebutton
-> clicking should allow edits. You may have to do this as root.</para
-></listitem>
-<listitem
-><para
-><command
->man XF86Config</command
-> and look under section Keyboard.</para
-></listitem>
-<listitem
-><para
->Install <application
->NumLockX</application
->, which is available from <ulink url="http://dforce.sh.cvut.cz/~seli/en/numlockx"
->http://dforce.sh.cvut.cz/~seli/en/numlockx</ulink
->.</para
-></listitem>
+<listitem><para><application>xkeycaps</application>: <mousebutton>right</mousebutton> clicking should allow edits. You may have to do this as root.</para></listitem>
+<listitem><para><command>man XF86Config</command> and look under section Keyboard.</para></listitem>
+<listitem><para>Install <application>NumLockX</application>, which is available from <ulink url="http://dforce.sh.cvut.cz/~seli/en/numlockx">http://dforce.sh.cvut.cz/~seli/en/numlockx</ulink>.</para></listitem>
 </itemizedlist>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How do I take window or desktop screenshots?</para>
+<para>How do I take window or desktop screenshots?</para>
 </question>
 <answer>
-<para
->Use &ksnapshot;.</para>
+<para>Use &ksnapshot;.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Is there a tool to make webpages?</para>
+<para>Is there a tool to make webpages?</para>
 </question>
 <answer>
-<para
->Yes, and there are a lot of them out there, including <application
->StarOffice</application
->, <application
->&Netscape; Composer</application
->, and <application
->XEmacs</application
->. There are also many &kde; applications. To find the most current list, go to <ulink url="http://kde-apps.org"
->kde-apps.org: The Latest in &kde; Applications</ulink
-> and search for <emphasis
->web development</emphasis
->. Try as many as possible and choose the one most suitable to your needs.</para>
+<para>Yes, and there are a lot of them out there, including <application>StarOffice</application>, <application>&Netscape; Composer</application>, and <application>XEmacs</application>. There are also many &kde; applications. To find the most current list, go to <ulink url="http://kde-apps.org">kde-apps.org: The Latest in &kde; Applications</ulink> and search for <emphasis>web development</emphasis>. Try as many as possible and choose the one most suitable to your needs.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->What do all those acronyms like AFAIK mean?</para>
+<para>What do all those acronyms like AFAIK mean?</para>
 </question>
 <answer>
-<para
-><screen
->AAMOF: as a matter of fact
+<para><screen>AAMOF: as a matter of fact
 AFAIK: as far as I know
 AISE: as I see it
 BFN: bye for now
@@ -301,8 +158,7 @@ RTFM: read the fine manual
 SOP: standard operating procedure
 TIA: thanks in advance
 YMMV: your mileage may vary
-</screen
-></para>
+</screen></para>
 </answer>
 </qandaentry>
 </qandaset>
diff --git a/tde-i18n-en_GB/docs/tdebase/faq/panel.docbook b/tde-i18n-en_GB/docs/tdebase/faq/panel.docbook
index e49ccb7189f..60718985eb0 100644
--- a/tde-i18n-en_GB/docs/tdebase/faq/panel.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/faq/panel.docbook
@@ -5,28 +5,16 @@
 -->
 
 <chapter id="panel">
-<title
->The panel</title>
+<title>The panel</title>
 
 <qandaset>
 <qandaentry>
 <question>
-<para
->How do I add applications to the &kde; panel (&kicker;)?</para>
+<para>How do I add applications to the &kde; panel (&kicker;)?</para>
 </question>
 <answer>
-<para
->There are several ways to add an application to the panel, of which the easiest is to right-click on the panel, and from the context menu which appears, select <menuchoice
-><guimenu
->Panel Menu</guimenu
-><guisubmenu
->Add</guisubmenu
-><guisubmenu
->Application Button</guisubmenu
-></menuchoice
-> and then the application for which you want to add a link.</para>
-<para
->For more ways of adding buttons to the panel, refer to the &kicker; Handbook.</para>
+<para>There are several ways to add an application to the panel, of which the easiest is to right-click on the panel, and from the context menu which appears, select <menuchoice><guimenu>Panel Menu</guimenu><guisubmenu>Add</guisubmenu><guisubmenu>Application Button</guisubmenu></menuchoice> and then the application for which you want to add a link.</para>
+<para>For more ways of adding buttons to the panel, refer to the &kicker; Handbook.</para>
 
 </answer>
 </qandaentry>
@@ -35,25 +23,13 @@
 <!--
 <qandaentry>
 <question>
-<para
->Is it possible to change the <guibutton
->K</guibutton
-> button of
+<para>Is it possible to change the <guibutton>K</guibutton> button of
 the panel to another picture?</para>
-</question
->/
+</question>/
 <answer>
-<para
->Look for
-<filename
->$<envar
->HOME</envar
->/.trinity/share/apps/kicker/pics/go.png</filename
-> and
-<filename
->$<envar
->HOME</envar
->/.trinity/share/apps/kicker/pics/mini/go.png</filename>
+<para>Look for
+<filename>$<envar>HOME</envar>/.trinity/share/apps/kicker/pics/go.png</filename> and
+<filename>$<envar>HOME</envar>/.trinity/share/apps/kicker/pics/mini/go.png</filename>
 and replace them.  Do not forget to flatten the replacements to one
 layer, or else you will not see anything.  Create the folders if
 they do not already exist.  Then restart &kicker;.</para>
@@ -62,43 +38,16 @@ they do not already exist.  Then restart &kicker;.</para>
 -->
 
 <qandaentry>
-<question
-><para
->My desktop panel has disappeared. How can I get it back?</para>
+<question><para>My desktop panel has disappeared. How can I get it back?</para>
 </question>
 
 <answer>
 
-<para
->The panel disappearing is usually due to it crashing. This is most often caused by loading an applet that has a fatal bug or due to a bad installation of &kde; and/or the panel.</para>
+<para>The panel disappearing is usually due to it crashing. This is most often caused by loading an applet that has a fatal bug or due to a bad installation of &kde; and/or the panel.</para>
 
-<para
->The easiest way to get the panel back is to launch the <guilabel
->Run Command</guilabel
-> window by pressing <keycombo action="simul"
->&Alt;<keycap
->F2</keycap
-> </keycombo
-> and entering <userinput
-><command
->kicker</command
-></userinput
-> and then pressing the <guibutton
->OK</guibutton
-> button.</para>
+<para>The easiest way to get the panel back is to launch the <guilabel>Run Command</guilabel> window by pressing <keycombo action="simul">&Alt;<keycap>F2</keycap> </keycombo> and entering <userinput><command>kicker</command></userinput> and then pressing the <guibutton>OK</guibutton> button.</para>
 
-<para
->If the panel continues to disappear, you may wish to either remove or edit by hand your <filename
->$<envar
->TDEHOME</envar
->/share/config/kickerrc</filename
-> file, where <filename class="directory"
->$<envar
->TDEHOME</envar
-></filename
-> is usually <filename class="directory"
->~/.trinity</filename
->. If you choose to edit it by hand, start by removing the applet entry groups.</para>
+<para>If the panel continues to disappear, you may wish to either remove or edit by hand your <filename>$<envar>TDEHOME</envar>/share/config/kickerrc</filename> file, where <filename class="directory">$<envar>TDEHOME</envar></filename> is usually <filename class="directory">~/.trinity</filename>. If you choose to edit it by hand, start by removing the applet entry groups.</para>
 
 </answer>
 </qandaentry>
diff --git a/tde-i18n-en_GB/docs/tdebase/faq/tdeapps.docbook b/tde-i18n-en_GB/docs/tdebase/faq/tdeapps.docbook
index 5b22a3f79d8..d894f7d4c6f 100644
--- a/tde-i18n-en_GB/docs/tdebase/faq/tdeapps.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/faq/tdeapps.docbook
@@ -5,128 +5,43 @@
 -->
 
 <chapter id="applications">
-<title
->&kde; applications</title>
+<title>&kde; applications</title>
 
 <qandaset>
 <qandaentry>
 <question>
-<para
->&kppp;</para>
+<para>&kppp;</para>
 </question>
 <answer>
 
-<para
->Many &kde; users report problems using &kppp;. But before you complain about &kppp;, make sure you have already checked the following:</para>
+<para>Many &kde; users report problems using &kppp;. But before you complain about &kppp;, make sure you have already checked the following:</para>
 
 <itemizedlist>
-<listitem
-><para
->Can you dialup to your <acronym
->ISP</acronym
-> without using &kppp;? If you cannot, then perhaps &kppp; is not the culprit after all.</para
-></listitem>
-<listitem
-><para
->Have you gone through the &kppp; documentation at least three times and followed its instructions and trouble-shooting suggestions?</para
-></listitem>
+<listitem><para>Can you dialup to your <acronym>ISP</acronym> without using &kppp;? If you cannot, then perhaps &kppp; is not the culprit after all.</para></listitem>
+<listitem><para>Have you gone through the &kppp; documentation at least three times and followed its instructions and trouble-shooting suggestions?</para></listitem>
 </itemizedlist>
-<para
->The &kppp; documentation can be accessed through the <application
->&kde; Help Centre</application
->. Last, but not least, the &kppp; homepage is at <ulink url="http://ktown.kde.org/~kppp/"
->http://ktown.kde.org/~kppp/</ulink
->.</para>
-<para
->Now, if you still encounter problems, here's what might help you solve them:</para>
+<para>The &kppp; documentation can be accessed through the <application>&kde; Help Centre</application>. Last, but not least, the &kppp; homepage is at <ulink url="http://ktown.kde.org/~kppp/">http://ktown.kde.org/~kppp/</ulink>.</para>
+<para>Now, if you still encounter problems, here's what might help you solve them:</para>
 <variablelist>
-<varlistentry
-><term
->How do I change the &MTU; setting in &kppp;?</term>
-<listitem
-><para
->Open up the &kppp; dialogue box and select <guibutton
->Setup</guibutton
->. Choose an existing account and click <guibutton
->Edit</guibutton
->, or <guibutton
->New</guibutton
-> to create a new dialup account. Select the <guilabel
->Dial</guilabel
-> tab and click <guibutton
->Arguments</guibutton
->. Type what you want to change in the Argument textbox (&eg; <userinput
->mtu 296</userinput
->) and click <guibutton
->Add</guibutton
->. When you are satisfied, click <guibutton
->Close</guibutton
->.</para>
-<para
->To check whether the options <quote
->took</quote
->, do one of the following:</para>
+<varlistentry><term>How do I change the &MTU; setting in &kppp;?</term>
+<listitem><para>Open up the &kppp; dialogue box and select <guibutton>Setup</guibutton>. Choose an existing account and click <guibutton>Edit</guibutton>, or <guibutton>New</guibutton> to create a new dialup account. Select the <guilabel>Dial</guilabel> tab and click <guibutton>Arguments</guibutton>. Type what you want to change in the Argument textbox (&eg; <userinput>mtu 296</userinput>) and click <guibutton>Add</guibutton>. When you are satisfied, click <guibutton>Close</guibutton>.</para>
+<para>To check whether the options <quote>took</quote>, do one of the following:</para>
 <itemizedlist>
 <listitem>
-<para
->In a terminal window, run <userinput
-><command
->/sbin/ifconfig</command
-> ppp0</userinput
-> and look at the reported &MTU; in the output. It should match your request.</para>
+<para>In a terminal window, run <userinput><command>/sbin/ifconfig</command> ppp0</userinput> and look at the reported &MTU; in the output. It should match your request.</para>
 </listitem>
-<listitem
-><para
->Add <option
->debug</option
-> and <option
->kdebug</option
-> (each on a separate line) to your <filename
->/etc/ppp/options</filename
-> file and restart your &PPP; session. You will find debugging messages in <filename
->/var/log/messages</filename
->, including &MRU; and &MTU; settings.</para
-></listitem>
+<listitem><para>Add <option>debug</option> and <option>kdebug</option> (each on a separate line) to your <filename>/etc/ppp/options</filename> file and restart your &PPP; session. You will find debugging messages in <filename>/var/log/messages</filename>, including &MRU; and &MTU; settings.</para></listitem>
 </itemizedlist>
-<para
->If you want, the &MRU; and &MTU; settings can be added to the <filename
->options</filename
-> file, one complete setting per line, no quotes or dashes.</para
-></listitem>
+<para>If you want, the &MRU; and &MTU; settings can be added to the <filename>options</filename> file, one complete setting per line, no quotes or dashes.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->&kppp; connects at a slower speed than normal.</term>
-<listitem
-><para
->The following might do the trick:</para>
+<term>&kppp; connects at a slower speed than normal.</term>
+<listitem><para>The following might do the trick:</para>
 <itemizedlist>
-<listitem
-><para
->Try executing <command
->setserial spd_hi</command
->.</para
-></listitem>
-<listitem
-><para
->The default &MTU; value is 1500, which maybe too large for a dialup connection. Try changing it to a smaller value like <userinput
->296</userinput
-> or <userinput
->576</userinput
->.</para
-></listitem>
-<listitem
-><para
->Check in your <filename class="directory"
->$<envar
->HOME</envar
->/.trinity/share/config</filename
-> for the <filename
->kppprc</filename
->. Ensure the correct modem speed is actually defined there.</para
-></listitem>
-</itemizedlist
-></listitem>
+<listitem><para>Try executing <command>setserial spd_hi</command>.</para></listitem>
+<listitem><para>The default &MTU; value is 1500, which maybe too large for a dialup connection. Try changing it to a smaller value like <userinput>296</userinput> or <userinput>576</userinput>.</para></listitem>
+<listitem><para>Check in your <filename class="directory">$<envar>HOME</envar>/.trinity/share/config</filename> for the <filename>kppprc</filename>. Ensure the correct modem speed is actually defined there.</para></listitem>
+</itemizedlist></listitem>
 </varlistentry>
 </variablelist>
 </answer>
@@ -134,86 +49,30 @@
 
 <qandaentry>
 <question>
-<para
->&konsole;</para>
+<para>&konsole;</para>
 </question>
 <answer>
 <variablelist>
 
 <varlistentry>
-<term
->How do I page-up or page-down?</term>
-<listitem
-><para
->Use <keycombo action="simul"
-> <keycap
->Shift</keycap
-><keycap
->Page Up</keycap
-></keycombo
-> and <keycombo action="simul"
-><keycap
->Shift</keycap
-><keycap
->Pg Dn</keycap
-></keycombo
->. </para
-></listitem>
+<term>How do I page-up or page-down?</term>
+<listitem><para>Use <keycombo action="simul"> <keycap>Shift</keycap><keycap>Page Up</keycap></keycombo> and <keycombo action="simul"><keycap>Shift</keycap><keycap>Pg Dn</keycap></keycombo>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->How do I perform a simple <quote
->copy</quote
-> from &konsole; to anything else?</term>
-<listitem
-><para
->When I do a <command
->ls</command
->, first I select with the mouse the desired text, press <keycombo action="simul"
->&Ctrl;<keycap
->C</keycap
-></keycombo
->, then I make the target application active, point the mouse to the relevant part and press <keycombo action="simul"
->&Ctrl;<keycap
->V</keycap
-></keycombo
->. Alternatively, highlight the text by dragging with the &LMB; down and paste by clicking with the &MMB; (or both buttons if you are using a 2 button mouse with 3 button emulation). </para
-></listitem>
+<term>How do I perform a simple <quote>copy</quote> from &konsole; to anything else?</term>
+<listitem><para>When I do a <command>ls</command>, first I select with the mouse the desired text, press <keycombo action="simul">&Ctrl;<keycap>C</keycap></keycombo>, then I make the target application active, point the mouse to the relevant part and press <keycombo action="simul">&Ctrl;<keycap>V</keycap></keycombo>. Alternatively, highlight the text by dragging with the &LMB; down and paste by clicking with the &MMB; (or both buttons if you are using a 2 button mouse with 3 button emulation). </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Why can't &konsole; find the <quote
->9x15</quote
-> and the 2 <quote
->console</quote
-> bitmap fonts installed with &kde;?</term>
+<term>Why can't &konsole; find the <quote>9x15</quote> and the 2 <quote>console</quote> bitmap fonts installed with &kde;?</term>
 <listitem>
 
-<para
-><application
->FontConfig</application
-> must find the three fonts installed in: <filename class="directory"
->$<envar
->TDEDIR</envar
->/share/fonts</filename
->. If the &kde; install does not install these fonts in a directory that already exists (&eg; <filename class="directory"
->/usr/share/fonts</filename
->) then you must add this directory to the configuration file <filename class="directory"
->/etc/fonts/local.conf</filename
->. This should be the first line after <quote
->&lt;fontconfig&gt;</quote
->. For example: <programlisting>
+<para><application>FontConfig</application> must find the three fonts installed in: <filename class="directory">$<envar>TDEDIR</envar>/share/fonts</filename>. If the &kde; install does not install these fonts in a directory that already exists (&eg; <filename class="directory">/usr/share/fonts</filename>) then you must add this directory to the configuration file <filename class="directory">/etc/fonts/local.conf</filename>. This should be the first line after <quote>&lt;fontconfig&gt;</quote>. For example: <programlisting>
 &lt;fontconfig&gt;
 &lt;dir&gt;/usr/kde3/share/fonts&lt;/dir&gt;
 &lt;/fontconfig&gt;
-</programlisting
-> After adding the directory, run (as root): <userinput
-><command
->fc-cache</command
-> -v</userinput
-> and check that it found the directory.</para>
+</programlisting> After adding the directory, run (as root): <userinput><command>fc-cache</command> -v</userinput> and check that it found the directory.</para>
 </listitem>
 </varlistentry>
 
@@ -223,16 +82,10 @@
 
 <qandaentry>
 <question>
-<para
->&kmail;</para>
+<para>&kmail;</para>
 </question>
 <answer>
-<para
->&kmail; has its own home page at <ulink url="http://kmail.kde.org"
->http://kmail.kde.org</ulink
-> where an <acronym
->FAQ</acronym
-> is available.</para>
+<para>&kmail; has its own home page at <ulink url="http://kmail.kde.org">http://kmail.kde.org</ulink> where an <acronym>FAQ</acronym> is available.</para>
 </answer>
 </qandaentry>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/faq/tips.docbook b/tde-i18n-en_GB/docs/tdebase/faq/tips.docbook
index 9f7b4e80e26..af3d0ad2b57 100644
--- a/tde-i18n-en_GB/docs/tdebase/faq/tips.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/faq/tips.docbook
@@ -5,199 +5,84 @@
 -->
 
 <chapter id="tips">
-<title
->Useful tips</title>
+<title>Useful tips</title>
 
 <qandaset>
 <qandaentry>
 <question>
-<para
->Reading documentation in &kde;</para>
+<para>Reading documentation in &kde;</para>
 </question>
 <answer>
-<para
->Pop up the <guilabel
->Run Command</guilabel
-> window (<keycombo action="simul"
->&Alt;<keycap
->F2</keycap
-></keycombo
-> by default) and type: <itemizedlist>
+<para>Pop up the <guilabel>Run Command</guilabel> window (<keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo> by default) and type: <itemizedlist>
 <listitem>
-<para
-><command
->man:<replaceable
->command</replaceable
-></command
-> for man pages. It even unpacks on the fly if the man pages are gzipped.</para>
+<para><command>man:<replaceable>command</replaceable></command> for man pages. It even unpacks on the fly if the man pages are gzipped.</para>
 </listitem>
 
 <listitem>
-<para
-><command
->info:<replaceable
->command</replaceable
-></command
-> for info pages.</para>
+<para><command>info:<replaceable>command</replaceable></command> for info pages.</para>
 </listitem>
 
 <listitem>
-<para
-><command
->help:<replaceable
->kdeappname</replaceable
-></command
-> for &kde; application help pages.</para>
+<para><command>help:<replaceable>kdeappname</replaceable></command> for &kde; application help pages.</para>
 </listitem>
 
 </itemizedlist>
 </para>
 
-<para
->You can also enter any of these in the <guilabel
->Location</guilabel
-> text box in &konqueror;.</para>
-<para
->Or you can use the <application
->&kde; Help Centre</application
-> if you are using &kde; 2. Simply start the <application
->&kde; Help Centre</application
-> by clicking on the icon (the blue book with the yellow key) on the toolbar. Once the <application
->&kde; Help Centre</application
-> has loaded, the window on the left will contain an entry called <guilabel
->Unix manual pages</guilabel
->. Click once on this entry, and you can browse through all the installed manual pages on your system.</para>
+<para>You can also enter any of these in the <guilabel>Location</guilabel> text box in &konqueror;.</para>
+<para>Or you can use the <application>&kde; Help Centre</application> if you are using &kde; 2. Simply start the <application>&kde; Help Centre</application> by clicking on the icon (the blue book with the yellow key) on the toolbar. Once the <application>&kde; Help Centre</application> has loaded, the window on the left will contain an entry called <guilabel>Unix manual pages</guilabel>. Click once on this entry, and you can browse through all the installed manual pages on your system.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Move or resize windows quickly</para>
+<para>Move or resize windows quickly</para>
 </question>
 <answer>
-<para
->To move a window, use <keycombo action="simul"
->&Alt;<mousebutton
->left</mousebutton
-></keycombo
-> mouse button. <keycombo action="simul"
->&Alt;<mousebutton
->right</mousebutton
-></keycombo
-> mouse button will resize the window. Last but not least, <keycombo action="simul"
->&Alt;<mousebutton
->middle</mousebutton
-></keycombo
-> mouse button raises/lowers the window. The <application
->&kde; Control Centre</application
-> allows you to change these mouse bindings.</para>
+<para>To move a window, use <keycombo action="simul">&Alt;<mousebutton>left</mousebutton></keycombo> mouse button. <keycombo action="simul">&Alt;<mousebutton>right</mousebutton></keycombo> mouse button will resize the window. Last but not least, <keycombo action="simul">&Alt;<mousebutton>middle</mousebutton></keycombo> mouse button raises/lowers the window. The <application>&kde; Control Centre</application> allows you to change these mouse bindings.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Killing windows in &kde;</para>
+<para>Killing windows in &kde;</para>
 </question>
 <answer>
-<para
->There is a standard keybinding (<keycombo action="simul"
->&Ctrl;&Alt;&Esc;</keycombo
->) that gives you a skull &amp; crossbones cursor. Click that cursor on a window to kill it. The keybindings are viewable/changeable from the <application
->&kde; Control Centre</application
->. <caution
-><para
->Using this option kills the program forcibly. Data may be lost, and some processes related to the program may remain active. Use only as a last resort.</para
-></caution>
+<para>There is a standard keybinding (<keycombo action="simul">&Ctrl;&Alt;&Esc;</keycombo>) that gives you a skull &amp; crossbones cursor. Click that cursor on a window to kill it. The keybindings are viewable/changeable from the <application>&kde; Control Centre</application>. <caution><para>Using this option kills the program forcibly. Data may be lost, and some processes related to the program may remain active. Use only as a last resort.</para></caution>
 <!-- fixme: use only if necessary; processes might remain --></para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->What if something is so wrong that I ca not even get the skull &amp; crossbones cursor? How do I get out of a total lockup?</para>
+<para>What if something is so wrong that I ca not even get the skull &amp; crossbones cursor? How do I get out of a total lockup?</para>
 </question>
 <answer>
-<para
->These kind of locks tend to occur when an application locks up while it has a so called <quote
->mouse/keyboard grab</quote
->. When that happens you can try to select a virtual text console with <keycombo action="simul"
->&Ctrl;&Alt;<keycap
->F1</keycap
-></keycombo
-> and login. With the following command you will get a list of all running processes:</para>
-
-<screen
-><userinput
->        <command
->ps</command
-> <option
->-aux</option
-> | <command
->more</command
-></userinput
-></screen>
-
-<para
->By killing the process that has the mousegrab, your desktop will come to life again. Unfortunately you ca not see which process that is, so you will have to find out through trial and error. To kill a process use:</para>
-
-<screen
-><userinput
->        <command
->kill</command
-> <option
->-9</option
-> <replaceable
->pid</replaceable
-></userinput
-></screen>
-
-<para
->Here <replaceable
->pid</replaceable
-> is the process id of the process, which is the first number on each line reported by <command
->ps</command
-> <option
->-aux</option
->.</para>
-
-<para
->You can switch back to the desktop with <keycombo action="simul"
->&Ctrl;&Alt;<keycap
->F7</keycap
-></keycombo
-> (or <keycap
->F8</keycap
-> through <keycap
->F9</keycap
-> depending on your operating system) to see if things work again. When you press <keycombo action="simul"
->&Alt;<keycap
->Tab</keycap
-></keycombo
-> you should get a response from the window manager. If not, you need to get back to the text console and try to kill another process.</para>
-
-<para
->Good candidates to kill are: the application you were working with, &kicker;, &klipper; and &kdesktop;.</para>
+<para>These kind of locks tend to occur when an application locks up while it has a so called <quote>mouse/keyboard grab</quote>. When that happens you can try to select a virtual text console with <keycombo action="simul">&Ctrl;&Alt;<keycap>F1</keycap></keycombo> and login. With the following command you will get a list of all running processes:</para>
+
+<screen><userinput>        <command>ps</command> <option>-aux</option> | <command>more</command></userinput></screen>
+
+<para>By killing the process that has the mousegrab, your desktop will come to life again. Unfortunately you ca not see which process that is, so you will have to find out through trial and error. To kill a process use:</para>
+
+<screen><userinput>        <command>kill</command> <option>-9</option> <replaceable>pid</replaceable></userinput></screen>
+
+<para>Here <replaceable>pid</replaceable> is the process id of the process, which is the first number on each line reported by <command>ps</command> <option>-aux</option>.</para>
+
+<para>You can switch back to the desktop with <keycombo action="simul">&Ctrl;&Alt;<keycap>F7</keycap></keycombo> (or <keycap>F8</keycap> through <keycap>F9</keycap> depending on your operating system) to see if things work again. When you press <keycombo action="simul">&Alt;<keycap>Tab</keycap></keycombo> you should get a response from the window manager. If not, you need to get back to the text console and try to kill another process.</para>
+
+<para>Good candidates to kill are: the application you were working with, &kicker;, &klipper; and &kdesktop;.</para>
 </answer>
 </qandaentry>
 
 <!-- fixme: how to do in KDE2.x
 <qandaentry>
 <question>
-<para
->Switching window managers on the fly in &kde; 1.x</para>
+<para>Switching window managers on the fly in &kde; 1.x</para>
 </question>
 <answer>
-<para
->If you want to switch your window manager on the fly, type the
-following into a terminal window: <command
->kwmcom
-go:<replaceable
->blackbox</replaceable
-></command
->.  This switches to
+<para>If you want to switch your window manager on the fly, type the
+following into a terminal window: <command>kwmcom
+go:<replaceable>blackbox</replaceable></command>.  This switches to
 Blackbox, but you can substitute any window manager you like.</para>
 </answer>
 </qandaentry>
diff --git a/tde-i18n-en_GB/docs/tdebase/faq/winmng.docbook b/tde-i18n-en_GB/docs/tdebase/faq/winmng.docbook
index 4c1fd830618..f548851aaa1 100644
--- a/tde-i18n-en_GB/docs/tdebase/faq/winmng.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/faq/winmng.docbook
@@ -7,67 +7,42 @@
 
 
 <chapter id="windowmanager">
-<title
->The window manager</title>
+<title>The window manager</title>
 
-<para
->The default window manager provided by &kde; is the K Window Manager (&twin;). Please read <quote
->The K Window Manager Handbook</quote
-> (which should be accessible from the <application
->&kde; Help Centre</application
->) for usage information.</para>
+<para>The default window manager provided by &kde; is the K Window Manager (&twin;). Please read <quote>The K Window Manager Handbook</quote> (which should be accessible from the <application>&kde; Help Centre</application>) for usage information.</para>
 
 <qandaset>
 <qandaentry>
 <question>
-<para
->Are there keyboard shortcuts for &twin; operations?</para>
+<para>Are there keyboard shortcuts for &twin; operations?</para>
 </question>
 <answer>
-<para
->Yes. Please refer to "The K Window Manager Handbook" for the list of shortcuts available.</para>
+<para>Yes. Please refer to "The K Window Manager Handbook" for the list of shortcuts available.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Can I define my own set of keyboard shortcuts?</para>
+<para>Can I define my own set of keyboard shortcuts?</para>
 </question>
 <answer>
-<para
->Yes. Launch the <application
->&kde; Control Centre</application
-> and select <menuchoice
-><guimenu
->Regional &amp; Accessibility</guimenu
-><guimenuitem
->Keyboard Shortcuts</guimenuitem
-></menuchoice
-> to configure window manager bindings like maximising windows, &etc;. </para>
+<para>Yes. Launch the <application>&kde; Control Centre</application> and select <menuchoice><guimenu>Regional &amp; Accessibility</guimenu><guimenuitem>Keyboard Shortcuts</guimenuitem></menuchoice> to configure window manager bindings like maximising windows, &etc;. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->When I "iconify" a window, it disappears. Where does it go?</para>
+<para>When I "iconify" a window, it disappears. Where does it go?</para>
 </question>
 <answer>
-<para
->With many &X-Window; &GUI;s, the minimise button (a little dot) will erase the window that the program is running in and create, instead, an icon on the desktop. &kde; does not do this. Instead, when a window is iconified it is simply hidden (but the program is still running).</para>
-<para
->There are a few ways to access <quote
->disappeared</quote
-> windows:</para>
+<para>With many &X-Window; &GUI;s, the minimise button (a little dot) will erase the window that the program is running in and create, instead, an icon on the desktop. &kde; does not do this. Instead, when a window is iconified it is simply hidden (but the program is still running).</para>
+<para>There are a few ways to access <quote>disappeared</quote> windows:</para>
 <itemizedlist>
 <listitem>
-<para
->If you are running the taskbar part of &kicker;, you can choose to have a list of tasks displayed on your desktop. Iconified tasks will have their names displayed in grey.</para>
+<para>If you are running the taskbar part of &kicker;, you can choose to have a list of tasks displayed on your desktop. Iconified tasks will have their names displayed in grey.</para>
 </listitem>
 <listitem>
-<para
->If you click the &MMB; on the root window (&ie;, the background of the desktop), &twin; will give you a list of all available tasks.</para>
+<para>If you click the &MMB; on the root window (&ie;, the background of the desktop), &twin; will give you a list of all available tasks.</para>
 </listitem>
 </itemizedlist>
 </answer>
@@ -75,51 +50,32 @@
 
 <qandaentry>
 <question>
-<para
->How do I maximise windows only vertically or horizontally?</para>
+<para>How do I maximise windows only vertically or horizontally?</para>
 </question>
 <answer>
-<para
->Provided your window is not already maximised, clicking on the maximise button with the &LMB;/&MMB;/&RMB; will maximise fully/vertically/horizontally respectively.</para>
+<para>Provided your window is not already maximised, clicking on the maximise button with the &LMB;/&MMB;/&RMB; will maximise fully/vertically/horizontally respectively.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->What is <quote
->shading</quote
-> a window?</para>
+<para>What is <quote>shading</quote> a window?</para>
 </question>
 <answer>
-<para
->By <quote
->shading</quote
-> a window we mean <quote
->rolling up</quote
-> the window leaving just the title bar visible. You can do this by double clicking on the window title bar.</para>
+<para>By <quote>shading</quote> a window we mean <quote>rolling up</quote> the window leaving just the title bar visible. You can do this by double clicking on the window title bar.</para>
 </answer>
 </qandaentry>
 
 <!-- Not sure this is still applicable
 <qandaentry>
 <question>
-<para
->Is it possible to have FVWM2-like shadow frameworks for the
+<para>Is it possible to have FVWM2-like shadow frameworks for the
 placement of windows?</para>
 </question>
 <answer>
-<para
->Yes.  Run <application
->&kde; Control Center</application
-> and select <guimenu
->Look and Feel</guimenu>
-followed by <guisubmenu
->Window Behavior</guisubmenu
-> and finally
-<guimenuitem
->Advanced</guimenuitem
->.  There is a dialog option that
+<para>Yes.  Run <application>&kde; Control Center</application> and select <guimenu>Look and Feel</guimenu>
+followed by <guisubmenu>Window Behavior</guisubmenu> and finally
+<guimenuitem>Advanced</guimenuitem>.  There is a dialog option that
 allows you to set the placement policy you want.</para>
 </answer>
 </qandaentry>
diff --git a/tde-i18n-en_GB/docs/tdebase/glossary/index.docbook b/tde-i18n-en_GB/docs/tdebase/glossary/index.docbook
index 2d690b502df..9b7db6216bd 100644
--- a/tde-i18n-en_GB/docs/tdebase/glossary/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/glossary/index.docbook
@@ -8,459 +8,175 @@
 ]>
 
 
-<glossary id="glossary"
->&glossary-tdeprinting; <glossdiv id="glossdiv-technologies">
-		<title
->Technologies</title>
+<glossary id="glossary">&glossary-tdeprinting; <glossdiv id="glossdiv-technologies">
+		<title>Technologies</title>
 		<glossentry id="gloss-ioslave">
-			<glossterm
-><acronym
->IO</acronym
-> Slave</glossterm>
-			<glossdef
-><para
-><acronym
->IO</acronym
-> Slaves enable &kde; applications to access remote resources as easily as local resources (making them <quote
->network transparent</quote
->). Remote resources (&eg; files) might be stored on <acronym
->SMB</acronym
-> shares or similar.</para>
-<glossseealso otherterm="gloss-smb"
-><acronym
->SMB</acronym
-></glossseealso
-> <glossseealso otherterm="gloss-kde"
->&kde;</glossseealso
-> </glossdef>
+			<glossterm><acronym>IO</acronym> Slave</glossterm>
+			<glossdef><para><acronym>IO</acronym> Slaves enable &kde; applications to access remote resources as easily as local resources (making them <quote>network transparent</quote>). Remote resources (&eg; files) might be stored on <acronym>SMB</acronym> shares or similar.</para>
+<glossseealso otherterm="gloss-smb"><acronym>SMB</acronym></glossseealso> <glossseealso otherterm="gloss-kde">&kde;</glossseealso> </glossdef>
 		</glossentry>
 		<glossentry id="gloss-tdeio">
-			<glossterm
-><acronym
->TDEIO</acronym
-></glossterm>
-			<glossdef
-><para
->The &kde; Input/Output system which makes use of so-called <quote
-><acronym
->IO</acronym
-> Slaves</quote
->.</para>
-<glossseealso otherterm="gloss-ioslave"
-><acronym
->IO</acronym
-> Slave</glossseealso
-> <glossseealso otherterm="gloss-kde"
->&kde;</glossseealso
-> </glossdef>
+			<glossterm><acronym>TDEIO</acronym></glossterm>
+			<glossdef><para>The &kde; Input/Output system which makes use of so-called <quote><acronym>IO</acronym> Slaves</quote>.</para>
+<glossseealso otherterm="gloss-ioslave"><acronym>IO</acronym> Slave</glossseealso> <glossseealso otherterm="gloss-kde">&kde;</glossseealso> </glossdef>
 		</glossentry>
 		<glossentry id="gloss-tdeparts">
-			<glossterm
->KParts</glossterm>
-			<glossdef
-><para
->KParts is an embedding technology which allows &kde; applications to embed other &kde; applications. For example, the text view used by &konqueror; is a KPart.</para>
-				<glossseealso otherterm="gloss-konqueror"
->&konqueror;</glossseealso>
+			<glossterm>KParts</glossterm>
+			<glossdef><para>KParts is an embedding technology which allows &kde; applications to embed other &kde; applications. For example, the text view used by &konqueror; is a KPart.</para>
+				<glossseealso otherterm="gloss-konqueror">&konqueror;</glossseealso>
 			</glossdef>
 		</glossentry>
 		<glossentry id="gloss-tdesycoca">
-			<glossterm
-><acronym
->KSycoca</acronym
-></glossterm>
-			<glossdef
-><para
-><acronym
->KSycoca</acronym
-> (&kde; <emphasis
->Sy</emphasis
->stem <emphasis
->Co</emphasis
->nfiguration <emphasis
->Ca</emphasis
->che) is a configuration cache which, for example, guarantees fast access to the menu entries.</para>
+			<glossterm><acronym>KSycoca</acronym></glossterm>
+			<glossdef><para><acronym>KSycoca</acronym> (&kde; <emphasis>Sy</emphasis>stem <emphasis>Co</emphasis>nfiguration <emphasis>Ca</emphasis>che) is a configuration cache which, for example, guarantees fast access to the menu entries.</para>
 				<glossseealso 
-otherterm="gloss-tdebuildsycoca"
-><application
->KBuildSycoca</application
-></glossseealso>
+otherterm="gloss-tdebuildsycoca"><application>KBuildSycoca</application></glossseealso>
 			</glossdef>
 		</glossentry>
 	</glossdiv>
 	
 	<glossdiv id="glossdiv-xfree86">
-		<title
->XFree86</title>
+		<title>XFree86</title>
 		<glossentry id="gloss-antialiasing">
-			<glossterm
->Antialiasing</glossterm>
-			<glossdef
-><para
->If mentioned in context with &kde;, antialiasing often means the smoothing of the fonts visible on the screen. &Qt; version 2.3.0 or higher used together with XFree86 4.x makes this possible under &kde; as well.</para>
-<glossseealso otherterm="gloss-kde"
->&kde;</glossseealso
-> <glossseealso otherterm="gloss-qt"
->&Qt;</glossseealso
-> </glossdef>
+			<glossterm>Antialiasing</glossterm>
+			<glossdef><para>If mentioned in context with &kde;, antialiasing often means the smoothing of the fonts visible on the screen. &Qt; version 2.3.0 or higher used together with XFree86 4.x makes this possible under &kde; as well.</para>
+<glossseealso otherterm="gloss-kde">&kde;</glossseealso> <glossseealso otherterm="gloss-qt">&Qt;</glossseealso> </glossdef>
 		</glossentry>
 		<glossentry id="gloss-xserver">
-			<glossterm
->&X-Server;</glossterm>
-			<glossdef
-><para
->The &X-Server; represents a basic layer upon which the various &GUI;s like &kde; are built. It manages the basic mouse and keyboard input (from the local host as well as from remote hosts) and provides elementary graphic routines to draw rectangles and other primitives.</para>
-<glossseealso otherterm="gloss-kde"
->&kde;</glossseealso
-> <glossseealso otherterm="gloss-gui"
->&GUI;</glossseealso
-> </glossdef>
+			<glossterm>&X-Server;</glossterm>
+			<glossdef><para>The &X-Server; represents a basic layer upon which the various &GUI;s like &kde; are built. It manages the basic mouse and keyboard input (from the local host as well as from remote hosts) and provides elementary graphic routines to draw rectangles and other primitives.</para>
+<glossseealso otherterm="gloss-kde">&kde;</glossseealso> <glossseealso otherterm="gloss-gui">&GUI;</glossseealso> </glossdef>
 		</glossentry>
 	</glossdiv>
 
 	<glossdiv id="glossdiv-applications">
-		<title
->Applications</title>
+		<title>Applications</title>
 		<glossentry id="gloss-tdebuildsycoca">
-			<glossterm
-><application
->KBuildSycoca</application
-></glossterm>
-			<glossdef
-><para
-><application
->KBuildSycoca</application
-> is a command line program and regenerates the so-called <acronym
->KSycoca</acronym
->. This is useful, for example, if some or all modules in &kcontrol; are missing.</para>
-<glossseealso otherterm="gloss-tdesycoca"
-><acronym
->KSycoca</acronym
-></glossseealso
-> <glossseealso otherterm="gloss-kcontrol"
->&kcontrol;</glossseealso
-> </glossdef>
+			<glossterm><application>KBuildSycoca</application></glossterm>
+			<glossdef><para><application>KBuildSycoca</application> is a command line program and regenerates the so-called <acronym>KSycoca</acronym>. This is useful, for example, if some or all modules in &kcontrol; are missing.</para>
+<glossseealso otherterm="gloss-tdesycoca"><acronym>KSycoca</acronym></glossseealso> <glossseealso otherterm="gloss-kcontrol">&kcontrol;</glossseealso> </glossdef>
 		</glossentry>
 		<glossentry id="gloss-kcontrol">
-			<glossterm
->&kcontrol;</glossterm>
-			<glossdef
-><para
->This is the project and filename of the &kde; control centre. &kcontrol; allows you to customise virtually every configuration option of &kde;.</para>
-				<glossseealso otherterm="gloss-kde"
->&kde;</glossseealso>
+			<glossterm>&kcontrol;</glossterm>
+			<glossdef><para>This is the project and filename of the &kde; control centre. &kcontrol; allows you to customise virtually every configuration option of &kde;.</para>
+				<glossseealso otherterm="gloss-kde">&kde;</glossseealso>
 			</glossdef>
 		</glossentry>
 		<glossentry id="gloss-kicker">
-			<glossterm
->&kicker;</glossterm>
-			<glossdef
-><para
->&kicker; is the nickname as well as project name of the &kde; panel.</para>
-<glossseealso otherterm="gloss-kde"
->&kde;</glossseealso
-> <glossseealso otherterm="gloss-panel"
->Panel</glossseealso
-> </glossdef>
+			<glossterm>&kicker;</glossterm>
+			<glossdef><para>&kicker; is the nickname as well as project name of the &kde; panel.</para>
+<glossseealso otherterm="gloss-kde">&kde;</glossseealso> <glossseealso otherterm="gloss-panel">Panel</glossseealso> </glossdef>
 		</glossentry>
 		<glossentry id="gloss-konqueror">
-			<glossterm
->&konqueror;</glossterm>
-			<glossdef
-><para
->&konqueror; is a filemanager, web browser, picture viewer and more, and a core part of the &kde; project. You can find more information about &konqueror; at <ulink url="http://www.konqueror.org"
->www.konqueror.org</ulink
->.</para>
-				<glossseealso otherterm="gloss-kde"
->&kde;</glossseealso>
+			<glossterm>&konqueror;</glossterm>
+			<glossdef><para>&konqueror; is a filemanager, web browser, picture viewer and more, and a core part of the &kde; project. You can find more information about &konqueror; at <ulink url="http://www.konqueror.org">www.konqueror.org</ulink>.</para>
+				<glossseealso otherterm="gloss-kde">&kde;</glossseealso>
 			</glossdef>
 		</glossentry>
 		<glossentry id="gloss-ksirc">
-			<glossterm
->&ksirc;</glossterm>
-			<glossdef
-><para
->&ksirc; is the default <acronym
->IRC</acronym
-> client, which is shipped with &kde;. You can use &ksirc; to chat with anyone on an <acronym
->IRC</acronym
-> network.</para>
-				<glossseealso otherterm="gloss-irc"
-><acronym
->IRC</acronym
-></glossseealso>
+			<glossterm>&ksirc;</glossterm>
+			<glossdef><para>&ksirc; is the default <acronym>IRC</acronym> client, which is shipped with &kde;. You can use &ksirc; to chat with anyone on an <acronym>IRC</acronym> network.</para>
+				<glossseealso otherterm="gloss-irc"><acronym>IRC</acronym></glossseealso>
 			</glossdef>
-		</glossentry
->			 	
+		</glossentry>			 	
 	</glossdiv>
 	
 	<glossdiv id="glossdiv-desktop-terminology">
-		<title
->Desktop Terminology</title>
+		<title>Desktop Terminology</title>
 		<glossentry id="gloss-draganddrop">
-			<glossterm
->Drag and Drop</glossterm>
-			<glossdef
-><para
->This concept tries to replace many actions like copying files from one place to another by a certain mouse movement, &eg; clicking on an icon in a &konqueror; window, moving the mouse to another window while keeping the mouse button pressed, and releasing the mouse button (<quote
->dropping</quote
-> the object) copies files.</para>
-				<glossseealso otherterm="gloss-konqueror"
->&konqueror;</glossseealso>
+			<glossterm>Drag and Drop</glossterm>
+			<glossdef><para>This concept tries to replace many actions like copying files from one place to another by a certain mouse movement, &eg; clicking on an icon in a &konqueror; window, moving the mouse to another window while keeping the mouse button pressed, and releasing the mouse button (<quote>dropping</quote> the object) copies files.</para>
+				<glossseealso otherterm="gloss-konqueror">&konqueror;</glossseealso>
 			</glossdef>
 		</glossentry>
 		<glossentry id="gloss-gui">
-			<glossterm
->&GUI;</glossterm>
-			<glossdef
-><para
->Abbreviation for <emphasis
->G</emphasis
->raphical <emphasis
->U</emphasis
->ser <emphasis
->I</emphasis
->nterface. Every desktop environment (like &kde;) is a &GUI;. Most &GUI;s feature mouse support and/or windows to manage the programs.</para>
-				<glossseealso otherterm="gloss-kde"
->&kde;</glossseealso>
+			<glossterm>&GUI;</glossterm>
+			<glossdef><para>Abbreviation for <emphasis>G</emphasis>raphical <emphasis>U</emphasis>ser <emphasis>I</emphasis>nterface. Every desktop environment (like &kde;) is a &GUI;. Most &GUI;s feature mouse support and/or windows to manage the programs.</para>
+				<glossseealso otherterm="gloss-kde">&kde;</glossseealso>
 			</glossdef>
 		</glossentry>
 		<glossentry id="gloss-kde">
-			<glossterm
->&kde;</glossterm>
-			<glossdef
-><para
->Abbreviation for <quote
->K Desktop Environment</quote
->, a leading &GUI; for &UNIX;-based systems. You can find more detailled information at <ulink url="http://www.kde.org"
->www.kde.org</ulink
->.</para>
-				<glossseealso otherterm="gloss-gui"
->&GUI;</glossseealso>
+			<glossterm>&kde;</glossterm>
+			<glossdef><para>Abbreviation for <quote>K Desktop Environment</quote>, a leading &GUI; for &UNIX;-based systems. You can find more detailled information at <ulink url="http://www.kde.org">www.kde.org</ulink>.</para>
+				<glossseealso otherterm="gloss-gui">&GUI;</glossseealso>
 			</glossdef>
 		</glossentry>
 		<glossentry id="gloss-gnome">
-			<glossterm
-><acronym
->GNOME</acronym
-></glossterm>
+			<glossterm><acronym>GNOME</acronym></glossterm>
 			<glossdef>
-				<para
-><emphasis
->G</emphasis
->NU <emphasis
->N</emphasis
->etwork <emphasis
->O</emphasis
->bject <emphasis
->M</emphasis
->odel <emphasis
->E</emphasis
->nvironment, one of the leading &UNIX; &GUI;s.</para>
-				<glossseealso otherterm="gloss-gui"
->&GUI;</glossseealso>
+				<para><emphasis>G</emphasis>NU <emphasis>N</emphasis>etwork <emphasis>O</emphasis>bject <emphasis>M</emphasis>odel <emphasis>E</emphasis>nvironment, one of the leading &UNIX; &GUI;s.</para>
+				<glossseealso otherterm="gloss-gui">&GUI;</glossseealso>
 			</glossdef>
 		</glossentry>
 		<glossentry id="gloss-panel">
-			<glossterm
->Panel</glossterm>
-			<glossdef
-><para
->Refers to the panel (also known as <quote
->&kicker;</quote
->) which often resides at the bottom of the screen.</para>
-<glossseealso otherterm="gloss-kde"
->&kde;</glossseealso
-> <glossseealso otherterm="gloss-kicker"
->&kicker;</glossseealso
-> </glossdef>
+			<glossterm>Panel</glossterm>
+			<glossdef><para>Refers to the panel (also known as <quote>&kicker;</quote>) which often resides at the bottom of the screen.</para>
+<glossseealso otherterm="gloss-kde">&kde;</glossseealso> <glossseealso otherterm="gloss-kicker">&kicker;</glossseealso> </glossdef>
 		</glossentry>
 		<glossentry id="gloss-ripping">
-			<glossterm
->ripping</glossterm>
-			<glossdef
-><para
->The process of reading audio data from a &cdrom; and storing it on the hard disk.</para>
+			<glossterm>ripping</glossterm>
+			<glossdef><para>The process of reading audio data from a &cdrom; and storing it on the hard disk.</para>
 			</glossdef>
 		</glossentry>
 	</glossdiv>
 	
 	<glossdiv id="kde-development">
-		<title
->&kde; Development</title>
+		<title>&kde; Development</title>
 		<glossentry id="gloss-qt">
-			<glossterm
->&Qt;</glossterm>
-			<glossdef
-><para
->The &GUI; of &kde; is built on top of the &Qt; toolkit, which provides many graphical elements (so-called <quote
->Widgets</quote
->) which are used to construct the desktop. You can find more information about &Qt; at <ulink url="http://www.trolltech.com"
->www.trolltech.com</ulink
->.</para>
-<glossseealso otherterm="gloss-kde"
->&kde;</glossseealso
-> <glossseealso otherterm="gloss-gui"
->&GUI;</glossseealso
-> <glossseealso otherterm="gloss-widget"
->Widget</glossseealso
-> </glossdef>
+			<glossterm>&Qt;</glossterm>
+			<glossdef><para>The &GUI; of &kde; is built on top of the &Qt; toolkit, which provides many graphical elements (so-called <quote>Widgets</quote>) which are used to construct the desktop. You can find more information about &Qt; at <ulink url="http://www.trolltech.com">www.trolltech.com</ulink>.</para>
+<glossseealso otherterm="gloss-kde">&kde;</glossseealso> <glossseealso otherterm="gloss-gui">&GUI;</glossseealso> <glossseealso otherterm="gloss-widget">Widget</glossseealso> </glossdef>
 		</glossentry>
 		<glossentry id="gloss-i18n">
-			<glossterm
->i18n</glossterm>
-			<glossdef
-><para
->Abbreviation for <quote
->internationalisation</quote
->. &kde; supports many different languages, and several i18n techniques make it easy to translate the &GUI; as well as the accompanying documents of &kde; into all these languages. More information about the i18n process is available at <ulink url="http://i18n.kde.org"
->i18n.kde.org</ulink
->.</para>
-<glossseealso otherterm="gloss-kde"
->&kde;</glossseealso
-> <glossseealso otherterm="gloss-gui"
->&GUI;</glossseealso
-> </glossdef>
+			<glossterm>i18n</glossterm>
+			<glossdef><para>Abbreviation for <quote>internationalisation</quote>. &kde; supports many different languages, and several i18n techniques make it easy to translate the &GUI; as well as the accompanying documents of &kde; into all these languages. More information about the i18n process is available at <ulink url="http://i18n.kde.org">i18n.kde.org</ulink>.</para>
+<glossseealso otherterm="gloss-kde">&kde;</glossseealso> <glossseealso otherterm="gloss-gui">&GUI;</glossseealso> </glossdef>
 		</glossentry>
 		<glossentry id="gloss-l10n">
-			<glossterm
->l10n</glossterm>
-			<glossdef
-><para
->Abbreviation for <quote
->localisation</quote
->, the process of adapting a program to the local environment. This includes &eg; the currency used for monetary values or the time format.</para>
-				<glossseealso otherterm="gloss-i18n"
->i18n</glossseealso>
+			<glossterm>l10n</glossterm>
+			<glossdef><para>Abbreviation for <quote>localisation</quote>, the process of adapting a program to the local environment. This includes &eg; the currency used for monetary values or the time format.</para>
+				<glossseealso otherterm="gloss-i18n">i18n</glossseealso>
                         </glossdef>
 		</glossentry>
 		<glossentry id="gloss-widget">
-			<glossterm
->Widget</glossterm>
-			<glossdef
-><para
->Graphical elements like scrollbars, buttons or input fields which are used by &kde; to construct the &GUI;. </para>
-<glossseealso otherterm="gloss-kde"
->&kde;</glossseealso
-> <glossseealso otherterm="gloss-gui"
->&GUI;</glossseealso
-> </glossdef>
+			<glossterm>Widget</glossterm>
+			<glossdef><para>Graphical elements like scrollbars, buttons or input fields which are used by &kde; to construct the &GUI;. </para>
+<glossseealso otherterm="gloss-kde">&kde;</glossseealso> <glossseealso otherterm="gloss-gui">&GUI;</glossseealso> </glossdef>
 		</glossentry>
       <glossentry id="gloss-cvs">
-         <glossterm
-><acronym
->CVS</acronym
-></glossterm>
+         <glossterm><acronym>CVS</acronym></glossterm>
          <glossdef>
-            <para
-><emphasis
->C</emphasis
->oncurrent <emphasis
->V</emphasis
->ersion <emphasis
->S</emphasis
->ystem. The <acronym
->CVS</acronym
-> is a very elegant way of managing file versions that allow more than one developer to easily work on the same project. You can find a description of how to get the latest (developer) version of the &kde; sources via anonymous <acronym
->CVS</acronym
-> on <ulink url="http://www.kde.org/anoncvs.html"
->http://www.kde.org/anoncvs.html</ulink
->. More about <acronym
->CVS</acronym
-> is available at <ulink url="http://www.cvshome.org"
->www.cvshome.org</ulink
->. </para>
+            <para><emphasis>C</emphasis>oncurrent <emphasis>V</emphasis>ersion <emphasis>S</emphasis>ystem. The <acronym>CVS</acronym> is a very elegant way of managing file versions that allow more than one developer to easily work on the same project. You can find a description of how to get the latest (developer) version of the &kde; sources via anonymous <acronym>CVS</acronym> on <ulink url="http://www.kde.org/anoncvs.html">http://www.kde.org/anoncvs.html</ulink>. More about <acronym>CVS</acronym> is available at <ulink url="http://www.cvshome.org">www.cvshome.org</ulink>. </para>
          </glossdef>
       </glossentry>
 	</glossdiv>
 	
 	<glossdiv id="glossdiv-misc">
-		<title
->Miscellaneous</title>
+		<title>Miscellaneous</title>
 		<glossentry id="gloss-rfc">
-			<glossterm
-><acronym
->RFC</acronym
-></glossterm>
-			<glossdef
-><para
-><emphasis
->R</emphasis
->equest <emphasis
->F</emphasis
->or <emphasis
->C</emphasis
->omment. A common way to publish new protocol ideas or procedures for evaluation of the Internet community. Though <acronym
->RFC</acronym
->s are not mandatory, many applications try to adhere to them, once they have been approved by the community. More information about <acronym
->RFC</acronym
->s can be found at the <ulink url="http://www.rfc-editor.org"
->RFC Homepage</ulink
->.</para>
+			<glossterm><acronym>RFC</acronym></glossterm>
+			<glossdef><para><emphasis>R</emphasis>equest <emphasis>F</emphasis>or <emphasis>C</emphasis>omment. A common way to publish new protocol ideas or procedures for evaluation of the Internet community. Though <acronym>RFC</acronym>s are not mandatory, many applications try to adhere to them, once they have been approved by the community. More information about <acronym>RFC</acronym>s can be found at the <ulink url="http://www.rfc-editor.org">RFC Homepage</ulink>.</para>
 			</glossdef>
-		</glossentry
->	
+		</glossentry>	
 	</glossdiv>
 	
 	<glossdiv id="glossdiv-protocols">
-		<title
->Various protocols</title>
+		<title>Various protocols</title>
 		<glossentry id="gloss-smb">
-			<glossterm
-><acronym
->SMB</acronym
-></glossterm>
-			<glossdef
-><para
-><emphasis
->S</emphasis
->erver <emphasis
->M</emphasis
->essage <emphasis
->B</emphasis
->lock. A network protocol used in &Microsoft; &Windows; networks to access the filesystems of other computers.</para>
-				<glossseealso otherterm="gloss-ioslave"
-><acronym
->IO</acronym
-> Slave</glossseealso>
+			<glossterm><acronym>SMB</acronym></glossterm>
+			<glossdef><para><emphasis>S</emphasis>erver <emphasis>M</emphasis>essage <emphasis>B</emphasis>lock. A network protocol used in &Microsoft; &Windows; networks to access the filesystems of other computers.</para>
+				<glossseealso otherterm="gloss-ioslave"><acronym>IO</acronym> Slave</glossseealso>
 			</glossdef>
 		</glossentry>
 		<glossentry id="gloss-irc">
-			<glossterm
-><acronym
->IRC</acronym
-></glossterm>
-			<glossdef
-><para
-><emphasis
->I</emphasis
->nternet <emphasis
->R</emphasis
->elay <emphasis
->C</emphasis
->hat. A protocol defined in <acronym
->RFC</acronym
-> 1459, which handles the specification to enable real time text chat.</para>
-				<glossseealso otherterm="gloss-rfc"
-><acronym
->RFC</acronym
-></glossseealso>
+			<glossterm><acronym>IRC</acronym></glossterm>
+			<glossdef><para><emphasis>I</emphasis>nternet <emphasis>R</emphasis>elay <emphasis>C</emphasis>hat. A protocol defined in <acronym>RFC</acronym> 1459, which handles the specification to enable real time text chat.</para>
+				<glossseealso otherterm="gloss-rfc"><acronym>RFC</acronym></glossseealso>
 			</glossdef>
 		</glossentry>
                 <glossentry id="gloss-host">
-		        <glossterm
->host</glossterm>
-			<glossdef
-><para
->This can either be a name from your <filename
->/etc/hosts</filename
-> file (<systemitem class="systemname"
->mycomputer</systemitem
->), an Internet name (<systemitem class="systemname"
->www.kde.org</systemitem
->) or an IP-Address (<systemitem
->192.168.0.10</systemitem
->). </para>
+		        <glossterm>host</glossterm>
+			<glossdef><para>This can either be a name from your <filename>/etc/hosts</filename> file (<systemitem class="systemname">mycomputer</systemitem>), an Internet name (<systemitem class="systemname">www.kde.org</systemitem>) or an IP-Address (<systemitem>192.168.0.10</systemitem>). </para>
 	                </glossdef>
 	        </glossentry>
 	</glossdiv>
diff --git a/tde-i18n-en_GB/docs/tdebase/glossary/tdeprintingglossary.docbook b/tde-i18n-en_GB/docs/tdebase/glossary/tdeprintingglossary.docbook
index 17b6ddb88ac..c0869488cc5 100644
--- a/tde-i18n-en_GB/docs/tdebase/glossary/tdeprintingglossary.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/glossary/tdeprintingglossary.docbook
@@ -11,1248 +11,442 @@
 <glossary id="glossary">
 -->
         <glossdiv id="glossdiv-printing">
-                <title
->Printing</title>
+                <title>Printing</title>
  
 
                 <glossentry id="gloss-acl">
-                        <glossterm
-><acronym
->ACLs</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->A</emphasis
->ccess <emphasis
->C</emphasis
->ontrol <emphasis
->L</emphasis
->ists; ACLs are used to check for the access by a given (authenticated) user. A first rough support for ACLs for printing is available from &CUPS;; this will be refined in future versions. </para>
-                                <glossseealso otherterm="gloss-authentication"
->Authentication</glossseealso>
+                        <glossterm><acronym>ACLs</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>A</emphasis>ccess <emphasis>C</emphasis>ontrol <emphasis>L</emphasis>ists; ACLs are used to check for the access by a given (authenticated) user. A first rough support for ACLs for printing is available from &CUPS;; this will be refined in future versions. </para>
+                                <glossseealso otherterm="gloss-authentication">Authentication</glossseealso>
                         </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-appsocketprotocol">
-                        <glossterm
->AppSocket Protocol</glossterm>
-                        <glossdef
-><para
->AppSocket is a protocol for the transfer of print data, also frequently called "Direct TCP/IP Printing". &Hewlett-Packard; have taken AppSocket, added a few minor extensions around it and been very successful in renaming and marketing it under the brand "&HP; JetDirect"...</para>
-<glossseealso otherterm="gloss-hpjetdirectprotocol"
->&HP; JetDirect Protocol</glossseealso
-> <glossseealso otherterm="gloss-directtcpipprinting"
->Direct TCP/IP Printing</glossseealso
-> </glossdef>
+                        <glossterm>AppSocket Protocol</glossterm>
+                        <glossdef><para>AppSocket is a protocol for the transfer of print data, also frequently called "Direct TCP/IP Printing". &Hewlett-Packard; have taken AppSocket, added a few minor extensions around it and been very successful in renaming and marketing it under the brand "&HP; JetDirect"...</para>
+<glossseealso otherterm="gloss-hpjetdirectprotocol">&HP; JetDirect Protocol</glossseealso> <glossseealso otherterm="gloss-directtcpipprinting">Direct TCP/IP Printing</glossseealso> </glossdef>
                 </glossentry>
  
                 <glossentry id="gloss-apsfilter">
-                        <glossterm
->APSfilter</glossterm>
-                        <glossdef
-><para
->APSfilter is used mainly in the context of "classical" &UNIX; printing (BSD-style LPD). It is a sophisticated shell script, disguised as an "all-in-one" filtering program. In reality, APSfilter calls "real filters" to do the jobs needed. It sends printjobs automatically through these other filters, based on an initial file-type analysis of the printfile. It is written and maintained by Andreas Klemm. It is similar to Magicfilter and mostly uses Ghostscript for file conversions. Some Linux Distributions (like &SuSE;) use APSfilter, others Magicfilter (like &RedHat;), some have both for preference selection (like *BSD). &CUPS; has <emphasis
->no</emphasis
-> need for APSfilter, as it runs its own file type recognition (based on &MIME; types) and applies its own filtering logic.</para>
-<glossseealso otherterm="gloss-ghostscript"
->Ghostscript</glossseealso
-> <glossseealso otherterm="gloss-magicfilter"
->Magicfilter</glossseealso
-> <glossseealso otherterm="gloss-mimetypes"
->&MIME;-Types</glossseealso
-> <glossseealso otherterm="gloss-printcap"
->printcap</glossseealso
-> </glossdef>
+                        <glossterm>APSfilter</glossterm>
+                        <glossdef><para>APSfilter is used mainly in the context of "classical" &UNIX; printing (BSD-style LPD). It is a sophisticated shell script, disguised as an "all-in-one" filtering program. In reality, APSfilter calls "real filters" to do the jobs needed. It sends printjobs automatically through these other filters, based on an initial file-type analysis of the printfile. It is written and maintained by Andreas Klemm. It is similar to Magicfilter and mostly uses Ghostscript for file conversions. Some Linux Distributions (like &SuSE;) use APSfilter, others Magicfilter (like &RedHat;), some have both for preference selection (like *BSD). &CUPS; has <emphasis>no</emphasis> need for APSfilter, as it runs its own file type recognition (based on &MIME; types) and applies its own filtering logic.</para>
+<glossseealso otherterm="gloss-ghostscript">Ghostscript</glossseealso> <glossseealso otherterm="gloss-magicfilter">Magicfilter</glossseealso> <glossseealso otherterm="gloss-mimetypes">&MIME;-Types</glossseealso> <glossseealso otherterm="gloss-printcap">printcap</glossseealso> </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-authentication">
-                        <glossterm
->Authentication</glossterm>
-                        <glossdef
-><para
->Proving the identity of a certain person (maybe via username/password or by means of a certificate) is often called authentication. Once you are authenticated, you may or may not get access to a requested ressource, possibly based on ACLs.</para>
-                                <glossseealso otherterm="gloss-acl"
->ACLs</glossseealso>
+                        <glossterm>Authentication</glossterm>
+                        <glossdef><para>Proving the identity of a certain person (maybe via username/password or by means of a certificate) is often called authentication. Once you are authenticated, you may or may not get access to a requested ressource, possibly based on ACLs.</para>
+                                <glossseealso otherterm="gloss-acl">ACLs</glossseealso>
                         </glossdef>
                 </glossentry>
  
                 <glossentry id="gloss-bidirectionalcommunication">
-                        <glossterm
->Bi-directional communication</glossterm>
-                        <glossdef
-><para
->In the context of printing, a server or a host may receive additional information sent back from the printer (status messages &etc;), either upon a query or unrequested. AppSocket ( = &HP; JetDirect), &CUPS; and IPP support bi-directional communication, LPR/LPD and BSD-style printing do not...</para>
-<glossseealso otherterm="gloss-appsocketprotocol"
->AppSocket Protocol</glossseealso
-> <glossseealso otherterm="gloss-cups"
->&CUPS;</glossseealso
-> <glossseealso otherterm="gloss-directtcpipprinting"
->Direct TCP/IP Printing</glossseealso
-> <glossseealso otherterm="gloss-hpjetdirectprotocol"
->&HP; JetDirect</glossseealso
-> <glossseealso otherterm="gloss-ipp"
->IPP</glossseealso
-> <glossseealso otherterm="gloss-lprlpd"
->LPR/LPD</glossseealso
-> </glossdef>
+                        <glossterm>Bi-directional communication</glossterm>
+                        <glossdef><para>In the context of printing, a server or a host may receive additional information sent back from the printer (status messages &etc;), either upon a query or unrequested. AppSocket ( = &HP; JetDirect), &CUPS; and IPP support bi-directional communication, LPR/LPD and BSD-style printing do not...</para>
+<glossseealso otherterm="gloss-appsocketprotocol">AppSocket Protocol</glossseealso> <glossseealso otherterm="gloss-cups">&CUPS;</glossseealso> <glossseealso otherterm="gloss-directtcpipprinting">Direct TCP/IP Printing</glossseealso> <glossseealso otherterm="gloss-hpjetdirectprotocol">&HP; JetDirect</glossseealso> <glossseealso otherterm="gloss-ipp">IPP</glossseealso> <glossseealso otherterm="gloss-lprlpd">LPR/LPD</glossseealso> </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-bsdstyleprinting">
-                        <glossterm
->BSD-style Printing</glossterm>
-                        <glossdef
-><para
->Generic term for different variants of the traditional &UNIX; printing method. Its first version appeared in the early 70s on BSD &UNIX; and was formally described in <ulink url="http://www.rfc.net/rfc1179.html"
->RFC 1179</ulink
-> only as late as 1990. At the time when BSD "remote" printing was first designed, printers were serially or otherwise directly connected devices to a host (with the Internet hardly consisting of more than 100 nodes!); printers used hole-punched, continuous paper, fed through by a tractor mechanism, with simple rows of ASCII text mechanically hammered on to the medium, drawn from a cardboard box beneath the table. It came out like a zig-zag folded paper "snake". Remote printing consisted of a neighbouring host in the next room sending a file asking for printout. How technology has changed! Printers generally use cut-sheet media, they have built-in intelligence to compute the raster images of pages after pages that are sent to them using one of the powerful page description languages (PDL). Many are network nodes in their own right, with CPU, RAM, a hard disk and their own Operation System, and are hooked to a net with potentially millions of users... It is a vast proof of the flexible &UNIX; concept for doing things, that it made "Line Printing" reliably work even under these modern conditions. But time has finally come now to go for something new -- the IPP. It is strong proof of the flexibility of &UNIX;; that "Line Printing" works reliably, even under these modern conditions. But time has finally come now to go for something new -- the IPP. </para>
-<glossseealso otherterm="gloss-ipp"
->IPP</glossseealso
-> <glossseealso otherterm="gloss-cups"
->&CUPS;</glossseealso
-> <glossseealso otherterm="gloss-lprlpd"
->LPR/LPD printing</glossseealso
-> </glossdef>
+                        <glossterm>BSD-style Printing</glossterm>
+                        <glossdef><para>Generic term for different variants of the traditional &UNIX; printing method. Its first version appeared in the early 70s on BSD &UNIX; and was formally described in <ulink url="http://www.rfc.net/rfc1179.html">RFC 1179</ulink> only as late as 1990. At the time when BSD "remote" printing was first designed, printers were serially or otherwise directly connected devices to a host (with the Internet hardly consisting of more than 100 nodes!); printers used hole-punched, continuous paper, fed through by a tractor mechanism, with simple rows of ASCII text mechanically hammered on to the medium, drawn from a cardboard box beneath the table. It came out like a zig-zag folded paper "snake". Remote printing consisted of a neighbouring host in the next room sending a file asking for printout. How technology has changed! Printers generally use cut-sheet media, they have built-in intelligence to compute the raster images of pages after pages that are sent to them using one of the powerful page description languages (PDL). Many are network nodes in their own right, with CPU, RAM, a hard disk and their own Operation System, and are hooked to a net with potentially millions of users... It is a vast proof of the flexible &UNIX; concept for doing things, that it made "Line Printing" reliably work even under these modern conditions. But time has finally come now to go for something new -- the IPP. It is strong proof of the flexibility of &UNIX;; that "Line Printing" works reliably, even under these modern conditions. But time has finally come now to go for something new -- the IPP. </para>
+<glossseealso otherterm="gloss-ipp">IPP</glossseealso> <glossseealso otherterm="gloss-cups">&CUPS;</glossseealso> <glossseealso otherterm="gloss-lprlpd">LPR/LPD printing</glossseealso> </glossdef>
                 </glossentry>
  
                 <glossentry id="gloss-cups">
-                        <glossterm
->&CUPS;</glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->C</emphasis
->ommon <emphasis
->U</emphasis
->NIX <emphasis
->P</emphasis
->rinting <emphasis
->S</emphasis
->ystem; &CUPS; is the most modern &UNIX; and Linux printing system, also providing cross-platform print services to &Microsoft; &Windows; and Apple &MacOS; clients. Based on IPP, it does away with all the pitfalls of old-style BSD printing, providing authentication, encryption and ACLs, plus many more features. At the same time it is backward-compatible enough to serve all legacy clients that are not yet up to IPP, via LPR/LPD (BSD-style). &CUPS; is able to control any &PostScript; printer by utilizing the vendor-supplied PPD (PostScript Printer Description file), targeted originally for &Microsoft; Windows NT printing only. &kde; Printing is most powerful if based on &CUPS;.</para>
-<glossseealso otherterm="gloss-acl"
->ACLs</glossseealso
-> <glossseealso otherterm="gloss-authentication"
->Authentication</glossseealso
-> <glossseealso otherterm="gloss-bsdstyleprinting"
->BSD-style printing</glossseealso
-> <glossseealso otherterm="gloss-ipp"
->IPP</glossseealso
-> <glossseealso otherterm="gloss-tdeprint"
->TDEPrint</glossseealso
-> <glossseealso otherterm="gloss-lprlpd"
->LPR/LPD</glossseealso
-> <glossseealso otherterm="gloss-ppd"
->PPD</glossseealso
-> </glossdef>
+                        <glossterm>&CUPS;</glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>C</emphasis>ommon <emphasis>U</emphasis>NIX <emphasis>P</emphasis>rinting <emphasis>S</emphasis>ystem; &CUPS; is the most modern &UNIX; and Linux printing system, also providing cross-platform print services to &Microsoft; &Windows; and Apple &MacOS; clients. Based on IPP, it does away with all the pitfalls of old-style BSD printing, providing authentication, encryption and ACLs, plus many more features. At the same time it is backward-compatible enough to serve all legacy clients that are not yet up to IPP, via LPR/LPD (BSD-style). &CUPS; is able to control any &PostScript; printer by utilizing the vendor-supplied PPD (PostScript Printer Description file), targeted originally for &Microsoft; Windows NT printing only. &kde; Printing is most powerful if based on &CUPS;.</para>
+<glossseealso otherterm="gloss-acl">ACLs</glossseealso> <glossseealso otherterm="gloss-authentication">Authentication</glossseealso> <glossseealso otherterm="gloss-bsdstyleprinting">BSD-style printing</glossseealso> <glossseealso otherterm="gloss-ipp">IPP</glossseealso> <glossseealso otherterm="gloss-tdeprint">TDEPrint</glossseealso> <glossseealso otherterm="gloss-lprlpd">LPR/LPD</glossseealso> <glossseealso otherterm="gloss-ppd">PPD</glossseealso> </glossdef>
                 </glossentry>
 
  
                 <glossentry id="gloss-cupsfaq">
-                        <glossterm
-><acronym
->&CUPS;-FAQ</acronym
-></glossterm>
-                        <glossdef
-><para
->Currently only available in German (translation is on the way), the <ulink url="http://www.danka.de/printpro/faq.html"
->&CUPS;-FAQ</ulink
-> is a valuable resource to answer many questions that anyone new to &CUPS; printing might have at first. </para>
-                                <glossseealso otherterm="gloss-tdeprinthandbook"
->TDEPrint Handbook</glossseealso>
+                        <glossterm><acronym>&CUPS;-FAQ</acronym></glossterm>
+                        <glossdef><para>Currently only available in German (translation is on the way), the <ulink url="http://www.danka.de/printpro/faq.html">&CUPS;-FAQ</ulink> is a valuable resource to answer many questions that anyone new to &CUPS; printing might have at first. </para>
+                                <glossseealso otherterm="gloss-tdeprinthandbook">TDEPrint Handbook</glossseealso>
                         </glossdef>
                 </glossentry>
 
 
                 <glossentry id="gloss-cups-o-matic">
-                        <glossterm
->&CUPS;-O-Matic</glossterm>
-                        <glossdef
-><para
->&CUPS;-O-Matic was the first "Third Party" plugin for the &CUPS; printing software. It is available on the <ulink url="http://www.linuxprinting.org/cups-doc.html"
->Linuxprinting.org website</ulink
-> to provide an online PPD-generating service. Together with the companion <application
->cupsomatic</application
-> Perl-Script, that needs to be installed as an additional &CUPS; backend, it redirects output from the native <application
->pstops</application
-> filter into a chain of suitable Ghostscript filters. Upon completion, it passes the resulting data back to a &CUPS; "backend" for sending to the printer. In this way, &CUPS;-O-Matic enables support for any printer known to have worked previously in a "classical" Ghostscript environment. If no native &CUPS; support for that printer is in sight... &CUPS;-O-Matic is now replaced by the more capable PPD-O-Matic.</para>
-<glossseealso otherterm="gloss-cupsomatic"
->cupsomatic</glossseealso
-> <glossseealso otherterm="gloss-PPD-O-Matic"
->PPD-O-Matic</glossseealso
-> <glossseealso otherterm="gloss-foomatic"
->Foomatic</glossseealso
-> </glossdef>
+                        <glossterm>&CUPS;-O-Matic</glossterm>
+                        <glossdef><para>&CUPS;-O-Matic was the first "Third Party" plugin for the &CUPS; printing software. It is available on the <ulink url="http://www.linuxprinting.org/cups-doc.html">Linuxprinting.org website</ulink> to provide an online PPD-generating service. Together with the companion <application>cupsomatic</application> Perl-Script, that needs to be installed as an additional &CUPS; backend, it redirects output from the native <application>pstops</application> filter into a chain of suitable Ghostscript filters. Upon completion, it passes the resulting data back to a &CUPS; "backend" for sending to the printer. In this way, &CUPS;-O-Matic enables support for any printer known to have worked previously in a "classical" Ghostscript environment. If no native &CUPS; support for that printer is in sight... &CUPS;-O-Matic is now replaced by the more capable PPD-O-Matic.</para>
+<glossseealso otherterm="gloss-cupsomatic">cupsomatic</glossseealso> <glossseealso otherterm="gloss-PPD-O-Matic">PPD-O-Matic</glossseealso> <glossseealso otherterm="gloss-foomatic">Foomatic</glossseealso> </glossdef>
                 </glossentry>
 
 
                 <glossentry id="gloss-cupsomatic">
-                        <glossterm
->cupsomatic</glossterm>
-                        <glossdef
-><para
->The Perl script <application
->cupsomatic</application
-> (plus a working Perl installation on your system) is needed to make any &CUPS;-O-Matic (or PPD-O-Matic) generated PPD work with &CUPS;. It was written by Grant Taylor, author of the Linux Printing HOWTO and Maintainer of the <ulink url="http://www.linuxprinting.org/printer_list.cgi"
->printer database</ulink
-> at the Linuxprinting.org website.</para>
-<glossseealso otherterm="gloss-cups-o-matic"
->&CUPS;-O-Matic</glossseealso
-> <glossseealso otherterm="gloss-foomatic"
->Foomatic</glossseealso
-> <glossseealso otherterm="gloss-cupsomatic"
->cupsomatic</glossseealso
-> </glossdef>
+                        <glossterm>cupsomatic</glossterm>
+                        <glossdef><para>The Perl script <application>cupsomatic</application> (plus a working Perl installation on your system) is needed to make any &CUPS;-O-Matic (or PPD-O-Matic) generated PPD work with &CUPS;. It was written by Grant Taylor, author of the Linux Printing HOWTO and Maintainer of the <ulink url="http://www.linuxprinting.org/printer_list.cgi">printer database</ulink> at the Linuxprinting.org website.</para>
+<glossseealso otherterm="gloss-cups-o-matic">&CUPS;-O-Matic</glossseealso> <glossseealso otherterm="gloss-foomatic">Foomatic</glossseealso> <glossseealso otherterm="gloss-cupsomatic">cupsomatic</glossseealso> </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-daemon">
-                        <glossterm
-><acronym
->Daemon</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->D</emphasis
->isk <emphasis
->a</emphasis
->nd <emphasis
->e</emphasis
->xecution <emphasis
->mon</emphasis
->itor; <acronym
->Daemons</acronym
-> are present on all &UNIX; systems to perform tasks independent of user intervention. Readers more familiar with &Microsoft; &Windows; might want to compare daemons and the tasks they are responsible with "services". One example of a daemon present on most legacy &UNIX; systems is the LPD (Line Printer Daemon); &CUPS; is widely seen as the successor to LPD in the &UNIX; world and it also operates through a daemon. </para>
-                                <glossseealso otherterm="gloss-spooling"
->SPOOLing</glossseealso>
+                        <glossterm><acronym>Daemon</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>D</emphasis>isk <emphasis>a</emphasis>nd <emphasis>e</emphasis>xecution <emphasis>mon</emphasis>itor; <acronym>Daemons</acronym> are present on all &UNIX; systems to perform tasks independent of user intervention. Readers more familiar with &Microsoft; &Windows; might want to compare daemons and the tasks they are responsible with "services". One example of a daemon present on most legacy &UNIX; systems is the LPD (Line Printer Daemon); &CUPS; is widely seen as the successor to LPD in the &UNIX; world and it also operates through a daemon. </para>
+                                <glossseealso otherterm="gloss-spooling">SPOOLing</glossseealso>
                         </glossdef>
                 </glossentry>
  
                 <glossentry id="gloss-databaselinuxprinting">
-                        <glossterm
->Database, Linuxprinting.org</glossterm>
-                        <glossdef
-><para
->Already years ago, when Linux printing was still really difficult (only command line printing was known to most Linux users, no device specific print options were available for doing the jobs), Grant Taylor, author of the "Linux Printing HOWTO", collected most of the available information about printers, drivers and filters in his database. With the emerging &CUPS; concept, extending the use of PPDs even to non-PostScript printers, he realised the potential of this database: if one puts the different datablobs (with content that could be described along the lines "Which device prints with which Ghostscript or other filter?", "How well?", and "What command line switches are available?") into PPD-compatible files, he could have all the power of &CUPS; on top of the traditional printer "drivers". This has now developed into a broader concept, known as "Foomatic". Foomatic extends the capabilities of spoolers other than &CUPS; (LPR/LPD, LPRng, PDQ, PPR) to a certain degree ("stealing" some concepts from &CUPS;). The Linuxprinting Database is not a Linux-only stop -- people running other &UNIX; based OSes (like *BSD or &MacOS; X) will also find valuable information and software there. </para>
-<glossseealso otherterm="gloss-foomatic"
->Foomatic</glossseealso
-> <glossseealso otherterm="gloss-linuxprintingdatabase"
->Linuxprinting database</glossseealso
-> </glossdef>
+                        <glossterm>Database, Linuxprinting.org</glossterm>
+                        <glossdef><para>Already years ago, when Linux printing was still really difficult (only command line printing was known to most Linux users, no device specific print options were available for doing the jobs), Grant Taylor, author of the "Linux Printing HOWTO", collected most of the available information about printers, drivers and filters in his database. With the emerging &CUPS; concept, extending the use of PPDs even to non-PostScript printers, he realised the potential of this database: if one puts the different datablobs (with content that could be described along the lines "Which device prints with which Ghostscript or other filter?", "How well?", and "What command line switches are available?") into PPD-compatible files, he could have all the power of &CUPS; on top of the traditional printer "drivers". This has now developed into a broader concept, known as "Foomatic". Foomatic extends the capabilities of spoolers other than &CUPS; (LPR/LPD, LPRng, PDQ, PPR) to a certain degree ("stealing" some concepts from &CUPS;). The Linuxprinting Database is not a Linux-only stop -- people running other &UNIX; based OSes (like *BSD or &MacOS; X) will also find valuable information and software there. </para>
+<glossseealso otherterm="gloss-foomatic">Foomatic</glossseealso> <glossseealso otherterm="gloss-linuxprintingdatabase">Linuxprinting database</glossseealso> </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-directtcpipprinting">
-                        <glossterm
->Direct TCP/IP Printing</glossterm>
-                        <glossdef
-><para
->This is a method that often uses TCP/IP port 9100 to connect to the printer. It works with many modern network printers and has a few advantages over LPR/LPD, as it is faster and provides some "backchannel feedback data" from the printer to the host sending the job.</para>
-<glossseealso otherterm="gloss-appsocketprotocol"
->AppSocket Protocol</glossseealso
-> <glossseealso otherterm="gloss-hpjetdirectprotocol"
->&HP; JetDirect Protocol</glossseealso
-> </glossdef>
+                        <glossterm>Direct TCP/IP Printing</glossterm>
+                        <glossdef><para>This is a method that often uses TCP/IP port 9100 to connect to the printer. It works with many modern network printers and has a few advantages over LPR/LPD, as it is faster and provides some "backchannel feedback data" from the printer to the host sending the job.</para>
+<glossseealso otherterm="gloss-appsocketprotocol">AppSocket Protocol</glossseealso> <glossseealso otherterm="gloss-hpjetdirectprotocol">&HP; JetDirect Protocol</glossseealso> </glossdef>
                 </glossentry>
 
 
                 <glossentry id="gloss-drivers">
-                        <glossterm
->Drivers, Printer Drivers</glossterm>
-                        <glossdef
-><para
->The term "printer drivers", used in the same sense as on the &Microsoft; &Windows; platform, is not entirely applicable to a Linux or &UNIX; platform. A "driver" functionality is supplied on &UNIX; by different modular components working together. At the core of the printer drivers are "filters". Filters convert print files from a given input format to another format that is acceptable to the target printer. In many cases filters may be connected to a whole filter "chain", where only the result of the last conversion is sent to the printer. The actual transfer of the print data to the device is performed by a "backend". </para>
-<glossseealso otherterm="gloss-filter"
->Filter</glossseealso
-> <glossseealso otherterm="gloss-ppd"
->PPDs</glossseealso
-> </glossdef>
+                        <glossterm>Drivers, Printer Drivers</glossterm>
+                        <glossdef><para>The term "printer drivers", used in the same sense as on the &Microsoft; &Windows; platform, is not entirely applicable to a Linux or &UNIX; platform. A "driver" functionality is supplied on &UNIX; by different modular components working together. At the core of the printer drivers are "filters". Filters convert print files from a given input format to another format that is acceptable to the target printer. In many cases filters may be connected to a whole filter "chain", where only the result of the last conversion is sent to the printer. The actual transfer of the print data to the device is performed by a "backend". </para>
+<glossseealso otherterm="gloss-filter">Filter</glossseealso> <glossseealso otherterm="gloss-ppd">PPDs</glossseealso> </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-easysoftwareproducts">
-                        <glossterm
->Easy Software Products</glossterm>
-                        <glossdef
-><para
->Mike Sweet's company, which has contributed a few substantial software products towards the Free Software community; amongst them the initial version of <ulink url="http://gimp-print.sf.net/"
->Gimp-Print,</ulink
-> the <ulink url="http://www.easysw.com/epm/"
->EPM software packaging</ulink
-> tool and <ulink url="http://www.easysw.com/htmldoc/"
->HTMLDOC</ulink
-> (used by the "Linux Documentation Project" to build the PDF versions of the HOWTOs) -- but most importantly: <ulink url="http://www.cups.org/"
->&CUPS;</ulink
-> (the 'Common &UNIX; Printing System'). ESP finance themselves by selling a commercial version of &CUPS;, called <ulink url="http://www.easysw.com/"
->ESP PrintPro,</ulink
-> that includes some professional enhancements. </para>
-<glossseealso otherterm="gloss-cups"
->&CUPS;</glossseealso
-> <glossseealso otherterm="gloss-espprintpro"
->ESP PrintPro</glossseealso
-> <glossseealso otherterm="gloss-esp"
->ESP</glossseealso
-> <glossseealso otherterm="gloss-gimpprint"
->Gimp-Print</glossseealso
-> </glossdef>
+                        <glossterm>Easy Software Products</glossterm>
+                        <glossdef><para>Mike Sweet's company, which has contributed a few substantial software products towards the Free Software community; amongst them the initial version of <ulink url="http://gimp-print.sf.net/">Gimp-Print,</ulink> the <ulink url="http://www.easysw.com/epm/">EPM software packaging</ulink> tool and <ulink url="http://www.easysw.com/htmldoc/">HTMLDOC</ulink> (used by the "Linux Documentation Project" to build the PDF versions of the HOWTOs) -- but most importantly: <ulink url="http://www.cups.org/">&CUPS;</ulink> (the 'Common &UNIX; Printing System'). ESP finance themselves by selling a commercial version of &CUPS;, called <ulink url="http://www.easysw.com/">ESP PrintPro,</ulink> that includes some professional enhancements. </para>
+<glossseealso otherterm="gloss-cups">&CUPS;</glossseealso> <glossseealso otherterm="gloss-espprintpro">ESP PrintPro</glossseealso> <glossseealso otherterm="gloss-esp">ESP</glossseealso> <glossseealso otherterm="gloss-gimpprint">Gimp-Print</glossseealso> </glossdef>
                 </glossentry>
  
                 <glossentry id="gloss-encryption">
-                        <glossterm
->Encryption</glossterm>
-                        <glossdef
-><para
->Encryption of confidential data is an all-important issue if you transfer it over the Internet or even within intranets. Printing via traditional protocols is not encrypted at all -- it is very easy to tap and eavesdrop &eg; into &PostScript; or PCL data transfered over the wire. Therefore, in the design of IPP, provision was made for the easy plugin of encryption mechanisms (which can be provided by the same means as the encryption standards for HTTP traffic: SSL and TLS).</para>
-<glossseealso otherterm="gloss-authentication"
->Authentication</glossseealso
-> <glossseealso otherterm="gloss-cups"
->&CUPS;</glossseealso
-> <glossseealso otherterm="gloss-ipp"
->IPP</glossseealso
-> <glossseealso otherterm="gloss-ssl"
->SSL</glossseealso
-> <glossseealso otherterm="gloss-tls"
->TLS</glossseealso
-> </glossdef>
+                        <glossterm>Encryption</glossterm>
+                        <glossdef><para>Encryption of confidential data is an all-important issue if you transfer it over the Internet or even within intranets. Printing via traditional protocols is not encrypted at all -- it is very easy to tap and eavesdrop &eg; into &PostScript; or PCL data transfered over the wire. Therefore, in the design of IPP, provision was made for the easy plugin of encryption mechanisms (which can be provided by the same means as the encryption standards for HTTP traffic: SSL and TLS).</para>
+<glossseealso otherterm="gloss-authentication">Authentication</glossseealso> <glossseealso otherterm="gloss-cups">&CUPS;</glossseealso> <glossseealso otherterm="gloss-ipp">IPP</glossseealso> <glossseealso otherterm="gloss-ssl">SSL</glossseealso> <glossseealso otherterm="gloss-tls">TLS</glossseealso> </glossdef>
                 </glossentry>
 
 
                 <glossentry id="gloss-epson">
-                        <glossterm
-><acronym
->Epson</acronym
-></glossterm>
-                        <glossdef
-><para
->Epson inkjets are among the best supported models by Free software drivers, as the company was not necessarily as secretive about their devices and handed technical specification documents to developers. The excellent print quality achieved by Gimp-Print on the Stylus series of printers can be attributed to this openness. They have also contracted Easy Software Products to maintain an enhanced version of Ghostscript ("ESP GhostScript") for improved support of their printer portfolio. </para>
-                                <glossseealso otherterm="gloss-ghostscript"
->ESP Ghostscript</glossseealso>
+                        <glossterm><acronym>Epson</acronym></glossterm>
+                        <glossdef><para>Epson inkjets are among the best supported models by Free software drivers, as the company was not necessarily as secretive about their devices and handed technical specification documents to developers. The excellent print quality achieved by Gimp-Print on the Stylus series of printers can be attributed to this openness. They have also contracted Easy Software Products to maintain an enhanced version of Ghostscript ("ESP GhostScript") for improved support of their printer portfolio. </para>
+                                <glossseealso otherterm="gloss-ghostscript">ESP Ghostscript</glossseealso>
                         </glossdef>
                 </glossentry>
 
 
                 <glossentry id="gloss-escapesequence">
-                        <glossterm
->Escape Sequences</glossterm>
-                        <glossdef
-><para
->The first ever printers printed ASCII data only. To initiate a new line, or eject a page, they included special command sequences, often carrying a leading [ESC]-character. &HP; evolved this concept through its series of PCL language editions until today, having now developed a full-blown Page Description Language (PDL) from these humble beginnings. </para>
-<glossseealso otherterm="gloss-pcl"
->PCL</glossseealso
-> <glossseealso otherterm="gloss-pdl"
->PDL</glossseealso
-> </glossdef>
+                        <glossterm>Escape Sequences</glossterm>
+                        <glossdef><para>The first ever printers printed ASCII data only. To initiate a new line, or eject a page, they included special command sequences, often carrying a leading [ESC]-character. &HP; evolved this concept through its series of PCL language editions until today, having now developed a full-blown Page Description Language (PDL) from these humble beginnings. </para>
+<glossseealso otherterm="gloss-pcl">PCL</glossseealso> <glossseealso otherterm="gloss-pdl">PDL</glossseealso> </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-escp">
-                        <glossterm
-><acronym
->ESC/P</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->E</emphasis
->pson <emphasis
->S</emphasis
->tandard <emphasis
->C</emphasis
->odes for <emphasis
->P</emphasis
->rinters. Besides &PostScript; and PCL, Epson's ESC/P printer language is one of the best known.</para>
-<glossseealso otherterm="gloss-pcl"
->PCL</glossseealso
-> <glossseealso otherterm="gloss-postscript"
->&PostScript;</glossseealso
-> <glossseealso otherterm="gloss-hpgl"
->hpgl</glossseealso
-> </glossdef>
+                        <glossterm><acronym>ESC/P</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>E</emphasis>pson <emphasis>S</emphasis>tandard <emphasis>C</emphasis>odes for <emphasis>P</emphasis>rinters. Besides &PostScript; and PCL, Epson's ESC/P printer language is one of the best known.</para>
+<glossseealso otherterm="gloss-pcl">PCL</glossseealso> <glossseealso otherterm="gloss-postscript">&PostScript;</glossseealso> <glossseealso otherterm="gloss-hpgl">hpgl</glossseealso> </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-esp">
-                        <glossterm
-><acronym
->ESP</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->E</emphasis
->asy <emphasis
->S</emphasis
->oftware <emphasis
->P</emphasis
->roducts; the company that developed &CUPS; (the "Common &UNIX; Printing System"). </para>
-<glossseealso otherterm="gloss-easysoftwareproducts"
->Easy Software Products</glossseealso
-> <glossseealso otherterm="gloss-cups"
->&CUPS;</glossseealso
-> <glossseealso otherterm="gloss-espprintpro"
->ESP PrintPro</glossseealso
-> </glossdef>
+                        <glossterm><acronym>ESP</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>E</emphasis>asy <emphasis>S</emphasis>oftware <emphasis>P</emphasis>roducts; the company that developed &CUPS; (the "Common &UNIX; Printing System"). </para>
+<glossseealso otherterm="gloss-easysoftwareproducts">Easy Software Products</glossseealso> <glossseealso otherterm="gloss-cups">&CUPS;</glossseealso> <glossseealso otherterm="gloss-espprintpro">ESP PrintPro</glossseealso> </glossdef>
                 </glossentry>
 
 
                 <glossentry id="gloss-espghostscript">
-                        <glossterm
-><acronym
->ESP</acronym
-> Ghostscript</glossterm>
-                        <glossdef
-><para
->A Ghostscript version that is maintained by Easy Software Products. It includes pre-compiled Gimp-Print drivers for many inkjets (plus some other goodies). ESP Ghostscript will produce photographic quality prints in many cases, especially with the Epson Stylus model series. ESP Ghostscript is GPL-software. </para>
-<glossseealso otherterm="gloss-easysoftwareproducts"
->Easy Software Products</glossseealso
-> <glossseealso otherterm="gloss-cups"
->&CUPS;</glossseealso
-> <glossseealso otherterm="gloss-espprintpro"
->ESP PrintPro</glossseealso
-> </glossdef>
+                        <glossterm><acronym>ESP</acronym> Ghostscript</glossterm>
+                        <glossdef><para>A Ghostscript version that is maintained by Easy Software Products. It includes pre-compiled Gimp-Print drivers for many inkjets (plus some other goodies). ESP Ghostscript will produce photographic quality prints in many cases, especially with the Epson Stylus model series. ESP Ghostscript is GPL-software. </para>
+<glossseealso otherterm="gloss-easysoftwareproducts">Easy Software Products</glossseealso> <glossseealso otherterm="gloss-cups">&CUPS;</glossseealso> <glossseealso otherterm="gloss-espprintpro">ESP PrintPro</glossseealso> </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-espprintpro">
-                        <glossterm
-><acronym
->ESP</acronym
-> PrintPro</glossterm>
-                        <glossdef
-><para
->This professional enhancement to &CUPS; (the "Common &UNIX; Printing System") is sold by the developers of &CUPS; complete with more than 2,300 printer drivers for several commercial &UNIX; platforms. <ulink url="http://www.easysw.com/printpro/"
->ESP PrintPro</ulink
-> is supposed to work "out of the box" with little or no configuration for users or admins. ESP also sell support contracts for &CUPS; and PrintPro. These sales help to feed the programmers who develop the Free version of &CUPS;. </para>
-                                <glossseealso otherterm="gloss-cups"
->&CUPS;</glossseealso>
+                        <glossterm><acronym>ESP</acronym> PrintPro</glossterm>
+                        <glossdef><para>This professional enhancement to &CUPS; (the "Common &UNIX; Printing System") is sold by the developers of &CUPS; complete with more than 2,300 printer drivers for several commercial &UNIX; platforms. <ulink url="http://www.easysw.com/printpro/">ESP PrintPro</ulink> is supposed to work "out of the box" with little or no configuration for users or admins. ESP also sell support contracts for &CUPS; and PrintPro. These sales help to feed the programmers who develop the Free version of &CUPS;. </para>
+                                <glossseealso otherterm="gloss-cups">&CUPS;</glossseealso>
                         </glossdef>
                 </glossentry>
 
                <glossentry id="gloss-filter">
-                        <glossterm
->Filter</glossterm>
-                        <glossdef
-><para
->Filters, in general, are programs that take some input data, work on it and pass it on as their output data. Filters may or may not change the data. Filters in the context of printing, are programs that convert a given file (destined for printing, but not suitable in the format it is presently) into a printable format. Sometimes whole "filter chains" have to be constructed to achieve the goal, piping the output of one filter as the input to the next. </para>
-<glossseealso otherterm="gloss-ghostscript"
->Ghostscript</glossseealso
-> <glossseealso otherterm="gloss-rip"
->RIP</glossseealso
-> </glossdef>
+                        <glossterm>Filter</glossterm>
+                        <glossdef><para>Filters, in general, are programs that take some input data, work on it and pass it on as their output data. Filters may or may not change the data. Filters in the context of printing, are programs that convert a given file (destined for printing, but not suitable in the format it is presently) into a printable format. Sometimes whole "filter chains" have to be constructed to achieve the goal, piping the output of one filter as the input to the next. </para>
+<glossseealso otherterm="gloss-ghostscript">Ghostscript</glossseealso> <glossseealso otherterm="gloss-rip">RIP</glossseealso> </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-foomatic">
-                        <glossterm
->Foomatic</glossterm>
-                        <glossdef
-><para
->Foomatic started out as the wrapper name for a set of different tools available from <ulink url="http://www.linuxprinting.org/"
->Linuxprinting.org</ulink
-> These tools aimed to make the usage of traditional Ghostscript and other print filters easier for users and extend the filters' capabilities by adding more command line switches or explain the driver's execution data. Foomatic's different incarnations are &CUPS;-O-Matic, PPD-O-Matic, PDQ-O-Matic, LPD-O-Matic, PPR-O-Matic, MF-O-Matic and Direct-O-Matic. All of these allow the generation of appropriate printer configuration files online, by simply selection the suitable model and suggested (or alternate) driver for that machine. More recently, Foomatic gravitated towards becoming a "meta-spooling" system, that allows configuration of the underlying print subsystem through a unified set of commands (however, this is much more complicated than TDEPrint's &GUI; interface, which performs a similar task with regards to different print subsystems). </para>
-<glossseealso otherterm="gloss-cups-o-matic"
->&CUPS;-O-Matic</glossseealso
-> <glossseealso otherterm="gloss-PPD-O-Matic"
->PPD-O-Matic</glossseealso
-> <glossseealso otherterm="gloss-cupsomatic"
->cupsomatic</glossseealso
-> </glossdef>
+                        <glossterm>Foomatic</glossterm>
+                        <glossdef><para>Foomatic started out as the wrapper name for a set of different tools available from <ulink url="http://www.linuxprinting.org/">Linuxprinting.org</ulink> These tools aimed to make the usage of traditional Ghostscript and other print filters easier for users and extend the filters' capabilities by adding more command line switches or explain the driver's execution data. Foomatic's different incarnations are &CUPS;-O-Matic, PPD-O-Matic, PDQ-O-Matic, LPD-O-Matic, PPR-O-Matic, MF-O-Matic and Direct-O-Matic. All of these allow the generation of appropriate printer configuration files online, by simply selection the suitable model and suggested (or alternate) driver for that machine. More recently, Foomatic gravitated towards becoming a "meta-spooling" system, that allows configuration of the underlying print subsystem through a unified set of commands (however, this is much more complicated than TDEPrint's &GUI; interface, which performs a similar task with regards to different print subsystems). </para>
+<glossseealso otherterm="gloss-cups-o-matic">&CUPS;-O-Matic</glossseealso> <glossseealso otherterm="gloss-PPD-O-Matic">PPD-O-Matic</glossseealso> <glossseealso otherterm="gloss-cupsomatic">cupsomatic</glossseealso> </glossdef>
                 </glossentry>
 
                <glossentry id="gloss-ghostscript">
-                        <glossterm
->Ghostscript</glossterm>
-                        <glossdef
-><para
->Ghostscript is a &PostScript; Raster Image Processor (RIP) in software, originally developed by L. Peter Deutsch. There is always a <acronym
->GPL</acronym
-> version of Ghostscript available for free usage and distribution (mostly 1 year old) while the current version is commercially sold under another licence. Ghostscript is widely used inside the Linux and &UNIX; world for transforming &PostScript; into raster data suitable for sending to non-&PostScript; devices.</para>
-<glossseealso otherterm="gloss-postscript"
->&PostScript;</glossseealso
-> <glossseealso otherterm="gloss-rip"
->RIP</glossseealso
-> </glossdef>
+                        <glossterm>Ghostscript</glossterm>
+                        <glossdef><para>Ghostscript is a &PostScript; Raster Image Processor (RIP) in software, originally developed by L. Peter Deutsch. There is always a <acronym>GPL</acronym> version of Ghostscript available for free usage and distribution (mostly 1 year old) while the current version is commercially sold under another licence. Ghostscript is widely used inside the Linux and &UNIX; world for transforming &PostScript; into raster data suitable for sending to non-&PostScript; devices.</para>
+<glossseealso otherterm="gloss-postscript">&PostScript;</glossseealso> <glossseealso otherterm="gloss-rip">RIP</glossseealso> </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-gimpprint">
-                        <glossterm
->Gimp-Print</glossterm>
-                        <glossdef
-><para
->Contrary to its name, Gimp-Print is no longer just the plugin to be used for printing from the popular Gimp program -- its codebase can also serve to be compiled into... *...a set of PPDs and associated filters that integrate seamlessly into &CUPS;, supporting around 130 different printer models, providing photographic output quality in many cases; *...a Ghostscript filter that can be used with any other program that needs a software-RIP; *...a library that can be used by other software applications in need of rasterising functions. </para>
-<glossseealso otherterm="gloss-lexmark"
->Lexmark Drivers</glossseealso
-> <glossseealso otherterm="gloss-rip"
->RIP</glossseealso
-> <glossseealso otherterm="gloss-ghostscript"
->Ghostscript</glossseealso
-> </glossdef>
+                        <glossterm>Gimp-Print</glossterm>
+                        <glossdef><para>Contrary to its name, Gimp-Print is no longer just the plugin to be used for printing from the popular Gimp program -- its codebase can also serve to be compiled into... *...a set of PPDs and associated filters that integrate seamlessly into &CUPS;, supporting around 130 different printer models, providing photographic output quality in many cases; *...a Ghostscript filter that can be used with any other program that needs a software-RIP; *...a library that can be used by other software applications in need of rasterising functions. </para>
+<glossseealso otherterm="gloss-lexmark">Lexmark Drivers</glossseealso> <glossseealso otherterm="gloss-rip">RIP</glossseealso> <glossseealso otherterm="gloss-ghostscript">Ghostscript</glossseealso> </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-hp">
-                        <glossterm
-><acronym
->&HP;</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->H</emphasis
->ewlett-<emphasis
->Packard</emphasis
->; one of the first companies to distribute their own Linux printer drivers. -- More recently, the Company has released their "HPIJS" package of drivers, including source code and a Free licence. This is the first printer manufacturer to do so. HPIJS supports most current models of HP Ink- and DeskJets. </para>
+                        <glossterm><acronym>&HP;</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>H</emphasis>ewlett-<emphasis>Packard</emphasis>; one of the first companies to distribute their own Linux printer drivers. -- More recently, the Company has released their "HPIJS" package of drivers, including source code and a Free licence. This is the first printer manufacturer to do so. HPIJS supports most current models of HP Ink- and DeskJets. </para>
                         </glossdef>
                 </glossentry>
 
 
                 <glossentry id="gloss-hpgl">
-                        <glossterm
-><acronym
->&HP;/GL</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->&HP;</emphasis
-> <emphasis
->G</emphasis
->raphical <emphasis
->L</emphasis
->anguage; a &HP; printer language mainly used for plotters; many CAD (Computer Aided Design) software programs output &HP;/GL files for printing.</para>
-<glossseealso otherterm="gloss-escp"
->ESC/P</glossseealso
-> <glossseealso otherterm="gloss-pcl"
->PCL</glossseealso
-> <glossseealso otherterm="gloss-postscript"
->&PostScript;</glossseealso
-> </glossdef>
+                        <glossterm><acronym>&HP;/GL</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>&HP;</emphasis> <emphasis>G</emphasis>raphical <emphasis>L</emphasis>anguage; a &HP; printer language mainly used for plotters; many CAD (Computer Aided Design) software programs output &HP;/GL files for printing.</para>
+<glossseealso otherterm="gloss-escp">ESC/P</glossseealso> <glossseealso otherterm="gloss-pcl">PCL</glossseealso> <glossseealso otherterm="gloss-postscript">&PostScript;</glossseealso> </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-hpjetdirectprotocol">
-                        <glossterm
->&HP; JetDirect Protocol</glossterm>
-                        <glossdef
-><para
->A term branded by &HP; to describe their implementation of print data transfer to the printer via an otherwise "AppSocket" or "Direct TCP/IP Printing" named protocol.</para>
-<glossseealso otherterm="gloss-appsocketprotocol"
->AppSocket Protocol</glossseealso
-> <glossseealso otherterm="gloss-directtcpipprinting"
->Direct TCP/IP Printing</glossseealso
-> </glossdef>
+                        <glossterm>&HP; JetDirect Protocol</glossterm>
+                        <glossdef><para>A term branded by &HP; to describe their implementation of print data transfer to the printer via an otherwise "AppSocket" or "Direct TCP/IP Printing" named protocol.</para>
+<glossseealso otherterm="gloss-appsocketprotocol">AppSocket Protocol</glossseealso> <glossseealso otherterm="gloss-directtcpipprinting">Direct TCP/IP Printing</glossseealso> </glossdef>
                 </glossentry>
 
 		<glossentry id="gloss-ietf">
-                        <glossterm
-><acronym
->IETF</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->I</emphasis
->nternet <emphasis
->E</emphasis
->ngineering <emphasis
->T</emphasis
->ask <emphasis
->F</emphasis
->orce; an assembly of Internet, software and hardware experts that discuss new networking technologies and very often arrive at conclusions that are regarded by many as standards. "TCP/IP" is the most famous example. IETF standards, as well as drafts, discussions, ideas and useful tutorials, are put in writing in the famous series of "RFCs", which are available to the public and included in most Linux and BSD distributions.</para>
-<glossseealso otherterm="gloss-ipp"
->IPP</glossseealso
-> <glossseealso otherterm="gloss-pwg"
->PWG</glossseealso
-> <glossseealso otherterm="gloss-rfc"
->RFC</glossseealso
-> </glossdef>
+                        <glossterm><acronym>IETF</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>I</emphasis>nternet <emphasis>E</emphasis>ngineering <emphasis>T</emphasis>ask <emphasis>F</emphasis>orce; an assembly of Internet, software and hardware experts that discuss new networking technologies and very often arrive at conclusions that are regarded by many as standards. "TCP/IP" is the most famous example. IETF standards, as well as drafts, discussions, ideas and useful tutorials, are put in writing in the famous series of "RFCs", which are available to the public and included in most Linux and BSD distributions.</para>
+<glossseealso otherterm="gloss-ipp">IPP</glossseealso> <glossseealso otherterm="gloss-pwg">PWG</glossseealso> <glossseealso otherterm="gloss-rfc">RFC</glossseealso> </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-ipp">
-                        <glossterm
-><acronym
->IPP</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->I</emphasis
->nternet <emphasis
->P</emphasis
->rinting <emphasis
->P</emphasis
->rotocol; defined in a series of RFCs accepted by the IETF with status "proposed standard"; was designed by the PWG. -- IPP is a completely new design for network printing, but it utilises a very well-known and proven method for the actual data transfer: HTTP 1.1! By not "re-inventing the wheel", and basing itself on an existing and robust Internet standard, IPP is able to relatively easily bolt other HTTP-compatible standard mechanisms into its framework: * Basic, Digest or Certificate authentication mechanisms; * SSL or TLS for encryption of transferred data; * LDAP for directory services (to publish data on printers, device-options, drivers, costs or also to the network; or to check for passwords while performing authentication). </para>
-<glossseealso otherterm="gloss-cups"
->&CUPS;</glossseealso
-> <glossseealso otherterm="gloss-pwg"
->PWG</glossseealso
-> <glossseealso otherterm="gloss-ietf"
->IETF</glossseealso
-> <glossseealso otherterm="gloss-rfc"
->RFC</glossseealso
-> <glossseealso otherterm="gloss-tls"
->TLS</glossseealso
-> </glossdef>
+                        <glossterm><acronym>IPP</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>I</emphasis>nternet <emphasis>P</emphasis>rinting <emphasis>P</emphasis>rotocol; defined in a series of RFCs accepted by the IETF with status "proposed standard"; was designed by the PWG. -- IPP is a completely new design for network printing, but it utilises a very well-known and proven method for the actual data transfer: HTTP 1.1! By not "re-inventing the wheel", and basing itself on an existing and robust Internet standard, IPP is able to relatively easily bolt other HTTP-compatible standard mechanisms into its framework: * Basic, Digest or Certificate authentication mechanisms; * SSL or TLS for encryption of transferred data; * LDAP for directory services (to publish data on printers, device-options, drivers, costs or also to the network; or to check for passwords while performing authentication). </para>
+<glossseealso otherterm="gloss-cups">&CUPS;</glossseealso> <glossseealso otherterm="gloss-pwg">PWG</glossseealso> <glossseealso otherterm="gloss-ietf">IETF</glossseealso> <glossseealso otherterm="gloss-rfc">RFC</glossseealso> <glossseealso otherterm="gloss-tls">TLS</glossseealso> </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-tdeprint">
-                        <glossterm
-><acronym
->TDEPrint</acronym
-></glossterm>
-                        <glossdef
-><para
->The new printing functionality of &kde; since version 2.2 consists of several modules that translate the features and settings of different available print subsystems (&CUPS;, BSD-style LPR/LPD, RLPR...) into nice &kde; desktop &GUI; windows and dialogues to ease their usage. Most important for day-to-day usage is "kprinter", the new &GUI; print command. -- Note: TDEPrint does <emphasis
->not</emphasis
-> implement its own spooling mechanism or its own &PostScript; processing; for this it relies on the selected <emphasis
->print subsystem</emphasis
-> -- however it does add some functionality of its own on top of this foundation... </para>
-<glossseealso otherterm="gloss-bsdstyleprinting"
->BSD-style printing</glossseealso
-> <glossseealso otherterm="gloss-cups"
->&CUPS;</glossseealso
-> <glossseealso otherterm="gloss-kprinter"
->kprinter</glossseealso
-> <glossseealso otherterm="gloss-tdeprinthandbook"
->TDEPrint Handbook</glossseealso
-> </glossdef>
+                        <glossterm><acronym>TDEPrint</acronym></glossterm>
+                        <glossdef><para>The new printing functionality of &kde; since version 2.2 consists of several modules that translate the features and settings of different available print subsystems (&CUPS;, BSD-style LPR/LPD, RLPR...) into nice &kde; desktop &GUI; windows and dialogues to ease their usage. Most important for day-to-day usage is "kprinter", the new &GUI; print command. -- Note: TDEPrint does <emphasis>not</emphasis> implement its own spooling mechanism or its own &PostScript; processing; for this it relies on the selected <emphasis>print subsystem</emphasis> -- however it does add some functionality of its own on top of this foundation... </para>
+<glossseealso otherterm="gloss-bsdstyleprinting">BSD-style printing</glossseealso> <glossseealso otherterm="gloss-cups">&CUPS;</glossseealso> <glossseealso otherterm="gloss-kprinter">kprinter</glossseealso> <glossseealso otherterm="gloss-tdeprinthandbook">TDEPrint Handbook</glossseealso> </glossdef>
                 </glossentry>
 
 
                 <glossentry id="gloss-tdeprinthandbook">
-                        <glossterm
-><acronym
->TDEPrint Handbook...</acronym
-></glossterm>
-                        <glossdef
-><para
->...is the name of the reference document that describes TDEPrint functions to users and administrators. You can load it into Konqueror by typing "help:/tdeprint" into the address field. The <ulink url="http://printing.kde.org/"
->TDEPrint website</ulink
-> is the resource for updates to this documentation, as well as PDF versions suitable for printing it. It is authored and maintained by Kurt Pfeifle. </para>
-                                <glossseealso otherterm="gloss-cupsfaq"
->&CUPS;-FAQ</glossseealso>
+                        <glossterm><acronym>TDEPrint Handbook...</acronym></glossterm>
+                        <glossdef><para>...is the name of the reference document that describes TDEPrint functions to users and administrators. You can load it into Konqueror by typing "help:/tdeprint" into the address field. The <ulink url="http://printing.kde.org/">TDEPrint website</ulink> is the resource for updates to this documentation, as well as PDF versions suitable for printing it. It is authored and maintained by Kurt Pfeifle. </para>
+                                <glossseealso otherterm="gloss-cupsfaq">&CUPS;-FAQ</glossseealso>
                         </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-kprinter">
-                        <glossterm
->kprinter</glossterm>
-                        <glossdef
-><para
-><emphasis
->kprinter</emphasis
-> is the new powerful print utility that is natively used by all &kde; applications. Contrary to some common misconceptions, <emphasis
->kprinter</emphasis
-> is <emphasis
->not</emphasis
-> a &CUPS;-only tool, but supports different print subsystems. You can even switch to a different print subsystem "on the fly", in between two jobs, without re-configuration. Of course, due to the powerful features of &CUPS;, <emphasis
->kprinter</emphasis
-> is best suited for use with a &CUPS; frontend. <emphasis
->kprinter</emphasis
-> is the successor to "qtcups", which is no longer being actively maintained. It has inherited all the best features of qtcups and added several new ones. MOST IMPORTANT: you can use <emphasis
->kprinter</emphasis
-> with all its features in all non-&kde; applications that allow a customized print command, like gv, Acrobat Reader, Netscape, Mozilla, Galeon, StarOffice, OpenOffice and all GNOME programs. <emphasis
->kprinter</emphasis
-> can act as a "standalone" utility, started from an X-Terminal or a "Mini-CLI" to print many different files, from different folders, with different formats, in one job and simultaneously, without the need to first open the files in the applications! (File formats supported this way are &PostScript;, PDF, International and ASCII Text, as well as many different popular graphic formats, such as PNG, TIFF, JPEG, PNM, Sun RASTER, &etc;) </para>
-                                <glossseealso otherterm="gloss-qtcups"
->QtCUPS</glossseealso>
+                        <glossterm>kprinter</glossterm>
+                        <glossdef><para><emphasis>kprinter</emphasis> is the new powerful print utility that is natively used by all &kde; applications. Contrary to some common misconceptions, <emphasis>kprinter</emphasis> is <emphasis>not</emphasis> a &CUPS;-only tool, but supports different print subsystems. You can even switch to a different print subsystem "on the fly", in between two jobs, without re-configuration. Of course, due to the powerful features of &CUPS;, <emphasis>kprinter</emphasis> is best suited for use with a &CUPS; frontend. <emphasis>kprinter</emphasis> is the successor to "qtcups", which is no longer being actively maintained. It has inherited all the best features of qtcups and added several new ones. MOST IMPORTANT: you can use <emphasis>kprinter</emphasis> with all its features in all non-&kde; applications that allow a customized print command, like gv, Acrobat Reader, Netscape, Mozilla, Galeon, StarOffice, OpenOffice and all GNOME programs. <emphasis>kprinter</emphasis> can act as a "standalone" utility, started from an X-Terminal or a "Mini-CLI" to print many different files, from different folders, with different formats, in one job and simultaneously, without the need to first open the files in the applications! (File formats supported this way are &PostScript;, PDF, International and ASCII Text, as well as many different popular graphic formats, such as PNG, TIFF, JPEG, PNM, Sun RASTER, &etc;) </para>
+                                <glossseealso otherterm="gloss-qtcups">QtCUPS</glossseealso>
                         </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-lexmark">
-                        <glossterm
-><acronym
->Lexmark</acronym
-></glossterm>
-                        <glossdef
-><para
->was one of the first companies to distribute their own Linux printer drivers for some of their models. However, those drivers are binary only (no source code available), and therefore cannot be used to integrate into other Free printing software projects. </para>
+                        <glossterm><acronym>Lexmark</acronym></glossterm>
+                        <glossdef><para>was one of the first companies to distribute their own Linux printer drivers for some of their models. However, those drivers are binary only (no source code available), and therefore cannot be used to integrate into other Free printing software projects. </para>
                         </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-linuxprintingorg">
-                        <glossterm
->Linuxprinting.org</glossterm>
-                        <glossdef
-><para
->Linuxprinting.org = not just for Linux; all &UNIX;-like OS-es, like *BSD and commercial Unices may find useful printing information on this site. This web site is the home for the interesting Foomatic project, that strives to develop the "Meta Print Spool and Driver Configuration Toolset" (being able to configure, through one common interface, different print subsystems and their required drivers) with the ability to transfer all queues, printers and configuration files seamlessly to another spooler without new configuration effort. -- Also, they maintain the Printing Database; a collection of driver and device information that enables everybody to find the most current information about printer models, and also generate online the configuration files for any spooler/driver/device combo known to work with one of the common Linux or &UNIX; print subsystems. </para>
-                                <glossseealso otherterm="gloss-linuxprintingdatabase"
->Linuxprinting database</glossseealso>
+                        <glossterm>Linuxprinting.org</glossterm>
+                        <glossdef><para>Linuxprinting.org = not just for Linux; all &UNIX;-like OS-es, like *BSD and commercial Unices may find useful printing information on this site. This web site is the home for the interesting Foomatic project, that strives to develop the "Meta Print Spool and Driver Configuration Toolset" (being able to configure, through one common interface, different print subsystems and their required drivers) with the ability to transfer all queues, printers and configuration files seamlessly to another spooler without new configuration effort. -- Also, they maintain the Printing Database; a collection of driver and device information that enables everybody to find the most current information about printer models, and also generate online the configuration files for any spooler/driver/device combo known to work with one of the common Linux or &UNIX; print subsystems. </para>
+                                <glossseealso otherterm="gloss-linuxprintingdatabase">Linuxprinting database</glossseealso>
                         </glossdef>
                 </glossentry>
 
 
                 <glossentry id="gloss-linuxprintingdatabase">
-                        <glossterm
-><acronym
->Linuxprinting.org Database</acronym
-></glossterm>
-                        <glossdef
-><para
->....Database containing printers and drivers that are suitable for them... ...a lot of information and documentation to be found... ...it is now also providing some tools and utilities for easing the integration of those drivers into a given system... ...the "Foomatic" family of utilities; being the toolset to make use of the database for most of the commonly used print subsystems, for generating "on the fly" working configurations for your printer model. </para>
-                                <glossseealso otherterm="gloss-foomatic"
->Foomatic</glossseealso>
+                        <glossterm><acronym>Linuxprinting.org Database</acronym></glossterm>
+                        <glossdef><para>....Database containing printers and drivers that are suitable for them... ...a lot of information and documentation to be found... ...it is now also providing some tools and utilities for easing the integration of those drivers into a given system... ...the "Foomatic" family of utilities; being the toolset to make use of the database for most of the commonly used print subsystems, for generating "on the fly" working configurations for your printer model. </para>
+                                <glossseealso otherterm="gloss-foomatic">Foomatic</glossseealso>
                         </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-lprlpd">
-                        <glossterm
-><acronym
->LPR/LPD</acronym
-> printing</glossterm>
-                        <glossdef
-><para
->LPR == some people translate <emphasis
->L</emphasis
->ine <emphasis
->P</emphasis
->rinting <emphasis
->R</emphasis
->equest, others: <emphasis
->L</emphasis
->ine <emphasis
->P</emphasis
->rinter <emphasis
->R</emphasis
->emote.</para>
-                                <glossseealso otherterm="gloss-bsdstyleprinting"
->BSD-style printing</glossseealso>
+                        <glossterm><acronym>LPR/LPD</acronym> printing</glossterm>
+                        <glossdef><para>LPR == some people translate <emphasis>L</emphasis>ine <emphasis>P</emphasis>rinting <emphasis>R</emphasis>equest, others: <emphasis>L</emphasis>ine <emphasis>P</emphasis>rinter <emphasis>R</emphasis>emote.</para>
+                                <glossseealso otherterm="gloss-bsdstyleprinting">BSD-style printing</glossseealso>
                         </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-magicfilter">
-                        <glossterm
->Magicfilter</glossterm>
-                        <glossdef
-><para
->Similarly to the APSfilter program, Magicfilter provides automatic file type recognition functions and, base on that, automatic file conversion to a printable format, depending on the target printer.</para>
-                                <glossseealso otherterm="gloss-apsfilter"
->APSfilter</glossseealso>
+                        <glossterm>Magicfilter</glossterm>
+                        <glossdef><para>Similarly to the APSfilter program, Magicfilter provides automatic file type recognition functions and, base on that, automatic file conversion to a printable format, depending on the target printer.</para>
+                                <glossseealso otherterm="gloss-apsfilter">APSfilter</glossseealso>
                         </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-mimetypes">
-                        <glossterm
->&MIME;-Types</glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->M</emphasis
->ultipurpose (or Multimedia) <emphasis
->I</emphasis
->nternet <emphasis
->M</emphasis
->ail <emphasis
->E</emphasis
->xtensions; &MIME;-Types were first used to allow the transport of binary data (like mail attachments containing graphics) over mail connections that were normally only transmitting ASCII characters: the data had to be encoded into an ASCII representation. Later this concept was extended to describe a data format in a platform independent, but at the same time non-ambiguous, way. From &Windows; everybody knows the .doc extensions for &Microsoft; Word files. This is handled ambiguously on the &Windows; platform: .doc extensions are also used for simple text files or for Adobe Framemaker files. And if a real Word file is renamed with a different extension, it can no longer be opened by the program. &MIME; typed files carry a recognition string with them, describing their file format based on <emphasis
->main_category/sub_category</emphasis
->. Inside IPP, print files are also described using the &MIME; type scheme. &MIME; types are registered with the IANA (Internet Assigning Numbers <emphasis
->Association</emphasis
->) to keep them unambiguous. &CUPS; has some &MIME; types of its own registered, like <emphasis
->application/vnd.cups-raster</emphasis
-> (for the &CUPS;-internal raster image format). </para>
-<glossseealso otherterm="gloss-cups"
->&CUPS;</glossseealso
-> <glossseealso otherterm="gloss-easysoftwareproducts"
->Easy Software Products</glossseealso
-> <glossseealso otherterm="gloss-espprintpro"
->ESP PrintPro</glossseealso
-> <glossseealso otherterm="gloss-gimpprint"
->Gimp-Print</glossseealso
-> </glossdef>
+                        <glossterm>&MIME;-Types</glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>M</emphasis>ultipurpose (or Multimedia) <emphasis>I</emphasis>nternet <emphasis>M</emphasis>ail <emphasis>E</emphasis>xtensions; &MIME;-Types were first used to allow the transport of binary data (like mail attachments containing graphics) over mail connections that were normally only transmitting ASCII characters: the data had to be encoded into an ASCII representation. Later this concept was extended to describe a data format in a platform independent, but at the same time non-ambiguous, way. From &Windows; everybody knows the .doc extensions for &Microsoft; Word files. This is handled ambiguously on the &Windows; platform: .doc extensions are also used for simple text files or for Adobe Framemaker files. And if a real Word file is renamed with a different extension, it can no longer be opened by the program. &MIME; typed files carry a recognition string with them, describing their file format based on <emphasis>main_category/sub_category</emphasis>. Inside IPP, print files are also described using the &MIME; type scheme. &MIME; types are registered with the IANA (Internet Assigning Numbers <emphasis>Association</emphasis>) to keep them unambiguous. &CUPS; has some &MIME; types of its own registered, like <emphasis>application/vnd.cups-raster</emphasis> (for the &CUPS;-internal raster image format). </para>
+<glossseealso otherterm="gloss-cups">&CUPS;</glossseealso> <glossseealso otherterm="gloss-easysoftwareproducts">Easy Software Products</glossseealso> <glossseealso otherterm="gloss-espprintpro">ESP PrintPro</glossseealso> <glossseealso otherterm="gloss-gimpprint">Gimp-Print</glossseealso> </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-pcl">
-                        <glossterm
-><acronym
->PCL</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->P</emphasis
->rinter <emphasis
->C</emphasis
->ontrol <emphasis
->L</emphasis
->anguage; developed by &HP;. PCL started off in version 1 as a simple command set for ASCII printing; now, in its versions PCL6 and PCL-X, it is capable of printing graphics and colour -- but outside the &Microsoft; &Windows; realm and &HP-UX; (&HP;'s own brand of &UNIX;), it is not commonly used...</para>
-<glossseealso otherterm="gloss-escp"
->ESC/P</glossseealso
-> <glossseealso otherterm="gloss-hpgl"
->&HP;/GL</glossseealso
-> <glossseealso otherterm="gloss-pdl"
->PDL</glossseealso
-> <glossseealso otherterm="gloss-postscript"
->&PostScript;</glossseealso
-> </glossdef>
+                        <glossterm><acronym>PCL</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>P</emphasis>rinter <emphasis>C</emphasis>ontrol <emphasis>L</emphasis>anguage; developed by &HP;. PCL started off in version 1 as a simple command set for ASCII printing; now, in its versions PCL6 and PCL-X, it is capable of printing graphics and colour -- but outside the &Microsoft; &Windows; realm and &HP-UX; (&HP;'s own brand of &UNIX;), it is not commonly used...</para>
+<glossseealso otherterm="gloss-escp">ESC/P</glossseealso> <glossseealso otherterm="gloss-hpgl">&HP;/GL</glossseealso> <glossseealso otherterm="gloss-pdl">PDL</glossseealso> <glossseealso otherterm="gloss-postscript">&PostScript;</glossseealso> </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-pdl">
-                        <glossterm
-><acronym
->PDL</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->P</emphasis
->age <emphasis
->D</emphasis
->escription <emphasis
->L</emphasis
->anguage; PDLs describe, in an abstract way, the graphical representation of a page. - Before it is actually transferred into toner or ink laid down on to paper, a PDL needs to be "interpreted" first. In &UNIX;, the most important PDL is &PostScript;. </para>
-<glossseealso otherterm="gloss-escp"
->ESC/P</glossseealso
-> <glossseealso otherterm="gloss-hpgl"
->&HP;/GL</glossseealso
-> <glossseealso otherterm="gloss-pcl"
->PCL</glossseealso
-> <glossseealso otherterm="gloss-postscript"
->&PostScript;</glossseealso
-> </glossdef>
+                        <glossterm><acronym>PDL</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>P</emphasis>age <emphasis>D</emphasis>escription <emphasis>L</emphasis>anguage; PDLs describe, in an abstract way, the graphical representation of a page. - Before it is actually transferred into toner or ink laid down on to paper, a PDL needs to be "interpreted" first. In &UNIX;, the most important PDL is &PostScript;. </para>
+<glossseealso otherterm="gloss-escp">ESC/P</glossseealso> <glossseealso otherterm="gloss-hpgl">&HP;/GL</glossseealso> <glossseealso otherterm="gloss-pcl">PCL</glossseealso> <glossseealso otherterm="gloss-postscript">&PostScript;</glossseealso> </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-pixel">
-                        <glossterm
->Pixel</glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->Pic</emphasis
->ture <emphasis
->El</emphasis
->ement; this term describes the smallest part of a raster picture (either as printed on paper or as displayed on a monitor by cathode rays or LCD elements). As any graphical or image representation on those types of output devices is composed of pixels, the values of "ppi" (pixel per inch) and &dpi; (dots per inch) are one important parameter for the overall quality and resolution of an image.</para>
-<glossseealso otherterm="gloss-filter"
->Filter</glossseealso
-> <glossseealso otherterm="gloss-ghostscript"
->Ghostscript</glossseealso
-> <glossseealso otherterm="gloss-postscript"
->&PostScript;</glossseealso
-> <glossseealso otherterm="gloss-raster"
->Raster</glossseealso
-> </glossdef>
+                        <glossterm>Pixel</glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>Pic</emphasis>ture <emphasis>El</emphasis>ement; this term describes the smallest part of a raster picture (either as printed on paper or as displayed on a monitor by cathode rays or LCD elements). As any graphical or image representation on those types of output devices is composed of pixels, the values of "ppi" (pixel per inch) and &dpi; (dots per inch) are one important parameter for the overall quality and resolution of an image.</para>
+<glossseealso otherterm="gloss-filter">Filter</glossseealso> <glossseealso otherterm="gloss-ghostscript">Ghostscript</glossseealso> <glossseealso otherterm="gloss-postscript">&PostScript;</glossseealso> <glossseealso otherterm="gloss-raster">Raster</glossseealso> </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-pjl">
-                        <glossterm
-><acronym
->PJL</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->P</emphasis
->rint <emphasis
->J</emphasis
->ob <emphasis
->L</emphasis
->anguage; developed by &HP; to control and influence default and per-job settings of a printer. It may not only be used for &HP;'s own (PCL-)printers; also many &PostScript; and other printers understand PJL commands sent to them inside a print job, or in a separate signal.</para>
-                                <glossseealso otherterm="gloss-pcl"
->PCL</glossseealso>
+                        <glossterm><acronym>PJL</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>P</emphasis>rint <emphasis>J</emphasis>ob <emphasis>L</emphasis>anguage; developed by &HP; to control and influence default and per-job settings of a printer. It may not only be used for &HP;'s own (PCL-)printers; also many &PostScript; and other printers understand PJL commands sent to them inside a print job, or in a separate signal.</para>
+                                <glossseealso otherterm="gloss-pcl">PCL</glossseealso>
                         </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-postscript">
-                        <glossterm
->&PostScript;</glossterm>
-                        <glossdef
-><para
->&PostScript; (often shortened to "PS") is the de-facto standard in the &UNIX; world for printing files. It was developed by Adobe and licensed to printer manufacturers and software companies. As the &PostScript; specifications were published by Adobe, there are also "Third Party" implementations of &PostScript; generating and &PostScript; interpreting software available (one of the best-known in the Free software world being Ghostscript, a powerful PS-interpreter). </para>
-<glossseealso otherterm="gloss-escp"
->ESC/P</glossseealso
-> <glossseealso otherterm="gloss-hpgl"
->&HP;/GL</glossseealso
-> <glossseealso otherterm="gloss-pcl"
->PCL</glossseealso
-> <glossseealso otherterm="gloss-ppd"
->PPD</glossseealso
-> </glossdef>
+                        <glossterm>&PostScript;</glossterm>
+                        <glossdef><para>&PostScript; (often shortened to "PS") is the de-facto standard in the &UNIX; world for printing files. It was developed by Adobe and licensed to printer manufacturers and software companies. As the &PostScript; specifications were published by Adobe, there are also "Third Party" implementations of &PostScript; generating and &PostScript; interpreting software available (one of the best-known in the Free software world being Ghostscript, a powerful PS-interpreter). </para>
+<glossseealso otherterm="gloss-escp">ESC/P</glossseealso> <glossseealso otherterm="gloss-hpgl">&HP;/GL</glossseealso> <glossseealso otherterm="gloss-pcl">PCL</glossseealso> <glossseealso otherterm="gloss-ppd">PPD</glossseealso> </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-ppd">
-                        <glossterm
-><acronym
->PPD</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->P</emphasis
->ostScript <emphasis
->P</emphasis
->rinter <emphasis
->D</emphasis
->escription; PPDs are ASCII files storing all information about the special capabilities of a printer, plus definitions of the (PostScript- or PJL-) commands to call on a certain capability (like print duplexing). As the explanation of the acronym reveals, PPDs were originally only used for &PostScript; printers. &CUPS; has extended the PPD concept to all types of printers. PPDs for &PostScript; printers are provided by the printer vendors. They can be used with &CUPS; and TDEPrint to have access to the full features of any &PostScript; printer. The TDEPrint Team recommends using a PPD originally intended for use with &Microsoft; Windows NT. PPDs for non-PostScript printers <emphasis
->need</emphasis
-> a companion "filter" to process the &PostScript; print files into a format digestible for the non-PostScript target device. Those PPD/filter combos are not (yet) available from the vendors. After the initiative by the &CUPS; developers to utilise PPDs, the Free Software community was creative enough to quickly come up with support for most of the currently used printer models, through PPDs and classical Ghostscript filters. But note: the printout quality varies from "hi-quality photographic output" (using Gimp-Print with most Epson inkjets) to "hardly readable" (using Foomatic-enabled Ghostscript filters for models rated as "paperweight" in the Linuxprinting.org database). </para>
-<glossseealso otherterm="gloss-cups"
->&CUPS;</glossseealso
-> <glossseealso otherterm="gloss-linuxprintingorg"
->Linuxprinting.org</glossseealso
-> <glossseealso otherterm="gloss-postscript"
->&PostScript;</glossseealso
-> </glossdef>
+                        <glossterm><acronym>PPD</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>P</emphasis>ostScript <emphasis>P</emphasis>rinter <emphasis>D</emphasis>escription; PPDs are ASCII files storing all information about the special capabilities of a printer, plus definitions of the (PostScript- or PJL-) commands to call on a certain capability (like print duplexing). As the explanation of the acronym reveals, PPDs were originally only used for &PostScript; printers. &CUPS; has extended the PPD concept to all types of printers. PPDs for &PostScript; printers are provided by the printer vendors. They can be used with &CUPS; and TDEPrint to have access to the full features of any &PostScript; printer. The TDEPrint Team recommends using a PPD originally intended for use with &Microsoft; Windows NT. PPDs for non-PostScript printers <emphasis>need</emphasis> a companion "filter" to process the &PostScript; print files into a format digestible for the non-PostScript target device. Those PPD/filter combos are not (yet) available from the vendors. After the initiative by the &CUPS; developers to utilise PPDs, the Free Software community was creative enough to quickly come up with support for most of the currently used printer models, through PPDs and classical Ghostscript filters. But note: the printout quality varies from "hi-quality photographic output" (using Gimp-Print with most Epson inkjets) to "hardly readable" (using Foomatic-enabled Ghostscript filters for models rated as "paperweight" in the Linuxprinting.org database). </para>
+<glossseealso otherterm="gloss-cups">&CUPS;</glossseealso> <glossseealso otherterm="gloss-linuxprintingorg">Linuxprinting.org</glossseealso> <glossseealso otherterm="gloss-postscript">&PostScript;</glossseealso> </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-PPD-O-Matic">
-                        <glossterm
->PPD-O-Matic</glossterm>
-                        <glossdef
-><para
->PPD-O-Matic is a set of Perl scripts that run on the Linuxprinting.org web server and can be used online to generate PPDs for any printer that is known to print with Ghostscript. These PPDs can be hooked up to &CUPS;/TDEPrint, as well as used inside PPD-aware applications like StarOffice to determine all different parameters of your printjobs. It is now recommended, in most cases, to use "PPD-O-Matic" instead of the older &CUPS;-O-Matic. To generate a PPD, go to the <ulink url="http://www.linuxprinting.org/printer_list.cgi"
->printer database</ulink
->, select your printer model, follow the link to show the available Ghostscript filters for that printer, select one, click "generate" and finally save the file to your local system. Be sure to read the instructions. Make sure that your local system does indeed have Ghostscript and the filter, which you chose before generating the PPD, installed. </para>
-<glossseealso otherterm="gloss-postscript"
->&PostScript;</glossseealso
-> <glossseealso otherterm="gloss-cups-o-matic"
->&CUPS;-O-Matic</glossseealso
-> <glossseealso otherterm="gloss-linuxprintingorg"
->Linuxprinting.org</glossseealso
-> <glossseealso otherterm="gloss-foomatic"
->Foomatic</glossseealso
-> </glossdef>
+                        <glossterm>PPD-O-Matic</glossterm>
+                        <glossdef><para>PPD-O-Matic is a set of Perl scripts that run on the Linuxprinting.org web server and can be used online to generate PPDs for any printer that is known to print with Ghostscript. These PPDs can be hooked up to &CUPS;/TDEPrint, as well as used inside PPD-aware applications like StarOffice to determine all different parameters of your printjobs. It is now recommended, in most cases, to use "PPD-O-Matic" instead of the older &CUPS;-O-Matic. To generate a PPD, go to the <ulink url="http://www.linuxprinting.org/printer_list.cgi">printer database</ulink>, select your printer model, follow the link to show the available Ghostscript filters for that printer, select one, click "generate" and finally save the file to your local system. Be sure to read the instructions. Make sure that your local system does indeed have Ghostscript and the filter, which you chose before generating the PPD, installed. </para>
+<glossseealso otherterm="gloss-postscript">&PostScript;</glossseealso> <glossseealso otherterm="gloss-cups-o-matic">&CUPS;-O-Matic</glossseealso> <glossseealso otherterm="gloss-linuxprintingorg">Linuxprinting.org</glossseealso> <glossseealso otherterm="gloss-foomatic">Foomatic</glossseealso> </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-printcap">
-                        <glossterm
->printcap</glossterm>
-                        <glossdef
-><para
->In BSD-style print systems, the "printcap" file holds the configuration information; the printing daemon reads this file to determine which printers are available, what filters are to be user for each, where the spooling folder is located, if there are banner pages to be used, and so on... Some applications also depend on read access to the printcap file, to obtain the names of available printers. </para>
-                                <glossseealso otherterm="gloss-bsdstyleprinting"
->BSD-style printing</glossseealso>
+                        <glossterm>printcap</glossterm>
+                        <glossdef><para>In BSD-style print systems, the "printcap" file holds the configuration information; the printing daemon reads this file to determine which printers are available, what filters are to be user for each, where the spooling folder is located, if there are banner pages to be used, and so on... Some applications also depend on read access to the printcap file, to obtain the names of available printers. </para>
+                                <glossseealso otherterm="gloss-bsdstyleprinting">BSD-style printing</glossseealso>
                         </glossdef>
                 </glossentry>
   
 
                 <glossentry id="gloss-printermib">
-                        <glossterm
->Printer-<acronym
->MIB</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->Printer</emphasis
->-<emphasis
->M</emphasis
->anagement <emphasis
->I</emphasis
->nformation <emphasis
->B</emphasis
->ase; the Printer-MIB defines a set of parameters that are to be stored inside the printer for access through the network. This is useful if many (in some cases, literally thousands) network printers are managed centrally with the help of SNMP (Simple Network Management Protocol).</para>
-<glossseealso otherterm="gloss-pwg"
->PWG</glossseealso
-> <glossseealso otherterm="gloss-snmp"
->SNMP</glossseealso
-> </glossdef>
+                        <glossterm>Printer-<acronym>MIB</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>Printer</emphasis>-<emphasis>M</emphasis>anagement <emphasis>I</emphasis>nformation <emphasis>B</emphasis>ase; the Printer-MIB defines a set of parameters that are to be stored inside the printer for access through the network. This is useful if many (in some cases, literally thousands) network printers are managed centrally with the help of SNMP (Simple Network Management Protocol).</para>
+<glossseealso otherterm="gloss-pwg">PWG</glossseealso> <glossseealso otherterm="gloss-snmp">SNMP</glossseealso> </glossdef>
                 </glossentry>
   
                 <glossentry id="gloss-pwg">
-                        <glossterm
-><acronym
->PWG</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->P</emphasis
->rinter <emphasis
->W</emphasis
->orking <emphasis
->G</emphasis
->roup; the PWG is a loose grouping of representatives of the printer industry that has, in the past years, developed different standards in relation to network printing. These were later accepted by the IETF as RFC standards, like the "Printer-MIB" and the IPP.</para>
-<glossseealso otherterm="gloss-postscript"
->&PostScript;</glossseealso
-> <glossseealso otherterm="gloss-ipp"
->IPP</glossseealso
-> <glossseealso otherterm="gloss-printermib"
->Printer-MIB</glossseealso
-> <glossseealso otherterm="gloss-snmp"
->SNMP</glossseealso
-> </glossdef>
+                        <glossterm><acronym>PWG</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>P</emphasis>rinter <emphasis>W</emphasis>orking <emphasis>G</emphasis>roup; the PWG is a loose grouping of representatives of the printer industry that has, in the past years, developed different standards in relation to network printing. These were later accepted by the IETF as RFC standards, like the "Printer-MIB" and the IPP.</para>
+<glossseealso otherterm="gloss-postscript">&PostScript;</glossseealso> <glossseealso otherterm="gloss-ipp">IPP</glossseealso> <glossseealso otherterm="gloss-printermib">Printer-MIB</glossseealso> <glossseealso otherterm="gloss-snmp">SNMP</glossseealso> </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-printtdeioslave">
-                        <glossterm
->print:/ TDEIO Slave</glossterm>
-                        <glossdef
-><para
->You can use a syntax of "print:/..." to get quick access to TDEPrint resources. Typing "print:/manager" as a Konqueror URL address gives administrative access to TDEPrint. Konqueror uses &kde;'s famous "KParts" technology to achieve that. </para>
-<glossseealso otherterm="gloss-ioslave"
->IO Slave</glossseealso
-> <glossseealso otherterm="gloss-tdeparts"
->KParts</glossseealso
-> </glossdef>
+                        <glossterm>print:/ TDEIO Slave</glossterm>
+                        <glossdef><para>You can use a syntax of "print:/..." to get quick access to TDEPrint resources. Typing "print:/manager" as a Konqueror URL address gives administrative access to TDEPrint. Konqueror uses &kde;'s famous "KParts" technology to achieve that. </para>
+<glossseealso otherterm="gloss-ioslave">IO Slave</glossseealso> <glossseealso otherterm="gloss-tdeparts">KParts</glossseealso> </glossdef>
                 </glossentry>
 
 
                 <glossentry id="gloss-printerdatabase">
-                        <glossterm
->Printer Database</glossterm>
-                        <glossdef
-><para
->.</para>
-                                <glossseealso otherterm="gloss-linuxprintingdatabase"
->Linuxprinting Database</glossseealso>
+                        <glossterm>Printer Database</glossterm>
+                        <glossdef><para>.</para>
+                                <glossseealso otherterm="gloss-linuxprintingdatabase">Linuxprinting Database</glossseealso>
                         </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-qtcups">
-                        <glossterm
-><acronym
->Qt&CUPS;</acronym
-></glossterm>
-                        <glossdef
-><para
->Qt&CUPS; and KUPS were the predecessors of TDEPrint; they are now deprecated and no longer maintained. What was good in qtcups is all inherited by "kprinter", the new TDE print dialogue (which is much improved over qtcups); what you liked about kups is now all in the TDEPrint Manager (accessible via the KDE Control Centre or via the URL "print:/manager" from Konqueror) -- with more functionality and less bugs... Its former developer, Michael Goffioul, is now the developer of TDEPrint -- a very nice and productive guy and quick bug fixer... </para>
-                                <glossseealso otherterm="gloss-kprinter"
->kprinter</glossseealso>
+                        <glossterm><acronym>Qt&CUPS;</acronym></glossterm>
+                        <glossdef><para>Qt&CUPS; and KUPS were the predecessors of TDEPrint; they are now deprecated and no longer maintained. What was good in qtcups is all inherited by "kprinter", the new TDE print dialogue (which is much improved over qtcups); what you liked about kups is now all in the TDEPrint Manager (accessible via the KDE Control Centre or via the URL "print:/manager" from Konqueror) -- with more functionality and less bugs... Its former developer, Michael Goffioul, is now the developer of TDEPrint -- a very nice and productive guy and quick bug fixer... </para>
+                                <glossseealso otherterm="gloss-kprinter">kprinter</glossseealso>
                         </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-raster">
-                        <glossterm
->Raster Image</glossterm>
-                        <glossdef
-><para
->Every picture on a physical medium is composed of a pattern of discrete dots in different colours and (maybe) sizes. This is called a "raster image". This is as opposed to a "vector image" where the graphic is described in terms of continuous curves, shades, forms and filled areas, represented by mathematical formula. Vector images normally have a smaller file size and may be scaled in size without any loss of information and quality --- but they cannot be output directly, but always have to be "rendered" or "rasterised" first to the given resolution that the output device is capable of... The rasterisation is done by a Raster Image Processor (RIP, often the Ghostscript software) or some other filtering instance.</para>
-<glossseealso otherterm="gloss-pixel"
->Pixel</glossseealso
-> <glossseealso otherterm="gloss-ghostscript"
->Ghostscript</glossseealso
-> <glossseealso otherterm="gloss-postscript"
->&PostScript;</glossseealso
-> <glossseealso otherterm="gloss-filter"
->Filter</glossseealso
-> <glossseealso otherterm="gloss-rip"
->RIP</glossseealso
-> </glossdef>
+                        <glossterm>Raster Image</glossterm>
+                        <glossdef><para>Every picture on a physical medium is composed of a pattern of discrete dots in different colours and (maybe) sizes. This is called a "raster image". This is as opposed to a "vector image" where the graphic is described in terms of continuous curves, shades, forms and filled areas, represented by mathematical formula. Vector images normally have a smaller file size and may be scaled in size without any loss of information and quality --- but they cannot be output directly, but always have to be "rendered" or "rasterised" first to the given resolution that the output device is capable of... The rasterisation is done by a Raster Image Processor (RIP, often the Ghostscript software) or some other filtering instance.</para>
+<glossseealso otherterm="gloss-pixel">Pixel</glossseealso> <glossseealso otherterm="gloss-ghostscript">Ghostscript</glossseealso> <glossseealso otherterm="gloss-postscript">&PostScript;</glossseealso> <glossseealso otherterm="gloss-filter">Filter</glossseealso> <glossseealso otherterm="gloss-rip">RIP</glossseealso> </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-rip">
-                        <glossterm
-><acronym
->RIP</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->R</emphasis
->aster <emphasis
->I</emphasis
->mage <emphasis
->P</emphasis
->rocess(or); if used in the context of printing, "RIP" means a hardware or software instance that converts &PostScript; (or other print formats that are represented in one of the non-Raster PDLs) into a raster image format in such a way that it is acceptable for the "marking engine" of the printer. &PostScript; printers contain their own PostScript-RIPs. A RIP may or may not be located inside a printer. For many &UNIX; systems, Ghostscript is the package that provides a "RIP in software", running on the host computer, and pre-digesting the &PostScript; or other data to become ready to be sent to the printing device (hence you may perceive a "grain of truth" in the slogan "Ghostscript turns your printer into a &PostScript; machine", which of course is not correct in the true sense of the meaning).</para>
-<glossseealso otherterm="gloss-filter"
->Filter</glossseealso
-> <glossseealso otherterm="gloss-ghostscript"
->Ghostscript</glossseealso
-> <glossseealso otherterm="gloss-postscript"
->&PostScript;</glossseealso
-> <glossseealso otherterm="gloss-pdl"
->PDL</glossseealso
-> <glossseealso otherterm="gloss-raster"
->Raster</glossseealso
-> </glossdef>
+                        <glossterm><acronym>RIP</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>R</emphasis>aster <emphasis>I</emphasis>mage <emphasis>P</emphasis>rocess(or); if used in the context of printing, "RIP" means a hardware or software instance that converts &PostScript; (or other print formats that are represented in one of the non-Raster PDLs) into a raster image format in such a way that it is acceptable for the "marking engine" of the printer. &PostScript; printers contain their own PostScript-RIPs. A RIP may or may not be located inside a printer. For many &UNIX; systems, Ghostscript is the package that provides a "RIP in software", running on the host computer, and pre-digesting the &PostScript; or other data to become ready to be sent to the printing device (hence you may perceive a "grain of truth" in the slogan "Ghostscript turns your printer into a &PostScript; machine", which of course is not correct in the true sense of the meaning).</para>
+<glossseealso otherterm="gloss-filter">Filter</glossseealso> <glossseealso otherterm="gloss-ghostscript">Ghostscript</glossseealso> <glossseealso otherterm="gloss-postscript">&PostScript;</glossseealso> <glossseealso otherterm="gloss-pdl">PDL</glossseealso> <glossseealso otherterm="gloss-raster">Raster</glossseealso> </glossdef>
                 </glossentry>
 
 
                 <glossentry id="gloss-rlpr">
-                        <glossterm
-><acronym
->RLPR</acronym
-> (Remote LPR)</glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->R</emphasis
->emote <emphasis
->L</emphasis
->ine <emphasis
->P</emphasis
->rinting <emphasis
->R</emphasis
->equest; this is a BSD-style printing system, that needs no root privileges to be installed, and no "printcap" to work: all parameters may be specified on the command line. RLPR comes in handy for many laptop users who are working in frequently changing environments. This is because it may be installed concurrently with every other printing sub system, and allows a very flexible and quick way to install a printer for direct access via LPR/LPD. TDEPrint has an "Add Printer Wizard" to make RLPR usage even easier. The kprinter command allows switching to RLPR "on the fly" at any time.</para>
-<glossseealso otherterm="gloss-tdeprint"
->TDEPrint</glossseealso
-> <glossseealso otherterm="gloss-kprinter"
->kprinter</glossseealso
-> <glossseealso otherterm="gloss-printcap"
->printcap</glossseealso
-> </glossdef>
+                        <glossterm><acronym>RLPR</acronym> (Remote LPR)</glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>R</emphasis>emote <emphasis>L</emphasis>ine <emphasis>P</emphasis>rinting <emphasis>R</emphasis>equest; this is a BSD-style printing system, that needs no root privileges to be installed, and no "printcap" to work: all parameters may be specified on the command line. RLPR comes in handy for many laptop users who are working in frequently changing environments. This is because it may be installed concurrently with every other printing sub system, and allows a very flexible and quick way to install a printer for direct access via LPR/LPD. TDEPrint has an "Add Printer Wizard" to make RLPR usage even easier. The kprinter command allows switching to RLPR "on the fly" at any time.</para>
+<glossseealso otherterm="gloss-tdeprint">TDEPrint</glossseealso> <glossseealso otherterm="gloss-kprinter">kprinter</glossseealso> <glossseealso otherterm="gloss-printcap">printcap</glossseealso> </glossdef>
                 </glossentry>
 
  
                 <glossentry id="gloss-snmp">
-                        <glossterm
-><acronym
->SNMP</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->S</emphasis
->imple <emphasis
->N</emphasis
->etwork <emphasis
->M</emphasis
->anagement <emphasis
->P</emphasis
->rotocol; SNMP is widely used to control all types of network node (Hosts, Routers, Switches, Gateways, Printers...) remotely.</para>
-<glossseealso otherterm="gloss-pwg"
->PWG</glossseealso
-> <glossseealso otherterm="gloss-printermib"
->Printer-MIB</glossseealso
-> </glossdef>
+                        <glossterm><acronym>SNMP</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>S</emphasis>imple <emphasis>N</emphasis>etwork <emphasis>M</emphasis>anagement <emphasis>P</emphasis>rotocol; SNMP is widely used to control all types of network node (Hosts, Routers, Switches, Gateways, Printers...) remotely.</para>
+<glossseealso otherterm="gloss-pwg">PWG</glossseealso> <glossseealso otherterm="gloss-printermib">Printer-MIB</glossseealso> </glossdef>
                 </glossentry>
 
 	        <glossentry id="gloss-ssl">
-                        <glossterm
-><acronym
->SSL(3)</acronym
-> encryption</glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->S</emphasis
->ecure <emphasis
->S</emphasis
->ocket <emphasis
->L</emphasis
->ayer; <acronym
->SSL</acronym
-> is a proprietary encryption method for data transfer over HTTP that was developed by Netscape. It is now being replaced by an IETF standard named TLS. </para>
-                                <glossseealso otherterm="gloss-tls"
-><acronym
->TLS</acronym
-></glossseealso>
+                        <glossterm><acronym>SSL(3)</acronym> encryption</glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>S</emphasis>ecure <emphasis>S</emphasis>ocket <emphasis>L</emphasis>ayer; <acronym>SSL</acronym> is a proprietary encryption method for data transfer over HTTP that was developed by Netscape. It is now being replaced by an IETF standard named TLS. </para>
+                                <glossseealso otherterm="gloss-tls"><acronym>TLS</acronym></glossseealso>
                         </glossdef>
                 </glossentry>
 
 
 	        <glossentry id="gloss-spooling">
-                        <glossterm
-><acronym
->SPOOL</acronym
->ing</glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->S</emphasis
->ynchronous <emphasis
->P</emphasis
->eripheral <emphasis
->O</emphasis
->perations <emphasis
->O</emphasis
->n<emphasis
->L</emphasis
->ine; <acronym
->SPOOL</acronym
->ing enables printing applications (and users) to continue their work as the job is being taken care of by a system <acronym
->daemon</acronym
->, which stores the file at a temporary location until the printer is ready to print. </para>
-                                <glossseealso otherterm="gloss-daemon"
-><acronym
->Daemon</acronym
-></glossseealso>
+                        <glossterm><acronym>SPOOL</acronym>ing</glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>S</emphasis>ynchronous <emphasis>P</emphasis>eripheral <emphasis>O</emphasis>perations <emphasis>O</emphasis>n<emphasis>L</emphasis>ine; <acronym>SPOOL</acronym>ing enables printing applications (and users) to continue their work as the job is being taken care of by a system <acronym>daemon</acronym>, which stores the file at a temporary location until the printer is ready to print. </para>
+                                <glossseealso otherterm="gloss-daemon"><acronym>Daemon</acronym></glossseealso>
                         </glossdef>
                 </glossentry>
 
 
 	        <glossentry id="gloss-tls">
-                        <glossterm
-><acronym
->TLS</acronym
-> encryption</glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->T</emphasis
->ransport <emphasis
->L</emphasis
->ayer <emphasis
->S</emphasis
->ecurity; <acronym
->TLS</acronym
-> is an encryption standard for data transfered over HTTP 1.1; it is defined in RFC 2246; although based on the former SSL development (from Netscape) it is not fully compatible with it. </para>
-                                <glossseealso otherterm="gloss-ssl"
-><acronym
->SSL(3)</acronym
-></glossseealso>
+                        <glossterm><acronym>TLS</acronym> encryption</glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>T</emphasis>ransport <emphasis>L</emphasis>ayer <emphasis>S</emphasis>ecurity; <acronym>TLS</acronym> is an encryption standard for data transfered over HTTP 1.1; it is defined in RFC 2246; although based on the former SSL development (from Netscape) it is not fully compatible with it. </para>
+                                <glossseealso otherterm="gloss-ssl"><acronym>SSL(3)</acronym></glossseealso>
                         </glossdef>
                 </glossentry>
 
 
 	        <glossentry id="gloss-systemVstyleprinting">
-                        <glossterm
->System V-style printing</glossterm>
-                        <glossdef
-><para
->This is the second flavour of traditional &UNIX; printing (as opposed to BSD-style printing). It uses a different command set (lp, lpadmin,...) to BSD, but is not fundamentally different from it. However, the gap between the two is big enough to make the two incompatible, so that a BSD-client cannot simply print to a System V style print server without additional tweaking... IPP is supposed to resolve this weakness and more. </para>
-<glossseealso otherterm="gloss-bsdstyleprinting"
-><acronym
->BSD-style printing</acronym
-></glossseealso
-> <glossseealso otherterm="gloss-ipp"
-><acronym
->IPP</acronym
-></glossseealso
-> </glossdef>
+                        <glossterm>System V-style printing</glossterm>
+                        <glossdef><para>This is the second flavour of traditional &UNIX; printing (as opposed to BSD-style printing). It uses a different command set (lp, lpadmin,...) to BSD, but is not fundamentally different from it. However, the gap between the two is big enough to make the two incompatible, so that a BSD-client cannot simply print to a System V style print server without additional tweaking... IPP is supposed to resolve this weakness and more. </para>
+<glossseealso otherterm="gloss-bsdstyleprinting"><acronym>BSD-style printing</acronym></glossseealso> <glossseealso otherterm="gloss-ipp"><acronym>IPP</acronym></glossseealso> </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-turboprint">
-                        <glossterm
->TurboPrint</glossterm>
-                        <glossdef
-><para
->Shareware software providing photo quality printing for many inkjet printers. It is useful if you are unable to find a driver for your printer and may be hooked into either a traditional Ghostscript system or a modern &CUPS; system.</para>
-                                <glossseealso otherterm="gloss-gimpprint"
->Gimp-Print</glossseealso>
+                        <glossterm>TurboPrint</glossterm>
+                        <glossdef><para>Shareware software providing photo quality printing for many inkjet printers. It is useful if you are unable to find a driver for your printer and may be hooked into either a traditional Ghostscript system or a modern &CUPS; system.</para>
+                                <glossseealso otherterm="gloss-gimpprint">Gimp-Print</glossseealso>
                         </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-xpp">
-                        <glossterm
-><acronym
->XPP</acronym
-></glossterm>
-                        <glossdef
-><para
->Abbreviation for <emphasis
->X</emphasis
-> <emphasis
->P</emphasis
->rinting <emphasis
->P</emphasis
->anel; <acronym
->XPP</acronym
-> was the first Free graphical print command for &CUPS;, written by Till Kamppeter, and in some ways a model for the "kprinter" utility in &kde;.</para>
+                        <glossterm><acronym>XPP</acronym></glossterm>
+                        <glossdef><para>Abbreviation for <emphasis>X</emphasis> <emphasis>P</emphasis>rinting <emphasis>P</emphasis>anel; <acronym>XPP</acronym> was the first Free graphical print command for &CUPS;, written by Till Kamppeter, and in some ways a model for the "kprinter" utility in &kde;.</para>
                         </glossdef>
                 </glossentry>
 <!--
                 <glossentry id="gloss-1">
-                        <glossterm
->xxxx</glossterm>
-                        <glossdef
-><para
->.</para>
-                                <glossseealso otherterm="gloss-1"
->xyz</glossseealso>
+                        <glossterm>xxxx</glossterm>
+                        <glossdef><para>.</para>
+                                <glossseealso otherterm="gloss-1">xyz</glossseealso>
                         </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-3">
-                        <glossterm
->xxxx</glossterm>
-                        <glossdef
-><para
->.</para>
-                                <glossseealso otherterm="gloss-1"
->xyz</glossseealso>
+                        <glossterm>xxxx</glossterm>
+                        <glossdef><para>.</para>
+                                <glossseealso otherterm="gloss-1">xyz</glossseealso>
                         </glossdef>
                 </glossentry>
 
                 <glossentry id="gloss-4">
-                        <glossterm
->xxxx</glossterm>
-                        <glossdef
-><para
->.</para>
-                                <glossseealso otherterm="gloss-1"
->xyz</glossseealso>
+                        <glossterm>xxxx</glossterm>
+                        <glossdef><para>.</para>
+                                <glossseealso otherterm="gloss-1">xyz</glossseealso>
                         </glossdef>
                 </glossentry>
 -->
diff --git a/tde-i18n-en_GB/docs/tdebase/kate/advanced.docbook b/tde-i18n-en_GB/docs/tdebase/kate/advanced.docbook
index 128a567ef87..44ef40da5df 100644
--- a/tde-i18n-en_GB/docs/tdebase/kate/advanced.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kate/advanced.docbook
@@ -1,171 +1,65 @@
 <chapter id="advanced-editing-tools">
 <chapterinfo>
 <authorgroup>
-<author
->&Anders.Lund; &Anders.Lund.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Anders.Lund; &Anders.Lund.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </chapterinfo>
-<title
->Advanced Editing Tools</title>
+<title>Advanced Editing Tools</title>
 
 <sect1 id="comment">
 
-<title
->Comment/Uncomment</title>
-
-<para
->The Comment and Uncomment commands, available from the <guimenu
->Tools</guimenu
-> menu allow you to add or remove comment markers to the selection, or the current line if no text is selected, it comments are supported by the format of the text you are editing.</para>
-
-<para
->The rules for how commenting is done are defined in the syntax definitions, so if syntax highlighting is not used, commenting/uncommenting is not possible.</para>
-
-<para
->Some formats define single line comment markers, some multi line markers and some both. If multi line markers are not available, commenting out a selection that does not fully include its last line is not possible.</para>
-
-<para
->If a single line marker is available, commenting single lines is preferred where applicable, as this helps to avoid problems with nested comments.</para>
-
-<para
->When removing comment markers, no uncommented text should be selected. When removing multiline comment markers from a selection, any whitespace outside the comment markers is ignored.</para>
-
-<para
-><indexterm
-><primary
->comment</primary
-></indexterm
-> To place comment markers, use the <menuchoice
-><guimenu
->Tools</guimenu
-><guimenuitem
->Comment</guimenuitem
-></menuchoice
-> menu item or the related keyboard shortcut sequence, default is <keycombo action="simul"
->&Ctrl;<keycap
->#</keycap
-></keycombo
->.</para>
-
-<para
-><indexterm
-><primary
->uncomment</primary
-></indexterm
-> To remove comment markers, use the <menuchoice
-><guimenu
->Tools</guimenu
-><guimenuitem
->Uncomment</guimenuitem
-></menuchoice
-> menu item or the related keyboard shortcut, default is <keycombo action="simul"
->&Ctrl;&Shift;<keycap
->#</keycap
-></keycombo
->.</para>
+<title>Comment/Uncomment</title>
+
+<para>The Comment and Uncomment commands, available from the <guimenu>Tools</guimenu> menu allow you to add or remove comment markers to the selection, or the current line if no text is selected, it comments are supported by the format of the text you are editing.</para>
+
+<para>The rules for how commenting is done are defined in the syntax definitions, so if syntax highlighting is not used, commenting/uncommenting is not possible.</para>
+
+<para>Some formats define single line comment markers, some multi line markers and some both. If multi line markers are not available, commenting out a selection that does not fully include its last line is not possible.</para>
+
+<para>If a single line marker is available, commenting single lines is preferred where applicable, as this helps to avoid problems with nested comments.</para>
+
+<para>When removing comment markers, no uncommented text should be selected. When removing multiline comment markers from a selection, any whitespace outside the comment markers is ignored.</para>
+
+<para><indexterm><primary>comment</primary></indexterm> To place comment markers, use the <menuchoice><guimenu>Tools</guimenu><guimenuitem>Comment</guimenuitem></menuchoice> menu item or the related keyboard shortcut sequence, default is <keycombo action="simul">&Ctrl;<keycap>#</keycap></keycombo>.</para>
+
+<para><indexterm><primary>uncomment</primary></indexterm> To remove comment markers, use the <menuchoice><guimenu>Tools</guimenu><guimenuitem>Uncomment</guimenuitem></menuchoice> menu item or the related keyboard shortcut, default is <keycombo action="simul">&Ctrl;&Shift;<keycap>#</keycap></keycombo>.</para>
 
 </sect1>
 
 <sect1 id="edit-command">
 
-<title
->Editing Command</title>
-
-<para
->This tool, available from the <menuchoice
-><guimenu
->Tools</guimenu
-><guimenuitem
->Editing Command</guimenuitem
-></menuchoice
-> menu item, provides access to a small set of <application
->vi</application
->/<application
->vim</application
->-like commands for editing the text. It is a no nonsense tool for advanced or experienced users, but do not let that hold you back from experiencing its powers!</para>
-
-<para
->Currently, the following commands are available:</para>
+<title>Editing Command</title>
+
+<para>This tool, available from the <menuchoice><guimenu>Tools</guimenu><guimenuitem>Editing Command</guimenuitem></menuchoice> menu item, provides access to a small set of <application>vi</application>/<application>vim</application>-like commands for editing the text. It is a no nonsense tool for advanced or experienced users, but do not let that hold you back from experiencing its powers!</para>
+
+<para>Currently, the following commands are available:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><command
->time</command
-></term>
+<term><command>time</command></term>
 
 <listitem>
-<para
->This command will output the current time as known by your computer in the format <quote
->HH:MM:SS</quote
-></para>
-
-<para
->To use it, launch the Editing Command Dialogue and type into the input box the word <userinput
->time</userinput
-></para>
+<para>This command will output the current time as known by your computer in the format <quote>HH:MM:SS</quote></para>
+
+<para>To use it, launch the Editing Command Dialogue and type into the input box the word <userinput>time</userinput></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><command
->char</command
-></term>
+<term><command>char</command></term>
 <listitem>
-<para
->This command allows you to insert literal characters by their numerical identifier, in decimal, octal or hexadecimal form. To use it launch the Editing Command dialogue and type <userinput
->char: [number]</userinput
-> in the entry box, then hit <guibutton
->OK</guibutton
->.</para
-> 
+<para>This command allows you to insert literal characters by their numerical identifier, in decimal, octal or hexadecimal form. To use it launch the Editing Command dialogue and type <userinput>char: [number]</userinput> in the entry box, then hit <guibutton>OK</guibutton>.</para> 
 
 <example>
-<title
-><command
->char</command
-> examples</title>
-
-<para
->Input: <userinput
->char:234</userinput
-></para>
-<para
->Output: <computeroutput
->ê</computeroutput
-></para>
-<para
->Input: <userinput
->char:0x1234</userinput
-></para>
-<para
->Output: <computeroutput
->ê</computeroutput
-></para>
-<para
->Input: <userinput
->char:1232</userinput
-></para>
-<para
->Output: <computeroutput
->ê</computeroutput
-></para>
+<title><command>char</command> examples</title>
+
+<para>Input: <userinput>char:234</userinput></para>
+<para>Output: <computeroutput>ê</computeroutput></para>
+<para>Input: <userinput>char:0x1234</userinput></para>
+<para>Output: <computeroutput>ê</computeroutput></para>
+<para>Input: <userinput>char:1232</userinput></para>
+<para>Output: <computeroutput>ê</computeroutput></para>
 </example>
 
 </listitem>
@@ -175,157 +69,54 @@
 <varlistentry>
 
 <term>
-<indexterm
-><primary
->replace, sed style</primary>
-<secondary
->search, sed style</secondary
-></indexterm>
-<command
->s///[ig]</command
-> <command
->%s///[ig]</command
-></term>
+<indexterm><primary>replace, sed style</primary>
+<secondary>search, sed style</secondary></indexterm>
+<command>s///[ig]</command> <command>%s///[ig]</command></term>
 
 <listitem>
-<para
->This command does a sed-like search/replace operation on the current line, or on the whole file (<command
->%s///</command
->).</para>
-
-<para
->In short, the text is searched for text matching the <emphasis
->search pattern</emphasis
->, the regular expression between the first and the second slash, and when a match is found, the matching part of the text is replaced with the expression between the middle and last part of the string. Parentheses in the search pattern create <emphasis
->back references</emphasis
->, that is the command remembers which part of the match matched in the parentheses; these strings can be reused in the replace pattern, referred to as <userinput
->\1</userinput
-> for the first set of parentheses, <userinput
->\2</userinput
-> for the second and so on.</para>
-
-<para
->To search for a literal <literal
->(</literal
-> or <literal
->)</literal
->, you need to <emphasis
->escape</emphasis
-> it using a backslash character: <userinput
->\(\)</userinput
-></para>
-
-<para
->If you put an <userinput
->i</userinput
-> at the end of the expression, the matching will be case insensitive.</para>
+<para>This command does a sed-like search/replace operation on the current line, or on the whole file (<command>%s///</command>).</para>
+
+<para>In short, the text is searched for text matching the <emphasis>search pattern</emphasis>, the regular expression between the first and the second slash, and when a match is found, the matching part of the text is replaced with the expression between the middle and last part of the string. Parentheses in the search pattern create <emphasis>back references</emphasis>, that is the command remembers which part of the match matched in the parentheses; these strings can be reused in the replace pattern, referred to as <userinput>\1</userinput> for the first set of parentheses, <userinput>\2</userinput> for the second and so on.</para>
+
+<para>To search for a literal <literal>(</literal> or <literal>)</literal>, you need to <emphasis>escape</emphasis> it using a backslash character: <userinput>\(\)</userinput></para>
+
+<para>If you put an <userinput>i</userinput> at the end of the expression, the matching will be case insensitive.</para>
 
 <example>
 
-<title
->Replacing text in the current line</title>
+<title>Replacing text in the current line</title>
 
-<para
->Your friendly compiler just stopped, telling you that the class <classname
->myClass</classname
-> mentioned in line 3902 in your source file is not defined.</para>
+<para>Your friendly compiler just stopped, telling you that the class <classname>myClass</classname> mentioned in line 3902 in your source file is not defined.</para>
 
-<para
->&quot;Buckle!&quot; you think, it is of course <classname
->MyClass</classname
->. You go to line 3902, and instead of trying to find the word in the text, you launch the Editing Command Dialogue, enter <userinput
->s/myclass/MyClass/i</userinput
->, hit the <guibutton
->OK</guibutton
-> button, save the file and compile &ndash; successfully without the error.</para>
+<para>&quot;Buckle!&quot; you think, it is of course <classname>MyClass</classname>. You go to line 3902, and instead of trying to find the word in the text, you launch the Editing Command Dialogue, enter <userinput>s/myclass/MyClass/i</userinput>, hit the <guibutton>OK</guibutton> button, save the file and compile &ndash; successfully without the error.</para>
 
 </example>
 
 <example>
-<title
->Replacing text in the whole file</title>
-
-<para
->Imagine that you have a file, in which you mention a <quote
->Miss Jensen</quote
-> several times, when someone comes in and tells you that she just got married to <quote
->Mr Jones</quote
->. You want, of course, to replace each and every occurrence of <quote
->Miss Jensen</quote
-> with <quote
->Ms Jones</quote
->.</para>
-
-<para
->Launch the Editing Command dialogue, and type into the entry box: <userinput
->%s/Miss Jensen/Ms Jones/</userinput
-> and hit return, you are done.</para>
+<title>Replacing text in the whole file</title>
+
+<para>Imagine that you have a file, in which you mention a <quote>Miss Jensen</quote> several times, when someone comes in and tells you that she just got married to <quote>Mr Jones</quote>. You want, of course, to replace each and every occurrence of <quote>Miss Jensen</quote> with <quote>Ms Jones</quote>.</para>
+
+<para>Launch the Editing Command dialogue, and type into the entry box: <userinput>%s/Miss Jensen/Ms Jones/</userinput> and hit return, you are done.</para>
 
 </example>
 
 <example>
-<title
->A More Advanced Example</title>
-
-<para
->This example makes use of <emphasis
->back references</emphasis
-> as well as a <emphasis
->word class</emphasis
-> (if you do not know what that is, please refer to the related documentation mentioned below).</para>
-
-<para
->Suppose you have the following line: <programlisting
->void MyClass::DoStringOps( String      &amp;foo, String &amp;bar String *p, int  &amp;a, int &amp;b )</programlisting>
+<title>A More Advanced Example</title>
+
+<para>This example makes use of <emphasis>back references</emphasis> as well as a <emphasis>word class</emphasis> (if you do not know what that is, please refer to the related documentation mentioned below).</para>
+
+<para>Suppose you have the following line: <programlisting>void MyClass::DoStringOps( String      &amp;foo, String &amp;bar String *p, int  &amp;a, int &amp;b )</programlisting>
 </para>
-<para
->Now you realise that this is not nice code, and decide that you want to use the <constant
->const</constant
-> keyword for all <quote
->address of</quote
-> arguments, those characterised by the &amp; operator in front of the argument name. You would also like to simplify the white space, so that there is only 1 whitespace character between each word.</para>
-
-<para
->Launch the Editing Command Dialogue, and enter: <userinput
->s/\s+(\w+)\s+(&amp;)/ const \1 \2/g</userinput
-> and hit the <guibutton
->OK</guibutton
-> button. The <userinput
->g</userinput
-> at the end of the expression makes the regular expression recompile for each match to save the <emphasis
->backreferences</emphasis
->.</para>
-
-<para
->Output: <computeroutput
->void MyClass::DoStringOps( const String &amp;foo, const String &amp;bar String *p, const int &amp;a, const int &amp;b )</computeroutput
-></para>
-
-<para
->Mission completed! Now, what happened? Well, we looked for some white space (<literal
->\s+</literal
->) followed by one or more alphabetic characters (<literal
->\w+</literal
->) followed by some more whitespace (<literal
->\s+</literal
->) followed by an ampersand, and in the process saved the alphabetic chunk and the ampersand for reuse in the replace operation. Then we replaced the matching part of our line with one whitespace followed by <quote
->const</quote
-> followed by one whitespace followed by our saved alphabetical chunk (<literal
->\1</literal
->) followed by one whitespace followed by our saved ampersand (<literal
->\2</literal
->)</para>
-
-<para
->Now in some cases the alphabetical chunk was <quote
->String</quote
->, in some <quote
->int</quote
->, so using the character class <literal
->\w</literal
-> and the <literal
->+</literal
-> quantifier proved a valuable asset.</para>
+<para>Now you realise that this is not nice code, and decide that you want to use the <constant>const</constant> keyword for all <quote>address of</quote> arguments, those characterised by the &amp; operator in front of the argument name. You would also like to simplify the white space, so that there is only 1 whitespace character between each word.</para>
+
+<para>Launch the Editing Command Dialogue, and enter: <userinput>s/\s+(\w+)\s+(&amp;)/ const \1 \2/g</userinput> and hit the <guibutton>OK</guibutton> button. The <userinput>g</userinput> at the end of the expression makes the regular expression recompile for each match to save the <emphasis>backreferences</emphasis>.</para>
+
+<para>Output: <computeroutput>void MyClass::DoStringOps( const String &amp;foo, const String &amp;bar String *p, const int &amp;a, const int &amp;b )</computeroutput></para>
+
+<para>Mission completed! Now, what happened? Well, we looked for some white space (<literal>\s+</literal>) followed by one or more alphabetic characters (<literal>\w+</literal>) followed by some more whitespace (<literal>\s+</literal>) followed by an ampersand, and in the process saved the alphabetic chunk and the ampersand for reuse in the replace operation. Then we replaced the matching part of our line with one whitespace followed by <quote>const</quote> followed by one whitespace followed by our saved alphabetical chunk (<literal>\1</literal>) followed by one whitespace followed by our saved ampersand (<literal>\2</literal>)</para>
+
+<para>Now in some cases the alphabetical chunk was <quote>String</quote>, in some <quote>int</quote>, so using the character class <literal>\w</literal> and the <literal>+</literal> quantifier proved a valuable asset.</para>
 
 </example>
 
@@ -335,14 +126,7 @@
 </variablelist>
 
 <warning>
-<para
->This is extremely powerful, and though the actions can be undone by calling the <menuchoice
-><guimenuitem
->Undo</guimenuitem
-></menuchoice
-> command several times (as required) I recommend you practise a bit before using this command for serious editing if you are not familiar with <application
->sed</application
-> or perl regular expressions.</para>
+<para>This is extremely powerful, and though the actions can be undone by calling the <menuchoice><guimenuitem>Undo</guimenuitem></menuchoice> command several times (as required) I recommend you practise a bit before using this command for serious editing if you are not familiar with <application>sed</application> or perl regular expressions.</para>
 </warning>
 
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdebase/kate/configuring.docbook b/tde-i18n-en_GB/docs/tdebase/kate/configuring.docbook
index e682f0c5e0d..fd370c1aba5 100644
--- a/tde-i18n-en_GB/docs/tdebase/kate/configuring.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kate/configuring.docbook
@@ -1,89 +1,42 @@
 <chapter id="configuring-kate">
 <chapterinfo>
 <authorgroup>
-<author
-><personname
-><firstname
-></firstname
-></personname
-></author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author><personname><firstname></firstname></personname></author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </chapterinfo>
-<title
->Configuring &kate;</title>
+<title>Configuring &kate;</title>
 
 <sect1 id="configuring-overview">
-<title
->Overview</title>
+<title>Overview</title>
 <para>
 <indexterm>
-<primary
->configure</primary>
-<secondary
->settings</secondary>
-<tertiary
->preferences</tertiary
-></indexterm>
+<primary>configure</primary>
+<secondary>settings</secondary>
+<tertiary>preferences</tertiary></indexterm>
 <anchor id="find"/> <anchor id="find-again"/> <anchor id="replace"/> <anchor id="undo"/> <anchor id="redo"/> &kate; offers several means of tweaking the application to behave as desired. The most important ones are: </para>
 
 <variablelist>
 <varlistentry>
-<term id="configure"
->The Configuration Dialogue</term>
-<listitem
-><para
->The main configuration tool, allowing you to configure the &kate; application, the editor component and the usage of plugins.</para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term id="settings"
->The <guimenu
->Settings</guimenu
-> Menu</term>
-<listitem
-><para
->Allows you to change often used settings, and to launch the configuration dialogues.</para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
->The <guimenu
->View</guimenu
-> Menu</term>
-<listitem
-><para
->Allows you to split the current frame, as well as to display the icons and line numbers pane for the currently edited document.</para
-></listitem>
+<term id="configure">The Configuration Dialogue</term>
+<listitem><para>The main configuration tool, allowing you to configure the &kate; application, the editor component and the usage of plugins.</para></listitem>
+</varlistentry>
+<varlistentry>
+<term id="settings">The <guimenu>Settings</guimenu> Menu</term>
+<listitem><para>Allows you to change often used settings, and to launch the configuration dialogues.</para></listitem>
+</varlistentry>
+<varlistentry>
+<term>The <guimenu>View</guimenu> Menu</term>
+<listitem><para>Allows you to split the current frame, as well as to display the icons and line numbers pane for the currently edited document.</para></listitem>
 </varlistentry>
 </variablelist>
 
-<para
->The embedded &konsole; is using the configuration defined in the &kcontrolcenter;, and may be configured by clicking the <mousebutton
->right</mousebutton
-> mouse button and choosing from the <guimenuitem
->Settings</guimenuitem
-> sub menu.</para>
+<para>The embedded &konsole; is using the configuration defined in the &kcontrolcenter;, and may be configured by clicking the <mousebutton>right</mousebutton> mouse button and choosing from the <guimenuitem>Settings</guimenuitem> sub menu.</para>
 
 </sect1>
 
 <sect1 id="configuring-kate-configdialog">
-<title
->The Main Configuration Dialogue</title>
+<title>The Main Configuration Dialogue</title>
 
 <mediaobject>
 <imageobject>
@@ -91,83 +44,42 @@
 </imageobject>
 </mediaobject>
 
-<para
->The &kate; configuration dialogue displays a tree of topics on the left, and a configuration page corresponding to the selected topic on the right. The tree groups the pages of the dialogue into logical groups.</para>
+<para>The &kate; configuration dialogue displays a tree of topics on the left, and a configuration page corresponding to the selected topic on the right. The tree groups the pages of the dialogue into logical groups.</para>
 
 <sect2 id="config-dialog">
-<title
->The &kate; group</title>
-<para
->This group contains pages to configure the main &kate; application</para>
+<title>The &kate; group</title>
+<para>This group contains pages to configure the main &kate; application</para>
 
 <sect3 id="config-dialog-general">
-<title
->The General Page</title>
-<para
->Global Options for &kate;</para>
+<title>The General Page</title>
+<para>Global Options for &kate;</para>
 
 <variablelist>
 <varlistentry>
-<term
->Application Mode</term>
+<term>Application Mode</term>
 <listitem>
-<para
-><indexterm
-><primary
->MDI</primary
-><secondary
->SDI</secondary
-></indexterm>
-This group lets you choose between &kate; <acronym
->MDI</acronym
-> and &kate; <acronym
->SDI</acronym
-> mode, selecting the appropriate button.</para>
- <para
->&kate; <acronym
->MDI</acronym
-> (Multiple Document Interface), which is the default mode, makes &kate; use a single window for all open files. You can choose the document to edit from the File List (docked into the &kate; window by default) or by selecting the document from the <guimenu
->Document</guimenu
-> menu.</para>
-<para
->&kate; <acronym
->SDI</acronym
-> (Single Document Interface) will make &kate; open each document in a window of its own, and the File List/File Selector will have a separate window.</para>
- <para
->If you change this setting, you will need to restart &kate; for it to take effect.</para>
+<para><indexterm><primary>MDI</primary><secondary>SDI</secondary></indexterm>
+This group lets you choose between &kate; <acronym>MDI</acronym> and &kate; <acronym>SDI</acronym> mode, selecting the appropriate button.</para>
+ <para>&kate; <acronym>MDI</acronym> (Multiple Document Interface), which is the default mode, makes &kate; use a single window for all open files. You can choose the document to edit from the File List (docked into the &kate; window by default) or by selecting the document from the <guimenu>Document</guimenu> menu.</para>
+<para>&kate; <acronym>SDI</acronym> (Single Document Interface) will make &kate; open each document in a window of its own, and the File List/File Selector will have a separate window.</para>
+ <para>If you change this setting, you will need to restart &kate; for it to take effect.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->At Startup</term
-> 
-<listitem
-><para
->These options determine how and if &kate; will restore your editing session when launched after a normal shutdown (if restored by the session manager, &kate; will always attempt to restore your session as close as possible to what it was when you last used &kate;).</para>
+<term>At Startup</term> 
+<listitem><para>These options determine how and if &kate; will restore your editing session when launched after a normal shutdown (if restored by the session manager, &kate; will always attempt to restore your session as close as possible to what it was when you last used &kate;).</para>
 
 <variablelist>
 <varlistentry>
 <term>
 <anchor id="config-dialog-general-reopen-files"/>
-<guibutton
->Reopen Files</guibutton
-></term>
-<listitem
-><para
->If this option is enabled, files open when you last closed &kate; will be reopened. Bookmarks will be restored, and the cursor position, icon border and line numbers settings for the last editor used with the document will be re-established</para
-></listitem
-> 
-</varlistentry>
-<varlistentry>
-<term
-><guibutton
->Restore View Configuration</guibutton
-></term>
-<listitem
-><para
->If this option is enabled, &kate; will attempt to restore your frames exactly as you left them.</para
-></listitem>
+<guibutton>Reopen Files</guibutton></term>
+<listitem><para>If this option is enabled, files open when you last closed &kate; will be reopened. Bookmarks will be restored, and the cursor position, icon border and line numbers settings for the last editor used with the document will be re-established</para></listitem> 
+</varlistentry>
+<varlistentry>
+<term><guibutton>Restore View Configuration</guibutton></term>
+<listitem><para>If this option is enabled, &kate; will attempt to restore your frames exactly as you left them.</para></listitem>
 </varlistentry>
 </variablelist>
 
@@ -176,55 +88,24 @@ This group lets you choose between &kate; <acronym
 </varlistentry>
 
 <varlistentry>
-<term
-><guibutton
->Restrict to single instance</guibutton
-></term>
-<listitem
-><para
->Enabling this means you can only have one running instance of &kate; running at any given time. If you attempt to start another one, the current instance will take over and also open files as requested. For example, if you use &kate; for displaying sources for web pages in Konqueror, they will all be opened in an existing instance of &kate; if this option is enabled.</para
-></listitem>
+<term><guibutton>Restrict to single instance</guibutton></term>
+<listitem><para>Enabling this means you can only have one running instance of &kate; running at any given time. If you attempt to start another one, the current instance will take over and also open files as requested. For example, if you use &kate; for displaying sources for web pages in Konqueror, they will all be opened in an existing instance of &kate; if this option is enabled.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guibutton
->Show Contents While Resizing Frames</guibutton
-></term
-> <listitem
-><para
->If this option is enabled, the windows will be fully repainted while dragging the frame splitters. If unchecked, a so-called <quote
->rubber band</quote
-> (indicating the new size of the frame) will be used instead.</para
-></listitem>
+<term><guibutton>Show Contents While Resizing Frames</guibutton></term> <listitem><para>If this option is enabled, the windows will be fully repainted while dragging the frame splitters. If unchecked, a so-called <quote>rubber band</quote> (indicating the new size of the frame) will be used instead.</para></listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="config-dialog-general-sync-konsole"/>
-<guibutton
->Sync Konsole with Active Document</guibutton
-></term>
-<listitem
-><para
->This will cause the built-in &konsole; to <command
->cd</command
-> into the directory of the active document when launched and when a new document gets the focus. If not enabled, you have to do all your navigation in the &konsole; on your own. </para
-></listitem
-> 
-</varlistentry>
-
-<varlistentry>
-<term
-><guibutton
->Number of Recent Files</guibutton
-></term>
-<listitem
-><para
->Unsurprisingly, this allows you to decide how long the <guimenu
->Open Recent</guimenu
-> files menu should grow.</para
-></listitem>
+<guibutton>Sync Konsole with Active Document</guibutton></term>
+<listitem><para>This will cause the built-in &konsole; to <command>cd</command> into the directory of the active document when launched and when a new document gets the focus. If not enabled, you have to do all your navigation in the &konsole; on your own. </para></listitem> 
+</varlistentry>
+
+<varlistentry>
+<term><guibutton>Number of Recent Files</guibutton></term>
+<listitem><para>Unsurprisingly, this allows you to decide how long the <guimenu>Open Recent</guimenu> files menu should grow.</para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -234,126 +115,83 @@ This group lets you choose between &kate; <acronym
 </sect2>
 
 <sect2 id="config-dialog-editor">
-<title
->The Editor Group</title>
-<para
->This group contains all pages related to the editor component of &kate;</para>
+<title>The Editor Group</title>
+<para>This group contains all pages related to the editor component of &kate;</para>
 
 <sect3 id="config-dialog-editor-colors">
-<title
->The <guilabel
->Colours</guilabel
-> Page</title
-> <para
->This page allows you to change the background and selection background colours of the editor. Initially, &kate; will use the colours as set in the &kcontrolcenter; <menuchoice
-><guimenu
->Look'n'Feel</guimenu
-><guimenuitem
->Colours</guimenuitem
-> </menuchoice
-> page.</para>
-
-<para
->To change a colour, press the associated button and select the desired colour in the colour chooser.</para>
-
-<note
-><para
->Choosing the background colour may render Syntax Highlighted text unreadable. You should use a light colour for the background, and a dark colour for the selection background. </para>
-<para
->Otherwise, you will probably need to change the <link linkend="config-dialog-editor-highlight-default-styles"
->Default Styles</link
->.</para>
+<title>The <guilabel>Colours</guilabel> Page</title> <para>This page allows you to change the background and selection background colours of the editor. Initially, &kate; will use the colours as set in the &kcontrolcenter; <menuchoice><guimenu>Look'n'Feel</guimenu><guimenuitem>Colours</guimenuitem> </menuchoice> page.</para>
+
+<para>To change a colour, press the associated button and select the desired colour in the colour chooser.</para>
+
+<note><para>Choosing the background colour may render Syntax Highlighted text unreadable. You should use a light colour for the background, and a dark colour for the selection background. </para>
+<para>Otherwise, you will probably need to change the <link linkend="config-dialog-editor-highlight-default-styles">Default Styles</link>.</para>
 </note>
 </sect3>
 
 <sect3 id="config-dialog-editor-fonts">
-<title
->The Fonts Page</title
-> <!-- FIXME LINKS //-->
+<title>The Fonts Page</title> <!-- FIXME LINKS //-->
 
-<para
->This page allows you to choose the default fonts for &kate;. The settings will be used for the &kwrite; and for viewing text files in &konqueror; as well.</para>
+<para>This page allows you to choose the default fonts for &kate;. The settings will be used for the &kwrite; and for viewing text files in &konqueror; as well.</para>
 
-<para
->The page presents two tabs, one for the editor font and one for the printing font. Select a tab and choose the desired font. The default is to use the &kde; global setting for fixed font.</para>
+<para>The page presents two tabs, one for the editor font and one for the printing font. Select a tab and choose the desired font. The default is to use the &kde; global setting for fixed font.</para>
 
-<tip
-><para
->As it is not currently possible to use individual fonts for documents, nor to change the font for printing from the print dialogue, be careful. A fixed-width font is strongly recommended. </para
-></tip>
+<tip><para>As it is not currently possible to use individual fonts for documents, nor to change the font for printing from the print dialogue, be careful. A fixed-width font is strongly recommended. </para></tip>
 </sect3>
 
 <sect3 id="config-dialog-editor-indent">
-<title
->The Indent Page</title>
-<para
->This page allows you to change the behaviour of indentation.</para>
+<title>The Indent Page</title>
+<para>This page allows you to change the behaviour of indentation.</para>
 
 <variablelist>
-<title
->Indent Options</title>
+<title>Indent Options</title>
 
 <varlistentry>
 <term>
 <anchor id="config-dialog-editor-indent-auto-indent"/>
-<guibutton
->Auto indent</guibutton>
+<guibutton>Auto indent</guibutton>
 </term>
 <listitem>
-<para
->If checked, &kate; will automatically indent new lines equal to the previous line. If the previous line is blank, the nearest above line with contents is used.</para>
+<para>If checked, &kate; will automatically indent new lines equal to the previous line. If the previous line is blank, the nearest above line with contents is used.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="config-dialog-editor-indent-indent-with-spaces"/>
-<guibutton
->Indent with Spaces</guibutton>
+<guibutton>Indent with Spaces</guibutton>
 </term>
 <listitem>
-<para
->If checked, &kate; will indent with spaces rather than tabs.</para>
+<para>If checked, &kate; will indent with spaces rather than tabs.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="config-dialog-editor-indent-backspace-key-indents"/>
-<guibutton
->Backspace key indents</guibutton>
+<guibutton>Backspace key indents</guibutton>
 </term>
 <listitem>
-<para
->If this is checked, &kate; will unindent equal to the nearest above line with contents when you press the <keycap
->Backspace</keycap
-> key if the part of the line preceding the cursor contains only whitespace.</para>
+<para>If this is checked, &kate; will unindent equal to the nearest above line with contents when you press the <keycap>Backspace</keycap> key if the part of the line preceding the cursor contains only whitespace.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="config-dialog-editor-indent-tab-key-indents"/>
-<guibutton
->Tab key indents</guibutton>
+<guibutton>Tab key indents</guibutton>
 </term>
 <listitem>
-<para
->If this is checked, &kate; will indent the current line equal to the nearest above line with content when you press the <keycap
->Tab</keycap
-> key, if the part of the line preceding the cursor contains only whitespace.</para>
+<para>If this is checked, &kate; will indent the current line equal to the nearest above line with content when you press the <keycap>Tab</keycap> key, if the part of the line preceding the cursor contains only whitespace.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="config-dialog-editor-indent-keep-extra-spaces"/>
-<guibutton
->Keep extra spaces</guibutton>
+<guibutton>Keep extra spaces</guibutton>
 </term>
 <listitem>
-<para
->With this behaviour checked, &kate; will leave whitespace behind the cursor after indenting.</para>
+<para>With this behaviour checked, &kate; will leave whitespace behind the cursor after indenting.</para>
 </listitem>
 </varlistentry>
 
@@ -362,42 +200,31 @@ This group lets you choose between &kate; <acronym
 </sect3>
 
 <sect3 id="config-dialog-editor-select">
-<title
->The Select Page</title>
+<title>The Select Page</title>
 
-<para
->This page provides options for fine tuning the select behaviour of &kate;</para>
+<para>This page provides options for fine tuning the select behaviour of &kate;</para>
 
 <variablelist>
-<title
->Select Options</title>
+<title>Select Options</title>
 
 <varlistentry>
 <term>
 <anchor id="config-dialog-editor-select-persistent-selections"/>
-<guibutton
->Persistent Selections</guibutton>
+<guibutton>Persistent Selections</guibutton>
 </term>
 <listitem>
-<para
->When Persistent Selections is enabled, key input will not cause the selection to be removed/diminished.</para
-> 
-<note
-><para
->This option partly conflicts with the Overwrite Selection option. If both are enabled, pasting text or pressing any other keys than the arrow keys will cause the selection to be overwritten.</para
-></note>
+<para>When Persistent Selections is enabled, key input will not cause the selection to be removed/diminished.</para> 
+<note><para>This option partly conflicts with the Overwrite Selection option. If both are enabled, pasting text or pressing any other keys than the arrow keys will cause the selection to be overwritten.</para></note>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="config-dialog-editor-select-overwrite-selections"/>
-<guibutton
->Overwrite Selection</guibutton>
+<guibutton>Overwrite Selection</guibutton>
 </term>
 <listitem>
-<para
->If this is enabled, any text insertion, whether typed or pasted will cause the selected text to be deleted and replaced with the inserted text.</para>
+<para>If this is enabled, any text insertion, whether typed or pasted will cause the selected text to be deleted and replaced with the inserted text.</para>
 </listitem>
 </varlistentry>
 
@@ -405,12 +232,10 @@ This group lets you choose between &kate; <acronym
 <varlistentry>
 <term>
 <anchor id="config-dialog-editor-select-mouse-autocopy"/>
-<guibutton
->Mouse Autocopy</guibutton>
+<guibutton>Mouse Autocopy</guibutton>
 </term>
 <listitem>
-<para
->If enabled, any text selected by moving the mouse with the left button pressed will
+<para>If enabled, any text selected by moving the mouse with the left button pressed will
 be copied to the clipboard, ready for pasting.</para>
 </listitem>
 </varlistentry>
@@ -420,132 +245,81 @@ be copied to the clipboard, ready for pasting.</para>
 </sect3>
 
 <sect3 id="config-dialog-editor-edit">
-<title
->The Edit Page</title>
-<para
->This page contains miscellaneous options for fine-tuning the behaviour of the &kate; editor component.</para>
+<title>The Edit Page</title>
+<para>This page contains miscellaneous options for fine-tuning the behaviour of the &kate; editor component.</para>
 
 <variablelist>
-<title
->Editor Options</title>
+<title>Editor Options</title>
 
 <varlistentry>
 <term>
 <anchor id="config-dialog-editor-edit-word-wrap"/>
-<guibutton
->Word Wrap</guibutton>
+<guibutton>Word Wrap</guibutton>
 </term>
 <listitem>
-<para
->Word Wrap as used here means dynamically format the text by breaking lines at an appropriate place, rather than soft wrapping lines in the editor for easier reading.</para>
-<para
->If enabled, &kate; will insert a line break as defined by the <link linkend="document-end-of-line"
->End of Line</link
-> setting for the document when the line extends the length set in <link linkend="config-dialog-editor-edit-wrap-words-at"
->Wrap Words At</link
-> option described below.</para>
+<para>Word Wrap as used here means dynamically format the text by breaking lines at an appropriate place, rather than soft wrapping lines in the editor for easier reading.</para>
+<para>If enabled, &kate; will insert a line break as defined by the <link linkend="document-end-of-line">End of Line</link> setting for the document when the line extends the length set in <link linkend="config-dialog-editor-edit-wrap-words-at">Wrap Words At</link> option described below.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="config-dialog-editor-edit-wrap-words-at"/>
-<guibutton
->Wrap Words At</guibutton>
+<guibutton>Wrap Words At</guibutton>
 </term>
 <listitem>
-<para
->This option decides the max length of lines if the <link linkend="config-dialog-editor-edit-word-wrap"
->Word Wrap</link
-> option is enabled.</para>
+<para>This option decides the max length of lines if the <link linkend="config-dialog-editor-edit-word-wrap">Word Wrap</link> option is enabled.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="config-dialog-editor-edit-replace-tabs-with-spaces"/>
-<guibutton
->Replace Tabs with Spaces</guibutton>
+<guibutton>Replace Tabs with Spaces</guibutton>
 </term>
 <listitem>
-<para
->If enabled, &kate; will replace inserted <keycap
->Tab</keycap
-> characters with a number of single whitespace characters as defined in <link linkend="config-dialog-editor-edit-tab-indent-width"
->Tab Width</link
->.</para>
+<para>If enabled, &kate; will replace inserted <keycap>Tab</keycap> characters with a number of single whitespace characters as defined in <link linkend="config-dialog-editor-edit-tab-indent-width">Tab Width</link>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="config-dialog-editor-edit-remove-trailing-spaces"/>
-<guibutton
->Remove trailing spaces</guibutton>
+<guibutton>Remove trailing spaces</guibutton>
 </term>
 <listitem>
-<para
->If enabled, &kate; will remove any whitespace at the rear end of a line each time the cursor is moved off that line.</para>
+<para>If enabled, &kate; will remove any whitespace at the rear end of a line each time the cursor is moved off that line.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="config-dialog-editor-edit-tab-indent-width"/>
-<guibutton
->Tab/Indent Width</guibutton>
+<guibutton>Tab/Indent Width</guibutton>
 </term>
 <listitem>
-<para
->Sets the tab width, which is also used to decide the amount of indentation when <link linkend="config-dialog-editor-indent-auto-indent"
->Auto Indent</link
-> is enabled, or indentation is otherwise called for.</para>
-<para
->Depending on the <link linkend="config-dialog-editor-indent"
->Indent</link
-> settings indentation may be caused by pressing the <keycap
->Tab</keycap
-> and <keycap
->Backspace</keycap
-> keys, and activating the <link linkend="edit-indent"
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Indent</guimenuitem
-></link
-> menu entry will call for indent as well.</para>
+<para>Sets the tab width, which is also used to decide the amount of indentation when <link linkend="config-dialog-editor-indent-auto-indent">Auto Indent</link> is enabled, or indentation is otherwise called for.</para>
+<para>Depending on the <link linkend="config-dialog-editor-indent">Indent</link> settings indentation may be caused by pressing the <keycap>Tab</keycap> and <keycap>Backspace</keycap> keys, and activating the <link linkend="edit-indent"><guimenu>Edit</guimenu> <guimenuitem>Indent</guimenuitem></link> menu entry will call for indent as well.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="config-dialog-editor-edit-auto-brackets"/>
-<guibutton
->Auto Brackets</guibutton>
+<guibutton>Auto Brackets</guibutton>
 </term>
 <listitem>
-<para
->If this is enabled, &kate; will automatically insert a right bracket immediately to the right of the cursor when a left bracket is inserted from the keyboard. The supported bracket types are <keycap
->(</keycap
->, <keycap
->{</keycap
->, <keycap
->[</keycap
->and <keycap
->&lt;</keycap
-></para>
+<para>If this is enabled, &kate; will automatically insert a right bracket immediately to the right of the cursor when a left bracket is inserted from the keyboard. The supported bracket types are <keycap>(</keycap>, <keycap>{</keycap>, <keycap>[</keycap>and <keycap>&lt;</keycap></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="config-dialog-editor-edit-group-undos"/>
-<guibutton
->Group undos</guibutton>
+<guibutton>Group undos</guibutton>
 </term>
 <listitem>
-<para
->If enabled, &kate; will group any number of similar editing actions (for example typing, backspacing, pasting) in one entry in the undo history, so they can all be undone at once.</para>
+<para>If enabled, &kate; will group any number of similar editing actions (for example typing, backspacing, pasting) in one entry in the undo history, so they can all be undone at once.</para>
 </listitem>
 </varlistentry>
 
@@ -553,28 +327,20 @@ be copied to the clipboard, ready for pasting.</para>
 <varlistentry>
 <term>
 <anchor id="config-dialog-editor-edit-show-tabs"/>
-<guibutton
->Show Tabs</guibutton>
+<guibutton>Show Tabs</guibutton>
 </term>
 <listitem>
-<para
->If enabled, &kate; will draw a small dot at the start of a <keycap
->Tab</keycap
-> character in the editor to indicate its presence.</para>
+<para>If enabled, &kate; will draw a small dot at the start of a <keycap>Tab</keycap> character in the editor to indicate its presence.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="config-dialog-editor-edit-smart-home"/>
-<guibutton
->Smart Home</guibutton>
+<guibutton>Smart Home</guibutton>
 </term>
 <listitem>
-<para
->This will make &kate; move the cursor to the first non-whitespace character of the current line rather than to the absolute beginning, when the <keycap
->Home</keycap
-> key (or other key assigned to that function) is pressed.</para>
+<para>This will make &kate; move the cursor to the first non-whitespace character of the current line rather than to the absolute beginning, when the <keycap>Home</keycap> key (or other key assigned to that function) is pressed.</para>
 </listitem>
 </varlistentry>
 
@@ -582,17 +348,11 @@ be copied to the clipboard, ready for pasting.</para>
 <varlistentry>
 <term>
 <anchor id="config-dialog-editor-edit-page-up-down-moves-cursor"/>
-<guibutton
->Page Up/Down moves cursor</guibutton>
+<guibutton>Page Up/Down moves cursor</guibutton>
 </term>
 <listitem>
-<para
->If enabled, the cursor will be moved to the first/last visible
-line when <keycap
->Page Up</keycap
->/<keycap
->Page Down</keycap
-> (or
+<para>If enabled, the cursor will be moved to the first/last visible
+line when <keycap>Page Up</keycap>/<keycap>Page Down</keycap> (or
 other key assigned to those functions) is pressed, rather than being
 kept at its relative position.</para>
 </listitem>
@@ -601,15 +361,11 @@ kept at its relative position.</para>
 <varlistentry>
 <term>
 <anchor id="config-dialog-editor-edit-wrap-cursor"/>
-<guibutton
->Wrap Cursor</guibutton>
+<guibutton>Wrap Cursor</guibutton>
 </term>
 <listitem>
-<para
->If enabled, moving the cursor past the end of a line will cause it to continue to the next/previous line if any.</para>
-<para
->If not enabled, the cursor cannot be moved right of the beginning of the line, but it may be moved past the end of line, and when text is inserted &kate; will automatically insert whitespace up to that position. This is sometimes very handy for programmers, for example.</para
-> 
+<para>If enabled, moving the cursor past the end of a line will cause it to continue to the next/previous line if any.</para>
+<para>If not enabled, the cursor cannot be moved right of the beginning of the line, but it may be moved past the end of line, and when text is inserted &kate; will automatically insert whitespace up to that position. This is sometimes very handy for programmers, for example.</para> 
 </listitem>
 </varlistentry>
 
@@ -618,58 +374,34 @@ kept at its relative position.</para>
 </sect3>
 
 <sect3 id="config-dialog-editor-keyboard">
-<title
->The Keyboard Page</title>
+<title>The Keyboard Page</title>
 
-<para
->Here you can configure the keyboard shortcuts for the internal commands of the &kate; editor component. These includes commands for moving around in the document and selecting text. For keys related to copying and pasting text, see The Configure Keys Dialogue </para>
+<para>Here you can configure the keyboard shortcuts for the internal commands of the &kate; editor component. These includes commands for moving around in the document and selecting text. For keys related to copying and pasting text, see The Configure Keys Dialogue </para>
 
-<para
->You may change the keys for a command, or add an alternate key.</para>
+<para>You may change the keys for a command, or add an alternate key.</para>
 
 <procedure>
-<title
->To change the key(s) for a command, follow this procedure:</title>
+<title>To change the key(s) for a command, follow this procedure:</title>
 <step>
-<para
->Select the command for which you want to configure the keys.</para>
+<para>Select the command for which you want to configure the keys.</para>
 </step>
 <step>
-<para
->Choose the <guibutton
->None</guibutton
-> option in the pane below the list if you don't want a key for this command.</para>
-<para
->Choose the <guibutton
->Default</guibutton
-> option to use the default key(s) for the command</para>
-<para
->Choose the <guibutton
->Custom</guibutton
-> option to select a custom key for the command, or set an alternate one.</para>
+<para>Choose the <guibutton>None</guibutton> option in the pane below the list if you don't want a key for this command.</para>
+<para>Choose the <guibutton>Default</guibutton> option to use the default key(s) for the command</para>
+<para>Choose the <guibutton>Custom</guibutton> option to select a custom key for the command, or set an alternate one.</para>
 </step>
 <step>
-<para
->If you choose the <guibutton
->Custom</guibutton
-> option, the key entering button at the right of the pane will be enabled. To set a key, press it. The &kde; Define Shortcut Dialogue will appear. In this dialogue:</para>
+<para>If you choose the <guibutton>Custom</guibutton> option, the key entering button at the right of the pane will be enabled. To set a key, press it. The &kde; Define Shortcut Dialogue will appear. In this dialogue:</para>
 </step>
 <step>
 <procedure>
 <step>
-<para
->Choose whether to set the default or alternate key. <guilabel
->Default</guilabel
-> does not mean that you change the application default for this action, rather it sets the custom standard key for it.</para>
+<para>Choose whether to set the default or alternate key. <guilabel>Default</guilabel> does not mean that you change the application default for this action, rather it sets the custom standard key for it.</para>
 </step>
 <step>
-<para
->Press the desired key sequence, it will be visualised for you in the dialogue for your confirmation. </para>
+<para>Press the desired key sequence, it will be visualised for you in the dialogue for your confirmation. </para>
 
-<para
->If you are of an adventurous nature, try playing around with the <guibutton
->Multikey</guibutton
-> option. Using it will allow you to have &Emacs;-like key sequences (one key enters a group, the next performs the action), apart from the fact that instead of just doing the job, &kde; will pop up a menu to choose from in an undefined and most likely inappropriate place. You will now be in no doubt as to whether pressing the next key in the sequence will work, or you have to type the menu accelerator (both will work).</para>
+<para>If you are of an adventurous nature, try playing around with the <guibutton>Multikey</guibutton> option. Using it will allow you to have &Emacs;-like key sequences (one key enters a group, the next performs the action), apart from the fact that instead of just doing the job, &kde; will pop up a menu to choose from in an undefined and most likely inappropriate place. You will now be in no doubt as to whether pressing the next key in the sequence will work, or you have to type the menu accelerator (both will work).</para>
 </step>
 </procedure>
 </step>
@@ -677,142 +409,77 @@ kept at its relative position.</para>
 </sect3>
 
 <sect3 id="config-dialog-editor-spelling">
-<title
->The Spelling Page</title>
-<para
->This page allows you to configure how &tdespell; behaves with &kate;</para>
+<title>The Spelling Page</title>
+<para>This page allows you to configure how &tdespell; behaves with &kate;</para>
 </sect3>
 
 <sect3 id="config-dialog-editor-hl">
-<title
->The Highlighting Page</title>
+<title>The Highlighting Page</title>
 
-<para
->This page allows you to fine tune the colour and syntax type selection of &kate;</para>
+<para>This page allows you to fine tune the colour and syntax type selection of &kate;</para>
 <para>
 <mediaobject>
-<imageobject
-><imagedata format="PNG" fileref="configdialog02.png"/></imageobject>
+<imageobject><imagedata format="PNG" fileref="configdialog02.png"/></imageobject>
 </mediaobject>
 </para>
-<para
->For more in depth information on the syntax highlighting system, see ??</para>
+<para>For more in depth information on the syntax highlighting system, see ??</para>
 
-<para
->The page consists of two tabs, one for setting the <guibutton
->Default styles</guibutton
-> and one for managing the <guibutton
->Highlight Modes</guibutton
->. Both tabs display a list of contexts in which the default colours and font are used to visualise the look of each style. The context name is painted using the current properties of the context.</para>
+<para>The page consists of two tabs, one for setting the <guibutton>Default styles</guibutton> and one for managing the <guibutton>Highlight Modes</guibutton>. Both tabs display a list of contexts in which the default colours and font are used to visualise the look of each style. The context name is painted using the current properties of the context.</para>
 
-<para
->The list has four or five columns, each with the following purpose:</para>
+<para>The list has four or five columns, each with the following purpose:</para>
 
 <variablelist>
 
 <varlistentry>
-<term
->Context</term>
-<listitem
-><para
->Displays the context name, painted using the style properties for the context.</para
-></listitem>
+<term>Context</term>
+<listitem><para>Displays the context name, painted using the style properties for the context.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Bold</term>
-<listitem
-><para
->The state of this checkbox decides if the context should be rendered using a boldface font.</para
-></listitem>
+<term>Bold</term>
+<listitem><para>The state of this checkbox decides if the context should be rendered using a boldface font.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Italic</term>
-<listitem
-><para
->The state of this checkbox decides if the context should be rendered using italic font.</para
-></listitem>
+<term>Italic</term>
+<listitem><para>The state of this checkbox decides if the context should be rendered using italic font.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Normal</term>
-<listitem
-><para
->This button displays the colour for drawing the style in normal mode, when the text is not selected that is. To change the colour, click the button.</para
-></listitem>
+<term>Normal</term>
+<listitem><para>This button displays the colour for drawing the style in normal mode, when the text is not selected that is. To change the colour, click the button.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Selected</term>
-<listitem
-><para
->This button displays the colour for drawing the style when the text is selected. To change the colour, click the button.</para
-></listitem>
+<term>Selected</term>
+<listitem><para>This button displays the colour for drawing the style when the text is selected. To change the colour, click the button.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Using Default</term>
-<listitem
-><para
->This checkbox, only available in the <guibutton
->Highlight Modes</guibutton
-> tab shows if the style is using its default values. It will automatically become unchecked if you change any properties of the style. Check it to reset a style to using defaults.</para
-></listitem
-> 
+<term>Using Default</term>
+<listitem><para>This checkbox, only available in the <guibutton>Highlight Modes</guibutton> tab shows if the style is using its default values. It will automatically become unchecked if you change any properties of the style. Check it to reset a style to using defaults.</para></listitem> 
 </varlistentry>
 
 </variablelist>
 
 <sect4 id="config-dialog-editor-highlight-default-styles">
-<title
->The Default Styles Tab</title>
-<para
->To change any of the default styles, set its properties as desired.</para>
+<title>The Default Styles Tab</title>
+<para>To change any of the default styles, set its properties as desired.</para>
 </sect4>
 
 <sect4 id="config-dialog-editor-highlight-highlight-modes">
-<title
->The Highlight Modes Tab</title
-> 
-
-<para
-><indexterm
-><primary
->syntax highlighting, configuring</primary
-></indexterm
-> Here you can change the most important properties of each available highlight mode. First, use the <guibutton
->Highlight</guibutton
-> dropdown to choose a mode to work on.</para
-> <para
->Highlight modes are initially chosen based on the &MIME; type and extension of the file. To change the list for the current selection, edit the <guibutton
->File Extensions</guibutton
-> and <guibutton
->Mime Types</guibutton
-> entries. Alternatively, press the wizard button to the right of the <guibutton
->Mime Types</guibutton
-> entry. This will show a dialogue displaying all available &MIME; types to choose from. Using it will edit the &MIME; types as well as the file extensions.</para>
+<title>The Highlight Modes Tab</title> 
+
+<para><indexterm><primary>syntax highlighting, configuring</primary></indexterm> Here you can change the most important properties of each available highlight mode. First, use the <guibutton>Highlight</guibutton> dropdown to choose a mode to work on.</para> <para>Highlight modes are initially chosen based on the &MIME; type and extension of the file. To change the list for the current selection, edit the <guibutton>File Extensions</guibutton> and <guibutton>Mime Types</guibutton> entries. Alternatively, press the wizard button to the right of the <guibutton>Mime Types</guibutton> entry. This will show a dialogue displaying all available &MIME; types to choose from. Using it will edit the &MIME; types as well as the file extensions.</para>
 
 <mediaobject>
-<imageobject
-><imagedata format="PNG" fileref="mimetypechooser.png"/></imageobject>
+<imageobject><imagedata format="PNG" fileref="mimetypechooser.png"/></imageobject>
 </mediaobject>
-<para
->The &MIME; type chooser dialogue displays a tree of available &MIME; types, with a description and the patterns for the &MIME; type. To include a &MIME; type, check the box beside it. </para>
+<para>The &MIME; type chooser dialogue displays a tree of available &MIME; types, with a description and the patterns for the &MIME; type. To include a &MIME; type, check the box beside it. </para>
 
-<para
->You can change the style properties of any context as described above.</para
-> 
+<para>You can change the style properties of any context as described above.</para> 
 
-<para
->At the bottom of the tab, below the highlight properties, you see a button labelled <guibutton
->Download</guibutton
->. Pressing it will attempt to connect to the &kate; website and fetch a list of available syntax highlight modes which you can update or add.</para>
+<para>At the bottom of the tab, below the highlight properties, you see a button labelled <guibutton>Download</guibutton>. Pressing it will attempt to connect to the &kate; website and fetch a list of available syntax highlight modes which you can update or add.</para>
 
 </sect4>
 
@@ -821,41 +488,20 @@ kept at its relative position.</para>
 </sect2>
 
 <sect2 id="config-dialog-plugins">
-<title
->The Plugins Group</title
-> 
+<title>The Plugins Group</title> 
 
-<para
-><indexterm
-><primary
->plugins, configuring</primary
-></indexterm
-> This group contains pages related to plugins. Apart from the Manager configuration page, some plugins provide individual configuration options. For information on these, see the documentation for the individual plugins.</para>
+<para><indexterm><primary>plugins, configuring</primary></indexterm> This group contains pages related to plugins. Apart from the Manager configuration page, some plugins provide individual configuration options. For information on these, see the documentation for the individual plugins.</para>
 
 <sect3 id="config-dialog-plugins-manager">
-<title
->The Plugin Manager Page</title
-> 
-
-<para
->This page provides the means of loading/unloading plugins, and minimal information about individual plugins.</para>
-
-<para
->To load an unloaded plugin, select it in the <guibutton
->Available Plugins</guibutton
-> pane and use the arrow buttons to move it to the <guibutton
->Loaded Plugins</guibutton
-> pane.</para>
-
-<para
->To unload a loaded plugin, select it in the <guibutton
->Loaded Plugins</guibutton
-> pane and use the arrow buttons to move it to the <guibutton
->Available buttons</guibutton
-> pane.</para>
-
-<para
->To view a minimal description and information about a plugin, select it and the information will be available below the lists.</para>
+<title>The Plugin Manager Page</title> 
+
+<para>This page provides the means of loading/unloading plugins, and minimal information about individual plugins.</para>
+
+<para>To load an unloaded plugin, select it in the <guibutton>Available Plugins</guibutton> pane and use the arrow buttons to move it to the <guibutton>Loaded Plugins</guibutton> pane.</para>
+
+<para>To unload a loaded plugin, select it in the <guibutton>Loaded Plugins</guibutton> pane and use the arrow buttons to move it to the <guibutton>Available buttons</guibutton> pane.</para>
+
+<para>To view a minimal description and information about a plugin, select it and the information will be available below the lists.</para>
 </sect3>
 
 </sect2>
diff --git a/tde-i18n-en_GB/docs/tdebase/kate/fundamentals.docbook b/tde-i18n-en_GB/docs/tdebase/kate/fundamentals.docbook
index bf0979d4aa6..a73127b55e1 100644
--- a/tde-i18n-en_GB/docs/tdebase/kate/fundamentals.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kate/fundamentals.docbook
@@ -1,226 +1,95 @@
 <chapter id="fundamentals">
 <chapterinfo>
 <authorgroup>
-<author
-><personname
-><firstname
-></firstname
-></personname
-></author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author><personname><firstname></firstname></personname></author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </chapterinfo>
-<title
->The Fundamentals</title>
+<title>The Fundamentals</title>
 
-<para
->If you have ever used a text editor, you will have no problem using &kate;. In the next two sections, <link linkend="starting-kate"
->Starting &kate; </link
-> and in <link linkend="working-with-kate"
->Working with &kate;</link
->, we'll show you everything you need to get up and running quickly. </para>
+<para>If you have ever used a text editor, you will have no problem using &kate;. In the next two sections, <link linkend="starting-kate">Starting &kate; </link> and in <link linkend="working-with-kate">Working with &kate;</link>, we'll show you everything you need to get up and running quickly. </para>
 
 <sect1 id="starting-kate">
-<title
->Starting &kate;</title>
+<title>Starting &kate;</title>
 
-<para
->You can start &kate; from the <guimenu
->TDE menu</guimenu
-> or from the command line. </para>
+<para>You can start &kate; from the <guimenu>TDE menu</guimenu> or from the command line. </para>
 
 <sect2 id="starting-from-the-menu">
-<title
->From the Menu</title>
-<para
->Open the &kde; program menu by clicking on the <guiicon
->big K</guiicon
-> icon on the toolbar at the bottom left of your screen. This will raise the <guimenu
->program menu</guimenu
->. Move your cursor up the menu to the <guimenu
->Editors</guimenu
-> menu item. A list of available editors will appear. Choose <guimenuitem
->&kate;</guimenuitem
->. </para>
-
-<para
->Unless you configure &kate; not to, it will load the last files you edited. See <link linkend="configure"
->Configuring &kate;</link
-> to learn how to toggle this feature on and off. </para>
+<title>From the Menu</title>
+<para>Open the &kde; program menu by clicking on the <guiicon>big K</guiicon> icon on the toolbar at the bottom left of your screen. This will raise the <guimenu>program menu</guimenu>. Move your cursor up the menu to the <guimenu>Editors</guimenu> menu item. A list of available editors will appear. Choose <guimenuitem>&kate;</guimenuitem>. </para>
+
+<para>Unless you configure &kate; not to, it will load the last files you edited. See <link linkend="configure">Configuring &kate;</link> to learn how to toggle this feature on and off. </para>
 
 </sect2>
 
 <sect2 id="starting-from-the-command-line">
-<title
->From the Command Line</title>
+<title>From the Command Line</title>
 
-<para
->You can start &kate; by typing its name on the command line. If you give it a file name, as in the example below, it will open or create that file. </para>
+<para>You can start &kate; by typing its name on the command line. If you give it a file name, as in the example below, it will open or create that file. </para>
 
 <informalexample>
-<screen
-><prompt
->%</prompt
-><userinput
-><command
->kate</command
-> <option
-><replaceable
->myfile.txt</replaceable
-></option
-></userinput
->
+<screen><prompt>%</prompt><userinput><command>kate</command> <option><replaceable>myfile.txt</replaceable></option></userinput>
 </screen>
 </informalexample>
 
-<para
->If you have an active connection, and permission, you can take advantage of &kde;'s network transparency to open files on the internet. </para>
+<para>If you have an active connection, and permission, you can take advantage of &kde;'s network transparency to open files on the internet. </para>
 
 <informalexample>
-<screen
-><prompt
->%</prompt
-><userinput
-><command
->kate</command
-> <option
-><replaceable
->ftp://ftp.kde.org/pub/kde/README_FIRST</replaceable
-></option
-></userinput
->
+<screen><prompt>%</prompt><userinput><command>kate</command> <option><replaceable>ftp://ftp.kde.org/pub/kde/README_FIRST</replaceable></option></userinput>
 </screen>
 </informalexample>
 
 <sect3 id="command-line-options">
-<title
->Command Line Options</title>
-<para
->&kate; accepts following command line options:</para>
+<title>Command Line Options</title>
+<para>&kate; accepts following command line options:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><userinput
-><command
->kate</command
-> <option
->--help</option
-></userinput
-></term>
+<term><userinput><command>kate</command> <option>--help</option></userinput></term>
 <listitem>
-<para
->This lists the most basic options available at the command line. </para>
+<para>This lists the most basic options available at the command line. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
-><command
->kate</command
-> <option
->--help-qt</option
-></userinput
-></term>
+<term><userinput><command>kate</command> <option>--help-qt</option></userinput></term>
 <listitem>
-<para
->This lists the options available for changing the way &kate; interacts with &Qt;. </para>
+<para>This lists the options available for changing the way &kate; interacts with &Qt;. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
-><command
->kate</command
-> <option
->--help-kde</option
-></userinput
-></term>
+<term><userinput><command>kate</command> <option>--help-kde</option></userinput></term>
 <listitem>
-<para
->This lists the options available for changing the way &kate; interacts with &kde;. </para>
+<para>This lists the options available for changing the way &kate; interacts with &kde;. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
-><command
->kate</command
-> <option
->--help-all</option
-></userinput
-></term>
+<term><userinput><command>kate</command> <option>--help-all</option></userinput></term>
 <listitem>
-<para
->This lists all of the command line options. </para>
+<para>This lists all of the command line options. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
-><command
->kate</command
-> <option
->--author</option
-></userinput
-></term>
+<term><userinput><command>kate</command> <option>--author</option></userinput></term>
 <listitem>
-<para
->Lists &kate;'s authors in the terminal window. </para>
+<para>Lists &kate;'s authors in the terminal window. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
-><command
->kate</command
-> <option
->--version</option
-></userinput
-></term>
+<term><userinput><command>kate</command> <option>--version</option></userinput></term>
 <listitem>
-<para
->Lists version information for &Qt;, &kde;, and &kate;. Also available through <userinput
-><command
->kate</command
-> <option
->-V</option
-></userinput
-> </para>
+<para>Lists version information for &Qt;, &kde;, and &kate;. Also available through <userinput><command>kate</command> <option>-V</option></userinput> </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
-><command
->kate</command
-> <option
->--license</option
-></userinput
-></term>
+<term><userinput><command>kate</command> <option>--license</option></userinput></term>
 <listitem>
-<para
->Shows licence information. </para>
+<para>Shows licence information. </para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -228,529 +97,189 @@
 </sect2>
 
 <sect2 id="drag-and-drop">
-<title
->Drag and Drop</title>
-<para
->&kate; uses the &kde; Drag and Drop protocol. Files may be dragged and dropped onto &kate; from the Desktop, &konqueror; or some remote ftp site opened in one of &konqueror;'s windows. </para>
+<title>Drag and Drop</title>
+<para>&kate; uses the &kde; Drag and Drop protocol. Files may be dragged and dropped onto &kate; from the Desktop, &konqueror; or some remote ftp site opened in one of &konqueror;'s windows. </para>
 </sect2>
 </sect1>
 
 <sect1 id="working-with-kate">
-<title
->Working with &kate;</title>
-<para
-><link linkend="quick-start"
->Quick Start</link
-> will show you how to toggle four simple options that will let you configure some of &kate;'s more powerful features right away. <link linkend="keystroke-commands"
-> Keystroke Commands</link
-> lays out some of the default keystroke shortcuts for those who can't or don't want to use a mouse. </para>
+<title>Working with &kate;</title>
+<para><link linkend="quick-start">Quick Start</link> will show you how to toggle four simple options that will let you configure some of &kate;'s more powerful features right away. <link linkend="keystroke-commands"> Keystroke Commands</link> lays out some of the default keystroke shortcuts for those who can't or don't want to use a mouse. </para>
 
 <sect2 id="quick-start">
-<title
->Quick Start</title>
+<title>Quick Start</title>
 
-<para
->This section will describe some of the items on the <guimenu
->Settings</guimenu
-> menu so that you can quickly configure &kate; to work the way you want it. </para>
+<para>This section will describe some of the items on the <guimenu>Settings</guimenu> menu so that you can quickly configure &kate; to work the way you want it. </para>
 
-<para
->When you start &kate; for the first time you'll see two windows with white backgrounds. Above the two windows is a toolbar with the usual labelled icons. And above that, a menu bar. </para>
+<para>When you start &kate; for the first time you'll see two windows with white backgrounds. Above the two windows is a toolbar with the usual labelled icons. And above that, a menu bar. </para>
 
-<para
->The left-hand window is a dockable side bar. It combines the Filelist and Fileselector windows. Switch between the two by clicking on the tabs at the top of the window. </para>
+<para>The left-hand window is a dockable side bar. It combines the Filelist and Fileselector windows. Switch between the two by clicking on the tabs at the top of the window. </para>
 
-<para
->If you've started &kate; with a file, the right-hand window will show the file you are editing and the Filelist on the side bar will show the name of the file. Use the Fileselector window to open files. </para>
+<para>If you've started &kate; with a file, the right-hand window will show the file you are editing and the Filelist on the side bar will show the name of the file. Use the Fileselector window to open files. </para>
 
-<para
->You can toggle the Filelist and Fileselector window on and off in <guimenu
->Settings</guimenu
-> menu. This menu offers you your first glimpse into &kate;'s power and flexibility. In this section we'll look at four items: </para>
+<para>You can toggle the Filelist and Fileselector window on and off in <guimenu>Settings</guimenu> menu. This menu offers you your first glimpse into &kate;'s power and flexibility. In this section we'll look at four items: </para>
 
 <variablelist>
 <varlistentry>
-<term
-><menuchoice
-><guimenuitem
->Show Toolbar</guimenuitem
-></menuchoice
-></term>
+<term><menuchoice><guimenuitem>Show Toolbar</guimenuitem></menuchoice></term>
 <listitem>
-<para
->Toggles the toolbar on and off. </para>
+<para>Toggles the toolbar on and off. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <menuchoice>
-<guimenuitem
->Show Filelist</guimenuitem>
+<guimenuitem>Show Filelist</guimenuitem>
 </menuchoice>
 </term>
 <listitem>
-<para
->Toggles the Filelist on and off. If the Filelist/Fileselector window is not open, &kate; launches the side bar as a separate, undocked, window. To dock the window grab the two thin parallel lines above the tabs by clicking on them with your &LMB; and holding the button down. Drag the the window into &kate;'s editing window and release the &LMB; when you have positioned the Filelist/Fileselector window as you prefer. </para>
+<para>Toggles the Filelist on and off. If the Filelist/Fileselector window is not open, &kate; launches the side bar as a separate, undocked, window. To dock the window grab the two thin parallel lines above the tabs by clicking on them with your &LMB; and holding the button down. Drag the the window into &kate;'s editing window and release the &LMB; when you have positioned the Filelist/Fileselector window as you prefer. </para>
 
 <tip>
-<para
->If you have grabbed the two parallel lines successfully your mouse pointer will turn into two crossed arrows as you drag. </para>
+<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>
 <varlistentry>
-<term
-><menuchoice
-><guimenuitem
->Show Fileselector</guimenuitem
-></menuchoice
-></term>
+<term><menuchoice><guimenuitem>Show Fileselector</guimenuitem></menuchoice></term>
 <listitem>
-<para
->Toggles the Fileselector on and off. This menu item is the same as <guimenuitem
->Show Filelist</guimenuitem
-> with one difference. Toggling it on launches the window with the Fileselector on top. </para>
+<para>Toggles the Fileselector on and off. This menu item is the same as <guimenuitem>Show Filelist</guimenuitem> with one difference. Toggling it on launches the window with the Fileselector on top. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenuitem
->Show Console</guimenuitem
-></menuchoice
-></term>
+<term><menuchoice><guimenuitem>Show Console</guimenuitem></menuchoice></term>
 <listitem>
-<para
->Toggles a console emulator on and off at the bottom of &kate;'s window. In other words, it gives you a command line within the application. </para>
+<para>Toggles a console emulator on and off at the bottom of &kate;'s window. In other words, it gives you a command line within the application. </para>
 </listitem>
 </varlistentry>
 </variablelist>
 </sect2>
 
 <sect2 id="keystroke-commands">
-<title
->Keystroke Commands</title>
+<title>Keystroke Commands</title>
 
-<para
->Many of &kate;'s keystroke commands (shortcuts) are configurable by way of the <link linkend="settings"
->Settings</link
-> menu. By default &kate; honours the following key bindings. </para>
+<para>Many of &kate;'s keystroke commands (shortcuts) are configurable by way of the <link linkend="settings">Settings</link> menu. By default &kate; honours the following key bindings. </para>
 
 <informaltable>
 <tgroup cols="2">
 <tbody>
 
-<row
-><entry
-><para
-><keycap
->Insert</keycap
-></para
-></entry>
-<entry
-><para
->Toggle between Insert and Overwrite mode. When in insert mode the editor will add any typed characters to the text and push any previously typed data to the right of the text cursor. Overwrite mode causes the entry of each character to eliminate the character immediately to the right of the text cursor.</para
-></entry>
+<row><entry><para><keycap>Insert</keycap></para></entry>
+<entry><para>Toggle between Insert and Overwrite mode. When in insert mode the editor will add any typed characters to the text and push any previously typed data to the right of the text cursor. Overwrite mode causes the entry of each character to eliminate the character immediately to the right of the text cursor.</para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo
-><keycap
->Left Arrow</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Move the cursor one character to the left </para
-></entry>
+<entry><para><keycombo><keycap>Left Arrow</keycap></keycombo></para></entry>
+<entry><para>Move the cursor one character to the left </para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo
-><keycap
->Right Arrow</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Move the cursor one character to the right </para
-></entry>
+<entry><para><keycombo><keycap>Right Arrow</keycap></keycombo></para></entry>
+<entry><para>Move the cursor one character to the right </para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo action="simul"
-><keycap
->Up Arrow</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Move the cursor up one line </para
-></entry>
+<entry><para><keycombo action="simul"><keycap>Up Arrow</keycap></keycombo></para></entry>
+<entry><para>Move the cursor up one line </para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo action="simul"
-><keycap
->Down Arrow</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Move the cursor down one line </para
-></entry>
+<entry><para><keycombo action="simul"><keycap>Down Arrow</keycap></keycombo></para></entry>
+<entry><para>Move the cursor down one line </para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo action="simul"
-><keycap
->Page Up</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Move the cursor up one page </para
-></entry>
+<entry><para><keycombo action="simul"><keycap>Page Up</keycap></keycombo></para></entry>
+<entry><para>Move the cursor up one page </para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo action="simul"
-><keycap
->Page Down</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Move the cursor down one page </para
-></entry>
+<entry><para><keycombo action="simul"><keycap>Page Down</keycap></keycombo></para></entry>
+<entry><para>Move the cursor down one page </para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo action="simul"
-><keycap
->Backspace</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Delete the character to the left of the cursor </para
-></entry>
+<entry><para><keycombo action="simul"><keycap>Backspace</keycap></keycombo></para></entry>
+<entry><para>Delete the character to the left of the cursor </para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo action="simul"
-><keycap
->Home</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Move the cursor to the beginning of the line </para
-></entry>
+<entry><para><keycombo action="simul"><keycap>Home</keycap></keycombo></para></entry>
+<entry><para>Move the cursor to the beginning of the line </para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo action="simul"
-><keycap
->End</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Move the cursor to the end of the line </para
-></entry>
+<entry><para><keycombo action="simul"><keycap>End</keycap></keycombo></para></entry>
+<entry><para>Move the cursor to the end of the line </para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo action="simul"
-><keycap
->Delete</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Delete the character to the right of the cursor (or any selected text)</para
-></entry>
+<entry><para><keycombo action="simul"><keycap>Delete</keycap></keycombo></para></entry>
+<entry><para>Delete the character to the right of the cursor (or any selected text)</para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo action="simul"
->&Shift;<keycap
->Left Arrow</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Mark text one character to the left </para
-></entry>
+<entry><para><keycombo action="simul">&Shift;<keycap>Left Arrow</keycap></keycombo></para></entry>
+<entry><para>Mark text one character to the left </para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo action="simul"
->&Shift;<keycap
->Right Arrow</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Mark text one character to the right </para
-></entry>
+<entry><para><keycombo action="simul">&Shift;<keycap>Right Arrow</keycap></keycombo></para></entry>
+<entry><para>Mark text one character to the right </para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo action="simul"
-><keycap
->F1</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Help</para
-></entry>
+<entry><para><keycombo action="simul"><keycap>F1</keycap></keycombo></para></entry>
+<entry><para>Help</para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo action="simul"
->&Shift;<keycap
->F1</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
-><link linkend="whats-this"
->What's this?</link
-></para
-></entry>
+<entry><para><keycombo action="simul">&Shift;<keycap>F1</keycap></keycombo></para></entry>
+<entry><para><link linkend="whats-this">What's this?</link></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><keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo></para></entry>
+<entry><para><link linkend="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><keycombo action="simul"><keycap>F3</keycap></keycombo></para></entry>
+<entry><para><link linkend="find-again">Find again</link></para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo action="simul"
->&Ctrl;<keycap
->B</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Set a Bookmark</para
-></entry>
+<entry><para><keycombo action="simul">&Ctrl;<keycap>B</keycap></keycombo></para></entry>
+<entry><para>Set a Bookmark</para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo action="simul"
->&Ctrl;<keycap
->C</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Copy the marked text to the clipboard. </para
-></entry>
+<entry><para><keycombo action="simul">&Ctrl;<keycap>C</keycap></keycombo></para></entry>
+<entry><para>Copy the marked text to the clipboard. </para></entry>
 </row>
 
 <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><keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo></para></entry>
+<entry><para><link linkend="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><keycombo action="simul">&Ctrl;<keycap>P</keycap></keycombo></para></entry>
+<entry><para><link linkend="print">Print</link> </para></entry>
 </row>
 <row>
 
-<entry
-><para
-><keycombo action="simul"
->&Ctrl;<keycap
->Q</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Quit - close active copy of editor </para
-></entry>
+<entry><para><keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo></para></entry>
+<entry><para>Quit - close active copy of editor </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><keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo></para></entry>
+<entry><para><link linkend="replace">Replace</link></para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo action="simul"
->&Ctrl;<keycap
->S</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Save your file.</para
-></entry>
+<entry><para><keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo></para></entry>
+<entry><para>Save your file.</para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo action="simul"
->&Ctrl;<keycap
->V</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Paste.</para
-></entry>
+<entry><para><keycombo action="simul">&Ctrl;<keycap>V</keycap></keycombo></para></entry>
+<entry><para>Paste.</para></entry>
 </row>
 
 <row>
-<entry
-><para
-><keycombo action="simul"
->&Ctrl;<keycap
->X</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Delete the marked text and copy it to the clipboard. </para
-></entry>
+<entry><para><keycombo action="simul">&Ctrl;<keycap>X</keycap></keycombo></para></entry>
+<entry><para>Delete the marked text and copy it to the clipboard. </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><keycombo action="simul">&Ctrl;<keycap>Z</keycap></keycombo></para></entry>
+<entry><para><link linkend="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><keycombo action="simul">&Ctrl;&Shift;<keycap>Z</keycap></keycombo></para></entry>
+<entry><para><link linkend="redo">Redo</link></para></entry>
 </row>
 </tbody>
 </tgroup>
@@ -761,72 +290,38 @@
 
 <sect1 id="fundamentals-getting-help">
 
-<title
->Getting Help</title>
+<title>Getting Help</title>
 
 <sect2>
 
-<title
->With &kate;</title>
+<title>With &kate;</title>
 <variablelist>
 
 <varlistentry>
-<term
->This manual</term
-> 
+<term>This manual</term> 
 
 <listitem>
-<para
->Offers detailed documentation on all menu commands, configuration options, tools, dialogues, plugins &etc; as well as descriptions of of the &kate; window, the editor and various concepts used in the application.</para>
-
-<para
->Press <keycap
->F1</keycap
-> or use the <menuchoice
-><guimenu
->Help</guimenu
-></menuchoice
-> <guisubmenu
->Contents</guisubmenu
-> menu topic to view this manual.</para
-></listitem>
+<para>Offers detailed documentation on all menu commands, configuration options, tools, dialogues, plugins &etc; as well as descriptions of of the &kate; window, the editor and various concepts used in the application.</para>
+
+<para>Press <keycap>F1</keycap> or use the <menuchoice><guimenu>Help</guimenu></menuchoice> <guisubmenu>Contents</guisubmenu> menu topic to view this manual.</para></listitem>
 
 </varlistentry>
 
 <varlistentry id="whats-this">
-<term
->What's This Help</term
-> 
+<term>What's This Help</term> 
 <listitem>
-<para
->What's This help offers immediate help with single elements of graphical windows, such as buttons or other window areas.</para>
-
-<para
->We strive to provide What's This help for any elements for which it makes sense. It is available throughout the configuration dialogue, and in many other dialogues as well.</para>
-
-<para
->To employ What's This help, press <keycombo
->&Shift;<keycap
->F1</keycap
-></keycombo
-> or use the <menuchoice
-><guimenu
->Help</guimenu
-><guimenuitem
->What's This</guimenuitem
-></menuchoice
-> menu item to enable What's This mode. The cursor will turn into an arrow with a question mark, and you can now click any element in the window to read the What's This help for that element, if it is available.</para>
+<para>What's This help offers immediate help with single elements of graphical windows, such as buttons or other window areas.</para>
+
+<para>We strive to provide What's This help for any elements for which it makes sense. It is available throughout the configuration dialogue, and in many other dialogues as well.</para>
+
+<para>To employ What's This help, press <keycombo>&Shift;<keycap>F1</keycap></keycombo> or use the <menuchoice><guimenu>Help</guimenu><guimenuitem>What's This</guimenuitem></menuchoice> menu item to enable What's This mode. The cursor will turn into an arrow with a question mark, and you can now click any element in the window to read the What's This help for that element, if it is available.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Help Buttons in Dialogues</term>
+<term>Help Buttons in Dialogues</term>
 <listitem>
-<para
->Some dialogues have a <guibutton
->Help</guibutton
-> Button. Pressing it will start the &khelpcenter; and open the relevant documentation.</para>
+<para>Some dialogues have a <guibutton>Help</guibutton> Button. Pressing it will start the &khelpcenter; and open the relevant documentation.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -834,13 +329,9 @@
 </sect2>
 
 <sect2>
-<title
->With Your Text Files</title>
+<title>With Your Text Files</title>
 
-<para
->&kate; does not (yet!) provide any means for reading document related documentation. Depending on the file you are editing, you may find the <link linkend="kate-mdi-tools-konsole"
->Built in &konsole;</link
-> helpful for viewing related &UNIX; manual pages or info documentation, or you can use &konqueror;.</para>
+<para>&kate; does not (yet!) provide any means for reading document related documentation. Depending on the file you are editing, you may find the <link linkend="kate-mdi-tools-konsole">Built in &konsole;</link> helpful for viewing related &UNIX; manual pages or info documentation, or you can use &konqueror;.</para>
 
 </sect2>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kate/highlighting.docbook b/tde-i18n-en_GB/docs/tdebase/kate/highlighting.docbook
index cef036728ef..2785ea10b09 100644
--- a/tde-i18n-en_GB/docs/tdebase/kate/highlighting.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kate/highlighting.docbook
@@ -1,191 +1,103 @@
 <appendix id="highlight">
 <appendixinfo>
 <authorgroup>
-<author
-><personname
-><firstname
-></firstname
-></personname
-></author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author><personname><firstname></firstname></personname></author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </appendixinfo>
-<title
->Working with Syntax Highlighting</title>
+<title>Working with Syntax Highlighting</title>
 
 <sect1 id="highlight-overview">
 
-<title
->Overview</title>
+<title>Overview</title>
 
-<para
->Syntax Highlighting is what makes the editor automatically display text in different styles/colours, depending on the function of the string in relation to the purpose of the file. In program source code for example, control statements may be rendered bold, while data types and comments get different colours from the rest of the text. This greatly enhances the readability of the text, and thus helps the author to be more efficient and productive.</para>
+<para>Syntax Highlighting is what makes the editor automatically display text in different styles/colours, depending on the function of the string in relation to the purpose of the file. In program source code for example, control statements may be rendered bold, while data types and comments get different colours from the rest of the text. This greatly enhances the readability of the text, and thus helps the author to be more efficient and productive.</para>
 
 <mediaobject>
-<imageobject
-><imagedata format="PNG" fileref="highlighted.png"/></imageobject>
-<textobject
-><phrase
->A perl function, rendered with syntax highlighting.</phrase
-></textobject>
-<caption
-><para
->A perl function, rendered with syntax highlighting.</para>
+<imageobject><imagedata format="PNG" fileref="highlighted.png"/></imageobject>
+<textobject><phrase>A perl function, rendered with syntax highlighting.</phrase></textobject>
+<caption><para>A perl function, rendered with syntax highlighting.</para>
 </caption>
 </mediaobject>
 
 <mediaobject>
-<imageobject
-><imagedata format="PNG" fileref="unhighlighted.png"/></imageobject>
-<textobject
-><phrase
->The same perl function, without highlighting.</phrase
-></textobject>
-<caption
-><para
->The same perl function, without highlighting.</para
-></caption>
+<imageobject><imagedata format="PNG" fileref="unhighlighted.png"/></imageobject>
+<textobject><phrase>The same perl function, without highlighting.</phrase></textobject>
+<caption><para>The same perl function, without highlighting.</para></caption>
 </mediaobject>
 
-<para
->Of the two examples, which is easiest to read?</para>
+<para>Of the two examples, which is easiest to read?</para>
 
-<para
->&kate; comes with a flexible, configurable and capable system for doing syntax highlighting, and the standard distribution provides definitions for a wide range of programming languages, markup and scripting languages and other text file formats. In addition you can provide your own definitions in simple &XML; files.</para>
+<para>&kate; comes with a flexible, configurable and capable system for doing syntax highlighting, and the standard distribution provides definitions for a wide range of programming languages, markup and scripting languages and other text file formats. In addition you can provide your own definitions in simple &XML; files.</para>
 
-<para
->&kate; will automatically detect the right syntax rules when you open a file, based on the &MIME; Type of the file, determined by its extension, or, if it has none, the contents. Should you experience a bad choice, you can manually set the syntax to use from the <menuchoice
-><guimenu
->Documents</guimenu
-><guisubmenu
->Highlight Mode</guisubmenu
-></menuchoice
-> menu.</para>
+<para>&kate; will automatically detect the right syntax rules when you open a file, based on the &MIME; Type of the file, determined by its extension, or, if it has none, the contents. Should you experience a bad choice, you can manually set the syntax to use from the <menuchoice><guimenu>Documents</guimenu><guisubmenu>Highlight Mode</guisubmenu></menuchoice> menu.</para>
 
-<para
->The styles and colours used by each syntax highlight definition, as well as which &MIME;types it should be used for, can be configured using the <link linkend="config-dialog-editor-hl"
-> Highlight</link
-> page of the <link linkend="config-dialog"
->Config Dialogue</link
->.</para>
+<para>The styles and colours used by each syntax highlight definition, as well as which &MIME;types it should be used for, can be configured using the <link linkend="config-dialog-editor-hl"> Highlight</link> page of the <link linkend="config-dialog">Config Dialogue</link>.</para>
 
 <note>
-<para
->Syntax highlighting is there to enhance the readability of correct text, but you cannot trust it to validate your text. Marking text for syntax is difficult depending on the format you are using, and in some cases the authors of the syntax rules will be proud if 98% of text gets correctly rendered, though most often you need a rare style to see the incorrect 2%.</para>
+<para>Syntax highlighting is there to enhance the readability of correct text, but you cannot trust it to validate your text. Marking text for syntax is difficult depending on the format you are using, and in some cases the authors of the syntax rules will be proud if 98% of text gets correctly rendered, though most often you need a rare style to see the incorrect 2%.</para>
 </note>
 
 <tip>
-<para
->You can download updated or additional syntax highlight definitions from the &kate; website by clicking the <guibutton
->Download</guibutton
-> button in the <link linkend="config-dialog-editor-hl"
->Highlight Page</link
-> of the <link linkend="config-dialog"
->Config Dialogue</link
->.</para>
+<para>You can download updated or additional syntax highlight definitions from the &kate; website by clicking the <guibutton>Download</guibutton> button in the <link linkend="config-dialog-editor-hl">Highlight Page</link> of the <link linkend="config-dialog">Config Dialogue</link>.</para>
 </tip>
 
 </sect1>
 
 <sect1 id="katehighlight-system">
 
-<title
->The &kate; Syntax Highlight System</title>
+<title>The &kate; Syntax Highlight System</title>
 
-<para
->This section will discuss the &kate; syntax highlighting mechanism in more detail. It is for you if you want to know know about it, or if you want to change or create syntax definitions.</para>
+<para>This section will discuss the &kate; syntax highlighting mechanism in more detail. It is for you if you want to know know about it, or if you want to change or create syntax definitions.</para>
 
 <sect2 id="katehighlight-howitworks">
 
-<title
->How it Works</title>
-
-<para
->Whenever you open a file, one of the first things the &kate; editor does is detect which syntax definition to use for the file. While reading the text of the file, and while you type away in it, the syntax highlighting system will analyse the text using the rules defined by the syntax definition and mark in it where different contexts and styles begin and end.</para>
-
-<para
->When you type in the document, the new text is analysed and marked on the fly, so that if you delete a character that is marked as the beginning or end of a context, the style of surrounding text changes accordingly.</para>
-
-<para
->The syntax definitions used by the &kate; syntax highlighting system are &XML; files, containing <itemizedlist>
-<listitem
-><para
->Rules for detecting the role of text, organised into context blocks</para
-></listitem>
-<listitem
-><para
->Keyword lists</para
-></listitem>
-<listitem
-><para
->Style Item definitions</para
-></listitem>
+<title>How it Works</title>
+
+<para>Whenever you open a file, one of the first things the &kate; editor does is detect which syntax definition to use for the file. While reading the text of the file, and while you type away in it, the syntax highlighting system will analyse the text using the rules defined by the syntax definition and mark in it where different contexts and styles begin and end.</para>
+
+<para>When you type in the document, the new text is analysed and marked on the fly, so that if you delete a character that is marked as the beginning or end of a context, the style of surrounding text changes accordingly.</para>
+
+<para>The syntax definitions used by the &kate; syntax highlighting system are &XML; files, containing <itemizedlist>
+<listitem><para>Rules for detecting the role of text, organised into context blocks</para></listitem>
+<listitem><para>Keyword lists</para></listitem>
+<listitem><para>Style Item definitions</para></listitem>
 </itemizedlist>
 </para>
 
-<para
->When analysing the text, the detection rules are evaluated in the order in which they are defined, and if the beginning of the current string matches a rule, the related context is used. The start point in the text is moved to the final point at which that rule matched and a new loop of the rules begins, starting in the context set by the matched rule.</para>
+<para>When analysing the text, the detection rules are evaluated in the order in which they are defined, and if the beginning of the current string matches a rule, the related context is used. The start point in the text is moved to the final point at which that rule matched and a new loop of the rules begins, starting in the context set by the matched rule.</para>
 
 </sect2>
 
 <sect2 id="highlight-system-rules">
-<title
->Rules</title>
+<title>Rules</title>
 
-<para
->The detection rules are the heart of the highlighting detection system. A rule is a string, character or <link linkend="regular-expressions"
->regular expression</link
-> against which to match the text being analysed. It contains information about which style to use for the matching part of the text. It may switch the working context of the system either to an explicitly mentioned context or to the previous context used by the text.</para>
+<para>The detection rules are the heart of the highlighting detection system. A rule is a string, character or <link linkend="regular-expressions">regular expression</link> against which to match the text being analysed. It contains information about which style to use for the matching part of the text. It may switch the working context of the system either to an explicitly mentioned context or to the previous context used by the text.</para>
 
-<para
->Rules are organised in context groups. A context group is used for main text concepts within the format, for example quoted text strings or comment blocks in program source code. This ensures that the highlighting system does not need to loop through all rules when it is not necessary, and that some character sequences in the text can be treated differently depending on the current context. </para>
+<para>Rules are organised in context groups. A context group is used for main text concepts within the format, for example quoted text strings or comment blocks in program source code. This ensures that the highlighting system does not need to loop through all rules when it is not necessary, and that some character sequences in the text can be treated differently depending on the current context. </para>
 
 </sect2>
 
 <sect2 id="highlight-context-styles-keywords">
-<title
->Context Styles and Keywords</title>
+<title>Context Styles and Keywords</title>
 
-<para
->In some programming languages, integer numbers are treated differently than floating point ones by the compiler (the program that converts the source code to a binary executable), and there may be characters having a special meaning within a quoted string. In such cases, it makes sense to render them differently from the surroundings so that they are easy to identify while reading the text. So even if they do not represent special contexts, they may be seen as such by the syntax highlighting system, so that they can be marked for different rendering.</para>
+<para>In some programming languages, integer numbers are treated differently than floating point ones by the compiler (the program that converts the source code to a binary executable), and there may be characters having a special meaning within a quoted string. In such cases, it makes sense to render them differently from the surroundings so that they are easy to identify while reading the text. So even if they do not represent special contexts, they may be seen as such by the syntax highlighting system, so that they can be marked for different rendering.</para>
 
-<para
->A syntax definition may contain as many styles as required to cover the concepts of the format it is used for.</para>
+<para>A syntax definition may contain as many styles as required to cover the concepts of the format it is used for.</para>
 
-<para
->In many formats, there are lists of words that represent a specific concept. For example in programming languages, the control statements is one concept, data type names another, and built in functions of the language a third. The &kate; Syntax Highlighting System can use such lists to detect and mark words in the text to emphasise concepts of the text formats.</para>
+<para>In many formats, there are lists of words that represent a specific concept. For example in programming languages, the control statements is one concept, data type names another, and built in functions of the language a third. The &kate; Syntax Highlighting System can use such lists to detect and mark words in the text to emphasise concepts of the text formats.</para>
 
 </sect2>
 
 <sect2 id="kate-highlight-system-default-styles">
-<title
->Default Styles</title>
+<title>Default Styles</title>
 
-<para
->If you open a C++ source file, a &Java; source file and an <acronym
->HTML</acronym
-> document in &kate;, you will see that even though the formats are different, and thus different words are chosen for special treatment, the colours used are the same. This is because &kate; has a predefined list of Default Styles, that are employed by the individual syntax definitions.</para>
+<para>If you open a C++ source file, a &Java; source file and an <acronym>HTML</acronym> document in &kate;, you will see that even though the formats are different, and thus different words are chosen for special treatment, the colours used are the same. This is because &kate; has a predefined list of Default Styles, that are employed by the individual syntax definitions.</para>
 
-<para
->This makes it easy to recognise similar concepts in different text formats. For example comments are present in almost any programming, scripting or markup language, and when they are rendered using the same style in all languages, you do not have to stop and think to identify them within the text.</para>
+<para>This makes it easy to recognise similar concepts in different text formats. For example comments are present in almost any programming, scripting or markup language, and when they are rendered using the same style in all languages, you do not have to stop and think to identify them within the text.</para>
 
 <tip>
-<para
->All styles in a syntax definition use one of the default styles. A few syntax definitions use more styles that there are defaults, so if you use a format often, it may be worth launching the configuration dialogue to see if some concepts are using the same style. For example there is only one default style for strings, but as the perl programming language operates with two types of strings, you can enhance the highlighting by configuring those to be slightly different.</para>
+<para>All styles in a syntax definition use one of the default styles. A few syntax definitions use more styles that there are defaults, so if you use a format often, it may be worth launching the configuration dialogue to see if some concepts are using the same style. For example there is only one default style for strings, but as the perl programming language operates with two types of strings, you can enhance the highlighting by configuring those to be slightly different.</para>
 </tip>
 
 </sect2>
@@ -193,74 +105,47 @@
 </sect1>
 
 <sect1 id="katehighlight-xml-format">
-<title
->The Highlight Definition &XML; Format</title>
+<title>The Highlight Definition &XML; Format</title>
 
 <sect2>
-<title
->Overview</title>
-
-<para
->This section is an overview of the Highlight Definition &XML; format. It will describe the main components and their meaning and usage, and go into detail with the detection rules.</para>
-
-<para
->The formal definition, aka the <acronym
->DTD</acronym
-> is stored in the file <filename
->language.dtd</filename
-> which should be installed on your system in the folder <filename
->$<envar
->TDEDIR</envar
->/share/apps/kate/syntax</filename
->.</para>
+<title>Overview</title>
+
+<para>This section is an overview of the Highlight Definition &XML; format. It will describe the main components and their meaning and usage, and go into detail with the detection rules.</para>
+
+<para>The formal definition, aka the <acronym>DTD</acronym> is stored in the file <filename>language.dtd</filename> which should be installed on your system in the folder <filename>$<envar>TDEDIR</envar>/share/apps/kate/syntax</filename>.</para>
 
 <variablelist>
-<title
->Main components of &kate; Highlight Definitions</title>
+<title>Main components of &kate; Highlight Definitions</title>
 
 <varlistentry>
-<term
->The General Section</term>
+<term>The General Section</term>
 <listitem>
-<para
->The General Section contains information on the comment format of the described language, and defines whether keywords are case sensitive.</para
-> 
+<para>The General Section contains information on the comment format of the described language, and defines whether keywords are case sensitive.</para> 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Highlighting</term>
+<term>Highlighting</term>
 <listitem>
-<para
->The Highlighting section contains all data required to analyse and render the text. This includes:</para>
+<para>The Highlighting section contains all data required to analyse and render the text. This includes:</para>
 
 <variablelist>
 <varlistentry>
-<term
->ItemDatas</term>
-<listitem
-><para
->Contains ItemData elements, each defining a style.</para
-></listitem
-> 
+<term>ItemDatas</term>
+<listitem><para>Contains ItemData elements, each defining a style.</para></listitem> 
 </varlistentry>
 
 <varlistentry>
-<term
->Keyword lists</term>
+<term>Keyword lists</term>
 <listitem>
-<para
->Each list has a name, and may contain any number of items.</para>
+<para>Each list has a name, and may contain any number of items.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Contexts</term>
+<term>Contexts</term>
 <listitem>
-<para
->Contains contexts, which again contain the syntax detection rules.</para>
+<para>Contains contexts, which again contain the syntax detection rules.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -275,347 +160,175 @@
 </sect1>
 
 <sect1 id="kate-highlight-rules-detailled">
-<title
->Highlight Detection Rules</title>
-
-<para
->This section describes the syntax detection rules.</para>
-
-<para
->Each rule can match zero or more characters at the beginning of the string they are asked to test. If the rule matches, the matching characters are assigned the style or <emphasis
->attribute</emphasis
-> defined by the rule, and a rule may ask that the current context is switched.</para>
-
-<para
->The <emphasis
->attribute</emphasis
-> and <emphasis
->context</emphasis
-> attributes are common to all rules.</para>
-
-<para
->A rule looks like this:</para>
-
-<programlisting
->&lt;RuleName attribute=&quot;(identifier)&quot; context=&quot;(identifier|order)&quot; [rule specific attributes] /&gt;</programlisting>
-
-<para
->The <emphasis
->attribute</emphasis
-> identifies the style to use for matched characters by name or index, and the <emphasis
->context</emphasis
-> identifies the context to use from here.</para>
-
-<para
->The <emphasis
->attribute</emphasis
-> can be identified either by name, or by its zero-based index in the ItemDatas group.</para>
-
-<para
->The <emphasis
->context</emphasis
-> can be identified by:</para>
+<title>Highlight Detection Rules</title>
+
+<para>This section describes the syntax detection rules.</para>
+
+<para>Each rule can match zero or more characters at the beginning of the string they are asked to test. If the rule matches, the matching characters are assigned the style or <emphasis>attribute</emphasis> defined by the rule, and a rule may ask that the current context is switched.</para>
+
+<para>The <emphasis>attribute</emphasis> and <emphasis>context</emphasis> attributes are common to all rules.</para>
+
+<para>A rule looks like this:</para>
+
+<programlisting>&lt;RuleName attribute=&quot;(identifier)&quot; context=&quot;(identifier|order)&quot; [rule specific attributes] /&gt;</programlisting>
+
+<para>The <emphasis>attribute</emphasis> identifies the style to use for matched characters by name or index, and the <emphasis>context</emphasis> identifies the context to use from here.</para>
+
+<para>The <emphasis>attribute</emphasis> can be identified either by name, or by its zero-based index in the ItemDatas group.</para>
+
+<para>The <emphasis>context</emphasis> can be identified by:</para>
 
 <itemizedlist>
 <listitem>
-<para
->An <emphasis
->identifier</emphasis
->, currently only its zero-based index in the contexts group.</para>
+<para>An <emphasis>identifier</emphasis>, currently only its zero-based index in the contexts group.</para>
 </listitem>
 <listitem>
-<para
->An <emphasis
->order</emphasis
-> telling the engine to stay in the current context (<userinput
->#stay</userinput
->), or to pop back to a previous context used in the string (<userinput
->#pop</userinput
->).</para
-> 
-<para
->To go back more steps, the #pop keyword can be repeated: <userinput
->#pop#pop#pop</userinput
-></para
-> 
+<para>An <emphasis>order</emphasis> telling the engine to stay in the current context (<userinput>#stay</userinput>), or to pop back to a previous context used in the string (<userinput>#pop</userinput>).</para> 
+<para>To go back more steps, the #pop keyword can be repeated: <userinput>#pop#pop#pop</userinput></para> 
 </listitem>
 </itemizedlist>
 
-<para
->Some rules can have <emphasis
->child rules</emphasis
-> which are then evaluated if and only if the parent rule matched. The entire matched string will be given the attribute defined by the parent rule. A rule with child rules looks like this:</para>
+<para>Some rules can have <emphasis>child rules</emphasis> which are then evaluated if and only if the parent rule matched. The entire matched string will be given the attribute defined by the parent rule. A rule with child rules looks like this:</para>
 
-<programlisting
->&lt;RuleName (attributes)&gt;
+<programlisting>&lt;RuleName (attributes)&gt;
   &lt;ChildRuleName (attributes) /&gt;
   ...
 &lt;/RuleName&gt;
 </programlisting>
 
 
-<para
->Rule specific attributes varies and are described in the following list.</para
-> 
+<para>Rule specific attributes varies and are described in the following list.</para> 
 
 <variablelist>
-<title
->The Rules in Detail</title>
+<title>The Rules in Detail</title>
 
 <varlistentry>
-<term
->DetectChar</term>
+<term>DetectChar</term>
 <listitem>
-<para
->Detect a single specific character. Commonly used for example to find the ends of quoted strings.</para
-> 
-<programlisting
->&lt;DetectChar char=&quot;(character)&quot; (common attributes) /&gt;</programlisting>
-<para
->The <userinput
->char</userinput
-> attribute defines the character to match.</para
-> 
+<para>Detect a single specific character. Commonly used for example to find the ends of quoted strings.</para> 
+<programlisting>&lt;DetectChar char=&quot;(character)&quot; (common attributes) /&gt;</programlisting>
+<para>The <userinput>char</userinput> attribute defines the character to match.</para> 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Detect2Chars</term>
+<term>Detect2Chars</term>
 <listitem>
-<para
->Detect two specific characters in a defined order.</para>
-<programlisting
->&lt;Detect2Chars char=&quot;(character)&quot; char1=&quot;(character)&quot; (common attributes) /&gt;</programlisting>
-<para
->The <userinput
->char</userinput
-> attribute defines the first character to match, <userinput
->char1</userinput
-> the second.</para>
+<para>Detect two specific characters in a defined order.</para>
+<programlisting>&lt;Detect2Chars char=&quot;(character)&quot; char1=&quot;(character)&quot; (common attributes) /&gt;</programlisting>
+<para>The <userinput>char</userinput> attribute defines the first character to match, <userinput>char1</userinput> the second.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->AnyChar</term>
+<term>AnyChar</term>
 <listitem>
-<para
->Detect one character of a set of specified characters.</para>
-<programlisting
->&lt;AnyChar String=&quot;(string)&quot; (common attributes) /&gt;</programlisting>
-<para
->The <userinput
->String</userinput
-> attribute defines the set of characters.</para>
+<para>Detect one character of a set of specified characters.</para>
+<programlisting>&lt;AnyChar String=&quot;(string)&quot; (common attributes) /&gt;</programlisting>
+<para>The <userinput>String</userinput> attribute defines the set of characters.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->StringDetect</term>
+<term>StringDetect</term>
 <listitem>
-<para
->Detect an exact string.</para>
-<programlisting
->&lt;StringDetect String=&quot;(string)&quot; [insensitive=&quot;TRUE|FALSE;&quot;] (common attributes) /&gt;</programlisting>
-<para
->The <userinput
->String</userinput
-> attribute defines the string to match. The <userinput
->insensitive</userinput
-> attribute defaults to <userinput
->FALSE</userinput
-> and is fed to the string comparison function. If the value is <userinput
->TRUE</userinput
-> insensitive comparing is used.</para
-> 
+<para>Detect an exact string.</para>
+<programlisting>&lt;StringDetect String=&quot;(string)&quot; [insensitive=&quot;TRUE|FALSE;&quot;] (common attributes) /&gt;</programlisting>
+<para>The <userinput>String</userinput> attribute defines the string to match. The <userinput>insensitive</userinput> attribute defaults to <userinput>FALSE</userinput> and is fed to the string comparison function. If the value is <userinput>TRUE</userinput> insensitive comparing is used.</para> 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->RegExpr</term>
+<term>RegExpr</term>
 <listitem>
-<para
->Matches against a regular expression.</para>
-<programlisting
->&lt;RegExpr String=&quot;(string)&quot; [insensitive=&quot;TRUE|FALSE;&quot;] [minimal=&quot;TRUE|FALSE&quot;] (common attributes) /&gt;</programlisting>
-<para
->The <userinput
->String</userinput
-> attribute defines the regular expression.</para>
-<para
-><userinput
->insensitive</userinput
-> defaults to <userinput
->FALSE</userinput
-> and is fed to the regular expression engine.</para>
-<para
-><userinput
->minimal</userinput
-> defaults to <userinput
->FALSE</userinput
-> and is fed to the regular expression engine.</para>
-<para
->Because the rules are always matched against the beginning of the current string, a regular expression starting with a caret (<literal
->^</literal
->) indicates that the rule should only be matched against the start of a line.</para>
-<para
->See <link linkend="regular-expressions"
->Regular Expressions</link
-> for more information on those.</para
-> 
+<para>Matches against a regular expression.</para>
+<programlisting>&lt;RegExpr String=&quot;(string)&quot; [insensitive=&quot;TRUE|FALSE;&quot;] [minimal=&quot;TRUE|FALSE&quot;] (common attributes) /&gt;</programlisting>
+<para>The <userinput>String</userinput> attribute defines the regular expression.</para>
+<para><userinput>insensitive</userinput> defaults to <userinput>FALSE</userinput> and is fed to the regular expression engine.</para>
+<para><userinput>minimal</userinput> defaults to <userinput>FALSE</userinput> and is fed to the regular expression engine.</para>
+<para>Because the rules are always matched against the beginning of the current string, a regular expression starting with a caret (<literal>^</literal>) indicates that the rule should only be matched against the start of a line.</para>
+<para>See <link linkend="regular-expressions">Regular Expressions</link> for more information on those.</para> 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Keyword</term>
+<term>Keyword</term>
 <listitem>
-<para
->Detect a keyword from a specified list.</para>
-<programlisting
->&lt;keyword String=&quot;(list name)&quot; (common attributes) /&gt;</programlisting>
-<para
->The <userinput
->String</userinput
-> attribute identifies the keyword list by name. A list with that name must exist.</para>
+<para>Detect a keyword from a specified list.</para>
+<programlisting>&lt;keyword String=&quot;(list name)&quot; (common attributes) /&gt;</programlisting>
+<para>The <userinput>String</userinput> attribute identifies the keyword list by name. A list with that name must exist.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Int</term>
+<term>Int</term>
 <listitem>
-<para
->Detect an integer number.</para>
-<para
-><programlisting
->&lt;Int (common attributes) /&gt;</programlisting
-></para>
-<para
->This rule has no specific attributes. Child rules are typically used to detect combinations of <userinput
->L</userinput
-> and <userinput
->U</userinput
-> after the number, indicating the integer type in program code.</para>
+<para>Detect an integer number.</para>
+<para><programlisting>&lt;Int (common attributes) /&gt;</programlisting></para>
+<para>This rule has no specific attributes. Child rules are typically used to detect combinations of <userinput>L</userinput> and <userinput>U</userinput> after the number, indicating the integer type in program code.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Float</term>
+<term>Float</term>
 <listitem>
-<para
->Detect a floating point number.</para>
-<para
-><programlisting
->&lt;Float (common attributes)
-/&gt;</programlisting
-></para
-> 
-<para
->This rule has no specific attributes.</para>
+<para>Detect a floating point number.</para>
+<para><programlisting>&lt;Float (common attributes)
+/&gt;</programlisting></para> 
+<para>This rule has no specific attributes.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->HlCOct</term>
+<term>HlCOct</term>
 <listitem>
-<para
->Detect an octal point number representation.</para>
-<para
-><programlisting
->&lt;HlCOct (common attributes) /&gt;</programlisting
-></para>
-<para
->This rule has no specific attributes.</para>
+<para>Detect an octal point number representation.</para>
+<para><programlisting>&lt;HlCOct (common attributes) /&gt;</programlisting></para>
+<para>This rule has no specific attributes.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->HlCHex</term>
+<term>HlCHex</term>
 <listitem>
-<para
->Detect a hexadecimal number representation.</para>
-<para
-><programlisting
->&lt;Int (common attributes) /&gt;</programlisting
-></para>
-<para
->This rule has no specific attributes.</para>
+<para>Detect a hexadecimal number representation.</para>
+<para><programlisting>&lt;Int (common attributes) /&gt;</programlisting></para>
+<para>This rule has no specific attributes.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->HlCStringChar</term>
+<term>HlCStringChar</term>
 <listitem>
-<para
->Detect an escaped character.</para>
-<para
-><programlisting
->&lt;HlCStringChar (common attributes)
-/&gt;</programlisting
-></para>
-<para
->This rule has no specific attributes.</para>
-
-<para
->It matches letteral representations of invisible characters commonly used in program code, for example <userinput
->\n</userinput
-> (newline) or <userinput
->\t</userinput
-> (TAB).</para>
-
-<para
->The following characters will match if they follow a backslash (<literal
->\</literal
->): <userinput
->abefnrtv&quot;'?</userinput
->. Additionally, escaped hexadecimal numbers like for example <userinput
->\xff</userinput
-> and escaped octal numbers, for example <userinput
->\033</userinput
-> will match.</para>
+<para>Detect an escaped character.</para>
+<para><programlisting>&lt;HlCStringChar (common attributes)
+/&gt;</programlisting></para>
+<para>This rule has no specific attributes.</para>
+
+<para>It matches letteral representations of invisible characters commonly used in program code, for example <userinput>\n</userinput> (newline) or <userinput>\t</userinput> (TAB).</para>
+
+<para>The following characters will match if they follow a backslash (<literal>\</literal>): <userinput>abefnrtv&quot;'?</userinput>. Additionally, escaped hexadecimal numbers like for example <userinput>\xff</userinput> and escaped octal numbers, for example <userinput>\033</userinput> will match.</para>
 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->RangeDetect</term>
+<term>RangeDetect</term>
 <listitem>
-<para
->Detect a string with defined start and end characters.</para>
-<programlisting
->&lt;RangeDetect char=&quot;(character)&quot;  char1=&quot;(character)&quot; (common attributes) /&gt;</programlisting>
-<para
-><userinput
->char</userinput
-> defines the character starting the range, <userinput
->char2</userinput
-> the character ending the range.</para>
-<para
->Useful to detect for example small quoted strings and the like, but note that since the hl engine works on one line at a time, this will not find strings spanning over a line break.</para>
+<para>Detect a string with defined start and end characters.</para>
+<programlisting>&lt;RangeDetect char=&quot;(character)&quot;  char1=&quot;(character)&quot; (common attributes) /&gt;</programlisting>
+<para><userinput>char</userinput> defines the character starting the range, <userinput>char2</userinput> the character ending the range.</para>
+<para>Useful to detect for example small quoted strings and the like, but note that since the hl engine works on one line at a time, this will not find strings spanning over a line break.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->LineContinue</term>
+<term>LineContinue</term>
 <listitem>
-<para
->Matches at end of line.</para>
-<programlisting
->&lt;LineContinue (common attributes) /&gt;</programlisting>
-<para
->This rule has no specific attributes.</para>
-<para
->This rule is useful for switching context at end of line.</para>
+<para>Matches at end of line.</para>
+<programlisting>&lt;LineContinue (common attributes) /&gt;</programlisting>
+<para>This rule has no specific attributes.</para>
+<para>This rule is useful for switching context at end of line.</para>
 </listitem>
 </varlistentry>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kate/index.docbook b/tde-i18n-en_GB/docs/tdebase/kate/index.docbook
index d9202e714c9..62956cc7782 100644
--- a/tde-i18n-en_GB/docs/tdebase/kate/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kate/index.docbook
@@ -13,125 +13,70 @@
   <!ENTITY plugins-chapter SYSTEM "plugins.docbook">
   <!ENTITY regexp-appendix SYSTEM "regular-expressions.docbook">
   <!ENTITY % addindex "IGNORE">
-  <!ENTITY % British-English "INCLUDE"
-><!-- change language only here -->
+  <!ENTITY % British-English "INCLUDE"><!-- change language only here -->
 ]>
 
 <book lang="&language;">
-<title
->The &kate; Handbook</title>
+<title>The &kate; Handbook</title>
 
 <bookinfo>
 <authorgroup>
-<author
->&Anders.Lund; &Anders.Lund.mail;</author>
-<author
->&Seth.Rothberg; &Seth.Rothberg.mail;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Anders.Lund; &Anders.Lund.mail;</author>
+<author>&Seth.Rothberg; &Seth.Rothberg.mail;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
 <copyright>
-<year
->2000</year>
-<year
->2001</year>
-<holder
->&Seth.Rothberg;</holder>
+<year>2000</year>
+<year>2001</year>
+<holder>&Seth.Rothberg;</holder>
 </copyright>
 <copyright>
-<year
->2002</year
-><year
->2003</year>
-<holder
->&Anders.Lund;</holder>
+<year>2002</year><year>2003</year>
+<holder>&Anders.Lund;</holder>
 </copyright>
 
-<legalnotice
->&FDLNotice;</legalnotice>
+<legalnotice>&FDLNotice;</legalnotice>
 
-<date
->2002-01-26</date>
-<releaseinfo
->2.00.00</releaseinfo>
+<date>2002-01-26</date>
+<releaseinfo>2.00.00</releaseinfo>
 
 <abstract>
-<para
->&kate; is a programmer's text editor for &kde; 2.2 and above.</para>
+<para>&kate; is a programmer's text editor for &kde; 2.2 and above.</para>
 
-<para
->This handbook documents &kate; Version 1.0</para>
+<para>This handbook documents &kate; Version 1.0</para>
 </abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->tdebase</keyword>
-<keyword
->Kate</keyword>
-<keyword
->text</keyword>
-<keyword
->editor</keyword>
-<keyword
->programmer</keyword>
-<keyword
->programming</keyword>
-<keyword
->projects</keyword>
-<keyword
->MDI</keyword>
-<keyword
->Multi</keyword>
-<keyword
->Document</keyword>
-<keyword
->Interface</keyword>
-<keyword
->terminal</keyword>
-<keyword
->console</keyword>
+<keyword>KDE</keyword>
+<keyword>tdebase</keyword>
+<keyword>Kate</keyword>
+<keyword>text</keyword>
+<keyword>editor</keyword>
+<keyword>programmer</keyword>
+<keyword>programming</keyword>
+<keyword>projects</keyword>
+<keyword>MDI</keyword>
+<keyword>Multi</keyword>
+<keyword>Document</keyword>
+<keyword>Interface</keyword>
+<keyword>terminal</keyword>
+<keyword>console</keyword>
 </keywordset>
 
 </bookinfo>
 
 <chapter id="introduction">
-<title
->Introduction</title>
+<title>Introduction</title>
 
-<para
->Welcome to &kate;, a programmer's text editor for &kde; version 2.2 and above. Some of &kate;'s many features include configurable syntax highlighting for languages ranging from C and C++ to <acronym
->HTML</acronym
-> to bash scripts, the ability to create and maintain projects, a multiple document interface (<acronym
->MDI</acronym
->), and a self-contained terminal emulator. </para>
+<para>Welcome to &kate;, a programmer's text editor for &kde; version 2.2 and above. Some of &kate;'s many features include configurable syntax highlighting for languages ranging from C and C++ to <acronym>HTML</acronym> to bash scripts, the ability to create and maintain projects, a multiple document interface (<acronym>MDI</acronym>), and a self-contained terminal emulator. </para>
 
-<para
->But &kate; is more than a programmer's editor. Its ability to open several files at once makes it ideal for editing &UNIX;'s many configuration files. This document was written in &kate;. </para>
+<para>But &kate; is more than a programmer's editor. Its ability to open several files at once makes it ideal for editing &UNIX;'s many configuration files. This document was written in &kate;. </para>
 
 <para>
 <mediaobject>
-<imageobject
-><imagedata format="PNG" fileref="kate.png"/></imageobject>
-<caption
-><para
->Editing this manual...</para
-></caption>
+<imageobject><imagedata format="PNG" fileref="kate.png"/></imageobject>
+<caption><para>Editing this manual...</para></caption>
 </mediaobject>
 </para>
 
@@ -153,253 +98,123 @@
 
 <chapter id="credits">
 
-<title
->Credits and Licence</title>
+<title>Credits and Licence</title>
 
-<para
->&kate;. Program copyright 2000, 2001, 2002 by the &kate; developer team. </para>
+<para>&kate;. Program copyright 2000, 2001, 2002 by the &kate; developer team. </para>
 
 <variablelist>
-<title
->The &kate; team:</title>
+<title>The &kate; team:</title>
 <varlistentry>
-<term
->&Christoph.Cullmann; &Christoph.Cullmann.mail;</term>
-<listitem
-><para
->Project Manager &amp; Core Developer</para
-></listitem>
+<term>&Christoph.Cullmann; &Christoph.Cullmann.mail;</term>
+<listitem><para>Project Manager &amp; Core Developer</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->&Anders.Lund; &Anders.Lund.mail;</term>
-<listitem
-><para
->Core Developer, Perl syntax highlighting, documentation</para
-></listitem>
+<term>&Anders.Lund; &Anders.Lund.mail;</term>
+<listitem><para>Core Developer, Perl syntax highlighting, documentation</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->&Joseph.Wenninger; &Joseph.Wenninger.mail;</term>
-<listitem
-><para
->Core Developer, syntax highlighting</para
-></listitem>
+<term>&Joseph.Wenninger; &Joseph.Wenninger.mail;</term>
+<listitem><para>Core Developer, syntax highlighting</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Michael Bartl <email
->michael.bartl1@chello.at</email
-></term>
-<listitem
-><para
->Core Developer</para
-></listitem>
+<term>Michael Bartl <email>michael.bartl1@chello.at</email></term>
+<listitem><para>Core Developer</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Phlip <email
->phlip_cpp@my-deja.com</email
-></term>
-<listitem
-><para
->The project compiler</para
-></listitem>
+<term>Phlip <email>phlip_cpp@my-deja.com</email></term>
+<listitem><para>The project compiler</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->&Waldo.Bastian; &Waldo.Bastian.mail;</term>
-<listitem
-><para
->The cool buffer system</para
-></listitem>
+<term>&Waldo.Bastian; &Waldo.Bastian.mail;</term>
+<listitem><para>The cool buffer system</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Matt Newell <email
->newellm@proaxis.com</email
-></term>
-<listitem
-><para
->Testing...</para
-></listitem>
+<term>Matt Newell <email>newellm@proaxis.com</email></term>
+<listitem><para>Testing...</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Michael McCallum <email
->gholam@xtra.co.nz</email
-></term>
-<listitem
-><para
->Core Developer</para
-></listitem>
+<term>Michael McCallum <email>gholam@xtra.co.nz</email></term>
+<listitem><para>Core Developer</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Jochen Wilhemly <email
->digisnap@cs.tu-berlin.de</email
-></term>
-<listitem
-><para
->KWrite Author</para
-></listitem>
+<term>Jochen Wilhemly <email>digisnap@cs.tu-berlin.de</email></term>
+<listitem><para>KWrite Author</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->&Michael.Koch; &Michael.Koch.mail;</term>
-<listitem
-><para
->KWrite port to KParts</para
-></listitem>
+<term>&Michael.Koch; &Michael.Koch.mail;</term>
+<listitem><para>KWrite port to KParts</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Christian Gebauer <email
->gebauer@bigfoot.com</email
-></term>
-<listitem
-><para
->Unspecified</para
-></listitem>
+<term>Christian Gebauer <email>gebauer@bigfoot.com</email></term>
+<listitem><para>Unspecified</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->&Simon.Hausmann; &Simon.Hausmann.mail;</term>
-<listitem
-><para
->Unspecified</para
-></listitem>
+<term>&Simon.Hausmann; &Simon.Hausmann.mail;</term>
+<listitem><para>Unspecified</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Glen Parker <email
->glenebob@nwlink.com</email
-></term>
-<listitem
-><para
->KWrite Undo History, KSpell integration</para
-></listitem>
+<term>Glen Parker <email>glenebob@nwlink.com</email></term>
+<listitem><para>KWrite Undo History, KSpell integration</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Scott Manson <email
->sdmanson@alltel.net</email
-></term>
-<listitem
-><para
->KWrite XML syntax highlighting support</para
-></listitem>
+<term>Scott Manson <email>sdmanson@alltel.net</email></term>
+<listitem><para>KWrite XML syntax highlighting support</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->&John.Firebaugh; &John.Firebaugh.mail;</term>
-<listitem
-><para
->Various Patches</para
-></listitem>
+<term>&John.Firebaugh; &John.Firebaugh.mail;</term>
+<listitem><para>Various Patches</para></listitem>
 </varlistentry>
 </variablelist>
 
 <variablelist>
-<title
->Many other people have contributed:</title>
+<title>Many other people have contributed:</title>
 <varlistentry>
-<term
->Matteo Merli <email
->merlim@libero.it</email
-></term>
-<listitem
-><para
->Highlighting for RPM Spec-Files, Diff and more</para
-></listitem>
+<term>Matteo Merli <email>merlim@libero.it</email></term>
+<listitem><para>Highlighting for RPM Spec-Files, Diff and more</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Rocky Scaletta <email
->rocky@purdue.edu</email
-></term>
-<listitem
-><para
->Highlighting for VHDL</para
-></listitem>
+<term>Rocky Scaletta <email>rocky@purdue.edu</email></term>
+<listitem><para>Highlighting for VHDL</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Yury Lebedev </term>
-<listitem
-><para
->Highlighting for SQL</para
-></listitem>
+<term>Yury Lebedev </term>
+<listitem><para>Highlighting for SQL</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Chris Ross</term>
-<listitem
-><para
->Highlighting for Ferite</para
-></listitem>
+<term>Chris Ross</term>
+<listitem><para>Highlighting for Ferite</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Nick Roux</term>
-<listitem
-><para
->Highlighting for ILERPG</para
-></listitem>
+<term>Nick Roux</term>
+<listitem><para>Highlighting for ILERPG</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->John Firebaugh</term>
-<listitem
-><para
->Highlighting for Java, and much more</para
-></listitem>
+<term>John Firebaugh</term>
+<listitem><para>Highlighting for Java, and much more</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Carsten Niehaus</term>
-<listitem
-><para
->Highlighting for LaTeX</para
-></listitem>
+<term>Carsten Niehaus</term>
+<listitem><para>Highlighting for LaTeX</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Per Wigren</term>
-<listitem
-><para
->Highlighting for Makefiles, Python</para
-></listitem>
+<term>Per Wigren</term>
+<listitem><para>Highlighting for Makefiles, Python</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Jan Fritz</term>
-<listitem
-><para
->Highlighting for Python</para
-></listitem>
+<term>Jan Fritz</term>
+<listitem><para>Highlighting for Python</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->&Daniel.Naber;</term>
-<listitem
-><para
->Small bugfixes, XML plugin</para
-></listitem>
+<term>&Daniel.Naber;</term>
+<listitem><para>Small bugfixes, XML plugin</para></listitem>
 </varlistentry>
 </variablelist>
 
-<para
->Documentation copyright 2000,2001 &Seth.Rothberg; &Seth.Rothberg.mail;</para>
+<para>Documentation copyright 2000,2001 &Seth.Rothberg; &Seth.Rothberg.mail;</para>
 
-<para
->Documentation copyright 2002, 2003 &Anders.Lund; &Anders.Lund.mail;</para>
+<para>Documentation copyright 2002, 2003 &Anders.Lund; &Anders.Lund.mail;</para>
 
-<para
->Conversion to British English: John Knight <email
->anarchist_tomato@herzeleid.net</email
-></para
-> 
+<para>Conversion to British English: John Knight <email>anarchist_tomato@herzeleid.net</email></para> 
 &underFDL; &underGPL; </chapter>
 
 &highlighting-appendix;
@@ -407,8 +222,7 @@
 &regexp-appendix;
 
 <appendix id="installation">
-<title
->Installation</title>
+<title>Installation</title>
 
 &install.intro.documentation;
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kate/mdi.docbook b/tde-i18n-en_GB/docs/tdebase/kate/mdi.docbook
index 38ddee1ee8e..76b3536507d 100644
--- a/tde-i18n-en_GB/docs/tdebase/kate/mdi.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kate/mdi.docbook
@@ -1,88 +1,38 @@
 <chapter id="kate-mdi">
 <chapterinfo>
 <authorgroup>
-<author
->&Anders.Lund; &Anders.Lund.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Anders.Lund; &Anders.Lund.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </chapterinfo>
-<title
->Working With the &kate; <acronym
->MDI</acronym
-></title>
+<title>Working With the &kate; <acronym>MDI</acronym></title>
 
 <sect1 id="kate-mdi-overview">
-<title
->Overview</title>
+<title>Overview</title>
 
-<para
->Window, View, Document, Frame, Editor... What are they all in the terminology of &kate;, and how do you get the most out of it? This chapter will explain all of that, and even more.</para>
+<para>Window, View, Document, Frame, Editor... What are they all in the terminology of &kate;, and how do you get the most out of it? This chapter will explain all of that, and even more.</para>
 
 <sect2 id="kate-mdi-overview-mainwindow">
 
-<title
->The Main Window</title>
+<title>The Main Window</title>
 
-<para
-><indexterm
-><primary
->Main window</primary
-></indexterm
-> The &kate; Main Window is a standard &kde; application window, with the addition of dockable subwindows, or tool windows. It has a Menubar with all the common menus, and some more, and a toolbar providing access to commonly used commands.</para>
+<para><indexterm><primary>Main window</primary></indexterm> The &kate; Main Window is a standard &kde; application window, with the addition of dockable subwindows, or tool windows. It has a Menubar with all the common menus, and some more, and a toolbar providing access to commonly used commands.</para>
 
-<para
->The most important part of the window is the Editing Area, by default displaying a single text editor component, in which you can work with your documents.</para>
+<para>The most important part of the window is the Editing Area, by default displaying a single text editor component, in which you can work with your documents.</para>
 
-<para
->The docking capabilities of the window is used for the tool windows:</para>
+<para>The docking capabilities of the window is used for the tool windows:</para>
 
 <itemizedlist>
-<listitem
-><para
-><link linkend="kate-mdi-tools-file-list"
->The File List</link
-></para
-></listitem>
-<listitem
-><para
-><link linkend="kate-mdi-tools-file-selector"
->The File Selector</link
-></para
-></listitem>
-<listitem
-><para
-><link linkend="kate-mdi-tools-konsole"
->The Built in Terminal Emulator</link
-></para
-></listitem>
+<listitem><para><link linkend="kate-mdi-tools-file-list">The File List</link></para></listitem>
+<listitem><para><link linkend="kate-mdi-tools-file-selector">The File Selector</link></para></listitem>
+<listitem><para><link linkend="kate-mdi-tools-konsole">The Built in Terminal Emulator</link></para></listitem>
 </itemizedlist>
 
-<para
->And possibly other tool windows, for example provided by plugins.</para>
+<para>And possibly other tool windows, for example provided by plugins.</para>
 
-<para
-><indexterm
-><primary
->Tool Windows</primary
-></indexterm
-> The Tool Windows can be placed anywhere you want them inside or outside the main window by dragging the handle bar in the top of them with the &LMB; pressed, and stacked in shared tab windows if desired.</para>
+<para><indexterm><primary>Tool Windows</primary></indexterm> The Tool Windows can be placed anywhere you want them inside or outside the main window by dragging the handle bar in the top of them with the &LMB; pressed, and stacked in shared tab windows if desired.</para>
 
-<para
->When dragging a docked window, a black rectangle will be displayed to indicate where the window will be placed if you release the mouse button, unless you move the mouse cursor outside the main window, in which case the dragged window will become a free floating top level window.</para>
+<para>When dragging a docked window, a black rectangle will be displayed to indicate where the window will be placed if you release the mouse button, unless you move the mouse cursor outside the main window, in which case the dragged window will become a free floating top level window.</para>
 
 </sect2>
 
@@ -91,137 +41,60 @@
 
 <sect1 id="kate-mdi-editor">
 
-<title
->The Editor area</title>
+<title>The Editor area</title>
 
-<para
-><indexterm
-><primary
->Editing Area</primary
-></indexterm
-> &kate; is capable of having more than one document open at the same time, and also of splitting the editing area into any number of frames, similar to how for example &konqueror; or the popular <application
->emacs</application
-> text editor works. This way you can view several documents at the same time, or more instances of the same document, handy for example if your document contains definitions in the top that you want to see often for reference. Or you could view a program source header in one frame, while editing the implementation file in another.</para>
+<para><indexterm><primary>Editing Area</primary></indexterm> &kate; is capable of having more than one document open at the same time, and also of splitting the editing area into any number of frames, similar to how for example &konqueror; or the popular <application>emacs</application> text editor works. This way you can view several documents at the same time, or more instances of the same document, handy for example if your document contains definitions in the top that you want to see often for reference. Or you could view a program source header in one frame, while editing the implementation file in another.</para>
 
-<para
->When a document is available in more than one editor, changes made in one editor will immediately be reflected in the others as well. This includes changing the text as well as selecting text. Search operations or cursor movement is only reflected in the current editor.</para>
+<para>When a document is available in more than one editor, changes made in one editor will immediately be reflected in the others as well. This includes changing the text as well as selecting text. Search operations or cursor movement is only reflected in the current editor.</para>
 
-<para
->It is currently not possible to have more instances of the same document open in the sense that one instance will be edited while the other will not.</para>
+<para>It is currently not possible to have more instances of the same document open in the sense that one instance will be edited while the other will not.</para>
 
-<para
->When splitting an editor into two frames, it is divided into two equally sized frames, both displaying the current document of that editor. The new frame will be at the bottom (in the case of a horizontal split) or at the right (for a vertical split). The new frame gets the focus, which is visualised by a small green led in the focused frame.</para>
+<para>When splitting an editor into two frames, it is divided into two equally sized frames, both displaying the current document of that editor. The new frame will be at the bottom (in the case of a horizontal split) or at the right (for a vertical split). The new frame gets the focus, which is visualised by a small green led in the focused frame.</para>
 
 </sect1>
 
 <sect1 id="kate-mdi-tools-file-list">
-<title
->The File List</title>
-
-<para
-><indexterm
-><primary
->File list</primary
-></indexterm
-> The file list displays a list of all documents currently open in &kate;. Modified files will have a small <guiicon
->floppy disk</guiicon
-> icon on their left to indicate that state.</para>
-
-<para
->If two or more files with the same name (located in different folders) are open, the names of the second will be prepended <quote
->&lt;2&gt;</quote
-> and so on. The tool-tip for the file will display its full name including the path, allowing you to choose the desired one.</para
-> <para
->To display a document in the currently active frame, click the document name in the list.</para>
-
-<para
->The default location in the &kate; window is to the left of the editing area, in a dockable tab window shared with the <link linkend="kate-mdi-tools-file-selector"
->File Selector</link
->.</para>
+<title>The File List</title>
+
+<para><indexterm><primary>File list</primary></indexterm> The file list displays a list of all documents currently open in &kate;. Modified files will have a small <guiicon>floppy disk</guiicon> icon on their left to indicate that state.</para>
+
+<para>If two or more files with the same name (located in different folders) are open, the names of the second will be prepended <quote>&lt;2&gt;</quote> and so on. The tool-tip for the file will display its full name including the path, allowing you to choose the desired one.</para> <para>To display a document in the currently active frame, click the document name in the list.</para>
+
+<para>The default location in the &kate; window is to the left of the editing area, in a dockable tab window shared with the <link linkend="kate-mdi-tools-file-selector">File Selector</link>.</para>
 </sect1>
 
 <sect1 id="kate-mdi-tools-file-selector">
-<title
->The File Selector</title>
+<title>The File Selector</title>
 
-<para
-><indexterm
-><primary
->File selector</primary
-></indexterm
-> The File Selector is a folder viewer, allowing you to open files from a displayed folder in the current frame.</para>
+<para><indexterm><primary>File selector</primary></indexterm> The File Selector is a folder viewer, allowing you to open files from a displayed folder in the current frame.</para>
 
-<para
->From top down, the file selector consist of the following elements:</para>
+<para>From top down, the file selector consist of the following elements:</para>
 
 <variablelist>
 <varlistentry>
-<term
->A Toolbar</term>
+<term>A Toolbar</term>
 <listitem>
-<para
->This contains standard navigations tool buttons:</para>
+<para>This contains standard navigations tool buttons:</para>
 <variablelist>
 <varlistentry>
-<term
-><guibutton
->Home</guibutton
-></term>
-<listitem
-><para
->Pressing it will cause the folder view to <command
->cd</command
-> to your home folder.</para
-></listitem>
+<term><guibutton>Home</guibutton></term>
+<listitem><para>Pressing it will cause the folder view to <command>cd</command> to your home folder.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guibutton
->Up</guibutton
-></term>
-<listitem
-><para
->This will cause the folder view to <command
->cd</command
-> to the immediate parent of the currently displayed folder if possible.</para
-></listitem>
+<term><guibutton>Up</guibutton></term>
+<listitem><para>This will cause the folder view to <command>cd</command> to the immediate parent of the currently displayed folder if possible.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guibutton
->Back</guibutton
-></term>
-<listitem
-><para
->Causes the folder view to <command
->cd</command
-> to the previously displayed folder in the history. This button is disabled, if there is no previous item.</para
-></listitem>
+<term><guibutton>Back</guibutton></term>
+<listitem><para>Causes the folder view to <command>cd</command> to the previously displayed folder in the history. This button is disabled, if there is no previous item.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guibutton
->Forward</guibutton
-></term>
-<listitem
-><para
->Causes the folder view to <command
->cd</command
-> to the next folder in the history. This button is disabled, if there is no next folder.</para
-></listitem>
+<term><guibutton>Forward</guibutton></term>
+<listitem><para>Causes the folder view to <command>cd</command> to the next folder in the history. This button is disabled, if there is no next folder.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guibutton
->Sync</guibutton
-></term>
-<listitem
-><para
->This button will cause the folder view to <command
->cd</command
-> to the folder of the currently active document if possible. This button is disabled, if the active document is a new, unsaved file, or the folder in which it resides can not be decided.</para
-></listitem
-> 
+<term><guibutton>Sync</guibutton></term>
+<listitem><para>This button will cause the folder view to <command>cd</command> to the folder of the currently active document if possible. This button is disabled, if the active document is a new, unsaved file, or the folder in which it resides can not be decided.</para></listitem> 
 </varlistentry>
 </variablelist>
 
@@ -229,43 +102,24 @@
 </varlistentry>
 
 <varlistentry>
-<term
->A &URL; entry</term>
+<term>A &URL; entry</term>
 <listitem>
-<para
->Here you can type the path of a folder to browse. The &URL; entry maintains a list of previously typed paths. To choose one use the arrow button to the right of the entry.</para>
-<tip
-><para
->The &URL; entry has folder auto-completion. The completion method can be set using the &RMB; menu of the text entry.</para
-></tip>
-</listitem
-> 
+<para>Here you can type the path of a folder to browse. The &URL; entry maintains a list of previously typed paths. To choose one use the arrow button to the right of the entry.</para>
+<tip><para>The &URL; entry has folder auto-completion. The completion method can be set using the &RMB; menu of the text entry.</para></tip>
+</listitem> 
 </varlistentry>
 
 <varlistentry>
-<term
->A Folder View</term>
-<listitem
-><para
->This is a standard &kde; folder view.</para
-></listitem>
+<term>A Folder View</term>
+<listitem><para>This is a standard &kde; folder view.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->A Filter Entry</term>
+<term>A Filter Entry</term>
 <listitem>
-<para
->The Filter entry allows you to enter a filter for the files displayed in the folder view. The filter uses standard globs; patterns must be separated by white space. Example: <userinput
->*.cpp *.h *.moc</userinput
-></para>
-<para
->To display all files, enter a single asterisk <userinput
->*</userinput
->.</para>
-<para
->The filter entry saves the last 10 filters entered between sessions, to use one, press the arrow button on the right of the entry and select the desired filter string.</para
-> 
+<para>The Filter entry allows you to enter a filter for the files displayed in the folder view. The filter uses standard globs; patterns must be separated by white space. Example: <userinput>*.cpp *.h *.moc</userinput></para>
+<para>To display all files, enter a single asterisk <userinput>*</userinput>.</para>
+<para>The filter entry saves the last 10 filters entered between sessions, to use one, press the arrow button on the right of the entry and select the desired filter string.</para> 
 </listitem>
 </varlistentry>
 
@@ -275,33 +129,13 @@
 
 
 <sect1 id="kate-mdi-tools-konsole">
-<title
->The Built in Terminal Emulator</title>
-
-<para
-><indexterm
-><primary
->Terminal emulator</primary
-></indexterm
-> The built in Terminal Emulator is a copy of the &kde; &konsole; terminal application, for your convenience. It is available from the <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Show Terminal Emulator</guimenuitem
-></menuchoice
-> menu item or by pressing the <keycombo action="simul"
-><keycap
->F7</keycap
-></keycombo
-> key, and will get the focus whenever displayed. Additionally, if the <link linkend="config-dialog-general-sync-konsole"
->Sync &konsole; with active document</link
-> option is enabled, it will change into the directory of the current document if possible when it is displayed, or when the current document changes.</para>
-
-<para
->The default location in the &kate; window is at the bottom, below the editing area.</para>
-
-<para
->You can configure the &konsole; using it's &RMB; menu, for more information, see the &konsole; manual.</para>
+<title>The Built in Terminal Emulator</title>
+
+<para><indexterm><primary>Terminal emulator</primary></indexterm> The built in Terminal Emulator is a copy of the &kde; &konsole; terminal application, for your convenience. It is available from the <menuchoice><guimenu>Settings</guimenu><guimenuitem>Show Terminal Emulator</guimenuitem></menuchoice> menu item or by pressing the <keycombo action="simul"><keycap>F7</keycap></keycombo> key, and will get the focus whenever displayed. Additionally, if the <link linkend="config-dialog-general-sync-konsole">Sync &konsole; with active document</link> option is enabled, it will change into the directory of the current document if possible when it is displayed, or when the current document changes.</para>
+
+<para>The default location in the &kate; window is at the bottom, below the editing area.</para>
+
+<para>You can configure the &konsole; using it's &RMB; menu, for more information, see the &konsole; manual.</para>
 
 </sect1>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kate/menus.docbook b/tde-i18n-en_GB/docs/tdebase/kate/menus.docbook
index b59173e1e7c..b9d6d439ad1 100644
--- a/tde-i18n-en_GB/docs/tdebase/kate/menus.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kate/menus.docbook
@@ -1,663 +1,289 @@
 <chapter id="menu-entries">
 <chapterinfo>
 <authorgroup>
-<author
-><personname
-><firstname
-></firstname
-></personname
-></author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author><personname><firstname></firstname></personname></author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </chapterinfo>
-<title
->Menu Entries</title>
+<title>Menu Entries</title>
 
 <sect1 id="file-menu">
-<title
->The <guimenu
->File</guimenu
-> Menu</title>
+<title>The <guimenu>File</guimenu> Menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
 <anchor id="new"/>
-<menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->N</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->New</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>New</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->This command <action
->starts a new document</action
-> in the editing window. In the <guibutton
->Filelist</guibutton
-> on the left the new file is named <emphasis
->Untitled</emphasis
->. </para>
+<para>This command <action>starts a new document</action> in the editing window. In the <guibutton>Filelist</guibutton> on the left the new file is named <emphasis>Untitled</emphasis>. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="open"/>
-<menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->O</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Open</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>O</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Open</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->This command does not <action
->open a file</action
->. It launches &kde;'s open file dialogue box which waits for you to select the files you want to open. </para>
-
-<para
->The open file dialogue box works like a simple version of &konqueror;. Use your &LMB; to click on a file name to select it. Double-click on a file name to open that file. Once you've selected a file name, you can also press the <guibutton
->OK</guibutton
-> button to open the file. </para>
+<para>This command does not <action>open a file</action>. It launches &kde;'s open file dialogue box which waits for you to select the files you want to open. </para>
+
+<para>The open file dialogue box works like a simple version of &konqueror;. Use your &LMB; to click on a file name to select it. Double-click on a file name to open that file. Once you've selected a file name, you can also press the <guibutton>OK</guibutton> button to open the file. </para>
 <tip>
-<para
->Select multiple files by holding down the &Ctrl; or the &Shift; key along with the &LMB;. <keycombo action="simul"
-> &Ctrl;<mousebutton
->Left</mousebutton
-> </keycombo
-> click selects one file at a time. <keycombo action="simul"
-> &Shift;<mousebutton
->Left</mousebutton
-> </keycombo
-> click selects a contiguous set of files. </para>
+<para>Select multiple files by holding down the &Ctrl; or the &Shift; key along with the &LMB;. <keycombo action="simul"> &Ctrl;<mousebutton>Left</mousebutton> </keycombo> click selects one file at a time. <keycombo action="simul"> &Shift;<mousebutton>Left</mousebutton> </keycombo> click selects a contiguous set of files. </para>
 </tip>
 
-<para
->Clicking on a folder name in the file selection window opens that folder and displays its contents. Clicking on a file name shows a thumbnail view of the file in the preview window to the right of the file system window. </para>
+<para>Clicking on a folder name in the file selection window opens that folder and displays its contents. Clicking on a file name shows a thumbnail view of the file in the preview window to the right of the file system window. </para>
 
-<para
->Use the buttons and combo box on the toolbar above the file selection window to move through the file system or to adjust the properties of the open file dialogue box. </para>
+<para>Use the buttons and combo box on the toolbar above the file selection window to move through the file system or to adjust the properties of the open file dialogue box. </para>
 
-<para
->Below the file selection window is the Location combo box. Type the name of the file you want to edit here. If you click the arrow on the right of the drop down box, you can choose from recently used files. Open several files at once by quoting each file name. </para>
+<para>Below the file selection window is the Location combo box. Type the name of the file you want to edit here. If you click the arrow on the right of the drop down box, you can choose from recently used files. Open several files at once by quoting each file name. </para>
 
-<para
->Below the Location combo box is the Filter combo box. Enter file masks here to filter the kinds of files shown in the selection window. For example, typing the filter <literal role="extension"
->*.txt</literal
-> and pressing <keycap
->Enter</keycap
-> will limit the display to files with a <literal role="extension"
->.txt</literal
-> extension. The Filter combo contains a list of your most recently used filters. </para>
+<para>Below the Location combo box is the Filter combo box. Enter file masks here to filter the kinds of files shown in the selection window. For example, typing the filter <literal role="extension">*.txt</literal> and pressing <keycap>Enter</keycap> will limit the display to files with a <literal role="extension">.txt</literal> extension. The Filter combo contains a list of your most recently used filters. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="open-recent"/>
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Open Recent</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>File</guimenu> <guimenuitem>Open Recent</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->This command allows you to <action
->open a file</action
-> from a submenu that contains a list of recently edited files. </para>
+<para>This command allows you to <action>open a file</action> from a submenu that contains a list of recently edited files. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="save"/>
-<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
->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
->. </para>
+<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>. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="save-as"/>
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Save As</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>File</guimenu> <guimenuitem>Save As</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
-><action
->Name and rename files</action
-> with this command. It launches the save file dialogue box. This dialogue works just as the open file dialogue box does. You can use it to navigate through your file system, preview existing files, or filter your file view with file masks. </para>
-
-<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>
+<para><action>Name and rename files</action> with this command. It launches the save file dialogue box. This dialogue works just as the open file dialogue box does. You can use it to navigate through your file system, preview existing files, or filter your file view with file masks. </para>
+
+<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>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="save-all"/>
-<menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->L</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Save All</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>L</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Save All</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->This command <action
->saves all open files</action
->. </para>
+<para>This command <action>saves all open files</action>. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="reload"/>
-<menuchoice
-><shortcut
-> <keycombo action="simul"
-><keycap
->F5</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Reload</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut> <keycombo action="simul"><keycap>F5</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Reload</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
-><action
->Reloads the active file from disk</action
->. This command is useful if another program or process has changed the file while you have it open in &kate; </para>
+<para><action>Reloads the active file from disk</action>. This command is useful if another program or process has changed the file while you have it open in &kate; </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="open-with"/>
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Open with</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>File</guimenu> <guimenuitem>Open with</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->This command launches the open with dialogue box that allows you to <action
->select another application to open the active file</action
->. Your file will still be open in &kate;. </para>
+<para>This command launches the open with dialogue box that allows you to <action>select another application to open the active file</action>. Your file will still be open in &kate;. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="print"/>
-<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
->Print the active file</action
->. </para>
+<para><action>Print the active file</action>. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="close"/>
-<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
->Close the active file</action
-> with this command. If you have made unsaved changes, you will be prompted to save the file before &kate; closes it. </para>
+<para><action>Close the active file</action> with this command. If you have made unsaved changes, you will be prompted to save the file before &kate; closes it. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="close-all"/>
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Close All</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>File</guimenu> <guimenuitem>Close All</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->This command <action
->closes all the files you have open</action
-> in &kate;. </para>
+<para>This command <action>closes all the files you have open</action> in &kate;. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="new-window"/>
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->New Window</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>File</guimenu> <guimenuitem>New Window</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
-><action
->Opens another instance of &kate;</action
->. The new instance will be identical to your previous instance. </para>
+<para><action>Opens another instance of &kate;</action>. The new instance will be identical to your previous instance. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="quit"/>
-<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
->This command <action
->closes &kate;</action
-> and any files you were editing. If you have made unsaved changes to any of the files you were editing, you will be prompted to save them. </para>
+<para>This command <action>closes &kate;</action> and any files you were editing. If you have made unsaved changes to any of the files you were editing, you will be prompted to save them. </para>
 </listitem>
 </varlistentry>
 </variablelist>
 </sect1>
 
 <sect1 id="edit-menu">
-<title
->The <guimenu
->Edit</guimenu
-> Menu</title>
-<para
->The <guimenu
->Edit</guimenu
-> menu contains a host of commands, all to work with the currently active document.</para>
+<title>The <guimenu>Edit</guimenu> 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>
+<title>Menu Entries</title>
 <varlistentry>
 <term>
 <anchor id="edit-undo"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->Z</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Undo</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>Z</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Undo</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Undo the last editing command (typing, copying, cutting etc.)</para>
-<note
-><para
->If grouped undo is enabled, this may undo several editing commands of the same type, like typing in characters.</para
-></note>
+<para>Undo the last editing command (typing, copying, cutting etc.)</para>
+<note><para>If grouped undo is enabled, this may undo several editing commands of the same type, like typing in characters.</para></note>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="edit-redo"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;&Shift;<keycap
->Z</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Redo</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>Z</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Redo</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Redo the last undo step.</para>
+<para>Redo the last undo step.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="edit-cut"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->X</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Cut</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>X</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Cut</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Removes selected text if any, and places a copy of the removed text in the clipboard.</para>
+<para>Removes selected text if any, and places a copy of the removed text in the clipboard.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="edit-copy"/>
-<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
->Copies selected text, if any, to the clipboard.</para>
+<para>Copies selected text, if any, to the clipboard.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="edit-paste"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->V</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Paste</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>V</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Paste</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Copies the first item in the clipboard into the editor at cursor position.</para>
-<note
-><para
->If Overwrite Selection is enabled, the pasted text will overwrite the selection, if any.</para
-></note>
+<para>Copies the first item in the clipboard into the editor at cursor position.</para>
+<note><para>If Overwrite Selection is enabled, the pasted text will overwrite the selection, if any.</para></note>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="edit-select-all"/>
-<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
->Selects all text in the editor.</para>
+<para>Selects all text in the editor.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="edit-deselect"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;&Shift;<keycap
->A</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Deselect</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>A</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Deselect</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Deselects the selected text in the editor if any.</para>
+<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"
-><keycap
->F4</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Toggle Block Selection</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul"><keycap>F4</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Toggle Block Selection</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Toggles Selection Mode. When the Selection Mode is <quote
->BLOCK</quote
->, you can make vertical selections, ie 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
->NORM</quote
-> or <quote
->BLK</quote
->.</para>
+<para>Toggles Selection Mode. When the Selection Mode is <quote>BLOCK</quote>, you can make vertical selections, ie 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>NORM</quote> or <quote>BLK</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="edit-find"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->F</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Find</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Find</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Launch the Find Dialogue to allow you to search for text in the edited document.</para>
+<para>Launch the Find Dialogue to allow you to search for text in the edited document.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="edit-find-next"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
-><keycap
->F3</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Find Next</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul"><keycap>F3</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Find Next</guimenuitem> </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>Go to the nearest downwards match of the last text or regular expression searched for, starting from 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
-> <guimenuitem
->Find Previous</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Shift;<keycap>F3</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Find Previous</guimenuitem> </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>Go to the nearest upwards match of the last text or regular expression searched for, starting from cursor position</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="edit-replace"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->R</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Replace</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Replace</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Launch the Replace Dialogue to replace one or more instances of a defined text with something else.</para>
+<para>Launch the Replace Dialogue to replace one or more instances of a defined text with something else.</para>
 </listitem>
 </varlistentry>
 
@@ -665,129 +291,54 @@
 <varlistentry>
 <term>
 <anchor id="edit-indent"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->I</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Indent</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>I</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Indent</guimenuitem> </menuchoice>
 </term>
-<listitem
-><!-- FIXME LINK -->
-<para
->Adds one indent step to the current line, or all lines covered by a possible selection.</para>
-<para
->The indentation depends on the settings in the Indent Page of the Configuration Dialogue.</para>
+<listitem><!-- FIXME LINK -->
+<para>Adds one indent step to the current line, or all lines covered by a possible selection.</para>
+<para>The indentation depends on the settings in the Indent Page of the Configuration Dialogue.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="edit-unindent"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;&Shift;<keycap
->I</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Unindent</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>I</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Unindent</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Removes one indent step from the current line, or all lines covered by a possible selection.</para>
-<para
->The indentation depends on the settings in the Indent Page of the Configuration Dialogue.</para>
+<para>Removes one indent step from the current line, or all lines covered by a possible selection.</para>
+<para>The indentation depends on the settings in the Indent Page of the Configuration Dialogue.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="edit-comment"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->#</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Comment</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>#</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Comment</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Enclose or prepend the current line, or any selected text, with (a) comment marker(s), according to the rules defined by the syntax rules for the document. Does nothing if no comment rules are defined.</para>
-<para
->This is interesting mostly when working with source code, for example with C/C++, perl, python &etc;, as well as with markup text like <acronym
->HTML</acronym
->, &XML;, <acronym
->CSS</acronym
-> and so on.</para>
+<para>Enclose or prepend the current line, or any selected text, with (a) comment marker(s), according to the rules defined by the syntax rules for the document. Does nothing if no comment rules are defined.</para>
+<para>This is interesting mostly when working with source code, for example with C/C++, perl, python &etc;, as well as with markup text like <acronym>HTML</acronym>, &XML;, <acronym>CSS</acronym> and so on.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="edit-uncomment"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;&Shift;<keycap
->#</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
-></guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>#</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem></guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Remove comment marker(s) from the current line, or a possible selection, according to the syntax rules for the document. </para>
-<para
->See also <link linkend="edit-comment"
-><guimenu
->Edit</guimenu
-><guimenuitem
->Comment</guimenuitem
-></link
-></para>
+<para>Remove comment marker(s) from the current line, or a possible selection, according to the syntax rules for the document. </para>
+<para>See also <link linkend="edit-comment"><guimenu>Edit</guimenu><guimenuitem>Comment</guimenuitem></link></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="edit-go-to-line"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->G</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Go to line...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>G</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Go to line...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Launches the Go To Line Dialogue, allowing you to enter the number of a line to find in the document</para>
+<para>Launches the Go To Line Dialogue, allowing you to enter the number of a line to find in the document</para>
 </listitem>
 </varlistentry>
 
@@ -796,97 +347,44 @@
 </sect1>
 
 <sect1 id="document-menu">
-<title
->The <guimenu
->Document</guimenu
->Menu</title>
-<para
->The <guimenu
->Document</guimenu
-> menu has two purposes:</para>
+<title>The <guimenu>Document</guimenu>Menu</title>
+<para>The <guimenu>Document</guimenu> menu has two purposes:</para>
 <itemizedlist>
-<listitem
-><para
->Allowing you to change the document-specific settings for the currently active document.</para
-></listitem>
-<listitem
-><para
->Choosing which of the open documents to work on</para
-></listitem>
+<listitem><para>Allowing you to change the document-specific settings for the currently active document.</para></listitem>
+<listitem><para>Choosing which of the open documents to work on</para></listitem>
 </itemizedlist>
-<para
->A menu entry for each open document will be available below the entries documented here. Clicking one of these will bring the requested document to focus. If you have multiple frames, an editor for that document will be displayed in the currently active frame.</para>
+<para>A menu entry for each open document will be available below the entries documented here. Clicking one of these will bring the requested document to focus. If you have multiple frames, an editor for that document will be displayed in the currently active frame.</para>
 <variablelist>
-<title
->Menu items</title>
+<title>Menu items</title>
 
 <varlistentry>
 <term>
 <anchor id="document-back"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Alt;<keycap
->Left</keycap
-></keycombo
-></shortcut
-> <guimenu
->Document</guimenu
-> <guimenuitem
->Back</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Alt;<keycap>Left</keycap></keycombo></shortcut> <guimenu>Document</guimenu> <guimenuitem>Back</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->This will bring the previous document in the stack in focus. If you have multiple frames, an editor for the document will be displayed in the currently active frame.</para
-> <para
->The order is the order in which documents were opened, rather than a logical history. This behaviour may change in future versions of &kate;.</para>
+<para>This will bring the previous document in the stack in focus. If you have multiple frames, an editor for the document will be displayed in the currently active frame.</para> <para>The order is the order in which documents were opened, rather than a logical history. This behaviour may change in future versions of &kate;.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="document-forward"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Alt;<keycap
->Right</keycap
-></keycombo
-></shortcut
-> <guimenu
->Document</guimenu
-> <guimenuitem
->Forward</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Alt;<keycap>Right</keycap></keycombo></shortcut> <guimenu>Document</guimenu> <guimenuitem>Forward</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->This will bring the previous document in the stack in focus. If you have multiple frames, an editor for the document will be displayed in the currently active frame.</para>
-<para
->The order is the order in which the documents were opened, rather than a logical history. This behaviour may change in future versions of &kate;.</para>
+<para>This will bring the previous document in the stack in focus. If you have multiple frames, an editor for the document will be displayed in the currently active frame.</para>
+<para>The order is the order in which the documents were opened, rather than a logical history. This behaviour may change in future versions of &kate;.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="document-highlight-mode"/>
-<menuchoice
-><guimenu
->Document</guimenu
-> <guisubmenu
->Highlight Mode</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Document</guimenu> <guisubmenu>Highlight Mode</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->The <guimenu
->Highlight Mode</guimenu
-> menu allows you to manually decide which syntax rules to use for highlighting and <link linkend="edit-comment"
-><guimenuitem
->comment</guimenuitem
-></link
->'ing the active document. The menu groups the available syntax rule sets into logical groups.</para>
+<para>The <guimenu>Highlight Mode</guimenu> menu allows you to manually decide which syntax rules to use for highlighting and <link linkend="edit-comment"><guimenuitem>comment</guimenuitem></link>'ing the active document. The menu groups the available syntax rule sets into logical groups.</para>
 <!-- FIXME link to syntax rules chapter, when written :) -->
 </listitem>
 </varlistentry>
@@ -894,53 +392,27 @@
 <varlistentry>
 <term>
 <anchor id="document-end-of-line"/>
-<menuchoice
-><guimenu
->Document</guimenu
-> <guisubmenu
->End of Line</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Document</guimenu> <guisubmenu>End of Line</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->This menu allows you to manually set the End of Line mode for the active document. Changing the mode will replace all line separators in the document with the character sequence for the new mode.</para>
+<para>This menu allows you to manually set the End of Line mode for the active document. Changing the mode will replace all line separators in the document with the character sequence for the new mode.</para>
 
-<para
->The available modes are:</para>
+<para>The available modes are:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guimenuitem
->Unix</guimenuitem
-></term>
+<term><guimenuitem>Unix</guimenuitem></term>
 <listitem>
-<para
->On &UNIX; systems, end of line is a single newline character.</para
-></listitem>
+<para>On &UNIX; systems, end of line is a single newline character.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guimenuitem
->DOS</guimenuitem
-></term>
-<listitem
-><para
->On <acronym
->DOS</acronym
-> (and &Windows;) systems, end of line is represented by a carriage return followed by a newline.</para
-></listitem>
+<term><guimenuitem>DOS</guimenuitem></term>
+<listitem><para>On <acronym>DOS</acronym> (and &Windows;) systems, end of line is represented by a carriage return followed by a newline.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenuitem
->Mac</guimenuitem
-></term>
-<listitem
-><para
->On &Mac; systems, end of line is represented by a by a carriage return.</para
-></listitem>
+<term><guimenuitem>Mac</guimenuitem></term>
+<listitem><para>On &Mac; systems, end of line is represented by a by a carriage return.</para></listitem>
 </varlistentry>
 </variablelist>
 </listitem>
@@ -949,157 +421,69 @@
 </sect1>
 
 <sect1 id="view-menu">
-<title
->The <guimenu
->View</guimenu
-> menu</title>
+<title>The <guimenu>View</guimenu> menu</title>
 
-<para
->The <guimenu
->View</guimenu
-> menu allows you to manage settings specific to the active editor, and to manage frames.</para>
+<para>The <guimenu>View</guimenu> menu allows you to manage settings specific to the active editor, and to manage frames.</para>
 
 <variablelist>
-<title
->Menu Items</title>
+<title>Menu Items</title>
 
 <varlistentry>
 <term>
 <anchor id="view-split-vertical"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;&Shift;<keycap
->L</keycap
-></keycombo
-></shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Split Vertical</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>L</keycap></keycombo></shortcut> <guimenu>View</guimenu> <guimenuitem>Split Vertical</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->This will split the frame (which may be the main editing area) in two equally sized frames, the new one to the left of the current one. The new frame gets the focus, and will display the same document as the old one.</para>
-<para
->See also <link linkend="kate-mdi"
->Working with the &kate; MDI</link
-></para>
+<para>This will split the frame (which may be the main editing area) in two equally sized frames, the new one to the left of the current one. The new frame gets the focus, and will display the same document as the old one.</para>
+<para>See also <link linkend="kate-mdi">Working with the &kate; MDI</link></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="view-split-horizontal"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;&Shift;<keycap
->T</keycap
-></keycombo
-></shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Split Horizontal</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>T</keycap></keycombo></shortcut> <guimenu>View</guimenu> <guimenuitem>Split Horizontal</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Splits the current frame (which may be the main editing area) in two equally sized frames, the new one at the bottom half. The new frame gets the focus, and displays the same document as the old one.</para>
-<para
->See also <link linkend="kate-mdi"
->Working with the &kate; MDI</link
-></para>
+<para>Splits the current frame (which may be the main editing area) in two equally sized frames, the new one at the bottom half. The new frame gets the focus, and displays the same document as the old one.</para>
+<para>See also <link linkend="kate-mdi">Working with the &kate; MDI</link></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="view-close-current"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;&Shift;<keycap
->R</keycap
-></keycombo
-></shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Close Current</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>R</keycap></keycombo></shortcut> <guimenu>View</guimenu> <guimenuitem>Close Current</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Closes the active frame. This is disabled, if there is only one frame (the main editing area).</para
-> <para
->No documents get closed by closing a frame &ndash; they will still be available in the <link linkend="document-menu"
-><guimenu
->Documents</guimenu
-> Menu</link
-> as well as in the File List.</para
-> <para
->See also <link linkend="kate-mdi"
->Working with the &kate; MDI</link
-></para>
+<para>Closes the active frame. This is disabled, if there is only one frame (the main editing area).</para> <para>No documents get closed by closing a frame &ndash; they will still be available in the <link linkend="document-menu"><guimenu>Documents</guimenu> Menu</link> as well as in the File List.</para> <para>See also <link linkend="kate-mdi">Working with the &kate; MDI</link></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="view-show-icon-border"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
-><keycap
->F6</keycap
-></keycombo
-></shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Show Icon Border</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul"><keycap>F6</keycap></keycombo></shortcut> <guimenu>View</guimenu> <guimenuitem>Show Icon Border</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->This is a toggle item. Setting it on checked will make the side of the active editor, and vice versa.</para>
+<para>This is a toggle item. Setting it on checked will make the side of the active editor, and vice versa.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="view-show-line-numbers"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
-><keycap
->F11</keycap
-></keycombo
-></shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Show Line Numbers</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul"><keycap>F11</keycap></keycombo></shortcut> <guimenu>View</guimenu> <guimenuitem>Show Line Numbers</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<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>
+<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>
 <anchor id="view-go"/>
-<menuchoice
-><guimenu
->View</guimenu
-> <guisubmenu
->Go</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guisubmenu>Go</guisubmenu> </menuchoice>
 </term>
 <listitem>
 
@@ -1108,48 +492,22 @@
 <varlistentry>
 <term>
 <anchor id="view-go-next-view"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
-><keycap
->F8</keycap
-></keycombo
-></shortcut
-> <guimenuitem
->Next View</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul"><keycap>F8</keycap></keycombo></shortcut> <guimenuitem>Next View</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Move focus to the next frame; the order is following order of creation rather than that of visual logic. This behaviour may change in a future version of &kate;</para>
-<para
->See also <link linkend="kate-mdi"
->Working with the &kate; MDI</link
-></para>
+<para>Move focus to the next frame; the order is following order of creation rather than that of visual logic. This behaviour may change in a future version of &kate;</para>
+<para>See also <link linkend="kate-mdi">Working with the &kate; MDI</link></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="view-go-previous-view"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Shift;<keycap
->F8</keycap
-></keycombo
-></shortcut
-> <guimenuitem
->Previous View</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Shift;<keycap>F8</keycap></keycombo></shortcut> <guimenuitem>Previous View</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Move focus to the previous frame; the order is following order of creation rather than that of visual logic. This behaviour may change in a future version of &kate;</para>
-<para
->See also <link linkend="kate-mdi"
->Working with the &kate; MDI</link
-></para>
+<para>Move focus to the previous frame; the order is following order of creation rather than that of visual logic. This behaviour may change in a future version of &kate;</para>
+<para>See also <link linkend="kate-mdi">Working with the &kate; MDI</link></para>
 </listitem>
 </varlistentry>
 
@@ -1166,59 +524,33 @@
 </sect1>
 
 <sect1 id="bookmarks-menu">
-<title
->The <guimenu
->Bookmarks</guimenu
-> Menu</title>
+<title>The <guimenu>Bookmarks</guimenu> Menu</title>
 
-<para
->The <guimenu
->Bookmarks</guimenu
-> menu allows you to work with the bookmarks in the currently active document.</para>
+<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 start of that line. The editor will scroll as necessary to make that line visible.</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 start of that line. The editor will scroll as necessary to make that line visible.</para>
 
 <variablelist>
 
-<title
->Menu Items</title>
+<title>Menu Items</title>
 
 <varlistentry>
 <term>
 <anchor id="bookmarks-toggle-bookmark"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->B</keycap
-></keycombo
-></shortcut
-> <guimenu
->Bookmarks</guimenu
-> <guimenuitem
->Toggle Bookmark</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>B</keycap></keycombo></shortcut> <guimenu>Bookmarks</guimenu> <guimenuitem>Toggle Bookmark</guimenuitem> </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>
+<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
-><guimenu
->Bookmarks</guimenu
-> <guimenuitem
->Clear Bookmarks</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Bookmarks</guimenu> <guimenuitem>Clear Bookmarks</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Clears (removes) all bookmarks of the active document.</para>
+<para>Clears (removes) all bookmarks of the active document.</para>
 </listitem>
 </varlistentry>
 
@@ -1229,30 +561,12 @@
 
 <sect1 id="tools-menu">
 
-<title
->The <guimenu
->Tools</guimenu
-> Menu</title>
-
-<para
->The <guimenu
->Tools</guimenu
-> menu contains commands of two categories: <itemizedlist>
-<listitem
-><para
->Tools doing advanced editing of the current document, for example <link linkend="tools-menu-editing-command"
-><guimenuitem
->Editing Command</guimenuitem
-></link
->.</para>
+<title>The <guimenu>Tools</guimenu> Menu</title>
+
+<para>The <guimenu>Tools</guimenu> menu contains commands of two categories: <itemizedlist>
+<listitem><para>Tools doing advanced editing of the current document, for example <link linkend="tools-menu-editing-command"><guimenuitem>Editing Command</guimenuitem></link>.</para>
 </listitem>
-<listitem
-><para
->Tools adding functionality to the application, for example the <link linkend="tools-menu-find-in-files"
-><guimenuitem
->Find in Files</guimenuitem
-></link
-> tool.</para>
+<listitem><para>Tools adding functionality to the application, for example the <link linkend="tools-menu-find-in-files"><guimenuitem>Find in Files</guimenuitem></link> tool.</para>
 </listitem>
 </itemizedlist>
 </para>
@@ -1262,62 +576,30 @@
 <varlistentry>
 <term>
 <anchor id="tools-menu-editing-command"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->M</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Editing Command...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>M</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Editing Command...</guimenuitem> </menuchoice>
 </term>
-<listitem
-><!-- FIXME LINK, DOCUMENT THAT TODO: add a minimal desc here-->
-<para
->Launch the Editing Command Dialogue</para>
+<listitem><!-- FIXME LINK, DOCUMENT THAT TODO: add a minimal desc here-->
+<para>Launch the Editing Command Dialogue</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="tools-menu-find-in-files"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;&Shift;<keycap
->F</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Find in Files...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>F</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Find in Files...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Launch the Find In Files Dialogue to search for a specified text in files on disk.</para>
+<para>Launch the Find In Files Dialogue to search for a specified text in files on disk.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="tools-menu-apply-word-wrap"/>
-<menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Apply Word Wrap</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Edit</guimenu> <guimenuitem>Apply Word Wrap</guimenuitem> </menuchoice>
 </term>
-<listitem
-><!-- FIXME LINKS TEST MORE? //-->
-<para
->Apply word wrap to ? according to the settings in the ? </para>
+<listitem><!-- FIXME LINKS TEST MORE? //-->
+<para>Apply word wrap to ? according to the settings in the ? </para>
 </listitem>
 </varlistentry>
 
@@ -1325,16 +607,10 @@
 <varlistentry>
 <term>
 <anchor id="tools-menu-spelling"/>
-<menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Spelling...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Edit</guimenu> <guimenuitem>Spelling...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Spell check the current document using the &kde; spell checker</para>
+<para>Spell check the current document using the &kde; spell checker</para>
 </listitem>
 </varlistentry>
 
@@ -1346,111 +622,61 @@
 
 <sect1 id="settings-menu">
 
-<title
->The <guimenu
->Settings</guimenu
-> Menu</title>
+<title>The <guimenu>Settings</guimenu> Menu</title>
 
-<para
->The <guimenu
->Settings</guimenu
-> menu allows you to change the properties of the main window, such as showing/hiding toolbars and boxes, and provides access to the configuration dialogues.</para>
+<para>The <guimenu>Settings</guimenu> menu allows you to change the properties of the main window, such as showing/hiding toolbars and boxes, and provides access to the configuration dialogues.</para>
 
 <variablelist>
 
 <varlistentry>
 <term>
 <anchor id="settings-show-toolbar"/>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show Toolbar</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Toolbar</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Toggles the display of the main toolbar.</para>
+<para>Toggles the display of the main toolbar.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="settings-show-filelist"/>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show Filelist</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Filelist</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Toggle the display of the &kate; Filelist</para>
+<para>Toggle the display of the &kate; Filelist</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="settings-show-fileselector"/>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show Fileselector</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Fileselector</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Toggle the display of the &kate; File Selector</para>
+<para>Toggle the display of the &kate; File Selector</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="settings-show-konsole"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
-><keycap
->F7</keycap
-></keycombo
-></shortcut
-> <guimenu
->Settings</guimenu
-> <guimenuitem
->Show Konsole</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul"><keycap>F7</keycap></keycombo></shortcut> <guimenu>Settings</guimenu> <guimenuitem>Show Konsole</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Toggles the display of the built in terminal emulator.</para>
-<para
->When activated the first time, the terminal will be created.</para>
-<para
->When the terminal emulator is displayed, it will get the focus, so that you can start typing in commands immediately. If the <link linkend="config-dialog-general-sync-konsole"
->Sync Konsole with Active Document</link
-> option is enabled in the <link linkend="config-dialog-general"
->General Page</link
-> of the <link linkend="config-dialog"
->Main configuration dialogue</link
-> the shell session will change to the directory of the active document, if it is a local file.</para>
+<para>Toggles the display of the built in terminal emulator.</para>
+<para>When activated the first time, the terminal will be created.</para>
+<para>When the terminal emulator is displayed, it will get the focus, so that you can start typing in commands immediately. If the <link linkend="config-dialog-general-sync-konsole">Sync Konsole with Active Document</link> option is enabled in the <link linkend="config-dialog-general">General Page</link> of the <link linkend="config-dialog">Main configuration dialogue</link> the shell session will change to the directory of the active document, if it is a local file.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="settings-configure-shortcuts"/>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Shortcuts</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Shortcuts</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Display the the familiar &kde; Keyboard Shortcut Configuration Dialogue.</para>
+<para>Display the the familiar &kde; Keyboard Shortcut Configuration Dialogue.</para>
 </listitem>
 </varlistentry>
 
@@ -1458,34 +684,20 @@
 <varlistentry>
 <term>
 <anchor id="settings-configure-toolbars"/>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Toolbars</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Toolbars</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Display the the familiar &kde; Toolbar Configuration Dialogue.</para>
+<para>Display the the familiar &kde; Toolbar Configuration Dialogue.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
 <anchor id="settings-configure-kate"/>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure &kate;</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure &kate;</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Launch the <link linkend="config-dialog"
->Main Configuration Dialogue</link
-></para>
+<para>Launch the <link linkend="config-dialog">Main Configuration Dialogue</link></para>
 </listitem>
 </varlistentry>
 
@@ -1496,20 +708,11 @@
 
 <sect1 id="help-menu">
 
-<title
->The <guimenu
->Help</guimenu
-> Menu</title>
+<title>The <guimenu>Help</guimenu> Menu</title>
 
-<para
->The <guimenu
->Help</guimenu
-> menu provides access to the online help available for &kate;; as well as to the usual about dialogues.</para>
+<para>The <guimenu>Help</guimenu> menu provides access to the online help available for &kate;; as well as to the usual about dialogues.</para>
 
-<para
->As well as the standard &kde; <guimenu
->Help</guimenu
-> menu items described below, if you have installed the tdeaddons package with additional &kate; plugins, you will have a menu entry to show the Plugins User Manuals.</para>
+<para>As well as the standard &kde; <guimenu>Help</guimenu> menu items described below, if you have installed the tdeaddons package with additional &kate; plugins, you will have a menu entry to show the Plugins User Manuals.</para>
 &help.menu.documentation; </sect1>
 
 </chapter>
diff --git a/tde-i18n-en_GB/docs/tdebase/kate/part.docbook b/tde-i18n-en_GB/docs/tdebase/kate/part.docbook
index f0e11a9d57c..24d3c81be3d 100644
--- a/tde-i18n-en_GB/docs/tdebase/kate/part.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kate/part.docbook
@@ -1,303 +1,136 @@
 <chapter id="kate-part">
 <chapterinfo>
 <authorgroup>
-<author
-><personname
-><firstname
-></firstname
-></personname
-></author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author><personname><firstname></firstname></personname></author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </chapterinfo>
-<title
->Working with the &kate; editor</title>
+<title>Working with the &kate; editor</title>
 
 <sect1 id="kate-part-overview">
 
-<title
->Overview</title>
+<title>Overview</title>
 
-<para
->The &kate; editor is the editing area of the &kate; window. This editor is also used by &kwrite;, and it can be used in &konqueror; for displaying text files from your local computer, or from the network.</para>
+<para>The &kate; editor is the editing area of the &kate; window. This editor is also used by &kwrite;, and it can be used in &konqueror; for displaying text files from your local computer, or from the network.</para>
 
-<para
->The editor is composed of the following components:</para>
+<para>The editor is composed of the following components:</para>
 
 <variablelist>
 
 <varlistentry>
-<term
->The editing area</term>
-<listitem
-><para
->This is where the text of your document is located.</para
-></listitem>
+<term>The editing area</term>
+<listitem><para>This is where the text of your document is located.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->The Scroll bars</term>
+<term>The Scroll bars</term>
 <listitem>
-<para
->The scroll bars indicate the position of the visible part of the document text, and can be used to move around the document. Dragging the scrollbars will not cause the insertion cursor to be moved.</para>
-<para
->The scroll bars are displayed and hidden as required.</para>
+<para>The scroll bars indicate the position of the visible part of the document text, and can be used to move around the document. Dragging the scrollbars will not cause the insertion cursor to be moved.</para>
+<para>The scroll bars are displayed and hidden as required.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->The Icon Border</term>
+<term>The Icon Border</term>
 <listitem>
-<para
->The icon border is a small pane on the left side of the editor, displaying a small icon next to marked lines.</para>
-<para
->You can set or remove a <link linkend="kate-part-bookmarks"
->bookmark</link
-> in a visible line by clicking the &LMB; in the icon border next to that line.</para>
-<para
->The display of the icon border can be toggled using the <menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Show Icon Border</guimenuitem
-></menuchoice
-> menu item.</para
-> 
+<para>The icon border is a small pane on the left side of the editor, displaying a small icon next to marked lines.</para>
+<para>You can set or remove a <link linkend="kate-part-bookmarks">bookmark</link> in a visible line by clicking the &LMB; in the icon border next to that line.</para>
+<para>The display of the icon border can be toggled using the <menuchoice><guimenu>View</guimenu> <guimenuitem>Show Icon Border</guimenuitem></menuchoice> menu item.</para> 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->The Line Numbers Pane</term>
+<term>The Line Numbers Pane</term>
 <listitem>
-<para
->The Line numbers pane shows the line numbers of all visible lines in the document.</para
-> 
-<para
->The display of the Line Numbers Pane can be toggled using the <menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Show Line Numbers</guimenuitem
-></menuchoice
-> menu item.</para>
+<para>The Line numbers pane shows the line numbers of all visible lines in the document.</para> 
+<para>The display of the Line Numbers Pane can be toggled using the <menuchoice><guimenu>View</guimenu> <guimenuitem>Show Line Numbers</guimenuitem></menuchoice> menu item.</para>
 </listitem>
 </varlistentry>
 
 </variablelist>
 
 <itemizedlist>
-<title
->Also in this Chapter:</title>
-<listitem
-><para
-><link linkend="kate-part-navigation"
->Navigating in the Text</link
-> </para
-></listitem>
-<listitem
-><para
-><link linkend="kate-part-selection"
->Working with the Selection</link
-></para
-></listitem>
-<listitem
-><para
-><link linkend="kate-part-copy-and-paste"
->Copying and Pasting Text</link
-></para
-></listitem>
-<listitem
-><para
-><link linkend="kate-part-find-replace"
->Finding and Replacing Text</link
-></para
-></listitem>
-<listitem
-><para
-><link linkend="kate-part-bookmarks"
->Using Bookmarks</link
-></para
-></listitem>
-<listitem
-><para
-><link linkend="kate-part-auto-wrap"
->Automatically Wrapping Text</link
-></para
-></listitem>
+<title>Also in this Chapter:</title>
+<listitem><para><link linkend="kate-part-navigation">Navigating in the Text</link> </para></listitem>
+<listitem><para><link linkend="kate-part-selection">Working with the Selection</link></para></listitem>
+<listitem><para><link linkend="kate-part-copy-and-paste">Copying and Pasting Text</link></para></listitem>
+<listitem><para><link linkend="kate-part-find-replace">Finding and Replacing Text</link></para></listitem>
+<listitem><para><link linkend="kate-part-bookmarks">Using Bookmarks</link></para></listitem>
+<listitem><para><link linkend="kate-part-auto-wrap">Automatically Wrapping Text</link></para></listitem>
 </itemizedlist>
 
 </sect1>
 
 <sect1 id="kate-part-navigation">
-<title
->Navigating in the Text</title>
+<title>Navigating in the Text</title>
 
-<para
->This section is not yet documented.</para>
+<para>This section is not yet documented.</para>
 
 </sect1>
 
 <sect1 id="kate-part-selection">
-<title
->Working with the Selection</title>
+<title>Working with the Selection</title>
 
-<para
->There are two basic ways of selecting text in &kate;: using the mouse, and using the keyboard.</para>
+<para>There are two basic ways of selecting text in &kate;: using the mouse, and using the keyboard.</para>
 
-<para
->To select using the mouse, hold down the &LMB; while dragging the mouse cursor from where the selection should start, to the desired end point. The text gets selected as you drag.</para>
+<para>To select using the mouse, hold down the &LMB; while dragging the mouse cursor from where the selection should start, to the desired end point. The text gets selected as you drag.</para>
 
-<para
->Double-clicking a word will select that word.</para>
+<para>Double-clicking a word will select that word.</para>
 
-<para
->Triple-clicking in a line will select the entire line.</para>
+<para>Triple-clicking in a line will select the entire line.</para>
 
-<para
->If &Shift; is held down while clicking, text will be selected:</para>
+<para>If &Shift; is held down while clicking, text will be selected:</para>
 
 <itemizedlist>
-<listitem
-><para
->If nothing is already selected, from the text cursor position to the mouse cursor position.</para
-></listitem>
-<listitem
-><para
->If there is a selection, from and including that selection to the mouse cursor position</para
-></listitem>
+<listitem><para>If nothing is already selected, from the text cursor position to the mouse cursor position.</para></listitem>
+<listitem><para>If there is a selection, from and including that selection to the mouse cursor position</para></listitem>
 </itemizedlist>
 
 <note>
-<para
->When selecting text by dragging the mouse, the selected text is copied to the clipboard, and can be pasted by clicking the middle mouse button in the editor, or in any other application to which you want to paste the text. </para>
+<para>When selecting text by dragging the mouse, the selected text is copied to the clipboard, and can be pasted by clicking the middle mouse button in the editor, or in any other application to which you want to paste the text. </para>
 </note>
 
-<para
->To select using the keyboard, hold down the &Shift; key while using the navigation keys (The Arrow keys, <keycap
->Page Up</keycap
->, <keycap
->Page Down</keycap
->, <keycap
->Home</keycap
-> and <keycap
->End</keycap
->, possibly in combination with &Ctrl; to extend the move of the text cursor).</para>
-
-<para
->See also the section <link linkend="kate-part-navigation"
->Navigating in the Text</link
-> in this Chapter.</para>
-
-<para
->To <action
->Copy</action
-> the current selection, use the <menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Copy</guimenuitem
-></menuchoice
-> menu item or the keyboard shortcut (defaults to <keycombo action="simul"
->&Ctrl;<keycap
->C</keycap
-></keycombo
->).</para>
-
-<para
->To <action
->Deselect</action
-> the current selection, use the <menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Deselect</guimenuitem
-></menuchoice
-> menu item, or the keyboard shortcut (default is <keycombo action="simul"
->&Ctrl;&Shift;<keycap
->A</keycap
-></keycombo
->), or click with the &LMB; in the editor.</para>
+<para>To select using the keyboard, hold down the &Shift; key while using the navigation keys (The Arrow keys, <keycap>Page Up</keycap>, <keycap>Page Down</keycap>, <keycap>Home</keycap> and <keycap>End</keycap>, possibly in combination with &Ctrl; to extend the move of the text cursor).</para>
+
+<para>See also the section <link linkend="kate-part-navigation">Navigating in the Text</link> in this Chapter.</para>
+
+<para>To <action>Copy</action> the current selection, use the <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Copy</guimenuitem></menuchoice> menu item or the keyboard shortcut (defaults to <keycombo action="simul">&Ctrl;<keycap>C</keycap></keycombo>).</para>
+
+<para>To <action>Deselect</action> the current selection, use the <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Deselect</guimenuitem></menuchoice> menu item, or the keyboard shortcut (default is <keycombo action="simul">&Ctrl;&Shift;<keycap>A</keycap></keycombo>), or click with the &LMB; in the editor.</para>
 
 <sect2 id="kate-part-selection-block">
-<title
->Using Block Selection</title>
-
-<para
->When Block Selection is enabled, you can make <quote
->vertical selections</quote
-> in the text, meaning selecting limited columns from multiple lines. This is handy for working with tab separated lines for example.</para>
-
-<para
->Block Selection can be toggled using the <menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Toggle Block Selection</guimenuitem
-></menuchoice
-> menu item. The default keyboard shortcut is <keycap
->F4</keycap
-></para>
+<title>Using Block Selection</title>
+
+<para>When Block Selection is enabled, you can make <quote>vertical selections</quote> in the text, meaning selecting limited columns from multiple lines. This is handy for working with tab separated lines for example.</para>
+
+<para>Block Selection can be toggled using the <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Toggle Block Selection</guimenuitem></menuchoice> menu item. The default keyboard shortcut is <keycap>F4</keycap></para>
 
 </sect2>
 
 <sect2 id="kate-part-seleciton-overwrite">
 
-<title
->Using Overwrite Selection</title>
+<title>Using Overwrite Selection</title>
 
-<para
->If Overwrite Selection is enabled, typing or pasting text into the selection will cause the selected text to be replaced. If not enabled, new text will be added at the position of the text cursor.</para>
+<para>If Overwrite Selection is enabled, typing or pasting text into the selection will cause the selected text to be replaced. If not enabled, new text will be added at the position of the text cursor.</para>
 
-<para
->Overwrite Selection is enabled by default.</para>
+<para>Overwrite Selection is enabled by default.</para>
 
-<para
->To change the setting for this option, use the <link linkend="config-dialog-editor-select"
->Select Page</link
-> of the <link linkend="config-dialog"
->Configuration Dialogue</link
->.</para>
+<para>To change the setting for this option, use the <link linkend="config-dialog-editor-select">Select Page</link> of the <link linkend="config-dialog">Configuration Dialogue</link>.</para>
 
 </sect2>
 
 <sect2 id="kate-part-selection-persistent">
 
-<title
->Using Persistent Selection</title>
+<title>Using Persistent Selection</title>
 
-<para
->When Persistent selection is enabled, typing characters or moving the cursor will not cause the Selection to become deselected. This means that you can move the cursor away from the selection and type text.</para>
+<para>When Persistent selection is enabled, typing characters or moving the cursor will not cause the Selection to become deselected. This means that you can move the cursor away from the selection and type text.</para>
 
-<para
->Persistent Selection is disabled by default.</para>
+<para>Persistent Selection is disabled by default.</para>
 
-<para
->Persistent Selection can be enabled in the <link linkend="config-dialog-editor-select"
->Select Page</link
-> of the <link linkend="config-dialog"
->Configuration Dialogue</link
->.</para>
+<para>Persistent Selection can be enabled in the <link linkend="config-dialog-editor-select">Select Page</link> of the <link linkend="config-dialog">Configuration Dialogue</link>.</para>
 
 <warning>
-<para
->If Persistent Selection and Overwrite Selection are both enabled, typing or pasting text when the text cursor is inside the selection will cause it to be replaced and deselected.</para>
+<para>If Persistent Selection and Overwrite Selection are both enabled, typing or pasting text when the text cursor is inside the selection will cause it to be replaced and deselected.</para>
 </warning>
 
 </sect2>
@@ -306,325 +139,152 @@
 
 <sect1 id="kate-part-copy-and-paste">
 
-<title
->Copying and Pasting Text</title>
-
-<para
->To copy text, select it and use the <menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Copy</guimenuitem
-></menuchoice
-> menu item. Additionally, selecting text with the mouse will cause selected text to be copied to the clipboard.</para>
-
-<para
->To paste the text currently in the clipboard, use the <menuchoice
-> <guimenu
->Edit</guimenu
-><guimenuitem
->Paste</guimenuitem
-></menuchoice
-> menu item.</para>
-
-<para
->Additionally, text selected with the mouse may be pasted by clicking the <mousebutton
->middle</mousebutton
-> mouse button at the desired position.</para>
+<title>Copying and Pasting Text</title>
+
+<para>To copy text, select it and use the <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Copy</guimenuitem></menuchoice> menu item. Additionally, selecting text with the mouse will cause selected text to be copied to the clipboard.</para>
+
+<para>To paste the text currently in the clipboard, use the <menuchoice> <guimenu>Edit</guimenu><guimenuitem>Paste</guimenuitem></menuchoice> menu item.</para>
+
+<para>Additionally, text selected with the mouse may be pasted by clicking the <mousebutton>middle</mousebutton> mouse button at the desired position.</para>
 
 <tip>
-<para
->If you are using the &kde; desktop, you can retrieve earlier copied text from any application using the &klipper; icon in the &kicker; icon tray.</para>
+<para>If you are using the &kde; desktop, you can retrieve earlier copied text from any application using the &klipper; icon in the &kicker; icon tray.</para>
 </tip>
 
 </sect1>
 
 <sect1 id="kate-part-find-replace">
-<title
->Finding and Replacing Text</title>
+<title>Finding and Replacing Text</title>
 
 <sect2 id="find-replace-dialog">
-<title
->The <guilabel
->Find Text</guilabel
-> and <guilabel
->Replace Text</guilabel
-> Dialogues</title>
+<title>The <guilabel>Find Text</guilabel> and <guilabel>Replace Text</guilabel> Dialogues</title>
 
 
-<para
->The Find and Replace Text dialogues in &kate; are very much the same, except the Replace Text dialogue offers the means of entering a replacement string along with a few extra options.</para>
+<para>The Find and Replace Text dialogues in &kate; are very much the same, except the Replace Text dialogue offers the means of entering a replacement string along with a few extra options.</para>
 
-<para
->The dialogues offer the following common options:</para>
+<para>The dialogues offer the following common options:</para>
 
 <variablelist>
 
 <varlistentry>
-<term
-><guilabel
->Text to Find</guilabel
-></term>
-<listitem
-><para
->This is where to enter the search string. The interpretation of the string depends on some of the options described below.</para
-></listitem>
+<term><guilabel>Text to Find</guilabel></term>
+<listitem><para>This is where to enter the search string. The interpretation of the string depends on some of the options described below.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Regular Expression</guilabel
-></term>
+<term><guilabel>Regular Expression</guilabel></term>
 <listitem>
-<para
->If checked, the search string is interpreted as a regular expression. A button for using a graphical tool to create or edit the expression will be enabled.</para
-> 
-<para
->See <link linkend="regular-expressions"
->Regular Expressions</link
-> for more on these.</para
-> 
+<para>If checked, the search string is interpreted as a regular expression. A button for using a graphical tool to create or edit the expression will be enabled.</para> 
+<para>See <link linkend="regular-expressions">Regular Expressions</link> for more on these.</para> 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Case Insensitive</guilabel
-></term>
+<term><guilabel>Case Insensitive</guilabel></term>
 <listitem>
-<para
->If enabled, the search will be case insensitive.</para>
+<para>If enabled, the search will be case insensitive.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Whole Words Only</guilabel
-></term>
+<term><guilabel>Whole Words Only</guilabel></term>
 <listitem>
-<para
->If checked, the search will only match if there is a word boundary at both ends of the string matching, meaning not an alphanumeric character - either some other visible character or a line end.</para>
+<para>If checked, the search will only match if there is a word boundary at both ends of the string matching, meaning not an alphanumeric character - either some other visible character or a line end.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->From Beginning</guilabel
-></term>
+<term><guilabel>From Beginning</guilabel></term>
 <listitem>
-<para
->If checked, the search will start at the beginning of the first line in the document, otherwise it will start at cursor position.</para>
+<para>If checked, the search will start at the beginning of the first line in the document, otherwise it will start at cursor position.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Find Backwards</guilabel
-></term>
+<term><guilabel>Find Backwards</guilabel></term>
 <listitem>
-<para
->If checked, the search will look for the first match above the starting point, either cursor position or the beginning of the document, if the <guilabel
->From Beginning</guilabel
-> option is enabled.</para>
+<para>If checked, the search will look for the first match above the starting point, either cursor position or the beginning of the document, if the <guilabel>From Beginning</guilabel> option is enabled.</para>
 </listitem>
 </varlistentry>
 
 </variablelist>
 
-<para
->The <guilabel
->Replace Text</guilabel
-> Dialogue offers some additional options:</para>
+<para>The <guilabel>Replace Text</guilabel> Dialogue offers some additional options:</para>
 
 <variablelist>
 
 <varlistentry>
-<term
-><guilabel
->Replace With</guilabel
-></term>
-<listitem
-><para
->This is where to enter the replacement string.</para
-></listitem
-> 
+<term><guilabel>Replace With</guilabel></term>
+<listitem><para>This is where to enter the replacement string.</para></listitem> 
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Selected Text</guilabel
-></term>
+<term><guilabel>Selected Text</guilabel></term>
 <listitem>
-<para
->This option is disabled if no text is selected, or if the <guilabel
->Prompt on Replace</guilabel
-> option is enabled. If checked, all matches of the search string within the selected text will be replaced with the replace string.</para>
+<para>This option is disabled if no text is selected, or if the <guilabel>Prompt on Replace</guilabel> option is enabled. If checked, all matches of the search string within the selected text will be replaced with the replace string.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Prompt on Replace</guilabel
-></term>
-<listitem
-><para
->If checked, a small dialogue will prompt you for what to do for each time a match is found. It offers the following options: <variablelist>
+<term><guilabel>Prompt on Replace</guilabel></term>
+<listitem><para>If checked, a small dialogue will prompt you for what to do for each time a match is found. It offers the following options: <variablelist>
 
 <varlistentry>
-<term
-><guibutton
->Yes</guibutton
-></term>
-<listitem
-><para
->Activate this to replace the current match (which is selected in the editor).</para
-></listitem
-> 
+<term><guibutton>Yes</guibutton></term>
+<listitem><para>Activate this to replace the current match (which is selected in the editor).</para></listitem> 
 </varlistentry>
 
 <varlistentry>
-<term
-><guibutton
->No</guibutton
-></term>
-<listitem
-><para
->Activate to skip the current match, and try to find another one.</para
-></listitem>
+<term><guibutton>No</guibutton></term>
+<listitem><para>Activate to skip the current match, and try to find another one.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guibutton
->All</guibutton
-></term>
-<listitem
-><para
->Activate to cancel prompting, and just replace all matches.</para
-></listitem
-> 
+<term><guibutton>All</guibutton></term>
+<listitem><para>Activate to cancel prompting, and just replace all matches.</para></listitem> 
 </varlistentry>
 
 <varlistentry>
-<term
-><guibutton
->Close</guibutton
-></term>
-<listitem
-><para
->Activate this skip the current match and end the searching.</para
-></listitem
-> 
+<term><guibutton>Close</guibutton></term>
+<listitem><para>Activate this skip the current match and end the searching.</para></listitem> 
 </varlistentry>
 
 </variablelist>
 
-</para
-></listitem>
+</para></listitem>
 </varlistentry>
 
 </variablelist>
 
 <note>
-<para
->There is currently no way to use minimal matching when searching for a regular expression. This will be added in a future version of &kate;</para
-> 
+<para>There is currently no way to use minimal matching when searching for a regular expression. This will be added in a future version of &kate;</para> 
 </note>
 
 </sect2>
 
 <sect2 id="finding-text">
-<title
->Finding Text</title>
-
-<para
->To find text, launch the <guilabel
->Find Text</guilabel
-> Dialogue with <keycombo action="simul"
->&Ctrl;<keycap
->F</keycap
-></keycombo
->or from the <menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Find...</guimenuitem
-></menuchoice
-> menu item,enter a search string, set the <link linkend="find-replace-dialog"
->options</link
-> as desired and hit <guibutton
->Ok</guibutton
->. If no matches is found between the starting point for the search (either the text cursor position or the beginning of the document) you will be prompted for permission to continue from the start (or end, if you are searching backwards) of the document.</para>
-
-<para
->If a match is found it is selected and the <guilabel
->Find Text</guilabel
-> Dialogue is hidden, but stay tuned, finding further matches is very easy:</para>
-
-<para
->To find the next match in the search direction, use the <menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Find Next</guimenuitem
-></menuchoice
-> command or press <keycap
->F3</keycap
->.</para>
-
-<para
->To find the next match in the opposite direction, use the <menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Find Previous</guimenuitem
-></menuchoice
-> command or press <keycombo action="simul"
->&Shift;<keycap
->F3</keycap
-></keycombo
->.</para>
-
-<para
->If no match is found before reaching the document border, you will be prompted for permission to cross that.</para>
+<title>Finding Text</title>
+
+<para>To find text, launch the <guilabel>Find Text</guilabel> Dialogue with <keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo>or from the <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Find...</guimenuitem></menuchoice> menu item,enter a search string, set the <link linkend="find-replace-dialog">options</link> as desired and hit <guibutton>Ok</guibutton>. If no matches is found between the starting point for the search (either the text cursor position or the beginning of the document) you will be prompted for permission to continue from the start (or end, if you are searching backwards) of the document.</para>
+
+<para>If a match is found it is selected and the <guilabel>Find Text</guilabel> Dialogue is hidden, but stay tuned, finding further matches is very easy:</para>
+
+<para>To find the next match in the search direction, use the <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Find Next</guimenuitem></menuchoice> command or press <keycap>F3</keycap>.</para>
+
+<para>To find the next match in the opposite direction, use the <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Find Previous</guimenuitem></menuchoice> command or press <keycombo action="simul">&Shift;<keycap>F3</keycap></keycombo>.</para>
+
+<para>If no match is found before reaching the document border, you will be prompted for permission to cross that.</para>
 
 </sect2>
 
 <sect2>
-<title
->Replacing Text</title>
-
-<para
->To replace text, launch the <guilabel
->Replace text</guilabel
-> Dialogue using the <menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Replace</guimenuitem
-></menuchoice
-> command, or the <keycombo action="simul"
->&Ctrl;<keycap
->R</keycap
-></keycombo
-> shortcut, enter a search string and optionally a replace string (if the replace string is empty, each match will be replaced with &quot;&quot;), set the <link linkend="find-replace-dialog"
->options</link
-> as desired and hit the <guibutton
->Ok</guibutton
-> button.</para>
+<title>Replacing Text</title>
+
+<para>To replace text, launch the <guilabel>Replace text</guilabel> Dialogue using the <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Replace</guimenuitem></menuchoice> command, or the <keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo> shortcut, enter a search string and optionally a replace string (if the replace string is empty, each match will be replaced with &quot;&quot;), set the <link linkend="find-replace-dialog">options</link> as desired and hit the <guibutton>Ok</guibutton> button.</para>
 
 <tip>
-<para
->If you are using a regular expression to find the text to replace, you can employ backreferences to reuse text captured in parenthesised subpatterns of the expression.</para>
-<para
->See <xref linkend="regular-expressions"/> for more on these.</para>
+<para>If you are using a regular expression to find the text to replace, you can employ backreferences to reuse text captured in parenthesised subpatterns of the expression.</para>
+<para>See <xref linkend="regular-expressions"/> for more on these.</para>
 </tip>
 
 </sect2>
@@ -632,100 +292,48 @@
 </sect1>
 
 <sect1 id="kate-part-bookmarks">
-<title
->Using Bookmarks</title>
+<title>Using Bookmarks</title>
 
-<para
->The bookmarks feature allows you to mark certain lines, to be able to easily find them again.</para>
+<para>The bookmarks feature allows you to mark certain lines, to be able to easily find them again.</para>
 
-<para
->You can set or remove a bookmark in a line in two ways:</para>
+<para>You can set or remove a bookmark in a line in two ways:</para>
 
 <itemizedlist>
 <listitem>
-<para
->Moving the insertion cursor to that line, and activate the <menuchoice
-><guimenu
->Bookmarks</guimenu
-><guimenuitem
->Toggle Bookmark</guimenuitem
-></menuchoice
-> (<keycombo action="simul"
->&Ctrl;<keycap
->B</keycap
-></keycombo
->) command.</para
-> 
+<para>Moving the insertion cursor to that line, and activate the <menuchoice><guimenu>Bookmarks</guimenu><guimenuitem>Toggle Bookmark</guimenuitem></menuchoice> (<keycombo action="simul">&Ctrl;<keycap>B</keycap></keycombo>) command.</para> 
 </listitem>
 <listitem>
-<para
->Clicking in the Icon Border next to that line.</para>
+<para>Clicking in the Icon Border next to that line.</para>
 </listitem>
 </itemizedlist>
 
 
-<para
->Bookmarks are available in the <guimenu
->Bookmarks</guimenu
-> menu. The individual bookmarks are available as menu items, labelled with the line number of the line with the bookmark, and the first few characters of the text in the line. To move the insertion cursor to the beginning of a bookmarked line, open the menu and select the bookmark.</para>
+<para>Bookmarks are available in the <guimenu>Bookmarks</guimenu> menu. The individual bookmarks are available as menu items, labelled with the line number of the line with the bookmark, and the first few characters of the text in the line. To move the insertion cursor to the beginning of a bookmarked line, open the menu and select the bookmark.</para>
 
 <tip>
-<para
->If the <link linkend="config-dialog-general-reopen-files"
->Reopen Files</link
-> option in the <link linkend="config-dialog"
->Config Dialogue</link
-> is enabled (or if &kate; was started by the session manager), your bookmarks will be restored when the document is reopened.</para>
+<para>If the <link linkend="config-dialog-general-reopen-files">Reopen Files</link> option in the <link linkend="config-dialog">Config Dialogue</link> is enabled (or if &kate; was started by the session manager), your bookmarks will be restored when the document is reopened.</para>
 </tip>
 
 </sect1>
 
 <sect1 id="kate-part-auto-wrap">
 
-<title
->Automatically Wrapping text</title>
-
-<para
->This feature allows you to have the text formatted in a very simple way: the text will be wrapped, so that no lines exceed a maximum number of characters per line, unless there is a longer string of non-whitespace characters.</para>
-
-<para
->To enable/disable it, check/uncheck the <guibutton
->Word Wrap</guibutton
-> checkbox in the <link linkend="config-dialog-editor-edit"
->edit page</link
-> of the <link linkend="config-dialog"
->configuration dialogue</link
->.</para>
-
-<para
->To set the maximum line width (maximum characters per line), use the <link linkend="config-dialog-editor-edit-wrap-words-at"
-><guibutton
->Wrap Words At</guibutton
-></link
-> option in the <link linkend="config-dialog-editor-edit"
->edit page</link
-> of the <link linkend="config-dialog"
->configuration dialogue</link
->.</para>
-
-<para
->If enabled, it has the following effects: <itemizedlist>
-<listitem
-><para
->While typing, the editor will automatically insert a hard line break after the last whitespace character at a position before the maximum line width is reached.</para
-></listitem>
-<listitem
-><para
->While loading a document, the editor will wrap the text in a similar way, so that no lines are longer than the maximum line width, if they contain any whitespace allowing that.</para
-></listitem>
+<title>Automatically Wrapping text</title>
+
+<para>This feature allows you to have the text formatted in a very simple way: the text will be wrapped, so that no lines exceed a maximum number of characters per line, unless there is a longer string of non-whitespace characters.</para>
+
+<para>To enable/disable it, check/uncheck the <guibutton>Word Wrap</guibutton> checkbox in the <link linkend="config-dialog-editor-edit">edit page</link> of the <link linkend="config-dialog">configuration dialogue</link>.</para>
+
+<para>To set the maximum line width (maximum characters per line), use the <link linkend="config-dialog-editor-edit-wrap-words-at"><guibutton>Wrap Words At</guibutton></link> option in the <link linkend="config-dialog-editor-edit">edit page</link> of the <link linkend="config-dialog">configuration dialogue</link>.</para>
+
+<para>If enabled, it has the following effects: <itemizedlist>
+<listitem><para>While typing, the editor will automatically insert a hard line break after the last whitespace character at a position before the maximum line width is reached.</para></listitem>
+<listitem><para>While loading a document, the editor will wrap the text in a similar way, so that no lines are longer than the maximum line width, if they contain any whitespace allowing that.</para></listitem>
 </itemizedlist>
 
 </para>
 
-<note
-><para
->There is currently no way to set word wrap for document types, or even to enable or disable the feature on document level. This will be fixed in a future version of &kate;</para
-></note>
+<note><para>There is currently no way to set word wrap for document types, or even to enable or disable the feature on document level. This will be fixed in a future version of &kate;</para></note>
 
 </sect1>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kate/plugins.docbook b/tde-i18n-en_GB/docs/tdebase/kate/plugins.docbook
index 6431b95829c..5f0bbaa1ffe 100644
--- a/tde-i18n-en_GB/docs/tdebase/kate/plugins.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kate/plugins.docbook
@@ -1,32 +1,11 @@
 <chapter id="plugins">
 <chapterinfo>
 <authorgroup>
-<author
-><personname
-><firstname
-></firstname
-></personname
-></author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author><personname><firstname></firstname></personname></author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </chapterinfo>
-<title
->Working with Plugins</title>
-<para
->This chapter will describe topics related to using plugins</para>
+<title>Working with Plugins</title>
+<para>This chapter will describe topics related to using plugins</para>
 
 </chapter>
diff --git a/tde-i18n-en_GB/docs/tdebase/kate/regular-expressions.docbook b/tde-i18n-en_GB/docs/tdebase/kate/regular-expressions.docbook
index c692da92cd5..5adc38a3f0c 100644
--- a/tde-i18n-en_GB/docs/tdebase/kate/regular-expressions.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kate/regular-expressions.docbook
@@ -1,491 +1,162 @@
 <appendix id="regular-expressions">
 <appendixinfo>
 <authorgroup>
-<author
->&Anders.Lund; &Anders.Lund.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Anders.Lund; &Anders.Lund.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </appendixinfo>
 
-<title
->Regular Expressions</title>
+<title>Regular Expressions</title>
 
-<synopsis
->This Appendix contains a brief but hopefully sufficient and
-covering introduction to the world of <emphasis
->regular
-expressions</emphasis
->. It documents regular expressions in the form
+<synopsis>This Appendix contains a brief but hopefully sufficient and
+covering introduction to the world of <emphasis>regular
+expressions</emphasis>. It documents regular expressions in the form
 available within &kate;, which is not compatible with the regular
 expressions of perl, nor with those of for example
-<command
->grep</command
->.</synopsis>
+<command>grep</command>.</synopsis>
 
 <sect1>
 
-<title
->Introduction</title>
-
-<para
-><emphasis
->Regular Expressions</emphasis
-> provides us with a way to describe some possible contents of a text string in a way understood by a small piece of software, so that it can investigate if a text matches, and also in the case of advanced applications with the means of saving pieces or the matching text.</para>
-
-<para
->An example: Say you want to search a text for paragraphs that starts with either of the names <quote
->Henrik</quote
-> or <quote
->Pernille</quote
-> followed by some form of the verb <quote
->say</quote
->.</para>
-
-<para
->With a normal search, you would start out searching for the first name, <quote
->Henrik</quote
-> maybe followed by <quote
->sa</quote
-> like this: <userinput
->Henrik sa</userinput
->, and while looking for matches, you would have to discard those not being the beginning of a paragraph, as well as those in which the word starting with the letters <quote
->sa</quote
-> was not either <quote
->says</quote
->, <quote
->said</quote
-> or so. And then of cause repeat all of that with the next name...</para>
-
-<para
->With Regular Expressions, that task could be accomplished with a single search, and with a larger degree of preciseness.</para>
-
-<para
->To achieve this, Regular Expressions defines rules for expressing in details a generalisation of a string to match. Our example, which we might literally express like this: <quote
->A line starting with either <quote
->Henrik</quote
-> or <quote
->Pernille</quote
-> (possibly following up to 4 blanks or tab characters) followed by a whitespace followed by <quote
->sa</quote
-> and then either <quote
->ys</quote
-> or <quote
->id</quote
-></quote
-> could be expressed with the following regular expression:</para
-> <para
-><userinput
->^[ \t]{0,4}(Henrik|Pernille) sa(ys|id)</userinput
-></para>
-
-<para
->The above example demonstrates all four major concepts of modern Regular Expressions, namely:</para>
+<title>Introduction</title>
+
+<para><emphasis>Regular Expressions</emphasis> provides us with a way to describe some possible contents of a text string in a way understood by a small piece of software, so that it can investigate if a text matches, and also in the case of advanced applications with the means of saving pieces or the matching text.</para>
+
+<para>An example: Say you want to search a text for paragraphs that starts with either of the names <quote>Henrik</quote> or <quote>Pernille</quote> followed by some form of the verb <quote>say</quote>.</para>
+
+<para>With a normal search, you would start out searching for the first name, <quote>Henrik</quote> maybe followed by <quote>sa</quote> like this: <userinput>Henrik sa</userinput>, and while looking for matches, you would have to discard those not being the beginning of a paragraph, as well as those in which the word starting with the letters <quote>sa</quote> was not either <quote>says</quote>, <quote>said</quote> or so. And then of cause repeat all of that with the next name...</para>
+
+<para>With Regular Expressions, that task could be accomplished with a single search, and with a larger degree of preciseness.</para>
+
+<para>To achieve this, Regular Expressions defines rules for expressing in details a generalisation of a string to match. Our example, which we might literally express like this: <quote>A line starting with either <quote>Henrik</quote> or <quote>Pernille</quote> (possibly following up to 4 blanks or tab characters) followed by a whitespace followed by <quote>sa</quote> and then either <quote>ys</quote> or <quote>id</quote></quote> could be expressed with the following regular expression:</para> <para><userinput>^[ \t]{0,4}(Henrik|Pernille) sa(ys|id)</userinput></para>
+
+<para>The above example demonstrates all four major concepts of modern Regular Expressions, namely:</para>
 
 <itemizedlist>
-<listitem
-><para
->Patterns</para
-></listitem>
-<listitem
-><para
->Assertions</para
-></listitem>
-<listitem
-><para
->Quantifiers</para
-></listitem>
-<listitem
-><para
->Back references</para
-></listitem>
+<listitem><para>Patterns</para></listitem>
+<listitem><para>Assertions</para></listitem>
+<listitem><para>Quantifiers</para></listitem>
+<listitem><para>Back references</para></listitem>
 </itemizedlist>
 
-<para
->The caret (<literal
->^</literal
->) starting the expression is an assertion, being true only if the following matching string is at the start of a line.</para>
-
-<para
->The stings <literal
->[ \t]</literal
-> and <literal
->(Henrik|Pernille) sa(ys|id)</literal
-> are patterns. The first one is a <emphasis
->character class</emphasis
-> that matches either a blank or a (horizontal) tab character; the other pattern contains first a subpattern matching either <literal
->Henrik</literal
-> <emphasis
->or</emphasis
-> <literal
->Pernille</literal
->, then a piece matching the exact string <literal
-> sa</literal
-> and finally a subpattern matching either <literal
->ys</literal
-> <emphasis
->or</emphasis
-> <literal
->id</literal
-></para>
-
-<para
->The string <literal
->{0,4}</literal
-> is a quantifier saying <quote
->anywhere from 0 up to 4 of the previous</quote
->.</para>
-
-<para
->Because regular expression software supporting the concept of <emphasis
->back references</emphasis
-> saves the entire matching part of the string as well as sub-patterns enclosed in parentheses, given some means of access to those references, we could get our hands on either the whole match (when searching a text document in an editor with a regular expression, that is often marked as selected) or either the name found, or the last part of the verb.</para>
-
-<para
->All together, the expression will match where we wanted it to, and only there.</para>
-
-<para
->The following sections will describe in details how to construct and use patterns, character classes, assertions, quantifiers and back references, and the final section will give a few useful examples.</para>
+<para>The caret (<literal>^</literal>) starting the expression is an assertion, being true only if the following matching string is at the start of a line.</para>
+
+<para>The stings <literal>[ \t]</literal> and <literal>(Henrik|Pernille) sa(ys|id)</literal> are patterns. The first one is a <emphasis>character class</emphasis> that matches either a blank or a (horizontal) tab character; the other pattern contains first a subpattern matching either <literal>Henrik</literal> <emphasis>or</emphasis> <literal>Pernille</literal>, then a piece matching the exact string <literal> sa</literal> and finally a subpattern matching either <literal>ys</literal> <emphasis>or</emphasis> <literal>id</literal></para>
+
+<para>The string <literal>{0,4}</literal> is a quantifier saying <quote>anywhere from 0 up to 4 of the previous</quote>.</para>
+
+<para>Because regular expression software supporting the concept of <emphasis>back references</emphasis> saves the entire matching part of the string as well as sub-patterns enclosed in parentheses, given some means of access to those references, we could get our hands on either the whole match (when searching a text document in an editor with a regular expression, that is often marked as selected) or either the name found, or the last part of the verb.</para>
+
+<para>All together, the expression will match where we wanted it to, and only there.</para>
+
+<para>The following sections will describe in details how to construct and use patterns, character classes, assertions, quantifiers and back references, and the final section will give a few useful examples.</para>
 
 </sect1>
 
 <sect1 id="regex-patterns">
 
-<title
->Patterns</title>
+<title>Patterns</title>
 
-<para
->Patterns consists of literal strings and character classes. Patterns may contain sub-patterns, which are patterns enclosed in parentheses.</para>
+<para>Patterns consists of literal strings and character classes. Patterns may contain sub-patterns, which are patterns enclosed in parentheses.</para>
 
 <sect2>
-<title
->Escaping characters</title>
+<title>Escaping characters</title>
 
-<para
->In patterns as well as in character classes, some characters have a special meaning. To literally match any of those characters, they must be marked or <emphasis
->escaped</emphasis
-> to let the regular expression software know that it should interpret such characters in their literal meaning.</para>
+<para>In patterns as well as in character classes, some characters have a special meaning. To literally match any of those characters, they must be marked or <emphasis>escaped</emphasis> to let the regular expression software know that it should interpret such characters in their literal meaning.</para>
 
-<para
->This is done by prepending the character with a backslash (<literal
->\</literal
->).</para>
+<para>This is done by prepending the character with a backslash (<literal>\</literal>).</para>
 
 
-<para
->The regular expression software will silently ignore escaping a character that does not have any special meaning in the context, so escaping for example a <quote
->j</quote
-> (<userinput
->\j</userinput
->) is safe. If you are in doubt whether a character could have a special meaning, you can therefore escape it safely.</para>
+<para>The regular expression software will silently ignore escaping a character that does not have any special meaning in the context, so escaping for example a <quote>j</quote> (<userinput>\j</userinput>) is safe. If you are in doubt whether a character could have a special meaning, you can therefore escape it safely.</para>
 
-<para
->Escaping of cause includes the backslash character it self, to literally match a such, you would write <userinput
->\\</userinput
->.</para>
+<para>Escaping of cause includes the backslash character it self, to literally match a such, you would write <userinput>\\</userinput>.</para>
 
 </sect2>
 
 <sect2>
-<title
->Character Classes and abbreviations</title>
-
-<para
->A <emphasis
->character class</emphasis
-> is an expression that matches one of a defined set of characters. In Regular Expressions, character classes are defined by putting the legal characters for the class in square brackets, <literal
->[]</literal
->, or by using one of the abbreviated classes described below.</para>
-
-<para
->Simple character classes just contains one or more literal characters, for example <userinput
->[abc]</userinput
-> (matching either of the letters <quote
->a</quote
->, <quote
->b</quote
-> or <quote
->c</quote
->) or <userinput
->[0123456789]</userinput
-> (matching any digit).</para>
-
-<para
->Because letters and digits have a logical order, you can abbreviate those by specifying ranges of them: <userinput
->[a-c]</userinput
-> is equal to <userinput
->[abc]</userinput
-> and <userinput
->[0-9]</userinput
-> is equal to <userinput
->[0123456789]</userinput
->. Combining these constructs, for example <userinput
->[a-fynot1-38]</userinput
-> is completely legal (the last one would match, of cause, either of <quote
->a</quote
->,<quote
->b</quote
->,<quote
->c</quote
->,<quote
->d</quote
->, <quote
->e</quote
->,<quote
->f</quote
->,<quote
->y</quote
->,<quote
->n</quote
->,<quote
->o</quote
->,<quote
->t</quote
->, <quote
->1</quote
->,<quote
->2</quote
->,<quote
->3</quote
-> or <quote
->8</quote
->).</para>
-
-<para
->As capital letters are different characters from their non-capital equivalents, to create a caseless character class matching <quote
->a</quote
-> or <quote
->b</quote
->, in any case, you need to write it <userinput
->[aAbB]</userinput
->.</para>
-
-<para
->It is of cause possible to create a <quote
->negative</quote
-> class matching as <quote
->anything but</quote
-> To do so put a caret (<literal
->^</literal
->) at the beginning of the class: </para>
-
-<para
-><userinput
->[^abc]</userinput
-> will match any character <emphasis
->but</emphasis
-> <quote
->a</quote
->, <quote
->b</quote
-> or <quote
->c</quote
->.</para>
-
-<para
->In addition to literal characters, some abbreviations are defined, making life still a bit easier: <variablelist>
+<title>Character Classes and abbreviations</title>
+
+<para>A <emphasis>character class</emphasis> is an expression that matches one of a defined set of characters. In Regular Expressions, character classes are defined by putting the legal characters for the class in square brackets, <literal>[]</literal>, or by using one of the abbreviated classes described below.</para>
+
+<para>Simple character classes just contains one or more literal characters, for example <userinput>[abc]</userinput> (matching either of the letters <quote>a</quote>, <quote>b</quote> or <quote>c</quote>) or <userinput>[0123456789]</userinput> (matching any digit).</para>
+
+<para>Because letters and digits have a logical order, you can abbreviate those by specifying ranges of them: <userinput>[a-c]</userinput> is equal to <userinput>[abc]</userinput> and <userinput>[0-9]</userinput> is equal to <userinput>[0123456789]</userinput>. Combining these constructs, for example <userinput>[a-fynot1-38]</userinput> is completely legal (the last one would match, of cause, either of <quote>a</quote>,<quote>b</quote>,<quote>c</quote>,<quote>d</quote>, <quote>e</quote>,<quote>f</quote>,<quote>y</quote>,<quote>n</quote>,<quote>o</quote>,<quote>t</quote>, <quote>1</quote>,<quote>2</quote>,<quote>3</quote> or <quote>8</quote>).</para>
+
+<para>As capital letters are different characters from their non-capital equivalents, to create a caseless character class matching <quote>a</quote> or <quote>b</quote>, in any case, you need to write it <userinput>[aAbB]</userinput>.</para>
+
+<para>It is of cause possible to create a <quote>negative</quote> class matching as <quote>anything but</quote> To do so put a caret (<literal>^</literal>) at the beginning of the class: </para>
+
+<para><userinput>[^abc]</userinput> will match any character <emphasis>but</emphasis> <quote>a</quote>, <quote>b</quote> or <quote>c</quote>.</para>
+
+<para>In addition to literal characters, some abbreviations are defined, making life still a bit easier: <variablelist>
 
 <varlistentry>
-<term
-><userinput
->\a</userinput
-></term>
-<listitem
-><para
->This matches the <acronym
->ASCII</acronym
-> bell character (BEL, 0x07).</para
-></listitem>
+<term><userinput>\a</userinput></term>
+<listitem><para>This matches the <acronym>ASCII</acronym> bell character (BEL, 0x07).</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->\f</userinput
-></term>
-<listitem
-><para
->This matches the <acronym
->ASCII</acronym
-> form feed character (FF, 0x0C).</para
-></listitem>
+<term><userinput>\f</userinput></term>
+<listitem><para>This matches the <acronym>ASCII</acronym> form feed character (FF, 0x0C).</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->\n</userinput
-></term>
-<listitem
-><para
->This matches the <acronym
->ASCII</acronym
-> line feed character (LF, 0x0A, Unix newline).</para
-></listitem>
+<term><userinput>\n</userinput></term>
+<listitem><para>This matches the <acronym>ASCII</acronym> line feed character (LF, 0x0A, Unix newline).</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->\r</userinput
-></term>
-<listitem
-><para
->This matches the <acronym
->ASCII</acronym
-> carriage return character (CR, 0x0D).</para
-></listitem>
+<term><userinput>\r</userinput></term>
+<listitem><para>This matches the <acronym>ASCII</acronym> carriage return character (CR, 0x0D).</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->\t</userinput
-></term>
-<listitem
-><para
->This matches the <acronym
->ASCII</acronym
-> horizontal tab character (HT, 0x09).</para
-></listitem>
+<term><userinput>\t</userinput></term>
+<listitem><para>This matches the <acronym>ASCII</acronym> horizontal tab character (HT, 0x09).</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->\v</userinput
-></term>
-<listitem
-><para
->This matches the <acronym
->ASCII</acronym
-> vertical tab character (VT, 0x0B).</para
-></listitem>
+<term><userinput>\v</userinput></term>
+<listitem><para>This matches the <acronym>ASCII</acronym> vertical tab character (VT, 0x0B).</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><userinput
->\xhhhh</userinput
-></term>
-
-<listitem
-><para
->This matches the Unicode character corresponding to the hexadecimal number hhhh (between 0x0000 and 0xFFFF). \0ooo (&ie;, \zero ooo) matches the <acronym
->ASCII</acronym
->/Latin-1 character corresponding to the octal number ooo (between 0 and 0377).</para
-></listitem>
+<term><userinput>\xhhhh</userinput></term>
+
+<listitem><para>This matches the Unicode character corresponding to the hexadecimal number hhhh (between 0x0000 and 0xFFFF). \0ooo (&ie;, \zero ooo) matches the <acronym>ASCII</acronym>/Latin-1 character corresponding to the octal number ooo (between 0 and 0377).</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->.</userinput
-> (dot)</term>
-<listitem
-><para
->This matches any character (including newline).</para
-></listitem>
+<term><userinput>.</userinput> (dot)</term>
+<listitem><para>This matches any character (including newline).</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->\d</userinput
-></term>
-<listitem
-><para
->This matches a digit. Equal to <literal
->[0-9]</literal
-></para
-></listitem>
+<term><userinput>\d</userinput></term>
+<listitem><para>This matches a digit. Equal to <literal>[0-9]</literal></para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->\D</userinput
-></term>
-<listitem
-><para
->This matches a non-digit. Equal to <literal
->[^0-9]</literal
-> or <literal
->[^\d]</literal
-></para
-></listitem>
+<term><userinput>\D</userinput></term>
+<listitem><para>This matches a non-digit. Equal to <literal>[^0-9]</literal> or <literal>[^\d]</literal></para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->\s</userinput
-></term>
-<listitem
-><para
->This matches a whitespace character. Practically equal to <literal
->[ \t\n\r]</literal
-></para
-></listitem>
+<term><userinput>\s</userinput></term>
+<listitem><para>This matches a whitespace character. Practically equal to <literal>[ \t\n\r]</literal></para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->\S</userinput
-></term>
-<listitem
-><para
->This matches a non-whitespace. Practically equal to <literal
->[^ \t\r\n]</literal
->, and equal to <literal
->[^\s]</literal
-></para
-></listitem>
+<term><userinput>\S</userinput></term>
+<listitem><para>This matches a non-whitespace. Practically equal to <literal>[^ \t\r\n]</literal>, and equal to <literal>[^\s]</literal></para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->\w</userinput
-></term>
-<listitem
-><para
->Matches any <quote
->word character</quote
-> - in this case any letter or digit. Note that underscore (<literal
->_</literal
->) is not matched, as is the case with perl regular expressions. Equal to <literal
->[a-zA-Z0-9]</literal
-></para
-></listitem>
+<term><userinput>\w</userinput></term>
+<listitem><para>Matches any <quote>word character</quote> - in this case any letter or digit. Note that underscore (<literal>_</literal>) is not matched, as is the case with perl regular expressions. Equal to <literal>[a-zA-Z0-9]</literal></para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->\W</userinput
-></term>
-<listitem
-><para
->Matches any non-word character - anything but letters or numbers. Equal to <literal
->[^a-zA-Z0-9]</literal
-> or <literal
->[^\w]</literal
-></para
-></listitem>
+<term><userinput>\W</userinput></term>
+<listitem><para>Matches any non-word character - anything but letters or numbers. Equal to <literal>[^a-zA-Z0-9]</literal> or <literal>[^\w]</literal></para></listitem>
 </varlistentry>
 
 
@@ -493,69 +164,31 @@ expressions of perl, nor with those of for example
 
 </para>
 
-<para
->The abbreviated classes can be put inside a custom class, for example to match a word character, a blank or a dot, you could write <userinput
->[\w \.]</userinput
-></para
-> 
+<para>The abbreviated classes can be put inside a custom class, for example to match a word character, a blank or a dot, you could write <userinput>[\w \.]</userinput></para> 
 
-<note
-> <para
->The POSIX notation of classes, <userinput
->[:&lt;class name&gt;:]</userinput
-> is currently not supported.</para
-> </note>
+<note> <para>The POSIX notation of classes, <userinput>[:&lt;class name&gt;:]</userinput> is currently not supported.</para> </note>
 
 <sect3>
-<title
->Characters with special meanings inside character classes</title>
+<title>Characters with special meanings inside character classes</title>
 
-<para
->The following characters has a special meaning inside the <quote
->[]</quote
-> character class construct, and must be escaped to be literally included in a class:</para>
+<para>The following characters has a special meaning inside the <quote>[]</quote> character class construct, and must be escaped to be literally included in a class:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><userinput
->]</userinput
-></term>
-<listitem
-><para
->Ends the character class. Must be escaped unless it is the very first character in the class (may follow an unescaped caret)</para
-></listitem>
+<term><userinput>]</userinput></term>
+<listitem><para>Ends the character class. Must be escaped unless it is the very first character in the class (may follow an unescaped caret)</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><userinput
->^</userinput
-> (caret)</term>
-<listitem
-><para
->Denotes a negative class, if it is the first character. Must be escaped to match literally if it is the first character in the class.</para
-></listitem
-> 
+<term><userinput>^</userinput> (caret)</term>
+<listitem><para>Denotes a negative class, if it is the first character. Must be escaped to match literally if it is the first character in the class.</para></listitem> 
 </varlistentry>
 <varlistentry>
-<term
-><userinput
->-</userinput
-> (dash)</term>
-<listitem
-><para
->Denotes a logical range. Must always be escaped within a character class.</para
-></listitem>
+<term><userinput>-</userinput> (dash)</term>
+<listitem><para>Denotes a logical range. Must always be escaped within a character class.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><userinput
->\</userinput
-> (backslash)</term>
-<listitem
-><para
->The escape character. Must always be escaped.</para
-></listitem>
+<term><userinput>\</userinput> (backslash)</term>
+<listitem><para>The escape character. Must always be escaped.</para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -566,240 +199,110 @@ expressions of perl, nor with those of for example
 
 <sect2>
 
-<title
->Alternatives: matching <quote
->one of</quote
-></title>
-
-<para
->If you want to match one of a set of alternative patterns, you can separate those with <literal
->|</literal
-> (vertical bar character).</para>
-
-<para
->For example to find either <quote
->John</quote
-> or <quote
->Harry</quote
-> you would use an expression <userinput
->John|Harry</userinput
->.</para>
+<title>Alternatives: matching <quote>one of</quote></title>
+
+<para>If you want to match one of a set of alternative patterns, you can separate those with <literal>|</literal> (vertical bar character).</para>
+
+<para>For example to find either <quote>John</quote> or <quote>Harry</quote> you would use an expression <userinput>John|Harry</userinput>.</para>
 
 </sect2>
 
 <sect2>
 
-<title
->Sub Patterns</title>
+<title>Sub Patterns</title>
 
-<para
-><emphasis
->Sub patterns</emphasis
-> are patterns enclosed in parentheses, and they have several uses in the world of regular expressions.</para>
+<para><emphasis>Sub patterns</emphasis> are patterns enclosed in parentheses, and they have several uses in the world of regular expressions.</para>
 
 <sect3>
 
-<title
->Specifying alternatives</title>
-
-<para
->You may use a sub pattern to group a set of alternatives within a larger pattern. The alternatives are separated by the character <quote
->|</quote
-> (vertical bar).</para>
-
-<para
->For example to match either of the words <quote
->int</quote
->, <quote
->float</quote
-> or <quote
->double</quote
->, you could use the pattern <userinput
->int|float|double</userinput
->. If you only want to find one if it is followed by some whitespace and then some letters, put the alternatives inside a subpattern: <userinput
->(int|float|double)\s+\w+</userinput
->.</para>
+<title>Specifying alternatives</title>
+
+<para>You may use a sub pattern to group a set of alternatives within a larger pattern. The alternatives are separated by the character <quote>|</quote> (vertical bar).</para>
+
+<para>For example to match either of the words <quote>int</quote>, <quote>float</quote> or <quote>double</quote>, you could use the pattern <userinput>int|float|double</userinput>. If you only want to find one if it is followed by some whitespace and then some letters, put the alternatives inside a subpattern: <userinput>(int|float|double)\s+\w+</userinput>.</para>
 
 </sect3>
 
 <sect3>
 
-<title
->Capturing matching text (back references)</title>
-
-<para
->If you want to use a back reference, use a sub pattern to have the desired part of the pattern remembered.</para>
-
-<para
->For example, it you want to find two occurrences of the same word separated by a comma and possibly some whitespace, you could write <userinput
->(\w+),\s*\1</userinput
->. The sub pattern <literal
->\w+</literal
-> would find a chunk of word characters, and the entire expression would match if those were followed by a comma, 0 or more whitespace and then an equal chunk of word characters. (The string <literal
->\1</literal
-> references <emphasis
->the first sub pattern enclosed in parentheses</emphasis
->)</para>
-
-<!-- <para
->See also <link linkend="backreferences"
->Back references</link
->.</para
-> -->
+<title>Capturing matching text (back references)</title>
+
+<para>If you want to use a back reference, use a sub pattern to have the desired part of the pattern remembered.</para>
+
+<para>For example, it you want to find two occurrences of the same word separated by a comma and possibly some whitespace, you could write <userinput>(\w+),\s*\1</userinput>. The sub pattern <literal>\w+</literal> would find a chunk of word characters, and the entire expression would match if those were followed by a comma, 0 or more whitespace and then an equal chunk of word characters. (The string <literal>\1</literal> references <emphasis>the first sub pattern enclosed in parentheses</emphasis>)</para>
+
+<!-- <para>See also <link linkend="backreferences">Back references</link>.</para> -->
 
 </sect3>
 
 <sect3 id="lookahead-assertions">
-<title
->Lookahead Assertions</title>
-
-<para
->A lookahead assertion is a sub pattern, starting with either <literal
->?=</literal
-> or <literal
->?!</literal
->.</para>
-
-<para
->For example to match the literal string <quote
->Bill</quote
-> but only if not followed by <quote
-> Gates</quote
->, you could use this expression: <userinput
->Bill(?! Gates)</userinput
->. (This would find <quote
->Bill Clinton</quote
-> as well as <quote
->Billy the kid</quote
->, but silently ignore the other matches.)</para>
-
-<para
->Sub patterns used for assertions are not captured.</para>
-
-<para
->See also <link linkend="assertions"
->Assertions</link
-></para>
+<title>Lookahead Assertions</title>
+
+<para>A lookahead assertion is a sub pattern, starting with either <literal>?=</literal> or <literal>?!</literal>.</para>
+
+<para>For example to match the literal string <quote>Bill</quote> but only if not followed by <quote> Gates</quote>, you could use this expression: <userinput>Bill(?! Gates)</userinput>. (This would find <quote>Bill Clinton</quote> as well as <quote>Billy the kid</quote>, but silently ignore the other matches.)</para>
+
+<para>Sub patterns used for assertions are not captured.</para>
+
+<para>See also <link linkend="assertions">Assertions</link></para>
 
 </sect3>
 
 </sect2>
 
 <sect2 id="special-characters-in-patterns">
-<title
->Characters with a special meaning inside patterns</title>
+<title>Characters with a special meaning inside patterns</title>
 
-<para
->The following characters have meaning inside a pattern, and must be escaped if you want to literally match them: <variablelist>
+<para>The following characters have meaning inside a pattern, and must be escaped if you want to literally match them: <variablelist>
 
 <varlistentry>
-<term
-><userinput
->\</userinput
-> (backslash)</term>
-<listitem
-><para
->The escape character.</para
-></listitem>
+<term><userinput>\</userinput> (backslash)</term>
+<listitem><para>The escape character.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->^</userinput
-> (caret)</term>
-<listitem
-><para
->Asserts the beginning of the string.</para
-></listitem>
+<term><userinput>^</userinput> (caret)</term>
+<listitem><para>Asserts the beginning of the string.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->$</userinput
-></term>
-<listitem
-><para
->Asserts the end of string.</para
-></listitem>
+<term><userinput>$</userinput></term>
+<listitem><para>Asserts the end of string.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->()</userinput
-> (left and right parentheses)</term>
-<listitem
-><para
->Denotes sub patterns.</para
-></listitem>
+<term><userinput>()</userinput> (left and right parentheses)</term>
+<listitem><para>Denotes sub patterns.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->{}</userinput
-> (left and right curly braces)</term>
-<listitem
-><para
->Denotes numeric quantifiers.</para
-></listitem>
+<term><userinput>{}</userinput> (left and right curly braces)</term>
+<listitem><para>Denotes numeric quantifiers.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->[]</userinput
-> (left and right square brackets)</term>
-<listitem
-><para
->Denotes character classes.</para
-></listitem>
+<term><userinput>[]</userinput> (left and right square brackets)</term>
+<listitem><para>Denotes character classes.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->|</userinput
-> (vertical bar)</term>
-<listitem
-><para
->logical OR. Separates alternatives.</para
-></listitem>
+<term><userinput>|</userinput> (vertical bar)</term>
+<listitem><para>logical OR. Separates alternatives.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->+</userinput
-> (plus sign)</term>
-<listitem
-><para
->Quantifier, 1 or more.</para
-></listitem>
+<term><userinput>+</userinput> (plus sign)</term>
+<listitem><para>Quantifier, 1 or more.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->*</userinput
-> (asterisk)</term>
-<listitem
-><para
->Quantifier, 0 or more.</para
-></listitem>
+<term><userinput>*</userinput> (asterisk)</term>
+<listitem><para>Quantifier, 0 or more.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->?</userinput
-> (question mark)</term>
-<listitem
-><para
->An optional character. Can be interpreted as a quantifier, 0 or 1.</para
-></listitem>
+<term><userinput>?</userinput> (question mark)</term>
+<listitem><para>An optional character. Can be interpreted as a quantifier, 0 or 1.</para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -811,125 +314,58 @@ expressions of perl, nor with those of for example
 </sect1>
 
 <sect1 id="quantifiers">
-<title
->Quantifiers</title>
-
-<para
-><emphasis
->Quantifiers</emphasis
-> allows a regular expression to match a specified number or range of numbers of either a character, character class or sub pattern.</para>
-
-<para
->Quantifiers are enclosed in curly brackets (<literal
->{</literal
-> and <literal
->}</literal
->) and have the general form <literal
->{[minimum-occurrences][,[maximum-occurrences]]}</literal
-> </para>
-
-<para
->The usage is best explained by example: <variablelist>
+<title>Quantifiers</title>
+
+<para><emphasis>Quantifiers</emphasis> allows a regular expression to match a specified number or range of numbers of either a character, character class or sub pattern.</para>
+
+<para>Quantifiers are enclosed in curly brackets (<literal>{</literal> and <literal>}</literal>) and have the general form <literal>{[minimum-occurrences][,[maximum-occurrences]]}</literal> </para>
+
+<para>The usage is best explained by example: <variablelist>
 
 <varlistentry>
-<term
-><userinput
->{1}</userinput
-></term>
-<listitem
-><para
->Exactly 1 occurrence</para
-></listitem>
+<term><userinput>{1}</userinput></term>
+<listitem><para>Exactly 1 occurrence</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->{0,1}</userinput
-></term>
-<listitem
-><para
->Zero or 1 occurrences</para
-></listitem>
+<term><userinput>{0,1}</userinput></term>
+<listitem><para>Zero or 1 occurrences</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->{,1}</userinput
-></term>
-<listitem
-><para
->The same, with less work;)</para
-></listitem>
+<term><userinput>{,1}</userinput></term>
+<listitem><para>The same, with less work;)</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->{5,10}</userinput
-></term>
-<listitem
-><para
->At least 5 but maximum 10 occurrences.</para
-></listitem>
+<term><userinput>{5,10}</userinput></term>
+<listitem><para>At least 5 but maximum 10 occurrences.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->{5,}</userinput
-></term>
-<listitem
-><para
->At least 5 occurrences, no maximum.</para
-></listitem>
+<term><userinput>{5,}</userinput></term>
+<listitem><para>At least 5 occurrences, no maximum.</para></listitem>
 </varlistentry>
 
 </variablelist>
 
 </para>
 
-<para
->Additionally, there are some abbreviations: <variablelist>
+<para>Additionally, there are some abbreviations: <variablelist>
 
 <varlistentry>
-<term
-><userinput
->*</userinput
-> (asterisk)</term>
-<listitem
-><para
->similar to <literal
->{0,}</literal
->, find any number of occurrences.</para
-></listitem>
+<term><userinput>*</userinput> (asterisk)</term>
+<listitem><para>similar to <literal>{0,}</literal>, find any number of occurrences.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->+</userinput
-> (plus sign)</term>
-<listitem
-><para
->similar to <literal
->{1,}</literal
->, at least 1 occurrence.</para
-></listitem>
+<term><userinput>+</userinput> (plus sign)</term>
+<listitem><para>similar to <literal>{1,}</literal>, at least 1 occurrence.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->?</userinput
-> (question mark)</term>
-<listitem
-><para
->similar to <literal
->{0,1}</literal
->, zero or 1 occurrence.</para
-></listitem>
+<term><userinput>?</userinput> (question mark)</term>
+<listitem><para>similar to <literal>{0,1}</literal>, zero or 1 occurrence.</para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -938,98 +374,39 @@ expressions of perl, nor with those of for example
 
 <sect2>
 
-<title
->Greed</title>
+<title>Greed</title>
 
-<para
->When using quantifiers with no maximum, regular expressions defaults to match as much of the searched string as possible, commonly known as <emphasis
->greedy</emphasis
-> behaviour.</para>
+<para>When using quantifiers with no maximum, regular expressions defaults to match as much of the searched string as possible, commonly known as <emphasis>greedy</emphasis> behaviour.</para>
 
-<para
->Modern regular expression software provides the means of <quote
->turning off greediness</quote
->, though in a graphical environment it is up to the interface to provide you with access to this feature. For example a search dialogue providing a regular expression search could have a check box labelled <quote
->Minimal matching</quote
-> as well as it ought to indicate if greediness is the default behaviour.</para>
+<para>Modern regular expression software provides the means of <quote>turning off greediness</quote>, though in a graphical environment it is up to the interface to provide you with access to this feature. For example a search dialogue providing a regular expression search could have a check box labelled <quote>Minimal matching</quote> as well as it ought to indicate if greediness is the default behaviour.</para>
 
 </sect2>
 
 <sect2>
-<title
->In context examples</title>
+<title>In context examples</title>
 
-<para
->Here are a few examples of using quantifiers</para>
+<para>Here are a few examples of using quantifiers</para>
 
 <variablelist>
 
 <varlistentry>
-<term
-><userinput
->^\d{4,5}\s</userinput
-></term>
-<listitem
-><para
->Matches the digits in <quote
->1234 go</quote
-> and <quote
->12345 now</quote
->, but neither in <quote
->567 eleven</quote
-> nor in <quote
->223459 somewhere</quote
-></para
-></listitem>
+<term><userinput>^\d{4,5}\s</userinput></term>
+<listitem><para>Matches the digits in <quote>1234 go</quote> and <quote>12345 now</quote>, but neither in <quote>567 eleven</quote> nor in <quote>223459 somewhere</quote></para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->\s+</userinput
-></term>
-<listitem
-><para
->Matches one or more whitespace characters</para
-></listitem>
+<term><userinput>\s+</userinput></term>
+<listitem><para>Matches one or more whitespace characters</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->(bla){1,}</userinput
-></term>
-<listitem
-><para
->Matches all of <quote
->blablabla</quote
-> and the <quote
->bla</quote
-> in <quote
->blackbird</quote
-> or <quote
->tabla</quote
-></para
-></listitem>
+<term><userinput>(bla){1,}</userinput></term>
+<listitem><para>Matches all of <quote>blablabla</quote> and the <quote>bla</quote> in <quote>blackbird</quote> or <quote>tabla</quote></para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->/?&gt;</userinput
-></term>
-<listitem
-><para
->Matches <quote
->/&gt;</quote
-> in <quote
->&lt;closeditem/&gt;</quote
-> as well as <quote
->&gt;</quote
-> in <quote
->&lt;openitem&gt;</quote
->.</para
-></listitem>
+<term><userinput>/?&gt;</userinput></term>
+<listitem><para>Matches <quote>/&gt;</quote> in <quote>&lt;closeditem/&gt;</quote> as well as <quote>&gt;</quote> in <quote>&lt;openitem&gt;</quote>.</para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -1039,164 +416,56 @@ expressions of perl, nor with those of for example
 </sect1>
 
 <sect1 id="assertions">
-<title
->Assertions</title>
-
-<para
-><emphasis
->Assertions</emphasis
-> allows a regular expression to match only under certain controlled conditions.</para>
-
-<para
->An assertion does not need a character to match, it rather investigates the surroundings of a possible match before acknowledging it. For example the <emphasis
->word boundary</emphasis
-> assertion does not try to find a non word character opposite a word one at its position, instead it makes sure that there is not a word character. This means that the assertion can match where there is no character, &ie; at the ends of a searched string.</para>
-
-<para
->Some assertions actually does have a pattern to match, but the part of the string matching that will not be a part of the result of the match of the full expression.</para>
-
-<para
->Regular Expressions as documented here supports the following assertions: <variablelist>
-
-<varlistentry
-> 
-<term
-><userinput
->^</userinput
-> (caret: beginning of string)</term
-> 
-<listitem
-><para
->Matches the beginning of the searched string.</para
-> <para
->The expression <userinput
->^Peter</userinput
-> will match at <quote
->Peter</quote
-> in the string <quote
->Peter, hey!</quote
-> but not in <quote
->Hey, Peter!</quote
-> </para
-> </listitem>
+<title>Assertions</title>
+
+<para><emphasis>Assertions</emphasis> allows a regular expression to match only under certain controlled conditions.</para>
+
+<para>An assertion does not need a character to match, it rather investigates the surroundings of a possible match before acknowledging it. For example the <emphasis>word boundary</emphasis> assertion does not try to find a non word character opposite a word one at its position, instead it makes sure that there is not a word character. This means that the assertion can match where there is no character, &ie; at the ends of a searched string.</para>
+
+<para>Some assertions actually does have a pattern to match, but the part of the string matching that will not be a part of the result of the match of the full expression.</para>
+
+<para>Regular Expressions as documented here supports the following assertions: <variablelist>
+
+<varlistentry> 
+<term><userinput>^</userinput> (caret: beginning of string)</term> 
+<listitem><para>Matches the beginning of the searched string.</para> <para>The expression <userinput>^Peter</userinput> will match at <quote>Peter</quote> in the string <quote>Peter, hey!</quote> but not in <quote>Hey, Peter!</quote> </para> </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->$</userinput
-> (end of string)</term>
-<listitem
-><para
->Matches the end of the searched string.</para>
-
-<para
->The expression <userinput
->you\?$</userinput
-> will match at the last you in the string <quote
->You didn't do that, did you?</quote
-> but nowhere in <quote
->You didn't do that, right?</quote
-></para>
+<term><userinput>$</userinput> (end of string)</term>
+<listitem><para>Matches the end of the searched string.</para>
+
+<para>The expression <userinput>you\?$</userinput> will match at the last you in the string <quote>You didn't do that, did you?</quote> but nowhere in <quote>You didn't do that, right?</quote></para>
 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->\b</userinput
-> (word boundary)</term>
-<listitem
-><para
->Matches if there is a word character at one side and not a word character at the other.</para>
-<para
->This is useful to find word ends, for example both ends to find a whole word. The expression <userinput
->\bin\b</userinput
-> will match at the separate <quote
->in</quote
-> in the string <quote
->He came in through the window</quote
->, but not at the <quote
->in</quote
-> in <quote
->window</quote
->.</para
-></listitem>
+<term><userinput>\b</userinput> (word boundary)</term>
+<listitem><para>Matches if there is a word character at one side and not a word character at the other.</para>
+<para>This is useful to find word ends, for example both ends to find a whole word. The expression <userinput>\bin\b</userinput> will match at the separate <quote>in</quote> in the string <quote>He came in through the window</quote>, but not at the <quote>in</quote> in <quote>window</quote>.</para></listitem>
 
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->\B</userinput
-> (non word boundary)</term>
-<listitem
-><para
->Matches wherever <quote
->\b</quote
-> does not.</para>
-<para
->That means that it will match for example within words: The expression <userinput
->\Bin\B</userinput
-> will match at in <quote
->window</quote
-> but not in <quote
->integer</quote
-> or <quote
->I'm in love</quote
->.</para>
+<term><userinput>\B</userinput> (non word boundary)</term>
+<listitem><para>Matches wherever <quote>\b</quote> does not.</para>
+<para>That means that it will match for example within words: The expression <userinput>\Bin\B</userinput> will match at in <quote>window</quote> but not in <quote>integer</quote> or <quote>I'm in love</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->(?=PATTERN)</userinput
-> (Positive lookahead)</term>
-<listitem
-><para
->A lookahead assertion looks at the part of the string following a possible match. The positive lookahead will prevent the string from matching if the text following the possible match does not match the <emphasis
->PATTERN</emphasis
-> of the assertion, but the text matched by that will not be included in the result.</para>
-<para
->The expression <userinput
->handy(?=\w)</userinput
-> will match at <quote
->handy</quote
-> in <quote
->handyman</quote
-> but not in <quote
->That came in handy!</quote
-></para>
+<term><userinput>(?=PATTERN)</userinput> (Positive lookahead)</term>
+<listitem><para>A lookahead assertion looks at the part of the string following a possible match. The positive lookahead will prevent the string from matching if the text following the possible match does not match the <emphasis>PATTERN</emphasis> of the assertion, but the text matched by that will not be included in the result.</para>
+<para>The expression <userinput>handy(?=\w)</userinput> will match at <quote>handy</quote> in <quote>handyman</quote> but not in <quote>That came in handy!</quote></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->(?!PATTERN)</userinput
-> (Negative lookahead)</term>
-
-<listitem
-><para
->The negative lookahead prevents a possible match to be acknowledged if the following part of the searched string does match its <emphasis
->PATTERN</emphasis
->.</para>
-<para
->The expression <userinput
->const \w+\b(?!\s*&amp;)</userinput
-> will match at <quote
->const char</quote
-> in the string <quote
->const char* foo</quote
-> while it can not match <quote
->const QString</quote
-> in <quote
->const QString&amp; bar</quote
-> because the <quote
->&amp;</quote
-> matches the negative lookahead assertion pattern.</para>
+<term><userinput>(?!PATTERN)</userinput> (Negative lookahead)</term>
+
+<listitem><para>The negative lookahead prevents a possible match to be acknowledged if the following part of the searched string does match its <emphasis>PATTERN</emphasis>.</para>
+<para>The expression <userinput>const \w+\b(?!\s*&amp;)</userinput> will match at <quote>const char</quote> in the string <quote>const char* foo</quote> while it can not match <quote>const QString</quote> in <quote>const QString&amp; bar</quote> because the <quote>&amp;</quote> matches the negative lookahead assertion pattern.</para>
 </listitem>
 </varlistentry>
 
@@ -1208,11 +477,9 @@ expressions of perl, nor with those of for example
 
 <!-- TODO sect1 id="backreferences">
 
-<title
->Back References</title>
+<title>Back References</title>
 
-<para
-></para>
+<para></para>
 
 </sect1 -->
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/arts/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/arts/index.docbook
index 7e2945de9fb..d6dc0909822 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/arts/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/arts/index.docbook
@@ -3,292 +3,140 @@
 "dtd/kdex.dtd" [
  <!ENTITY midi-kcontrol SYSTEM "midi.docbook">
  <!ENTITY % addindex "IGNORE">
- <!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+ <!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Mike.McBride;</author>
-<author
->&Jost.Schenck;</author>
+<author>&Mike.McBride;</author>
+<author>&Jost.Schenck;</author>
 
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2003-04-01</date>
-<releaseinfo
->3.2</releaseinfo>
+<date>2003-04-01</date>
+<releaseinfo>3.2</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->sound server</keyword>
-<keyword
->sound</keyword>
-<keyword
->aRts</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>sound server</keyword>
+<keyword>sound</keyword>
+<keyword>aRts</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="sndserver">
-<title
->Sound System</title>
+<title>Sound System</title>
 
-<para
->This control module is used to configure the settings for the &arts; sound server (the &kde; sound server).</para>
+<para>This control module is used to configure the settings for the &arts; sound server (the &kde; sound server).</para>
 
 <sect2 id="sndserver-general">
-<title
->&arts;</title>
+<title>&arts;</title>
 
-<para
->The top option, labelled <guilabel
->Start aRts soundserver on KDE startup</guilabel
->, enables (or disables) the &arts; sound server.</para>
+<para>The top option, labelled <guilabel>Start aRts soundserver on KDE startup</guilabel>, enables (or disables) the &arts; sound server.</para>
 
 <tip>
-<para
->You can find out more about &arts; in general by typing <userinput
->help:/artsbuilder</userinput
-> into the &konqueror; location bar, or by finding the &arts-builder; documentation in &khelpcenter;. </para>
+<para>You can find out more about &arts; in general by typing <userinput>help:/artsbuilder</userinput> into the &konqueror; location bar, or by finding the &arts-builder; documentation in &khelpcenter;. </para>
 </tip>
 
-<para
->The rest of the panel consists of options for the &arts; sound server.</para>
+<para>The rest of the panel consists of options for the &arts; sound server.</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Enable network transparency</guilabel
-></term>
+<term><guilabel>Enable network transparency</guilabel></term>
 <listitem>
-<para
->If this option is enabled, then sound requests from the network will be honoured by the sound server. If this option is disabled, the sound server will only honour requests from the local computer.</para>
+<para>If this option is enabled, then sound requests from the network will be honoured by the sound server. If this option is disabled, the sound server will only honour requests from the local computer.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Exchange security and reference info over the X11 server</guilabel
-></term>
-<listitem
-><para
->If you have enabled network transparency, this option will allow the exchange of security and reference information. If in doubt, and you have enabled network transparency, this option should be checked.</para
-></listitem
-> 
+<term><guilabel>Exchange security and reference info over the X11 server</guilabel></term>
+<listitem><para>If you have enabled network transparency, this option will allow the exchange of security and reference information. If in doubt, and you have enabled network transparency, this option should be checked.</para></listitem> 
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Run soundserver with realtime priority</guilabel
-></term>
-<listitem
-><para
->Enabling this option will give the sound server priority over other applications, which will help alleviate any problems delivering uninterrupted sound.</para>
-<note
-><para
->This option may require permissions you do not have as a regular user.</para>
-<para
->This option also relies on certain real time support from your system which may not be available.</para>
-<para
->If you do not have the necessary permissions, or your system does not have the real time support necessary, enabling this option will not cause problems.</para
-></note
-></listitem>
+<term><guilabel>Run soundserver with realtime priority</guilabel></term>
+<listitem><para>Enabling this option will give the sound server priority over other applications, which will help alleviate any problems delivering uninterrupted sound.</para>
+<note><para>This option may require permissions you do not have as a regular user.</para>
+<para>This option also relies on certain real time support from your system which may not be available.</para>
+<para>If you do not have the necessary permissions, or your system does not have the real time support necessary, enabling this option will not cause problems.</para></note></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Autosuspend if idle for:</guilabel
-></term>
+<term><guilabel>Autosuspend if idle for:</guilabel></term>
 <listitem>
-<para
->Normally &arts; locks the sound card device, so that other applications cannot use it. If you enable this option, then if &arts; has been idle for the amount of time you set, it will suspend itself, allowing any application access to the sound hardware. If &arts; receives another request, it will unsuspend, and continue as normal. Enabling this option may cause a small delay when you start an &arts; application.</para>
+<para>Normally &arts; locks the sound card device, so that other applications cannot use it. If you enable this option, then if &arts; has been idle for the amount of time you set, it will suspend itself, allowing any application access to the sound hardware. If &arts; receives another request, it will unsuspend, and continue as normal. Enabling this option may cause a small delay when you start an &arts; application.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Display messages using:</guilabel
-></term>
+<term><guilabel>Display messages using:</guilabel></term>
 <listitem>
-<para
->The application that will be used to display messages from the &arts; server. The default is <application
->artsmessage</application
-> and this should probably not be changed unless you have thoroughly read the &arts; documentation.</para>
+<para>The application that will be used to display messages from the &arts; server. The default is <application>artsmessage</application> and this should probably not be changed unless you have thoroughly read the &arts; documentation.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Message Display</guilabel
-></term>
+<term><guilabel>Message Display</guilabel></term>
 <listitem>
-<para
->You can select how detailed the messages are that &arts; displays to you. You can choose to see only error messages, debug messages that are useful to the developers (you probably only want that level if you are a developer, or one has asked you to set this). Or you can choose to see generally informational messages when &arts; is doing something such as suspending itself. </para>
+<para>You can select how detailed the messages are that &arts; displays to you. You can choose to see only error messages, debug messages that are useful to the developers (you probably only want that level if you are a developer, or one has asked you to set this). Or you can choose to see generally informational messages when &arts; is doing something such as suspending itself. </para>
 </listitem>
 </varlistentry>
 
 </variablelist>
 
-<para
->At the bottom of this page is a button that allows you to <guibutton
->Test Sound</guibutton
->.</para>
+<para>At the bottom of this page is a button that allows you to <guibutton>Test Sound</guibutton>.</para>
 
 </sect2>
 
 <sect2 id="sndserver-soundio">
-<title
->Sound I/O</title>
+<title>Sound I/O</title>
 
-<para
->I/O means Input and Output, and this panel allows you to configure how &kde; and &arts; interact with your sound hardware.</para>
+<para>I/O means Input and Output, and this panel allows you to configure how &kde; and &arts; interact with your sound hardware.</para>
 
-<para
->The first option you can configure in the <guilabel
->Sound I/O</guilabel
-> panel is the <guilabel
->Sound I/O method:</guilabel
->. It tells &arts; which sound system to use for input and output of sound. Current choices are <acronym
->ALSA</acronym
-> (Advanced &Linux; Sound Architecture), <acronym
->OSS</acronym
-> (Open Sound System), <acronym
->ESD</acronym
-> (Enlightenment Sound Daemon), no audio at all and autodetect. In most cases <quote
->Autodetect</quote
-> will be perfect for you.</para>
+<para>The first option you can configure in the <guilabel>Sound I/O</guilabel> panel is the <guilabel>Sound I/O method:</guilabel>. It tells &arts; which sound system to use for input and output of sound. Current choices are <acronym>ALSA</acronym> (Advanced &Linux; Sound Architecture), <acronym>OSS</acronym> (Open Sound System), <acronym>ESD</acronym> (Enlightenment Sound Daemon), no audio at all and autodetect. In most cases <quote>Autodetect</quote> will be perfect for you.</para>
 
-<para
->Other options are:</para>
+<para>Other options are:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Enable full duplex operation</guilabel
-></term>
-<listitem
-><para
->This option allows the sound server to play and record sound at the same time. This option should be enabled if you use applications (such as Internet telephones) which require simultaneous record and playback.</para
-></listitem>
+<term><guilabel>Enable full duplex operation</guilabel></term>
+<listitem><para>This option allows the sound server to play and record sound at the same time. This option should be enabled if you use applications (such as Internet telephones) which require simultaneous record and playback.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Use custom sound device:</guilabel
-></term>
+<term><guilabel>Use custom sound device:</guilabel></term>
 <listitem>
-<para
->Normally, the sound server defaults to using the device called <filename class="devicefile"
->/dev/dsp</filename
-> for sound output. This should work in most cases. An exception is, for instance, if you are using devfs, then you should use <filename class="devicefile"
->/dev/sound/dsp</filename
-> instead. Other alternatives are things like <filename class="devicefile"
->/dev/dsp0</filename
-> or <filename class="devicefile"
->/dev/dsp1</filename
-> if you have a soundcard that supports multiple outputs or you have multiple soundcards.</para>
+<para>Normally, the sound server defaults to using the device called <filename class="devicefile">/dev/dsp</filename> for sound output. This should work in most cases. An exception is, for instance, if you are using devfs, then you should use <filename class="devicefile">/dev/sound/dsp</filename> instead. Other alternatives are things like <filename class="devicefile">/dev/dsp0</filename> or <filename class="devicefile">/dev/dsp1</filename> if you have a soundcard that supports multiple outputs or you have multiple soundcards.</para>
 <tip>
-<para
->If you often use non-&arts; aware applications, and you have a soundcard that supports it, try setting &arts; to use a different device than <filename class="devicefile"
->/dev/dsp</filename
->. This way, other applications will be able to use the default device, while &arts; is still running, without giving any error messages.</para>
+<para>If you often use non-&arts; aware applications, and you have a soundcard that supports it, try setting &arts; to use a different device than <filename class="devicefile">/dev/dsp</filename>. This way, other applications will be able to use the default device, while &arts; is still running, without giving any error messages.</para>
 </tip>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Use custom sampling rate:</guilabel
-></term>
+<term><guilabel>Use custom sampling rate:</guilabel></term>
 <listitem>
-<para
->Normally, the sound server defaults to using a sampling rate of 44100 Hz (<acronym
->CD</acronym
-> quality), which is supported on almost all hardware. If you are using certain Yamaha soundcards, you might need to configure this to 48000 Hz here; if you are using old SoundBlaster cards, like SoundBlaster Pro, you might need to change this to 22050 Hz. All other values are possible too and may make sense in certain contexts (&ie; professional studio equipment).</para
-> 
+<para>Normally, the sound server defaults to using a sampling rate of 44100 Hz (<acronym>CD</acronym> quality), which is supported on almost all hardware. If you are using certain Yamaha soundcards, you might need to configure this to 48000 Hz here; if you are using old SoundBlaster cards, like SoundBlaster Pro, you might need to change this to 22050 Hz. All other values are possible too and may make sense in certain contexts (&ie; professional studio equipment).</para> 
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Other custom options:</guilabel
-></term>
-<listitem
-><para
->There are some options offered by &arts; which may not be available in this control module, so you can add command line options here which will be passed directly to <application
->artsd</application
->. The options will be appended, so they will override the choices made in the <acronym
->GUI</acronym
->. To see the possible choices, open a &konsole; window, and type <userinput
-><command
->artsd</command
-> <option
->-h</option
-></userinput
->.</para>
+<term><guilabel>Other custom options:</guilabel></term>
+<listitem><para>There are some options offered by &arts; which may not be available in this control module, so you can add command line options here which will be passed directly to <application>artsd</application>. The options will be appended, so they will override the choices made in the <acronym>GUI</acronym>. To see the possible choices, open a &konsole; window, and type <userinput><command>artsd</command> <option>-h</option></userinput>.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Sound quality:</guilabel
-></term>
+<term><guilabel>Sound quality:</guilabel></term>
 <listitem>
-<para
->These settings allow you to configure the quality of the sounds that will be played.</para>
+<para>These settings allow you to configure the quality of the sounds that will be played.</para>
 <tip>
-<para
->Note that a higher sound quality causes a higher <acronym
->CPU</acronym
-> usage.</para>
-<para
->If you find sound is slow, or using too much <acronym
->CPU</acronym
->, try reducing this setting.</para>
+<para>Note that a higher sound quality causes a higher <acronym>CPU</acronym> usage.</para>
+<para>If you find sound is slow, or using too much <acronym>CPU</acronym>, try reducing this setting.</para>
 </tip>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Audio Buffer Size (response time)</guilabel
-></term>
-<listitem
-><para
->This slider determines how quickly the sound server can use your computer's resources. The faster the response time, the higher the <acronym
->CPU</acronym
-> load will be.</para>
-<tip
-><para
->I would recommend that you start with the sound server set at 250 ms, and use &kde; for a while. If you notice that the sound does not work correctly, increase the responsiveness one step at a time until the problems disappear.</para
-></tip>
+<term><guilabel>Audio Buffer Size (response time)</guilabel></term>
+<listitem><para>This slider determines how quickly the sound server can use your computer's resources. The faster the response time, the higher the <acronym>CPU</acronym> load will be.</para>
+<tip><para>I would recommend that you start with the sound server set at 250 ms, and use &kde; for a while. If you notice that the sound does not work correctly, increase the responsiveness one step at a time until the problems disappear.</para></tip>
 </listitem>
 </varlistentry>
 
@@ -297,13 +145,9 @@
 </sect2>
 
 <sect2>
-<title
->Mixer</title>
+<title>Mixer</title>
 
-<para
->If you have installed the optional tdemultimedia package, a &kcontrol; panel allowing configuration of the mixer will also appear here. If installed, you can read about this in <ulink url="help:/kcontrol/mixer/index.html"
->its own manual</ulink
->.</para>
+<para>If you have installed the optional tdemultimedia package, a &kcontrol; panel allowing configuration of the mixer will also appear here. If installed, you can read about this in <ulink url="help:/kcontrol/mixer/index.html">its own manual</ulink>.</para>
 
 </sect2>
 &midi-kcontrol; </sect1>
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/arts/midi.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/arts/midi.docbook
index 5c2ae385ad5..b3e2fe90bce 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/arts/midi.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/arts/midi.docbook
@@ -1,47 +1,16 @@
 <sect2 id="midi">
 <sect2info>
 <authorgroup>
-<author
->&Mike.McBride; &Mike.McBride.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Mike.McBride; &Mike.McBride.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </sect2info>
-<title
-><acronym
->MIDI</acronym
-> Configuration</title>
+<title><acronym>MIDI</acronym> Configuration</title>
 
-<para
->This module is used to determine which <acronym
->MIDI</acronym
-> device &kde; should use. You can also install a <acronym
->MIDI</acronym
-> wrapper around the device if you want.</para>
+<para>This module is used to determine which <acronym>MIDI</acronym> device &kde; should use. You can also install a <acronym>MIDI</acronym> wrapper around the device if you want.</para>
 
-<para
->The use of this module is simple. Click once on the <acronym
->MIDI</acronym
-> device that you would like to use from the list.</para>
+<para>The use of this module is simple. Click once on the <acronym>MIDI</acronym> device that you would like to use from the list.</para>
 
-<para
->If you want to use a <acronym
->MIDI</acronym
-> mapper, simply mark the checkbox below the list labelled <guilabel
->Use MIDI Mapper</guilabel
->. This will allow you to select the map in the text box below. You can click on the folder icon to browse your filesystem to find the map if you need it.</para>
+<para>If you want to use a <acronym>MIDI</acronym> mapper, simply mark the checkbox below the list labelled <guilabel>Use MIDI Mapper</guilabel>. This will allow you to select the map in the text box below. You can click on the folder icon to browse your filesystem to find the map if you need it.</para>
 
 </sect2>
\ No newline at end of file
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/background/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/background/index.docbook
index 904bd97986e..92572b7a831 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/background/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/background/index.docbook
@@ -2,179 +2,103 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Mark.Donohoe;</author>
-<author
->&Martin.R.Jones;</author>
-<!-- <author
->&Duncan.H;</author
-> -->
-<author
->&Mike.McBride;</author>
-
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Mark.Donohoe;</author>
+<author>&Martin.R.Jones;</author>
+<!-- <author>&Duncan.H;</author> -->
+<author>&Mike.McBride;</author>
+
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2003-09-28</date>
-<releaseinfo
->3.2</releaseinfo>
+<date>2003-09-28</date>
+<releaseinfo>3.2</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->background</keyword>
-<keyword
->wallpaper</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>background</keyword>
+<keyword>wallpaper</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="background">
 
-<title
->Background</title>
+<title>Background</title>
 
-<para
->The Background module allows you to configure colours or wallpapers for your desktop background.</para>
+<para>The Background module allows you to configure colours or wallpapers for your desktop background.</para>
  
-<para
->It is comprised of four areas:</para>
+<para>It is comprised of four areas:</para>
  
 <orderedlist>
 <listitem>
-<para
->Desktop selection area</para>
+<para>Desktop selection area</para>
 </listitem>
 <listitem>
-<para
->The background Preview Monitor</para>
+<para>The background Preview Monitor</para>
 </listitem>
 <listitem>
-<para
->An area for determining the background colour</para>
+<para>An area for determining the background colour</para>
 </listitem>
 <listitem>
-<para
->An area for selecting background images</para>
+<para>An area for selecting background images</para>
 </listitem>
 </orderedlist>
 
 <variablelist>
 <varlistentry>
-<term
->Selecting the desktop</term>
+<term>Selecting the desktop</term>
 <listitem>
-<para
->The drop down box labelled <guilabel
->Setting for desktop:</guilabel
-> is used to select the desktop you want to configure. You can select any of the desktops individually, or you can select <guilabel
->All Desktops</guilabel
-> and the changes you make will be applied to all desktops.</para>
+<para>The drop down box labelled <guilabel>Setting for desktop:</guilabel> is used to select the desktop you want to configure. You can select any of the desktops individually, or you can select <guilabel>All Desktops</guilabel> and the changes you make will be applied to all desktops.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Preview Monitor</term>
+<term>Preview Monitor</term>
 <listitem>
-<para
->This is a preview window. It will give you a sense of what to expect with each change.</para>
+<para>This is a preview window. It will give you a sense of what to expect with each change.</para>
 </listitem>
-</varlistentry
->	
+</varlistentry>	
 
 <varlistentry>
-<term
-><guilabel
->Background</guilabel
-></term>
+<term><guilabel>Background</guilabel></term>
 <listitem>
-<para
->This section allows you to load a wallpaper on top of the colour gradient chosen in the section below.</para>
+<para>This section allows you to load a wallpaper on top of the colour gradient chosen in the section below.</para>
 
-<para
->There are three choices available here:</para>
+<para>There are three choices available here:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->No Picture</guilabel
-></term>
+<term><guilabel>No Picture</guilabel></term>
 <listitem>
-<para
->No picture background will be shown. The colour and pattern choices below will still take effect.</para>
+<para>No picture background will be shown. The colour and pattern choices below will still take effect.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Picture</guilabel
-></term>
+<term><guilabel>Picture</guilabel></term>
 <listitem>
-<para
->A single picture will be used as the background for the selected desktops.</para>
-<para
->How this picture is positioned and scaled can be fine tuned below.</para>
+<para>A single picture will be used as the background for the selected desktops.</para>
+<para>How this picture is positioned and scaled can be fine tuned below.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Slide show</guilabel
-></term>
+<term><guilabel>Slide show</guilabel></term>
 <listitem>
-<para
->&kde; allows you to have an automatic slide show of wallpaper images. To enable this option, press the <guibutton
->Setup...</guibutton
-> button. In the resulting dialogue you may choose any image or folder of images available on your computer, using the <guibutton
->Add...</guibutton
-> button to navigate your file system. <guibutton
->Remove</guibutton
-> will remove the currently selected entry from the list.</para
-> 
-
-<para
->You may choose the length of time any image is displayed in the <guilabel
->Change picture after:</guilabel
-> box, and you may choose <guibutton
->Show pictures in random order</guibutton
-> if you don't want them displayed in the order they are listed.</para>
-
-<tip
-><para
->Displaying wallpaper requires that the image be kept in memory. If you are low on memory, using a small, tiled image or none at all is recommended.</para>
-
-<para
->Scaling or centreing a small image still requires an image the size of your display to be maintained in memory.</para
-></tip>
+<para>&kde; allows you to have an automatic slide show of wallpaper images. To enable this option, press the <guibutton>Setup...</guibutton> button. In the resulting dialogue you may choose any image or folder of images available on your computer, using the <guibutton>Add...</guibutton> button to navigate your file system. <guibutton>Remove</guibutton> will remove the currently selected entry from the list.</para> 
+
+<para>You may choose the length of time any image is displayed in the <guilabel>Change picture after:</guilabel> box, and you may choose <guibutton>Show pictures in random order</guibutton> if you don't want them displayed in the order they are listed.</para>
+
+<tip><para>Displaying wallpaper requires that the image be kept in memory. If you are low on memory, using a small, tiled image or none at all is recommended.</para>
+
+<para>Scaling or centreing a small image still requires an image the size of your display to be maintained in memory.</para></tip>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -182,192 +106,85 @@
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Options</guilabel
-></term>
+<term><guilabel>Options</guilabel></term>
 <listitem>
 
-<variablelist
-><!-- Positioning -->
+<variablelist><!-- Positioning -->
 <varlistentry>
-<term
->Centred</term>
-<listitem
-><para
->The image will be centred on the screen without changing the size of the image. The background colours will be present anywhere the image does not cover.</para
-> </listitem>
+<term>Centred</term>
+<listitem><para>The image will be centred on the screen without changing the size of the image. The background colours will be present anywhere the image does not cover.</para> </listitem>
 </varlistentry>
 <varlistentry>
-<term
->Tiled</term>
-<listitem
-><para
->The image will be duplicated until it fills the entire desktop. The first image will be placed in the upper left corner of the screen, and duplicated downward and to the right.</para
-></listitem>
+<term>Tiled</term>
+<listitem><para>The image will be duplicated until it fills the entire desktop. The first image will be placed in the upper left corner of the screen, and duplicated downward and to the right.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Centre Tiled</term>
-<listitem
-><para
->The image will be duplicated until it fills the entire desktop. The first image will be placed in the centre of the screen, and duplicated upward, downward to the right, and to the left.</para>
-</listitem
-></varlistentry>
+<term>Centre Tiled</term>
+<listitem><para>The image will be duplicated until it fills the entire desktop. The first image will be placed in the centre of the screen, and duplicated upward, downward to the right, and to the left.</para>
+</listitem></varlistentry>
 <varlistentry>
-<term
->Centred Maxpect</term>
-<listitem
-><para
->The image will be placed in the centre of the screen. It will be scaled to fit the desktop, but it will not change the aspect ratio of the original image. This will provide you with an image that is not distorted. </para
-></listitem>
+<term>Centred Maxpect</term>
+<listitem><para>The image will be placed in the centre of the screen. It will be scaled to fit the desktop, but it will not change the aspect ratio of the original image. This will provide you with an image that is not distorted. </para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Tiled Maxpect</term>
+<term>Tiled Maxpect</term>
 <listitem>
-<para
->The image will be placed in the corner of the screen. It will be scaled to fit the desktop, but it will not change the aspect ratio of the original image. This will provide you with an image that is not distorted. If there is any space over, the image will be duplicated to fill it. </para>
+<para>The image will be placed in the corner of the screen. It will be scaled to fit the desktop, but it will not change the aspect ratio of the original image. This will provide you with an image that is not distorted. If there is any space over, the image will be duplicated to fill it. </para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->Scaled</term>
-<listitem
-><para
->The image will be scaled to fit the desktop. It will be stretched to fit to all four corners. This may distort the image.</para
-></listitem>
+<term>Scaled</term>
+<listitem><para>The image will be scaled to fit the desktop. It will be stretched to fit to all four corners. This may distort the image.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Centred Auto fit</term>
+<term>Centred Auto fit</term>
 <listitem>
-<para
->If the picture fits the desktop size, this mode works like the centred option. If the picture is larger than the desktop then it is scaled down to fit while keeping the aspect ratio. </para>
+<para>If the picture fits the desktop size, this mode works like the centred option. If the picture is larger than the desktop then it is scaled down to fit while keeping the aspect ratio. </para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<variablelist
-><!-- Colors -->
+<variablelist><!-- Colors -->
 <varlistentry>
-<term
-><guilabel
->Colours:</guilabel
-></term>
+<term><guilabel>Colours:</guilabel></term>
 <listitem>
-<para
->The first drop down box allows you to choose the type of colour, gradient, or pattern to display under (or in place of) wallpaper.</para>
-<tip
-><para
->If you are going to be using a picture as a wallpaper, you can skip this section of the dialogue box.</para
-> 
-<para
->However, if your chosen wallpaper does not cover the entire desktop, the chosen colours will still show in the remaining space.</para
-></tip>
+<para>The first drop down box allows you to choose the type of colour, gradient, or pattern to display under (or in place of) wallpaper.</para>
+<tip><para>If you are going to be using a picture as a wallpaper, you can skip this section of the dialogue box.</para> 
+<para>However, if your chosen wallpaper does not cover the entire desktop, the chosen colours will still show in the remaining space.</para></tip>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Single Colour</guilabel
-></term>
-<listitem
-><para
->By choosing this mode, you select one colour using the first colour bar, and the entire background is covered with this one colour.</para
-></listitem
-> 
+<term><guilabel>Single Colour</guilabel></term>
+<listitem><para>By choosing this mode, you select one colour using the first colour bar, and the entire background is covered with this one colour.</para></listitem> 
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Horizontal Gradient</guilabel
-></term>
-<listitem
-><para
->By choosing this mode, you select two colours (using both colour buttons). &kde; will then start with the colour selected by <guilabel
->Primary Colour</guilabel
-> on the left edge of the screen, and slowly transform into the colour selected by <guilabel
->Blend Colour</guilabel
-> by the time it gets to the right edge of the screen.</para
-></listitem>
+<term><guilabel>Horizontal Gradient</guilabel></term>
+<listitem><para>By choosing this mode, you select two colours (using both colour buttons). &kde; will then start with the colour selected by <guilabel>Primary Colour</guilabel> on the left edge of the screen, and slowly transform into the colour selected by <guilabel>Blend Colour</guilabel> by the time it gets to the right edge of the screen.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Vertical Gradient</guilabel
-></term>
-<listitem
-><para
->By choosing this mode, you select two colours (using both colour buttons). &kde; will then start with the colour selected by <guilabel
->Primary Colour</guilabel
-> on the top edge of the screen, and slowly transform into the colour selected by <guilabel
->Blend Colour</guilabel
-> as it moves to the bottom of the screen.</para
-></listitem
-> 
+<term><guilabel>Vertical Gradient</guilabel></term>
+<listitem><para>By choosing this mode, you select two colours (using both colour buttons). &kde; will then start with the colour selected by <guilabel>Primary Colour</guilabel> on the top edge of the screen, and slowly transform into the colour selected by <guilabel>Blend Colour</guilabel> as it moves to the bottom of the screen.</para></listitem> 
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Pyramid Gradient</guilabel
-></term>
-<listitem
-><para
->By choosing this mode, you select two colours (using both colour buttons). &kde; will then start with the colour selected by <guilabel
->Primary Colour</guilabel
-> in each corner of the screen, and slowly transform into the colour selected by <guilabel
->Blend Colour</guilabel
-> as it moves to the centre of the screen.</para
-></listitem>
+<term><guilabel>Pyramid Gradient</guilabel></term>
+<listitem><para>By choosing this mode, you select two colours (using both colour buttons). &kde; will then start with the colour selected by <guilabel>Primary Colour</guilabel> in each corner of the screen, and slowly transform into the colour selected by <guilabel>Blend Colour</guilabel> as it moves to the centre of the screen.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Pipecross Gradient</guilabel
-></term>
-<listitem
-><para
->By choosing this mode, you select two colours (using both colour buttons). &kde; will then start with the colour selected by <guilabel
->Primary Colour</guilabel
-> in each corner of the screen, and slowly transform into the colour selected by <guilabel
->Blend Colour</guilabel
-> as it moves to the centre of the screen. The shape of this gradient is different than the pyramid gradient.</para
-></listitem>
+<term><guilabel>Pipecross Gradient</guilabel></term>
+<listitem><para>By choosing this mode, you select two colours (using both colour buttons). &kde; will then start with the colour selected by <guilabel>Primary Colour</guilabel> in each corner of the screen, and slowly transform into the colour selected by <guilabel>Blend Colour</guilabel> as it moves to the centre of the screen. The shape of this gradient is different than the pyramid gradient.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Elliptic Gradient</guilabel
-></term>
-<listitem
-><para
->By choosing this mode, you select two colours (using both colour buttons). &kde; will then start with the colour selected by <guilabel
->Blend Colour</guilabel
-> in the centre of the screen, and slowly transform into the colour selected by <guilabel
->Primary Colour</guilabel
-> as it moves to the edges, in an elliptical pattern.</para
-></listitem>
+<term><guilabel>Elliptic Gradient</guilabel></term>
+<listitem><para>By choosing this mode, you select two colours (using both colour buttons). &kde; will then start with the colour selected by <guilabel>Blend Colour</guilabel> in the centre of the screen, and slowly transform into the colour selected by <guilabel>Primary Colour</guilabel> as it moves to the edges, in an elliptical pattern.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><replaceable
->Pattern</replaceable
-></term>
+<term><replaceable>Pattern</replaceable></term>
 <listitem>
-<para
->The rest of the list are the names of various patterns or textures you can choose.</para
-> 
-<para
->Click on <guibutton
->OK</guibutton
->, and &kde; will render the pattern you selected using the two colours you selected. For more on patterns, see the section <link linkend="bkgnd-patterns"
->Adding, Removing and Modifying Patterns</link
->.</para>
-
-<para
->Select the primary colour with the first colour bar. If you have chosen a pattern that requires two colours to be set the secondary colour can be set by pressing the appropriate button.</para>
+<para>The rest of the list are the names of various patterns or textures you can choose.</para> 
+<para>Click on <guibutton>OK</guibutton>, and &kde; will render the pattern you selected using the two colours you selected. For more on patterns, see the section <link linkend="bkgnd-patterns">Adding, Removing and Modifying Patterns</link>.</para>
+
+<para>Select the primary colour with the first colour bar. If you have chosen a pattern that requires two colours to be set the secondary colour can be set by pressing the appropriate button.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -378,33 +195,14 @@
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Blending:</guilabel
-></term>
+<term><guilabel>Blending:</guilabel></term>
 <listitem>
-<para
->The drop down box labelled <guilabel
->Blending:</guilabel
-> contains the options to make a smooth transition (blend) from the wallpaper as it changes to the background.</para>
+<para>The drop down box labelled <guilabel>Blending:</guilabel> contains the options to make a smooth transition (blend) from the wallpaper as it changes to the background.</para>
 
 <orderedlist>
-<listitem
-><para
->A drop down box allows you to select the blending mode. Many of the modes are similar to blending modes for background colours. Select your mode from the list, and the preview window shows you what it will look like.</para
-></listitem
-> 
-<listitem
-><para
->The <guilabel
->Balance</guilabel
-> slider adjusts the blending. The results can be seen in the preview window.</para
-></listitem>
-<listitem
-><para
->The <guilabel
->Reverse roles</guilabel
-> can reverse the role of the picture and the background for some types of blending.</para>
+<listitem><para>A drop down box allows you to select the blending mode. Many of the modes are similar to blending modes for background colours. Select your mode from the list, and the preview window shows you what it will look like.</para></listitem> 
+<listitem><para>The <guilabel>Balance</guilabel> slider adjusts the blending. The results can be seen in the preview window.</para></listitem>
+<listitem><para>The <guilabel>Reverse roles</guilabel> can reverse the role of the picture and the background for some types of blending.</para>
 </listitem>
 </orderedlist>
 </listitem>
@@ -415,70 +213,33 @@
 </variablelist>
 
 <sect2 id="bkgnd-advanced">
-<title
->Advanced options</title>
-<para
->Located below the preview monitor is a button labeled <guibutton
->Advanced Options...</guibutton
->.</para>
-
-<para
->To use an external program to determine and change the background of &kde;, simply select <guilabel
->Use the following program for drawing the background</guilabel
->. Available &kde; programs are listed, select one to enable it. To modify your choice, for example to change the refresh times, you may press the <guibutton
->Modify...</guibutton
-> button.</para>
-
-<para
->To add a third party application (&eg; <application
->XEarth</application
-> you may use the <guibutton
->Add...</guibutton
-> button. A dialogue will open allowing you to choose your application, and fill in other data about it. You may remove any entries from this list by selecting it and pressing the <guibutton
->Remove</guibutton
-> button.</para>
-
-<para
->Using third party external programs to modify or change the background is beyond the scope of this document, see their respective documentation for the format of command-line switches and other configuration information.</para>
-
-<para
->Also in this section you may choose to set the colour of text that is used for icons on the desktop. If you find icon text difficult to read against a wallpaper or pattern, you can choose a solid colour to show beneath text, or enable a shadow under the text to enhance its appearance.</para>
-
-<para
->Finally you can set the <guilabel
->Size of the background cache:</guilabel
->. The default (2048 KB) is usually a safe choice.</para>
+<title>Advanced options</title>
+<para>Located below the preview monitor is a button labeled <guibutton>Advanced Options...</guibutton>.</para>
+
+<para>To use an external program to determine and change the background of &kde;, simply select <guilabel>Use the following program for drawing the background</guilabel>. Available &kde; programs are listed, select one to enable it. To modify your choice, for example to change the refresh times, you may press the <guibutton>Modify...</guibutton> button.</para>
+
+<para>To add a third party application (&eg; <application>XEarth</application> you may use the <guibutton>Add...</guibutton> button. A dialogue will open allowing you to choose your application, and fill in other data about it. You may remove any entries from this list by selecting it and pressing the <guibutton>Remove</guibutton> button.</para>
+
+<para>Using third party external programs to modify or change the background is beyond the scope of this document, see their respective documentation for the format of command-line switches and other configuration information.</para>
+
+<para>Also in this section you may choose to set the colour of text that is used for icons on the desktop. If you find icon text difficult to read against a wallpaper or pattern, you can choose a solid colour to show beneath text, or enable a shadow under the text to enhance its appearance.</para>
+
+<para>Finally you can set the <guilabel>Size of the background cache:</guilabel>. The default (2048 KB) is usually a safe choice.</para>
 
 </sect2>
 
 <sect2 id="bkgnd-patterns">
-<title
->Adding, Removing and Modifying Patterns</title>
-
-<para
->A pattern is a picture file which &kde; uses as a template to draw your background. The picture file provides the shapes, but &kde; provides the colours. &kde; is packaged with several patterns, and you also can add new patterns.</para>
-
-<para
->To add a new pattern that is available to every user on your computer, simply place the file in <filename class="directory"
->$<envar
->TDEDIR</envar
->/share/apps/kdesktop/patterns/</filename
-></para>
-
-<para
->Copy a <literal role="extension"
->.desktop</literal
-> file from this folder, and name it the same as your new pattern image file. Modify the contents to suit your new pattern.</para>
-
-<para
->To add a new pattern for a single user, add the files to <filename class="directory"
->$<envar
->TDEHOME</envar
->/share/apps/kdesktop/patterns/</filename
-></para>
-
-<para
->For best results, the pattern should be a grayscale PNG file.</para>
+<title>Adding, Removing and Modifying Patterns</title>
+
+<para>A pattern is a picture file which &kde; uses as a template to draw your background. The picture file provides the shapes, but &kde; provides the colours. &kde; is packaged with several patterns, and you also can add new patterns.</para>
+
+<para>To add a new pattern that is available to every user on your computer, simply place the file in <filename class="directory">$<envar>TDEDIR</envar>/share/apps/kdesktop/patterns/</filename></para>
+
+<para>Copy a <literal role="extension">.desktop</literal> file from this folder, and name it the same as your new pattern image file. Modify the contents to suit your new pattern.</para>
+
+<para>To add a new pattern for a single user, add the files to <filename class="directory">$<envar>TDEHOME</envar>/share/apps/kdesktop/patterns/</filename></para>
+
+<para>For best results, the pattern should be a grayscale PNG file.</para>
 
 </sect2>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/bell/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/bell/index.docbook
index c2af7f9e516..e37c3ba5575 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/bell/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/bell/index.docbook
@@ -1,124 +1,53 @@
 <?xml version="1.0"?>
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
  <!ENTITY % addindex "IGNORE">
- <!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+ <!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 <authorgroup>
-<author
-><firstname
->Pat</firstname
-> <surname
->Dowler</surname
-> </author>
+<author><firstname>Pat</firstname> <surname>Dowler</surname> </author>
 
-<author
-><firstname
->Matthias</firstname
-> <surname
->Hoelzer</surname
-> </author>
+<author><firstname>Matthias</firstname> <surname>Hoelzer</surname> </author>
 
-<author
-><firstname
->Mike</firstname
-> <surname
->McBride</surname
-> </author>
+<author><firstname>Mike</firstname> <surname>McBride</surname> </author>
 
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
-<date
->2003-10-16</date>
-<releaseinfo
->3.2</releaseinfo>
+<date>2003-10-16</date>
+<releaseinfo>3.2</releaseinfo>
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->Bell</keyword>
-<keyword
->Settings</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>Bell</keyword>
+<keyword>Settings</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="bell">
-<title
->System bell</title>
+<title>System bell</title>
 
-<para
->The system bell or beep is a feature of the X server, which attempts to make good use of the available hardware. </para>
+<para>The system bell or beep is a feature of the X server, which attempts to make good use of the available hardware. </para>
 
-<para
->&kde; normally doesn't use the system bell; instead using its own system notifications, which could include log entries, message popups, or its own beep. You can configure these in the <guilabel
->System Notifications</guilabel
-> &kcontrol; module.</para>
+<para>&kde; normally doesn't use the system bell; instead using its own system notifications, which could include log entries, message popups, or its own beep. You can configure these in the <guilabel>System Notifications</guilabel> &kcontrol; module.</para>
 
-<note
-><para
->It isn't always possible for the X server to actually make a beep sound with exactly the parameters selected due to hardware limitations. For example, on most PCs, volume control is not very good so the X server seems to fake low volume with a reduced duration of the sound. Thus, if the settings don't seem to do anything, this is because the X server and/or the hardware don't support anything better.</para
-></note>
+<note><para>It isn't always possible for the X server to actually make a beep sound with exactly the parameters selected due to hardware limitations. For example, on most PCs, volume control is not very good so the X server seems to fake low volume with a reduced duration of the sound. Thus, if the settings don't seem to do anything, this is because the X server and/or the hardware don't support anything better.</para></note>
 
-<para
->Users are able to set the following parameters for the bell:</para>
+<para>Users are able to set the following parameters for the bell:</para>
 
 <itemizedlist>
-<listitem
-> <para
->volume (percentage of <quote
->maximum</quote
-> volume)</para
-> </listitem>
-<listitem
-> <para
->pitch (in Hz)</para
-> </listitem>
-<listitem
-> <para
->duration (in milliseconds)</para
-> </listitem>
+<listitem> <para>volume (percentage of <quote>maximum</quote> volume)</para> </listitem>
+<listitem> <para>pitch (in Hz)</para> </listitem>
+<listitem> <para>duration (in milliseconds)</para> </listitem>
 </itemizedlist>
 
-<para
->You can use the <guibutton
->test</guibutton
-> button to hear how the current settings will sound.</para>
+<para>You can use the <guibutton>test</guibutton> button to hear how the current settings will sound.</para>
 
-<sect2 id="bell-author"
-><title
->Section Authors</title>
-<para
->Pat Dowler, Matthias Hoelzer <email
->mhk@kde.org</email
-></para>
-<para
->Converted to KDE 2.0 by Mike McBride <email
->mpmcbride7@yahoo.com</email
-></para>
-<para
->Conversion to British English: Malcolm Hunter <email
->malcolm.hunter@gmx.co.uk</email
-></para
-> 
+<sect2 id="bell-author"><title>Section Authors</title>
+<para>Pat Dowler, Matthias Hoelzer <email>mhk@kde.org</email></para>
+<para>Converted to KDE 2.0 by Mike McBride <email>mpmcbride7@yahoo.com</email></para>
+<para>Conversion to British English: Malcolm Hunter <email>malcolm.hunter@gmx.co.uk</email></para> 
 </sect2>
 </sect1>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/cache/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/cache/index.docbook
index f0ec76562e9..6de5f958ac5 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/cache/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/cache/index.docbook
@@ -2,91 +2,45 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
-><firstname
-></firstname
-><surname
-></surname
-></author>
+<author><firstname></firstname><surname></surname></author>
 
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2003-10-12</date>
-<releaseinfo
->3.2</releaseinfo>
+<date>2003-10-12</date>
+<releaseinfo>3.2</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->Konqueror</keyword>
-<keyword
->Cache</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>Konqueror</keyword>
+<keyword>Cache</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="cache">
-<title
->Cache</title>
+<title>Cache</title>
 
-<para
->This module allows you to control the size of the local cache folder used by &konqueror;. Note that each user account on your computer has a separate cache folder, and this folder is not shared with other web browsers such as &Netscape;.</para>
+<para>This module allows you to control the size of the local cache folder used by &konqueror;. Note that each user account on your computer has a separate cache folder, and this folder is not shared with other web browsers such as &Netscape;.</para>
 
-<para
->Storing local copies of web pages that you have visited allows &konqueror; to quickly load their contents on subsequent visits. It will only be necessary to reload the contents from the original site if they have changed since your last visit, or if you click the reload button in &konqueror;.</para>
+<para>Storing local copies of web pages that you have visited allows &konqueror; to quickly load their contents on subsequent visits. It will only be necessary to reload the contents from the original site if they have changed since your last visit, or if you click the reload button in &konqueror;.</para>
 
-<para
->If you really don't want any of the web pages you visit to be stored on your computer, you can disable &konqueror;'s disk cache by clearing the checkbox labelled <guilabel
->Use cache</guilabel
->.</para>
+<para>If you really don't want any of the web pages you visit to be stored on your computer, you can disable &konqueror;'s disk cache by clearing the checkbox labelled <guilabel>Use cache</guilabel>.</para>
 
-<para
->You can set here how aggressively &konqueror; keeps the cache up to date. <guilabel
->Keep cache in sync</guilabel
-> means that &konqueror; will hit the cache for all objects, downloading them if they are not there, and then display the item from the cache. <guilabel
->Use cache whenever possible</guilabel
-> means that &konqueror; will try the cache, and if an object is not there, it will directly download it for display. <guilabel
->Offline browsing mode</guilabel
-> means that &konqueror; will try the cache, and if an object is not there, it will not attempt to download it from the Internet.</para>
+<para>You can set here how aggressively &konqueror; keeps the cache up to date. <guilabel>Keep cache in sync</guilabel> means that &konqueror; will hit the cache for all objects, downloading them if they are not there, and then display the item from the cache. <guilabel>Use cache whenever possible</guilabel> means that &konqueror; will try the cache, and if an object is not there, it will directly download it for display. <guilabel>Offline browsing mode</guilabel> means that &konqueror; will try the cache, and if an object is not there, it will not attempt to download it from the Internet.</para>
 
-<para
->You can control the size of the cache by typing a number into the text box labelled <guilabel
->Disk cache size</guilabel
->. This is the average amount of space in kilobytes that the cache folder is allowed to use. When the cache grows too large, &konqueror; will delete older files to reduce the size of the cache folder.</para>
+<para>You can control the size of the cache by typing a number into the text box labelled <guilabel>Disk cache size</guilabel>. This is the average amount of space in kilobytes that the cache folder is allowed to use. When the cache grows too large, &konqueror; will delete older files to reduce the size of the cache folder.</para>
 
-<para
->This is however, only an average, and during a browsing session the cache could become substantially larger.</para>
+<para>This is however, only an average, and during a browsing session the cache could become substantially larger.</para>
 
-<para
->You can use the <guibutton
->Clear Cache</guibutton
-> button to empty the cache at any time.</para>
+<para>You can use the <guibutton>Clear Cache</guibutton> button to empty the cache at any time.</para>
 </sect1>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/clock/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/clock/index.docbook
index 9945e689c16..ba049c4068e 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/clock/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/clock/index.docbook
@@ -2,104 +2,53 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Mike.McBride; &Mike.McBride.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Mike.McBride; &Mike.McBride.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2003-10-19</date>
-<releaseinfo
->3.2</releaseinfo>
+<date>2003-10-19</date>
+<releaseinfo>3.2</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->clock</keyword>
-<keyword
->date</keyword>
-<keyword
->time</keyword>
-<keyword
->set</keyword>
-<keyword
->configure</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>clock</keyword>
+<keyword>date</keyword>
+<keyword>time</keyword>
+<keyword>set</keyword>
+<keyword>configure</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="datetime">
 
-<title
->Date &amp; Time</title>
+<title>Date &amp; Time</title>
 
-<para
->You can use this module to alter the system date and time, using a convenient graphical interface.</para>
+<para>You can use this module to alter the system date and time, using a convenient graphical interface.</para>
 
-<note
-><para
->You must have system administrator (<systemitem class="username"
->root</systemitem
->) access to change the system date and time. If you do not have this access level, this module will only show you the current settings.</para
-></note>
+<note><para>You must have system administrator (<systemitem class="username">root</systemitem>) access to change the system date and time. If you do not have this access level, this module will only show you the current settings.</para></note>
 
-<para
->When you first start, you are in display mode only. To modify your settings, click on <guibutton
->Administrator Mode</guibutton
->. If you are logged in as <systemitem class="username"
->root</systemitem
->, you will go straight to the change dialogue. If not, &kde; will ask for a superuser password.</para>
+<para>When you first start, you are in display mode only. To modify your settings, click on <guibutton>Administrator Mode</guibutton>. If you are logged in as <systemitem class="username">root</systemitem>, you will go straight to the change dialogue. If not, &kde; will ask for a superuser password.</para>
 
 <sect2 id="date-change">
-<title
->Modifying your settings</title>
-
-<para
->You set the date using the left half of the module. Simply choose your month (the drop down box at the top), year (the spin box at the top), and the day of the month (simply click on the day in the calendar).</para>
-
-<para
->You set the time using the spin boxes at the bottom of the clock. You can also directly enter your value.</para>
-
-<note
-><para
->The time is represented in 24 hour format. If you want the system time to be set to 8:00 PM, you need to set the hour spinbox to <guilabel
->20</guilabel
-> (8 + 12). If you want the system time set to 8:00 AM, you should set the hour spinbox to <guilabel
->8</guilabel
->.</para
-></note>
-
-<para
->To set a new time zone, simply select one from the drop down box at the bottom.</para>
-
-<para
->When you have set the correct date and time, simply click <guibutton
->Apply</guibutton
-> to make the changes permanent.</para>
+<title>Modifying your settings</title>
+
+<para>You set the date using the left half of the module. Simply choose your month (the drop down box at the top), year (the spin box at the top), and the day of the month (simply click on the day in the calendar).</para>
+
+<para>You set the time using the spin boxes at the bottom of the clock. You can also directly enter your value.</para>
+
+<note><para>The time is represented in 24 hour format. If you want the system time to be set to 8:00 PM, you need to set the hour spinbox to <guilabel>20</guilabel> (8 + 12). If you want the system time set to 8:00 AM, you should set the hour spinbox to <guilabel>8</guilabel>.</para></note>
+
+<para>To set a new time zone, simply select one from the drop down box at the bottom.</para>
+
+<para>When you have set the correct date and time, simply click <guibutton>Apply</guibutton> to make the changes permanent.</para>
 </sect2>
 
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/colors/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/colors/index.docbook
index 9309da02b22..a4af7121ec2 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/colors/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/colors/index.docbook
@@ -2,187 +2,92 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Mike.McBride; &Mike.McBride.mail;</author>
-<author
->&Mark.Donohoe; &Mark.Donohoe.mail;</author>
-<author
->&Martin.R.Jones; &Martin.R.Jones.mail;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Mike.McBride; &Mike.McBride.mail;</author>
+<author>&Mark.Donohoe; &Mark.Donohoe.mail;</author>
+<author>&Martin.R.Jones; &Martin.R.Jones.mail;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2003-09-22</date>
-<releaseinfo
->3.2</releaseinfo>
+<date>2003-09-22</date>
+<releaseinfo>3.2</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->colour</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>colour</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="color">
 
-<title
->Colours</title>
+<title>Colours</title>
 <sect2 id="color-intro">
-<title
->Introduction</title>
+<title>Introduction</title>
 
-<para
->The Colour Selection module is comprised of 4 sections:</para>
+<para>The Colour Selection module is comprised of 4 sections:</para>
 
 <orderedlist>
-<listitem
-><para
-><link linkend="kcmdisplay-preview"
->The colour scheme preview</link
->.</para
-></listitem>
-<listitem
-><para
-><link linkend="kcmdisplay-widget-color"
->The current <guilabel
->Widget Colour</guilabel
-></link
->.</para>
+<listitem><para><link linkend="kcmdisplay-preview">The colour scheme preview</link>.</para></listitem>
+<listitem><para><link linkend="kcmdisplay-widget-color">The current <guilabel>Widget Colour</guilabel></link>.</para>
 </listitem>
-<listitem
-><para
-><link linkend="kcmdisplay-color-schemes"
->The available Colour Schemes</link
->.</para
-></listitem>
-<listitem
-><para
-><link linkend="kcmdisplay-contrast"
->The contrast slider</link
->.</para
-></listitem>
+<listitem><para><link linkend="kcmdisplay-color-schemes">The available Colour Schemes</link>.</para></listitem>
+<listitem><para><link linkend="kcmdisplay-contrast">The contrast slider</link>.</para></listitem>
 </orderedlist>
 
-<note
-><para
->A <emphasis
->Widget</emphasis
-> is a commonly-used programmer's term for referring to User Interface elements such as buttons, menus, and scroll bars. You can think of them as the fundamental pieces that are assembled to make your application.</para
-></note>
+<note><para>A <emphasis>Widget</emphasis> is a commonly-used programmer's term for referring to User Interface elements such as buttons, menus, and scroll bars. You can think of them as the fundamental pieces that are assembled to make your application.</para></note>
 
 <sect3 id="kcmdisplay-preview">
-<title
->Preview</title>
+<title>Preview</title>
 
-<para
->This section of the dialogue demonstrates how a colour scheme applies to a sample selection of widgets. It provides you with a <guilabel
->preview</guilabel
-> of your current colour choices.</para>
+<para>This section of the dialogue demonstrates how a colour scheme applies to a sample selection of widgets. It provides you with a <guilabel>preview</guilabel> of your current colour choices.</para>
 
-<para
->A colour scheme consists of a set of 18 colours. </para>
+<para>A colour scheme consists of a set of 18 colours. </para>
 
-<para
->Each of the widgets is labelled to help you identify how your changes will impact the colour scheme.</para>
+<para>Each of the widgets is labelled to help you identify how your changes will impact the colour scheme.</para>
 
 </sect3>
 
 <sect3 id="kcmdisplay-widget-color">
-<title
-><guilabel
->Widget Colour</guilabel
-></title>
+<title><guilabel>Widget Colour</guilabel></title>
 
-<para
->The currently selected member of the colour scheme is shown in the combo box. This widget colour can be changed by clicking on the coloured box below the combo box. A colour selection dialogue will then appear, from which you may select a new colour. When you are happy with your colour selection, press <guibutton
->OK</guibutton
-> in the colour selection dialogue. The colour will be updated in the Preview Area.</para>
+<para>The currently selected member of the colour scheme is shown in the combo box. This widget colour can be changed by clicking on the coloured box below the combo box. A colour selection dialogue will then appear, from which you may select a new colour. When you are happy with your colour selection, press <guibutton>OK</guibutton> in the colour selection dialogue. The colour will be updated in the Preview Area.</para>
 
-<para
->You may select any member of the colour scheme from the colour combination box.</para>
+<para>You may select any member of the colour scheme from the colour combination box.</para>
 
 </sect3>
 
 <sect3 id="kcmdisplay-contrast">
-<title
-><guilabel
->Contrast</guilabel
-> Slider</title>
+<title><guilabel>Contrast</guilabel> Slider</title>
 
-<para
->The <guilabel
->Contrast</guilabel
-> slider allows you to change the contrast between different shadings of the selected colours.</para>
+<para>The <guilabel>Contrast</guilabel> slider allows you to change the contrast between different shadings of the selected colours.</para>
 
-<para
->The preview area instantly updates to show the effect of your change.</para>
+<para>The preview area instantly updates to show the effect of your change.</para>
 
 </sect3>
 
 <sect3 id="kcmdisplay-color-schemes">
-<title
-><guilabel
->Colour Scheme</guilabel
-></title>
-
-<para
->Various colour schemes are supplied with &kde;, and you are free to define your own.</para
-> 
-
-<para
->The three major colour components of each scheme are shown beside the name in the list. To preview a scheme in the larger preview area, click on its name in the list box. </para>
-
-<para
->You can use the &kde;-supplied Colour Schemes as a starting point to devise your own Scheme. Click on the <guibutton
->Save Scheme...</guibutton
-> button to store the colour scheme under a new name, then modify it. </para>
-
-<para
->When such a user-created Colour Scheme is selected, changes to it (as shown in the Preview) can be saved with the <guibutton
->Save Scheme...</guibutton
-> button; it can also be deleted with the <guibutton
->Remove Scheme</guibutton
-> button.</para>
-
-<note
-><para
->The &kde;-supplied Schemes themselves cannot be changed or deleted.</para
-></note>
-
-<para
->You can use the <guibutton
->Import Scheme...</guibutton
-> button to add new entries to the list. This might be colour schemes that you have created on another computer and saved, or colour schemes you have downloaded from a website.</para>
-
-<para
->You can choose if you want &kde; to apply the colour scheme even to non-&kde; applications by enabling the <guilabel
->Apply colours to non-TDE applications</guilabel
->. Not all applications will allow this, but most do.</para>
+<title><guilabel>Colour Scheme</guilabel></title>
+
+<para>Various colour schemes are supplied with &kde;, and you are free to define your own.</para> 
+
+<para>The three major colour components of each scheme are shown beside the name in the list. To preview a scheme in the larger preview area, click on its name in the list box. </para>
+
+<para>You can use the &kde;-supplied Colour Schemes as a starting point to devise your own Scheme. Click on the <guibutton>Save Scheme...</guibutton> button to store the colour scheme under a new name, then modify it. </para>
+
+<para>When such a user-created Colour Scheme is selected, changes to it (as shown in the Preview) can be saved with the <guibutton>Save Scheme...</guibutton> button; it can also be deleted with the <guibutton>Remove Scheme</guibutton> button.</para>
+
+<note><para>The &kde;-supplied Schemes themselves cannot be changed or deleted.</para></note>
+
+<para>You can use the <guibutton>Import Scheme...</guibutton> button to add new entries to the list. This might be colour schemes that you have created on another computer and saved, or colour schemes you have downloaded from a website.</para>
+
+<para>You can choose if you want &kde; to apply the colour scheme even to non-&kde; applications by enabling the <guilabel>Apply colours to non-TDE applications</guilabel>. Not all applications will allow this, but most do.</para>
 
 </sect3>
 </sect2>
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/cookies/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/cookies/index.docbook
index c08cc498bcb..5d6bf669449 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/cookies/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/cookies/index.docbook
@@ -2,237 +2,128 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Krishna.Tateneni; &Krishna.Tateneni.mail;</author>
-<author
->&Jost.Schenck; &Jost.Schenck.mail;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Krishna.Tateneni; &Krishna.Tateneni.mail;</author>
+<author>&Jost.Schenck; &Jost.Schenck.mail;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2003-10-12</date>
-<releaseinfo
->3.2</releaseinfo>
+<date>2003-10-12</date>
+<releaseinfo>3.2</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->cookie</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>cookie</keyword>
 </keywordset>
 
 </articleinfo>
 
 <sect1 id="cookie">
-<title
->Cookies</title>
+<title>Cookies</title>
 
-<para
->Cookies are a mechanism used by web sites to store and retrieve information using your browser. For example, a web site may allow you to customise the content and layout of the pages you see, so that your choices are persistent across different visits to that web site.</para>
+<para>Cookies are a mechanism used by web sites to store and retrieve information using your browser. For example, a web site may allow you to customise the content and layout of the pages you see, so that your choices are persistent across different visits to that web site.</para>
 
-<para
->The web site is able to remember your preferences by storing a cookie on your computer. Then, on future visits, the web site retrieves the information stored in the cookie to format the content of the site according to your previously specified preferences.</para>
+<para>The web site is able to remember your preferences by storing a cookie on your computer. Then, on future visits, the web site retrieves the information stored in the cookie to format the content of the site according to your previously specified preferences.</para>
 
-<para
->Thus, cookies play a very useful role in web browsing. Unfortunately, web sites often store and retrieve information in cookies without your explicit knowledge or consent. Some of this information may be quite useful to the web site owners, for example, by allowing them to collect summary statistics on the number of visits different areas of the web sites get, or to customise banner advertising.</para>
+<para>Thus, cookies play a very useful role in web browsing. Unfortunately, web sites often store and retrieve information in cookies without your explicit knowledge or consent. Some of this information may be quite useful to the web site owners, for example, by allowing them to collect summary statistics on the number of visits different areas of the web sites get, or to customise banner advertising.</para>
 
-<para
->The cookies module of the &kcontrol; allows you to set policies for the use of cookies when you are browsing the web with the &konqueror; web browser. </para>
+<para>The cookies module of the &kcontrol; allows you to set policies for the use of cookies when you are browsing the web with the &konqueror; web browser. </para>
 
-<warning
-><para
->Note that the policies that you set using this control module will <emphasis
->not</emphasis
-> apply to other web browsers such as &Netscape;.</para
-></warning>
+<warning><para>Note that the policies that you set using this control module will <emphasis>not</emphasis> apply to other web browsers such as &Netscape;.</para></warning>
 
 <sect2 id="cookie-policy">
 
-<title
->Policy</title>
+<title>Policy</title>
 
-<para
->Using the <guilabel
->Policy</guilabel
-> tab, you can configure the &kde; applications that will handle cookies. You can do this by specifying a general cookie policy as well as special cookie policies for certain domains or hosts.</para>
+<para>Using the <guilabel>Policy</guilabel> tab, you can configure the &kde; applications that will handle cookies. You can do this by specifying a general cookie policy as well as special cookie policies for certain domains or hosts.</para>
 
-<para
->The top of the policy tab has a checkbox labeled <guilabel
->Enable cookies</guilabel
->. If you leave this unchecked cookies will be completely disabled. However, this may make browsing rather inconvenient especially as some web sites require the use of browsers with cookies enabled.</para>
+<para>The top of the policy tab has a checkbox labeled <guilabel>Enable cookies</guilabel>. If you leave this unchecked cookies will be completely disabled. However, this may make browsing rather inconvenient especially as some web sites require the use of browsers with cookies enabled.</para>
 
-<para
->You will probably want to enable cookies and then set specific policies on how you want them to be handled.</para>
+<para>You will probably want to enable cookies and then set specific policies on how you want them to be handled.</para>
 
-<para
->The first group of options create settings that apply to all cookies.</para>
+<para>The first group of options create settings that apply to all cookies.</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Only accept cookies from originating server</guilabel
-></term>
+<term><guilabel>Only accept cookies from originating server</guilabel></term>
 <listitem>
-<para
->Some pages try to set cookies from servers other than the one you are seeing the <acronym
->HTML</acronym
-> page from. For example, they show you advertisements, and the advertisements are from another computer, often one that belongs to a large advertising group. These advertisements may try to set a cookie which would allow them to track the pages you view across multiple web sites.</para>
-<para
->Disabling this option will mean only cookies that come from the same web server as you are explicitly connecting to will be accepted.</para>
+<para>Some pages try to set cookies from servers other than the one you are seeing the <acronym>HTML</acronym> page from. For example, they show you advertisements, and the advertisements are from another computer, often one that belongs to a large advertising group. These advertisements may try to set a cookie which would allow them to track the pages you view across multiple web sites.</para>
+<para>Disabling this option will mean only cookies that come from the same web server as you are explicitly connecting to will be accepted.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Automatically accept session cookies</guilabel
-></term>
+<term><guilabel>Automatically accept session cookies</guilabel></term>
 <listitem>
 
-<para
->An increasingly common use for cookies is not to track your movements across many visits to a web site but to just follow what you do during one single visit. Session cookies are saved as long as you are looking at the site and deleted when you leave it.</para>
+<para>An increasingly common use for cookies is not to track your movements across many visits to a web site but to just follow what you do during one single visit. Session cookies are saved as long as you are looking at the site and deleted when you leave it.</para>
 
-<para
->Web sites can use this information for various things, most commonly it is a convenience so that you do not have to keep logging in to view pages. For example, on a webmail site, without some kind of session <acronym
->ID</acronym
->, you would have to give your password again for each email you want to read. There are other ways to achieve this, but cookies are simple and very common.</para>
+<para>Web sites can use this information for various things, most commonly it is a convenience so that you do not have to keep logging in to view pages. For example, on a webmail site, without some kind of session <acronym>ID</acronym>, you would have to give your password again for each email you want to read. There are other ways to achieve this, but cookies are simple and very common.</para>
 
-<para
->Enabling this option means that session cookies are always accepted, even if you don't accept any other kind, and even if you choose to reject cookies from a particular site, session cookies from that site will be accepted.</para>
+<para>Enabling this option means that session cookies are always accepted, even if you don't accept any other kind, and even if you choose to reject cookies from a particular site, session cookies from that site will be accepted.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Treat all cookies as session cookies</guilabel
-></term>
+<term><guilabel>Treat all cookies as session cookies</guilabel></term>
 <listitem>
-<para
->If this option is enabled, all cookies are treated as session cookies. That is, they are not kept when you leave the web site.</para>
+<para>If this option is enabled, all cookies are treated as session cookies. That is, they are not kept when you leave the web site.</para>
 <note>
-<para
->The definition of <quote
->leave the web site</quote
-> is vague. Some cookies may hang around for a little while after you are no longer viewing any pages on a particular web site. This is normal.</para>
+<para>The definition of <quote>leave the web site</quote> is vague. Some cookies may hang around for a little while after you are no longer viewing any pages on a particular web site. This is normal.</para>
 </note>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->The section for <guilabel
->Default Policy</guilabel
-> sets some further options that are mutually exclusive &mdash; you can choose only one of these options as the default, but you are free to set a different option for any specific web server.</para>
+<para>The section for <guilabel>Default Policy</guilabel> sets some further options that are mutually exclusive &mdash; you can choose only one of these options as the default, but you are free to set a different option for any specific web server.</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Ask for confirmation</guilabel
-></term>
+<term><guilabel>Ask for confirmation</guilabel></term>
 <listitem>
-<para
->If this option is selected, you will be asked for confirmation every time a cookie is stored or retrieved. You can selectively accept or reject each cookie. The confirmation dialogue will also allow you to set a domain specific policy, if you do not want to confirm each cookie for that domain.</para>
+<para>If this option is selected, you will be asked for confirmation every time a cookie is stored or retrieved. You can selectively accept or reject each cookie. The confirmation dialogue will also allow you to set a domain specific policy, if you do not want to confirm each cookie for that domain.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Accept all cookies</guilabel
-></term>
+<term><guilabel>Accept all cookies</guilabel></term>
 <listitem>
-<para
->If this option is selected, all cookies will be accepted without asking for confirmation.</para>
+<para>If this option is selected, all cookies will be accepted without asking for confirmation.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Reject all cookies</guilabel
-></term>
+<term><guilabel>Reject all cookies</guilabel></term>
 <listitem>
-<para
->If this option is selected, all cookies will be rejected without asking for confirmation.</para>
+<para>If this option is selected, all cookies will be rejected without asking for confirmation.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->In addition to the default policy for handling of cookies, which you can set by selecting one of the three options described above, you can also set policies for specific host domains using the controls in the <guilabel
->Domain Specific</guilabel
-> group.</para>
+<para>In addition to the default policy for handling of cookies, which you can set by selecting one of the three options described above, you can also set policies for specific host domains using the controls in the <guilabel>Domain Specific</guilabel> group.</para>
 
-<para
->The Ask, Accept, or Reject policy can be applied to a specific domain by clicking on the <guibutton
->New...</guibutton
-> button, which brings up a dialogue. In this dialogue, you can type the name of the domain (with a leading dot), then select the policy you want to apply to this domain. Note that entries may also get added while you are browsing, if the default policy is to ask for confirmation, and you choose a general policy for a specific host (for example, by selecting <guilabel
->Reject all cookies from this domain</guilabel
-> when asked to confirm a cookie).</para>
+<para>The Ask, Accept, or Reject policy can be applied to a specific domain by clicking on the <guibutton>New...</guibutton> button, which brings up a dialogue. In this dialogue, you can type the name of the domain (with a leading dot), then select the policy you want to apply to this domain. Note that entries may also get added while you are browsing, if the default policy is to ask for confirmation, and you choose a general policy for a specific host (for example, by selecting <guilabel>Reject all cookies from this domain</guilabel> when asked to confirm a cookie).</para>
 
-<para
->You can also select a specific host domain from the list and click the <guibutton
->Change</guibutton
-> button to choose a different policy for that domain than the one shown in the list.</para>
+<para>You can also select a specific host domain from the list and click the <guibutton>Change</guibutton> button to choose a different policy for that domain than the one shown in the list.</para>
 
-<para
->To delete a domain specific policy, choose a domain from the list, and then click the <guibutton
->Delete</guibutton
-> button. The default policy will apply to domains which have been deleted from the list.</para>
+<para>To delete a domain specific policy, choose a domain from the list, and then click the <guibutton>Delete</guibutton> button. The default policy will apply to domains which have been deleted from the list.</para>
 
 </sect2>
 
 <sect2 id="cookie-management">
-<title
->Management</title>
-
-<para
->In the <guilabel
->Management</guilabel
-> tab you can browse and selectively delete cookies that have been set in the past.</para>
-
-<para
->In the upper part of this dialogue, you can see a list of domains displayed as a tree. Click on the little <guiicon
->+</guiicon
-> next to a domain to see all cookies that have been set for this particular target domain. If you select one of these cookies, you will notice that its contents will show up in the frame <guilabel
->Cookie Details</guilabel
-> below.</para>
-
-<para
->By clicking the <guibutton
->Delete</guibutton
-> button you can now delete the selected cookie. Click <guibutton
->Delete All</guibutton
-> to delete all cookies stored.</para>
-
-<para
->Choose <guibutton
->Reload List</guibutton
-> to reload the list from your hard disk. You might want to do this if you have had the module open and are testing web sites or have made many changes in the module itself.</para>
+<title>Management</title>
+
+<para>In the <guilabel>Management</guilabel> tab you can browse and selectively delete cookies that have been set in the past.</para>
+
+<para>In the upper part of this dialogue, you can see a list of domains displayed as a tree. Click on the little <guiicon>+</guiicon> next to a domain to see all cookies that have been set for this particular target domain. If you select one of these cookies, you will notice that its contents will show up in the frame <guilabel>Cookie Details</guilabel> below.</para>
+
+<para>By clicking the <guibutton>Delete</guibutton> button you can now delete the selected cookie. Click <guibutton>Delete All</guibutton> to delete all cookies stored.</para>
+
+<para>Choose <guibutton>Reload List</guibutton> to reload the list from your hard disk. You might want to do this if you have had the module open and are testing web sites or have made many changes in the module itself.</para>
 
 </sect2>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/crypto/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/crypto/index.docbook
index 0c4d8e716c4..65ec3b1d583 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/crypto/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/crypto/index.docbook
@@ -2,311 +2,159 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Mike.McBride; &Mike.McBride.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Mike.McBride; &Mike.McBride.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-10-17</date>
-<releaseinfo
->3.1</releaseinfo>
+<date>2002-10-17</date>
+<releaseinfo>3.1</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->crypto</keyword>
-<keyword
->SSL</keyword>
-<keyword
->encryption</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>crypto</keyword>
+<keyword>SSL</keyword>
+<keyword>encryption</keyword>
 
 </keywordset>
 </articleinfo>
 
 <sect1 id="crypto">
 
-<title
->Encryption Configuration</title>
+<title>Encryption Configuration</title>
 
 <sect2 id="crypto-intro">
-<title
->Introduction</title>
-<para
->Many applications within &kde; are capable of exchanging information using encrypted files and/or network transmissions.</para>
+<title>Introduction</title>
+<para>Many applications within &kde; are capable of exchanging information using encrypted files and/or network transmissions.</para>
 </sect2>
 
 <sect2 id="crypto-use">
-<title
->Use</title>
-
-<warning
-><para
->All encryption schemes are only as strong as their weakest link. In general, unless you have some previous training/knowledge, it is better to leave this module unchanged.</para
-></warning>
-
-<para
->The options within this module can be divided into two groups:</para>
-
-<para
->Two options along the bottom of the module, <guilabel
->Warn on entering SSL Mode</guilabel
-> and <guilabel
->Warn on leaving SSL mode</guilabel
->, allow you to determine if &kde; should inform you when you enter or leave SSL encryption.</para
-> 
-
-<para
->The remainder of the options are about determining which encryption methods to use, and which should not be used. Once you have selected the appropriate encryption protocols, simply click <guibutton
->Apply</guibutton
-> to commit your changes.</para>
-
-<tip
-><para
->Only make changes to this module if specific information about the strength or weakness of a particular encryption method is given to you from <emphasis
->a reliable source</emphasis
->.</para
-></tip>
+<title>Use</title>
+
+<warning><para>All encryption schemes are only as strong as their weakest link. In general, unless you have some previous training/knowledge, it is better to leave this module unchanged.</para></warning>
+
+<para>The options within this module can be divided into two groups:</para>
+
+<para>Two options along the bottom of the module, <guilabel>Warn on entering SSL Mode</guilabel> and <guilabel>Warn on leaving SSL mode</guilabel>, allow you to determine if &kde; should inform you when you enter or leave SSL encryption.</para> 
+
+<para>The remainder of the options are about determining which encryption methods to use, and which should not be used. Once you have selected the appropriate encryption protocols, simply click <guibutton>Apply</guibutton> to commit your changes.</para>
+
+<tip><para>Only make changes to this module if specific information about the strength or weakness of a particular encryption method is given to you from <emphasis>a reliable source</emphasis>.</para></tip>
 
 </sect2>
 
 <!-- Ugh.. write a bunch of stuff about the rest of it -->
 <sect2 id="ssl_tab">
-<title
->The <guilabel
->SSL</guilabel
-> Tab</title>
-
-<para
->The first option is <guilabel
->Enable TLS support if supported by the server</guilabel
->. <acronym
->TLS</acronym
-> is Transport Layer Security, and is the newest version of <acronym
->SSL</acronym
->. It integrates better than <acronym
->SSL</acronym
-> with other protocols, and it has replaced <acronym
->SSL</acronym
-> in protocols such as POP3 and <acronym
->SMTP</acronym
->.</para>
-
-<para
->Then next options are <guilabel
->Enable SSL v2</guilabel
-> and <guilabel
->Enable SSL v3</guilabel
->. These are the second and third revision of the <acronym
->SSL</acronym
-> protocol, and it is normal to enable both.</para>
-
-<para
->There are several different <firstterm
->Ciphers</firstterm
-> available, and you can enable these separately in the lists labelled <guilabel
->SSL v2 Ciphers to Use</guilabel
-> and <guilabel
->SSL v3 Ciphers to Use</guilabel
->. The actual protocol to use is negotiated by the application and the server when the connection is created.</para>
-
-<para
->There are several <guilabel
->Cipher Wizards</guilabel
-> to help you choose a set that is suitable for your use.</para>
+<title>The <guilabel>SSL</guilabel> Tab</title>
+
+<para>The first option is <guilabel>Enable TLS support if supported by the server</guilabel>. <acronym>TLS</acronym> is Transport Layer Security, and is the newest version of <acronym>SSL</acronym>. It integrates better than <acronym>SSL</acronym> with other protocols, and it has replaced <acronym>SSL</acronym> in protocols such as POP3 and <acronym>SMTP</acronym>.</para>
+
+<para>Then next options are <guilabel>Enable SSL v2</guilabel> and <guilabel>Enable SSL v3</guilabel>. These are the second and third revision of the <acronym>SSL</acronym> protocol, and it is normal to enable both.</para>
+
+<para>There are several different <firstterm>Ciphers</firstterm> available, and you can enable these separately in the lists labelled <guilabel>SSL v2 Ciphers to Use</guilabel> and <guilabel>SSL v3 Ciphers to Use</guilabel>. The actual protocol to use is negotiated by the application and the server when the connection is created.</para>
+
+<para>There are several <guilabel>Cipher Wizards</guilabel> to help you choose a set that is suitable for your use.</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guibutton
->Most Compatible</guibutton
-></term>
+<term><guibutton>Most Compatible</guibutton></term>
 <listitem>
-<para
->Select the settings found to be most compatible with the most servers.</para>
+<para>Select the settings found to be most compatible with the most servers.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guibutton
->US Ciphers Only</guibutton
-></term>
+<term><guibutton>US Ciphers Only</guibutton></term>
 <listitem>
-<para
->Select only the US <quote
->strong</quote
-> (128 bit or greater) ciphers.</para>
+<para>Select only the US <quote>strong</quote> (128 bit or greater) ciphers.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guibutton
->Export Ciphers Only</guibutton
-></term>
+<term><guibutton>Export Ciphers Only</guibutton></term>
 <listitem>
-<para
->Select only the weak (56 bit or less) ciphers.</para>
+<para>Select only the weak (56 bit or less) ciphers.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guibutton
->Enable All</guibutton
-></term>
+<term><guibutton>Enable All</guibutton></term>
 <listitem>
-<para
->Select all ciphers and methods.</para>
+<para>Select all ciphers and methods.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->Finally, there are some general <acronym
->SSL</acronym
-> settings.</para>
+<para>Finally, there are some general <acronym>SSL</acronym> settings.</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Use EGD</guilabel
-></term>
+<term><guilabel>Use EGD</guilabel></term>
 <listitem>
-<para
->If selected, <application
->OpenSSL</application
-> will be asked to use the entropy gathering daemon (<acronym
->EGD</acronym
->) for initialising the pseudo-random number generator.</para>
+<para>If selected, <application>OpenSSL</application> will be asked to use the entropy gathering daemon (<acronym>EGD</acronym>) for initialising the pseudo-random number generator.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Use entropy file</guilabel
-></term>
+<term><guilabel>Use entropy file</guilabel></term>
 <listitem>
-<para
->If selected, <application
->OpenSSL</application
-> will be asked to use the given file as entropy for initialising the pseudo-random number generator.</para>
+<para>If selected, <application>OpenSSL</application> will be asked to use the given file as entropy for initialising the pseudo-random number generator.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Warn on entering SSL mode</guilabel
-></term>
+<term><guilabel>Warn on entering SSL mode</guilabel></term>
 <listitem>
-<para
->If selected, you will be notified when entering an <acronym
->SSL</acronym
-> enabled site.</para>
+<para>If selected, you will be notified when entering an <acronym>SSL</acronym> enabled site.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Warn on leaving SSL mode</guilabel
-></term>
+<term><guilabel>Warn on leaving SSL mode</guilabel></term>
 <listitem>
-<para
->If selected, you will be notified when leaving an <acronym
->SSL</acronym
-> based site.</para>
+<para>If selected, you will be notified when leaving an <acronym>SSL</acronym> based site.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Warn on sending unencrypted data</guilabel
-></term>
+<term><guilabel>Warn on sending unencrypted data</guilabel></term>
 <listitem>
-<para
->If selected, you will be notified before sending unencrypted data via a web browser.</para>
+<para>If selected, you will be notified before sending unencrypted data via a web browser.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 </sect2>
 
 <sect2 id="openssl">
-<title
->The <guilabel
->OpenSSL</guilabel
-> Tab</title>
-
-<para
->Here you can test if your <application
->OpenSSL</application
-> libraries have been detected correctly by &kde;, with the <guibutton
->Test</guibutton
-> button.</para>
-
-<para
->If the test is unsuccessful, you can specify a path to the libraries in the field labelled <guilabel
->Path to OpenSSL Shared Libraries</guilabel
->.</para>
+<title>The <guilabel>OpenSSL</guilabel> Tab</title>
+
+<para>Here you can test if your <application>OpenSSL</application> libraries have been detected correctly by &kde;, with the <guibutton>Test</guibutton> button.</para>
+
+<para>If the test is unsuccessful, you can specify a path to the libraries in the field labelled <guilabel>Path to OpenSSL Shared Libraries</guilabel>.</para>
 
 </sect2>
 
 <sect2 id="your-certificates">
-<title
->The <guilabel
->Your Certificates</guilabel
-> Tab</title>
+<title>The <guilabel>Your Certificates</guilabel> Tab</title>
 
-<para
->The list shows which certificates of yours &kde; knows about. You can easily manage them from here.</para>
+<para>The list shows which certificates of yours &kde; knows about. You can easily manage them from here.</para>
 
 </sect2>
 
 <sect2 id="authentication">
-<title
->The <guilabel
->Authentication</guilabel
-> Tab</title>
+<title>The <guilabel>Authentication</guilabel> Tab</title>
 
-<para
->Not yet documented </para>
+<para>Not yet documented </para>
 </sect2>
 
 <sect2 id="peer-ssl-certificates">
-<title
->The <guilabel
->Peer SSL Certificates</guilabel
-> Tab</title>
+<title>The <guilabel>Peer SSL Certificates</guilabel> Tab</title>
 
-<para
->The list box shows which site and personal certificates &kde; knows about. You can easily manage them from here.</para>
+<para>The list box shows which site and personal certificates &kde; knows about. You can easily manage them from here.</para>
 
 </sect2>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/desktop/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/desktop/index.docbook
index 43b1ffca305..e529e365342 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/desktop/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/desktop/index.docbook
@@ -2,153 +2,77 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Mike.McBride; &Mike.McBride.mail;</author>
-<author
->&Jost.Schenck; &Jost.Schenck.mail;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Mike.McBride; &Mike.McBride.mail;</author>
+<author>&Jost.Schenck; &Jost.Schenck.mail;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2003-10-08</date>
-<releaseinfo
->3.2</releaseinfo>
+<date>2003-10-08</date>
+<releaseinfo>3.2</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->desktop</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>desktop</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="desktop">
 
-<title
->Desktop</title>
+<title>Desktop</title>
 
 <sect2 id="desktop-appearance">
-<title
-><guilabel
->Appearance Tab</guilabel
-></title>
+<title><guilabel>Appearance Tab</guilabel></title>
 
-<para
->Here you can configure how icons on your desktop appear.</para>
+<para>Here you can configure how icons on your desktop appear.</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Standard font:</guilabel
-></term>
-<listitem
-><para
->This option can be used to change the typeface used on the desktop. Simply select your typeface from the dropdown box.</para
-></listitem>
+<term><guilabel>Standard font:</guilabel></term>
+<listitem><para>This option can be used to change the typeface used on the desktop. Simply select your typeface from the dropdown box.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Font size:</guilabel
-></term>
-<listitem
-><para
->You can change the relative size of the text on the Desktop. </para
-></listitem>
+<term><guilabel>Font size:</guilabel></term>
+<listitem><para>You can change the relative size of the text on the Desktop. </para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Normal text colour:</guilabel
-></term>
-<listitem
-><para
->This option lets you select the colour of normal (or unhighlighted) text.</para
-></listitem>
+<term><guilabel>Normal text colour:</guilabel></term>
+<listitem><para>This option lets you select the colour of normal (or unhighlighted) text.</para></listitem>
 </varlistentry>
-<varlistentry
-><term
-><guilabel
->Text background colour:</guilabel
-></term>
-<listitem
-><para
->This option lets you select the background colour of normal text. If left unchecked, the text has a transparent background. If selected, you can choose the colour by pressing the button. </para
-></listitem>
+<varlistentry><term><guilabel>Text background colour:</guilabel></term>
+<listitem><para>This option lets you select the background colour of normal text. If left unchecked, the text has a transparent background. If selected, you can choose the colour by pressing the button. </para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Underline filenames:</guilabel
-></term>
-<listitem
-><para
->Determines if file names are underlined on the Desktop.</para
-></listitem>
+<term><guilabel>Underline filenames:</guilabel></term>
+<listitem><para>Determines if file names are underlined on the Desktop.</para></listitem>
 </varlistentry>
 </variablelist>
 </sect2>
 
 <sect2 id="desktop-number">
-<title
-><guilabel
->Multiple Desktops</guilabel
-></title>
+<title><guilabel>Multiple Desktops</guilabel></title>
 
-<para
->&kde; offers you the possibility to have several virtual desktops. In this tab you can configure the number of desktops as well as their names. Just use the slider to adjust the number of desktops. You can assign names to the desktops by entering text into the text fields below.</para
-> 
+<para>&kde; offers you the possibility to have several virtual desktops. In this tab you can configure the number of desktops as well as their names. Just use the slider to adjust the number of desktops. You can assign names to the desktops by entering text into the text fields below.</para> 
 
-<para
->If enable <guilabel
->Mouse wheel over desktop switches desktop</guilabel
-> then scrolling the wheel over an empty space on the desktop will change the the next virtual desktop numerically, in the direction you scrolled (either up or down).</para>
+<para>If enable <guilabel>Mouse wheel over desktop switches desktop</guilabel> then scrolling the wheel over an empty space on the desktop will change the the next virtual desktop numerically, in the direction you scrolled (either up or down).</para>
 
 </sect2>
 
 <sect2 id="desktop-desktop-path">
-<title
-><guilabel
->Paths</guilabel
-></title>
-
-<para
->You can use this section to configure where Desktop files, Wastebin files, and Autostart files are stored on your computer as well as the standard path for documents. </para>
-
-<warning
-><para
->By changing the values in the first three of these paths, you will automatically move the files from their previous to their new location. </para
-></warning>
-
-<note
-><para
->Do not just delete the icons from the desktop. If you dislike them move them somewhere else in this module or hide them (with a dot in the front of the filename). If the paths in this dialogue do not exist when &kde; is started, they will be recreated.</para
-></note>
+<title><guilabel>Paths</guilabel></title>
+
+<para>You can use this section to configure where Desktop files, Wastebin files, and Autostart files are stored on your computer as well as the standard path for documents. </para>
+
+<warning><para>By changing the values in the first three of these paths, you will automatically move the files from their previous to their new location. </para></warning>
+
+<note><para>Do not just delete the icons from the desktop. If you dislike them move them somewhere else in this module or hide them (with a dot in the front of the filename). If the paths in this dialogue do not exist when &kde; is started, they will be recreated.</para></note>
 
 </sect2>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/desktopbehavior/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/desktopbehavior/index.docbook
index 80ad24d9b3c..53aa4e1ffad 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/desktopbehavior/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/desktopbehavior/index.docbook
@@ -2,218 +2,113 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Mike.McBride; &Mike.McBride.mail;</author>
-<author
->&Jost.Schenck; &Jost.Schenck.mail;</author>
-<othercredit role="translator"
-><firstname
->Jonathan</firstname
-><surname
->Riddell</surname
-><affiliation
-><address
-><email
->kde-en-gb@jriddell.org</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Mike.McBride; &Mike.McBride.mail;</author>
+<author>&Jost.Schenck; &Jost.Schenck.mail;</author>
+<othercredit role="translator"><firstname>Jonathan</firstname><surname>Riddell</surname><affiliation><address><email>kde-en-gb@jriddell.org</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-02-12</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-02-12</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->desktop</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>desktop</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="desktop">
 
-<title
->Desktop Behaviour</title>
+<title>Desktop Behaviour</title>
 
 <sect2 id="desktop-desktop">
-<title
-><guilabel
->Desktop</guilabel
-> Tab</title>
+<title><guilabel>Desktop</guilabel> Tab</title>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Show icons on desktop</guilabel
-></term>
+<term><guilabel>Show icons on desktop</guilabel></term>
 <listitem>
-<para
->Uncheck this option if you do not want to have icons on the desktop. Without icons the desktop may be somewhat faster, but you will no longer be able to drag files to the desktop.</para>
-<para
->This will not remove any files already stored on the desktop, they will instead be hidden.</para>
+<para>Uncheck this option if you do not want to have icons on the desktop. Without icons the desktop may be somewhat faster, but you will no longer be able to drag files to the desktop.</para>
+<para>This will not remove any files already stored on the desktop, they will instead be hidden.</para>
 
-<para
->If this is enabled, several further options become available:</para>
+<para>If this is enabled, several further options become available:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Automatically line up icons</guilabel
-></term>
-<listitem
-><para
->If this option is enabled, &kde; will align icons on a grid on the desktop. If it is not enabled, you may drop icons anywhere, and they will not be aligned for you.</para
-></listitem>
+<term><guilabel>Automatically line up icons</guilabel></term>
+<listitem><para>If this option is enabled, &kde; will align icons on a grid on the desktop. If it is not enabled, you may drop icons anywhere, and they will not be aligned for you.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Show hidden files</guilabel
-></term>
-<listitem
-><para
->If this option is enabled, then all hidden files will appear on the desktop. Generally this only clutters your desktop area, but if you are often working with hidden files or folders, this can be useful.</para>
-<warning
-><para
->Be very careful when deleting or modifying hidden files. Many of these files are configuration files and are essential for the correct operation of your computer.</para
-></warning>
+<term><guilabel>Show hidden files</guilabel></term>
+<listitem><para>If this option is enabled, then all hidden files will appear on the desktop. Generally this only clutters your desktop area, but if you are often working with hidden files or folders, this can be useful.</para>
+<warning><para>Be very careful when deleting or modifying hidden files. Many of these files are configuration files and are essential for the correct operation of your computer.</para></warning>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Allow programs in desktop window</guilabel
-></term>
+<term><guilabel>Allow programs in desktop window</guilabel></term>
 <listitem>
-<para
->Enabling this option allows you to set a program as your desktop background, for example <command
->xearth</command
->, or &kworldclock;</para>
+<para>Enabling this option allows you to set a program as your desktop background, for example <command>xearth</command>, or &kworldclock;</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->Below these options you can see a list titled <guilabel
->Show Icon Previews For</guilabel
->. The &kde; desktop has a preview feature for many file types, including <acronym
->HTML</acronym
-> files, images, &PostScript; and <acronym
->PDF</acronym
->, sound, web archives (if you have the appropriate &konqueror; plugin installed) and text files.</para>
-
-<para
->if you enable previews for one of these, files of that particular file type will not be represented by standard icons on the desktop, but will instead be shown as miniature previews. On slow computers, the previews can take some time to show up, so you might not want to enable this feature.</para>
-
-<para
->Finally there is <guilabel
->Display device icons:</guilabel
->.</para>
-
-<para
->On some operating systems (&Linux; and FreeBSD, so far) &kde; can dynamically display icons for each <firstterm
->mountable</firstterm
-> device you have available. This could be &CD-ROM; drives, floppy disk drives, or network shares.</para>
-
-<para
->If you enable this, you can choose what kind, if any, of these devices you would like quick access icons to be displayed for.</para>
+<para>Below these options you can see a list titled <guilabel>Show Icon Previews For</guilabel>. The &kde; desktop has a preview feature for many file types, including <acronym>HTML</acronym> files, images, &PostScript; and <acronym>PDF</acronym>, sound, web archives (if you have the appropriate &konqueror; plugin installed) and text files.</para>
+
+<para>if you enable previews for one of these, files of that particular file type will not be represented by standard icons on the desktop, but will instead be shown as miniature previews. On slow computers, the previews can take some time to show up, so you might not want to enable this feature.</para>
+
+<para>Finally there is <guilabel>Display device icons:</guilabel>.</para>
+
+<para>On some operating systems (&Linux; and FreeBSD, so far) &kde; can dynamically display icons for each <firstterm>mountable</firstterm> device you have available. This could be &CD-ROM; drives, floppy disk drives, or network shares.</para>
+
+<para>If you enable this, you can choose what kind, if any, of these devices you would like quick access icons to be displayed for.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Show tooltips</guilabel
-></term>
+<term><guilabel>Show tooltips</guilabel></term>
 <listitem>
-<para
->Check this option if you would like to see tooltips for icons on the desktop as you hover the mouse over them. These tooltips display information about the file represented by the icon. Depending on the type of file, the information can range from simple file size and creation dates for unfamiliar file types, to complete meta information such as the content of tags for music files.</para>
+<para>Check this option if you would like to see tooltips for icons on the desktop as you hover the mouse over them. These tooltips display information about the file represented by the icon. Depending on the type of file, the information can range from simple file size and creation dates for unfamiliar file types, to complete meta information such as the content of tags for music files.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Mouse button actions:</guilabel
-></term>
+<term><guilabel>Mouse button actions:</guilabel></term>
 <listitem>
 
-<para
->The mouse button section allows you to determine what happens when you click one of the three mouse buttons on the Desktop (where there is no window).</para>
+<para>The mouse button section allows you to determine what happens when you click one of the three mouse buttons on the Desktop (where there is no window).</para>
 
-<note
-><para
->Not all mice have three buttons. Two button mice can usually activate the <mousebutton
->Middle</mousebutton
-> button by pressing both the <mousebutton
->Left</mousebutton
-> and <mousebutton
->Right</mousebutton
-> mouse buttons at the same time.</para
-></note>
+<note><para>Not all mice have three buttons. Two button mice can usually activate the <mousebutton>Middle</mousebutton> button by pressing both the <mousebutton>Left</mousebutton> and <mousebutton>Right</mousebutton> mouse buttons at the same time.</para></note>
 
-<para
->For each of the three mouse buttons, you can select:</para>
+<para>For each of the three mouse buttons, you can select:</para>
 
 <variablelist>
 <varlistentry>
-<term
->No Action</term>
-<listitem
-><para
->When you use this mouse button, nothing happens.</para
-></listitem>
+<term>No Action</term>
+<listitem><para>When you use this mouse button, nothing happens.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Window list menu</term>
-<listitem
-><para
->This brings up a submenu with all the virtual desktops. Under each virtual desktop, you can select any window currently located on that desktop. Once selected, &kde; will switch to that desktop, and place the focus on that window.</para
-></listitem>
+<term>Window list menu</term>
+<listitem><para>This brings up a submenu with all the virtual desktops. Under each virtual desktop, you can select any window currently located on that desktop. Once selected, &kde; will switch to that desktop, and place the focus on that window.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Desktop Menu.</term>
-<listitem
-><para
->This brings up a submenu with commands specific to &kde;. You can create icons, edit bookmarks, cut and paste, run commands, configure &kde;, arrange icons, lock the session and log out of &kde;. The exact content of the menu varies depending on the current status of &kde;. </para
-></listitem>
+<term>Desktop Menu.</term>
+<listitem><para>This brings up a submenu with commands specific to &kde;. You can create icons, edit bookmarks, cut and paste, run commands, configure &kde;, arrange icons, lock the session and log out of &kde;. The exact content of the menu varies depending on the current status of &kde;. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Application Menu</term>
-<listitem
-><para
->This brings up the <guimenu
->Application</guimenu
-> Menus (also know as the <guimenu
->K</guimenu
-> Menus), so you can start a new application.</para
-></listitem>
+<term>Application Menu</term>
+<listitem><para>This brings up the <guimenu>Application</guimenu> Menus (also know as the <guimenu>K</guimenu> Menus), so you can start a new application.</para></listitem>
 </varlistentry>
 </variablelist>
 <!-- FIXME: someone needs to write something about these custom menus -->
@@ -222,22 +117,11 @@
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Show menu bar at the top of the screeen:</guilabel
-></term>
+<term><guilabel>Show menu bar at the top of the screeen:</guilabel></term>
 <listitem>
-<para
->This option determines whether there is a menu across the top of the &kde; Desktop similar to the style of &MacOS;.</para>
-
-<para
->The default is <guilabel
->None</guilabel
->. If you select <guilabel
->Desktop menu bar</guilabel
-> one static menu is shown at the top of the screen, displaying the desktop menu. Finally there is <guilabel
->Current application's menu bar (Mac OS-style)</guilabel
->. If this option is selected, applications won't have their menu bar attached to their own window anymore. Instead, there is one menu bar at the top of the screen which shows the menus of the currently active application. You might recognise this behaviour from &MacOS;. </para>
+<para>This option determines whether there is a menu across the top of the &kde; Desktop similar to the style of &MacOS;.</para>
+
+<para>The default is <guilabel>None</guilabel>. If you select <guilabel>Desktop menu bar</guilabel> one static menu is shown at the top of the screen, displaying the desktop menu. Finally there is <guilabel>Current application's menu bar (Mac OS-style)</guilabel>. If this option is selected, applications won't have their menu bar attached to their own window anymore. Instead, there is one menu bar at the top of the screen which shows the menus of the currently active application. You might recognise this behaviour from &MacOS;. </para>
 
 </listitem>
 </varlistentry>
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/ebrowsing/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/ebrowsing/index.docbook
index 2753da77908..cc60b7c1206 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/ebrowsing/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/ebrowsing/index.docbook
@@ -2,225 +2,75 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Krishna.Tateneni; &Krishna.Tateneni.mail;</author>
-<author
->&Yves.Arrouye; &Yves.Arrouye.mail;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Krishna.Tateneni; &Krishna.Tateneni.mail;</author>
+<author>&Yves.Arrouye; &Yves.Arrouye.mail;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-10-16</date>
-<releaseinfo
->3.1</releaseinfo>
+<date>2002-10-16</date>
+<releaseinfo>3.1</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->enhanced browsing</keyword>
-<keyword
->web shortcuts</keyword>
-<keyword
->browsing</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>enhanced browsing</keyword>
+<keyword>web shortcuts</keyword>
+<keyword>browsing</keyword>
 </keywordset>
 
 </articleinfo>
 <sect1 id="ebrowse">
 
-<title
->Web Shortcuts</title>
+<title>Web Shortcuts</title>
 
 <sect2 id="ebrowse-intro">
 
-<title
->Introduction</title>
-
-<para
->&konqueror; offers some features to enhance your browsing experience. One such feature is <emphasis
->Web Shortcuts</emphasis
->.</para>
-
-<para
->You may already have noticed that &kde; is very Internet friendly. For example, you can click on the <guimenuitem
->Run</guimenuitem
-> menu item or type the keyboard shortcut assigned to that command (<keycombo action="simul"
-><keycap
->Alt</keycap
-><keycap
->F2</keycap
-></keycombo
->, unless you have changed it) and type in a <acronym
->URI</acronym
->. <footnote
-><para
->Uniform Resource Identifier. A standard way of referring to a resource such as a file on your computer, a World Wide Web address, an email address, <abbrev
->etc...</abbrev
->.</para
-></footnote
-></para>
-
-<para
->Web shortcuts, on the other hand, let you come up with new pseudo <acronym
->URL</acronym
-> schemes, or shortcuts, that basically let you <emphasis
->parameterise</emphasis
-> commonly used <acronym
->URI</acronym
->s. For example, if you like the Google search engine, you can configure KDE so that a pseudo <acronym
->URL</acronym
-> scheme like <emphasis
->gg</emphasis
-> will trigger a search on Google. This way, typing <userinput
->gg:<replaceable
->my query</replaceable
-></userinput
-> will search for <replaceable
->my query</replaceable
-> on Google.</para>
-
-<note
-><para
->One can see why we call these pseudo <acronym
->URL</acronym
-> schemes. They are used like a <acronym
->URL</acronym
-> scheme, but the input is not properly <acronym
->URL</acronym
-> encoded, so one will type <userinput
->google:kde apps</userinput
-> and not <userinput
->google:kde+apps</userinput
->.</para
-></note>
-
-<para
->You can use web shortcuts wherever you would normally use <acronym
->URI</acronym
->s. Shortcuts for several search engines should already be configured on your system, but you can add new keywords and change or delete existing ones in the enhanced browsing control module. </para>
+<title>Introduction</title>
+
+<para>&konqueror; offers some features to enhance your browsing experience. One such feature is <emphasis>Web Shortcuts</emphasis>.</para>
+
+<para>You may already have noticed that &kde; is very Internet friendly. For example, you can click on the <guimenuitem>Run</guimenuitem> menu item or type the keyboard shortcut assigned to that command (<keycombo action="simul"><keycap>Alt</keycap><keycap>F2</keycap></keycombo>, unless you have changed it) and type in a <acronym>URI</acronym>. <footnote><para>Uniform Resource Identifier. A standard way of referring to a resource such as a file on your computer, a World Wide Web address, an email address, <abbrev>etc...</abbrev>.</para></footnote></para>
+
+<para>Web shortcuts, on the other hand, let you come up with new pseudo <acronym>URL</acronym> schemes, or shortcuts, that basically let you <emphasis>parameterise</emphasis> commonly used <acronym>URI</acronym>s. For example, if you like the Google search engine, you can configure KDE so that a pseudo <acronym>URL</acronym> scheme like <emphasis>gg</emphasis> will trigger a search on Google. This way, typing <userinput>gg:<replaceable>my query</replaceable></userinput> will search for <replaceable>my query</replaceable> on Google.</para>
+
+<note><para>One can see why we call these pseudo <acronym>URL</acronym> schemes. They are used like a <acronym>URL</acronym> scheme, but the input is not properly <acronym>URL</acronym> encoded, so one will type <userinput>google:kde apps</userinput> and not <userinput>google:kde+apps</userinput>.</para></note>
+
+<para>You can use web shortcuts wherever you would normally use <acronym>URI</acronym>s. Shortcuts for several search engines should already be configured on your system, but you can add new keywords and change or delete existing ones in the enhanced browsing control module. </para>
 
 </sect2>
 
 <sect2 id="ebrowse-use">
 
-<title
->Use</title>
+<title>Use</title>
 
-<para
->There is a single tab in this control module. The title of the tab is <guilabel
->Keywords</guilabel
->. This tab features two main boxes, one for Internet Keywords and one for web shortcuts.</para>
+<para>There is a single tab in this control module. The title of the tab is <guilabel>Keywords</guilabel>. This tab features two main boxes, one for Internet Keywords and one for web shortcuts.</para>
 
 <sect3 id="ebrowse-srch-use">
 
-<title
->Web Shortcuts</title>
-
-<para
->The descriptive names of defined web shortcuts are shown in a listbox. As with other lists in &kde;, you can click on a column heading to toggle the sort order between ascending and descending, and you can resize the columns.</para>
-
-<para
->If you double-click on a specific entry in the list of defined search providers, the details for that entry are shown in a popup dialogue. In addition to the descriptive name for the item, you can also see the <acronym
->URI</acronym
-> which is used, as well as the associated shortcuts which you can type anywhere in &kde; where <acronym
->URI</acronym
->s are expected. A given search provider can have multiple shortcuts, each separated by a comma.</para>
-
-<para
->The text boxes are used not only for displaying information about an item in the list of web shortcuts, but also for modifying or adding new items.</para>
-
-<para
->You can change the contents of either the <guilabel
->Search URI</guilabel
-> or the <guilabel
->URI Shortcuts</guilabel
-> text box. Click <guibutton
->OK</guibutton
-> to save your changes or <guibutton
->Cancel</guibutton
-> to exit the dialogue with no changes.</para>
-
-<para
->If you examine the contents of the <guilabel
->Search URI</guilabel
-> text box, you will find that most, if not all of the entries have a <option
->\{@}</option
-> in them. This sequence of two characters acts as a parameter, which is to say that they are replaced by whatever you happen to type after the colon character that is between a shortcut and its parameter. Let's consider some examples to clarify this idea.</para>
-
-<para
->Suppose that the <acronym
->URI</acronym
-> is <userinput
->http://www.google.com/search?q=\{@}</userinput
->, and <userinput
->gg</userinput
-> is a shortcut to this <acronym
->URI</acronym
->. Then, typing <userinput
->gg:<replaceable
->alpha</replaceable
-></userinput
-> is equivalent to <userinput
->http://www.google.com/search?q=<replaceable
->alpha</replaceable
-></userinput
->. You could type anything after the <userinput
->:</userinput
-> character; whatever you have typed simply replaces the <option
->\{@}</option
-> characters, after being converted to the appropriate character set for the search provider and then properly <acronym
->URL</acronym
->-encoded. Only the <option
->\{@}</option
-> part of the search <acronym
->URI</acronym
-> is touched, the rest of it is supposed to be properly <acronym
->URL</acronym
->-encoded already and is left as is.</para>
-
-<para
->You can also have shortcuts without parameters. Suppose the <acronym
->URI</acronym
-> was <emphasis
->file:/home/me/mydocs/kofficefiles/kword</emphasis
-> and the shortcut was <emphasis
->mykword</emphasis
->. Then, typing <userinput
->mykword:</userinput
-> is the same as typing the complete <acronym
->URI</acronym
->. Note that there is nothing after the colon when typing the shortcut, but the colon is still required in order for the shortcut to be recognised as such.</para>
-
-<para
->By now, you will have understood that even though these shortcuts are called web shortcuts, they really are shortcuts to parameterised <acronym
->URI</acronym
->s, which can point not only to web sites like search engines but also to anything else that can be pointed to by a <acronym
->URI</acronym
->. Web shortcuts are a very powerful feature of navigation in &kde;.</para>
+<title>Web Shortcuts</title>
+
+<para>The descriptive names of defined web shortcuts are shown in a listbox. As with other lists in &kde;, you can click on a column heading to toggle the sort order between ascending and descending, and you can resize the columns.</para>
+
+<para>If you double-click on a specific entry in the list of defined search providers, the details for that entry are shown in a popup dialogue. In addition to the descriptive name for the item, you can also see the <acronym>URI</acronym> which is used, as well as the associated shortcuts which you can type anywhere in &kde; where <acronym>URI</acronym>s are expected. A given search provider can have multiple shortcuts, each separated by a comma.</para>
+
+<para>The text boxes are used not only for displaying information about an item in the list of web shortcuts, but also for modifying or adding new items.</para>
+
+<para>You can change the contents of either the <guilabel>Search URI</guilabel> or the <guilabel>URI Shortcuts</guilabel> text box. Click <guibutton>OK</guibutton> to save your changes or <guibutton>Cancel</guibutton> to exit the dialogue with no changes.</para>
+
+<para>If you examine the contents of the <guilabel>Search URI</guilabel> text box, you will find that most, if not all of the entries have a <option>\{@}</option> in them. This sequence of two characters acts as a parameter, which is to say that they are replaced by whatever you happen to type after the colon character that is between a shortcut and its parameter. Let's consider some examples to clarify this idea.</para>
+
+<para>Suppose that the <acronym>URI</acronym> is <userinput>http://www.google.com/search?q=\{@}</userinput>, and <userinput>gg</userinput> is a shortcut to this <acronym>URI</acronym>. Then, typing <userinput>gg:<replaceable>alpha</replaceable></userinput> is equivalent to <userinput>http://www.google.com/search?q=<replaceable>alpha</replaceable></userinput>. You could type anything after the <userinput>:</userinput> character; whatever you have typed simply replaces the <option>\{@}</option> characters, after being converted to the appropriate character set for the search provider and then properly <acronym>URL</acronym>-encoded. Only the <option>\{@}</option> part of the search <acronym>URI</acronym> is touched, the rest of it is supposed to be properly <acronym>URL</acronym>-encoded already and is left as is.</para>
+
+<para>You can also have shortcuts without parameters. Suppose the <acronym>URI</acronym> was <emphasis>file:/home/me/mydocs/kofficefiles/kword</emphasis> and the shortcut was <emphasis>mykword</emphasis>. Then, typing <userinput>mykword:</userinput> is the same as typing the complete <acronym>URI</acronym>. Note that there is nothing after the colon when typing the shortcut, but the colon is still required in order for the shortcut to be recognised as such.</para>
+
+<para>By now, you will have understood that even though these shortcuts are called web shortcuts, they really are shortcuts to parameterised <acronym>URI</acronym>s, which can point not only to web sites like search engines but also to anything else that can be pointed to by a <acronym>URI</acronym>. Web shortcuts are a very powerful feature of navigation in &kde;.</para>
 
 </sect3>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/email/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/email/index.docbook
index f4571453809..2497c28be53 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/email/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/email/index.docbook
@@ -2,128 +2,70 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Krishna.Tateneni; &Krishna.Tateneni.mail;</author>
-<author
->&Jost.Schenck; &Jost.Schenck.mail;</author>
-<author
->&Mike.McBride; &Mike.McBride.mail;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Krishna.Tateneni; &Krishna.Tateneni.mail;</author>
+<author>&Jost.Schenck; &Jost.Schenck.mail;</author>
+<author>&Mike.McBride; &Mike.McBride.mail;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-09-01</date>
-<releaseinfo
->3.1.00</releaseinfo>
+<date>2002-09-01</date>
+<releaseinfo>3.1.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->email</keyword>
-<keyword
->e-mail</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>email</keyword>
+<keyword>e-mail</keyword>
 </keywordset>
 
 </articleinfo>
 <sect1 id="e-mail">
-<title
->Email</title>
+<title>Email</title>
 
 
 <sect2 id="email-intro">
-<title
->Introduction</title>
+<title>Introduction</title>
 
-<para
->The email module of the &kcontrol; allows you to enter and save some basic email information. This information is used when performing functions related to email within &kde;, for example, when sending bug reports from the &kde; crash handler application.</para>
+<para>The email module of the &kcontrol; allows you to enter and save some basic email information. This information is used when performing functions related to email within &kde;, for example, when sending bug reports from the &kde; crash handler application.</para>
 
-<para
->Programs such as &kmail;, which are used for reading and sending email, may offer many more options for customising the way in which email is handled. These options depend upon the specific program being used. &kmail;, for instance, offers its own configuration facilities.</para>
+<para>Programs such as &kmail;, which are used for reading and sending email, may offer many more options for customising the way in which email is handled. These options depend upon the specific program being used. &kmail;, for instance, offers its own configuration facilities.</para>
 
-<para
->Some of the information needed for configuring email should have been provided by your internet service provider (<acronym
->ISP</acronym
->). If you are connected to a local network, then the system administrator of your network should be able to help you.</para>
+<para>Some of the information needed for configuring email should have been provided by your internet service provider (<acronym>ISP</acronym>). If you are connected to a local network, then the system administrator of your network should be able to help you.</para>
 
 </sect2>
 
 <sect2 id="email-use">
-<title
->Use</title>
+<title>Use</title>
 
-<para
->&kde; automatically establishes some of the information for this control module using the login information on the system. You will need to enter the remaining information.</para>
-<para
->Looking at the page from top to bottom, the options are:</para>
+<para>&kde; automatically establishes some of the information for this control module using the login information on the system. You will need to enter the remaining information.</para>
+<para>Looking at the page from top to bottom, the options are:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Full name</guilabel
-></term>
-<listitem
-><para
->Type your full name as you would like it to appear in the email messages that you send. </para
-></listitem>
+<term><guilabel>Full name</guilabel></term>
+<listitem><para>Type your full name as you would like it to appear in the email messages that you send. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Organisation</guilabel
-></term>
-<listitem
-><para
->If you work for a company or organisation, you can enter its name in this text box.</para
-></listitem>
+<term><guilabel>Organisation</guilabel></term>
+<listitem><para>If you work for a company or organisation, you can enter its name in this text box.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Email address</guilabel
-></term>
-<listitem
-><para
->To be able to use email, you must enter your email address here.</para
-></listitem>
+<term><guilabel>Email address</guilabel></term>
+<listitem><para>To be able to use email, you must enter your email address here.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Reply-to address</guilabel
-></term>
-<listitem
-><para
->If replies to your email messages should be sent to a different address, you can enter that address in this text box.</para
-></listitem>
+<term><guilabel>Reply-to address</guilabel></term>
+<listitem><para>If replies to your email messages should be sent to a different address, you can enter that address in this text box.</para></listitem>
 </varlistentry>
 </variablelist>
 </sect2>
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/energy/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/energy/index.docbook
index 4814541ce14..c2bdd26c078 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/energy/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/energy/index.docbook
@@ -2,134 +2,68 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Mike.McBride; &Mike.McBride.mail;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Mike.McBride; &Mike.McBride.mail;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-02-12</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-02-12</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->energy</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>energy</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="energy">
-<title
->Energy</title>
+<title>Energy</title>
 
 <sect2 id="energy-intro">
-<title
->Introduction</title>
-
-<para
->This module is useful for any computer having a monitor labelled Energy Star Compliant. (Energy Star Compliant equipment is equipment that can be configured to automatically enter a power saving mode when appropriate, without human intervention.)</para>
-
-<tip
-><para
->Energy Star Compliance can be applied to nearly any electrical device. This module, however, does not spin down hard drives, does not shutdown printers, &etc; These settings only affect the behaviour of your monitor.</para>
-
-<para
->For information on shutting down components on a laptop, do not use this module. Instead, install tdeutils, and refer to the module entitled <ulink url="help://kcontrol/powerctrl/index.html"
->Laptop Power Control Centre</ulink
->, for details.</para
-></tip>
-
-<para
->In the case of computer monitors, the computer can control the monitor, switching it between four states: On, Standby, Suspend, and Off.</para>
-
-<note
-><para
->The following list of states is a generalisation, and you may find that your monitor will differ from the descriptions below.</para
-></note>
-
-<para
-><quote
->ON</quote
-> is the normal operation of your monitor while you are using it.</para>
-
-<para
-><quote
->STANDBY</quote
-> is usually a minor power saving level. This setting usually involves blanking the screen, and not firing the electron gun, but keeping the electron gun <quote
->energised</quote
-> and ready to go. When you need to use the monitor again, the monitor will come back on very quickly.</para>
-
-<para
-><quote
->SUSPEND</quote
-> is a very low power mode alternative. With most monitors the screen is blanked, the electron gun is shut down and the magnets that control the electron gun are powered down. While the power saving is substantial, to reactivate the monitor may take up to 10-15 seconds. The computer should always be able to return the monitor to On or Standby while in suspend mode.</para>
-
-<para
-><quote
->OFF</quote
->, usually means just that. The computer monitor is turned off. This usually means that the computer will not be able to turn the monitor back on by itself. Obviously, this keeps power consumption to a bare minimum (zero).</para>
+<title>Introduction</title>
+
+<para>This module is useful for any computer having a monitor labelled Energy Star Compliant. (Energy Star Compliant equipment is equipment that can be configured to automatically enter a power saving mode when appropriate, without human intervention.)</para>
+
+<tip><para>Energy Star Compliance can be applied to nearly any electrical device. This module, however, does not spin down hard drives, does not shutdown printers, &etc; These settings only affect the behaviour of your monitor.</para>
+
+<para>For information on shutting down components on a laptop, do not use this module. Instead, install tdeutils, and refer to the module entitled <ulink url="help://kcontrol/powerctrl/index.html">Laptop Power Control Centre</ulink>, for details.</para></tip>
+
+<para>In the case of computer monitors, the computer can control the monitor, switching it between four states: On, Standby, Suspend, and Off.</para>
+
+<note><para>The following list of states is a generalisation, and you may find that your monitor will differ from the descriptions below.</para></note>
+
+<para><quote>ON</quote> is the normal operation of your monitor while you are using it.</para>
+
+<para><quote>STANDBY</quote> is usually a minor power saving level. This setting usually involves blanking the screen, and not firing the electron gun, but keeping the electron gun <quote>energised</quote> and ready to go. When you need to use the monitor again, the monitor will come back on very quickly.</para>
+
+<para><quote>SUSPEND</quote> is a very low power mode alternative. With most monitors the screen is blanked, the electron gun is shut down and the magnets that control the electron gun are powered down. While the power saving is substantial, to reactivate the monitor may take up to 10-15 seconds. The computer should always be able to return the monitor to On or Standby while in suspend mode.</para>
+
+<para><quote>OFF</quote>, usually means just that. The computer monitor is turned off. This usually means that the computer will not be able to turn the monitor back on by itself. Obviously, this keeps power consumption to a bare minimum (zero).</para>
 
 </sect2>
 <sect2 id="energy-use">
-<title
->Use</title>
-
-<para
->Using this module is very simple:</para>
-
-<para
->If your monitor is Energy Star Compliant, then you should put a mark in the check box labeled <guilabel
->Enable Display Energy Saving</guilabel
->. This will activate the energy saving commands. </para>
-
-<para
->The next three slider bars, tell the computer how many minutes of inactivity before automatically switching to a new state. These numbers can be adjusted with either the sliders, or the spin boxes.</para>
-
-<note
-><para
->These times are not additive, but all start counting at zero.</para
-> 
-
-<para
->As an example:</para
-> 
-
-<para
->If you set the Standby Mode to 10 minutes, the Suspend mode to 20 minutes, and the Power off at 30 minutes, and you stop using your computer at 9:00, then the monitor will:</para
-> <para
->Enter Standby mode at 9:10, enter Suspend mode at 9:20, and shut the power off at 9:30.</para
-></note>
-
-<para
->When you are happy with the settings, click <guibutton
->OK</guibutton
->.</para>
+<title>Use</title>
+
+<para>Using this module is very simple:</para>
+
+<para>If your monitor is Energy Star Compliant, then you should put a mark in the check box labeled <guilabel>Enable Display Energy Saving</guilabel>. This will activate the energy saving commands. </para>
+
+<para>The next three slider bars, tell the computer how many minutes of inactivity before automatically switching to a new state. These numbers can be adjusted with either the sliders, or the spin boxes.</para>
+
+<note><para>These times are not additive, but all start counting at zero.</para> 
+
+<para>As an example:</para> 
+
+<para>If you set the Standby Mode to 10 minutes, the Suspend mode to 20 minutes, and the Power off at 30 minutes, and you stop using your computer at 9:00, then the monitor will:</para> <para>Enter Standby mode at 9:10, enter Suspend mode at 9:20, and shut the power off at 9:30.</para></note>
+
+<para>When you are happy with the settings, click <guibutton>OK</guibutton>.</para>
 
 </sect2>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/filemanager/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/filemanager/index.docbook
index 91d669d56e7..75f7680ea13 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/filemanager/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/filemanager/index.docbook
@@ -2,374 +2,201 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Mike.McBride; &Mike.McBride.mail;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Mike.McBride; &Mike.McBride.mail;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-10-16</date>
-<releaseinfo
->3.1</releaseinfo>
+<date>2002-10-16</date>
+<releaseinfo>3.1</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->file manager</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>file manager</keyword>
 </keywordset>
 </articleinfo>
 <sect1 id="file-manager">
-<title
->File Manager</title>
+<title>File Manager</title>
 
-<para
->In this module, you can configure various aspects of &konqueror;'s file manager functionality. </para>
+<para>In this module, you can configure various aspects of &konqueror;'s file manager functionality. </para>
 
-<note
-><para
->&konqueror;'s web browser functionality has its <ulink url="help:/kcontrol/tdehtml/index.html"
->own configuration modules</ulink
->.</para
-></note>
+<note><para>&konqueror;'s web browser functionality has its <ulink url="help:/kcontrol/tdehtml/index.html">own configuration modules</ulink>.</para></note>
 
 <sect2 id="fileman-use">
-<title
->Use</title>
+<title>Use</title>
 
-<para
->The configuration options for the file manager are organised under tabs as follows:</para>
+<para>The configuration options for the file manager are organised under tabs as follows:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Appearance</guilabel
-></term>
-<listitem
-><para
->This tab contains options for customising the appearance of &konqueror; windows, such as the default font text colour.</para
-></listitem>
+<term><guilabel>Appearance</guilabel></term>
+<listitem><para>This tab contains options for customising the appearance of &konqueror; windows, such as the default font text colour.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Behaviour</guilabel
-></term>
-<listitem
-><para
->This tab contains a couple of &konqueror; global options.</para
-></listitem>
+<term><guilabel>Behaviour</guilabel></term>
+<listitem><para>This tab contains a couple of &konqueror; global options.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Previews</guilabel
-></term>
+<term><guilabel>Previews</guilabel></term>
 <listitem>
-<para
->On this tab, you can customise when &konqueror; should show previews.</para>
+<para>On this tab, you can customise when &konqueror; should show previews.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
 <sect3 id="fileman-appearance">
-<title
->Appearance</title>
+<title>Appearance</title>
 
-<para
->The following settings determine how text and colours are displayed in &konqueror; File Manager mode windows.</para>
+<para>The following settings determine how text and colours are displayed in &konqueror; File Manager mode windows.</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Standard font:</guilabel
-></term>
+<term><guilabel>Standard font:</guilabel></term>
 <listitem>
-<para
->This is the font used to display text such as file names in &konqueror; windows.</para>
+<para>This is the font used to display text such as file names in &konqueror; windows.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Font size:</guilabel
-></term>
+<term><guilabel>Font size:</guilabel></term>
 <listitem>
 
-<para
->Lets you control the size of text, while the <guilabel
->Standard Font</guilabel
-> setting determines the font face used.</para>
+<para>Lets you control the size of text, while the <guilabel>Standard Font</guilabel> setting determines the font face used.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Normal text colour:</guilabel
-></term>
+<term><guilabel>Normal text colour:</guilabel></term>
 <listitem>
-<para
->Determines the standard text colour.</para>
+<para>Determines the standard text colour.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Word-wrap icon text:</guilabel
-></term>
+<term><guilabel>Word-wrap icon text:</guilabel></term>
 <listitem>
-<para
->When checked, long filenames will be wrapped onto multiple lines, rather than showing only the part of the filename that fits on a single line.</para>
+<para>When checked, long filenames will be wrapped onto multiple lines, rather than showing only the part of the filename that fits on a single line.</para>
 
-<tip
-> <para
->If you uncheck this option, you can still see word-wrapped filenames by pausing the mouse pointer over the icon.</para
-></tip>
+<tip> <para>If you uncheck this option, you can still see word-wrapped filenames by pausing the mouse pointer over the icon.</para></tip>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Underline filenames:</guilabel
-></term>
+<term><guilabel>Underline filenames:</guilabel></term>
 <listitem>
-<para
->When <guilabel
->Underline filenames</guilabel
-> is checked, filenames will be underlined so that they look like links on a web page.</para>
+<para>When <guilabel>Underline filenames</guilabel> is checked, filenames will be underlined so that they look like links on a web page.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Display file sizes in bytes:</guilabel
-></term>
+<term><guilabel>Display file sizes in bytes:</guilabel></term>
 <listitem>
-<para
->The final check box on this page determines how &konqueror; displays file sizes, when you are in one of the file manager modes that normally shows this information. If you check the <guilabel
->Display file sizes in bytes</guilabel
-> box then file sizes are always shown in bytes. If you leave it unchecked then file sizes are shown in bytes, kilobytes or megabytes, depending on their size.</para>
+<para>The final check box on this page determines how &konqueror; displays file sizes, when you are in one of the file manager modes that normally shows this information. If you check the <guilabel>Display file sizes in bytes</guilabel> box then file sizes are always shown in bytes. If you leave it unchecked then file sizes are shown in bytes, kilobytes or megabytes, depending on their size.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 </sect3>
 
 <sect3 id="fileman-behav">
-<title
->Behaviour</title>
+<title>Behaviour</title>
 
 <variablelist>
-<title
-><guilabel
->Misc Options</guilabel
-></title>
+<title><guilabel>Misc Options</guilabel></title>
 <varlistentry>
-<term
->Open folders in separate windows</term>
-<listitem
-> <para
->If this option is checked, a new &konqueror; window will be created when you open a folder, rather than simply showing that folder's contents in the current window.</para
-></listitem>
+<term>Open folders in separate windows</term>
+<listitem> <para>If this option is checked, a new &konqueror; window will be created when you open a folder, rather than simply showing that folder's contents in the current window.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Show network operations in a single window</term>
+<term>Show network operations in a single window</term>
 <listitem>
-<para
->If unchecked, and you download a file, a dialogue box will appear that shows the status of the download.</para>
+<para>If unchecked, and you download a file, a dialogue box will appear that shows the status of the download.</para>
 
 <screenshot>
-  <screeninfo
->Download Dialogue Box</screeninfo>
+  <screeninfo>Download Dialogue Box</screeninfo>
   <mediaobject>
-  <imageobject
-><imagedata fileref="tdefileman2.png"
+  <imageobject><imagedata fileref="tdefileman2.png"
  format="PNG"/></imageobject>
-  <textobject
-> <phrase
->Download Dialogue Box</phrase
-> </textobject>
+  <textobject> <phrase>Download Dialogue Box</phrase> </textobject>
   <caption>
-  <para
->Individual Download Dialogue Box</para>
+  <para>Individual Download Dialogue Box</para>
   </caption>
   </mediaobject>
 </screenshot>
 
-<para
->If you start a new transfer, another dialogue box will appear. (&Netscape; users will be familiar with this behaviour) </para>
+<para>If you start a new transfer, another dialogue box will appear. (&Netscape; users will be familiar with this behaviour) </para>
 
-<para
->If checked, all transfer status windows will be grouped together under a single dialogue box.</para>
+<para>If checked, all transfer status windows will be grouped together under a single dialogue box.</para>
 <screenshot>
-  <screeninfo
->Download Dialogue Box</screeninfo>
+  <screeninfo>Download Dialogue Box</screeninfo>
   <mediaobject>
-  <imageobject
-><imagedata fileref="tdefileman1.png"
+  <imageobject><imagedata fileref="tdefileman1.png"
  format="PNG"/></imageobject>
-  <textobject
-><phrase
->Download Dialogue Box</phrase
-></textobject>
+  <textobject><phrase>Download Dialogue Box</phrase></textobject>
   <caption>
-  <para
->Collected Download Dialogue Box</para>
+  <para>Collected Download Dialogue Box</para>
   </caption>
   </mediaobject>
 </screenshot>
 
-<para
->If you choose to use the Collected download dialogue box, you can delete transfers by clicking once on the transfer you want to cancel, then clicking the <guibutton
->Delete</guibutton
-> Button on the left.</para>
+<para>If you choose to use the Collected download dialogue box, you can delete transfers by clicking once on the transfer you want to cancel, then clicking the <guibutton>Delete</guibutton> Button on the left.</para>
 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Show file tips</guilabel
-></term>
+<term><guilabel>Show file tips</guilabel></term>
 <listitem>
-<para
->Here you can control if, when moving the mouse over a file, you want to see a small popup window with additional information about that file.</para>
+<para>Here you can control if, when moving the mouse over a file, you want to see a small popup window with additional information about that file.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Show previews in file tips</guilabel
-></term>
+<term><guilabel>Show previews in file tips</guilabel></term>
 <listitem>
-<para
->Here you can control if the file tip should show a thumbnail preview of the file. </para>
+<para>Here you can control if the file tip should show a thumbnail preview of the file. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Home URL</guilabel
-></term>
-<listitem
-><para
->This is the &URL; (&eg; a folder or a web page) where &konqueror; will jump to when the <guibutton
->Home</guibutton
-> button is pressed.</para
-><para
->The default is the users home folder, indicated with a <literal
->~</literal
->.</para
-></listitem>
+<term><guilabel>Home URL</guilabel></term>
+<listitem><para>This is the &URL; (&eg; a folder or a web page) where &konqueror; will jump to when the <guibutton>Home</guibutton> button is pressed.</para><para>The default is the users home folder, indicated with a <literal>~</literal>.</para></listitem>
 </varlistentry>
 </variablelist>
 
-<para
->You can set a path that is your <guilabel
->Home URL</guilabel
-> by typing into the text field, or using the <guiicon
->browse</guiicon
-> icon. The default is <literal
->~</literal
-> which is a standard shortcut for your $<envar
->HOME</envar
-> folder. When you choose the <guiicon
->home</guiicon
-> icon on your panel, in a file open or save dialogue, or from within &konqueror; in file manager mode, this is the folder you will be shown.</para>
-
-<para
->The <guilabel
->Ask confirmation for</guilabel
-> setting tells &konqueror; what to do when you choose to <quote
->Delete</quote
->, <quote
->Trash</quote
->, or <quote
->Shred</quote
-> a file in a &konqueror; window. If any box is checked, &konqueror; asks for confirmation before performing the corresponding action.</para>
+<para>You can set a path that is your <guilabel>Home URL</guilabel> by typing into the text field, or using the <guiicon>browse</guiicon> icon. The default is <literal>~</literal> which is a standard shortcut for your $<envar>HOME</envar> folder. When you choose the <guiicon>home</guiicon> icon on your panel, in a file open or save dialogue, or from within &konqueror; in file manager mode, this is the folder you will be shown.</para>
+
+<para>The <guilabel>Ask confirmation for</guilabel> setting tells &konqueror; what to do when you choose to <quote>Delete</quote>, <quote>Trash</quote>, or <quote>Shred</quote> a file in a &konqueror; window. If any box is checked, &konqueror; asks for confirmation before performing the corresponding action.</para>
 
 </sect3>
 
 <sect3>
-<title
->Previews</title>
-
-<para
->&konqueror; has a preview feature for many file types, including <acronym
->HTML</acronym
-> files, images, &PostScript; and <acronym
->PDF</acronym
->, sound, web archives (if you have the appropriate &konqueror; plugin installed) and text files.</para>
-
-<para
->If you enable previews for one of these, files of that particular file type will not be represented by standard icons in the filemanager, but will instead be shown as miniature previews. On slow computers, the previews can take some time to show up, so you might not want to enable this feature.</para>
-
-<para
->In this module you can specify which <quote
->protocols</quote
-> you wish the previews to be available for. Creating the previews requires that &konqueror; download at least part of the file, in order to create the preview. &konqueror;, like the rest of &kde; is entirely network transparent, and will treat a remote &FTP; folder just as if it was on your local hard drive. This can result in a delay, especially if you are viewing, for example, a folder full of images over a slow network connection.</para>
-
-<para
->For each protocol, you can independently enable or disable previews. For example, you might enable previews for <acronym
->NFS</acronym
-> mounted drives if you have a fast network, but disable them for &FTP; because your Internet connection is via a modem.</para>
-
-<para
->You can further refine the maximum size file that &konqueror; will attempt to show a preview for. The default is 1 MB. In other words, by default, if a file is 900 kb in size, and the protocol you are viewing the folder with is enabled, then &konqueror; will create a preview icon for it. If the file is 1.1 MB in size, &konqueror; will not make a preview, even if the protocol is enabled.</para>
-
-<para
->You can turn on and off previews <quote
->on the fly</quote
-> from within &konqueror;, using the <guimenu
->View</guimenu
-> menu. For example, if you normally want to see image previews on every protocol but find a particular server is very slow to send you the data, you might turn it off for the present, and turn it on again later.</para>
-
-<para
->You may also like to enable the checkbox <guilabel
->Increase size of previews relative to icons</guilabel
->, in order to see more information in the thumbnails.</para>
-
-<para
->Many image files already contain a thumbnail. You can enable the <guilabel
->Use thumbnails embedded in files</guilabel
-> to make use of these. This will save time waiting for thumbnails to be created when viewing a folder full of images you have not previously seen in &konqueror;.</para>
+<title>Previews</title>
+
+<para>&konqueror; has a preview feature for many file types, including <acronym>HTML</acronym> files, images, &PostScript; and <acronym>PDF</acronym>, sound, web archives (if you have the appropriate &konqueror; plugin installed) and text files.</para>
+
+<para>If you enable previews for one of these, files of that particular file type will not be represented by standard icons in the filemanager, but will instead be shown as miniature previews. On slow computers, the previews can take some time to show up, so you might not want to enable this feature.</para>
+
+<para>In this module you can specify which <quote>protocols</quote> you wish the previews to be available for. Creating the previews requires that &konqueror; download at least part of the file, in order to create the preview. &konqueror;, like the rest of &kde; is entirely network transparent, and will treat a remote &FTP; folder just as if it was on your local hard drive. This can result in a delay, especially if you are viewing, for example, a folder full of images over a slow network connection.</para>
+
+<para>For each protocol, you can independently enable or disable previews. For example, you might enable previews for <acronym>NFS</acronym> mounted drives if you have a fast network, but disable them for &FTP; because your Internet connection is via a modem.</para>
+
+<para>You can further refine the maximum size file that &konqueror; will attempt to show a preview for. The default is 1 MB. In other words, by default, if a file is 900 kb in size, and the protocol you are viewing the folder with is enabled, then &konqueror; will create a preview icon for it. If the file is 1.1 MB in size, &konqueror; will not make a preview, even if the protocol is enabled.</para>
+
+<para>You can turn on and off previews <quote>on the fly</quote> from within &konqueror;, using the <guimenu>View</guimenu> menu. For example, if you normally want to see image previews on every protocol but find a particular server is very slow to send you the data, you might turn it off for the present, and turn it on again later.</para>
+
+<para>You may also like to enable the checkbox <guilabel>Increase size of previews relative to icons</guilabel>, in order to see more information in the thumbnails.</para>
+
+<para>Many image files already contain a thumbnail. You can enable the <guilabel>Use thumbnails embedded in files</guilabel> to make use of these. This will save time waiting for thumbnails to be created when viewing a folder full of images you have not previously seen in &konqueror;.</para>
 
 </sect3>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/filetypes/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/filetypes/index.docbook
index 700fdf00682..39a0fa18995 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/filetypes/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/filetypes/index.docbook
@@ -2,270 +2,129 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
-<title
->File Associations</title>
+<title>File Associations</title>
 <authorgroup>
-<author
->&Mike.McBride; &Mike.McBride.mail;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Mike.McBride; &Mike.McBride.mail;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2003-10-13</date>
-<releaseinfo
->3.2</releaseinfo>
+<date>2003-10-13</date>
+<releaseinfo>3.2</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->files association</keyword>
-<keyword
->association</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>files association</keyword>
+<keyword>association</keyword>
 </keywordset>
 </articleinfo>
 <sect1 id="file-assoc">
-<title
->File Associations</title>
+<title>File Associations</title>
 
 <sect2 id="file-assoc-intro">
-<title
->Introduction</title>
+<title>Introduction</title>
 
-<para
->One of the most convenient aspects of &kde;, is its ability to automatically match a data file, with its application. As an example, when you click on your favourite &kword; document in &konqueror;, &kde; automatically starts &kword;, and automatically loads that file into &kword; so you can begin working on it.</para>
+<para>One of the most convenient aspects of &kde;, is its ability to automatically match a data file, with its application. As an example, when you click on your favourite &kword; document in &konqueror;, &kde; automatically starts &kword;, and automatically loads that file into &kword; so you can begin working on it.</para>
 
-<para
->In the example above, the &kword; Data file is <emphasis
->associated</emphasis
-> with &kword; (the application). These file associations are crucial to the functioning of &kde;.</para>
+<para>In the example above, the &kword; Data file is <emphasis>associated</emphasis> with &kword; (the application). These file associations are crucial to the functioning of &kde;.</para>
 
-<para
->When &kde; is installed, it automatically creates hundreds of file associations to many of the most common data types. These initial associations are based on the most commonly included software, and the most common user preferences.</para>
+<para>When &kde; is installed, it automatically creates hundreds of file associations to many of the most common data types. These initial associations are based on the most commonly included software, and the most common user preferences.</para>
 
-<para
->Unfortunately, &kde; can not:</para>
+<para>Unfortunately, &kde; can not:</para>
 
 <itemizedlist>
-<listitem
-><para
->predict every possible combination of software and data files</para
-></listitem>
-<listitem
-><para
->prepare for file formats not yet invented</para
-></listitem>
-<listitem
-><para
->or predict everyone's favourite application for certain file formats</para
-></listitem>
+<listitem><para>predict every possible combination of software and data files</para></listitem>
+<listitem><para>prepare for file formats not yet invented</para></listitem>
+<listitem><para>or predict everyone's favourite application for certain file formats</para></listitem>
 </itemizedlist>
 
-<para
->You can change your current file associations or add new file associations using this module.</para>
+<para>You can change your current file associations or add new file associations using this module.</para>
 
-<para
->Each file association is recorded as a mime type. &MIME; stands for <quote
->Multipurpose Internet Mail Extensions</quote
->. It allows a computer to determine the type of file, without opening and analysing the format of each and every file.</para>
+<para>Each file association is recorded as a mime type. &MIME; stands for <quote>Multipurpose Internet Mail Extensions</quote>. It allows a computer to determine the type of file, without opening and analysing the format of each and every file.</para>
 
 </sect2>
 
 <sect2 id="file-assoc-use">
-<title
->How to use this module</title>
+<title>How to use this module</title>
 
-<para
->The file associations are organised into several categories, and at a minimum you will have:</para>
+<para>The file associations are organised into several categories, and at a minimum you will have:</para>
 
 <orderedlist>
-<listitem
-><para
->Application</para
-></listitem>
-<listitem
-><para
->Audio</para
-></listitem>
-<listitem
-><para
->Image</para
-></listitem>
-<listitem
-><para
->Inode</para
-></listitem>
-<listitem
-><para
->Message</para
-></listitem>
-<listitem
-><para
->Multipart</para
-></listitem>
-<listitem
-><para
->Print</para
-></listitem>
-<listitem
-><para
->Text</para
-></listitem>
-<listitem
-><para
->Video</para
-></listitem>
+<listitem><para>Application</para></listitem>
+<listitem><para>Audio</para></listitem>
+<listitem><para>Image</para></listitem>
+<listitem><para>Inode</para></listitem>
+<listitem><para>Message</para></listitem>
+<listitem><para>Multipart</para></listitem>
+<listitem><para>Print</para></listitem>
+<listitem><para>Text</para></listitem>
+<listitem><para>Video</para></listitem>
 </orderedlist>
 
-<para
->All of the file associations are sorted into one of these categories.</para>
+<para>All of the file associations are sorted into one of these categories.</para>
 
-<para
->There is also an overview category <quote
->All</quote
->, which displays all the file types in one list, without categorising them.</para>
+<para>There is also an overview category <quote>All</quote>, which displays all the file types in one list, without categorising them.</para>
 
-<note
-><para
->There is no functional difference between any of the categories. These categories are designed to help organise your file associations, but they do not alter the associations in any way. </para
-></note>
+<note><para>There is no functional difference between any of the categories. These categories are designed to help organise your file associations, but they do not alter the associations in any way. </para></note>
 
-<para
->The categories are listed in the box labelled <guilabel
->Known Types</guilabel
->.</para>
+<para>The categories are listed in the box labelled <guilabel>Known Types</guilabel>.</para>
 
-<para
->You can explore each of these categories, and see the file associations contained within each one, by simply double-clicking on the category name. You will be presented with a list of the associated mime-types under that category.</para>
+<para>You can explore each of these categories, and see the file associations contained within each one, by simply double-clicking on the category name. You will be presented with a list of the associated mime-types under that category.</para>
 
-<tip
-><para
->You can also search for a particular &MIME; type by using the search box. The search box is labelled <guilabel
->Find filename pattern</guilabel
-> and is located above the category list.</para>
+<tip><para>You can also search for a particular &MIME; type by using the search box. The search box is labelled <guilabel>Find filename pattern</guilabel> and is located above the category list.</para>
 
-<para
->Simply type the first letter of the &MIME; type you are interested in. The categories are automatically expanded, and only the mime-types that include that letter are displayed.</para>
+<para>Simply type the first letter of the &MIME; type you are interested in. The categories are automatically expanded, and only the mime-types that include that letter are displayed.</para>
 
-<para
->You can then enter a second character and the mime-types will be further limited to mime types containing those two characters.</para
-></tip>
+<para>You can then enter a second character and the mime-types will be further limited to mime types containing those two characters.</para></tip>
 
 <sect3 id="file-assoc-use-add">
-<title
->Adding a new mime type</title>
-
-<para
->If you want to add a new &MIME; type to your file associations, you can click on the <guibutton
->Add...</guibutton
-> button. A small dialogue box will appear. You select the category from the drop down box, and type the &MIME; name in the blank labelled <guilabel
->Type name</guilabel
->. Click <guibutton
->OK</guibutton
-> to add the new mime type, or click <guibutton
->Cancel</guibutton
-> to not add any new mime-types.</para>
+<title>Adding a new mime type</title>
+
+<para>If you want to add a new &MIME; type to your file associations, you can click on the <guibutton>Add...</guibutton> button. A small dialogue box will appear. You select the category from the drop down box, and type the &MIME; name in the blank labelled <guilabel>Type name</guilabel>. Click <guibutton>OK</guibutton> to add the new mime type, or click <guibutton>Cancel</guibutton> to not add any new mime-types.</para>
 
 </sect3>
 
 <sect3 id="file-assoc-use-del">
-<title
->Removing a mime type</title>
+<title>Removing a mime type</title>
 
-<para
->If you want to remove a &MIME; type, simply select the &MIME; type you want to delete by clicking once with the mouse on the &MIME; type name. Then click the button labelled <guibutton
->Remove</guibutton
->. The &MIME; type will be deleted immediately.</para>
+<para>If you want to remove a &MIME; type, simply select the &MIME; type you want to delete by clicking once with the mouse on the &MIME; type name. Then click the button labelled <guibutton>Remove</guibutton>. The &MIME; type will be deleted immediately.</para>
 
 </sect3>
 
 <sect3 id="file-assoc-use-edit">
-<title
->Editing a mime types properties</title>
+<title>Editing a mime types properties</title>
 
-<para
->Before you can edit a &MIME; types property, you must first specify which &MIME; type. Simply browse through the categories until you find the &MIME; type you want to edit, then click once on it with the mouse.</para>
+<para>Before you can edit a &MIME; types property, you must first specify which &MIME; type. Simply browse through the categories until you find the &MIME; type you want to edit, then click once on it with the mouse.</para>
 
-<para
->As soon as you have selected the &MIME; type, the current values of the &MIME; type will appear in the module window.</para>
+<para>As soon as you have selected the &MIME; type, the current values of the &MIME; type will appear in the module window.</para>
 
-<para
->You will notice the current values are split into two tabs: <guilabel
->General</guilabel
-> and <guilabel
->Embedding</guilabel
-></para>
+<para>You will notice the current values are split into two tabs: <guilabel>General</guilabel> and <guilabel>Embedding</guilabel></para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->General</guilabel
-></term>
+<term><guilabel>General</guilabel></term>
 <listitem>
-<para
->There are 4 properties for each &MIME; type in this tab:</para>
+<para>There are 4 properties for each &MIME; type in this tab:</para>
 
 <orderedlist>
-<listitem
-><para
-><guilabel
->Mime Type Icon</guilabel
-> is the icon that will be visible when using &konqueror; as a file manager.</para
-></listitem>
-<listitem
-><para
-><guilabel
->Filename Patterns</guilabel
-> is a search pattern which &kde; will use to determine the &MIME; type.</para
-></listitem>
-<listitem
-><para
-><guilabel
->Description</guilabel
-> is a short description of the file type. This is for your benefit only.</para
-></listitem>
-<listitem
-><para
-><guilabel
->Application Preference Order</guilabel
-> determines which applications will be associated with the specified &MIME; type.</para
-></listitem>
+<listitem><para><guilabel>Mime Type Icon</guilabel> is the icon that will be visible when using &konqueror; as a file manager.</para></listitem>
+<listitem><para><guilabel>Filename Patterns</guilabel> is a search pattern which &kde; will use to determine the &MIME; type.</para></listitem>
+<listitem><para><guilabel>Description</guilabel> is a short description of the file type. This is for your benefit only.</para></listitem>
+<listitem><para><guilabel>Application Preference Order</guilabel> determines which applications will be associated with the specified &MIME; type.</para></listitem>
 </orderedlist>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Embedding Tab</guilabel
-></term>
+<term><guilabel>Embedding Tab</guilabel></term>
 <listitem>
-<para
->The Embedding tab allows you to determine if an file will be viewed within a &konqueror; window, or by starting the application.</para>
+<para>The Embedding tab allows you to determine if an file will be viewed within a &konqueror; window, or by starting the application.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -273,211 +132,83 @@
 </sect3>
 
 <sect3 id="file-assoc-use-icon">
-<title
->Changing the Icon</title>
+<title>Changing the Icon</title>
 
-<para
->To change the icon, simply click on the Icon button. A dialogue box will appear, which will show you all available icons. Simply click once with the mouse on the icon of your choice, and click <guibutton
->OK</guibutton
->.</para>
+<para>To change the icon, simply click on the Icon button. A dialogue box will appear, which will show you all available icons. Simply click once with the mouse on the icon of your choice, and click <guibutton>OK</guibutton>.</para>
 
 </sect3>
 
 <sect3 id="file-assoc-use-pattern">
-<title
->Editing the mime-type patterns</title>
-
-<para
->The box labelled <guilabel
->Filename Patterns</guilabel
->, determines what files will be included within this mime-type.</para>
-
-<para
->Usually, files are selected based on their suffix. (Examples: Files that end with <literal role="extension"
->.wav</literal
-> are sound files, using the WAV format and files that end in <literal role="extension"
->.c</literal
-> are program files written in C).</para>
-
-<para
->You should enter your filename mask in this combo box.</para>
-
-<para
->The asterisk (<literal
->*</literal
->) is a wildcard character that will be used with nearly every mime type mask. A complete discussion of wildcards is beyond the scope of this manual, but it is important to understand that the asterisk (in this context), <quote
->matches</quote
-> any number of characters. As an example: <userinput
->*.pdf</userinput
-> will match <filename
->Datafile.pdf</filename
->, <filename
->Graphics.pdf</filename
-> and <filename
->User.pdf</filename
->, but not <filename
->PDF</filename
->, <filename
->Datafile.PDF</filename
->, or <filename
->.pdf</filename
->.</para>
-
-<tip
-><para
->It is very beneficial to have multiple masks. One for lower case, one for upper case, &etc; This will help ensure that &kde; can determine the file type more accurately.</para
-></tip>
+<title>Editing the mime-type patterns</title>
+
+<para>The box labelled <guilabel>Filename Patterns</guilabel>, determines what files will be included within this mime-type.</para>
+
+<para>Usually, files are selected based on their suffix. (Examples: Files that end with <literal role="extension">.wav</literal> are sound files, using the WAV format and files that end in <literal role="extension">.c</literal> are program files written in C).</para>
+
+<para>You should enter your filename mask in this combo box.</para>
+
+<para>The asterisk (<literal>*</literal>) is a wildcard character that will be used with nearly every mime type mask. A complete discussion of wildcards is beyond the scope of this manual, but it is important to understand that the asterisk (in this context), <quote>matches</quote> any number of characters. As an example: <userinput>*.pdf</userinput> will match <filename>Datafile.pdf</filename>, <filename>Graphics.pdf</filename> and <filename>User.pdf</filename>, but not <filename>PDF</filename>, <filename>Datafile.PDF</filename>, or <filename>.pdf</filename>.</para>
+
+<tip><para>It is very beneficial to have multiple masks. One for lower case, one for upper case, &etc; This will help ensure that &kde; can determine the file type more accurately.</para></tip>
 
 </sect3>
 
 <sect3 id="file-assoc-use-desc">
-<title
->Editing a mime types description.</title>
+<title>Editing a mime types description.</title>
 
-<para
->You can type a short description of the &MIME; type in the text box labelled <guilabel
->Description</guilabel
->. This label is to help you, it does not affect the function of the &MIME; type.</para>
+<para>You can type a short description of the &MIME; type in the text box labelled <guilabel>Description</guilabel>. This label is to help you, it does not affect the function of the &MIME; type.</para>
 
 </sect3>
 
 <sect3 id="file-assoc-use-app">
-<title
->Editing the application associations</title>
-
-<para
->There are four buttons (<guibutton
->Move Up</guibutton
->, <guibutton
->Move Down</guibutton
->, <guibutton
->Add</guibutton
-> and <guibutton
->Remove</guibutton
->) and a combo box (which lists the applications) which are used to configure the applications.</para>
-
-<para
->The combo box lists all of the applications associated with a specific &MIME; type. The list is in a specific order. The top application is the first application tried. The next application down the list is the second, etc.</para>
-
-<note
-><para
->What do you mean there is more than one application per &MIME; type? Why is this necessary?</para>
-
-<para
->We started out by saying that &kde; comes preconfigured with hundreds of file associations. The reality is, each system that &kde; is installed on has a different selection of applications. By allowing multiple associations per &MIME; type, &kde; can continue to operate when a certain application is not installed on the system.</para>
-
-<para
->As an example:</para>
-<para
->For the &MIME; type <literal
->pdf</literal
->, there are two applications associated with this file type. The first program is called <application
->PS Viewer</application
->. If your system does not have <application
->PS Viewer</application
-> installed, then &kde; automatically starts the second application <application
->Adobe Acrobat Reader</application
->. As you can see, this will help keep &kde; running strong as you add and subtract applications.</para
-></note>
-
-<para
->We have established that the order is important. You can change the order of the applications by clicking once with the mouse on the application you want to move, and then clicking either <guibutton
->Move Up</guibutton
-> or <guibutton
->Move Down</guibutton
->. This will shift the currently selected application up or down the list of applications. </para>
-
-<para
->You can add new applications to the list by clicking the button labelled <guibutton
->Add</guibutton
->. A dialogue box will appear. Using the dialogue box, you can select the application you want to use for this mime type. Click <guibutton
->OK</guibutton
-> when you are done, and the application will be added to the current list.</para>
-
-<para
->You can remove an application (thereby ensuring that the application will never run with this &MIME; type by clicking once on the name of the application, and clicking the <guibutton
->Remove</guibutton
-> button.</para>
-
-<tip
-><para
->It is a good idea to use the <guibutton
->Move Up</guibutton
-> and <guibutton
->Move Down</guibutton
-> buttons to adjust the unwanted application to a lower position in the list, rather than deleting the application from the list entirely. Once you have deleted an application, if your preferred application should become compromised, there will not be an application to view the data document.</para
-></tip>
+<title>Editing the application associations</title>
+
+<para>There are four buttons (<guibutton>Move Up</guibutton>, <guibutton>Move Down</guibutton>, <guibutton>Add</guibutton> and <guibutton>Remove</guibutton>) and a combo box (which lists the applications) which are used to configure the applications.</para>
+
+<para>The combo box lists all of the applications associated with a specific &MIME; type. The list is in a specific order. The top application is the first application tried. The next application down the list is the second, etc.</para>
+
+<note><para>What do you mean there is more than one application per &MIME; type? Why is this necessary?</para>
+
+<para>We started out by saying that &kde; comes preconfigured with hundreds of file associations. The reality is, each system that &kde; is installed on has a different selection of applications. By allowing multiple associations per &MIME; type, &kde; can continue to operate when a certain application is not installed on the system.</para>
+
+<para>As an example:</para>
+<para>For the &MIME; type <literal>pdf</literal>, there are two applications associated with this file type. The first program is called <application>PS Viewer</application>. If your system does not have <application>PS Viewer</application> installed, then &kde; automatically starts the second application <application>Adobe Acrobat Reader</application>. As you can see, this will help keep &kde; running strong as you add and subtract applications.</para></note>
+
+<para>We have established that the order is important. You can change the order of the applications by clicking once with the mouse on the application you want to move, and then clicking either <guibutton>Move Up</guibutton> or <guibutton>Move Down</guibutton>. This will shift the currently selected application up or down the list of applications. </para>
+
+<para>You can add new applications to the list by clicking the button labelled <guibutton>Add</guibutton>. A dialogue box will appear. Using the dialogue box, you can select the application you want to use for this mime type. Click <guibutton>OK</guibutton> when you are done, and the application will be added to the current list.</para>
+
+<para>You can remove an application (thereby ensuring that the application will never run with this &MIME; type by clicking once on the name of the application, and clicking the <guibutton>Remove</guibutton> button.</para>
+
+<tip><para>It is a good idea to use the <guibutton>Move Up</guibutton> and <guibutton>Move Down</guibutton> buttons to adjust the unwanted application to a lower position in the list, rather than deleting the application from the list entirely. Once you have deleted an application, if your preferred application should become compromised, there will not be an application to view the data document.</para></tip>
 
 </sect3>
 
 <sect3 id="file-assoc-embedding">
-<title
->Embedding</title>
-<para
->By clicking on the <guilabel
->Embedding</guilabel
-> tab, you are presented with three radio buttons in the <guilabel
->Left click action</guilabel
-> group. These determine how &konqueror; views the selected &MIME; type:</para>
+<title>Embedding</title>
+<para>By clicking on the <guilabel>Embedding</guilabel> tab, you are presented with three radio buttons in the <guilabel>Left click action</guilabel> group. These determine how &konqueror; views the selected &MIME; type:</para>
 
 <variablelist>
-<varlistentry
-><term
->Show file in embedded viewer</term>
-<listitem
-><para
->If this is selected, the file will be shown <emphasis
->within</emphasis
-> the &konqueror; window.</para
-></listitem
-></varlistentry>
-<varlistentry
-><term
->Show file in separate viewer</term>
-<listitem
-><para
->This will cause a separate window to be created when showing this mime-type.</para
-></listitem
-></varlistentry>
-<varlistentry
-><term
->Use group settings.</term>
-<listitem
-><para
->This will cause the mime-type to use the settings for the mime-type group. (if you are editing an audio mime type, then the settings for the audio group are used).</para
-></listitem
-></varlistentry>
+<varlistentry><term>Show file in embedded viewer</term>
+<listitem><para>If this is selected, the file will be shown <emphasis>within</emphasis> the &konqueror; window.</para></listitem></varlistentry>
+<varlistentry><term>Show file in separate viewer</term>
+<listitem><para>This will cause a separate window to be created when showing this mime-type.</para></listitem></varlistentry>
+<varlistentry><term>Use group settings.</term>
+<listitem><para>This will cause the mime-type to use the settings for the mime-type group. (if you are editing an audio mime type, then the settings for the audio group are used).</para></listitem></varlistentry>
 </variablelist>
 
-<para
->Below this is a listbox labelled <guilabel
->Services Preference Order</guilabel
->.</para>
-
-<para
->When you are in &konqueror;, you can <mousebutton
->right</mousebutton
-> mouse click, and a menu will with an entry labelled <guimenu
->Preview with...</guimenu
-> will appear. This box lists the applications that will appear, in the order they will appear, under this menu.</para>
-
-<para
->You can use the <guibutton
->Move Up</guibutton
-> and <guibutton
->Move Down</guibutton
-> buttons to change the order.</para>
+<para>Below this is a listbox labelled <guilabel>Services Preference Order</guilabel>.</para>
+
+<para>When you are in &konqueror;, you can <mousebutton>right</mousebutton> mouse click, and a menu will with an entry labelled <guimenu>Preview with...</guimenu> will appear. This box lists the applications that will appear, in the order they will appear, under this menu.</para>
+
+<para>You can use the <guibutton>Move Up</guibutton> and <guibutton>Move Down</guibutton> buttons to change the order.</para>
 
 </sect3>
 
 <sect3 id="file-assoc-use-done">
-<title
->Making changes permanent</title>
+<title>Making changes permanent</title>
 
-<para
->When you are done making any changes to mime types, you can click <guibutton
->Apply</guibutton
-> to make your changes permanent, but keep you in this module.</para>
+<para>When you are done making any changes to mime types, you can click <guibutton>Apply</guibutton> to make your changes permanent, but keep you in this module.</para>
 
 </sect3>
 </sect2>
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/fonts/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/fonts/index.docbook
index a379b8d94a2..ac3b120830d 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/fonts/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/fonts/index.docbook
@@ -2,171 +2,74 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Mike.McBride; &Mike.McBride.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Mike.McBride; &Mike.McBride.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2003-09-22</date>
-<releaseinfo
->3.2</releaseinfo>
+<date>2003-09-22</date>
+<releaseinfo>3.2</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->fonts</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>fonts</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="fonts">
 
-<title
->Fonts</title>
+<title>Fonts</title>
 
-<para
->This module is designed to allow you to easily select different fonts for different parts of the &kde; Desktop.</para>
+<para>This module is designed to allow you to easily select different fonts for different parts of the &kde; Desktop.</para>
 
-<para
->The panel consists of different font groups to give you a lot of flexibility in configuring your fonts: </para>
+<para>The panel consists of different font groups to give you a lot of flexibility in configuring your fonts: </para>
 
 <itemizedlist>
-<listitem
-><para
-><guilabel
->General:</guilabel
-> Used everywhere the other font groups do not apply</para
-></listitem>
-
-<listitem
-><para
-><guilabel
->Fixed width:</guilabel
-> Anywhere a non-proportional font is specified</para
-></listitem>
-
-<!-- <listitem
-><para
-><guilabel
->File Manager</guilabel
-> (Font to use in the
-&kde; file manager)</para
-></listitem
-> -->
-
-<listitem
-><para
-><guilabel
->Toolbar:</guilabel
-> Font used in &kde; application toolbars</para
-></listitem>
-
-<listitem
-><para
-><guilabel
->Menu:</guilabel
-> Font used in &kde; application menus</para
-></listitem>
-
-<listitem
-><para
-><guilabel
->Window title:</guilabel
-> Font used in the window title</para
-></listitem>
-
-<listitem
-><para
-><guilabel
->Taskbar:</guilabel
-> Font used in the taskbar panel applet</para
-></listitem>
-
-<listitem
-><para
-><guilabel
->Desktop:</guilabel
-> Font used on the desktop to label icons</para
-></listitem>
+<listitem><para><guilabel>General:</guilabel> Used everywhere the other font groups do not apply</para></listitem>
+
+<listitem><para><guilabel>Fixed width:</guilabel> Anywhere a non-proportional font is specified</para></listitem>
+
+<!-- <listitem><para><guilabel>File Manager</guilabel> (Font to use in the
+&kde; file manager)</para></listitem> -->
+
+<listitem><para><guilabel>Toolbar:</guilabel> Font used in &kde; application toolbars</para></listitem>
+
+<listitem><para><guilabel>Menu:</guilabel> Font used in &kde; application menus</para></listitem>
+
+<listitem><para><guilabel>Window title:</guilabel> Font used in the window title</para></listitem>
+
+<listitem><para><guilabel>Taskbar:</guilabel> Font used in the taskbar panel applet</para></listitem>
+
+<listitem><para><guilabel>Desktop:</guilabel> Font used on the desktop to label icons</para></listitem>
 
 </itemizedlist>
 
-<para
->Each font has a corresponding <guibutton
->Choose...</guibutton
-> button. By clicking on this button, a dialogue box appears. You can use this dialogue box to choose a new font, font style, size and character set. Then press <guibutton
->OK</guibutton
->.</para>
-
-<para
->An example of the font you have chosen will be displayed in the space between the font group name and the choose button.</para>
-
-<para
->When you are done, simply click <guibutton
->OK</guibutton
->, and all necessary components of &kde; will be restarted so your changes can take affect immediately.</para>
-
-<para
->The <guibutton
->Adjust All Fonts...</guibutton
-> button allows you to quickly set properties for all the fonts selected above. A font selection dialogue similar to the standard one will appear, but you will notice checkboxes that allow you to change the <guilabel
->Font</guilabel
->, <guilabel
->Font style</guilabel
-> or <guilabel
->Size</guilabel
-> independently of each other. You can choose any one, two, or three of these options, and they will be applied to all the font groups.</para>
-
-<para
->For example, if you have selected several different font faces above, and realise they are all a size too big (this often happens when you change screen resolution, for instance), you can apply a new font size to all the fonts, without affecting your customised font faces and styles.</para>
+<para>Each font has a corresponding <guibutton>Choose...</guibutton> button. By clicking on this button, a dialogue box appears. You can use this dialogue box to choose a new font, font style, size and character set. Then press <guibutton>OK</guibutton>.</para>
+
+<para>An example of the font you have chosen will be displayed in the space between the font group name and the choose button.</para>
+
+<para>When you are done, simply click <guibutton>OK</guibutton>, and all necessary components of &kde; will be restarted so your changes can take affect immediately.</para>
+
+<para>The <guibutton>Adjust All Fonts...</guibutton> button allows you to quickly set properties for all the fonts selected above. A font selection dialogue similar to the standard one will appear, but you will notice checkboxes that allow you to change the <guilabel>Font</guilabel>, <guilabel>Font style</guilabel> or <guilabel>Size</guilabel> independently of each other. You can choose any one, two, or three of these options, and they will be applied to all the font groups.</para>
+
+<para>For example, if you have selected several different font faces above, and realise they are all a size too big (this often happens when you change screen resolution, for instance), you can apply a new font size to all the fonts, without affecting your customised font faces and styles.</para>
 
 <sect2 id="fonts-aa">
-<title
->Anti-alias text</title>
-
-<para
->To use anti-aliasing, simply place a mark in the checkbox labelled <guilabel
->Use anti-aliasing for fonts</guilabel
->. This enables two more options.</para>
-<para
->Placing a mark in the checkbox will allow you to specify which range of fonts will <emphasis
->not</emphasis
-> be anti-aliased. This range is specified with the two combo boxes on the same line.</para>
-
-<para
->You can also choose the method that &kde; uses to create an anti-alias look to your fonts. If you are not familiar with the individual methods, you should leave this option alone.</para>
-
-<note
-><para
->The ability to use anti-aliased fonts and icons requires that you have support in both X and the &Qt; toolkit, that you have suitable fonts installed, and that you are using the built-in font serving capabilities of the X server. If you still are having problems, please contact the appropriate &kde; mailing list, or check the <acronym
->FAQ</acronym
->.</para
-></note>
+<title>Anti-alias text</title>
+
+<para>To use anti-aliasing, simply place a mark in the checkbox labelled <guilabel>Use anti-aliasing for fonts</guilabel>. This enables two more options.</para>
+<para>Placing a mark in the checkbox will allow you to specify which range of fonts will <emphasis>not</emphasis> be anti-aliased. This range is specified with the two combo boxes on the same line.</para>
+
+<para>You can also choose the method that &kde; uses to create an anti-alias look to your fonts. If you are not familiar with the individual methods, you should leave this option alone.</para>
+
+<note><para>The ability to use anti-aliased fonts and icons requires that you have support in both X and the &Qt; toolkit, that you have suitable fonts installed, and that you are using the built-in font serving capabilities of the X server. If you still are having problems, please contact the appropriate &kde; mailing list, or check the <acronym>FAQ</acronym>.</para></note>
 
 </sect2>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/helpindex/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/helpindex/index.docbook
index d9a4ee29875..62a141f1118 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/helpindex/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/helpindex/index.docbook
@@ -2,214 +2,83 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Mike.McBride; &Mike.McBride.mail;</author>
-<author
->&Jost.Schenck; &Jost.Schenck.mail;</author>
-
-<othercredit role="translator"
-><firstname
->Jonathan</firstname
-><surname
->Riddell</surname
-><affiliation
-><address
-><email
->kde-en-gb@jriddell.org</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Mike.McBride; &Mike.McBride.mail;</author>
+<author>&Jost.Schenck; &Jost.Schenck.mail;</author>
+
+<othercredit role="translator"><firstname>Jonathan</firstname><surname>Riddell</surname><affiliation><address><email>kde-en-gb@jriddell.org</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-10-17</date>
-<releaseinfo
->3.1</releaseinfo>
+<date>2002-10-17</date>
+<releaseinfo>3.1</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->Help Index</keyword>
-<keyword
->Index</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>Help Index</keyword>
+<keyword>Index</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="help-index">
 
-<title
->Help Index</title>
-
-<note
-><para
->At the time of writing, for most installations of &kde; the entire search engine function in &khelpcenter; is disabled, and settings made in this &kcontrol; module will have no effect. We hope to have it back in a future release.</para
-></note>
-
-<para
->&kde; comes with a lot of documentation for applications and components. While it is possible to just browse the manuals until you find that piece of information you're looking for, this may be a very time-consuming task. To make this easier for you, &kde; offers fulltext search using a program called <application
->ht://dig</application
->. It works quite similar to search engines on the web, in fact some search engines you now might even use it. Just click on the <guilabel
->Search</guilabel
-> tab in the &khelpcenter;, enter the word you are looking for, click <guibutton
->Search</guibutton
-> and enjoy!</para>
-
-<para
->However, to make use of this feature, <application
->ht://dig</application
-> has to be installed on your system and &kde; has to be configured to make us of it. This control module tries to help you doing the latter. If you haven't installed <application
->ht://dig</application
-> and it wasn't shipped with your operating system you have to get ht://dig yourself. Have a look at <ulink url="http://www.htdig.org"
->the ht://dig homepage</ulink
-> on how to download and install it.</para>
-
-<para
->When you first start, you are in display mode only. To modify your settings, click on <guibutton
->Administrator Mode</guibutton
->. If you are logged in as <systemitem class="username"
->root</systemitem
->, you will go straight to the change dialogue. If not, &kde; will ask for a superuser password.</para>
-<sect2 id="help-index-use"
-> 
-
-<title
->Use</title
-> 
-
-<para
->There are two important things to tell &kde; so it can make use of the fulltext search engine:</para>
+<title>Help Index</title>
+
+<note><para>At the time of writing, for most installations of &kde; the entire search engine function in &khelpcenter; is disabled, and settings made in this &kcontrol; module will have no effect. We hope to have it back in a future release.</para></note>
+
+<para>&kde; comes with a lot of documentation for applications and components. While it is possible to just browse the manuals until you find that piece of information you're looking for, this may be a very time-consuming task. To make this easier for you, &kde; offers fulltext search using a program called <application>ht://dig</application>. It works quite similar to search engines on the web, in fact some search engines you now might even use it. Just click on the <guilabel>Search</guilabel> tab in the &khelpcenter;, enter the word you are looking for, click <guibutton>Search</guibutton> and enjoy!</para>
+
+<para>However, to make use of this feature, <application>ht://dig</application> has to be installed on your system and &kde; has to be configured to make us of it. This control module tries to help you doing the latter. If you haven't installed <application>ht://dig</application> and it wasn't shipped with your operating system you have to get ht://dig yourself. Have a look at <ulink url="http://www.htdig.org">the ht://dig homepage</ulink> on how to download and install it.</para>
+
+<para>When you first start, you are in display mode only. To modify your settings, click on <guibutton>Administrator Mode</guibutton>. If you are logged in as <systemitem class="username">root</systemitem>, you will go straight to the change dialogue. If not, &kde; will ask for a superuser password.</para>
+<sect2 id="help-index-use"> 
+
+<title>Use</title> 
+
+<para>There are two important things to tell &kde; so it can make use of the fulltext search engine:</para>
 
 <itemizedlist>
-<listitem
-><para
->where to find the <application
->ht://dig</application
-> programs KDE uses for fulltext search</para
-></listitem>
-<listitem
-><para
->where to search</para
-></listitem>
+<listitem><para>where to find the <application>ht://dig</application> programs KDE uses for fulltext search</para></listitem>
+<listitem><para>where to search</para></listitem>
 </itemizedlist>
 
 <sect3 id="help-index-use-progs">
 
-<title
->The <application
->ht://dig</application
-> Programs</title>
-
-<para
->There are three programs &kde; needs that come with <application
->ht://dig</application
->: <command
->htdig</command
->, <command
->htsearch</command
-> and <command
->htmerge</command
->. For each program you have to provide the full path including the program name, for example: <filename class="directory"
->/usr/bin/htdig</filename
->.</para
-> 
-
-<para
->Where exactly these programs are installed depends on your operating system or your distribution. However, there are some good guesses you might want to try:</para>
+<title>The <application>ht://dig</application> Programs</title>
+
+<para>There are three programs &kde; needs that come with <application>ht://dig</application>: <command>htdig</command>, <command>htsearch</command> and <command>htmerge</command>. For each program you have to provide the full path including the program name, for example: <filename class="directory">/usr/bin/htdig</filename>.</para> 
+
+<para>Where exactly these programs are installed depends on your operating system or your distribution. However, there are some good guesses you might want to try:</para>
 
 <itemizedlist>
 
-<listitem
-><para
-><command
->htdig</command
-> and <command
->htmerge</command
-> are often found in <filename class="directory"
->/usr/bin/</filename
-> or in something like <filename class="directory"
->/usr/local/www/htdig/bin/</filename
->.</para
-></listitem>
-
-<listitem
-><para
->the <command
->htsearch</command
-> command is often found in a sub folder called <filename class="directory"
->cgi-bin</filename
->, for example <filename class="directory"
->/usr/local/httpd/cgi-bin/</filename
->.</para>
+<listitem><para><command>htdig</command> and <command>htmerge</command> are often found in <filename class="directory">/usr/bin/</filename> or in something like <filename class="directory">/usr/local/www/htdig/bin/</filename>.</para></listitem>
+
+<listitem><para>the <command>htsearch</command> command is often found in a sub folder called <filename class="directory">cgi-bin</filename>, for example <filename class="directory">/usr/local/httpd/cgi-bin/</filename>.</para>
 
 </listitem>
 </itemizedlist>
 
-<tip
-><para
->To find out where for example <command
->htdig</command
-> is installed you can always type <command
->whereis htdig</command
-> on the console. <command
->whereis</command
-> will look for the specified command in the standard execution path folders. However, folders like <filename class="directory"
->cgi-bin</filename
-> are often not in the standard execution path.</para
-></tip>
+<tip><para>To find out where for example <command>htdig</command> is installed you can always type <command>whereis htdig</command> on the console. <command>whereis</command> will look for the specified command in the standard execution path folders. However, folders like <filename class="directory">cgi-bin</filename> are often not in the standard execution path.</para></tip>
 
 </sect3>
 
 <sect3 id="help-index-use-scope">
-<title
->Scope and Search Paths</title>
-
-<para
->In this section you can choose which help resources should be indexed, &ie; made available to the search engine.</para>
-
-<para
->In the <guilabel
->Scope</guilabel
-> frame you can select some typical resources you want to be indexed, &ie; the &kde; help files, and the information offered by the <command
->man</command
-> and <command
->info</command
-> commands. Note that some of those may still be disabled, which means that support for them has not been added yet.</para>
-
-<para
->Maybe you have additional files you want to access using the &khelpcenter; fulltext search feature. For example, you might have an <acronym
->HTML</acronym
-> reference installed in <filename
->/home/jdoe/docs/selfhtml</filename
->. By adding this path to the list of additional search paths you make this documentation available to &khelpcenter;'s fulltext search, too. Just click on the <guibutton
->Add</guibutton
-> button and a file dialogue will ask you for an additional search folder. Select <filename class="directory"
->/home/jdoe/docs/selfhtml</filename
-> and click <guibutton
->OK</guibutton
->. To remove an additional search path, just select it and click <guibutton
->Delete</guibutton
->.</para>
-
-<important
-><para
->Your changes to the scope and additional search paths will not take effect if you don't click on the <guibutton
->Build index</guibutton
-> button.</para
-></important>
+<title>Scope and Search Paths</title>
+
+<para>In this section you can choose which help resources should be indexed, &ie; made available to the search engine.</para>
+
+<para>In the <guilabel>Scope</guilabel> frame you can select some typical resources you want to be indexed, &ie; the &kde; help files, and the information offered by the <command>man</command> and <command>info</command> commands. Note that some of those may still be disabled, which means that support for them has not been added yet.</para>
+
+<para>Maybe you have additional files you want to access using the &khelpcenter; fulltext search feature. For example, you might have an <acronym>HTML</acronym> reference installed in <filename>/home/jdoe/docs/selfhtml</filename>. By adding this path to the list of additional search paths you make this documentation available to &khelpcenter;'s fulltext search, too. Just click on the <guibutton>Add</guibutton> button and a file dialogue will ask you for an additional search folder. Select <filename class="directory">/home/jdoe/docs/selfhtml</filename> and click <guibutton>OK</guibutton>. To remove an additional search path, just select it and click <guibutton>Delete</guibutton>.</para>
+
+<important><para>Your changes to the scope and additional search paths will not take effect if you don't click on the <guibutton>Build index</guibutton> button.</para></important>
 </sect3>
 
 </sect2>
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/icons/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/icons/index.docbook
index eb875630a9e..058866d77f6 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/icons/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/icons/index.docbook
@@ -2,305 +2,137 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Mike.McBride; &Mike.McBride.mail;</author>
-<author
->&Jost.Schenck; &Jost.Schenck.mail;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Mike.McBride; &Mike.McBride.mail;</author>
+<author>&Jost.Schenck; &Jost.Schenck.mail;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2003-09-22</date>
-<releaseinfo
->3.2</releaseinfo>
+<date>2003-09-22</date>
+<releaseinfo>3.2</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->icon</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>icon</keyword>
 </keywordset>
 </articleinfo>
 <sect1 id="icons">
-<title
->Icons</title>
+<title>Icons</title>
 
 <sect2 id="icons-intro">
-<title
->Introduction</title>
+<title>Introduction</title>
 
-<para
->&kde; comes with a full set of icons in several sizes. These icons are being used all over &kde;: the desktop, the panel, the &konqueror; file manager, in every toolbar of every &kde; application, etc. The icons control module offers you very flexible ways of customising the way &kde; handles icons. You can:</para>
+<para>&kde; comes with a full set of icons in several sizes. These icons are being used all over &kde;: the desktop, the panel, the &konqueror; file manager, in every toolbar of every &kde; application, etc. The icons control module offers you very flexible ways of customising the way &kde; handles icons. You can:</para>
 
 <itemizedlist>
-<listitem
-><para
->install and choose icon themes</para
-></listitem>
-<listitem
-><para
->choose different icon sizes</para
-></listitem>
-<listitem
-><para
->assign effects to icons (for example make them semi-transparent or colourise them) </para
-></listitem>
-<listitem
-><para
->configure these settings for each of the different places icons will be used in: for example the desktop, toolbars &etc; </para
-></listitem>
+<listitem><para>install and choose icon themes</para></listitem>
+<listitem><para>choose different icon sizes</para></listitem>
+<listitem><para>assign effects to icons (for example make them semi-transparent or colourise them) </para></listitem>
+<listitem><para>configure these settings for each of the different places icons will be used in: for example the desktop, toolbars &etc; </para></listitem>
 </itemizedlist>
 
-<important
-><para
->Please note that some of these settings may depend on your selected icon theme. &kde; comes with two icon themes by default, &kde;-Classic (HiColour) and Crystal SVG. There is also a low colour theme in the tdeartwork package, along with others.</para
-></important>
+<important><para>Please note that some of these settings may depend on your selected icon theme. &kde; comes with two icon themes by default, &kde;-Classic (HiColour) and Crystal SVG. There is also a low colour theme in the tdeartwork package, along with others.</para></important>
 
 </sect2>
 
 <sect2 id="icon-theme">
-<title
-><guilabel
->Theme</guilabel
-></title>
+<title><guilabel>Theme</guilabel></title>
 
-<para
->Starting at the top, you can see some example icons. These change in appearance depending on the icon theme you select. Most default installations will have only one icon theme available, the &kde; default Crystal SVG theme. There are others contained separately in the tdeartwork package, and you can download more from the Internet.</para>
+<para>Starting at the top, you can see some example icons. These change in appearance depending on the icon theme you select. Most default installations will have only one icon theme available, the &kde; default Crystal SVG theme. There are others contained separately in the tdeartwork package, and you can download more from the Internet.</para>
 
-<para
->Use the <guibutton
->Install New Theme...</guibutton
-> to browse to the location of newly downloaded themes, and they will then become available to select from above.</para>
+<para>Use the <guibutton>Install New Theme...</guibutton> to browse to the location of newly downloaded themes, and they will then become available to select from above.</para>
 
 </sect2>
 
 <sect2 id="icons-use">
-<title
->Advanced</title>
-
-<para
->Looking at this second page of the icons control module, you will see two areas:</para>
-
-<itemizedlist
-> 
-<listitem
-> 
-<para
->An area labelled <guilabel
->Use of Icon</guilabel
->. Here you can choose which particular usage of icons you want to configure, for example <guilabel
->Toolbar</guilabel
-> or <guilabel
->Panel</guilabel
->.</para
-> 
-</listitem
-> 
-
-<listitem
-> <para
->A preview area where you can see how icons of the selected kind will look using the current settings. Note that the state of this preview also depends on the icon state selected in the effects below (do not worry about that now, we will explain that below). </para
-> </listitem>
+<title>Advanced</title>
+
+<para>Looking at this second page of the icons control module, you will see two areas:</para>
+
+<itemizedlist> 
+<listitem> 
+<para>An area labelled <guilabel>Use of Icon</guilabel>. Here you can choose which particular usage of icons you want to configure, for example <guilabel>Toolbar</guilabel> or <guilabel>Panel</guilabel>.</para> 
+</listitem> 
+
+<listitem> <para>A preview area where you can see how icons of the selected kind will look using the current settings. Note that the state of this preview also depends on the icon state selected in the effects below (do not worry about that now, we will explain that below). </para> </listitem>
 </itemizedlist>
 
-<para
->When you want to configure icons, first select the usage of icons you want to configure. Change the settings until you like the preview. You can then choose a different icon usage and configure that. At the end, if you are satisfied with your settings, click <guibutton
->OK</guibutton
-> or <guibutton
->Apply</guibutton
-> to take the changes in effect.</para>
+<para>When you want to configure icons, first select the usage of icons you want to configure. Change the settings until you like the preview. You can then choose a different icon usage and configure that. At the end, if you are satisfied with your settings, click <guibutton>OK</guibutton> or <guibutton>Apply</guibutton> to take the changes in effect.</para>
 
-<para
->There are two further options to consider, <guilabel
->Size</guilabel
-> and <guilabel
->Effects</guilabel
->. </para>
+<para>There are two further options to consider, <guilabel>Size</guilabel> and <guilabel>Effects</guilabel>. </para>
 
 <sect3 id="icons-use-size">
-<title
->Icon Size</title>
-
-<para
->You have two options relating to icon sizes. First, you can choose from a list of icon sizes. Second, you can tell &kde; to draw all pixels using double sized pixels. The largest icon sizes are especially useful for visually impaired people.</para>
-
-<para
->Which sizes will be offered by the icon size listbox depends on the icon theme you have selected in the icon themes control module. For example, the low colour icon theme only offers the sizes 16 and 32 for desktop icons and 16, 22 and 32 for toolbar icons. The HiColour theme offers icon sizes 16, 32 and 48 as well as sizes from 64 to 128. However, as &kde; can not have all these icon sizes in store, icons using size 64 to 128 will be automatically generated which may result in a loss of quality.</para>
-
-<para
->If the icon sizes offered by your chosen icon theme are not enough for you, there is still the option <guilabel
->Double-sized pixels</guilabel
->. If this option is selected, all icons will have double sized pixels, &ie; a 2x2 block instead of normal pixels. While this makes it possible to achieve very large icon sizes, the quality is poor: icons will look <quote
->blocky</quote
->, an effect you may remember if you've grown up using a Sinclair ZX Spectrum or similar. If this is an option for you, using the large sizes offered by &kde;'s HiColour icon theme will always result in a much better quality than using the low colour icon theme with double sized pixels.</para
-> 
+<title>Icon Size</title>
+
+<para>You have two options relating to icon sizes. First, you can choose from a list of icon sizes. Second, you can tell &kde; to draw all pixels using double sized pixels. The largest icon sizes are especially useful for visually impaired people.</para>
+
+<para>Which sizes will be offered by the icon size listbox depends on the icon theme you have selected in the icon themes control module. For example, the low colour icon theme only offers the sizes 16 and 32 for desktop icons and 16, 22 and 32 for toolbar icons. The HiColour theme offers icon sizes 16, 32 and 48 as well as sizes from 64 to 128. However, as &kde; can not have all these icon sizes in store, icons using size 64 to 128 will be automatically generated which may result in a loss of quality.</para>
+
+<para>If the icon sizes offered by your chosen icon theme are not enough for you, there is still the option <guilabel>Double-sized pixels</guilabel>. If this option is selected, all icons will have double sized pixels, &ie; a 2x2 block instead of normal pixels. While this makes it possible to achieve very large icon sizes, the quality is poor: icons will look <quote>blocky</quote>, an effect you may remember if you've grown up using a Sinclair ZX Spectrum or similar. If this is an option for you, using the large sizes offered by &kde;'s HiColour icon theme will always result in a much better quality than using the low colour icon theme with double sized pixels.</para> 
 <!-- 
-<para
->You can also choose to have smoothed icons, an effect similar to
-anti-aliasing of fonts.  Enable the checkbox <guilabel
->Blend alpha
-channel</guilabel
-> to see this in action, but note that it will slow
+<para>You can also choose to have smoothed icons, an effect similar to
+anti-aliasing of fonts.  Enable the checkbox <guilabel>Blend alpha
+channel</guilabel> to see this in action, but note that it will slow
 down graphics on a slower computer.</para>
 -->
 
-<para
->You can also choose animated icons. Many of the icons have animations associated with them. Enable the checkbox labelled <guilabel
->Animate Icons</guilabel
->, to enable this effect, but note that it may appear slow or jerky if your graphics card is old or you are low on memory.</para>
+<para>You can also choose animated icons. Many of the icons have animations associated with them. Enable the checkbox labelled <guilabel>Animate Icons</guilabel>, to enable this effect, but note that it may appear slow or jerky if your graphics card is old or you are low on memory.</para>
 
 </sect3>
 
 <sect3 id="icons-use-effects">
-<title
->Effects</title>
+<title>Effects</title>
 
-<para
->Finally you can configure certain <quote
->filters</quote
-> to be applied on icons which are in one of three states:</para>
+<para>Finally you can configure certain <quote>filters</quote> to be applied on icons which are in one of three states:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Default</guilabel
-></term>
-<listitem
-><para
->This is how the icon will look normally.</para
-></listitem>
+<term><guilabel>Default</guilabel></term>
+<listitem><para>This is how the icon will look normally.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Active</guilabel
->:</term>
-<listitem
-><para
->This is how the icon will look when the mouse cursor is over the icon.</para
-></listitem>
+<term><guilabel>Active</guilabel>:</term>
+<listitem><para>This is how the icon will look when the mouse cursor is over the icon.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Disabled</guilabel
->:</term>
-<listitem
-><para
->This is how the icon will look if its corresponding action is disabled, &ie; clicking on it will not lead to any result.</para
-></listitem>
+<term><guilabel>Disabled</guilabel>:</term>
+<listitem><para>This is how the icon will look if its corresponding action is disabled, &ie; clicking on it will not lead to any result.</para></listitem>
 </varlistentry>
 </variablelist>
 
-<para
->Select one of these states, and press the <guibutton
->Set Effect...</guibutton
-> button to configure a corresponding icon effect. Please note that this configuration will only affect icons of the currently selected <guilabel
->Use of Icon</guilabel
-> category (see above): configuring an effect for active icons, while <guilabel
->Toolbar</guilabel
-> icon usage is selected, will <emphasis
->not</emphasis
-> affect active icons used in other places.</para>
-
-<para
->Below the list of icon states there are two options: you can configure an effect and you can select the <guilabel
->Semi-transparent</guilabel
-> option, which will make the background <quote
->shine through</quote
-> the icon. To the right of the effects list box there's a setup button to pass additional parameters to a filter.</para>
-
-<para
->The following effects can be applied to icons:</para>
+<para>Select one of these states, and press the <guibutton>Set Effect...</guibutton> button to configure a corresponding icon effect. Please note that this configuration will only affect icons of the currently selected <guilabel>Use of Icon</guilabel> category (see above): configuring an effect for active icons, while <guilabel>Toolbar</guilabel> icon usage is selected, will <emphasis>not</emphasis> affect active icons used in other places.</para>
+
+<para>Below the list of icon states there are two options: you can configure an effect and you can select the <guilabel>Semi-transparent</guilabel> option, which will make the background <quote>shine through</quote> the icon. To the right of the effects list box there's a setup button to pass additional parameters to a filter.</para>
+
+<para>The following effects can be applied to icons:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->No Effect</guilabel
->:</term>
-<listitem
-><para
->Icons will be used without applying any effect.</para
-></listitem
-> 
+<term><guilabel>No Effect</guilabel>:</term>
+<listitem><para>Icons will be used without applying any effect.</para></listitem> 
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->To Grey</guilabel
->:</term>
-<listitem
-><para
->This filter will apply a greyish look to the icon. Click <guibutton
->Setup...</guibutton
-> to configure the intensity of this filter. Note that it is customary for most user interfaces to use this effect for disabled icons only.</para
-></listitem>
+<term><guilabel>To Grey</guilabel>:</term>
+<listitem><para>This filter will apply a greyish look to the icon. Click <guibutton>Setup...</guibutton> to configure the intensity of this filter. Note that it is customary for most user interfaces to use this effect for disabled icons only.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Colourise</guilabel
->:</term>
-<listitem
-><para
->Icons will be coloured using a custom colour. For example, you may configure active icons (&ie; the icon the mouse cursor is over) to shine golden. Click <guibutton
->Setup...</guibutton
-> to configure the used colour and the intensity of the colouring.</para
-></listitem
-> 
+<term><guilabel>Colourise</guilabel>:</term>
+<listitem><para>Icons will be coloured using a custom colour. For example, you may configure active icons (&ie; the icon the mouse cursor is over) to shine golden. Click <guibutton>Setup...</guibutton> to configure the used colour and the intensity of the colouring.</para></listitem> 
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Gamma</guilabel
->:</term>
-<listitem
-><para
->A different gamma value will be applied to all icons. If you're no photographer and don't know what Gamma is: it's quite similar to what people call contrast. Just play around with the gamma settings by clicking on <guibutton
->Setup...</guibutton
-> to get a feeling for this effect.</para
-></listitem>
+<term><guilabel>Gamma</guilabel>:</term>
+<listitem><para>A different gamma value will be applied to all icons. If you're no photographer and don't know what Gamma is: it's quite similar to what people call contrast. Just play around with the gamma settings by clicking on <guibutton>Setup...</guibutton> to get a feeling for this effect.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Desaturate</guilabel
->:</term>
-<listitem
-><para
->Icons will be drawn desaturated. This is quite similar to the <quote
->Colour</quote
-> setting on your television. Click <guibutton
->Setup...</guibutton
-> to configure the amount of desaturation. </para
-></listitem
-> 
+<term><guilabel>Desaturate</guilabel>:</term>
+<listitem><para>Icons will be drawn desaturated. This is quite similar to the <quote>Colour</quote> setting on your television. Click <guibutton>Setup...</guibutton> to configure the amount of desaturation. </para></listitem> 
 </varlistentry>
 </variablelist>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/index.docbook
index b599c16d500..9e4982aac59 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/index.docbook
@@ -2,233 +2,126 @@
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" 
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <book lang="&language;">
 <bookinfo>
-<title
->The &kcontrolcenter;</title>
+<title>The &kcontrolcenter;</title>
 
 <authorgroup>
-<author
-><firstname
->Michael</firstname
-> <surname
->McBride</surname
-> <affiliation
-><address
-><email
->mpmcbride7@yahoo.com</email
-></address
-></affiliation>
+<author><firstname>Michael</firstname> <surname>McBride</surname> <affiliation><address><email>mpmcbride7@yahoo.com</email></address></affiliation>
 </author>
 </authorgroup>
 
-<legalnotice
->&FDLNotice;</legalnotice>
+<legalnotice>&FDLNotice;</legalnotice>
 
-<date
->2002-02-02</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-02-02</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <abstract>
-<para
->This documentation describes &kde;'s control centre.</para>
+<para>This documentation describes &kde;'s control centre.</para>
 </abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->kcontrol</keyword>
-<keyword
->configuration</keyword>
-<keyword
->settings</keyword>
-<keyword
->module</keyword>
+<keyword>KDE</keyword>
+<keyword>kcontrol</keyword>
+<keyword>configuration</keyword>
+<keyword>settings</keyword>
+<keyword>module</keyword>
 </keywordset>
 
 </bookinfo>
 
 <chapter id="introduction">
-<title
->The &kcontrolcenter;</title>
+<title>The &kcontrolcenter;</title>
 
-<para
->The &kcontrolcenter; (from now on referred to simply as <quote
->the control centre</quote
->) provides you with a centralised and convenient way to configure all of your &kde; settings. </para>
+<para>The &kcontrolcenter; (from now on referred to simply as <quote>the control centre</quote>) provides you with a centralised and convenient way to configure all of your &kde; settings. </para>
 
-<para
->The control centre is made up of multiple modules. Each module is a separate application, but the control centre organises all of these programs into a convenient location. </para>
+<para>The control centre is made up of multiple modules. Each module is a separate application, but the control centre organises all of these programs into a convenient location. </para>
 
 <tip>
-<para
->Each control centre module can be executed individually </para>
+<para>Each control centre module can be executed individually </para>
 
-<para
->See section entitled <link linkend="control-center-run-indiv"
->Running individual control centre modules</link
-> for more information. </para>
+<para>See section entitled <link linkend="control-center-run-indiv">Running individual control centre modules</link> for more information. </para>
 </tip>
 
-<para
->The control centre groups the configuration modules into categories, so they are easy to locate. Within each category, the control centre shows all the modules in a list, so it is easier to find the right configuration module. </para>
+<para>The control centre groups the configuration modules into categories, so they are easy to locate. Within each category, the control centre shows all the modules in a list, so it is easier to find the right configuration module. </para>
 </chapter>
 
 <chapter id="control-center">
-<title
->Using The &kcontrolcenter;</title>
+<title>Using The &kcontrolcenter;</title>
 
-<para
->This next section details the use of the control centre itself. For information on individual modules, please see <link linkend="module"
->Control Centre Modules</link
-> </para>
+<para>This next section details the use of the control centre itself. For information on individual modules, please see <link linkend="module">Control Centre Modules</link> </para>
 
 <sect1 id="control-center-starting">
-<title
->Starting the &kcontrol;</title>
+<title>Starting the &kcontrol;</title>
 
-<para
->The &kcontrolcenter; can be started 3 ways: </para>
+<para>The &kcontrolcenter; can be started 3 ways: </para>
 
-<orderedlist
-> 
+<orderedlist> 
 <listitem>
-<para
->By selecting <menuchoice
-><guimenu
->K Button</guimenu
-><guimenuitem
->Control Centre</guimenuitem
-></menuchoice
-> from the &kde; Panel. </para>
+<para>By selecting <menuchoice><guimenu>K Button</guimenu><guimenuitem>Control Centre</guimenuitem></menuchoice> from the &kde; Panel. </para>
 </listitem>
 <listitem>
-<para
->By pressing <keycombo action="simul"
->&Alt;<keycap
->F2</keycap
-></keycombo
->. </para>
-
-<para
->This will bring up a dialogue box. Type <userinput
-><command
->kcontrol</command
-></userinput
->, and click <guibutton
->Run</guibutton
->. </para>
+<para>By pressing <keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo>. </para>
+
+<para>This will bring up a dialogue box. Type <userinput><command>kcontrol</command></userinput>, and click <guibutton>Run</guibutton>. </para>
 </listitem>
 
 <listitem>
-<para
->You can type <command
->kcontrol &amp;</command
-> at any command prompt. </para>
-</listitem
-> 
-</orderedlist
-> 
-
-<para
->All three of these methods are equivalent, and produce the same result. </para>
+<para>You can type <command>kcontrol &amp;</command> at any command prompt. </para>
+</listitem> 
+</orderedlist> 
+
+<para>All three of these methods are equivalent, and produce the same result. </para>
 
 </sect1>
 
-<sect1 id="control-center-screen"
-> 
-<title
->The &kcontrolcenter; Screen</title>
+<sect1 id="control-center-screen"> 
+<title>The &kcontrolcenter; Screen</title>
 
-<para
->When you start the control centre, you are presented with a window, which can be divided into 3 functional parts. </para>
+<para>When you start the control centre, you are presented with a window, which can be divided into 3 functional parts. </para>
 
 <screenshot>
-<screeninfo
->Screenshot</screeninfo>
+<screeninfo>Screenshot</screeninfo>
 <mediaobject>
-<imageobject
-> <imagedata fileref="screenshot.png" format="PNG"/> 
+<imageobject> <imagedata fileref="screenshot.png" format="PNG"/> 
 </imageobject>
-<textobject
-> <phrase
->Screenshot</phrase
-> </textobject>
+<textobject> <phrase>Screenshot</phrase> </textobject>
 <caption>
-<para
->The &kde; Control Centre Screen</para>
+<para>The &kde; Control Centre Screen</para>
 </caption>
 </mediaobject>
-</screenshot
-> 
+</screenshot> 
 
-<para
->Across the top is a menubar. The menubar will provide you with quick access to most of &kcontrolcenter;'s features. The menus are detailed in <link linkend="control-center-menus"
->The &kde; Control Centre Menus</link
->. </para>
+<para>Across the top is a menubar. The menubar will provide you with quick access to most of &kcontrolcenter;'s features. The menus are detailed in <link linkend="control-center-menus">The &kde; Control Centre Menus</link>. </para>
 
-<para
->Along the left hand side, is a column. This is a where you choose which module to configure. You can learn how to navigate through the modules in the section called <link linkend="module-intro"
->Navigating Modules</link
->. </para>
+<para>Along the left hand side, is a column. This is a where you choose which module to configure. You can learn how to navigate through the modules in the section called <link linkend="module-intro">Navigating Modules</link>. </para>
 
-<para
->The main panel shows you some system information. </para>
+<para>The main panel shows you some system information. </para>
 
-<para
->In this example, we are running &kde; 2.99, we started &kcontrolcenter; as user <systemitem class="username"
->adridg</systemitem
->, the computer is named <systemitem class="systemname"
->aramis</systemitem
->, it is a FreeBSD system, Version 4.4-RELEASE, on a Pentium. </para>
+<para>In this example, we are running &kde; 2.99, we started &kcontrolcenter; as user <systemitem class="username">adridg</systemitem>, the computer is named <systemitem class="systemname">aramis</systemitem>, it is a FreeBSD system, Version 4.4-RELEASE, on a Pentium. </para>
 
 </sect1>
 
 <sect1 id="control-center-menus">
-<title
->The &kcontrol; Menus</title>
+<title>The &kcontrol; Menus</title>
 
-<para
->This next section gives you a brief description of what each menu item does. </para>
+<para>This next section gives you a brief description of what each menu item does. </para>
 
 <sect2 id="control-center-menu-file">
-<title
-><guimenu
->File</guimenu
-> Menu</title>
+<title><guimenu>File</guimenu> Menu</title>
 
-<para
->The <guimenu
->File</guimenu
-> menu has a single entry. </para>
+<para>The <guimenu>File</guimenu> menu has a single entry. </para>
 
 <variablelist>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->Q</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Quit</guimenuitem
-> </menuchoice
-></term>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Quit</guimenuitem> </menuchoice></term>
 <listitem>
 <para>
-<action
->Closes the control centre.</action>
+<action>Closes the control centre.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -237,161 +130,75 @@
 </sect2>
 
 <sect2 id="control-center-menu-view">
-<title
-><guimenu
->View</guimenu
-> Menu</title>
-
-<para
->These options determine how the module selection looks and behaves. </para>
-
-<variablelist
-> 
-<varlistentry
-> 
-<term
-><menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Mode</guimenuitem
-> </menuchoice
-></term>
+<title><guimenu>View</guimenu> Menu</title>
+
+<para>These options determine how the module selection looks and behaves. </para>
+
+<variablelist> 
+<varlistentry> 
+<term><menuchoice><guimenu>View</guimenu> <guimenuitem>Mode</guimenuitem> </menuchoice></term>
 
 <listitem>
-<para
->Determines whether to use <guimenuitem
->Tree</guimenuitem
-> view, or <guimenuitem
->Icon</guimenuitem
-> view for your modules. </para>
-
-<para
->With <guimenuitem
->Tree</guimenuitem
-> view, each submenu appears as an indented list. </para>
-
-<para
->With <guimenuitem
->Icon</guimenuitem
-> view, when you click on a category, the categories disappear and are replaced with the module list. You then use the <guiicon
->up</guiicon
-> button to return to the categories. </para>
+<para>Determines whether to use <guimenuitem>Tree</guimenuitem> view, or <guimenuitem>Icon</guimenuitem> view for your modules. </para>
+
+<para>With <guimenuitem>Tree</guimenuitem> view, each submenu appears as an indented list. </para>
+
+<para>With <guimenuitem>Icon</guimenuitem> view, when you click on a category, the categories disappear and are replaced with the module list. You then use the <guiicon>up</guiicon> button to return to the categories. </para>
 </listitem>
 </varlistentry>
 
-<varlistentry
-> 
-<term
-><menuchoice
-><guimenu
->View</guimenu
-><guisubmenu
->Icon size</guisubmenu
-> </menuchoice
-></term
-> 
+<varlistentry> 
+<term><menuchoice><guimenu>View</guimenu><guisubmenu>Icon size</guisubmenu> </menuchoice></term> 
 
 <listitem>
-<para
->Using this option, you can choose <guimenuitem
->Small</guimenuitem
->, <guimenuitem
->Medium</guimenuitem
->, or <guimenuitem
->Large</guimenuitem
-> icons to select your modules. </para>
-
-<note
-><para
->This menu item only controls the icon size if you are in <guimenuitem
->Icon View</guimenuitem
->. If you choose <guimenuitem
->Tree View</guimenuitem
->, the <guimenuitem
->Small</guimenuitem
-> icon size will be used, no matter what size was previously selected in <guimenuitem
->Icon View</guimenuitem
->. </para>
+<para>Using this option, you can choose <guimenuitem>Small</guimenuitem>, <guimenuitem>Medium</guimenuitem>, or <guimenuitem>Large</guimenuitem> icons to select your modules. </para>
+
+<note><para>This menu item only controls the icon size if you are in <guimenuitem>Icon View</guimenuitem>. If you choose <guimenuitem>Tree View</guimenuitem>, the <guimenuitem>Small</guimenuitem> icon size will be used, no matter what size was previously selected in <guimenuitem>Icon View</guimenuitem>. </para>
 </note>
 </listitem>
 
-</varlistentry
-> 
-</variablelist
-> 
+</varlistentry> 
+</variablelist> 
 </sect2>
 
 <sect2 id="control-center-menu-mod">
-<title
-><guimenu
->Modules</guimenu
-> Menu</title>
+<title><guimenu>Modules</guimenu> Menu</title>
 
-<para
->The modules menu is a shortcut to take you directly to any module in the control centre. </para>
+<para>The modules menu is a shortcut to take you directly to any module in the control centre. </para>
 
 </sect2>
 
 <sect2 id="control-center-menu-help">
-<title
-><guimenu
->Help</guimenu
-> Menu</title>
+<title><guimenu>Help</guimenu> Menu</title>
 &help.menu.documentation; </sect2>
 
 </sect1>
 
 <sect1 id="control-center-exiting">
-<title
->Exiting The &kde; Control Centre</title>
+<title>Exiting The &kde; Control Centre</title>
 
-<para
->You can exit the control centre one of three ways: </para>
+<para>You can exit the control centre one of three ways: </para>
 
 <itemizedlist>
 <listitem>
-<para
->Select <menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Quit</guimenuitem
-></menuchoice
-> from the menu bar. </para>
+<para>Select <menuchoice><guimenu>File</guimenu> <guimenuitem>Quit</guimenuitem></menuchoice> from the menu bar. </para>
 </listitem>
 
 <listitem>
-<para
->Type <keycombo action="simul"
->&Ctrl;<keycap
->Q</keycap
-></keycombo
-> on the keyboard. </para>
+<para>Type <keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo> on the keyboard. </para>
 </listitem>
 
 <listitem>
-<para
->Click on the <guiicon
->Close</guiicon
-> button on the frame surrounding the control centre. </para>
+<para>Click on the <guiicon>Close</guiicon> button on the frame surrounding the control centre. </para>
 </listitem>
 </itemizedlist>
 
 </sect1>
 
 <sect1 id="control-center-run-indiv">
-<title
->Running Individual Modules</title>
-
-<para
->You can run individual modules without running kcontrol by selecting <menuchoice
-><guimenu
->K Button</guimenu
-> <guisubmenu
->Preferences</guisubmenu
-> </menuchoice
-> from the &kde; panel. You can then select the module you want to run in the submenus. </para>
+<title>Running Individual Modules</title>
+
+<para>You can run individual modules without running kcontrol by selecting <menuchoice><guimenu>K Button</guimenu> <guisubmenu>Preferences</guisubmenu> </menuchoice> from the &kde; panel. You can then select the module you want to run in the submenus. </para>
 
 </sect1>
 
@@ -400,335 +207,186 @@
 <!--*****************************************************************-->
 
 <chapter id="module">
-<title
->The &kcontrol; Modules</title>
+<title>The &kcontrol; Modules</title>
 
-<para
->In order to make it as easy as possible, the &kcontrol; has organised similar options into groups. Each group is called a module. When you click on the name of a module in the left window, you will be presented with the options of the module on the right. </para>
+<para>In order to make it as easy as possible, the &kcontrol; has organised similar options into groups. Each group is called a module. When you click on the name of a module in the left window, you will be presented with the options of the module on the right. </para>
 
-<para
->Each module will have some or all of the following buttons: </para>
+<para>Each module will have some or all of the following buttons: </para>
 
 <variablelist>
 
 <varlistentry>
-<term
->Help</term>
+<term>Help</term>
 <listitem>
-<para
->This button will give you help specific to the current module. The button will show you a short summary help page in the left window. At the bottom of that window, you can click on a link to get more detailed help. </para>
+<para>This button will give you help specific to the current module. The button will show you a short summary help page in the left window. At the bottom of that window, you can click on a link to get more detailed help. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Use Defaults</guilabel
-></term
-> 
+<term><guilabel>Use Defaults</guilabel></term> 
 <listitem>
-<para
->This button will restore this module to its default values. You must click <guibutton
->OK</guibutton
-> to save the options. </para>
+<para>This button will restore this module to its default values. You must click <guibutton>OK</guibutton> to save the options. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guibutton
->Apply</guibutton
-></term>
+<term><guibutton>Apply</guibutton></term>
 <listitem>
-<para
->Clicking this button will save all changes to &kde;. If you have changed anything, clicking <guibutton
->Apply</guibutton
-> will cause the changes to take effect. </para>
+<para>Clicking this button will save all changes to &kde;. If you have changed anything, clicking <guibutton>Apply</guibutton> will cause the changes to take effect. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guibutton
->Reset</guibutton
-></term>
+<term><guibutton>Reset</guibutton></term>
 <listitem>
-<para
->This button will <quote
->Reset</quote
-> the module. The exact effect will depend on the module. </para>
+<para>This button will <quote>Reset</quote> the module. The exact effect will depend on the module. </para>
 </listitem>
-</varlistentry
-> 
+</varlistentry> 
 
 </variablelist>
 
 <note>
-<para
->You must save the options of one module using <guibutton
->Apply</guibutton
-> before you can change to a different module. </para>
-<para
->If you try to change without saving your options, you will be asked if you want to save your changes, or discard them. </para>
+<para>You must save the options of one module using <guibutton>Apply</guibutton> before you can change to a different module. </para>
+<para>If you try to change without saving your options, you will be asked if you want to save your changes, or discard them. </para>
 </note>
 
 
 <sect1 id="module-intro">
-<title
->Navigating Modules</title>
+<title>Navigating Modules</title>
 
-<para
->This is a list of the <emphasis
->standard</emphasis
-> configuration modules (sorted by category) provided by the <application role="package"
->KDE base</application
-> package. Please note that there may be many more modules on your system if you have installed additional software. </para>
+<para>This is a list of the <emphasis>standard</emphasis> configuration modules (sorted by category) provided by the <application role="package">KDE base</application> package. Please note that there may be many more modules on your system if you have installed additional software. </para>
 
 <!-- Commented until fixed arrangement is made -->
 <!-- 
 <variablelist>
 <varlistentry>
-<term
->File Browsing</term>
+<term>File Browsing</term>
 <listitem>
 <para>
-<link linkend="file-assoc"
->File Associations</link
->,
-<link linkend="file-manager"
->File Manager</link
->,
+<link linkend="file-assoc">File Associations</link>,
+<link linkend="file-manager">File Manager</link>,
 </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Look and Feel</term>
+<term>Look and Feel</term>
 <listitem>
 <para>
-<link linkend="background"
->Background</link
->,
-<!- - <link linkend="borders"
->Borders</link
->,- ->
-<link linkend="color"
->Colors</link
->,
-<link linkend="desktop"
->Desktop</link
->,
-<link linkend="fonts"
->Fonts</link
->,
-<link linkend="icons"
->Icons</link
->,
-<!- -  <link linkend="iconstyle"
->Icon Style</link
->, - ->
-<link linkend="key-bindings"
->Key Bindings</link
->,
-<link linkend="launch-feedback"
->Launch feedback</link
->,
-<link linkend="panel"
->Panel</link
->,
-<link linkend="screensaver"
->Screensaver</link
->,
-<link linkend="style"
->Style</link
->,
-<link linkend="sys-notify"
->System Notifications</link
->,
-<link linkend="taskbar"
->Taskbar</link
->,
-<link linkend="theme-manager"
->Theme Manager</link
->,
-<!- - <link linkend="numbername"
->Virtual Desktops</link
->,- ->
-<link linkend="window-behavior"
->Window Behavior</link
->,
-<link linkend="window-deco"
->Window Decoration</link
->.
+<link linkend="background">Background</link>,
+<!- - <link linkend="borders">Borders</link>,- ->
+<link linkend="color">Colors</link>,
+<link linkend="desktop">Desktop</link>,
+<link linkend="fonts">Fonts</link>,
+<link linkend="icons">Icons</link>,
+<!- -  <link linkend="iconstyle">Icon Style</link>, - ->
+<link linkend="key-bindings">Key Bindings</link>,
+<link linkend="launch-feedback">Launch feedback</link>,
+<link linkend="panel">Panel</link>,
+<link linkend="screensaver">Screensaver</link>,
+<link linkend="style">Style</link>,
+<link linkend="sys-notify">System Notifications</link>,
+<link linkend="taskbar">Taskbar</link>,
+<link linkend="theme-manager">Theme Manager</link>,
+<!- - <link linkend="numbername">Virtual Desktops</link>,- ->
+<link linkend="window-behavior">Window Behavior</link>,
+<link linkend="window-deco">Window Decoration</link>.
 </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Network</term>
+<term>Network</term>
 <listitem>
 <para>
-<link linkend="e-mail"
->E-Mail</link
->,
-<link linkend="lan-browsing"
->LAN Browsing</link
->,
-<link linkend="timeouts"
->Preferences</link
->, <!- - FIXME - ->
-<link linkend="socks"
->SOCKS</link
->,
-<link linkend="talk"
->Talk Configuration</link>
-<link linkend="windows-shares"
->Windows Shares</link>
+<link linkend="e-mail">E-Mail</link>,
+<link linkend="lan-browsing">LAN Browsing</link>,
+<link linkend="timeouts">Preferences</link>, <!- - FIXME - ->
+<link linkend="socks">SOCKS</link>,
+<link linkend="talk">Talk Configuration</link>
+<link linkend="windows-shares">Windows Shares</link>
 </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Peripherals</term>
+<term>Peripherals</term>
 <listitem>
 <para>
-<link linkend="kbd"
->Keyboard</link
->,
-<link linkend="mouse"
->Mouse</link>
+<link linkend="kbd">Keyboard</link>,
+<link linkend="mouse">Mouse</link>
 </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Personalization</term>
+<term>Personalization</term>
 <listitem>
 <para>
-<link linkend="accessibility"
->Accessibility</link
->,
-<link linkend="locale"
->Country &amp; Language</link
->,
-<link linkend="crypto"
->Crypto</link
->,
-<!- - <link linkend="kblayout"
->Keyboard Layout</link
->, - ->
-<link linkend="passwords"
->Passwords</link>
-<link linkend="spell-checking"
->Spell Checking</link
->.
+<link linkend="accessibility">Accessibility</link>,
+<link linkend="locale">Country &amp; Language</link>,
+<link linkend="crypto">Crypto</link>,
+<!- - <link linkend="kblayout">Keyboard Layout</link>, - ->
+<link linkend="passwords">Passwords</link>
+<link linkend="spell-checking">Spell Checking</link>.
 </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Power Control</term>
+<term>Power Control</term>
 <listitem>
 <para>
-<link linkend="battery-monitor"
->Battery Monitor</link
->,
-<link linkend="energy"
->Energy</link
->,
-<link linkend="powerctrl"
->Laptop Power Control</link
->,
-<link linkend="lowbatcrit"
->Low Battery Critical</link
->,
-<link linkend="lowbatwarn"
->Low Battery Warning</link>
+<link linkend="battery-monitor">Battery Monitor</link>,
+<link linkend="energy">Energy</link>,
+<link linkend="powerctrl">Laptop Power Control</link>,
+<link linkend="lowbatcrit">Low Battery Critical</link>,
+<link linkend="lowbatwarn">Low Battery Warning</link>
 </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Sound</term>
+<term>Sound</term>
 <listitem>
 <para>
-<link linkend="midi"
->Midi</link
->,
-<link linkend="mixer"
->Mixer</link
->,
-<link linkend="sndserver"
->Sound Server</link
->,
-<link linkend="bell"
->System Bell</link>
+<link linkend="midi">Midi</link>,
+<link linkend="mixer">Mixer</link>,
+<link linkend="sndserver">Sound Server</link>,
+<link linkend="bell">System Bell</link>
 </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->System</term>
+<term>System</term>
 <listitem>
 <para>
-<link linkend="datetime"
->Date and Time</link
->,
-<link linkend="konsole"
->&konsole;</link
->,
-<link linkend="login-manager"
->Login Manager</link
->,
-<link linkend="print-manager"
->Printing Manager</link
->,
-<link linkend="sessions"
->Session Manager</link
->,
+<link linkend="datetime">Date and Time</link>,
+<link linkend="konsole">&konsole;</link>,
+<link linkend="login-manager">Login Manager</link>,
+<link linkend="print-manager">Printing Manager</link>,
+<link linkend="sessions">Session Manager</link>,
 </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Web Browsing</term>
+<term>Web Browsing</term>
 <listitem>
 <para>
-<link linkend="cookie"
->Cookies</link
->,
-<link linkend="ebrowse"
->Enhanced Browsing</link
->,
-<link linkend="konq-browsing"
->Konqueror Browser</link
->,
-<link linkend="nsplugins"
->Netscape Plugins</link
->,
-<link linkend="proxies"
->Proxies &amp; Cache</link
->,
-<link linkend="stylesheets"
->Stylesheets</link
->,
-<link linkend="user-agent"
->User Agent</link
->,
+<link linkend="cookie">Cookies</link>,
+<link linkend="ebrowse">Enhanced Browsing</link>,
+<link linkend="konq-browsing">Konqueror Browser</link>,
+<link linkend="nsplugins">Netscape Plugins</link>,
+<link linkend="proxies">Proxies &amp; Cache</link>,
+<link linkend="stylesheets">Stylesheets</link>,
+<link linkend="user-agent">User Agent</link>,
 </para>
 </listitem>
 </varlistentry>
 
-</variablelist
->-->
+</variablelist>-->
 </sect1>
 
 
@@ -738,189 +396,60 @@
 </chapter>
 
 <chapter id="laptop">
-<title
->Laptop Modules Notes</title>
-
-<para
->In order to use the laptop modules, you must have the kernel <acronym
->APM</acronym
-> package installed in your kernel. Useful information on how to do this can be found at <ulink url="http://www.cs.utexas.edu/users/kharker/linux-laptop/apm.html"
-> http://www.cs.utexas.edu/users/kharker/linux-laptop/apm.html</ulink
-> and in the Battery Powered Linux mini-HOWTO at <ulink url="http://metalab.unc.edu/LDP/HOWTO/mini/Battery-Powered.html"
-> http://metalab.unc.edu/LDP/HOWTO/mini/Battery-Powered.html</ulink
->. </para>
-
-<para
->If you want the <guimenuitem
->suspend</guimenuitem
-> and <guimenuitem
->standby</guimenuitem
-> menu commands to work then you should install the &Linux; <application
->apmd</application
-> package (version 2.4 or later). If you want to use them from non-root accounts you must mark the <application
->apm</application
-> command <quote
->set uid root</quote
->. </para>
-
-<para
->To do this, log on as <systemitem class="username"
->root</systemitem
-> and enter: </para>
-
-<screen
-><prompt
->%</prompt
-><userinput
-><command
->chown</command
-> <option
->root 
-/usr/bin/apm</option
->;<command
->chmod</command
-> <option
->+s 
-/usr/bin/apm</option
-></userinput
->
+<title>Laptop Modules Notes</title>
+
+<para>In order to use the laptop modules, you must have the kernel <acronym>APM</acronym> package installed in your kernel. Useful information on how to do this can be found at <ulink url="http://www.cs.utexas.edu/users/kharker/linux-laptop/apm.html"> http://www.cs.utexas.edu/users/kharker/linux-laptop/apm.html</ulink> and in the Battery Powered Linux mini-HOWTO at <ulink url="http://metalab.unc.edu/LDP/HOWTO/mini/Battery-Powered.html"> http://metalab.unc.edu/LDP/HOWTO/mini/Battery-Powered.html</ulink>. </para>
+
+<para>If you want the <guimenuitem>suspend</guimenuitem> and <guimenuitem>standby</guimenuitem> menu commands to work then you should install the &Linux; <application>apmd</application> package (version 2.4 or later). If you want to use them from non-root accounts you must mark the <application>apm</application> command <quote>set uid root</quote>. </para>
+
+<para>To do this, log on as <systemitem class="username">root</systemitem> and enter: </para>
+
+<screen><prompt>%</prompt><userinput><command>chown</command> <option>root 
+/usr/bin/apm</option>;<command>chmod</command> <option>+s 
+/usr/bin/apm</option></userinput>
 </screen>
 
 <warning>
-<para
->By doing this you will allow any user of your system to put it into suspend or standby states - if you are the only user, this should not be a problem. </para>
-
-<para
->Also note that any program which has <systemitem class="username"
->root</systemitem
-> access, can be a potential security problem. You should carefully determine if there are any security concerns <emphasis
->before</emphasis
-> giving any program <systemitem class="username"
->root</systemitem
-> permissions. </para>
+<para>By doing this you will allow any user of your system to put it into suspend or standby states - if you are the only user, this should not be a problem. </para>
+
+<para>Also note that any program which has <systemitem class="username">root</systemitem> access, can be a potential security problem. You should carefully determine if there are any security concerns <emphasis>before</emphasis> giving any program <systemitem class="username">root</systemitem> permissions. </para>
 </warning>
 
 </chapter>
 
 <chapter id="credits">
-<title
->Credits and Licence</title>
+<title>Credits and Licence</title>
 
-<para
->&kcontrol;</para>
-<para
->Program copyright 1997-2001 The &kcontrolcenter; Developers</para>
-<para
->Contributors:</para>
+<para>&kcontrol;</para>
+<para>Program copyright 1997-2001 The &kcontrolcenter; Developers</para>
+<para>Contributors:</para>
 
 <itemizedlist>
-<listitem
-><para
->Matthias Hoelzer-Kluepfel <email
->hoelzer@kde.org</email
-></para
-></listitem>
-<listitem
-><para
->Matthias Elter <email
->elter@kde.org</email
-></para
-></listitem>
+<listitem><para>Matthias Hoelzer-Kluepfel <email>hoelzer@kde.org</email></para></listitem>
+<listitem><para>Matthias Elter <email>elter@kde.org</email></para></listitem>
 </itemizedlist>
 
-<para
->Documentation <trademark class="copyright"
->copyright 2000 Michael McBride</trademark
-> <email
->mpmcbride7@yahoo.com</email
-></para>
+<para>Documentation <trademark class="copyright">copyright 2000 Michael McBride</trademark> <email>mpmcbride7@yahoo.com</email></para>
 
-<para
->Contributors:</para>
+<para>Contributors:</para>
 
 <itemizedlist>
-<listitem
-><para
->Paul Campbell <email
->paul@taniwha.com</email
-></para
-></listitem>
-<listitem
-><para
->Helge Deller <email
->deller@kde.org</email
-></para
-></listitem>
-<listitem
-><para
->Mark Donohoe </para
-></listitem>
-<listitem
-><para
->Pat Dowler </para
-></listitem>
-<listitem
-><para
->Duncan Haldane <email
->duncan@kde.org</email
-></para
-></listitem>
-<listitem
-><para
->Steffen Hansen <email
->stefh@mip.ou.dk</email
->.</para
-></listitem>
-<listitem
-><para
->Matthias Hoelzer-Kluepfel <email
->hoelzer@kde.org</email
-></para
-></listitem>
-<listitem
-><para
->Martin Jones <email
->mjones@kde.org</email
-></para
-></listitem>
-<listitem
-><para
->Jost Schenck <email
->jost@schenck.de</email
-></para
-></listitem>
-<listitem
-><para
->Jonathan Singer <email
->jsinger@leeta.net</email
-></para
-></listitem>
-<listitem
-><para
->Thomas Tanghus <email
->tanghus@earthling.net</email
-></para
-></listitem>
-<listitem
-><para
->Krishna Tateneni <email
->tateneni@pluto.njcc.com
-></email
-></para
-></listitem>
-<listitem
-><para
->Ellis Whitehead <email
->ewhitehe@uni-freiburg.de</email
-></para
-></listitem>
+<listitem><para>Paul Campbell <email>paul@taniwha.com</email></para></listitem>
+<listitem><para>Helge Deller <email>deller@kde.org</email></para></listitem>
+<listitem><para>Mark Donohoe </para></listitem>
+<listitem><para>Pat Dowler </para></listitem>
+<listitem><para>Duncan Haldane <email>duncan@kde.org</email></para></listitem>
+<listitem><para>Steffen Hansen <email>stefh@mip.ou.dk</email>.</para></listitem>
+<listitem><para>Matthias Hoelzer-Kluepfel <email>hoelzer@kde.org</email></para></listitem>
+<listitem><para>Martin Jones <email>mjones@kde.org</email></para></listitem>
+<listitem><para>Jost Schenck <email>jost@schenck.de</email></para></listitem>
+<listitem><para>Jonathan Singer <email>jsinger@leeta.net</email></para></listitem>
+<listitem><para>Thomas Tanghus <email>tanghus@earthling.net</email></para></listitem>
+<listitem><para>Krishna Tateneni <email>tateneni@pluto.njcc.com></email></para></listitem>
+<listitem><para>Ellis Whitehead <email>ewhitehe@uni-freiburg.de</email></para></listitem>
 
 </itemizedlist>
-<para
->Conversion to British English: Malcolm Hunter <email
->malcolm.hunter@gmx.co.uk</email
-></para
-> 
+<para>Conversion to British English: Malcolm Hunter <email>malcolm.hunter@gmx.co.uk</email></para> 
 &underFDL; &underGPL; </chapter>
 
 </book>
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmaccess/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmaccess/index.docbook
index 0de44832cbb..d95215e5e29 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmaccess/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmaccess/index.docbook
@@ -2,202 +2,82 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article>
 <articleinfo>
 
-<authorgroup
->	
-<author
->&Mike.McBride; &Mike.McBride.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<authorgroup>	
+<author>&Mike.McBride; &Mike.McBride.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-09-01</date>
-<releaseinfo
->3.01.00</releaseinfo>
+<date>2002-09-01</date>
+<releaseinfo>3.01.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->accessibility</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>accessibility</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="accessibility">
-<title
->Accessibility</title>
+<title>Accessibility</title>
 <sect2 id="accessibility-intro">
 
-<title
->Introduction</title>
+<title>Introduction</title>
 
-<para
->This module is designed to help users who have difficulty hearing audible cues, or who have difficulty using a keyboard. </para>
+<para>This module is designed to help users who have difficulty hearing audible cues, or who have difficulty using a keyboard. </para>
 
-<para
->The module is divided into two tabs: <link linkend="access-bell"
-><guilabel
->Bell</guilabel
-></link
-> and <link linkend="access-kb"
-><guilabel
->Keyboard</guilabel
-></link
->. </para>
+<para>The module is divided into two tabs: <link linkend="access-bell"><guilabel>Bell</guilabel></link> and <link linkend="access-kb"><guilabel>Keyboard</guilabel></link>. </para>
 
 <sect3 id="access-bell">
-<title
-><guilabel
->Bell</guilabel
-></title>
-
-<para
->This panel is divided into an <guilabel
->Audible Bell</guilabel
-> section and a <guilabel
->Visible Bell</guilabel
-> section. </para>
-
-<para
->The top check box labelled <guilabel
->Use System Bell</guilabel
->, determines whether the normal System bell rings. If this option is disabled, the System bell will be silenced. </para>
-
-<para
->The next check box down can be used to play a different sound whenever the system bell is triggered. To activate, place a mark in the check box labelled <guilabel
->Use customised bell</guilabel
->, and enter the complete pathname to the sound file in the text box labelled <guilabel
->Sound to Play</guilabel
->. If you want, you can select the <guibutton
->Browse</guibutton
-> button to navigate through your filesystem to find the exact file. </para>
-
-<para
->For those users who have difficulty hearing the System bell, or those users who have a silent computer, &kde; offers the <emphasis
->visible bell</emphasis
->. This provides a visual signal (inverting the screen or flashing a colour across it) when the system bell would normally sound. </para>
-
-<para
->To use the visible bell, first place a mark in the check box labelled <guilabel
->Use visible bell</guilabel
->. </para>
-
-<para
->You can then select between <guilabel
->Invert screen</guilabel
->, or <guilabel
->Flash screen</guilabel
->. If you select <guilabel
->Invert screen</guilabel
->, all colours on the screen will be reversed. If you choose <guilabel
->Flash screen</guilabel
->, you can choose the colour by clicking the button to the right of the <guilabel
->Flash screen</guilabel
-> selection. </para>
-
-<para
->The slider bar can be used to adjust the duration of the visible bell. The default value is 500ms, or half a second. </para>
+<title><guilabel>Bell</guilabel></title>
+
+<para>This panel is divided into an <guilabel>Audible Bell</guilabel> section and a <guilabel>Visible Bell</guilabel> section. </para>
+
+<para>The top check box labelled <guilabel>Use System Bell</guilabel>, determines whether the normal System bell rings. If this option is disabled, the System bell will be silenced. </para>
+
+<para>The next check box down can be used to play a different sound whenever the system bell is triggered. To activate, place a mark in the check box labelled <guilabel>Use customised bell</guilabel>, and enter the complete pathname to the sound file in the text box labelled <guilabel>Sound to Play</guilabel>. If you want, you can select the <guibutton>Browse</guibutton> button to navigate through your filesystem to find the exact file. </para>
+
+<para>For those users who have difficulty hearing the System bell, or those users who have a silent computer, &kde; offers the <emphasis>visible bell</emphasis>. This provides a visual signal (inverting the screen or flashing a colour across it) when the system bell would normally sound. </para>
+
+<para>To use the visible bell, first place a mark in the check box labelled <guilabel>Use visible bell</guilabel>. </para>
+
+<para>You can then select between <guilabel>Invert screen</guilabel>, or <guilabel>Flash screen</guilabel>. If you select <guilabel>Invert screen</guilabel>, all colours on the screen will be reversed. If you choose <guilabel>Flash screen</guilabel>, you can choose the colour by clicking the button to the right of the <guilabel>Flash screen</guilabel> selection. </para>
+
+<para>The slider bar can be used to adjust the duration of the visible bell. The default value is 500ms, or half a second. </para>
 
 </sect3>
 
 <sect3 id="access-kb">
-<title
-><guilabel
->Keyboard</guilabel
-></title>
+<title><guilabel>Keyboard</guilabel></title>
 
-<para
->There are three sections to this panel.</para>
+<para>There are three sections to this panel.</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Use Sticky Keys</guilabel
-></term>
+<term><guilabel>Use Sticky Keys</guilabel></term>
 <listitem>
-<para
->If this option is enabled, the user can press and release the &Shift;, &Alt; or &Ctrl; keys, and then press another key to get a key combo (example: <keycombo action="simul"
->&Ctrl; &Alt; <keycap
->Del</keycap
-></keycombo
-> could be done with &Ctrl; then &Alt; then <keycap
->Del</keycap
->). </para>
-
-<para
->Also in this section is a check box labelled <guilabel
->Lock Sticky Keys</guilabel
->. If this check box is enabled, the &Alt;, &Ctrl; and &Shift; keys stay <quote
->selected</quote
-> until they are <quote
->de-selected</quote
-> by the user. </para>
-
-<para
->As an example: </para>
+<para>If this option is enabled, the user can press and release the &Shift;, &Alt; or &Ctrl; keys, and then press another key to get a key combo (example: <keycombo action="simul">&Ctrl; &Alt; <keycap>Del</keycap></keycombo> could be done with &Ctrl; then &Alt; then <keycap>Del</keycap>). </para>
+
+<para>Also in this section is a check box labelled <guilabel>Lock Sticky Keys</guilabel>. If this check box is enabled, the &Alt;, &Ctrl; and &Shift; keys stay <quote>selected</quote> until they are <quote>de-selected</quote> by the user. </para>
+
+<para>As an example: </para>
 <variablelist>
 <varlistentry>
-<term
->With <guilabel
->Lock Sticky Keys</guilabel
-> disabled:</term>
+<term>With <guilabel>Lock Sticky Keys</guilabel> disabled:</term>
 <listitem>
-<para
->The user presses the &Shift; key, then presses the <keycap
->F</keycap
-> key. The computer translates this into <keycombo action="simul"
->&Shift;<keycap
->F</keycap
-></keycombo
->. Now if the user types a <keycap
->p</keycap
->, the computer interprets this as the letter p (no shift). </para>
+<para>The user presses the &Shift; key, then presses the <keycap>F</keycap> key. The computer translates this into <keycombo action="simul">&Shift;<keycap>F</keycap></keycombo>. Now if the user types a <keycap>p</keycap>, the computer interprets this as the letter p (no shift). </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->With <guilabel
->Lock Sticky Keys</guilabel
-> enabled:</term>
+<term>With <guilabel>Lock Sticky Keys</guilabel> enabled:</term>
 <listitem>
-<para
->The user presses the &Shift; key, then presses the <keycap
->F</keycap
-> key. The computer translates this into <keycombo action="simul"
->&Shift;<keycap
->F</keycap
-></keycombo
->. Now if the user types a <keycap
->p</keycap
->, the computer interprets this as the letter P (<keycombo action="simul"
->&Shift;<keycap
->P</keycap
-></keycombo
->). </para>
+<para>The user presses the &Shift; key, then presses the <keycap>F</keycap> key. The computer translates this into <keycombo action="simul">&Shift;<keycap>F</keycap></keycombo>. Now if the user types a <keycap>p</keycap>, the computer interprets this as the letter P (<keycombo action="simul">&Shift;<keycap>P</keycap></keycombo>). </para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -205,24 +85,16 @@
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Slow keys</guilabel
-></term>
+<term><guilabel>Slow keys</guilabel></term>
 <listitem>
-<para
->If this option is enabled, the user must hold the key down for a specified period of time (adjustable with the slider) before the keystroke will be accepted. This helps prevent accidental key strokes. </para>
+<para>If this option is enabled, the user must hold the key down for a specified period of time (adjustable with the slider) before the keystroke will be accepted. This helps prevent accidental key strokes. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Bounce keys</guilabel
-></term>
+<term><guilabel>Bounce keys</guilabel></term>
 <listitem>
-<para
->If this option is enabled, the user must wait a specified delay (configurable with the slider) before the next key press can be accepted. This prevents accidental multiple key strokes. </para>
+<para>If this option is enabled, the user must wait a specified delay (configurable with the slider) before the next key press can be accepted. This prevents accidental multiple key strokes. </para>
 </listitem>
 </varlistentry>
 </variablelist>
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmcss/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmcss/index.docbook
index 34b33d4c1d7..48968426957 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmcss/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmcss/index.docbook
@@ -2,134 +2,70 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article>
 <articleinfo>
 
 <authorgroup>
-<author
->&Lauri.Watts; &Lauri.Watts.mail;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Lauri.Watts; &Lauri.Watts.mail;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2003-10-12</date>
-<releaseinfo
->3.2</releaseinfo>
+<date>2003-10-12</date>
+<releaseinfo>3.2</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->CSS</keyword>
-<keyword
->Stylesheets</keyword>
-<keyword
->Accessibility</keyword>
+<keyword>KDE</keyword>
+<keyword>CSS</keyword>
+<keyword>Stylesheets</keyword>
+<keyword>Accessibility</keyword>
 </keywordset>
 
 </articleinfo>
 
 <sect1 id="stylesheets">
 
-<title
->Stylesheets</title>
+<title>Stylesheets</title>
 
 <sect2>
-<title
->Introduction</title>
-
-<para
-><acronym
->CSS</acronym
-> style sheets affect the way web pages appear. <acronym
->CSS</acronym
-> stands for <emphasis
->C</emphasis
->ascading <emphasis
->S</emphasis
->tyle <emphasis
->S</emphasis
->heets.</para>
-
-<para
->&kde; can use its own stylesheet, based on simple defaults and the colour scheme you are using for your desktop. &kde; can also use a stylesheet that you have written yourself. Finally, you can specify a stylesheet in this module. The options presented in this module are tuned for accessibility purposes, especially for people with reduced vision.</para>
-
-<para
->Your choices here affect every &kde; application that renders HTML with &kde;'s own renderer, which is called tdehtml. These include &kmail;, &khelpcenter; and of course &konqueror;. Choices here do not affect other browsers such as &Netscape;.</para>
-
-<para
->The module has two pages, <guilabel
->General</guilabel
->, where you can choose which stylesheet to use, and <guilabel
->Customise</guilabel
-> where you can design an accessibility stylesheet.</para>
+<title>Introduction</title>
+
+<para><acronym>CSS</acronym> style sheets affect the way web pages appear. <acronym>CSS</acronym> stands for <emphasis>C</emphasis>ascading <emphasis>S</emphasis>tyle <emphasis>S</emphasis>heets.</para>
+
+<para>&kde; can use its own stylesheet, based on simple defaults and the colour scheme you are using for your desktop. &kde; can also use a stylesheet that you have written yourself. Finally, you can specify a stylesheet in this module. The options presented in this module are tuned for accessibility purposes, especially for people with reduced vision.</para>
+
+<para>Your choices here affect every &kde; application that renders HTML with &kde;'s own renderer, which is called tdehtml. These include &kmail;, &khelpcenter; and of course &konqueror;. Choices here do not affect other browsers such as &Netscape;.</para>
+
+<para>The module has two pages, <guilabel>General</guilabel>, where you can choose which stylesheet to use, and <guilabel>Customise</guilabel> where you can design an accessibility stylesheet.</para>
 
 </sect2>
 
 <sect2 id="css-general">
-<title
->General</title>
+<title>General</title>
 
-<para
->This page contains the following options:</para>
+<para>This page contains the following options:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Use default stylesheet</guilabel
-></term>
+<term><guilabel>Use default stylesheet</guilabel></term>
 <listitem>
-<para
->&kde; will use the default stylesheet. Some of the colours will default to those defined in your chosen colour scheme. Most settings are easily overridden by the page you are viewing.</para>
+<para>&kde; will use the default stylesheet. Some of the colours will default to those defined in your chosen colour scheme. Most settings are easily overridden by the page you are viewing.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Use user-defined stylesheet</guilabel
-></term>
+<term><guilabel>Use user-defined stylesheet</guilabel></term>
 <listitem>
-<para
->&kde; will use a stylesheet that you have written yourself. You can use the browse button to locate the stylesheet on your system. <acronym
->CSS</acronym
-> files traditionally have a <literal role="extension"
->.css</literal
-> extension, but this is not required.</para>
+<para>&kde; will use a stylesheet that you have written yourself. You can use the browse button to locate the stylesheet on your system. <acronym>CSS</acronym> files traditionally have a <literal role="extension">.css</literal> extension, but this is not required.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Use accessibility stylesheet defined in &quot;Customise&quot;-tab</guilabel
-></term>
+<term><guilabel>Use accessibility stylesheet defined in &quot;Customise&quot;-tab</guilabel></term>
 <listitem>
-<para
->Use the settings defined in the <guilabel
->Customise</guilabel
-> tab. Enabling this option will enable the options on the <guilabel
->Customise</guilabel
-> page.</para>
+<para>Use the settings defined in the <guilabel>Customise</guilabel> tab. Enabling this option will enable the options on the <guilabel>Customise</guilabel> page.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -137,143 +73,84 @@
 </sect2>
 
 <sect2 id="css-customize">
-<title
->Customise</title>
+<title>Customise</title>
 
-<para
->Here you can set up a user stylesheet. The options available are only a subset of the instructions you can add in a stylesheet, and they are geared towards people with reduced vision, to allow users to create a stylesheet that makes web pages and the &kde; help files more readable.</para>
+<para>Here you can set up a user stylesheet. The options available are only a subset of the instructions you can add in a stylesheet, and they are geared towards people with reduced vision, to allow users to create a stylesheet that makes web pages and the &kde; help files more readable.</para>
 
-<para
->The options on this page are disabled unless you chose <guilabel
->Use accessibility stylesheet defined in &quot;Customise&quot;-tab</guilabel
-> on the previous page.</para>
+<para>The options on this page are disabled unless you chose <guilabel>Use accessibility stylesheet defined in &quot;Customise&quot;-tab</guilabel> on the previous page.</para>
 
 <sect3>
-<title
-><guilabel
->Font Family</guilabel
-></title>
+<title><guilabel>Font Family</guilabel></title>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Base family</guilabel
-></term>
+<term><guilabel>Base family</guilabel></term>
 <listitem>
-<para
->Choose a font family to use for body text.</para>
+<para>Choose a font family to use for body text.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Use same family for all text</guilabel
-></term>
+<term><guilabel>Use same family for all text</guilabel></term>
 <listitem>
-<para
->If you enable this, then the same font family will be used for all text, regardless of the settings on the page you are viewing. This is useful for pages which have used a decorative or hard to read font for headlines.</para>
+<para>If you enable this, then the same font family will be used for all text, regardless of the settings on the page you are viewing. This is useful for pages which have used a decorative or hard to read font for headlines.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 </sect3>
 
 <sect3>
-<title
->Font Size</title>
+<title>Font Size</title>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Base Font Size</guilabel
-></term>
+<term><guilabel>Base Font Size</guilabel></term>
 <listitem>
-<para
->This is the default size for text on the page. Many web sites set their font sizes relative to this default, using <quote
->larger</quote
-> or <quote
->+1</quote
-> to make the text bigger, and <quote
->smaller</quote
-> or <quote
->-1</quote
-> to make the text smaller.</para>
-<para
->Many people design their web pages on platforms where the ordinary default text size is too large for the average user to read, so it is very common to come across web pages that have forced the font smaller in this way.</para>
-<para
->This setting will allow you to set the default font to a comfortable size, so that the relative sizes are also enlarged enough to be comfortable.</para>
-<para
->Do not forget you can also have &konqueror; enforce a minimum size, so that text is <emphasis
->never</emphasis
-> too small to read. Set that under Behaviour, in the Web Browser section in &kcontrol;.</para>
+<para>This is the default size for text on the page. Many web sites set their font sizes relative to this default, using <quote>larger</quote> or <quote>+1</quote> to make the text bigger, and <quote>smaller</quote> or <quote>-1</quote> to make the text smaller.</para>
+<para>Many people design their web pages on platforms where the ordinary default text size is too large for the average user to read, so it is very common to come across web pages that have forced the font smaller in this way.</para>
+<para>This setting will allow you to set the default font to a comfortable size, so that the relative sizes are also enlarged enough to be comfortable.</para>
+<para>Do not forget you can also have &konqueror; enforce a minimum size, so that text is <emphasis>never</emphasis> too small to read. Set that under Behaviour, in the Web Browser section in &kcontrol;.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Use same size for all elements</guilabel
-></term>
+<term><guilabel>Use same size for all elements</guilabel></term>
 <listitem>
-<para
->If you enable this option, then all text will be rendered at your specified font size, regardless of the instructions the page contains. Relative font sizes as discussed earlier, and even specific instructions that text should be rendered at a certain size will be overridden here.</para>
+<para>If you enable this option, then all text will be rendered at your specified font size, regardless of the instructions the page contains. Relative font sizes as discussed earlier, and even specific instructions that text should be rendered at a certain size will be overridden here.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 </sect3>
 
 <sect3>
-<title
->Colours</title>
+<title>Colours</title>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Black on White</guilabel
-></term>
+<term><guilabel>Black on White</guilabel></term>
 <listitem>
-<para
->Many people with reduced vision find black text on a white screen gives the most contrast, and is easiest to read. If this applies to you, you can set this here.</para>
+<para>Many people with reduced vision find black text on a white screen gives the most contrast, and is easiest to read. If this applies to you, you can set this here.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->White on Black</guilabel
-></term>
+<term><guilabel>White on Black</guilabel></term>
 <listitem>
-<para
->Many other people with reduced vision find the opposite to be true, that white text on a black screen is easier to read.</para>
+<para>Many other people with reduced vision find the opposite to be true, that white text on a black screen is easier to read.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Custom</guilabel
-></term>
+<term><guilabel>Custom</guilabel></term>
 <listitem>
-<para
->Still other people find that pure black and white, in either order, is difficult to read. You can set custom colours here for both the <guilabel
->Background</guilabel
-> and the <guilabel
->Foreground</guilabel
->.</para>
+<para>Still other people find that pure black and white, in either order, is difficult to read. You can set custom colours here for both the <guilabel>Background</guilabel> and the <guilabel>Foreground</guilabel>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Use same colour for all text</guilabel
-></term>
+<term><guilabel>Use same colour for all text</guilabel></term>
 <listitem>
-<para
->Many web sites use a different, often contrasting colour for headings or other flourishes. If this interferes with your ability to read the content, you can enable this checkbox to have &kde; use the colours you have set above for all text.</para>
+<para>Many web sites use a different, often contrasting colour for headings or other flourishes. If this interferes with your ability to read the content, you can enable this checkbox to have &kde; use the colours you have set above for all text.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -281,29 +158,19 @@
 </sect3>
 
 <sect3>
-<title
->Images</title>
+<title>Images</title>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Suppress images</guilabel
-></term>
+<term><guilabel>Suppress images</guilabel></term>
 <listitem>
-<para
->If you do not want to view images, you can turn this off here.</para
-></listitem>
+<para>If you do not want to view images, you can turn this off here.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Suppress background images</guilabel
-></term>
+<term><guilabel>Suppress background images</guilabel></term>
 <listitem>
-<para
->One major problem for reduced vision users is that background images do not give sufficient contrast to allow them to read the text. You can disable background images here, independently of your choice above to view all images.</para>
+<para>One major problem for reduced vision users is that background images do not give sufficient contrast to allow them to read the text. You can disable background images here, independently of your choice above to view all images.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -311,19 +178,13 @@
 </sect3>
 
 <sect3>
-<title
->Preview</title>
+<title>Preview</title>
 
-<para
->The <guibutton
->Preview</guibutton
-> allows you to see the effect of your changes. A window will pop up, showing how several types of headings will appear with your stylesheet, and a sentence in the default body text.</para>
+<para>The <guibutton>Preview</guibutton> allows you to see the effect of your changes. A window will pop up, showing how several types of headings will appear with your stylesheet, and a sentence in the default body text.</para>
 
-<para
->This should allow you to fine tune your stylesheet until you have something that you can comfortably read.</para>
+<para>This should allow you to fine tune your stylesheet until you have something that you can comfortably read.</para>
 
-<para
->Happy surfing!</para>
+<para>Happy surfing!</para>
 
 </sect3>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmfontinst/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmfontinst/index.docbook
index 882d3a14a6e..f5211c2a084 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmfontinst/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmfontinst/index.docbook
@@ -2,113 +2,49 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 <authorgroup>
-<author
->&Craig.Drummond; &Craig.Drummond.Mail;</author>
+<author>&Craig.Drummond; &Craig.Drummond.Mail;</author>
 
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2003-10-22</date>
-<releaseinfo
->3.2</releaseinfo>
+<date>2003-10-22</date>
+<releaseinfo>3.2</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->fonts</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>fonts</keyword>
 </keywordset>
 </articleinfo>
 <sect1 id="fontinst">
-<title
->Font Installer</title>
+<title>Font Installer</title>
 
-<para
->This module is responsible for installing (and uninstalling) fonts. The installer will configure X (XFree86), XRender, (anti-aliasing), and <application
->Ghostscript</application
-> (printing), for any TrueType (<literal role="extension"
->.ttf</literal
->) and Type1 (<literal role="extension"
->.pfa</literal
->, <literal role="extension"
->.pfb</literal
->) fonts that you care to install - bitmap (<literal role="extension"
->.bdf</literal
->, <literal role="extension"
->.pcf</literal
->, <literal role="extension"
->.snf</literal
->), and Speedo (<literal role="extension"
->.spd</literal
->), fonts will also be installed, but these can only used by X.</para>
+<para>This module is responsible for installing (and uninstalling) fonts. The installer will configure X (XFree86), XRender, (anti-aliasing), and <application>Ghostscript</application> (printing), for any TrueType (<literal role="extension">.ttf</literal>) and Type1 (<literal role="extension">.pfa</literal>, <literal role="extension">.pfb</literal>) fonts that you care to install - bitmap (<literal role="extension">.bdf</literal>, <literal role="extension">.pcf</literal>, <literal role="extension">.snf</literal>), and Speedo (<literal role="extension">.spd</literal>), fonts will also be installed, but these can only used by X.</para>
 
-<para
->When the module is started by a normal (non-root) user, then the settings will refer to their personal configuration, and installed fonts will be available to them only. For <systemitem class="username"
->root</systemitem
->, the settings will usually refer to the system-wide configuration, and as such any installed fonts should be available to all users.</para>
-<para
->If you install fonts as a normal user and notice the fonts used for display (and for print preview) do not match those of the printed output - then you should re-install the fonts system-wide (i.e. as <systemitem class="username"
->root</systemitem
->). This can occur because when printing the output is sent to a printer queue - and when the system comes to actually send the information to the printer, it is running as a different user (usually <systemitem class="username"
->lp</systemitem
->), and cannot find the font files.</para>
-<para
->To install fonts, simply select the "Add Fonts" button - this will produce a file dialogue, then just locate the fonts to install. Likewise, to remove a font, simply highlight a font and press the "Delete" button.</para>
-<para
->Fonts may also be "disabled" - this basically just "hides" the font file, so that the font system cannot "see" it. To enable/disable fonts, just highlight the required fonts, and select the "Enable" or "Disable" button. </para>
+<para>When the module is started by a normal (non-root) user, then the settings will refer to their personal configuration, and installed fonts will be available to them only. For <systemitem class="username">root</systemitem>, the settings will usually refer to the system-wide configuration, and as such any installed fonts should be available to all users.</para>
+<para>If you install fonts as a normal user and notice the fonts used for display (and for print preview) do not match those of the printed output - then you should re-install the fonts system-wide (i.e. as <systemitem class="username">root</systemitem>). This can occur because when printing the output is sent to a printer queue - and when the system comes to actually send the information to the printer, it is running as a different user (usually <systemitem class="username">lp</systemitem>), and cannot find the font files.</para>
+<para>To install fonts, simply select the "Add Fonts" button - this will produce a file dialogue, then just locate the fonts to install. Likewise, to remove a font, simply highlight a font and press the "Delete" button.</para>
+<para>Fonts may also be "disabled" - this basically just "hides" the font file, so that the font system cannot "see" it. To enable/disable fonts, just highlight the required fonts, and select the "Enable" or "Disable" button. </para>
 <sect2 id="using-konqueror">
-<title
->Using Konqueror</title>
-<para
->You can also use Konqueror to install fonts via drag-and-drop. To do this just type <ulink url="fonts:/"
->fonts:/</ulink
-> into Konqueror's Location bar.</para>
-<para
->As a normal (non-root) user, this will produce 2 top-level folders:</para>
+<title>Using Konqueror</title>
+<para>You can also use Konqueror to install fonts via drag-and-drop. To do this just type <ulink url="fonts:/">fonts:/</ulink> into Konqueror's Location bar.</para>
+<para>As a normal (non-root) user, this will produce 2 top-level folders:</para>
 <orderedlist>
 <listitem>
-<para
-><ulink url="fonts:/Personal"
->Personal</ulink
-> - this will display your personal fonts.</para>
+<para><ulink url="fonts:/Personal">Personal</ulink> - this will display your personal fonts.</para>
 </listitem>
 <listitem>
-<para
-><ulink url="fonts:/System"
->System</ulink
-> - this will display the system wide fonts. If you drag-n-drop a font on to the folders here, you will be asked for the root password in order to install the font.</para>
+<para><ulink url="fonts:/System">System</ulink> - this will display the system wide fonts. If you drag-n-drop a font on to the folders here, you will be asked for the root password in order to install the font.</para>
 </listitem>
 </orderedlist>
-<para
->If you drop a font over <ulink url="fonts:/"
->fonts:/</ulink
->, then you will be asked whether this should go into "Personal", or "System".</para>
-<para
->As root, just the contents of the system font folder will be displayed - as root does not have any "personal" fonts.</para>
+<para>If you drop a font over <ulink url="fonts:/">fonts:/</ulink>, then you will be asked whether this should go into "Personal", or "System".</para>
+<para>As root, just the contents of the system font folder will be displayed - as root does not have any "personal" fonts.</para>
 </sect2>
 </sect1>
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmkonsole/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmkonsole/index.docbook
index 0626c66b40d..a1dcd8fe5f1 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmkonsole/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmkonsole/index.docbook
@@ -2,8 +2,7 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
@@ -11,257 +10,139 @@
 
 
 <authorgroup>
-<author
->&Jonathan.Singer; &Jonathan.Singer.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Jonathan.Singer; &Jonathan.Singer.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-02-12</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-02-12</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->konsole</keyword>
-<keyword
->terminal</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>konsole</keyword>
+<keyword>terminal</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="konsole">
-<title
->&konsole;</title>
+<title>&konsole;</title>
 
-<para
->In this module, you can configure basic settings for &konsole;, the &kde; terminal. You can also easily create new schemata (appearance files) for &konsole;.</para>
+<para>In this module, you can configure basic settings for &konsole;, the &kde; terminal. You can also easily create new schemata (appearance files) for &konsole;.</para>
 
-<para
->This module contains several tab pages: <guilabel
->General</guilabel
->, <guilabel
->Schema</guilabel
->, <guilabel
->Session</guilabel
-> and <guilabel
->Write Daemon</guilabel
->.</para>
+<para>This module contains several tab pages: <guilabel>General</guilabel>, <guilabel>Schema</guilabel>, <guilabel>Session</guilabel> and <guilabel>Write Daemon</guilabel>.</para>
 
 <sect2>
-<title
-><guilabel
->General</guilabel
-></title>
+<title><guilabel>General</guilabel></title>
 
-<para
->This tab page allows you to configure aspects of &konsole;'s functions. It contains the following options:</para>
+<para>This tab page allows you to configure aspects of &konsole;'s functions. It contains the following options:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Use Konsole as default terminal application</guilabel
-></term>
+<term><guilabel>Use Konsole as default terminal application</guilabel></term>
 <listitem>
-<para
->If you wish to have &kde; use another terminal application by default, uncheck this box and enter the preferred application (<application
->wterm</application
->, <application
->rxvt</application
->, &etc;) in the text field below.</para>
+<para>If you wish to have &kde; use another terminal application by default, uncheck this box and enter the preferred application (<application>wterm</application>, <application>rxvt</application>, &etc;) in the text field below.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Show Terminal Size when Resizing</guilabel
-></term>
+<term><guilabel>Show Terminal Size when Resizing</guilabel></term>
 <listitem>
-<para
->By default, &konsole; will show the size (in characters) of the window when you are resizing, allowing you to make the window a specific size. Uncheck this box to turn off this behaviour.</para
-></listitem>
+<para>By default, &konsole; will show the size (in characters) of the window when you are resizing, allowing you to make the window a specific size. Uncheck this box to turn off this behaviour.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Show Frame</guilabel
-></term>
+<term><guilabel>Show Frame</guilabel></term>
 <listitem>
-<para
->Draw an inner frame around the inside of the &konsole; window.</para>
+<para>Draw an inner frame around the inside of the &konsole; window.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Confirm quit with open sessions</guilabel
-></term>
+<term><guilabel>Confirm quit with open sessions</guilabel></term>
 <listitem>
-<para
->When set, a warning appears when you try to close a &konsole; window with multiple sessions.</para>
+<para>When set, a warning appears when you try to close a &konsole; window with multiple sessions.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Blinking Cursor</guilabel
-></term>
-<listitem
-><para
->If you have trouble spotting the cursor in the &konsole; window, you can have it blink to draw your attention.</para
-></listitem>
+<term><guilabel>Blinking Cursor</guilabel></term>
+<listitem><para>If you have trouble spotting the cursor in the &konsole; window, you can have it blink to draw your attention.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Line Spacing</guilabel
-></term>
-<listitem
-><para
->Change the space between lines of text.</para>
+<term><guilabel>Line Spacing</guilabel></term>
+<listitem><para>Change the space between lines of text.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Consider the following characters part of a word when double clicking</guilabel
-></term>
-<listitem
-><para
->It is a common &UNIX; behaviour to select a whole word when you double click on it, however, the computer's idea of a word may differ from yours. Add characters here that you would like to be considered always to be <quote
->part of a word</quote
->. For example, adding the <literal
->@</literal
-> character will allow you to double click to select an entire email address.</para
-></listitem>
+<term><guilabel>Consider the following characters part of a word when double clicking</guilabel></term>
+<listitem><para>It is a common &UNIX; behaviour to select a whole word when you double click on it, however, the computer's idea of a word may differ from yours. Add characters here that you would like to be considered always to be <quote>part of a word</quote>. For example, adding the <literal>@</literal> character will allow you to double click to select an entire email address.</para></listitem>
 </varlistentry>
 </variablelist>
 </sect2>
 
 <sect2>
-<title
->Schema</title>
+<title>Schema</title>
 
-<para
->The <guilabel
->Schema</guilabel
-> page will allow you to easily create, edit and save schemata, with text and background colouring, transparency and background images.</para>
+<para>The <guilabel>Schema</guilabel> page will allow you to easily create, edit and save schemata, with text and background colouring, transparency and background images.</para>
 
 
 <!-- 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Font</guilabel
-></term>
+<term><guilabel>Font</guilabel></term>
 <listitem>
-<para
->Use the drop-down box to select the default font size.  Use the
-<guibutton
->Custom...</guibutton
-> button to select your own combination
+<para>Use the drop-down box to select the default font size.  Use the
+<guibutton>Custom...</guibutton> button to select your own combination
 of font, size, and style.</para>
 </listitem>
 </varlistentry>
  
 <varlistentry>
-<term
-><guilabel
->Full Screen</guilabel
-></term>
+<term><guilabel>Full Screen</guilabel></term>
 <listitem>
-<para
->Check the box to make &konsole; windows full-screen by
+<para>Check the box to make &konsole; windows full-screen by
 default.</para>
 </listitem>
 </varlistentry>
 </variablelist>
-</listitem
-> 
+</listitem> 
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Bars</guilabel
-></term>
+<term><guilabel>Bars</guilabel></term>
 <listitem>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Show menubar</guilabel
-></term>
+<term><guilabel>Show menubar</guilabel></term>
 <listitem>
-<para
->Check to show the menubar by default.</para>
+<para>Check to show the menubar by default.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Show toolbar</guilabel
-></term>
+<term><guilabel>Show toolbar</guilabel></term>
 <listitem>
-<para
->Check to show the toolbar by default.</para>
+<para>Check to show the toolbar by default.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Show frame</guilabel
-></term>
+<term><guilabel>Show frame</guilabel></term>
 <listitem>
-<para
->Check to show the frame by default.</para>
+<para>Check to show the frame by default.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Scrollbar position</guilabel
-></term>
+<term><guilabel>Scrollbar position</guilabel></term>
 <listitem>
-<para
->Select the default position of the scrollbar:
-<guilabel
->Hide</guilabel
-> (no scrollbar), <guilabel
->Left</guilabel
->, or
-<guilabel
->Right</guilabel
->.</para>
+<para>Select the default position of the scrollbar:
+<guilabel>Hide</guilabel> (no scrollbar), <guilabel>Left</guilabel>, or
+<guilabel>Right</guilabel>.</para>
 </listitem>
 </varlistentry>
 </variablelist>
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmlaunch/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmlaunch/index.docbook
index b9173626e56..f0a19134cb6 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmlaunch/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmlaunch/index.docbook
@@ -2,86 +2,44 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Lauri.Watts; &Lauri.Watts.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Lauri.Watts; &Lauri.Watts.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2003-09-22</date>
-<releaseinfo
->3.2</releaseinfo>
+<date>2003-09-22</date>
+<releaseinfo>3.2</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->launch feedback</keyword>
-<keyword
->cursor</keyword>
-<keyword
->busy</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>launch feedback</keyword>
+<keyword>cursor</keyword>
+<keyword>busy</keyword>
 </keywordset>
 
 </articleinfo>
 
 <sect1 id="launch-feedback">
-<title
->Launch Feedback</title>
+<title>Launch Feedback</title>
 
-<para
->Sometimes it is reassuring to know that your computer didn't just ignore your command, and something is happening behind the scenes. In this module you can configure visible feedback to help you know if you really hit that icon or not.</para>
+<para>Sometimes it is reassuring to know that your computer didn't just ignore your command, and something is happening behind the scenes. In this module you can configure visible feedback to help you know if you really hit that icon or not.</para>
 	
-<para
->The traditional way to indicate that your computer is busy is to modify the cursor, and you can turn this on by choosing a <guilabel
->Busy Cursor</guilabel
-> checkbox.</para>
+<para>The traditional way to indicate that your computer is busy is to modify the cursor, and you can turn this on by choosing a <guilabel>Busy Cursor</guilabel> checkbox.</para>
 
-<para
->With this option enabled, your cursor will have an icon attached to it for a short time, when a new application is being launched. You can configure how long this icon is displayed beside your cursor with the <guilabel
->Startup indication timeout (seconds):</guilabel
-> spinbox. The default is 30 seconds.</para>
+<para>With this option enabled, your cursor will have an icon attached to it for a short time, when a new application is being launched. You can configure how long this icon is displayed beside your cursor with the <guilabel>Startup indication timeout (seconds):</guilabel> spinbox. The default is 30 seconds.</para>
 
-<para
->There are several variations of busy cursor available, including a blinking cursor, a bouncing cursor or a passive icon with no animation.</para>
+<para>There are several variations of busy cursor available, including a blinking cursor, a bouncing cursor or a passive icon with no animation.</para>
 
-<para
->Traditional &kde; launch notification has taken another form, which you can also enable and disable here. Normally when you start an application, it gets an immediate entry in the taskbar, with the icon replaced by a spinning hourglass to let you know something is happening. You can toggle this behaviour on and off with the <guilabel
->Enable Taskbar Notification</guilabel
-> checkbox, and when it's enabled, you can set a time in the <guilabel
->Startup indication timeout (seconds):</guilabel
-> spinbox.</para>
+<para>Traditional &kde; launch notification has taken another form, which you can also enable and disable here. Normally when you start an application, it gets an immediate entry in the taskbar, with the icon replaced by a spinning hourglass to let you know something is happening. You can toggle this behaviour on and off with the <guilabel>Enable Taskbar Notification</guilabel> checkbox, and when it's enabled, you can set a time in the <guilabel>Startup indication timeout (seconds):</guilabel> spinbox.</para>
 
-<para
->Not all applications that you start will eventually show a window, or an entry in the taskbar. Some of them, for example, are docked into the &kde; system tray. Alternatively, it might be that you sent it off to a different virtual desktop, and <quote
->Show all windows</quote
-> is unchecked in the &kcontrolcenter; module <guimenuitem
->Taskbar</guimenuitem
->. Setting a timeout ensures that, even in these cases, you can still get launch feedback, but also that it will go away when the job is done.</para>
+<para>Not all applications that you start will eventually show a window, or an entry in the taskbar. Some of them, for example, are docked into the &kde; system tray. Alternatively, it might be that you sent it off to a different virtual desktop, and <quote>Show all windows</quote> is unchecked in the &kcontrolcenter; module <guimenuitem>Taskbar</guimenuitem>. Setting a timeout ensures that, even in these cases, you can still get launch feedback, but also that it will go away when the job is done.</para>
 
 </sect1>
 </article>
\ No newline at end of file
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmnotify/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmnotify/index.docbook
index 7ebe5b1ce1f..3e94eba9142 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmnotify/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmnotify/index.docbook
@@ -2,143 +2,69 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Mike.McBride; &Mike.McBride.mail;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Mike.McBride; &Mike.McBride.mail;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-02-12</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-02-12</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->system notification</keyword>
-<keyword
->notification</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>system notification</keyword>
+<keyword>notification</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="sys-notify">
-<title
->System Notification Settings</title>
+<title>System Notification Settings</title>
 
-<para
->&kde;, like all applications, needs to inform the user when a problem occurs, a task is completed, or something has happened. &kde; uses a set of <quote
->System Notifications</quote
-> to keep the user informed on what is happening.</para>
+<para>&kde;, like all applications, needs to inform the user when a problem occurs, a task is completed, or something has happened. &kde; uses a set of <quote>System Notifications</quote> to keep the user informed on what is happening.</para>
 
-<para
->Using this module, you can determine what &kde; does to communicate each event.</para>
+<para>Using this module, you can determine what &kde; does to communicate each event.</para>
 
-<para
->The panel consists of a large list of specific events which need to be communicated to the user. This list is organised into a tree, so that you can rapidly find the notification you are looking for.</para>
+<para>The panel consists of a large list of specific events which need to be communicated to the user. This list is organised into a tree, so that you can rapidly find the notification you are looking for.</para>
 
-<para
->To configure a notification, simply click on a group, which will open up a subgroup. You can click on subgroups, which may lead to more subgroups, or it may lead to a list of notifications.</para>
+<para>To configure a notification, simply click on a group, which will open up a subgroup. You can click on subgroups, which may lead to more subgroups, or it may lead to a list of notifications.</para>
 
-<para
->Once you have found the notification you are looking for, double-click on the notification.</para>
+<para>Once you have found the notification you are looking for, double-click on the notification.</para>
 
-<para
->You will be presented with 4 options:</para>
+<para>You will be presented with 4 options:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Log to file</guilabel
-></term>
-<listitem
-><para
->This will tell &kde; to add the notification to the end of a file. Once you place a mark in front of this option, you can enter a filename at the bottom of the module. If you click on the <guiicon
->folder</guiicon
-> to the right of the blank, you can browse through your filesystem and select the file you want.</para
-></listitem>
+<term><guilabel>Log to file</guilabel></term>
+<listitem><para>This will tell &kde; to add the notification to the end of a file. Once you place a mark in front of this option, you can enter a filename at the bottom of the module. If you click on the <guiicon>folder</guiicon> to the right of the blank, you can browse through your filesystem and select the file you want.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Play sound</guilabel
-></term>
-<listitem
-><para
->When this notification is activated, &kde; will play a sound. Once you place a mark in front of this option, you can enter a filename at the bottom of the module. </para>
-<para
->If you click on the <guiicon
->folder</guiicon
-> to the right of the blank, you can browse through your filesystem and select the file you want.</para>
-<para
->By clicking the arrow button to the right of the <guiicon
->folder</guiicon
-> button, you can hear the sound.</para>
-
-<para
->Maybe you want to use a special media player to play sound files, &eg; because you use sound files in a special format or you don't use the &arts; sound daemon. In that case, check the <guilabel
->Use external player</guilabel
-> option and enter the full path and name of the program you want to use into the text field.</para
-></listitem>
+<term><guilabel>Play sound</guilabel></term>
+<listitem><para>When this notification is activated, &kde; will play a sound. Once you place a mark in front of this option, you can enter a filename at the bottom of the module. </para>
+<para>If you click on the <guiicon>folder</guiicon> to the right of the blank, you can browse through your filesystem and select the file you want.</para>
+<para>By clicking the arrow button to the right of the <guiicon>folder</guiicon> button, you can hear the sound.</para>
+
+<para>Maybe you want to use a special media player to play sound files, &eg; because you use sound files in a special format or you don't use the &arts; sound daemon. In that case, check the <guilabel>Use external player</guilabel> option and enter the full path and name of the program you want to use into the text field.</para></listitem>
 
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Show messagebox</guilabel
-></term>
-<listitem
-><para
->When this notification is activated, a message box appears in the middle of the screen to inform the user of the message.</para
-></listitem>
+<term><guilabel>Show messagebox</guilabel></term>
+<listitem><para>When this notification is activated, a message box appears in the middle of the screen to inform the user of the message.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Standard error output</guilabel
-></term>
-<listitem
-><para
->When this notification is activated, the message is sent to the standard output.</para
-></listitem>
+<term><guilabel>Standard error output</guilabel></term>
+<listitem><para>When this notification is activated, the message is sent to the standard output.</para></listitem>
 </varlistentry>
 </variablelist>
-<tip
-><para
->You are not limited to choosing one option, you can use any combination of these four options for each notification.</para
-></tip>
-
-<para
->You can turn off (or on) all sounds at once, for all installed applications, with the <guibutton
->Enable All Sounds</guibutton
-> or <guibutton
->Disable All Sounds</guibutton
-> Button. Which of these you see depends on the current status.</para>
+<tip><para>You are not limited to choosing one option, you can use any combination of these four options for each notification.</para></tip>
+
+<para>You can turn off (or on) all sounds at once, for all installed applications, with the <guibutton>Enable All Sounds</guibutton> or <guibutton>Disable All Sounds</guibutton> Button. Which of these you see depends on the current status.</para>
 
 </sect1>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmsmserver/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmsmserver/index.docbook
index 7bac2d4cff6..78f911433ae 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmsmserver/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmsmserver/index.docbook
@@ -2,149 +2,79 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Jost.Schenck; &Jost.Schenck.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Jost.Schenck; &Jost.Schenck.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2003-10-13</date>
-<releaseinfo
->3.2</releaseinfo>
+<date>2003-10-13</date>
+<releaseinfo>3.2</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->session</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>session</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="sessions">
-<title
->Session Manager</title>
+<title>Session Manager</title>
 
 <sect2 id="sessions-use">
-<title
->Use</title>
+<title>Use</title>
 
-<para
->In this control module you can configure &kde;'s session manager.</para>
+<para>In this control module you can configure &kde;'s session manager.</para>
 
-<para
->Session management refers to &kde;'s ability to save the state of applications and windows when you log out of &kde; and restore them when you log back in.</para>
+<para>Session management refers to &kde;'s ability to save the state of applications and windows when you log out of &kde; and restore them when you log back in.</para>
 
-<para
->The <guilabel
->General</guilabel
-> section contains one setting:</para>
+<para>The <guilabel>General</guilabel> section contains one setting:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Confirm logout</guilabel
-></term>
+<term><guilabel>Confirm logout</guilabel></term>
 <listitem>
-<para
->If this option is checked, when logging out, &kde; will display a dialogue asking for confirmation. In this dialogue you can also choose whether you want to restore your current session when you login the next time.</para>
+<para>If this option is checked, when logging out, &kde; will display a dialogue asking for confirmation. In this dialogue you can also choose whether you want to restore your current session when you login the next time.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->You may choose one of three options on what should happen when you log into &kde;:</para>
+<para>You may choose one of three options on what should happen when you log into &kde;:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Restore previous session</guilabel
-></term>
-<listitem
-><para
->If this option is checked, &kde; will save your current session's state when you logout. &kde; will restore your session on the next login, so you can continue to work with a desktop just like you left it.</para>
+<term><guilabel>Restore previous session</guilabel></term>
+<listitem><para>If this option is checked, &kde; will save your current session's state when you logout. &kde; will restore your session on the next login, so you can continue to work with a desktop just like you left it.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Restore manually saved session</guilabel
-></term>
-<listitem
-><para
->Instead of restoring &kde; to the state it was when you logged out last, it will be restored to a specific state that you have saved manually. </para
-></listitem>
+<term><guilabel>Restore manually saved session</guilabel></term>
+<listitem><para>Instead of restoring &kde; to the state it was when you logged out last, it will be restored to a specific state that you have saved manually. </para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Start with an empty session</guilabel
-></term>
+<term><guilabel>Start with an empty session</guilabel></term>
 <listitem>
-<para
->If you choose this option, &kde; will never restore sessions that it has saved.</para>
+<para>If you choose this option, &kde; will never restore sessions that it has saved.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->You can configure what should happen by default when you log out of &kde;. These options are not possible on all operating systems, and they require the use of &tdm; as your login manager. </para>
+<para>You can configure what should happen by default when you log out of &kde;. These options are not possible on all operating systems, and they require the use of &tdm; as your login manager. </para>
 
-<para
->The options available are self explanatory, if you are in doubt, leave the default settings. They are:</para>
+<para>The options available are self explanatory, if you are in doubt, leave the default settings. They are:</para>
 
 <itemizedlist>
-<listitem
-><para
-><guilabel
->Login as different user</guilabel
-> (this is the default)</para
-></listitem>
-<listitem
-><para
-><guilabel
->Turn off computer</guilabel
-></para
-></listitem>
-<listitem
-><para
-><guilabel
->Restart computer</guilabel
-></para
-></listitem>
+<listitem><para><guilabel>Login as different user</guilabel> (this is the default)</para></listitem>
+<listitem><para><guilabel>Turn off computer</guilabel></para></listitem>
+<listitem><para><guilabel>Restart computer</guilabel></para></listitem>
 </itemizedlist>
 
-<para
->Finally, you can enter a colon (<literal
->:</literal
->) separated list of applications that should not be saved in sessions, and therefore will not be started when restoring a session. For example <userinput
->xterm:konsole</userinput
->.</para>
+<para>Finally, you can enter a colon (<literal>:</literal>) separated list of applications that should not be saved in sessions, and therefore will not be started when restoring a session. For example <userinput>xterm:konsole</userinput>.</para>
 
 </sect2>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmstyle/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmstyle/index.docbook
index 5d05a331969..a1961c33027 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmstyle/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmstyle/index.docbook
@@ -2,321 +2,137 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Mike.McBride; &Mike.McBride.mail;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Mike.McBride; &Mike.McBride.mail;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2003-09-22</date>
-<releaseinfo
->3.2</releaseinfo>
+<date>2003-09-22</date>
+<releaseinfo>3.2</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->style</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>style</keyword>
 </keywordset>
 </articleinfo>
 <sect1 id="style">
-<title
->Style</title>
+<title>Style</title>
 
 <sect2 id="style-intro">
-<title
->Introduction</title>
-
-<para
->This module is used to configure how the individual widgets are drawn by &kde;.</para>
-
-<note
-><para
->A <emphasis
->Widget</emphasis
-> is a commonly-used programmer's term for referring to User Interface elements such as buttons, menus, and scroll bars. You can think of them as the fundamental pieces that are assembled to make your application.</para
-></note>
-
-<para
->You can configure how the widgets are drawn with this module, but to change the colour of the widgets, you should refer to the section entitled <ulink url="help:/kcontrol/color/index.html"
->Colours</ulink
->.</para>
-
-<para
->This panel is divided into three tabs: <guilabel
->Style</guilabel
->, <guilabel
->Effects</guilabel
->, <guilabel
->Miscellaneous</guilabel
->.</para>
+<title>Introduction</title>
+
+<para>This module is used to configure how the individual widgets are drawn by &kde;.</para>
+
+<note><para>A <emphasis>Widget</emphasis> is a commonly-used programmer's term for referring to User Interface elements such as buttons, menus, and scroll bars. You can think of them as the fundamental pieces that are assembled to make your application.</para></note>
+
+<para>You can configure how the widgets are drawn with this module, but to change the colour of the widgets, you should refer to the section entitled <ulink url="help:/kcontrol/color/index.html">Colours</ulink>.</para>
+
+<para>This panel is divided into three tabs: <guilabel>Style</guilabel>, <guilabel>Effects</guilabel>, <guilabel>Miscellaneous</guilabel>.</para>
 
 <sect3 id="style-style">
-<title
-><guilabel
->Style</guilabel
-> tab</title>
+<title><guilabel>Style</guilabel> tab</title>
 
-<para
->The top list box, labelled <guilabel
->Widget Style</guilabel
-> contains a list of the pre-defined styles. Each style has a name, and a brief description.</para>
+<para>The top list box, labelled <guilabel>Widget Style</guilabel> contains a list of the pre-defined styles. Each style has a name, and a brief description.</para>
 
-<para
->To change styles, simply click on the style name, and a preview of the style will be displayed in the preview box below the style list.</para>
+<para>To change styles, simply click on the style name, and a preview of the style will be displayed in the preview box below the style list.</para>
 
-<para
->The other options available here are:</para>
+<para>The other options available here are:</para>
 
 <variablelist>
-<varlistentry
-> 
-<term
-><guilabel
->Show icons on buttons</guilabel
-></term>
+<varlistentry> 
+<term><guilabel>Show icons on buttons</guilabel></term>
 <listitem>
-<para
->If this option is selected, action buttons (like <guibutton
->OK</guibutton
-> and <guibutton
->Apply</guibutton
-> will have a small icon located within them to act as a visual reference. If this option is not selected, then only the text of the button will appear in the button.</para>
-</listitem
-> 
-</varlistentry
-> 
-
-<varlistentry
-> 
-<term
-><guilabel
->Enable tooltips</guilabel
-></term>
+<para>If this option is selected, action buttons (like <guibutton>OK</guibutton> and <guibutton>Apply</guibutton> will have a small icon located within them to act as a visual reference. If this option is not selected, then only the text of the button will appear in the button.</para>
+</listitem> 
+</varlistentry> 
+
+<varlistentry> 
+<term><guilabel>Enable tooltips</guilabel></term>
 <listitem>
-<para
->This will toggle tooltips off and on.</para>
-</listitem
-> 
-</varlistentry
-> 
-
-<varlistentry
-> 
-<term
-><guilabel
->Menubar on the top of the screen in the style of MacOS</guilabel
-></term>
+<para>This will toggle tooltips off and on.</para>
+</listitem> 
+</varlistentry> 
+
+<varlistentry> 
+<term><guilabel>Menubar on the top of the screen in the style of MacOS</guilabel></term>
 <listitem>
-<para
->This will turn on a menubar at the top of the screen. This menubar will reflect the menu options of the active application.</para>
-</listitem
-> 
-</varlistentry
-> 
+<para>This will turn on a menubar at the top of the screen. This menubar will reflect the menu options of the active application.</para>
+</listitem> 
+</varlistentry> 
 </variablelist>
 
 </sect3>
 
 <sect3 id="style-effects">
-<title
-><guilabel
->Effects</guilabel
-> tab</title>
-<para
->If you click on the <guilabel
->Effects</guilabel
-> tab, you will see the panel is divided into two sections.</para>
-<para
->At the top of the first section, is a checkbox labelled <guilabel
->Enable GUI effects</guilabel
->. If there is no mark in front of this checkbox, then all visual effects of this panel are disabled. To edit any of these effects, simply place a mark in this checkbox.</para>
-
-<para
->Below that checkbox, are 4 combo boxes: </para>
+<title><guilabel>Effects</guilabel> tab</title>
+<para>If you click on the <guilabel>Effects</guilabel> tab, you will see the panel is divided into two sections.</para>
+<para>At the top of the first section, is a checkbox labelled <guilabel>Enable GUI effects</guilabel>. If there is no mark in front of this checkbox, then all visual effects of this panel are disabled. To edit any of these effects, simply place a mark in this checkbox.</para>
+
+<para>Below that checkbox, are 4 combo boxes: </para>
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Combobox effects</guilabel
-></term>
-<listitem
-><para
->This combobox has two options. If this option is set to <guilabel
->Animate</guilabel
-> then when a combo box is selected, it will appear to scroll down. If <guilabel
->Disable</guilabel
-> is selected, then the combobox list appears instantly.</para
-></listitem>
+<term><guilabel>Combobox effects</guilabel></term>
+<listitem><para>This combobox has two options. If this option is set to <guilabel>Animate</guilabel> then when a combo box is selected, it will appear to scroll down. If <guilabel>Disable</guilabel> is selected, then the combobox list appears instantly.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Tool Tip Effect</guilabel
-></term>
-<listitem
-><para
->This combobox has three options. If this option is set to <guilabel
->Animate</guilabel
-> then when a tool tip appears, it will have a short animation. If <guilabel
->Fade</guilabel
-> is selected, the tool tip appears to fade from the background. If <guilabel
->Disable</guilabel
-> is selected, then the tool tip appears instantly.</para
-></listitem>
+<term><guilabel>Tool Tip Effect</guilabel></term>
+<listitem><para>This combobox has three options. If this option is set to <guilabel>Animate</guilabel> then when a tool tip appears, it will have a short animation. If <guilabel>Fade</guilabel> is selected, the tool tip appears to fade from the background. If <guilabel>Disable</guilabel> is selected, then the tool tip appears instantly.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Menu Effect</guilabel
-></term>
-<listitem
-><para
->This combobox has four options. If this option is set to <guilabel
->Animate</guilabel
-> then when a menu list appears, it will appear to scroll downward. If <guilabel
->Fade</guilabel
-> is selected, the menu list appears to fade from the background. If <guilabel
->Make Transparent</guilabel
-> is selected, the menu list will have a transparent look to it. The details of that transparency is configured in the next part of the dialogue. If <guilabel
->Disable</guilabel
-> is selected, then the menu list appears instantly.</para
-></listitem>
+<term><guilabel>Menu Effect</guilabel></term>
+<listitem><para>This combobox has four options. If this option is set to <guilabel>Animate</guilabel> then when a menu list appears, it will appear to scroll downward. If <guilabel>Fade</guilabel> is selected, the menu list appears to fade from the background. If <guilabel>Make Transparent</guilabel> is selected, the menu list will have a transparent look to it. The details of that transparency is configured in the next part of the dialogue. If <guilabel>Disable</guilabel> is selected, then the menu list appears instantly.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Menu tear-off handles</guilabel
-></term>
-<listitem
-><para
->If this option is set to <guilabel
->Disable</guilabel
->, then no menus can be separated from the application. If <guilabel
->Application Level</guilabel
-> is selected, then it is left up to each individual application to determine which menus can be torn separated from the application.</para>
-<note
-><para
->Many applications do not have tear off menus. You cannot tell &kde; to force an application to allow tear off menus. This is determined by the authors of the application.</para
-></note
-></listitem>
+<term><guilabel>Menu tear-off handles</guilabel></term>
+<listitem><para>If this option is set to <guilabel>Disable</guilabel>, then no menus can be separated from the application. If <guilabel>Application Level</guilabel> is selected, then it is left up to each individual application to determine which menus can be torn separated from the application.</para>
+<note><para>Many applications do not have tear off menus. You cannot tell &kde; to force an application to allow tear off menus. This is determined by the authors of the application.</para></note></listitem>
 </varlistentry>
 </variablelist>
 
-<para
->The next checkbox, labelled <guilabel
->Menu drop shadow</guilabel
-> is used to toggle the drop shadow behind all &kde; menus. A drop shadow is a dark, soft line on the bottom and right sides of the menu, which give the menus the appearance that the menu is lifted off the application, and the menu is creating a shadow on the application.</para>
+<para>The next checkbox, labelled <guilabel>Menu drop shadow</guilabel> is used to toggle the drop shadow behind all &kde; menus. A drop shadow is a dark, soft line on the bottom and right sides of the menu, which give the menus the appearance that the menu is lifted off the application, and the menu is creating a shadow on the application.</para>
 
-<para
->The next section only applies if the combobox labelled <guilabel
->Menu Effect</guilabel
-> is set to <guilabel
->Make Transparent</guilabel
->. You can use the combo box labelled <guilabel
->Menu transparency type</guilabel
-> to select the method &kde; uses to generate the transparency. You can use the slider to determine the level of transparency in menus. A preview is visible on the right side of this section.</para>
+<para>The next section only applies if the combobox labelled <guilabel>Menu Effect</guilabel> is set to <guilabel>Make Transparent</guilabel>. You can use the combo box labelled <guilabel>Menu transparency type</guilabel> to select the method &kde; uses to generate the transparency. You can use the slider to determine the level of transparency in menus. A preview is visible on the right side of this section.</para>
 
 </sect3>
 
 <sect3 id="style-misc">
-<title
-><guilabel
->Miscellaneous</guilabel
-> tab</title>
-
-<para
->This small section has six options.</para>
-
-<variablelist
-> 
-
-<varlistentry
-> 
-<term
-><guilabel
->Highlight buttons under mouse.</guilabel
-></term>
+<title><guilabel>Miscellaneous</guilabel> tab</title>
+
+<para>This small section has six options.</para>
+
+<variablelist> 
+
+<varlistentry> 
+<term><guilabel>Highlight buttons under mouse.</guilabel></term>
 <listitem>
-<para
->If there is a mark in this checkbox, when the mouse pointer is above a toolbar button, that button will be highlighted with a square around the button. This is a good visual indicator of which button will be selected with a mouse click.</para>
-</listitem
-> 
-</varlistentry
-> 
-
-<varlistentry
-> 
-<term
-><guilabel
->Transparent toolbars when moving</guilabel
-></term>
+<para>If there is a mark in this checkbox, when the mouse pointer is above a toolbar button, that button will be highlighted with a square around the button. This is a good visual indicator of which button will be selected with a mouse click.</para>
+</listitem> 
+</varlistentry> 
+
+<varlistentry> 
+<term><guilabel>Transparent toolbars when moving</guilabel></term>
 <listitem>
-<para
->As the title suggests, if this option is selected, the toolbars will be transparent when you are moving them around on the screen.</para>
-</listitem
-> 
-</varlistentry
-> 
-
-<varlistentry
-> 
-<term
-><guilabel
->Text position</guilabel
-></term>
+<para>As the title suggests, if this option is selected, the toolbars will be transparent when you are moving them around on the screen.</para>
+</listitem> 
+</varlistentry> 
+
+<varlistentry> 
+<term><guilabel>Text position</guilabel></term>
 <listitem>
-<para
->This combo box lets you determine where on the button the text name of the button will appear as the default. If <guilabel
->Icon Only</guilabel
-> is selected, then there is no text on the tool bar buttons. If <guilabel
->Text Only</guilabel
-> is selected, then the buttons icon is replaced with a text name of the button. If <guilabel
->Text Alongside Icons</guilabel
-> is selected, then the name of the button will be placed to the <emphasis
->right</emphasis
-> of the icon. If <guilabel
->Text Under Icons</guilabel
-> is selected, the default will be to have the text of the button <emphasis
->below</emphasis
-> the icon.</para>
-<tip
-><para
->This option only specifies the <emphasis
->default</emphasis
-> location. Each application can override the setting used in this panel.</para
-></tip>
-</listitem
-> 
-</varlistentry
-> 
+<para>This combo box lets you determine where on the button the text name of the button will appear as the default. If <guilabel>Icon Only</guilabel> is selected, then there is no text on the tool bar buttons. If <guilabel>Text Only</guilabel> is selected, then the buttons icon is replaced with a text name of the button. If <guilabel>Text Alongside Icons</guilabel> is selected, then the name of the button will be placed to the <emphasis>right</emphasis> of the icon. If <guilabel>Text Under Icons</guilabel> is selected, the default will be to have the text of the button <emphasis>below</emphasis> the icon.</para>
+<tip><para>This option only specifies the <emphasis>default</emphasis> location. Each application can override the setting used in this panel.</para></tip>
+</listitem> 
+</varlistentry> 
 
 </variablelist>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmtaskbar/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmtaskbar/index.docbook
index 326f9102474..3858ec96524 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmtaskbar/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmtaskbar/index.docbook
@@ -2,174 +2,92 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Mike.McBride; &Mike.McBride.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Mike.McBride; &Mike.McBride.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-10-08</date>
-<releaseinfo
->3.2</releaseinfo>
+<date>2002-10-08</date>
+<releaseinfo>3.2</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->taskbar</keyword>
-<keyword
->configure</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>taskbar</keyword>
+<keyword>configure</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="taskbar">
-<title
->Taskbar</title>
+<title>Taskbar</title>
 
 <sect2>
-<title
-><guilabel
->Taskbar</guilabel
-></title>
-
-<para
->The taskbar is a quick way to switch between applications. The taskbar can be located in the panel (default), or outside the panel on the desktop.</para>
-
-<para
->This module has options to control how the taskbar operates:</para>
-
-<para
-><guilabel
->Show windows from all desktops</guilabel
->, determines if all open windows are included in the taskbar or not. By default, the taskbar only shows the open windows <emphasis
->on the current desktop</emphasis
->. If this option is enabled, the taskbar will show all open windows <emphasis
->on all desktops</emphasis
->.</para>
-
-<para
->Using the <guilabel
->Show window list button</guilabel
-> option, you can enable a little button to be shown in the taskbar: this button will open a popup menu offering access to applications on other desktops as well as some useful actions, like <guilabel
->Unclutter Windows</guilabel
->.</para>
-
-<para
-><guilabel
->Sort tasks by virtual desktop</guilabel
-> changes the sort order of the icons on the taskbar, so that windows on virtual desktop 1 are shown first (to the left, or at the top of the taskbar), followed by windows on virtual desktop 2, and so on.</para>
-
-<para
->You can disable the application icons, and show just the text. You might want to do this to save space on your taskbar, for example.</para>
-
-<para
->You can have the taskbar <guilabel
->Show only minimised windows</guilabel
->. In this case, when you minimise a window, it will show up on the taskbar, and when you open it again, its taskbar entry will disappear.</para>
-
-<para
-><guilabel
->Group similar tasks</guilabel
-> allows you to save some space on your taskbar, by only showing one icon for each running application, no matter how many windows are shown. You can click on the icon to display a menu of all the windows that are available. This is most useful when you have enabled <guilabel
->Show all windows</guilabel
->.</para>
+<title><guilabel>Taskbar</guilabel></title>
+
+<para>The taskbar is a quick way to switch between applications. The taskbar can be located in the panel (default), or outside the panel on the desktop.</para>
+
+<para>This module has options to control how the taskbar operates:</para>
+
+<para><guilabel>Show windows from all desktops</guilabel>, determines if all open windows are included in the taskbar or not. By default, the taskbar only shows the open windows <emphasis>on the current desktop</emphasis>. If this option is enabled, the taskbar will show all open windows <emphasis>on all desktops</emphasis>.</para>
+
+<para>Using the <guilabel>Show window list button</guilabel> option, you can enable a little button to be shown in the taskbar: this button will open a popup menu offering access to applications on other desktops as well as some useful actions, like <guilabel>Unclutter Windows</guilabel>.</para>
+
+<para><guilabel>Sort tasks by virtual desktop</guilabel> changes the sort order of the icons on the taskbar, so that windows on virtual desktop 1 are shown first (to the left, or at the top of the taskbar), followed by windows on virtual desktop 2, and so on.</para>
+
+<para>You can disable the application icons, and show just the text. You might want to do this to save space on your taskbar, for example.</para>
+
+<para>You can have the taskbar <guilabel>Show only minimised windows</guilabel>. In this case, when you minimise a window, it will show up on the taskbar, and when you open it again, its taskbar entry will disappear.</para>
+
+<para><guilabel>Group similar tasks</guilabel> allows you to save some space on your taskbar, by only showing one icon for each running application, no matter how many windows are shown. You can click on the icon to display a menu of all the windows that are available. This is most useful when you have enabled <guilabel>Show all windows</guilabel>.</para>
 
 </sect2>
 
 <sect2>
-<title
-><guilabel
->Actions</guilabel
-></title>
+<title><guilabel>Actions</guilabel></title>
 
-<para
->The next set of options allow you to customise the actions performed with different mouse clicks on taskbar icons.</para>
+<para>The next set of options allow you to customise the actions performed with different mouse clicks on taskbar icons.</para>
 
-<para
->You can select any action from the list for the &LMB;, the &MMB; and the &RMB;.</para>
+<para>You can select any action from the list for the &LMB;, the &MMB; and the &RMB;.</para>
 
-<para
->The options available are:</para>
+<para>The options available are:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Show Task List</guilabel
-></term>
+<term><guilabel>Show Task List</guilabel></term>
 <listitem>
-<para
->Show the list of tasks grouped under the icon you have clicked on. If there is only one task or window for that icon, it will become the active window.</para>
-<para
->This is the default action for the &LMB;.</para>
+<para>Show the list of tasks grouped under the icon you have clicked on. If there is only one task or window for that icon, it will become the active window.</para>
+<para>This is the default action for the &LMB;.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Cycle Through Windows</guilabel
-></term>
+<term><guilabel>Cycle Through Windows</guilabel></term>
 <listitem>
-<para
->If there is more than one task grouped under the icon, switch from one to the next, until you release the button (&ie; when you have reached the window you are looking for). If there is only one task or window for that icon, it will become the active window.</para
-> 
+<para>If there is more than one task grouped under the icon, switch from one to the next, until you release the button (&ie; when you have reached the window you are looking for). If there is only one task or window for that icon, it will become the active window.</para> 
 
-<para
->This is the default action for the &MMB; if window grouping is enabled.</para>
+<para>This is the default action for the &MMB; if window grouping is enabled.</para>
 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Show Operations Menu</guilabel
-></term>
+<term><guilabel>Show Operations Menu</guilabel></term>
 <listitem>
-<para
->Show the operations menu for the application. This allows you to minimise, maximize, &etc;, move windows between desktops, and close windows. You can perform these actions on all windows grouped under that icon, or on any single window, by choosing it from the submenu.</para>
-<para
->This is the default action for the &RMB;.</para>
+<para>Show the operations menu for the application. This allows you to minimise, maximize, &etc;, move windows between desktops, and close windows. You can perform these actions on all windows grouped under that icon, or on any single window, by choosing it from the submenu.</para>
+<para>This is the default action for the &RMB;.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Raise Task</guilabel
->, <guilabel
->Lower Task</guilabel
->, <guilabel
->Minimise Task</guilabel
-></term>
+<term><guilabel>Raise Task</guilabel>, <guilabel>Lower Task</guilabel>, <guilabel>Minimise Task</guilabel></term>
 <listitem>
-<para
->These three options make sense only if window grouping is disabled. They are fairly self-explanatory. Raise means to make active, bring to the front, and give focus. Lower means, send to the back, and give focus to whichever window is now on top.</para>
+<para>These three options make sense only if window grouping is disabled. They are fairly self-explanatory. Raise means to make active, bring to the front, and give focus. Lower means, send to the back, and give focus to whichever window is now on top.</para>
 </listitem>
 </varlistentry>
 </variablelist>
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/keyboard/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/keyboard/index.docbook
index 320d43bcdaf..5da87605348 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/keyboard/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/keyboard/index.docbook
@@ -2,108 +2,59 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Mike.McBride; &Mike.McBride.mail;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Mike.McBride; &Mike.McBride.mail;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-02-12</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-02-12</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->keyboard</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>keyboard</keyword>
 </keywordset>
 </articleinfo>
 <sect1 id="kbd">
-<title
->Keyboard</title>
+<title>Keyboard</title>
 
-<para
->This module allows you to choose how your keyboard works.</para>
+<para>This module allows you to choose how your keyboard works.</para>
 
-<para
->The actual effect of setting these options depends upon the features provided by your keyboard hardware and the X server on which &kde; is running. As an example, you may find that changing the key click volume has no effect because that feature is not available on your system. </para>
+<para>The actual effect of setting these options depends upon the features provided by your keyboard hardware and the X server on which &kde; is running. As an example, you may find that changing the key click volume has no effect because that feature is not available on your system. </para>
 
 <sect2 id="kbd-use">
-<title
->Advanced</title>
+<title>Advanced</title>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Enable keyboard repeat</guilabel
-></term>
+<term><guilabel>Enable keyboard repeat</guilabel></term>
 <listitem>
-<para
->When this option is selected, pressing and holding down a key emits the same character repeatedly until the key is released. Pressing and holding the key will have the same effect as pressing it multiple times in succession. </para>
-<tip
-><para
->Almost all users will want to have this option enabled, because it makes navigating through documents with the arrow keys significantly easier. </para
-></tip>
+<para>When this option is selected, pressing and holding down a key emits the same character repeatedly until the key is released. Pressing and holding the key will have the same effect as pressing it multiple times in succession. </para>
+<tip><para>Almost all users will want to have this option enabled, because it makes navigating through documents with the arrow keys significantly easier. </para></tip>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->NumLock on KDE Startup</guilabel
-></term>
+<term><guilabel>NumLock on KDE Startup</guilabel></term>
 <listitem>
-<para
->You can choose to either always <guilabel
->Turn on</guilabel
-> or <guilabel
->Turn off</guilabel
-> the NumLock when &kde; starts, or you can choose to have &kde; leave NumLock at whatever it was set to before KDE started up.</para>
+<para>You can choose to either always <guilabel>Turn on</guilabel> or <guilabel>Turn off</guilabel> the NumLock when &kde; starts, or you can choose to have &kde; leave NumLock at whatever it was set to before KDE started up.</para>
 </listitem>
 </varlistentry>
 
 
 <varlistentry>
-<term
-><guilabel
->Key click volume:</guilabel
-></term>
+<term><guilabel>Key click volume:</guilabel></term>
 <listitem>
-<para
->If supported, this option allows you to hear audible clicks from your computer's speakers when you press the keys on your keyboard. In essence, this simulates the <quote
->click</quote
-> of a mechanical type-writer. You can change the loudness of the key click feedback by dragging the slider button or by clicking the up/down arrows on the spin-button. Setting the volume to 0% turns off the key click.</para>
-<para
->Many computers won't support this function.</para>
-<tip
-><para
->Very few people would choose to enable this option, since it generally annoys everyone else in the room. However, if your heart yearns for the pre-soft-key era, this may help you to re-experience the warm sentimentality of days-gone-by.</para>
+<para>If supported, this option allows you to hear audible clicks from your computer's speakers when you press the keys on your keyboard. In essence, this simulates the <quote>click</quote> of a mechanical type-writer. You can change the loudness of the key click feedback by dragging the slider button or by clicking the up/down arrows on the spin-button. Setting the volume to 0% turns off the key click.</para>
+<para>Many computers won't support this function.</para>
+<tip><para>Very few people would choose to enable this option, since it generally annoys everyone else in the room. However, if your heart yearns for the pre-soft-key era, this may help you to re-experience the warm sentimentality of days-gone-by.</para>
 </tip>
 </listitem>
 </varlistentry>
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/keys/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/keys/index.docbook
index ea1405b79b7..46a0ce85692 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/keys/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/keys/index.docbook
@@ -2,244 +2,104 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Mike.McBride; &Mike.McBride.mail;</author>
-<author
->&Jost.Schenck; &Jost.Schenck.mail;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Mike.McBride; &Mike.McBride.mail;</author>
+<author>&Jost.Schenck; &Jost.Schenck.mail;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-02-13</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-02-13</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->key bindings</keyword>
-<keyword
->bindings</keyword>
-<keyword
->shortcuts</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>key bindings</keyword>
+<keyword>bindings</keyword>
+<keyword>shortcuts</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="key-bindings">
-<title
->Shortcuts</title>
-
-<sect2 id="key-bindings-intro"
-> 
-<title
->Introduction</title
-> 
-
-<para
->While most of the functionality offered by &kde; can be accessed using a simple <quote
->point and click</quote
-> interface, many people prefer using the keyboard for some tasks. Pressing something like <keycombo action="simul"
-> &Ctrl;<keycap
->F</keycap
-></keycombo
-> is often just faster than moving your hands off the keyboard to the mouse, opening the <guimenu
->Edit</guimenu
-> menu and selecting <guimenuitem
->Find</guimenuitem
->.</para>
-
-<para
->As different people have different preferences about keyboard shortcuts, &kde; offers full customisation of <quote
->key bindings.</quote
-> A key binding or shortcut is a combination of an action with a key or a combination of keys.</para>
+<title>Shortcuts</title>
+
+<sect2 id="key-bindings-intro"> 
+<title>Introduction</title> 
+
+<para>While most of the functionality offered by &kde; can be accessed using a simple <quote>point and click</quote> interface, many people prefer using the keyboard for some tasks. Pressing something like <keycombo action="simul"> &Ctrl;<keycap>F</keycap></keycombo> is often just faster than moving your hands off the keyboard to the mouse, opening the <guimenu>Edit</guimenu> menu and selecting <guimenuitem>Find</guimenuitem>.</para>
+
+<para>As different people have different preferences about keyboard shortcuts, &kde; offers full customisation of <quote>key bindings.</quote> A key binding or shortcut is a combination of an action with a key or a combination of keys.</para>
 
 </sect2>
 
 <sect2 id="key-bindings-use">
-<title
->Use</title>
-
-<para
->In the Shortcuts control module you will see a list of <quote
->key schemes,</quote
-> a list of key bindings in the currently selected scheme and a frame where you can customise the currently selected key binding. Also, you will see a tab for <guilabel
->Global shortcuts</guilabel
-> and one for <guilabel
->Application shortcuts</guilabel
->.</para>
+<title>Use</title>
+
+<para>In the Shortcuts control module you will see a list of <quote>key schemes,</quote> a list of key bindings in the currently selected scheme and a frame where you can customise the currently selected key binding. Also, you will see a tab for <guilabel>Global shortcuts</guilabel> and one for <guilabel>Application shortcuts</guilabel>.</para>
 
 <sect3 id="key-bindings-use-globapp">
-<title
->Global Shortcuts and Application Shortcuts</title>
-
-<para
-><guilabel
->Global shortcuts</guilabel
-> and <guilabel
->application shortcuts</guilabel
-> work just the same. Actually, in a certain way application shortcuts are <quote
->global</quote
-> as well. The only difference is:</para>
+<title>Global Shortcuts and Application Shortcuts</title>
+
+<para><guilabel>Global shortcuts</guilabel> and <guilabel>application shortcuts</guilabel> work just the same. Actually, in a certain way application shortcuts are <quote>global</quote> as well. The only difference is:</para>
 
 <itemizedlist>
-<listitem
-><para
-><quote
->Global shortcuts</quote
-> are shortcuts for actions that make sense even when no application is opened. These shortcuts usually refer to actions like switching desktops, manipulating windows etc. </para
-></listitem
-> 
-<listitem
-><para
-><quote
->Application shortcuts</quote
-> refer to actions that are often available in applications, such as Save, Print, Copy etc.</para
-></listitem
-> 
+<listitem><para><quote>Global shortcuts</quote> are shortcuts for actions that make sense even when no application is opened. These shortcuts usually refer to actions like switching desktops, manipulating windows etc. </para></listitem> 
+<listitem><para><quote>Application shortcuts</quote> refer to actions that are often available in applications, such as Save, Print, Copy etc.</para></listitem> 
 </itemizedlist>
 
-<para
->Please note, that the application shortcuts configured here are <emphasis
->only</emphasis
-> the standard actions often found in applications. Most applications will define their own actions as well, for which you have to customise key bindings using the application's key bindings dialogue.</para>
+<para>Please note, that the application shortcuts configured here are <emphasis>only</emphasis> the standard actions often found in applications. Most applications will define their own actions as well, for which you have to customise key bindings using the application's key bindings dialogue.</para>
 
 </sect3>
 
 <sect3 id="key-bindings-use-confkeys">
-<title
->Configuring Key Bindings</title>
+<title>Configuring Key Bindings</title>
 
-<para
->Configuring key bindings is pretty easy. In the middle of the key bindings control module you'll find a list of available actions. If there's a key binding configured for that action you'll find it right next to it. Just select the action you want to configure.</para>
+<para>Configuring key bindings is pretty easy. In the middle of the key bindings control module you'll find a list of available actions. If there's a key binding configured for that action you'll find it right next to it. Just select the action you want to configure.</para>
 
-<para
->After you've selected an action you'll notice that most of the controls below the action list are enabled. There you can configure a combination of keys or maybe no key binding at all for the selected action. </para>
+<para>After you've selected an action you'll notice that most of the controls below the action list are enabled. There you can configure a combination of keys or maybe no key binding at all for the selected action. </para>
 
 <itemizedlist>
-<listitem
-><para
-><guilabel
->No key</guilabel
->: the selected action will not be associated with any key.</para
-></listitem>
-
-<listitem
-><para
-><guilabel
->Default key</guilabel
->: the selected action will be associated with &kde;'s default value. This is a good choice for most actions, as &kde; comes with reasonable key bindings we have thought about. </para
-></listitem>
-
-<listitem
-><para
-><guilabel
->Custom key</guilabel
->: if this option is enabled, you can create a key combination for the selected action. Just select any modifiers (&ie; &Shift;, &Ctrl;, or &Alt;) and then select a key: just click on the key symbol and after that press the key you want to assign to this key combination.</para
-></listitem>
+<listitem><para><guilabel>No key</guilabel>: the selected action will not be associated with any key.</para></listitem>
+
+<listitem><para><guilabel>Default key</guilabel>: the selected action will be associated with &kde;'s default value. This is a good choice for most actions, as &kde; comes with reasonable key bindings we have thought about. </para></listitem>
+
+<listitem><para><guilabel>Custom key</guilabel>: if this option is enabled, you can create a key combination for the selected action. Just select any modifiers (&ie; &Shift;, &Ctrl;, or &Alt;) and then select a key: just click on the key symbol and after that press the key you want to assign to this key combination.</para></listitem>
 
 </itemizedlist>
 
-<para
->As with all control modules, your changes won't take in effect until you click <guibutton
->OK</guibutton
-> or <guibutton
->Apply</guibutton
->. Click <guibutton
->Cancel</guibutton
-> to discard all changes.</para>
+<para>As with all control modules, your changes won't take in effect until you click <guibutton>OK</guibutton> or <guibutton>Apply</guibutton>. Click <guibutton>Cancel</guibutton> to discard all changes.</para>
 
 </sect3>
 
 <sect3 id="key-bindings-use-confschemes">
-<title
->Configuring Schemes</title>
-
-<para
->A key binding scheme is a set of key bindings that you can access using its name. &kde; comes with one pre-defined key binding scheme called <guilabel
->KDE default for 3 modifiers</guilabel
->. In addition to that scheme, you'll always see a scheme named <guilabel
->Current scheme</guilabel
-> that stands for the set of key bindings you are using right now (&ie; not the current settings you are playing with, but what you've been using up to now). </para>
-
-<para
->When you are playing with the key bindings for the first time you don't have to be afraid of changing the default bindings: &kde; won't let you overwrite the defaults, so you can always switch back to the factory presets. By choosing <guilabel
->Current scheme</guilabel
-> you can return to the set of key bindings you've been using up to now. However, be careful not to select a scheme when you've made changes to the key bindings you don't want to lose.</para>
-
-<para
->When you are satisfied with a set of key bindings you've created, you may want to save them to a scheme of your own, so that you can still experiment with the bindings and always return to a certain scheme. You can always do this by clicking on the <guibutton
->Add</guibutton
-> button. You will be prompted for a name and then the new scheme will appear in the key schemes listbox. You can remove your own schemes again by selecting a scheme and clicking the <guibutton
->Remove</guibutton
-> button. Click the <guibutton
->Save changes</guibutton
-> button to save any changes you have made to the currently selected scheme. Note that you can not remove or save changes to <guilabel
->KDE default</guilabel
-> or to <guilabel
->Current scheme</guilabel
->.</para>
-
-<important
-><para
->If you want to save your changes while a read-only scheme is selected, you always have to add a new scheme first! If you select one of your own schemes because you want to save the changes to that one, the control module will switch to the key bindings of that scheme, discarding your changes.</para
-></important
-> </sect3>
+<title>Configuring Schemes</title>
+
+<para>A key binding scheme is a set of key bindings that you can access using its name. &kde; comes with one pre-defined key binding scheme called <guilabel>KDE default for 3 modifiers</guilabel>. In addition to that scheme, you'll always see a scheme named <guilabel>Current scheme</guilabel> that stands for the set of key bindings you are using right now (&ie; not the current settings you are playing with, but what you've been using up to now). </para>
+
+<para>When you are playing with the key bindings for the first time you don't have to be afraid of changing the default bindings: &kde; won't let you overwrite the defaults, so you can always switch back to the factory presets. By choosing <guilabel>Current scheme</guilabel> you can return to the set of key bindings you've been using up to now. However, be careful not to select a scheme when you've made changes to the key bindings you don't want to lose.</para>
+
+<para>When you are satisfied with a set of key bindings you've created, you may want to save them to a scheme of your own, so that you can still experiment with the bindings and always return to a certain scheme. You can always do this by clicking on the <guibutton>Add</guibutton> button. You will be prompted for a name and then the new scheme will appear in the key schemes listbox. You can remove your own schemes again by selecting a scheme and clicking the <guibutton>Remove</guibutton> button. Click the <guibutton>Save changes</guibutton> button to save any changes you have made to the currently selected scheme. Note that you can not remove or save changes to <guilabel>KDE default</guilabel> or to <guilabel>Current scheme</guilabel>.</para>
+
+<important><para>If you want to save your changes while a read-only scheme is selected, you always have to add a new scheme first! If you select one of your own schemes because you want to save the changes to that one, the control module will switch to the key bindings of that scheme, discarding your changes.</para></important> </sect3>
 
 </sect2>
 
 <sect2>
-<title
->Modifier Keys</title>
-
-<para
->Different keyboards offer different sets of modifier keys. A &Mac; keyboard, for example, does not have a &Ctrl; key, and instead has an <keycap
->Option</keycap
-> key. Here you can see what the available modifier keys for the current keyboard are.</para>
-
-<para
->If you enable <guilabel
->Macintosh keyboard</guilabel
-> the list of modifiers will change.</para>
-
-<para
->If you have enabled the &Mac; keyboard, you can further enable <guilabel
->MacOS-style modifier usage</guilabel
->, to make &kde; behave more like &MacOS;.</para
-><!-- FIXME: well, that's rather non-explanatory, more here would be good -->
-
-<para
->Finally, you can change what a keypress sends to the &X-Server; in the <guilabel
->X Modifier Mapping</guilabel
-> section. A common example is to reconfigure the <keycap
->Caps Lock</keycap
-> key, which is rarely used, to be another &Ctrl; key. This is especially nice if you are a touch typist, as <keycap
->Caps Lock</keycap
-> is much easier to reach than either of the &Ctrl; keys on a standard keyboard.</para>
+<title>Modifier Keys</title>
+
+<para>Different keyboards offer different sets of modifier keys. A &Mac; keyboard, for example, does not have a &Ctrl; key, and instead has an <keycap>Option</keycap> key. Here you can see what the available modifier keys for the current keyboard are.</para>
+
+<para>If you enable <guilabel>Macintosh keyboard</guilabel> the list of modifiers will change.</para>
+
+<para>If you have enabled the &Mac; keyboard, you can further enable <guilabel>MacOS-style modifier usage</guilabel>, to make &kde; behave more like &MacOS;.</para><!-- FIXME: well, that's rather non-explanatory, more here would be good -->
+
+<para>Finally, you can change what a keypress sends to the &X-Server; in the <guilabel>X Modifier Mapping</guilabel> section. A common example is to reconfigure the <keycap>Caps Lock</keycap> key, which is rarely used, to be another &Ctrl; key. This is especially nice if you are a touch typist, as <keycap>Caps Lock</keycap> is much easier to reach than either of the &Ctrl; keys on a standard keyboard.</para>
 
 <!-- FIXME: what exactly is going on here... -->
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/kthememgr/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/kthememgr/index.docbook
index 8e3bfc2a446..b5f4c1a673d 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/kthememgr/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/kthememgr/index.docbook
@@ -2,8 +2,7 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE" 
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE" > <!-- change language only here -->
 ]>
 
 <article lang="&language;">
@@ -11,170 +10,76 @@
 
 
 <authorgroup>
-<author
-> <firstname
->Lauri</firstname
-> <surname
->Watts</surname
-> </author>
-
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->KDE British Conversion</contrib
-></othercredit
-> 
+<author> <firstname>Lauri</firstname> <surname>Watts</surname> </author>
+
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>KDE British Conversion</contrib></othercredit> 
 
 </authorgroup>
 
-<date
->2002-02-16</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-02-16</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->kcontrol</keyword>
-<keyword
->Themes</keyword>
+<keyword>KDE</keyword>
+<keyword>kcontrol</keyword>
+<keyword>Themes</keyword>
 </keywordset>
 
 </articleinfo>
 <sect1 id="theme-manager">
 
-<title
->Theme Manager</title>
+<title>Theme Manager</title>
 
-<para
->With this module you can install, view, and even create, &kde; themes.</para>
+<para>With this module you can install, view, and even create, &kde; themes.</para>
 
-<para
->This page is divided into two tabs: <guilabel
->Installer</guilabel
->, <guilabel
->Contents</guilabel
->.</para>
+<para>This page is divided into two tabs: <guilabel>Installer</guilabel>, <guilabel>Contents</guilabel>.</para>
 
 <sect2 id="theme-installer">
-<title
->Installer</title>
+<title>Installer</title>
 
-<para
->Here you can install, preview and create &kde; themes. Themes created this way may not cover all the configurable options that &kde; has to offer. However, they do cover most options and are a great way to get started.</para>
+<para>Here you can install, preview and create &kde; themes. Themes created this way may not cover all the configurable options that &kde; has to offer. However, they do cover most options and are a great way to get started.</para>
 
-<para
->On the left, you can see a list of themes that &kde; is aware of. Selecting one of the names will change the preview image in the middle of the pane, to give you a small taste of what the theme looks like. Any information the author has provided about the theme, for example, a longer or more descriptive name, is displayed in the bottom of the pane.</para>
+<para>On the left, you can see a list of themes that &kde; is aware of. Selecting one of the names will change the preview image in the middle of the pane, to give you a small taste of what the theme looks like. Any information the author has provided about the theme, for example, a longer or more descriptive name, is displayed in the bottom of the pane.</para>
 
-<para
->Along with the normal &kcontrol; buttons at the bottom, you have four new ones to the right of the module. <guibutton
->Add...</guibutton
-> allows you to add a new theme to the list on the left. Pressing it will open a normal &kde; file dialogue, where you can browse to the location of themes you have downloaded or created.</para>
+<para>Along with the normal &kcontrol; buttons at the bottom, you have four new ones to the right of the module. <guibutton>Add...</guibutton> allows you to add a new theme to the list on the left. Pressing it will open a normal &kde; file dialogue, where you can browse to the location of themes you have downloaded or created.</para>
 
-<para
->The <guibutton
->Save As...</guibutton
-> button allows you to save an existing theme with a new name, for example to allow you to easily modify it without damaging the original. It is strongly recommended that you use this if you intend creating themes by hand, you can get very unexpected results if there are errors in a theme file.</para>
+<para>The <guibutton>Save As...</guibutton> button allows you to save an existing theme with a new name, for example to allow you to easily modify it without damaging the original. It is strongly recommended that you use this if you intend creating themes by hand, you can get very unexpected results if there are errors in a theme file.</para>
 
-<para
-><guibutton
->Create</guibutton
-> will create a theme that contains your current desktop settings. Themes created this way are fairly unsophisticated, but they are a very good start to learning to make your own.</para>
+<para><guibutton>Create</guibutton> will create a theme that contains your current desktop settings. Themes created this way are fairly unsophisticated, but they are a very good start to learning to make your own.</para>
 
-<para
->Finally, it's very easy to collect alot of themes that look rather nice on a website, but aren't to your taste once you've tried them. The <guibutton
->Remove...</guibutton
-> will remedy this situation, removing the theme from the list on the left.</para>
+<para>Finally, it's very easy to collect alot of themes that look rather nice on a website, but aren't to your taste once you've tried them. The <guibutton>Remove...</guibutton> will remedy this situation, removing the theme from the list on the left.</para>
 
 </sect2>
 
 <sect2>
-<title
->Contents</title>
-
-<para
->This page works together with the previous one, allowing you to custom fit a theme to your own needs.</para>
-
-<para
->Not all themes contain instructions (or images) for all the configurable parts of &kde;. For example, some contain a colour scheme, a desktop wallpaper, and a style for the panel, but they don't have any icons or Window Decoration instructions.</para>
-
-<para
->Another common situation is to find you have finally got your own icon theme, colour scheme or window decoration arrangement <quote
->just so</quote
->, and although you'd like to try out a theme, you don't want to mess up your current installation.</para>
-
-<para
->Using this page, you can see immediately what categories of changes the theme will make, and you can enable or disable its effects on those categories.</para>
-
-<para
->The list under the heading <guilabel
->Work on the following parts</guilabel
-> will show you a checkbox to the left if the theme is going to affect that item, and to the right if the theme actually contains any contents for that category.</para>
-
-<para
->You can use the <guibutton
->Clear</guibutton
-> button to clear all the checkboxes, and the <guibutton
->Invert</guibutton
-> button to check all the checkboxes that are currently empty, and clear those that were checked.</para>
-
-<para
->For example, the <quote
->Eclipse</quote
-> theme that comes with a base &kde; installation contains contents for all the configurable items, and is by default set up to change them all to its own settings. The <quote
->MGBreizh</quote
-> theme contains contents for everything except the icons. The <quote
->Technical</quote
-> theme, which you can find in the tdeartwork package, contains <emphasis
->only</emphasis
-> the icons, so if you were to install <quote
->MGBreizh</quote
->, and then <quote
->Technical</quote
->, you would find you still had mostly the <quote
->MGBreizh</quote
-> theme in place, but with new icons.</para>
-
-<para
->Taking this same scenario, what if you really didn't want the <quote
->MGBreizh</quote
-> theme anymore, and wanted to remove it, and just use the <quote
->Technical</quote
-> icon theme with a plain desktop?</para>
-
-<para
->You have two choices here. You can check the <guilabel
->Uninstall parts of previous theme</guilabel
-> box, and then any installed theme will be entirely removed before the new one is installed. Or you could just install the <quote
->Default</quote
-> theme, which really isn't a theme, it's more of a theme cleaner - it removes all other themes, and resets all your desktop theme settings to the &kde; default appearance.</para>
+<title>Contents</title>
+
+<para>This page works together with the previous one, allowing you to custom fit a theme to your own needs.</para>
+
+<para>Not all themes contain instructions (or images) for all the configurable parts of &kde;. For example, some contain a colour scheme, a desktop wallpaper, and a style for the panel, but they don't have any icons or Window Decoration instructions.</para>
+
+<para>Another common situation is to find you have finally got your own icon theme, colour scheme or window decoration arrangement <quote>just so</quote>, and although you'd like to try out a theme, you don't want to mess up your current installation.</para>
+
+<para>Using this page, you can see immediately what categories of changes the theme will make, and you can enable or disable its effects on those categories.</para>
+
+<para>The list under the heading <guilabel>Work on the following parts</guilabel> will show you a checkbox to the left if the theme is going to affect that item, and to the right if the theme actually contains any contents for that category.</para>
+
+<para>You can use the <guibutton>Clear</guibutton> button to clear all the checkboxes, and the <guibutton>Invert</guibutton> button to check all the checkboxes that are currently empty, and clear those that were checked.</para>
+
+<para>For example, the <quote>Eclipse</quote> theme that comes with a base &kde; installation contains contents for all the configurable items, and is by default set up to change them all to its own settings. The <quote>MGBreizh</quote> theme contains contents for everything except the icons. The <quote>Technical</quote> theme, which you can find in the tdeartwork package, contains <emphasis>only</emphasis> the icons, so if you were to install <quote>MGBreizh</quote>, and then <quote>Technical</quote>, you would find you still had mostly the <quote>MGBreizh</quote> theme in place, but with new icons.</para>
+
+<para>Taking this same scenario, what if you really didn't want the <quote>MGBreizh</quote> theme anymore, and wanted to remove it, and just use the <quote>Technical</quote> icon theme with a plain desktop?</para>
+
+<para>You have two choices here. You can check the <guilabel>Uninstall parts of previous theme</guilabel> box, and then any installed theme will be entirely removed before the new one is installed. Or you could just install the <quote>Default</quote> theme, which really isn't a theme, it's more of a theme cleaner - it removes all other themes, and resets all your desktop theme settings to the &kde; default appearance.</para>
 
 </sect2>
 
 <sect2 id="theme-author">
-<title
->Section Author</title>
-
-<para
->This section was written by Lauri Watts <email
->lauri@kde.org</email
->.</para>
-
-<para
->KDE British Conversion Malcolm Hunter <email
->malcolm.hunter@gmx.co.uk</email
-></para
->         
+<title>Section Author</title>
+
+<para>This section was written by Lauri Watts <email>lauri@kde.org</email>.</para>
+
+<para>KDE British Conversion Malcolm Hunter <email>malcolm.hunter@gmx.co.uk</email></para>         
 </sect2>
 
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/language/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/language/index.docbook
index 258f0edda9d..a5cf378baee 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/language/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/language/index.docbook
@@ -2,8 +2,7 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
@@ -11,323 +10,123 @@
 
 <sect1info>
 <authorgroup>
-<author
->&Mike.McBride; &Mike.McBride.mail;</author>
-<author
->&Krishna.Tateneni; &Krishna.Tateneni.mail;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Mike.McBride; &Mike.McBride.mail;</author>
+<author>&Krishna.Tateneni; &Krishna.Tateneni.mail;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
  </authorgroup>
-<date
->2003-10-14</date
-> <releaseinfo
->3.2</releaseinfo
-> <keywordset>
-		<keyword
->KDE</keyword>
-		<keyword
->KControl</keyword>
-		<keyword
->locale</keyword>
-		<keyword
->country</keyword>
-		<keyword
->language</keyword>
+<date>2003-10-14</date> <releaseinfo>3.2</releaseinfo> <keywordset>
+		<keyword>KDE</keyword>
+		<keyword>KControl</keyword>
+		<keyword>locale</keyword>
+		<keyword>country</keyword>
+		<keyword>language</keyword>
 	  </keywordset>
 
 	</sect1info>
 
 
-<title
->Country and Language</title>
+<title>Country and Language</title>
 
-<para
->This module of the &kde; control centre allows you select customisation options that depend on the region of the world that you happen to live in. There are five different pages in this module, each of which is described in detail in the following sections.</para>
+<para>This module of the &kde; control centre allows you select customisation options that depend on the region of the world that you happen to live in. There are five different pages in this module, each of which is described in detail in the following sections.</para>
 
-<para
->In most cases, you can simply select the country you live in, and the other options will be set in an appropriate manner.</para>
+<para>In most cases, you can simply select the country you live in, and the other options will be set in an appropriate manner.</para>
 
-<para
->Below the pages of this module, you can see a preview of what the settings look like. In addition to positive and negative numbers, you can see how positive and negative currency values, long and short dates, and times are displayed. When you change any of the settings, the preview shows the effects of the changes before you apply them.</para>
+<para>Below the pages of this module, you can see a preview of what the settings look like. In addition to positive and negative numbers, you can see how positive and negative currency values, long and short dates, and times are displayed. When you change any of the settings, the preview shows the effects of the changes before you apply them.</para>
 
 <sect2 id="locale-locale">
-<title
->Locale</title>
+<title>Locale</title>
 
-<para
->On this page, there are two lists, from which you can select the country and languages that you want to use.</para>
+<para>On this page, there are two lists, from which you can select the country and languages that you want to use.</para>
 
-<para
->When you click on the <guilabel
->Country</guilabel
-> list, a menu pops up showing major groups of countries. You can select one of these regions and see a list of the countries that are available for that region.</para>
+<para>When you click on the <guilabel>Country</guilabel> list, a menu pops up showing major groups of countries. You can select one of these regions and see a list of the countries that are available for that region.</para>
 
-<para
->If the language for the country you have selected is available on your system, it will be selected automatically. For instance, choosing <guilabel
->Germany</guilabel
-> as the country will select <guilabel
->German</guilabel
-> as the language, if it is available.</para>
+<para>If the language for the country you have selected is available on your system, it will be selected automatically. For instance, choosing <guilabel>Germany</guilabel> as the country will select <guilabel>German</guilabel> as the language, if it is available.</para>
 
 </sect2>
 
 <sect2 id="locale-numbers">
-<title
->Numbers</title>
+<title>Numbers</title>
 
-<para
->On this page, you can select options for how numbers are displayed. The defaults are selected automatically based on the country which is currently selected.</para>
+<para>On this page, you can select options for how numbers are displayed. The defaults are selected automatically based on the country which is currently selected.</para>
 
-<para
->In the text box labelled <guilabel
->Decimal symbol</guilabel
->, you can type the character that you want to use to separate the decimal portion of numbers. You could put anything here you wanted to, but really, <userinput
->.</userinput
-> and <userinput
->,</userinput
-> are the two characters that make the most sense.</para>
+<para>In the text box labelled <guilabel>Decimal symbol</guilabel>, you can type the character that you want to use to separate the decimal portion of numbers. You could put anything here you wanted to, but really, <userinput>.</userinput> and <userinput>,</userinput> are the two characters that make the most sense.</para>
 
-<para
->Similarly, you can choose the character which is used to group units of thousands in numbers. If no character, not even a space, is present, then there will be no separator for thousands.</para>
+<para>Similarly, you can choose the character which is used to group units of thousands in numbers. If no character, not even a space, is present, then there will be no separator for thousands.</para>
 
-<para
->Finally, you can choose what character should be prefixed to positive and negative numbers respectively. For example, the default for English is not to have any prefix for positive numbers, and a <userinput
->-</userinput
-> for negative numbers.</para>
+<para>Finally, you can choose what character should be prefixed to positive and negative numbers respectively. For example, the default for English is not to have any prefix for positive numbers, and a <userinput>-</userinput> for negative numbers.</para>
 
 </sect2>
 
 <sect2 id="locale-money">
 
-<title
->Money</title>
+<title>Money</title>
 
-<para
->Unlike the display of ordinary numbers, conventions for currency values do vary from region to region. However, you will find that the defaults are probably fine.</para>
+<para>Unlike the display of ordinary numbers, conventions for currency values do vary from region to region. However, you will find that the defaults are probably fine.</para>
 
-<para
->The character or characters representing the currency symbol are based on the country that is currently selected. The decimal symbol and thousands separator work as they do for numbers. The text box labelled <guilabel
->Fract digits</guilabel
-> allows you to specify the number of fractional digits used in displaying currency values.</para>
+<para>The character or characters representing the currency symbol are based on the country that is currently selected. The decimal symbol and thousands separator work as they do for numbers. The text box labelled <guilabel>Fract digits</guilabel> allows you to specify the number of fractional digits used in displaying currency values.</para>
 
-<para
->For both positive and negative currency values, you can control whether the currency symbol appears before or after the numeric value, and how the sign of the value is distinguished in the display. Note that the symbols used for the sign of currency values are the same as those used for other numeric values.</para>
+<para>For both positive and negative currency values, you can control whether the currency symbol appears before or after the numeric value, and how the sign of the value is distinguished in the display. Note that the symbols used for the sign of currency values are the same as those used for other numeric values.</para>
 
-<para
->If the checkbox labelled <guilabel
->Prefix currency symbol</guilabel
-> is selected, the currency symbol appears before the numeric value. If this checkbox is cleared, then the currency symbol appears after the numeric value.</para>
+<para>If the checkbox labelled <guilabel>Prefix currency symbol</guilabel> is selected, the currency symbol appears before the numeric value. If this checkbox is cleared, then the currency symbol appears after the numeric value.</para>
 
-<para
->There are five choices for the way in which the sign of the currency value is handled:</para>
+<para>There are five choices for the way in which the sign of the currency value is handled:</para>
 <itemizedlist>
-<listitem
-><para
->The <guilabel
->Parens around</guilabel
-> option displays the numeric value within a pair of parentheses.</para
-></listitem>
-<listitem
-><para
->The <guilabel
->Before quantity money</guilabel
-> option displays the sign before the numeric value, but after any currency symbol that may be present.</para
-></listitem>
-<listitem
-><para
->The <guilabel
->After quantity money</guilabel
-> option displays the sign after the numeric value, but before any currency symbol that may be present.</para
-></listitem>
-<listitem
-><para
->The <guilabel
->Before money</guilabel
-> option displays the sign before the numeric value as well as any currency symbol that may be present.</para
-></listitem>
-<listitem
-><para
->The <guilabel
->After money</guilabel
-> option displays the sign after the numeric value as well as any currency symbol that may be present.</para
-></listitem>
+<listitem><para>The <guilabel>Parens around</guilabel> option displays the numeric value within a pair of parentheses.</para></listitem>
+<listitem><para>The <guilabel>Before quantity money</guilabel> option displays the sign before the numeric value, but after any currency symbol that may be present.</para></listitem>
+<listitem><para>The <guilabel>After quantity money</guilabel> option displays the sign after the numeric value, but before any currency symbol that may be present.</para></listitem>
+<listitem><para>The <guilabel>Before money</guilabel> option displays the sign before the numeric value as well as any currency symbol that may be present.</para></listitem>
+<listitem><para>The <guilabel>After money</guilabel> option displays the sign after the numeric value as well as any currency symbol that may be present.</para></listitem>
 </itemizedlist>
 
 </sect2>
 
 <sect2 id="locale-datetime">
-<title
->Time and Dates</title>
+<title>Time and Dates</title>
 
-<para
->If you use a different calendar system than Gregorian, you can choose this from the first dropdown box.</para>
+<para>If you use a different calendar system than Gregorian, you can choose this from the first dropdown box.</para>
 
-<para
->On the rest of this page, there are text boxes for the time, long date, and short date, in which you can type format strings to control the way in which times and dates are displayed.</para>
+<para>On the rest of this page, there are text boxes for the time, long date, and short date, in which you can type format strings to control the way in which times and dates are displayed.</para>
 
-<para
->Except for the special codes described below, any other characters in the format strings are displayed literally. The special codes consist of a <parameter
->%</parameter
-> sign followed by a character, as shown in the list of codes below:</para>
+<para>Except for the special codes described below, any other characters in the format strings are displayed literally. The special codes consist of a <parameter>%</parameter> sign followed by a character, as shown in the list of codes below:</para>
 
 <itemizedlist>
-<listitem
-><para
->Time format codes:</para>
+<listitem><para>Time format codes:</para>
   <itemizedlist>
 
-  <listitem
-><para
-><parameter
->HH</parameter
-> - The hour according to a 24-hour clock, using two digits (00 to 23).</para
-></listitem>
-  <listitem
-><para
-><parameter
->hH</parameter
-> - The hour according to a 24-hour clock, using one or two digits (0 to 23).</para
-></listitem>
-  <listitem
-><para
-><parameter
->PH</parameter
-> (uppercase eye) - The hour according to a 12-hour clock, using two digits (01 to 12).</para
-></listitem>
-  <listitem
-><para
-><parameter
->pH</parameter
-> (lowercase ell) - The hour according to a 12-hour clock, using one or two digits (1 to 12).</para
-></listitem>
-  <listitem
-><para
-><parameter
->MM</parameter
-> - The current minute using two digits (00 to 59).</para
-></listitem>
-  <listitem
-><para
-><parameter
->SS</parameter
-> - The current second using two digits (00 to 59).</para
-></listitem>
-  <listitem
-><para
-><parameter
->AMPM</parameter
-> - Either <quote
->am</quote
-> or <quote
->pm</quote
-> depending on the hour. Useful with <parameter
->PH</parameter
-> or <parameter
->pH</parameter
->.</para
-></listitem>
+  <listitem><para><parameter>HH</parameter> - The hour according to a 24-hour clock, using two digits (00 to 23).</para></listitem>
+  <listitem><para><parameter>hH</parameter> - The hour according to a 24-hour clock, using one or two digits (0 to 23).</para></listitem>
+  <listitem><para><parameter>PH</parameter> (uppercase eye) - The hour according to a 12-hour clock, using two digits (01 to 12).</para></listitem>
+  <listitem><para><parameter>pH</parameter> (lowercase ell) - The hour according to a 12-hour clock, using one or two digits (1 to 12).</para></listitem>
+  <listitem><para><parameter>MM</parameter> - The current minute using two digits (00 to 59).</para></listitem>
+  <listitem><para><parameter>SS</parameter> - The current second using two digits (00 to 59).</para></listitem>
+  <listitem><para><parameter>AMPM</parameter> - Either <quote>am</quote> or <quote>pm</quote> depending on the hour. Useful with <parameter>PH</parameter> or <parameter>pH</parameter>.</para></listitem>
   </itemizedlist>
 </listitem>
 
-<listitem
-><para
->Date format codes:</para>
+<listitem><para>Date format codes:</para>
   <itemizedlist>
-  <listitem
-><para
-><parameter
->YYYY</parameter
-> - The year, using 4 digits.</para
-></listitem>
-  <listitem
-><para
-><parameter
->YY</parameter
-> - The year, using 2 digits.</para
-></listitem>
-  <listitem
-><para
-><parameter
->MM</parameter
-> - The month, using 2 digits (01 to 12).</para
-></listitem>
-  <listitem
-><para
-><parameter
->mM</parameter
-> - The month, using 1 or 2 digits (1 to 12).</para
-></listitem>
-  <listitem
-><para
-><parameter
->MONTH</parameter
-> - The name of the month.</para
-></listitem>
-  <listitem
-><para
-><parameter
->SHORTMONTH</parameter
-> - The abbreviated name of the month.</para
-></listitem>
-  <listitem
-><para
-><parameter
->DD</parameter
-> - The day, using 2 digits (01 to 31).</para
-></listitem>
-  <listitem
-><para
-><parameter
->dD</parameter
-> - The day, using 1 or 2 digits (1 to 31).</para
-></listitem>
-  <listitem
-><para
-><parameter
->WEEKDAY</parameter
-> - The name of the weekday.</para
-></listitem>
-  <listitem
-><para
-><parameter
->SHORTWEEKDAY</parameter
-> - The abbreviated name of the weekday.</para
-></listitem>
+  <listitem><para><parameter>YYYY</parameter> - The year, using 4 digits.</para></listitem>
+  <listitem><para><parameter>YY</parameter> - The year, using 2 digits.</para></listitem>
+  <listitem><para><parameter>MM</parameter> - The month, using 2 digits (01 to 12).</para></listitem>
+  <listitem><para><parameter>mM</parameter> - The month, using 1 or 2 digits (1 to 12).</para></listitem>
+  <listitem><para><parameter>MONTH</parameter> - The name of the month.</para></listitem>
+  <listitem><para><parameter>SHORTMONTH</parameter> - The abbreviated name of the month.</para></listitem>
+  <listitem><para><parameter>DD</parameter> - The day, using 2 digits (01 to 31).</para></listitem>
+  <listitem><para><parameter>dD</parameter> - The day, using 1 or 2 digits (1 to 31).</para></listitem>
+  <listitem><para><parameter>WEEKDAY</parameter> - The name of the weekday.</para></listitem>
+  <listitem><para><parameter>SHORTWEEKDAY</parameter> - The abbreviated name of the weekday.</para></listitem>
   </itemizedlist>
 </listitem>
 </itemizedlist>
 
-<para
->Finally, there's a combobox labelled <guilabel
->First day of the week</guilabel
-> which lets you select which day is the first one of the week in your country.</para>
+<para>Finally, there's a combobox labelled <guilabel>First day of the week</guilabel> which lets you select which day is the first one of the week in your country.</para>
 
 </sect2>
 <sect2 id="locale-other">
-<title
->Other</title>
-<para
->You can select the default paper format with the combo box labelled <guilabel
->Paper Format</guilabel
->.</para>
-
-<para
->Use the drop down box labelled <guilabel
->Measure system</guilabel
-> to select Imperial or Metric systems of measurement.</para>
+<title>Other</title>
+<para>You can select the default paper format with the combo box labelled <guilabel>Paper Format</guilabel>.</para>
+
+<para>Use the drop down box labelled <guilabel>Measure system</guilabel> to select Imperial or Metric systems of measurement.</para>
 
 </sect2>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/mouse/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/mouse/index.docbook
index f8a56db1571..92117c513ec 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/mouse/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/mouse/index.docbook
@@ -2,330 +2,154 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Mike.McBride; &Mike.McBride.mail;</author>
-<author
->&Brad.Hards; &Brad.Hards.mail;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Mike.McBride; &Mike.McBride.mail;</author>
+<author>&Brad.Hards; &Brad.Hards.mail;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2004-10-09</date>
-<releaseinfo
->3.03.00</releaseinfo>
+<date>2004-10-09</date>
+<releaseinfo>3.03.00</releaseinfo>
 
 <abstract>
-<para
->This is the documentation for the &kde; &kcontrol; module that configures mice and other pointing devices. </para>
+<para>This is the documentation for the &kde; &kcontrol; module that configures mice and other pointing devices. </para>
 </abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->mouse</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>mouse</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="mouse">
-<title
->Mouse</title>
-
-<para
->This module allows you to configure your pointing device. Your pointing device may be a mouse, a track ball, a touch-pad, or another piece of hardware that performs a similar function.</para>
-
-<para
->This module is divided into several tabs: <link linkend="mouse-general"
->General</link
->, <link linkend="cursor-theme"
->Cursor Theme</link
->, <link linkend="mouse-advanced"
->Advanced</link
-> and <link linkend="mouse-navigation"
->Mouse Navigation</link
->. </para>
+<title>Mouse</title>
+
+<para>This module allows you to configure your pointing device. Your pointing device may be a mouse, a track ball, a touch-pad, or another piece of hardware that performs a similar function.</para>
+
+<para>This module is divided into several tabs: <link linkend="mouse-general">General</link>, <link linkend="cursor-theme">Cursor Theme</link>, <link linkend="mouse-advanced">Advanced</link> and <link linkend="mouse-navigation">Mouse Navigation</link>. </para>
 
 <sect2 id="mouse-general">
-<title
-><guilabel
->General</guilabel
-></title>
+<title><guilabel>General</guilabel></title>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Button Order</guilabel
-></term>
-<listitem
-><para
->If you are left-handed, you may prefer to swap the functions of the <mousebutton
->left</mousebutton
-> and <mousebutton
->right</mousebutton
-> buttons on your pointing device by choosing the <quote
->Left handed</quote
-> option. If your pointing device has more than two buttons, only those that function as the <mousebutton
->left</mousebutton
-> and <mousebutton
->right</mousebutton
-> buttons are affected. For example, if you have a three-button mouse, the <mousebutton
->middle</mousebutton
-> button is unaffected.</para>
+<term><guilabel>Button Order</guilabel></term>
+<listitem><para>If you are left-handed, you may prefer to swap the functions of the <mousebutton>left</mousebutton> and <mousebutton>right</mousebutton> buttons on your pointing device by choosing the <quote>Left handed</quote> option. If your pointing device has more than two buttons, only those that function as the <mousebutton>left</mousebutton> and <mousebutton>right</mousebutton> buttons are affected. For example, if you have a three-button mouse, the <mousebutton>middle</mousebutton> button is unaffected.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Reverse scroll direction</guilabel
-></term>
-<listitem
-><para
->With this checkbox selected, the scroll wheel (if any) will work in the opposite direction (so that if rolling the top of the scroll wheel towards you previously causes a scroll down, then it will now cause a scroll up). This may be useful to handle a unusual setup of the X server. </para>
+<term><guilabel>Reverse scroll direction</guilabel></term>
+<listitem><para>With this checkbox selected, the scroll wheel (if any) will work in the opposite direction (so that if rolling the top of the scroll wheel towards you previously causes a scroll down, then it will now cause a scroll up). This may be useful to handle a unusual setup of the X server. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Double-click to open files and folders (select icons on first click)</guilabel
-></term>
+<term><guilabel>Double-click to open files and folders (select icons on first click)</guilabel></term>
 <listitem>
-<para
->If this option is not checked, icons/files will be opened with a single click of the <mousebutton
->left</mousebutton
-> mouse-button. This default behaviour is consistent with what you would expect when you click links in most web browsers. If checked however, icons/files will be opened with a double click, while a single click will only select the icon or file. This is the behaviour you may know from other desktops or operating systems.</para>
+<para>If this option is not checked, icons/files will be opened with a single click of the <mousebutton>left</mousebutton> mouse-button. This default behaviour is consistent with what you would expect when you click links in most web browsers. If checked however, icons/files will be opened with a double click, while a single click will only select the icon or file. This is the behaviour you may know from other desktops or operating systems.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Single-click to open files and folders</guilabel
-></term>
+<term><guilabel>Single-click to open files and folders</guilabel></term>
 <listitem>
-<para
->This is the default setting for &kde;. Clicking once on an icon will open it. To select you can drag around the icon(s) or <keycombo action="simul"
->&Ctrl;<mousebutton
->Right</mousebutton
-></keycombo
-> click, or simply click and hold to drag it. You can also enable automatic selection of icons using the <guilabel
->Automatically select icons</guilabel
-> checkbox, discussed below.</para>
+<para>This is the default setting for &kde;. Clicking once on an icon will open it. To select you can drag around the icon(s) or <keycombo action="simul">&Ctrl;<mousebutton>Right</mousebutton></keycombo> click, or simply click and hold to drag it. You can also enable automatic selection of icons using the <guilabel>Automatically select icons</guilabel> checkbox, discussed below.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Change pointer shape over icons</guilabel
-></term>
+<term><guilabel>Change pointer shape over icons</guilabel></term>
 <listitem>
-<para
->When this option is checked, the shape of the mouse pointer changes whenever it is over an icon.</para>
+<para>When this option is checked, the shape of the mouse pointer changes whenever it is over an icon.</para>
 
-<tip
-><para
->This option should be checked in most situations. It gives more visual feedback and says, in essence, if you click here, something will happen.</para
-></tip>
+<tip><para>This option should be checked in most situations. It gives more visual feedback and says, in essence, if you click here, something will happen.</para></tip>
 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Automatically select icons</guilabel
-></term>
+<term><guilabel>Automatically select icons</guilabel></term>
 <listitem>
-<para
->As noted above, if you have <guilabel
->Single-click to open files and folders</guilabel
-> selected, you can select icons by dragging around them, or by using <keycombo action="simul"
->&Ctrl;<mousebutton
->Right</mousebutton
-></keycombo
-> click. If you routinely need to select icons, you may want to enable this checkbox, which will allow icons to be selected automatically by pausing over the icon. The <guilabel
->Delay:</guilabel
-> slider determines how long is required before the automatic selection takes effect. </para>
+<para>As noted above, if you have <guilabel>Single-click to open files and folders</guilabel> selected, you can select icons by dragging around them, or by using <keycombo action="simul">&Ctrl;<mousebutton>Right</mousebutton></keycombo> click. If you routinely need to select icons, you may want to enable this checkbox, which will allow icons to be selected automatically by pausing over the icon. The <guilabel>Delay:</guilabel> slider determines how long is required before the automatic selection takes effect. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Visual feedback on activation</guilabel
-></term>
+<term><guilabel>Visual feedback on activation</guilabel></term>
 <listitem>
-<para
->When this option is checked, &kde; gives you visual feedback whenever you click on something and activate it.</para
-></listitem>
+<para>When this option is checked, &kde; gives you visual feedback whenever you click on something and activate it.</para></listitem>
 </varlistentry>
 
 </variablelist>
 </sect2>
 
 <sect2 id="cursor-theme">
-<title
-><guilabel
->Cursor Theme</guilabel
-></title>
+<title><guilabel>Cursor Theme</guilabel></title>
 
-<para
->This tab allows you to select from a number of cursor themes. A preview of the cursor display is shown above the listbox. </para>
+<para>This tab allows you to select from a number of cursor themes. A preview of the cursor display is shown above the listbox. </para>
 
-<note
-><para
->The features provided by this tab may not be available on some systems. Your system may need to be updated to support cursor themes. </para
-></note>
+<note><para>The features provided by this tab may not be available on some systems. Your system may need to be updated to support cursor themes. </para></note>
 
-<para
->If you have additional cursor themes available to you, you can install and remove them using the buttons below the listbox. Note that you cannot remove the default themes. </para>
+<para>If you have additional cursor themes available to you, you can install and remove them using the buttons below the listbox. Note that you cannot remove the default themes. </para>
 
 </sect2>
 
 <sect2 id="mouse-advanced">
-<title
->Advanced</title>
+<title>Advanced</title>
 
 <variablelist>
 <varlistentry>
 <term id="peripherals-mouse-acceleration">
-<guilabel
->Pointer acceleration</guilabel
-></term>
+<guilabel>Pointer acceleration</guilabel></term>
 <listitem>
-<para
->This option allows you to change the relationship between the distance that the mouse pointer moves on the screen and the relative movement of the physical device itself (which may be a mouse, track-ball, or some other pointing device.)</para>
-
-<para
->A high value for the acceleration multiplier will lead to large movements of the mouse pointer on the screen, even when you only make a small movement with the physical device.</para>
-
-<tip
-><para
->A multiplier between <guilabel
->1x</guilabel
-> and <guilabel
->3x</guilabel
-> will works well for many systems. With a multiplier over <guilabel
->3x</guilabel
-> the mouse pointer may become difficult to control.</para
-></tip>
+<para>This option allows you to change the relationship between the distance that the mouse pointer moves on the screen and the relative movement of the physical device itself (which may be a mouse, track-ball, or some other pointing device.)</para>
+
+<para>A high value for the acceleration multiplier will lead to large movements of the mouse pointer on the screen, even when you only make a small movement with the physical device.</para>
+
+<tip><para>A multiplier between <guilabel>1x</guilabel> and <guilabel>3x</guilabel> will works well for many systems. With a multiplier over <guilabel>3x</guilabel> the mouse pointer may become difficult to control.</para></tip>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Pointer threshold</guilabel
-></term>
+<term><guilabel>Pointer threshold</guilabel></term>
 <listitem>
-<para
->The threshold is the smallest distance that the mouse pointer must move on the screen before acceleration has any effect. If the movement is within the threshold, the mouse pointer moves as if the acceleration were set to <guilabel
->1x</guilabel
->.</para>
-
-<para
->Thus, when you make small movements with the physical device (&eg; mouse), you still have fine control of the mouse pointer on the screen, whereas larger movements of the physical device will move the mouse pointer rapidly to different areas on the screen.</para>
-
-<para
->You can set the threshold value by dragging the slider button or by clicking the up/down arrows on the spin-button to the left of the slider.</para>
-
-<tip
-><para
->In general, the higher you set the <guilabel
->Pointer acceleration</guilabel
-> value, the higher you'll want to set the <guilabel
->Pointer threshold</guilabel
-> value. For example, A <guilabel
->Pointer threshold</guilabel
-> of 4 pixels may be appropriate for a <guilabel
->Pointer Acceleration</guilabel
-> of 2x, but 10 pixels might be better for 3x.</para
-></tip>
+<para>The threshold is the smallest distance that the mouse pointer must move on the screen before acceleration has any effect. If the movement is within the threshold, the mouse pointer moves as if the acceleration were set to <guilabel>1x</guilabel>.</para>
+
+<para>Thus, when you make small movements with the physical device (&eg; mouse), you still have fine control of the mouse pointer on the screen, whereas larger movements of the physical device will move the mouse pointer rapidly to different areas on the screen.</para>
+
+<para>You can set the threshold value by dragging the slider button or by clicking the up/down arrows on the spin-button to the left of the slider.</para>
+
+<tip><para>In general, the higher you set the <guilabel>Pointer acceleration</guilabel> value, the higher you'll want to set the <guilabel>Pointer threshold</guilabel> value. For example, A <guilabel>Pointer threshold</guilabel> of 4 pixels may be appropriate for a <guilabel>Pointer Acceleration</guilabel> of 2x, but 10 pixels might be better for 3x.</para></tip>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Double click interval</guilabel
-></term>
+<term><guilabel>Double click interval</guilabel></term>
 <listitem>
-<para
->This is the maximum amount of time between clicks for &kde; to register a double click. If you click twice, and the time between those two clicks is less than this number, &kde; recognises that as a double click. If the time between these two clicks is greater than this number, &kde; recognises those as two <emphasis
->separate</emphasis
-> single clicks.</para>
+<para>This is the maximum amount of time between clicks for &kde; to register a double click. If you click twice, and the time between those two clicks is less than this number, &kde; recognises that as a double click. If the time between these two clicks is greater than this number, &kde; recognises those as two <emphasis>separate</emphasis> single clicks.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Drag start time</guilabel
-> and <guilabel
->Drag start distance</guilabel
-></term>
+<term><guilabel>Drag start time</guilabel> and <guilabel>Drag start distance</guilabel></term>
 
 <listitem>
-<para
->If you <itemizedlist
-> <listitem
-><para
->click with the mouse</para
-></listitem
-> <listitem
-><para
->drag within the time specified in <guilabel
->Drag start time</guilabel
->, and </para
-></listitem
-> <listitem
-><para
->move a distance equal to or greater than the number (of pixels) specified in <guilabel
->Drag start distance</guilabel
-></para
-> </listitem
-> </itemizedlist
-> &kde; will drag the selected item.</para>
+<para>If you <itemizedlist> <listitem><para>click with the mouse</para></listitem> <listitem><para>drag within the time specified in <guilabel>Drag start time</guilabel>, and </para></listitem> <listitem><para>move a distance equal to or greater than the number (of pixels) specified in <guilabel>Drag start distance</guilabel></para> </listitem> </itemizedlist> &kde; will drag the selected item.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Mouse wheel scrolls by</guilabel
-></term>
+<term><guilabel>Mouse wheel scrolls by</guilabel></term>
 <listitem>
-<para
->If you have a wheel mouse, use the slider to determine how many lines of text one <quote
->step</quote
-> of the mouse wheel will scroll.</para>
+<para>If you have a wheel mouse, use the slider to determine how many lines of text one <quote>step</quote> of the mouse wheel will scroll.</para>
 </listitem>
 </varlistentry>
 
@@ -334,97 +158,52 @@
 </sect2>
 
 <sect2 id="mouse-navigation">
-<title
-><guilabel
->Mouse Navigation</guilabel
-></title>
+<title><guilabel>Mouse Navigation</guilabel></title>
 
-<para
->This tab allows you to configure the keyboard number pad keys as a mouse-type device. This may be useful when you are working on a device without another pointing device, or where you have no other use for the number pad. </para>
+<para>This tab allows you to configure the keyboard number pad keys as a mouse-type device. This may be useful when you are working on a device without another pointing device, or where you have no other use for the number pad. </para>
 
 <variablelist>
 
 <varlistentry>
-<term
-><guilabel
->Move pointer with keyboard (using the num pad)</guilabel
-></term>
+<term><guilabel>Move pointer with keyboard (using the num pad)</guilabel></term>
 <listitem>
-<para
->To enable keyboard mouse mode, you need to select the checkbox labelled <guilabel
->Move pointer with keyboard (using the num pad)</guilabel
->. When you do this, the other settings will become enabled, and you can customise the keyboard pointer behaviour further, if required. </para>
-<para
->The various keys on the number pad move in the direction you would expect. Note that you can move diagonally as well as up, down, left and right. The <keycap
->5</keycap
-> key emulates a click to a pointer button, typically &LMB;. You change which button is emulated by using the <keycap
->/</keycap
-> key (which makes it &LMB;), <keycap
->*</keycap
-> key (which makes it &MMB;) and <keycap
->-</keycap
-> (which makes it &RMB;). Using the <keycap
->+</keycap
-> emulates a doubleclick to the selected pointer button. You can use the <keycap
->0</keycap
-> key to emulate holding down the selected pointer button (for easy dragging), and then use the <keycap
->.</keycap
-> to emulate releasing the selected pointer button. </para>
+<para>To enable keyboard mouse mode, you need to select the checkbox labelled <guilabel>Move pointer with keyboard (using the num pad)</guilabel>. When you do this, the other settings will become enabled, and you can customise the keyboard pointer behaviour further, if required. </para>
+<para>The various keys on the number pad move in the direction you would expect. Note that you can move diagonally as well as up, down, left and right. The <keycap>5</keycap> key emulates a click to a pointer button, typically &LMB;. You change which button is emulated by using the <keycap>/</keycap> key (which makes it &LMB;), <keycap>*</keycap> key (which makes it &MMB;) and <keycap>-</keycap> (which makes it &RMB;). Using the <keycap>+</keycap> emulates a doubleclick to the selected pointer button. You can use the <keycap>0</keycap> key to emulate holding down the selected pointer button (for easy dragging), and then use the <keycap>.</keycap> to emulate releasing the selected pointer button. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Acceleration delay</guilabel
-></term>
+<term><guilabel>Acceleration delay</guilabel></term>
 <listitem>
-<para
->This is the time (in milliseconds) between the initial key press and the first repeated motion event for mouse key acceleration. </para>
+<para>This is the time (in milliseconds) between the initial key press and the first repeated motion event for mouse key acceleration. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Repeat interval</guilabel
-></term>
+<term><guilabel>Repeat interval</guilabel></term>
 <listitem>
-<para
->This is the time in milliseconds between repeated motion events for mouse key acceleration. </para>
+<para>This is the time in milliseconds between repeated motion events for mouse key acceleration. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Acceleration time</guilabel
-></term>
+<term><guilabel>Acceleration time</guilabel></term>
 <listitem>
-<para
->This is the number of key events before the pointer reaches a maximum speed for mouse key acceleration. </para>
+<para>This is the number of key events before the pointer reaches a maximum speed for mouse key acceleration. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Maximum speed</guilabel
-></term>
+<term><guilabel>Maximum speed</guilabel></term>
 <listitem>
-<para
->This is the maximum speed in pixels per key event the pointer can reach for mouse key acceleration. </para>
+<para>This is the maximum speed in pixels per key event the pointer can reach for mouse key acceleration. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Acceleration profile</guilabel
-></term>
+<term><guilabel>Acceleration profile</guilabel></term>
 <listitem>
-<para
->This is the slope of the acceleration curve for mouse key acceleration. </para>
+<para>This is the slope of the acceleration curve for mouse key acceleration. </para>
 </listitem>
 </varlistentry>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/netpref/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/netpref/index.docbook
index bb7c2e8fc55..c9517512ca5 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/netpref/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/netpref/index.docbook
@@ -2,132 +2,76 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Lauri.Watts; &Lauri.Watts.mail;</author>
-
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Lauri.Watts; &Lauri.Watts.mail;</author>
+
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-10-16</date>
-<releaseinfo
->3.1</releaseinfo>
+<date>2002-10-16</date>
+<releaseinfo>3.1</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->tdebase</keyword>
-<keyword
->kcontrol</keyword>
-<keyword
->network</keyword>
-<keyword
->timeouts</keyword>
+<keyword>KDE</keyword>
+<keyword>tdebase</keyword>
+<keyword>kcontrol</keyword>
+<keyword>network</keyword>
+<keyword>timeouts</keyword>
 </keywordset>
 
 </articleinfo>
 
 <sect1 id="timeouts">
 
-<title
->Preferences</title>
+<title>Preferences</title>
 
-<para
->Here you can set timeout values. You might want to tweak them if your connection is very slow, but the default settings are appropriate for most users.</para>
+<para>Here you can set timeout values. You might want to tweak them if your connection is very slow, but the default settings are appropriate for most users.</para>
 
-<para
->Here <guilabel
->Timeout Values</guilabel
-> are the length of time an application should wait for an answer from a network operation.</para>
+<para>Here <guilabel>Timeout Values</guilabel> are the length of time an application should wait for an answer from a network operation.</para>
 
-<para
->You can configure the following timeouts:</para>
+<para>You can configure the following timeouts:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Socket Read</guilabel
-></term>
+<term><guilabel>Socket Read</guilabel></term>
 <listitem>
-<para
->Some applications use <firstterm
->sockets</firstterm
-> to communicate. You can think of a socket as a water tap; while it is open, water (or in our case, data) comes out, without any interaction. If something stops this flow of data, the application will wait for more to come. This could be a very long time, but you can configure a maximum time for an application to wait with this option.</para>
-<para
->This setting will only apply to &kde; applications, of course.</para>
+<para>Some applications use <firstterm>sockets</firstterm> to communicate. You can think of a socket as a water tap; while it is open, water (or in our case, data) comes out, without any interaction. If something stops this flow of data, the application will wait for more to come. This could be a very long time, but you can configure a maximum time for an application to wait with this option.</para>
+<para>This setting will only apply to &kde; applications, of course.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Proxy Connect</guilabel
-></term>
+<term><guilabel>Proxy Connect</guilabel></term>
 <listitem>
-<para
->Sets how long to wait for a connection to a proxy server, if one is configured. </para>
+<para>Sets how long to wait for a connection to a proxy server, if one is configured. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Server Connect</guilabel
-></term>
+<term><guilabel>Server Connect</guilabel></term>
 <listitem>
-<para
->Sets how long to wait for a connection to a remote server. </para>
+<para>Sets how long to wait for a connection to a remote server. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Server Response</guilabel
-></term>
+<term><guilabel>Server Response</guilabel></term>
 <listitem>
-<para
->Sets how long to wait for a reply from a remote server. </para>
+<para>Sets how long to wait for a reply from a remote server. </para>
 </listitem>
 </varlistentry>
 
 </variablelist>
 
-<para
->You can configure <guilabel
->FTP Options</guilabel
-> here. At present there is just one option, <guilabel
->Enable Passive Mode (PASV)</guilabel
->.</para>
-
-<para
->Passive &FTP; is often required when you are behind a firewall. Many firewalls only permit connections that were initiated from <quote
->the inside</quote
->. Passive &FTP; is controlled by the client, which makes it usable through firewalls.</para>
+<para>You can configure <guilabel>FTP Options</guilabel> here. At present there is just one option, <guilabel>Enable Passive Mode (PASV)</guilabel>.</para>
+
+<para>Passive &FTP; is often required when you are behind a firewall. Many firewalls only permit connections that were initiated from <quote>the inside</quote>. Passive &FTP; is controlled by the client, which makes it usable through firewalls.</para>
 
 </sect1>
 </article>
\ No newline at end of file
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/panel/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/panel/index.docbook
index 9b28919dd8a..193d74f4465 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/panel/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/panel/index.docbook
@@ -2,316 +2,132 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Mike.McBride; &Mike.McBride.mail;</author>
-<author
->&Lauri.Watts; &Lauri.Watts.mail;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Mike.McBride; &Mike.McBride.mail;</author>
+<author>&Lauri.Watts; &Lauri.Watts.mail;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2003-10-08</date>
-<releaseinfo
->3.2</releaseinfo>
+<date>2003-10-08</date>
+<releaseinfo>3.2</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->panel</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>panel</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="panel">
-<title
->Panel</title>
+<title>Panel</title>
 
-<para
->The &kde; panel (often referred to as &kicker;) is the bar that you'll usually find at the bottom of the screen when you start up &kde; for the first time. The panel gives you quick access to applications and makes it easier for you to organise your desktop. Using the &kde; panel you can: </para>
+<para>The &kde; panel (often referred to as &kicker;) is the bar that you'll usually find at the bottom of the screen when you start up &kde; for the first time. The panel gives you quick access to applications and makes it easier for you to organise your desktop. Using the &kde; panel you can: </para>
 
 <itemizedlist>
-<listitem
-><para
->launch applications using the <guimenu
->K</guimenu
-> menu or the application buttons</para
-></listitem>
-<listitem
-><para
->switch desktops using the panel's pager applet</para>
+<listitem><para>launch applications using the <guimenu>K</guimenu> menu or the application buttons</para></listitem>
+<listitem><para>switch desktops using the panel's pager applet</para>
 </listitem>
-<listitem
-><para
->switch active windows, and minimise or maximise them</para>
+<listitem><para>switch active windows, and minimise or maximise them</para>
 </listitem>
-<listitem
-><para
->browse folder using the browser menu functionality </para
-></listitem>
-<listitem
-><para
->access panel applets that extend the panel's functionality, offering for example mixers, clocks or a system monitor</para
-> </listitem>
+<listitem><para>browse folder using the browser menu functionality </para></listitem>
+<listitem><para>access panel applets that extend the panel's functionality, offering for example mixers, clocks or a system monitor</para> </listitem>
 </itemizedlist>
 
 <sect2 id="panel-position">
-<title
->Arrangement</title>
-
-<para
->In the <guilabel
->Arrangement</guilabel
-> tab you can configure the size and position of the panel.</para>
-
-<para
->In the section labelled <guilabel
->Position</guilabel
-> is a set of 12 small buttons arranged in a square. Each button corresponds to a location for the panel. Click on a button and notice where the panel is located on the preview monitor to the right.</para>
-
-<tip
-><para
->Generally, the available space in kicker is used more efficiently if the panel is aligned horizontally, &ie; attached to the top or bottom screen border.</para
-></tip>
-
-<para
->In the section labelled <guilabel
->Length</guilabel
->, you can use the combo box and slider to adjust the <emphasis
->minimum</emphasis
-> length of the panel. If you place a mark in the checkbox labeled <guilabel
->Expand as required to fit contents</guilabel
->, the panel will become longer if more space is needed. When less space is required on the panel, the panel will shrink down to the minimum size. If there is no mark in the checkbox, then the panel is fixed to the length specified in this section.</para>
-
-<para
->The final section of this table is labeled <guilabel
->Size</guilabel
->, and refers to the <emphasis
->height</emphasis
-> of the panel. The panel's size can be <guilabel
->Tiny</guilabel
->, <guilabel
->Small</guilabel
->, <guilabel
->Medium</guilabel
->, <guilabel
->Large</guilabel
-> or <guilabel
->Custom</guilabel
->. If you choose <guilabel
->Custom</guilabel
-> mode, you can resize &kicker; by specifying a height in the combobox.</para>
-
-<para
->If you have multiple monitors, you can configure the panel for each screen entirely independently. If you are not sure which screen is which, Press the <guibutton
->Identify</guibutton
-> and a number will appear centred on each screen.</para>
-
-<para
->Then simply choose the screen you wish to configure from the drop down box labelled <guilabel
->Xinerama screen</guilabel
->, or choose <guilabel
->All Screens</guilabel
-> to have identical configurations on each.</para>
+<title>Arrangement</title>
+
+<para>In the <guilabel>Arrangement</guilabel> tab you can configure the size and position of the panel.</para>
+
+<para>In the section labelled <guilabel>Position</guilabel> is a set of 12 small buttons arranged in a square. Each button corresponds to a location for the panel. Click on a button and notice where the panel is located on the preview monitor to the right.</para>
+
+<tip><para>Generally, the available space in kicker is used more efficiently if the panel is aligned horizontally, &ie; attached to the top or bottom screen border.</para></tip>
+
+<para>In the section labelled <guilabel>Length</guilabel>, you can use the combo box and slider to adjust the <emphasis>minimum</emphasis> length of the panel. If you place a mark in the checkbox labeled <guilabel>Expand as required to fit contents</guilabel>, the panel will become longer if more space is needed. When less space is required on the panel, the panel will shrink down to the minimum size. If there is no mark in the checkbox, then the panel is fixed to the length specified in this section.</para>
+
+<para>The final section of this table is labeled <guilabel>Size</guilabel>, and refers to the <emphasis>height</emphasis> of the panel. The panel's size can be <guilabel>Tiny</guilabel>, <guilabel>Small</guilabel>, <guilabel>Medium</guilabel>, <guilabel>Large</guilabel> or <guilabel>Custom</guilabel>. If you choose <guilabel>Custom</guilabel> mode, you can resize &kicker; by specifying a height in the combobox.</para>
+
+<para>If you have multiple monitors, you can configure the panel for each screen entirely independently. If you are not sure which screen is which, Press the <guibutton>Identify</guibutton> and a number will appear centred on each screen.</para>
+
+<para>Then simply choose the screen you wish to configure from the drop down box labelled <guilabel>Xinerama screen</guilabel>, or choose <guilabel>All Screens</guilabel> to have identical configurations on each.</para>
 
 </sect2>
 
 <sect2 id="panel-hiding">
-<title
->Hiding</title>
-
-<para
->Depending on your screen resolution you may find that the panel takes away too much of your precious screen real estate. To save screen space, the panel offers manual hiding of the panel, an auto hide feature, and the ability to allow other windows to lay on top of the panel. These features are selected in the section entitled <guilabel
->Hide Mode</guilabel
->.</para>
-
-<para
->The <guilabel
->Hide Mode</guilabel
-> section has three options:</para>
+<title>Hiding</title>
+
+<para>Depending on your screen resolution you may find that the panel takes away too much of your precious screen real estate. To save screen space, the panel offers manual hiding of the panel, an auto hide feature, and the ability to allow other windows to lay on top of the panel. These features are selected in the section entitled <guilabel>Hide Mode</guilabel>.</para>
+
+<para>The <guilabel>Hide Mode</guilabel> section has three options:</para>
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Only hide when panel-hiding button is clicked</guilabel
-></term>
-<listitem
-><para
->When this option is selected, the panel will remain visible at the location you defined unless you click on the button at the far right (for horizontally oriented) or bottom (for vertically oriented) button. This button has an arrow on it pointed to the edge of the screen.</para>
-
-<para
->Once clicked, the panel will disappear. If the button is clicked again, the panel will re-appear at the same location.</para>
+<term><guilabel>Only hide when panel-hiding button is clicked</guilabel></term>
+<listitem><para>When this option is selected, the panel will remain visible at the location you defined unless you click on the button at the far right (for horizontally oriented) or bottom (for vertically oriented) button. This button has an arrow on it pointed to the edge of the screen.</para>
+
+<para>Once clicked, the panel will disappear. If the button is clicked again, the panel will re-appear at the same location.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Hide automatically</guilabel
-></term>
-<listitem
-><para
->If this option is selected, then the panel will automatically disappear after the number of seconds specified in the combo box below the option. To make the panel reappear, simply move the mouse pointer to the edge of the screen where the panel is located, and the panel will reappear immediately.</para>
-
-<para
->If you place a mark in the checkbox labelled <guilabel
->Show panel when switching desktops</guilabel
->, the panel will automatically reappear when you switch desktops. (The panel will disappear again after the specified number of seconds.)</para>
+<term><guilabel>Hide automatically</guilabel></term>
+<listitem><para>If this option is selected, then the panel will automatically disappear after the number of seconds specified in the combo box below the option. To make the panel reappear, simply move the mouse pointer to the edge of the screen where the panel is located, and the panel will reappear immediately.</para>
+
+<para>If you place a mark in the checkbox labelled <guilabel>Show panel when switching desktops</guilabel>, the panel will automatically reappear when you switch desktops. (The panel will disappear again after the specified number of seconds.)</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Allow other windows to cover the panel</guilabel
-></term>
-<listitem
-><para
->As this option's label implies, the panel is always on the desktop when this option is selected. It is now possible, however, for application windows to lay on top of the panel.</para
->  
-
-<para
->To restore the panel, simply move the mouse cursor to the screen location specified in the drop box labeled <guilabel
->Raise when the pointer touches the screen's:</guilabel
->. You can change this value by selecting one of the choices provided in the drop down box.</para>
-
-<para
->Once the panel has moved back on top of the application window, it will stay there until the application window becomes active again.</para>
+<term><guilabel>Allow other windows to cover the panel</guilabel></term>
+<listitem><para>As this option's label implies, the panel is always on the desktop when this option is selected. It is now possible, however, for application windows to lay on top of the panel.</para>  
+
+<para>To restore the panel, simply move the mouse cursor to the screen location specified in the drop box labeled <guilabel>Raise when the pointer touches the screen's:</guilabel>. You can change this value by selecting one of the choices provided in the drop down box.</para>
+
+<para>Once the panel has moved back on top of the application window, it will stay there until the application window becomes active again.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->The next section down is labelled <guilabel
->Panel-Hiding Buttons</guilabel
->. It consists of two check boxes: <guilabel
->Show left panel-hiding button</guilabel
-> and <guilabel
->Show left panel-hiding button</guilabel
->. Use these checkboxes to show and hide the left and right manual panel hiding buttons.</para>
-
-<para
->If there is no mark in the checkbox labeled <guilabel
->Animate panel hiding</guilabel
->, then whenever the toolbar is hidden, is simply disappears. If there is a mark in the check box, then the panel appears to slide off the edge of the screen.</para>
-
-<para
->You can determine how quickly the panel appears to move by adjusting the slider from <guilabel
->Fast</guilabel
-> to <guilabel
->Slow</guilabel
->.</para>
+<para>The next section down is labelled <guilabel>Panel-Hiding Buttons</guilabel>. It consists of two check boxes: <guilabel>Show left panel-hiding button</guilabel> and <guilabel>Show left panel-hiding button</guilabel>. Use these checkboxes to show and hide the left and right manual panel hiding buttons.</para>
+
+<para>If there is no mark in the checkbox labeled <guilabel>Animate panel hiding</guilabel>, then whenever the toolbar is hidden, is simply disappears. If there is a mark in the check box, then the panel appears to slide off the edge of the screen.</para>
+
+<para>You can determine how quickly the panel appears to move by adjusting the slider from <guilabel>Fast</guilabel> to <guilabel>Slow</guilabel>.</para>
 </sect2>
 
 <sect2 id="panel-menus">
-<title
->Menus</title>
+<title>Menus</title>
 
-<para
->In the <guilabel
->Menus</guilabel
-> tab you can configure the panel menu's behaviour. This affects the TDE menu you will often use to launch applications, the browser menus you can use to access folders and other menus like the recent documents menu.</para>
+<para>In the <guilabel>Menus</guilabel> tab you can configure the panel menu's behaviour. This affects the TDE menu you will often use to launch applications, the browser menus you can use to access folders and other menus like the recent documents menu.</para>
 
-<para
->The <guilabel
->TDE Menu</guilabel
-> frame offers you some options to configure the <guimenu
->K</guimenu
-> menu's functionality. This frame consists of 4 items:</para>
+<para>The <guilabel>TDE Menu</guilabel> frame offers you some options to configure the <guimenu>K</guimenu> menu's functionality. This frame consists of 4 items:</para>
 
 <itemizedlist>
-<listitem
-><para
->The <guilabel
->Menu item format:</guilabel
-> radio buttons have three options. This determines how the application name (&ie; &konqueror;, &kword;, &etc;) and the description (&ie; Web Browser, Word Processor, &etc;) are displayed on the TDE menu. </para
-></listitem>
-
-<listitem
-><para
->The <guilabel
->Optional Sub Menus</guilabel
-> checkboxes allow you to determine which special menu items appear in the TDE Menu.</para>
-<para
->The <guilabel
->Bookmarks</guilabel
-> menu allows you to quickly select from the same bookmarks that are available in &konqueror;. </para>
-<para
->The <guilabel
->Find</guilabel
-> menu offers access to the &kfind; application to search for local files, and a quick link to a search engine to search for things on the Internet.</para>
-
-<para
->The <guilabel
->Preferences</guilabel
-> menu allows you to launch each &kcontrol; module directly from the TDE menu.</para>
-<para
->The <guilabel
->Print System</guilabel
-> menu provides several menu entries to help manage the printer(s) attached to your system.</para>
-<para
->The <guilabel
->Quick Browser</guilabel
-> menu gives you quick links to locations on your hard drive.</para>
-<para
->The <guilabel
->Recent Documents</guilabel
-> menu lists the most recently edited documents and will automatically launch the application to edit or view this document. </para>
-<para
->The <guilabel
->Terminal Sessions</guilabel
-> menu provides menu items to launch several different types of terminal programs (command line interfaces).</para>
+<listitem><para>The <guilabel>Menu item format:</guilabel> radio buttons have three options. This determines how the application name (&ie; &konqueror;, &kword;, &etc;) and the description (&ie; Web Browser, Word Processor, &etc;) are displayed on the TDE menu. </para></listitem>
+
+<listitem><para>The <guilabel>Optional Sub Menus</guilabel> checkboxes allow you to determine which special menu items appear in the TDE Menu.</para>
+<para>The <guilabel>Bookmarks</guilabel> menu allows you to quickly select from the same bookmarks that are available in &konqueror;. </para>
+<para>The <guilabel>Find</guilabel> menu offers access to the &kfind; application to search for local files, and a quick link to a search engine to search for things on the Internet.</para>
+
+<para>The <guilabel>Preferences</guilabel> menu allows you to launch each &kcontrol; module directly from the TDE menu.</para>
+<para>The <guilabel>Print System</guilabel> menu provides several menu entries to help manage the printer(s) attached to your system.</para>
+<para>The <guilabel>Quick Browser</guilabel> menu gives you quick links to locations on your hard drive.</para>
+<para>The <guilabel>Recent Documents</guilabel> menu lists the most recently edited documents and will automatically launch the application to edit or view this document. </para>
+<para>The <guilabel>Terminal Sessions</guilabel> menu provides menu items to launch several different types of terminal programs (command line interfaces).</para>
 </listitem>
 
-<listitem
-><para
-><guilabel
->Show side image</guilabel
-> will add a small image to the side of the menu. This is purely decorative.</para
-></listitem>
-
-<listitem
-><para
->The <guibutton
->Edit TDE Menu</guibutton
-> button launches the &kde; menu editor.</para
-></listitem>
+<listitem><para><guilabel>Show side image</guilabel> will add a small image to the side of the menu. This is purely decorative.</para></listitem>
+
+<listitem><para>The <guibutton>Edit TDE Menu</guibutton> button launches the &kde; menu editor.</para></listitem>
 </itemizedlist>
 
-<para
->In the <guilabel
->QuickBrowser Menus</guilabel
-> area you can configure whether the panel's browser menus will show hidden files or not (hidden files on unix systems are those whose filenames begin with a dot) as well as how many files at most will be shown in a browser menu. The latter option may be especially useful if you have a rather small screen resolution, as then the browser menus will quickly fill up your screen when you browse folders containing many files.</para>
-
-<para
->The quick start section in the TDE menu offers quick access to programs you have used often or recently. In the <guilabel
->Quick Start Menu Items</guilabel
-> frame you can choose whether this section will show the most recently or the most frequently used programs. Using the option <guilabel
->Maximum number of entries</guilabel
-> combo box, you can configure how many programs the quick start section will remember.</para>
+<para>In the <guilabel>QuickBrowser Menus</guilabel> area you can configure whether the panel's browser menus will show hidden files or not (hidden files on unix systems are those whose filenames begin with a dot) as well as how many files at most will be shown in a browser menu. The latter option may be especially useful if you have a rather small screen resolution, as then the browser menus will quickly fill up your screen when you browse folders containing many files.</para>
+
+<para>The quick start section in the TDE menu offers quick access to programs you have used often or recently. In the <guilabel>Quick Start Menu Items</guilabel> frame you can choose whether this section will show the most recently or the most frequently used programs. Using the option <guilabel>Maximum number of entries</guilabel> combo box, you can configure how many programs the quick start section will remember.</para>
 
 </sect2>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/panelappearance/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/panelappearance/index.docbook
index 562d2f264a9..4efbd76d42f 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/panelappearance/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/panelappearance/index.docbook
@@ -2,170 +2,75 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
-><firstname
->Mike</firstname
-> <surname
->McBride</surname
-> </author>
-<author
-><firstname
->Jost</firstname
-> <surname
->Schenck</surname
-> </author>
-<othercredit role="translator"
-><firstname
->Jonathan</firstname
-><surname
->Riddell</surname
-><affiliation
-><address
-><email
->kde-en-gb@jriddell.org</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author><firstname>Mike</firstname> <surname>McBride</surname> </author>
+<author><firstname>Jost</firstname> <surname>Schenck</surname> </author>
+<othercredit role="translator"><firstname>Jonathan</firstname><surname>Riddell</surname><affiliation><address><email>kde-en-gb@jriddell.org</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2003-10-06</date>
-<releaseinfo
->3.2</releaseinfo>
+<date>2003-10-06</date>
+<releaseinfo>3.2</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->panel</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>panel</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="panel">
-<title
->Panel</title>
+<title>Panel</title>
 
-<para
->Here you can configure the panel's overall appearance.</para>
+<para>Here you can configure the panel's overall appearance.</para>
 
-<para
->You can also have the icons themselves zoom out when the mouse is over them, with the <guilabel
->Enable icon zooming</guilabel
-> option. You can choose to have tooltips appear when your mouse button is over an icon, by enabling the <guilabel
->Show tooltips</guilabel
-> option.</para>
+<para>You can also have the icons themselves zoom out when the mouse is over them, with the <guilabel>Enable icon zooming</guilabel> option. You can choose to have tooltips appear when your mouse button is over an icon, by enabling the <guilabel>Show tooltips</guilabel> option.</para>
 
 <sect2 id="button-backgrounds">
-<title
->Button Backgrounds</title>
-
-<para
->The &kde; panel supports so-called <guilabel
->Button Backgrounds</guilabel
->. This means that the buttons shown on the panel will be drawn using configurable images. To enable button backgrounds, simply choose the button type from the list, and change the drop down box to the colour image you would like to use. Choose <guilabel
->Default</guilabel
-> to return to an unstyled button. If you choose <guilabel
->Custom colour</guilabel
->, the colour button next to the drop down list will be enabled. Click on it to select a custom colour to use.</para>
+<title>Button Backgrounds</title>
+
+<para>The &kde; panel supports so-called <guilabel>Button Backgrounds</guilabel>. This means that the buttons shown on the panel will be drawn using configurable images. To enable button backgrounds, simply choose the button type from the list, and change the drop down box to the colour image you would like to use. Choose <guilabel>Default</guilabel> to return to an unstyled button. If you choose <guilabel>Custom colour</guilabel>, the colour button next to the drop down list will be enabled. Click on it to select a custom colour to use.</para>
 
 </sect2>
 
 <sect2 id="panel-background">
-<title
-><guilabel
->Panel Background</guilabel
-></title>
-
-<para
-><guilabel
->Enable transparency</guilabel
-> to turn the entire panel transparent. The desktop background will show through instead of a solid colour panel.</para>
-
-<para
->There will still be small handles beside each applet, to allow you to locate, move, and configure them. These can be turned off in the <guilabel
->Advanced Options...</guilabel
-></para>
-
-<para
->If you check <guilabel
->Enable background image</guilabel
-> a picture that will be used to draw the panel's background, just as you can use a picture for the desktop background. You can specify an image file in the line edit box below or choose one by clicking on the <guibutton
->Browse</guibutton
-> button. You'll see a preview of the selected picture on the right.</para>
-
-<para
->The image can be tinted on-the-fly by enabling the option <guilabel
->Colour to match the desktop colour scheme</guilabel
->. You might use a greyscale texture that is tinted in this manner, to create a particular effect.</para>
+<title><guilabel>Panel Background</guilabel></title>
+
+<para><guilabel>Enable transparency</guilabel> to turn the entire panel transparent. The desktop background will show through instead of a solid colour panel.</para>
+
+<para>There will still be small handles beside each applet, to allow you to locate, move, and configure them. These can be turned off in the <guilabel>Advanced Options...</guilabel></para>
+
+<para>If you check <guilabel>Enable background image</guilabel> a picture that will be used to draw the panel's background, just as you can use a picture for the desktop background. You can specify an image file in the line edit box below or choose one by clicking on the <guibutton>Browse</guibutton> button. You'll see a preview of the selected picture on the right.</para>
+
+<para>The image can be tinted on-the-fly by enabling the option <guilabel>Colour to match the desktop colour scheme</guilabel>. You might use a greyscale texture that is tinted in this manner, to create a particular effect.</para>
 </sect2>
 
 <sect2 id="advanced-options">
-<title
-><guilabel
->Advanced Options...</guilabel
-></title>
-
-<para
->The <guilabel
->Hide button size:</guilabel
-> option allows you to choose a width in pixels for the hide buttons, if they are visible.</para>
-
-<para
->The panel itself has several default sizes set, which you can switch between by simply dragging the edge of it, or by &RMB; clicking on an empty space in the panel, choosing <guisubmenu
->Size</guisubmenu
-> and selecting the desired size from the submenu. If you enable <guilabel
->Allow Drag and Drop resizing of panels</guilabel
-> then by choosing <guimenuitem
->Custom</guimenuitem
-> in the panel menu, you can drag the panel edge to any size you like.</para>
-
-<para
->Applet handles are normally visible beside each applet on the panel, so that it is clear where to click to configure them, or to get to the panel menu. You can instead have them <guilabel
->Fade out</guilabel
->, or hide unless you hover the mouse over them, or you can choose to <guilabel
->Hide</guilabel
-> them completely.</para>
-
-<para
->Finally, if the panel is transparent, you can tint it with a colour of your choice. The slider allows you to choose how opaque the tint is. At the lowest end, there is no tint visible, while at the highest, the panel is not transparent at all.</para>
+<title><guilabel>Advanced Options...</guilabel></title>
+
+<para>The <guilabel>Hide button size:</guilabel> option allows you to choose a width in pixels for the hide buttons, if they are visible.</para>
+
+<para>The panel itself has several default sizes set, which you can switch between by simply dragging the edge of it, or by &RMB; clicking on an empty space in the panel, choosing <guisubmenu>Size</guisubmenu> and selecting the desired size from the submenu. If you enable <guilabel>Allow Drag and Drop resizing of panels</guilabel> then by choosing <guimenuitem>Custom</guimenuitem> in the panel menu, you can drag the panel edge to any size you like.</para>
+
+<para>Applet handles are normally visible beside each applet on the panel, so that it is clear where to click to configure them, or to get to the panel menu. You can instead have them <guilabel>Fade out</guilabel>, or hide unless you hover the mouse over them, or you can choose to <guilabel>Hide</guilabel> them completely.</para>
+
+<para>Finally, if the panel is transparent, you can tint it with a colour of your choice. The slider allows you to choose how opaque the tint is. At the lowest end, there is no tint visible, while at the highest, the panel is not transparent at all.</para>
 
 </sect2>
 
 <sect2 id="panel-author">
-<title
->Section Author</title>
-<para
->This section written by: Jost Schenck <email
->jost@schenck.de</email
-></para>
-<para
->Minor update by Mike McBride <email
->mpmcbride7@yahoo.com</email
-></para>
-
-<para
->Some new options added by Lauri Watts <email
->lauri@kde.org</email
-></para>
-
-<para
->Jonathan Riddell<email
->kde-en-gb@jriddell.org</email
-></para
-> 
+<title>Section Author</title>
+<para>This section written by: Jost Schenck <email>jost@schenck.de</email></para>
+<para>Minor update by Mike McBride <email>mpmcbride7@yahoo.com</email></para>
+
+<para>Some new options added by Lauri Watts <email>lauri@kde.org</email></para>
+
+<para>Jonathan Riddell<email>kde-en-gb@jriddell.org</email></para> 
 
 </sect2>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/passwords/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/passwords/index.docbook
index 486f35b7c11..d433efdc682 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/passwords/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/passwords/index.docbook
@@ -2,101 +2,53 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Krishna.Tateneni; &Krishna.Tateneni.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Krishna.Tateneni; &Krishna.Tateneni.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2003-10-16</date>
-<releaseinfo
->3.2</releaseinfo>
+<date>2003-10-16</date>
+<releaseinfo>3.2</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->password</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>password</keyword>
 </keywordset>
 
 </articleinfo>
 <sect1 id="passwords">
 
-<title
->Passwords</title>
+<title>Passwords</title>
 
 <sect2 id="passwords-intro">
-<title
->Introduction</title>
+<title>Introduction</title>
 
-<para
->This module of the &kcontrol; gives you options for configuring the way in which the &tdesu; program treats passwords. &tdesu; will ask you for a password when you try to carry out some privileged actions, such as changing the date/time stored in your system clock, or adding new users on your computer.</para>
+<para>This module of the &kcontrol; gives you options for configuring the way in which the &tdesu; program treats passwords. &tdesu; will ask you for a password when you try to carry out some privileged actions, such as changing the date/time stored in your system clock, or adding new users on your computer.</para>
 
-<para
->Privileged actions such as those described above can only be carried out by <systemitem class="username"
->root</systemitem
-> or a user with administrator permissions on your system. You will need to enter the password for the root account when you want to carry out such actions.</para>
+<para>Privileged actions such as those described above can only be carried out by <systemitem class="username">root</systemitem> or a user with administrator permissions on your system. You will need to enter the password for the root account when you want to carry out such actions.</para>
 
-<important
-><para
->The options in this module do not affect the behaviour of passwords in other programs such as &kmail;.</para>
+<important><para>The options in this module do not affect the behaviour of passwords in other programs such as &kmail;.</para>
 </important>
 
 </sect2>
 
 <sect2 id="passwords-use">
-<title
->Use</title>
-
-<para
->There are two configuration options for passwords. The first is to control the visual feedback that you receive when you type a password. The actual characters in the password are never shown on the screen. You can choose to have each character represented by a <token
->*</token
-> character. If you want to make it harder for someone who might be watching your screen to figure out how many characters there are in the password, you can choose to have each character in the password be represented by three asterisks rather than just one. Still another option is not to have any visual feedback at all, so nothing appears on the screen when you type a password.</para>
-
-<para
->If you work in a reasonably secure environment, you can check the option labelled <guilabel
->Remember Passwords</guilabel
->, and then choose a time period in minutes using the spinner labelled <guilabel
->Timeout</guilabel
->. (You can either type a number between 5 and 1200 minutes, or use the arrows on the spinner.)</para>
-
-<para
->If the <guilabel
->Remember passwords</guilabel
-> option has been selected, <application
->tdesu</application
-> will not ask you for a password for the length of time specified, after you have given the password once. Keep in mind, however, that this makes your workstation less secure.</para>
-
-<important
-><para
->You should avoid selecting the <guilabel
->Remember passwords</guilabel
-> option if you are working in an insecure area, such as a publicly accessible workstation. Also, note that choosing a shorter timeout may be better if you are in a less secure environment.</para
-></important>
+<title>Use</title>
+
+<para>There are two configuration options for passwords. The first is to control the visual feedback that you receive when you type a password. The actual characters in the password are never shown on the screen. You can choose to have each character represented by a <token>*</token> character. If you want to make it harder for someone who might be watching your screen to figure out how many characters there are in the password, you can choose to have each character in the password be represented by three asterisks rather than just one. Still another option is not to have any visual feedback at all, so nothing appears on the screen when you type a password.</para>
+
+<para>If you work in a reasonably secure environment, you can check the option labelled <guilabel>Remember Passwords</guilabel>, and then choose a time period in minutes using the spinner labelled <guilabel>Timeout</guilabel>. (You can either type a number between 5 and 1200 minutes, or use the arrows on the spinner.)</para>
+
+<para>If the <guilabel>Remember passwords</guilabel> option has been selected, <application>tdesu</application> will not ask you for a password for the length of time specified, after you have given the password once. Keep in mind, however, that this makes your workstation less secure.</para>
+
+<important><para>You should avoid selecting the <guilabel>Remember passwords</guilabel> option if you are working in an insecure area, such as a publicly accessible workstation. Also, note that choosing a shorter timeout may be better if you are in a less secure environment.</para></important>
 
 </sect2>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/proxy/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/proxy/index.docbook
index ac3eb8e7490..89100936044 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/proxy/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/proxy/index.docbook
@@ -3,8 +3,7 @@
 "dtd/kdex.dtd" [
 <!ENTITY socks-kcontrol SYSTEM "socks.docbook">
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
@@ -12,186 +11,93 @@
 
 
 <authorgroup>
-<author
->&Krishna.Tateneni; &Krishna.Tateneni.mail;</author>
-<othercredit role="translator"
-><firstname
->Jonathan</firstname
-><surname
->Riddell</surname
-><affiliation
-><address
-><email
->kde-en-gb@jriddell.org</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Krishna.Tateneni; &Krishna.Tateneni.mail;</author>
+<othercredit role="translator"><firstname>Jonathan</firstname><surname>Riddell</surname><affiliation><address><email>kde-en-gb@jriddell.org</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-02-11</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-02-11</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->proxy</keyword>
-<keyword
->proxies</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>proxy</keyword>
+<keyword>proxies</keyword>
 </keywordset>
 
 </articleinfo>
 <sect1 id="proxies">
-<title
->Proxies</title>
+<title>Proxies</title>
 
 <sect2 id="proxies-intro">
 
-<title
->Introduction</title>
+<title>Introduction</title>
 
-<para
->Proxies are programs running on a computer that acts a server on the network you are connected to (whether by modem or other means). These programs receive &HTTP; and &FTP; requests, retrieve the relevant files from the internet, and pass them on to the client computer that made the requests.</para>
+<para>Proxies are programs running on a computer that acts a server on the network you are connected to (whether by modem or other means). These programs receive &HTTP; and &FTP; requests, retrieve the relevant files from the internet, and pass them on to the client computer that made the requests.</para>
 
-<para
->When you have configured a proxy, &HTTP; and/or &FTP; requests are re-routed through the computer that is acting as a proxy server. However, you can also select specific hosts which should be contacted directly, rather than through the proxy server. If you are on a local network, for example, access to local hosts probably doesn't need to go through a proxy server.</para>
+<para>When you have configured a proxy, &HTTP; and/or &FTP; requests are re-routed through the computer that is acting as a proxy server. However, you can also select specific hosts which should be contacted directly, rather than through the proxy server. If you are on a local network, for example, access to local hosts probably doesn't need to go through a proxy server.</para>
 
-<para
->You should only need to configure a proxy server if your network administrator requires it (if you are a dial-up user, that would be your internet service provider or <acronym
->ISP</acronym
->). Otherwise, especially if you are feeling a bit confused about this proxy business, but everything seems to be fine with your internet connection, you don't need to change anything.</para>
+<para>You should only need to configure a proxy server if your network administrator requires it (if you are a dial-up user, that would be your internet service provider or <acronym>ISP</acronym>). Otherwise, especially if you are feeling a bit confused about this proxy business, but everything seems to be fine with your internet connection, you don't need to change anything.</para>
 
 </sect2>
 
 <sect2 id="proxies-use">
 
-<title
->Use</title>
+<title>Use</title>
 
-<para
->The first option on the page is a checkbox labelled <guilabel
->Use proxy</guilabel
->.</para>
+<para>The first option on the page is a checkbox labelled <guilabel>Use proxy</guilabel>.</para>
 
-<para
->Check this box to enable the use of proxy servers for your internet connection.</para>
+<para>Check this box to enable the use of proxy servers for your internet connection.</para>
 
-<para
->Please note that using proxy servers is optional, but has the benefit or advantage of giving you faster access to data on the internet.</para>
+<para>Please note that using proxy servers is optional, but has the benefit or advantage of giving you faster access to data on the internet.</para>
 
-<para
->If you are uncertain whether or not you need to use a proxy server to connect to the internet, please consult with your internet service provider's setup guide or your system administrator.</para>
+<para>If you are uncertain whether or not you need to use a proxy server to connect to the internet, please consult with your internet service provider's setup guide or your system administrator.</para>
 
-<para
->If you have selected to use a proxy, you have several methods to configure the settings for it.</para>
+<para>If you have selected to use a proxy, you have several methods to configure the settings for it.</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Automatically detected script file</guilabel
-></term>
+<term><guilabel>Automatically detected script file</guilabel></term>
 <listitem>
 
-<para
->Select this option if you want the proxy setup configuration script file to be automatically detected and downloaded.</para>
-<para
->This option only differs from the next choice in that it <emphasis
->does not</emphasis
-> require you to supply the location of the configuration script file. Instead, it will be automatically downloaded using <quote
->Web Access Protocol Discovery</quote
-> (<acronym
->WAPD</acronym
->).</para>
-
-<note
-><para
->If you have a problem using this setup, please consult the <acronym
->FAQ</acronym
-> section at <ulink url="http://www.konqueror.org"
->http://www.konqueror.org</ulink
-> for more information.</para
-></note>
+<para>Select this option if you want the proxy setup configuration script file to be automatically detected and downloaded.</para>
+<para>This option only differs from the next choice in that it <emphasis>does not</emphasis> require you to supply the location of the configuration script file. Instead, it will be automatically downloaded using <quote>Web Access Protocol Discovery</quote> (<acronym>WAPD</acronym>).</para>
+
+<note><para>If you have a problem using this setup, please consult the <acronym>FAQ</acronym> section at <ulink url="http://www.konqueror.org">http://www.konqueror.org</ulink> for more information.</para></note>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Specified script file</guilabel
-></term>
+<term><guilabel>Specified script file</guilabel></term>
 <listitem>
-<para
->Select this option if your proxy support is provided through a script file located at a specific address. You can then enter the address in the location text box, or use the <guiicon
->folder</guiicon
-> icon to browse to it.</para>
+<para>Select this option if your proxy support is provided through a script file located at a specific address. You can then enter the address in the location text box, or use the <guiicon>folder</guiicon> icon to browse to it.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Preset environment variables</guilabel
-></term>
+<term><guilabel>Preset environment variables</guilabel></term>
 <listitem>
-<para
->Some systems are setup with $<envar
->HTTP_PROXY</envar
-> to allow graphical as well as non-graphical applications to share the same proxy configuration information.</para>
-<para
->If you know this applies to you, select this option and click on the <guibutton
->Setup...</guibutton
-> button to provide the environment variable names used to set the address of the proxy server(s).</para>
+<para>Some systems are setup with $<envar>HTTP_PROXY</envar> to allow graphical as well as non-graphical applications to share the same proxy configuration information.</para>
+<para>If you know this applies to you, select this option and click on the <guibutton>Setup...</guibutton> button to provide the environment variable names used to set the address of the proxy server(s).</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Manually specified settings</guilabel
-></term>
+<term><guilabel>Manually specified settings</guilabel></term>
 <listitem>
-<para
->Select this option, and click on the <guibutton
->Setup...</guibutton
-> to manually setup the location of the proxy servers to be used.</para>
-
-<para
->If you choose this option, another dialogue will pop up.</para>
-
-<para
->The complete addressing information for the proxy includes both the internet address and a port number. You should enter these into the relevant text boxes. The <guiicon
->arrow</guiicon
-> button copies the information from the <guilabel
->HTTP</guilabel
-> line to the <guilabel
->FTP</guilabel
-> line, in order to help save some typing.</para>
-
-<para
->If there are hosts which you can connect to without going through the proxy server, you can press <guibutton
->Add</guibutton
-> to add the names of these hosts, separated by in the text box labelled <guilabel
->No Proxy For:</guilabel
->. For example, hosts that are on your local network can probably be contacted directly.</para>
-
-<para
->You can also choose <guilabel
->Only use proxy for entries in this list</guilabel
->.</para>
-
-<para
->Check this box to reverse the use of the exception list, &ie; the proxy servers will only be used when the requested &URL; matches one of the addresses listed here.</para>
-
-<para
->This features is useful if all you need is a proxy to access a few specific sites, for example, an internal intranet. If you have more complex requirements you might want to use a configuration script.</para>
+<para>Select this option, and click on the <guibutton>Setup...</guibutton> to manually setup the location of the proxy servers to be used.</para>
+
+<para>If you choose this option, another dialogue will pop up.</para>
+
+<para>The complete addressing information for the proxy includes both the internet address and a port number. You should enter these into the relevant text boxes. The <guiicon>arrow</guiicon> button copies the information from the <guilabel>HTTP</guilabel> line to the <guilabel>FTP</guilabel> line, in order to help save some typing.</para>
+
+<para>If there are hosts which you can connect to without going through the proxy server, you can press <guibutton>Add</guibutton> to add the names of these hosts, separated by in the text box labelled <guilabel>No Proxy For:</guilabel>. For example, hosts that are on your local network can probably be contacted directly.</para>
+
+<para>You can also choose <guilabel>Only use proxy for entries in this list</guilabel>.</para>
+
+<para>Check this box to reverse the use of the exception list, &ie; the proxy servers will only be used when the requested &URL; matches one of the addresses listed here.</para>
+
+<para>This features is useful if all you need is a proxy to access a few specific sites, for example, an internal intranet. If you have more complex requirements you might want to use a configuration script.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -199,24 +105,11 @@
 </sect2>
 
 <sect2 id="authorization">
-<title
-><guilabel
->Authorisation</guilabel
-></title>
-
-<para
->Here you can choose between two types of authentication, if your proxy requires it. You can have <guilabel
->Prompt as needed</guilabel
->, the default, in which case &konqueror; will only ask for a username or password if it needs to.</para>
-
-<para
->The other option is <guilabel
->Use automatic login</guilabel
->. Select this option if you have already set up a login entry for your proxy server in the <filename
->$<envar
->TDEDIR</envar
->/share/config/kionetrc</filename
-> file.</para>
+<title><guilabel>Authorisation</guilabel></title>
+
+<para>Here you can choose between two types of authentication, if your proxy requires it. You can have <guilabel>Prompt as needed</guilabel>, the default, in which case &konqueror; will only ask for a username or password if it needs to.</para>
+
+<para>The other option is <guilabel>Use automatic login</guilabel>. Select this option if you have already set up a login entry for your proxy server in the <filename>$<envar>TDEDIR</envar>/share/config/kionetrc</filename> file.</para>
 
 </sect2>
 &socks-kcontrol; </sect1>
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/proxy/socks.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/proxy/socks.docbook
index 6463d9b0c07..c8ee36dd9ae 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/proxy/socks.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/proxy/socks.docbook
@@ -1,81 +1,29 @@
 <sect2 id="socks">
 <sect2info>
 <authorgroup>
-<author
->&Lauri.Watts;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Lauri.Watts;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </sect2info>
 
-<title
->SOCKS</title>
+<title>SOCKS</title>
 
-<para
->SOCKS is a protocol to execute proxy requests for a client. SOCKS is capable of authentication and encryption of traffic, and is often found in corporate settings, as opposed to home users. For more information about SOCKS, see the <ulink url="http://www.socks.nec.com"
->NEC</ulink
-> website</para>
+<para>SOCKS is a protocol to execute proxy requests for a client. SOCKS is capable of authentication and encryption of traffic, and is often found in corporate settings, as opposed to home users. For more information about SOCKS, see the <ulink url="http://www.socks.nec.com">NEC</ulink> website</para>
 
-<para
->With this module you can enable most of the network aware &kde; applications to transparently use SOCKS.</para>
+<para>With this module you can enable most of the network aware &kde; applications to transparently use SOCKS.</para>
 
-<para
->Setting up of a SOCKS client is outside the scope of this document, and the differences between the commonly used ones are very large. If you already have a working SOCKS implementation, allowing you to use commandline clients (for example, if <command
->lynx</command
-> or <command
->ftp</command
-> are already working) then you can simply check the <guilabel
->Enable SOCKS support</guilabel
-> checkbox.</para>
+<para>Setting up of a SOCKS client is outside the scope of this document, and the differences between the commonly used ones are very large. If you already have a working SOCKS implementation, allowing you to use commandline clients (for example, if <command>lynx</command> or <command>ftp</command> are already working) then you can simply check the <guilabel>Enable SOCKS support</guilabel> checkbox.</para>
 
-<para
->When this box is checked, several further options become available to you.</para>
+<para>When this box is checked, several further options become available to you.</para>
 
-<para
->First, you should select which of the various SOCKS clients you have installed on your computer. &kde; will attempt to find this out by itself, if you choose <guilabel
->Auto detect</guilabel
->. If you know the client you have, you could choose either <guilabel
->NEC Socks</guilabel
-> or <guilabel
->Dante</guilabel
->. If you have a custom built SOCKS library to use, you can select <guilabel
->Use custom library</guilabel
-> and then enter the path to it in the <guilabel
->Path</guilabel
-> field.</para>
+<para>First, you should select which of the various SOCKS clients you have installed on your computer. &kde; will attempt to find this out by itself, if you choose <guilabel>Auto detect</guilabel>. If you know the client you have, you could choose either <guilabel>NEC Socks</guilabel> or <guilabel>Dante</guilabel>. If you have a custom built SOCKS library to use, you can select <guilabel>Use custom library</guilabel> and then enter the path to it in the <guilabel>Path</guilabel> field.</para>
 
-<para
->If you want &kde; to auto detect the SOCKS library in use, but you suspect it isn't looking in the right places or you have installed it in a non-standard location, then you can add further paths to be searched in the bottom of this panel. Use the <guibutton
->Add</guibutton
-> and <guibutton
->Remove</guibutton
-> to add or remove paths.</para>
+<para>If you want &kde; to auto detect the SOCKS library in use, but you suspect it isn't looking in the right places or you have installed it in a non-standard location, then you can add further paths to be searched in the bottom of this panel. Use the <guibutton>Add</guibutton> and <guibutton>Remove</guibutton> to add or remove paths.</para>
 
-<para
->At any time while filling in this module, you can press the <guibutton
->Test</guibutton
-> button, and &kde; will report immediately with a message box to tell you if it could find and initialise SOCKS or not.</para>
+<para>At any time while filling in this module, you can press the <guibutton>Test</guibutton> button, and &kde; will report immediately with a message box to tell you if it could find and initialise SOCKS or not.</para>
 
-<para
->Changes made here will not affect any applications that are already open. You will need to close and restart them before they are able to connect via SOCKS.</para>
+<para>Changes made here will not affect any applications that are already open. You will need to close and restart them before they are able to connect via SOCKS.</para>
 
-<para
->Conversion to British English: Malcolm Hunter <email
->malcolm.hunter@gmx.co.uk</email
-></para
-> 
+<para>Conversion to British English: Malcolm Hunter <email>malcolm.hunter@gmx.co.uk</email></para> 
 
 </sect2>
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/screensaver/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/screensaver/index.docbook
index 1705b5249c0..e841382b86b 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/screensaver/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/screensaver/index.docbook
@@ -2,284 +2,129 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Mike.McBride; &Mike.McBride.mail;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Mike.McBride; &Mike.McBride.mail;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-09-19</date>
-<releaseinfo
->3.01.00</releaseinfo>
+<date>2002-09-19</date>
+<releaseinfo>3.01.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->screensaver</keyword>
-<keyword
->screen saver</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>screensaver</keyword>
+<keyword>screen saver</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="screensaver">
 
-<title
->Screen Saver</title>
+<title>Screen Saver</title>
 
-<para
->Using this module, you can choose your screen saver, determine how much time must pass before the screen saver is activated, and add or remove password protection to your screen saver.</para>
+<para>Using this module, you can choose your screen saver, determine how much time must pass before the screen saver is activated, and add or remove password protection to your screen saver.</para>
 
 <sect2 id="ss-choose">
-<title
->Choosing the screen saver, and configuring its options</title>
-
-<para
->In the <guilabel
->Settings</guilabel
-> box is a check box labeled <guilabel
->Start screen saver automatically</guilabel
->. This box must have a mark in it, or &kde; will not launch any screen saver and it will not allow you to adjust the settings of your screen saver.</para>
-
-<para
->Along the left side is a list of all available screen savers. You can select a screen saver by simply clicking on its name. Once you have selected a screen saver, you will see a small preview on the monitor on the right.</para>
-
-<note
-><para
->The preview monitor will often show the screen saver larger than it is when the screen saver is activated. This is done on purpose, since many of the details of the screen savers would be unintelligible if actually scaled down to such a small size.</para
-></note>
-
-<para
->Each screen saver has a different set of setup options. By clicking on <guilabel
->Setup...</guilabel
->, a dialogue box will appear with all available options. As you adjust the options, the preview box in the dialog box will show you what effect you will achieve with the current settings.</para>
-
-<para
->When you are done setting up your screen saver, click <guibutton
->OK</guibutton
->.</para
-> <para
->Clicking <guibutton
->Cancel</guibutton
-> will erase any changes you made in this dialogue box, and return you to the screen saver module.</para>
-
-<para
->Clicking the <guibutton
->About</guibutton
-> button will give you the Copyright and Author information if you are interested.</para>
-
-<para
->When you think you have all the options set the way you want, simply click on <guibutton
->Test</guibutton
-> to immediately start the screen saver <emphasis
->exactly</emphasis
-> as it will appear.</para>
+<title>Choosing the screen saver, and configuring its options</title>
+
+<para>In the <guilabel>Settings</guilabel> box is a check box labeled <guilabel>Start screen saver automatically</guilabel>. This box must have a mark in it, or &kde; will not launch any screen saver and it will not allow you to adjust the settings of your screen saver.</para>
+
+<para>Along the left side is a list of all available screen savers. You can select a screen saver by simply clicking on its name. Once you have selected a screen saver, you will see a small preview on the monitor on the right.</para>
+
+<note><para>The preview monitor will often show the screen saver larger than it is when the screen saver is activated. This is done on purpose, since many of the details of the screen savers would be unintelligible if actually scaled down to such a small size.</para></note>
+
+<para>Each screen saver has a different set of setup options. By clicking on <guilabel>Setup...</guilabel>, a dialogue box will appear with all available options. As you adjust the options, the preview box in the dialog box will show you what effect you will achieve with the current settings.</para>
+
+<para>When you are done setting up your screen saver, click <guibutton>OK</guibutton>.</para> <para>Clicking <guibutton>Cancel</guibutton> will erase any changes you made in this dialogue box, and return you to the screen saver module.</para>
+
+<para>Clicking the <guibutton>About</guibutton> button will give you the Copyright and Author information if you are interested.</para>
+
+<para>When you think you have all the options set the way you want, simply click on <guibutton>Test</guibutton> to immediately start the screen saver <emphasis>exactly</emphasis> as it will appear.</para>
 
 </sect2>
 
 <sect2 id="ss-options">
-<title
->Setting the time, priority and passwords for screen savers.</title>
-
-<para
->Below the Preview Monitor, is the <guilabel
->Start screen saver automatically</guilabel
-> check box, and a spin box which determines the period of inactivity before the screen saver should be started. You can enter any number from 1-120 minutes in this box.</para>
-
-<para
->Enable the check box <guilabel
->Make the screen saver aware of power management</guilabel
-> if you do not want the screensaver to start while you watch TV or movies on your monitor.</para>
-
-<para
->Below that is a check box labelled <guilabel
->Require password to stop screen saver</guilabel
->. If it is checked, when you click a key or click a mouse button to end the screen saver and return to your work, you must enter a password. The password used is the same password you used to login to your machine. If there is no mark in the check box, no password is required to return to your desktop.</para>
-
-<para
->Finally, there is a slider labelled <guilabel
->Priority</guilabel
->. If your screen saver appears jumpy, you should increase the priority closer to the <guilabel
->High</guilabel
-> end. This will tell your computer to devote more time to the screen saver, and less time to other tasks. </para>
+<title>Setting the time, priority and passwords for screen savers.</title>
+
+<para>Below the Preview Monitor, is the <guilabel>Start screen saver automatically</guilabel> check box, and a spin box which determines the period of inactivity before the screen saver should be started. You can enter any number from 1-120 minutes in this box.</para>
+
+<para>Enable the check box <guilabel>Make the screen saver aware of power management</guilabel> if you do not want the screensaver to start while you watch TV or movies on your monitor.</para>
+
+<para>Below that is a check box labelled <guilabel>Require password to stop screen saver</guilabel>. If it is checked, when you click a key or click a mouse button to end the screen saver and return to your work, you must enter a password. The password used is the same password you used to login to your machine. If there is no mark in the check box, no password is required to return to your desktop.</para>
+
+<para>Finally, there is a slider labelled <guilabel>Priority</guilabel>. If your screen saver appears jumpy, you should increase the priority closer to the <guilabel>High</guilabel> end. This will tell your computer to devote more time to the screen saver, and less time to other tasks. </para>
 
 </sect2>
 
-<sect2 id="ss-other"
-><title
->Using a non-&kde; screen saver</title
-> 
+<sect2 id="ss-other"><title>Using a non-&kde; screen saver</title> 
 
-<para
->&kde; does not prevent another screen saver from working. To use a different screen saver, such as <application
->xscreensaver</application
->, simply disable the &kde; Screen Saver, and set up your other screen saver program normally. </para>
+<para>&kde; does not prevent another screen saver from working. To use a different screen saver, such as <application>xscreensaver</application>, simply disable the &kde; Screen Saver, and set up your other screen saver program normally. </para>
 
 </sect2>
 
 <sect2 id="screensaver-remove">
-<title
->Removing and restoring a screen saver from your system</title>
-
-<para
->If you want to remove a screen saver from the list in this Control Centre Module, you will need to rename a file on your system.</para>
-
-<caution
-><para
->Working as a <systemitem class="username"
->root</systemitem
-> user is a potentially dangerous situation. While unlikely, it is entirely possible to do permanent damage to your system while working as <emphasis
->root</emphasis
->.</para>
-
-<para
->Be very careful following the next set of directions</para
-></caution>
-
-<para
->To delete a screen saver, type the following commands:</para>
-
-<screen
-><prompt
->bash$</prompt
-> <command
->cd 
+<title>Removing and restoring a screen saver from your system</title>
+
+<para>If you want to remove a screen saver from the list in this Control Centre Module, you will need to rename a file on your system.</para>
+
+<caution><para>Working as a <systemitem class="username">root</systemitem> user is a potentially dangerous situation. While unlikely, it is entirely possible to do permanent damage to your system while working as <emphasis>root</emphasis>.</para>
+
+<para>Be very careful following the next set of directions</para></caution>
+
+<para>To delete a screen saver, type the following commands:</para>
+
+<screen><prompt>bash$</prompt> <command>cd 
 $TDEDIR/share/applnk/System/ScreenSavers</command>
-<prompt
->bash$</prompt
-> <command
->ls</command
->
-</screen
-> 
-
-<para
->This will give you a list of files. You will notice similarities between some of the file names and that of the screen saver you want to remove. Simply rename the file of similarly named desktop file to a name which does not end in <emphasis
->desktop</emphasis
->.</para>
-
-<para
->Example:</para>
-<screen
-><prompt
->bash$</prompt
-> <command
->cd 
+<prompt>bash$</prompt> <command>ls</command>
+</screen> 
+
+<para>This will give you a list of files. You will notice similarities between some of the file names and that of the screen saver you want to remove. Simply rename the file of similarly named desktop file to a name which does not end in <emphasis>desktop</emphasis>.</para>
+
+<para>Example:</para>
+<screen><prompt>bash$</prompt> <command>cd 
 $TDEDIR/share/applnk/System/ScreenSavers</command>
-<prompt
->bash$</prompt
-> <command
->mv KSpace.desktop KSpace.backup</command
->
-</screen
-> 
-
-<para
->Will remove Space (GL) from the list</para>
-
-<note
-><para
->You must close the &kcontrolcenter; entirely and restart it before the changes will be seen.</para
-></note>
-
-<para
->To restore the disabled screen saver, simply rename the file back to its original name:</para>
-
-<screen
-><prompt
->bash$</prompt
-> <command
->cd 
+<prompt>bash$</prompt> <command>mv KSpace.desktop KSpace.backup</command>
+</screen> 
+
+<para>Will remove Space (GL) from the list</para>
+
+<note><para>You must close the &kcontrolcenter; entirely and restart it before the changes will be seen.</para></note>
+
+<para>To restore the disabled screen saver, simply rename the file back to its original name:</para>
+
+<screen><prompt>bash$</prompt> <command>cd 
 $TDEDIR/share/applnk/System/ScreenSavers</command>
-<prompt
->bash$</prompt
-> <command
->mv KSpace.backup KSpace.desktop</command
->
-</screen
-> 
+<prompt>bash$</prompt> <command>mv KSpace.backup KSpace.desktop</command>
+</screen> 
 
-<para
->Restart the &kcontrolcenter;, and the screen saver is back in the list.</para>
+<para>Restart the &kcontrolcenter;, and the screen saver is back in the list.</para>
 
 </sect2>
 
 <sect2 id="grace">
-<title
->Advanced Settings: Grace period</title>
-
-<para
->There is a five second grace period after the screen saver begins before a password is required even if <guilabel
->Require password</guilabel
-> is checked.</para>
-<para
->Locking the desktop manually, by clicking the lock icon in the &kde; panel, causes the password protection to engage immediately with no grace period.</para>
-<para
->To alter the grace period setting, you need to manually edit the configuration file. To do so:</para>
-<para
-><prompt
->$</prompt
-> <command
->cd <filename
->~/.trinity/share/config</filename
-> </command
-> </para>
-<para
->Now, using a text editor (the example uses &kate;, the &kde; text editor), load the <filename
->kdesktoprc</filename
->.</para>
-<para
-><prompt
->$</prompt
-> <command
->kate <filename
->kdesktoprc</filename
-> </command
-> </para>
-<para
->Search through the file for the section labelled <emphasis
->[Screensaver]</emphasis
->.</para>
-<para
->Look through all lines in the section for an entry entitled <emphasis
->LockGrace</emphasis
->.</para>
-<para
->If the entry exists, you can edit the value of the entry. </para>
-<screen
->[Screensaver]
+<title>Advanced Settings: Grace period</title>
+
+<para>There is a five second grace period after the screen saver begins before a password is required even if <guilabel>Require password</guilabel> is checked.</para>
+<para>Locking the desktop manually, by clicking the lock icon in the &kde; panel, causes the password protection to engage immediately with no grace period.</para>
+<para>To alter the grace period setting, you need to manually edit the configuration file. To do so:</para>
+<para><prompt>$</prompt> <command>cd <filename>~/.trinity/share/config</filename> </command> </para>
+<para>Now, using a text editor (the example uses &kate;, the &kde; text editor), load the <filename>kdesktoprc</filename>.</para>
+<para><prompt>$</prompt> <command>kate <filename>kdesktoprc</filename> </command> </para>
+<para>Search through the file for the section labelled <emphasis>[Screensaver]</emphasis>.</para>
+<para>Look through all lines in the section for an entry entitled <emphasis>LockGrace</emphasis>.</para>
+<para>If the entry exists, you can edit the value of the entry. </para>
+<screen>[Screensaver]
 LockGrace=3000</screen>
-<para
->The value of the entity represents the duration of the grace period in milliseconds. An entry of 3000, would change the grace period to 3 seconds. You can set the value of the entry to any number between zero (no grace period) and 300000 (5 minutes). </para>
-<para
->If the entry does not exist, simply add the entry to the end of the section.</para>
+<para>The value of the entity represents the duration of the grace period in milliseconds. An entry of 3000, would change the grace period to 3 seconds. You can set the value of the entry to any number between zero (no grace period) and 300000 (5 minutes). </para>
+<para>If the entry does not exist, simply add the entry to the end of the section.</para>
 
-<para
->Any changes to the configuration entry take effect immediately.</para>
+<para>Any changes to the configuration entry take effect immediately.</para>
 
 </sect2>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/smb/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/smb/index.docbook
index 0c6c183792a..7b2f23b2f22 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/smb/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/smb/index.docbook
@@ -2,80 +2,36 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Mike.McBride; &Mike.McBride.mail;</author>
-<author
->&Jost.Schenck; &Jost.Schenck.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Mike.McBride; &Mike.McBride.mail;</author>
+<author>&Jost.Schenck; &Jost.Schenck.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-02-12</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-02-12</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->Windows shares</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>Windows shares</keyword>
 </keywordset>
 </articleinfo>
 <sect1 id="windows-shares">
-<title
->Windows Shares</title>
+<title>Windows Shares</title>
 
 <sect2 id="windows-shares-intro">
-<title
->Introduction</title>
-
-<para
->In many small local area networks, the <acronym
->SMB</acronym
-> protocol is used to offer network services. Names like <quote
->&Windows; Network</quote
-> or <quote
->&Windows; for Workgroups Network</quote
-> or <quote
->LanManager</quote
-> are often used as well. Using <acronym
->SMB</acronym
-> you can access so-called <quote
->shares</quote
-> (&ie; folders made available by the server) as well as printers. </para>
-
-<para
->&kde; comes with built-in support for the <acronym
->SMB</acronym
-> protocol. As &kde; is network-transparent that means you can access <acronym
->SMB</acronym
-> shares from everywhere you can access your local files, for example in the &konqueror; file manager and in the file dialogue. To make use of this you should provide &kde; with some information on your <acronym
->SMB</acronym
-> network. But do not worry, this is normally pretty simple as, for example, all the Windows clients in your network need and have the same information.</para>
+<title>Introduction</title>
+
+<para>In many small local area networks, the <acronym>SMB</acronym> protocol is used to offer network services. Names like <quote>&Windows; Network</quote> or <quote>&Windows; for Workgroups Network</quote> or <quote>LanManager</quote> are often used as well. Using <acronym>SMB</acronym> you can access so-called <quote>shares</quote> (&ie; folders made available by the server) as well as printers. </para>
+
+<para>&kde; comes with built-in support for the <acronym>SMB</acronym> protocol. As &kde; is network-transparent that means you can access <acronym>SMB</acronym> shares from everywhere you can access your local files, for example in the &konqueror; file manager and in the file dialogue. To make use of this you should provide &kde; with some information on your <acronym>SMB</acronym> network. But do not worry, this is normally pretty simple as, for example, all the Windows clients in your network need and have the same information.</para>
 
 <!-- Don't know if the following info should go in the base
 documentation --> 
@@ -86,18 +42,7 @@ very cool thing (TM) btw. If you want to write some documentation for
 this one too, have a look at tdenetwork/lanbrowsing/lisa/README and
 contact me if you have questions. -->
 
-<note
-><para
->For the <acronym
->SMB</acronym
-> protocol to work, it is required to have <application
->Samba</application
-> correctly installed. If you have an NT domain controller, you will need at least <application
->Samba</application
-> version 2.0 or higher. If you want to access &Windows; 2000 shares, you will need <application
->Samba</application
-> version 2.0.7 or higher. Older versions may work too, but have not been tested.</para
-></note>
+<note><para>For the <acronym>SMB</acronym> protocol to work, it is required to have <application>Samba</application> correctly installed. If you have an NT domain controller, you will need at least <application>Samba</application> version 2.0 or higher. If you want to access &Windows; 2000 shares, you will need <application>Samba</application> version 2.0.7 or higher. Older versions may work too, but have not been tested.</para></note>
 
 <!-- TODO: link to some place which explains USING SMB, i.e. konqueror
 or file dialog manual -->
@@ -105,48 +50,15 @@ or file dialog manual -->
 </sect2>
 
 <sect2 id="windows-shares-use">
-<title
->Use</title>
-
-<para
->Although there are a lot of insecure <acronym
->SMB</acronym
-> networks out there which allow access to anyone, in principle you have to authenticate yourself to access the services of an <acronym
->SMB</acronym
-> server. By default, &kde; will use the data entered in the <guilabel
->Default user name</guilabel
-> and <guilabel
->Default password</guilabel
-> fields to authenticate itself on <acronym
->SMB</acronym
-> hosts. If you leave the field <guilabel
->Default user name</guilabel
-> empty, &kde; will try to access <acronym
->SMB</acronym
-> hosts without a username. If you leave the default password empty, it will try without a password. If &kde; is unsuccessful accessing the host using these settings, you will be asked for a username and a password.</para>
-
-<important
-><para
->While it makes things more comfortable if &kde; stores your <acronym
->SMB</acronym
-> password, this may be a security problem. If you are using <acronym
->SMB</acronym
-> in a security conscious environment, you should not store your password here but rather enter it anew every time you need to access an <acronym
->SMB</acronym
-> host.</para
-></important>
-
-<para
->In the <guilabel
->Workgroup</guilabel
-> field, you can enter your workgroup name. If you don't know it, ask your system administrator or have a look at other already configured machines in your network. However, in most cases providing the workgroup name is not required, so you probably can also leave this empty.</para>
-
-<para
->If the option <guilabel
->Show hidden shares</guilabel
-> is checked, shares ending with a <quote
->$</quote
-> will be shown.</para>
+<title>Use</title>
+
+<para>Although there are a lot of insecure <acronym>SMB</acronym> networks out there which allow access to anyone, in principle you have to authenticate yourself to access the services of an <acronym>SMB</acronym> server. By default, &kde; will use the data entered in the <guilabel>Default user name</guilabel> and <guilabel>Default password</guilabel> fields to authenticate itself on <acronym>SMB</acronym> hosts. If you leave the field <guilabel>Default user name</guilabel> empty, &kde; will try to access <acronym>SMB</acronym> hosts without a username. If you leave the default password empty, it will try without a password. If &kde; is unsuccessful accessing the host using these settings, you will be asked for a username and a password.</para>
+
+<important><para>While it makes things more comfortable if &kde; stores your <acronym>SMB</acronym> password, this may be a security problem. If you are using <acronym>SMB</acronym> in a security conscious environment, you should not store your password here but rather enter it anew every time you need to access an <acronym>SMB</acronym> host.</para></important>
+
+<para>In the <guilabel>Workgroup</guilabel> field, you can enter your workgroup name. If you don't know it, ask your system administrator or have a look at other already configured machines in your network. However, in most cases providing the workgroup name is not required, so you probably can also leave this empty.</para>
+
+<para>If the option <guilabel>Show hidden shares</guilabel> is checked, shares ending with a <quote>$</quote> will be shown.</para>
 </sect2>
 
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/spellchecking/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/spellchecking/index.docbook
index 4578d3b55c8..67ff42190f2 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/spellchecking/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/spellchecking/index.docbook
@@ -2,133 +2,66 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Lauri.Watts; &Lauri.Watts.mail;</author>
+<author>&Lauri.Watts; &Lauri.Watts.mail;</author>
 
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2003-10-13</date>
-<releaseinfo
->3.2</releaseinfo>
+<date>2003-10-13</date>
+<releaseinfo>3.2</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->Spelling</keyword>
-<keyword
->dictionary</keyword>
+<keyword>KDE</keyword>
+<keyword>Spelling</keyword>
+<keyword>dictionary</keyword>
 </keywordset>
 
 </articleinfo>
 
 <sect1 id="spell-checking">
 
-<title
->Spell Checker</title>
+<title>Spell Checker</title>
 
-<para
->The configuration options available here are used by all &kde; applications that use &tdespell;, which is a front end to <command
->ispell</command
-> or <command
->aspell</command
->.</para>
+<para>The configuration options available here are used by all &kde; applications that use &tdespell;, which is a front end to <command>ispell</command> or <command>aspell</command>.</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Create root/affix combinations not in dictionary</guilabel
-></term>
+<term><guilabel>Create root/affix combinations not in dictionary</guilabel></term>
 <listitem>
-<para
->Selecting this option allows the spell checker to register as <quote
->correct</quote
-> combinations of root words with suffixes or prefixes even if the particular combination is not listed in its dictionary database of words.</para>
+<para>Selecting this option allows the spell checker to register as <quote>correct</quote> combinations of root words with suffixes or prefixes even if the particular combination is not listed in its dictionary database of words.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Consider run-together words as spelling errors</guilabel
-></term>
-<listitem
-><para
->If this is selected, then words that appear in the dictionary separately, but have been run together, are considered to be spelling errors. For example, even though <quote
->alarm</quote
-> and <quote
->clock</quote
-> might be in your dictionary, if <quote
->alarmclock</quote
-> is not, it will be flagged as a spelling error.</para
-></listitem>
+<term><guilabel>Consider run-together words as spelling errors</guilabel></term>
+<listitem><para>If this is selected, then words that appear in the dictionary separately, but have been run together, are considered to be spelling errors. For example, even though <quote>alarm</quote> and <quote>clock</quote> might be in your dictionary, if <quote>alarmclock</quote> is not, it will be flagged as a spelling error.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Dictionary:</guilabel
-></term>
+<term><guilabel>Dictionary:</guilabel></term>
 <listitem>
-<para
->Choose from the available dictionaries, which one to use for &tdespell;.</para>
+<para>Choose from the available dictionaries, which one to use for &tdespell;.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Encoding:</guilabel
-></term>
+<term><guilabel>Encoding:</guilabel></term>
 <listitem>
-<para
->You should select the one that matches the character set you are using. In some cases, dictionaries will support more than one encoding. A dictionary might, for example, accept accented characters when <emphasis
->Latin1</emphasis
-> is selected, but accept email-style character combinations (like <userinput
->'a</userinput
-> for an accented <emphasis
->a</emphasis
->) when <emphasis
->7-Bit-ASCII</emphasis
-> is selected. Please see your dictionary's distribution for more information.</para>
+<para>You should select the one that matches the character set you are using. In some cases, dictionaries will support more than one encoding. A dictionary might, for example, accept accented characters when <emphasis>Latin1</emphasis> is selected, but accept email-style character combinations (like <userinput>'a</userinput> for an accented <emphasis>a</emphasis>) when <emphasis>7-Bit-ASCII</emphasis> is selected. Please see your dictionary's distribution for more information.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Client:</guilabel
-></term>
+<term><guilabel>Client:</guilabel></term>
 <listitem>
-<para
->You can choose which of the installed client applications on your system to use. For example, you can choose <command
->ispell</command
->.</para>
+<para>You can choose which of the installed client applications on your system to use. For example, you can choose <command>ispell</command>.</para>
 </listitem>
 </varlistentry>
 </variablelist>
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/tdehtml/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/tdehtml/index.docbook
index 4c7deb25248..62b7ea24e4c 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/tdehtml/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/tdehtml/index.docbook
@@ -3,339 +3,146 @@
 "dtd/kdex.dtd" [
 <!ENTITY nsplugins-kcontrol SYSTEM "nsplugin.docbook">
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Krishna.Tateneni; &Krishna.Tateneni.mail;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Krishna.Tateneni; &Krishna.Tateneni.mail;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2003-10-12</date>
-<releaseinfo
->3.2</releaseinfo>
+<date>2003-10-12</date>
+<releaseinfo>3.2</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->konqueror</keyword>
-<keyword
->browsing</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>konqueror</keyword>
+<keyword>browsing</keyword>
 </keywordset>
 
 </articleinfo>
 <sect1 id="konq-browsing">
-<title
->Browsing With &konqueror;</title>
+<title>Browsing With &konqueror;</title>
 
-<para
->The &konqueror; Browser module of &kcontrol; allows you to select various options for the appearance and behaviour of &konqueror;, the integrated web browser of &kde;.</para>
+<para>The &konqueror; Browser module of &kcontrol; allows you to select various options for the appearance and behaviour of &konqueror;, the integrated web browser of &kde;.</para>
 
 <sect2 id="kbrowse-html">
 
-<title
->Behaviour</title>
-
-<para
->The first option you can enable on this page is <guilabel
->Enable completion of forms</guilabel
->. If you check this box, &konqueror; will try to remember what you answer to form questions, and will try to fill in forms for you with the answers you previously used.</para>
-
-<para
->You can configure the number of form items &konqueror; remembers with the slider below labelled <guilabel
->Maximum completions</guilabel
-></para>
-
-<note
-><para
->Of course, anything &konqueror; fills in a form with, you can still edit before submitting the form!</para
-></note>
-
-<para
->The next option is <guilabel
->Change cursor over links</guilabel
->. If this option is selected, the shape of the cursor will change (usually to a hand) whenever it moves over a hyperlink. This makes it easy to identify links, especially when they are in the form of images.</para>
-
-<para
->&konqueror; defaults to a single window per page, but has the capability to open multiple <firstterm
->tabs</firstterm
-> inside a single window. &konqueror; also, by default, has a &MMB; shortcut to open any link in a new window. If you enable <guilabel
->Open links in new tab instead of in new window</guilabel
-> you can &MMB; click on a link to have it open in a new tab.</para>
-
-<para
->If you are using tabbed browsing, you can choose if a newly opened tab becomes the active (<quote
->front</quote
->) tab, or goes to the back. On a slow internet connection, or while browsing a page that has a list of headlines or other links in a list, you may like to have the new tabs load in the background while you continue reading. In this case, leave this setting disabled. If you prefer to go straight to the new page, leaving the old one in the background to return to later, enable it.</para>
-
-<para
->If you close a window in &konqueror; that has multiple tabs open, &konqueror; will ask you if you're sure that you meant to close it. You can toggle on and off this behaviour with the <guilabel
->Confirm when closing windows with multiple tabs</guilabel
-> checkbox.</para>
-
-<para
->As a convenience feature, if you enable <guilabel
->Right click goes back in history</guilabel
->, then clicking an empty area (&ie; not a link) in the &konqueror; window will act as if you pressed the <guiicon
->Back</guiicon
-> button on the toolbar.</para>
-
-<para
->The checkbox labelled <guilabel
->Automatically load images</guilabel
->, allows you to control whether images on web pages are loaded by default. Unless you have a very slow connection, you will probably want to leave this option selected, as there are many web pages that are difficult to use without images. If you don't select the option to automatically load images, you can still view the text on the page, and then load the images if you need them.</para>
-
-<para
->Enabling <guilabel
->Allow automatic delayed reloading/redirecting</guilabel
-> allows websites to send you to another page without your interaction. In many cases, this is a convenience. For example, the website has moved to a new <acronym
->URL</acronym
->. Many webmasters in this situation will put up a page on the old site, telling you that it has moved and you may like to change your bookmark, and then automatically move you along to the new website. However, such features can be confusing, or annoying, when misused, and so you may wish to disable it.</para>
-
-<para
->The next setting is <guilabel
->Underline links:</guilabel
->. You can choose to underline links <guilabel
->Always</guilabel
->. If this option is selected, any text on web pages that acts as a link will be shown in an underlined font. While many web pages do use colour to distinguish text that acts as a link, underlining makes it very easy to spot links.</para>
-
-<para
->If you don't like underlined links, you can choose <guilabel
->Never</guilabel
->, so that no links are underlined. Or you can choose a middle ground, <guilabel
->Hover</guilabel
->, so that links are underlined when the mouse cursor is resting over them, and not underlined the rest of the time.</para>
-
-<para
->Many web pages use animated gif images, and these can be very annoying, and in some cases, quite a drain on your system resources. The <guilabel
->Animations</guilabel
-> option lets you choose when animations are enabled. The default is enabled, but you can set this to disabled, or to run the animation only once, even if the file itself contains instructions that the animation should run more times, or continuously.</para>
+<title>Behaviour</title>
+
+<para>The first option you can enable on this page is <guilabel>Enable completion of forms</guilabel>. If you check this box, &konqueror; will try to remember what you answer to form questions, and will try to fill in forms for you with the answers you previously used.</para>
+
+<para>You can configure the number of form items &konqueror; remembers with the slider below labelled <guilabel>Maximum completions</guilabel></para>
+
+<note><para>Of course, anything &konqueror; fills in a form with, you can still edit before submitting the form!</para></note>
+
+<para>The next option is <guilabel>Change cursor over links</guilabel>. If this option is selected, the shape of the cursor will change (usually to a hand) whenever it moves over a hyperlink. This makes it easy to identify links, especially when they are in the form of images.</para>
+
+<para>&konqueror; defaults to a single window per page, but has the capability to open multiple <firstterm>tabs</firstterm> inside a single window. &konqueror; also, by default, has a &MMB; shortcut to open any link in a new window. If you enable <guilabel>Open links in new tab instead of in new window</guilabel> you can &MMB; click on a link to have it open in a new tab.</para>
+
+<para>If you are using tabbed browsing, you can choose if a newly opened tab becomes the active (<quote>front</quote>) tab, or goes to the back. On a slow internet connection, or while browsing a page that has a list of headlines or other links in a list, you may like to have the new tabs load in the background while you continue reading. In this case, leave this setting disabled. If you prefer to go straight to the new page, leaving the old one in the background to return to later, enable it.</para>
+
+<para>If you close a window in &konqueror; that has multiple tabs open, &konqueror; will ask you if you're sure that you meant to close it. You can toggle on and off this behaviour with the <guilabel>Confirm when closing windows with multiple tabs</guilabel> checkbox.</para>
+
+<para>As a convenience feature, if you enable <guilabel>Right click goes back in history</guilabel>, then clicking an empty area (&ie; not a link) in the &konqueror; window will act as if you pressed the <guiicon>Back</guiicon> button on the toolbar.</para>
+
+<para>The checkbox labelled <guilabel>Automatically load images</guilabel>, allows you to control whether images on web pages are loaded by default. Unless you have a very slow connection, you will probably want to leave this option selected, as there are many web pages that are difficult to use without images. If you don't select the option to automatically load images, you can still view the text on the page, and then load the images if you need them.</para>
+
+<para>Enabling <guilabel>Allow automatic delayed reloading/redirecting</guilabel> allows websites to send you to another page without your interaction. In many cases, this is a convenience. For example, the website has moved to a new <acronym>URL</acronym>. Many webmasters in this situation will put up a page on the old site, telling you that it has moved and you may like to change your bookmark, and then automatically move you along to the new website. However, such features can be confusing, or annoying, when misused, and so you may wish to disable it.</para>
+
+<para>The next setting is <guilabel>Underline links:</guilabel>. You can choose to underline links <guilabel>Always</guilabel>. If this option is selected, any text on web pages that acts as a link will be shown in an underlined font. While many web pages do use colour to distinguish text that acts as a link, underlining makes it very easy to spot links.</para>
+
+<para>If you don't like underlined links, you can choose <guilabel>Never</guilabel>, so that no links are underlined. Or you can choose a middle ground, <guilabel>Hover</guilabel>, so that links are underlined when the mouse cursor is resting over them, and not underlined the rest of the time.</para>
+
+<para>Many web pages use animated gif images, and these can be very annoying, and in some cases, quite a drain on your system resources. The <guilabel>Animations</guilabel> option lets you choose when animations are enabled. The default is enabled, but you can set this to disabled, or to run the animation only once, even if the file itself contains instructions that the animation should run more times, or continuously.</para>
 
 </sect2>
 
 <sect2 id="kbrowse-appearance">
 
-<title
->Fonts</title>
-
-<para
->Under this tab, you can select various options related to the use of fonts. Although the shapes and sizes of fonts are often part of the design of a web page, you can select some default settings for &konqueror; to use.</para>
-
-<para
->The first thing you can set here is the font size. There are two settings which work together to allow you a comfortable browsing experience.</para>
-
-<para
->Firstly, you can set a <guilabel
->Minimum Font Size</guilabel
->. This means, even if the font size is set specifically in the page you are viewing, &konqueror; will ignore that instruction and never show smaller fonts than you set here.</para>
-
-<para
->Next you can set a <guilabel
->Medium Font Size</guilabel
->. This is not only the default size of text, used when the page doesn't specify sizes, but it is also used as the base size that relative font sizes are calculated against. That is, the <acronym
->HTML</acronym
-> instruction <quote
->smaller</quote
->, it means smaller than the size you set for this option.</para>
-
-<para
->For either option, you can select the exact font size in points by using the up/down spin control (or just typing) next to the option label.</para>
-
-<para
->These options are independent of each other. Pages that do not set a font size, or ask for the default, will display with the size you set from <guilabel
->Medium Font Size</guilabel
->, while any pages that ask for a size smaller than your <guilabel
->Minimum Font Size</guilabel
-> setting will instead show that size. The one does not affect the other.</para>
-
-<para
->The remaining options are for the fonts to be associated with different types of markup used in <acronym
->HTML</acronym
-> pages. Note that many web pages may override these settings. If you click anywhere on a control which shows a font name, a list of font names appears, and you can select a different font if you like. (If there are a lot of fonts, a vertical scrollbar appears in the list to allow you to scroll through all of the fonts.)</para>
+<title>Fonts</title>
+
+<para>Under this tab, you can select various options related to the use of fonts. Although the shapes and sizes of fonts are often part of the design of a web page, you can select some default settings for &konqueror; to use.</para>
+
+<para>The first thing you can set here is the font size. There are two settings which work together to allow you a comfortable browsing experience.</para>
+
+<para>Firstly, you can set a <guilabel>Minimum Font Size</guilabel>. This means, even if the font size is set specifically in the page you are viewing, &konqueror; will ignore that instruction and never show smaller fonts than you set here.</para>
+
+<para>Next you can set a <guilabel>Medium Font Size</guilabel>. This is not only the default size of text, used when the page doesn't specify sizes, but it is also used as the base size that relative font sizes are calculated against. That is, the <acronym>HTML</acronym> instruction <quote>smaller</quote>, it means smaller than the size you set for this option.</para>
+
+<para>For either option, you can select the exact font size in points by using the up/down spin control (or just typing) next to the option label.</para>
+
+<para>These options are independent of each other. Pages that do not set a font size, or ask for the default, will display with the size you set from <guilabel>Medium Font Size</guilabel>, while any pages that ask for a size smaller than your <guilabel>Minimum Font Size</guilabel> setting will instead show that size. The one does not affect the other.</para>
+
+<para>The remaining options are for the fonts to be associated with different types of markup used in <acronym>HTML</acronym> pages. Note that many web pages may override these settings. If you click anywhere on a control which shows a font name, a list of font names appears, and you can select a different font if you like. (If there are a lot of fonts, a vertical scrollbar appears in the list to allow you to scroll through all of the fonts.)</para>
 <!--
-<para
->You can set a font for each <quote
->type</quote
-> of markup, for
-each <guilabel
->Charset</guilabel
->, by changing the character set in the
+<para>You can set a font for each <quote>type</quote> of markup, for
+each <guilabel>Charset</guilabel>, by changing the character set in the
 first drop down box, and then selecting a font for each category below.
 This would take quite some time, so you may just want to set up the
 fonts for your default character set.  Most English speaking users will
 use iso8859-1</para>
 -->
-<para
->Below this, you can set a <guilabel
->Font size adjustment for this encoding</guilabel
->. Sometimes the fonts you want to use for a particular encoding or language are much larger or smaller than average, so you can use this setting to bring them into line.</para>
+<para>Below this, you can set a <guilabel>Font size adjustment for this encoding</guilabel>. Sometimes the fonts you want to use for a particular encoding or language are much larger or smaller than average, so you can use this setting to bring them into line.</para>
 
-<para
->You can set a default encoding that &konqueror; should assume pages are when rendering them. The default setting is <guilabel
->Use language encoding</guilabel
->, but you can change it to any encoding available in the list.</para>
+<para>You can set a default encoding that &konqueror; should assume pages are when rendering them. The default setting is <guilabel>Use language encoding</guilabel>, but you can change it to any encoding available in the list.</para>
 
 </sect2>
 
 <sect2 id="kbrowse-java">
-<title
->&Java; and JavaScript</title>
-
-<para
->&Java; allows applications to be downloaded and run by a web browser, provided you have the necessary software installed on your machine. Many web sites make use of &Java; (for example, online banking services or interactive gaming sites). You should be aware that running programs from unknown sources could pose a threat to the security of your computer, even if the potential extent of the damage is not great.</para>
-
-<para
->The checkboxes under <guilabel
->Global Settings</guilabel
-> allows you to turn &Java; support on for all web sites by default. You can also select to turn &Java; on or off for specific hosts. To add a policy for a specific host, click the <guilabel
->Add...</guilabel
-> button to bring up a dialogue in which you can type the host name and then choose to accept or reject &Java; code from that particular host, which will add the domain to the list on the left of the page.</para>
-
-<para
->You can select a host in the list, and click the <guilabel
->Change...</guilabel
-> button to choose a different policy for that host. Clicking the <guilabel
->Delete</guilabel
-> button removes the policy for the selected host; after deletion, the global settings will then apply to that host. You can import policies from a file by clicking the <guilabel
->Import...</guilabel
-> button. To save the current list to a compressed archive file, click the <guilabel
->Export...</guilabel
-> button.</para>
-
-<para
->Finally, the group of controls labelled <guilabel
->Java Runtime Settings</guilabel
-> allows you to set some options for the way in which &Java; should run. These options are useful for diagnosing problems, or if you are a &Java; developer, and should not normally need adjusting.</para>
-
-<para
->If you select the <guilabel
->Show Java Console</guilabel
-> option, &konqueror; will open a console window from which &Java; applications can read and write text. While most &Java; applications will not require such a console, it could be helpful in diagnosing problems with &Java; applications.</para>
-
-<para
-><guilabel
->Use TDEIO</guilabel
-> will cause the <acronym
->JVM</acronym
->to use &kde;'s own <acronym
->TDEIO</acronym
-> transports for network connections.</para>
-
-<para
-><guilabel
->Use security manager</guilabel
-> is normally enabled by default. This setting will cause the <acronym
->JVM</acronym
-> to run with a Security Manager in place. This will keep applets from being able to read and write to your file system, creating arbitrary sockets, and other actions which could be used to compromise your system. Disable this option at your own risk. You can modify your <filename
->$<envar
->HOME</envar
->/.java.policy</filename
-> file with the &Java; policytool utility to give code downloaded from certain sites more permissions.</para>
-
-<para
->The <guilabel
->Shutdown Applet Server when inactive</guilabel
-> checkbox allows you to save resources by closing the &Java; Applet Server when it is not in use, rather than leaving it running in the background. Leaving this disabled may make &Java; applets start up faster, but it will use system resources when you are not using a &Java; applet. If you enable this, you can set a timeout.</para>
-
-<para
->You can either opt to have &konqueror; automatically detect the &Java; installation on your system, or specify the path to the installation yourself by selecting <guilabel
->Use user-specified Java</guilabel
->. You may want to choose the latter method, for instance, if you have multiple &Java; installations on your system, and want to specify which one to use. If the &Java; Virtual Machine you are using requires any special startup options, you can type them in the text box labelled <guilabel
->Additional Java Arguments</guilabel
->.</para>
+<title>&Java; and JavaScript</title>
+
+<para>&Java; allows applications to be downloaded and run by a web browser, provided you have the necessary software installed on your machine. Many web sites make use of &Java; (for example, online banking services or interactive gaming sites). You should be aware that running programs from unknown sources could pose a threat to the security of your computer, even if the potential extent of the damage is not great.</para>
+
+<para>The checkboxes under <guilabel>Global Settings</guilabel> allows you to turn &Java; support on for all web sites by default. You can also select to turn &Java; on or off for specific hosts. To add a policy for a specific host, click the <guilabel>Add...</guilabel> button to bring up a dialogue in which you can type the host name and then choose to accept or reject &Java; code from that particular host, which will add the domain to the list on the left of the page.</para>
+
+<para>You can select a host in the list, and click the <guilabel>Change...</guilabel> button to choose a different policy for that host. Clicking the <guilabel>Delete</guilabel> button removes the policy for the selected host; after deletion, the global settings will then apply to that host. You can import policies from a file by clicking the <guilabel>Import...</guilabel> button. To save the current list to a compressed archive file, click the <guilabel>Export...</guilabel> button.</para>
+
+<para>Finally, the group of controls labelled <guilabel>Java Runtime Settings</guilabel> allows you to set some options for the way in which &Java; should run. These options are useful for diagnosing problems, or if you are a &Java; developer, and should not normally need adjusting.</para>
+
+<para>If you select the <guilabel>Show Java Console</guilabel> option, &konqueror; will open a console window from which &Java; applications can read and write text. While most &Java; applications will not require such a console, it could be helpful in diagnosing problems with &Java; applications.</para>
+
+<para><guilabel>Use TDEIO</guilabel> will cause the <acronym>JVM</acronym>to use &kde;'s own <acronym>TDEIO</acronym> transports for network connections.</para>
+
+<para><guilabel>Use security manager</guilabel> is normally enabled by default. This setting will cause the <acronym>JVM</acronym> to run with a Security Manager in place. This will keep applets from being able to read and write to your file system, creating arbitrary sockets, and other actions which could be used to compromise your system. Disable this option at your own risk. You can modify your <filename>$<envar>HOME</envar>/.java.policy</filename> file with the &Java; policytool utility to give code downloaded from certain sites more permissions.</para>
+
+<para>The <guilabel>Shutdown Applet Server when inactive</guilabel> checkbox allows you to save resources by closing the &Java; Applet Server when it is not in use, rather than leaving it running in the background. Leaving this disabled may make &Java; applets start up faster, but it will use system resources when you are not using a &Java; applet. If you enable this, you can set a timeout.</para>
+
+<para>You can either opt to have &konqueror; automatically detect the &Java; installation on your system, or specify the path to the installation yourself by selecting <guilabel>Use user-specified Java</guilabel>. You may want to choose the latter method, for instance, if you have multiple &Java; installations on your system, and want to specify which one to use. If the &Java; Virtual Machine you are using requires any special startup options, you can type them in the text box labelled <guilabel>Additional Java Arguments</guilabel>.</para>
 
 </sect2>
 
 <sect2 id="kbrowse-javascript">
-<title
->JavaScript</title>
-
-<para
->Despite the name, JavaScript is not related at all to &Java;.</para>
-
-<para
->The first part of this page works the same as the &Java; page settings.</para>
-
-<para
->The checkboxes under <guilabel
->Global Settings</guilabel
-> allow you to turn JavaScript support on for all web sites by default. You can also select to turn JavaScript on or off for specific hosts. To add a policy for a specific host, click the <guilabel
->Add...</guilabel
-> button to bring up a dialogue in which you can type the host name and then choose to accept or reject JavaScript code from that particular host, which will add the domain to the list on the left of the page.</para>
-
-<para
->You can select a host in the list, and click the <guilabel
->Change...</guilabel
-> button to choose a different policy for that host. Clicking the <guilabel
->Delete</guilabel
-> button removes the policy for the selected host; after deletion, the global settings will then apply to that host. You can import policies from a file by clicking the <guilabel
->Import...</guilabel
-> button. To save the current list to a compressed archive file, click the <guilabel
->Export...</guilabel
-> button.</para>
-
-<para
->The final set of options on this page determine what happens when a page uses JavaScript for specific actions.</para>
-
-<para
->You can individually enable or disable the ability of JavaScript to manipulate your windows by moving, resizing or changing focus. You can also disable JavaScript from changing the status bar text, so that for instance, you can always see where links will take you when clicked.The choices for these options are <guilabel
->Allow</guilabel
-> and <guilabel
->Ignore</guilabel
->.</para>
-
-<para
->For opening a new window, there is even more control. You can set &konqueror; to <guilabel
->Allow</guilabel
-> all such requests, <guilabel
->Ask</guilabel
-> each time a request is made, or <guilabel
->Deny</guilabel
-> all popup requests.</para>
-
-<para
->The <guilabel
->Smart</guilabel
-> setting will only allow JavaScript popup windows when you have explicitly chosen a link that creates one.</para>
+<title>JavaScript</title>
+
+<para>Despite the name, JavaScript is not related at all to &Java;.</para>
+
+<para>The first part of this page works the same as the &Java; page settings.</para>
+
+<para>The checkboxes under <guilabel>Global Settings</guilabel> allow you to turn JavaScript support on for all web sites by default. You can also select to turn JavaScript on or off for specific hosts. To add a policy for a specific host, click the <guilabel>Add...</guilabel> button to bring up a dialogue in which you can type the host name and then choose to accept or reject JavaScript code from that particular host, which will add the domain to the list on the left of the page.</para>
+
+<para>You can select a host in the list, and click the <guilabel>Change...</guilabel> button to choose a different policy for that host. Clicking the <guilabel>Delete</guilabel> button removes the policy for the selected host; after deletion, the global settings will then apply to that host. You can import policies from a file by clicking the <guilabel>Import...</guilabel> button. To save the current list to a compressed archive file, click the <guilabel>Export...</guilabel> button.</para>
+
+<para>The final set of options on this page determine what happens when a page uses JavaScript for specific actions.</para>
+
+<para>You can individually enable or disable the ability of JavaScript to manipulate your windows by moving, resizing or changing focus. You can also disable JavaScript from changing the status bar text, so that for instance, you can always see where links will take you when clicked.The choices for these options are <guilabel>Allow</guilabel> and <guilabel>Ignore</guilabel>.</para>
+
+<para>For opening a new window, there is even more control. You can set &konqueror; to <guilabel>Allow</guilabel> all such requests, <guilabel>Ask</guilabel> each time a request is made, or <guilabel>Deny</guilabel> all popup requests.</para>
+
+<para>The <guilabel>Smart</guilabel> setting will only allow JavaScript popup windows when you have explicitly chosen a link that creates one.</para>
 
 </sect2>
 
 <sect2 id="kbrowse-plugins">
-<title
->Plugins</title>
-
-<para
->The first setting here is <guilabel
->Enable Plugins globally</guilabel
->. If you disable this checkbox, then &konqueror; will not use any plugins. If you enable it, then any installed and configured plugins that it can find will be used by &konqueror;</para>
-
-<para
->You can also restrict &konqueror; to <guilabel
->Only allow HTTP and HTTPS URLs for plugins</guilabel
-> by checking the box.</para>
+<title>Plugins</title>
+
+<para>The first setting here is <guilabel>Enable Plugins globally</guilabel>. If you disable this checkbox, then &konqueror; will not use any plugins. If you enable it, then any installed and configured plugins that it can find will be used by &konqueror;</para>
+
+<para>You can also restrict &konqueror; to <guilabel>Only allow HTTP and HTTPS URLs for plugins</guilabel> by checking the box.</para>
 
 </sect2>
 &nsplugins-kcontrol; </sect1>
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/tdehtml/nsplugin.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/tdehtml/nsplugin.docbook
index 1e6ada4226a..84d50b0c398 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/tdehtml/nsplugin.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/tdehtml/nsplugin.docbook
@@ -1,99 +1,43 @@
 <sect2 id="nsplugins">
-<title
->&Netscape; Plugins</title>
+<title>&Netscape; Plugins</title>
 
 <sect3 id="nsplugins-intro">
-<title
->Introduction</title>
+<title>Introduction</title>
 
-<para
->As &Netscape;'s <application
->Navigator</application
-> has been a web browsing standard for many years, so-called &Netscape; plugins have appeared that allow rich web content. Using those plugins, web sites can contain <acronym
->PDF</acronym
-> files, flash animations, video, &etc; With &konqueror;, you can still use these plugins to take advantage of rich web content.</para>
+<para>As &Netscape;'s <application>Navigator</application> has been a web browsing standard for many years, so-called &Netscape; plugins have appeared that allow rich web content. Using those plugins, web sites can contain <acronym>PDF</acronym> files, flash animations, video, &etc; With &konqueror;, you can still use these plugins to take advantage of rich web content.</para>
 
-<note
-><para
->&Netscape; plugins should not be confused with &konqueror; plugins. The latter ones specifically extend &konqueror;'s functionality; they are normally not used to display rich web content.</para
-></note>
+<note><para>&Netscape; plugins should not be confused with &konqueror; plugins. The latter ones specifically extend &konqueror;'s functionality; they are normally not used to display rich web content.</para></note>
 
 </sect3>
 
 <sect3 id="nsplugins-scan">
-<title
->Scan</title>
-
-<para
->&konqueror; has to know where your &Netscape; plugins are installed. This can be in several places, &ie; you might have system-wide plugins in <filename class="directory"
->/opt/netscape/plugins</filename
-> and your personal plugins in <filename class="directory"
->$<envar
->HOME</envar
->/.netscape/plugins</filename
->. However, &konqueror; will not automatically use the installed plugins: it first has to scan a list of folders. You can initiate the scan by clicking <guibutton
->Scan for new plugins</guibutton
->. Alternatively, you can enable <guilabel
->Scan for new plugins at &kde; startup</guilabel
-> so &konqueror; will scan the appropriate folders every time &kde; starts up, to see whether new plugins have been installed.</para>
-
-<note
-><para
->Enabling <guilabel
->Scan for new plugins at &kde; startup</guilabel
-> can considerably slow down the startup procedure, and is known to give difficulty on certain installations. Turn this option off if you experience problems.</para
-></note>
-
-<para
->To find plugins, &konqueror; will look in the folders specified in the <guilabel
->Scan Folders</guilabel
-> frame. When you use this control module for the first time, this list will already be filled with reasonable paths that should work on most operating systems. If you need to provide a new path, click the <guibutton
->New</guibutton
-> button; then you can either enter the new path in the text edit box to the left, or choose a folder using the file dialogue by clicking the <guibutton
->New...</guibutton
-> button. As scanning the folders can take a little time, you might want to remove folders from the list where you know that no plugins are installed: do this by selecting a folder and clicking <guibutton
->Remove</guibutton
->. Using the <guibutton
->Up</guibutton
-> and <guibutton
->Down</guibutton
-> buttons you can change the order in which folders will be scanned by moving the selected folder up or down.</para>
-
-<para
->As usual, click <guibutton
->Apply</guibutton
-> to save your changes permanently.</para>
+<title>Scan</title>
+
+<para>&konqueror; has to know where your &Netscape; plugins are installed. This can be in several places, &ie; you might have system-wide plugins in <filename class="directory">/opt/netscape/plugins</filename> and your personal plugins in <filename class="directory">$<envar>HOME</envar>/.netscape/plugins</filename>. However, &konqueror; will not automatically use the installed plugins: it first has to scan a list of folders. You can initiate the scan by clicking <guibutton>Scan for new plugins</guibutton>. Alternatively, you can enable <guilabel>Scan for new plugins at &kde; startup</guilabel> so &konqueror; will scan the appropriate folders every time &kde; starts up, to see whether new plugins have been installed.</para>
+
+<note><para>Enabling <guilabel>Scan for new plugins at &kde; startup</guilabel> can considerably slow down the startup procedure, and is known to give difficulty on certain installations. Turn this option off if you experience problems.</para></note>
+
+<para>To find plugins, &konqueror; will look in the folders specified in the <guilabel>Scan Folders</guilabel> frame. When you use this control module for the first time, this list will already be filled with reasonable paths that should work on most operating systems. If you need to provide a new path, click the <guibutton>New</guibutton> button; then you can either enter the new path in the text edit box to the left, or choose a folder using the file dialogue by clicking the <guibutton>New...</guibutton> button. As scanning the folders can take a little time, you might want to remove folders from the list where you know that no plugins are installed: do this by selecting a folder and clicking <guibutton>Remove</guibutton>. Using the <guibutton>Up</guibutton> and <guibutton>Down</guibutton> buttons you can change the order in which folders will be scanned by moving the selected folder up or down.</para>
+
+<para>As usual, click <guibutton>Apply</guibutton> to save your changes permanently.</para>
 
 </sect3>
 
 <sect3 id="nsplugins-plugins">
-<title
->Plugins</title>
+<title>Plugins</title>
 
-<para
->In this tab, you can see a list of the &Netscape; plugins found by &konqueror;, displayed as a tree. Double click on a plugin to fold it out and you'll see that the different mime types this plugin can handle will be displayed as branches. Fold out a mime type to see its info.</para>
+<para>In this tab, you can see a list of the &Netscape; plugins found by &konqueror;, displayed as a tree. Double click on a plugin to fold it out and you'll see that the different mime types this plugin can handle will be displayed as branches. Fold out a mime type to see its info.</para>
 
-<para
->This tab is mostly for informational purposes. The only configurable option is <guilabel
->Use artsdsp to pipe plugin sound through aRts</guilabel
->, which is enabled by default. Disable this if you wish plugins to use their own method for sounds, and you have configured &arts; in such a way that third-party applications can do so (for example, by having it exit when idle, or by having it use a custom sound device on modern soundcards which allow this.)</para>
+<para>This tab is mostly for informational purposes. The only configurable option is <guilabel>Use artsdsp to pipe plugin sound through aRts</guilabel>, which is enabled by default. Disable this if you wish plugins to use their own method for sounds, and you have configured &arts; in such a way that third-party applications can do so (for example, by having it exit when idle, or by having it use a custom sound device on modern soundcards which allow this.)</para>
 
 </sect3>
 
 <sect3 id="nsplugins-author">
-<title
->Section Author</title>
-
-<para
->This section written by: Jost Schenck <email
->jost@schenck.de</email
-></para>
-
-<para
->Conversion to British English: Malcolm Hunter <email
->malcolm.hunter@gmx.co.uk</email
-></para
-> 
+<title>Section Author</title>
+
+<para>This section written by: Jost Schenck <email>jost@schenck.de</email></para>
+
+<para>Conversion to British English: Malcolm Hunter <email>malcolm.hunter@gmx.co.uk</email></para> 
 
 </sect3>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/tdm/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/tdm/index.docbook
index a54991df318..8c5f5ea55f6 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/tdm/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/tdm/index.docbook
@@ -2,504 +2,216 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Thomas.Tanghus; &Thomas.Tanghus.mail;</author>
-<author
->&Steffen.Hansen; &Steffen.Hansen.mail;</author>
-<author
->&Mike.McBride; &Mike.McBride.mail;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Thomas.Tanghus; &Thomas.Tanghus.mail;</author>
+<author>&Steffen.Hansen; &Steffen.Hansen.mail;</author>
+<author>&Mike.McBride; &Mike.McBride.mail;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-02-13</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-02-13</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->TDM configuration</keyword>
-<keyword
->login manager</keyword>
-<keyword
->login</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>TDM configuration</keyword>
+<keyword>login manager</keyword>
+<keyword>login</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="login-manager">
-<title
->Login Manager</title>
-
-<para
->Using this module, you can configure the &kde; graphical login manager, &tdm;. You can change how the login screen looks, who has access using the login manager and who can shutdown the computer.</para>
-
-<para
->In order to organise all of these options, this module is divided into five sections: <link linkend="tdmconfig-appearance"
-><guilabel
->Appearance</guilabel
-></link
->, <link linkend="tdmconfig-font"
-><guilabel
->Font</guilabel
-></link
->, <link linkend="tdmconfig-background"
-><guilabel
->Background</guilabel
-></link
->, <link linkend="tdmconfig-sessions"
-><guilabel
->Sessions</guilabel
-></link
->, <link linkend="tdmconfig-users"
-><guilabel
->Users</guilabel
-></link
-> and <link linkend="tdmconfig-convenience"
-><guilabel
->Convenience</guilabel
-></link
->.</para>
-
-<para
->You can switch between the sections using the tabs at the top of the window.</para>
-
-<note
-><para
->If you are not currently logged in as a superuser, you will need to click the <guibutton
->Administrator Mode</guibutton
-> Button. You will then be asked for a superuser password. Entering a correct password will allow you to modify the settings of this module.</para
-></note>
+<title>Login Manager</title>
+
+<para>Using this module, you can configure the &kde; graphical login manager, &tdm;. You can change how the login screen looks, who has access using the login manager and who can shutdown the computer.</para>
+
+<para>In order to organise all of these options, this module is divided into five sections: <link linkend="tdmconfig-appearance"><guilabel>Appearance</guilabel></link>, <link linkend="tdmconfig-font"><guilabel>Font</guilabel></link>, <link linkend="tdmconfig-background"><guilabel>Background</guilabel></link>, <link linkend="tdmconfig-sessions"><guilabel>Sessions</guilabel></link>, <link linkend="tdmconfig-users"><guilabel>Users</guilabel></link> and <link linkend="tdmconfig-convenience"><guilabel>Convenience</guilabel></link>.</para>
+
+<para>You can switch between the sections using the tabs at the top of the window.</para>
+
+<note><para>If you are not currently logged in as a superuser, you will need to click the <guibutton>Administrator Mode</guibutton> Button. You will then be asked for a superuser password. Entering a correct password will allow you to modify the settings of this module.</para></note>
 
 <sect2 id="tdmconfig-appearance">
-<title
->Appearance</title>
+<title>Appearance</title>
 
-<para
->From this page you can change the visual appearance of &tdm;, &kde;'s graphical login manager.</para>
+<para>From this page you can change the visual appearance of &tdm;, &kde;'s graphical login manager.</para>
 
-<para
->The greeting string is the title of the login screen. If the string contains the word <computeroutput
->HOSTNAME</computeroutput
-> it will be translated to the domainless name of the machine &tdm; is installed on.</para>
+<para>The greeting string is the title of the login screen. If the string contains the word <computeroutput>HOSTNAME</computeroutput> it will be translated to the domainless name of the machine &tdm; is installed on.</para>
 
-<para
->You can then choose to show either the current system time, a logo or nothing special in the login box. Make your choice in the radio buttons labelled <guilabel
->Logo area</guilabel
->. Using the <guilabel
->Positions</guilabel
-> setting, you can choose to either centre the content of the logo area or to position it using fixed coordinates.</para>
+<para>You can then choose to show either the current system time, a logo or nothing special in the login box. Make your choice in the radio buttons labelled <guilabel>Logo area</guilabel>. Using the <guilabel>Positions</guilabel> setting, you can choose to either centre the content of the logo area or to position it using fixed coordinates.</para>
 
-<para
->If you chose <guilabel
->Show logo</guilabel
-> you can now choose a logo:</para>
+<para>If you chose <guilabel>Show logo</guilabel> you can now choose a logo:</para>
 
 <itemizedlist>
 <listitem>
-<para
->Drop an image file on the image button.</para>
+<para>Drop an image file on the image button.</para>
 </listitem>
 <listitem>
-<para
->Click on the image button and select a new image from the image chooser dialogue.</para>
+<para>Click on the image button and select a new image from the image chooser dialogue.</para>
 </listitem>
 </itemizedlist>
 
-<para
->If you do not specify a logo the default <filename
->$<envar
->TDEDIR</envar
->/share/apps/tdm/pics/kdelogo.png</filename
-> will be displayed.</para>
+<para>If you do not specify a logo the default <filename>$<envar>TDEDIR</envar>/share/apps/tdm/pics/kdelogo.png</filename> will be displayed.</para>
 
-<para
->While &kde;'s style depends on the settings of the user logged in, the style used by &tdm; can be configured using the <guilabel
->GUI Style</guilabel
-> option.</para>
+<para>While &kde;'s style depends on the settings of the user logged in, the style used by &tdm; can be configured using the <guilabel>GUI Style</guilabel> option.</para>
 
-<para
->Below that, you have two dropdown boxes to choose the language and the country for your login box.</para>
+<para>Below that, you have two dropdown boxes to choose the language and the country for your login box.</para>
 
 </sect2>
 
 <sect2 id="tdmconfig-font">
-<title
->Font</title>
-
-<para
->From this section of the module you can change the fonts used in the login window.</para>
-
-<para
->You can select three different font styles from the drop down box (<guilabel
->Greeting</guilabel
->, <guilabel
->Fail</guilabel
->, <guilabel
->Standard</guilabel
->). When you click on the <guibutton
->Change font</guibutton
-> button a dialogue appears from which you can select the new characteristics for the font style.</para>
+<title>Font</title>
+
+<para>From this section of the module you can change the fonts used in the login window.</para>
+
+<para>You can select three different font styles from the drop down box (<guilabel>Greeting</guilabel>, <guilabel>Fail</guilabel>, <guilabel>Standard</guilabel>). When you click on the <guibutton>Change font</guibutton> button a dialogue appears from which you can select the new characteristics for the font style.</para>
 
 <itemizedlist>
 <listitem>
-<para
->The <guilabel
->Greeting</guilabel
-> font is the font used for the title (Greeting String).</para>
+<para>The <guilabel>Greeting</guilabel> font is the font used for the title (Greeting String).</para>
 </listitem>
 <listitem>
-<para
->The <guilabel
->Fail</guilabel
-> font is used when a login fails.</para>
+<para>The <guilabel>Fail</guilabel> font is used when a login fails.</para>
 </listitem>
 <listitem>
-<para
->The <guilabel
->Standard</guilabel
-> font is used in all other places in the login window.</para>
+<para>The <guilabel>Standard</guilabel> font is used in all other places in the login window.</para>
 </listitem>
 </itemizedlist>
 
-<para
->An example of each font can be seen in the <guilabel
->Example</guilabel
-> Box.</para>
+<para>An example of each font can be seen in the <guilabel>Example</guilabel> Box.</para>
 
 </sect2>
 
 <sect2 id="tdmconfig-background">
-<title
->Background</title>
+<title>Background</title>
 
-<para
->Here you can change the desktop background which will be displayed when a user logs in. You can have a single colour or an image as a background. If you have an image as the background and select centre, the selected background colour will be used around the image if it isn't large enough to cover the entire desktop.</para>
+<para>Here you can change the desktop background which will be displayed when a user logs in. You can have a single colour or an image as a background. If you have an image as the background and select centre, the selected background colour will be used around the image if it isn't large enough to cover the entire desktop.</para>
 
-<para
->The background colours and effects are controlled by the options on the tab labelled <guilabel
->Background</guilabel
-> and you select a background image and its placement from the options on the tab labelled <guilabel
->Wallpaper</guilabel
->.</para>
+<para>The background colours and effects are controlled by the options on the tab labelled <guilabel>Background</guilabel> and you select a background image and its placement from the options on the tab labelled <guilabel>Wallpaper</guilabel>.</para>
 
-<para
->To change the default background colour(s) simply click either of the colour buttons and select a new colour.</para>
+<para>To change the default background colour(s) simply click either of the colour buttons and select a new colour.</para>
 
-<para
->The dropdown box above the colour buttons provides you with several different blend effects. Choose one from the list, and it will be previewed on the small monitor at the top of the window. Your choices are:</para>
+<para>The dropdown box above the colour buttons provides you with several different blend effects. Choose one from the list, and it will be previewed on the small monitor at the top of the window. Your choices are:</para>
 
 <variablelist>
 <varlistentry>
-<term
->Flat</term>
-<listitem
-><para
->By choosing this mode, you select one colour (using the colour button labelled <guibutton
->Colour 1</guibutton
->), and the entire background is covered with this one colour.</para
-></listitem>
+<term>Flat</term>
+<listitem><para>By choosing this mode, you select one colour (using the colour button labelled <guibutton>Colour 1</guibutton>), and the entire background is covered with this one colour.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Pattern</term>
-<listitem
-><para
->By choosing this mode, you select two colours (using both colour buttons). </para
-> <para
->You then select a pattern by clicking <guilabel
->Setup</guilabel
->. This opens a new dialogue window, which gives you the opportunity to select a pattern. Simply click once on the pattern of your choice, then click on <guilabel
->OK</guilabel
->, and &kde; will render the pattern you selected using the two colours you selected. For more on patterns, see the section <ulink url="help:/kcontrol/background/index.html#bkgnd-patterns"
->Background: Adding, Removing and Modifying Patterns</ulink
->.</para
-></listitem>
+<term>Pattern</term>
+<listitem><para>By choosing this mode, you select two colours (using both colour buttons). </para> <para>You then select a pattern by clicking <guilabel>Setup</guilabel>. This opens a new dialogue window, which gives you the opportunity to select a pattern. Simply click once on the pattern of your choice, then click on <guilabel>OK</guilabel>, and &kde; will render the pattern you selected using the two colours you selected. For more on patterns, see the section <ulink url="help:/kcontrol/background/index.html#bkgnd-patterns">Background: Adding, Removing and Modifying Patterns</ulink>.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Background Program</term>
-<listitem
-><para
->By selecting this option, you can have &kde; use an external program to determine the background. This can be any program of your choosing. For more information on this option, see the section entitled <ulink url="help:/kcontrol/background/index.html#bkgnd-programs"
->Background: Using an external program</ulink
->.</para
-></listitem>
+<term>Background Program</term>
+<listitem><para>By selecting this option, you can have &kde; use an external program to determine the background. This can be any program of your choosing. For more information on this option, see the section entitled <ulink url="help:/kcontrol/background/index.html#bkgnd-programs">Background: Using an external program</ulink>.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Horizontal Gradient</term>
-<listitem
-><para
->By choosing this mode, you select two colours (using both colour buttons). &kde; will then start with the colour selected by <guilabel
->Colour 1</guilabel
-> on the left edge of the screen, and slowly transform into the colour selected by <guilabel
->Colour 2</guilabel
-> by the time it gets to the right edge of the screen.</para
-></listitem>
+<term>Horizontal Gradient</term>
+<listitem><para>By choosing this mode, you select two colours (using both colour buttons). &kde; will then start with the colour selected by <guilabel>Colour 1</guilabel> on the left edge of the screen, and slowly transform into the colour selected by <guilabel>Colour 2</guilabel> by the time it gets to the right edge of the screen.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Vertical Gradient</term>
-<listitem
-><para
->By choosing this mode, you select two colours (using both colour buttons). &kde; will then start with the colour selected by <guilabel
->Colour 1</guilabel
-> on the top edge of the screen, and slowly transform into the colour selected by <guilabel
->Colour 2</guilabel
-> as it moves to the bottom of the screen.</para
-></listitem>
+<term>Vertical Gradient</term>
+<listitem><para>By choosing this mode, you select two colours (using both colour buttons). &kde; will then start with the colour selected by <guilabel>Colour 1</guilabel> on the top edge of the screen, and slowly transform into the colour selected by <guilabel>Colour 2</guilabel> as it moves to the bottom of the screen.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Pyramid Gradient</term>
-<listitem
-><para
->By choosing this mode, you select two colours (using both colour buttons). &kde; will then start with the colour selected by <guilabel
->Colour 1</guilabel
-> in each corner of the screen, and slowly transform into the colour selected by <guilabel
->Colour 2</guilabel
-> as it moves to the centre of the screen.</para
-></listitem
-> 
+<term>Pyramid Gradient</term>
+<listitem><para>By choosing this mode, you select two colours (using both colour buttons). &kde; will then start with the colour selected by <guilabel>Colour 1</guilabel> in each corner of the screen, and slowly transform into the colour selected by <guilabel>Colour 2</guilabel> as it moves to the centre of the screen.</para></listitem> 
 </varlistentry>
 <varlistentry>
-<term
->Pipecross Gradient</term>
-<listitem
-><para
->By choosing this mode, you select two colours (using both colour buttons). &kde; will then start with the colour selected by <guilabel
->Colour 1</guilabel
-> in each corner of the screen, and slowly transform into the colour selected by <guilabel
->Colour 2</guilabel
-> as it moves to the centre of the screen. The <quote
->shape</quote
-> of this gradient is different then the pyramid gradient.</para
-></listitem>
+<term>Pipecross Gradient</term>
+<listitem><para>By choosing this mode, you select two colours (using both colour buttons). &kde; will then start with the colour selected by <guilabel>Colour 1</guilabel> in each corner of the screen, and slowly transform into the colour selected by <guilabel>Colour 2</guilabel> as it moves to the centre of the screen. The <quote>shape</quote> of this gradient is different then the pyramid gradient.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Elliptic Gradient</term>
-<listitem
-><para
->By choosing this mode, you select two colours (using both colour buttons). &kde; will then start with the colour selected by <guilabel
->Colour 2</guilabel
-> in the centre of the screen, and slowly transform into the colour selected by <guilabel
->Colour 1</guilabel
-> as it moves to the edges, in an elliptical pattern.</para
-></listitem
-> 
+<term>Elliptic Gradient</term>
+<listitem><para>By choosing this mode, you select two colours (using both colour buttons). &kde; will then start with the colour selected by <guilabel>Colour 2</guilabel> in the centre of the screen, and slowly transform into the colour selected by <guilabel>Colour 1</guilabel> as it moves to the edges, in an elliptical pattern.</para></listitem> 
 </varlistentry>
 </variablelist>
 
-<para
->The setup button is only needed for if you select <guilabel
->Background program</guilabel
-> or <guilabel
->Patterns</guilabel
->. In these instances, another window will appear to configure the specifics.</para>
-<para
-><emphasis
->Wallpaper</emphasis
-></para>
-<para
->To select a new background image first, click on the <guilabel
->Wallpapers</guilabel
-> tab, then you can either select an image from the drop-down list labelled <guilabel
->Wallpaper</guilabel
-> or select <guibutton
->Browse...</guibutton
-> and select an image file from a file selector.</para>
-
-<para
->The image can be displayed in six different ways:</para>
+<para>The setup button is only needed for if you select <guilabel>Background program</guilabel> or <guilabel>Patterns</guilabel>. In these instances, another window will appear to configure the specifics.</para>
+<para><emphasis>Wallpaper</emphasis></para>
+<para>To select a new background image first, click on the <guilabel>Wallpapers</guilabel> tab, then you can either select an image from the drop-down list labelled <guilabel>Wallpaper</guilabel> or select <guibutton>Browse...</guibutton> and select an image file from a file selector.</para>
+
+<para>The image can be displayed in six different ways:</para>
 <variablelist>
 <varlistentry>
-<term
->No wallpaper</term
-> 
-<listitem
-><para
->No image is displayed. Just the background colours.</para>
-</listitem
-></varlistentry>
+<term>No wallpaper</term> 
+<listitem><para>No image is displayed. Just the background colours.</para>
+</listitem></varlistentry>
 <varlistentry>
-<term
->Centred</term
-> 
-<listitem
-><para
->The image will be centred on the screen. The background colours will be present anywhere the image does not cover.</para
-> </listitem>
+<term>Centred</term> 
+<listitem><para>The image will be centred on the screen. The background colours will be present anywhere the image does not cover.</para> </listitem>
 </varlistentry>
 <varlistentry>
-<term
->Tiled</term>
-<listitem
-><para
->The image will be duplicated until it fills the entire desktop. The first image will be placed in the upper left corner of the screen, and duplicated downward and to the right.</para
-> </listitem>
+<term>Tiled</term>
+<listitem><para>The image will be duplicated until it fills the entire desktop. The first image will be placed in the upper left corner of the screen, and duplicated downward and to the right.</para> </listitem>
 </varlistentry>
 <varlistentry>
-<term
->Centre Tiled</term>
-<listitem
-><para
->The image will be duplicated until it fills the entire desktop. The first image will be placed in the centre of the screen, and duplicated upward, downward to the right, and to the left.</para
-> </listitem>
+<term>Centre Tiled</term>
+<listitem><para>The image will be duplicated until it fills the entire desktop. The first image will be placed in the centre of the screen, and duplicated upward, downward to the right, and to the left.</para> </listitem>
 </varlistentry>
 <varlistentry>
-<term
->Centred Maxpect</term>
-<listitem
-><para
->The image will be placed in the centre of the screen. It will be scaled to fit the desktop, but it will not change the aspect ratio of the original image. This will provide you with an image that is not distorted. </para
-> </listitem>
+<term>Centred Maxpect</term>
+<listitem><para>The image will be placed in the centre of the screen. It will be scaled to fit the desktop, but it will not change the aspect ratio of the original image. This will provide you with an image that is not distorted. </para> </listitem>
 </varlistentry>
 <varlistentry>
-<term
->Scaled</term>
-<listitem
-><para
->The image will be scaled to fit the desktop. It will be stretched to fit all four corners.</para
-> </listitem>
+<term>Scaled</term>
+<listitem><para>The image will be scaled to fit the desktop. It will be stretched to fit all four corners.</para> </listitem>
 </varlistentry>
 </variablelist>
 
 </sect2>
 
 <sect2 id="tdmconfig-sessions">
-<title
->Sessions</title>
-
-<para
-><guilabel
->Allow to shutdown</guilabel
-></para>
-<para
->Use this dropdown box to choose who is allowed to shut down:</para>
+<title>Sessions</title>
+
+<para><guilabel>Allow to shutdown</guilabel></para>
+<para>Use this dropdown box to choose who is allowed to shut down:</para>
 <itemizedlist>
 <listitem>
-<para
-><guilabel
->None</guilabel
->: No one can shutdown the computer using &tdm;. You must be logged in, and execute a command.</para>
+<para><guilabel>None</guilabel>: No one can shutdown the computer using &tdm;. You must be logged in, and execute a command.</para>
 </listitem>
 <listitem>
-<para
-><guilabel
->All</guilabel
->: Everyone can shutdown the computer using &tdm;.</para>
+<para><guilabel>All</guilabel>: Everyone can shutdown the computer using &tdm;.</para>
 </listitem>
-<listitem
-><para
-><guilabel
->Root only</guilabel
->: &tdm; requires that the <systemitem
->root</systemitem
-> password be entered before shutting down the computer.</para
-></listitem
-> 
-<listitem
-><para
-><guilabel
->Console only</guilabel
->: The user must be at this console, to shut down the computer.</para
-></listitem>
+<listitem><para><guilabel>Root only</guilabel>: &tdm; requires that the <systemitem>root</systemitem> password be entered before shutting down the computer.</para></listitem> 
+<listitem><para><guilabel>Console only</guilabel>: The user must be at this console, to shut down the computer.</para></listitem>
 </itemizedlist>
 
-<para
-><emphasis
->Commands</emphasis
-></para>
-<para
->Use these 3 blanks to define the exact shutdown command.</para>
-<para
->The shutdown command defaults to:</para>
-
-<para
-><command
->/sbin/shutdown</command
-></para>
-
-<para
->The restart command defaults to:</para>
-
-<para
-><command
->/sbin/reboot</command
-></para>
-
-<para
->The Console mode (which restarts the computer as a console only terminal) defaults to:</para>
-
-<para
-><command
->/sbin/init <option
->3</option
-></command
-></para>
-
-<para
->When <guilabel
->Show boot options</guilabel
-> is enabled, &tdm; will on reboot offer you options for the lilo boot manager. For this feature to work, you will need to supply the correct paths to your <command
->lilo</command
-> command and to lilo's map file.</para>
+<para><emphasis>Commands</emphasis></para>
+<para>Use these 3 blanks to define the exact shutdown command.</para>
+<para>The shutdown command defaults to:</para>
+
+<para><command>/sbin/shutdown</command></para>
+
+<para>The restart command defaults to:</para>
+
+<para><command>/sbin/reboot</command></para>
+
+<para>The Console mode (which restarts the computer as a console only terminal) defaults to:</para>
+
+<para><command>/sbin/init <option>3</option></command></para>
+
+<para>When <guilabel>Show boot options</guilabel> is enabled, &tdm; will on reboot offer you options for the lilo boot manager. For this feature to work, you will need to supply the correct paths to your <command>lilo</command> command and to lilo's map file.</para>
 
 
 <sect3 id="tdmconfig-sess">
-<title
->Session types</title>
-
-<para
->Define which session types should be accessible from the login window.</para>
-
-<para
->For more information on this subject, look at <filename class="directory"
->/etc/X11/xdm/Xsession</filename
-> to find your <application
->xdm</application
-> setup files. Also review the <ulink url="man:xdm"
->xdm man pages</ulink
->, especially under the SESSION PROGRAM section.</para>
-
-<para
->To add a session, type its name in the blank entitled <guilabel
->New types</guilabel
->, and click <guibutton
->Add new</guibutton
->. </para>
-
-<para
->To remove a session, select the session from the list and click <guibutton
->Remove</guibutton
->.</para>
+<title>Session types</title>
+
+<para>Define which session types should be accessible from the login window.</para>
+
+<para>For more information on this subject, look at <filename class="directory">/etc/X11/xdm/Xsession</filename> to find your <application>xdm</application> setup files. Also review the <ulink url="man:xdm">xdm man pages</ulink>, especially under the SESSION PROGRAM section.</para>
+
+<para>To add a session, type its name in the blank entitled <guilabel>New types</guilabel>, and click <guibutton>Add new</guibutton>. </para>
+
+<para>To remove a session, select the session from the list and click <guibutton>Remove</guibutton>.</para>
 
 </sect3>
 
@@ -507,210 +219,98 @@
 
 
 <sect2 id="tdmconfig-users">
-<title
->Users</title>
+<title>Users</title>
 
-<para
->From here you can change the way users are represented in the login window.</para>
+<para>From here you can change the way users are represented in the login window.</para>
 
-<para
->As you look on this window, you will see three lists (All users, selected users, and no-show users). You also see an image box, and a set of options along the right side of the window.</para>
+<para>As you look on this window, you will see three lists (All users, selected users, and no-show users). You also see an image box, and a set of options along the right side of the window.</para>
 
-<para
->The first thing you must decide, is if you are going to show users or not.</para>
+<para>The first thing you must decide, is if you are going to show users or not.</para>
 
 
-<para
->If you choose to show users, then the login window will show images (which you select), of a list of users. When someone is ready to login, they select their user name/image, enter their password, and they are granted access. </para>
+<para>If you choose to show users, then the login window will show images (which you select), of a list of users. When someone is ready to login, they select their user name/image, enter their password, and they are granted access. </para>
 
-<para
->If you choose not to show users, then the login window will be more traditional. Users will need to type their username, and password to gain entrance. This is the preferred way if you have many users on this terminal.</para>
+<para>If you choose not to show users, then the login window will be more traditional. Users will need to type their username, and password to gain entrance. This is the preferred way if you have many users on this terminal.</para>
 
 <sect3 id="tdmconfig-showusers">
-<title
->To show (and sort) or not to show users</title>
+<title>To show (and sort) or not to show users</title>
 
-<para
->Along the right edge of the window are two check boxes:</para>
+<para>Along the right edge of the window are two check boxes:</para>
 
-<para
->If <guilabel
->Show users</guilabel
-> is selected, you have chosen to show images of users, instead of making them type their login name.</para>
+<para>If <guilabel>Show users</guilabel> is selected, you have chosen to show images of users, instead of making them type their login name.</para>
 
-<para
->If <guilabel
->Sort users</guilabel
-> is selected, then the list of users will be sorted alphabetically in the login window. If unchecked, users will be listed in the same order as they are on this page. If <guilabel
->Show users</guilabel
-> is not checked, this has no effect.</para>
+<para>If <guilabel>Sort users</guilabel> is selected, then the list of users will be sorted alphabetically in the login window. If unchecked, users will be listed in the same order as they are on this page. If <guilabel>Show users</guilabel> is not checked, this has no effect.</para>
 
 </sect3>
 
 <sect3 id="tdmconfig-whichusers">
-<title
->How to determine which users to show and which users to hide</title>
+<title>How to determine which users to show and which users to hide</title>
 
-<para
->Below the user image box, and above the <guilabel
->Show users</guilabel
-> check box, is a set of two radio buttions:</para>
+<para>Below the user image box, and above the <guilabel>Show users</guilabel> check box, is a set of two radio buttions:</para>
 
 <itemizedlist>
-<listitem
-><para
->Show only selected users: If this option is selected, only the users contained in the list labelled <guilabel
->Selected Users</guilabel
->, will be displayed in the login window. If <guilabel
->Show users</guilabel
-> is not checked, this has no effect.</para
-></listitem>
-<listitem
-><para
->Show all users but no-show users: If this option is selected, all users will be listed, <emphasis
->except</emphasis
-> those users contained in the list entitled <guilabel
->No show users</guilabel
->. If <guilabel
->Show users</guilabel
-> is not checked, this has no effect. </para
-></listitem>
+<listitem><para>Show only selected users: If this option is selected, only the users contained in the list labelled <guilabel>Selected Users</guilabel>, will be displayed in the login window. If <guilabel>Show users</guilabel> is not checked, this has no effect.</para></listitem>
+<listitem><para>Show all users but no-show users: If this option is selected, all users will be listed, <emphasis>except</emphasis> those users contained in the list entitled <guilabel>No show users</guilabel>. If <guilabel>Show users</guilabel> is not checked, this has no effect. </para></listitem>
 </itemizedlist>
 
 </sect3>
 
 <sect3 id="tdmconfig-select">
-<title
->Select users</title>
+<title>Select users</title>
 
-<para
->This page contains three listboxes. The large listbox on the left shows all the users on the system which might be a genuine user.</para>
+<para>This page contains three listboxes. The large listbox on the left shows all the users on the system which might be a genuine user.</para>
 
-<para
->The top rightmost listbox shows the selected users and the bottom rightmost listbox shows the users we don't want displayed in the login window.</para>
+<para>The top rightmost listbox shows the selected users and the bottom rightmost listbox shows the users we don't want displayed in the login window.</para>
 
-<para
->To move a user from one listbox to another you click on the username in the listbox and click <guibutton
->&gt;&gt;</guibutton
-> to move the user from the leftmost box the the rightmost box or <guibutton
->&lt;&lt;</guibutton
-> to move the user from the rightmost box to the leftmost box.</para>
+<para>To move a user from one listbox to another you click on the username in the listbox and click <guibutton>&gt;&gt;</guibutton> to move the user from the leftmost box the the rightmost box or <guibutton>&lt;&lt;</guibutton> to move the user from the rightmost box to the leftmost box.</para>
 
 </sect3>
 
 <sect3 id="tdmconfig-image">
-<title
->Images</title>
-
-<note
-><para
->This section of the manual only applies if <guilabel
->Show users</guilabel
-> is selected. If it is not, this image box has no effect.</para
-></note>
-
-<para
->Every user on the system can be represented by a image. The image for the user is kept in a file called <filename
->$<envar
->TDEDIR</envar
->/share/apps/tdm/pics/users/$<envar
->USER</envar
->.xpm.</filename
-> If the user doesn't have such a file the file <filename
->$<envar
->TDEDIR</envar
->/share/apps/tdm/pics/users/default.xpm</filename
-> will be used instead.</para>
-
-<para
->To assign a new image to a user just select the user in one of the listboxes and either drop an imagefile on the image button to the right or click on the image button and select a new image from the image selector.</para>
-
-<para
->If no user is currently selected you will be asked if you want to change the default image.</para>
-
-<para
->The replacement is performed by a &konqueror; process so if the image file already exists you will be prompted by &konqueror; if you want to replace it. If you confirm the image will be replaced - you will <emphasis
->not</emphasis
-> have to press the <guibutton
->Apply</guibutton
-> button.</para>
+<title>Images</title>
+
+<note><para>This section of the manual only applies if <guilabel>Show users</guilabel> is selected. If it is not, this image box has no effect.</para></note>
+
+<para>Every user on the system can be represented by a image. The image for the user is kept in a file called <filename>$<envar>TDEDIR</envar>/share/apps/tdm/pics/users/$<envar>USER</envar>.xpm.</filename> If the user doesn't have such a file the file <filename>$<envar>TDEDIR</envar>/share/apps/tdm/pics/users/default.xpm</filename> will be used instead.</para>
+
+<para>To assign a new image to a user just select the user in one of the listboxes and either drop an imagefile on the image button to the right or click on the image button and select a new image from the image selector.</para>
+
+<para>If no user is currently selected you will be asked if you want to change the default image.</para>
+
+<para>The replacement is performed by a &konqueror; process so if the image file already exists you will be prompted by &konqueror; if you want to replace it. If you confirm the image will be replaced - you will <emphasis>not</emphasis> have to press the <guibutton>Apply</guibutton> button.</para>
 
 </sect3>
 </sect2>
 
 
 <sect2 id="tdmconfig-convenience">
-<title
->Convenience</title>
+<title>Convenience</title>
 
-<para
->In the <guilabel
->convenience</guilabel
-> tab you can configure some options that make life easier for lazy people, like auto login or disabling passwords.</para>
+<para>In the <guilabel>convenience</guilabel> tab you can configure some options that make life easier for lazy people, like auto login or disabling passwords.</para>
 
-<important
-><para
->Please think more than twice before using these options. Every option in the <guilabel
->convenience</guilabel
-> tab is well-suited to seriously compromise your system security. Practically, these options are only to be used in a completely non-critical environment, &eg; a private computer at home. </para
-></important>
+<important><para>Please think more than twice before using these options. Every option in the <guilabel>convenience</guilabel> tab is well-suited to seriously compromise your system security. Practically, these options are only to be used in a completely non-critical environment, &eg; a private computer at home. </para></important>
 
 <sect3 id="loginmanager-convenience-autologin">
-<title
->Automatic Login</title>
-
-<para
->Automatic login will give anyone access to a certain account on your system without doing any authentication. You can enable it using the option <guilabel
->Enable auto-login</guilabel
->.</para>
-
-<para
->Automatic login comes in two flavours: <guilabel
->truly automatic login</guilabel
-> acts like you would expect automatic login to, &ie; &tdm; will automatically login without expecting any input from the user. Enable this using the <guilabel
->Truly automatic login</guilabel
-> option. If this option is not enabled, &tdm; will start normally, enabling you to login as any user, and will only perform automatic login if you kill the X server, &eg; by pressing <keycombo action="simul"
->&Ctrl;&Alt;<keycap
->Backspace</keycap
-></keycombo
->.</para>
-
-<para
->You can choose the account to be used for automatic login in the list below.</para>
+<title>Automatic Login</title>
+
+<para>Automatic login will give anyone access to a certain account on your system without doing any authentication. You can enable it using the option <guilabel>Enable auto-login</guilabel>.</para>
+
+<para>Automatic login comes in two flavours: <guilabel>truly automatic login</guilabel> acts like you would expect automatic login to, &ie; &tdm; will automatically login without expecting any input from the user. Enable this using the <guilabel>Truly automatic login</guilabel> option. If this option is not enabled, &tdm; will start normally, enabling you to login as any user, and will only perform automatic login if you kill the X server, &eg; by pressing <keycombo action="simul">&Ctrl;&Alt;<keycap>Backspace</keycap></keycombo>.</para>
+
+<para>You can choose the account to be used for automatic login in the list below.</para>
 
 </sect3>
 
 <sect3 id="loginmanager-convenience-nopasswd">
-<title
->Password-less Login</title>
-
-<para
->Using this feature, you can allow certain users to login without having to provide their password. Enable this feature using the <guilabel
->Enable password-less logins</guilabel
-> option.</para>
-
-<para
->Below this option you will see a list of users for which a password is required, as well as a (by default, empty) list of users that do not need to provide a password. When <guilabel
->Enable password-less logins</guilabel
-> is enabled, you can move users from one list into the other, by selecting them and then clicking the <guibutton
->&gt;&gt;</guibutton
-> and <guibutton
->&lt;&lt;</guibutton
-> buttons.</para>
-
-<important
-><para
->Again, this option should only be used in a safe environment. If you enable it on a rather public system you should take care that only users with heavy access restrictions are granted password-less login, &eg; <systemitem
->guest</systemitem
->.</para
-></important>
-
-<para
->The <guilabel
->Automatically login after X server crash</guilabel
-> option allows you to skip the authentication procedure when your X server accidentally crashed. <guilabel
->Show previous user</guilabel
-> will show the name of the last login already entered into the login field in &tdm;. Some site administrators would consider even this a possible security weakness, because potential attackers then know at least one valid login.</para>
+<title>Password-less Login</title>
+
+<para>Using this feature, you can allow certain users to login without having to provide their password. Enable this feature using the <guilabel>Enable password-less logins</guilabel> option.</para>
+
+<para>Below this option you will see a list of users for which a password is required, as well as a (by default, empty) list of users that do not need to provide a password. When <guilabel>Enable password-less logins</guilabel> is enabled, you can move users from one list into the other, by selecting them and then clicking the <guibutton>&gt;&gt;</guibutton> and <guibutton>&lt;&lt;</guibutton> buttons.</para>
+
+<important><para>Again, this option should only be used in a safe environment. If you enable it on a rather public system you should take care that only users with heavy access restrictions are granted password-less login, &eg; <systemitem>guest</systemitem>.</para></important>
+
+<para>The <guilabel>Automatically login after X server crash</guilabel> option allows you to skip the authentication procedure when your X server accidentally crashed. <guilabel>Show previous user</guilabel> will show the name of the last login already entered into the login field in &tdm;. Some site administrators would consider even this a possible security weakness, because potential attackers then know at least one valid login.</para>
 
 
 </sect3>
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/twindecoration/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/twindecoration/index.docbook
index b4194089571..a7731676695 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/twindecoration/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/twindecoration/index.docbook
@@ -2,87 +2,48 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Rik.Hemsley; &Rik.Hemsley.mail;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Rik.Hemsley; &Rik.Hemsley.mail;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2003-09-28</date>
-<releaseinfo
->3.2</releaseinfo>
+<date>2003-09-28</date>
+<releaseinfo>3.2</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->twin</keyword>
-<keyword
->window</keyword>
-<keyword
->border</keyword>
-<keyword
->theme</keyword>
-<keyword
->style</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>twin</keyword>
+<keyword>window</keyword>
+<keyword>border</keyword>
+<keyword>theme</keyword>
+<keyword>style</keyword>
 </keywordset>
 </articleinfo>
 <sect1 id="window-deco">
-<title
->Window Decoration</title>
+<title>Window Decoration</title>
 
 <sect2>
-<title
->General</title>
+<title>General</title>
 
-<para
->This module allows you to select a style for the borders around windows.</para>
+<para>This module allows you to select a style for the borders around windows.</para>
 
-<para
->Each style has a different look, but also a different <quote
->feel</quote
->. Some have (sometimes invisible) <quote
->resize</quote
-> borders all around the edge, which make resizing easier but moving more difficult. Some have no borders on certain edges. One (<quote
->BII</quote
->) even has a dynamically sized and positioned title element.</para>
+<para>Each style has a different look, but also a different <quote>feel</quote>. Some have (sometimes invisible) <quote>resize</quote> borders all around the edge, which make resizing easier but moving more difficult. Some have no borders on certain edges. One (<quote>BII</quote>) even has a dynamically sized and positioned title element.</para>
 
-<para
->You are encouraged to experiment with the different styles until you find one which best suits your pattern of work.</para>
+<para>You are encouraged to experiment with the different styles until you find one which best suits your pattern of work.</para>
 
-<para
->Choose a window decoration style from the drop down box at the top of the screen to see a preview of it in the lower pane.</para>
+<para>Choose a window decoration style from the drop down box at the top of the screen to see a preview of it in the lower pane.</para>
 
-<para
->If there are any configurable options for the theme you chose on the first page, they will become available below the preview...</para>
+<para>If there are any configurable options for the theme you chose on the first page, they will become available below the preview...</para>
 
 <!-- 
-<para
->In particular, if you chose to use the IceWM theme, you can choose
+<para>In particular, if you chose to use the IceWM theme, you can choose
 here which of the many IceWM themes to use.  The IceWM theme has
 instructions on the page as to where you should copy the theme files,
 and once this is done, you can simply select the theme you want to
@@ -92,28 +53,22 @@ use.</para>
 </sect2>
 
 <sect2>
-<title
->Buttons</title>
+<title>Buttons</title>
 
-<para
->This page has instructions directly on it - just drag around the buttons until you have the order that makes you comfortable.</para>
+<para>This page has instructions directly on it - just drag around the buttons until you have the order that makes you comfortable.</para>
 
 <note>
-<para
->Not all the window decorations are able to comply with your custom set button order. The ones that cannot are being converted, but at the time of this release they have not been all been changed.</para>
+<para>Not all the window decorations are able to comply with your custom set button order. The ones that cannot are being converted, but at the time of this release they have not been all been changed.</para>
 </note>
 
-<para
->Apart from choosing the window decoration itself, you can choose here two further options: If there should be a tooltip while you hover your mouse over a window decoration button, and if the window decoration should attempt to use a custom set button order.</para>
+<para>Apart from choosing the window decoration itself, you can choose here two further options: If there should be a tooltip while you hover your mouse over a window decoration button, and if the window decoration should attempt to use a custom set button order.</para>
 
 <tip>
-<para
->The tooltips can be quite useful if you have set a custom button order, and then changed to an unfamiliar window decoration.</para>
+<para>The tooltips can be quite useful if you have set a custom button order, and then changed to an unfamiliar window decoration.</para>
 </tip>
 
 <tip>
-<para
->For accessibility purposes, some window decorations support extra wide borders. If this is available, you can also choose a border size here. These large borders are easier to see for low vision users, and easier to grab for people with limited mobility or difficulty using a mouse.</para>
+<para>For accessibility purposes, some window decorations support extra wide borders. If this is available, you can also choose a border size here. These large borders are easier to see for low vision users, and easier to grab for people with limited mobility or difficulty using a mouse.</para>
 </tip>
 
 </sect2>
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/useragent/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/useragent/index.docbook
index 09f16321c6c..df515db9587 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/useragent/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/useragent/index.docbook
@@ -2,149 +2,67 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
-<title
->Browser Identification</title>
+<title>Browser Identification</title>
 <articleinfo>
 <authorgroup>
-<author
->&Krishna.Tateneni; &Krishna.Tateneni.mail;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Krishna.Tateneni; &Krishna.Tateneni.mail;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2003-10-12</date>
-<releaseinfo
->3.2</releaseinfo>
+<date>2003-10-12</date>
+<releaseinfo>3.2</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->user agent</keyword>
-<keyword
->browser</keyword>
-<keyword
->identification</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>user agent</keyword>
+<keyword>browser</keyword>
+<keyword>identification</keyword>
 </keywordset>
 
 </articleinfo>
 
 <sect1 id="user-agent">
-<title
->Browser Identification</title>
+<title>Browser Identification</title>
 
 
 <sect2 id="user-agent-intro">
-<title
->Introduction</title>
+<title>Introduction</title>
 
-<para
->When &konqueror; connects to a web site to retrieve information, some basic identifying information is sent to the web site in the form of a <quote
->User Agent</quote
-> header.</para>
+<para>When &konqueror; connects to a web site to retrieve information, some basic identifying information is sent to the web site in the form of a <quote>User Agent</quote> header.</para>
 
-<para
->Because of minor differences in the way that different web browsers function, web sites that rely too much on a single browser may sometimes not display as intended when viewed using another browser. Some web sites are smart enough to examine the contents of the user agent header and incorporate this information in the <acronym
->HTML</acronym
-> code so that the content is displayed correctly regardless of the browser used.</para>
+<para>Because of minor differences in the way that different web browsers function, web sites that rely too much on a single browser may sometimes not display as intended when viewed using another browser. Some web sites are smart enough to examine the contents of the user agent header and incorporate this information in the <acronym>HTML</acronym> code so that the content is displayed correctly regardless of the browser used.</para>
 
-<para
->However, you may find that some web sites refuse to function correctly unless you are using a browser recognised as <quote
->proper</quote
-> by that site. In these cases, you may find it necessary to fool the web site by having &konqueror; report itself to be another browser by means of the user agent header.</para>
+<para>However, you may find that some web sites refuse to function correctly unless you are using a browser recognised as <quote>proper</quote> by that site. In these cases, you may find it necessary to fool the web site by having &konqueror; report itself to be another browser by means of the user agent header.</para>
 
 </sect2>
 
 <sect2 id="user-agent-use">
-<title
->Use</title>
-
-<para
->In this module you can configure the type of browser that &konqueror; will report itself to be. You can control this information by web site. Usually, the list box that is labeled <guilabel
->Site/Domain Specific Identification</guilabel
-> will be empty, so that &konqueror; will always use its default useragent string.</para>
-
-<para
->You can disable the sending of a user agent entirely, by unchecking the <guilabel
->Send identification</guilabel
-> checkbox. This may cause strange behaviour on some sites, and may even deny you access to some websites, so disable this with caution.</para>
-
-<para
->To configure a new agent binding, press the <guibutton
->New...</guibutton
-> button. Type the name of the server or a domain in the text box at the top of the dialogue that pops up, which is labelled <guilabel
->When browsing the following site</guilabel
->.</para>
-
-<para
->Note that you can <emphasis
->not</emphasis
-> use the wildcard character <token
->*</token
-> in this text box. However, the string <userinput
->kde.org</userinput
-> will match all hosts in the domain <systemitem
->kde.org</systemitem
-></para>
-
-<para
->After typing the name of the server, type in the identifying string in the next combo box, which is labeled <guilabel
->Use the following identity:</guilabel
->, or choose a string from the list. If you don't choose a string from the list, you will need to know what a valid string from the browser looks like. For example, you could type <userinput
->Mozilla/4.0 (compatible; MSIE 4.0)</userinput
->. </para>
-
-<para
->In the field labelled <guilabel
->Alias (description)</guilabel
-> you can enter a descriptive name for the configured binding, &eg; <userinput
->Netscape Navigator 4.75 on Linux</userinput
-> for the useragent string <userinput
->Mozilla/4.75 (X11; U; Linux 2.2.14 i686)</userinput
->.</para>
-
-<para
->You can click on an existing entry in the <guilabel
->Configured agent bindings</guilabel
-> list, and then modify the contents of the text boxes, followed by clicking <guibutton
->Change...</guibutton
->.</para>
-
-<para
->The <guibutton
->Delete</guibutton
-> button can be used to delete the selected entry in the list of configured agent bindings. The <guibutton
->Delete All</guibutton
-> will remove all the configured user agent strings. Click the <guibutton
->Apply</guibutton
-> to take your changes in effect.</para>
-
-<para
->You can use the checkboxes at the top of the screen to build a user agent that is uniquely yours, by choosing your own combination of operating system name and version, platform, processor type, and language.</para>
-
-<para
->In all cases, the user agent that is being sent by default is displayed in bold text at the top of the page.</para>
+<title>Use</title>
+
+<para>In this module you can configure the type of browser that &konqueror; will report itself to be. You can control this information by web site. Usually, the list box that is labeled <guilabel>Site/Domain Specific Identification</guilabel> will be empty, so that &konqueror; will always use its default useragent string.</para>
+
+<para>You can disable the sending of a user agent entirely, by unchecking the <guilabel>Send identification</guilabel> checkbox. This may cause strange behaviour on some sites, and may even deny you access to some websites, so disable this with caution.</para>
+
+<para>To configure a new agent binding, press the <guibutton>New...</guibutton> button. Type the name of the server or a domain in the text box at the top of the dialogue that pops up, which is labelled <guilabel>When browsing the following site</guilabel>.</para>
+
+<para>Note that you can <emphasis>not</emphasis> use the wildcard character <token>*</token> in this text box. However, the string <userinput>kde.org</userinput> will match all hosts in the domain <systemitem>kde.org</systemitem></para>
+
+<para>After typing the name of the server, type in the identifying string in the next combo box, which is labeled <guilabel>Use the following identity:</guilabel>, or choose a string from the list. If you don't choose a string from the list, you will need to know what a valid string from the browser looks like. For example, you could type <userinput>Mozilla/4.0 (compatible; MSIE 4.0)</userinput>. </para>
+
+<para>In the field labelled <guilabel>Alias (description)</guilabel> you can enter a descriptive name for the configured binding, &eg; <userinput>Netscape Navigator 4.75 on Linux</userinput> for the useragent string <userinput>Mozilla/4.75 (X11; U; Linux 2.2.14 i686)</userinput>.</para>
+
+<para>You can click on an existing entry in the <guilabel>Configured agent bindings</guilabel> list, and then modify the contents of the text boxes, followed by clicking <guibutton>Change...</guibutton>.</para>
+
+<para>The <guibutton>Delete</guibutton> button can be used to delete the selected entry in the list of configured agent bindings. The <guibutton>Delete All</guibutton> will remove all the configured user agent strings. Click the <guibutton>Apply</guibutton> to take your changes in effect.</para>
+
+<para>You can use the checkboxes at the top of the screen to build a user agent that is uniquely yours, by choosing your own combination of operating system name and version, platform, processor type, and language.</para>
+
+<para>In all cases, the user agent that is being sent by default is displayed in bold text at the top of the page.</para>
 
 </sect2>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/windowmanagement/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/windowmanagement/index.docbook
index 6812a8d7013..8e49122c52d 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/windowmanagement/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/windowmanagement/index.docbook
@@ -2,457 +2,221 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 	
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
->&Mike.McBride; &Mike.McBride.mail;</author>
-<author
->&Jost.Schenck; &Jost.Schenck.mail;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Mike.McBride; &Mike.McBride.mail;</author>
+<author>&Jost.Schenck; &Jost.Schenck.mail;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2004-05-04</date>
-<releaseinfo
->3.2</releaseinfo>
+<date>2004-05-04</date>
+<releaseinfo>3.2</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->actions</keyword>
-<keyword
->window placement</keyword>
-<keyword
->window size</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>actions</keyword>
+<keyword>window placement</keyword>
+<keyword>window size</keyword>
 </keywordset>
 </articleinfo>
 <sect1 id="window-behavior">
-<title
->Window Behaviour</title>
-
-<para
->In the upper part of this control module you can see several tabs: <guilabel
->Focus</guilabel
->, <guilabel
->Actions</guilabel
->, <guilabel
->Moving</guilabel
-> and <guilabel
->Advanced</guilabel
->. In the <guilabel
->Focus</guilabel
-> panel you can configure how windows gain or lose focus, &ie; become active or inactive. Using <guilabel
->Actions</guilabel
-> you can configure how windows react to mouse clicks. <guilabel
->Moving</guilabel
-> allows you to configure how windows move and place themselves when started. The <guilabel
->Advanced</guilabel
-> options cover some specialized options involving moving windows between desktops and <quote
->window shading</quote
->. </para>
+<title>Window Behaviour</title>
+
+<para>In the upper part of this control module you can see several tabs: <guilabel>Focus</guilabel>, <guilabel>Actions</guilabel>, <guilabel>Moving</guilabel> and <guilabel>Advanced</guilabel>. In the <guilabel>Focus</guilabel> panel you can configure how windows gain or lose focus, &ie; become active or inactive. Using <guilabel>Actions</guilabel> you can configure how windows react to mouse clicks. <guilabel>Moving</guilabel> allows you to configure how windows move and place themselves when started. The <guilabel>Advanced</guilabel> options cover some specialized options involving moving windows between desktops and <quote>window shading</quote>. </para>
 
 <note>
-<para
->Please note that the configuration in this module will not take effect if you don't use &kde;'s native window manager, &twin;. If you do use a different window manager, please refer to its documentation for how to customise window behaviour. </para>
+<para>Please note that the configuration in this module will not take effect if you don't use &kde;'s native window manager, &twin;. If you do use a different window manager, please refer to its documentation for how to customise window behaviour. </para>
 </note>
 
 <sect2 id="action-focus">
-<title
->Focus</title>
+<title>Focus</title>
 
-<para
->The <quote
->focus</quote
-> of the desktop refers to the window which the user is currently working on. The window with focus is often referred to as the <quote
->active window</quote
->. </para>
+<para>The <quote>focus</quote> of the desktop refers to the window which the user is currently working on. The window with focus is often referred to as the <quote>active window</quote>. </para>
 
-<para
->Focus does not necessarily mean the window is the one at the front &mdash; this is referred to as <quote
->raised</quote
->, and although this is configured here as well, focus and raising of windows are configured independently.</para>
+<para>Focus does not necessarily mean the window is the one at the front &mdash; this is referred to as <quote>raised</quote>, and although this is configured here as well, focus and raising of windows are configured independently.</para>
 
 <sect3 id="action-focus-focuspolicy">
-<title
->Focus Policy</title>
+<title>Focus Policy</title>
 
-<para
->There are four methods &kde; can use to determine the current focus: </para>
+<para>There are four methods &kde; can use to determine the current focus: </para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Click to Focus</guilabel
-></term>
+<term><guilabel>Click to Focus</guilabel></term>
 <listitem>
-<para
->A window becomes active when you click into it. </para>
+<para>A window becomes active when you click into it. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Focus follows mouse</guilabel
-></term>
+<term><guilabel>Focus follows mouse</guilabel></term>
 <listitem>
-<para
->Moving the mouse pointer actively over a normal window activates it. New windows such as the mini command line invoked with <keycombo action="simul"
->&Alt;<keycap
->F2</keycap
-></keycombo
-> will receive the focus, without you having to point the mouse at them explicitly. </para>
-
-<para
->In other window managers, this is sometimes known as <quote
->Sloppy focus follows mouse</quote
->. </para>
+<para>Moving the mouse pointer actively over a normal window activates it. New windows such as the mini command line invoked with <keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo> will receive the focus, without you having to point the mouse at them explicitly. </para>
+
+<para>In other window managers, this is sometimes known as <quote>Sloppy focus follows mouse</quote>. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Focus under mouse</guilabel
-></term>
+<term><guilabel>Focus under mouse</guilabel></term>
 <listitem>
-<para
->The window that happens to be under the mouse pointer becomes active. If the mouse is not over a window (for instance, it's on the desktop) the last window that was under the mouse has focus. New windows such as the mini command line invoked with <keycombo action="simul"
->&Alt;<keycap
->F2</keycap
-></keycombo
-> will not receive the focus, you must move the mouse over them to type. </para>
+<para>The window that happens to be under the mouse pointer becomes active. If the mouse is not over a window (for instance, it's on the desktop) the last window that was under the mouse has focus. New windows such as the mini command line invoked with <keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo> will not receive the focus, you must move the mouse over them to type. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Focus strictly under mouse</guilabel
-></term>
+<term><guilabel>Focus strictly under mouse</guilabel></term>
 <listitem>
-<para
->Similar to <guilabel
->Focus under mouse</guilabel
->, but even more strict with its interpretation. Only the window under the mouse pointer is active. If the mouse pointer is not over a window, no window has focus. New windows such as the mini command line invoked with <keycombo action="simul"
->&Alt;<keycap
->F2</keycap
-></keycombo
-> will not receive the focus, you must move the mouse over them to type. </para>
-
-<note
-><para
->Note that <guilabel
->Focus under mouse</guilabel
-> and <guilabel
->Focus strictly under mouse</guilabel
-> prevent certain features, such as the <keycombo action="simul"
->&Alt;&Tab;</keycombo
-> walk-through-windows dialogue, from working properly.</para>
+<para>Similar to <guilabel>Focus under mouse</guilabel>, but even more strict with its interpretation. Only the window under the mouse pointer is active. If the mouse pointer is not over a window, no window has focus. New windows such as the mini command line invoked with <keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo> will not receive the focus, you must move the mouse over them to type. </para>
+
+<note><para>Note that <guilabel>Focus under mouse</guilabel> and <guilabel>Focus strictly under mouse</guilabel> prevent certain features, such as the <keycombo action="simul">&Alt;&Tab;</keycombo> walk-through-windows dialogue, from working properly.</para>
 </note>
 
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->Once you have determined the focus policy, there are the window raising options. </para>
+<para>Once you have determined the focus policy, there are the window raising options. </para>
 
-<para
->By placing a mark in front of <guilabel
->Auto Raise</guilabel
->, &kde; can bring a window to the front if the mouse is over that window for a specified period of time. This is very useful with the <guilabel
->Focus follows Mouse</guilabel
-> option. You can determine the delay by using the slider bar/spin box combination. </para>
+<para>By placing a mark in front of <guilabel>Auto Raise</guilabel>, &kde; can bring a window to the front if the mouse is over that window for a specified period of time. This is very useful with the <guilabel>Focus follows Mouse</guilabel> option. You can determine the delay by using the slider bar/spin box combination. </para>
 
 <tip>
-<para
->Setting the delay too short will cause a rapid fire changing of windows, which can be quite distracting. Most people will like a delay of 100-300 ms. This is responsive, but it will let you slide over the corners of a window on your way to your destination without bringing that window to the front. </para>
+<para>Setting the delay too short will cause a rapid fire changing of windows, which can be quite distracting. Most people will like a delay of 100-300 ms. This is responsive, but it will let you slide over the corners of a window on your way to your destination without bringing that window to the front. </para>
 </tip>
 
-<para
->If you do not use <guilabel
->Auto Raise</guilabel
->, make sure the <guilabel
->Click Raise</guilabel
-> option has a mark in front of it. You will not be happy with both <guilabel
->Auto Raise</guilabel
-> and <guilabel
->Click Raise</guilabel
-> disabled, the net effect is that windows are not raised at all. </para>
+<para>If you do not use <guilabel>Auto Raise</guilabel>, make sure the <guilabel>Click Raise</guilabel> option has a mark in front of it. You will not be happy with both <guilabel>Auto Raise</guilabel> and <guilabel>Click Raise</guilabel> disabled, the net effect is that windows are not raised at all. </para>
 
 </sect3>
 
 
 <sect3 id="action-focus-keyboard">
-<title
-><guilabel
->Navigation</guilabel
-></title>
-
-<para
->In the <guilabel
->Navigation</guilabel
-> frame you can configure the way switching between applications or desktops using <keycombo action="simul"
-> &Alt;<keycap
->Tab</keycap
-></keycombo
-> or <keycombo action="simul"
-> &Ctrl;<keycap
->Tab</keycap
-></keycombo
->. </para>
-
-<para
->Switching applications using <keycombo action="simul"
->&Alt; <keycap
->Tab</keycap
-></keycombo
->, &ie; holding down &Alt; while repeatedly pressing the <keycap
->Tab</keycap
-> key, can take place in &kde; mode or in <acronym
->CDE</acronym
-> mode: in &kde; mode you will see a box in the middle of the screen showing you the currently selected application while you are still holding down the &Alt; key. In <acronym
->CDE</acronym
-> mode focus goes to each new window as it's selected. </para>
-
-<para
->Next there is an option where you can choose to <guilabel
->Traverse windows on all desktops</guilabel
-> or not. With this enabled, switching windows with <keycombo action="simul"
-> &Alt;<keycap
->Tab</keycap
-></keycombo
-> will show all windows, on all desktops, and take you to the appropriate desktop for the window you select. With it disabled, only windows on your current desktop are selectable with <keycombo action="simul"
-> &Alt;<keycap
->Tab</keycap
-></keycombo
->, and you must use <keycombo action="simul"
->&Ctrl;<keycap
->Tab</keycap
-></keycombo
-> to switch to other desktops yourself. </para>
-
-<para
->If you check the <guilabel
->Desktop navigation wraps around</guilabel
-> checkbox, then after you reach the <quote
->last</quote
-> desktop, pressing <keycap
->Tab</keycap
-> again will select the first desktop again.</para>
-
-<para
->Many people name their virtual desktops according to their purpose or some other naming scheme. You may find it convenient to select the <guilabel
->Popup desktop name on desktop switch</guilabel
->, so you can quickly tell that you've switched to the right one.</para>
+<title><guilabel>Navigation</guilabel></title>
+
+<para>In the <guilabel>Navigation</guilabel> frame you can configure the way switching between applications or desktops using <keycombo action="simul"> &Alt;<keycap>Tab</keycap></keycombo> or <keycombo action="simul"> &Ctrl;<keycap>Tab</keycap></keycombo>. </para>
+
+<para>Switching applications using <keycombo action="simul">&Alt; <keycap>Tab</keycap></keycombo>, &ie; holding down &Alt; while repeatedly pressing the <keycap>Tab</keycap> key, can take place in &kde; mode or in <acronym>CDE</acronym> mode: in &kde; mode you will see a box in the middle of the screen showing you the currently selected application while you are still holding down the &Alt; key. In <acronym>CDE</acronym> mode focus goes to each new window as it's selected. </para>
+
+<para>Next there is an option where you can choose to <guilabel>Traverse windows on all desktops</guilabel> or not. With this enabled, switching windows with <keycombo action="simul"> &Alt;<keycap>Tab</keycap></keycombo> will show all windows, on all desktops, and take you to the appropriate desktop for the window you select. With it disabled, only windows on your current desktop are selectable with <keycombo action="simul"> &Alt;<keycap>Tab</keycap></keycombo>, and you must use <keycombo action="simul">&Ctrl;<keycap>Tab</keycap></keycombo> to switch to other desktops yourself. </para>
+
+<para>If you check the <guilabel>Desktop navigation wraps around</guilabel> checkbox, then after you reach the <quote>last</quote> desktop, pressing <keycap>Tab</keycap> again will select the first desktop again.</para>
+
+<para>Many people name their virtual desktops according to their purpose or some other naming scheme. You may find it convenient to select the <guilabel>Popup desktop name on desktop switch</guilabel>, so you can quickly tell that you've switched to the right one.</para>
 
 
 </sect3>
 </sect2>
 
 <sect2 id="action-actions">
-<title
->Actions</title>
+<title>Actions</title>
 
-<para
->In this panel you can configure what happens to windows when a mouse is clicked on them. This panel is divided into four sections. </para>
+<para>In this panel you can configure what happens to windows when a mouse is clicked on them. This panel is divided into four sections. </para>
 
 <sect3 id="action-actions-sec1">
-<title
-><guilabel
->Titlebar double-click</guilabel
-></title>
-
-<para
->This section provides a single dropdown box. You can select either <guilabel
->Shade</guilabel
->, several variations of <guilabel
->Maximise</guilabel
-> or <guilabel
->Lower</guilabel
->. </para>
-
-<para
->Selecting <guilabel
->Maximise</guilabel
-> causes &kde; to maximise the window whenever you doubleclick on the titlebar. You can further choose to maximise windows only horizontally or only vertically.</para>
-
-<para
-><guilabel
->Shade</guilabel
->, on the other hand, causes the window to be reduced to simply the titlebar. Double clicking on the titlebar again, restores the window to its normal size. </para>
+<title><guilabel>Titlebar double-click</guilabel></title>
+
+<para>This section provides a single dropdown box. You can select either <guilabel>Shade</guilabel>, several variations of <guilabel>Maximise</guilabel> or <guilabel>Lower</guilabel>. </para>
+
+<para>Selecting <guilabel>Maximise</guilabel> causes &kde; to maximise the window whenever you doubleclick on the titlebar. You can further choose to maximise windows only horizontally or only vertically.</para>
+
+<para><guilabel>Shade</guilabel>, on the other hand, causes the window to be reduced to simply the titlebar. Double clicking on the titlebar again, restores the window to its normal size. </para>
 
 <tip>
-<para
->You can have windows automatically unshade when you simply place the mouse over their shaded titlebar. Just check the <guilabel
->Enable Hover</guilabel
-> check box in the <guilabel
->Advanced</guilabel
-> tab of this module. This is a great way to reclaim desktop space when you're cutting and pasting between a lot of windows, for example. </para>
+<para>You can have windows automatically unshade when you simply place the mouse over their shaded titlebar. Just check the <guilabel>Enable Hover</guilabel> check box in the <guilabel>Advanced</guilabel> tab of this module. This is a great way to reclaim desktop space when you're cutting and pasting between a lot of windows, for example. </para>
 </tip>
 
 </sect3>
 
 <sect3 id="action-actions-sec2">
-<title
-><guilabel
->Titlebar &amp; Frame</guilabel
-></title>
+<title><guilabel>Titlebar &amp; Frame</guilabel></title>
 
-<para
->This section allows you to determine what happens when you single click on the titlebar or frame of a window. Notice that you can have different actions associated with the same click depending on whether the window is active or not. </para>
+<para>This section allows you to determine what happens when you single click on the titlebar or frame of a window. Notice that you can have different actions associated with the same click depending on whether the window is active or not. </para>
 
-<para
->For each combination of mousebuttons, modifiers, Active and Inactive, you can select the most appropriate choice. The actions are as follows: </para>
+<para>For each combination of mousebuttons, modifiers, Active and Inactive, you can select the most appropriate choice. The actions are as follows: </para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Activate</guilabel
-></term>
+<term><guilabel>Activate</guilabel></term>
 <listitem>
-<para
->Make this window active. </para>
+<para>Make this window active. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Lower</guilabel
-></term>
+<term><guilabel>Lower</guilabel></term>
 <listitem>
-<para
->Will move this window to the bottom of the display. This will get the window out of the way. </para>
+<para>Will move this window to the bottom of the display. This will get the window out of the way. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Nothing</guilabel
-></term>
+<term><guilabel>Nothing</guilabel></term>
 <listitem>
-<para
->Just like it says. Nothing happens. </para>
+<para>Just like it says. Nothing happens. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Operations Menu</guilabel
-></term>
+<term><guilabel>Operations Menu</guilabel></term>
 <listitem>
-<para
->Will bring up a small submenu, where you can choose window related commands (&ie; Maximise, Minimise, Close, &etc;). </para>
+<para>Will bring up a small submenu, where you can choose window related commands (&ie; Maximise, Minimise, Close, &etc;). </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Raise</guilabel
-></term>
+<term><guilabel>Raise</guilabel></term>
 <listitem>
-<para
->Will bring the window to the top of the display. All other windows which overlap with this one, will be hidden <quote
->below</quote
-> it. </para>
+<para>Will bring the window to the top of the display. All other windows which overlap with this one, will be hidden <quote>below</quote> it. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Toggle Raise and Lower</term>
+<term>Toggle Raise and Lower</term>
 <listitem>
-<para
->This will raise windows which are not on top, and lower windows which are already on top. </para>
+<para>This will raise windows which are not on top, and lower windows which are already on top. </para>
 </listitem>
 </varlistentry>
 </variablelist>
 </sect3>
 
 <sect3 id="action-actions-sec3">
-<title
-><guilabel
->Inactive Inner Window</guilabel
-></title>
+<title><guilabel>Inactive Inner Window</guilabel></title>
 
-<para
->This part of the module, allows you to configure what happens when you click on an inactive window, with any of the three mouse buttons. </para>
+<para>This part of the module, allows you to configure what happens when you click on an inactive window, with any of the three mouse buttons. </para>
 
-<para
->Your choices are as follows: </para>
+<para>Your choices are as follows: </para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Activate, Raise and pass click</guilabel
-></term>
+<term><guilabel>Activate, Raise and pass click</guilabel></term>
 <listitem>
-<para
->This makes the clicked window active, raises it to the top of the display, and passes a mouse click to the application within the window. </para>
+<para>This makes the clicked window active, raises it to the top of the display, and passes a mouse click to the application within the window. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Activate and pass click</guilabel
-></term>
+<term><guilabel>Activate and pass click</guilabel></term>
 <listitem>
-<para
->This makes the clicked window active and passes a mouse click to the application within the window. </para>
+<para>This makes the clicked window active and passes a mouse click to the application within the window. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Activate</guilabel
-></term>
+<term><guilabel>Activate</guilabel></term>
 <listitem>
-<para
->This simply makes the clicked window active. The mouse click is not passed on to the application within the window. </para>
+<para>This simply makes the clicked window active. The mouse click is not passed on to the application within the window. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Activate and Raise</guilabel
-></term>
+<term><guilabel>Activate and Raise</guilabel></term>
 <listitem>
-<para
->This makes the clicked window active and raises the window to the top of the display. The mouse click is not passed on to the application within the window. </para>
+<para>This makes the clicked window active and raises the window to the top of the display. The mouse click is not passed on to the application within the window. </para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -460,92 +224,54 @@
 </sect3>
 
 <sect3 id="action-actions-sec4">
-<title
-><guilabel
->Inner Window, titlebar and frame</guilabel
-></title>
-
-<para
->This bottom section, allows you to configure additional actions, when a modifier key (by default &Alt;) is pressed, and a mouse click is made on a window.</para>
-
-<para
->Once again, you can select different actions for <mousebutton
->Left</mousebutton
->, <mousebutton
->Middle</mousebutton
-> and <mousebutton
->Right</mousebutton
-> button clicks. </para>
-
-<para
->Your choices are:</para>
+<title><guilabel>Inner Window, titlebar and frame</guilabel></title>
+
+<para>This bottom section, allows you to configure additional actions, when a modifier key (by default &Alt;) is pressed, and a mouse click is made on a window.</para>
+
+<para>Once again, you can select different actions for <mousebutton>Left</mousebutton>, <mousebutton>Middle</mousebutton> and <mousebutton>Right</mousebutton> button clicks. </para>
+
+<para>Your choices are:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Lower</guilabel
-></term>
+<term><guilabel>Lower</guilabel></term>
 <listitem>
-<para
->Will move this window to the bottom of the display. This will get the window out of the way. </para>
+<para>Will move this window to the bottom of the display. This will get the window out of the way. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Move</guilabel
-></term>
+<term><guilabel>Move</guilabel></term>
 <listitem>
-<para
->Allows you to drag the selected window around the desktop. </para>
+<para>Allows you to drag the selected window around the desktop. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Nothing</guilabel
-></term>
+<term><guilabel>Nothing</guilabel></term>
 <listitem>
-<para
->Just like it says. Nothing happens. </para>
+<para>Just like it says. Nothing happens. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Raise</guilabel
-></term>
+<term><guilabel>Raise</guilabel></term>
 <listitem>
-<para
->Will bring the window to the top of the display. All other windows which overlap with this one, will be hidden <quote
->below</quote
-> it. </para>
+<para>Will bring the window to the top of the display. All other windows which overlap with this one, will be hidden <quote>below</quote> it. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Resize</guilabel
-></term>
+<term><guilabel>Resize</guilabel></term>
 <listitem>
-<para
->Allows you to change the size of the selected window. </para>
+<para>Allows you to change the size of the selected window. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Toggle Raise and Lower</guilabel
-></term>
+<term><guilabel>Toggle Raise and Lower</guilabel></term>
 <listitem>
-<para
->This will raise windows which are not on top, and lower windows which are already on top. </para>
+<para>This will raise windows which are not on top, and lower windows which are already on top. </para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -555,102 +281,55 @@
 </sect2>
 
 <sect2 id="action-moving">
-<title
-><guilabel
->Moving</guilabel
-></title>
+<title><guilabel>Moving</guilabel></title>
 
 <sect3>
-<title
-><guilabel
->Windows</guilabel
-></title>
+<title><guilabel>Windows</guilabel></title>
 
-<para
->The options here determine how windows appear on screen when you are moving them. Most of these options exact a price in performance, so if you want to streamline your desktop, you should turn them off. However, if you have a fast computer, they may make your day a little more pleasant, so leave them on.</para>
+<para>The options here determine how windows appear on screen when you are moving them. Most of these options exact a price in performance, so if you want to streamline your desktop, you should turn them off. However, if you have a fast computer, they may make your day a little more pleasant, so leave them on.</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Display content in moving windows</guilabel
-></term>
+<term><guilabel>Display content in moving windows</guilabel></term>
 <listitem>
-<para
->Enable this option if you want a window's content to be fully shown while moving it, instead of just showing a window <quote
->skeleton</quote
->. The result may not be satisfying on slow computers without graphic acceleration.</para>
+<para>Enable this option if you want a window's content to be fully shown while moving it, instead of just showing a window <quote>skeleton</quote>. The result may not be satisfying on slow computers without graphic acceleration.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Display content in resizing windows</guilabel
-></term>
+<term><guilabel>Display content in resizing windows</guilabel></term>
 <listitem>
-<para
->Enable this option if you want a window's content to be shown while resizing it, instead of just showing a window <quote
->skeleton</quote
->. The result, again, may not be satisfying on slower computers.</para>
+<para>Enable this option if you want a window's content to be shown while resizing it, instead of just showing a window <quote>skeleton</quote>. The result, again, may not be satisfying on slower computers.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Display window geometry when moving or resizing</guilabel
-></term>
+<term><guilabel>Display window geometry when moving or resizing</guilabel></term>
 <listitem>
-<para
->Enable this option if you want a popup tooltip to tell you the size in pixels of a window as you resize it.</para
-></listitem>
+<para>Enable this option if you want a popup tooltip to tell you the size in pixels of a window as you resize it.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Animate minimise and restore</guilabel
-></term>
+<term><guilabel>Animate minimise and restore</guilabel></term>
 <listitem>
 
-<para
->Enable this option if you want an animation shown when windows are minimised or restored.</para>
-<para
->With the slider, you can set the speed of the animation.</para>
+<para>Enable this option if you want an animation shown when windows are minimised or restored.</para>
+<para>With the slider, you can set the speed of the animation.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Allow moving and resizing of maximised windows</guilabel
-></term>
+<term><guilabel>Allow moving and resizing of maximised windows</guilabel></term>
 <listitem>
-<para
->When enabled, this feature activates the border of maximised windows, and allows you to move or resize them just as you can normal windows.</para>
+<para>When enabled, this feature activates the border of maximised windows, and allows you to move or resize them just as you can normal windows.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Placement:</guilabel
-></term>
+<term><guilabel>Placement:</guilabel></term>
 <listitem>
 
-<para
->The placement policy determines where a new window will appear on the desktop. <guilabel
->Smart</guilabel
-> will try to achieve a minimum overlap of windows, <guilabel
->Cascade</guilabel
-> will cascade the windows, and <guilabel
->Random</guilabel
-> will use a random position. <guilabel
->Centred</guilabel
-> will open all new windows in the centre of the screen, and <guilabel
->Zero-Cornered</guilabel
-> will open all windows with their top left corner in the top left corner of the screen.</para>
+<para>The placement policy determines where a new window will appear on the desktop. <guilabel>Smart</guilabel> will try to achieve a minimum overlap of windows, <guilabel>Cascade</guilabel> will cascade the windows, and <guilabel>Random</guilabel> will use a random position. <guilabel>Centred</guilabel> will open all new windows in the centre of the screen, and <guilabel>Zero-Cornered</guilabel> will open all windows with their top left corner in the top left corner of the screen.</para>
 
 </listitem>
 </varlistentry>
@@ -660,50 +339,32 @@
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Snap Zones</guilabel
-></title>
+<title><guilabel>Snap Zones</guilabel></title>
 
-<para
->The rest of this page allows you to configure the <guilabel
->Snap Zones</guilabel
->. These are like a magnetic field along the side of the desktop and each window, which will make windows snap alongside when moved near.</para>
+<para>The rest of this page allows you to configure the <guilabel>Snap Zones</guilabel>. These are like a magnetic field along the side of the desktop and each window, which will make windows snap alongside when moved near.</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Border snap zone:</guilabel
-></term>
+<term><guilabel>Border snap zone:</guilabel></term>
 <listitem>
 
-<para
->Here you can set the snap zone for screen borders. Moving a window within the configured distance will make it snap to the edge of the desktop.</para>
+<para>Here you can set the snap zone for screen borders. Moving a window within the configured distance will make it snap to the edge of the desktop.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Window snap zone:</guilabel
-></term>
+<term><guilabel>Window snap zone:</guilabel></term>
 <listitem>
 
-<para
->Here you can set the snap zone for windows. As with screen borders, moving a window near to another will make it snap to the edge as if the windows were magnetised.</para>
+<para>Here you can set the snap zone for windows. As with screen borders, moving a window near to another will make it snap to the edge as if the windows were magnetised.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Snap windows only when overlapping</guilabel
-></term>
+<term><guilabel>Snap windows only when overlapping</guilabel></term>
 <listitem>
 
-<para
->If checked, windows will not snap together if they are only near each other, they must be overlapping, by the configured amount or less.</para>
+<para>If checked, windows will not snap together if they are only near each other, they must be overlapping, by the configured amount or less.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -712,54 +373,31 @@
 </sect2>
 
 <sect2 id="action-advanced">
-<title
->Advanced</title>
+<title>Advanced</title>
 
-<para
->In the <guilabel
->Advanced</guilabel
-> panel you can do more advanced fine tuning to the window behaviour. </para>
+<para>In the <guilabel>Advanced</guilabel> panel you can do more advanced fine tuning to the window behaviour. </para>
 
 <variablelist>
-<title
->Shading</title>
+<title>Shading</title>
 
 <varlistentry>
-<term
-><guilabel
->Animate</guilabel
-></term>
+<term><guilabel>Animate</guilabel></term>
 <listitem>
-<para
->If this option is enabled, shading, or rolling up a window until just the title bar is shown, will be animated.</para>
+<para>If this option is enabled, shading, or rolling up a window until just the title bar is shown, will be animated.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Enable hover</guilabel
-></term>
+<term><guilabel>Enable hover</guilabel></term>
 <listitem>
-<para
->If this option is enabled, a shaded window will un-shade automatically when the mouse pointer has been over the title bar for some time. Use the slider to configure the delay un-shading. </para>
+<para>If this option is enabled, a shaded window will un-shade automatically when the mouse pointer has been over the title bar for some time. Use the slider to configure the delay un-shading. </para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->Finally, you can configure <guilabel
->Active Desktop Borders</guilabel
->. If this is enabled, moving the mouse to a screen border will change your desktop. This is useful if you want to drag windows from one desktop to another.</para>
-
-<para
->You can set this option to <guilabel
->Disabled</guilabel
->, which is the default, to <guilabel
->Only when moving windows</guilabel
->, or to <guilabel
->Always enabled</guilabel
-> in which case just pushing your mouse against the side of the screen will switch you to a new desktop.</para>
+<para>Finally, you can configure <guilabel>Active Desktop Borders</guilabel>. If this is enabled, moving the mouse to a screen border will change your desktop. This is useful if you want to drag windows from one desktop to another.</para>
+
+<para>You can set this option to <guilabel>Disabled</guilabel>, which is the default, to <guilabel>Only when moving windows</guilabel>, or to <guilabel>Always enabled</guilabel> in which case just pushing your mouse against the side of the screen will switch you to a new desktop.</para>
 
 </sect2>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kfind/index.docbook b/tde-i18n-en_GB/docs/tdebase/kfind/index.docbook
index 85fe5d4a78c..91682d60755 100644
--- a/tde-i18n-en_GB/docs/tdebase/kfind/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kfind/index.docbook
@@ -4,241 +4,113 @@
   <!ENTITY kappname "&kfind;">
   <!ENTITY package "tdebase">
   <!ENTITY % addindex "IGNORE">
-  <!ENTITY % British-English "INCLUDE"
-> 
+  <!ENTITY % British-English "INCLUDE"> 
 ]>
 
 <book lang="&language;">
 
 <bookinfo>
-<title
->The &kfind; Handbook</title>
+<title>The &kfind; Handbook</title>
 
 <authorgroup>
-<author
->&Dirk.Doerflinger; &Dirk.Doerflinger.mail;</author>
-
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Dirk.Doerflinger; &Dirk.Doerflinger.mail;</author>
+
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 
 </authorgroup>
 
 <copyright>
-<year
->2001</year>
-<holder
->&Dirk.Doerflinger;</holder>
+<year>2001</year>
+<holder>&Dirk.Doerflinger;</holder>
 </copyright>
 
-<legalnotice
->&FDLNotice;</legalnotice>
+<legalnotice>&FDLNotice;</legalnotice>
 
-<date
->2004-04-11</date>
-<releaseinfo
->1.20.01</releaseinfo>
+<date>2004-04-11</date>
+<releaseinfo>1.20.01</releaseinfo>
 
 <abstract>
-<para
->&kfind; is &kde;'s file find utility. </para>
+<para>&kfind; is &kde;'s file find utility. </para>
 </abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->tdeutils</keyword>
-<keyword
->kfind</keyword>
-<keyword
->find</keyword>
-<keyword
->search</keyword>
+<keyword>KDE</keyword>
+<keyword>tdeutils</keyword>
+<keyword>kfind</keyword>
+<keyword>find</keyword>
+<keyword>search</keyword>
 </keywordset>
 </bookinfo>
 
 <chapter id="introduction">
-<title
->Introduction</title>
+<title>Introduction</title>
 
-<para
->&kfind; is the &kde; file find utility. </para>
+<para>&kfind; is the &kde; file find utility. </para>
 
 <sect1 id="starting">
-<title
->Launching &kfind;</title>
+<title>Launching &kfind;</title>
 
-<para
->The Find Files tool is a useful method of searching for specific files on your computer, or for searching for files that match a pattern. An example of this could include searching for files of a particular type or with certain letters in the filename. You can load this utility by clicking on <guimenuitem
->Find Files</guimenuitem
->. This will launch &kfind;. </para>
+<para>The Find Files tool is a useful method of searching for specific files on your computer, or for searching for files that match a pattern. An example of this could include searching for files of a particular type or with certain letters in the filename. You can load this utility by clicking on <guimenuitem>Find Files</guimenuitem>. This will launch &kfind;. </para>
 
 </sect1>
 </chapter>
 
 <chapter id="kfind">
-<title
->Finding Files</title>
+<title>Finding Files</title>
 
 <sect1 id="name-tab">
-<title
->The Name/Location Tab</title>
-
-<para
->When starting &kfind;, you will see a quite simple window. Type in the name of the file you are searching in the textbox labelled <guilabel
->Named:</guilabel
->. Choose a folder where you want to search by typing it in the field <guilabel
->Look in:</guilabel
-> or by clicking <guibutton
->Browse...</guibutton
-> and press <keycap
->Enter</keycap
-> or click <guibutton
->Find</guibutton
->. If <guilabel
->Include subfolders</guilabel
-> is checked all subfolders starting from your chosen folder will be searched too. The results will be displayed in the box below. </para>
-
-<para
->You can use the following wildcards: </para>
+<title>The Name/Location Tab</title>
+
+<para>When starting &kfind;, you will see a quite simple window. Type in the name of the file you are searching in the textbox labelled <guilabel>Named:</guilabel>. Choose a folder where you want to search by typing it in the field <guilabel>Look in:</guilabel> or by clicking <guibutton>Browse...</guibutton> and press <keycap>Enter</keycap> or click <guibutton>Find</guibutton>. If <guilabel>Include subfolders</guilabel> is checked all subfolders starting from your chosen folder will be searched too. The results will be displayed in the box below. </para>
+
+<para>You can use the following wildcards: </para>
 
 <variablelist>
 <varlistentry>
-<term
->The Asterisk <quote
-><keycap
->*</keycap
-></quote
-></term>
+<term>The Asterisk <quote><keycap>*</keycap></quote></term>
 <listitem>
-<para
->The asterisk stands for any number of missing characters (even zero), that means &eg; searching for <userinput
->marc*</userinput
-> may find the files <filename
->marc</filename
->, <filename
->marc.png</filename
-> and <filename
-> marc_must_not_read_this.kwd</filename
->. <userinput
->mar*.kwd</userinput
-> may find <filename
->marketplace.kwd</filename
-> and <filename
->marc_must_not_read_this.kwd</filename
->. </para>
+<para>The asterisk stands for any number of missing characters (even zero), that means &eg; searching for <userinput>marc*</userinput> may find the files <filename>marc</filename>, <filename>marc.png</filename> and <filename> marc_must_not_read_this.kwd</filename>. <userinput>mar*.kwd</userinput> may find <filename>marketplace.kwd</filename> and <filename>marc_must_not_read_this.kwd</filename>. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->The Question Mark <quote
-><keycap
->?</keycap
-></quote
-></term>
+<term>The Question Mark <quote><keycap>?</keycap></quote></term>
 <listitem>
-<para
->In contrast to the asterisk, the question mark stands for exactly one character, so <userinput
->mar?</userinput
-> will find <filename
->marc</filename
->, but <userinput
->marc?</userinput
-> will not find anything, as our files are called <filename
->marc</filename
-> and <filename
->marc.png</filename
->. You can put as many question marks in the term as you want, it will find exactly that number of characters. </para>
+<para>In contrast to the asterisk, the question mark stands for exactly one character, so <userinput>mar?</userinput> will find <filename>marc</filename>, but <userinput>marc?</userinput> will not find anything, as our files are called <filename>marc</filename> and <filename>marc.png</filename>. You can put as many question marks in the term as you want, it will find exactly that number of characters. </para>
 </listitem>
 </varlistentry>
 
 </variablelist>
 
-<para
->Of course you can combine those two wildcard symbols in a search term. </para>
+<para>Of course you can combine those two wildcard symbols in a search term. </para>
 
 </sect1>
 
 <sect1 id="kfind-date-range">
-<title
->The Contents Tab</title>
+<title>The Contents Tab</title>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->File type</guilabel
-></term>
+<term><guilabel>File type</guilabel></term>
 <listitem>
-<para
->Here you can specify the type of file you are searching for. </para>
+<para>Here you can specify the type of file you are searching for. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Containing text</guilabel
-></term>
+<term><guilabel>Containing text</guilabel></term>
 <listitem>
-<para
->Type in the word or phrase the files you are searching for must contain. Note: If you do this in a large folder or checked <guilabel
->Include subfolders</guilabel
-> in the <guilabel
->Name/Location</guilabel
-> tab, this may take a long time. </para>
+<para>Type in the word or phrase the files you are searching for must contain. Note: If you do this in a large folder or checked <guilabel>Include subfolders</guilabel> in the <guilabel>Name/Location</guilabel> tab, this may take a long time. </para>
 
 <note>
-<para
->This option will <emphasis
->not</emphasis
-> work for all files listed under <guilabel
->File type</guilabel
->. Only the following file types are supported: <itemizedlist>
-<listitem
-><para
->Text files, &eg; source code and <filename
->README</filename
-> files</para
-></listitem>
-<listitem
-><para
->KWord &gt;= 1.2</para
-></listitem>
-<listitem
-><para
->KPresenter &gt;= 1.2</para
-></listitem>
-<listitem
-><para
->KSpread &gt;= 1.2</para
-></listitem>
-<listitem
-><para
->OpenOffice.org Writer</para
-></listitem>
-<listitem
-><para
->OpenOffice.org Impress</para
-></listitem>
-<listitem
-><para
->OpenOffice.org Calc</para
-></listitem>
+<para>This option will <emphasis>not</emphasis> work for all files listed under <guilabel>File type</guilabel>. Only the following file types are supported: <itemizedlist>
+<listitem><para>Text files, &eg; source code and <filename>README</filename> files</para></listitem>
+<listitem><para>KWord &gt;= 1.2</para></listitem>
+<listitem><para>KPresenter &gt;= 1.2</para></listitem>
+<listitem><para>KSpread &gt;= 1.2</para></listitem>
+<listitem><para>OpenOffice.org Writer</para></listitem>
+<listitem><para>OpenOffice.org Impress</para></listitem>
+<listitem><para>OpenOffice.org Calc</para></listitem>
 </itemizedlist>
 
 </para>
@@ -248,37 +120,17 @@
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Case sensitive</guilabel
-></term>
+<term><guilabel>Case sensitive</guilabel></term>
 <listitem>
-<para
->If you enable this option, &kfind; will only find files with the exact case matching, &eg; <userinput
->MARC</userinput
-> will only match <quote
->MARC</quote
->, not <quote
->Marc</quote
->. </para>
+<para>If you enable this option, &kfind; will only find files with the exact case matching, &eg; <userinput>MARC</userinput> will only match <quote>MARC</quote>, not <quote>Marc</quote>. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Regular expression</guilabel
-></term>
-<listitem
-><para
->If you have installed the &kregexpeditor; tool from the tdeutils package, you will have this additional option. Enabling it will allow you to search for a <firstterm
->regexp</firstterm
-> or regular expression. A regexp is a way to specify conditions for your search, and they can be very complex, and equally they can be very powerful. If you are unfamiliar with regular expressions, you can choose <guilabel
->Edit Regular Expression</guilabel
-> to open &kregexpeditor;. This tool allows you to construct your set of conditions graphically, and then generates the expression for you.</para>
-
-<para
->&kregexpeditor; is a very useful tool, and can be used from within many &kde; applications other than &kfind;. You can find more information from within its own help file.</para>
+<term><guilabel>Regular expression</guilabel></term>
+<listitem><para>If you have installed the &kregexpeditor; tool from the tdeutils package, you will have this additional option. Enabling it will allow you to search for a <firstterm>regexp</firstterm> or regular expression. A regexp is a way to specify conditions for your search, and they can be very complex, and equally they can be very powerful. If you are unfamiliar with regular expressions, you can choose <guilabel>Edit Regular Expression</guilabel> to open &kregexpeditor;. This tool allows you to construct your set of conditions graphically, and then generates the expression for you.</para>
+
+<para>&kregexpeditor; is a very useful tool, and can be used from within many &kde; applications other than &kfind;. You can find more information from within its own help file.</para>
 </listitem>
 </varlistentry>
 
@@ -289,44 +141,30 @@
 </sect1>
 
 <sect1 id="kfind-advanced">
-<title
->The Properties Tab</title>
+<title>The Properties Tab</title>
 
-<para
->Here you can refine your search. These are the special refinements you can choose: </para>
+<para>Here you can refine your search. These are the special refinements you can choose: </para>
 
 <variablelist>
 
 <varlistentry>
-<term
-><guilabel
->Find all files created or modified</guilabel
-></term>
+<term><guilabel>Find all files created or modified</guilabel></term>
 <listitem>
-<para
->Here you can either enter two dates, between which the files were created or modified, or specify a time period. </para>
+<para>Here you can either enter two dates, between which the files were created or modified, or specify a time period. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->File size is</guilabel
-></term>
+<term><guilabel>File size is</guilabel></term>
 <listitem>
-<para
->Here you can specify if the file has to be at least or as most as big as the size you entered in the following box. </para>
+<para>Here you can specify if the file has to be at least or as most as big as the size you entered in the following box. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Files owned by user, Files owned by group</guilabel
-></term>
+<term><guilabel>Files owned by user, Files owned by group</guilabel></term>
 <listitem>
-<para
->Here you can specify user and group names. </para>
+<para>Here you can specify user and group names. </para>
 </listitem>
 </varlistentry>
 
@@ -338,120 +176,77 @@
 
 <chapter id="credits">
 
-<title
->Credits and Licence</title>
+<title>Credits and Licence</title>
 
-<para
->&kfind; </para>
+<para>&kfind; </para>
 
-<para
->Program copyright: </para>
+<para>Program copyright: </para>
 
 <itemizedlist>
-<title
->Developers</title>
+<title>Developers</title>
 <listitem>
-<para
->Martin Hartig</para>
+<para>Martin Hartig</para>
 </listitem>
 
 <listitem>
-<para
->Stephan Kulow <email
->coolo@kde.org</email
-></para>
+<para>Stephan Kulow <email>coolo@kde.org</email></para>
 </listitem>
 
 <listitem>
-<para
->Mario Weilguni <email
->mweilguni@sime.com</email
-></para>
+<para>Mario Weilguni <email>mweilguni@sime.com</email></para>
 </listitem>
 
 <listitem>
-<para
->Alex Zepeda <email
->jazepeda@pacbell.net</email
-></para>
+<para>Alex Zepeda <email>jazepeda@pacbell.net</email></para>
 </listitem>
 
 <listitem>
-<para
->Miroslav Flídr <email
->flidr@kky.zcu.cz</email
-></para>
+<para>Miroslav Flídr <email>flidr@kky.zcu.cz</email></para>
 </listitem>
 
 <listitem>
-<para
->Harri Porten <email
->porten@kde.org</email
-></para>
+<para>Harri Porten <email>porten@kde.org</email></para>
 </listitem>
 
 <listitem>
-<para
->Dima Rogozin <email
->dima@mercury.co.il</email
-></para>
+<para>Dima Rogozin <email>dima@mercury.co.il</email></para>
 </listitem>
 
 <listitem>
-<para
->Carsten Pfeiffer <email
->pfeiffer@kde.org</email
-></para>
+<para>Carsten Pfeiffer <email>pfeiffer@kde.org</email></para>
 </listitem>
 
 <listitem>
-<para
->Hans Petter Bieker <email
->bieker@kde.org</email
-></para>
+<para>Hans Petter Bieker <email>bieker@kde.org</email></para>
 </listitem>
 
 <listitem>
-<para
->Waldo Bastian <email
->bastian@kde.org</email
-></para>
+<para>Waldo Bastian <email>bastian@kde.org</email></para>
 </listitem>
     
 </itemizedlist>
 
-<para
->Documentation copyright 2001 &Dirk.Doerflinger; &Dirk.Doerflinger.mail;</para
-> 
+<para>Documentation copyright 2001 &Dirk.Doerflinger; &Dirk.Doerflinger.mail;</para> 
 
-<para
->Conversion to British English: John Knight <email
->anarchist_tomato@herzeleid.net</email
-></para
-> 
+<para>Conversion to British English: John Knight <email>anarchist_tomato@herzeleid.net</email></para> 
 &underFDL; &underBSDLicense; </chapter>
 
 <appendix id="installation">
-<title
->Installation</title>
+<title>Installation</title>
 
 <sect1 id="getting-kfind">
-<title
->How to obtain &kfind;</title>
+<title>How to obtain &kfind;</title>
 &install.intro.documentation; </sect1>
 
 <sect1 id="requirements">
-<title
->Requirements</title>
+<title>Requirements</title>
 
-<para
->In order to successfully use &kfind;, you need &kde; 3.x. </para>
+<para>In order to successfully use &kfind;, you need &kde; 3.x. </para>
 
 </sect1>
 
 <sect1 id="compilation">
-<title
->Compilation and Installation</title>
+<title>Compilation and Installation</title>
 &install.compile.documentation; </sect1>
 
 </appendix>
diff --git a/tde-i18n-en_GB/docs/tdebase/khelpcenter/contact.docbook b/tde-i18n-en_GB/docs/tdebase/khelpcenter/contact.docbook
index c164370fb32..c4cdd5b35b1 100644
--- a/tde-i18n-en_GB/docs/tdebase/khelpcenter/contact.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/khelpcenter/contact.docbook
@@ -1,100 +1,48 @@
 <chapter id="contact-the-kde-team">
-<chapterinfo
-><date
->2002-01-18</date
-> <releaseinfo
->3.00.00</releaseinfo
-> </chapterinfo>
-<title
->Contact the &kde; team</title>
+<chapterinfo><date>2002-01-18</date> <releaseinfo>3.00.00</releaseinfo> </chapterinfo>
+<title>Contact the &kde; team</title>
 <anchor id="contact"/>
 
 <sect1 id="contact-mailinglists">
-<title
->Mailing lists</title>
+<title>Mailing lists</title>
 
-<para
->&kde; has several mailing lists up. See below for some of the most useful. Older articles can be found in the <ulink url="http://lists.kde.org"
->mailing list archive</ulink
->.</para>
+<para>&kde; has several mailing lists up. See below for some of the most useful. Older articles can be found in the <ulink url="http://lists.kde.org">mailing list archive</ulink>.</para>
 
 <variablelist>
 
 <varlistentry>
-<term
-><ulink url="http://mail.kde.org/mailman/listinfo/kde"
->kde</ulink
-></term>
-<listitem
-><para
->For general discussion, users helping each other.</para
-></listitem>
+<term><ulink url="http://mail.kde.org/mailman/listinfo/kde">kde</ulink></term>
+<listitem><para>For general discussion, users helping each other.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><ulink url="http://mail.kde.org/mailman/listinfo/kde-announce"
->kde-announce</ulink
-></term>
-<listitem
-><para
->Announcements of new &kde; applications</para
-></listitem>
+<term><ulink url="http://mail.kde.org/mailman/listinfo/kde-announce">kde-announce</ulink></term>
+<listitem><para>Announcements of new &kde; applications</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><ulink url="http://mail.kde.org/mailman/listinfo/kde-devel"
->kde-devel</ulink
-></term>
-<listitem
-><para
->For developers.</para
-></listitem>
+<term><ulink url="http://mail.kde.org/mailman/listinfo/kde-devel">kde-devel</ulink></term>
+<listitem><para>For developers.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><ulink url="http://mail.kde.org/mailman/listinfo/kde-artists"
->kde-artists</ulink
-></term>
-<listitem
-><para
->Creating icons and other artwork</para
-></listitem>
+<term><ulink url="http://mail.kde.org/mailman/listinfo/kde-artists">kde-artists</ulink></term>
+<listitem><para>Creating icons and other artwork</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><ulink url="http://mail.kde.org/mailman/listinfo/kde-doc-english"
->kde-doc-english</ulink
-></term>
-<listitem
-><para
->For people interested in writing documentation for &kde;.</para
-></listitem>
+<term><ulink url="http://mail.kde.org/mailman/listinfo/kde-doc-english">kde-doc-english</ulink></term>
+<listitem><para>For people interested in writing documentation for &kde;.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><ulink url="http://mail.kde.org/mailman/listinfo/tde-i18n-doc"
->tde-i18n-doc</ulink
-></term>
-<listitem
-><para
->Internationalisation and documentation issues</para
-></listitem>
+<term><ulink url="http://mail.kde.org/mailman/listinfo/tde-i18n-doc">tde-i18n-doc</ulink></term>
+<listitem><para>Internationalisation and documentation issues</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><ulink url="http://i18n.kde.org/teams/"
->http://i18n.kde.org/teams/</ulink
-></term>
-<listitem
-><para
->For localised information, which may include user email lists and websites, check the translation teams page at the above &URL;.</para
-></listitem>
+<term><ulink url="http://i18n.kde.org/teams/">http://i18n.kde.org/teams/</ulink></term>
+<listitem><para>For localised information, which may include user email lists and websites, check the translation teams page at the above &URL;.</para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -102,117 +50,58 @@
 </sect1>
 
 <sect1 id="contact-developers">
-<title
->Contacting the &kde; developers</title>
+<title>Contacting the &kde; developers</title>
 
-<para
->On this page, you can find links to &kde; related web sites.</para>
+<para>On this page, you can find links to &kde; related web sites.</para>
 
-<para
->The K Desktop Environment is developed by a large group of people around the world. Our main communication channel is the Internet. For general questions, you will be best served by asking on the mailing lists mentioned in the <link linkend="contact-mailinglists"
->previous section</link
->, and contact addresses for individual developers can be found in the documentation of their individual application.</para>
+<para>The K Desktop Environment is developed by a large group of people around the world. Our main communication channel is the Internet. For general questions, you will be best served by asking on the mailing lists mentioned in the <link linkend="contact-mailinglists">previous section</link>, and contact addresses for individual developers can be found in the documentation of their individual application.</para>
 
-<para
->Please visit our <ulink url="http://www.kde.org/contact/representatives.php"
->Official Representatives</ulink
-> page for official enquiries regarding &kde; (&eg; interviews).</para>
+<para>Please visit our <ulink url="http://www.kde.org/contact/representatives.php">Official Representatives</ulink> page for official enquiries regarding &kde; (&eg; interviews).</para>
 
-<para
->More information about &kde; is available at &kde-http;.</para>
+<para>More information about &kde; is available at &kde-http;.</para>
 
-<para
-><anchor id="links"/>Other &kde; websites include:</para>
+<para><anchor id="links"/>Other &kde; websites include:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><ulink url="http://www.kde.org"
->www.kde.org</ulink
-></term>
-<listitem
-><para
->&kde;'s official website</para
-></listitem>
+<term><ulink url="http://www.kde.org">www.kde.org</ulink></term>
+<listitem><para>&kde;'s official website</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><ulink url="http://developer.kde.org"
->developer.kde.org</ulink
-></term>
-<listitem
-><para
->The &kde; developers centre</para
-></listitem>
+<term><ulink url="http://developer.kde.org">developer.kde.org</ulink></term>
+<listitem><para>The &kde; developers centre</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><ulink url="http://webcvs.kde.org"
->webcvs.kde.org</ulink
-></term>
-<listitem
-><para
->A web interface to the &kde; CVS repository</para
-></listitem>
+<term><ulink url="http://webcvs.kde.org">webcvs.kde.org</ulink></term>
+<listitem><para>A web interface to the &kde; CVS repository</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><ulink url="http://i18n.kde.org"
->i18n.kde.org</ulink
-></term>
-<listitem
-><para
->&kde;'s internationalisation and documentation server</para
-></listitem>
+<term><ulink url="http://i18n.kde.org">i18n.kde.org</ulink></term>
+<listitem><para>&kde;'s internationalisation and documentation server</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><ulink url="ftp://ftp.kde.org"
->ftp.kde.org</ulink
-></term>
-<listitem
-><para
->The main &kde; &FTP; server. Please have a look at the link below to find a mirror site in your geographic region.</para
-></listitem>
+<term><ulink url="ftp://ftp.kde.org">ftp.kde.org</ulink></term>
+<listitem><para>The main &kde; &FTP; server. Please have a look at the link below to find a mirror site in your geographic region.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><ulink
-url="http://www.kde.org/mirrors"
->www.kde.org/mirrors</ulink
-></term
-> 
-<listitem
-><para
->&kde; web and &FTP; mirror sites</para
-></listitem>
+<term><ulink
+url="http://www.kde.org/mirrors">www.kde.org/mirrors</ulink></term> 
+<listitem><para>&kde; web and &FTP; mirror sites</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><ulink url="http://www.kde-apps.org"
->www.kde-apps.org</ulink
-></term>
-<listitem
-><para
->A directory of &kde; applications.</para
-></listitem>
+<term><ulink url="http://www.kde-apps.org">www.kde-apps.org</ulink></term>
+<listitem><para>A directory of &kde; applications.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><ulink url="http://www.kde-look.org"
->www.kde-look.org</ulink
-></term>
-<listitem
-><para
->&kde; themes, icons, and other items to change the look of your desktop.</para
-></listitem>
+<term><ulink url="http://www.kde-look.org">www.kde-look.org</ulink></term>
+<listitem><para>&kde; themes, icons, and other items to change the look of your desktop.</para></listitem>
 </varlistentry>
 </variablelist>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/khelpcenter/help.docbook b/tde-i18n-en_GB/docs/tdebase/khelpcenter/help.docbook
index 372573d1e1b..88ff0f7c915 100644
--- a/tde-i18n-en_GB/docs/tdebase/khelpcenter/help.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/khelpcenter/help.docbook
@@ -1,183 +1,88 @@
 <chapter id="help-system-user-manual">
-<chapterinfo
-><date
->2002-02-03</date
-> <releaseinfo
->0.08.00</releaseinfo
-> </chapterinfo>
-<title
->&kde; Help System User Manual</title>
+<chapterinfo><date>2002-02-03</date> <releaseinfo>0.08.00</releaseinfo> </chapterinfo>
+<title>&kde; Help System User Manual</title>
 <anchor id="help"/>
 
 <sect1 id="help-introduction">
-<title
->&kde; Help System</title>
+<title>&kde; Help System</title>
 	
-<para
->The &kde; help system is designed to make accessing the common &UNIX; help systems (<application
->man</application
-> and <application
->info</application
->) simple, as well as the native &kde; documentation (&XML;). </para>
+<para>The &kde; help system is designed to make accessing the common &UNIX; help systems (<application>man</application> and <application>info</application>) simple, as well as the native &kde; documentation (&XML;). </para>
 	
-<para
->All base &kde; applications come fully documented, thanks to the efforts of the Documentation team. If you would like to help, please write to the Documentation coordinator, Lauri Watts, at <email
->lauri@kde.org</email
-> for information. No experience is required, just enthusiasm and patience. </para>
-
-<para
->If you would like to help translating &kde; documentation to your native language, the Translation coordinator is Thomas Diehl, <email
->thd@kde.org</email
->, and he would also welcome the help. More information, including the coordinators for each language team, can be found on the <ulink url="http://i18n.kde.org"
->Internationalisation web site</ulink
->, and in the <link linkend="contact"
->Contact</link
-> section of this document. </para>
+<para>All base &kde; applications come fully documented, thanks to the efforts of the Documentation team. If you would like to help, please write to the Documentation coordinator, Lauri Watts, at <email>lauri@kde.org</email> for information. No experience is required, just enthusiasm and patience. </para>
+
+<para>If you would like to help translating &kde; documentation to your native language, the Translation coordinator is Thomas Diehl, <email>thd@kde.org</email>, and he would also welcome the help. More information, including the coordinators for each language team, can be found on the <ulink url="http://i18n.kde.org">Internationalisation web site</ulink>, and in the <link linkend="contact">Contact</link> section of this document. </para>
 
 <sect2 id="installation">
-<title
->Installation</title>
+<title>Installation</title>
 
-<para
->&khelpcenter; is an integral part of the &kde; Base installation, and is installed with every copy of &kde;. It can be found in the tdebase package, and is available from the &kde-ftp;, or will be found in your operating system tdebase package. </para>
+<para>&khelpcenter; is an integral part of the &kde; Base installation, and is installed with every copy of &kde;. It can be found in the tdebase package, and is available from the &kde-ftp;, or will be found in your operating system tdebase package. </para>
 
 </sect2>
 </sect1>
 
 <sect1 id="invoking-help">
-<title
->Invoking Help</title>
-
-<para
->&khelpcenter; can be called in several ways: </para>
-
-<variablelist
-> 
-<varlistentry
-> 
-<term
->From the <guimenu
->Help</guimenu
-> menu</term
-> 
-<listitem>
-<para
->The most common will probably be from within an application. Choose <menuchoice
-><guimenu
->Help</guimenu
-> <guimenuitem
->Contents</guimenuitem
-></menuchoice
-> to open that application's help file, at the contents page. </para>
+<title>Invoking Help</title>
+
+<para>&khelpcenter; can be called in several ways: </para>
+
+<variablelist> 
+<varlistentry> 
+<term>From the <guimenu>Help</guimenu> menu</term> 
+<listitem>
+<para>The most common will probably be from within an application. Choose <menuchoice><guimenu>Help</guimenu> <guimenuitem>Contents</guimenuitem></menuchoice> to open that application's help file, at the contents page. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->From the <guimenu
->K</guimenu
-> menu</term>
+<term>From the <guimenu>K</guimenu> menu</term>
 <listitem>
-<para
->Choose the big <guiicon
->K</guiicon
-> in your panel, and select <guimenuitem
->Help</guimenuitem
-> to open &khelpcenter;, starting at the default welcome page. </para>
-</listitem
-> 
+<para>Choose the big <guiicon>K</guiicon> in your panel, and select <guimenuitem>Help</guimenuitem> to open &khelpcenter;, starting at the default welcome page. </para>
+</listitem> 
 </varlistentry>
 
 <varlistentry>
-<term
->From the panel</term>
+<term>From the panel</term>
 <listitem>
-<para
->By default, the &kicker; panel contains an icon to call &khelpcenter;. Again, the default welcome page is displayed. </para>
-</listitem
-> 
+<para>By default, the &kicker; panel contains an icon to call &khelpcenter;. Again, the default welcome page is displayed. </para>
+</listitem> 
 </varlistentry>
 
 <varlistentry>
-<term
->From the command line</term>
+<term>From the command line</term>
 <listitem>
-<para
->&khelpcenter; may be started using a &URL; to display a file. &URL;s have been added for <command
->info</command
-> and <command
->man</command
-> pages also. You can use them as follows: </para
-> 
+<para>&khelpcenter; may be started using a &URL; to display a file. &URL;s have been added for <command>info</command> and <command>man</command> pages also. You can use them as follows: </para> 
 
 <variablelist>
 <varlistentry>
-<term
->An application help file</term>
-<listitem>
-<para
-><command
->khelpcenter</command
-> <option
->help:/<replaceable
->kedit</replaceable
-></option
-> </para>
-<para
->Opens the &kedit; help file, at the contents page. </para>
+<term>An application help file</term>
+<listitem>
+<para><command>khelpcenter</command> <option>help:/<replaceable>kedit</replaceable></option> </para>
+<para>Opens the &kedit; help file, at the contents page. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->A local &URL;</term>
-<listitem
-><para
-><command
->khelpcenter</command
-> <option
->file:/ <replaceable
->usr/local/src/qt/html/index.html</replaceable
-></option
-> </para>
+<term>A local &URL;</term>
+<listitem><para><command>khelpcenter</command> <option>file:/ <replaceable>usr/local/src/qt/html/index.html</replaceable></option> </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->A Man page</term>
+<term>A Man page</term>
 <listitem>
-<para
-><command
->khelpcenter</command
-> <option
->man:/<replaceable
->strcpy</replaceable
-></option
-> </para>
+<para><command>khelpcenter</command> <option>man:/<replaceable>strcpy</replaceable></option> </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->An Info page</term>
+<term>An Info page</term>
 <listitem>
-<para
-><command
->khelpcenter</command
-> <option
->info:/<replaceable
->gcc</replaceable
-></option
-> </para>
+<para><command>khelpcenter</command> <option>info:/<replaceable>gcc</replaceable></option> </para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->Invoking <command
->khelpcenter</command
-> with no parameters opens the default welcome page. </para>
+<para>Invoking <command>khelpcenter</command> with no parameters opens the default welcome page. </para>
 </listitem>
 </varlistentry>
 
@@ -185,200 +90,104 @@
 </sect1>
 
 <sect1 id="interface-basics">
-<title
->The &khelpcenter; interface</title>
-
-<para
->The &khelpcenter; interface consists of two panes of information. </para>
-
-<para
->The toolbar and menus are explained further in <xref linkend="menu-and-toolbar-ref"/>. </para>
-
-<para
->Documents contain their own navigation tools, enabling you to move either sequentially through a document, using <guilabel
->Next</guilabel
->, <guilabel
->Previous</guilabel
->, and <guilabel
->Home</guilabel
-> links, or to move around in a less structured manner, using hyperlinks. </para>
-
-<para
->Links can take you to other parts of the same document, or to a different document, and you can use the <guiicon
->Back</guiicon
-> (Left pointing arrow) or <guiicon
->Forward</guiicon
-> (Right pointing arrow) icons on the toolbar to move through the documents you have viewed in this session. </para
-> 
-
-<para
->The two panes display the contents of the help system, and the help files themselves, on the left and right respectively. </para>
+<title>The &khelpcenter; interface</title>
+
+<para>The &khelpcenter; interface consists of two panes of information. </para>
+
+<para>The toolbar and menus are explained further in <xref linkend="menu-and-toolbar-ref"/>. </para>
+
+<para>Documents contain their own navigation tools, enabling you to move either sequentially through a document, using <guilabel>Next</guilabel>, <guilabel>Previous</guilabel>, and <guilabel>Home</guilabel> links, or to move around in a less structured manner, using hyperlinks. </para>
+
+<para>Links can take you to other parts of the same document, or to a different document, and you can use the <guiicon>Back</guiicon> (Left pointing arrow) or <guiicon>Forward</guiicon> (Right pointing arrow) icons on the toolbar to move through the documents you have viewed in this session. </para> 
+
+<para>The two panes display the contents of the help system, and the help files themselves, on the left and right respectively. </para>
 
 <sect2 id="contents-pane">
-<title
->The <guilabel
->Contents</guilabel
-> pane</title>
-
-<para
->The <guilabel
->Contents</guilabel
-> pane in &khelpcenter; is displayed on the left hand side of the window. As you might expect, you can move the splitter bar, to make sure you can comfortably read the contents of either pane. </para
-> 
-
-<para
->The <guilabel
->Contents</guilabel
-> pane is further divided into two tabs, one containing a <link linkend="contents-menu"
->menu</link
-> showing all the help information &khelpcenter; is aware of, and the other contains the &kde; <link linkend="kde-glossary"
->glossary</link
-> of terms. </para>
+<title>The <guilabel>Contents</guilabel> pane</title>
+
+<para>The <guilabel>Contents</guilabel> pane in &khelpcenter; is displayed on the left hand side of the window. As you might expect, you can move the splitter bar, to make sure you can comfortably read the contents of either pane. </para> 
+
+<para>The <guilabel>Contents</guilabel> pane is further divided into two tabs, one containing a <link linkend="contents-menu">menu</link> showing all the help information &khelpcenter; is aware of, and the other contains the &kde; <link linkend="kde-glossary">glossary</link> of terms. </para>
 
 <sect3 id="contents-menu">
-<title
->The <guilabel
->Contents</guilabel
-> Menu</title>
+<title>The <guilabel>Contents</guilabel> Menu</title>
 
-<para
->The <guilabel
->Contents</guilabel
-> contains the following default entries: </para
-> 
+<para>The <guilabel>Contents</guilabel> contains the following default entries: </para> 
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Introduction</guilabel
-></term>
-<listitem
-><para
->Welcome to &kde; - an introduction to the K Desktop Environment.</para
-></listitem>
+<term><guilabel>Introduction</guilabel></term>
+<listitem><para>Welcome to &kde; - an introduction to the K Desktop Environment.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Introduction to &kde;</guilabel
-></term>
+<term><guilabel>Introduction to &kde;</guilabel></term>
 <listitem>
-<para
->The &kde; Quickstart guide. Contains a tour of the &kde; Interface and specific help and tips on how to work smarter with &kde;. </para>
+<para>The &kde; Quickstart guide. Contains a tour of the &kde; Interface and specific help and tips on how to work smarter with &kde;. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->&kde; User's manual</guilabel
-></term>
+<term><guilabel>&kde; User's manual</guilabel></term>
 <listitem>
-<para
->The &kde; User's manual is an in-depth exploration of &kde;, including installation, configuration and customisation, and use. </para>
-</listitem
-> 
+<para>The &kde; User's manual is an in-depth exploration of &kde;, including installation, configuration and customisation, and use. </para>
+</listitem> 
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Application manuals</guilabel
-></term>
+<term><guilabel>Application manuals</guilabel></term>
 <listitem>
-<para
->Native &kde; application documentation. All &kde; applications have documentation in &XML; format, which are converted to <acronym
->HTML</acronym
-> when you view them. This section lists all the &kde; applications with a brief description and a link to the full application documentation. </para>
-<para
->The applications are displayed in a tree structure that echoes the default structure of the <guimenu
->K</guimenu
-> menu, making it easy to find the application you are looking for. </para>
-</listitem
-> 
+<para>Native &kde; application documentation. All &kde; applications have documentation in &XML; format, which are converted to <acronym>HTML</acronym> when you view them. This section lists all the &kde; applications with a brief description and a link to the full application documentation. </para>
+<para>The applications are displayed in a tree structure that echoes the default structure of the <guimenu>K</guimenu> menu, making it easy to find the application you are looking for. </para>
+</listitem> 
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->&UNIX; manual pages</guilabel
-></term>
+<term><guilabel>&UNIX; manual pages</guilabel></term>
 <listitem>
-<para
->&UNIX; man pages are the traditional on-line documentation format for &UNIX; systems. Most programs on your system will have a man page. In addition, man pages exist for programming functions and file formats. </para>
-</listitem
-> 
+<para>&UNIX; man pages are the traditional on-line documentation format for &UNIX; systems. Most programs on your system will have a man page. In addition, man pages exist for programming functions and file formats. </para>
+</listitem> 
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Browse info pages</guilabel
-></term>
+<term><guilabel>Browse info pages</guilabel></term>
 <listitem>
-<para
->TeXinfo documentation is used by many &GNU; applications, including <command
->gcc</command
-> (the C/C++ compiler), <command
->emacs</command
->, and many others. </para>
+<para>TeXinfo documentation is used by many &GNU; applications, including <command>gcc</command> (the C/C++ compiler), <command>emacs</command>, and many others. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Tutorials</guilabel
-></term>
+<term><guilabel>Tutorials</guilabel></term>
 <listitem>
-<para
->Short, task based or informational tutorials. </para>
+<para>Short, task based or informational tutorials. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->The &kde; FAQ</guilabel
-></term>
+<term><guilabel>The &kde; FAQ</guilabel></term>
 <listitem>
-<para
->Frequently asked questions about &kde;, and their answers. </para>
+<para>Frequently asked questions about &kde;, and their answers. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->&kde; on the web</guilabel
-></term>
+<term><guilabel>&kde; on the web</guilabel></term>
 <listitem>
-<para
->Links to &kde; on the web, both the official &kde; website, and other useful sites. </para>
+<para>Links to &kde; on the web, both the official &kde; website, and other useful sites. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Contact Information</guilabel
-></term>
+<term><guilabel>Contact Information</guilabel></term>
 <listitem>
-<para
->Information on how to contact &kde; developers, and how to join the &kde; mailing lists. </para>
+<para>Information on how to contact &kde; developers, and how to join the &kde; mailing lists. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Supporting &kde;</guilabel
-></term>
+<term><guilabel>Supporting &kde;</guilabel></term>
 <listitem>
-<para
->How to help, and how to get involved. </para>
+<para>How to help, and how to get involved. </para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -386,24 +195,14 @@
 </sect3>
 <!-- 
 <sect3 id="search">
-<title
->The <guilabel
->Search</guilabel
-> tab</title>
+<title>The <guilabel>Search</guilabel> tab</title>
 
 <para>
-Searching requires you have the <application
->ht://Dig</application>
+Searching requires you have the <application>ht://Dig</application>
 application installed.  Information on installing and configuring the
 search index is available in the document.  Configuration of the search
 index is performed in the &kcontrol;, by choosing
-<menuchoice
-><guisubmenu
->Help</guisubmenu
-><guimenuitem
->Index</guimenuitem
-></menuchoice
->,
+<menuchoice><guisubmenu>Help</guisubmenu><guimenuitem>Index</guimenuitem></menuchoice>,
 and detailed help is available from this module.
 </para>
 
@@ -415,172 +214,77 @@ up and configured.
 <para>
 Searching the help files is fairly intuitive, enter the word(s) you wish
 to search for in the text box, choose your options (if any), and press
-<guibutton
->Search</guibutton
->.  The results display in the viewer pane
+<guibutton>Search</guibutton>.  The results display in the viewer pane
 to the right.
 </para>
 
-<para
->The options available are:</para>
+<para>The options available are:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Method</guilabel
-></term>
+<term><guilabel>Method</guilabel></term>
 <listitem>
 <para>
 Choose how to search for multiple words.  If you choose
-<guilabel
->and</guilabel
->, results are returned only if all your search
-terms are included in the page. <guilabel
->or</guilabel
-> returns results
-if <emphasis
->any</emphasis
-> of the search terms are found, and
-<guilabel
->boolean</guilabel
-> lets you search using a combination.
-</para
-> 
+<guilabel>and</guilabel>, results are returned only if all your search
+terms are included in the page. <guilabel>or</guilabel> returns results
+if <emphasis>any</emphasis> of the search terms are found, and
+<guilabel>boolean</guilabel> lets you search using a combination.
+</para> 
 <para>
-Boolean syntax lets you use the operators <literal
->AND</literal
->,
-<literal
->OR</literal
-> and <literal
->NOT</literal
-> to create complex
+Boolean syntax lets you use the operators <literal>AND</literal>,
+<literal>OR</literal> and <literal>NOT</literal> to create complex
 searches. Some examples:</para>
 <variablelist>
 <varlistentry>
-<term
-><userinput
->cat and dog</userinput
-></term>
-<listitem
-><para
->Searches for pages which have both the words
-<userinput
->cat</userinput
-> and <userinput
->dog</userinput
-> in them.  Pages with
-only one or the other will not be returned.</para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><userinput
->cat not dog</userinput
-></term>
-<listitem
-><para
->Searches for pages with <userinput
->cat</userinput
-> in them, but
-only returns the ones that don't have the word <userinput
->dog</userinput
-> in
-them.</para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><userinput
->cat or (dog not nose)</userinput
-></term>
-<listitem
-><para
->Searches for pages which contain <userinput
->cat</userinput
->, and
-for pages which contain <userinput
->dog</userinput
-> but don't contain
-<userinput
->nose</userinput
->.  Pages which contain both
-<userinput
->cat</userinput
-> and <userinput
->nose</userinput
-> would be returned,
-pages containing all three words would not.</para
-></listitem
-> 
+<term><userinput>cat and dog</userinput></term>
+<listitem><para>Searches for pages which have both the words
+<userinput>cat</userinput> and <userinput>dog</userinput> in them.  Pages with
+only one or the other will not be returned.</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><userinput>cat not dog</userinput></term>
+<listitem><para>Searches for pages with <userinput>cat</userinput> in them, but
+only returns the ones that don't have the word <userinput>dog</userinput> in
+them.</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><userinput>cat or (dog not nose)</userinput></term>
+<listitem><para>Searches for pages which contain <userinput>cat</userinput>, and
+for pages which contain <userinput>dog</userinput> but don't contain
+<userinput>nose</userinput>.  Pages which contain both
+<userinput>cat</userinput> and <userinput>nose</userinput> would be returned,
+pages containing all three words would not.</para></listitem> 
 </varlistentry>
 </variablelist>
-<para
->If your searches are not returning the results you expect, check
+<para>If your searches are not returning the results you expect, check
 carefully you haven't excluded the wrong search term with an errand
-<literal
->NOT</literal
-> or a stray brace.</para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><guilabel
->Max. results</guilabel
-></term>
-<listitem
-><para
->Determines the maximum number of results returned from your
-search.</para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><guilabel
->Format</guilabel
-></term>
-<listitem
-><para
->Decide if you want just a short link to the page
+<literal>NOT</literal> or a stray brace.</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><guilabel>Max. results</guilabel></term>
+<listitem><para>Determines the maximum number of results returned from your
+search.</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><guilabel>Format</guilabel></term>
+<listitem><para>Decide if you want just a short link to the page
 containing your search terms, or do you want a longer
-summary.</para
-></listitem
-> 
-</varlistentry>
-<varlistentry>
-<term
-><guilabel
->Sort</guilabel
-></term>
-<listitem
-><para
->Sort the results in order of <guilabel
->Score</guilabel
-> (how
+summary.</para></listitem> 
+</varlistentry>
+<varlistentry>
+<term><guilabel>Sort</guilabel></term>
+<listitem><para>Sort the results in order of <guilabel>Score</guilabel> (how
 closely your search terms were matched,) alphabetically by
-<guilabel
->Title</guilabel
-> or by <guilabel
->Date</guilabel
->.  Selecting the
-<guilabel
->Reverse order</guilabel
-> check box, naturally enough, reverses the
-sort order of the results.</para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><guilabel
->Update index</guilabel
-></term>
-<listitem
-><para
->Update the search index, to incorporate new documents,
+<guilabel>Title</guilabel> or by <guilabel>Date</guilabel>.  Selecting the
+<guilabel>Reverse order</guilabel> check box, naturally enough, reverses the
+sort order of the results.</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><guilabel>Update index</guilabel></term>
+<listitem><para>Update the search index, to incorporate new documents,
 or if you think your database is incomplete or damaged.  This may take
-some time.</para
-></listitem>
+some time.</para></listitem>
 </varlistentry>
 </variablelist>
 </sect3>
@@ -589,209 +293,118 @@ some time.</para
 </sect2>
 
 <sect2 id="man-and-info">
-<title
->The <application
->Man</application
-> and <application
->Info</application
-> sections</title>
+<title>The <application>Man</application> and <application>Info</application> sections</title>
 
-<para
->Man pages are the standard &UNIX; manual pages, and have been in use for many years on many operating systems. They are extremely thorough, and are the very best place to get information about most &UNIX; commands and applications. When people say <quote
->RTFM</quote
->, the Manual they are referring to is very often the man page.</para>
+<para>Man pages are the standard &UNIX; manual pages, and have been in use for many years on many operating systems. They are extremely thorough, and are the very best place to get information about most &UNIX; commands and applications. When people say <quote>RTFM</quote>, the Manual they are referring to is very often the man page.</para>
 
-<para
->The man pages are not perfect. They tend to be in depth, but also extremely technical, often written by developers, and for developers. In some cases this makes them somewhat unfriendly, if not downright impossible for many users to understand. They are, however, the best source of solid information on most command line applications, and very often the only source.</para>
+<para>The man pages are not perfect. They tend to be in depth, but also extremely technical, often written by developers, and for developers. In some cases this makes them somewhat unfriendly, if not downright impossible for many users to understand. They are, however, the best source of solid information on most command line applications, and very often the only source.</para>
 
-<para
->If you've ever wondered what the number is when people write things like man(1) it means which section of the manual the item is in. You will see &khelpcenter; uses the numbers to divide the very many man pages into their own sections, making it easier for you to find the information you're looking for, if you're just browsing.</para>
+<para>If you've ever wondered what the number is when people write things like man(1) it means which section of the manual the item is in. You will see &khelpcenter; uses the numbers to divide the very many man pages into their own sections, making it easier for you to find the information you're looking for, if you're just browsing.</para>
 
-<para
->Also available are the Info pages, intended to be a replacement for the man pages. The maintainer of some applications no longer update the man pages, so if there is both a man page and an info page available, the info page is probably the most recent. Most applications have one or the other though. If the application you are looking for help on is a &GNU; utility, you will most likely find it has an info page, not a man page.</para>
+<para>Also available are the Info pages, intended to be a replacement for the man pages. The maintainer of some applications no longer update the man pages, so if there is both a man page and an info page available, the info page is probably the most recent. Most applications have one or the other though. If the application you are looking for help on is a &GNU; utility, you will most likely find it has an info page, not a man page.</para>
 
 <sect3 id="navigation">
-<title
->Navigating inside the <application
->Info</application
-> pages</title>
-
-<para
->Info documents are arranged hierarchically with each page called a node. All info documents have a <guilabel
->Top</guilabel
-> node, &ie; the opening page. You can return to the <guilabel
->Top</guilabel
-> of an info document by pressing <guilabel
->Top</guilabel
->.</para>
-
-<para
-><guibutton
->Prev</guibutton
-> &amp; <guibutton
->Next</guibutton
-> are used to move to the previous/next page at the current level of the hierarchy.</para>
-
-<para
->Clicking on a menu item within a document moves you to a lower level in the hierarchy. You may move up the hierarchy by pressing <guibutton
->Up</guibutton
->.</para>
-
-<para
->Man is treated similarly to info, with the section index being the Top node and each man page on the level below. Man entries are one page long.</para>
+<title>Navigating inside the <application>Info</application> pages</title>
+
+<para>Info documents are arranged hierarchically with each page called a node. All info documents have a <guilabel>Top</guilabel> node, &ie; the opening page. You can return to the <guilabel>Top</guilabel> of an info document by pressing <guilabel>Top</guilabel>.</para>
+
+<para><guibutton>Prev</guibutton> &amp; <guibutton>Next</guibutton> are used to move to the previous/next page at the current level of the hierarchy.</para>
+
+<para>Clicking on a menu item within a document moves you to a lower level in the hierarchy. You may move up the hierarchy by pressing <guibutton>Up</guibutton>.</para>
+
+<para>Man is treated similarly to info, with the section index being the Top node and each man page on the level below. Man entries are one page long.</para>
 
 </sect3>
 </sect2>
 
 <sect2 id="kde-glossary">
-<title
->The &kde; glossary</title>
+<title>The &kde; glossary</title>
 
-<para
->The glossary provides a quick reference point, where you can look up the definitions of words that may be unfamiliar to you. These range from &kde; specific applications and technologies, through to general &UNIX; computing terms. </para>
+<para>The glossary provides a quick reference point, where you can look up the definitions of words that may be unfamiliar to you. These range from &kde; specific applications and technologies, through to general &UNIX; computing terms. </para>
 
-<para
->In the left hand pane you will see a tree view, with two choices: <guilabel
->Alphabetically</guilabel
-> or <guilabel
->By topic</guilabel
->. Both contain the same entries, sorted differently, to allow you to quickly find the item of interest. </para>
+<para>In the left hand pane you will see a tree view, with two choices: <guilabel>Alphabetically</guilabel> or <guilabel>By topic</guilabel>. Both contain the same entries, sorted differently, to allow you to quickly find the item of interest. </para>
 
-<para
->Navigate down the tree views to the left, and items you select will be displayed on the right. </para>
+<para>Navigate down the tree views to the left, and items you select will be displayed on the right. </para>
 
 </sect2>
 
 <sect2 id="menu-and-toolbar-ref">
-<title
->The menus and toolbar</title>
+<title>The menus and toolbar</title>
 
-<para
->&khelpcenter; has a very minimal interface, allowing you to concentrate on getting help rather than learning how to use the help browser. </para>
+<para>&khelpcenter; has a very minimal interface, allowing you to concentrate on getting help rather than learning how to use the help browser. </para>
 
-<para
->The icons available to you in the toolbar are as follows: </para>
+<para>The icons available to you in the toolbar are as follows: </para>
 
 <variablelist>
-<title
->Toolbar Icons</title>
+<title>Toolbar Icons</title>
 
 <varlistentry>
 
-<term
-><guiicon
->Back</guiicon
-></term>
+<term><guiicon>Back</guiicon></term>
 <listitem>
-<para
->Go to the previous page you viewed.</para>
+<para>Go to the previous page you viewed.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guiicon
->Forward</guiicon
-></term>
+<term><guiicon>Forward</guiicon></term>
 <listitem>
-<para
->Go forward one page. This icon is only active if you have already used the <guiicon
->Back</guiicon
-> icon.</para
-></listitem>
+<para>Go forward one page. This icon is only active if you have already used the <guiicon>Back</guiicon> icon.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guiicon
->Print</guiicon
-></term>
+<term><guiicon>Print</guiicon></term>
 <listitem>
-<para
->Print the contents of the currently visible page. </para>
+<para>Print the contents of the currently visible page. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guiicon
->Find</guiicon
-></term>
+<term><guiicon>Find</guiicon></term>
 <listitem>
-<para
->Find a word or words within the currently visible page. </para>
+<para>Find a word or words within the currently visible page. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guiicon
->Increase Font</guiicon
-></term>
+<term><guiicon>Increase Font</guiicon></term>
 <listitem>
-<para
->Increase the size of the text in the viewer pane. </para>
+<para>Increase the size of the text in the viewer pane. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guiicon
->Decrease Font</guiicon
-></term>
+<term><guiicon>Decrease Font</guiicon></term>
 <listitem>
-<para
->Decrease the size of the text in the viewer pane. This icon is only enabled if you have previously enlarged the text. </para>
+<para>Decrease the size of the text in the viewer pane. This icon is only enabled if you have previously enlarged the text. </para>
 </listitem>
 </varlistentry>
 
 </variablelist>
 
-<para
->The menus contain the following entries: </para>
+<para>The menus contain the following entries: </para>
 
 <variablelist>
 <varlistentry>
-<term
-><guimenu
->File</guimenu
-></term>
+<term><guimenu>File</guimenu></term>
 <listitem>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Print...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>File</guimenu> <guimenuitem>Print...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Print the contents of the currently visible page. </para>
+<para>Print the contents of the currently visible page. </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
->Close and exit &khelpcenter; </para>
+<para>Close and exit &khelpcenter; </para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -799,52 +412,23 @@ some time.</para
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenu
->Edit</guimenu
-></term>
+<term><guimenu>Edit</guimenu></term>
 <listitem>
 
 <variablelist>
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->A</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Select All</guimenuitem
-> </menuchoice>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>A</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Select All</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Select all the text in the current page. </para>
+<para>Select all the text in the current page. </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
->Find a word or words in the currently visible page. </para>
+<para>Find a word or words in the currently visible page. </para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -852,43 +436,22 @@ some time.</para
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenu
->View</guimenu
-></term>
+<term><guimenu>View</guimenu></term>
 <listitem>
 <variablelist>
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->View Document Source</guimenuitem
-> </menuchoice>
+<term><menuchoice><guimenu>View</guimenu> <guimenuitem>View Document Source</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->View the <acronym
->HTML</acronym
-> source of the page you are currently viewing. </para>
+<para>View the <acronym>HTML</acronym> source of the page you are currently viewing. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-> <guisubmenu
->Set Encoding</guisubmenu
-> </menuchoice>
+<term><menuchoice><guimenu>View</guimenu> <guisubmenu>Set Encoding</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Change the encoding of the current page. Normally, the default setting of <guimenuitem
->Auto</guimenuitem
-> should be sufficient, but if you are having problems viewing pages written in languages other than English, you may need to choose a specific encoding in this menu. </para>
+<para>Change the encoding of the current page. Normally, the default setting of <guimenuitem>Auto</guimenuitem> should be sufficient, but if you are having problems viewing pages written in languages other than English, you may need to choose a specific encoding in this menu. </para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -896,68 +459,36 @@ some time.</para
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Go</guimenu
-> <guimenuitem
->Back</guimenuitem
-></menuchoice
-></term>
+<term><menuchoice><guimenu>Go</guimenu> <guimenuitem>Back</guimenuitem></menuchoice></term>
 <listitem>
-<para
->Go back to the previous page you were viewing.</para>
+<para>Go back to the previous page you were viewing.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Go</guimenu
-> <guimenuitem
->Forward</guimenuitem
-> </menuchoice
-></term>
+<term><menuchoice><guimenu>Go</guimenu> <guimenuitem>Forward</guimenuitem> </menuchoice></term>
 <listitem>
-<para
->If you have previously moved back with the back icon or menu entry, you can work your way forward again with this menu entry.</para>
+<para>If you have previously moved back with the back icon or menu entry, you can work your way forward again with this menu entry.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Go</guimenu
-> <guimenuitem
->...</guimenuitem
-> </menuchoice
-></term>
+<term><menuchoice><guimenu>Go</guimenu> <guimenuitem>...</guimenuitem> </menuchoice></term>
 <listitem>
-<para
->At the bottom of the <guimenu
->Go</guimenu
-> menu, you will find a history list, of the last few pages you have looked at. Selecting one will take you directly back to that page.</para>
-</listitem
-></varlistentry
-></variablelist>
+<para>At the bottom of the <guimenu>Go</guimenu> menu, you will find a history list, of the last few pages you have looked at. Selecting one will take you directly back to that page.</para>
+</listitem></varlistentry></variablelist>
 
 </sect2>
 
 </sect1>
 
 <sect1 id="credits">
-<title
->Credits and Licences</title>
+<title>Credits and Licences</title>
 
-<para
->&khelpcenter;</para>
+<para>&khelpcenter;</para>
 
-<para
->Originally developed by &Matthias.Elter; &Matthias.Elter.mail;</para>
-<para
->The current maintainer is &Cornelius.Schumacher; &Cornelius.Schumacher.mail;</para>
+<para>Originally developed by &Matthias.Elter; &Matthias.Elter.mail;</para>
+<para>The current maintainer is &Cornelius.Schumacher; &Cornelius.Schumacher.mail;</para>
 &underFDL; &underGPL; </sect1>
 </chapter>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/khelpcenter/index.docbook b/tde-i18n-en_GB/docs/tdebase/khelpcenter/index.docbook
index 06bfe61fb87..948f43a5795 100644
--- a/tde-i18n-en_GB/docs/tdebase/khelpcenter/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/khelpcenter/index.docbook
@@ -24,65 +24,37 @@ available, unless only references to the top page are needed, which is doubtful.
   <!ENTITY kde-kcontrol-doc SYSTEM "../kcontrol/index.html" NDATA SGML>
   <!ENTITY kde-kfm-doc SYSTEM "../konqueror/index.html" NDATA SGML>
   <!ENTITY kde-kwm-doc SYSTEM "../kwm/index.html" NDATA SGML>
-  <!-- ENTITY man SYSTEM "." NDATA LINESPECIFIC
-> - to be changed ; should be 
+  <!-- ENTITY man SYSTEM "." NDATA LINESPECIFIC> - to be changed ; should be 
 the reference to the apropos file in this case, but I cannot really imagine 
 putting all manual pages into FPIs or system identifiers, so we'll have to find 
 a way round it. (FF) -->
   <!ENTITY kappname "&khelpcenter;">
-  <!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+  <!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
   <!ENTITY % addindex "IGNORE">
 ]>
 
 <book lang="&language;">
 <bookinfo>
-<title
->The &khelpcenter;</title>
+<title>The &khelpcenter;</title>
 <authorgroup>
-<corpauthor
->The &kde; Team</corpauthor>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<corpauthor>The &kde; Team</corpauthor>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
-<date
->2002-01-18</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-01-18</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <abstract>
-<para
->&kde; is a powerful graphical desktop environment for &UNIX; workstations. A &kde; desktop combines ease of use, contemporary functionality and outstanding graphical design with the technological superiority of the &UNIX; operating system.</para>
+<para>&kde; is a powerful graphical desktop environment for &UNIX; workstations. A &kde; desktop combines ease of use, contemporary functionality and outstanding graphical design with the technological superiority of the &UNIX; operating system.</para>
 </abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->tdebase</keyword>
-<keyword
->khelpcenter</keyword>
-<keyword
->kdehelp</keyword>
-<keyword
->help</keyword>
-<keyword
->help centre</keyword>
-<keyword
->KDE help centre</keyword>
+<keyword>KDE</keyword>
+<keyword>tdebase</keyword>
+<keyword>khelpcenter</keyword>
+<keyword>kdehelp</keyword>
+<keyword>help</keyword>
+<keyword>help centre</keyword>
+<keyword>KDE help centre</keyword>
 </keywordset>
 </bookinfo>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/khelpcenter/links.docbook b/tde-i18n-en_GB/docs/tdebase/khelpcenter/links.docbook
index 51e671a605c..644f2322d50 100644
--- a/tde-i18n-en_GB/docs/tdebase/khelpcenter/links.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/khelpcenter/links.docbook
@@ -1,90 +1,15 @@
 <chapter id="web">
 <chapterinfo>
-<date
->2000-10-02</date>
-<releaseinfo
->1.94.00</releaseinfo>
+<date>2000-10-02</date>
+<releaseinfo>1.94.00</releaseinfo>
 </chapterinfo>
-<title
->&kde; on the web</title>
+<title>&kde; on the web</title>
 <anchor id="links"/>
  
-<para
->The K Desktop Environment is developed by a large group of developers around the world. Our main communication channel is the Internet. Please find links to &kde; related web sites on this page.</para>
+<para>The K Desktop Environment is developed by a large group of developers around the world. Our main communication channel is the Internet. Please find links to &kde; related web sites on this page.</para>
 
 
-<variablelist
-> <varlistentry
-> <term
-><ulink url="http://www.kde.org"
->www.kde.org</ulink
-></term
-> <listitem
-><para
->&kde;'s official website</para
-></listitem
-> </varlistentry
-> <varlistentry
-> <term
-><ulink url="http://kde.themes.org"
->kde.themes.org</ulink
-></term
-> <listitem
-><para
->&kde; themes</para
-></listitem
-> </varlistentry
-> <varlistentry
-> <term
-><ulink url="http://developer.kde.org"
->developer.kde.org</ulink
-></term
-> <listitem
-><para
->The &kde; developers centre</para
-></listitem
-> </varlistentry
-> <varlistentry
-> <term
-><ulink url="http://webcvs.kde.org"
->webcvs.kde.org</ulink
-></term
-> <listitem
-><para
->A web interface to the &kde; CVS repository</para
-></listitem
-> </varlistentry
-> <varlistentry
-> <term
-><ulink url="http://i18n.kde.org"
->i18n.kde.org</ulink
-></term
-> <listitem
-><para
->&kde;'s internationalisation and documentation server</para
-></listitem
-> </varlistentry
-> <varlistentry
-> <term
-><ulink url="ftp://ftp.kde.org"
->ftp.kde.org</ulink
-></term
-> <listitem
-><para
->The main &kde; &FTP; server. Please have a look at the link below to find a mirror site in your geographic region.</para
-></listitem
-> </varlistentry
-> <varlistentry
-> <term
-><ulink url="http://www.kde.org/mirrors.html"
->www.kde.org/mirrors.html</ulink
-></term
-> <listitem
-><para
->&kde; &FTP; mirror sites</para
-></listitem
-> </varlistentry
-> </variablelist>
+<variablelist> <varlistentry> <term><ulink url="http://www.kde.org">www.kde.org</ulink></term> <listitem><para>&kde;'s official website</para></listitem> </varlistentry> <varlistentry> <term><ulink url="http://kde.themes.org">kde.themes.org</ulink></term> <listitem><para>&kde; themes</para></listitem> </varlistentry> <varlistentry> <term><ulink url="http://developer.kde.org">developer.kde.org</ulink></term> <listitem><para>The &kde; developers centre</para></listitem> </varlistentry> <varlistentry> <term><ulink url="http://webcvs.kde.org">webcvs.kde.org</ulink></term> <listitem><para>A web interface to the &kde; CVS repository</para></listitem> </varlistentry> <varlistentry> <term><ulink url="http://i18n.kde.org">i18n.kde.org</ulink></term> <listitem><para>&kde;'s internationalisation and documentation server</para></listitem> </varlistentry> <varlistentry> <term><ulink url="ftp://ftp.kde.org">ftp.kde.org</ulink></term> <listitem><para>The main &kde; &FTP; server. Please have a look at the link below to find a mirror site in your geographic region.</para></listitem> </varlistentry> <varlistentry> <term><ulink url="http://www.kde.org/mirrors.html">www.kde.org/mirrors.html</ulink></term> <listitem><para>&kde; &FTP; mirror sites</para></listitem> </varlistentry> </variablelist>
 
 </chapter>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/khelpcenter/support.docbook b/tde-i18n-en_GB/docs/tdebase/khelpcenter/support.docbook
index c15b43176d2..432d41b1eb8 100644
--- a/tde-i18n-en_GB/docs/tdebase/khelpcenter/support.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/khelpcenter/support.docbook
@@ -1,101 +1,63 @@
 <chapter id="supporting-kde">
-<chapterinfo
-><date
->2002-03-04</date
-> <releaseinfo
->2.02.00</releaseinfo
-> </chapterinfo>
-<title
->Supporting &kde;</title>
+<chapterinfo><date>2002-03-04</date> <releaseinfo>2.02.00</releaseinfo> </chapterinfo>
+<title>Supporting &kde;</title>
 <anchor id="support"/>
 
 <sect1 id="supporting-kde-introduction">
-<title
->Supporting &kde;</title>
+<title>Supporting &kde;</title>
 
-<para
->If you are new to &kde;, the &kde; project might look like big machinery to you. Undoubtedly, &kde; is no longer a small project, nevertheless it is very important to realise that it is easy to <quote
->make a difference</quote
-> in the &kde; world. </para>
+<para>If you are new to &kde;, the &kde; project might look like big machinery to you. Undoubtedly, &kde; is no longer a small project, nevertheless it is very important to realise that it is easy to <quote>make a difference</quote> in the &kde; world. </para>
 
-<para
->There is always a need for dedicated developers, graphic artists, sound engineers, translators and documentation writers. Consider jumping aboard this exciting international project and make yourself a name in the software world.</para>
+<para>There is always a need for dedicated developers, graphic artists, sound engineers, translators and documentation writers. Consider jumping aboard this exciting international project and make yourself a name in the software world.</para>
 
-<para
->Along the way you will make countless friends and acquaintances all over the world. Also, the satisfaction that stems from doing actual hands-on work, that will benefit an uncountable number of users world-wide, and from seeing an unparalleled project grow, is hard to beat. Please consider joining and supporting &kde; and hop aboard this exciting journey towards a free and open alternative computing platform. </para>
+<para>Along the way you will make countless friends and acquaintances all over the world. Also, the satisfaction that stems from doing actual hands-on work, that will benefit an uncountable number of users world-wide, and from seeing an unparalleled project grow, is hard to beat. Please consider joining and supporting &kde; and hop aboard this exciting journey towards a free and open alternative computing platform. </para>
 
 </sect1>
 
 <sect1 id="supporting-kde-get-started">
-<title
->How to get started</title>
+<title>How to get started</title>
 
 <itemizedlist>
 
-<listitem
-><para
->Subscribe to the <link linkend="contact"
->&kde; mailing lists</link
-> that interest you. </para
-></listitem>
-
-<listitem
-><para
->Read the <ulink url="http://lists.kde.org"
->mailing list</ulink
-> archives in order to get a feel for &kde; development. </para
-></listitem>
-
-<listitem
-><para
->Learn how to program using the &kde; application framework and join the friendly &kde; developers' community. </para
-></listitem>
+<listitem><para>Subscribe to the <link linkend="contact">&kde; mailing lists</link> that interest you. </para></listitem>
+
+<listitem><para>Read the <ulink url="http://lists.kde.org">mailing list</ulink> archives in order to get a feel for &kde; development. </para></listitem>
+
+<listitem><para>Learn how to program using the &kde; application framework and join the friendly &kde; developers' community. </para></listitem>
 
 </itemizedlist>
 
 </sect1>
 
 <sect1 id="supporting-kde-financial-support">
-<title
->Supporting financially</title>
+<title>Supporting financially</title>
 
-<para
->The &kde; team is working very hard on providing you with the best desktop available for the &UNIX; operating system. &kde; is available for free and will always be available for free, including each and every line of its source code, for everyone to modify and distribute. If you enjoy and use &kde; please consider supporting the &kde; Project financially. &kde; is in constant need of funds in order to finance its operations. </para>
+<para>The &kde; team is working very hard on providing you with the best desktop available for the &UNIX; operating system. &kde; is available for free and will always be available for free, including each and every line of its source code, for everyone to modify and distribute. If you enjoy and use &kde; please consider supporting the &kde; Project financially. &kde; is in constant need of funds in order to finance its operations. </para>
 
-<para
->If your busy schedule or skills do not permit you to be actively involved in &kde; development, please consider supporting &kde; financially by sending a donation to: </para>
+<para>If your busy schedule or skills do not permit you to be actively involved in &kde; development, please consider supporting &kde; financially by sending a donation to: </para>
 
-<para
->You can send standard US cheques to the following address: </para>
+<para>You can send standard US cheques to the following address: </para>
 
-<literallayout
->K Desktop Environment e.V.
+<literallayout>K Desktop Environment e.V.
 Mirko Boehm
 2029 Chadds Ford Drive
 Reston, VA 20191
 USA
 </literallayout>
 
-<para
->Use "KDE e.V. - Mirko Boehm" in the "Pay to the order of..." line. </para>
+<para>Use "KDE e.V. - Mirko Boehm" in the "Pay to the order of..." line. </para>
 
-<para
->From Europe, you may remit your donation to (be aware of a fee if wiring from outside of Germany): </para>
+<para>From Europe, you may remit your donation to (be aware of a fee if wiring from outside of Germany): </para>
 
-<literallayout
->K Desktop Environment e.V.
+<literallayout>K Desktop Environment e.V.
 Account-Nr. 0 66 64 46
 BLZ 200 700 24
 Deutsche Bank 24
 </literallayout>
 
-<para
->Please contact Mirko Boehm <email
->kde-ev-treasurer@kde.org</email
-> if you have any questions. </para>
+<para>Please contact Mirko Boehm <email>kde-ev-treasurer@kde.org</email> if you have any questions. </para>
 
-<para
->Your contribution is very much appreciated. Thank you! </para>
+<para>Your contribution is very much appreciated. Thank you! </para>
 
 </sect1>
 </chapter>
diff --git a/tde-i18n-en_GB/docs/tdebase/khelpcenter/welcome.docbook b/tde-i18n-en_GB/docs/tdebase/khelpcenter/welcome.docbook
index 59a12630834..2f5a467b997 100644
--- a/tde-i18n-en_GB/docs/tdebase/khelpcenter/welcome.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/khelpcenter/welcome.docbook
@@ -1,95 +1,50 @@
 <chapter id="welcome-to-kde">
-<chapterinfo
-><date
->2002-01-18</date
-> <releaseinfo
->3.00.00</releaseinfo
-> </chapterinfo>
-<title
->Welcome to &kde;</title>
+<chapterinfo><date>2002-01-18</date> <releaseinfo>3.00.00</releaseinfo> </chapterinfo>
+<title>Welcome to &kde;</title>
 <anchor id="welcome"/>
 
-<para
-> <emphasis
->The &kde; team welcomes you to user-friendly &UNIX; computing.</emphasis
-> </para>
+<para> <emphasis>The &kde; team welcomes you to user-friendly &UNIX; computing.</emphasis> </para>
 
 <sect1 id="welcome-page">
-<title
->Welcome to the K Desktop Environment</title>
+<title>Welcome to the K Desktop Environment</title>
 
 <sect2 id="welcome-information-about-kde">
-<title
->Information about &kde;</title>
+<title>Information about &kde;</title>
 
-<para
->&kde; is a powerful graphical desktop environment for &UNIX; workstations. A &kde; desktop combines ease of use, contemporary functionality and outstanding graphical design with the technological superiority of the &UNIX; operating system. </para>
+<para>&kde; is a powerful graphical desktop environment for &UNIX; workstations. A &kde; desktop combines ease of use, contemporary functionality and outstanding graphical design with the technological superiority of the &UNIX; operating system. </para>
 
-<para
-><link linkend="what-is-tde"
->What is the K Desktop Environment?</link
-></para>
+<para><link linkend="what-is-tde">What is the K Desktop Environment?</link></para>
 
-<para
-><link linkend="contact"
->Contacting the &kde; Project</link
-></para>
+<para><link linkend="contact">Contacting the &kde; Project</link></para>
 
-<para
-><link linkend="support"
->Supporting the &kde; Project</link
-></para>
+<para><link linkend="support">Supporting the &kde; Project</link></para>
 
-<para
-><link linkend="links"
->Useful links</link
-></para>
+<para><link linkend="links">Useful links</link></para>
 
 </sect2>
 
 <sect2 id="welcome-getting-the-most-out-of-kde">
-<title
->Getting the most out of &kde;</title>
+<title>Getting the most out of &kde;</title>
 
 <sect3 id="welcome-general-documentation">
-<title
->General documentation</title>
+<title>General documentation</title>
 
-<para
-><ulink url="help:/khelpcenter/quickstart"
->A Quick Start Guide to the Desktop</ulink
-></para>
+<para><ulink url="help:/khelpcenter/quickstart">A Quick Start Guide to the Desktop</ulink></para>
 
-<para
-><ulink url="help:/khelpcenter/userguide"
->&kde; User's guide</ulink
-></para>
+<para><ulink url="help:/khelpcenter/userguide">&kde; User's guide</ulink></para>
 
-<para
-><ulink url="help:/khelpcenter/faq"
->Frequently asked questions</ulink
-></para>
+<para><ulink url="help:/khelpcenter/faq">Frequently asked questions</ulink></para>
 
 </sect3>
 
 <sect3 id="welcome-basic-applications">
-<title
->Basic applications</title>
-
-<para
-><ulink url="help:/kicker"
->Desktop Panel</ulink
-></para>
-
-<para
-><ulink url="help:/kcontrol"
->Control Centre</ulink
-></para>
-
-<para
-><ulink url="help:/konqueror"
->File Manager</ulink
-></para>
+<title>Basic applications</title>
+
+<para><ulink url="help:/kicker">Desktop Panel</ulink></para>
+
+<para><ulink url="help:/kcontrol">Control Centre</ulink></para>
+
+<para><ulink url="help:/konqueror">File Manager</ulink></para>
 
 </sect3>
 </sect2>
diff --git a/tde-i18n-en_GB/docs/tdebase/khelpcenter/whatistde.docbook b/tde-i18n-en_GB/docs/tdebase/khelpcenter/whatistde.docbook
index 8ab7799675b..8439e58bc71 100644
--- a/tde-i18n-en_GB/docs/tdebase/khelpcenter/whatistde.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/khelpcenter/whatistde.docbook
@@ -1,100 +1,55 @@
 <chapter id="what-is-tde">
-<chapterinfo
-><date
->2002-01-18</date
-> <releaseinfo
->3.00.00</releaseinfo
-> </chapterinfo>
-<title
->What is &tde;?</title>
+<chapterinfo><date>2002-01-18</date> <releaseinfo>3.00.00</releaseinfo> </chapterinfo>
+<title>What is &tde;?</title>
 <anchor id="whatistde"/>
 
 <sect1 id="what-is-tde-introduction">
-<title
->What is &tde;?</title>
+<title>What is &tde;?</title>
 
-<para
->&tde; is a desktop environment. In other words, &tde; is a collection of programs, technologies and documentation that attempt to make life easier for computer users. &tde; is targeted at &UNIX; workstations. It features network transparency and a contemporary work philosophy. </para>
+<para>&tde; is a desktop environment. In other words, &tde; is a collection of programs, technologies and documentation that attempt to make life easier for computer users. &tde; is targeted at &UNIX; workstations. It features network transparency and a contemporary work philosophy. </para>
 
-<para
->The creators of the K Desktop Environment are a world-wide group of software engineers. This group's major goal in free software development is to provide high quality software that empowers the user with easy control of his computer's resources.</para>
+<para>The creators of the K Desktop Environment are a world-wide group of software engineers. This group's major goal in free software development is to provide high quality software that empowers the user with easy control of his computer's resources.</para>
 
-<para
->&tde; seeks to fill the need for an easy to use desktop for &UNIX; workstations, similar to the desktop environments found under &MacOS; or &Windows; 95/NT. &tde; meets the requirement of users for an easy to use work environment. Tools used to reach this end are: enhanced inter-application communication, component reuse, global drag and drop, uniform look and feel and many more. Thus, &tde; offers much more than the traditional &UNIX; window managers.</para>
+<para>&tde; seeks to fill the need for an easy to use desktop for &UNIX; workstations, similar to the desktop environments found under &MacOS; or &Windows; 95/NT. &tde; meets the requirement of users for an easy to use work environment. Tools used to reach this end are: enhanced inter-application communication, component reuse, global drag and drop, uniform look and feel and many more. Thus, &tde; offers much more than the traditional &UNIX; window managers.</para>
 
-<para
->Stability, scaleability and openness are qualities which have made &UNIX; the undisputed choice for the information technology professional for many years. &tde; builds on top of this excellent base framework and brings new, much needed qualities: usability, user friendliness and beauty! &tde; was the first, and stays the forefront player in bringing these qualities to &UNIX;, which constituted for years, the premier platform for server computers and scientific institutions, but wasn't very attractive for desktop users.</para>
+<para>Stability, scaleability and openness are qualities which have made &UNIX; the undisputed choice for the information technology professional for many years. &tde; builds on top of this excellent base framework and brings new, much needed qualities: usability, user friendliness and beauty! &tde; was the first, and stays the forefront player in bringing these qualities to &UNIX;, which constituted for years, the premier platform for server computers and scientific institutions, but wasn't very attractive for desktop users.</para>
 
-<para
->Without &UNIX; the Internet would not exist, or at least would have a vastly different form. &UNIX; has not, until now, addressed the needs of the average computer user. This fact is particularly unfortunate, since a number of implementations of &UNIX; (<ulink url="http://www.linux.org"
->&Linux;</ulink
->, <ulink url="http://www.freebsd.org"
->FreeBSD</ulink
->, <ulink url="http://www.netbsd.org"
->NetBSD</ulink
->, &etc;) are freely available on the Internet, all of which are of exceptional quality and stability. </para>
+<para>Without &UNIX; the Internet would not exist, or at least would have a vastly different form. &UNIX; has not, until now, addressed the needs of the average computer user. This fact is particularly unfortunate, since a number of implementations of &UNIX; (<ulink url="http://www.linux.org">&Linux;</ulink>, <ulink url="http://www.freebsd.org">FreeBSD</ulink>, <ulink url="http://www.netbsd.org">NetBSD</ulink>, &etc;) are freely available on the Internet, all of which are of exceptional quality and stability. </para>
 
 </sect1>
 
 <sect1 id="what-is-tde-the-desktop">
-<title
->&tde; The Desktop Environment</title>
+<title>&tde; The Desktop Environment</title>
 
-<para
->In combination with a free implementation of &UNIX;, &tde; provides to the world an open and completely free desktop computing platform either at home or at work.</para>
+<para>In combination with a free implementation of &UNIX;, &tde; provides to the world an open and completely free desktop computing platform either at home or at work.</para>
 
-<para
->This platform is available to anyone free of charge including its source code for anyone to modify.</para>
+<para>This platform is available to anyone free of charge including its source code for anyone to modify.</para>
 
-<para
->While there will always be room for improvement we believe we have now delivered a viable alternative to some of the more commonly found and commercial operating systems/desktops combinations available today. It is our hope that the combination of &UNIX; and &tde; will finally bring the same open, reliable, stable, and monopoly free computing to the average computer user that scientists and computing professionals world-wide have enjoyed for years. </para>
+<para>While there will always be room for improvement we believe we have now delivered a viable alternative to some of the more commonly found and commercial operating systems/desktops combinations available today. It is our hope that the combination of &UNIX; and &tde; will finally bring the same open, reliable, stable, and monopoly free computing to the average computer user that scientists and computing professionals world-wide have enjoyed for years. </para>
 
 </sect1>
 
 <sect1 id="what-is-tde-the-development-framework">
-<title
->&tde; The Application Development Framework</title>
+<title>&tde; The Application Development Framework</title>
 
-<para
->&tde; focuses on the user's needs, but it's obvious that this focus is more easily achieved by also giving developers the best tools. &tde; code contains, and comes with, some of the best development technologies of the modern computing age.</para>
+<para>&tde; focuses on the user's needs, but it's obvious that this focus is more easily achieved by also giving developers the best tools. &tde; code contains, and comes with, some of the best development technologies of the modern computing age.</para>
 
-<para
->Authoring applications under &UNIX;/X11 used to be an extremely tedious and labour intensive process. &tde; recognises the fact that a computing platform is only as good as the number of first class applications available to the users of that particular platform.</para>
+<para>Authoring applications under &UNIX;/X11 used to be an extremely tedious and labour intensive process. &tde; recognises the fact that a computing platform is only as good as the number of first class applications available to the users of that particular platform.</para>
 
-<para
->&tde; defines new technologies in &DCOP; and KParts, created to offer a component document model and technology. Together with the complete &tde; libraries programming interface, &DCOP;/KParts are set in direct competition with other similar technologies like &Microsoft; <abbrev
->MFC</abbrev
->/<abbrev
->COM</abbrev
->/ActiveX technologies. The excellent quality and the high level of refinement of &tde;'s application programming interface (<acronym
->API</acronym
->) enables developers to focus on original and interesting issues and avoid reinventing the wheel.</para>
+<para>&tde; defines new technologies in &DCOP; and KParts, created to offer a component document model and technology. Together with the complete &tde; libraries programming interface, &DCOP;/KParts are set in direct competition with other similar technologies like &Microsoft; <abbrev>MFC</abbrev>/<abbrev>COM</abbrev>/ActiveX technologies. The excellent quality and the high level of refinement of &tde;'s application programming interface (<acronym>API</acronym>) enables developers to focus on original and interesting issues and avoid reinventing the wheel.</para>
 
 </sect1>
 
 <sect1 id="what-is-tde-the-office-suite">
-<title
->&tde; The Office Application Suite</title>
-
-<para
->In its current form, &tde; provides, apart from the essential desktop component applications, a suite of powerful office programs known to the world by the name &koffice;.</para>
-
-<para
->&koffice; is based on the &tde; &DCOP;/KParts technologies. It currently contains: a word processor with desktop publishing capabilities (&kword;), a spreadsheet application (&kspread;) and accompanying charting program (&kchart;), a presentation program (&kpresenter;) and a vector drawing program (&kontour;). Tying things together is the <application
->KOffice Workspace</application
->, an integrated shell to ease the use of the &koffice; components in conjunction with each other. Additional components include an email client, a news reader, and a powerful <abbrev
->PIM</abbrev
-> (Personal Information Manager - an organiser).</para>
-
-<para
->While some of those components are still in alpha development, others are already extremely powerful. For example, &kpresenter;, &tde;'s presentation application, was successfully used at the 5th International &Linux; Congress in Cologne, Germany to deliver a &tde; presentation. </para>
-
-<para
->We would like to invite you to <ulink url="http://www.kde.org"
->learn more about &tde;</ulink
-> and <ulink url="http://koffice.kde.org"
->&koffice;</ulink
->.</para>
+<title>&tde; The Office Application Suite</title>
+
+<para>In its current form, &tde; provides, apart from the essential desktop component applications, a suite of powerful office programs known to the world by the name &koffice;.</para>
+
+<para>&koffice; is based on the &tde; &DCOP;/KParts technologies. It currently contains: a word processor with desktop publishing capabilities (&kword;), a spreadsheet application (&kspread;) and accompanying charting program (&kchart;), a presentation program (&kpresenter;) and a vector drawing program (&kontour;). Tying things together is the <application>KOffice Workspace</application>, an integrated shell to ease the use of the &koffice; components in conjunction with each other. Additional components include an email client, a news reader, and a powerful <abbrev>PIM</abbrev> (Personal Information Manager - an organiser).</para>
+
+<para>While some of those components are still in alpha development, others are already extremely powerful. For example, &kpresenter;, &tde;'s presentation application, was successfully used at the 5th International &Linux; Congress in Cologne, Germany to deliver a &tde; presentation. </para>
+
+<para>We would like to invite you to <ulink url="http://www.kde.org">learn more about &tde;</ulink> and <ulink url="http://koffice.kde.org">&koffice;</ulink>.</para>
 
 </sect1>
 </chapter>
diff --git a/tde-i18n-en_GB/docs/tdebase/kicker/index.docbook b/tde-i18n-en_GB/docs/tdebase/kicker/index.docbook
index 7f9cb31571d..fd8340cdbed 100644
--- a/tde-i18n-en_GB/docs/tdebase/kicker/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kicker/index.docbook
@@ -11,253 +11,152 @@
 <book lang="&language;">
 
 <bookinfo>
-<title
->The &kicker; Handbook</title>
+<title>The &kicker; Handbook</title>
 
 <authorgroup>
-<author
->&Dirk.Doerflinger; &Dirk.Doerflinger.mail;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Dirk.Doerflinger; &Dirk.Doerflinger.mail;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
 <copyright>
-<year
->2001</year
-><year
->2002</year>
-<holder
->&Dirk.Doerflinger;</holder>
+<year>2001</year><year>2002</year>
+<holder>&Dirk.Doerflinger;</holder>
 </copyright>
 
-<legalnotice
->&FDLNotice;</legalnotice>
+<legalnotice>&FDLNotice;</legalnotice>
 
-<date
->2002-03-01</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-03-01</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <abstract>
-<para
->&kicker; is the &kde; application starter panel and is also capable of some useful applets and extensions. It usually resides on the bottom of the desktop. </para>
+<para>&kicker; is the &kde; application starter panel and is also capable of some useful applets and extensions. It usually resides on the bottom of the desktop. </para>
 </abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->Kicker</keyword>
-<keyword
->tdebase</keyword>
-<keyword
->panel</keyword>
-<keyword
->application</keyword>
-<keyword
->starter</keyword>
+<keyword>KDE</keyword>
+<keyword>Kicker</keyword>
+<keyword>tdebase</keyword>
+<keyword>panel</keyword>
+<keyword>application</keyword>
+<keyword>starter</keyword>
 </keywordset>
 
 </bookinfo>
 
 <chapter id="introduction">
-<title
->Introduction</title>
+<title>Introduction</title>
 
 
-<para
->&kicker; is the application launcher panel of the K Desktop Environment. Besides the <guimenu
->K</guimenu
-> Menu, where you can start applications, &kicker; is also capable of running docked applets like the pager, the taskbar or the clock, and extensions, such as child panels. </para>
+<para>&kicker; is the application launcher panel of the K Desktop Environment. Besides the <guimenu>K</guimenu> Menu, where you can start applications, &kicker; is also capable of running docked applets like the pager, the taskbar or the clock, and extensions, such as child panels. </para>
 
-<para
->&kicker; usually resides on the bottom of the desktop, but it can also be moved to any other border. Please report any problems or feature requests to the &kde; mailing lists. </para>
+<para>&kicker; usually resides on the bottom of the desktop, but it can also be moved to any other border. Please report any problems or feature requests to the &kde; mailing lists. </para>
 
 </chapter>
 
 <chapter id="using-kicker">
-<title
->Using &kicker;</title>
+<title>Using &kicker;</title>
 
-<para
->This is what you see on a freshly installed &kde;, assuming that you skipped <application
->KPersonaliser</application
->. If you are using lower resolution, some of the icons may not appear immediately. To cater for those smaller resolutions, the screenshot below is divided in two parts. </para>
+<para>This is what you see on a freshly installed &kde;, assuming that you skipped <application>KPersonaliser</application>. If you are using lower resolution, some of the icons may not appear immediately. To cater for those smaller resolutions, the screenshot below is divided in two parts. </para>
 
 <screenshot>
-<screeninfo
->Here's a screenshot of the left side of &kicker;</screeninfo>
+<screeninfo>Here's a screenshot of the left side of &kicker;</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="screenshot_left.png" format="PNG"/></imageobject>
 <textobject>
-<phrase
->Screenshot Left</phrase>
+<phrase>Screenshot Left</phrase>
 </textobject>
 <caption>
-<para
->Here's a screenshot of the left side of &kicker; </para>
+<para>Here's a screenshot of the left side of &kicker; </para>
 </caption>
 </mediaobject>
 </screenshot>
 
 <screenshot>
-<screeninfo
->And here's the right side</screeninfo>
+<screeninfo>And here's the right side</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="screenshot_right.png" format="PNG"/></imageobject>
 <textobject>
-<phrase
->Screenshot Right</phrase>
+<phrase>Screenshot Right</phrase>
 </textobject>
 <caption>
-<para
->And here's the right side </para>
+<para>And here's the right side </para>
 </caption>
 </mediaobject>
 </screenshot>
 
-<para
->Of course, this is only one way &kicker; might appear on the screen. There are many more configurations available. </para>
+<para>Of course, this is only one way &kicker; might appear on the screen. There are many more configurations available. </para>
 
 <sect1 id="newbie">
-<title
->A quick tour for new &kde; users</title>
+<title>A quick tour for new &kde; users</title>
 
-<para
->If you are experienced with this kind of application launcher, you can ignore this chapter and move on to <link linkend="basics"
->&kicker; basics</link
->. </para>
+<para>If you are experienced with this kind of application launcher, you can ignore this chapter and move on to <link linkend="basics">&kicker; basics</link>. </para>
 
-<para
->The main use of &kicker; is starting applications. This is done by clicking icons, either from the panel or from the <guimenu
->K</guimenu
-> Menu. &kicker; shows some more things too, so let's see. </para>
+<para>The main use of &kicker; is starting applications. This is done by clicking icons, either from the panel or from the <guimenu>K</guimenu> Menu. &kicker; shows some more things too, so let's see. </para>
 
-<para
->Having a look at the screenshots above, there are from left to right: </para>
+<para>Having a look at the screenshots above, there are from left to right: </para>
 
 <variablelist>
 
 <varlistentry>
-<term
->The <guimenu
->K</guimenu
-> Menu</term>
+<term>The <guimenu>K</guimenu> Menu</term>
 <listitem>
-<para
->It is used for launching applications and some other useful things. Refer to <link linkend="k-menu"
->The <guimenu
->K</guimenu
-> Menu </link
->for more information. </para>
+<para>It is used for launching applications and some other useful things. Refer to <link linkend="k-menu">The <guimenu>K</guimenu> Menu </link>for more information. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Application start icons</term>
+<term>Application start icons</term>
 <listitem>
-<para
->Here are some icons of commonly used applications. They can be moved and removed and others can be added. Some of them have a special meaning, which you can read more about in <link linkend="basics"
->&kicker; basics</link
->. Resting the mouse over an icon without clicking shows the name and a short description of that application, if you have set that in the <link linkend="configuring"
->Settings Dialogue</link
->. </para>
+<para>Here are some icons of commonly used applications. They can be moved and removed and others can be added. Some of them have a special meaning, which you can read more about in <link linkend="basics">&kicker; basics</link>. Resting the mouse over an icon without clicking shows the name and a short description of that application, if you have set that in the <link linkend="configuring">Settings Dialogue</link>. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->The Pager applet</term>
+<term>The Pager applet</term>
 <listitem>
-<para
->This displays a small view of the virtual desktops. Clicking one section of it will activate that desktop. Please refer to <link linkend="applets"
->Applets</link
->. </para>
+<para>This displays a small view of the virtual desktops. Clicking one section of it will activate that desktop. Please refer to <link linkend="applets">Applets</link>. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->The Taskbar</term>
+<term>The Taskbar</term>
 <listitem>
-<para
->All running applications are displayed as buttons in the taskbar. Clicking an application's button will bring this application on top. If it was on top before, it will be iconified. As always, more information in <link linkend="applets"
->Applets</link
->. </para>
+<para>All running applications are displayed as buttons in the taskbar. Clicking an application's button will bring this application on top. If it was on top before, it will be iconified. As always, more information in <link linkend="applets">Applets</link>. </para>
 </listitem>
 
 </varlistentry>
 <varlistentry>
-<term
->Lock/Logout</term>
+<term>Lock/Logout</term>
 <listitem>
-<para
->This applet contains two small buttons. The one with the luggage lock on it locks your session if you ever leave your &kde; unattended and don't want anybody else to have access to it; the other one shuts down &kde; and the X-Server. </para>
+<para>This applet contains two small buttons. The one with the luggage lock on it locks your session if you ever leave your &kde; unattended and don't want anybody else to have access to it; the other one shuts down &kde; and the X-Server. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->System Tray</term>
+<term>System Tray</term>
 <listitem>
-<para
->The system tray is able to swallow some kind of applications like - in this case - &klipper;. There are also more useful apps for the system tray. You can click the applications either with the <mousebutton
->left</mousebutton
-> or the <mousebutton
->right</mousebutton
-> mousebutton and see what's happening. </para>
+<para>The system tray is able to swallow some kind of applications like - in this case - &klipper;. There are also more useful apps for the system tray. You can click the applications either with the <mousebutton>left</mousebutton> or the <mousebutton>right</mousebutton> mousebutton and see what's happening. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Clock</term>
+<term>Clock</term>
 <listitem>
-<para
->The Clock applet is - of course - a small, useful clock. It can have various styles, have a look at the <link linkend="applets"
->applets</link
-> section for more information. </para>
+<para>The Clock applet is - of course - a small, useful clock. It can have various styles, have a look at the <link linkend="applets">applets</link> section for more information. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->The <guibutton
->hide</guibutton
-> button</term>
+<term>The <guibutton>hide</guibutton> button</term>
 <listitem>
-<para
->This button lets you fade out &kicker; for having more space on the screen. When &kicker; is faded out, only the <guibutton
->hide</guibutton
-> button will remain in order to fade in &kicker; again. </para>
+<para>This button lets you fade out &kicker; for having more space on the screen. When &kicker; is faded out, only the <guibutton>hide</guibutton> button will remain in order to fade in &kicker; again. </para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->This was only the description of &kicker; on its initial launch. It can be configured in many ways and styles and more applets can be added. There are even some extensions like the external taskbar you can add. See <link linkend="basics"
->&kicker; basics</link
->, <link linkend="applets"
->Applets </link
-> and <link linkend="extensions"
->Extensions </link
->for more information. </para>
+<para>This was only the description of &kicker; on its initial launch. It can be configured in many ways and styles and more applets can be added. There are even some extensions like the external taskbar you can add. See <link linkend="basics">&kicker; basics</link>, <link linkend="applets">Applets </link> and <link linkend="extensions">Extensions </link>for more information. </para>
 
 </sect1>
 
@@ -265,103 +164,44 @@
 
 <chapter id="basics">
 
-<title
->&kicker; basics</title>
+<title>&kicker; basics</title>
 
 <sect1 id="general-usage">
-<title
->General usage</title>
-
-<para
->As mentioned before, there are a lot of things that can be added to &kicker;. This section will tell you everything about application starting, folder browsing and adding some kinds of applets and extensions. Lots of things can be done from the <guimenu
->context menu</guimenu
-> or from <guisubmenu
->Configure Panel</guisubmenu
-> in the <guimenu
->K</guimenu
-> Menu. </para>
+<title>General usage</title>
+
+<para>As mentioned before, there are a lot of things that can be added to &kicker;. This section will tell you everything about application starting, folder browsing and adding some kinds of applets and extensions. Lots of things can be done from the <guimenu>context menu</guimenu> or from <guisubmenu>Configure Panel</guisubmenu> in the <guimenu>K</guimenu> Menu. </para>
 
 <sect2 id="adding-apps">
-<title
->Adding applications</title>
+<title>Adding applications</title>
 
-<para
->There are three different ways to add an application to &kicker;: </para>
+<para>There are three different ways to add an application to &kicker;: </para>
 
 <variablelist>
 <varlistentry>
-<term
->Drag and Drop</term>
+<term>Drag and Drop</term>
 <listitem>
-<para
->Simply drag any file from &konqueror; into &kicker; and it's there. This works also from the <guimenu
->K</guimenu
-> Menu with any entry. You can change the attributes like optional command line parameters or the icon by clicking it with the <mousebutton
->right</mousebutton
-> mouse button and choosing <guimenuitem
->Preferences</guimenuitem
-> from the <guimenu
->context menu</guimenu
->. </para>
+<para>Simply drag any file from &konqueror; into &kicker; and it's there. This works also from the <guimenu>K</guimenu> Menu with any entry. You can change the attributes like optional command line parameters or the icon by clicking it with the <mousebutton>right</mousebutton> mouse button and choosing <guimenuitem>Preferences</guimenuitem> from the <guimenu>context menu</guimenu>. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Using the context menu to add a &kde; application</term>
+<term>Using the context menu to add a &kde; application</term>
 <listitem>
-<para
->Click the <mousebutton
->right</mousebutton
-> mousebutton on any free space in &kicker; and choose <guisubmenu
->Add</guisubmenu
-> and then <guisubmenu
->Button </guisubmenu
->. There you can choose an application which will be added in the place you clicked. </para>
+<para>Click the <mousebutton>right</mousebutton> mousebutton on any free space in &kicker; and choose <guisubmenu>Add</guisubmenu> and then <guisubmenu>Button </guisubmenu>. There you can choose an application which will be added in the place you clicked. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Using the <guimenu
->context menu</guimenu
-> to add a non-&kde;-application</term>
+<term>Using the <guimenu>context menu</guimenu> to add a non-&kde;-application</term>
 <listitem>
-<para
->Non-&kde;-applications &eg; <application
->xosview</application
-> or <application
->xemacs</application
->. </para>
+<para>Non-&kde;-applications &eg; <application>xosview</application> or <application>xemacs</application>. </para>
 
-<para
->Click the <mousebutton
->right</mousebutton
-> mousebutton on any free space in &kicker; and choose <guisubmenu
->Add</guisubmenu
->, <guisubmenu
->Special Button</guisubmenu
-> and then <guimenuitem
->Non-KDE Application </guimenuitem
->. Choose the application you want to add. In the newly appearing window, you can append an <guilabel
->optional command line</guilabel
->, have the application start from a terminal, and choose the icon which will appear in &kicker; by clicking the <guiicon
->gear </guiicon
->. If you don't choose an icon, the application will use the gear as a default. </para>
+<para>Click the <mousebutton>right</mousebutton> mousebutton on any free space in &kicker; and choose <guisubmenu>Add</guisubmenu>, <guisubmenu>Special Button</guisubmenu> and then <guimenuitem>Non-KDE Application </guimenuitem>. Choose the application you want to add. In the newly appearing window, you can append an <guilabel>optional command line</guilabel>, have the application start from a terminal, and choose the icon which will appear in &kicker; by clicking the <guiicon>gear </guiicon>. If you don't choose an icon, the application will use the gear as a default. </para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->Applications can be moved or removed by &RMB; click and choosing <guimenuitem
->Move</guimenuitem
-> or <guimenuitem
->Remove</guimenuitem
->. You can also move an icon by clicking &MMB; if you have one. Another way to remove an application is by clicking the &RMB; on any free space and then choosing <guisubmenu
->Remove</guisubmenu
->, <guisubmenu
->Button</guisubmenu
-> and then the application you want to be removed. </para>
+<para>Applications can be moved or removed by &RMB; click and choosing <guimenuitem>Move</guimenuitem> or <guimenuitem>Remove</guimenuitem>. You can also move an icon by clicking &MMB; if you have one. Another way to remove an application is by clicking the &RMB; on any free space and then choosing <guisubmenu>Remove</guisubmenu>, <guisubmenu>Button</guisubmenu> and then the application you want to be removed. </para>
 
 <!-- NOTE: Lauri: I'd say it would confuse users if I'd mention Non-KDE-Apps -->
 <!-- explicitly here. Please add them if you think there's a need. -->
@@ -369,308 +209,123 @@
 </sect2>
 
 <sect2 id="adding-folders">
-<title
->Adding Folders</title>
+<title>Adding Folders</title>
 
-<para
->Folders can be added by simply dragging a folder to any free space of &kicker;. Quick Browsers can also be added from the <guimenu
->context menu</guimenu
-> or the <guimenu
->K</guimenu
-> Menu. </para>
+<para>Folders can be added by simply dragging a folder to any free space of &kicker;. Quick Browsers can also be added from the <guimenu>context menu</guimenu> or the <guimenu>K</guimenu> Menu. </para>
 
-<para
->There are two different ways to have a folder in &kicker;, you can choose between them in the menu appearing after dropping. Omitting this menu, it will be added as a file manager <acronym
->URL</acronym
->. </para>
+<para>There are two different ways to have a folder in &kicker;, you can choose between them in the menu appearing after dropping. Omitting this menu, it will be added as a file manager <acronym>URL</acronym>. </para>
 
 <variablelist>
 <varlistentry>
-<term
->Add as file manager &URL;</term>
+<term>Add as file manager &URL;</term>
 <listitem>
-<para
->Choosing this will add a link to the selected folder. Clicking this <guiicon
->folder</guiicon
-> icon will open &konqueror; displaying the contents of this folder. </para>
+<para>Choosing this will add a link to the selected folder. Clicking this <guiicon>folder</guiicon> icon will open &konqueror; displaying the contents of this folder. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Add as Quick Browser</term>
+<term>Add as Quick Browser</term>
 <listitem>
-<para
->If you add a folder this way, it will be displayed as a submenu of &kicker;. This submenu contains <guimenuitem
->Open in File Manager</guimenuitem
->, which does the same as a file manager &URL;, and <guimenuitem
->Open in Terminal</guimenuitem
->, which opens a terminal with this folder as working path. Also, this submenu contains the contents of that folder. Sub-folders are displayed as new submenus like the Quick Browser itself. The maximum number of displayed elements can be set in the <link linkend="configuring"
->Settings Dialogue</link
->. Quick Browsers can also be added from the <guimenu
->context menu</guimenu
-> of &kicker; and then choosing <guisubmenu
->Add</guisubmenu
-> and <guisubmenu
->Special Button</guisubmenu
->. </para>
+<para>If you add a folder this way, it will be displayed as a submenu of &kicker;. This submenu contains <guimenuitem>Open in File Manager</guimenuitem>, which does the same as a file manager &URL;, and <guimenuitem>Open in Terminal</guimenuitem>, which opens a terminal with this folder as working path. Also, this submenu contains the contents of that folder. Sub-folders are displayed as new submenus like the Quick Browser itself. The maximum number of displayed elements can be set in the <link linkend="configuring">Settings Dialogue</link>. Quick Browsers can also be added from the <guimenu>context menu</guimenu> of &kicker; and then choosing <guisubmenu>Add</guisubmenu> and <guisubmenu>Special Button</guisubmenu>. </para>
 </listitem>
 </varlistentry>
 
 </variablelist>
 
-<para
->Both kinds of folders can be moved or removed by &RMB; click and choosing <guimenuitem
->Move</guimenuitem
-> or <guimenuitem
->Remove</guimenuitem
->. You can also move an icon by clicking &MMB; if you have one. Another way to remove a folder is by clicking the &RMB; on any free space and then choosing <guisubmenu
->Remove</guisubmenu
->, <guisubmenu
->Button</guisubmenu
-> and then the folder you want to be removed. </para>
-
-<para
->File manager &URL;s can also be configured from the <guimenu
->context-menu</guimenu
->, just like any other folder anywhere in &kde; </para>
+<para>Both kinds of folders can be moved or removed by &RMB; click and choosing <guimenuitem>Move</guimenuitem> or <guimenuitem>Remove</guimenuitem>. You can also move an icon by clicking &MMB; if you have one. Another way to remove a folder is by clicking the &RMB; on any free space and then choosing <guisubmenu>Remove</guisubmenu>, <guisubmenu>Button</guisubmenu> and then the folder you want to be removed. </para>
+
+<para>File manager &URL;s can also be configured from the <guimenu>context-menu</guimenu>, just like any other folder anywhere in &kde; </para>
 
 </sect2>
 
 <sect2 id="adding-special-icons">
-<title
->Special Icons</title>
-
-<para
->Some icons in &kicker; have a special meaning. They are added by choosing <guisubmenu
->Add</guisubmenu
-> and then <guisubmenu
->Special Button</guisubmenu
-> of the <guimenu
->context-menu</guimenu
->. </para>
+<title>Special Icons</title>
+
+<para>Some icons in &kicker; have a special meaning. They are added by choosing <guisubmenu>Add</guisubmenu> and then <guisubmenu>Special Button</guisubmenu> of the <guimenu>context-menu</guimenu>. </para>
 
 <variablelist>
 <varlistentry>
-<term
->The <guimenu
->K</guimenu
-> Menu Icon</term>
-<listitem>
-<para
-><guiicon
-><inlinemediaobject
-><imageobject
-><imagedata fileref="k_menu_icon.png" format="PNG"/></imageobject
-></inlinemediaobject
-></guiicon
-> The <guiicon
->TDE Menu icon</guiicon
-> is one of the most necessary icons in &kicker;. As you might guess, it opens the <guimenu
->K</guimenu
-> Menu, which you can learn more about in <link linkend="k-menu"
->The TDE Menu</link
->. </para>
+<term>The <guimenu>K</guimenu> Menu Icon</term>
+<listitem>
+<para><guiicon><inlinemediaobject><imageobject><imagedata fileref="k_menu_icon.png" format="PNG"/></imageobject></inlinemediaobject></guiicon> The <guiicon>TDE Menu icon</guiicon> is one of the most necessary icons in &kicker;. As you might guess, it opens the <guimenu>K</guimenu> Menu, which you can learn more about in <link linkend="k-menu">The TDE Menu</link>. </para>
 </listitem>
 </varlistentry>
 
 
-<varlistentry>
-<term
->The Window List</term>
-<listitem>
-<para
-><guiicon
-><inlinemediaobject
-><imageobject
-><imagedata fileref="windowlist_icon.png" format="PNG"/></imageobject
-></inlinemediaobject
-></guiicon
-> Clicking this <guiicon
->icon</guiicon
-> will show the <guimenu
->Window List</guimenu
->. Its first entry, <guimenuitem
->Unclutter Windows</guimenuitem
->, tries to move the windows on your active desktop in a way to see as many as possible. </para>
-
-<para
-><guimenuitem
->Cascade Windows</guimenuitem
-> puts all windows on the active desktop over each others, the most recently on top and the others sorted by the time they where last used.</para
-> <para
->Below those entries is a list of all currently running applications, grouped by the desktops on which they are running. Clicking on the name of a desktop will switch to that one, clicking an application will also activate it. </para>
+<varlistentry>
+<term>The Window List</term>
+<listitem>
+<para><guiicon><inlinemediaobject><imageobject><imagedata fileref="windowlist_icon.png" format="PNG"/></imageobject></inlinemediaobject></guiicon> Clicking this <guiicon>icon</guiicon> will show the <guimenu>Window List</guimenu>. Its first entry, <guimenuitem>Unclutter Windows</guimenuitem>, tries to move the windows on your active desktop in a way to see as many as possible. </para>
+
+<para><guimenuitem>Cascade Windows</guimenuitem> puts all windows on the active desktop over each others, the most recently on top and the others sorted by the time they where last used.</para> <para>Below those entries is a list of all currently running applications, grouped by the desktops on which they are running. Clicking on the name of a desktop will switch to that one, clicking an application will also activate it. </para>
 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->The Bookmarks Icon</term>
+<term>The Bookmarks Icon</term>
 <listitem>
-<para
-><guiicon
-><inlinemediaobject
-><imageobject
-><imagedata fileref="bookmarks_icon.png" format="PNG"/></imageobject
-></inlinemediaobject
-></guiicon
-> The <guiicon
->Bookmarks icon</guiicon
-> provides fast access to your bookmarks. They appear in the same way as if you click the <guimenu
->Bookmarks menu</guimenu
-> in &konqueror;. Clicking a bookmark in the menu will launch &konqueror; with the <acronym
->URL</acronym
-> which is behind that bookmark. </para>
+<para><guiicon><inlinemediaobject><imageobject><imagedata fileref="bookmarks_icon.png" format="PNG"/></imageobject></inlinemediaobject></guiicon> The <guiicon>Bookmarks icon</guiicon> provides fast access to your bookmarks. They appear in the same way as if you click the <guimenu>Bookmarks menu</guimenu> in &konqueror;. Clicking a bookmark in the menu will launch &konqueror; with the <acronym>URL</acronym> which is behind that bookmark. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->The Recent Documents Icon</term>
+<term>The Recent Documents Icon</term>
 <listitem>
-<para
-><guiicon
-><inlinemediaobject
-><imageobject
-><imagedata fileref="recent_docs_icon.png" format="PNG"/></imageobject
-></inlinemediaobject
-></guiicon
-> This menu shows the most recently used documents (works only with &kde; applications for the moment). Clicking the element <guimenuitem
->Clear History</guimenuitem
-> will remove those entries, what may be useful for privacy reasons. </para>
+<para><guiicon><inlinemediaobject><imageobject><imagedata fileref="recent_docs_icon.png" format="PNG"/></imageobject></inlinemediaobject></guiicon> This menu shows the most recently used documents (works only with &kde; applications for the moment). Clicking the element <guimenuitem>Clear History</guimenuitem> will remove those entries, what may be useful for privacy reasons. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->The Desktop Access Icon</term>
+<term>The Desktop Access Icon</term>
 <listitem>
-<para
-><guiicon
-><inlinemediaobject
-><imageobject
-><imagedata fileref="desktop_icon.png" format="PNG"/></imageobject
-></inlinemediaobject
-></guiicon
-> The <guiicon
->Desktop Access icon</guiicon
-> lets you have quick access to all the things you have on your desktop by minimising all currently open applications. Clicking it once will toggle it to show the desktop. The <guiicon
->icon</guiicon
-> will remain pressed until you either click it again, what will restore your minimised apps, or reactivate an application from the taskbar. </para>
+<para><guiicon><inlinemediaobject><imageobject><imagedata fileref="desktop_icon.png" format="PNG"/></imageobject></inlinemediaobject></guiicon> The <guiicon>Desktop Access icon</guiicon> lets you have quick access to all the things you have on your desktop by minimising all currently open applications. Clicking it once will toggle it to show the desktop. The <guiicon>icon</guiicon> will remain pressed until you either click it again, what will restore your minimised apps, or reactivate an application from the taskbar. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->The Quick Browser Item</term>
+<term>The Quick Browser Item</term>
 <listitem>
-<para
-><guiicon
-><inlinemediaobject
-><imageobject
-><imagedata fileref="quickbrowser_icon.png" format="PNG"/></imageobject
-></inlinemediaobject
-></guiicon
->Adding a <guiicon
->Quick Browser icon</guiicon
-> will open a dialogue which will let you choose a path and an <guiicon
->icon</guiicon
->, which will appear as a <guimenu
->Quick Browser menu</guimenu
->. Refer to the <link linkend="adding-folders"
->Adding Folders</link
-> section for more information about quick browsers. </para>
+<para><guiicon><inlinemediaobject><imageobject><imagedata fileref="quickbrowser_icon.png" format="PNG"/></imageobject></inlinemediaobject></guiicon>Adding a <guiicon>Quick Browser icon</guiicon> will open a dialogue which will let you choose a path and an <guiicon>icon</guiicon>, which will appear as a <guimenu>Quick Browser menu</guimenu>. Refer to the <link linkend="adding-folders">Adding Folders</link> section for more information about quick browsers. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->The Non-KDE Application Item</term>
+<term>The Non-KDE Application Item</term>
 <listitem>
-<para
->The <guimenuitem
->Add Non-KDE Application</guimenuitem
-> lets you add an application which doesn't appear in the <guimenu
->K</guimenu
-> menu to &kicker;. Refer to <link linkend="adding-apps"
->Adding Applications</link
-> for more information about Non-&kde; Applications. </para>
+<para>The <guimenuitem>Add Non-KDE Application</guimenuitem> lets you add an application which doesn't appear in the <guimenu>K</guimenu> menu to &kicker;. Refer to <link linkend="adding-apps">Adding Applications</link> for more information about Non-&kde; Applications. </para>
 </listitem>
 </varlistentry>
 
 
 <varlistentry>
-<term
->The Terminal Sessions Icon</term>
+<term>The Terminal Sessions Icon</term>
 <listitem>
-<para
-><guiicon
-><inlinemediaobject
-><imageobject
-><imagedata fileref="terminals_icon.png" format="PNG"/></imageobject
-></inlinemediaobject
-></guiicon
-> This icon provides a menu of the available Terminal sessions, just as &konsole; does when you click and hold its <guiicon
->New Session</guiicon
-> button. </para>
+<para><guiicon><inlinemediaobject><imageobject><imagedata fileref="terminals_icon.png" format="PNG"/></imageobject></inlinemediaobject></guiicon> This icon provides a menu of the available Terminal sessions, just as &konsole; does when you click and hold its <guiicon>New Session</guiicon> button. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->The Printing System Icon</term>
+<term>The Printing System Icon</term>
 <listitem>
-<para
-><guiicon
-><inlinemediaobject
-><imageobject
-><imagedata fileref="printsys_icon.png" format="PNG"/></imageobject
-></inlinemediaobject
-></guiicon
->This icon gives you direct access to &kde;'s printing system. Clicking the &LMB; on the icon opens a menu which gives you the following options: <itemizedlist>
-<listitem
-><para
-><guimenuitem
->Add Printer...</guimenuitem
->:This will start &kde;'s Add Printer Wizard which allows you to simply add a new printer to your system.</para>
+<para><guiicon><inlinemediaobject><imageobject><imagedata fileref="printsys_icon.png" format="PNG"/></imageobject></inlinemediaobject></guiicon>This icon gives you direct access to &kde;'s printing system. Clicking the &LMB; on the icon opens a menu which gives you the following options: <itemizedlist>
+<listitem><para><guimenuitem>Add Printer...</guimenuitem>:This will start &kde;'s Add Printer Wizard which allows you to simply add a new printer to your system.</para>
 </listitem>
-<listitem
-><para
-><guimenuitem
->TDE Print Settings</guimenuitem
-> This item will open the TDE Print Configuration dialogue.</para>
+<listitem><para><guimenuitem>TDE Print Settings</guimenuitem> This item will open the TDE Print Configuration dialogue.</para>
 </listitem>
 
 <listitem>
-<para
-><guimenuitem
->Configure Server</guimenuitem
-></para>
+<para><guimenuitem>Configure Server</guimenuitem></para>
 
 </listitem>
 
-<listitem
-><para
-><guimenuitem
->Print Manager</guimenuitem
->This item starts the Printing Manager, &kde;'s main printing control centre.</para>
+<listitem><para><guimenuitem>Print Manager</guimenuitem>This item starts the Printing Manager, &kde;'s main printing control centre.</para>
 </listitem>
 
-<listitem
-><para
-><guimenuitem
->Print Browser (&konqueror;)</guimenuitem
->This item will start &konqueror; with the <literal
->print:/</literal
-> io-slave to browse all kinds of printers.</para>
+<listitem><para><guimenuitem>Print Browser (&konqueror;)</guimenuitem>This item will start &konqueror; with the <literal>print:/</literal> io-slave to browse all kinds of printers.</para>
 </listitem>
 
-<listitem
-><para
-><guimenuitem
->Print a file...</guimenuitem
->This item opens a dialogue which lets you easily print one or more files.</para>
+<listitem><para><guimenuitem>Print a file...</guimenuitem>This item opens a dialogue which lets you easily print one or more files.</para>
 </listitem>
 
 </itemizedlist>
@@ -684,226 +339,110 @@
 </sect2>
 
 <sect2 id="removing-icons">
-<title
->Removing all kinds of icons</title>
-
-<para
->Clicking the &RMB; on any icon, no means if it's for an application, a folder or a special icon, or clicking the small arrow on the handle, and then choosing <guimenuitem
->Remove</guimenuitem
-> from the appearing <guimenu
->context menu</guimenu
-> will remove the icon from &kicker;. </para>
-<para
->Another way of removing icons is clicking the &RMB; on any free space in &kicker; and choosing <guimenuitem
->Remove</guimenuitem
-> and then <guimenuitem
->Button</guimenuitem
-> or <guimenuitem
->Special Button</guimenuitem
->. You can then choose the button you want to remove in the submenu.</para>
+<title>Removing all kinds of icons</title>
+
+<para>Clicking the &RMB; on any icon, no means if it's for an application, a folder or a special icon, or clicking the small arrow on the handle, and then choosing <guimenuitem>Remove</guimenuitem> from the appearing <guimenu>context menu</guimenu> will remove the icon from &kicker;. </para>
+<para>Another way of removing icons is clicking the &RMB; on any free space in &kicker; and choosing <guimenuitem>Remove</guimenuitem> and then <guimenuitem>Button</guimenuitem> or <guimenuitem>Special Button</guimenuitem>. You can then choose the button you want to remove in the submenu.</para>
 
 <note>
-<para
->Please note that removing an icon from &kicker; won't remove the application on the disk! </para>
+<para>Please note that removing an icon from &kicker; won't remove the application on the disk! </para>
 </note>
 
 </sect2>
 
 <sect2 id="adding-applets">
-<title
->Adding Applets</title>
-
-<para
->&kicker; comes with a set of applets like the taskbar or the mini-pager. Those can be added either from the submenu <guisubmenu
->Configure Panel</guisubmenu
-> of the <guimenu
->K</guimenu
-> Menu or from the <guimenu
->context menu</guimenu
-> by choosing <guisubmenu
->Add</guisubmenu
-> and then <guisubmenu
->Applet</guisubmenu
->. </para>
-
-<para
->Applets can be moved by dragging them on their handle with holding the &LMB; mouse button, or the &MMB; mouse button, or by choosing <guimenuitem
->Move</guimenuitem
-> from the <guimenu
->context menu</guimenu
->. </para>
-
-<para
->You can learn more about the applets in the section <link linkend="applets"
->Applets</link
->. </para>
+<title>Adding Applets</title>
+
+<para>&kicker; comes with a set of applets like the taskbar or the mini-pager. Those can be added either from the submenu <guisubmenu>Configure Panel</guisubmenu> of the <guimenu>K</guimenu> Menu or from the <guimenu>context menu</guimenu> by choosing <guisubmenu>Add</guisubmenu> and then <guisubmenu>Applet</guisubmenu>. </para>
+
+<para>Applets can be moved by dragging them on their handle with holding the &LMB; mouse button, or the &MMB; mouse button, or by choosing <guimenuitem>Move</guimenuitem> from the <guimenu>context menu</guimenu>. </para>
+
+<para>You can learn more about the applets in the section <link linkend="applets">Applets</link>. </para>
 
 </sect2>
 <sect2 id="removing-applets">
-<title
->Removing Applets</title>
-<para
->Applets can be removed by choosing <guimenuitem
->Remove</guimenuitem
-> from the <guimenu
->context menu</guimenu
->, which appears when the &RMB; is clicked on the applet's handle (left or top side of the applet) or in some applets allover the applet. The same <guimenu
->menu</guimenu
-> appears when clicking the small arrow on the applet's handle. </para>
+<title>Removing Applets</title>
+<para>Applets can be removed by choosing <guimenuitem>Remove</guimenuitem> from the <guimenu>context menu</guimenu>, which appears when the &RMB; is clicked on the applet's handle (left or top side of the applet) or in some applets allover the applet. The same <guimenu>menu</guimenu> appears when clicking the small arrow on the applet's handle. </para>
 
 
 </sect2>
 
 <sect2 id="adding-extensions">
-<title
->Adding Extensions</title>
+<title>Adding Extensions</title>
 
-<para
->There is also the possibility to add external extensions to &kicker;, like the external taskbar, the Dock Application Bar for WindowMaker dock-applications, <application
->Kasbar</application
->, an iconic kind of taskbar and even child panels which behave like new instances of &kicker;. </para>
+<para>There is also the possibility to add external extensions to &kicker;, like the external taskbar, the Dock Application Bar for WindowMaker dock-applications, <application>Kasbar</application>, an iconic kind of taskbar and even child panels which behave like new instances of &kicker;. </para>
 
-<para
->All extensions can be moved to any border of the screen by dragging them with the &LMB; on the small fade-out handles on the left or top side of the extensions. These fade-out handles can also be used for fading out the extension. The child panel can also be dragged by clicking with the &LMB; on any empty space on it. </para>
+<para>All extensions can be moved to any border of the screen by dragging them with the &LMB; on the small fade-out handles on the left or top side of the extensions. These fade-out handles can also be used for fading out the extension. The child panel can also be dragged by clicking with the &LMB; on any empty space on it. </para>
 
-<para
->More about extensions can be read in the <link linkend="extensions"
->extensions</link
-> section. </para>
+<para>More about extensions can be read in the <link linkend="extensions">extensions</link> section. </para>
 
 </sect2>
 
 <sect2 id="removing-extensions">
-<title
->Removing Extensions</title>
-
-<para
->You can remove extensions by clicking <guimenuitem
->Remove</guimenuitem
-> in their <guimenu
->context menu</guimenu
->, usually located in the fade-out handles. </para>
+<title>Removing Extensions</title>
+
+<para>You can remove extensions by clicking <guimenuitem>Remove</guimenuitem> in their <guimenu>context menu</guimenu>, usually located in the fade-out handles. </para>
 </sect2>
 
 </sect1>
 
 <sect1 id="configuring-apps">
-<title
->Configuring Application Buttons</title>
-
-<para
->Every <guiicon
->application starter</guiicon
-> has some preferences you can set from their <guimenu
->context menu</guimenu
->. Usually applications and folders have the same preferences as in &konqueror;. Only the applications which are located in the <guimenu
->K</guimenu
-> Menu (for experienced users: those which have a <literal role="extension"
->*.desktop</literal
-> in the <filename class="directory"
->applnk</filename
-> dir) have a special kind of config dialogue. </para>
+<title>Configuring Application Buttons</title>
+
+<para>Every <guiicon>application starter</guiicon> has some preferences you can set from their <guimenu>context menu</guimenu>. Usually applications and folders have the same preferences as in &konqueror;. Only the applications which are located in the <guimenu>K</guimenu> Menu (for experienced users: those which have a <literal role="extension">*.desktop</literal> in the <filename class="directory">applnk</filename> dir) have a special kind of config dialogue. </para>
 
 <sect2 id="general-tab">
-<title
->The <guilabel
->General</guilabel
-> Tab</title>
-
-<para
->Here you can see some stats about the application link. You can also choose an icon by clicking on the <guibutton
->icon button</guibutton
-> and change the filename of the link file. This may be useful if you want the icon on the panel behave different to the analogue one in the <guimenu
->K</guimenu
-> Menu. </para>
+<title>The <guilabel>General</guilabel> Tab</title>
+
+<para>Here you can see some stats about the application link. You can also choose an icon by clicking on the <guibutton>icon button</guibutton> and change the filename of the link file. This may be useful if you want the icon on the panel behave different to the analogue one in the <guimenu>K</guimenu> Menu. </para>
 
 </sect2>
 
 <sect2 id="permissions-tab">
-<title
->The <guilabel
->Permissions</guilabel
-> Tab</title>
+<title>The <guilabel>Permissions</guilabel> Tab</title>
 
-<para
->Here you can set the permissions of the link file. Please refer to the manuals or handbooks of your operating system for more about permissions. </para>
+<para>Here you can set the permissions of the link file. Please refer to the manuals or handbooks of your operating system for more about permissions. </para>
 
 </sect2>
 
 <sect2 id="execute-tab">
-<title
->The <guilabel
->Execute</guilabel
-> Tab</title>
+<title>The <guilabel>Execute</guilabel> Tab</title>
 
-<para
->You can set the behaviour of the application when it's executed on this page. </para>
+<para>You can set the behaviour of the application when it's executed on this page. </para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Command</guilabel
-></term>
+<term><guilabel>Command</guilabel></term>
 <listitem>
-<para
->Usually, there is only the name of the binary that has to be started when clicking on the icon. You can search for another application to be started by clicking the <guibutton
->Browse</guibutton
-> button and/or add special command line parameters to the application. </para>
+<para>Usually, there is only the name of the binary that has to be started when clicking on the icon. You can search for another application to be started by clicking the <guibutton>Browse</guibutton> button and/or add special command line parameters to the application. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Panel Embedding</guilabel
-></term>
+<term><guilabel>Panel Embedding</guilabel></term>
 <listitem>
-<para
->This feature is not implemented yet. </para>
+<para>This feature is not implemented yet. </para>
 </listitem>
-<!--<listitem
-><para
->&kicker; has the possibility to swallow some applications
-like <abbrev
->e.g.</abbrev
-> <application
->XOSView</application
->. This means that
+<!--<listitem><para>&kicker; has the possibility to swallow some applications
+like <abbrev>e.g.</abbrev> <application>XOSView</application>. This means that
 the application will show up directly in the panel.  Therefore you have to
-insert the exact title of the application window in the <guilabel
->Window
-Title</guilabel
-> Textfield. You can also specify an application that will be
+insert the exact title of the application window in the <guilabel>Window
+Title</guilabel> Textfield. You can also specify an application that will be
 executed when clicking on the swallowed application by typing it's name in the
-<guilabel
->Execute on click</guilabel
-> field.</para
-></listitem
->-->
+<guilabel>Execute on click</guilabel> field.</para></listitem>-->
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Run in terminal</guilabel
-></term>
+<term><guilabel>Run in terminal</guilabel></term>
 <listitem>
-<para
->If this box is checked, the application will be executed in a terminal window. You can also add special Terminal options. </para>
+<para>If this box is checked, the application will be executed in a terminal window. You can also add special Terminal options. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Run as different user</guilabel
-></term>
+<term><guilabel>Run as different user</guilabel></term>
 <listitem>
-<para
->Checking this option will let the application start with the permission of the user you typed in the field <guilabel
->Username</guilabel
->. You will be prompted for the user's password on application start. This option may be very useful if you want to start some applications as superuser. </para>
+<para>Checking this option will let the application start with the permission of the user you typed in the field <guilabel>Username</guilabel>. You will be prompted for the user's password on application start. This option may be very useful if you want to start some applications as superuser. </para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -911,20 +450,11 @@ executed when clicking on the swallowed application by typing it's name in the
 </sect2>
 
 <sect2 id="application-tab">
-<title
->The <guilabel
->Application</guilabel
-> Tab</title>
+<title>The <guilabel>Application</guilabel> Tab</title>
 
-<para
->If you set a name and a comment, they will be shown as tooltips of the start icons in the style <quote
->Name - Comment</quote
->. </para>
+<para>If you set a name and a comment, they will be shown as tooltips of the start icons in the style <quote>Name - Comment</quote>. </para>
 
-<para
->In the <guilabel
->File Types</guilabel
-> section you can choose what kinds of filetypes are handled by this application. Please refer to &konqueror; handbook for more about this. </para>
+<para>In the <guilabel>File Types</guilabel> section you can choose what kinds of filetypes are handled by this application. Please refer to &konqueror; handbook for more about this. </para>
 
 </sect2>
 
@@ -933,552 +463,259 @@ executed when clicking on the swallowed application by typing it's name in the
 </chapter>
 
 <chapter id="configuring">
-<title
->Configuring &kicker;</title>
-
-<para
->This section describes the ways &kicker; can be configured. It's only about the basic &kicker; settings, configuration of the applets are described in their <link linkend="applets"
->sections</link
-> </para>
-
-<para
->You can change the settings by either clicking <guimenuitem
->Settings</guimenuitem
-> in the <guimenu
->context menu</guimenu
-> or the submenu <guisubmenu
->Configure Panel</guisubmenu
-> of the <guimenu
->K</guimenu
-> Menu or in the &kcontrol; in the module <guilabel
->Look &amp; Feel</guilabel
->. </para>
+<title>Configuring &kicker;</title>
+
+<para>This section describes the ways &kicker; can be configured. It's only about the basic &kicker; settings, configuration of the applets are described in their <link linkend="applets">sections</link> </para>
+
+<para>You can change the settings by either clicking <guimenuitem>Settings</guimenuitem> in the <guimenu>context menu</guimenu> or the submenu <guisubmenu>Configure Panel</guisubmenu> of the <guimenu>K</guimenu> Menu or in the &kcontrol; in the module <guilabel>Look &amp; Feel</guilabel>. </para>
 
 <note>
-<para
->Please note that the settings in the <guilabel
->General</guilabel
-> and the <guilabel
->Look &amp; Feel</guilabel
-> tabs only affect to the main panel while the behaviour of extensions is set in the <guilabel
->Extensions</guilabel
-> tab. </para>
+<para>Please note that the settings in the <guilabel>General</guilabel> and the <guilabel>Look &amp; Feel</guilabel> tabs only affect to the main panel while the behaviour of extensions is set in the <guilabel>Extensions</guilabel> tab. </para>
 </note>
 
 
 <sect1 id="panel">
-<title
->The Panel Section</title>
+<title>The Panel Section</title>
 
 <sect2 id="panel-general">
-<title
-><guilabel
->General</guilabel
-></title>
-
-<para
->In the <guilabel
->General</guilabel
-> tab you can configure some basic functionality of the &kde; panel (&ie; functionality you'd find in other panel applications as well; later we'll come to the more interesting features). </para>
-
-<para
->In the <guilabel
->Panel Location</guilabel
-> frame you can choose which screen border the panel should be attached to. Please note that usually the available space is used more efficiently if the panel is aligned horizontally, &ie; attached to the top or bottom screen border. If you want to play around with different settings you can change the panel's position even easier by dragging the panel from one border to the other. </para>
-
-<para
->The <guilabel
->Alignment</guilabel
-> group lets you define, where &kicker; is located when the size is set to less than 100%. This can also be done by dragging &kicker; with the &LMB; to the place you want to have it. </para>
-
-<para
->The panel's style can be tiny, small, medium or large. Depending on which applets you use you may find that some applets work better at different panel sizes. You can also change the size by moving the mousepointer over the upper border of &kicker; (assuming &kicker; is at the bottom of your screen) and dragging it while holding the &LMB;. When you do that, the style settings will switch to <guilabel
->Custom</guilabel
-> </para>
+<title><guilabel>General</guilabel></title>
+
+<para>In the <guilabel>General</guilabel> tab you can configure some basic functionality of the &kde; panel (&ie; functionality you'd find in other panel applications as well; later we'll come to the more interesting features). </para>
+
+<para>In the <guilabel>Panel Location</guilabel> frame you can choose which screen border the panel should be attached to. Please note that usually the available space is used more efficiently if the panel is aligned horizontally, &ie; attached to the top or bottom screen border. If you want to play around with different settings you can change the panel's position even easier by dragging the panel from one border to the other. </para>
+
+<para>The <guilabel>Alignment</guilabel> group lets you define, where &kicker; is located when the size is set to less than 100%. This can also be done by dragging &kicker; with the &LMB; to the place you want to have it. </para>
+
+<para>The panel's style can be tiny, small, medium or large. Depending on which applets you use you may find that some applets work better at different panel sizes. You can also change the size by moving the mousepointer over the upper border of &kicker; (assuming &kicker; is at the bottom of your screen) and dragging it while holding the &LMB;. When you do that, the style settings will switch to <guilabel>Custom</guilabel> </para>
 
 <note>
-<para
->Please note, that switching manually to <guilabel
->Custom</guilabel
-> doesn't have any effect and otherwise that you don't need to switch to custom to be able to resize &kicker; manually. </para>
+<para>Please note, that switching manually to <guilabel>Custom</guilabel> doesn't have any effect and otherwise that you don't need to switch to custom to be able to resize &kicker; manually. </para>
 </note>
 
-<para
->Some people may not want to have &kicker; take the whole width or height of their screen. The slider <guilabel
->Percentage of desktop width/height to be used</guilabel
-> changes this behaviour. If you decrease the percentage, &kicker; will either appear aligned left or top of the screen, depending on its location. Checking the checkbox <guilabel
->Expand to fit required size</guilabel
-> makes sure that &kicker; is at least as big as needed to show every icon and applet. </para>
+<para>Some people may not want to have &kicker; take the whole width or height of their screen. The slider <guilabel>Percentage of desktop width/height to be used</guilabel> changes this behaviour. If you decrease the percentage, &kicker; will either appear aligned left or top of the screen, depending on its location. Checking the checkbox <guilabel>Expand to fit required size</guilabel> makes sure that &kicker; is at least as big as needed to show every icon and applet. </para>
 </sect2>
 
 <sect2 id="panel-hiding">
-<title
-><guilabel
->Hiding</guilabel
-></title>
-
-<para
->Depending on your screen resolution you may find that the panel takes away too much of your precious screen real estate. To save screen space, the panel offers an auto hide feature. When this feature is enabled, the panel will hide when the mouse cursor has not been moved over it for a configurable amount of time. If you move the mouse to the panel's screen border it will show up again. Check the <guilabel
->Enable automatic hide</guilabel
-> option in the <guilabel
->Automatic Hide</guilabel
-> frame to enable this feature. Using the <guilabel
->Delay in seconds</guilabel
-> slider you can configure the amount of time the panel will wait before it hides. The checkbox <guilabel
->Show panel when switching desktop</guilabel
-> makes sure that the panel will be shown on the new chosen desktop. Otherwise, if there are too many applets and icons on &kicker;, two small scroll buttons will be displayed to scroll the whole panel. </para>
-
-<para
->When the panel's hide buttons are enabled you'll see buttons on both sides of the panel, with arrows showing to the screen border. If you click on one of these buttons, the panel will slide away in that direction. After that, you'll see a remaining show button in that corner, which will make the panel show again. Check the appropriate checkbox if you want the hide buttons to show up on any side of &kicker;. Using the slider you can change the width of the buttons. </para>
-
-<para
->Using the <guilabel
->Manual Hide Animation</guilabel
-> (for the hide buttons) and <guilabel
->Auto Hide Animation</guilabel
-> (for the auto hide functionality) options you can configure whether the panel will softly slide away or just disappear. You can enable or disable both animations using the <guilabel
->Enable</guilabel
-> options and you can change the speed of the animation using the sliders. </para>
+<title><guilabel>Hiding</guilabel></title>
+
+<para>Depending on your screen resolution you may find that the panel takes away too much of your precious screen real estate. To save screen space, the panel offers an auto hide feature. When this feature is enabled, the panel will hide when the mouse cursor has not been moved over it for a configurable amount of time. If you move the mouse to the panel's screen border it will show up again. Check the <guilabel>Enable automatic hide</guilabel> option in the <guilabel>Automatic Hide</guilabel> frame to enable this feature. Using the <guilabel>Delay in seconds</guilabel> slider you can configure the amount of time the panel will wait before it hides. The checkbox <guilabel>Show panel when switching desktop</guilabel> makes sure that the panel will be shown on the new chosen desktop. Otherwise, if there are too many applets and icons on &kicker;, two small scroll buttons will be displayed to scroll the whole panel. </para>
+
+<para>When the panel's hide buttons are enabled you'll see buttons on both sides of the panel, with arrows showing to the screen border. If you click on one of these buttons, the panel will slide away in that direction. After that, you'll see a remaining show button in that corner, which will make the panel show again. Check the appropriate checkbox if you want the hide buttons to show up on any side of &kicker;. Using the slider you can change the width of the buttons. </para>
+
+<para>Using the <guilabel>Manual Hide Animation</guilabel> (for the hide buttons) and <guilabel>Auto Hide Animation</guilabel> (for the auto hide functionality) options you can configure whether the panel will softly slide away or just disappear. You can enable or disable both animations using the <guilabel>Enable</guilabel> options and you can change the speed of the animation using the sliders. </para>
 
 </sect2>
 
 <sect2 id="panel-looknfeel">
-<title
-><guilabel
->Look &amp; Feel</guilabel
-></title>
-
-<para
->Using the <guilabel
->Look &amp; Feel</guilabel
-> tab you can configure the panel's overall appearance. </para>
-
-<para
->The &kde; panel supports so-called <quote
->tiled buttons</quote
->. This means that the buttons shown on the panel will be drawn using configurable images. To enable button tiling, check the <guilabel
->Enable background tiles</guilabel
-> option in the <guilabel
->Look &amp; Feel</guilabel
-> tab. Then you can configure tiles for certain kinds of buttons. </para>
-
-<para
->For every kind of panel button there is a frame offering an <guilabel
->Enabled</guilabel
-> option to enable or disable tiled images. If tiles are enabled for this kind of button, you can choose a tile in the combo box below and the box on the right will show a preview of this tile. </para>
-
-<para
->The different kinds of buttons are: </para>
+<title><guilabel>Look &amp; Feel</guilabel></title>
+
+<para>Using the <guilabel>Look &amp; Feel</guilabel> tab you can configure the panel's overall appearance. </para>
+
+<para>The &kde; panel supports so-called <quote>tiled buttons</quote>. This means that the buttons shown on the panel will be drawn using configurable images. To enable button tiling, check the <guilabel>Enable background tiles</guilabel> option in the <guilabel>Look &amp; Feel</guilabel> tab. Then you can configure tiles for certain kinds of buttons. </para>
+
+<para>For every kind of panel button there is a frame offering an <guilabel>Enabled</guilabel> option to enable or disable tiled images. If tiles are enabled for this kind of button, you can choose a tile in the combo box below and the box on the right will show a preview of this tile. </para>
+
+<para>The different kinds of buttons are: </para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->TDE Menu Tiles</guilabel
-></term>
+<term><guilabel>TDE Menu Tiles</guilabel></term>
 <listitem>
-<para
->The icon for the <guiicon
->TDE Menu</guiicon
-> will be displayed as a tile </para>
+<para>The icon for the <guiicon>TDE Menu</guiicon> will be displayed as a tile </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Quickbrowser Tiles</guilabel
-></term>
+<term><guilabel>Quickbrowser Tiles</guilabel></term>
 <listitem>
-<para
->The icons for <guiicon
->Quickbrowsers</guiicon
-> will be displayed as tiles </para>
+<para>The icons for <guiicon>Quickbrowsers</guiicon> will be displayed as tiles </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Application Launcher Tiles</guilabel
-></term>
+<term><guilabel>Application Launcher Tiles</guilabel></term>
 <listitem>
-<para
->The icons which start applications will be displayed as tiles </para>
+<para>The icons which start applications will be displayed as tiles </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<guilabel
->Legacy Application Tiles</guilabel>
+<guilabel>Legacy Application Tiles</guilabel>
 </term>
 <listitem>
-<para
->The icons for legacy applications will be displayed as tiles </para>
+<para>The icons for legacy applications will be displayed as tiles </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Window List Tiles</guilabel
-></term>
+<term><guilabel>Window List Tiles</guilabel></term>
 <listitem>
-<para
->The <guiicon
->Window List</guiicon
-> icon will be displayed as a tile </para>
+<para>The <guiicon>Window List</guiicon> icon will be displayed as a tile </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Desktop Access Tiles</guilabel
-></term>
+<term><guilabel>Desktop Access Tiles</guilabel></term>
 <listitem>
-<para
->The <guiicon
->Desktop Access</guiicon
-> icon will be displayed as a tile </para>
+<para>The <guiicon>Desktop Access</guiicon> icon will be displayed as a tile </para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->Enabling the switch <guilabel
->Enable icon zooming</guilabel
-> will give you the effect that &kicker;'s icons will grow bigger when hovering with the mouse. This effect will not appear when the size of &kicker; is set bigger than <guilabel
->medium</guilabel
->. </para>
+<para>Enabling the switch <guilabel>Enable icon zooming</guilabel> will give you the effect that &kicker;'s icons will grow bigger when hovering with the mouse. This effect will not appear when the size of &kicker; is set bigger than <guilabel>medium</guilabel>. </para>
 
-<para
->If <guilabel
->Show tooltips</guilabel
-> is checked, small descriptions of the icons or applets will be shown when the mousepointer rests over an icon for some seconds. </para>
+<para>If <guilabel>Show tooltips</guilabel> is checked, small descriptions of the icons or applets will be shown when the mousepointer rests over an icon for some seconds. </para>
 
-<para
->The <guilabel
->Background Image</guilabel
-> is a picture that will be used to draw the panel's background, just like you can use a picture for the desktop background. Check the <guilabel
->Enable background image</guilabel
-> option to enable this feature. You can specify an image file in the line edit box below or choose one by clicking on the <guibutton
->Browse</guibutton
-> button. You'll see a preview of the selected picture on the right. </para>
+<para>The <guilabel>Background Image</guilabel> is a picture that will be used to draw the panel's background, just like you can use a picture for the desktop background. Check the <guilabel>Enable background image</guilabel> option to enable this feature. You can specify an image file in the line edit box below or choose one by clicking on the <guibutton>Browse</guibutton> button. You'll see a preview of the selected picture on the right. </para>
 
 
 
 </sect2>
 
 <sect2 id="panel-menus">
-<title
->Menus</title>
-
-<para
->In the <guilabel
->Menus</guilabel
-> tab you can configure the panel menu's behaviour. This affects the <guimenu
->K</guimenu
-> menu you will often use to launch applications, the browser menus you can use to access folders and other menus like the recent documents menu. </para>
-
-<para
->The <guilabel
->TDE Menu Layout</guilabel
-> frame offers you some options to configure the <guimenu
->K</guimenu
-> menu's functionality. The <guilabel
->Show &quot;Bookmarks&quot; submenu</guilabel
-> and <guilabel
->Show &quot;Recent Documents&quot; submenu</guilabel
-> options will enable submenus showing your <application
->konqueror</application
-> bookmarks and the last documents you've opened using &kde; applications respectively. The <guilabel
->Show &quot;Quick Browser&quot; submenu</guilabel
-> option will enable a browser menu. Enabling the <guilabel
->Show side image</guilabel
-> checkbox will display a neat image on the left side of the <guimenu
->K</guimenu
-> menu. If the option <guilabel
->Detailed menu entries</guilabel
-> is set, th <guimenu
->K</guimenu
-> menu will show a small description besides the name of the application. </para>
-<para
->Within the <guilabel
->TDE Menu Layout</guilabel
-> you can also define which dynamic menus should be displayed in the <guimenu
->K</guimenu
-> menu by moving them from <guilabel
->Available Menus</guilabel
-> to <guilabel
->Selected Menus</guilabel
-> using the <guibutton
->&lt;&lt;</guibutton
->. They can be removed the same way by using the <guibutton
->&gt;&gt;</guibutton
->. </para>
-
-<para
->In the <guilabel
->Browser Menus</guilabel
-> frame you can configure whether the panel's browser menus will show hidden files or not (hidden files on UNIX systems are those whose filenames begin with a dot) as well as how many files at most will be shown in a browser menu; the latter option may be especially useful if you have a rather small screen resolution, as the browser menus would otherwise quickly fill up your screen when you browse folders containing many files. </para>
-
-<para
->The quick start section in the <guimenu
->K</guimenu
-> menu offers quick access to programs you have used often or recently. In the <guilabel
->&quot;Quick Start&quot; section contains</guilabel
-> frame you can choose whether this section will show the most recently or the most frequently used programs. Using the option <guilabel
->Max number of &quot;Quick Start&quot; entries</guilabel
-> you can configure how many programs the quick start section will remember. </para>
+<title>Menus</title>
+
+<para>In the <guilabel>Menus</guilabel> tab you can configure the panel menu's behaviour. This affects the <guimenu>K</guimenu> menu you will often use to launch applications, the browser menus you can use to access folders and other menus like the recent documents menu. </para>
+
+<para>The <guilabel>TDE Menu Layout</guilabel> frame offers you some options to configure the <guimenu>K</guimenu> menu's functionality. The <guilabel>Show &quot;Bookmarks&quot; submenu</guilabel> and <guilabel>Show &quot;Recent Documents&quot; submenu</guilabel> options will enable submenus showing your <application>konqueror</application> bookmarks and the last documents you've opened using &kde; applications respectively. The <guilabel>Show &quot;Quick Browser&quot; submenu</guilabel> option will enable a browser menu. Enabling the <guilabel>Show side image</guilabel> checkbox will display a neat image on the left side of the <guimenu>K</guimenu> menu. If the option <guilabel>Detailed menu entries</guilabel> is set, th <guimenu>K</guimenu> menu will show a small description besides the name of the application. </para>
+<para>Within the <guilabel>TDE Menu Layout</guilabel> you can also define which dynamic menus should be displayed in the <guimenu>K</guimenu> menu by moving them from <guilabel>Available Menus</guilabel> to <guilabel>Selected Menus</guilabel> using the <guibutton>&lt;&lt;</guibutton>. They can be removed the same way by using the <guibutton>&gt;&gt;</guibutton>. </para>
+
+<para>In the <guilabel>Browser Menus</guilabel> frame you can configure whether the panel's browser menus will show hidden files or not (hidden files on UNIX systems are those whose filenames begin with a dot) as well as how many files at most will be shown in a browser menu; the latter option may be especially useful if you have a rather small screen resolution, as the browser menus would otherwise quickly fill up your screen when you browse folders containing many files. </para>
+
+<para>The quick start section in the <guimenu>K</guimenu> menu offers quick access to programs you have used often or recently. In the <guilabel>&quot;Quick Start&quot; section contains</guilabel> frame you can choose whether this section will show the most recently or the most frequently used programs. Using the option <guilabel>Max number of &quot;Quick Start&quot; entries</guilabel> you can configure how many programs the quick start section will remember. </para>
 
 </sect2>
 
 
 <sect2 id="panel-applets">
-<title
->Applets</title>
+<title>Applets</title>
 
-<para
->Applets are small plugins that extend the panel's functionality. &kde; comes with some applets but they may be provided by third parties as well.</para>
+<para>Applets are small plugins that extend the panel's functionality. &kde; comes with some applets but they may be provided by third parties as well.</para>
 
-<para
->Panel applets can be started using two different ways: internally or externally. While <quote
->internal</quote
-> is the preferred way to load applets, this can raise stability or security problems when you are using poorly programmed third-party applets. To address these problems, applets can be marked <quote
->trusted</quote
->. You might want to configure the panel to treat trusted applets different from untrusted ones. Your options are: </para>
+<para>Panel applets can be started using two different ways: internally or externally. While <quote>internal</quote> is the preferred way to load applets, this can raise stability or security problems when you are using poorly programmed third-party applets. To address these problems, applets can be marked <quote>trusted</quote>. You might want to configure the panel to treat trusted applets different from untrusted ones. Your options are: </para>
 
 <itemizedlist>
 <listitem>
-<para
-><guilabel
->Load only trusted applets internal</guilabel
->: All applets but the ones marked <quote
->trusted</quote
-> will be loaded using an external wrapper application. </para>
+<para><guilabel>Load only trusted applets internal</guilabel>: All applets but the ones marked <quote>trusted</quote> will be loaded using an external wrapper application. </para>
 </listitem>
 
 <listitem>
-<para
-><guilabel
->Load startup config applets internal</guilabel
->: The applets shown on &kde; startup will be loaded internally, others will be loaded using an external wrapper application.</para
-></listitem>
-<listitem
-><para
-><guilabel
->Load all applets internal</guilabel
->: will load all applets internally, regardless of whether they're trusted or not. </para>
+<para><guilabel>Load startup config applets internal</guilabel>: The applets shown on &kde; startup will be loaded internally, others will be loaded using an external wrapper application.</para></listitem>
+<listitem><para><guilabel>Load all applets internal</guilabel>: will load all applets internally, regardless of whether they're trusted or not. </para>
 </listitem>
 </itemizedlist>
 
-<para
->For stability and security reasons, we recommend using one of the first two options and that you mark only those applets as 'trusted' that come with the &kde; base packages. </para>
+<para>For stability and security reasons, we recommend using one of the first two options and that you mark only those applets as 'trusted' that come with the &kde; base packages. </para>
 
-<para
->To mark applets <quote
->trusted</quote
-> or <quote
->untrusted</quote
-> you can move them from one of the shown listboxes to the other. Just try selecting an applet in the list of trusted applets and click the <guibutton
->&gt;&gt;</guibutton
-> button. This will move the selected applet to the other list, while clicking the <guibutton
->&lt;&lt;</guibutton
-> button will move the selected applet of the list of available applets to the list of trusted ones. </para>
+<para>To mark applets <quote>trusted</quote> or <quote>untrusted</quote> you can move them from one of the shown listboxes to the other. Just try selecting an applet in the list of trusted applets and click the <guibutton>&gt;&gt;</guibutton> button. This will move the selected applet to the other list, while clicking the <guibutton>&lt;&lt;</guibutton> button will move the selected applet of the list of available applets to the list of trusted ones. </para>
 
 </sect2>
 
 <sect2 id="panel-extensions">
-<title
->Extensions</title>
-<para
->In this section you can change the behaviour of the <xref linkend="extensions"/>. Simply choose one of your extensions (&eg; Child Panel) from the listbox on the left side and adjust its settings. Those are very similar to the settings on the <xref linkend="panel-general"/> and the <xref linkend="panel-looknfeel"/> tabs. </para>
-
-<para
->The <guilabel
->Panel Location</guilabel
-> group sets the location of the chosen extension. If the option <guilabel
->Enable automatic hide</guilabel
-> is checked, the extension will be faded out automatically after the time in seconds set with the slider <guilabel
->Delay in seconds</guilabel
->. Marking the checkbox <guilabel
->Show panel when switching desktop</guilabel
-> lets the extension show up after a desktop change. </para>
-
-<para
->You can toggle which hide buttons the chosen extension should have with the checkboxes in the group <guilabel
->Hide Buttons</guilabel
->. The slider <guilabel
-> Hide Button Size</guilabel
-> sets the size of the appearing hide buttons. </para>
+<title>Extensions</title>
+<para>In this section you can change the behaviour of the <xref linkend="extensions"/>. Simply choose one of your extensions (&eg; Child Panel) from the listbox on the left side and adjust its settings. Those are very similar to the settings on the <xref linkend="panel-general"/> and the <xref linkend="panel-looknfeel"/> tabs. </para>
+
+<para>The <guilabel>Panel Location</guilabel> group sets the location of the chosen extension. If the option <guilabel>Enable automatic hide</guilabel> is checked, the extension will be faded out automatically after the time in seconds set with the slider <guilabel>Delay in seconds</guilabel>. Marking the checkbox <guilabel>Show panel when switching desktop</guilabel> lets the extension show up after a desktop change. </para>
+
+<para>You can toggle which hide buttons the chosen extension should have with the checkboxes in the group <guilabel>Hide Buttons</guilabel>. The slider <guilabel> Hide Button Size</guilabel> sets the size of the appearing hide buttons. </para>
 
 </sect2>
 
 </sect1>
 
 <sect1 id="taskbar-settings">
-<title
->The Taskbar Section</title>
+<title>The Taskbar Section</title>
 
-<para
->This section changes the settings of the taskbar. Changes affect the external taskbar and also taskbar applets on &kicker; or child-panels. </para>
+<para>This section changes the settings of the taskbar. Changes affect the external taskbar and also taskbar applets on &kicker; or child-panels. </para>
 
 
 <variablelist>
 <varlistentry>
-<term
->Show all windows</term>
+<term>Show all windows</term>
 <listitem>
-<para
->If this box is checked, the taskbar will show all running apps of every desktop. Otherwise, only the applications of the current desktop are shown. </para>
+<para>If this box is checked, the taskbar will show all running apps of every desktop. Otherwise, only the applications of the current desktop are shown. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Show windows list button</term>
+<term>Show windows list button</term>
 <listitem>
-<para
->Checking this box will show the small <guibutton
->window list button</guibutton
->. </para>
+<para>Checking this box will show the small <guibutton>window list button</guibutton>. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Group similar tasks</term>
+<term>Group similar tasks</term>
 <listitem>
 <para>
-<inlinemediaobject
-><imageobject
-><imagedata fileref="taskbar_group.png"
-format="PNG"/></imageobject
-></inlinemediaobject
-> This is a feature introduced in &kde; version 2.2. If the option <guilabel
->Group similar tasks</guilabel
-> is set, several instances of the same application are grouped together in one taskbar button. </para>
-
-<para
->You can define the mouse actions of the taskbar buttons with the settings in the <guilabel
->Actions</guilabel
->. Each action can be one of the following:</para>
+<inlinemediaobject><imageobject><imagedata fileref="taskbar_group.png"
+format="PNG"/></imageobject></inlinemediaobject> This is a feature introduced in &kde; version 2.2. If the option <guilabel>Group similar tasks</guilabel> is set, several instances of the same application are grouped together in one taskbar button. </para>
+
+<para>You can define the mouse actions of the taskbar buttons with the settings in the <guilabel>Actions</guilabel>. Each action can be one of the following:</para>
 
 <variablelist>
 <varlistentry>
 <term>
-<guilabel
->Show Task List</guilabel>
+<guilabel>Show Task List</guilabel>
 </term>
-<listitem
-><para
->Clicking with the mouse button will open a menu displaying all tasks in that group. If you click an entry of that menu with any mouse button, the corresponding application will become active.</para>
+<listitem><para>Clicking with the mouse button will open a menu displaying all tasks in that group. If you click an entry of that menu with any mouse button, the corresponding application will become active.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Show Operations Menu</guilabel
-></term>
+<term><guilabel>Show Operations Menu</guilabel></term>
 <listitem>
 
-<para
->Clicking with the mousebutton will open a menu with all applications of that group, where every application has its window menu as a submenu and there are some group specific entries like <guimenuitem
->Close All</guimenuitem
-> which closes all applications of that group, <guisubmenu
->All to Desktop</guisubmenu
-> which lets you define on which desktop the whole group appears and <guimenuitem
->Maximise All</guimenuitem
->, <guimenuitem
->Minimise All</guimenuitem
-> and <guimenuitem
->Restore All</guimenuitem
-> which appends those actions to all applications of that group. </para>
+<para>Clicking with the mousebutton will open a menu with all applications of that group, where every application has its window menu as a submenu and there are some group specific entries like <guimenuitem>Close All</guimenuitem> which closes all applications of that group, <guisubmenu>All to Desktop</guisubmenu> which lets you define on which desktop the whole group appears and <guimenuitem>Maximise All</guimenuitem>, <guimenuitem>Minimise All</guimenuitem> and <guimenuitem>Restore All</guimenuitem> which appends those actions to all applications of that group. </para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Cycle Through Windows</guilabel
-></term>
-<listitem
-><para
->If this action is chosen, each click with the mousebutton on the <guibutton
->taskbar button</guibutton
-> will activate one of that group's applications, one after each others.</para>
+<term><guilabel>Cycle Through Windows</guilabel></term>
+<listitem><para>If this action is chosen, each click with the mousebutton on the <guibutton>taskbar button</guibutton> will activate one of that group's applications, one after each others.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Activate Task</guilabel
-></term>
+<term><guilabel>Activate Task</guilabel></term>
 <listitem>
-<para
-><guilabel
->Activate Task</guilabel
->: Clicking with the mousebutton will activate the first application in that group without opening the group menu. </para>
+<para><guilabel>Activate Task</guilabel>: Clicking with the mousebutton will activate the first application in that group without opening the group menu. </para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Raise Task</guilabel
-></term>
+<term><guilabel>Raise Task</guilabel></term>
 <listitem>
-<para
->The first application of that group will be put in the foreground without giving focus to it.</para>
+<para>The first application of that group will be put in the foreground without giving focus to it.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Lower Task</guilabel
-></term>
+<term><guilabel>Lower Task</guilabel></term>
 <listitem>
-<para
->The first application of that group will be put in the background. It won't lose the focus. </para>
+<para>The first application of that group will be put in the background. It won't lose the focus. </para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Minimise Task</guilabel
-></term>
+<term><guilabel>Minimise Task</guilabel></term>
 <listitem>
-<para
->The first application of that group will be minimised. If it is already minimised, it will be restored again.</para>
+<para>The first application of that group will be minimised. If it is already minimised, it will be restored again.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->Please note that some of these settings only have effect if a taskbar button contains more than one application. </para>
+<para>Please note that some of these settings only have effect if a taskbar button contains more than one application. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Sort tasks by virtual desktop</term>
+<term>Sort tasks by virtual desktop</term>
 <listitem>
-<para
->Checking this box will sort all <guibutton
->taskbar buttons</guibutton
-> in a group for each desktop, otherwise they are sorted by the order they are started. This will not affect grouped tasks if they are spread over more than one desktop. </para>
+<para>Checking this box will sort all <guibutton>taskbar buttons</guibutton> in a group for each desktop, otherwise they are sorted by the order they are started. This will not affect grouped tasks if they are spread over more than one desktop. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Show application icons</term>
+<term>Show application icons</term>
 <listitem>
-<para
->If this box is checked, every <guibutton
->taskbar button</guibutton
-> will have the icon of the running application beside its title. </para>
+<para>If this box is checked, every <guibutton>taskbar button</guibutton> will have the icon of the running application beside its title. </para>
 </listitem>
 </varlistentry>
 
@@ -1489,71 +726,36 @@ format="PNG"/></imageobject
 </chapter>
 
 <chapter id="k-menu">
-<title
->The <guimenu
->K</guimenu
-> Menu</title>
+<title>The <guimenu>K</guimenu> Menu</title>
 
-<para
->The <guimenu
->K</guimenu
-> Menu is one of the central elements of &kicker;. </para>
+<para>The <guimenu>K</guimenu> Menu is one of the central elements of &kicker;. </para>
 
-<para
->There are five main groups in the <guimenu
->K</guimenu
-> Menu which will be described now from bottom to top. </para>
+<para>There are five main groups in the <guimenu>K</guimenu> Menu which will be described now from bottom to top. </para>
 
 <sect1 id="kde-group">
-<title
->The <acronym
->KDE</acronym
-> Group</title>
+<title>The <acronym>KDE</acronym> Group</title>
 
-<para
->This group is for the common &kde; things in the <guimenu
->K</guimenu
-> Menu. </para>
+<para>This group is for the common &kde; things in the <guimenu>K</guimenu> Menu. </para>
 
 <variablelist>
 <varlistentry>
-<term
-><guimenuitem
->Logout</guimenuitem
-></term>
+<term><guimenuitem>Logout</guimenuitem></term>
 <listitem>
-<para
->This entry is used to finish the &kde; session. It also shuts down the &X-Window; session. </para>
+<para>This entry is used to finish the &kde; session. It also shuts down the &X-Window; session. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenuitem
->Lock Session</guimenuitem
-></term>
+<term><guimenuitem>Lock Session</guimenuitem></term>
 <listitem>
-<para
->With this entry you can lock your session if you don't want anybody else to access your desktop. If you have set a screensaver, it will appear when locked, otherwise the screen will turn black. If you hit any key, you will be prompted for your user password. This is independent from the screensaver's password settings. </para>
+<para>With this entry you can lock your session if you don't want anybody else to access your desktop. If you have set a screensaver, it will appear when locked, otherwise the screen will turn black. If you hit any key, you will be prompted for your user password. This is independent from the screensaver's password settings. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guisubmenu
->Configure Panel</guisubmenu
-></term>
+<term><guisubmenu>Configure Panel</guisubmenu></term>
 <listitem>
-<para
->In this submenu you can change the settings of &kicker;, described in the <link linkend="configuring"
->Configuring &kicker;</link
-> section, add things to &kicker; (see in <link linkend="basics"
->&kicker; Basics</link
-> for more) and start the <application
->Menu Editor</application
->. You can also reach the <guisubmenu
->Help</guisubmenu
-> Menu, but as you are reading this, you probably found it yourself. </para>
+<para>In this submenu you can change the settings of &kicker;, described in the <link linkend="configuring">Configuring &kicker;</link> section, add things to &kicker; (see in <link linkend="basics">&kicker; Basics</link> for more) and start the <application>Menu Editor</application>. You can also reach the <guisubmenu>Help</guisubmenu> Menu, but as you are reading this, you probably found it yourself. </para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -1561,73 +763,41 @@ format="PNG"/></imageobject
 </sect1>
 
 <sect1 id="run-command">
-<title
->Run Command</title>
+<title>Run Command</title>
 
-<para
->This will bring up a small but powerful application start dialogue. </para>
+<para>This will bring up a small but powerful application start dialogue. </para>
 
-<para
->In the standard case, you just type in a command and press <keycap
->Enter</keycap
-> or click <guibutton
->Run</guibutton
->. But there is also an <guibutton
->Options</guibutton
-> button which will bring up some starting options to the command window. </para>
+<para>In the standard case, you just type in a command and press <keycap>Enter</keycap> or click <guibutton>Run</guibutton>. But there is also an <guibutton>Options</guibutton> button which will bring up some starting options to the command window. </para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Run in terminal</guilabel
-></term>
+<term><guilabel>Run in terminal</guilabel></term>
 <listitem>
-<para
->Checking this box will let the application start in a terminal which means that you will be able to see any command-line messages the application may give. </para>
+<para>Checking this box will let the application start in a terminal which means that you will be able to see any command-line messages the application may give. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Run as a different user</guilabel
-></term>
+<term><guilabel>Run as a different user</guilabel></term>
 <listitem>
-<para
->If this box is checked, you can specify a user with whose permission the application should run in the <guilabel
->Username</guilabel
-> textfield. If you specify another user, you will have to give a password at the box below. </para>
+<para>If this box is checked, you can specify a user with whose permission the application should run in the <guilabel>Username</guilabel> textfield. If you specify another user, you will have to give a password at the box below. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Run with different priority</guilabel
-></term>
+<term><guilabel>Run with different priority</guilabel></term>
 <listitem>
-<para
->Check this option to run with a different priority. A higher priority will tell the operating system to give more processing time to the applications. You can use the slider to change the priority. If you want to give your app a higher priority than the default one (middle position), you will need to enter the root password below. </para>
+<para>Check this option to run with a different priority. A higher priority will tell the operating system to give more processing time to the applications. You can use the slider to change the priority. If you want to give your app a higher priority than the default one (middle position), you will need to enter the root password below. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Scheduler</guilabel
-></term>
+<term><guilabel>Scheduler</guilabel></term>
 <listitem>
-<para
->The Scheduler is the part of the operating system which processes will run and which have to wait. Usually, an application will run with normal schedule, which means it can use the processing time it gets from the operating system, but you can also set it to <guilabel
->Realtime</guilabel
->. This means that the application has all the process time until it gives it away. You will need to enter the root password to use <guilabel
->Realtime</guilabel
->. </para>
+<para>The Scheduler is the part of the operating system which processes will run and which have to wait. Usually, an application will run with normal schedule, which means it can use the processing time it gets from the operating system, but you can also set it to <guilabel>Realtime</guilabel>. This means that the application has all the process time until it gives it away. You will need to enter the root password to use <guilabel>Realtime</guilabel>. </para>
 
 <warning>
-<para
->This can be dangerous. If the application hangs and can't give up the processor, the complete system might hang. </para>
+<para>This can be dangerous. If the application hangs and can't give up the processor, the complete system might hang. </para>
 </warning>
 
 </listitem>
@@ -1638,47 +808,29 @@ format="PNG"/></imageobject
 </sect1>
 
 <sect1 id="browsers">
-<title
->Browsers</title>
+<title>Browsers</title>
 
-<para
->This group contains some very useful browsers. It can also contain dynamic menus as described in the <link linkend="panel-menus"
->Menus</link
-> section of &kicker;'s settings. </para>
+<para>This group contains some very useful browsers. It can also contain dynamic menus as described in the <link linkend="panel-menus">Menus</link> section of &kicker;'s settings. </para>
 
 <variablelist>
 <varlistentry>
-<term
-><guisubmenu
->Quick Browser</guisubmenu
-></term>
+<term><guisubmenu>Quick Browser</guisubmenu></term>
 <listitem>
-<para
->This submenu contains quick browsers for three very useful folders: home, root, and system configuration. </para>
+<para>This submenu contains quick browsers for three very useful folders: home, root, and system configuration. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guisubmenu
->Recent Documents</guisubmenu
-></term>
+<term><guisubmenu>Recent Documents</guisubmenu></term>
 <listitem>
-<para
->This menu shows the most recently used documents (works only with &kde; applications for the moment). Clicking the element <guimenuitem
->Clear History</guimenuitem
-> will remove those entries, what may be useful for privacy reasons. </para>
+<para>This menu shows the most recently used documents (works only with &kde; applications for the moment). Clicking the element <guimenuitem>Clear History</guimenuitem> will remove those entries, what may be useful for privacy reasons. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guisubmenu
->Bookmarks</guisubmenu
-></term>
+<term><guisubmenu>Bookmarks</guisubmenu></term>
 <listitem>
-<para
->This submenu shows your personal bookmarks just like &konqueror; does. Refer to the &konqueror; Handbook for more help on this. </para>
+<para>This submenu shows your personal bookmarks just like &konqueror; does. Refer to the &konqueror; Handbook for more help on this. </para>
 </listitem>
 </varlistentry>
 
@@ -1687,156 +839,90 @@ format="PNG"/></imageobject
 </sect1>
 
 <sect1 id="application-group">
-<title
->The Application Group</title>
+<title>The Application Group</title>
 
-<para
->The submenus for application starting are located in this group. You can use &kmenuedit; to add, remove or move the entries. Applications will have a short description if the option <guilabel
->Detailed menu entries</guilabel
-> is enabled in the settings. </para>
+<para>The submenus for application starting are located in this group. You can use &kmenuedit; to add, remove or move the entries. Applications will have a short description if the option <guilabel>Detailed menu entries</guilabel> is enabled in the settings. </para>
 </sect1>
 
 <sect1 id="most-recently-group">
-<title
->The most recently used applications</title>
+<title>The most recently used applications</title>
 
-<para
->This group holds either the most recently or the most frequently used applications. See the <link linkend="panel-menus"
->Menus Configuration</link
-> section for more about that. </para>
+<para>This group holds either the most recently or the most frequently used applications. See the <link linkend="panel-menus">Menus Configuration</link> section for more about that. </para>
 </sect1>
 
 </chapter>
 
 <chapter id="applets">
-<title
->Applets</title>
-
-<para
->Applets are small applications running inside of &kicker;. Almost everything besides the <guiicon
->application starter buttons</guiicon
-> are applets. They can be added from the <guimenu
->context menu</guimenu
-> or from the submenu <guisubmenu
->Configure Panel</guisubmenu
-> by choosing <guisubmenu
->Add</guisubmenu
-> and the <guisubmenu
->Applet</guisubmenu
->. Every applet contains a small arrow in its handle. Clicking it will bring up a menu which lets you move or remove it, set the Preferences, if there are any and set the preferences of &kicker;. </para>
+<title>Applets</title>
+
+<para>Applets are small applications running inside of &kicker;. Almost everything besides the <guiicon>application starter buttons</guiicon> are applets. They can be added from the <guimenu>context menu</guimenu> or from the submenu <guisubmenu>Configure Panel</guisubmenu> by choosing <guisubmenu>Add</guisubmenu> and the <guisubmenu>Applet</guisubmenu>. Every applet contains a small arrow in its handle. Clicking it will bring up a menu which lets you move or remove it, set the Preferences, if there are any and set the preferences of &kicker;. </para>
 
 <sect1 id="taskbar-applet">
-<title
->The Taskbar Applet</title>
+<title>The Taskbar Applet</title>
 
-<para
->The taskbar applet shows buttons for the running applications. The application, which has the focus, is shown as a pressed button. If an application is minimised, the title displayed in the taskbar will fade to grey. </para>
+<para>The taskbar applet shows buttons for the running applications. The application, which has the focus, is shown as a pressed button. If an application is minimised, the title displayed in the taskbar will fade to grey. </para>
 
 <tip>
-<para
->If you click on the button of the active application, it will be minimised. This means also that if you click twice on an inactive application, it will also be minimised. </para>
+<para>If you click on the button of the active application, it will be minimised. This means also that if you click twice on an inactive application, it will also be minimised. </para>
 </tip>
 
-<para
->A click with the &RMB; on a button will show the standard application menu. Only the entry <guimenuitem
->To current desktop</guimenuitem
-> differs: if you have set the taskbar to show the applications of all desktops, you can move this app to the current desktop. </para>
+<para>A click with the &RMB; on a button will show the standard application menu. Only the entry <guimenuitem>To current desktop</guimenuitem> differs: if you have set the taskbar to show the applications of all desktops, you can move this app to the current desktop. </para>
 
-<para
->There is also a small icon on the left or top side of the taskbar, which opens a menu. This is called the <guibutton
->windows list icon</guibutton
->. The menu's first entry, <guimenuitem
->Unclutter Windows</guimenuitem
->, tries to move the windows on your active desktop in a way to see as many as possible. <guimenuitem
->Cascade Windows</guimenuitem
-> puts all windows on the active desktop over each others, the most recently on top and the others sorted by the time they where last used. </para>
+<para>There is also a small icon on the left or top side of the taskbar, which opens a menu. This is called the <guibutton>windows list icon</guibutton>. The menu's first entry, <guimenuitem>Unclutter Windows</guimenuitem>, tries to move the windows on your active desktop in a way to see as many as possible. <guimenuitem>Cascade Windows</guimenuitem> puts all windows on the active desktop over each others, the most recently on top and the others sorted by the time they where last used. </para>
 
-<para
->Below those entries is a list of all currently running applications, grouped by the desktops on which they are running. Clicking on the name of a desktop will switch to that one, clicking an application will also activate it. You can specify the mouse behaviour. Please refer to <link linkend="taskbar-settings"
->Taskbar</link
-> settings for more about that. </para>
+<para>Below those entries is a list of all currently running applications, grouped by the desktops on which they are running. Clicking on the name of a desktop will switch to that one, clicking an application will also activate it. You can specify the mouse behaviour. Please refer to <link linkend="taskbar-settings">Taskbar</link> settings for more about that. </para>
 
 
 <sect2 id="configure-taskbar-applet">
-<title
->Configuring the Taskbar Applet</title>
+<title>Configuring the Taskbar Applet</title>
 
-<para
->You can configure the taskbar by clicking the &RMB; on the small move handle. </para>
-<para
->Please refer to <xref linkend="taskbar-settings"/> for details about the preferences of the taskbar. </para>
+<para>You can configure the taskbar by clicking the &RMB; on the small move handle. </para>
+<para>Please refer to <xref linkend="taskbar-settings"/> for details about the preferences of the taskbar. </para>
 
 </sect2>
 
 </sect1>
 
 <sect1 id="pager-applet">
-<title
->The Mini-Pager Applet</title>
+<title>The Mini-Pager Applet</title>
 
-<para
->This little applet shows a preview of the desktops and lets you also choose by a click with the &LMB; which desktop you want to use. </para>
+<para>This little applet shows a preview of the desktops and lets you also choose by a click with the &LMB; which desktop you want to use. </para>
 
-<para
->There is also a very useful <guimenu
->context menu</guimenu
->: </para>
+<para>There is also a very useful <guimenu>context menu</guimenu>: </para>
 
 <variablelist>
 <varlistentry>
-<term
-><guimenuitem
->Preview</guimenuitem
-></term>
+<term><guimenuitem>Preview</guimenuitem></term>
 <listitem>
-<para
->This option lets the mini pager appear as a tiny preview of the desktops with symbolic rectangles for the running applications. </para>
+<para>This option lets the mini pager appear as a tiny preview of the desktops with symbolic rectangles for the running applications. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenuitem
->Number</guimenuitem
-></term>
+<term><guimenuitem>Number</guimenuitem></term>
 <listitem>
-<para
->If this option is chosen, the pager will show the numbers of the desktops </para>
+<para>If this option is chosen, the pager will show the numbers of the desktops </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenuitem
->Name</guimenuitem
-></term>
+<term><guimenuitem>Name</guimenuitem></term>
 <listitem>
-<para
->This will let the pager show the names of the desktops, which can be set in the preferences or from <application
->Control Centre</application
->. </para>
+<para>This will let the pager show the names of the desktops, which can be set in the preferences or from <application>Control Centre</application>. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenuitem
->Enable Desktop Preview</guimenuitem
-></term>
+<term><guimenuitem>Enable Desktop Preview</guimenuitem></term>
 <listitem>
-<para
->If this option is checked, a small button will be shown which shows a bigger preview of the running desktops. If you click an application in that preview, it will be activated. </para>
+<para>If this option is checked, a small button will be shown which shows a bigger preview of the running desktops. If you click an application in that preview, it will be activated. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenuitem
->Preferences</guimenuitem
-></term>
+<term><guimenuitem>Preferences</guimenuitem></term>
 <listitem>
-<para
->Here you can set the number of desktops you want to have and the names of them. </para>
+<para>Here you can set the number of desktops you want to have and the names of them. </para>
 </listitem>
 </varlistentry>
 
@@ -1845,71 +931,48 @@ format="PNG"/></imageobject
 </sect1>
 
 <sect1 id="clock-applet">
-<title
->The Clock Applet</title>
+<title>The Clock Applet</title>
 
-<para
->As you might already guess, the clock applet is a small clock which resides in &kicker;. </para>
+<para>As you might already guess, the clock applet is a small clock which resides in &kicker;. </para>
 
-<para
->A click with the &LMB; on the clock will show a small calendar. You can use the <guibutton
->single arrows</guibutton
-> to switch the months or the <guibutton
->double arrows</guibutton
-> for switching years. This won't have any effect of your date settings, it's just for your information. </para>
+<para>A click with the &LMB; on the clock will show a small calendar. You can use the <guibutton>single arrows</guibutton> to switch the months or the <guibutton>double arrows</guibutton> for switching years. This won't have any effect of your date settings, it's just for your information. </para>
 
-<para
->There are some things you can do with the clock applet. This can be done from the <guimenu
->context menu</guimenu
->. </para>
+<para>There are some things you can do with the clock applet. This can be done from the <guimenu>context menu</guimenu>. </para>
 
 <sect2 id="clock-type">
-<title
-><guisubmenu
->Type</guisubmenu
-></title>
+<title><guisubmenu>Type</guisubmenu></title>
 
-<para
->There are four ways the clock can appear: </para>
+<para>There are four ways the clock can appear: </para>
 
 <variablelist>
 <varlistentry>
-<term
->Plain</term>
+<term>Plain</term>
 <listitem>
-<para
->This lets the clock appear as a simple text that shows the time in plain text. </para>
+<para>This lets the clock appear as a simple text that shows the time in plain text. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Digital</term>
+<term>Digital</term>
 <listitem>
-<para
->This lets the clock appear as a digital clock showing the time in the well known seven segment style. </para>
+<para>This lets the clock appear as a digital clock showing the time in the well known seven segment style. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Analogue</term>
+<term>Analogue</term>
 <listitem>
-<para
->If this is set, the clock will be displayed as an old styled analogue clock. </para>
+<para>If this is set, the clock will be displayed as an old styled analogue clock. </para>
 <note>
-<para
->This may only be useful if you set &kicker; to normal or large size. </para>
+<para>This may only be useful if you set &kicker; to normal or large size. </para>
 </note>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Fuzzy</term>
+<term>Fuzzy</term>
 <listitem>
-<para
->This is a very unorthodox style of time display. Try it out, it is really funny! </para>
+<para>This is a very unorthodox style of time display. Try it out, it is really funny! </para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -1917,100 +980,45 @@ format="PNG"/></imageobject
 </sect2>
 
 <sect2 id="clock-preferences">
-<title
-><guimenuitem
->Preferences</guimenuitem
-></title>
+<title><guimenuitem>Preferences</guimenuitem></title>
 
-<para
->Here you can set some general preferences of the clock applet. </para>
+<para>Here you can set some general preferences of the clock applet. </para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->General</guilabel
-></term>
+<term><guilabel>General</guilabel></term>
 <listitem>
-<para
->In the <guilabel
->Clock Type</guilabel
-> settings you can choose between the clock styles like in the <guimenu
->context menu</guimenu
->. </para>
+<para>In the <guilabel>Clock Type</guilabel> settings you can choose between the clock styles like in the <guimenu>context menu</guimenu>. </para>
 
-<para
->The <guilabel
->Date</guilabel
-> group lets you pick font and colour of the date, which is shown when activated for the specific clock type. </para>
+<para>The <guilabel>Date</guilabel> group lets you pick font and colour of the date, which is shown when activated for the specific clock type. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->The <guilabel
->Plain Clock</guilabel
-> Tab</term>
+<term>The <guilabel>Plain Clock</guilabel> Tab</term>
 <listitem>
-<para
->In the <guilabel
->Options</guilabel
-> section you can check if you want to have the date and/or the seconds shown. In <guilabel
->Colours</guilabel
-> you can choose if you want the common &kde; look or your own custom colours and font. </para>
+<para>In the <guilabel>Options</guilabel> section you can check if you want to have the date and/or the seconds shown. In <guilabel>Colours</guilabel> you can choose if you want the common &kde; look or your own custom colours and font. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->The <guilabel
->Digital Clock</guilabel
-> Tab</term>
+<term>The <guilabel>Digital Clock</guilabel> Tab</term>
 <listitem>
-<para
->In the <guilabel
->Options</guilabel
-> section you can check if you want to have the date, the seconds and/or blinking dots shown. In <guilabel
->Colours</guilabel
-> you can choose if you want the common <acronym
->LCD</acronym
->-Look or your own custom colours. </para>
+<para>In the <guilabel>Options</guilabel> section you can check if you want to have the date, the seconds and/or blinking dots shown. In <guilabel>Colours</guilabel> you can choose if you want the common <acronym>LCD</acronym>-Look or your own custom colours. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->The <guilabel
->Analogue Clock</guilabel
-> Tab</term>
+<term>The <guilabel>Analogue Clock</guilabel> Tab</term>
 <listitem>
-<para
->In the <guilabel
->Options</guilabel
-> section you can check if you want to have the date and/or seconds shown. In <guilabel
->Colours</guilabel
-> you can choose if you want the common <acronym
->LCD</acronym
->-Look or your own custom colours. You can also set the level of antialiasing, which means that lines will get blurred a little bit to prevent steps in the drawing. High quality antialiasing may catch some system load on low-end systems. <guilabel
->Draw Frame</guilabel
-> will display the clock a little bit sunken in the panel. </para>
+<para>In the <guilabel>Options</guilabel> section you can check if you want to have the date and/or seconds shown. In <guilabel>Colours</guilabel> you can choose if you want the common <acronym>LCD</acronym>-Look or your own custom colours. You can also set the level of antialiasing, which means that lines will get blurred a little bit to prevent steps in the drawing. High quality antialiasing may catch some system load on low-end systems. <guilabel>Draw Frame</guilabel> will display the clock a little bit sunken in the panel. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->The <guilabel
->Fuzzy Clock</guilabel
-> Tab</term>
+<term>The <guilabel>Fuzzy Clock</guilabel> Tab</term>
 <listitem>
-<para
->In the <guilabel
->Options</guilabel
-> section you can check if you want to have the date shown. There is also a slider to set the <guilabel
->Fuzziness</guilabel
->. This cannot be described in the documents, just do your own experiments. In <guilabel
->Colours</guilabel
-> you can choose the colours and the font of the fuzzy clock. </para>
+<para>In the <guilabel>Options</guilabel> section you can check if you want to have the date shown. There is also a slider to set the <guilabel>Fuzziness</guilabel>. This cannot be described in the documents, just do your own experiments. In <guilabel>Colours</guilabel> you can choose the colours and the font of the fuzzy clock. </para>
 </listitem>
 </varlistentry>
 
@@ -2019,208 +1027,122 @@ format="PNG"/></imageobject
 </sect2>
 
 <sect2 id="adjust-time">
-<title
-><guimenuitem
->Adjust Date and Time</guimenuitem
-></title>
+<title><guimenuitem>Adjust Date and Time</guimenuitem></title>
 
-<para
->This option starts the <guilabel
->Country &amp; Language</guilabel
-> configuration module of the &kcontrol;.</para>
+<para>This option starts the <guilabel>Country &amp; Language</guilabel> configuration module of the &kcontrol;.</para>
 
 <note>
-<para
->You will need the super user password for adjusting date and time. </para>
+<para>You will need the super user password for adjusting date and time. </para>
 </note>
 
 </sect2>
 
 <sect2 id="date-format">
-<title
-><guimenuitem
->Date and Time Format</guimenuitem
-></title>
+<title><guimenuitem>Date and Time Format</guimenuitem></title>
 
-<para
->This will open the Date and Time module of &kcontrol; where you can set your formats. There aren't any special permissions needed for that. </para>
+<para>This will open the Date and Time module of &kcontrol; where you can set your formats. There aren't any special permissions needed for that. </para>
 
 </sect2>
 
 <sect2 id="copy-date">
-<title
-><guisubmenu
->Copy</guisubmenu
-></title>
+<title><guisubmenu>Copy</guisubmenu></title>
 
-<para
->If you need to paste the actual date and/or time in another application (&eg; in a text editor), you can copy it to the clipboard with this function. After selecting one of the available formats, the actual date and/or time is placed in the clipboard using the appropriate format. </para>
+<para>If you need to paste the actual date and/or time in another application (&eg; in a text editor), you can copy it to the clipboard with this function. After selecting one of the available formats, the actual date and/or time is placed in the clipboard using the appropriate format. </para>
 
 </sect2>
 
 </sect1>
 
 <sect1 id="launcher-applet">
-<title
->The Quick Launcher Applet</title>
-
-<para
->This is a compressed application launcher. It is very useful especially if the panel is set to normal or large size. You can add applications by drag and drop or from the <guimenu
->context menu</guimenu
->. The <guimenu
->context menu</guimenu
-> is also used to remove an application. </para>
+<title>The Quick Launcher Applet</title>
+
+<para>This is a compressed application launcher. It is very useful especially if the panel is set to normal or large size. You can add applications by drag and drop or from the <guimenu>context menu</guimenu>. The <guimenu>context menu</guimenu> is also used to remove an application. </para>
 </sect1>
 
 <sect1 id="systemtray-applet">
-<title
->The System Tray Applet</title>
+<title>The System Tray Applet</title>
 
-<para
->The System Tray is used to dock some special applications like &eg; &klipper; or &kteatime;. </para>
+<para>The System Tray is used to dock some special applications like &eg; &klipper; or &kteatime;. </para>
 </sect1>
 
 <sect1 id="lockout-applet">
-<title
->Lock/Logout Applet</title>
-<para
->This little applet contains two buttons. The <guibutton
->luggage lock</guibutton
-> is used to lock the session if you ever want to leave your &kde; unattended and don't want anybody to access it. The <guibutton
->off switch</guibutton
-> is used to close your &kde; session. </para>
+<title>Lock/Logout Applet</title>
+<para>This little applet contains two buttons. The <guibutton>luggage lock</guibutton> is used to lock the session if you ever want to leave your &kde; unattended and don't want anybody to access it. The <guibutton>off switch</guibutton> is used to close your &kde; session. </para>
 </sect1>
 
 <sect1 id="run-applet">
-<title
->The Application Launcher Applet</title>
+<title>The Application Launcher Applet</title>
 
-<para
->This applet provides a simple command line embedded in &kicker;. Nothing more, nothing less. </para>
+<para>This applet provides a simple command line embedded in &kicker;. Nothing more, nothing less. </para>
 
 </sect1>
 
 <sect1 id="naughty-applet">
-<title
->The Runaway Process Catcher Applet</title>
+<title>The Runaway Process Catcher Applet</title>
 
-<para
->This applet shows a smiley which will get angry when any process catches up too much system resources. If an application uses too much, a messagebox will appear and ask you how to handle that application. </para>
+<para>This applet shows a smiley which will get angry when any process catches up too much system resources. If an application uses too much, a messagebox will appear and ask you how to handle that application. </para>
 
-<para
->Clicking it with the &LMB; will show a configuration dialogue. Here you can set the <guilabel
->Update interval</guilabel
->, which is set in seconds, and the <guilabel
->CPU load threshold</guilabel
->. At the moment, there is no real advice for setting this up, you will have to do some experimenting. These settings will probably change in a future release. There is also a section <guilabel
->Programs to ignore</guilabel
-> where you can add applications that use many resources naturally, &eg; compilers or 3D renderers. </para>
+<para>Clicking it with the &LMB; will show a configuration dialogue. Here you can set the <guilabel>Update interval</guilabel>, which is set in seconds, and the <guilabel>CPU load threshold</guilabel>. At the moment, there is no real advice for setting this up, you will have to do some experimenting. These settings will probably change in a future release. There is also a section <guilabel>Programs to ignore</guilabel> where you can add applications that use many resources naturally, &eg; compilers or 3D renderers. </para>
 
 </sect1>
 
 <sect1 id="klipper-applet">
-<title
->&klipper; Applet</title>
+<title>&klipper; Applet</title>
 
-<para
->This applet does exactly the same like the &klipper; residing in the system tray. It has the advantage, that it consumes a little bit less system resources, which only matters on really slow systems, but has the disadvantage, that it uses more space than &klipper; in the system tray. You can read more about that in the manual for <ulink url="help:/klipper/index.html"
->&klipper;</ulink
-> </para>
+<para>This applet does exactly the same like the &klipper; residing in the system tray. It has the advantage, that it consumes a little bit less system resources, which only matters on really slow systems, but has the disadvantage, that it uses more space than &klipper; in the system tray. You can read more about that in the manual for <ulink url="help:/klipper/index.html">&klipper;</ulink> </para>
 </sect1>
 
 </chapter>
 
 <chapter id="extensions">
-<title
->Extensions</title>
-
-<para
->There are also some features that run outside of &kicker;, the extensions. They are added from the submenu <guisubmenu
->Configure Panel</guisubmenu
-> of the <guimenu
->K</guimenu
-> Menu or the <guimenu
->context menu</guimenu
-> by choosing <guisubmenu
->Add</guisubmenu
-> and then <guisubmenu
->Extensions</guisubmenu
->. You can move them to any screenborder by dragging them at the small <guibutton
->fadeout </guibutton
-> on their side and remove it by right clicking on that button and choose <guimenuitem
->Remove</guimenuitem
->. Clicking these buttons with the &LMB; fades the extension out or in, just like the main &kicker;. </para>
-
-<para
->The style of the extensions can be configured in the <xref linkend="panel-extensions"/> section of &kicker;'s preferences. </para>
+<title>Extensions</title>
+
+<para>There are also some features that run outside of &kicker;, the extensions. They are added from the submenu <guisubmenu>Configure Panel</guisubmenu> of the <guimenu>K</guimenu> Menu or the <guimenu>context menu</guimenu> by choosing <guisubmenu>Add</guisubmenu> and then <guisubmenu>Extensions</guisubmenu>. You can move them to any screenborder by dragging them at the small <guibutton>fadeout </guibutton> on their side and remove it by right clicking on that button and choose <guimenuitem>Remove</guimenuitem>. Clicking these buttons with the &LMB; fades the extension out or in, just like the main &kicker;. </para>
+
+<para>The style of the extensions can be configured in the <xref linkend="panel-extensions"/> section of &kicker;'s preferences. </para>
 
 
 <sect1 id="external-taskbar-extension">
-<title
->The External Taskbar Extension</title>
+<title>The External Taskbar Extension</title>
 
-<para
->The external taskbar is just the same as the taskbar applet with the only difference that it provides its own panel. Refer to the <link linkend="taskbar-applet"
->taskbar applet section</link
-> for help about it. </para>
+<para>The external taskbar is just the same as the taskbar applet with the only difference that it provides its own panel. Refer to the <link linkend="taskbar-applet">taskbar applet section</link> for help about it. </para>
 
 </sect1>
 
 <sect1 id="child-panel-extension">
-<title
->The Child Panel Extension</title>
+<title>The Child Panel Extension</title>
 
-<para
->This is just a panel like &kicker; itself, where you can add all the stuff &kicker; is also capable. So you can have as many &kicker;s as you want. Just add a child panel and add applications and applets to it. </para>
+<para>This is just a panel like &kicker; itself, where you can add all the stuff &kicker; is also capable. So you can have as many &kicker;s as you want. Just add a child panel and add applications and applets to it. </para>
 
 </sect1>
 
 <sect1 id="kasbar-extension">
-<title
->The <application
->KasBar</application
-> Extension</title>
-
-<para
->The <application
->KasBar</application
-> is an iconic replacement of the taskbar. It always shows the icons of all currently running applications on any desktop, they can be chosen by clicking with the &LMB;. The active window is highlighted, minimised windows will show a little triangle pointing downwards instead of the square in the lower right of the icons. A triangle pointing to the right indicates that the application is shaded. </para>
+<title>The <application>KasBar</application> Extension</title>
+
+<para>The <application>KasBar</application> is an iconic replacement of the taskbar. It always shows the icons of all currently running applications on any desktop, they can be chosen by clicking with the &LMB;. The active window is highlighted, minimised windows will show a little triangle pointing downwards instead of the square in the lower right of the icons. A triangle pointing to the right indicates that the application is shaded. </para>
 </sect1>
 
 <sect1 id="dock-application-bar-extension">
-<title
->The Dock Application Bar Extension</title>
+<title>The Dock Application Bar Extension</title>
 
-<para
->The Dock Application Bar is an external bar which lets WindowMaker applications be docked. Just run your dockable WindowMaker programs, if the Dock Application Bar is running, they will be automatically docked. </para>
+<para>The Dock Application Bar is an external bar which lets WindowMaker applications be docked. Just run your dockable WindowMaker programs, if the Dock Application Bar is running, they will be automatically docked. </para>
 </sect1>
 
 </chapter>
 
 <chapter id="commands">
-<title
->Command Reference</title>
+<title>Command Reference</title>
 
 <sect1 id="keybinding">
-<title
->The Panel</title>
+<title>The Panel</title>
 
-<para
->There is only one standard shortcut available in &kicker;: </para>
+<para>There is only one standard shortcut available in &kicker;: </para>
 
 <variablelist>
 <varlistentry>
-<term
-><keycombo action="simul"
->&Alt;<keycap
->F1</keycap
-></keycombo
-></term>
+<term><keycombo action="simul">&Alt;<keycap>F1</keycap></keycombo></term>
 <listitem>
-<para
->Opens the <guimenu
->K</guimenu
-> Menu </para>
+<para>Opens the <guimenu>K</guimenu> Menu </para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -2230,182 +1152,107 @@ format="PNG"/></imageobject
 </chapter>
 
 <chapter id="faq">
-<title
->Questions and Answers</title>
+<title>Questions and Answers</title>
 
 <qandaset>
 <qandaentry>
 <question>
-<para
->How can I add applications, applets or anything else to the panel? </para>
+<para>How can I add applications, applets or anything else to the panel? </para>
 </question>
 <answer>
-<para
->Click the &RMB; on any free space in &kicker; and choose <guisubmenu
->Add</guisubmenu
->. From appearing submenu you can choose, what you want to add. See in <link linkend="basics"
->Kicker Basics</link
-> for more about that. </para>
+<para>Click the &RMB; on any free space in &kicker; and choose <guisubmenu>Add</guisubmenu>. From appearing submenu you can choose, what you want to add. See in <link linkend="basics">Kicker Basics</link> for more about that. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Can I have an external Taskbar just like in &kde; 1? </para>
+<para>Can I have an external Taskbar just like in &kde; 1? </para>
 </question>
 <answer>
-<para
->Yes, you can just click the &RMB; on any empty space in &kicker; and then choose <guisubmenu
->Add</guisubmenu
->, <guisubmenu
->Extension</guisubmenu
-> and the <guimenuitem
->External Taskbar</guimenuitem
->. </para>
+<para>Yes, you can just click the &RMB; on any empty space in &kicker; and then choose <guisubmenu>Add</guisubmenu>, <guisubmenu>Extension</guisubmenu> and the <guimenuitem>External Taskbar</guimenuitem>. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How can I move &kicker; to another screen border? </para>
+<para>How can I move &kicker; to another screen border? </para>
 </question>
 
 <answer>
-<para
->Simply drag it by holding the &LMB; on any empty space in &kicker; to any screen border. </para>
+<para>Simply drag it by holding the &LMB; on any empty space in &kicker; to any screen border. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How can I move extensions to another screen border? </para>
+<para>How can I move extensions to another screen border? </para>
 </question>
 
 <answer>
-<para
->Just drag it by holding the &LMB; on the small <guibutton
->handles</guibutton
-> on the left or the top of the extension. </para>
+<para>Just drag it by holding the &LMB; on the small <guibutton>handles</guibutton> on the left or the top of the extension. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->I want the taskbar to show all applications I'm running, independent on which desktop it is. Is that possible? </para>
+<para>I want the taskbar to show all applications I'm running, independent on which desktop it is. Is that possible? </para>
 </question>
 <answer>
-<para
->Yes, click the &RMB; on the small <guibutton
->handle</guibutton
-> of the taskbar, then choose <guimenuitem
->Preferences</guimenuitem
-> and check <guilabel
->Show all windows</guilabel
-> in the appearing dialogue. </para>
+<para>Yes, click the &RMB; on the small <guibutton>handle</guibutton> of the taskbar, then choose <guimenuitem>Preferences</guimenuitem> and check <guilabel>Show all windows</guilabel> in the appearing dialogue. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How can I access the <guimenu
->K</guimenu
-> Menu without using the mouse? </para>
+<para>How can I access the <guimenu>K</guimenu> Menu without using the mouse? </para>
 </question>
 <answer>
-<para
->Simply press <keycombo action="simul"
->&Alt;<keycap
->F1</keycap
-></keycombo
-> and it will appear. </para>
+<para>Simply press <keycombo action="simul">&Alt;<keycap>F1</keycap></keycombo> and it will appear. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Is there a way to add a menu containing all desktop icons to &kicker;? </para>
+<para>Is there a way to add a menu containing all desktop icons to &kicker;? </para>
 </question>
 <answer>
-<para
->Just fire up &konqueror;, go to your home folder and drag the <guiicon
->KDesktop</guiicon
-> icon to any free space of &kicker;, then choose <guimenuitem
->Add as Quick Browser</guimenuitem
-> from the appearing menu. </para>
+<para>Just fire up &konqueror;, go to your home folder and drag the <guiicon>KDesktop</guiicon> icon to any free space of &kicker;, then choose <guimenuitem>Add as Quick Browser</guimenuitem> from the appearing menu. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How can I change the colour and style of &kicker;? </para>
+<para>How can I change the colour and style of &kicker;? </para>
 </question>
 <answer>
-<para
->You can change the colours of the panel with the global colour module of the <application
->Control Centre</application
-> or you can style the panel itself, see in <xref linkend="panel-looknfeel"/> for more about that. </para>
+<para>You can change the colours of the panel with the global colour module of the <application>Control Centre</application> or you can style the panel itself, see in <xref linkend="panel-looknfeel"/> for more about that. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Why is the clock showing the wrong time? </para>
+<para>Why is the clock showing the wrong time? </para>
 </question>
 <answer>
-<para
->On some &RedHat;systems, the clock always shows the time in <acronym
->GMT</acronym
->. This is a bug in the system setup, and not directly related to &kicker;. However, to solve it, just create this symbolic link: <userinput
-><command
->ln</command
-> <option
->-s</option
-> <filename
->/usr/share/zoneinfo</filename
-> <filename
->/usr/lib/zoneinfo</filename
-></userinput
->. </para>
+<para>On some &RedHat;systems, the clock always shows the time in <acronym>GMT</acronym>. This is a bug in the system setup, and not directly related to &kicker;. However, to solve it, just create this symbolic link: <userinput><command>ln</command> <option>-s</option> <filename>/usr/share/zoneinfo</filename> <filename>/usr/lib/zoneinfo</filename></userinput>. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Is it possible to change the <guiicon
->K</guiicon
-> button of the panel to another picture? </para>
+<para>Is it possible to change the <guiicon>K</guiicon> button of the panel to another picture? </para>
 </question>
 <answer>
-<para
->Look for <filename
->$HOME/.trinity/share/apps/kicker/pics/go.png</filename
-> and <filename
->$HOME/.trinity/share/apps/kicker/pics/mini/go.png</filename
-> and replace them. Do not forget to flatten the replacements to one layer, or else you will not see anything. Create the folders if they do not already exist. Then restart &kicker;. </para>
+<para>Look for <filename>$HOME/.trinity/share/apps/kicker/pics/go.png</filename> and <filename>$HOME/.trinity/share/apps/kicker/pics/mini/go.png</filename> and replace them. Do not forget to flatten the replacements to one layer, or else you will not see anything. Create the folders if they do not already exist. Then restart &kicker;. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Why is my <guisubmenu
->Settings</guisubmenu
-> menu not working? </para>
+<para>Why is my <guisubmenu>Settings</guisubmenu> menu not working? </para>
 </question>
 <answer>
-<para
->Your menu entries may be mixed up for some reason. Simply run <command
->tdebuildsycoca</command
-> on a commandline. </para>
+<para>Your menu entries may be mixed up for some reason. Simply run <command>tdebuildsycoca</command> on a commandline. </para>
 </answer>
 </qandaentry>
 </qandaset>
@@ -2413,52 +1260,40 @@ format="PNG"/></imageobject
 
 <chapter id="credits">
 
-<title
->Credits and Licence</title>
+<title>Credits and Licence</title>
 
-<para
->&kicker; </para>
+<para>&kicker; </para>
 
-<para
->Program copyright 1999-2000 The KDE Team <ulink url="http://www.kde.org"
-> (www.kde.org)</ulink
->. </para>
+<para>Program copyright 1999-2000 The KDE Team <ulink url="http://www.kde.org"> (www.kde.org)</ulink>. </para>
 
 <itemizedlist>
 <listitem>
-<para
->&Matthias.Elter; &Matthias.Elter.mail; </para>
+<para>&Matthias.Elter; &Matthias.Elter.mail; </para>
 </listitem>
 
 <listitem>
-<para
->&Matthias.Ettrich; &Matthias.Ettrich.mail; </para>
+<para>&Matthias.Ettrich; &Matthias.Ettrich.mail; </para>
 </listitem>
 
 <listitem>
-<para
->&Wilco.Greven; &Wilco.Greven.mail; </para>
+<para>&Wilco.Greven; &Wilco.Greven.mail; </para>
 </listitem>
 
 <listitem>
-<para
->&Rik.Hemsley; &Rik.Hemsley.mail; </para>
+<para>&Rik.Hemsley; &Rik.Hemsley.mail; </para>
 </listitem>
 
 <listitem>
-<para
->&Daniel.M.Duley; &Daniel.M.Duley.mail; </para>
+<para>&Daniel.M.Duley; &Daniel.M.Duley.mail; </para>
 </listitem>
 
 <listitem>
-<para
->&Preston.Brown; &Preston.Brown.mail; </para>
+<para>&Preston.Brown; &Preston.Brown.mail; </para>
 </listitem>
 
 </itemizedlist>
 
-<para
->Documentation copyright 2001, 2002 &Dirk.Doerflinger; &Dirk.Doerflinger.mail;</para>
+<para>Documentation copyright 2001, 2002 &Dirk.Doerflinger; &Dirk.Doerflinger.mail;</para>
 &underFDL; &underBSDLicense; </chapter>
 
 &documentation.index;
diff --git a/tde-i18n-en_GB/docs/tdebase/kinfocenter/devices/index.docbook b/tde-i18n-en_GB/docs/tdebase/kinfocenter/devices/index.docbook
index af32239a9b1..f41d740c669 100644
--- a/tde-i18n-en_GB/docs/tdebase/kinfocenter/devices/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kinfocenter/devices/index.docbook
@@ -2,81 +2,44 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
-<title
->Device Information</title>
+<title>Device Information</title>
 <articleinfo>
 
 <authorgroup>
-<author
->&Matthias.Hoelzer-Kluepfel;</author>
-<author
->&Helge.Deller;</author>
-<author
->&Duncan.Haldane;</author>
-<author
->&Mike.McBride;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Matthias.Hoelzer-Kluepfel;</author>
+<author>&Helge.Deller;</author>
+<author>&Duncan.Haldane;</author>
+<author>&Mike.McBride;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
     
-<date
->2002-02-12</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-02-12</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->device</keyword>
-<keyword
->system information</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>device</keyword>
+<keyword>system information</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1>
-<title
->Device Information</title>
+<title>Device Information</title>
 
-<para
->This page displays information about the available devices, </para>
+<para>This page displays information about the available devices, </para>
 
 <note>
-<para
->The exact information displayed is system-dependent. On some systems, device information cannot be displayed yet. </para>
+<para>The exact information displayed is system-dependent. On some systems, device information cannot be displayed yet. </para>
 </note>
 
-<para
->On &Linux;, this information is read from <filename class="devicefile"
->/proc/devices</filename
-> and <filename class="devicefile"
->/proc/misc</filename
->, which are only available if the <filename class="directory"
->/proc</filename
-> pseudo-filesystem is compiled into the kernel. Devices are listed by group (Character, Block, or Miscellaneous). The device major number is listed, followed by an identifying label. </para>
+<para>On &Linux;, this information is read from <filename class="devicefile">/proc/devices</filename> and <filename class="devicefile">/proc/misc</filename>, which are only available if the <filename class="directory">/proc</filename> pseudo-filesystem is compiled into the kernel. Devices are listed by group (Character, Block, or Miscellaneous). The device major number is listed, followed by an identifying label. </para>
 
-<para
->The user cannot modify any settings on this page. </para>
+<para>The user cannot modify any settings on this page. </para>
 
 </sect1>
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/kinfocenter/dma/index.docbook b/tde-i18n-en_GB/docs/tdebase/kinfocenter/dma/index.docbook
index 50832841ba1..e5d6b30d0cc 100644
--- a/tde-i18n-en_GB/docs/tdebase/kinfocenter/dma/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kinfocenter/dma/index.docbook
@@ -2,107 +2,46 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
-<title
-><acronym
->DMA</acronym
-> Channel Information</title>
+<title><acronym>DMA</acronym> Channel Information</title>
 <articleinfo>
 
 <authorgroup>
-<author
->&Matthias.Hoelzer-Kluepfel;</author>
-<author
->&Helge.Deller;</author>
-<author
->&Duncan.Haldane;</author>
-<author
->&Mike.McBride;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Matthias.Hoelzer-Kluepfel;</author>
+<author>&Helge.Deller;</author>
+<author>&Duncan.Haldane;</author>
+<author>&Mike.McBride;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-02-12</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-02-12</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->DMA</keyword>
-<keyword
->system information</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>DMA</keyword>
+<keyword>system information</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1>
-<title
-><acronym
->DMA</acronym
-> Channel Information</title>
+<title><acronym>DMA</acronym> Channel Information</title>
 
-<para
->This page displays information about the <acronym
->DMA</acronym
-> (Direct Memory Access) Channels. A <acronym
->DMA</acronym
-> channel is a direct connection that allows devices to transfer data to and from memory without going through the processor. Typically, i386-architecture systems (<acronym
->PC</acronym
->'s) have eight <acronym
->DMA</acronym
-> channels (0-7). </para>
+<para>This page displays information about the <acronym>DMA</acronym> (Direct Memory Access) Channels. A <acronym>DMA</acronym> channel is a direct connection that allows devices to transfer data to and from memory without going through the processor. Typically, i386-architecture systems (<acronym>PC</acronym>'s) have eight <acronym>DMA</acronym> channels (0-7). </para>
 
-<note
-> <para
->The exact information displayed is system-dependent. On some systems, <acronym
->DMA</acronym
-> Channel information cannot be displayed yet. </para
-> </note>
+<note> <para>The exact information displayed is system-dependent. On some systems, <acronym>DMA</acronym> Channel information cannot be displayed yet. </para> </note>
 
-<para
->On &Linux;, this information is read from <filename class="devicefile"
->/proc/dma</filename
->, which is only available if the <filename class="directory"
->/proc</filename
-> pseudo-filesystem is compiled into the kernel. </para>
+<para>On &Linux;, this information is read from <filename class="devicefile">/proc/dma</filename>, which is only available if the <filename class="directory">/proc</filename> pseudo-filesystem is compiled into the kernel. </para>
 
-<para
->A list of all currently-registered (<acronym
->ISA</acronym
-> bus) <acronym
->DMA</acronym
-> channels that are in use is shown. The first column shows the <acronym
->DMA</acronym
-> channel, and the second column shows the device which uses that channel. </para>
+<para>A list of all currently-registered (<acronym>ISA</acronym> bus) <acronym>DMA</acronym> channels that are in use is shown. The first column shows the <acronym>DMA</acronym> channel, and the second column shows the device which uses that channel. </para>
 
-<para
->Unused <acronym
->DMA</acronym
-> channels are not listed. </para>
+<para>Unused <acronym>DMA</acronym> channels are not listed. </para>
 
-<para
->The user cannot modify any settings on this page. </para>
+<para>The user cannot modify any settings on this page. </para>
 
 </sect1>
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/kinfocenter/index.docbook b/tde-i18n-en_GB/docs/tdebase/kinfocenter/index.docbook
index f3659e6b590..4a86a640893 100644
--- a/tde-i18n-en_GB/docs/tdebase/kinfocenter/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kinfocenter/index.docbook
@@ -1,213 +1,113 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" 
 "dtd/kdex.dtd" [
-<!ENTITY infocenter "<application
->KInfoCenter</application
->">
+<!ENTITY infocenter "<application>KInfoCenter</application>">
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <book lang="&language;">
 <bookinfo>
-<title
->The &infocenter;</title>
+<title>The &infocenter;</title>
 
 <authorgroup>
-<author
-><firstname
->Michael</firstname
-> <surname
->McBride</surname
-> <affiliation
-><address
-><email
->mpmcbride7@yahoo.com</email
-></address
-></affiliation>
+<author><firstname>Michael</firstname> <surname>McBride</surname> <affiliation><address><email>mpmcbride7@yahoo.com</email></address></affiliation>
 </author>
 </authorgroup>
 
-<date
->2002-07-03</date>
-<releaseinfo
->3.10.00</releaseinfo>
+<date>2002-07-03</date>
+<releaseinfo>3.10.00</releaseinfo>
 
 <abstract>
-<para
->This documentation describes &kde;'s information centre.</para>
+<para>This documentation describes &kde;'s information centre.</para>
 </abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->kinfocenter</keyword>
-<keyword
->system</keyword>
-<keyword
->information</keyword>
-<keyword
->module</keyword>
+<keyword>KDE</keyword>
+<keyword>kinfocenter</keyword>
+<keyword>system</keyword>
+<keyword>information</keyword>
+<keyword>module</keyword>
 </keywordset>
 
 </bookinfo>
 
 <chapter id="introduction">
-<title
->The &infocenter;</title>
+<title>The &infocenter;</title>
 
-<para
->The &infocenter; (from now on referred to simply as <quote
->the information centre</quote
->) provides you with a centralised and convenient overview of your &kde; and system settings. </para>
+<para>The &infocenter; (from now on referred to simply as <quote>the information centre</quote>) provides you with a centralised and convenient overview of your &kde; and system settings. </para>
 
-<para
->The information centre is made up of multiple modules. Each module is a separate application, but the information centre organises all of these programs into a convenient location. </para>
+<para>The information centre is made up of multiple modules. Each module is a separate application, but the information centre organises all of these programs into a convenient location. </para>
 
 </chapter>
 
 <chapter id="info-center">
-<title
->Using The &infocenter;</title>
+<title>Using The &infocenter;</title>
 
-<para
->This next section details the use of the information centre itself. For information on individual modules, please see <link linkend="module"
->Info Centre Modules</link
-> </para>
+<para>This next section details the use of the information centre itself. For information on individual modules, please see <link linkend="module">Info Centre Modules</link> </para>
 
 <sect1 id="information-center-starting">
-<title
->Starting the &infocenter;</title>
+<title>Starting the &infocenter;</title>
 
-<para
->The &infocenter; can be started 3 ways: </para>
+<para>The &infocenter; can be started 3 ways: </para>
 
-<orderedlist
-> 
+<orderedlist> 
 <listitem>
-<para
->By selecting <menuchoice
-><guimenu
->K Button</guimenu
-><guisubmenu
->System</guisubmenu
-><guimenuitem
->Info Centre</guimenuitem
-></menuchoice
-> from the &kde; Panel. </para>
+<para>By selecting <menuchoice><guimenu>K Button</guimenu><guisubmenu>System</guisubmenu><guimenuitem>Info Centre</guimenuitem></menuchoice> from the &kde; Panel. </para>
 </listitem>
 <listitem>
-<para
->By pressing <keycombo action="simul"
->&Alt;<keycap
->F2</keycap
-></keycombo
->. </para>
-
-<para
->This will bring up a dialogue box. Type <userinput
-><command
->kinfocenter</command
-></userinput
->, and click <guibutton
->Run</guibutton
-> or press <keycap
->Enter</keycap
->. </para>
+<para>By pressing <keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo>. </para>
+
+<para>This will bring up a dialogue box. Type <userinput><command>kinfocenter</command></userinput>, and click <guibutton>Run</guibutton> or press <keycap>Enter</keycap>. </para>
 </listitem>
 
 <listitem>
-<para
->You can type <command
->kinfocenter &amp;</command
-> at any command prompt. </para>
-</listitem
-> 
-</orderedlist
-> 
-
-<para
->All three of these methods are equivalent, and produce the same result. </para>
+<para>You can type <command>kinfocenter &amp;</command> at any command prompt. </para>
+</listitem> 
+</orderedlist> 
+
+<para>All three of these methods are equivalent, and produce the same result. </para>
 
 </sect1>
 
-<sect1 id="information-center-screen"
-> 
-<title
->The &infocenter; Screen</title>
+<sect1 id="information-center-screen"> 
+<title>The &infocenter; Screen</title>
 
-<para
->When you start the information centre, you are presented with a window, which can be divided into 3 functional parts. </para>
+<para>When you start the information centre, you are presented with a window, which can be divided into 3 functional parts. </para>
 
-<para
->Across the top is a menubar. The menubar will provide you with quick access to most of &infocenter;'s features. The menus are detailed in <link linkend="info-center-menus"
->The &kde; Info Centre Menus</link
->. </para>
+<para>Across the top is a menubar. The menubar will provide you with quick access to most of &infocenter;'s features. The menus are detailed in <link linkend="info-center-menus">The &kde; Info Centre Menus</link>. </para>
 
-<para
->Along the left hand side, is a column. This is a where you choose which module to investigate. You can learn how to navigate through the modules in the section called <link linkend="module-intro"
->Navigating Modules</link
->. </para>
+<para>Along the left hand side, is a column. This is a where you choose which module to investigate. You can learn how to navigate through the modules in the section called <link linkend="module-intro">Navigating Modules</link>. </para>
 
-<para
->The main panel shows you some system information. </para>
+<para>The main panel shows you some system information. </para>
 
 <!-- 
 <para>
 In this example, we are running &kde; 2.99, we started &infocenter;
-as user <systemitem class="username"
->adridg</systemitem
->, the computer is
-named <systemitem class="systemname"
->aramis</systemitem
->, it is a
+as user <systemitem class="username">adridg</systemitem>, the computer is
+named <systemitem class="systemname">aramis</systemitem>, it is a
 FreeBSD system, Version 4.4-RELEASE, on a Pentium.
-</para
-> -->
+</para> -->
 
 </sect1>
 
 <sect1 id="info-center-menus">
-<title
->The &infocenter; Menus</title>
+<title>The &infocenter; Menus</title>
 
-<para
->This next section gives you a brief description of what each menu item does. </para>
+<para>This next section gives you a brief description of what each menu item does. </para>
 
 <sect2 id="info-center-menu-file">
-<title
-><guimenu
->File</guimenu
-> Menu</title>
+<title><guimenu>File</guimenu> Menu</title>
 
-<para
->The <guimenu
->File</guimenu
-> menu has a single entry. </para>
+<para>The <guimenu>File</guimenu> menu has a single entry. </para>
 
 <variablelist>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->Q</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Quit</guimenuitem
-> </menuchoice
-></term>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Quit</guimenuitem> </menuchoice></term>
 <listitem>
 <para>
-<action
->Closes the info centre.</action>
+<action>Closes the info centre.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -216,47 +116,27 @@ FreeBSD system, Version 4.4-RELEASE, on a Pentium.
 </sect2>
 
 <sect2 id="info-center-menu-help">
-<title
-><guimenu
->Help</guimenu
-> Menu</title>
+<title><guimenu>Help</guimenu> Menu</title>
 &help.menu.documentation; </sect2>
 
 </sect1>
 
 <sect1 id="info-center-exiting">
-<title
->Exiting The &kde; Information Centre</title>
+<title>Exiting The &kde; Information Centre</title>
 
-<para
->You can exit the info centre one of three ways: </para>
+<para>You can exit the info centre one of three ways: </para>
 
 <itemizedlist>
 <listitem>
-<para
->Select <menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Quit</guimenuitem
-></menuchoice
-> from the menu bar. </para>
+<para>Select <menuchoice><guimenu>File</guimenu> <guimenuitem>Quit</guimenuitem></menuchoice> from the menu bar. </para>
 </listitem>
 
 <listitem>
-<para
->Type <keycombo action="simul"
->&Ctrl;<keycap
->Q</keycap
-></keycombo
-> on the keyboard. </para>
+<para>Type <keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo> on the keyboard. </para>
 </listitem>
 
 <listitem>
-<para
->Click on the <guiicon
->Close</guiicon
-> button on the frame surrounding the info centre. </para>
+<para>Click on the <guiicon>Close</guiicon> button on the frame surrounding the info centre. </para>
 </listitem>
 </itemizedlist>
 
@@ -267,116 +147,61 @@ FreeBSD system, Version 4.4-RELEASE, on a Pentium.
 <!--*****************************************************************-->
 
 <chapter id="module">
-<title
->The &infocenter; Modules</title>
+<title>The &infocenter; Modules</title>
 
 <sect1 id="module-intro">
-<title
->Navigating Modules</title>
+<title>Navigating Modules</title>
 
-<para
->This is a list of the <emphasis
->standard</emphasis
-> configuration modules (sorted by category) provided by the <application role="package"
->&kde; base</application
-> package. Please note that there may be many more modules on your system if you have installed additional software. </para>
+<para>This is a list of the <emphasis>standard</emphasis> configuration modules (sorted by category) provided by the <application role="package">&kde; base</application> package. Please note that there may be many more modules on your system if you have installed additional software. </para>
 
 <itemizedlist>
 <listitem>
-<para
-><ulink url="help:/kinfocenter/dma/index.html"
->DMA-Channels</ulink
-></para>
+<para><ulink url="help:/kinfocenter/dma/index.html">DMA-Channels</ulink></para>
 </listitem>
 <listitem>
-<para
-><ulink url="help:/kinfocenter/devices/index.html"
->Devices</ulink
-></para>
+<para><ulink url="help:/kinfocenter/devices/index.html">Devices</ulink></para>
 </listitem>
 <listitem>
-<para
-><ulink url="help:/kinfocenter/ioports/index.html"
->IO-Ports</ulink
-></para>
+<para><ulink url="help:/kinfocenter/ioports/index.html">IO-Ports</ulink></para>
 </listitem>
 <listitem>
-<para
-><ulink url="help:/kinfocenter/interrupts/index.html"
->Interrupts</ulink
-></para>
+<para><ulink url="help:/kinfocenter/interrupts/index.html">Interrupts</ulink></para>
 </listitem>
 <listitem>
-<para
-><ulink url="help:/kinfocenter/memory/index.html"
->Memory</ulink
-></para>
+<para><ulink url="help:/kinfocenter/memory/index.html">Memory</ulink></para>
 </listitem>
 <listitem>
-<para
-><ulink url="help:/kinfocenter/nics/index.html"
->Network Interfaces</ulink
-></para>
+<para><ulink url="help:/kinfocenter/nics/index.html">Network Interfaces</ulink></para>
 </listitem>
 <listitem>
-<para
-><ulink url="help:/kinfocenter/pci/index.html"
->PCI</ulink
-></para>
+<para><ulink url="help:/kinfocenter/pci/index.html">PCI</ulink></para>
 </listitem>
 <listitem>
-<para
-><ulink url="help:/kinfocenter/pcmcia/index.html"
->PCMCIA</ulink
-></para>
+<para><ulink url="help:/kinfocenter/pcmcia/index.html">PCMCIA</ulink></para>
 </listitem>
 <listitem>
-<para
-><ulink url="help:/kinfocenter/partitions/index.html"
->Partitions</ulink
-></para>
+<para><ulink url="help:/kinfocenter/partitions/index.html">Partitions</ulink></para>
 </listitem>
 <listitem>
-<para
-><ulink url="help:/kinfocenter/processor/index.html"
->Processor</ulink
-></para>
+<para><ulink url="help:/kinfocenter/processor/index.html">Processor</ulink></para>
 </listitem>
 <listitem>
-<para
-><ulink url="help:/kinfocenter/protocols/index.html"
->Protocols</ulink
-></para>
+<para><ulink url="help:/kinfocenter/protocols/index.html">Protocols</ulink></para>
 </listitem>
 <listitem>
-<para
-><ulink url="help:/kinfocenter/scsi/index.html"
->SCSI</ulink
-></para>
+<para><ulink url="help:/kinfocenter/scsi/index.html">SCSI</ulink></para>
 </listitem>
 <listitem>
-<para
-><ulink url="help:/kinfocenter/samba/index.html"
->Samba Status Information</ulink
-></para>
+<para><ulink url="help:/kinfocenter/samba/index.html">Samba Status Information</ulink></para>
 </listitem>
 <listitem>
-<para
-><ulink url="help:/kinfocenter/sound/index.html"
->Sound</ulink
-></para>
+<para><ulink url="help:/kinfocenter/sound/index.html">Sound</ulink></para>
 </listitem>
 <listitem>
-<para
-><ulink url="help:/kinfocenter/usb/index.html"
->USB Devices</ulink
-></para>
+<para><ulink url="help:/kinfocenter/usb/index.html">USB Devices</ulink></para>
 </listitem>
 <listitem>
-<para
-><ulink url="help:/kinfocenter/xserver/index.html"
->X-Server</ulink
-></para>
+<para><ulink url="help:/kinfocenter/xserver/index.html">X-Server</ulink></para>
 </listitem>
 </itemizedlist>
 
@@ -387,125 +212,39 @@ FreeBSD system, Version 4.4-RELEASE, on a Pentium.
 </chapter>
 
 <chapter id="credits">
-<title
->Credits and Licence</title>
+<title>Credits and Licence</title>
 
-<para
->&infocenter;</para>
-<para
->Program copyright 1997-2001 The &infocenter; Developers</para>
-<para
->Contributors:</para>
+<para>&infocenter;</para>
+<para>Program copyright 1997-2001 The &infocenter; Developers</para>
+<para>Contributors:</para>
 
 <itemizedlist>
-<listitem
-><para
->Matthias Hoelzer-Kluepfel <email
->hoelzer@kde.org</email
-></para
-></listitem>
-<listitem
-><para
->Matthias Elter <email
->elter@kde.org</email
-></para
-></listitem>
+<listitem><para>Matthias Hoelzer-Kluepfel <email>hoelzer@kde.org</email></para></listitem>
+<listitem><para>Matthias Elter <email>elter@kde.org</email></para></listitem>
 </itemizedlist>
 
-<para
->Documentation <trademark class="copyright"
->copyright 2000 Michael McBride</trademark
-> <email
->mpmcbride7@yahoo.com</email
-></para>
+<para>Documentation <trademark class="copyright">copyright 2000 Michael McBride</trademark> <email>mpmcbride7@yahoo.com</email></para>
 
-<para
->Contributors:</para>
+<para>Contributors:</para>
 
 <itemizedlist>
-<listitem
-><para
->Paul Campbell <email
->paul@taniwha.com</email
-></para
-></listitem>
-<listitem
-><para
->Helge Deller <email
->deller@kde.org</email
-></para
-></listitem>
-<listitem
-><para
->Mark Donohoe </para
-></listitem>
-<listitem
-><para
->Pat Dowler</para
-></listitem>
-<listitem
-><para
->Duncan Haldane <email
->duncan@kde.org</email
-></para
-></listitem>
-<listitem
-><para
->Steffen Hansen <email
->stefh@mip.ou.dk</email
->.</para
-></listitem>
-<listitem
-><para
->Matthias Hoelzer-Kluepfel <email
->hoelzer@kde.org</email
-></para
-></listitem>
-<listitem
-><para
->Martin Jones <email
->mjones@kde.org</email
-></para
-></listitem>
-<listitem
-><para
->Jost Schenck <email
->jost@schenck.de</email
-></para
-></listitem>
-<listitem
-><para
->Jonathan Singer <email
->jsinger@leeta.net</email
-></para
-></listitem>
-<listitem
-><para
->Thomas Tanghus <email
->tanghus@earthling.net</email
-></para
-></listitem>
-<listitem
-><para
->Krishna Tateneni <email
->tateneni@pluto.njcc.com
-></email
-></para
-></listitem>
-<listitem
-><para
->Ellis Whitehead <email
->ewhitehe@uni-freiburg.de</email
-></para
-></listitem>
+<listitem><para>Paul Campbell <email>paul@taniwha.com</email></para></listitem>
+<listitem><para>Helge Deller <email>deller@kde.org</email></para></listitem>
+<listitem><para>Mark Donohoe </para></listitem>
+<listitem><para>Pat Dowler</para></listitem>
+<listitem><para>Duncan Haldane <email>duncan@kde.org</email></para></listitem>
+<listitem><para>Steffen Hansen <email>stefh@mip.ou.dk</email>.</para></listitem>
+<listitem><para>Matthias Hoelzer-Kluepfel <email>hoelzer@kde.org</email></para></listitem>
+<listitem><para>Martin Jones <email>mjones@kde.org</email></para></listitem>
+<listitem><para>Jost Schenck <email>jost@schenck.de</email></para></listitem>
+<listitem><para>Jonathan Singer <email>jsinger@leeta.net</email></para></listitem>
+<listitem><para>Thomas Tanghus <email>tanghus@earthling.net</email></para></listitem>
+<listitem><para>Krishna Tateneni <email>tateneni@pluto.njcc.com></email></para></listitem>
+<listitem><para>Ellis Whitehead <email>ewhitehe@uni-freiburg.de</email></para></listitem>
 
 </itemizedlist>
 
-<para
->Conversion to British English: Malcolm Hunter <email
->malcolm.hunter@gmx.co.uk</email
-></para
-> 
+<para>Conversion to British English: Malcolm Hunter <email>malcolm.hunter@gmx.co.uk</email></para> 
 &underFDL; &underGPL; </chapter>
 
 </book>
diff --git a/tde-i18n-en_GB/docs/tdebase/kinfocenter/interrupts/index.docbook b/tde-i18n-en_GB/docs/tdebase/kinfocenter/interrupts/index.docbook
index b9efbf5cffa..a13f30e4833 100644
--- a/tde-i18n-en_GB/docs/tdebase/kinfocenter/interrupts/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kinfocenter/interrupts/index.docbook
@@ -2,116 +2,49 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
-<title
->Interrupt Request (<abbrev
->IRQ</abbrev
->) Lines</title>
+<title>Interrupt Request (<abbrev>IRQ</abbrev>) Lines</title>
 <articleinfo>
 
 <authorgroup>
-<author
->&Matthias.Hoelzer-Kluepfel;</author>
-<author
->&Helge.Deller;</author>
-<author
->&Duncan.Haldane;</author>
-<author
->&Mike.McBride;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Matthias.Hoelzer-Kluepfel;</author>
+<author>&Helge.Deller;</author>
+<author>&Duncan.Haldane;</author>
+<author>&Mike.McBride;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-02-12</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-02-12</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->IRQ</keyword>
-<keyword
->interrupts</keyword>
-<keyword
->system information</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>IRQ</keyword>
+<keyword>interrupts</keyword>
+<keyword>system information</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1>
-<title
->Interrupt Request (<abbrev
->IRQ</abbrev
->) Lines in Use</title>
+<title>Interrupt Request (<abbrev>IRQ</abbrev>) Lines in Use</title>
 
-<para
->This page displays information about the Interrupt Request Lines in use, and the devices that use them.</para>
+<para>This page displays information about the Interrupt Request Lines in use, and the devices that use them.</para>
 
-<para
->An <acronym
->IRQ</acronym
-> is a hardware line used in a <acronym
->PC</acronym
-> by (<acronym
->ISA</acronym
-> bus) devices like keyboards, modems, sound cards, &etc;, to send interrupt signals to the processor to tell it that the device is ready to send or accept data. Unfortunately, there are only sixteen <acronym
->IRQ</acronym
->'s (0-15) available in the i386 (<acronym
->PC</acronym
->) architecture for sharing among the various <acronym
->ISA</acronym
-> devices.</para>
+<para>An <acronym>IRQ</acronym> is a hardware line used in a <acronym>PC</acronym> by (<acronym>ISA</acronym> bus) devices like keyboards, modems, sound cards, &etc;, to send interrupt signals to the processor to tell it that the device is ready to send or accept data. Unfortunately, there are only sixteen <acronym>IRQ</acronym>'s (0-15) available in the i386 (<acronym>PC</acronym>) architecture for sharing among the various <acronym>ISA</acronym> devices.</para>
 
-<para
->Many hardware problems are the result of <acronym
->IRQ</acronym
-> conflicts, when two devices try to use the same <acronym
->IRQ</acronym
->, or software is misconfigured to use a different <acronym
->IRQ</acronym
-> from the one a device is actually configured for.</para>
+<para>Many hardware problems are the result of <acronym>IRQ</acronym> conflicts, when two devices try to use the same <acronym>IRQ</acronym>, or software is misconfigured to use a different <acronym>IRQ</acronym> from the one a device is actually configured for.</para>
 
-<note
-><para
->The exact information displayed is system-dependent. On some systems, <acronym
->IRQ</acronym
-> information cannot be displayed yet.</para
-></note>
+<note><para>The exact information displayed is system-dependent. On some systems, <acronym>IRQ</acronym> information cannot be displayed yet.</para></note>
 
-<para
->On &Linux;, this information is read from <filename class="directory"
->/proc/interrupts</filename
->, which is only available if the <filename class="directory"
->/proc</filename
-> pseudo-filesystem is compiled into the kernel.</para>
+<para>On &Linux;, this information is read from <filename class="directory">/proc/interrupts</filename>, which is only available if the <filename class="directory">/proc</filename> pseudo-filesystem is compiled into the kernel.</para>
 
-<para
->The first column, is the <acronym
->IRQ</acronym
-> number. The second column, is the number of interrupts that have been received since the last reboot. The third column shows the type of interrupt. The fourth, identifies the device assigned to that interrupt.</para>
+<para>The first column, is the <acronym>IRQ</acronym> number. The second column, is the number of interrupts that have been received since the last reboot. The third column shows the type of interrupt. The fourth, identifies the device assigned to that interrupt.</para>
 
-<para
->The user cannot modify any settings on this page.</para>
+<para>The user cannot modify any settings on this page.</para>
 
 </sect1>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kinfocenter/ioports/index.docbook b/tde-i18n-en_GB/docs/tdebase/kinfocenter/ioports/index.docbook
index e26155a5c4b..1bc9f83fca4 100644
--- a/tde-i18n-en_GB/docs/tdebase/kinfocenter/ioports/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kinfocenter/ioports/index.docbook
@@ -2,89 +2,49 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
-<title
->I/O Port</title>
+<title>I/O Port</title>
 <articleinfo>
 
 <authorgroup>
-<author
->&Matthias.Hoelzer-Kluepfel;</author>
-<author
->&Helge.Deller;</author>
-<author
->&Duncan.Haldane;</author>
-<author
->&Mike.McBride;</author>
+<author>&Matthias.Hoelzer-Kluepfel;</author>
+<author>&Helge.Deller;</author>
+<author>&Duncan.Haldane;</author>
+<author>&Mike.McBride;</author>
 
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-02-12</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-02-12</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->ioports</keyword>
-<keyword
->system information</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>ioports</keyword>
+<keyword>system information</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1>
-<title
->Input/Output Port Information</title>
+<title>Input/Output Port Information</title>
 
-<para
->This page displays information about the I/O ports.</para>
+<para>This page displays information about the I/O ports.</para>
 
-<para
->I/O Ports are memory addresses used by the processor for direct communication with a device that has sent an interrupt signal to the processor.</para>
+<para>I/O Ports are memory addresses used by the processor for direct communication with a device that has sent an interrupt signal to the processor.</para>
 
-<para
->The exchange of commands or data between the processor and the device takes place through the I/O port address of the device, which is a hexadecimal number. No two devices can share the same I/O port. Many devices use multiple I/O port addresses, which are expressed as a range of hexadecimal numbers. </para>
+<para>The exchange of commands or data between the processor and the device takes place through the I/O port address of the device, which is a hexadecimal number. No two devices can share the same I/O port. Many devices use multiple I/O port addresses, which are expressed as a range of hexadecimal numbers. </para>
 
-<note
-><para
->The exact information displayed is system-dependent. On some systems, I/O port information can not yet be displayed.</para
-></note>
+<note><para>The exact information displayed is system-dependent. On some systems, I/O port information can not yet be displayed.</para></note>
 
-<para
->On &Linux;, this information is read from <filename class="devicefile"
->/proc/ioports</filename
-> which is only available if the <filename class="devicefile"
->/proc</filename
-> pseudo-filesystem is compiled into the kernel. A list of all currently-registered I/O port regions that are in use is shown.</para>
+<para>On &Linux;, this information is read from <filename class="devicefile">/proc/ioports</filename> which is only available if the <filename class="devicefile">/proc</filename> pseudo-filesystem is compiled into the kernel. A list of all currently-registered I/O port regions that are in use is shown.</para>
 
-<para
->The first column is the I/O port (or the range of I/O ports), the second column identifies the device that uses these I/O ports.</para>
+<para>The first column is the I/O port (or the range of I/O ports), the second column identifies the device that uses these I/O ports.</para>
 
-<para
->The user cannot modify any settings on this page.</para>
+<para>The user cannot modify any settings on this page.</para>
 
 </sect1>
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/kinfocenter/memory/index.docbook b/tde-i18n-en_GB/docs/tdebase/kinfocenter/memory/index.docbook
index ad31d42788b..90ddf62057a 100644
--- a/tde-i18n-en_GB/docs/tdebase/kinfocenter/memory/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kinfocenter/memory/index.docbook
@@ -2,139 +2,73 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
-<title
->Memory Information</title>
+<title>Memory Information</title>
 <articleinfo>
 
 <authorgroup>
-<author
->&Mike.McBride;</author>
-
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Mike.McBride;</author>
+
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 
 </authorgroup>
         
-<date
->2002-02-13</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-02-13</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->memory</keyword>
-<keyword
->system information</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>memory</keyword>
+<keyword>system information</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1>
-<title
->Memory Information</title>
+<title>Memory Information</title>
 
-<para
->This module displays the current memory usage. It is updated constantly, and can be very useful for pinpointing bottlenecks when certain applications are executed.</para>
+<para>This module displays the current memory usage. It is updated constantly, and can be very useful for pinpointing bottlenecks when certain applications are executed.</para>
 
 <sect2 id="memory-intro">
-<title
->Memory Types</title>
-
-<para
->The first thing you must understand, is there are two types of <quote
->memory</quote
->, available to the operating system and the programs that run within it.</para>
-
-<para
->The first type, is called physical memory. This is the memory located within the memory chips, within your computer. This is the <acronym
->RAM</acronym
-> (for Random Access Memory) you bought when you purchased your computer.</para>
-
-<para
->The second type of memory, is called virtual or swap memory. This block of memory, is actually space on the hard drive. The operating system reserves a space on the hard drive for <quote
->swap space</quote
->. The operating system can use this virtual memory (or swap space), if it runs out of physical memory. The reason this is called <quote
->swap</quote
-> memory, is the operating system takes some data that it doesn't think you will want for a while, and saves that to disk in this reserved space. The operating system then loads the new data you need right now. It has <quote
->swapped</quote
-> the not needed data, for the data you need right now. Virtual or swap memory is not as fast as physical memory, so operating systems try to keep data (especially often used data), in the physical memory.</para>
-
-<para
->The total memory, is the combined total of physical memory and virtual memory.</para>
+<title>Memory Types</title>
+
+<para>The first thing you must understand, is there are two types of <quote>memory</quote>, available to the operating system and the programs that run within it.</para>
+
+<para>The first type, is called physical memory. This is the memory located within the memory chips, within your computer. This is the <acronym>RAM</acronym> (for Random Access Memory) you bought when you purchased your computer.</para>
+
+<para>The second type of memory, is called virtual or swap memory. This block of memory, is actually space on the hard drive. The operating system reserves a space on the hard drive for <quote>swap space</quote>. The operating system can use this virtual memory (or swap space), if it runs out of physical memory. The reason this is called <quote>swap</quote> memory, is the operating system takes some data that it doesn't think you will want for a while, and saves that to disk in this reserved space. The operating system then loads the new data you need right now. It has <quote>swapped</quote> the not needed data, for the data you need right now. Virtual or swap memory is not as fast as physical memory, so operating systems try to keep data (especially often used data), in the physical memory.</para>
+
+<para>The total memory, is the combined total of physical memory and virtual memory.</para>
 
 </sect2>
 
 <sect2 id="memory-use">
-<title
->Memory Information Module</title>
+<title>Memory Information Module</title>
 
-<para
->This window is divided into a top and bottom section</para>
+<para>This window is divided into a top and bottom section</para>
 
-<para
->The top section shows you the total physical memory, total free physical memory, shared memory, and buffered memory.</para>
+<para>The top section shows you the total physical memory, total free physical memory, shared memory, and buffered memory.</para>
 
-<para
->All four values are represented as the total number of bytes, and as the number of megabytes (1 megabyte = slightly more than 1,000,000 bytes)</para>
+<para>All four values are represented as the total number of bytes, and as the number of megabytes (1 megabyte = slightly more than 1,000,000 bytes)</para>
 
-<para
->The bottom section shows you three graphs: </para>
+<para>The bottom section shows you three graphs: </para>
 
 <itemizedlist>
-<listitem
-><para
-><guilabel
->Total Memory</guilabel
-> (this is the combination of physical and virtual memory).</para
-></listitem>
-<listitem
-><para
-><guilabel
->Physical Memory</guilabel
-></para
-></listitem>
-<listitem
-><para
->Virtual memory, or <guilabel
->Swap Space</guilabel
->.</para
-></listitem>
+<listitem><para><guilabel>Total Memory</guilabel> (this is the combination of physical and virtual memory).</para></listitem>
+<listitem><para><guilabel>Physical Memory</guilabel></para></listitem>
+<listitem><para>Virtual memory, or <guilabel>Swap Space</guilabel>.</para></listitem>
 </itemizedlist>
 
-<para
->The green areas are free, and the red areas are used.</para>
+<para>The green areas are free, and the red areas are used.</para>
 
-<tip
-><para
->The exact values of each type of memory are not critical, and they change regularly. When you evaluate this page, look at trends.</para>
+<tip><para>The exact values of each type of memory are not critical, and they change regularly. When you evaluate this page, look at trends.</para>
 
-<para
->Does your computer have plenty of free space (green areas)? If not, you can increase the swap size or increase the physical memory.</para>
+<para>Does your computer have plenty of free space (green areas)? If not, you can increase the swap size or increase the physical memory.</para>
 
-<para
->Also, if your computer seems sluggish: is your physical memory full, and does the hard drive always seem to be running? This suggests that you do not have enough physical memory, and your computer is relying on the slower virtual memory for commonly used data. Increasing your physical memory will improve the responsiveness of your computer.</para
-></tip>
+<para>Also, if your computer seems sluggish: is your physical memory full, and does the hard drive always seem to be running? This suggests that you do not have enough physical memory, and your computer is relying on the slower virtual memory for commonly used data. Increasing your physical memory will improve the responsiveness of your computer.</para></tip>
 
 </sect2>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kinfocenter/nics/index.docbook b/tde-i18n-en_GB/docs/tdebase/kinfocenter/nics/index.docbook
index fa687819ae1..bccbc49f639 100644
--- a/tde-i18n-en_GB/docs/tdebase/kinfocenter/nics/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kinfocenter/nics/index.docbook
@@ -2,67 +2,38 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
-<title
->Network Interfaces</title>
+<title>Network Interfaces</title>
 <articleinfo>
 
 <authorgroup>
-<author
->&Lauri.Watts;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Lauri.Watts;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-02-11</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-02-11</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->Network</keyword>
-<keyword
->Interfaces</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>Network</keyword>
+<keyword>Interfaces</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1>
 
-<title
->Network Interfaces</title>
+<title>Network Interfaces</title>
 
-<para
->This page displays information about the network interfaces installed in your computer. </para>
+<para>This page displays information about the network interfaces installed in your computer. </para>
 
-<note
-><para
->The exact information displayed is system-dependent. On some systems, this information can not yet be displayed.</para
-></note>
+<note><para>The exact information displayed is system-dependent. On some systems, this information can not yet be displayed.</para></note>
 
-<para
->The user cannot modify any settings on this page.</para>
+<para>The user cannot modify any settings on this page.</para>
 
 
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdebase/kinfocenter/opengl/index.docbook b/tde-i18n-en_GB/docs/tdebase/kinfocenter/opengl/index.docbook
index 3e114ff0a24..8c01cb7cdd6 100644
--- a/tde-i18n-en_GB/docs/tdebase/kinfocenter/opengl/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kinfocenter/opengl/index.docbook
@@ -2,88 +2,42 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
-<title
-><acronym
->OpenGL</acronym
-></title>
+<title><acronym>OpenGL</acronym></title>
 <articleinfo>
 
 <authorgroup>
-<author
-><personname
-><firstname
->Ilya</firstname
-><surname
->Korniyko</surname
-></personname
-><email
->k_ilya@ukr.net</email
-></author>
-<othercredit role="translator"
-><firstname
->Andrew</firstname
-><surname
->Coles</surname
-><affiliation
-><address
-><email
->andrew_coles@yahoo.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author><personname><firstname>Ilya</firstname><surname>Korniyko</surname></personname><email>k_ilya@ukr.net</email></author>
+<othercredit role="translator"><firstname>Andrew</firstname><surname>Coles</surname><affiliation><address><email>andrew_coles@yahoo.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 
 </authorgroup>
 
-<date
-></date>
-<releaseinfo
-></releaseinfo>
+<date></date>
+<releaseinfo></releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->OpenGL</keyword>
-<keyword
->system information</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>OpenGL</keyword>
+<keyword>system information</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="opengl">
 
-<title
->OpenGL</title>
+<title>OpenGL</title>
 
-<para
->This page displays information about installed <acronym
->OpenGL</acronym
-> implementation. OpenGL (for "Open Graphics Library") is a cross-platform, hardware independent interface for 3D graphics. </para>
+<para>This page displays information about installed <acronym>OpenGL</acronym> implementation. OpenGL (for "Open Graphics Library") is a cross-platform, hardware independent interface for 3D graphics. </para>
 
-<para
-><acronym
->GLX</acronym
-> is the binding for OpenGL to X Window system.</para>
+<para><acronym>GLX</acronym> is the binding for OpenGL to X Window system.</para>
 
-<para
-><acronym
->DRI</acronym
-> (Direct Rendering Infrastucture) provides hardware acceleration for OpenGL. You must have a videocard with 3D accelerator and properly installed driver for this.</para>
+<para><acronym>DRI</acronym> (Direct Rendering Infrastucture) provides hardware acceleration for OpenGL. You must have a videocard with 3D accelerator and properly installed driver for this.</para>
  
 
-<para
->Read more at the official OpenGL site <ulink url="http://www.opengl.org"
->http://www.opengl.org</ulink
-> </para>
+<para>Read more at the official OpenGL site <ulink url="http://www.opengl.org">http://www.opengl.org</ulink> </para>
 
 </sect1>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kinfocenter/partitions/index.docbook b/tde-i18n-en_GB/docs/tdebase/kinfocenter/partitions/index.docbook
index 4ef630e0a2f..43a65b35afe 100644
--- a/tde-i18n-en_GB/docs/tdebase/kinfocenter/partitions/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kinfocenter/partitions/index.docbook
@@ -2,82 +2,44 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
-<title
->Partition Information</title>
+<title>Partition Information</title>
 <articleinfo>
 
 <authorgroup>
-<author
->&Matthias.Hoelzer-Kluepfel;</author>
-<author
->&Helge.Deller;</author>
-<author
->&Duncan.Haldane;</author>
-<author
->&Mike.McBride;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Matthias.Hoelzer-Kluepfel;</author>
+<author>&Helge.Deller;</author>
+<author>&Duncan.Haldane;</author>
+<author>&Mike.McBride;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-02-12</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-02-12</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->drive partition</keyword>
-<keyword
->system information</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>drive partition</keyword>
+<keyword>system information</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1>
-<title
->Partition Information</title>
+<title>Partition Information</title>
 
-<para
->This page displays information about partitions on your hard drives.</para>
+<para>This page displays information about partitions on your hard drives.</para>
 
-<note
-><para
->The exact information displayed is system-dependent. On some systems, partition information cannot be displayed yet.</para
-></note>
+<note><para>The exact information displayed is system-dependent. On some systems, partition information cannot be displayed yet.</para></note>
 
-<para
->On &Linux;, this information is read from <filename class="devicefile"
->/proc/partitions</filename
->, which is only available if the <filename class="directory"
->/proc</filename
-> pseudo-filesystem is compiled into the (2.1.x or later) kernel.</para>
+<para>On &Linux;, this information is read from <filename class="devicefile">/proc/partitions</filename>, which is only available if the <filename class="directory">/proc</filename> pseudo-filesystem is compiled into the (2.1.x or later) kernel.</para>
 
-<para
->The first two columns are the major and minor numbers respectively. The third column is the number of blocks (usually 1 block = 1024 bytes). The fourth column is a label for the device.</para>
+<para>The first two columns are the major and minor numbers respectively. The third column is the number of blocks (usually 1 block = 1024 bytes). The fourth column is a label for the device.</para>
 
-<para
->The user cannot modify any settings on this page.</para>
+<para>The user cannot modify any settings on this page.</para>
 
 </sect1>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kinfocenter/pci/index.docbook b/tde-i18n-en_GB/docs/tdebase/kinfocenter/pci/index.docbook
index 47b2a9b2ed4..8b97e588876 100644
--- a/tde-i18n-en_GB/docs/tdebase/kinfocenter/pci/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kinfocenter/pci/index.docbook
@@ -2,100 +2,44 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
-<title
-><acronym
->PCI</acronym
->-bus and Installed <acronym
->PCI</acronym
-> Cards</title>
+<title><acronym>PCI</acronym>-bus and Installed <acronym>PCI</acronym> Cards</title>
 <articleinfo>
 
 <authorgroup>
-<author
->&Matthias.Hoelzer-Kluepfel;</author>
-<author
->&Helge.Deller;</author>
-<author
->&Duncan.Haldane;</author>
-<author
->&Mike.McBride;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Matthias.Hoelzer-Kluepfel;</author>
+<author>&Helge.Deller;</author>
+<author>&Duncan.Haldane;</author>
+<author>&Mike.McBride;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-02-12</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-02-12</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->PCI</keyword>
-<keyword
->system information</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>PCI</keyword>
+<keyword>system information</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="pci">
 
-<title
-><acronym
->PCI</acronym
->-bus and Installed <acronym
->PCI</acronym
-> Cards</title>
+<title><acronym>PCI</acronym>-bus and Installed <acronym>PCI</acronym> Cards</title>
 
-<para
->This page displays information about the <acronym
->PCI</acronym
->-bus and installed <acronym
->PCI</acronym
-> cards, and other devices that use the Peripheral Component Interconnect (<acronym
->PCI</acronym
->) bus.</para>
+<para>This page displays information about the <acronym>PCI</acronym>-bus and installed <acronym>PCI</acronym> cards, and other devices that use the Peripheral Component Interconnect (<acronym>PCI</acronym>) bus.</para>
 
-<note
-><para
->The exact information displayed is system-dependent. On some systems, <acronym
->PCI</acronym
->-information can not yet be displayed.</para
-> </note>
+<note><para>The exact information displayed is system-dependent. On some systems, <acronym>PCI</acronym>-information can not yet be displayed.</para> </note>
 
-<para
->On &Linux;, this information is read from <filename class="devicefile"
->/proc/pci</filename
-> which is only available if the <filename class="directory"
->/proc</filename
-> pseudo-filesystem is compiled into the kernel. A listing of all <acronym
->PCI</acronym
-> devices found during kernel initialisation, and their configuration, is shown.</para>
+<para>On &Linux;, this information is read from <filename class="devicefile">/proc/pci</filename> which is only available if the <filename class="directory">/proc</filename> pseudo-filesystem is compiled into the kernel. A listing of all <acronym>PCI</acronym> devices found during kernel initialisation, and their configuration, is shown.</para>
 
-<para
->Each entry begins with a bus, device and function number.</para>
-<para
->The user cannot modify any settings on this page.</para>
+<para>Each entry begins with a bus, device and function number.</para>
+<para>The user cannot modify any settings on this page.</para>
 
 </sect1>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kinfocenter/pcmcia/index.docbook b/tde-i18n-en_GB/docs/tdebase/kinfocenter/pcmcia/index.docbook
index 8c55c7980ab..8fc1a2adf94 100644
--- a/tde-i18n-en_GB/docs/tdebase/kinfocenter/pcmcia/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kinfocenter/pcmcia/index.docbook
@@ -2,67 +2,35 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
-<title
-><acronym
->PCMCIA</acronym
-></title>
+<title><acronym>PCMCIA</acronym></title>
 <articleinfo>
 
 <authorgroup>
-<author
->&Mike.McBride;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Mike.McBride;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-02-12</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-02-12</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->Laptop</keyword>
-<keyword
->PCMCIA</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>Laptop</keyword>
+<keyword>PCMCIA</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="pcmcia">
-<title
-><acronym
->PCMCIA</acronym
-></title>
+<title><acronym>PCMCIA</acronym></title>
 
-<para
->This module displays information about <acronym
->PCMCIA</acronym
-> Cards</para>
+<para>This module displays information about <acronym>PCMCIA</acronym> Cards</para>
 
-<para
->The exact information is system dependent. On most systems no information is displayed at all.</para>
+<para>The exact information is system dependent. On most systems no information is displayed at all.</para>
 
 </sect1>
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/kinfocenter/processor/index.docbook b/tde-i18n-en_GB/docs/tdebase/kinfocenter/processor/index.docbook
index c76fb5654dd..a4c73596ba5 100644
--- a/tde-i18n-en_GB/docs/tdebase/kinfocenter/processor/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kinfocenter/processor/index.docbook
@@ -2,88 +2,45 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
-<title
->Processor Information</title>
+<title>Processor Information</title>
 <articleinfo>
 
 <authorgroup>
-<author
->&Matthias.Hoelzer-Kluepfel;</author>
-<author
->&Helge.Deller;</author>
-<author
->&Duncan.Haldane;</author>
-<author
->&Mike.McBride;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Matthias.Hoelzer-Kluepfel;</author>
+<author>&Helge.Deller;</author>
+<author>&Duncan.Haldane;</author>
+<author>&Mike.McBride;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-02-12</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-02-12</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->CPU</keyword>
-<keyword
->processor</keyword>
-<keyword
->system information</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>CPU</keyword>
+<keyword>processor</keyword>
+<keyword>system information</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="processor">
-<title
->Processor Information</title>
+<title>Processor Information</title>
 
-<para
->This page displays information about the system Central Processing Unit (<acronym
->CPU</acronym
->).</para>
+<para>This page displays information about the system Central Processing Unit (<acronym>CPU</acronym>).</para>
 
-<note
-><para
->The exact information displayed is system-dependent. On some systems, processor information cannot be displayed yet.</para
-></note>
+<note><para>The exact information displayed is system-dependent. On some systems, processor information cannot be displayed yet.</para></note>
 
-<para
->On &Linux;, this information is read from <filename class="devicefile"
->/proc/cpuinfo</filename
->, which is only available if the <filename class="directory"
->/proc</filename
-> pseudo-filesystem is compiled into the kernel.</para>
+<para>On &Linux;, this information is read from <filename class="devicefile">/proc/cpuinfo</filename>, which is only available if the <filename class="directory">/proc</filename> pseudo-filesystem is compiled into the kernel.</para>
 
-<para
->The exact contents of the window will depend on the <acronym
->CPU</acronym
->(s) in your machine, but the window is organised into two columns. The first column is the parameter, and the second column is the value of that parameter.</para>
+<para>The exact contents of the window will depend on the <acronym>CPU</acronym>(s) in your machine, but the window is organised into two columns. The first column is the parameter, and the second column is the value of that parameter.</para>
 
-<para
->The user cannot modify any settings on this page.</para>
+<para>The user cannot modify any settings on this page.</para>
 
 </sect1>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kinfocenter/protocols/index.docbook b/tde-i18n-en_GB/docs/tdebase/kinfocenter/protocols/index.docbook
index 3596a0bc521..48c761edff1 100644
--- a/tde-i18n-en_GB/docs/tdebase/kinfocenter/protocols/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kinfocenter/protocols/index.docbook
@@ -2,59 +2,33 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
-<title
->Protocols</title>
+<title>Protocols</title>
 
 <articleinfo>
 <authorgroup>
-<author
->&Lauri.Watts;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Lauri.Watts;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->Protocols</keyword>
-<keyword
->IOSlaves</keyword>
+<keyword>KDE</keyword>
+<keyword>Protocols</keyword>
+<keyword>IOSlaves</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="protocols">
-<title
->Protocols</title>
+<title>Protocols</title>
 
-<para
->On the left of the panel you will see a list of the IOSlaves that are installed on your system. IOSlaves are how &kde; applications <quote
->talk</quote
-> to other computers, other applications, or act on files.</para>
+<para>On the left of the panel you will see a list of the IOSlaves that are installed on your system. IOSlaves are how &kde; applications <quote>talk</quote> to other computers, other applications, or act on files.</para>
 
-<para
->Clicking on an IOSlave name will display some help information about that IOSlave, such as how to use it, and what it does.</para>
+<para>Clicking on an IOSlave name will display some help information about that IOSlave, such as how to use it, and what it does.</para>
 
-<para
->The protocols module is purely informational, you cannot change any settings here.</para>
+<para>The protocols module is purely informational, you cannot change any settings here.</para>
 
 </sect1>
 </article>
\ No newline at end of file
diff --git a/tde-i18n-en_GB/docs/tdebase/kinfocenter/samba/index.docbook b/tde-i18n-en_GB/docs/tdebase/kinfocenter/samba/index.docbook
index c636e2c010c..bc0513467f6 100644
--- a/tde-i18n-en_GB/docs/tdebase/kinfocenter/samba/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kinfocenter/samba/index.docbook
@@ -2,307 +2,123 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
-<title
->Samba Status Information</title>
+<title>Samba Status Information</title>
 <articleinfo>
 <authorgroup>
-<author
->&Alexander.Neundorf;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
-</authorgroup
-> 
-
-<date
->2002-02-12</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<author>&Alexander.Neundorf;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
+</authorgroup> 
+
+<date>2002-02-12</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->Samba</keyword>
-<keyword
->system information</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>Samba</keyword>
+<keyword>system information</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="sambastatus">
 
 
-<title
->Samba Status Information</title>
-
-<para
->The Samba and <acronym
->NFS</acronym
-> Status Monitor is a front end to the programs <command
->smbstatus</command
-> and <command
->showmount</command
->. Smbstatus reports on current Samba connections, and is part of the suite of Samba tools, which implements the <acronym
->SMB</acronym
-> (Session Message Block) protocol, also called the NetBIOS or LanManager protocol.</para>
-
-<para
->This protocol can be used to provide printer sharing or drive sharing services on a network including machines running the various flavours of &Microsoft; &Windows;.</para>
-
-<para
-><command
->showmount</command
-> is part of the <acronym
->NFS</acronym
-> software package. <acronym
->NFS</acronym
-> stands for Network File System and is the traditional &UNIX; way to share folders over the network. In this case the output of <command
->showmount</command
-> <option
->-a localhost</option
-> is parsed. On some systems showmount is in <filename class="directory"
->/usr/sbin</filename
->, check if you have showmount in your <envar
->PATH</envar
->.</para>
+<title>Samba Status Information</title>
+
+<para>The Samba and <acronym>NFS</acronym> Status Monitor is a front end to the programs <command>smbstatus</command> and <command>showmount</command>. Smbstatus reports on current Samba connections, and is part of the suite of Samba tools, which implements the <acronym>SMB</acronym> (Session Message Block) protocol, also called the NetBIOS or LanManager protocol.</para>
+
+<para>This protocol can be used to provide printer sharing or drive sharing services on a network including machines running the various flavours of &Microsoft; &Windows;.</para>
+
+<para><command>showmount</command> is part of the <acronym>NFS</acronym> software package. <acronym>NFS</acronym> stands for Network File System and is the traditional &UNIX; way to share folders over the network. In this case the output of <command>showmount</command> <option>-a localhost</option> is parsed. On some systems showmount is in <filename class="directory">/usr/sbin</filename>, check if you have showmount in your <envar>PATH</envar>.</para>
 
 <sect2 id="smb-exports">
-<title
->Exports</title>
-
-<para
->On this page you can see a big list which shows the currently active connections to Samba shares and <acronym
->NFS</acronym
-> exports of your machine. The first column shows you whether the resource is a Samba (<acronym
->SMB</acronym
->) share or a <acronym
->NFS</acronym
-> export. The second column contains the name of the share, the third the name of the remote host, which accesses this share. The remaining columns have only a meaning for Samba-shares.</para>
-
-<para
->The fourth column contains the User <abbrev
->ID</abbrev
-> of the user, who accesses this share. Note that this does not have to be equal to the &UNIX; user <abbrev
->ID</abbrev
-> of this user. The same applies for the next column, which displays the group <abbrev
->ID</abbrev
-> of the user.</para>
-
-<para
->Each connection to one of your shares is handled by a single process (<command
->smbd</command
->), the next column shows the process <abbrev
->ID</abbrev
-> (<acronym
->pid</acronym
->) of this <command
->smbd</command
->. If you kill this process the connected user will be disconnected. If the remote user works from &Windows;, as soon as this process is killed a new one will be created, so he will almost not notice it.</para>
-
-<para
->The last column shows how many files this user has currently open. Here you see only, how many files he has <emphasis
->open</emphasis
-> just now, you don't see how many he copied or formerly opened &etc;</para>
+<title>Exports</title>
+
+<para>On this page you can see a big list which shows the currently active connections to Samba shares and <acronym>NFS</acronym> exports of your machine. The first column shows you whether the resource is a Samba (<acronym>SMB</acronym>) share or a <acronym>NFS</acronym> export. The second column contains the name of the share, the third the name of the remote host, which accesses this share. The remaining columns have only a meaning for Samba-shares.</para>
+
+<para>The fourth column contains the User <abbrev>ID</abbrev> of the user, who accesses this share. Note that this does not have to be equal to the &UNIX; user <abbrev>ID</abbrev> of this user. The same applies for the next column, which displays the group <abbrev>ID</abbrev> of the user.</para>
+
+<para>Each connection to one of your shares is handled by a single process (<command>smbd</command>), the next column shows the process <abbrev>ID</abbrev> (<acronym>pid</acronym>) of this <command>smbd</command>. If you kill this process the connected user will be disconnected. If the remote user works from &Windows;, as soon as this process is killed a new one will be created, so he will almost not notice it.</para>
+
+<para>The last column shows how many files this user has currently open. Here you see only, how many files he has <emphasis>open</emphasis> just now, you don't see how many he copied or formerly opened &etc;</para>
 
 </sect2>
 
 <sect2 id="smb-imports">
-<title
->Imports</title>
+<title>Imports</title>
 
-<para
->Here you see which Samba- and <acronym
->NFS</acronym
->-shares from other hosts are mounted on your local system. The first column shows wether it is a Samba- or <acronym
->NFS</acronym
->-share, the second column displays the name of the share, and the third shows where it is mounted.</para>
+<para>Here you see which Samba- and <acronym>NFS</acronym>-shares from other hosts are mounted on your local system. The first column shows wether it is a Samba- or <acronym>NFS</acronym>-share, the second column displays the name of the share, and the third shows where it is mounted.</para>
 
-<para
->The mounted <acronym
->NFS</acronym
->-shares you should see on &Linux; (this has been tested), and it should also work on &Solaris; (this has not been tested).</para>
+<para>The mounted <acronym>NFS</acronym>-shares you should see on &Linux; (this has been tested), and it should also work on &Solaris; (this has not been tested).</para>
 
 </sect2>
 
-<sect2 id="smb-log"
-> 
-<title
->Log</title
-> 
-
-<para
->This page presents the contents of your local samba log file in a nice way. If you open this page, the list will be empty. You have to press the <guibutton
->Update</guibutton
-> button, then the samba log file will be read and the results displayed. Check whether the samba log file on your system is really at the location as specified in the input line. If it is somewhere else or if it has another name, correct it. After changing the file name you have to press <guibutton
->Update</guibutton
-> again.</para>
-
-<para
->Samba logs its actions according to the log level (see <filename
->smb.conf</filename
->). If loglevel = 1, samba logs only when somebody connects to your machine and when this connection is closed again. If log level = 2, it logs also if somebody opens a file and if he closes the file again. If the log level is higher than 2, yet more stuff is logged.</para>
-
-<para
->If you are interested in who accesses your machine, and which files are accessed, you should set the log level to 2 and regularly create a new samba log file (&eg; set up a <command
->cron</command
-> task which once a week moves your current samba log file into another folder or something like that). Otherwise your samba log file may become very big.</para>
-
-<para
->With the four checkboxes below the big list you can decide, which events are displayed in the list. You have to press <guibutton
->Update</guibutton
-> to see the results. If the log level of your samba is too low, you won't see everything.</para>
-
-<para
->By clicking on the header of one column you can sort the list by this column.</para>
+<sect2 id="smb-log"> 
+<title>Log</title> 
+
+<para>This page presents the contents of your local samba log file in a nice way. If you open this page, the list will be empty. You have to press the <guibutton>Update</guibutton> button, then the samba log file will be read and the results displayed. Check whether the samba log file on your system is really at the location as specified in the input line. If it is somewhere else or if it has another name, correct it. After changing the file name you have to press <guibutton>Update</guibutton> again.</para>
+
+<para>Samba logs its actions according to the log level (see <filename>smb.conf</filename>). If loglevel = 1, samba logs only when somebody connects to your machine and when this connection is closed again. If log level = 2, it logs also if somebody opens a file and if he closes the file again. If the log level is higher than 2, yet more stuff is logged.</para>
+
+<para>If you are interested in who accesses your machine, and which files are accessed, you should set the log level to 2 and regularly create a new samba log file (&eg; set up a <command>cron</command> task which once a week moves your current samba log file into another folder or something like that). Otherwise your samba log file may become very big.</para>
+
+<para>With the four checkboxes below the big list you can decide, which events are displayed in the list. You have to press <guibutton>Update</guibutton> to see the results. If the log level of your samba is too low, you won't see everything.</para>
+
+<para>By clicking on the header of one column you can sort the list by this column.</para>
 
 </sect2>
 
 
 <sect2 id="smb-statistics">
-<title
->Statistics</title>
-
-<para
->On this page you can filter the contents of the third page for certain contents.</para>
-
-<para
->Let's say the <guilabel
->Event</guilabel
-> field (not the one in the list) is set to <userinput
->Connection</userinput
->, <guilabel
->Service/File</guilabel
-> is set to <userinput
->*</userinput
->, <guilabel
->Host/User</guilabel
-> is set to <userinput
->*</userinput
->, <guilabel
->Show expanded service info</guilabel
-> is disabled and <guilabel
->Show expanded host info</guilabel
-> is disabled.</para>
-
-<para
->If you press <guibutton
->Update</guibutton
-> now, you will see how often a connection was opened to share <literal
->*</literal
-> (&ie; to any share) from host <literal
->*</literal
-> (&ie; from any host). Now enable <guilabel
->Show expanded host info</guilabel
-> and press <guibutton
->Update</guibutton
-> again. Now you will see for every host which matches the wildcard <literal
->*</literal
->, how many connections were opened by him.</para>
-
-<para
->Now press <guibutton
->clear</guibutton
->.</para>
-
-<para
->Now set the <guilabel
->Event</guilabel
-> field to File Access and enable <guilabel
->Show expanded service info</guilabel
-> and press <guibutton
->Update</guibutton
-> again.</para>
-
-<para
->Now you will see how often every single file was accessed. If you enable <guilabel
->Show expanded host info</guilabel
-> too, you will see how often every single user opened each file.</para>
-
-<para
->In the input lines <guilabel
->Service/File</guilabel
-> and <guilabel
->Host/User</guilabel
-> you can use the wildcards <literal
->*</literal
-> and <literal
->?</literal
-> in the same way you use them at the command line. Regular expressions are not recognised.</para>
-
-<para
->By clicking on the header of a column you can sort the list by this column. This way you can check out which file was opened most often, or which user opened the most files or whatever.</para>
+<title>Statistics</title>
+
+<para>On this page you can filter the contents of the third page for certain contents.</para>
+
+<para>Let's say the <guilabel>Event</guilabel> field (not the one in the list) is set to <userinput>Connection</userinput>, <guilabel>Service/File</guilabel> is set to <userinput>*</userinput>, <guilabel>Host/User</guilabel> is set to <userinput>*</userinput>, <guilabel>Show expanded service info</guilabel> is disabled and <guilabel>Show expanded host info</guilabel> is disabled.</para>
+
+<para>If you press <guibutton>Update</guibutton> now, you will see how often a connection was opened to share <literal>*</literal> (&ie; to any share) from host <literal>*</literal> (&ie; from any host). Now enable <guilabel>Show expanded host info</guilabel> and press <guibutton>Update</guibutton> again. Now you will see for every host which matches the wildcard <literal>*</literal>, how many connections were opened by him.</para>
+
+<para>Now press <guibutton>clear</guibutton>.</para>
+
+<para>Now set the <guilabel>Event</guilabel> field to File Access and enable <guilabel>Show expanded service info</guilabel> and press <guibutton>Update</guibutton> again.</para>
+
+<para>Now you will see how often every single file was accessed. If you enable <guilabel>Show expanded host info</guilabel> too, you will see how often every single user opened each file.</para>
+
+<para>In the input lines <guilabel>Service/File</guilabel> and <guilabel>Host/User</guilabel> you can use the wildcards <literal>*</literal> and <literal>?</literal> in the same way you use them at the command line. Regular expressions are not recognised.</para>
+
+<para>By clicking on the header of a column you can sort the list by this column. This way you can check out which file was opened most often, or which user opened the most files or whatever.</para>
 
 </sect2>
 
 
 <sect2 id="smb-stat-author">
-<title
->Section Author</title>
+<title>Section Author</title>
 
-<para
->Module copyright 2000: Michael Glauche and &Alexander.Neundorf; &Alexander.Neundorf.mail;</para>
+<para>Module copyright 2000: Michael Glauche and &Alexander.Neundorf; &Alexander.Neundorf.mail;</para>
 
-<para
->Originally written by: Michael Glauche</para>
+<para>Originally written by: Michael Glauche</para>
 
-<para
->Currently maintained by: &Alexander.Neundorf; &Alexander.Neundorf.mail;</para>
+<para>Currently maintained by: &Alexander.Neundorf; &Alexander.Neundorf.mail;</para>
 
 <itemizedlist>
-<title
->Contributors</title>
-<listitem
-><para
->Conversion to kcontrol applet:</para>
-<para
->&Matthias.Hoelzer-Kluepfel; &Matthias.Hoelzer-Kluepfel.mail;</para
-></listitem>
-<listitem
-><para
->Use of <classname
->TDEProcess</classname
-> instead of popen, and more error checking:</para>
-<para
->&David.Faure; &David.Faure.mail;</para
-></listitem>
-<listitem
-><para
->Conversion to tdecmodule, added tab pages 2,3,4, bug fixed:</para>
-<para
->&Alexander.Neundorf; &Alexander.Neundorf.mail;</para
-></listitem>
+<title>Contributors</title>
+<listitem><para>Conversion to kcontrol applet:</para>
+<para>&Matthias.Hoelzer-Kluepfel; &Matthias.Hoelzer-Kluepfel.mail;</para></listitem>
+<listitem><para>Use of <classname>TDEProcess</classname> instead of popen, and more error checking:</para>
+<para>&David.Faure; &David.Faure.mail;</para></listitem>
+<listitem><para>Conversion to tdecmodule, added tab pages 2,3,4, bug fixed:</para>
+<para>&Alexander.Neundorf; &Alexander.Neundorf.mail;</para></listitem>
 </itemizedlist>
 
-<para
->Documentation copyright 2000 &Alexander.Neundorf; &Alexander.Neundorf.mail;</para>
+<para>Documentation copyright 2000 &Alexander.Neundorf; &Alexander.Neundorf.mail;</para>
 
-<para
->Documentation translated to docbook by &Mike.McBride; &Mike.McBride.mail;</para>
+<para>Documentation translated to docbook by &Mike.McBride; &Mike.McBride.mail;</para>
 
-<para
->Conversion to British English: John Knight <email
->anarchist_tomato@herzeleid.net</email
-></para
-> 
+<para>Conversion to British English: John Knight <email>anarchist_tomato@herzeleid.net</email></para> 
 
 </sect2>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdebase/kinfocenter/scsi/index.docbook b/tde-i18n-en_GB/docs/tdebase/kinfocenter/scsi/index.docbook
index 43c77e0ee37..1f7feb0c476 100644
--- a/tde-i18n-en_GB/docs/tdebase/kinfocenter/scsi/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kinfocenter/scsi/index.docbook
@@ -2,97 +2,45 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
-<title
-><acronym
->SCSI</acronym
-> Interface Information</title>
+<title><acronym>SCSI</acronym> Interface Information</title>
 <articleinfo>
 
 <authorgroup>
-<author
->&Matthias.Hoelzer-Kluepfel;</author>
-<author
->&Helge.Deller;</author>
-<author
->&Duncan.Haldane;</author>
-<author
->&Mike.McBride;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Matthias.Hoelzer-Kluepfel;</author>
+<author>&Helge.Deller;</author>
+<author>&Duncan.Haldane;</author>
+<author>&Mike.McBride;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-02-12</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-02-12</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->SCSI</keyword>
-<keyword
->system information</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>SCSI</keyword>
+<keyword>system information</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="scsi">
 
-<title
-><acronym
->SCSI</acronym
-> Interface Information</title>
+<title><acronym>SCSI</acronym> Interface Information</title>
 
-<para
->This page displays information about Small Computer Systems Interface (<acronym
->SCSI</acronym
->) Interfaces and the attached <acronym
->SCSI</acronym
-> devices.</para>
+<para>This page displays information about Small Computer Systems Interface (<acronym>SCSI</acronym>) Interfaces and the attached <acronym>SCSI</acronym> devices.</para>
 
-<note
-><para
->The exact information displayed is system-dependent. On some systems <acronym
->SCSI</acronym
-> information cannot be displayed yet.</para
-></note>
+<note><para>The exact information displayed is system-dependent. On some systems <acronym>SCSI</acronym> information cannot be displayed yet.</para></note>
 
-<para
->On &Linux;, this information is read from <filename class="devicefile"
->/proc/scsi/scsi</filename
->, which is only available if the <filename class="directory"
->/proc</filename
-> pseudo-filesystem is compiled into the kernel. A listing of all <acronym
->SCSI</acronym
-> devices known to the kernel is shown.</para>
+<para>On &Linux;, this information is read from <filename class="devicefile">/proc/scsi/scsi</filename>, which is only available if the <filename class="directory">/proc</filename> pseudo-filesystem is compiled into the kernel. A listing of all <acronym>SCSI</acronym> devices known to the kernel is shown.</para>
 
-<para
->The devices are sorted numerically by their host, channel, and <acronym
->ID</acronym
-> numbers.</para>
+<para>The devices are sorted numerically by their host, channel, and <acronym>ID</acronym> numbers.</para>
 
-<para
->The user cannot modify any settings on this page.</para>
+<para>The user cannot modify any settings on this page.</para>
 
 </sect1>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kinfocenter/sound/index.docbook b/tde-i18n-en_GB/docs/tdebase/kinfocenter/sound/index.docbook
index ed86203c637..a3ee3cc6a83 100644
--- a/tde-i18n-en_GB/docs/tdebase/kinfocenter/sound/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kinfocenter/sound/index.docbook
@@ -2,82 +2,43 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
-<title
->Soundcard Information</title>
+<title>Soundcard Information</title>
 <articleinfo>
 
 <authorgroup>
-<author
->&Matthias.Hoelzer-Kluepfel;</author>
-<author
->&Helge.Deller;</author>
-<author
->&Duncan.Haldane;</author>
-<author
->&Mike.McBride;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Matthias.Hoelzer-Kluepfel;</author>
+<author>&Helge.Deller;</author>
+<author>&Duncan.Haldane;</author>
+<author>&Mike.McBride;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-02-12</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-02-12</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->soundcard</keyword>
-<keyword
->system information</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>soundcard</keyword>
+<keyword>system information</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="soundinfo">
 
-<title
->Soundcard Information</title>
+<title>Soundcard Information</title>
 
-<para
->This page displays information about any soundcards installed in the system.</para>
+<para>This page displays information about any soundcards installed in the system.</para>
 
-<note
-><para
->The exact information displayed is system-dependent. On some systems, soundcard information cannot be displayed yet.</para
-></note>
+<note><para>The exact information displayed is system-dependent. On some systems, soundcard information cannot be displayed yet.</para></note>
 
-<para
->On &Linux;, this information is read either from <filename class="devicefile"
->/dev/sndstat</filename
->, if present, or from <filename class="devicefile"
->/proc/sound</filename
->, which is only available if the <filename class="directory"
->/proc</filename
-> pseudo-filesystem is compiled into the (2.1.x or later) kernel.</para>
+<para>On &Linux;, this information is read either from <filename class="devicefile">/dev/sndstat</filename>, if present, or from <filename class="devicefile">/proc/sound</filename>, which is only available if the <filename class="directory">/proc</filename> pseudo-filesystem is compiled into the (2.1.x or later) kernel.</para>
 
-<para
->The user cannot modify any settings on this page.</para>
+<para>The user cannot modify any settings on this page.</para>
 
 </sect1>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kinfocenter/usb/index.docbook b/tde-i18n-en_GB/docs/tdebase/kinfocenter/usb/index.docbook
index 8da4dafa7fd..6ae4510551e 100644
--- a/tde-i18n-en_GB/docs/tdebase/kinfocenter/usb/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kinfocenter/usb/index.docbook
@@ -2,72 +2,37 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
-<title
-><acronym
->USB</acronym
-></title>
+<title><acronym>USB</acronym></title>
 <articleinfo>
 
 <authorgroup>
-<author
-><firstname
-></firstname
-> <surname
-></surname
-> </author>
+<author><firstname></firstname> <surname></surname> </author>
 
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 
 </authorgroup>
 
-<date
->2002-02-12</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-02-12</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <keywordset>
-<keyword
->KControl</keyword>
-<keyword
->USB</keyword>
-<keyword
->System Information</keyword>
+<keyword>KControl</keyword>
+<keyword>USB</keyword>
+<keyword>System Information</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="usb">
 
-<title
-><acronym
->USB</acronym
-></title>
+<title><acronym>USB</acronym></title>
 
-<para
->This module allows you to see the devices attached to your <acronym
->USB</acronym
-> bus(es).</para>
+<para>This module allows you to see the devices attached to your <acronym>USB</acronym> bus(es).</para>
 
-<para
->This module is for information only, you cannot edit any information you see here.</para>
+<para>This module is for information only, you cannot edit any information you see here.</para>
 </sect1>
 
 </article>
\ No newline at end of file
diff --git a/tde-i18n-en_GB/docs/tdebase/kinfocenter/xserver/index.docbook b/tde-i18n-en_GB/docs/tdebase/kinfocenter/xserver/index.docbook
index 71c7428594b..4f9906f190b 100644
--- a/tde-i18n-en_GB/docs/tdebase/kinfocenter/xserver/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kinfocenter/xserver/index.docbook
@@ -2,79 +2,45 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;" id="xserver">
-<title
->X Server Information</title>
+<title>X Server Information</title>
 <articleinfo>
 
 <authorgroup>
-<author
->&Mike.McBride;</author>
+<author>&Mike.McBride;</author>
 
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 
 </authorgroup>
 
-<date
->2002-02-12</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-02-12</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->X server</keyword>
-<keyword
->system information</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>X server</keyword>
+<keyword>system information</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1>
-<title
->X Server Information</title>
+<title>X Server Information</title>
 
-<para
->This screen is useful for getting specific information about your X server and the current session of X.</para>
+<para>This screen is useful for getting specific information about your X server and the current session of X.</para>
 
-<para
->When you open this module, you are presented with some information. The left hand side of the window is organised into a tree. Some of the elements have a plus sign in front of the label. Clicking this sign opens a <quote
->submenu</quote
-> related to the label. Clicking on a minus sign in front of a label hides the submenu.</para>
+<para>When you open this module, you are presented with some information. The left hand side of the window is organised into a tree. Some of the elements have a plus sign in front of the label. Clicking this sign opens a <quote>submenu</quote> related to the label. Clicking on a minus sign in front of a label hides the submenu.</para>
 
-<para
->The right hand side of the window contains the individual values for each of the parameters on the left.</para>
+<para>The right hand side of the window contains the individual values for each of the parameters on the left.</para>
 
-<para
->The information presented will vary depending on your setup.</para>
+<para>The information presented will vary depending on your setup.</para>
 
-<note
-><para
->Some setups may not be able to determine some or all of the parameters.</para
-></note>
+<note><para>Some setups may not be able to determine some or all of the parameters.</para></note>
 
-<para
->You can not change any values from this menu. It is for information only.</para>
+<para>You can not change any values from this menu. It is for information only.</para>
 
 </sect1>
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/klipper/index.docbook b/tde-i18n-en_GB/docs/tdebase/klipper/index.docbook
index 25e9fcaec9b..ed7a04ec42c 100644
--- a/tde-i18n-en_GB/docs/tdebase/klipper/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/klipper/index.docbook
@@ -4,257 +4,123 @@
   <!ENTITY kappname "&klipper;">
   <!ENTITY package "tdebase">
   <!ENTITY % addindex "IGNORE">
-  <!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+  <!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <book lang="&language;">
 <bookinfo>
-<title
->The &klipper; Handbook </title>
+<title>The &klipper; Handbook </title>
 
 <authorgroup>
-<author
->&Philip.Rodrigues; &Philip.Rodrigues.mail;</author>
-
-<othercredit role="developer"
->&Carsten.Pfeiffer; &Carsten.Pfeiffer.mail; </othercredit>
-
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Philip.Rodrigues; &Philip.Rodrigues.mail;</author>
+
+<othercredit role="developer">&Carsten.Pfeiffer; &Carsten.Pfeiffer.mail; </othercredit>
+
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 
 </authorgroup>
 
 <copyright>
-<year
->2000-2003</year>
-<holder
->&Philip.Rodrigues;</holder>
+<year>2000-2003</year>
+<holder>&Philip.Rodrigues;</holder>
 </copyright>
 
-<legalnotice
->&FDLNotice;</legalnotice>
+<legalnotice>&FDLNotice;</legalnotice>
 
-<date
->2003-09-18</date>
-<releaseinfo
->2.92.00</releaseinfo>
+<date>2003-09-18</date>
+<releaseinfo>2.92.00</releaseinfo>
 
 <abstract>
-<para
->&klipper; is the &kde; clipboard cut &amp; paste utility.</para>
+<para>&klipper; is the &kde; clipboard cut &amp; paste utility.</para>
 </abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->Klipper</keyword>
-<keyword
->tdebase</keyword>
-<keyword
->clipboard</keyword>
+<keyword>KDE</keyword>
+<keyword>Klipper</keyword>
+<keyword>tdebase</keyword>
+<keyword>clipboard</keyword>
 </keywordset>
 </bookinfo>
  
 <chapter id="introduction">
-<title
->Introduction</title>
-<para
->&klipper; is the &kde; clipboard utility. It stores clipboard history, and allows you to link clipboard contents to application actions. Please report any problems or feature requests to Carsten Pfeiffer &Carsten.Pfeiffer.mail;.</para>
+<title>Introduction</title>
+<para>&klipper; is the &kde; clipboard utility. It stores clipboard history, and allows you to link clipboard contents to application actions. Please report any problems or feature requests to Carsten Pfeiffer &Carsten.Pfeiffer.mail;.</para>
 
 </chapter>
 
 <chapter id="using-klipper">
-<title
->Using &klipper;</title>
+<title>Using &klipper;</title>
 
 <sect1 id="basic-usage">
-<title
->Basic Usage</title>
+<title>Basic Usage</title>
 <screenshot>
-<screeninfo
->The &klipper; icon.</screeninfo>
+<screeninfo>The &klipper; icon.</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="screenshot.png" format="PNG"/>
 </imageobject>
 <textobject>
-<phrase
->The &klipper; icon</phrase>
+<phrase>The &klipper; icon</phrase>
 </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->To display the clipboard history, click on the &klipper; icon in the &kde; panel, or press <keycombo action="simul"
->&Ctrl;&Alt;<keycap
->V</keycap
-> </keycombo
->. Previous clipboard entries are shown at the top of the pop-up menu which appears. Selecting one of these copies it to the clipboard, from where it can be pasted into any &kde; or X application as usual.</para>
-
-<para
->To remove &klipper; from your panel, open the pop-up menu and select <guimenuitem
->Quit</guimenuitem
->. A dialogue will ask you whether &klipper; should start automatically when you log in.</para>
+<para>To display the clipboard history, click on the &klipper; icon in the &kde; panel, or press <keycombo action="simul">&Ctrl;&Alt;<keycap>V</keycap> </keycombo>. Previous clipboard entries are shown at the top of the pop-up menu which appears. Selecting one of these copies it to the clipboard, from where it can be pasted into any &kde; or X application as usual.</para>
+
+<para>To remove &klipper; from your panel, open the pop-up menu and select <guimenuitem>Quit</guimenuitem>. A dialogue will ask you whether &klipper; should start automatically when you log in.</para>
 </sect1>
 
 <sect1 id="actions">
-<title
->Actions</title>
-
-<para
->&klipper; can perform actions on the contents of the clipboard, based on whether they match a particular regular expression. For example, any clipboard contents starting with <quote
->http://</quote
-> can be passed to &Netscape; or &konqueror; as &URL;s to open.</para>
-
-<para
->To use this feature, just copy a &URL; or filename to the clipboard. If there is a matching regular expression in &klipper;'s list, a menu will appear showing you the options you have (&eg; Open &URL; in &konqueror;, open &URL; in &Netscape;). Use the mouse or keyboard to select the option you want, and &klipper; will run the program you have selected, opening the address pointed to by the clipboard contents.</para>
-
-<para
->If you do not want to perform any actions on the clipboard contents, select <guimenuitem
->Do Nothing</guimenuitem
-> on the pop-up menu to return to what you were doing before. If you leave the menu, it will disappear, leaving you to continue your work. You can change the time that the menu remains for in the <guilabel
->Configure Klipper...</guilabel
-> dialogue, with the option <guilabel
->Timeout for action pop-ups</guilabel
-> under the <guilabel
->General</guilabel
-> tab.</para>
+<title>Actions</title>
+
+<para>&klipper; can perform actions on the contents of the clipboard, based on whether they match a particular regular expression. For example, any clipboard contents starting with <quote>http://</quote> can be passed to &Netscape; or &konqueror; as &URL;s to open.</para>
+
+<para>To use this feature, just copy a &URL; or filename to the clipboard. If there is a matching regular expression in &klipper;'s list, a menu will appear showing you the options you have (&eg; Open &URL; in &konqueror;, open &URL; in &Netscape;). Use the mouse or keyboard to select the option you want, and &klipper; will run the program you have selected, opening the address pointed to by the clipboard contents.</para>
+
+<para>If you do not want to perform any actions on the clipboard contents, select <guimenuitem>Do Nothing</guimenuitem> on the pop-up menu to return to what you were doing before. If you leave the menu, it will disappear, leaving you to continue your work. You can change the time that the menu remains for in the <guilabel>Configure Klipper...</guilabel> dialogue, with the option <guilabel>Timeout for action pop-ups</guilabel> under the <guilabel>General</guilabel> tab.</para>
 	  
-<para
->Actions can be disabled completely by clicking on &klipper; and selecting <guimenuitem
->Actions Enabled</guimenuitem
->, or by pressing <keycombo action="simul"
->&Ctrl;&Alt;<keycap
->X</keycap
-></keycombo
->.</para>
-
-<para
->Clipboard contents which match a regular expression can also be edited before performing an action on them. Select <guimenuitem
->Edit contents...</guimenuitem
-> on the &klipper; pop-up menu, and you can change the clipboard contents in the dialogue which appears, before clicking the <guibutton
->OK</guibutton
-> button to run the appropriate action.</para>
-
-<para
->Pressing <keycombo action="simul"
->&Ctrl;&Alt;<keycap
->R</keycap
-></keycombo
-> shows the pop-up menu to repeat the last action which &klipper; performed.</para>
+<para>Actions can be disabled completely by clicking on &klipper; and selecting <guimenuitem>Actions Enabled</guimenuitem>, or by pressing <keycombo action="simul">&Ctrl;&Alt;<keycap>X</keycap></keycombo>.</para>
+
+<para>Clipboard contents which match a regular expression can also be edited before performing an action on them. Select <guimenuitem>Edit contents...</guimenuitem> on the &klipper; pop-up menu, and you can change the clipboard contents in the dialogue which appears, before clicking the <guibutton>OK</guibutton> button to run the appropriate action.</para>
+
+<para>Pressing <keycombo action="simul">&Ctrl;&Alt;<keycap>R</keycap></keycombo> shows the pop-up menu to repeat the last action which &klipper; performed.</para>
 
 </sect1>
 
 <sect1 id="clipboard-modes">
-<title
->Clipboard/Selection Behaviour</title>
+<title>Clipboard/Selection Behaviour</title>
 
 <sect2 id="clipboard-modes-general">
-<title
->General</title>
-<para
->&klipper; can be used to set the behaviour of the clipboard and selection in &kde;. </para>
-
-<note
-><para
->The &X-Window; uses two separate clipboard buffers: the <quote
->selection</quote
-> and the <quote
->clipboard</quote
->. Text is placed in the selection buffer by simply selecting it, and can be pasted with the middle mouse button. To place text in the clipboard buffer, select it and press <keycombo
->&Ctrl;<keycap
->X</keycap
-> </keycombo
-> or <keycombo
->&Ctrl;<keycap
->C</keycap
-> </keycombo
->. Text from the clipboard buffer is pasted using <keycombo
->&Ctrl;<keycap
->V</keycap
-> </keycombo
-> or by selecting <menuchoice
-><guimenu
->Edit</guimenu
-><guimenuitem
->Paste</guimenuitem
-> </menuchoice
->.</para>
+<title>General</title>
+<para>&klipper; can be used to set the behaviour of the clipboard and selection in &kde;. </para>
+
+<note><para>The &X-Window; uses two separate clipboard buffers: the <quote>selection</quote> and the <quote>clipboard</quote>. Text is placed in the selection buffer by simply selecting it, and can be pasted with the middle mouse button. To place text in the clipboard buffer, select it and press <keycombo>&Ctrl;<keycap>X</keycap> </keycombo> or <keycombo>&Ctrl;<keycap>C</keycap> </keycombo>. Text from the clipboard buffer is pasted using <keycombo>&Ctrl;<keycap>V</keycap> </keycombo> or by selecting <menuchoice><guimenu>Edit</guimenu><guimenuitem>Paste</guimenuitem> </menuchoice>.</para>
 </note>
 
 <!-- &klipper; can be used to set the clipboard mode for the whole of &kde;. The
 first mode will be familiar to &Microsoft; &Windows; and &Mac; users: Text is
 inserted into the clipboard using an application's cut/copy (or generally
-<keycombo
->&Ctrl;<keycap
->X</keycap
-></keycombo
-> and
-<keycombo
->&Ctrl;<keycap
->C</keycap
-></keycombo
-> respectively)
+<keycombo>&Ctrl;<keycap>X</keycap></keycombo> and
+<keycombo>&Ctrl;<keycap>C</keycap></keycombo> respectively)
 function, and the application's paste (or generally 
-<keycombo
->&Ctrl;<keycap
->V</keycap
-></keycombo
->) function pastes the
+<keycombo>&Ctrl;<keycap>V</keycap></keycombo>) function pastes the
 contents of this clipboard.
 </para>
 <para>
 The second mode will be more familiar to longtime &UNIX; users: Selected text
-is copied to this clipboard, and clicking the <mousebutton
->middle</mousebutton
-> 
+is copied to this clipboard, and clicking the <mousebutton>middle</mousebutton> 
 mouse button pastes the
 contents of this clipboard.
 -->
 </sect2>
 
 <sect2 id="changing-clipboard-modes">
-<title
->Changing Clipboard/Selection Behaviour</title>
-<para
->In order to change clipboard/selection behaviour, select <guimenuitem
->Configure Klipper...</guimenuitem
-> from the &klipper; pop-up menu, and in the dialogue box that appears, select the <guilabel
->General</guilabel
-> tab. Selecting <guilabel
->Separate clipboard and selection</guilabel
-> makes the clipboard and selection function as completely separate buffers as described above. With this option set, the option <guilabel
->Ignore selection</guilabel
-> will prevent &klipper; from including the contents of the selection in its clipboard history and from performing actions on the contents of the selection. Selecting <guilabel
->Synchronise contents of the clipboard and the selection</guilabel
-> causes the clipboard and selection buffers to always be the same, meaning that text in the selection can be pasted with either the <mousebutton
->middle</mousebutton
-> mouse button or the key combination <keycombo
->&Ctrl;<keycap
->V</keycap
-> </keycombo
->, and similarly for text in the clipboard buffer. </para>
+<title>Changing Clipboard/Selection Behaviour</title>
+<para>In order to change clipboard/selection behaviour, select <guimenuitem>Configure Klipper...</guimenuitem> from the &klipper; pop-up menu, and in the dialogue box that appears, select the <guilabel>General</guilabel> tab. Selecting <guilabel>Separate clipboard and selection</guilabel> makes the clipboard and selection function as completely separate buffers as described above. With this option set, the option <guilabel>Ignore selection</guilabel> will prevent &klipper; from including the contents of the selection in its clipboard history and from performing actions on the contents of the selection. Selecting <guilabel>Synchronise contents of the clipboard and the selection</guilabel> causes the clipboard and selection buffers to always be the same, meaning that text in the selection can be pasted with either the <mousebutton>middle</mousebutton> mouse button or the key combination <keycombo>&Ctrl;<keycap>V</keycap> </keycombo>, and similarly for text in the clipboard buffer. </para>
 
  <!-- The
-<guilabel
->Synchronize contents of the clipboard and the
-selection</guilabel
-> check box determines the clipboard mode. If the box is
+<guilabel>Synchronize contents of the clipboard and the
+selection</guilabel> check box determines the clipboard mode. If the box is
 selected, the clipboard functions in the &UNIX; mode; if not, the
 &Windows;/&Mac; mode is used. -->
 
@@ -265,141 +131,76 @@ selected, the clipboard functions in the &UNIX; mode; if not, the
 </chapter>
 
 <chapter id="preferences">
-<title
->Configuring Klipper</title>
+<title>Configuring Klipper</title>
 
 <sect1 id="viewing-options">
 
-<title
->Viewing the Configuration Dialogue</title>
+<title>Viewing the Configuration Dialogue</title>
 
-<para
->To view or change &klipper;'s settings, open the &klipper; pop-up menu, and select <guimenuitem
->Configure Klipper...</guimenuitem
->. The &klipper; configuration dialogue will appear. Its contents are described below.</para>
+<para>To view or change &klipper;'s settings, open the &klipper; pop-up menu, and select <guimenuitem>Configure Klipper...</guimenuitem>. The &klipper; configuration dialogue will appear. Its contents are described below.</para>
 
 </sect1>
 
 <sect1 id="general-tab">
-<title
->General Options</title>
+<title>General Options</title>
 
 <variablelist>
 
 <varlistentry>
-<term
-><guilabel
->Popup menu at mouse-cursor position</guilabel
-></term>
-<listitem
-><para
->Make the &klipper; pop-up menus appear at the position of the mouse cursor, instead of their default position (in the &kde; Panel). Useful if you use the mouse more than the keyboard.</para
-></listitem>
+<term><guilabel>Popup menu at mouse-cursor position</guilabel></term>
+<listitem><para>Make the &klipper; pop-up menus appear at the position of the mouse cursor, instead of their default position (in the &kde; Panel). Useful if you use the mouse more than the keyboard.</para></listitem>
 </varlistentry>
 
 
 <varlistentry>
-<term
-><guilabel
->Save clipboard contents on exit</guilabel
-></term
-> <listitem
-><para
->If this option is on, the clipboard history will be saved when &klipper; exits, allowing you to use it next time &klipper; starts.</para>
+<term><guilabel>Save clipboard contents on exit</guilabel></term> <listitem><para>If this option is on, the clipboard history will be saved when &klipper; exits, allowing you to use it next time &klipper; starts.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Remove whitespace when executing actions</guilabel
-></term>
-<listitem
-><para
->If selected, any whitespace (spaces, tabs, &etc;) at the beginning and end of the clipboard contents will be removed before passing the clipboard contents to an application. This is useful, for example, if the clipboard contains a &URL; with spaces which, if opened by a web browser, would cause an error.</para>
+<term><guilabel>Remove whitespace when executing actions</guilabel></term>
+<listitem><para>If selected, any whitespace (spaces, tabs, &etc;) at the beginning and end of the clipboard contents will be removed before passing the clipboard contents to an application. This is useful, for example, if the clipboard contains a &URL; with spaces which, if opened by a web browser, would cause an error.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Replay actions on an item selected from history</guilabel
-></term>
-<listitem
-><para
->If this is switched on, selecting an item from the history causes &klipper; to display the actions pop-up on that item, if appropriate.</para>
+<term><guilabel>Replay actions on an item selected from history</guilabel></term>
+<listitem><para>If this is switched on, selecting an item from the history causes &klipper; to display the actions pop-up on that item, if appropriate.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Prevent empty clipboard</guilabel
-></term>
-<listitem
-><para
->If selected, the clipboard will never be empty: &klipper; will insert the most recent item from the clipboard history into the clipboard instead of allowing it to be empty.</para
-></listitem>
+<term><guilabel>Prevent empty clipboard</guilabel></term>
+<listitem><para>If selected, the clipboard will never be empty: &klipper; will insert the most recent item from the clipboard history into the clipboard instead of allowing it to be empty.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Ignore selection</guilabel
-></term>
-<listitem
-><para
->Sets the clipboard mode. See <xref linkend="clipboard-modes"/>. </para>
+<term><guilabel>Ignore selection</guilabel></term>
+<listitem><para>Sets the clipboard mode. See <xref linkend="clipboard-modes"/>. </para>
 </listitem>
-</varlistentry
-> 
+</varlistentry> 
 
 
 <varlistentry>
-<term
-><guilabel
->Synchronise contents of the clipboard and the selection</guilabel
-></term>
-<listitem
-><para
->Sets the clipboard mode. See <xref linkend="clipboard-modes"/>. </para>
+<term><guilabel>Synchronise contents of the clipboard and the selection</guilabel></term>
+<listitem><para>Sets the clipboard mode. See <xref linkend="clipboard-modes"/>. </para>
 </listitem>
-</varlistentry
-> 
+</varlistentry> 
 
 <varlistentry>
-<term
-><guilabel
->Separate clipboard and selection</guilabel
-></term>
-<listitem
-><para
->Sets the clipboard mode. See <xref linkend="clipboard-modes"/>. </para>
+<term><guilabel>Separate clipboard and selection</guilabel></term>
+<listitem><para>Sets the clipboard mode. See <xref linkend="clipboard-modes"/>. </para>
 </listitem>
-</varlistentry
-> 
+</varlistentry> 
 
 
 <varlistentry>
-<term
-><guilabel
->Timeout for Action pop-ups</guilabel
-></term>
-<listitem
-><para
->Set the time that a pop-up menu will remain for if you do nothing with it.</para
-></listitem>
+<term><guilabel>Timeout for Action pop-ups</guilabel></term>
+<listitem><para>Set the time that a pop-up menu will remain for if you do nothing with it.</para></listitem>
 </varlistentry>
 
-<varlistentry
-><term
-><guilabel
->Clipboard history size</guilabel
-></term>
-<listitem
-><para
->Sets the number of items that are stored in the clipboard history.</para
-></listitem>
+<varlistentry><term><guilabel>Clipboard history size</guilabel></term>
+<listitem><para>Sets the number of items that are stored in the clipboard history.</para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -407,128 +208,37 @@ selected, the clipboard functions in the &UNIX; mode; if not, the
 </sect1>
 
 <sect1 id="actions-tab">
-<title
->Actions Options</title>
+<title>Actions Options</title>
 
 <variablelist>
 <varlistentry>
-<term
->Editing Expressions/Actions</term>
-<listitem
-><para
->On the <guilabel
->Actions</guilabel
-> tab, double-click the regular expression or action that you want to edit. An in-place text editing box will appear in which the text can be edited as you wish. Make sure you press <keysym
->Enter</keysym
-> when you are done.</para
-></listitem>
+<term>Editing Expressions/Actions</term>
+<listitem><para>On the <guilabel>Actions</guilabel> tab, double-click the regular expression or action that you want to edit. An in-place text editing box will appear in which the text can be edited as you wish. Make sure you press <keysym>Enter</keysym> when you are done.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Adding Expressions/Actions</term>
-<listitem
-><para
->Click the <guibutton
->Add Action</guibutton
-> button to add a regular expression for &klipper; to match. &klipper; uses &Qt;'s <classname
->QRegExp</classname
->, which understands most regular expressions as you would use in <application
->grep</application
-> or <application
->egrep</application
-> for instance.</para>
-<para
->You can add a description of the regular expression type (&eg; <quote
->HTTP URL</quote
->) by <mousebutton
->left</mousebutton
-> clicking in the <guilabel
->Description</guilabel
-> column.</para
->   
-
-<note
-><para
->You can find detailed information about the use of <classname
->QRegExp</classname
-> regular expressions at <ulink url="http://doc.trolltech.com/qregexp.html#details"
->http://doc.trolltech.com/qregexp.html#details</ulink
->. Note that &klipper; does not support the wildcard mode mentioned on this page.</para
-></note
-> 
-
-<para
->Edit the regular expression as described above. To add a command to execute, <mousebutton
->right</mousebutton
-> click, select <guimenuitem
->Add Command</guimenuitem
-> and edit the command which appears in the tree under the regular expression.</para>
-
-<para
->Note that <token
->%s</token
-> in the command line is replaced with the clipboard contents, &eg; if your command definition is <userinput
-><command
->kedit</command
-> <token
->%s</token
-></userinput
-> and your clipboard contents are <filename
->/home/phil/textfile</filename
->, the command <userinput
-><command
->kedit</command
-> <filename
->/home/phil/textfile</filename
-></userinput
-> will be run. To include <token
->%s</token
-> in the command line, escape it with a backslash, as so: <userinput
->\%s</userinput
->.</para
-></listitem>
+<term>Adding Expressions/Actions</term>
+<listitem><para>Click the <guibutton>Add Action</guibutton> button to add a regular expression for &klipper; to match. &klipper; uses &Qt;'s <classname>QRegExp</classname>, which understands most regular expressions as you would use in <application>grep</application> or <application>egrep</application> for instance.</para>
+<para>You can add a description of the regular expression type (&eg; <quote>HTTP URL</quote>) by <mousebutton>left</mousebutton> clicking in the <guilabel>Description</guilabel> column.</para>   
+
+<note><para>You can find detailed information about the use of <classname>QRegExp</classname> regular expressions at <ulink url="http://doc.trolltech.com/qregexp.html#details">http://doc.trolltech.com/qregexp.html#details</ulink>. Note that &klipper; does not support the wildcard mode mentioned on this page.</para></note> 
+
+<para>Edit the regular expression as described above. To add a command to execute, <mousebutton>right</mousebutton> click, select <guimenuitem>Add Command</guimenuitem> and edit the command which appears in the tree under the regular expression.</para>
+
+<para>Note that <token>%s</token> in the command line is replaced with the clipboard contents, &eg; if your command definition is <userinput><command>kedit</command> <token>%s</token></userinput> and your clipboard contents are <filename>/home/phil/textfile</filename>, the command <userinput><command>kedit</command> <filename>/home/phil/textfile</filename></userinput> will be run. To include <token>%s</token> in the command line, escape it with a backslash, as so: <userinput>\%s</userinput>.</para></listitem>
 </varlistentry>
 
-<varlistentry
-><term
-><guibutton
->Advanced...</guibutton
-></term>
-<listitem
-><para
->Brings up the <guilabel
->Disable Actions for windows of type WM_CLASS</guilabel
-> dialogue.</para>
-<para
->Some programs, such as &konqueror;, use the clipboard internally. If you get unwanted &klipper; pop-ups all the time when using a certain application, do the following:</para>
+<varlistentry><term><guibutton>Advanced...</guibutton></term>
+<listitem><para>Brings up the <guilabel>Disable Actions for windows of type WM_CLASS</guilabel> dialogue.</para>
+<para>Some programs, such as &konqueror;, use the clipboard internally. If you get unwanted &klipper; pop-ups all the time when using a certain application, do the following:</para>
 
 <orderedlist>
-<listitem
-><para
->Open the application.</para
-></listitem>
-<listitem
-><para
->From a terminal, run <userinput
-><command
->xprop</command
-> | <command
->grep</command
-> <parameter
->WM_CLASS</parameter
-></userinput
-> and then click on the window of the application you are running.</para
-></listitem
-> 
-<listitem
-><para
->The first string after the equals sign is the one to enter.</para
-></listitem>
+<listitem><para>Open the application.</para></listitem>
+<listitem><para>From a terminal, run <userinput><command>xprop</command> | <command>grep</command> <parameter>WM_CLASS</parameter></userinput> and then click on the window of the application you are running.</para></listitem> 
+<listitem><para>The first string after the equals sign is the one to enter.</para></listitem>
 </orderedlist>
 
-<para
->Once the WM_CLASS is added, no more actions will be generated for windows of that application.</para>
+<para>Once the WM_CLASS is added, no more actions will be generated for windows of that application.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -536,44 +246,23 @@ selected, the clipboard functions in the &UNIX; mode; if not, the
 </sect1>
 
 <sect1 id="shortcuts-tab">
-<title
->Shortcuts Options</title>
+<title>Shortcuts Options</title>
 
-<para
->The shortcuts tab allows you to change the keyboard shortcuts which are used to access &klipper; functions. You can change the shortcut to one of three things:</para>
+<para>The shortcuts tab allows you to change the keyboard shortcuts which are used to access &klipper; functions. You can change the shortcut to one of three things:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->None</guilabel
-></term>
-<listitem
-><para
->The selected action cannot be accessed directly from the keyboard</para
-></listitem>
+<term><guilabel>None</guilabel></term>
+<listitem><para>The selected action cannot be accessed directly from the keyboard</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Default</guilabel
-></term>
-<listitem
-><para
->The selected action uses &klipper;'s default key. These are the shortcuts referred to in this manual.</para
-></listitem>
+<term><guilabel>Default</guilabel></term>
+<listitem><para>The selected action uses &klipper;'s default key. These are the shortcuts referred to in this manual.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Custom</guilabel
-></term>
-<listitem
-><para
->The selected action is assigned to the keys you choose.</para>
-<para
->To choose a custom key for the action you have selected, click on the representation of a key in the lower right of the screen to activate it, and type the desired key combination on your keyboard, as in any &kde; application. </para
-> </listitem>
+<term><guilabel>Custom</guilabel></term>
+<listitem><para>The selected action is assigned to the keys you choose.</para>
+<para>To choose a custom key for the action you have selected, click on the representation of a key in the lower right of the screen to activate it, and type the desired key combination on your keyboard, as in any &kde; application. </para> </listitem>
 </varlistentry>
 </variablelist>
 
@@ -581,87 +270,51 @@ selected, the clipboard functions in the &UNIX; mode; if not, the
 </chapter>
 
 <chapter id="credits">
-<title
->Credits and Licence</title>
-
-<para
->&klipper; </para>
-<para
->Program copyright 1998 Andrew Stanley-Jones <email
->asj@cban.com</email
-> </para>
-<para
->Program copyright 1998-2000 &Carsten.Pfeiffer; &Carsten.Pfeiffer.mail;</para>
-<para
->Currently maintained by &Carsten.Pfeiffer; </para>
-
-<para
->Documentation copyright 2000-2003 &Philip.Rodrigues; &Philip.Rodrigues.mail;</para>
+<title>Credits and Licence</title>
+
+<para>&klipper; </para>
+<para>Program copyright 1998 Andrew Stanley-Jones <email>asj@cban.com</email> </para>
+<para>Program copyright 1998-2000 &Carsten.Pfeiffer; &Carsten.Pfeiffer.mail;</para>
+<para>Currently maintained by &Carsten.Pfeiffer; </para>
+
+<para>Documentation copyright 2000-2003 &Philip.Rodrigues; &Philip.Rodrigues.mail;</para>
 &underFDL; &underGPL; </chapter>
 
 <appendix id="installation">
-<title
->Installation</title>
+<title>Installation</title>
 
 <sect1 id="getting-klipper">
-<title
->How to obtain &klipper;</title>
+<title>How to obtain &klipper;</title>
 &install.intro.documentation; </sect1>
 
 <sect1 id="compilation">
-<title
->Compilation and Installation</title>
-<para
->&klipper; should compile and install along with the tdebase package, and appear on your &kde; panel (&kicker;) when you run &kde; 3. If it does not appear, you can start it by selecting <menuchoice
-><guimenu
->Panel Menu</guimenu
-><guisubmenu
->Add</guisubmenu
-><guisubmenu
->Applet</guisubmenu
-><guimenuitem
->Klipper</guimenuitem
-> </menuchoice
-> in any context menu in &kicker;, the &kde; Panel.</para
-> 
+<title>Compilation and Installation</title>
+<para>&klipper; should compile and install along with the tdebase package, and appear on your &kde; panel (&kicker;) when you run &kde; 3. If it does not appear, you can start it by selecting <menuchoice><guimenu>Panel Menu</guimenu><guisubmenu>Add</guisubmenu><guisubmenu>Applet</guisubmenu><guimenuitem>Klipper</guimenuitem> </menuchoice> in any context menu in &kicker;, the &kde; Panel.</para> 
 
 <screenshot>
-<screeninfo
->&klipper; icon</screeninfo>
+<screeninfo>&klipper; icon</screeninfo>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="screenshot.png" format="PNG"/>
 	  </imageobject>
 	  <textobject>
-	    <phrase
->Screenshot</phrase>
+	    <phrase>Screenshot</phrase>
 	  </textobject>
 	</mediaobject>
 </screenshot>
 
 <!--
-<para
->To remove &klipper; from your panel, select <guimenuitem
->Remove
-Klipper</guimenuitem
-> from the context menu (accessed by left-clicking the
+<para>To remove &klipper; from your panel, select <guimenuitem>Remove
+Klipper</guimenuitem> from the context menu (accessed by left-clicking the
 small handle to the left of the &klipper; icon).</para>
 -->
 <!--
-<para
->To disable this, simply remove the file 
-<filename
->$<envar
->TDEDIR</envar
->/share/autostart/klipper.desktop</filename>
-or create a file <filename
->$<envar
->HOME</envar
->/share/autostart/klipper.desktop</filename>
+<para>To disable this, simply remove the file 
+<filename>$<envar>TDEDIR</envar>/share/autostart/klipper.desktop</filename>
+or create a file <filename>$<envar>HOME</envar>/share/autostart/klipper.desktop</filename>
 with the following contents:
 
-<programlisting
->
+<programlisting>
 [Desktop Entry]
 Hidden=true
 </programlisting>
diff --git a/tde-i18n-en_GB/docs/tdebase/kmenuedit/index.docbook b/tde-i18n-en_GB/docs/tdebase/kmenuedit/index.docbook
index a76c87faf69..a1cd85c60c5 100644
--- a/tde-i18n-en_GB/docs/tdebase/kmenuedit/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kmenuedit/index.docbook
@@ -4,540 +4,194 @@
   <!ENTITY kappname "&kmenuedit;">
   <!ENTITY package "tdebase">
   <!ENTITY % addindex "IGNORE">
-  <!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+  <!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <book lang="&language;">
 
 <bookinfo>
 
-<title
->The &kmenuedit; Handbook</title>
+<title>The &kmenuedit; Handbook</title>
 
 <authorgroup>
-<author
->&Milos.Prudek; &Milos.Prudek.mail;</author>
-
-<othercredit role="reviewer"
->&Lauri.Watts; &Lauri.Watts.mail; </othercredit>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Milos.Prudek; &Milos.Prudek.mail;</author>
+
+<othercredit role="reviewer">&Lauri.Watts; &Lauri.Watts.mail; </othercredit>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
 <copyright>
-<year
->2000</year>
-<holder
->&Milos.Prudek;</holder>
+<year>2000</year>
+<holder>&Milos.Prudek;</holder>
 </copyright>
 
-<legalnotice
->&FDLNotice;</legalnotice>
+<legalnotice>&FDLNotice;</legalnotice>
 
-<date
->2000-12-14</date>
-<releaseinfo
->0.00.01</releaseinfo>
+<date>2000-12-14</date>
+<releaseinfo>0.00.01</releaseinfo>
 
-<abstract
-><para
->&kmenuedit; allows editing of the &kde; Main menu. </para
-></abstract>
+<abstract><para>&kmenuedit; allows editing of the &kde; Main menu. </para></abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KDE Menu Editor</keyword>
-<keyword
->kmenuedit</keyword>
-<keyword
->application</keyword>
-<keyword
->program</keyword>
-<keyword
->menu</keyword>
-<keyword
->kicker</keyword>
+<keyword>KDE</keyword>
+<keyword>KDE Menu Editor</keyword>
+<keyword>kmenuedit</keyword>
+<keyword>application</keyword>
+<keyword>program</keyword>
+<keyword>menu</keyword>
+<keyword>kicker</keyword>
 
 </keywordset>
 
 </bookinfo>
 
 <chapter id="introduction">
-<title
->Introduction</title>
-
-<para
->&kmenuedit; allows editing of &kde; Main menu.</para>
-
-<para
->&kmenuedit; can be started either by right-clicking <inlinemediaobject
-><imageobject
-><imagedata fileref="i_k_button.png" format="PNG"/></imageobject
-></inlinemediaobject
-> the <guiicon
->K</guiicon
-> Button, or by choosing <guimenuitem
->Menu Edit</guimenuitem
-> from the <guisubmenu
->System</guisubmenu
-> submenu of the <guimenu
->Main</guimenu
-> menu.</para>
-
-<para
->&kmenuedit; allows you to:</para>
+<title>Introduction</title>
+
+<para>&kmenuedit; allows editing of &kde; Main menu.</para>
+
+<para>&kmenuedit; can be started either by right-clicking <inlinemediaobject><imageobject><imagedata fileref="i_k_button.png" format="PNG"/></imageobject></inlinemediaobject> the <guiicon>K</guiicon> Button, or by choosing <guimenuitem>Menu Edit</guimenuitem> from the <guisubmenu>System</guisubmenu> submenu of the <guimenu>Main</guimenu> menu.</para>
+
+<para>&kmenuedit; allows you to:</para>
 
 <itemizedlist>
-<listitem
-><para
->View and edit current <guimenu
->Main</guimenu
-> menu</para
-></listitem>
-<listitem
-><para
-><guimenuitem
->Cut</guimenuitem
->, <guimenuitem
->Copy</guimenuitem
-> and <guimenuitem
->paste</guimenuitem
-> menu items</para
-></listitem>
-<listitem
-><para
->Create and delete submenus</para
-></listitem>
+<listitem><para>View and edit current <guimenu>Main</guimenu> menu</para></listitem>
+<listitem><para><guimenuitem>Cut</guimenuitem>, <guimenuitem>Copy</guimenuitem> and <guimenuitem>paste</guimenuitem> menu items</para></listitem>
+<listitem><para>Create and delete submenus</para></listitem>
 </itemizedlist>
 
 </chapter>
 
 <chapter id="using-kmenuedit">
-<title
->Using &kmenuedit;</title>
+<title>Using &kmenuedit;</title>
 
-<para
->The left application panel shows the Main menu structure. When you browse items in the left panel, the right panel shows detailed information for the highlighted menu item.</para>
+<para>The left application panel shows the Main menu structure. When you browse items in the left panel, the right panel shows detailed information for the highlighted menu item.</para>
 
 <sect1 id="details-general">
-<title
->General program information</title>
+<title>General program information</title>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Name</guilabel
-></term>
-<listitem
-><para
->This is the name of your program as it appears in the <guimenu
->Main</guimenu
-> menu. It can be different from the real executable name. For instance the name of <command
->mc</command
-> executable is "<application
->Midnight Commander</application
->".</para
-></listitem>
+<term><guilabel>Name</guilabel></term>
+<listitem><para>This is the name of your program as it appears in the <guimenu>Main</guimenu> menu. It can be different from the real executable name. For instance the name of <command>mc</command> executable is "<application>Midnight Commander</application>".</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Comment</guilabel
-></term>
-<listitem
-><para
->Describe the program in greater detail in this field. This is entirely optional.</para
-></listitem>
+<term><guilabel>Comment</guilabel></term>
+<listitem><para>Describe the program in greater detail in this field. This is entirely optional.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Command</guilabel
-></term>
-<listitem
-><para
->This is the name of the executable program. Make sure that you have permission to run the program.</para
-></listitem>
+<term><guilabel>Command</guilabel></term>
+<listitem><para>This is the name of the executable program. Make sure that you have permission to run the program.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Type</guilabel
-></term>
-<listitem
-><para
->This field is similar to the Comment field. Describe the type of your program here.</para
-></listitem>
+<term><guilabel>Type</guilabel></term>
+<listitem><para>This field is similar to the Comment field. Describe the type of your program here.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Work Path</guilabel
-></term>
-<listitem
-><para
->Specify the work path of the program. This will be the current path when the program launches. It does not need to be the same as the executable location.</para
-></listitem>
+<term><guilabel>Work Path</guilabel></term>
+<listitem><para>Specify the work path of the program. This will be the current path when the program launches. It does not need to be the same as the executable location.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guiicon
->Icon List</guiicon
-></term>
-<listitem
-><para
-><inlinemediaobject
-><imageobject
-><imagedata 
-fileref="icon_sets.png" format="PNG"/></imageobject
-></inlinemediaobject
-> Click this icon to display a choice of icons. Choose an icon for your program.</para
-></listitem>
+<term><guiicon>Icon List</guiicon></term>
+<listitem><para><inlinemediaobject><imageobject><imagedata 
+fileref="icon_sets.png" format="PNG"/></imageobject></inlinemediaobject> Click this icon to display a choice of icons. Choose an icon for your program.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Run in Terminal</guilabel
-></term>
-<listitem
-><para
->You must check this if your program requires terminal emulator in order to run. This mainly applies to <link linkend="gloss-console-application"
->console applications</link
->.</para
-></listitem>
+<term><guilabel>Run in Terminal</guilabel></term>
+<listitem><para>You must check this if your program requires terminal emulator in order to run. This mainly applies to <link linkend="gloss-console-application">console applications</link>.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Terminal Options</guilabel
-></term>
-<listitem
-><para
->Put all terminal options in this field.</para
-></listitem>
+<term><guilabel>Terminal Options</guilabel></term>
+<listitem><para>Put all terminal options in this field.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Run as different user</guilabel
-></term>
-<listitem
-><para
->If you want to run this program as a different user (not you), check this checkbox, and provide the username in the <guilabel
->Username</guilabel
-> field.</para
-></listitem>
+<term><guilabel>Run as different user</guilabel></term>
+<listitem><para>If you want to run this program as a different user (not you), check this checkbox, and provide the username in the <guilabel>Username</guilabel> field.</para></listitem>
 </varlistentry>
 </variablelist>
 
-<para
->You can assign a special keyboard shortcut to launch your program.</para>
+<para>You can assign a special keyboard shortcut to launch your program.</para>
 
-<para
->Click the empty button to the right of the <guilabel
->Current key</guilabel
-> checkbox and press the key combination on your keyboard that you want to be assigned to your program.</para>
+<para>Click the empty button to the right of the <guilabel>Current key</guilabel> checkbox and press the key combination on your keyboard that you want to be assigned to your program.</para>
 
-<para
->A dialogue box will pop up, allowing you to assign a second keybinding to the same item by checking the <guilabel
->Alternate</guilabel
-> button. This might be useful, for example, if you often switch keyboard maps, and some shortcuts are not as convenient to type at all times.</para>
+<para>A dialogue box will pop up, allowing you to assign a second keybinding to the same item by checking the <guilabel>Alternate</guilabel> button. This might be useful, for example, if you often switch keyboard maps, and some shortcuts are not as convenient to type at all times.</para>
 
-<para
->Click the <guiicon
->x</guiicon
-> to clear the shortcut, if you made a mistake. Check the <guilabel
->Multi-Key</guilabel
-> box if you want to assign a shortcut that uses more than one key.</para>
+<para>Click the <guiicon>x</guiicon> to clear the shortcut, if you made a mistake. Check the <guilabel>Multi-Key</guilabel> box if you want to assign a shortcut that uses more than one key.</para>
 
-<para
->By default the <guilabel
->Auto-Close</guilabel
-> box is checked, and the dialogue will close when you have selected a keybinding. Uncheck it if you want the dialogue to stay open.</para>
+<para>By default the <guilabel>Auto-Close</guilabel> box is checked, and the dialogue will close when you have selected a keybinding. Uncheck it if you want the dialogue to stay open.</para>
 
-</sect1
-> 
+</sect1> 
 
 </chapter>
 
 <chapter id="menu-reference">
-<title
->Menu Reference</title>
+<title>Menu Reference</title>
 
 <variablelist>
 <varlistentry id="file-new-item">
-<term
-><menuchoice
-><guimenu
-><inlinemediaobject
-><imageobject
-><imagedata fileref="i_new_item.png" format="PNG"/></imageobject
-></inlinemediaobject
-> File</guimenu
-> <guimenuitem
->New Item</guimenuitem
-> </menuchoice
-></term
-> <listitem
-><para
-><action
->Adds new menu item.</action
-></para
-></listitem>
+<term><menuchoice><guimenu><inlinemediaobject><imageobject><imagedata fileref="i_new_item.png" format="PNG"/></imageobject></inlinemediaobject> File</guimenu> <guimenuitem>New Item</guimenuitem> </menuchoice></term> <listitem><para><action>Adds new menu item.</action></para></listitem>
 </varlistentry>
 
 <varlistentry id="file-new-submenu">
-<term
-><menuchoice
-><guimenu
-><inlinemediaobject
-><imageobject
-><imagedata fileref="i_new_submenu.png" format="PNG"/></imageobject
-></inlinemediaobject
->File</guimenu
-> <guimenuitem
->New Submenu</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
->Adds new submenu.</action
-></para
-></listitem>
+<term><menuchoice><guimenu><inlinemediaobject><imageobject><imagedata fileref="i_new_submenu.png" format="PNG"/></imageobject></inlinemediaobject>File</guimenu> <guimenuitem>New Submenu</guimenuitem> </menuchoice></term>
+<listitem><para><action>Adds new submenu.</action></para></listitem>
 </varlistentry>
 
 <varlistentry id="file-quit">
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->Q</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Quit</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
->Quits</action
-> &kmenuedit;.</para
-></listitem>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Quit</guimenuitem> </menuchoice></term>
+<listitem><para><action>Quits</action> &kmenuedit;.</para></listitem>
 </varlistentry>
 
 <varlistentry id="edit-cut">
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->X</keycap
-></keycombo
-> </shortcut
-> <guimenu
-><inlinemediaobject
-><imageobject
-><imagedata fileref="i_cut.png" format="PNG"/></imageobject
-></inlinemediaobject
-> Edit</guimenu
-> <guimenuitem
->Cut</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
->Cuts the current menu item to the clipboard.</action
-> If you want to move menu item, you should first cut it to the clipboard, move to the destination place using the left panel, and use the <guimenuitem
->Paste</guimenuitem
-> function to paste the menu item from the clipboard.</para
-></listitem
-> 
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>X</keycap></keycombo> </shortcut> <guimenu><inlinemediaobject><imageobject><imagedata fileref="i_cut.png" format="PNG"/></imageobject></inlinemediaobject> Edit</guimenu> <guimenuitem>Cut</guimenuitem> </menuchoice></term>
+<listitem><para><action>Cuts the current menu item to the clipboard.</action> If you want to move menu item, you should first cut it to the clipboard, move to the destination place using the left panel, and use the <guimenuitem>Paste</guimenuitem> function to paste the menu item from the clipboard.</para></listitem> 
 </varlistentry>
 
 <varlistentry id="edit-copy">
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->C</keycap
-></keycombo
-> </shortcut
-> <guimenu
-><inlinemediaobject
-><imageobject
-><imagedata fileref="i_copy.png" format="PNG"/></imageobject
-></inlinemediaobject
-> Edit</guimenu
-> <guimenuitem
->Copy</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
->Copies the current menu item to the clipboard</action
->. You can later use the <guimenuitem
->Paste</guimenuitem
-> function to paste the copied menu itemfrom the clipboard to its destination. You can paste the same item many times.</para
-></listitem>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>C</keycap></keycombo> </shortcut> <guimenu><inlinemediaobject><imageobject><imagedata fileref="i_copy.png" format="PNG"/></imageobject></inlinemediaobject> Edit</guimenu> <guimenuitem>Copy</guimenuitem> </menuchoice></term>
+<listitem><para><action>Copies the current menu item to the clipboard</action>. You can later use the <guimenuitem>Paste</guimenuitem> function to paste the copied menu itemfrom the clipboard to its destination. You can paste the same item many times.</para></listitem>
 </varlistentry>
 
 <varlistentry id="edit-paste">
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->V</keycap
-></keycombo
-> </shortcut
-> <guimenu
-><inlinemediaobject
-><imageobject
-><imagedata fileref="i_paste.png" format="PNG"/></imageobject
-></inlinemediaobject
-> Edit</guimenu
-> <guimenuitem
->Paste</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
->Paste menu item from the clipboard</action
-> to currently selected place in the <guimenu
->Main</guimenu
-> menu. You must first use <guimenuitem
->Cut</guimenuitem
-> or <guimenuitem
->Copy</guimenuitem
-> before you can <guimenuitem
->Paste</guimenuitem
->.</para
-></listitem>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>V</keycap></keycombo> </shortcut> <guimenu><inlinemediaobject><imageobject><imagedata fileref="i_paste.png" format="PNG"/></imageobject></inlinemediaobject> Edit</guimenu> <guimenuitem>Paste</guimenuitem> </menuchoice></term>
+<listitem><para><action>Paste menu item from the clipboard</action> to currently selected place in the <guimenu>Main</guimenu> menu. You must first use <guimenuitem>Cut</guimenuitem> or <guimenuitem>Copy</guimenuitem> before you can <guimenuitem>Paste</guimenuitem>.</para></listitem>
 </varlistentry>
 
 <varlistentry id="edit-delete">
-<term
-><menuchoice
-><guimenu
-><inlinemediaobject
-><imageobject
-><imagedata fileref="i_delete.png" format="PNG"/></imageobject
-></inlinemediaobject
-> Edit</guimenu
-> <guimenuitem
->Delete</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
->Deletes currently selected menu item.</action
-></para
-></listitem>
+<term><menuchoice><guimenu><inlinemediaobject><imageobject><imagedata fileref="i_delete.png" format="PNG"/></imageobject></inlinemediaobject> Edit</guimenu> <guimenuitem>Delete</guimenuitem> </menuchoice></term>
+<listitem><para><action>Deletes currently selected menu item.</action></para></listitem>
 </varlistentry>
 </variablelist>
 &help.menu.documentation; <glossary id="glossary">
-<title
->Glossary</title
-> 
+<title>Glossary</title> 
 
 <glossentry id="gloss-terminal-emulator">
-<glossterm
->Terminal emulator</glossterm>
+<glossterm>Terminal emulator</glossterm>
 <glossdef>
-<para
->Terminal emulator is simply a windowed shell; this is known as <quote
->command line window</quote
-> in some other environments. If you want to use the shell, you should know at least a few of the system-level commands for your operating system.</para>
+<para>Terminal emulator is simply a windowed shell; this is known as <quote>command line window</quote> in some other environments. If you want to use the shell, you should know at least a few of the system-level commands for your operating system.</para>
 </glossdef>
 </glossentry>
 
 <glossentry id="gloss-applet">
-<glossterm
->Applet</glossterm>
-<glossdef
-><para
->A small application that occupies very little memory and screen space, and at the same time gives you some useful information or provides a control shortcut. For instance the <application
->Clock</application
-> applet shows current time and date (and even a month diary if you click it), and <application
->System Monitor</application
-> applet shows how busy your machine currently is in real-time.</para
-> </glossdef
-> 
+<glossterm>Applet</glossterm>
+<glossdef><para>A small application that occupies very little memory and screen space, and at the same time gives you some useful information or provides a control shortcut. For instance the <application>Clock</application> applet shows current time and date (and even a month diary if you click it), and <application>System Monitor</application> applet shows how busy your machine currently is in real-time.</para> </glossdef> 
 </glossentry>
 
 <glossentry id="gloss-legacy-application">
-<glossterm
->Legacy Application</glossterm>
+<glossterm>Legacy Application</glossterm>
 <glossdef>
 
-<para
->An X-window application which was not written with &kde; in mind. Such applications run fine in &kde;. However, they are not warned automatically when you shut down your &kde; session. You therefore must not forget to save documents open in these applications before you log out from &kde;. </para
-> <para
->Additionally, many of these applications do not support copying and pasting from &kde; compliant applications. &Netscape; 4.x browser is a prominent example of such application <footnote
-><para
->Some <ulink url="http://www.gnome.org"
->GNOME</ulink
-> applications may provide limited interoperability with the &kde;.</para
-></footnote
->.</para>
+<para>An X-window application which was not written with &kde; in mind. Such applications run fine in &kde;. However, they are not warned automatically when you shut down your &kde; session. You therefore must not forget to save documents open in these applications before you log out from &kde;. </para> <para>Additionally, many of these applications do not support copying and pasting from &kde; compliant applications. &Netscape; 4.x browser is a prominent example of such application <footnote><para>Some <ulink url="http://www.gnome.org">GNOME</ulink> applications may provide limited interoperability with the &kde;.</para></footnote>.</para>
 </glossdef>
 </glossentry>
 
 <glossentry id="gloss-console-application">
-<glossterm
->Console Application</glossterm>
+<glossterm>Console Application</glossterm>
 <glossdef>
 
-<para
->Application originally written for non-graphic, text oriented environment. Such applications run fine in &kde;. They must run within console emulator, like &konsole;. They are not warned automatically when you shut down your &kde; session. You therefore must not forget to save documents open in these applications before you log out from the &kde;.</para>
-
-<para
->Console applications support copying and pasting from KDE-compliant applications.Simply mark the text in the console application with your mouse, switch to the KDE-compliant application and press <keycombo action="simul"
->&Ctrl; <keycap
->V</keycap
-></keycombo
-> to paste the text. If you want to copy from &kde; application to a console application, first mark the text with your mouse, press <keycombo action="simul"
->&Ctrl; <keycap
->C</keycap
-></keycombo
->, switch to the console application and press the middle button on your mouse<footnote
-><para
->If your mouse does not have a middle button, you must press <mousebutton
->left</mousebutton
-> and <mousebutton
->right</mousebutton
-> button at the same time. This is called <quote
->middle button emulation</quote
-> and it must be supported by your operating system to work.</para
-></footnote
->.</para>
+<para>Application originally written for non-graphic, text oriented environment. Such applications run fine in &kde;. They must run within console emulator, like &konsole;. They are not warned automatically when you shut down your &kde; session. You therefore must not forget to save documents open in these applications before you log out from the &kde;.</para>
+
+<para>Console applications support copying and pasting from KDE-compliant applications.Simply mark the text in the console application with your mouse, switch to the KDE-compliant application and press <keycombo action="simul">&Ctrl; <keycap>V</keycap></keycombo> to paste the text. If you want to copy from &kde; application to a console application, first mark the text with your mouse, press <keycombo action="simul">&Ctrl; <keycap>C</keycap></keycombo>, switch to the console application and press the middle button on your mouse<footnote><para>If your mouse does not have a middle button, you must press <mousebutton>left</mousebutton> and <mousebutton>right</mousebutton> button at the same time. This is called <quote>middle button emulation</quote> and it must be supported by your operating system to work.</para></footnote>.</para>
 
 </glossdef>
 </glossentry>
@@ -547,47 +201,28 @@ fileref="icon_sets.png" format="PNG"/></imageobject
 
 <chapter id="credits">
 
-<title
->Credits and Licence</title>
+<title>Credits and Licence</title>
 
-<para
->&kmenuedit; </para>
-<para
->Program copyright &copy; 2002, &Raffaele.Sandrini;</para>
+<para>&kmenuedit; </para>
+<para>Program copyright &copy; 2002, &Raffaele.Sandrini;</para>
 
-<para
->Contributors:</para>
+<para>Contributors:</para>
 <itemizedlist>
-<listitem
-><para
->&Matthias.Elter; &Matthias.Elter.mail; - Original Author</para
-> 
+<listitem><para>&Matthias.Elter; &Matthias.Elter.mail; - Original Author</para> 
 </listitem>
-<listitem
-><para
->&Matthias.Ettrich; &Matthias.Ettrich.mail;</para>
+<listitem><para>&Matthias.Ettrich; &Matthias.Ettrich.mail;</para>
 </listitem>
-<listitem
-><para
->&Daniel.M.Duley; &Daniel.M.Duley.mail;</para>
+<listitem><para>&Daniel.M.Duley; &Daniel.M.Duley.mail;</para>
 </listitem>
-<listitem
-><para
->&Preston.Brown; &Preston.Brown.mail;</para>
+<listitem><para>&Preston.Brown; &Preston.Brown.mail;</para>
 </listitem>
 </itemizedlist>
 
-<para
->Documentation copyright &copy; 2000 &Milos.Prudek;</para>
+<para>Documentation copyright &copy; 2000 &Milos.Prudek;</para>
 
-<para
->Updated for &kde; 3.0 by &Lauri.Watts; &Lauri.Watts.mail; 2002</para>
+<para>Updated for &kde; 3.0 by &Lauri.Watts; &Lauri.Watts.mail; 2002</para>
 
-<para
->Conversion to British English: John Knight <email
->anarchist_tomato@herzeleid.net</email
-></para
-> 
+<para>Conversion to British English: John Knight <email>anarchist_tomato@herzeleid.net</email></para> 
 &underFDL; &underGPL; </chapter>
 
 
diff --git a/tde-i18n-en_GB/docs/tdebase/konqueror/basics.docbook b/tde-i18n-en_GB/docs/tdebase/konqueror/basics.docbook
index 9ef927158d5..88312563854 100644
--- a/tde-i18n-en_GB/docs/tdebase/konqueror/basics.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/konqueror/basics.docbook
@@ -2,590 +2,174 @@
 
 <chapterinfo>
 <authorgroup>
-<author
->&Pamela.Roberts;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Pamela.Roberts;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
-<date
->2003-10-20</date
-> <releaseinfo
->3.2</releaseinfo
-> </chapterinfo>
-
-<title
->&konqueror; Basics</title>
-
-<important
-><para
->Like all &kde; applications, &konqueror; is highly configurable. This document describes how &konqueror; behaves with the normal, default, settings.</para>
-<para
->A three button mouse can be useful when you are running &konqueror; or any other &kde; application. If your mouse only has two buttons then you should be able to set your system up so that you can simulate a &MMB; by pressing both buttons at the same time. </para>
-<para
->If you are used to having to double-click to perform an action, then take care, because in common with the rest of &kde;, &konqueror; defaults to single-clicking.</para
-></important>
+<date>2003-10-20</date> <releaseinfo>3.2</releaseinfo> </chapterinfo>
+
+<title>&konqueror; Basics</title>
+
+<important><para>Like all &kde; applications, &konqueror; is highly configurable. This document describes how &konqueror; behaves with the normal, default, settings.</para>
+<para>A three button mouse can be useful when you are running &konqueror; or any other &kde; application. If your mouse only has two buttons then you should be able to set your system up so that you can simulate a &MMB; by pressing both buttons at the same time. </para>
+<para>If you are used to having to double-click to perform an action, then take care, because in common with the rest of &kde;, &konqueror; defaults to single-clicking.</para></important>
 
 <sect1 id="konq-start">
-<title
->Starting &konqueror;</title>
+<title>Starting &konqueror;</title>
 
-<para
->Being a combined File Manager and Browser, &konqueror; will automatically switch between the two modes as needed when it is running, but it is convenient to be able to choose which mode is to be used when you start it up.</para>
+<para>Being a combined File Manager and Browser, &konqueror; will automatically switch between the two modes as needed when it is running, but it is convenient to be able to choose which mode is to be used when you start it up.</para>
 
 <itemizedlist>
-<listitem
-><para
->If you have a <guiicon
->house</guiicon
-> shaped icon on the panel or desktop, then <mousebutton
->left</mousebutton
-> click on it to open &konqueror; as a file manager.</para
-></listitem>
-
-<listitem
-><para
->Or <mousebutton
->left</mousebutton
-> click on <guiicon
->world </guiicon
-> shaped icon on the panel or desktop to open &konqueror; in browser mode.</para
-></listitem>
-
-<listitem
-><para
->From the <guimenu
->K</guimenu
-> menu, select <menuchoice
-><guisubmenu
->Internet</guisubmenu
-><guimenuitem
->Konqueror Web Browser</guimenuitem
-></menuchoice
-> to start it as a browser, or <guimenuitem
->Home</guimenuitem
-> to launch &konqueror; in file manager mode. </para
-></listitem>
-
-<listitem
-><para
-><keycombo action="simul"
->&Alt;<keycap
->F2</keycap
-></keycombo
-> will open a <guilabel
->Run Command</guilabel
-> dialogue box, type <userinput
-><command
->konqueror</command
-></userinput
-> (lower case) and press <keycap
->Enter</keycap
-> or the <guibutton
->Run</guibutton
-> button to start in file manager mode, or just enter a &URL; such as <userinput
->http://www.konqueror.org</userinput
-> to start &konqueror; as a browser.</para
-></listitem>
+<listitem><para>If you have a <guiicon>house</guiicon> shaped icon on the panel or desktop, then <mousebutton>left</mousebutton> click on it to open &konqueror; as a file manager.</para></listitem>
+
+<listitem><para>Or <mousebutton>left</mousebutton> click on <guiicon>world </guiicon> shaped icon on the panel or desktop to open &konqueror; in browser mode.</para></listitem>
+
+<listitem><para>From the <guimenu>K</guimenu> menu, select <menuchoice><guisubmenu>Internet</guisubmenu><guimenuitem>Konqueror Web Browser</guimenuitem></menuchoice> to start it as a browser, or <guimenuitem>Home</guimenuitem> to launch &konqueror; in file manager mode. </para></listitem>
+
+<listitem><para><keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo> will open a <guilabel>Run Command</guilabel> dialogue box, type <userinput><command>konqueror</command></userinput> (lower case) and press <keycap>Enter</keycap> or the <guibutton>Run</guibutton> button to start in file manager mode, or just enter a &URL; such as <userinput>http://www.konqueror.org</userinput> to start &konqueror; as a browser.</para></listitem>
 
 </itemizedlist>
 
-<para
->&konqueror; is also started automatically when you <mousebutton
->left</mousebutton
-> click on a desktop icon that represents a folder, such as a hard disk drive or the <guiicon
->Trash</guiicon
-> icon. </para>
+<para>&konqueror; is also started automatically when you <mousebutton>left</mousebutton> click on a desktop icon that represents a folder, such as a hard disk drive or the <guiicon>Trash</guiicon> icon. </para>
 
 
 </sect1>
 
 <sect1 id="parts">
-<title
->The Parts of &konqueror;</title>
+<title>The Parts of &konqueror;</title>
 
-<para
->A brief look at the main parts of &konqueror;'s window:</para>
+<para>A brief look at the main parts of &konqueror;'s window:</para>
 
 <mediaobject>
-<imageobject
-><imagedata format="PNG" fileref="parts.png"/></imageobject>
+<imageobject><imagedata format="PNG" fileref="parts.png"/></imageobject>
 <textobject>
-<phrase
->Here's a screenshot of &konqueror;</phrase>
+<phrase>Here's a screenshot of &konqueror;</phrase>
 </textobject>
 </mediaobject>
 
-<para
->The <interface
->Titlebar</interface
-> is the strip across the top of &konqueror;'s window, and operates in the same way as for other &kde; applications. <mousebutton
->Right</mousebutton
-> click on the central portion to bring up the neat Titlebar menu.</para>
-
-<para
->The <interface
->Menubar</interface
-> is the strip containing the names of the drop-down menus. <mousebutton
->Left</mousebutton
-> click on a name to alternately show and hide that menu, or use <keycombo action="simul"
->&Alt;<keycap
->the underlined letter</keycap
-></keycombo
-> in the name as a hot key, for example <keycombo action="simul"
->&Alt;<keycap
->E</keycap
-></keycombo
-> to show the <guimenu
->Edit</guimenu
-> menu. The various menus are described in the <link linkend="menubar"
->Menubar</link
-> section of this document.</para>
-
-<para
->The <interface
->Toolbar</interface
-> contains icons for commonly used operations. <mousebutton
->Left</mousebutton
-> clicking on an icon will activate it. If you have enabled tooltips in the Control Centre <menuchoice
-><guimenu
-> Appearance &amp; Themes</guimenu
-><guisubmenu
->Style</guisubmenu
-></menuchoice
-> dialogue a brief description of what that icon does will appear when you hover the pointer over it.</para>
-
-<para
->Some icons, for example the Up and Back icons in the previous screenshot, have a small black triangle at their bottom right corner. If you hold the &LMB; pressed while the cursor is over this type of icon a small dropdown menu will appear.</para
-> <para
-><mousebutton
->Right</mousebutton
-> clicking on the <interface
->Toolbar </interface
-> will bring up the <link linkend="rmb-menus"
-><guilabel
->Toolbar Menu</guilabel
-></link
-> which you can use to change the <interface
->Toolbar</interface
->'s appearance and position.</para>
-
-<para
->The <interface
->Location Toolbar</interface
-> shows the path to the directory, &URL; or file being viewed. You can type a path or &URL; here and press &Enter; or <mousebutton
->left</mousebutton
-> click on the <guiicon
->Go</guiicon
-> icon at the right hand end of the <interface
->Location Toolbar</interface
-> to go to it. The black icon at the left hand end of the <interface
->Location Toolbar</interface
-> clears the text entry box.</para>
-
-<para
->The <interface
->Bookmark Toolbar</interface
-> is the area under the <interface
->Location Toolbar</interface
-> in the previous screenshot. You can add frequently used bookmarks here, see the <link linkend="orgbmark"
->Organising Your Bookmarks</link
-> section of this document.</para>
-
-<para
->The <interface
->Window</interface
-> is the main area of &konqueror; and can show you the contents of a directory, web page, document or image. Using the <link linkend="menu-window"
-><guimenu
->Window</guimenu
-></link
-> menu you can split &konqueror;'s main window into one or more separate views, useful for drag and drop operations, or set it to contain two or more tabbed views. </para>
-
-<para
->The <interface
->Status Bar</interface
-> runs across the bottom of the &konqueror;'s window and often shows general information about whatever the mouse pointer is hovering over. If you have split the main window into a number of views you will get an Status Bar for each view, and it will include a small green light at the left hand end to show which is the <quote
->active</quote
-> view. <mousebutton
->Right</mousebutton
-> clicking on the Status Bar brings up the Status Bar <link linkend="rmb-menus"
-><mousebutton
->Right</mousebutton
-> Mouse Button Menu</link
->.</para>
-
-<note
-><para
->Don't worry if your &konqueror; doesn't look exactly like this screenshot, it is highly configurable. In particular:</para>
+<para>The <interface>Titlebar</interface> is the strip across the top of &konqueror;'s window, and operates in the same way as for other &kde; applications. <mousebutton>Right</mousebutton> click on the central portion to bring up the neat Titlebar menu.</para>
+
+<para>The <interface>Menubar</interface> is the strip containing the names of the drop-down menus. <mousebutton>Left</mousebutton> click on a name to alternately show and hide that menu, or use <keycombo action="simul">&Alt;<keycap>the underlined letter</keycap></keycombo> in the name as a hot key, for example <keycombo action="simul">&Alt;<keycap>E</keycap></keycombo> to show the <guimenu>Edit</guimenu> menu. The various menus are described in the <link linkend="menubar">Menubar</link> section of this document.</para>
+
+<para>The <interface>Toolbar</interface> contains icons for commonly used operations. <mousebutton>Left</mousebutton> clicking on an icon will activate it. If you have enabled tooltips in the Control Centre <menuchoice><guimenu> Appearance &amp; Themes</guimenu><guisubmenu>Style</guisubmenu></menuchoice> dialogue a brief description of what that icon does will appear when you hover the pointer over it.</para>
+
+<para>Some icons, for example the Up and Back icons in the previous screenshot, have a small black triangle at their bottom right corner. If you hold the &LMB; pressed while the cursor is over this type of icon a small dropdown menu will appear.</para> <para><mousebutton>Right</mousebutton> clicking on the <interface>Toolbar </interface> will bring up the <link linkend="rmb-menus"><guilabel>Toolbar Menu</guilabel></link> which you can use to change the <interface>Toolbar</interface>'s appearance and position.</para>
+
+<para>The <interface>Location Toolbar</interface> shows the path to the directory, &URL; or file being viewed. You can type a path or &URL; here and press &Enter; or <mousebutton>left</mousebutton> click on the <guiicon>Go</guiicon> icon at the right hand end of the <interface>Location Toolbar</interface> to go to it. The black icon at the left hand end of the <interface>Location Toolbar</interface> clears the text entry box.</para>
+
+<para>The <interface>Bookmark Toolbar</interface> is the area under the <interface>Location Toolbar</interface> in the previous screenshot. You can add frequently used bookmarks here, see the <link linkend="orgbmark">Organising Your Bookmarks</link> section of this document.</para>
+
+<para>The <interface>Window</interface> is the main area of &konqueror; and can show you the contents of a directory, web page, document or image. Using the <link linkend="menu-window"><guimenu>Window</guimenu></link> menu you can split &konqueror;'s main window into one or more separate views, useful for drag and drop operations, or set it to contain two or more tabbed views. </para>
+
+<para>The <interface>Status Bar</interface> runs across the bottom of the &konqueror;'s window and often shows general information about whatever the mouse pointer is hovering over. If you have split the main window into a number of views you will get an Status Bar for each view, and it will include a small green light at the left hand end to show which is the <quote>active</quote> view. <mousebutton>Right</mousebutton> clicking on the Status Bar brings up the Status Bar <link linkend="rmb-menus"><mousebutton>Right</mousebutton> Mouse Button Menu</link>.</para>
+
+<note><para>Don't worry if your &konqueror; doesn't look exactly like this screenshot, it is highly configurable. In particular:</para>
 
 <itemizedlist>
-<listitem
-><para
->You can use the <link linkend="menu-settings"
-><guimenu
->Settings</guimenu
-></link
-> menu to choose whether to show or hide the Menubar, Main Toolbar, Location Toolbar and Bookmark Toolbar, or even to add an Extra Toolbar.</para
-></listitem>
-<listitem
-><para
->You can also <quote
->flatten</quote
-> the toolbars by <mousebutton
->left</mousebutton
-> clicking on the vertical lines at the left hand end of the bars, or move them around by holding the &LMB; down while you drag these bars around. </para
-></listitem>
-<listitem
-><para
->This screenshot does not show the optional <link linkend="sidebar"
-> Navigation Panel</link
->.</para
-></listitem>
+<listitem><para>You can use the <link linkend="menu-settings"><guimenu>Settings</guimenu></link> menu to choose whether to show or hide the Menubar, Main Toolbar, Location Toolbar and Bookmark Toolbar, or even to add an Extra Toolbar.</para></listitem>
+<listitem><para>You can also <quote>flatten</quote> the toolbars by <mousebutton>left</mousebutton> clicking on the vertical lines at the left hand end of the bars, or move them around by holding the &LMB; down while you drag these bars around. </para></listitem>
+<listitem><para>This screenshot does not show the optional <link linkend="sidebar"> Navigation Panel</link>.</para></listitem>
 </itemizedlist>
 
-<para
->For more details of how to change &konqueror;'s appearance, see the <link linkend="config"
->Configuring &konqueror;</link
-> section</para
-></note>
+<para>For more details of how to change &konqueror;'s appearance, see the <link linkend="config">Configuring &konqueror;</link> section</para></note>
 
 </sect1>
 
 <sect1 id="bubble">
-<title
->Tooltips and What's This?</title>
-
-<para
->You can find out a lot about how &konqueror; works without needing to read this entire document if you take advantage of <guilabel
->Tooltips</guilabel
-> and the <guimenuitem
->What's This?</guimenuitem
-> feature.</para>
-
-<para
->If <guilabel
->Tooltips</guilabel
-> have been enabled in &kde; (TDE menu <menuchoice
-><guimenu
->Control Centre</guimenu
-><guisubmenu
->Appearance &amp; Themes</guisubmenu
-><guisubmenu
->Style</guisubmenu
-></menuchoice
->, <guilabel
->Style</guilabel
-> dialogue) then when you hover the mouse pointer over a Toolbar or Navigation Panel button it should bring up a terse description of what that button does.</para>
-
-<para
-><guimenuitem
->What's This?</guimenuitem
-> is invoked by the Menubar <menuchoice
-><guimenu
->Help</guimenu
-><guimenuitem
->What's This?</guimenuitem
-></menuchoice
-> item, by <keycombo action="simul"
->&Shift;<keycap
->F1</keycap
-></keycombo
->, or by just &LMB; clicking on the question mark near the top right hand corner of &konqueror;'s window. It changes the cursor to show a question mark alongside the arrow.</para>
-
-<para
->When this question mark is visible, a &LMB; click won't actually do anything until you have clicked on a control (or the text alongside it) that supports <guimenuitem
->What's This?</guimenuitem
->, in which case it will display a reasonably comprehensive description of what the control is supposed to do. Most of the dialogue boxes that &konqueror; brings up support the <guimenuitem
->What's This?</guimenuitem
-> feature.</para>
+<title>Tooltips and What's This?</title>
+
+<para>You can find out a lot about how &konqueror; works without needing to read this entire document if you take advantage of <guilabel>Tooltips</guilabel> and the <guimenuitem>What's This?</guimenuitem> feature.</para>
+
+<para>If <guilabel>Tooltips</guilabel> have been enabled in &kde; (TDE menu <menuchoice><guimenu>Control Centre</guimenu><guisubmenu>Appearance &amp; Themes</guisubmenu><guisubmenu>Style</guisubmenu></menuchoice>, <guilabel>Style</guilabel> dialogue) then when you hover the mouse pointer over a Toolbar or Navigation Panel button it should bring up a terse description of what that button does.</para>
+
+<para><guimenuitem>What's This?</guimenuitem> is invoked by the Menubar <menuchoice><guimenu>Help</guimenu><guimenuitem>What's This?</guimenuitem></menuchoice> item, by <keycombo action="simul">&Shift;<keycap>F1</keycap></keycombo>, or by just &LMB; clicking on the question mark near the top right hand corner of &konqueror;'s window. It changes the cursor to show a question mark alongside the arrow.</para>
+
+<para>When this question mark is visible, a &LMB; click won't actually do anything until you have clicked on a control (or the text alongside it) that supports <guimenuitem>What's This?</guimenuitem>, in which case it will display a reasonably comprehensive description of what the control is supposed to do. Most of the dialogue boxes that &konqueror; brings up support the <guimenuitem>What's This?</guimenuitem> feature.</para>
 
 </sect1>
 
 <sect1 id="lmb-mmb">
-<title
-><mousebutton
->Left</mousebutton
-> and <mousebutton
->Middle</mousebutton
-> Mouse Button Actions</title>
-
-<para
->If you click the &LMB; on an item in &konqueror;'s window that item will be <quote
->activated</quote
->. Thus</para>
+<title><mousebutton>Left</mousebutton> and <mousebutton>Middle</mousebutton> Mouse Button Actions</title>
+
+<para>If you click the &LMB; on an item in &konqueror;'s window that item will be <quote>activated</quote>. Thus</para>
 
 <itemizedlist>
 
-<listitem
-><para
-><mousebutton
->Left</mousebutton
-> click on an icon in the Toolbar to do whatever that icon is supposed to do. </para
-></listitem>
-<listitem
-><para
-><mousebutton
->Left</mousebutton
-> click on an item in the Menubar to make that menu drop down.</para
-></listitem>
-<listitem
-><para
-><mousebutton
->Left</mousebutton
-> click on a menu item to do that thing.</para
-></listitem
-> 
-<listitem
-><para
-><mousebutton
->Left</mousebutton
-> click on an icon in the Bookmark Toolbar to open that &URL;.</para
-></listitem>
-<listitem
-><para
-><mousebutton
->Left</mousebutton
-> click on a link in a web page to make &konqueror; follow that link.</para
-></listitem>
-<listitem
-><para
-><mousebutton
->Left</mousebutton
-> click on a folder icon or name and &konqueror; will descend into (show the contents of) that folder. </para
-></listitem>
-<listitem
-><para
-><mousebutton
->Left</mousebutton
-> click on a file name or icon and &konqueror; will do whatever it thinks appropriate, based on the file type. In general this means opening <acronym
->HTML</acronym
-> pages, or previewing text, image or <application
->KOffice</application
-> files, showing them within &konqueror;'s window (<quote
->Preview</quote
-> means that you can see the file but not change it).</para
-> 
-
-<para
->&konqueror; decides what the file type is by matching the filename extension against a list of known types. If that fails it tries to guess the type from the file contents. You can change the list of known file types and associated actions with the <guilabel
->File Associations</guilabel
-> page of the <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Konqueror... </guimenuitem
-></menuchoice
-> dialogue.</para
-></listitem>
+<listitem><para><mousebutton>Left</mousebutton> click on an icon in the Toolbar to do whatever that icon is supposed to do. </para></listitem>
+<listitem><para><mousebutton>Left</mousebutton> click on an item in the Menubar to make that menu drop down.</para></listitem>
+<listitem><para><mousebutton>Left</mousebutton> click on a menu item to do that thing.</para></listitem> 
+<listitem><para><mousebutton>Left</mousebutton> click on an icon in the Bookmark Toolbar to open that &URL;.</para></listitem>
+<listitem><para><mousebutton>Left</mousebutton> click on a link in a web page to make &konqueror; follow that link.</para></listitem>
+<listitem><para><mousebutton>Left</mousebutton> click on a folder icon or name and &konqueror; will descend into (show the contents of) that folder. </para></listitem>
+<listitem><para><mousebutton>Left</mousebutton> click on a file name or icon and &konqueror; will do whatever it thinks appropriate, based on the file type. In general this means opening <acronym>HTML</acronym> pages, or previewing text, image or <application>KOffice</application> files, showing them within &konqueror;'s window (<quote>Preview</quote> means that you can see the file but not change it).</para> 
+
+<para>&konqueror; decides what the file type is by matching the filename extension against a list of known types. If that fails it tries to guess the type from the file contents. You can change the list of known file types and associated actions with the <guilabel>File Associations</guilabel> page of the <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Konqueror... </guimenuitem></menuchoice> dialogue.</para></listitem>
 
 </itemizedlist>
 
-<para
->Clicking the &MMB; on a file or folder name or icon does essentially the same as <mousebutton
->left</mousebutton
-> clicking except that it usually does it in a new &konqueror; window, unless the <guilabel
->Open links in new tab instead of in new window</guilabel
-> box has been checked in the <guimenuitem
->Behaviour</guimenuitem
-> page of the <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Konqueror...</guimenuitem
-></menuchoice
-> dialogue.</para>
-
-<para
->Holding the &Shift; key down while pressing the &MMB; will open the link in the background.</para>
-<important
-><para
->If you click the &MMB; when the mouse cursor is over a blank part of the main view (not over a link or file name or icon) &konqueror; will copy the contents of the clipboard into the Location Toolbar and try to use that as a &URL;.</para
-></important>
+<para>Clicking the &MMB; on a file or folder name or icon does essentially the same as <mousebutton>left</mousebutton> clicking except that it usually does it in a new &konqueror; window, unless the <guilabel>Open links in new tab instead of in new window</guilabel> box has been checked in the <guimenuitem>Behaviour</guimenuitem> page of the <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Konqueror...</guimenuitem></menuchoice> dialogue.</para>
+
+<para>Holding the &Shift; key down while pressing the &MMB; will open the link in the background.</para>
+<important><para>If you click the &MMB; when the mouse cursor is over a blank part of the main view (not over a link or file name or icon) &konqueror; will copy the contents of the clipboard into the Location Toolbar and try to use that as a &URL;.</para></important>
 </sect1>
 
 <sect1 id="rmb-menus">
-<title
-><mousebutton
->Right</mousebutton
-> Mouse Button Menus</title>
-
-<para
->Clicking the &RMB; on almost any part of &konqueror;'s window will bring up an appropriate context menu.</para>
-
-<note
-><para
->If you have enabled the <guilabel
->Right click goes back in history</guilabel
-> option in &konqueror;'s <link linkend="othersettings"
-> configuration</link
-> settings a simple <mousebutton
->right</mousebutton
-> click is equivalent to clicking on the <guibutton
->Back</guibutton
-> button. In this case you can access the context menu by moving the mouse with the <mousebutton
->right</mousebutton
-> button held down.</para
-></note>
+<title><mousebutton>Right</mousebutton> Mouse Button Menus</title>
+
+<para>Clicking the &RMB; on almost any part of &konqueror;'s window will bring up an appropriate context menu.</para>
+
+<note><para>If you have enabled the <guilabel>Right click goes back in history</guilabel> option in &konqueror;'s <link linkend="othersettings"> configuration</link> settings a simple <mousebutton>right</mousebutton> click is equivalent to clicking on the <guibutton>Back</guibutton> button. In this case you can access the context menu by moving the mouse with the <mousebutton>right</mousebutton> button held down.</para></note>
 
 <variablelist>
 
 <varlistentry>
-<term
->On the Titlebar</term>
-<listitem
-><para
-><mousebutton
->Right</mousebutton
-> clicking on any free area of the Titlebar brings up the Titlebar Menu, allowing you to control the position of &konqueror;'s window as well as the decoration applied to all &kde; program windows. </para
-></listitem>
+<term>On the Titlebar</term>
+<listitem><para><mousebutton>Right</mousebutton> clicking on any free area of the Titlebar brings up the Titlebar Menu, allowing you to control the position of &konqueror;'s window as well as the decoration applied to all &kde; program windows. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->On the Main Toolbar</term>
-<listitem
-><para
-><mousebutton
->Right</mousebutton
-> click on any free area of the Toolbar to bring up the Toolbar Menu. You can use it to control whether the Toolbar is at the top, bottom, left or right of &konqueror;'s window. You can also use the Toolbar Menu to set the size of the buttons on the Toolbar, and whether they are shown as icons, text or both.</para
-></listitem
-> 
+<term>On the Main Toolbar</term>
+<listitem><para><mousebutton>Right</mousebutton> click on any free area of the Toolbar to bring up the Toolbar Menu. You can use it to control whether the Toolbar is at the top, bottom, left or right of &konqueror;'s window. You can also use the Toolbar Menu to set the size of the buttons on the Toolbar, and whether they are shown as icons, text or both.</para></listitem> 
 </varlistentry>
 
 <varlistentry>
-<term
->On the Location Toolbar</term>
-<listitem
-><para
-><mousebutton
->Right</mousebutton
-> click in the &URL; entry box area to perform Cut, Copy, Paste or Clear operations in this area, or to change the automatic <link linkend="path-complete"
->Text Completion</link
-> features.</para
-></listitem
-> 
+<term>On the Location Toolbar</term>
+<listitem><para><mousebutton>Right</mousebutton> click in the &URL; entry box area to perform Cut, Copy, Paste or Clear operations in this area, or to change the automatic <link linkend="path-complete">Text Completion</link> features.</para></listitem> 
 </varlistentry>
 
 <varlistentry>
-<term
->On the Bookmark Toolbar</term>
-<listitem
-><para
->If you have the Bookmark Toolbar showing, then <mousebutton
->right</mousebutton
-> click on any free part of it to bring up the Bookmark Toolbar Menu which lets you change its position and whether items are shown as text, icons, or both. </para
-></listitem
-> 
+<term>On the Bookmark Toolbar</term>
+<listitem><para>If you have the Bookmark Toolbar showing, then <mousebutton>right</mousebutton> click on any free part of it to bring up the Bookmark Toolbar Menu which lets you change its position and whether items are shown as text, icons, or both. </para></listitem> 
 </varlistentry>
 
 <varlistentry>
-<term
->Within a View</term>
-<listitem
-><para
->If you <mousebutton
->right</mousebutton
-> click on any free area of a view then you will get a menu that contains, among other options, the <guiicon
->Up</guiicon
->, <guiicon
->Back</guiicon
->, <guiicon
->Forward</guiicon
-> and <guiicon
->Reload</guiicon
-> navigation commands. </para
-></listitem>
+<term>Within a View</term>
+<listitem><para>If you <mousebutton>right</mousebutton> click on any free area of a view then you will get a menu that contains, among other options, the <guiicon>Up</guiicon>, <guiicon>Back</guiicon>, <guiicon>Forward</guiicon> and <guiicon>Reload</guiicon> navigation commands. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->On a File or Folder</term>
-<listitem
-><para
->This is a most useful feature. <mousebutton
->Right</mousebutton
-> clicking on the name or icon of any file or folder not only <quote
->selects</quote
-> that item but also brings up a menu allowing you to <guiicon
->Cut</guiicon
->, Move, <guiicon
->Copy</guiicon
-> or Remove the item in various ways, add it to your <guimenu
->Bookmarks</guimenu
->, open it with the program of your choice or preview it, rename it, or edit the file type or properties.</para
-></listitem
-> </varlistentry>
+<term>On a File or Folder</term>
+<listitem><para>This is a most useful feature. <mousebutton>Right</mousebutton> clicking on the name or icon of any file or folder not only <quote>selects</quote> that item but also brings up a menu allowing you to <guiicon>Cut</guiicon>, Move, <guiicon>Copy</guiicon> or Remove the item in various ways, add it to your <guimenu>Bookmarks</guimenu>, open it with the program of your choice or preview it, rename it, or edit the file type or properties.</para></listitem> </varlistentry>
 
 <varlistentry>
-<term
->On the Status Bar</term>
-<listitem
-><para
-><mousebutton
->Right</mousebutton
-> click on the Status Bar at the bottom of a window or view to add or remove a view within &konqueror;'s window.</para
-></listitem
-> 
+<term>On the Status Bar</term>
+<listitem><para><mousebutton>Right</mousebutton> click on the Status Bar at the bottom of a window or view to add or remove a view within &konqueror;'s window.</para></listitem> 
 </varlistentry>
 </variablelist>
 
 </sect1>
 
 <sect1 id="man-info">
-<title
->Viewing Help, Man and Info Pages</title>
-
-<para
->You can view &kde; Help and &UNIX; Man and Info pages directly in &konqueror;, without having to start up <application
->KHelpCentre</application
->. </para>
-
-<para
->To view a &kde; Help page, enter <userinput
->help:/<replaceable
->application name</replaceable
-></userinput
-> (for example <userinput
->help:/kmail</userinput
-> to view the &kmail; documentation.) into &konqueror;'s Location Toolbar window. </para>
-
-<para
->If you want to read &UNIX; Man pages &konqueror; makes it easy. For example type <userinput
->man:/touch</userinput
-> or <userinput
->#touch</userinput
-> into the Location Toolbar to see the page for the <command
->touch</command
-> command.</para
-> 
-
-<para
->To browse through &UNIX; Info pages, entering <userinput
->info:/dir</userinput
-> takes you to Info's top level directory, then it's just a matter of clicking on the right links to find the page you want. Alternatively, use <userinput
->info:/<replaceable
->command name</replaceable
-></userinput
-> to go straight to the Info page you want.</para>
-
-<note
-><para
->Unfortunately, &kde; Help pages are stored in such a way that they cannot be viewed in other browsers. If you really need to do this your only recourse is to go online and visit <ulink url="http://docs.kde.org"
-> http://docs.kde.org</ulink
->.</para
-></note>
+<title>Viewing Help, Man and Info Pages</title>
+
+<para>You can view &kde; Help and &UNIX; Man and Info pages directly in &konqueror;, without having to start up <application>KHelpCentre</application>. </para>
+
+<para>To view a &kde; Help page, enter <userinput>help:/<replaceable>application name</replaceable></userinput> (for example <userinput>help:/kmail</userinput> to view the &kmail; documentation.) into &konqueror;'s Location Toolbar window. </para>
+
+<para>If you want to read &UNIX; Man pages &konqueror; makes it easy. For example type <userinput>man:/touch</userinput> or <userinput>#touch</userinput> into the Location Toolbar to see the page for the <command>touch</command> command.</para> 
+
+<para>To browse through &UNIX; Info pages, entering <userinput>info:/dir</userinput> takes you to Info's top level directory, then it's just a matter of clicking on the right links to find the page you want. Alternatively, use <userinput>info:/<replaceable>command name</replaceable></userinput> to go straight to the Info page you want.</para>
+
+<note><para>Unfortunately, &kde; Help pages are stored in such a way that they cannot be viewed in other browsers. If you really need to do this your only recourse is to go online and visit <ulink url="http://docs.kde.org"> http://docs.kde.org</ulink>.</para></note>
 </sect1>
 
 </chapter>
diff --git a/tde-i18n-en_GB/docs/tdebase/konqueror/bookmarks.docbook b/tde-i18n-en_GB/docs/tdebase/konqueror/bookmarks.docbook
index f2ce152d90a..3425b85dd10 100644
--- a/tde-i18n-en_GB/docs/tdebase/konqueror/bookmarks.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/konqueror/bookmarks.docbook
@@ -1,235 +1,47 @@
 <chapter id="bookmarks">
 <chapterinfo>
 <authorgroup>
-<author
->&Pamela.Roberts;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Pamela.Roberts;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
-<date
->2003-11-05</date
-> <releaseinfo
->3.2</releaseinfo
-> </chapterinfo>
-
-<title
->Using Bookmarks</title>
-
-<para
->Although you can use &konqueror;'s bookmarks to record the locations of your own files and folders, they are most useful when you are surfing the Web, letting you build up a list of useful sites.</para>
-
-<para
->To open the <guimenu
->Bookmarks</guimenu
-> menu you may either <mousebutton
->left</mousebutton
-> click on the <guimenu
->Bookmarks</guimenu
-> menu or use the <keycombo action="simul"
->&Alt;<keycap
->B</keycap
-></keycombo
-> shortcut. Once the list is visible, you can navigate through it with the arrow keys or with your mouse, then press &Enter; or <mousebutton
->left</mousebutton
-> click to visit the selected location.</para>
-
-<para
->To add a new item to the list use <menuchoice
-><guimenu
->Bookmarks </guimenu
-><guimenuitem
->Add Bookmark</guimenuitem
-></menuchoice
-> or <keycombo action="simul"
->&Ctrl;<keycap
->B</keycap
-></keycombo
-> or <mousebutton
->right</mousebutton
-> click on a clear space in the web page or folder view and select <guimenuitem
->Bookmark this Location</guimenuitem
-> from the pop up menu.</para>
-
-<para
->The <guimenu
->Bookmarks</guimenu
-> list can contain subfolders containing other bookmarks, you can create these with <menuchoice
-><guimenu
->Bookmarks </guimenu
-><guimenuitem
->New Bookmark Folder...</guimenuitem
-></menuchoice
-> . To add a bookmark into a subfolder rather than into the main Bookmark list, select the folder from within the <guimenu
->Bookmarks</guimenu
-> list and use the <guimenuitem
->Add Bookmark</guimenuitem
-> item in that folder.</para>
-
-<para
->You can also access your bookmarks from the <link linkend="sidebar"
-> <guilabel
->Navigation Panel</guilabel
-></link
->.</para>
+<date>2003-11-05</date> <releaseinfo>3.2</releaseinfo> </chapterinfo>
+
+<title>Using Bookmarks</title>
+
+<para>Although you can use &konqueror;'s bookmarks to record the locations of your own files and folders, they are most useful when you are surfing the Web, letting you build up a list of useful sites.</para>
+
+<para>To open the <guimenu>Bookmarks</guimenu> menu you may either <mousebutton>left</mousebutton> click on the <guimenu>Bookmarks</guimenu> menu or use the <keycombo action="simul">&Alt;<keycap>B</keycap></keycombo> shortcut. Once the list is visible, you can navigate through it with the arrow keys or with your mouse, then press &Enter; or <mousebutton>left</mousebutton> click to visit the selected location.</para>
+
+<para>To add a new item to the list use <menuchoice><guimenu>Bookmarks </guimenu><guimenuitem>Add Bookmark</guimenuitem></menuchoice> or <keycombo action="simul">&Ctrl;<keycap>B</keycap></keycombo> or <mousebutton>right</mousebutton> click on a clear space in the web page or folder view and select <guimenuitem>Bookmark this Location</guimenuitem> from the pop up menu.</para>
+
+<para>The <guimenu>Bookmarks</guimenu> list can contain subfolders containing other bookmarks, you can create these with <menuchoice><guimenu>Bookmarks </guimenu><guimenuitem>New Bookmark Folder...</guimenuitem></menuchoice> . To add a bookmark into a subfolder rather than into the main Bookmark list, select the folder from within the <guimenu>Bookmarks</guimenu> list and use the <guimenuitem>Add Bookmark</guimenuitem> item in that folder.</para>
+
+<para>You can also access your bookmarks from the <link linkend="sidebar"> <guilabel>Navigation Panel</guilabel></link>.</para>
 
 <sect1 id="orgbmark">
-<title
->The Bookmark Editor</title>
-
-<para
->The <menuchoice
-><guimenu
->Bookmarks</guimenu
-><guimenuitem
->Edit Bookmarks</guimenuitem
-> </menuchoice
-> option opens the <guilabel
->Bookmark Editor</guilabel
->.</para>
-<para
->This shows a tree view of your bookmarks and bookmark subfolders. As is usual for tree views in &kde;, subfolders are shown with a small square at the left of the folder name; if the square contains a <keycap
->+</keycap
-> sign <mousebutton
->left</mousebutton
-> clicking on it will expand the view to show the contents of that subfolder and the <keycap
->+</keycap
-> sign will change to <keycap
->-</keycap
->, <mousebutton
->left</mousebutton
-> clicking on the <keycap
->-</keycap
-> sign will collapse the subfolder view.</para>
-
-<para
->To select an item in the list you can <mousebutton
->left</mousebutton
-> click on it, or you can navigate through the list by using the <keysym
-> Up arrow</keysym
-> and <keysym
->Down arrow</keysym
-> keys to move around, <keysym
->Right arrow</keysym
-> to expand a subfolder and <keysym
-> Left arrow</keysym
-> to collapse it.</para>
-
-<para
->You can move an item to a different place in the list by using the normal Drag and Drop or <guimenuitem
->Cut</guimenuitem
-> and <guimenuitem
-> Paste</guimenuitem
-> methods. The order in which the items appear in the <guilabel
->Bookmark Editor</guilabel
-> is the order they will appear in the <guimenu
->Bookmarks</guimenu
-> drop down list. The <menuchoice
-><guimenu
->Insert </guimenu
-><guimenuitem
->Insert Separator</guimenuitem
-></menuchoice
-> option can be used to insert separating lines into the list wherever you wish.</para>
-
-<para
->A new subfolder can be created at the selected point in the list by using the <guimenuitem
->Create New Folder...</guimenuitem
-> option in the <guimenu
->Insert</guimenu
-> menu or from the drop down menu you get when you <mousebutton
->right</mousebutton
-> click on an item in the main part of the window, or with <keycombo action="simul"
->&Ctrl;<keycap
->N</keycap
-></keycombo
-> </para>
-
-<para
->To change the name of a bookmark or folder select it then press <keycap
->F2</keycap
-> or choose the <guimenuitem
->Rename</guimenuitem
-> item from the <guimenu
->Edit</guimenu
-> menu or the pop up menu that appears when you <mousebutton
->right</mousebutton
-> click on the item. Similarly, you can edit the &URL; by pressing <keycap
->F3</keycap
-> or choosing the <guimenuitem
-> Change URL</guimenuitem
-> menu item.</para>
-
-<para
->The <guilabel
->Bookmark Editor</guilabel
-> lets you import bookmarks from a range of other browsers into &konqueror;'s bookmark list, putting them into a new folder or replacing all current bookmarks. To do this select <guisubmenu
->Import</guisubmenu
-> from the <guimenu
->File</guimenu
-> menu. The <menuchoice
-><guimenu
->File</guimenu
-><guisubmenu
->Export</guisubmenu
-> </menuchoice
-> option can be used to export &konqueror;'s bookmarks to a &Netscape; or Mozilla browser.</para>
-
-<para
->If you often use the &Netscape; browser as well as &konqueror;, then rather than importing your &Netscape; bookmarks into &konqueror; it is better to select the <guimenuitem
->Show Netscape Bookmarks in Konqueror Windows</guimenuitem
-> item in the <guimenu
->Settings</guimenu
-> menu. If you do this any updates to &Netscape;'s bookmarks are automatically seen by &konqueror;.</para>
-
-<para
->To select which bookmark subfolder is used to hold the Bookmark Toolbar items select the subfolder then choose <guimenuitem
->Set as Toolbar Folder</guimenuitem
-> from the <guimenu
->Edit</guimenu
-> menu.</para>
-
-<para
->If you are tidying up your bookmarks and have forgotten what a particular web page is, you can easily open it from within the <guilabel
-> Bookmark Editor</guilabel
-> by <mousebutton
->right</mousebutton
-> clicking on the item and selecting <guimenuitem
->Open in Konqueror</guimenuitem
-> from the pop up menu. If you just want to check that the &URL; is still valid select <guimenuitem
->Check Status</guimenuitem
-> instead.</para>
-
-<important
-><para
->Don't forget to save your changes with <menuchoice
-> <guimenu
->File</guimenu
-><guimenuitem
->Save</guimenuitem
-></menuchoice
-> or <keycombo action="simul"
->&Ctrl;<keycap
->S</keycap
-></keycombo
-> before you leave the <guilabel
->Bookmark Editor</guilabel
->. </para
-></important>
-</sect1
-> 
+<title>The Bookmark Editor</title>
+
+<para>The <menuchoice><guimenu>Bookmarks</guimenu><guimenuitem>Edit Bookmarks</guimenuitem> </menuchoice> option opens the <guilabel>Bookmark Editor</guilabel>.</para>
+<para>This shows a tree view of your bookmarks and bookmark subfolders. As is usual for tree views in &kde;, subfolders are shown with a small square at the left of the folder name; if the square contains a <keycap>+</keycap> sign <mousebutton>left</mousebutton> clicking on it will expand the view to show the contents of that subfolder and the <keycap>+</keycap> sign will change to <keycap>-</keycap>, <mousebutton>left</mousebutton> clicking on the <keycap>-</keycap> sign will collapse the subfolder view.</para>
+
+<para>To select an item in the list you can <mousebutton>left</mousebutton> click on it, or you can navigate through the list by using the <keysym> Up arrow</keysym> and <keysym>Down arrow</keysym> keys to move around, <keysym>Right arrow</keysym> to expand a subfolder and <keysym> Left arrow</keysym> to collapse it.</para>
+
+<para>You can move an item to a different place in the list by using the normal Drag and Drop or <guimenuitem>Cut</guimenuitem> and <guimenuitem> Paste</guimenuitem> methods. The order in which the items appear in the <guilabel>Bookmark Editor</guilabel> is the order they will appear in the <guimenu>Bookmarks</guimenu> drop down list. The <menuchoice><guimenu>Insert </guimenu><guimenuitem>Insert Separator</guimenuitem></menuchoice> option can be used to insert separating lines into the list wherever you wish.</para>
+
+<para>A new subfolder can be created at the selected point in the list by using the <guimenuitem>Create New Folder...</guimenuitem> option in the <guimenu>Insert</guimenu> menu or from the drop down menu you get when you <mousebutton>right</mousebutton> click on an item in the main part of the window, or with <keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo> </para>
+
+<para>To change the name of a bookmark or folder select it then press <keycap>F2</keycap> or choose the <guimenuitem>Rename</guimenuitem> item from the <guimenu>Edit</guimenu> menu or the pop up menu that appears when you <mousebutton>right</mousebutton> click on the item. Similarly, you can edit the &URL; by pressing <keycap>F3</keycap> or choosing the <guimenuitem> Change URL</guimenuitem> menu item.</para>
+
+<para>The <guilabel>Bookmark Editor</guilabel> lets you import bookmarks from a range of other browsers into &konqueror;'s bookmark list, putting them into a new folder or replacing all current bookmarks. To do this select <guisubmenu>Import</guisubmenu> from the <guimenu>File</guimenu> menu. The <menuchoice><guimenu>File</guimenu><guisubmenu>Export</guisubmenu> </menuchoice> option can be used to export &konqueror;'s bookmarks to a &Netscape; or Mozilla browser.</para>
+
+<para>If you often use the &Netscape; browser as well as &konqueror;, then rather than importing your &Netscape; bookmarks into &konqueror; it is better to select the <guimenuitem>Show Netscape Bookmarks in Konqueror Windows</guimenuitem> item in the <guimenu>Settings</guimenu> menu. If you do this any updates to &Netscape;'s bookmarks are automatically seen by &konqueror;.</para>
+
+<para>To select which bookmark subfolder is used to hold the Bookmark Toolbar items select the subfolder then choose <guimenuitem>Set as Toolbar Folder</guimenuitem> from the <guimenu>Edit</guimenu> menu.</para>
+
+<para>If you are tidying up your bookmarks and have forgotten what a particular web page is, you can easily open it from within the <guilabel> Bookmark Editor</guilabel> by <mousebutton>right</mousebutton> clicking on the item and selecting <guimenuitem>Open in Konqueror</guimenuitem> from the pop up menu. If you just want to check that the &URL; is still valid select <guimenuitem>Check Status</guimenuitem> instead.</para>
+
+<important><para>Don't forget to save your changes with <menuchoice> <guimenu>File</guimenu><guimenuitem>Save</guimenuitem></menuchoice> or <keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo> before you leave the <guilabel>Bookmark Editor</guilabel>. </para></important>
+</sect1> 
 
 
 </chapter>
diff --git a/tde-i18n-en_GB/docs/tdebase/konqueror/browser.docbook b/tde-i18n-en_GB/docs/tdebase/konqueror/browser.docbook
index 1590932907e..62bd773a736 100644
--- a/tde-i18n-en_GB/docs/tdebase/konqueror/browser.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/konqueror/browser.docbook
@@ -2,580 +2,189 @@
 
 <chapterinfo>
 <authorgroup>
-<author
->&Pamela.Roberts;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Pamela.Roberts;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
-<date
->2003-11-05</date
-> <releaseinfo
->3.2</releaseinfo
-> </chapterinfo>
+<date>2003-11-05</date> <releaseinfo>3.2</releaseinfo> </chapterinfo>
 
 
-<title
->&konqueror; the Web Browser</title>
+<title>&konqueror; the Web Browser</title>
 
 <mediaobject>
-<imageobject
-><imagedata format="PNG" fileref="konqorg.png"/></imageobject>
+<imageobject><imagedata format="PNG" fileref="konqorg.png"/></imageobject>
 <textobject>
-<phrase
->Browsing www.konqueror.org</phrase>
+<phrase>Browsing www.konqueror.org</phrase>
 </textobject>
 </mediaobject>
 
 <sect1 id="conn-inet">
-<title
->Connecting to the Internet</title>
+<title>Connecting to the Internet</title>
 
-<para
->Once you are connected to the Internet you can use &konqueror; to browse the Web just as easily as you can use it to handle your local files. Just type a &URL; into the <guilabel
->Location</guilabel
-> Toolbar window, press &Enter;, and you are away!</para>
+<para>Once you are connected to the Internet you can use &konqueror; to browse the Web just as easily as you can use it to handle your local files. Just type a &URL; into the <guilabel>Location</guilabel> Toolbar window, press &Enter;, and you are away!</para>
 
 <itemizedlist>
-<listitem
-><para
->If you use a dial-up modem connection, then you will be using &kppp; or a similar dialler program to make the connection.</para
-></listitem>
-
-<listitem
-><para
->If your machine is connected to a local area network (<acronym
->LAN</acronym
->) that gives you a proxy connection to the Internet then you will have to set &konqueror; up for the proxy connection. This can be done with the <guilabel
->Proxy</guilabel
-> page of the <menuchoice
-><guimenu
-> Settings</guimenu
-><guimenuitem
->Configure Konqueror...</guimenuitem
-> </menuchoice
-> dialogue.</para
-></listitem>
-
-<listitem
-><para
->If you are lucky enough to have a high speed cable connection, then the service provider will probably give you an external cable modem which needs an ethernet connection to your machine. Unfortunately the details of how to establish the connection depend on the service provider and to some extent on which Linux/&UNIX; distribution you are using. Some <acronym
->ISP</acronym
->s connect their customers to the Internet through a proxy server, in which case you will have to set up &konqueror; to use it. You may find it useful to search the archives of your distribution's user group mailing list for help.</para>
+<listitem><para>If you use a dial-up modem connection, then you will be using &kppp; or a similar dialler program to make the connection.</para></listitem>
+
+<listitem><para>If your machine is connected to a local area network (<acronym>LAN</acronym>) that gives you a proxy connection to the Internet then you will have to set &konqueror; up for the proxy connection. This can be done with the <guilabel>Proxy</guilabel> page of the <menuchoice><guimenu> Settings</guimenu><guimenuitem>Configure Konqueror...</guimenuitem> </menuchoice> dialogue.</para></listitem>
+
+<listitem><para>If you are lucky enough to have a high speed cable connection, then the service provider will probably give you an external cable modem which needs an ethernet connection to your machine. Unfortunately the details of how to establish the connection depend on the service provider and to some extent on which Linux/&UNIX; distribution you are using. Some <acronym>ISP</acronym>s connect their customers to the Internet through a proxy server, in which case you will have to set up &konqueror; to use it. You may find it useful to search the archives of your distribution's user group mailing list for help.</para>
 </listitem>
 </itemizedlist>
 
-<note
-><para
->An error message such as <errorname
->Unknown Host</errorname
-> usually means that &konqueror; cannot find a connection to the Internet or that you have entered an incorrect &URL;.</para
-></note>
+<note><para>An error message such as <errorname>Unknown Host</errorname> usually means that &konqueror; cannot find a connection to the Internet or that you have entered an incorrect &URL;.</para></note>
 
 </sect1>
 
 <sect1 id="surf">
-<title
->Surfing and Searching</title>
-
-<para
->Once you have a connection to the Internet, you can surf with &konqueror; just as you can with any other browser.</para>
-
-<para
->Type a &URL; into the Location Toolbar window, press &Enter; or <mousebutton
->left</mousebutton
-> click on the <guibutton
->Go</guibutton
-> button at the right hand end of the Location Toolbar, and &konqueror; will download and display that page. If you have visited the page before, &konqueror;'s <link linkend="path-complete"
->Automatic Text Completion</link
-> feature can help you type the &URL; a second time, or you could look through the <guilabel
->History</guilabel
-> page in the <link linkend="sidebar"
->Navigation Panel</link
->. If you want to use one of the web's search engines, &konqueror;'s <link linkend="enhanced-browsing"
-> Web Shortcuts</link
-> feature can make this easier.</para>
-
-<para
-><mousebutton
->Left</mousebutton
-> click on a link in the page to go there.</para>
-
-<para
->To open a link in a new instance of &konqueror;, leaving the old page still visible, &MMB; click on the link or <mousebutton
-> right </mousebutton
-> click on it and select the <guimenuitem
->Open in New Window</guimenuitem
-> option.</para>
-
-<para
->You could also select the multiple view mode with <keycombo action="simul"
->&Ctrl;&Shift;<keycap
->L</keycap
-> </keycombo
-> or the Menubar <menuchoice
-><guimenu
->Window</guimenu
-> <guimenuitem
->Split View Left/Right</guimenuitem
-></menuchoice
-> option which will let you see different pages at the same time. This can be useful if you are looking through a complicated set of <acronym
->HTML</acronym
-> pages, but make sure the little link box at the bottom right hand corner is empty when you are doing this.</para>
-<para
-><link linkend="tabbrowse"
->Tabbed Browsing</link
-> will let you hold a number of pages in one &konqueror; window and quickly switch between them with a single mouse click.</para>
-<para
->To go back to the previous page use the <keycombo action="simul"
->&Alt;<keysym
->Left Arrow</keysym
-></keycombo
-> shortcut, the <guibutton
->Back</guibutton
-> button on the Toolbar, or the Menubar <menuchoice
-><guimenu
->Go</guimenu
-> <guimenuitem
->Back</guimenuitem
-></menuchoice
-> option.</para>
-<para
->Similarly, once you have gone back you can go forward by using <keycombo action="simul"
->&Alt;<keysym
->Right Arrow</keysym
-></keycombo
->, the <guibutton
->Forward</guibutton
-> button, or the Menubar <menuchoice
-><guimenu
->Go</guimenu
-> <guimenuitem
->Forward</guimenuitem
-></menuchoice
-> option.</para>
-
-<para
->If you want to stop the download for any reason then use the <keycap
->Esc</keycap
-> key, the Toolbar <guibutton
->Stop</guibutton
-> button or the Menubar <menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Stop</guimenuitem
-></menuchoice
-> item.</para>
-
-<para
->When you are viewing a web page you should see two new icons in the Toolbar, looking like magnifying glasses with small <keycap
->+</keycap
-> and <keycap
->-</keycap
-> symbols. Use these to adjust the size of the text in the page if you find it difficult to read. How well this works will depend on how the web page has been constructed.</para>
+<title>Surfing and Searching</title>
+
+<para>Once you have a connection to the Internet, you can surf with &konqueror; just as you can with any other browser.</para>
+
+<para>Type a &URL; into the Location Toolbar window, press &Enter; or <mousebutton>left</mousebutton> click on the <guibutton>Go</guibutton> button at the right hand end of the Location Toolbar, and &konqueror; will download and display that page. If you have visited the page before, &konqueror;'s <link linkend="path-complete">Automatic Text Completion</link> feature can help you type the &URL; a second time, or you could look through the <guilabel>History</guilabel> page in the <link linkend="sidebar">Navigation Panel</link>. If you want to use one of the web's search engines, &konqueror;'s <link linkend="enhanced-browsing"> Web Shortcuts</link> feature can make this easier.</para>
+
+<para><mousebutton>Left</mousebutton> click on a link in the page to go there.</para>
+
+<para>To open a link in a new instance of &konqueror;, leaving the old page still visible, &MMB; click on the link or <mousebutton> right </mousebutton> click on it and select the <guimenuitem>Open in New Window</guimenuitem> option.</para>
+
+<para>You could also select the multiple view mode with <keycombo action="simul">&Ctrl;&Shift;<keycap>L</keycap> </keycombo> or the Menubar <menuchoice><guimenu>Window</guimenu> <guimenuitem>Split View Left/Right</guimenuitem></menuchoice> option which will let you see different pages at the same time. This can be useful if you are looking through a complicated set of <acronym>HTML</acronym> pages, but make sure the little link box at the bottom right hand corner is empty when you are doing this.</para>
+<para><link linkend="tabbrowse">Tabbed Browsing</link> will let you hold a number of pages in one &konqueror; window and quickly switch between them with a single mouse click.</para>
+<para>To go back to the previous page use the <keycombo action="simul">&Alt;<keysym>Left Arrow</keysym></keycombo> shortcut, the <guibutton>Back</guibutton> button on the Toolbar, or the Menubar <menuchoice><guimenu>Go</guimenu> <guimenuitem>Back</guimenuitem></menuchoice> option.</para>
+<para>Similarly, once you have gone back you can go forward by using <keycombo action="simul">&Alt;<keysym>Right Arrow</keysym></keycombo>, the <guibutton>Forward</guibutton> button, or the Menubar <menuchoice><guimenu>Go</guimenu> <guimenuitem>Forward</guimenuitem></menuchoice> option.</para>
+
+<para>If you want to stop the download for any reason then use the <keycap>Esc</keycap> key, the Toolbar <guibutton>Stop</guibutton> button or the Menubar <menuchoice><guimenu>View</guimenu> <guimenuitem>Stop</guimenuitem></menuchoice> item.</para>
+
+<para>When you are viewing a web page you should see two new icons in the Toolbar, looking like magnifying glasses with small <keycap>+</keycap> and <keycap>-</keycap> symbols. Use these to adjust the size of the text in the page if you find it difficult to read. How well this works will depend on how the web page has been constructed.</para>
 </sect1>
 
 <sect1 id="tabbrowse">
-<title
->Tabbed Browsing</title>
-<para
->By using this feature you can make &konqueror; load multiple web pages in the same window, and switch between them using tabbed pages. This way, you can preload a page <quote
->in the background</quote
-> while you carry on reading another.</para>
-
-<para
->To use tabbed browsing, <mousebutton
->right</mousebutton
-> click on a link and choose <guimenuitem
->Open in New Tab</guimenuitem
-> from the drop down menu. The page will be downloaded and displayed as normal, but with tabs across the top of the view, one tab for each page. <mousebutton
->Left </mousebutton
-> click on a tab to view that page, or you can use the shortcuts <keycombo action="simul"
->&Ctrl;<keycap
->[</keycap
-></keycombo
-> and <keycombo action="simul"
->&Ctrl;<keycap
->]</keycap
-></keycombo
-> to cycle through the tab pages.</para>
-
-<para
->The <guimenuitem
->Open in Background Tab</guimenuitem
-> option in the &RMB; menu also downloads the page and shows a new tab for it, but the new page will not be displayed until you <mousebutton
->left</mousebutton
-> click on the tab.</para>
-
-<para
->If you check the <guilabel
->Open links in new tab instead of in new window </guilabel
-> box in the <guimenuitem
->Web Behaviour</guimenuitem
-> page of the <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Konqueror... </guimenuitem
-></menuchoice
-> dialogue, &MMB; clicking on a link will open it in a new tab page and if you hold the &Shift; key down while clicking the &MMB; the link will be opened in a background tab page.</para>
-
-<para
-><mousebutton
->Right</mousebutton
-> clicking on a tab will bring up a menu with the following options:</para>
+<title>Tabbed Browsing</title>
+<para>By using this feature you can make &konqueror; load multiple web pages in the same window, and switch between them using tabbed pages. This way, you can preload a page <quote>in the background</quote> while you carry on reading another.</para>
+
+<para>To use tabbed browsing, <mousebutton>right</mousebutton> click on a link and choose <guimenuitem>Open in New Tab</guimenuitem> from the drop down menu. The page will be downloaded and displayed as normal, but with tabs across the top of the view, one tab for each page. <mousebutton>Left </mousebutton> click on a tab to view that page, or you can use the shortcuts <keycombo action="simul">&Ctrl;<keycap>[</keycap></keycombo> and <keycombo action="simul">&Ctrl;<keycap>]</keycap></keycombo> to cycle through the tab pages.</para>
+
+<para>The <guimenuitem>Open in Background Tab</guimenuitem> option in the &RMB; menu also downloads the page and shows a new tab for it, but the new page will not be displayed until you <mousebutton>left</mousebutton> click on the tab.</para>
+
+<para>If you check the <guilabel>Open links in new tab instead of in new window </guilabel> box in the <guimenuitem>Web Behaviour</guimenuitem> page of the <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Konqueror... </guimenuitem></menuchoice> dialogue, &MMB; clicking on a link will open it in a new tab page and if you hold the &Shift; key down while clicking the &MMB; the link will be opened in a background tab page.</para>
+
+<para><mousebutton>Right</mousebutton> clicking on a tab will bring up a menu with the following options:</para>
 <variablelist>
 
 <varlistentry>
-<term
-><guimenuitem
->New Tab</guimenuitem
-></term>
-<listitem
-><para
->This opens a new, blank, tabbed page view. You can then download a web page into it by typing the &URL; into the Location Bar or by making a selection from the Bookmark Toolbar or the <link linkend="sidebar"
->Navigation Panel</link
-> history page.</para>
+<term><guimenuitem>New Tab</guimenuitem></term>
+<listitem><para>This opens a new, blank, tabbed page view. You can then download a web page into it by typing the &URL; into the Location Bar or by making a selection from the Bookmark Toolbar or the <link linkend="sidebar">Navigation Panel</link> history page.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guimenuitem
->Duplicate Tab</guimenuitem
-></term>
-<listitem
-><para
->To create a duplicate tabbed page.</para>
+<term><guimenuitem>Duplicate Tab</guimenuitem></term>
+<listitem><para>To create a duplicate tabbed page.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guimenuitem
->Detach Tab</guimenuitem
-></term>
-<listitem
-><para
->This option removes the selected tabbed page from the current &konqueror; window and opens it in a new instance of &konqueror;.</para>
+<term><guimenuitem>Detach Tab</guimenuitem></term>
+<listitem><para>This option removes the selected tabbed page from the current &konqueror; window and opens it in a new instance of &konqueror;.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guimenuitem
->Close Tab</guimenuitem
-></term>
-<listitem
-><para
->To close the selected tab page.</para>
+<term><guimenuitem>Close Tab</guimenuitem></term>
+<listitem><para>To close the selected tab page.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guimenuitem
->Reload</guimenuitem
-></term>
-<listitem
-><para
->Reloads the content of the current tab.</para>
+<term><guimenuitem>Reload</guimenuitem></term>
+<listitem><para>Reloads the content of the current tab.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guimenuitem
->Reload all Tabs</guimenuitem
-></term>
-<listitem
-><para
->Reloads the content of every tab.</para>
+<term><guimenuitem>Reload all Tabs</guimenuitem></term>
+<listitem><para>Reloads the content of every tab.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guimenuitem
->Switch to Tab</guimenuitem
-></term>
-<listitem
-><para
->Displays a submenu showing all other tabs. Choosing a tab from this list makes it the active tab.</para>
+<term><guimenuitem>Switch to Tab</guimenuitem></term>
+<listitem><para>Displays a submenu showing all other tabs. Choosing a tab from this list makes it the active tab.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guimenuitem
->Close Other Tabs</guimenuitem
-></term>
-<listitem
-><para
->To close all but the selected tab page.</para>
+<term><guimenuitem>Close Other Tabs</guimenuitem></term>
+<listitem><para>To close all but the selected tab page.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 </sect1>
 
 <sect1 id="enhanced-browsing">
-<title
->Web Shortcuts</title
-> <para
->If enabled, &konqueror;'s Web Shortcuts feature lets you submit a query directly to a search engine or similar web site without having to visit the site first.</para
-> <para
->For example, entering <userinput
->gg:konqueror</userinput
-> into the Location Bar and pressing &Enter; will ask <trademark
->Google</trademark
-> to search for items related to &konqueror;.</para
-> <para
->To see what Web Shortcuts are available, and perhaps add your own, use <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Konqueror...</guimenuitem
-></menuchoice
-> to open the <guilabel
->Settings </guilabel
-> dialogue box and click on the <guiicon
->Web Shortcuts</guiicon
-> icon.</para>
+<title>Web Shortcuts</title> <para>If enabled, &konqueror;'s Web Shortcuts feature lets you submit a query directly to a search engine or similar web site without having to visit the site first.</para> <para>For example, entering <userinput>gg:konqueror</userinput> into the Location Bar and pressing &Enter; will ask <trademark>Google</trademark> to search for items related to &konqueror;.</para> <para>To see what Web Shortcuts are available, and perhaps add your own, use <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Konqueror...</guimenuitem></menuchoice> to open the <guilabel>Settings </guilabel> dialogue box and click on the <guiicon>Web Shortcuts</guiicon> icon.</para>
 </sect1>
 
 <sect1 id="useragent">
-<title
->Browser Identification</title>
-<para
->When &konqueror; connects to a web site it sends some brief browser identification information, known as the <quote
->User Agent</quote
-> string. Many web sites use this information to customise the pages that they send back, based on the strengths and weaknesses of different browsers.</para>
-<para
->Unfortunately, some badly designed sites refuse to work properly unless you are using a browser that the site recognizes as a <quote
->valid</quote
-> one, even though if given a chance, &konqueror; will work satisfactorily with the vast majority of web pages.</para>
-<para
->To overcome this problem, you can change the browser identification information that &konqueror; sends for specific sites or domains by selecting <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
-> Configure Konqueror...</guimenuitem
-></menuchoice
-> to bring up the <guilabel
-> Settings</guilabel
-> dialogue box and clicking the <guiicon
->Browser Identification</guiicon
-> icon.</para>
-<note
-><para
->Problems with getting a web page to work properly may also be due to its use of &Java; or JavaScript. If you suspect that this may be the case check that they have been enabled in the <guiicon
->Java &amp; JavaScript </guiicon
-> section of the <guilabel
->Settings</guilabel
-> dialogue box.</para
-></note>
+<title>Browser Identification</title>
+<para>When &konqueror; connects to a web site it sends some brief browser identification information, known as the <quote>User Agent</quote> string. Many web sites use this information to customise the pages that they send back, based on the strengths and weaknesses of different browsers.</para>
+<para>Unfortunately, some badly designed sites refuse to work properly unless you are using a browser that the site recognizes as a <quote>valid</quote> one, even though if given a chance, &konqueror; will work satisfactorily with the vast majority of web pages.</para>
+<para>To overcome this problem, you can change the browser identification information that &konqueror; sends for specific sites or domains by selecting <menuchoice><guimenu>Settings</guimenu><guimenuitem> Configure Konqueror...</guimenuitem></menuchoice> to bring up the <guilabel> Settings</guilabel> dialogue box and clicking the <guiicon>Browser Identification</guiicon> icon.</para>
+<note><para>Problems with getting a web page to work properly may also be due to its use of &Java; or JavaScript. If you suspect that this may be the case check that they have been enabled in the <guiicon>Java &amp; JavaScript </guiicon> section of the <guilabel>Settings</guilabel> dialogue box.</para></note>
 
 </sect1>
 
 <sect1 id="save-print-web">
-<title
->Saving and Printing Web Items</title>
-
-<para
->When you are viewing a web page you can save it (or at least the basic <acronym
->HTML</acronym
-> or similar source text) to your local disk with <menuchoice
-><guimenu
->Location</guimenu
-><guimenuitem
->Save As...</guimenuitem
-></menuchoice
->. If the page you are viewing uses frames, then you will also be given the <menuchoice
-><guimenu
->Location</guimenu
-><guimenuitem
->Save Frame As...</guimenuitem
-></menuchoice
-> option. <mousebutton
->Left</mousebutton
-> click in the frame you want to save first.</para>
-
-<para
->If the page uses a background image, you can get and save that with the <menuchoice
-><guimenu
->Location</guimenu
-><guimenuitem
->Save Background Image As...</guimenuitem
-></menuchoice
-> option.</para>
-
-<para
->But if what you really want is that glorious picture of the latest Ferrari, then <mousebutton
->right</mousebutton
-> clicking on the image will give you a drop-down menu with a <guimenuitem
->Save Image As...</guimenuitem
-> option. Be sure to respect the owner's copyright, and ask for permission before using any pictures saved this way for anything other than your own viewing pleasure.</para>
-
-<para
->If you <mousebutton
->right</mousebutton
-> click on a link (which may be a picture) and select <guimenuitem
->Save Link As...</guimenuitem
-> from the pop up menu the basic <acronym
->HTML</acronym
-> or similar source text will be downloaded and saved on your local disk.</para>
-
-<para
-><mousebutton
->Right</mousebutton
-> clicking on a link (which may be a picture) and choosing <guimenuitem
->Copy Link Location</guimenuitem
-> will copy the &URL; of the link to the clipboard so you can then paste it into, say, an e-mail to a friend telling her about this wonderful new site.</para>
-
-<para
-><mousebutton
->Right</mousebutton
-> clicking on a picture and choosing <guimenuitem
->Copy Image Location</guimenuitem
-> copies the &URL; of the picture to the clipboard.</para>
-
-<para
->To save a complete web page, including images, select <guimenuitem
-> Archive Web Page...</guimenuitem
-> from the <guimenu
->Tools</guimenu
-> menu. Note that this feature is provided by a <link linkend="konq-plugin"
->plugin </link
-> and may not have been installed on your system. The web page will be saved as a single file with a <literal role="extension"
->.war</literal
-> extension and can be opened by <mousebutton
->left</mousebutton
-> clicking on the filename in &konqueror; running in File Manager mode.</para>
-
-<para
->Printing a copy of the page you are viewing is easily done with the Menubar <menuchoice
-><guimenu
->Location</guimenu
-> <guimenuitem
->Print...</guimenuitem
-></menuchoice
-> or <guimenuitem
->Print Frame</guimenuitem
-> option or with the Toolbar <guiicon
->Print</guiicon
-> button.</para>
+<title>Saving and Printing Web Items</title>
+
+<para>When you are viewing a web page you can save it (or at least the basic <acronym>HTML</acronym> or similar source text) to your local disk with <menuchoice><guimenu>Location</guimenu><guimenuitem>Save As...</guimenuitem></menuchoice>. If the page you are viewing uses frames, then you will also be given the <menuchoice><guimenu>Location</guimenu><guimenuitem>Save Frame As...</guimenuitem></menuchoice> option. <mousebutton>Left</mousebutton> click in the frame you want to save first.</para>
+
+<para>If the page uses a background image, you can get and save that with the <menuchoice><guimenu>Location</guimenu><guimenuitem>Save Background Image As...</guimenuitem></menuchoice> option.</para>
+
+<para>But if what you really want is that glorious picture of the latest Ferrari, then <mousebutton>right</mousebutton> clicking on the image will give you a drop-down menu with a <guimenuitem>Save Image As...</guimenuitem> option. Be sure to respect the owner's copyright, and ask for permission before using any pictures saved this way for anything other than your own viewing pleasure.</para>
+
+<para>If you <mousebutton>right</mousebutton> click on a link (which may be a picture) and select <guimenuitem>Save Link As...</guimenuitem> from the pop up menu the basic <acronym>HTML</acronym> or similar source text will be downloaded and saved on your local disk.</para>
+
+<para><mousebutton>Right</mousebutton> clicking on a link (which may be a picture) and choosing <guimenuitem>Copy Link Location</guimenuitem> will copy the &URL; of the link to the clipboard so you can then paste it into, say, an e-mail to a friend telling her about this wonderful new site.</para>
+
+<para><mousebutton>Right</mousebutton> clicking on a picture and choosing <guimenuitem>Copy Image Location</guimenuitem> copies the &URL; of the picture to the clipboard.</para>
+
+<para>To save a complete web page, including images, select <guimenuitem> Archive Web Page...</guimenuitem> from the <guimenu>Tools</guimenu> menu. Note that this feature is provided by a <link linkend="konq-plugin">plugin </link> and may not have been installed on your system. The web page will be saved as a single file with a <literal role="extension">.war</literal> extension and can be opened by <mousebutton>left</mousebutton> clicking on the filename in &konqueror; running in File Manager mode.</para>
+
+<para>Printing a copy of the page you are viewing is easily done with the Menubar <menuchoice><guimenu>Location</guimenu> <guimenuitem>Print...</guimenuitem></menuchoice> or <guimenuitem>Print Frame</guimenuitem> option or with the Toolbar <guiicon>Print</guiicon> button.</para>
 
 </sect1>
 
 <sect1 id="ftp">
-<title
->&FTP;</title>
-
-<para
->&FTP;, or File Transfer Protocol, is one of the the earliest, and still perhaps the best, way of transferring files between computers over the Internet.</para>
-
-<para
->With &FTP; you can see files and folders on the distant computer just as if they were on your own system, download them onto your computer using &konqueror;'s normal <guimenuitem
->Copy</guimenuitem
-> and <guimenuitem
->Paste</guimenuitem
-> or Drag 'n Drop methods and, if allowed, upload files from your machine to the other computer's filesystem. To try it, type the &URL;</para>
-
-<screen
-><userinput
->ftp://ftp.kde.org/pub/kde</userinput
->
+<title>&FTP;</title>
+
+<para>&FTP;, or File Transfer Protocol, is one of the the earliest, and still perhaps the best, way of transferring files between computers over the Internet.</para>
+
+<para>With &FTP; you can see files and folders on the distant computer just as if they were on your own system, download them onto your computer using &konqueror;'s normal <guimenuitem>Copy</guimenuitem> and <guimenuitem>Paste</guimenuitem> or Drag 'n Drop methods and, if allowed, upload files from your machine to the other computer's filesystem. To try it, type the &URL;</para>
+
+<screen><userinput>ftp://ftp.kde.org/pub/kde</userinput>
 </screen>
 
-<para
->into the Location Toolbar and press &Enter;. As long as you are connected to the Internet, and as long as the &kde;'s &FTP; site is not too busy, you should end up seeing the <filename class="directory"
->/pub/kde</filename
-> folder at &kde-ftp;</para>
-
-<note
-><para
->Although, strictly speaking, &FTP; &URL;s should be entered starting with <userinput
->ftp://</userinput
-> and <acronym
->WWW </acronym
-> &URL;s starting with <userinput
->http://</userinput
-> &konqueror; is usually smart enough to figure out what is meant, and insert these characters for you if you leave them out.</para
-></note>
-
-<para
->When you access an &FTP; site it will usually need some form of username and password from you. To simplify things, most &FTP; sites that offer files for free downloading will accept the word <systemitem class="username"
-> anonymous</systemitem
-> as a username and your email address as a password, and to make your life even easier &konqueror; will automatically supply these without troubling you. </para>
-
-<note
-><para
->If you try to access an &FTP; site that does not need a proper username or password but which is too busy to accept any more connections, &konqueror; often interprets the <quote
->busy</quote
-> message as a request for a name and password and will therefore pop up a dialogue box asking you to supply them.</para
-></note>
-
-<para
->Sites that are more concerned with security will need a proper username and password, in which case &konqueror; will ask you for them or you can include the username in the &URL; you type into the Location Toolbar, as for example</para>
-
-<screen
-><userinput
->ftp://<replaceable
->username</replaceable
->@ftp.cia.org</userinput
->
+<para>into the Location Toolbar and press &Enter;. As long as you are connected to the Internet, and as long as the &kde;'s &FTP; site is not too busy, you should end up seeing the <filename class="directory">/pub/kde</filename> folder at &kde-ftp;</para>
+
+<note><para>Although, strictly speaking, &FTP; &URL;s should be entered starting with <userinput>ftp://</userinput> and <acronym>WWW </acronym> &URL;s starting with <userinput>http://</userinput> &konqueror; is usually smart enough to figure out what is meant, and insert these characters for you if you leave them out.</para></note>
+
+<para>When you access an &FTP; site it will usually need some form of username and password from you. To simplify things, most &FTP; sites that offer files for free downloading will accept the word <systemitem class="username"> anonymous</systemitem> as a username and your email address as a password, and to make your life even easier &konqueror; will automatically supply these without troubling you. </para>
+
+<note><para>If you try to access an &FTP; site that does not need a proper username or password but which is too busy to accept any more connections, &konqueror; often interprets the <quote>busy</quote> message as a request for a name and password and will therefore pop up a dialogue box asking you to supply them.</para></note>
+
+<para>Sites that are more concerned with security will need a proper username and password, in which case &konqueror; will ask you for them or you can include the username in the &URL; you type into the Location Toolbar, as for example</para>
+
+<screen><userinput>ftp://<replaceable>username</replaceable>@ftp.cia.org</userinput>
 </screen>
 
-<para
->&konqueror; will then prompt you for the password.</para>
+<para>&konqueror; will then prompt you for the password.</para>
 
-<para
->&konqueror; can also support automatic logins as specified in a <filename
->.netrc</filename
-> file. Details of how to enable this feature are given at <ulink url="http://www.konqueror.org/faq.html#netrc"
-> http://www.konqueror.org/faq.html#netrc</ulink
-></para>
+<para>&konqueror; can also support automatic logins as specified in a <filename>.netrc</filename> file. Details of how to enable this feature are given at <ulink url="http://www.konqueror.org/faq.html#netrc"> http://www.konqueror.org/faq.html#netrc</ulink></para>
 
 </sect1>
 
 
 <sect1 id="portnumbers">
-<title
->&URL;s with Port Numbers</title>
-<para
->If you specify a port number in your &URL;, as in for example <userinput
->http://intranet.corp.com:1080</userinput
->, you might get the error message <quote
->Access to restricted port in POST denied</quote
->. This is done for security reasons. If you nevertheless need to access a server on this port, just add a key line <screen
-><userinput>
+<title>&URL;s with Port Numbers</title>
+<para>If you specify a port number in your &URL;, as in for example <userinput>http://intranet.corp.com:1080</userinput>, you might get the error message <quote>Access to restricted port in POST denied</quote>. This is done for security reasons. If you nevertheless need to access a server on this port, just add a key line <screen><userinput>
 OverridePorts=CommaSeparatedListOfAllowedPorts
-</userinput
-></screen
-> to <filename
->$TDEDIR/share/config/tdeio_httprc </filename
-> or <filename
->~/.trinity/share/config/tdeio_httprc</filename
->.</para>
-<para
->For example <screen
-><userinput
->OverridePorts=23,15
-</userinput
-></screen
-> (it should not include any embedded spaces).</para>
-<para
->&konqueror; will reject the following ports (the list is hardcoded in <filename
->tdelibs/tdeio/tdeio/job.cpp</filename
->):</para>
-<para
->1, 7, 9, 11, 13, 15, 17, 19, 20, 21, 22, 23, 25, 37, 42, 43, 53, 77, 79, 87, 95, 101, 102, 103, 104, 109, 110, 111, 113, 115, 117, 119, 123, 135, 139, 143, 179, 389, 512, 513, 514, 515, 526, 530, 531, 532, 540, 556, 587, 601, 989, 990, 992, 993, 995, 1080, 2049, 4045, 6000, 6667 </para>
+</userinput></screen> to <filename>$TDEDIR/share/config/tdeio_httprc </filename> or <filename>~/.trinity/share/config/tdeio_httprc</filename>.</para>
+<para>For example <screen><userinput>OverridePorts=23,15
+</userinput></screen> (it should not include any embedded spaces).</para>
+<para>&konqueror; will reject the following ports (the list is hardcoded in <filename>tdelibs/tdeio/tdeio/job.cpp</filename>):</para>
+<para>1, 7, 9, 11, 13, 15, 17, 19, 20, 21, 22, 23, 25, 37, 42, 43, 53, 77, 79, 87, 95, 101, 102, 103, 104, 109, 110, 111, 113, 115, 117, 119, 123, 135, 139, 143, 179, 389, 512, 513, 514, 515, 526, 530, 531, 532, 540, 556, 587, 601, 989, 990, 992, 993, 995, 1080, 2049, 4045, 6000, 6667 </para>
 </sect1>
 
 
diff --git a/tde-i18n-en_GB/docs/tdebase/konqueror/commands.docbook b/tde-i18n-en_GB/docs/tdebase/konqueror/commands.docbook
index 60410bfd441..1fa5132d764 100644
--- a/tde-i18n-en_GB/docs/tdebase/konqueror/commands.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/konqueror/commands.docbook
@@ -2,81 +2,38 @@
 
 <chapterinfo>
 <authorgroup>
-<author
->&Pamela.Roberts;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Pamela.Roberts;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
-<date
->2003-11-06</date
-> <releaseinfo
->3.2</releaseinfo
-> </chapterinfo>
-
-<title
->Command Reference</title>
-
-<note
-><para
->The shortcut key combinations shown in this chapter are the default ones. They can of course be <link linkend="configshort"
->changed</link
->. </para
-></note>
+<date>2003-11-06</date> <releaseinfo>3.2</releaseinfo> </chapterinfo>
+
+<title>Command Reference</title>
+
+<note><para>The shortcut key combinations shown in this chapter are the default ones. They can of course be <link linkend="configshort">changed</link>. </para></note>
 
 <sect1 id="specshort">
-<title
->Special Shortcuts</title>
-<para
->There are some useful shortcuts that are not shown in any of the menus:</para>
+<title>Special Shortcuts</title>
+<para>There are some useful shortcuts that are not shown in any of the menus:</para>
 <variablelist>
 
 <varlistentry>
-<term
-><keycap
->F6</keycap
-></term>
+<term><keycap>F6</keycap></term>
 <listitem>
-<para
->Sets the focus to the text entry box in the Location Toolbar.</para>
+<para>Sets the focus to the text entry box in the Location Toolbar.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><keycombo action="simul"
->&Ctrl;<keycap
->]</keycap
-></keycombo
-></term>
+<term><keycombo action="simul">&Ctrl;<keycap>]</keycap></keycombo></term>
 <listitem>
-<para
->Activate the next tab page.</para>
+<para>Activate the next tab page.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><keycombo action="simul"
->&Ctrl;<keycap
->[</keycap
-></keycombo
-></term>
+<term><keycombo action="simul">&Ctrl;<keycap>[</keycap></keycombo></term>
 <listitem>
-<para
->Activate the previous tab page.</para>
+<para>Activate the previous tab page.</para>
 </listitem>
 </varlistentry>
 
@@ -86,273 +43,77 @@
 </sect1>
 
 <sect1 id="menubar">
-<title
->The Menubar</title
-> <para
->Note that some menu entries only appear when they are applicable to the file you currently have open in &konqueror;. For example, the <menuchoice
-><guimenu
->Edit</guimenu
-><guimenuitem
->Find...</guimenuitem
-> </menuchoice
-> item will not appear when you are viewing the contents of a directory.</para>
+<title>The Menubar</title> <para>Note that some menu entries only appear when they are applicable to the file you currently have open in &konqueror;. For example, the <menuchoice><guimenu>Edit</guimenu><guimenuitem>Find...</guimenuitem> </menuchoice> item will not appear when you are viewing the contents of a directory.</para>
 <sect2 id="menu-location">
-<title
->The <guimenu
->Location</guimenu
-> Menu</title>
+<title>The <guimenu>Location</guimenu> Menu</title>
 
 <variablelist>
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->N</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Location</guimenu
-> <guimenuitem
->New Window</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Open another &konqueror; window.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;&Shift;<keycap
->N</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Location</guimenu
-> <guimenuitem
->New Tab</guimenuitem
-> </menuchoice
-></term
-> 
-<listitem
-><para
->Open another &konqueror; tab, containing a blank page.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->D</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Location</guimenu
-> <guimenuitem
->Duplicate Window</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Open another &konqueror; window, duplicating the current one.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->O</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Location</guimenu
-> <guimenuitem
->Open Location...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Open a folder or file by entering its path (for example <filename class="directory"
->/home/pam</filename
-> or <filename
->/home/pam/fred.txt</filename
->) in a simple dialogue box.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Location</guimenu
-> <guimenuitem
->Send Link</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Send an email containing a link to the current location.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Location</guimenu
-> <guimenuitem
->Send File</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Send an email containing the selected file as an attachment.</para
-></listitem>
-</varlistentry>
-
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Location</guimenu
-> <guimenuitem
->Save Background Image As...</guimenuitem
-> </menuchoice
-></term>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo> </shortcut> <guimenu>Location</guimenu> <guimenuitem>New Window</guimenuitem> </menuchoice></term>
+<listitem><para>Open another &konqueror; window.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;&Shift;<keycap>N</keycap></keycombo> </shortcut> <guimenu>Location</guimenu> <guimenuitem>New Tab</guimenuitem> </menuchoice></term> 
+<listitem><para>Open another &konqueror; tab, containing a blank page.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>D</keycap></keycombo> </shortcut> <guimenu>Location</guimenu> <guimenuitem>Duplicate Window</guimenuitem> </menuchoice></term>
+<listitem><para>Open another &konqueror; window, duplicating the current one.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>O</keycap></keycombo> </shortcut> <guimenu>Location</guimenu> <guimenuitem>Open Location...</guimenuitem> </menuchoice></term>
+<listitem><para>Open a folder or file by entering its path (for example <filename class="directory">/home/pam</filename> or <filename>/home/pam/fred.txt</filename>) in a simple dialogue box.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Location</guimenu> <guimenuitem>Send Link</guimenuitem> </menuchoice></term>
+<listitem><para>Send an email containing a link to the current location.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Location</guimenu> <guimenuitem>Send File</guimenuitem> </menuchoice></term>
+<listitem><para>Send an email containing the selected file as an attachment.</para></listitem>
+</varlistentry>
+
+
+<varlistentry>
+<term><menuchoice><guimenu>Location</guimenu> <guimenuitem>Save Background Image As...</guimenuitem> </menuchoice></term>
 <listitem>
-<para
->Only applies if you are viewing a web page with a background image. Opens the <guilabel
->Save As dialogue</guilabel
-> box to let you save the background image file to your own computer.</para>
+<para>Only applies if you are viewing a web page with a background image. Opens the <guilabel>Save As dialogue</guilabel> box to let you save the background image file to your own computer.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->S</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Location</guimenu
-> <guimenuitem
->Save As...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Only applies if you are viewing a document or web page, uses the <guilabel
->Save As...</guilabel
-> dialogue box to let you save a copy to your own computer.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Location</guimenu
-> <guimenuitem
->Save Frame As...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Similar to <guimenuitem
->Save As...</guimenuitem
-> but for use with a web site that uses frames.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->P</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Location</guimenu
-> <guimenuitem
->Print...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Print.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Location</guimenu
-> <guimenuitem
->Print Frame</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Print selected frame of a Web page.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Location</guimenu
-> <guimenuitem
->Open With Netscape/Mozilla</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Open the web page you are viewing in &konqueror; with &Netscape;/<application
->Mozilla</application
-> as well.</para
-></listitem
-> 
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->Q</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Location</guimenu
-> <guimenuitem
->Quit</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Close down this instance of &konqueror;.</para
-></listitem>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo> </shortcut> <guimenu>Location</guimenu> <guimenuitem>Save As...</guimenuitem> </menuchoice></term>
+<listitem><para>Only applies if you are viewing a document or web page, uses the <guilabel>Save As...</guilabel> dialogue box to let you save a copy to your own computer.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Location</guimenu> <guimenuitem>Save Frame As...</guimenuitem> </menuchoice></term>
+<listitem><para>Similar to <guimenuitem>Save As...</guimenuitem> but for use with a web site that uses frames.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>P</keycap></keycombo> </shortcut> <guimenu>Location</guimenu> <guimenuitem>Print...</guimenuitem> </menuchoice></term>
+<listitem><para>Print.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Location</guimenu> <guimenuitem>Print Frame</guimenuitem> </menuchoice></term>
+<listitem><para>Print selected frame of a Web page.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Location</guimenu> <guimenuitem>Open With Netscape/Mozilla</guimenuitem> </menuchoice></term>
+<listitem><para>Open the web page you are viewing in &konqueror; with &Netscape;/<application>Mozilla</application> as well.</para></listitem> 
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo> </shortcut> <guimenu>Location</guimenu> <guimenuitem>Quit</guimenuitem> </menuchoice></term>
+<listitem><para>Close down this instance of &konqueror;.</para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -360,467 +121,118 @@
 </sect2>
 
 <sect2 id="menu-edit">
-<title
->The <guimenu
->Edit</guimenu
-> Menu</title>
-
-<note
-><para
->Most items in the Menubar <guimenu
->Edit</guimenu
-> menu can also be found by &RMB; clicking on a free area of a view.</para
-></note>
+<title>The <guimenu>Edit</guimenu> Menu</title>
+
+<note><para>Most items in the Menubar <guimenu>Edit</guimenu> menu can also be found by &RMB; clicking on a free area of a view.</para></note>
 
 <variablelist>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->Z</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Undo</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Sometimes lets you reverse a mistaken action.</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
->Puts selected item(s) into the clipboard. If you then do a a <guimenuitem
->Paste</guimenuitem
-> the item(s) will be moved from the original location to the new one.</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
->Copy selected item(s) to the clipboard.</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
->Paste item(s) from clipboard to the currently viewed folder.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-><keycap
->F2</keycap
-> </shortcut
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Rename</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Lets you rename a file or folder without having to open the <guimenuitem
->Properties...</guimenuitem
-> dialogue box. </para
-></listitem>
-</varlistentry>
-
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-><keycap
->Delete</keycap
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Move to Trash</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Move selected item(s) to the Wastebin folder.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Shift;<keycap
->Delete</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Delete</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Delete the selected item(s).</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-><keycap
->F7</keycap
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Copy Files</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Copy the selected item(s) to another folder.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Move Files</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Move the selected item(s) to another folder.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Create New</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Create a link to an application, <acronym
->URL</acronym
->, Floppy or &CD-ROM; device, or create a new Folder or text or <acronym
->HTML</acronym
-> file. See the <link linkend="making"
->Create New...</link
->section for more details.</para
-></listitem
-> 
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Edit File Type...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Open the <guilabel
->Edit File Type</guilabel
-> dialogue box</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Properties..</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Open the <guilabel
->Edit Properties</guilabel
-> dialogue box</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Edit</guimenu
-><guisubmenu
->Selection</guisubmenu
-> </menuchoice
-></term>
-<listitem
-><para
->Contains a number of options for changing the items selected in the &konqueror; window: <variablelist>
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->+</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guisubmenu
->Selection</guisubmenu
-> <guimenuitem
->Select...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Together with the <guimenuitem
->Unselect...</guimenuitem
->, <guimenuitem
->Unselect All</guimenuitem
-> and <guimenuitem
->Invert</guimenuitem
-> Selection commands, this provides an easy and powerful way of selecting multiple files.</para>
-<para
->It brings up a simple dialogue box where you can enter a file name using the wild card characters * and ?, for example entering <literal role="extension"
->*.html</literal
-> will select all files ending with <literal role="extension"
->.html</literal
-> while <filename
->?a*</filename
-> will select all files which have the letter a as the second character in their filename.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->-</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guisubmenu
->Selection</guisubmenu
-> <guimenuitem
->Unselect...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Unselect files or folders via a dialogue similar to the one used by <guimenuitem
->Select...</guimenuitem
->.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->U</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guisubmenu
->Selection</guisubmenu
-> <guimenuitem
->Unselect All</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Unselect all selected files or folders.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->*</keycap
-></keycombo
-> </shortcut
-><guimenu
->Edit</guimenu
-> <guisubmenu
->Selection</guisubmenu
-> <guimenuitem
->Invert Selection</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Invert current selection.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->A</keycap
-></keycombo
-> </shortcut
-><guimenu
->Edit</guimenu
-> <guisubmenu
->Selection</guisubmenu
-> <guimenuitem
->Select All</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Selects all text in a HTML page or in a text page being previewed, you can then <guimenuitem
->Copy</guimenuitem
-> it and <guimenuitem
->Paste</guimenuitem
-> it into a text editor.</para
-></listitem
-> </varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>Z</keycap></keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Undo</guimenuitem> </menuchoice></term>
+<listitem><para>Sometimes lets you reverse a mistaken action.</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>Puts selected item(s) into the clipboard. If you then do a a <guimenuitem>Paste</guimenuitem> the item(s) will be moved from the original location to the new one.</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>Copy selected item(s) to the clipboard.</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>Paste item(s) from clipboard to the currently viewed folder.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut><keycap>F2</keycap> </shortcut><guimenu>Edit</guimenu> <guimenuitem>Rename</guimenuitem> </menuchoice></term>
+<listitem><para>Lets you rename a file or folder without having to open the <guimenuitem>Properties...</guimenuitem> dialogue box. </para></listitem>
+</varlistentry>
+
+
+<varlistentry>
+<term><menuchoice><shortcut><keycap>Delete</keycap></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Move to Trash</guimenuitem> </menuchoice></term>
+<listitem><para>Move selected item(s) to the Wastebin folder.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Shift;<keycap>Delete</keycap></keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Delete</guimenuitem> </menuchoice></term>
+<listitem><para>Delete the selected item(s).</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut><keycap>F7</keycap></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Copy Files</guimenuitem> </menuchoice></term>
+<listitem><para>Copy the selected item(s) to another folder.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Edit</guimenu> <guimenuitem>Move Files</guimenuitem> </menuchoice></term>
+<listitem><para>Move the selected item(s) to another folder.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Edit</guimenu> <guimenuitem>Create New</guimenuitem> </menuchoice></term>
+<listitem><para>Create a link to an application, <acronym>URL</acronym>, Floppy or &CD-ROM; device, or create a new Folder or text or <acronym>HTML</acronym> file. See the <link linkend="making">Create New...</link>section for more details.</para></listitem> 
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Edit</guimenu> <guimenuitem>Edit File Type...</guimenuitem> </menuchoice></term>
+<listitem><para>Open the <guilabel>Edit File Type</guilabel> dialogue box</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Edit</guimenu> <guimenuitem>Properties..</guimenuitem> </menuchoice></term>
+<listitem><para>Open the <guilabel>Edit Properties</guilabel> dialogue box</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Edit</guimenu><guisubmenu>Selection</guisubmenu> </menuchoice></term>
+<listitem><para>Contains a number of options for changing the items selected in the &konqueror; window: <variablelist>
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>+</keycap></keycombo> </shortcut> <guimenu>Edit</guimenu> <guisubmenu>Selection</guisubmenu> <guimenuitem>Select...</guimenuitem> </menuchoice></term>
+<listitem><para>Together with the <guimenuitem>Unselect...</guimenuitem>, <guimenuitem>Unselect All</guimenuitem> and <guimenuitem>Invert</guimenuitem> Selection commands, this provides an easy and powerful way of selecting multiple files.</para>
+<para>It brings up a simple dialogue box where you can enter a file name using the wild card characters * and ?, for example entering <literal role="extension">*.html</literal> will select all files ending with <literal role="extension">.html</literal> while <filename>?a*</filename> will select all files which have the letter a as the second character in their filename.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>-</keycap></keycombo> </shortcut> <guimenu>Edit</guimenu> <guisubmenu>Selection</guisubmenu> <guimenuitem>Unselect...</guimenuitem> </menuchoice></term>
+<listitem><para>Unselect files or folders via a dialogue similar to the one used by <guimenuitem>Select...</guimenuitem>.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>U</keycap></keycombo> </shortcut> <guimenu>Edit</guimenu> <guisubmenu>Selection</guisubmenu> <guimenuitem>Unselect All</guimenuitem> </menuchoice></term>
+<listitem><para>Unselect all selected files or folders.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>*</keycap></keycombo> </shortcut><guimenu>Edit</guimenu> <guisubmenu>Selection</guisubmenu> <guimenuitem>Invert Selection</guimenuitem> </menuchoice></term>
+<listitem><para>Invert current selection.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>A</keycap></keycombo> </shortcut><guimenu>Edit</guimenu> <guisubmenu>Selection</guisubmenu> <guimenuitem>Select All</guimenuitem> </menuchoice></term>
+<listitem><para>Selects all text in a HTML page or in a text page being previewed, you can then <guimenuitem>Copy</guimenuitem> it and <guimenuitem>Paste</guimenuitem> it into a text editor.</para></listitem> </varlistentry>
 </variablelist>
 </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->F</keycap
-></keycombo
-> </shortcut
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Find...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Find a text string in a text page you are previewing or in an <acronym
->HTML</acronym
-> page.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-><keycap
->F3</keycap
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Find Next</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Find the next occurrence of the text string in the text or <acronym
->HTML</acronym
-> page.</para
-></listitem
-> 
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Go to Line...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Go to a particular line number in a text page you are previewing.</para
-></listitem>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo> </shortcut><guimenu>Edit</guimenu> <guimenuitem>Find...</guimenuitem> </menuchoice></term>
+<listitem><para>Find a text string in a text page you are previewing or in an <acronym>HTML</acronym> page.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut><keycap>F3</keycap></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Find Next</guimenuitem> </menuchoice></term>
+<listitem><para>Find the next occurrence of the text string in the text or <acronym>HTML</acronym> page.</para></listitem> 
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Edit</guimenu> <guimenuitem>Go to Line...</guimenuitem> </menuchoice></term>
+<listitem><para>Go to a particular line number in a text page you are previewing.</para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -829,367 +241,114 @@
 
 <sect2 id="menu-view">
 
-<title
->The <guimenu
->View</guimenu
-> Menu</title>
+<title>The <guimenu>View</guimenu> Menu</title>
 
 <variablelist>
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-> <guisubmenu
->View Mode...</guisubmenu
-> </menuchoice
-></term>
-<listitem
-><para
->Selects <guimenuitem
->Icon</guimenuitem
->, <guimenuitem
->MultiColumn</guimenuitem
->, <guimenuitem
->Tree</guimenuitem
->, <guimenuitem
->Detailed List</guimenuitem
-> or <guimenuitem
->Text</guimenuitem
-> view mode.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Use index.html</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->If a selected folder contains a file <filename
->index.html</filename
->, it will be opened as a web page rather than showing the folder as a list of files.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Lock to current location</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Lock to current location. </para
-></listitem>
+<term><menuchoice><guimenu>View</guimenu> <guisubmenu>View Mode...</guisubmenu> </menuchoice></term>
+<listitem><para>Selects <guimenuitem>Icon</guimenuitem>, <guimenuitem>MultiColumn</guimenuitem>, <guimenuitem>Tree</guimenuitem>, <guimenuitem>Detailed List</guimenuitem> or <guimenuitem>Text</guimenuitem> view mode.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>View</guimenu> <guimenuitem>Use index.html</guimenuitem> </menuchoice></term>
+<listitem><para>If a selected folder contains a file <filename>index.html</filename>, it will be opened as a web page rather than showing the folder as a list of files.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>View</guimenu> <guimenuitem>Lock to current location</guimenuitem> </menuchoice></term>
+<listitem><para>Lock to current location. </para></listitem>
 </varlistentry>
 	  
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Unlock all views</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Unlock all views. </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Link View</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Link current view to others in a multiple view window.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-><keycap
->F5</keycap
-></shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Reload</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Reload.</para
-></listitem>
+<term><menuchoice><guimenu>View</guimenu> <guimenuitem>Unlock all views</guimenuitem> </menuchoice></term>
+<listitem><para>Unlock all views. </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>View</guimenu> <guimenuitem>Link View</guimenuitem> </menuchoice></term>
+<listitem><para>Link current view to others in a multiple view window.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut><keycap>F5</keycap></shortcut> <guimenu>View</guimenu> <guimenuitem>Reload</guimenuitem> </menuchoice></term>
+<listitem><para>Reload.</para></listitem>
 </varlistentry>
 	  
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-><keycap
->Esc</keycap
-></shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Stop</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Stop load (particularly useful when web browsing).</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Icon Size</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Select size of icons used when viewing a folder in Icon Mode.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-> <guisubmenu
->Sort</guisubmenu
-> </menuchoice
-></term>
-<listitem
-><para
->Choose order in which items are presented in the window when in Icon or MultiColumn View mode.</para
-></listitem>
+<term><menuchoice><shortcut><keycap>Esc</keycap></shortcut> <guimenu>View</guimenu> <guimenuitem>Stop</guimenuitem> </menuchoice></term>
+<listitem><para>Stop load (particularly useful when web browsing).</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>View</guimenu> <guimenuitem>Icon Size</guimenuitem> </menuchoice></term>
+<listitem><para>Select size of icons used when viewing a folder in Icon Mode.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>View</guimenu> <guisubmenu>Sort</guisubmenu> </menuchoice></term>
+<listitem><para>Choose order in which items are presented in the window when in Icon or MultiColumn View mode.</para></listitem>
 </varlistentry>
 	  
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Case Insensitive Sort</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Choose whether the sort order in Tree, Detailed List or Text View modes is case sensitive.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->U</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->View Document Source</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->View document source text.</para>
-<para
->Only available if you are viewing a document or <acronym
->HTML</acronym
-> page.</para>
+<term><menuchoice><guimenu>View</guimenu> <guimenuitem>Case Insensitive Sort</guimenuitem> </menuchoice></term>
+<listitem><para>Choose whether the sort order in Tree, Detailed List or Text View modes is case sensitive.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>U</keycap> </keycombo> </shortcut> <guimenu>View</guimenu> <guimenuitem>View Document Source</guimenuitem> </menuchoice></term>
+<listitem><para>View document source text.</para>
+<para>Only available if you are viewing a document or <acronym>HTML</acronym> page.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->View Frame Source</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->View frame source text</para>
-<para
->Only applies if you are viewing a web site that uses frames. Similar to <guimenuitem
->View Document Source</guimenuitem
->. </para>
+<term><menuchoice><guimenu>View</guimenu> <guimenuitem>View Frame Source</guimenuitem> </menuchoice></term>
+<listitem><para>View frame source text</para>
+<para>Only applies if you are viewing a web site that uses frames. Similar to <guimenuitem>View Document Source</guimenuitem>. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->I</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->View Document Information</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->View document information, such as title, &URL;, and &HTTP; headers used in retrieving the document.</para>
-<para
->Only available if you are viewing an <acronym
->HTML</acronym
-> page.</para>
+<term><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>I</keycap> </keycombo> </shortcut> <guimenu>View</guimenu> <guimenuitem>View Document Information</guimenuitem> </menuchoice></term>
+<listitem><para>View document information, such as title, &URL;, and &HTTP; headers used in retrieving the document.</para>
+<para>Only available if you are viewing an <acronym>HTML</acronym> page.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Security...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Tells you whether the current browser connection is secured with <acronym
->SSL</acronym
-> and lets you bring up the <guilabel
->Cryptography Configuration...</guilabel
-> dialogue box. <mousebutton
->Left</mousebutton
-> clicking on the Menubar padlock icon does the same thing.</para
-></listitem
-> </varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Set Encoding</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Set encoding</para>
-<para
->Allows you to choose the character encoding used to display <acronym
->HTML</acronym
-> pages. <guimenuitem
->Auto</guimenuitem
-> is usually the best choice.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-> <guisubmenu
->Preview</guisubmenu
-> </menuchoice
-></term>
-<listitem
-><para
->Lets you choose to show thumbnails of images, text files or HTML pages instead of the normal icons in Icon or MultiColumn View modes.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Show Hidden Files</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Show hidden (dot) files.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Show details...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Lets you choose which file and folder details are shown in Tree, Detailed List and Text views.</para
-></listitem>
-</varlistentry>
-
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Background Colour...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Select background colour for the File Manager mode. </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Background Image...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Select background image for the File Manager mode. </para
-></listitem>
+<term><menuchoice><guimenu>View</guimenu> <guimenuitem>Security...</guimenuitem> </menuchoice></term>
+<listitem><para>Tells you whether the current browser connection is secured with <acronym>SSL</acronym> and lets you bring up the <guilabel>Cryptography Configuration...</guilabel> dialogue box. <mousebutton>Left</mousebutton> clicking on the Menubar padlock icon does the same thing.</para></listitem> </varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>View</guimenu> <guimenuitem>Set Encoding</guimenuitem> </menuchoice></term>
+<listitem><para>Set encoding</para>
+<para>Allows you to choose the character encoding used to display <acronym>HTML</acronym> pages. <guimenuitem>Auto</guimenuitem> is usually the best choice.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>View</guimenu> <guisubmenu>Preview</guisubmenu> </menuchoice></term>
+<listitem><para>Lets you choose to show thumbnails of images, text files or HTML pages instead of the normal icons in Icon or MultiColumn View modes.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>View</guimenu> <guimenuitem>Show Hidden Files</guimenuitem> </menuchoice></term>
+<listitem><para>Show hidden (dot) files.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>View</guimenu> <guimenuitem>Show details...</guimenuitem> </menuchoice></term>
+<listitem><para>Lets you choose which file and folder details are shown in Tree, Detailed List and Text views.</para></listitem>
+</varlistentry>
+
+
+<varlistentry>
+<term><menuchoice><guimenu>View</guimenu> <guimenuitem>Background Colour...</guimenuitem> </menuchoice></term>
+<listitem><para>Select background colour for the File Manager mode. </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>View</guimenu> <guimenuitem>Background Image...</guimenuitem> </menuchoice></term>
+<listitem><para>Select background image for the File Manager mode. </para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -1197,175 +356,54 @@
 </sect2>
 
 <sect2 id="menu-go">
-<title
->The <guimenu
->Go</guimenu
-> Menu</title>
+<title>The <guimenu>Go</guimenu> Menu</title>
 
 <variablelist>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Alt;<keysym
->Up Arrow</keysym
-></keycombo
-> </shortcut
-><guimenu
->Go</guimenu
-> <guimenuitem
->Up</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Go up a level in the folder hierarchy.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Alt;<keysym
->Left Arrow</keysym
-></keycombo
-> </shortcut
-><guimenu
->Go</guimenu
-> <guimenuitem
->Back</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Go back to the previous view.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Alt;<keysym
->Right Arrow</keysym
-></keycombo
-> </shortcut
-><guimenu
->Go</guimenu
-> <guimenuitem
->Forward</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->You can only go forward if you've just gone back.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->Home</keycap
-></keycombo
-> </shortcut
-><guimenu
->Go</guimenu
-> <guimenuitem
->Home URL</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Go to your home folder.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Go</guimenu
-> <guimenuitem
->Applications</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Open the folder holding your applications.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Go</guimenu
-> <guimenuitem
->Trash</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Open your <filename class="directory"
->Trash</filename
-> folder in a separate window.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Go</guimenu
-> <guimenuitem
->Templates</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Open the <filename class="directory"
->Templates</filename
-> folder in a separate window.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Go</guimenu
-> <guimenuitem
->Autostart</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Open your <filename class="directory"
->Autostart</filename
-> folder in a separate window.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Go</guimenu
-> <guisubmenu
->Most Often Visited</guisubmenu
-> </menuchoice
-></term>
+<term><menuchoice><shortcut> <keycombo action="simul">&Alt;<keysym>Up Arrow</keysym></keycombo> </shortcut><guimenu>Go</guimenu> <guimenuitem>Up</guimenuitem> </menuchoice></term>
+<listitem><para>Go up a level in the folder hierarchy.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Alt;<keysym>Left Arrow</keysym></keycombo> </shortcut><guimenu>Go</guimenu> <guimenuitem>Back</guimenuitem> </menuchoice></term>
+<listitem><para>Go back to the previous view.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Alt;<keysym>Right Arrow</keysym></keycombo> </shortcut><guimenu>Go</guimenu> <guimenuitem>Forward</guimenuitem> </menuchoice></term>
+<listitem><para>You can only go forward if you've just gone back.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>Home</keycap></keycombo> </shortcut><guimenu>Go</guimenu> <guimenuitem>Home URL</guimenuitem> </menuchoice></term>
+<listitem><para>Go to your home folder.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Go</guimenu> <guimenuitem>Applications</guimenuitem> </menuchoice></term>
+<listitem><para>Open the folder holding your applications.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Go</guimenu> <guimenuitem>Trash</guimenuitem> </menuchoice></term>
+<listitem><para>Open your <filename class="directory">Trash</filename> folder in a separate window.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Go</guimenu> <guimenuitem>Templates</guimenuitem> </menuchoice></term>
+<listitem><para>Open the <filename class="directory">Templates</filename> folder in a separate window.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Go</guimenu> <guimenuitem>Autostart</guimenuitem> </menuchoice></term>
+<listitem><para>Open your <filename class="directory">Autostart</filename> folder in a separate window.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Go</guimenu> <guisubmenu>Most Often Visited</guisubmenu> </menuchoice></term>
 <listitem>
-<para
->Displays a submenu showing the &URL;s you visit most often. Selecting one of these will make &konqueror; open that &URL;.</para>
+<para>Displays a submenu showing the &URL;s you visit most often. Selecting one of these will make &konqueror; open that &URL;.</para>
 </listitem>
 </varlistentry>
 
@@ -1374,389 +412,126 @@
 </sect2>
 
 <sect2 id="menu-bookmarks">
-<title
->The <guimenu
->Bookmarks</guimenu
-> Menu</title>
-
-<note
-><para
->See the section <link linkend="bookmarks"
->Using Bookmarks</link
-> in this manual for a fuller description of these menu items. </para
-></note>
+<title>The <guimenu>Bookmarks</guimenu> Menu</title>
+
+<note><para>See the section <link linkend="bookmarks">Using Bookmarks</link> in this manual for a fuller description of these menu items. </para></note>
 <variablelist>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->B</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Bookmarks</guimenu
-> <guimenuitem
->Add Bookmark</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Add current selection to your bookmarks.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Bookmarks</guimenu
-> <guimenuitem
->Bookmark Tabs as Folder...</guimenuitem
-> </menuchoice
-></term>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>B</keycap></keycombo> </shortcut> <guimenu>Bookmarks</guimenu> <guimenuitem>Add Bookmark</guimenuitem> </menuchoice></term>
+<listitem><para>Add current selection to your bookmarks.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Bookmarks</guimenu> <guimenuitem>Bookmark Tabs as Folder...</guimenuitem> </menuchoice></term>
 <listitem>
-<para
->Create a bookmark folder containing links to all of the &URL;s currently open in &konqueror; tabs. </para>
+<para>Create a bookmark folder containing links to all of the &URL;s currently open in &konqueror; tabs. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Bookmarks</guimenu
-> <guimenuitem
->Edit Bookmarks...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Open the <link linkend="bookmarks"
->Bookmark Editor</link
->. </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Bookmarks</guimenu
-> <guimenuitem
->New Bookmark Folder...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Create a new folder in your Bookmarks folder.</para
-></listitem>
+<term><menuchoice><guimenu>Bookmarks</guimenu> <guimenuitem>Edit Bookmarks...</guimenuitem> </menuchoice></term>
+<listitem><para>Open the <link linkend="bookmarks">Bookmark Editor</link>. </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Bookmarks</guimenu> <guimenuitem>New Bookmark Folder...</guimenuitem> </menuchoice></term>
+<listitem><para>Create a new folder in your Bookmarks folder.</para></listitem>
 </varlistentry>
 </variablelist>
 
 </sect2>
 
 <sect2 id="menu-tools">
-<title
->The <guimenu
->Tools</guimenu
-> Menu</title>
+<title>The <guimenu>Tools</guimenu> Menu</title>
 
 <variablelist>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Alt;<keycap
->F2</keycap
-></keycombo
-></shortcut
-> <guimenu
->Tools</guimenu
-> <guimenuitem
->Run Command...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Run a program by entering its name in a simple dialogue box.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->T</keycap
-></keycombo
-></shortcut
-> <guimenu
->Tools</guimenu
-> <guimenuitem
->Open Terminal</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Open a &konsole; terminal window.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Find File...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Open the &kfind; application.</para
-></listitem>
+<term><menuchoice><shortcut> <keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo></shortcut> <guimenu>Tools</guimenu> <guimenuitem>Run Command...</guimenuitem> </menuchoice></term>
+<listitem><para>Run a program by entering its name in a simple dialogue box.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>T</keycap></keycombo></shortcut> <guimenu>Tools</guimenu> <guimenuitem>Open Terminal</guimenuitem> </menuchoice></term>
+<listitem><para>Open a &konsole; terminal window.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Tools</guimenu> <guimenuitem>Find File...</guimenuitem> </menuchoice></term>
+<listitem><para>Open the &kfind; application.</para></listitem>
 </varlistentry>
 </variablelist>
 
-<para
->If you have &konqueror; plugins installed there will be additional entries in the <guimenu
->Tools</guimenu
-> menu. See the <link linkend="konq-plugin"
->&konqueror; Plugins</link
-> chapter for further details.</para>
+<para>If you have &konqueror; plugins installed there will be additional entries in the <guimenu>Tools</guimenu> menu. See the <link linkend="konq-plugin">&konqueror; Plugins</link> chapter for further details.</para>
 </sect2>
 
 <sect2 id="menu-settings">
-<title
->The <guimenu
->Settings</guimenu
-> Menu</title>
-
-<note
-><para
->See also the section <link linkend="save-settings"
->Saving Settings and Profiles</link
->.</para
-></note>
+<title>The <guimenu>Settings</guimenu> Menu</title>
+
+<note><para>See also the section <link linkend="save-settings">Saving Settings and Profiles</link>.</para></note>
 
 <variablelist>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->M</keycap
-></keycombo
-></shortcut
-> <guimenu
->Settings</guimenu
-> <guimenuitem
->Show Menubar</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Show/Hide the menubar.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Toolbars</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Opens a sub menu where you can choose to show or hide the various Toolbars.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;&Shift; <keycap
->F</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Settings</guimenu
-> <guimenuitem
->Full Screen Mode</guimenuitem
-> </menuchoice
-></term>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>M</keycap></keycombo></shortcut> <guimenu>Settings</guimenu> <guimenuitem>Show Menubar</guimenuitem> </menuchoice></term>
+<listitem><para>Show/Hide the menubar.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Settings</guimenu> <guimenuitem>Toolbars</guimenuitem> </menuchoice></term>
+<listitem><para>Opens a sub menu where you can choose to show or hide the various Toolbars.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<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
->Changes &konqueror; to full screen mode, in which the &konqueror; window takes up the whole screen, and does not have the usual window decorations. To exit full screen mode, click on the <guiicon
->Exit Full Screen Mode</guiicon
-> icon on the toolbar, or press <keycombo action="simul"
->&Ctrl;&Shift; <keycap
->F</keycap
-></keycombo
->.</para>
+<para>Changes &konqueror; to full screen mode, in which the &konqueror; window takes up the whole screen, and does not have the usual window decorations. To exit full screen mode, click on the <guiicon>Exit Full Screen Mode</guiicon> icon on the toolbar, or press <keycombo action="simul">&Ctrl;&Shift; <keycap>F</keycap></keycombo>.</para>
 </listitem>
 </varlistentry>
 
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->View Properties Saved in Folder</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Save View properties to current folder. If this is selected, a <filename
->.directory</filename
-> file will be written in the current directory storing the settings you last used to view the directory. These settings are then loaded when you open the directory in &konqueror;.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Remove Folder Properties</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Remove settings stored in folder by <guimenuitem
->View Properties Saved in Folder</guimenuitem
->.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guisubmenu
->Load View Profile</guisubmenu
-> </menuchoice
-></term>
-<listitem
-><para
->Load the settings associated with a particular view profile.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Save View Profile "<replaceable
->ProfileName</replaceable
->"...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Save the current settings to the current view profile.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure View Profiles...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Lets you change an existing view profile or create a new one.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Shortcuts...</guimenuitem
-> </menuchoice
-></term
-> <listitem
-><para
->Lets you see and change &konqueror;'s shortcut key bindings, i.e. the associations between actions such as <guimenuitem
->Copy</guimenuitem
-> and keys or combinations of keys such a <keycombo action="simul"
->&Ctrl;<keycap
->V</keycap
-></keycombo
->. If you do this take care not to duplicate an existing shortcut.</para>
-</listitem
-></varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Toolbars...</guimenuitem
-> </menuchoice
-></term
-> <listitem
-><para
->Lets you configure the Main, Extra and Location Toolbars. See the section <link linkend="configure-bars"
->Changing Bars</link
->. </para
-></listitem
-> </varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure &konqueror;...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Lets you configure the File manager, File Associations, Browser, Internet Keywords, Cookies, Proxies, Cryptography, User Agent, or Toolbars by bringing up the appropriate dialogue box.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Spell Checking...</guimenuitem
-> </menuchoice
-></term>
+<term><menuchoice><guimenu>Settings</guimenu> <guimenuitem>View Properties Saved in Folder</guimenuitem> </menuchoice></term>
+<listitem><para>Save View properties to current folder. If this is selected, a <filename>.directory</filename> file will be written in the current directory storing the settings you last used to view the directory. These settings are then loaded when you open the directory in &konqueror;.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Settings</guimenu> <guimenuitem>Remove Folder Properties</guimenuitem> </menuchoice></term>
+<listitem><para>Remove settings stored in folder by <guimenuitem>View Properties Saved in Folder</guimenuitem>.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Settings</guimenu> <guisubmenu>Load View Profile</guisubmenu> </menuchoice></term>
+<listitem><para>Load the settings associated with a particular view profile.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Settings</guimenu> <guimenuitem>Save View Profile "<replaceable>ProfileName</replaceable>"...</guimenuitem> </menuchoice></term>
+<listitem><para>Save the current settings to the current view profile.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure View Profiles...</guimenuitem> </menuchoice></term>
+<listitem><para>Lets you change an existing view profile or create a new one.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Shortcuts...</guimenuitem> </menuchoice></term> <listitem><para>Lets you see and change &konqueror;'s shortcut key bindings, i.e. the associations between actions such as <guimenuitem>Copy</guimenuitem> and keys or combinations of keys such a <keycombo action="simul">&Ctrl;<keycap>V</keycap></keycombo>. If you do this take care not to duplicate an existing shortcut.</para>
+</listitem></varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Toolbars...</guimenuitem> </menuchoice></term> <listitem><para>Lets you configure the Main, Extra and Location Toolbars. See the section <link linkend="configure-bars">Changing Bars</link>. </para></listitem> </varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure &konqueror;...</guimenuitem> </menuchoice></term>
+<listitem><para>Lets you configure the File manager, File Associations, Browser, Internet Keywords, Cookies, Proxies, Cryptography, User Agent, or Toolbars by bringing up the appropriate dialogue box.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Spell Checking...</guimenuitem> </menuchoice></term>
 <listitem>
-<para
->Displays the spell checking configuration dialogue box, in which you can change settings associated with spell checking in &konqueror;.</para>
+<para>Displays the spell checking configuration dialogue box, in which you can change settings associated with spell checking in &konqueror;.</para>
 </listitem>
 </varlistentry>
 
@@ -1766,236 +541,63 @@
 </sect2>
 
 <sect2 id="menu-window">
-<title
->The <guimenu
->Window</guimenu
-> Menu</title>
+<title>The <guimenu>Window</guimenu> Menu</title>
 
 <variablelist>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;&Shift;<keycap
->L</keycap
-></keycombo
-></shortcut
-> <guimenu
->Window</guimenu
-> <guimenuitem
->Split View Left/Right</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Split View Left/Right.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;&Shift;<keycap
->T</keycap
-></keycombo
-></shortcut
-> <guimenu
->Window</guimenu
-> <guimenuitem
->Split View Top/Bottom</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Split View Top/Bottom.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;&Shift;<keycap
->R</keycap
-></keycombo
-></shortcut
-> <guimenu
->Window</guimenu
-> <guimenuitem
->Remove Active View</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Remove Active View.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;&Shift;<keycap
->N</keycap
-></keycombo
-></shortcut
-> <guimenu
->Window</guimenu
-> <guimenuitem
->New Tab</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Open a new, empty, tab page.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;&Shift;<keycap
->D</keycap
-></keycombo
-></shortcut
-> <guimenu
->Window</guimenu
-> <guimenuitem
->Duplicate Current Tab</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Open a duplicate tab page.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;&Shift;<keycap
->B</keycap
-></keycombo
-></shortcut
-> <guimenu
->Window</guimenu
-> <guimenuitem
->Detach Current Tab</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Show the current tab page in a new instance of &konqueror;.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->W</keycap
-></keycombo
-></shortcut
-> <guimenu
->Window</guimenu
-> <guimenuitem
->Close Current Tab</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Close the current tab page.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;&Shift;<keycap
->Left</keycap
-></keycombo
-></shortcut
-> <guimenu
->Window</guimenu
-> <guimenuitem
->Move Tab Left</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Move the current tab one place left in the list of tabs.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;&Shift;<keycap
->Left</keycap
-></keycombo
-></shortcut
-> <guimenu
->Window</guimenu
-> <guimenuitem
->Move Tab Right</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Move the current tab one place right in the list of tabs.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Window</guimenu
-> <guimenuitem
->Show Terminal Emulator</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Open a small text terminal view at the bottom of the main window.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
-><keycap
->F9</keycap
-></keycombo
-></shortcut
-> <guimenu
->Window</guimenu
-> <guimenuitem
->Show Navigation Panel</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Toggles the display of the &konqueror; navigation panel. See <xref linkend="sidebar"/>.</para
-></listitem>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;&Shift;<keycap>L</keycap></keycombo></shortcut> <guimenu>Window</guimenu> <guimenuitem>Split View Left/Right</guimenuitem> </menuchoice></term>
+<listitem><para>Split View Left/Right.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;&Shift;<keycap>T</keycap></keycombo></shortcut> <guimenu>Window</guimenu> <guimenuitem>Split View Top/Bottom</guimenuitem> </menuchoice></term>
+<listitem><para>Split View Top/Bottom.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;&Shift;<keycap>R</keycap></keycombo></shortcut> <guimenu>Window</guimenu> <guimenuitem>Remove Active View</guimenuitem> </menuchoice></term>
+<listitem><para>Remove Active View.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;&Shift;<keycap>N</keycap></keycombo></shortcut> <guimenu>Window</guimenu> <guimenuitem>New Tab</guimenuitem> </menuchoice></term>
+<listitem><para>Open a new, empty, tab page.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;&Shift;<keycap>D</keycap></keycombo></shortcut> <guimenu>Window</guimenu> <guimenuitem>Duplicate Current Tab</guimenuitem> </menuchoice></term>
+<listitem><para>Open a duplicate tab page.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;&Shift;<keycap>B</keycap></keycombo></shortcut> <guimenu>Window</guimenu> <guimenuitem>Detach Current Tab</guimenuitem> </menuchoice></term>
+<listitem><para>Show the current tab page in a new instance of &konqueror;.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>W</keycap></keycombo></shortcut> <guimenu>Window</guimenu> <guimenuitem>Close Current Tab</guimenuitem> </menuchoice></term>
+<listitem><para>Close the current tab page.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;&Shift;<keycap>Left</keycap></keycombo></shortcut> <guimenu>Window</guimenu> <guimenuitem>Move Tab Left</guimenuitem> </menuchoice></term>
+<listitem><para>Move the current tab one place left in the list of tabs.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;&Shift;<keycap>Left</keycap></keycombo></shortcut> <guimenu>Window</guimenu> <guimenuitem>Move Tab Right</guimenuitem> </menuchoice></term>
+<listitem><para>Move the current tab one place right in the list of tabs.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Window</guimenu> <guimenuitem>Show Terminal Emulator</guimenuitem> </menuchoice></term>
+<listitem><para>Open a small text terminal view at the bottom of the main window.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul"><keycap>F9</keycap></keycombo></shortcut> <guimenu>Window</guimenu> <guimenuitem>Show Navigation Panel</guimenuitem> </menuchoice></term>
+<listitem><para>Toggles the display of the &konqueror; navigation panel. See <xref linkend="sidebar"/>.</para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -2003,111 +605,38 @@
 </sect2>
 
 <sect2 id="menu-help">
-<title
->The <guimenu
->Help</guimenu
-> Menu</title>
+<title>The <guimenu>Help</guimenu> Menu</title>
 
 <variablelist>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Help</guimenu
-> <guimenuitem
->&konqueror; Handbook</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->View this document.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Shift;<keycap
->F1</keycap
-></keycombo
-></shortcut
-> <guimenu
->Help</guimenu
-> <guimenuitem
->What's This?</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Draws a question mark (?) beside the mouse pointer, clicking on a window item such as the <guiicon
->Stop</guiicon
-> button will then display a brief explanation. See <link linkend="bubble"
->Tooltips and What's This?</link
-> .</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Help</guimenu
-> <guimenuitem
->&konqueror; Introduction</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Revisit the introductory pages that you got when &konqueror; was first started.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Help</guimenu
-> <guimenuitem
->Report Bug...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Report bug.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Help</guimenu
-> <guimenuitem
->About &konqueror;...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Display some brief information about &konqueror;'s version number, authors and licence agreement.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Help</guimenu
-> <guimenuitem
->About KDE...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Show some information about the version of &kde; that you are running.</para
-></listitem>
+<term><menuchoice><guimenu>Help</guimenu> <guimenuitem>&konqueror; Handbook</guimenuitem> </menuchoice></term>
+<listitem><para>View this document.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Shift;<keycap>F1</keycap></keycombo></shortcut> <guimenu>Help</guimenu> <guimenuitem>What's This?</guimenuitem> </menuchoice></term>
+<listitem><para>Draws a question mark (?) beside the mouse pointer, clicking on a window item such as the <guiicon>Stop</guiicon> button will then display a brief explanation. See <link linkend="bubble">Tooltips and What's This?</link> .</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Help</guimenu> <guimenuitem>&konqueror; Introduction</guimenuitem> </menuchoice></term>
+<listitem><para>Revisit the introductory pages that you got when &konqueror; was first started.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Help</guimenu> <guimenuitem>Report Bug...</guimenuitem> </menuchoice></term>
+<listitem><para>Report bug.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Help</guimenu> <guimenuitem>About &konqueror;...</guimenuitem> </menuchoice></term>
+<listitem><para>Display some brief information about &konqueror;'s version number, authors and licence agreement.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Help</guimenu> <guimenuitem>About KDE...</guimenuitem> </menuchoice></term>
+<listitem><para>Show some information about the version of &kde; that you are running.</para></listitem>
 </varlistentry>
 
 </variablelist>
diff --git a/tde-i18n-en_GB/docs/tdebase/konqueror/config.docbook b/tde-i18n-en_GB/docs/tdebase/konqueror/config.docbook
index 473ab9af051..e0896d4091a 100644
--- a/tde-i18n-en_GB/docs/tdebase/konqueror/config.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/konqueror/config.docbook
@@ -2,188 +2,68 @@
 
 <chapterinfo>
 <authorgroup>
-<author
->&Pamela.Roberts;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Pamela.Roberts;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
-<date
->2003-11-06</date
-> <releaseinfo
->3.2</releaseinfo
-> </chapterinfo>
+<date>2003-11-06</date> <releaseinfo>3.2</releaseinfo> </chapterinfo>
 
 
-<title
->Configuring &konqueror;</title>
+<title>Configuring &konqueror;</title>
 
-<para
->In common with the rest of &kde;, &konqueror; is highly configurable, so you can really get the look and feel that best fits your needs and wishes.</para>
+<para>In common with the rest of &kde;, &konqueror; is highly configurable, so you can really get the look and feel that best fits your needs and wishes.</para>
 
 <sect1 id="configure-bars">
-<title
->Toolbars</title>
-
-<para
->When &kde; is newly installed, &konqueror;'s window contains a Menubar, Main and Location Toolbars and possibly a Bookmark Toolbar.</para>
-
-<para
->Maybe you don't need all these toolbars. To hide one of them, go into the <menuchoice
-><guimenu
->Settings</guimenu
-><guisubmenu
->Toolbars</guisubmenu
-> </menuchoice
-> menu and uncheck its box. To show a hidden toolbar, just check the box.</para
-> 
-
-<para
->The Menubar itself can be toggled on and off with the shortcut key combination <keycombo action="simul"
->&Ctrl;<keycap
->M</keycap
-></keycombo
->. </para>
+<title>Toolbars</title>
+
+<para>When &kde; is newly installed, &konqueror;'s window contains a Menubar, Main and Location Toolbars and possibly a Bookmark Toolbar.</para>
+
+<para>Maybe you don't need all these toolbars. To hide one of them, go into the <menuchoice><guimenu>Settings</guimenu><guisubmenu>Toolbars</guisubmenu> </menuchoice> menu and uncheck its box. To show a hidden toolbar, just check the box.</para> 
+
+<para>The Menubar itself can be toggled on and off with the shortcut key combination <keycombo action="simul">&Ctrl;<keycap>M</keycap></keycombo>. </para>
 
 <!-- FIXME -->
-<para
->On the left hand end of each bar you can see some vertical lines. By &LMB; clicking on them, you <quote
->flatten</quote
-> the bar, meaning that it is hidden but can be quickly restored by clicking on the now horizontal lines. You can also drag a bar into a new position with these lines.</para>
-
-<para
->If you <mousebutton
->right</mousebutton
-> click on a Toolbar, you will get a menu to configure this bar. You can choose the orientation, text position and icon size</para>
-
-<para
->The icons shown in the various bars can be changed by using the <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Toolbars...</guimenuitem
-></menuchoice
-> option, which brings up the <guilabel
->Configure Toolbars</guilabel
-> dialogue box. The Main and Extra Toolbars are divided into sections, such as Main Toolbar &lt;&konqueror;&gt;, Main Toolbar &lt;tdehtmlpart&gt; and Extra Toolbar &lt;tdehtmlsettingsplugin&gt;. The number and type of these sections will depend on whether &konqueror; is in Web Browser or File Manager mode and whether you have &konqueror; plugins installed.</para>
+<para>On the left hand end of each bar you can see some vertical lines. By &LMB; clicking on them, you <quote>flatten</quote> the bar, meaning that it is hidden but can be quickly restored by clicking on the now horizontal lines. You can also drag a bar into a new position with these lines.</para>
+
+<para>If you <mousebutton>right</mousebutton> click on a Toolbar, you will get a menu to configure this bar. You can choose the orientation, text position and icon size</para>
+
+<para>The icons shown in the various bars can be changed by using the <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Toolbars...</guimenuitem></menuchoice> option, which brings up the <guilabel>Configure Toolbars</guilabel> dialogue box. The Main and Extra Toolbars are divided into sections, such as Main Toolbar &lt;&konqueror;&gt;, Main Toolbar &lt;tdehtmlpart&gt; and Extra Toolbar &lt;tdehtmlsettingsplugin&gt;. The number and type of these sections will depend on whether &konqueror; is in Web Browser or File Manager mode and whether you have &konqueror; plugins installed.</para>
 
 </sect1>
 
 <sect1 id="configshort">
-<title
->Shortcuts</title>
-<para
->To change the shortcut key arrangements used by &konqueror; select <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Shortcuts... </guimenuitem
-></menuchoice
->. This will launch a dialogue box as shown below. </para>
+<title>Shortcuts</title>
+<para>To change the shortcut key arrangements used by &konqueror; select <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Shortcuts... </guimenuitem></menuchoice>. This will launch a dialogue box as shown below. </para>
 <mediaobject>
 <imageobject>
 <imagedata fileref="shortcut1.png" format="PNG"/>
 </imageobject>
 <textobject>
-<phrase
->Shortcut config screenshot 1</phrase>
+<phrase>Shortcut config screenshot 1</phrase>
 </textobject>
 </mediaobject>
-<para
->Search through the combo box to find the action you want to add or change the shortcut keys for and select it by <mousebutton
->left</mousebutton
-> clicking on the name. You will then be able to change the shortcut by selecting the <guilabel
->None</guilabel
->, <guilabel
->Default</guilabel
-> or <guilabel
->Custom</guilabel
-> radio button or by clicking on the large button in the <guilabel
->Shortcut for Selected Action</guilabel
-> area.</para>
-<para
->The <guilabel
->Define Shortcut</guilabel
-> dialogue box will then open. </para>
+<para>Search through the combo box to find the action you want to add or change the shortcut keys for and select it by <mousebutton>left</mousebutton> clicking on the name. You will then be able to change the shortcut by selecting the <guilabel>None</guilabel>, <guilabel>Default</guilabel> or <guilabel>Custom</guilabel> radio button or by clicking on the large button in the <guilabel>Shortcut for Selected Action</guilabel> area.</para>
+<para>The <guilabel>Define Shortcut</guilabel> dialogue box will then open. </para>
 <mediaobject>
 <imageobject>
 <imagedata fileref="shortcut2.png" format="PNG"/>
 </imageobject>
 <textobject>
-<phrase
->Shortcut config screenshot 2</phrase>
+<phrase>Shortcut config screenshot 2</phrase>
 </textobject>
 </mediaobject>
-<para
->Choose whether you want to change the <guilabel
->Primary</guilabel
-> or <guilabel
->Alternate</guilabel
-> shortcut then press the key combination you want to act as the shortcut, for example <keycombo action="simul"
-> &Ctrl;&Shift;<keycap
->S</keycap
-></keycombo
->. If the <guilabel
->Auto-Close</guilabel
-> box is checked the dialogue will vanish as soon as you enter the key combination, otherwise it will remain until you press <guibutton
->OK</guibutton
-> or <guibutton
->Cancel</guibutton
->. Clicking on the little black icon with a white cross in it clears the shortcut.</para>
+<para>Choose whether you want to change the <guilabel>Primary</guilabel> or <guilabel>Alternate</guilabel> shortcut then press the key combination you want to act as the shortcut, for example <keycombo action="simul"> &Ctrl;&Shift;<keycap>S</keycap></keycombo>. If the <guilabel>Auto-Close</guilabel> box is checked the dialogue will vanish as soon as you enter the key combination, otherwise it will remain until you press <guibutton>OK</guibutton> or <guibutton>Cancel</guibutton>. Clicking on the little black icon with a white cross in it clears the shortcut.</para>
 
 <sect2 id="userdefmenus">
-<title
->User Defined Menus</title>
-<para
->You can add your own pop up menu to &konqueror; so that pressing one key combination will make the menu appear then pressing a second key, or using the <keysym
->Up arrow</keysym
-> and <keysym
->Down arrow</keysym
-> keys and pressing <keycap
->Enter</keycap
->, will select an item from it.</para>
-<para
->To do this add a <guilabel
->Custom</guilabel
-> shortcut for each of the actions you want to appear in the menu and in the <guilabel
->Define Shortcut </guilabel
-> dialogue check the <guilabel
->Multi-Key</guilabel
-> box, press the key combination that you want to bring up your new menu then, separately, press the key that will choose that item from the menu.</para>
+<title>User Defined Menus</title>
+<para>You can add your own pop up menu to &konqueror; so that pressing one key combination will make the menu appear then pressing a second key, or using the <keysym>Up arrow</keysym> and <keysym>Down arrow</keysym> keys and pressing <keycap>Enter</keycap>, will select an item from it.</para>
+<para>To do this add a <guilabel>Custom</guilabel> shortcut for each of the actions you want to appear in the menu and in the <guilabel>Define Shortcut </guilabel> dialogue check the <guilabel>Multi-Key</guilabel> box, press the key combination that you want to bring up your new menu then, separately, press the key that will choose that item from the menu.</para>
 </sect2>
 </sect1>
 
 <sect1 id="othersettings">
-<title
->Other Settings</title>
-<para
->Selecting <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
-> Configure Konqueror...</guimenuitem
-></menuchoice
-> brings up a dialogue box which you can use to control most aspects of &konqueror;'s behaviour. It contains several sections which are selected by <mousebutton
->left </mousebutton
-> clicking on one of the icons at the left of the dialogue box.</para>
-<para
->Pressing the <guibutton
->Help</guibutton
-> button will give you detailed instructions about how to use each of these sections, or you can use the <link linkend="bubble"
->What's This?</link
-> feature.</para>
+<title>Other Settings</title>
+<para>Selecting <menuchoice><guimenu>Settings</guimenu><guimenuitem> Configure Konqueror...</guimenuitem></menuchoice> brings up a dialogue box which you can use to control most aspects of &konqueror;'s behaviour. It contains several sections which are selected by <mousebutton>left </mousebutton> clicking on one of the icons at the left of the dialogue box.</para>
+<para>Pressing the <guibutton>Help</guibutton> button will give you detailed instructions about how to use each of these sections, or you can use the <link linkend="bubble">What's This?</link> feature.</para>
 </sect1>
 
 
diff --git a/tde-i18n-en_GB/docs/tdebase/konqueror/credits.docbook b/tde-i18n-en_GB/docs/tdebase/konqueror/credits.docbook
index 88f895f231f..921b8e36475 100644
--- a/tde-i18n-en_GB/docs/tdebase/konqueror/credits.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/konqueror/credits.docbook
@@ -2,307 +2,154 @@
 
 <chapterinfo>
 <authorgroup>
-<author
->&Pamela.Roberts;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Pamela.Roberts;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
-<date
->2003-11-06</date
-> <releaseinfo
->3.2</releaseinfo
-> </chapterinfo>
+<date>2003-11-06</date> <releaseinfo>3.2</releaseinfo> </chapterinfo>
 
 
-<title
->Credits and Licence</title>
+<title>Credits and Licence</title>
 
-<para
->&konqueror;. Program copyright 1999-2003, the &konqueror; developers:</para>
+<para>&konqueror;. Program copyright 1999-2003, the &konqueror; developers:</para>
 
 <variablelist>
 
 <varlistentry>
-<term
->&David.Faure; &David.Faure.mail;</term>
-<listitem
-><para
->developer (parts, I/O lib) and maintainer</para
-></listitem>
+<term>&David.Faure; &David.Faure.mail;</term>
+<listitem><para>developer (parts, I/O lib) and maintainer</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->&Simon.Hausmann; &Simon.Hausmann.mail;</term>
-<listitem
-><para
->developer (framework, parts)</para
-></listitem>
+<term>&Simon.Hausmann; &Simon.Hausmann.mail;</term>
+<listitem><para>developer (framework, parts)</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->&Michael.Reiher; &Michael.Reiher.mail;</term>
-<listitem
-><para
->developer (framework)</para
-></listitem>
+<term>&Michael.Reiher; &Michael.Reiher.mail;</term>
+<listitem><para>developer (framework)</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->&Mattias.Welk; &Mattias.Welk.mail;</term>
-<listitem
-><para
->developer</para
-></listitem>
+<term>&Mattias.Welk; &Mattias.Welk.mail;</term>
+<listitem><para>developer</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->&Alexander.Neundorf; &Alexander.Neundorf.mail;</term>
-<listitem
-><para
->developer (list views)</para
-></listitem>
+<term>&Alexander.Neundorf; &Alexander.Neundorf.mail;</term>
+<listitem><para>developer (list views)</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->&Michael.Brade; &Michael.Brade.mail;</term>
-<listitem
-><para
->developer (list views, I/O lib)</para
-></listitem>
+<term>&Michael.Brade; &Michael.Brade.mail;</term>
+<listitem><para>developer (list views, I/O lib)</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->&Lars.Knoll; &Lars.Knoll.mail;</term>
-<listitem
-><para
->developer (<acronym
->HTML</acronym
-> rendering engine)</para
-></listitem>
+<term>&Lars.Knoll; &Lars.Knoll.mail;</term>
+<listitem><para>developer (<acronym>HTML</acronym> rendering engine)</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->&Antti.Koivisto; &Antti.Koivisto.mail;</term>
-<listitem
-><para
->developer (<acronym
->HTML</acronym
-> rendering engine)</para
-></listitem>
+<term>&Antti.Koivisto; &Antti.Koivisto.mail;</term>
+<listitem><para>developer (<acronym>HTML</acronym> rendering engine)</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->&Dirk.Mueller; &Dirk.Mueller.mail;</term>
-<listitem
-><para
->developer (<acronym
->HTML</acronym
-> rendering engine)</para
-></listitem>
+<term>&Dirk.Mueller; &Dirk.Mueller.mail;</term>
+<listitem><para>developer (<acronym>HTML</acronym> rendering engine)</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->&Peter.Kelly; &Peter.Kelly.mail;</term>
-<listitem
-><para
->developer (<acronym
->HTML</acronym
-> rendering engine, JavaScript)</para
-></listitem>
+<term>&Peter.Kelly; &Peter.Kelly.mail;</term>
+<listitem><para>developer (<acronym>HTML</acronym> rendering engine, JavaScript)</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->&Waldo.Bastian; &Waldo.Bastian.mail;</term>
-<listitem
-><para
->developer (<acronym
->HTML</acronym
-> rendering engine, I/O lib)</para
-></listitem>
+<term>&Waldo.Bastian; &Waldo.Bastian.mail;</term>
+<listitem><para>developer (<acronym>HTML</acronym> rendering engine, I/O lib)</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->&Matt.Koss; &Matt.Koss.mail;</term>
-<listitem
-><para
->developer (I/O lib)</para
-></listitem>
+<term>&Matt.Koss; &Matt.Koss.mail;</term>
+<listitem><para>developer (I/O lib)</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->&Alex.Zepeda; &Alex.Zepeda.mail;</term>
-<listitem
-><para
->developer (I/O lib)</para
-></listitem>
+<term>&Alex.Zepeda; &Alex.Zepeda.mail;</term>
+<listitem><para>developer (I/O lib)</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->&Stephan.Kulow; &Stephan.Kulow.mail;</term>
-<listitem
-><para
->developer (I/O lib)</para
-></listitem>
+<term>&Stephan.Kulow; &Stephan.Kulow.mail;</term>
+<listitem><para>developer (I/O lib)</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->&Richard.J.Moore; &Richard.J.Moore.mail;</term>
-<listitem
-><para
->developer (&Java; applet support)</para
-></listitem>
+<term>&Richard.J.Moore; &Richard.J.Moore.mail;</term>
+<listitem><para>developer (&Java; applet support)</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Dima Rogozin <email
->dima@mercury.co.il</email
-></term>
-<listitem
-><para
->developer (&Java; applet support)</para
-></listitem>
+<term>Dima Rogozin <email>dima@mercury.co.il</email></term>
+<listitem><para>developer (&Java; applet support)</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Wynn Wilkes <email
->wynnw@calderasystems.com</email
-></term>
-<listitem
-><para
->developer (&Java;2 manager support and other major improvements to applet support)</para
-></listitem>
+<term>Wynn Wilkes <email>wynnw@calderasystems.com</email></term>
+<listitem><para>developer (&Java;2 manager support and other major improvements to applet support)</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->&Harri.Porten; &Harri.Porten.mail;</term>
-<listitem
-><para
->developer (JavaScript)</para
-></listitem>
+<term>&Harri.Porten; &Harri.Porten.mail;</term>
+<listitem><para>developer (JavaScript)</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Stefan Schimanski <email
->schimmi@kde.org</email
-></term>
-<listitem
-><para
->developer (&Netscape; plugin support)</para
-></listitem>
+<term>Stefan Schimanski <email>schimmi@kde.org</email></term>
+<listitem><para>developer (&Netscape; plugin support)</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->&Carsten.Pfeiffer; &Carsten.Pfeiffer.mail;</term>
-<listitem
-><para
->developer (framework)</para
-></listitem>
+<term>&Carsten.Pfeiffer; &Carsten.Pfeiffer.mail;</term>
+<listitem><para>developer (framework)</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->&George.Staikos; &George.Staikos.mail;</term>
-<listitem
-><para
->developer (SSL support)</para
-></listitem>
+<term>&George.Staikos; &George.Staikos.mail;</term>
+<listitem><para>developer (SSL support)</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Dawit Alemayehu <email
->adawit@kde.org</email
-></term>
-<listitem
-><para
->developer (I/O lib, Authentication support)</para
-></listitem>
+<term>Dawit Alemayehu <email>adawit@kde.org</email></term>
+<listitem><para>developer (I/O lib, Authentication support)</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->&Torsten.Rahn; &Torsten.Rahn.mail;</term>
-<listitem
-><para
->Graphics / icons</para
-></listitem>
+<term>&Torsten.Rahn; &Torsten.Rahn.mail;</term>
+<listitem><para>Graphics / icons</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Torben Weis <email
->weis@kde.org</email
-></term>
-<listitem
-><para
->kfm author</para
-></listitem>
+<term>Torben Weis <email>weis@kde.org</email></term>
+<listitem><para>kfm author</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->&Joseph.Wenninger; &Joseph.Wenninger;</term>
-<listitem
-><para
->developer (navigation panel framework)</para
-></listitem>
+<term>&Joseph.Wenninger; &Joseph.Wenninger;</term>
+<listitem><para>developer (navigation panel framework)</para></listitem>
 </varlistentry>
 
 </variablelist>
 
-<para
->Documentation copyright 2000-2003</para>
+<para>Documentation copyright 2000-2003</para>
 
 <itemizedlist>
-<listitem
-><para
->&Erwan.Loisant; &Erwan.Loisant.mail;</para
-></listitem>
-<listitem
-><para
->&Pamela.Roberts; &Pamela.Roberts.mail;</para
-></listitem>
+<listitem><para>&Erwan.Loisant; &Erwan.Loisant.mail;</para></listitem>
+<listitem><para>&Pamela.Roberts; &Pamela.Roberts.mail;</para></listitem>
 </itemizedlist>
 
-<para
->Documentation updated for &kde; 3.2 by &Philip.Rodrigues; &Philip.Rodrigues.mail;.</para>
-<para
->Conversion to British English: John Knight <email
->anarchist_tomato@herzeleid.net</email
-></para
-> 
+<para>Documentation updated for &kde; 3.2 by &Philip.Rodrigues; &Philip.Rodrigues.mail;.</para>
+<para>Conversion to British English: John Knight <email>anarchist_tomato@herzeleid.net</email></para> 
 &underFDL; &underGPL; </chapter>
 <!--
 Local Variables:
diff --git a/tde-i18n-en_GB/docs/tdebase/konqueror/faq.docbook b/tde-i18n-en_GB/docs/tdebase/konqueror/faq.docbook
index 79acaced6ae..c4bc8b7881c 100644
--- a/tde-i18n-en_GB/docs/tdebase/konqueror/faq.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/konqueror/faq.docbook
@@ -1,175 +1,59 @@
 <chapter id="faq">
 <chapterinfo>
 <authorgroup>
-<author
->&Pamela.Roberts;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Pamela.Roberts;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
-<date
->2003-11-06</date
-> <releaseinfo
->3.2</releaseinfo
-> </chapterinfo>
+<date>2003-11-06</date> <releaseinfo>3.2</releaseinfo> </chapterinfo>
 
-<title
->Questions and Answers</title>
+<title>Questions and Answers</title>
 
 <qandaset>
 
 <!-- Link is dead, unfortunately. I suppose this is a more general thing anyway
 <qandaentry>
-<question
-><para
->How can I browse web sites using non latin
- scripts?</para
-></question>
-<answer
-><para
->Detailed instructions can be found at <ulink
-url="http://www.konqueror.org/i18n.html"
->http://www.konqueror.org/i18n.html</ulink
-></para
-></answer>
+<question><para>How can I browse web sites using non latin
+ scripts?</para></question>
+<answer><para>Detailed instructions can be found at <ulink
+url="http://www.konqueror.org/i18n.html">http://www.konqueror.org/i18n.html</ulink></para></answer>
 </qandaentry>
 -->
 
 <qandaentry>
-<question
-><para
->Can I run &konqueror; from another window manager?</para
-></question>
+<question><para>Can I run &konqueror; from another window manager?</para></question>
 
-<answer
-><para
->Just install &Qt;, tdelibs and tdebase, and from your favourite window manager, launch &konqueror;. It should work just fine, but if it doesn't (&kde; developers don't test that case often), report it to <ulink url="http://bugs.kde.org"
->http://bugs.kde.org</ulink
-> and try running <application
->tdeinit</application
-> before running &konqueror;, it usually helps.</para
-></answer>
+<answer><para>Just install &Qt;, tdelibs and tdebase, and from your favourite window manager, launch &konqueror;. It should work just fine, but if it doesn't (&kde; developers don't test that case often), report it to <ulink url="http://bugs.kde.org">http://bugs.kde.org</ulink> and try running <application>tdeinit</application> before running &konqueror;, it usually helps.</para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->Where does &konqueror; keep all its configuration data?</para
-></question>
-<answer
-><para
->Generally in the <filename
->~/.trinity</filename
-> folder (this may be <filename
->~/.trinity3</filename
-> on your system, depending on how &kde; 3 was installed). Do not alter these files unless you really know what you are doing.</para>
+<question><para>Where does &konqueror; keep all its configuration data?</para></question>
+<answer><para>Generally in the <filename>~/.trinity</filename> folder (this may be <filename>~/.trinity3</filename> on your system, depending on how &kde; 3 was installed). Do not alter these files unless you really know what you are doing.</para>
 
 <itemizedlist>
 
-<listitem
-><para
->The <filename class="directory"
->~/.trinity/share/apps/konqueror/profiles</filename
-> folder holds individual files containing settings for each of your <link linkend="save-settings"
->profiles. </link
-></para
-></listitem>
+<listitem><para>The <filename class="directory">~/.trinity/share/apps/konqueror/profiles</filename> folder holds individual files containing settings for each of your <link linkend="save-settings">profiles. </link></para></listitem>
 
-<listitem
-><para
->Your bookmarks are held in <filename class="directory"
->~/.trinity/share/apps/konqueror/bookmarks.xml</filename
-></para
-></listitem>
-<listitem
-><para
->Cookies are held in <filename class="directory"
->~/.trinity/share/apps/kcookiejar/cookies</filename
-></para
-></listitem>
-<listitem
-><para
->Your history, as used for the auto-completion feature, is in <filename
->~/.trinity/share/config/konq_history</filename
-></para
-></listitem>
+<listitem><para>Your bookmarks are held in <filename class="directory">~/.trinity/share/apps/konqueror/bookmarks.xml</filename></para></listitem>
+<listitem><para>Cookies are held in <filename class="directory">~/.trinity/share/apps/kcookiejar/cookies</filename></para></listitem>
+<listitem><para>Your history, as used for the auto-completion feature, is in <filename>~/.trinity/share/config/konq_history</filename></para></listitem>
 
-<listitem
-><para
->In the folder <filename class="directory"
->~/.trinity/share/config/</filename
-> the files <filename
->konqiconviewrc</filename
->, <filename
->konqlistviewrc</filename
-> and <filename
->konquerorrc</filename
-> hold a whole lot of general configuration settings.</para
-></listitem>
+<listitem><para>In the folder <filename class="directory">~/.trinity/share/config/</filename> the files <filename>konqiconviewrc</filename>, <filename>konqlistviewrc</filename> and <filename>konquerorrc</filename> hold a whole lot of general configuration settings.</para></listitem>
 
-<listitem
-><para
->The folder <filename class="directory"
->~/.trinity/share/cache/http/</filename
-> contains the browser cache.</para
-></listitem>
+<listitem><para>The folder <filename class="directory">~/.trinity/share/cache/http/</filename> contains the browser cache.</para></listitem>
 
-<listitem
-><para
->The Navigation Panel uses the files and subfolders in <filename class="directory"
->~/.trinity/share/apps/konqsidebartng</filename
-></para
-></listitem>
+<listitem><para>The Navigation Panel uses the files and subfolders in <filename class="directory">~/.trinity/share/apps/konqsidebartng</filename></para></listitem>
 </itemizedlist>
 
-<para
->Any folder specific view settings are put into <literal role="extension"
->.directory</literal
-> files in the individual folders.</para
-></answer>
+<para>Any folder specific view settings are put into <literal role="extension">.directory</literal> files in the individual folders.</para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->How do I clear out the history file?</para
-></question>
-<answer
-><para
->There are two <quote
->histories</quote
->:</para>
+<question><para>How do I clear out the history file?</para></question>
+<answer><para>There are two <quote>histories</quote>:</para>
 <itemizedlist>
-<listitem
-><para
->One is used for text completion in the Location Toolbar text entry box. To clear this <mousebutton
->right</mousebutton
-> click on the text entry box and select <guimenuitem
->Clear History </guimenuitem
->.</para>
+<listitem><para>One is used for text completion in the Location Toolbar text entry box. To clear this <mousebutton>right</mousebutton> click on the text entry box and select <guimenuitem>Clear History </guimenuitem>.</para>
 </listitem>
-<listitem
-><para
->The other is the log of visited locations. Select the History page in the Navigation Panel, <mousebutton
->right</mousebutton
-> click on an entry and choose <guimenuitem
->Remove Entry</guimenuitem
-> to remove just that entry or <guimenuitem
->Clear History</guimenuitem
-> to delete all entries.</para
-></listitem>
+<listitem><para>The other is the log of visited locations. Select the History page in the Navigation Panel, <mousebutton>right</mousebutton> click on an entry and choose <guimenuitem>Remove Entry</guimenuitem> to remove just that entry or <guimenuitem>Clear History</guimenuitem> to delete all entries.</para></listitem>
 
 </itemizedlist>
 
@@ -177,106 +61,33 @@ url="http://www.konqueror.org/i18n.html"
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->How do I enable, disable or clear the browser cache?</para
-></question
-> <answer>
-<para
->If you select <guimenuitem
->Cache</guimenuitem
-> in the dialogue launched by selecting <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Konqueror... </guimenuitem
-></menuchoice
->, you will be presented with a dialogue box that lets you disable the cache, clear it or set its size, and change the caching policy.</para>
+<question><para>How do I enable, disable or clear the browser cache?</para></question> <answer>
+<para>If you select <guimenuitem>Cache</guimenuitem> in the dialogue launched by selecting <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Konqueror... </guimenuitem></menuchoice>, you will be presented with a dialogue box that lets you disable the cache, clear it or set its size, and change the caching policy.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->How can I change the timeout values used by &konqueror; when web browsing?</para
-></question
-> <answer>
-<para
->In the Control Centre <menuchoice
-><guimenu
->Internet &amp; Network</guimenu
-> <guimenuitem
->Preferences</guimenuitem
-></menuchoice
-> page.</para>
+<question><para>How can I change the timeout values used by &konqueror; when web browsing?</para></question> <answer>
+<para>In the Control Centre <menuchoice><guimenu>Internet &amp; Network</guimenu> <guimenuitem>Preferences</guimenuitem></menuchoice> page.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->How do I set my <quote
->home</quote
-> page - the page loaded on startup?</para
-></question>
-<answer
-><para
->Start &konqueror; with the <guiicon
->Web Browser</guiicon
-> icon on the panel. Open the page you want to be loaded in any new <quote
->Web Browser</quote
-> window and select <guimenuitem
->Save View Profile "Web Browsing"</guimenuitem
-> from the <guimenu
->Settings</guimenu
-> menu.</para>
+<question><para>How do I set my <quote>home</quote> page - the page loaded on startup?</para></question>
+<answer><para>Start &konqueror; with the <guiicon>Web Browser</guiicon> icon on the panel. Open the page you want to be loaded in any new <quote>Web Browser</quote> window and select <guimenuitem>Save View Profile "Web Browsing"</guimenuitem> from the <guimenu>Settings</guimenu> menu.</para>
 
-<para
->All new &konqueror; windows that are started with the <guiicon
->Web Browser</guiicon
-> icon on the panel, or from the <guimenu
->location</guimenu
-> menu, and new empty tabs, will now start at this page.</para>
+<para>All new &konqueror; windows that are started with the <guiicon>Web Browser</guiicon> icon on the panel, or from the <guimenu>location</guimenu> menu, and new empty tabs, will now start at this page.</para>
 
-<note
-><para
->This does not change the behaviour of the <guiicon
->Home</guiicon
-> button on the &konqueror; toolbar, which will continue to take you to the &URI; defined in the &konqueror; configuration module. You can reach that module from within &konqueror;, via <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Konqueror</guimenuitem
-><guilabel
->Behaviour</guilabel
-></menuchoice
->. By default this is set to <userinput
->~</userinput
->, which is your Home folder. You may set this to any &URI;, either local or remote, and pressing the <guiicon
->Home</guiicon
-> icon on the toolbar will display it.</para
-></note>
+<note><para>This does not change the behaviour of the <guiicon>Home</guiicon> button on the &konqueror; toolbar, which will continue to take you to the &URI; defined in the &konqueror; configuration module. You can reach that module from within &konqueror;, via <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Konqueror</guimenuitem><guilabel>Behaviour</guilabel></menuchoice>. By default this is set to <userinput>~</userinput>, which is your Home folder. You may set this to any &URI;, either local or remote, and pressing the <guiicon>Home</guiicon> icon on the toolbar will display it.</para></note>
 
-<para
->To have &konqueror; start up with no page loaded, use <userinput
->about:blank</userinput
->.</para>
+<para>To have &konqueror; start up with no page loaded, use <userinput>about:blank</userinput>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->I can't find the answer to my question here.</para
-></question
-> 
+<question><para>I can't find the answer to my question here.</para></question> 
 <answer>
-<para
->Take a look at <ulink url="http://www.konqueror.org/faq.html"
-> http://www.konqueror.org/faq.html</ulink
-> or <ulink url="http://www.konqueror.org/konq-java.html"
-> http://www.konqueror.org/konq-java.html</ulink
->.</para>
+<para>Take a look at <ulink url="http://www.konqueror.org/faq.html"> http://www.konqueror.org/faq.html</ulink> or <ulink url="http://www.konqueror.org/konq-java.html"> http://www.konqueror.org/konq-java.html</ulink>.</para>
 </answer>
 </qandaentry>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/konqueror/filemanager.docbook b/tde-i18n-en_GB/docs/tdebase/konqueror/filemanager.docbook
index 055ca263f62..a8c396a7824 100644
--- a/tde-i18n-en_GB/docs/tdebase/konqueror/filemanager.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/konqueror/filemanager.docbook
@@ -1,534 +1,157 @@
 <chapter id="filemanager">
 <chapterinfo>
 <authorgroup>
-<author
->&Pamela.Roberts;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
-</authorgroup
-> <date
->2003-10-28</date
-> <releaseinfo
->3.2</releaseinfo
-> </chapterinfo>
-
-<title
->&konqueror; the File Manager</title>
+<author>&Pamela.Roberts;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
+</authorgroup> <date>2003-10-28</date> <releaseinfo>3.2</releaseinfo> </chapterinfo>
+
+<title>&konqueror; the File Manager</title>
 
 <sect1 id="dirfolders">
-<title
->Folders and Paths</title>
-<para
->In &UNIX; and &Linux; all folders are arranged in a simple inverted tree structure descending and branching down from from a single top level folder. This means that you can get from any folder to any other by going <quote
->up</quote
-> until you reach a common point then <quote
->down</quote
-> through the appropriate subfolders until you reach your target. </para
->  
-
-<para
->The position of any file or folder in the tree can be described by its <quote
->path</quote
->, which is a simple list of the folders you would have to descend through to get to the target folder or file. For example <filename class="directory"
->/home/pam</filename
-> is the subfolder <filename class="directory"
->pam</filename
-> of the subfolder <filename class="directory"
->home</filename
-> of the top level folder, and <filename
-> /home/pam/words.txt</filename
-> is the file <filename
->words.txt</filename
-> in that subfolder. The leading <quote
->/</quote
-> in these paths represents the top level folder.</para>
-
-<para
->Every folder accessible by your system, including those on other hard disk partitions, your floppy and &CD-ROM;, will appear in the tree descending from /, their exact paths will depend on how your system was set up (see also the section on <link linkend="floppy-cd"
->Floppy and &CD-ROM; Drives</link
->). </para>
-<para
->Every user on a &UNIX; / &Linux; system has their own <quote
->home</quote
-> folder to hold their personal files and settings, for example <filename class="directory"
->/home/jon</filename
-> and <filename class="directory"
->/home/mary</filename
->. The symbol <keycap
->~</keycap
-> is often used to represent the user's home folder, so that <filename
->~/letter.txt</filename
-> refers to the file <filename
->letter.txt</filename
-> in my home folder.</para>
-<para
->Note that the term <quote
->directory</quote
-> is often used instead of <quote
->folder</quote
->.</para>
+<title>Folders and Paths</title>
+<para>In &UNIX; and &Linux; all folders are arranged in a simple inverted tree structure descending and branching down from from a single top level folder. This means that you can get from any folder to any other by going <quote>up</quote> until you reach a common point then <quote>down</quote> through the appropriate subfolders until you reach your target. </para>  
+
+<para>The position of any file or folder in the tree can be described by its <quote>path</quote>, which is a simple list of the folders you would have to descend through to get to the target folder or file. For example <filename class="directory">/home/pam</filename> is the subfolder <filename class="directory">pam</filename> of the subfolder <filename class="directory">home</filename> of the top level folder, and <filename> /home/pam/words.txt</filename> is the file <filename>words.txt</filename> in that subfolder. The leading <quote>/</quote> in these paths represents the top level folder.</para>
+
+<para>Every folder accessible by your system, including those on other hard disk partitions, your floppy and &CD-ROM;, will appear in the tree descending from /, their exact paths will depend on how your system was set up (see also the section on <link linkend="floppy-cd">Floppy and &CD-ROM; Drives</link>). </para>
+<para>Every user on a &UNIX; / &Linux; system has their own <quote>home</quote> folder to hold their personal files and settings, for example <filename class="directory">/home/jon</filename> and <filename class="directory">/home/mary</filename>. The symbol <keycap>~</keycap> is often used to represent the user's home folder, so that <filename>~/letter.txt</filename> refers to the file <filename>letter.txt</filename> in my home folder.</para>
+<para>Note that the term <quote>directory</quote> is often used instead of <quote>folder</quote>.</para>
 </sect1>
 
 <sect1 id="viewmode">
-<title
->View Modes</title>
-<para
->In File Manager mode, &konqueror; shows you what files and subfolders are held in a folder, and can provide you with some information about them.</para>
-<para
->The <quote
->path</quote
-> of the folder you are looking at is shown in the Titlebar, and also in the Location Toolbar, prefixed with <quote
->file: </quote
-> to indicate that the folder is part of your computer's normal file system. For example <filename
->file:/home/pam</filename
->.</para>
-
-<para
->The way that &konqueror; displays the files and folders depends mainly on your choice of View Mode. This can be selected from the <menuchoice
-> <guimenu
->View</guimenu
-><guisubmenu
->View Mode</guisubmenu
-></menuchoice
-> sub menu, which gives you the following options: </para>
+<title>View Modes</title>
+<para>In File Manager mode, &konqueror; shows you what files and subfolders are held in a folder, and can provide you with some information about them.</para>
+<para>The <quote>path</quote> of the folder you are looking at is shown in the Titlebar, and also in the Location Toolbar, prefixed with <quote>file: </quote> to indicate that the folder is part of your computer's normal file system. For example <filename>file:/home/pam</filename>.</para>
+
+<para>The way that &konqueror; displays the files and folders depends mainly on your choice of View Mode. This can be selected from the <menuchoice> <guimenu>View</guimenu><guisubmenu>View Mode</guisubmenu></menuchoice> sub menu, which gives you the following options: </para>
 
 <variablelist>
 
 <varlistentry>
-<term
-><guimenuitem
->Icon View</guimenuitem
-></term>
-<listitem
-><para
->Displays the name and a suitable icon for each file or folder. </para
-></listitem>
+<term><guimenuitem>Icon View</guimenuitem></term>
+<listitem><para>Displays the name and a suitable icon for each file or folder. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenuitem
->MultiColumn View</guimenuitem
-></term>
-<listitem
-><para
->Similar to <guimenuitem
->Icon View</guimenuitem
-> except that the display is neatly formatted into regular columns.</para>
+<term><guimenuitem>MultiColumn View</guimenuitem></term>
+<listitem><para>Similar to <guimenuitem>Icon View</guimenuitem> except that the display is neatly formatted into regular columns.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenuitem
->Detailed List View</guimenuitem
-></term>
-<listitem
-><para
->Displays each file or folder on a separate line, as a small icon followed by the file or folder name followed by information about the item. The amount of information shown is controlled by the <menuchoice
-> <guimenu
->View</guimenu
-><guisubmenu
->Show Details</guisubmenu
-></menuchoice
-> sub menu settings. </para
-></listitem>
+<term><guimenuitem>Detailed List View</guimenuitem></term>
+<listitem><para>Displays each file or folder on a separate line, as a small icon followed by the file or folder name followed by information about the item. The amount of information shown is controlled by the <menuchoice> <guimenu>View</guimenu><guisubmenu>Show Details</guisubmenu></menuchoice> sub menu settings. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenuitem
->Text View</guimenuitem
-></term>
-<listitem
-><para
->Similar to <guimenuitem
->Detailed List View</guimenuitem
-> except that icons are not shown and the first character in each line will be <quote
->/</quote
-> if the item is a folder. </para
-></listitem>
+<term><guimenuitem>Text View</guimenuitem></term>
+<listitem><para>Similar to <guimenuitem>Detailed List View</guimenuitem> except that icons are not shown and the first character in each line will be <quote>/</quote> if the item is a folder. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenuitem
->Tree View</guimenuitem
-></term>
-<listitem
-><para
->This option is useful for <link linkend="navigation"
-> navigating</link
-> through the folder tree below the current folder. The display is similar to <guimenuitem
->Detailed List View</guimenuitem
-> except that the start of each line will show a small <keycap
->+</keycap
-> sign in a box if the item is a folder. <mousebutton
->Left</mousebutton
-> clicking on the box will expand the display to show the contents of that folder.</para>
+<term><guimenuitem>Tree View</guimenuitem></term>
+<listitem><para>This option is useful for <link linkend="navigation"> navigating</link> through the folder tree below the current folder. The display is similar to <guimenuitem>Detailed List View</guimenuitem> except that the start of each line will show a small <keycap>+</keycap> sign in a box if the item is a folder. <mousebutton>Left</mousebutton> clicking on the box will expand the display to show the contents of that folder.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenuitem
->Info List View</guimenuitem
-></term>
-<listitem
-><para
->Similar to <guimenuitem
->Detailed List View</guimenuitem
-> except that, where applicable, it shows the number of lines, words and characters and file format for each file. </para
-></listitem>
+<term><guimenuitem>Info List View</guimenuitem></term>
+<listitem><para>Similar to <guimenuitem>Detailed List View</guimenuitem> except that, where applicable, it shows the number of lines, words and characters and file format for each file. </para></listitem>
 </varlistentry>
 </variablelist>
 
-<para
->The default file icons shown in <guimenuitem
->Icon View</guimenuitem
-> and <guimenuitem
->MultiColumn View</guimenuitem
-> modes can be replaced by small preview images of the file contents, see the section <link linkend="previews"
-> File Previews</link
-> of this handbook for more details.</para>
+<para>The default file icons shown in <guimenuitem>Icon View</guimenuitem> and <guimenuitem>MultiColumn View</guimenuitem> modes can be replaced by small preview images of the file contents, see the section <link linkend="previews"> File Previews</link> of this handbook for more details.</para>
 
 <sect2 id="filetipinfo">
-<title
->File Tip Info</title>
-<para
->Checking the <guilabel
->Show file tips</guilabel
-> box in the <guilabel
-> Behaviour</guilabel
-> page of the &konqueror; Configuration dialogue causes a small pop up information window to appear when the mouse pointer is hovered over a file or folder name or icon in <guimenuitem
->Icon View</guimenuitem
-> or <guimenuitem
-> MultiColumn View</guimenuitem
-> mode. </para>
-<para
->If the <guilabel
->Show previews in file tips</guilabel
-> checkbox is checked the pop up window will also show a small image of the file contents. </para>
+<title>File Tip Info</title>
+<para>Checking the <guilabel>Show file tips</guilabel> box in the <guilabel> Behaviour</guilabel> page of the &konqueror; Configuration dialogue causes a small pop up information window to appear when the mouse pointer is hovered over a file or folder name or icon in <guimenuitem>Icon View</guimenuitem> or <guimenuitem> MultiColumn View</guimenuitem> mode. </para>
+<para>If the <guilabel>Show previews in file tips</guilabel> checkbox is checked the pop up window will also show a small image of the file contents. </para>
 </sect2>
 
 <sect2 id="previews">
-<title
->File Previews</title>
-<para
->Selecting <menuchoice
-><guimenu
->View</guimenu
-><guisubmenu
->Preview </guisubmenu
-></menuchoice
-> from the Menubar will bring up a sub menu that lets you enable file previews for certain types of file.</para>
-<para
->Generally this means that the file's icon will be replaced by a small image showing the file contents.</para>
-<para
->If file preview is enabled for <guimenuitem
->Sound Files</guimenuitem
-> the file will be played whenever the mouse cursor is hovering over the file name or icon.</para>
-<para
->Note that file previews are only available in <guimenuitem
->Icon View </guimenuitem
-> and <guimenuitem
->MultiColumn View</guimenuitem
-> modes.</para>
-<para
->Because &konqueror; has to read much more data than just the file name details to generate a preview, file previews may not be appropriate when viewing files on a floppy or from a remote system. The <guilabel
->Previews </guilabel
-> page of the File Manager Configuration dialogue allows you to disable file previews for protocols such as <link linkend="ftp"
->ftp</link
-> where reading the extra data would take too long.</para>
+<title>File Previews</title>
+<para>Selecting <menuchoice><guimenu>View</guimenu><guisubmenu>Preview </guisubmenu></menuchoice> from the Menubar will bring up a sub menu that lets you enable file previews for certain types of file.</para>
+<para>Generally this means that the file's icon will be replaced by a small image showing the file contents.</para>
+<para>If file preview is enabled for <guimenuitem>Sound Files</guimenuitem> the file will be played whenever the mouse cursor is hovering over the file name or icon.</para>
+<para>Note that file previews are only available in <guimenuitem>Icon View </guimenuitem> and <guimenuitem>MultiColumn View</guimenuitem> modes.</para>
+<para>Because &konqueror; has to read much more data than just the file name details to generate a preview, file previews may not be appropriate when viewing files on a floppy or from a remote system. The <guilabel>Previews </guilabel> page of the File Manager Configuration dialogue allows you to disable file previews for protocols such as <link linkend="ftp">ftp</link> where reading the extra data would take too long.</para>
 </sect2>
 
 </sect1>
 
 <sect1 id="navigation">
-<title
->Navigation</title>
-<para
->To get to a file with &konqueror; you first need to navigate through the folder tree to find the folder containing that file.</para>
+<title>Navigation</title>
+<para>To get to a file with &konqueror; you first need to navigate through the folder tree to find the folder containing that file.</para>
 
-<para
->To move between folders you can simply step up and down the tree:</para>
+<para>To move between folders you can simply step up and down the tree:</para>
 
 <itemizedlist>
-<listitem
-><para
->To descend into a subfolder <mousebutton
->left </mousebutton
-> click on its name or icon, or if you have <quote
->selected</quote
-> it (see below) then just press <keycap
->Enter</keycap
->.</para
-></listitem
-> 
-<listitem
-><para
->To go up the folder tree, click on the <guiicon
->Up </guiicon
-> button in the Toolbar, or use<keycombo action="simul"
->&Alt;<keysym
->Up Arrow</keysym
-></keycombo
->, or use the Menubar <menuchoice
-><guimenu
->Go</guimenu
-><guimenuitem
->Up</guimenuitem
-></menuchoice
-> option.</para
-></listitem>
+<listitem><para>To descend into a subfolder <mousebutton>left </mousebutton> click on its name or icon, or if you have <quote>selected</quote> it (see below) then just press <keycap>Enter</keycap>.</para></listitem> 
+<listitem><para>To go up the folder tree, click on the <guiicon>Up </guiicon> button in the Toolbar, or use<keycombo action="simul">&Alt;<keysym>Up Arrow</keysym></keycombo>, or use the Menubar <menuchoice><guimenu>Go</guimenu><guimenuitem>Up</guimenuitem></menuchoice> option.</para></listitem>
 </itemizedlist>
 
-<para
->To <quote
->select</quote
-> a file or folder in the displayed folder without opening it in any way use the <keysym
->up</keysym
-> and <keysym
->down </keysym
-> arrow keys to move through the items. The selected item will be highlighted and some information about it will be displayed in the Status Bar.</para>
-
-<para
->Setting the <link linkend="viewmode"
->View Mode</link
-> to <guimenuitem
-> Tree View</guimenuitem
-> can help you locate folders in the tree below the current folder. In this mode each folder is shown with a small box at the left. If the box contains a <keycap
->+</keycap
-> sign, <mousebutton
->left </mousebutton
-> clicking on the box (not on the folder name or icon) will display a sub tree showing files and subfolders contained in that folder. The small box will then change to show a <keycap
->-</keycap
-> sign. <mousebutton
->Left</mousebutton
-> click on that to collapse the sub tree. Once you have found the folder you are looking for, <mousebutton
->left </mousebutton
-> click on the folder name or icon to open it.</para>
-
-<para
->The <link linkend="sidebar"
->Navigation Panel</link
-> can also help you find your way around the file system.</para>
-
-<para
->You can go directly to any folder by typing its path into the Location Toolbar window or into the dialogue box invoked by the Menubar <menuchoice
-><guimenu
->Location</guimenu
-><guimenuitem
->Open Location</guimenuitem
-> </menuchoice
-> item or by <keycombo action="simul"
->&Ctrl;<keycap
-> O</keycap
-></keycombo
->. &konqueror;'s <link linkend="path-complete"
-> Text Completion</link
-> feature may be useful when you do this. Don't forget that in &Linux; / &UNIX; file and folder names are case sensitive.</para>
-
-<para
->Once you have moved to a new folder you can go back to your previous choice by using the Toolbar <guiicon
->Back</guiicon
-> button, the Menubar <menuchoice
-><guimenu
->Go</guimenu
-> <guimenuitem
->Back</guimenuitem
-></menuchoice
-> item, or <keycombo action="simul"
->&Alt;<keysym
->Left Arrow</keysym
-></keycombo
->.</para>
-
-<para
->Once you have gone back you can go forward. Use the Toolbar <guiicon
->Forward</guiicon
-> button, the Menubar <menuchoice
-><guimenu
->Go</guimenu
-> <guimenuitem
->Forward</guimenuitem
-></menuchoice
-> item or <keycombo action="simul"
->&Alt;<keysym
->Right Arrow</keysym
-></keycombo
->.</para>
-
-<tip
-><para
->Holding the &LMB; pressed while the mouse pointer is over the Toolbar <guiicon
->Up</guiicon
->, <guiicon
->Back</guiicon
-> or <guiicon
->Forward</guiicon
-> buttons brings up a menu of recently visited locations.</para
-></tip>
+<para>To <quote>select</quote> a file or folder in the displayed folder without opening it in any way use the <keysym>up</keysym> and <keysym>down </keysym> arrow keys to move through the items. The selected item will be highlighted and some information about it will be displayed in the Status Bar.</para>
+
+<para>Setting the <link linkend="viewmode">View Mode</link> to <guimenuitem> Tree View</guimenuitem> can help you locate folders in the tree below the current folder. In this mode each folder is shown with a small box at the left. If the box contains a <keycap>+</keycap> sign, <mousebutton>left </mousebutton> clicking on the box (not on the folder name or icon) will display a sub tree showing files and subfolders contained in that folder. The small box will then change to show a <keycap>-</keycap> sign. <mousebutton>Left</mousebutton> click on that to collapse the sub tree. Once you have found the folder you are looking for, <mousebutton>left </mousebutton> click on the folder name or icon to open it.</para>
+
+<para>The <link linkend="sidebar">Navigation Panel</link> can also help you find your way around the file system.</para>
+
+<para>You can go directly to any folder by typing its path into the Location Toolbar window or into the dialogue box invoked by the Menubar <menuchoice><guimenu>Location</guimenu><guimenuitem>Open Location</guimenuitem> </menuchoice> item or by <keycombo action="simul">&Ctrl;<keycap> O</keycap></keycombo>. &konqueror;'s <link linkend="path-complete"> Text Completion</link> feature may be useful when you do this. Don't forget that in &Linux; / &UNIX; file and folder names are case sensitive.</para>
+
+<para>Once you have moved to a new folder you can go back to your previous choice by using the Toolbar <guiicon>Back</guiicon> button, the Menubar <menuchoice><guimenu>Go</guimenu> <guimenuitem>Back</guimenuitem></menuchoice> item, or <keycombo action="simul">&Alt;<keysym>Left Arrow</keysym></keycombo>.</para>
+
+<para>Once you have gone back you can go forward. Use the Toolbar <guiicon>Forward</guiicon> button, the Menubar <menuchoice><guimenu>Go</guimenu> <guimenuitem>Forward</guimenuitem></menuchoice> item or <keycombo action="simul">&Alt;<keysym>Right Arrow</keysym></keycombo>.</para>
+
+<tip><para>Holding the &LMB; pressed while the mouse pointer is over the Toolbar <guiicon>Up</guiicon>, <guiicon>Back</guiicon> or <guiicon>Forward</guiicon> buttons brings up a menu of recently visited locations.</para></tip>
 
 <sect2 id="file-find">
-<title
->Finding Files and Folders</title>
-
-<para
->If you don't know or can't remember where a file or folder is within your system, then use the Toolbar <guiicon
->Find File</guiicon
-> button or the Menubar <menuchoice
-><guimenu
->Tools</guimenu
-><guimenuitem
->Find File...</guimenuitem
-></menuchoice
-> option. This will embed the file finder application &kfind; into &konqueror;'s window. See the &kfind; Handbook for help in using &kfind;. </para>
-
-<note
-><para
->If the name of a file or folder begins with a period (dot), then it is a <quote
->hidden</quote
-> file or folder, and will not normally be shown by &konqueror;. To see hidden files or folders use the Menubar <menuchoice
-> <guimenu
->View</guimenu
-><guimenuitem
->Show Hidden Files</guimenuitem
-> </menuchoice
-> option.</para>
-<para
->Another reason &konqueror; may not show the file or folder you are looking for is that you may have the <link linkend="konq-plugin"
-><guisubmenu
-> View Filter</guisubmenu
-></link
-> plugin set to display only certain types of file.</para
-></note>
+<title>Finding Files and Folders</title>
+
+<para>If you don't know or can't remember where a file or folder is within your system, then use the Toolbar <guiicon>Find File</guiicon> button or the Menubar <menuchoice><guimenu>Tools</guimenu><guimenuitem>Find File...</guimenuitem></menuchoice> option. This will embed the file finder application &kfind; into &konqueror;'s window. See the &kfind; Handbook for help in using &kfind;. </para>
+
+<note><para>If the name of a file or folder begins with a period (dot), then it is a <quote>hidden</quote> file or folder, and will not normally be shown by &konqueror;. To see hidden files or folders use the Menubar <menuchoice> <guimenu>View</guimenu><guimenuitem>Show Hidden Files</guimenuitem> </menuchoice> option.</para>
+<para>Another reason &konqueror; may not show the file or folder you are looking for is that you may have the <link linkend="konq-plugin"><guisubmenu> View Filter</guisubmenu></link> plugin set to display only certain types of file.</para></note>
 
 </sect2>
 
 <sect2 id="floppy-cd">
-<title
->Floppy and &CD-ROM; Drives</title>
-
-<para
->Any floppy disk, &CD; drive or other hard disk partition that you have on your system will usually appear in the <filename class="directory"
->/ </filename
->, <filename class="directory"
->/mnt</filename
-> or <filename class="directory"
->/auto</filename
-> folder, having a path something like <filename class="directory"
->/mnt/floppy</filename
-> or <filename class="directory"
->/cdrom</filename
->. The details will depend on how your system was set up.</para>
-
-<para
->&UNIX; / &Linux; requires that you <command
->mount</command
-> a floppy disk or &CD-ROM; when you have inserted it into the drive, and <command
->mount </command
-> other hard disk partitions when you want to access them. You also need to unmount a floppy disk or &CD-ROM; before removing it to register that it is no longer available. </para>
-
-<para
->How you do this will depend on how your system:</para>
+<title>Floppy and &CD-ROM; Drives</title>
+
+<para>Any floppy disk, &CD; drive or other hard disk partition that you have on your system will usually appear in the <filename class="directory">/ </filename>, <filename class="directory">/mnt</filename> or <filename class="directory">/auto</filename> folder, having a path something like <filename class="directory">/mnt/floppy</filename> or <filename class="directory">/cdrom</filename>. The details will depend on how your system was set up.</para>
+
+<para>&UNIX; / &Linux; requires that you <command>mount</command> a floppy disk or &CD-ROM; when you have inserted it into the drive, and <command>mount </command> other hard disk partitions when you want to access them. You also need to unmount a floppy disk or &CD-ROM; before removing it to register that it is no longer available. </para>
+
+<para>How you do this will depend on how your system:</para>
 
 <itemizedlist>
-<listitem
-><para
->You may have an <application
->Automount</application
-> facility, in which case you don't have to bother about explicitly mounting and unmounting, although you may find that the &CD-ROM; occasionally starts up by itself for no apparent reason.</para
-></listitem>
-
-<listitem
-><para
->You may have <guiicon
->Floppy</guiicon
->, &CD-ROM; and hard disk icons on your desktop, in which case &LMB; click on the icon to mount it. Doing this should also bring up a &konqueror; window showing the contents of the floppy, &CD-ROM; or partition. To unmount, <mousebutton
->right</mousebutton
-> click on the icon and choose the <guimenuitem
->Unmount</guimenuitem
-> item. Visit the section <link linkend="making"
->Create New...</link
-> in this Handbook to see how to create such an icon.</para
-></listitem>
-
-<listitem
-><para
->Or you can do it the traditional way by typing into a text console window:</para>
-
-<para
-><userinput
-><command
->mount /mnt/floppy</command
-></userinput
-></para>
+<listitem><para>You may have an <application>Automount</application> facility, in which case you don't have to bother about explicitly mounting and unmounting, although you may find that the &CD-ROM; occasionally starts up by itself for no apparent reason.</para></listitem>
+
+<listitem><para>You may have <guiicon>Floppy</guiicon>, &CD-ROM; and hard disk icons on your desktop, in which case &LMB; click on the icon to mount it. Doing this should also bring up a &konqueror; window showing the contents of the floppy, &CD-ROM; or partition. To unmount, <mousebutton>right</mousebutton> click on the icon and choose the <guimenuitem>Unmount</guimenuitem> item. Visit the section <link linkend="making">Create New...</link> in this Handbook to see how to create such an icon.</para></listitem>
+
+<listitem><para>Or you can do it the traditional way by typing into a text console window:</para>
+
+<para><userinput><command>mount /mnt/floppy</command></userinput></para>
 
 <!-- This markup doesn't work properly, it puts 'mount' and '/mnt/floppy' 
 on separate lines
-<screen
->
+<screen>
 <userinput><command>mount</command>
  <option><replaceable>/mnt/floppy</replaceable></option></userinput>
-</screen
-> -->
+</screen> -->
 
-<para
->to mount, for example, the floppy drive, and</para>
+<para>to mount, for example, the floppy drive, and</para>
 
 <!-- Same as above
-<screen
->
+<screen>
 <userinput><command>umount</command>
  <option><replaceable>/mnt/floppy</replaceable></option></userinput></screen>
 -->
 
-<para
-><userinput
-><command
->umount /mnt/floppy</command
-></userinput
-></para>
-
-<para
->to unmount it (<command
->umount</command
-> not <command
->unmount</command
->). </para>
-
-<note
-><para
->Rather than having to open a text console to type the <command
->mount </command
-> or <command
->umount</command
-> commands, you may prefer to use &konqueror;'s <menuchoice
-><guimenu
-> Tools</guimenu
-><guimenuitem
->Execute Shell Command</guimenuitem
-></menuchoice
-> (<keycombo action="simul"
->&Ctrl;<keycap
->E</keycap
-></keycombo
->) feature. </para
-></note>
+<para><userinput><command>umount /mnt/floppy</command></userinput></para>
+
+<para>to unmount it (<command>umount</command> not <command>unmount</command>). </para>
+
+<note><para>Rather than having to open a text console to type the <command>mount </command> or <command>umount</command> commands, you may prefer to use &konqueror;'s <menuchoice><guimenu> Tools</guimenu><guimenuitem>Execute Shell Command</guimenuitem></menuchoice> (<keycombo action="simul">&Ctrl;<keycap>E</keycap></keycombo>) feature. </para></note>
 
 </listitem>
 
@@ -538,730 +161,215 @@ on separate lines
 </sect1>
 
 <sect1 id="deleting">
-<title
->Deleting Files and Folders</title>
+<title>Deleting Files and Folders</title>
 
-<para
->&konqueror; gives you two ways to dispose of an unwanted file or folder:</para>
+<para>&konqueror; gives you two ways to dispose of an unwanted file or folder:</para>
 
 <itemizedlist>
-<listitem
-><para
->You can move it to the <filename
->Trash</filename
-> folder, which is the safest method as you can get it back if you realise that you have made a mistake.</para
-></listitem
-> 
-
-<listitem
-><para
->You can just plain Delete it, which removes the entry from the folder and adds the disk area occupied by the file(s) to the system's list of free disk areas, in the same way as the <command
->rm</command
-> command.</para
-></listitem>
+<listitem><para>You can move it to the <filename>Trash</filename> folder, which is the safest method as you can get it back if you realise that you have made a mistake.</para></listitem> 
+
+<listitem><para>You can just plain Delete it, which removes the entry from the folder and adds the disk area occupied by the file(s) to the system's list of free disk areas, in the same way as the <command>rm</command> command.</para></listitem>
 </itemizedlist>
 
-<para
->The simplest way to remove a file or folder is to position the mouse pointer over its name or icon and press the &RMB;, which will bring up a menu containing the options <guimenuitem
->Move to Wastebin</guimenuitem
-> and <guimenuitem
->Delete</guimenuitem
->.</para>
-
-<para
->Or, if you have <quote
->selected</quote
-> the item, the Menubar <guimenu
->Edit</guimenu
-> menu will give you the choice of <quote
-><guimenuitem
->Move to Wastebin</guimenuitem
-></quote
-> and <quote
-><guimenuitem
->Delete</guimenuitem
-></quote
-> options.</para>
-
-<para
-><keycap
->Del</keycap
-> will move the selected item or items to the Wastebin.</para>
-
-<para
-><keycombo action="simul"
->&Shift;<keycap
->Del</keycap
-></keycombo
-> will really, truly and irrevocably delete the selected item or items.</para>
-
-<note
-><para
->You won't be able to remove a file or folder if you do not have the necessary permissions, see the section on <link linkend="super-user"
->Super User Mode</link
-> for further details.</para
-></note>
+<para>The simplest way to remove a file or folder is to position the mouse pointer over its name or icon and press the &RMB;, which will bring up a menu containing the options <guimenuitem>Move to Wastebin</guimenuitem> and <guimenuitem>Delete</guimenuitem>.</para>
+
+<para>Or, if you have <quote>selected</quote> the item, the Menubar <guimenu>Edit</guimenu> menu will give you the choice of <quote><guimenuitem>Move to Wastebin</guimenuitem></quote> and <quote><guimenuitem>Delete</guimenuitem></quote> options.</para>
+
+<para><keycap>Del</keycap> will move the selected item or items to the Wastebin.</para>
+
+<para><keycombo action="simul">&Shift;<keycap>Del</keycap></keycombo> will really, truly and irrevocably delete the selected item or items.</para>
+
+<note><para>You won't be able to remove a file or folder if you do not have the necessary permissions, see the section on <link linkend="super-user">Super User Mode</link> for further details.</para></note>
 
 </sect1>
 
 <sect1 id="moving">
-<title
->Moving and Copying</title>
+<title>Moving and Copying</title>
 
-<para
->To copy a file or subfolder between folders you can:</para>
+<para>To copy a file or subfolder between folders you can:</para>
 
 <itemizedlist>
-<listitem
-><para
->Position the mouse pointer over its name or icon and hold down the &RMB;, which will bring up a menu containing the <guimenuitem
->Copy</guimenuitem
-> option. Choose that.</para>
-
-<para
->Or if the item is <quote
->selected</quote
-> you can use the <guiicon
->Copy</guiicon
-> button on the Toolbar or the Menubar <menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Copy</guimenuitem
-></menuchoice
-> item, or the <keycombo action="simul"
->&Ctrl;<keycap
->C</keycap
-></keycombo
-> shortcut key combination.</para
-></listitem>
-
-<listitem
-><para
->Navigate to the folder you want to copy the item into then Paste the item into the new folder by using the Toolbar <guiicon
->Paste</guiicon
-> button or the Menubar <menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Paste</guimenuitem
-></menuchoice
-> option or the <keycombo action="simul"
->&Ctrl;<keycap
->V</keycap
-></keycombo
-> shortcut, or by moving the mouse pointer to a clear area of the window and holding the &RMB; down to bring up a menu containing the <guimenuitem
->Paste</guimenuitem
-> option. </para
-></listitem>
+<listitem><para>Position the mouse pointer over its name or icon and hold down the &RMB;, which will bring up a menu containing the <guimenuitem>Copy</guimenuitem> option. Choose that.</para>
+
+<para>Or if the item is <quote>selected</quote> you can use the <guiicon>Copy</guiicon> button on the Toolbar or the Menubar <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Copy</guimenuitem></menuchoice> item, or the <keycombo action="simul">&Ctrl;<keycap>C</keycap></keycombo> shortcut key combination.</para></listitem>
+
+<listitem><para>Navigate to the folder you want to copy the item into then Paste the item into the new folder by using the Toolbar <guiicon>Paste</guiicon> button or the Menubar <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Paste</guimenuitem></menuchoice> option or the <keycombo action="simul">&Ctrl;<keycap>V</keycap></keycombo> shortcut, or by moving the mouse pointer to a clear area of the window and holding the &RMB; down to bring up a menu containing the <guimenuitem>Paste</guimenuitem> option. </para></listitem>
 </itemizedlist>
 
-<para
->Moving a file or subfolder between folders can be done in the same way as copying, except that you choose the <guimenuitem
->Cut</guimenuitem
-> option or <keycombo action="simul"
->&Ctrl;<keycap
->X</keycap
-></keycombo
-> instead of <guimenuitem
->Copy</guimenuitem
->. The item that you have <guimenuitem
->Cut</guimenuitem
-> will be removed from the original folder when you do the <guimenuitem
->Paste</guimenuitem
-> into the new folder.</para>
-
-<para
->You can also copy or move selected item(s) to another folder by using <menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Copy Files</guimenuitem
-></menuchoice
-> (<keycap
->F7</keycap
->) or <menuchoice
-><guimenu
->Edit</guimenu
-><guimenuitem
->Move Files</guimenuitem
-> </menuchoice
-> (<keycap
->F8</keycap
->), or by selecting <guimenuitem
->Copy To</guimenuitem
-> or <guimenuitem
->Move To</guimenuitem
-> from the drop down menu you get when you <mousebutton
->right</mousebutton
-> click on an file or folder name in the File Manager window.</para>
-
-<note
-><para
->You may not be able to copy or move a file or folder if you don't have the necessary permissions. See the section on <link linkend="super-user"
->Super User Mode</link
-> for further details.</para
-></note>
+<para>Moving a file or subfolder between folders can be done in the same way as copying, except that you choose the <guimenuitem>Cut</guimenuitem> option or <keycombo action="simul">&Ctrl;<keycap>X</keycap></keycombo> instead of <guimenuitem>Copy</guimenuitem>. The item that you have <guimenuitem>Cut</guimenuitem> will be removed from the original folder when you do the <guimenuitem>Paste</guimenuitem> into the new folder.</para>
+
+<para>You can also copy or move selected item(s) to another folder by using <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Copy Files</guimenuitem></menuchoice> (<keycap>F7</keycap>) or <menuchoice><guimenu>Edit</guimenu><guimenuitem>Move Files</guimenuitem> </menuchoice> (<keycap>F8</keycap>), or by selecting <guimenuitem>Copy To</guimenuitem> or <guimenuitem>Move To</guimenuitem> from the drop down menu you get when you <mousebutton>right</mousebutton> click on an file or folder name in the File Manager window.</para>
+
+<note><para>You may not be able to copy or move a file or folder if you don't have the necessary permissions. See the section on <link linkend="super-user">Super User Mode</link> for further details.</para></note>
 
 <sect2 id="dnd">
-<title
->Using Drag 'n Drop</title>
-
-<para
->&konqueror; also supports Drag and Drop copying and moving of files and folders.</para>
-
-<para
->You can do this by having two instances of &konqueror;, one showing the folder you want to copy from, the other showing the target folder. Position the mouse pointer over the item you wish to copy or move, then, holding the &LMB; pressed, <quote
->drag</quote
-> it to a clear space in the target folder. Release the button and you will be presented with a menu choice of <guimenuitem
->Copy</guimenuitem
-> or <guimenuitem
->Move</guimenuitem
->. Take care to <quote
->drop</quote
-> the item into an empty area of the target folder view - dropping it on top of another file name or icon can cause problems.</para>
-
-<para
->You can also set up &konqueror; to show more than one folder within its window and drag &amp; drop between them.</para>
+<title>Using Drag 'n Drop</title>
+
+<para>&konqueror; also supports Drag and Drop copying and moving of files and folders.</para>
+
+<para>You can do this by having two instances of &konqueror;, one showing the folder you want to copy from, the other showing the target folder. Position the mouse pointer over the item you wish to copy or move, then, holding the &LMB; pressed, <quote>drag</quote> it to a clear space in the target folder. Release the button and you will be presented with a menu choice of <guimenuitem>Copy</guimenuitem> or <guimenuitem>Move</guimenuitem>. Take care to <quote>drop</quote> the item into an empty area of the target folder view - dropping it on top of another file name or icon can cause problems.</para>
+
+<para>You can also set up &konqueror; to show more than one folder within its window and drag &amp; drop between them.</para>
 
 <mediaobject>
-<imageobject
-><imagedata format="PNG" fileref="dragdrop.png"/></imageobject>
+<imageobject><imagedata format="PNG" fileref="dragdrop.png"/></imageobject>
 <textobject>
-<phrase
->Split Views for Drag &amp; Drop</phrase>
+<phrase>Split Views for Drag &amp; Drop</phrase>
 </textobject>
 </mediaobject>
 
-<para
->This screenshot illustrates the use of the Menubar <menuchoice
-><guimenu
->Window</guimenu
-> <guimenuitem
->Split View Left/Right</guimenuitem
-></menuchoice
-> option, also available with the shortcut <keycombo action="simul"
->&Ctrl;&Shift;<keycap
->L</keycap
-> </keycombo
->, to split the main &konqueror; window into two views, each showing the contents of a different folder.</para>
-
-<para
->To be able to show different folders in each view they should not be linked; the little boxes at the bottom right of each view should be empty. </para>
-
-<para
->The <quote
->active</quote
-> view, that is the one whose path is shown in the Location Toolbar and which responds to navigation and Menubar commands, is shown by the little green light in the bottom left corner. To make a view active, <mousebutton
->left</mousebutton
-> click on an empty area of the view or on its Status Bar.</para>
-
-<para
->To remove an active view from &konqueror;'s window use the <keycombo action="simul"
->&Ctrl;&Shift;<keycap
->R</keycap
-> </keycombo
-> shortcut, or the Menubar <menuchoice
-><guimenu
->Window</guimenu
-> <guimenuitem
->Remove Active View</guimenuitem
-></menuchoice
-> option, or &RMB; click on the Status Bar and choose the <guimenuitem
->Remove Active View</guimenuitem
-> option from the resulting menu.</para>
-
-<para
->If you use &konqueror; tabs, you can drag and drop between tabs by dragging the file to the tab label, without letting go yet. The destination tab will pop to the front, allowing you to continue dragging and then drop the file.</para>
+<para>This screenshot illustrates the use of the Menubar <menuchoice><guimenu>Window</guimenu> <guimenuitem>Split View Left/Right</guimenuitem></menuchoice> option, also available with the shortcut <keycombo action="simul">&Ctrl;&Shift;<keycap>L</keycap> </keycombo>, to split the main &konqueror; window into two views, each showing the contents of a different folder.</para>
+
+<para>To be able to show different folders in each view they should not be linked; the little boxes at the bottom right of each view should be empty. </para>
+
+<para>The <quote>active</quote> view, that is the one whose path is shown in the Location Toolbar and which responds to navigation and Menubar commands, is shown by the little green light in the bottom left corner. To make a view active, <mousebutton>left</mousebutton> click on an empty area of the view or on its Status Bar.</para>
+
+<para>To remove an active view from &konqueror;'s window use the <keycombo action="simul">&Ctrl;&Shift;<keycap>R</keycap> </keycombo> shortcut, or the Menubar <menuchoice><guimenu>Window</guimenu> <guimenuitem>Remove Active View</guimenuitem></menuchoice> option, or &RMB; click on the Status Bar and choose the <guimenuitem>Remove Active View</guimenuitem> option from the resulting menu.</para>
+
+<para>If you use &konqueror; tabs, you can drag and drop between tabs by dragging the file to the tab label, without letting go yet. The destination tab will pop to the front, allowing you to continue dragging and then drop the file.</para>
 
 </sect2>
 
 <sect2 id="dups">
-<title
->Duplicate File Names</title>
-<para
->If you try to paste a file into a folder that already contains a file with the same name, &konqueror; will pop up a dialogue box warning you that the file already exists. You can then choose to: </para>
+<title>Duplicate File Names</title>
+<para>If you try to paste a file into a folder that already contains a file with the same name, &konqueror; will pop up a dialogue box warning you that the file already exists. You can then choose to: </para>
 <itemizedlist>
-<listitem
-><para
-><guilabel
->Overwrite</guilabel
-> the old file with the newly copied one. The <guibutton
->Overwrite All</guibutton
-> button can be used if you have copied multiple items.</para
-></listitem>
-<listitem
-><para
->Cancel the paste operation by pressing the <guibutton
->Skip </guibutton
-> or <guibutton
->Skip All</guibutton
-> button.</para
-></listitem>
-<listitem
-><para
->Give the file that is being copied a different name. You can do this by typing a new name into the text entry box or get &konqueror; to <guibutton
->Propose</guibutton
-> one. When you have done this press the <guibutton
->Rename</guibutton
-> button.</para
-></listitem>
+<listitem><para><guilabel>Overwrite</guilabel> the old file with the newly copied one. The <guibutton>Overwrite All</guibutton> button can be used if you have copied multiple items.</para></listitem>
+<listitem><para>Cancel the paste operation by pressing the <guibutton>Skip </guibutton> or <guibutton>Skip All</guibutton> button.</para></listitem>
+<listitem><para>Give the file that is being copied a different name. You can do this by typing a new name into the text entry box or get &konqueror; to <guibutton>Propose</guibutton> one. When you have done this press the <guibutton>Rename</guibutton> button.</para></listitem>
 </itemizedlist>
 </sect2>
 </sect1>
 
 <sect1 id="multiple">
-<title
->Selecting Multiple Files</title>
-
-<para
->You sometimes want to delete, copy or move a number of files that are similar in some way. For example you may wish to move all of the .png graphics files from one folder to another. &konqueror; makes this easy by letting you select multiple files based on similarities in their file names.</para>
-
-<para
->Use the Menubar <menuchoice
-><guimenu
->Edit</guimenu
-><guisubmenu
->Selection</guisubmenu
-> <guimenuitem
->Select...</guimenuitem
-></menuchoice
-> item or the shortcut <keycombo action="simul"
->&Ctrl;<keycap
->+</keycap
-></keycombo
->. This brings up a little dialogue box in which you enter a filename containing the wildcard characters <keycap
->*</keycap
->, which matches any number of characters, and <keycap
->?</keycap
-> which matches a single character. Press <guibutton
->OK</guibutton
-> and &konqueror; will highlight all files with matching names. For example;</para>
+<title>Selecting Multiple Files</title>
+
+<para>You sometimes want to delete, copy or move a number of files that are similar in some way. For example you may wish to move all of the .png graphics files from one folder to another. &konqueror; makes this easy by letting you select multiple files based on similarities in their file names.</para>
+
+<para>Use the Menubar <menuchoice><guimenu>Edit</guimenu><guisubmenu>Selection</guisubmenu> <guimenuitem>Select...</guimenuitem></menuchoice> item or the shortcut <keycombo action="simul">&Ctrl;<keycap>+</keycap></keycombo>. This brings up a little dialogue box in which you enter a filename containing the wildcard characters <keycap>*</keycap>, which matches any number of characters, and <keycap>?</keycap> which matches a single character. Press <guibutton>OK</guibutton> and &konqueror; will highlight all files with matching names. For example;</para>
       
 <itemizedlist>
-<listitem
-><para
-><userinput
-><filename
->flag*.png</filename
-></userinput
-> will select all filenames starting with the letters <quote
->flag</quote
-> and ending with <quote
-><literal role="extension"
->.png</literal
-></quote
->.</para
-></listitem>
-<listitem
-><para
-><userinput
-><filename
->memo?.txt</filename
-></userinput
-> will select <filename
->memo1.txt</filename
-> and <filename
->memo9.txt</filename
-> but not <filename
->memo99.txt</filename
->.</para
-></listitem>
+<listitem><para><userinput><filename>flag*.png</filename></userinput> will select all filenames starting with the letters <quote>flag</quote> and ending with <quote><literal role="extension">.png</literal></quote>.</para></listitem>
+<listitem><para><userinput><filename>memo?.txt</filename></userinput> will select <filename>memo1.txt</filename> and <filename>memo9.txt</filename> but not <filename>memo99.txt</filename>.</para></listitem>
 </itemizedlist>
 
-<para
->When you have selected a range of files, you can narrow down the selection by uing the Menubar <menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Unselect...</guimenuitem
-></menuchoice
-> option or <keycombo action="simul"
->&Ctrl;<keycap
->-</keycap
-></keycombo
-> to specify which of the selected files should be removed from the selection.</para>
-
-<para
->Use <keycombo action="simul"
->&Ctrl;<keycap
->U</keycap
-></keycombo
-> or the Menubar <menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Unselect All</guimenuitem
-></menuchoice
-> option or just &LMB; click on a clear area of the view to cancel the selection.</para>
-
-<para
->You can even invert the selection: that is, deselect all selected files and select those that were previously unselected. Use the Menubar <menuchoice
-><guimenu
->Edit</guimenu
-><guimenuitem
->Invert Selection</guimenuitem
-></menuchoice
-> option or <keycombo action="simul"
->&Ctrl;<keycap
->*</keycap
-></keycombo
-> to do this.</para>
-
-<para
->A number of useful shortcut keys can be used in list, tree and text view modes:</para>
+<para>When you have selected a range of files, you can narrow down the selection by uing the Menubar <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Unselect...</guimenuitem></menuchoice> option or <keycombo action="simul">&Ctrl;<keycap>-</keycap></keycombo> to specify which of the selected files should be removed from the selection.</para>
+
+<para>Use <keycombo action="simul">&Ctrl;<keycap>U</keycap></keycombo> or the Menubar <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Unselect All</guimenuitem></menuchoice> option or just &LMB; click on a clear area of the view to cancel the selection.</para>
+
+<para>You can even invert the selection: that is, deselect all selected files and select those that were previously unselected. Use the Menubar <menuchoice><guimenu>Edit</guimenu><guimenuitem>Invert Selection</guimenuitem></menuchoice> option or <keycombo action="simul">&Ctrl;<keycap>*</keycap></keycombo> to do this.</para>
+
+<para>A number of useful shortcut keys can be used in list, tree and text view modes:</para>
 <variablelist>
 
 <varlistentry>
-<term
-><keycap
->Space</keycap
-></term>
+<term><keycap>Space</keycap></term>
 <listitem>
-<para
->Toggle the current selection. </para>
+<para>Toggle the current selection. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><keycap
->Insert</keycap
-></term>
+<term><keycap>Insert</keycap></term>
 <listitem>
-<para
->Toggle the current selection and move down to the next item. </para>
+<para>Toggle the current selection and move down to the next item. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><keycombo action="simul"
->&Ctrl;<keysym
->Up Arrow</keysym
-></keycombo
->, <keycombo action="simul"
->&Ctrl;<keysym
->Down Arrow</keysym
-></keycombo
->, <keycombo action="simul"
->&Ctrl;<keycap
->Home</keycap
-></keycombo
->, <keycombo action="simul"
->&Ctrl;<keycap
->End</keycap
-></keycombo
->, <keycombo action="simul"
->&Ctrl;<keycap
->Page Up</keycap
-></keycombo
->, <keycombo action="simul"
->&Ctrl;<keycap
->Page Down</keycap
-></keycombo
-> </term>
+<term><keycombo action="simul">&Ctrl;<keysym>Up Arrow</keysym></keycombo>, <keycombo action="simul">&Ctrl;<keysym>Down Arrow</keysym></keycombo>, <keycombo action="simul">&Ctrl;<keycap>Home</keycap></keycombo>, <keycombo action="simul">&Ctrl;<keycap>End</keycap></keycombo>, <keycombo action="simul">&Ctrl;<keycap>Page Up</keycap></keycombo>, <keycombo action="simul">&Ctrl;<keycap>Page Down</keycap></keycombo> </term>
 <listitem>
-<para
->Move the selection, toggling the selection of everything on the way. </para>
+<para>Move the selection, toggling the selection of everything on the way. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><keycombo action="simul"
->&Shift;<keysym
->Up Arrow</keysym
-></keycombo
->, <keycombo action="simul"
->&Shift;<keysym
->Down Arrow</keysym
-></keycombo
->, <keycombo action="simul"
->&Shift;<keycap
->Home</keycap
-></keycombo
->, <keycombo action="simul"
->&Shift;<keycap
->End</keycap
-></keycombo
->, <keycombo action="simul"
->&Shift;<keycap
->Page Up</keycap
-></keycombo
->, <keycombo action="simul"
->&Shift;<keycap
->Page Down</keycap
-></keycombo
-> </term>
+<term><keycombo action="simul">&Shift;<keysym>Up Arrow</keysym></keycombo>, <keycombo action="simul">&Shift;<keysym>Down Arrow</keysym></keycombo>, <keycombo action="simul">&Shift;<keycap>Home</keycap></keycombo>, <keycombo action="simul">&Shift;<keycap>End</keycap></keycombo>, <keycombo action="simul">&Shift;<keycap>Page Up</keycap></keycombo>, <keycombo action="simul">&Shift;<keycap>Page Down</keycap></keycombo> </term>
 <listitem>
-<para
->Deselect everything, then move the selection, selecting everything on the way. </para>
+<para>Deselect everything, then move the selection, selecting everything on the way. </para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->Once you have selected the right files then the normal delete, copy or move commands will act on all of the selected files at once. </para>
-
-<note
-><para
->Depending on your keyboard type and locale, you may find that the <keycombo action="simul"
->&Ctrl;<keycap
->+</keycap
-></keycombo
->, <keycombo action="simul"
->&Ctrl;<keycap
->-</keycap
-></keycombo
-> and <keycombo action="simul"
->&Ctrl;<keycap
->*</keycap
-></keycombo
-> shortcuts only work with the Numeric keypad <keycap
->+</keycap
->, <keycap
->-</keycap
-> and <keycap
->*</keycap
-> keys.</para
-></note>
+<para>Once you have selected the right files then the normal delete, copy or move commands will act on all of the selected files at once. </para>
+
+<note><para>Depending on your keyboard type and locale, you may find that the <keycombo action="simul">&Ctrl;<keycap>+</keycap></keycombo>, <keycombo action="simul">&Ctrl;<keycap>-</keycap></keycombo> and <keycombo action="simul">&Ctrl;<keycap>*</keycap></keycombo> shortcuts only work with the Numeric keypad <keycap>+</keycap>, <keycap>-</keycap> and <keycap>*</keycap> keys.</para></note>
 
 </sect1>
 
 <sect1 id="making">
-<title
->Create New</title>
+<title>Create New</title>
 
-<para
->When &konqueror; is in File Manager mode, picking <guisubmenu
->Create New</guisubmenu
-> from the <guimenu
->Edit</guimenu
-> menu or from the context menu you get by &RMB; clicking on a free area in a folder view gives you a submenu letting you create any of the following in the current folder:</para>
+<para>When &konqueror; is in File Manager mode, picking <guisubmenu>Create New</guisubmenu> from the <guimenu>Edit</guimenu> menu or from the context menu you get by &RMB; clicking on a free area in a folder view gives you a submenu letting you create any of the following in the current folder:</para>
 
 <variablelist>
 
 <varlistentry>
-<term
-><menuchoice
-><guisubmenu
->File</guisubmenu
-><guimenuitem
->Link To Application...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->This option is most useful if you want to create an icon that will open a particular application. It opens a dialogue box with three tabbed pages. The first, <guilabel
->General</guilabel
->, is where you choose an icon and the text that will appear with it. The second page, <guilabel
->Permissions</guilabel
->, lets you select who can use or modify the icon. In the <guilabel
->Application</guilabel
-> page you must enter the <guilabel
->Command</guilabel
-> that will run the application, for example, <userinput
->kedit</userinput
-> to start up the &kedit; text editor. <userinput
->kedit /home/pam/todo.txt</userinput
-> would open the file <filename
->/home/pam/todo.txt</filename
-> in &kedit;. Advanced options such as the file types which the application can open are also available from this page.</para>
-
-<para
->To make the application icon appear on your desktop, create the link in your <filename class="directory"
->~/Desktop</filename
-> folder (this may be called something slightly different depending on how &kde; was installed on your system) or get to the <guisubmenu
->Create New...</guisubmenu
-> sub menu by <mousebutton
->right</mousebutton
-> clicking on a free area of the desktop instead of within &konqueror;'s window.</para>
-
-<para
->If you have a lot of specialised application links and don't want to clutter up the desktop, then why not create them in your Applications folder. You can get there in &konqueror; by choosing <menuchoice
-><guimenu
->Go</guimenu
-> <guimenuitem
->Applications</guimenuitem
-></menuchoice
->. Then create a single icon on your desktop to open your Applications folder, which is usually in <filename class="directory"
->~/.trinity/share/applnk</filename
->.</para>
-
-<para
->To put an application link icon into the panel, first create it in the Applications folder then drag the icon onto a clear area of the panel.</para>
+<term><menuchoice><guisubmenu>File</guisubmenu><guimenuitem>Link To Application...</guimenuitem> </menuchoice></term>
+<listitem><para>This option is most useful if you want to create an icon that will open a particular application. It opens a dialogue box with three tabbed pages. The first, <guilabel>General</guilabel>, is where you choose an icon and the text that will appear with it. The second page, <guilabel>Permissions</guilabel>, lets you select who can use or modify the icon. In the <guilabel>Application</guilabel> page you must enter the <guilabel>Command</guilabel> that will run the application, for example, <userinput>kedit</userinput> to start up the &kedit; text editor. <userinput>kedit /home/pam/todo.txt</userinput> would open the file <filename>/home/pam/todo.txt</filename> in &kedit;. Advanced options such as the file types which the application can open are also available from this page.</para>
+
+<para>To make the application icon appear on your desktop, create the link in your <filename class="directory">~/Desktop</filename> folder (this may be called something slightly different depending on how &kde; was installed on your system) or get to the <guisubmenu>Create New...</guisubmenu> sub menu by <mousebutton>right</mousebutton> clicking on a free area of the desktop instead of within &konqueror;'s window.</para>
+
+<para>If you have a lot of specialised application links and don't want to clutter up the desktop, then why not create them in your Applications folder. You can get there in &konqueror; by choosing <menuchoice><guimenu>Go</guimenu> <guimenuitem>Applications</guimenuitem></menuchoice>. Then create a single icon on your desktop to open your Applications folder, which is usually in <filename class="directory">~/.trinity/share/applnk</filename>.</para>
+
+<para>To put an application link icon into the panel, first create it in the Applications folder then drag the icon onto a clear area of the panel.</para>
 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guisubmenu
->File</guisubmenu
-><guimenuitem
->Link To Location (URL)...</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
->This lets you create an icon to open &konqueror; at a particular folder or web page. As with <guimenuitem
->Link To Application...</guimenuitem
-> you can make the application icon appear on your desktop by creating the link in your <filename
->~/Desktop</filename
-> folder or going to the <guisubmenu
->Create New...</guisubmenu
-> sub menu by right clicking on a free area of the desktop. When you first create it the text shown with the icon will be the full path or &URL;. You can change it by right clicking on the icon, selecting <guimenuitem
->Properties...</guimenuitem
-> and entering the preferred text in the <guilabel
->General</guilabel
-> tab page.</para
-></listitem>
+<term><menuchoice><guisubmenu>File</guisubmenu><guimenuitem>Link To Location (URL)...</guimenuitem></menuchoice></term>
+<listitem><para>This lets you create an icon to open &konqueror; at a particular folder or web page. As with <guimenuitem>Link To Application...</guimenuitem> you can make the application icon appear on your desktop by creating the link in your <filename>~/Desktop</filename> folder or going to the <guisubmenu>Create New...</guisubmenu> sub menu by right clicking on a free area of the desktop. When you first create it the text shown with the icon will be the full path or &URL;. You can change it by right clicking on the icon, selecting <guimenuitem>Properties...</guimenuitem> and entering the preferred text in the <guilabel>General</guilabel> tab page.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guisubmenu
->Device</guisubmenu
-><guimenuitem
->Floppy Device...</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
->Use this option to create an icon that will mount a floppy disk and open an instance of &konqueror; showing the disk's contents. To unmount the disk when you have finished with it <mousebutton
->right</mousebutton
-> click on the icon and select <guimenuitem
->Unmount</guimenuitem
->. In practice it doesn't have to be a floppy disk but can be any hard disk or partition on your system that is not normally mounted. In most cases you will want to create the icon on your desktop.</para
-></listitem>
+<term><menuchoice><guisubmenu>Device</guisubmenu><guimenuitem>Floppy Device...</guimenuitem></menuchoice></term>
+<listitem><para>Use this option to create an icon that will mount a floppy disk and open an instance of &konqueror; showing the disk's contents. To unmount the disk when you have finished with it <mousebutton>right</mousebutton> click on the icon and select <guimenuitem>Unmount</guimenuitem>. In practice it doesn't have to be a floppy disk but can be any hard disk or partition on your system that is not normally mounted. In most cases you will want to create the icon on your desktop.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenuitem
->Hard Disk...</guimenuitem
-></term>
-<listitem
-><para
->This option is similar to <guimenuitem
->Floppy Device...</guimenuitem
-> but for a hard disk drive or partition.</para
-></listitem>
+<term><guimenuitem>Hard Disk...</guimenuitem></term>
+<listitem><para>This option is similar to <guimenuitem>Floppy Device...</guimenuitem> but for a hard disk drive or partition.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenuitem
->CD/DVD-ROM Device...</guimenuitem
-></term>
-<listitem
-><para
->This option is similar to <guimenuitem
->Floppy Device...</guimenuitem
-> but for a <acronym
->CD</acronym
-> or <acronym
->DVD</acronym
-> drive.</para
-></listitem>
+<term><guimenuitem>CD/DVD-ROM Device...</guimenuitem></term>
+<listitem><para>This option is similar to <guimenuitem>Floppy Device...</guimenuitem> but for a <acronym>CD</acronym> or <acronym>DVD</acronym> drive.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenuitem
->Folder...</guimenuitem
-></term>
-<listitem
-><para
->An easy way of creating a new (sub)folder.</para
-></listitem>
+<term><guimenuitem>Folder...</guimenuitem></term>
+<listitem><para>An easy way of creating a new (sub)folder.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenuitem
->Text File...</guimenuitem
-></term>
-<listitem
-><para
->Use this to create an ordinary, empty, text file. A dialogue box will be opened for you to enter the name of your new file.</para
-></listitem>
+<term><guimenuitem>Text File...</guimenuitem></term>
+<listitem><para>Use this to create an ordinary, empty, text file. A dialogue box will be opened for you to enter the name of your new file.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenuitem
->HTML File...</guimenuitem
-></term>
-<listitem
-><para
->Creates a skeleton <acronym
->HTML</acronym
-> source file. When you type the new file's name into the dialogue box it is probably best to give it a <literal role="extension"
->.html </literal
-> extension to avoid confusion.</para
-></listitem>
+<term><guimenuitem>HTML File...</guimenuitem></term>
+<listitem><para>Creates a skeleton <acronym>HTML</acronym> source file. When you type the new file's name into the dialogue box it is probably best to give it a <literal role="extension">.html </literal> extension to avoid confusion.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenuitem
->Presentation Document...</guimenuitem
-></term>
-<listitem
-><para
->Creates a skeleton &koffice; &kpresenter; document. Give its name a <literal role="extension"
->.kpr</literal
-> extension.</para
-></listitem>
+<term><guimenuitem>Presentation Document...</guimenuitem></term>
+<listitem><para>Creates a skeleton &koffice; &kpresenter; document. Give its name a <literal role="extension">.kpr</literal> extension.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenuitem
->Text Document...</guimenuitem
-></term>
-<listitem
-><para
->Creates a skeleton <application
->KOffice</application
-> &kword; document using the standard &kword; style template. Give its name a <literal role="extension"
->.kwd</literal
-> extension.</para
-></listitem>
+<term><guimenuitem>Text Document...</guimenuitem></term>
+<listitem><para>Creates a skeleton <application>KOffice</application> &kword; document using the standard &kword; style template. Give its name a <literal role="extension">.kwd</literal> extension.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenuitem
->Spread Sheet Document...</guimenuitem
-></term>
-<listitem
-><para
->Use this to create a new <application
->KOffice</application
-> &kspread; spreadsheet file, and name it with a <literal role="extension"
->.ksp</literal
-> extension.</para
-></listitem>
+<term><guimenuitem>Spread Sheet Document...</guimenuitem></term>
+<listitem><para>Use this to create a new <application>KOffice</application> &kspread; spreadsheet file, and name it with a <literal role="extension">.ksp</literal> extension.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenuitem
->Illustration Document...</guimenuitem
-></term>
-<listitem
-><para
->Creates a new <application
->KOffice</application
-> &kontour; document. Name it with the extension <literal role="extension"
->.kil</literal
->.</para
-></listitem>
+<term><guimenuitem>Illustration Document...</guimenuitem></term>
+<listitem><para>Creates a new <application>KOffice</application> &kontour; document. Name it with the extension <literal role="extension">.kil</literal>.</para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -1269,174 +377,56 @@ on separate lines
 </sect1>
 
 <sect1 id="newname">
-<title
->Changing Names and Permissions</title>
-
-<para
->The easiest way to change the name of a file or folder is to <mousebutton
->right</mousebutton
-> click on it and select <guimenuitem
->Rename</guimenuitem
->.</para>
-
-<para
->To change the name or permissions of a file or folder <mousebutton
->right</mousebutton
-> click on its name or icon and select the <guimenuitem
->Properties...</guimenuitem
-> item, or if you have <quote
->selected</quote
-> the file or folder, then you can use the Menubar <menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Properties</guimenuitem
-></menuchoice
-> option.</para>
-
-<para
->This will bring up the Properties dialogue box with two tabbed pages:</para>
+<title>Changing Names and Permissions</title>
+
+<para>The easiest way to change the name of a file or folder is to <mousebutton>right</mousebutton> click on it and select <guimenuitem>Rename</guimenuitem>.</para>
+
+<para>To change the name or permissions of a file or folder <mousebutton>right</mousebutton> click on its name or icon and select the <guimenuitem>Properties...</guimenuitem> item, or if you have <quote>selected</quote> the file or folder, then you can use the Menubar <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Properties</guimenuitem></menuchoice> option.</para>
+
+<para>This will bring up the Properties dialogue box with two tabbed pages:</para>
 
 <itemizedlist>
-<listitem
-><para
-><guilabel
->General</guilabel
->, which gives you some information about the item and lets you change its name and, for a folder, the associated icon.</para
-></listitem>
-<listitem
-><para
-><guilabel
->Permissions</guilabel
->, which shows you the item's ownership and access permissions and lets you change the permissions. </para
-></listitem>
+<listitem><para><guilabel>General</guilabel>, which gives you some information about the item and lets you change its name and, for a folder, the associated icon.</para></listitem>
+<listitem><para><guilabel>Permissions</guilabel>, which shows you the item's ownership and access permissions and lets you change the permissions. </para></listitem>
 </itemizedlist>
 
 <sect2 id="copyrename">
-<title
->Copy and Rename</title>
-<para
->If you want to make a copy of an existing file with a different name, perhaps as a backup, in the same folder as the original file, do a normal <guimenuitem
->Copy</guimenuitem
-> then when you <guimenuitem
->Paste</guimenuitem
-> it a dialogue box will pop up complaining that the file already exists. Just type the new name into the dialogue's text box and press the <guibutton
->Rename</guibutton
-> button (or if you are feeling lazy pressing the <guibutton
->Propose</guibutton
-> button will generate a new name for you).</para>
+<title>Copy and Rename</title>
+<para>If you want to make a copy of an existing file with a different name, perhaps as a backup, in the same folder as the original file, do a normal <guimenuitem>Copy</guimenuitem> then when you <guimenuitem>Paste</guimenuitem> it a dialogue box will pop up complaining that the file already exists. Just type the new name into the dialogue's text box and press the <guibutton>Rename</guibutton> button (or if you are feeling lazy pressing the <guibutton>Propose</guibutton> button will generate a new name for you).</para>
 </sect2>
 
 <sect2 id="super-user">
-<title
->Super User Mode</title>
-
-<para
->If you are running as a normal user and try to access files outside of your own home folder you will often be prevented from doing so and get an error message such as <errorname
->Access Denied</errorname
->. </para>
-
-<para
->To access these files you need to be logged in as the system administrator, often known as the Super User or <systemitem class="username"
->root</systemitem
->. </para>
-
-<para
->Rather than logging out then in again, you can launch &konqueror; from the <guimenu
->K</guimenu
-> Menu in Super User mode by selecting <menuchoice
-><guisubmenu
->System</guisubmenu
-><guimenuitem
->File Manager - Super User Mode </guimenuitem
-></menuchoice
->. You will be asked for the <systemitem class="username"
->root</systemitem
-> login password but as long as you can provide that &konqueror; will be started up with full access privileges to all files on your system.</para>
-
-<warning
-><para
->Take care. As Super User (<systemitem class="username"
->root</systemitem
->), you have complete control of your system, and a wrong command can easily do irrevocable damage.</para>
-<para
->Also, connecting to the internet as <systemitem class="username"
->root</systemitem
-> is an extremely bad idea, as it seriously increases your vulnerability to malicious hacking.</para
-></warning>
+<title>Super User Mode</title>
+
+<para>If you are running as a normal user and try to access files outside of your own home folder you will often be prevented from doing so and get an error message such as <errorname>Access Denied</errorname>. </para>
+
+<para>To access these files you need to be logged in as the system administrator, often known as the Super User or <systemitem class="username">root</systemitem>. </para>
+
+<para>Rather than logging out then in again, you can launch &konqueror; from the <guimenu>K</guimenu> Menu in Super User mode by selecting <menuchoice><guisubmenu>System</guisubmenu><guimenuitem>File Manager - Super User Mode </guimenuitem></menuchoice>. You will be asked for the <systemitem class="username">root</systemitem> login password but as long as you can provide that &konqueror; will be started up with full access privileges to all files on your system.</para>
+
+<warning><para>Take care. As Super User (<systemitem class="username">root</systemitem>), you have complete control of your system, and a wrong command can easily do irrevocable damage.</para>
+<para>Also, connecting to the internet as <systemitem class="username">root</systemitem> is an extremely bad idea, as it seriously increases your vulnerability to malicious hacking.</para></warning>
 
 </sect2>
 </sect1>
 
 
 <sect1 id="commandline">
-<title
->At the Command Line</title>
-
-<para
->Although &konqueror; is a very powerful and flexible <acronym
->GUI</acronym
-> file manager, there are occasions when the experienced &Linux; / &UNIX; user wants to get down to the basics and work at the text command line level.</para>
-
-<para
->She could, of course, open an instance of &konsole;, perhaps with &konqueror;'s Menubar <menuchoice
-><guimenu
->Tools</guimenu
-><guimenuitem
->Open Terminal</guimenuitem
-></menuchoice
-> option or with <keycombo action="simul"
->&Ctrl;<keycap
->T</keycap
-></keycombo
->.</para>
-<para
->If she only wants to launch a program or view a &URL;, the <menuchoice
-> <guimenu
->Tools</guimenu
-><guimenuitem
->Run Command</guimenuitem
-></menuchoice
-> (<keycombo action="simul"
->&Alt;<keycap
->F2</keycap
-></keycombo
->) option may be easier.</para>
-
-<para
-><menuchoice
-><guimenu
->Tools</guimenu
-><guimenuitem
->Execute Shell Command... </guimenuitem
-></menuchoice
-> (<keycombo action="simul"
->&Ctrl; <keycap
->E</keycap
-></keycombo
->) opens a small command line dialogue window where you can enter a shell command such as <userinput
->ps -ax | grep tdeinit </userinput
->. Note that it does not support full featured terminal control characters, so applications such as <userinput
->top</userinput
-> and <userinput
-> less</userinput
-> will not work properly, but it is available immediately without the delay involved in starting &konsole;. </para>
-
-<para
->For more complex operations, &konqueror; has another nice feature; the Menubar <menuchoice
-><guimenu
->Window</guimenu
-><guimenuitem
->Show Terminal Emulator</guimenuitem
-></menuchoice
-> option, which opens up a terminal window as a new view within &konqueror;. As long as the link icon is visible at the bottom right corner of each view, the terminal will follow any folder changes you make in the normal file manager view.</para>
+<title>At the Command Line</title>
+
+<para>Although &konqueror; is a very powerful and flexible <acronym>GUI</acronym> file manager, there are occasions when the experienced &Linux; / &UNIX; user wants to get down to the basics and work at the text command line level.</para>
+
+<para>She could, of course, open an instance of &konsole;, perhaps with &konqueror;'s Menubar <menuchoice><guimenu>Tools</guimenu><guimenuitem>Open Terminal</guimenuitem></menuchoice> option or with <keycombo action="simul">&Ctrl;<keycap>T</keycap></keycombo>.</para>
+<para>If she only wants to launch a program or view a &URL;, the <menuchoice> <guimenu>Tools</guimenu><guimenuitem>Run Command</guimenuitem></menuchoice> (<keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo>) option may be easier.</para>
+
+<para><menuchoice><guimenu>Tools</guimenu><guimenuitem>Execute Shell Command... </guimenuitem></menuchoice> (<keycombo action="simul">&Ctrl; <keycap>E</keycap></keycombo>) opens a small command line dialogue window where you can enter a shell command such as <userinput>ps -ax | grep tdeinit </userinput>. Note that it does not support full featured terminal control characters, so applications such as <userinput>top</userinput> and <userinput> less</userinput> will not work properly, but it is available immediately without the delay involved in starting &konsole;. </para>
+
+<para>For more complex operations, &konqueror; has another nice feature; the Menubar <menuchoice><guimenu>Window</guimenu><guimenuitem>Show Terminal Emulator</guimenuitem></menuchoice> option, which opens up a terminal window as a new view within &konqueror;. As long as the link icon is visible at the bottom right corner of each view, the terminal will follow any folder changes you make in the normal file manager view.</para>
 
 <mediaobject>
-<imageobject
-><imagedata format="PNG" fileref="cmndline.png"/></imageobject>
+<imageobject><imagedata format="PNG" fileref="cmndline.png"/></imageobject>
 <textobject>
-<phrase
->Including the terminal emulator</phrase>
+<phrase>Including the terminal emulator</phrase>
 </textobject>
 </mediaobject>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/konqueror/index.docbook b/tde-i18n-en_GB/docs/tdebase/konqueror/index.docbook
index e66a34fb8fa..5faf81a696c 100644
--- a/tde-i18n-en_GB/docs/tdebase/konqueror/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/konqueror/index.docbook
@@ -16,84 +16,47 @@
   <!ENTITY konqueror-commands SYSTEM "commands.docbook">
   <!ENTITY konqueror-faq SYSTEM "faq.docbook">
   <!ENTITY konqueror-credits SYSTEM "credits.docbook">
-  <!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+  <!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
   <!ENTITY % addindex "IGNORE">
 ]>
 
-<book lang="&language;"
-> 
+<book lang="&language;"> 
 
 <bookinfo>
-<title
->The &konqueror; Handbook</title>
+<title>The &konqueror; Handbook</title>
 
 <authorgroup>
-<author
->&Pamela.Roberts; &Pamela.Roberts.mail;</author>
+<author>&Pamela.Roberts; &Pamela.Roberts.mail;</author>
 
 <othercredit role="developer">
-<othername
->The KDE Team</othername>
-<contrib
->Developers</contrib>
-</othercredit
-> 
-
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othername>The KDE Team</othername>
+<contrib>Developers</contrib>
+</othercredit> 
+
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
 <copyright>
-<year
->2000</year
-> <year
->2002</year>
-<holder
->Erwan Loisant</holder>
-<holder
->Pamela Roberts</holder>
+<year>2000</year> <year>2002</year>
+<holder>Erwan Loisant</holder>
+<holder>Pamela Roberts</holder>
 </copyright>
 
-<legalnotice
->&FDLNotice;</legalnotice>
+<legalnotice>&FDLNotice;</legalnotice>
 
-<date
->2002-09-22</date>
-<releaseinfo
->3.1</releaseinfo>
+<date>2002-09-22</date>
+<releaseinfo>3.1</releaseinfo>
 
-<abstract
-><para
->&konqueror; is &kde;'s advanced File Manager, Web Browser and Universal Viewing Application.</para>
+<abstract><para>&konqueror; is &kde;'s advanced File Manager, Web Browser and Universal Viewing Application.</para>
 </abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->Konqueror</keyword>
-<keyword
->Kdebase</keyword>
-<keyword
->File Manager</keyword>
-<keyword
->Browser</keyword>
-<keyword
->Viewer</keyword>
+<keyword>KDE</keyword>
+<keyword>Konqueror</keyword>
+<keyword>Kdebase</keyword>
+<keyword>File Manager</keyword>
+<keyword>Browser</keyword>
+<keyword>Viewer</keyword>
 </keywordset>
 
 </bookinfo>
@@ -115,28 +78,16 @@
 
 
 <appendix id="installation">
-<title
->Installation</title>
+<title>Installation</title>
 
-<para
->&konqueror; is part of the tdebase package which an essential part of &kde;.</para>
+<para>&konqueror; is part of the tdebase package which an essential part of &kde;.</para>
 
-<para
->For instructions on acquiring &kde; please see <ulink url="http://www.kde.org"
->http://www.kde.org</ulink
->.</para>
+<para>For instructions on acquiring &kde; please see <ulink url="http://www.kde.org">http://www.kde.org</ulink>.</para>
 
-<para
->For further information about &konqueror; you might like to visit <ulink url="http://www.konqueror.org"
->http://www.konqueror.org</ulink
->.</para>
+<para>For further information about &konqueror; you might like to visit <ulink url="http://www.konqueror.org">http://www.konqueror.org</ulink>.</para>
 
 
-<para
->Conversion to British English: John Knight <email
->anarchist_tomato@herzeleid.net</email
-></para
-> 
+<para>Conversion to British English: John Knight <email>anarchist_tomato@herzeleid.net</email></para> 
 
 </appendix>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/konqueror/introduction.docbook b/tde-i18n-en_GB/docs/tdebase/konqueror/introduction.docbook
index 35fe37f780c..503d36e5b8c 100644
--- a/tde-i18n-en_GB/docs/tdebase/konqueror/introduction.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/konqueror/introduction.docbook
@@ -1,77 +1,22 @@
 <chapter id="introduction">
 <chapterinfo>
 <authorgroup>
-<author
->&Pamela.Roberts;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Pamela.Roberts;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
-<date
->2003-10-20</date
-> <releaseinfo
->3.2</releaseinfo
-> </chapterinfo>
+<date>2003-10-20</date> <releaseinfo>3.2</releaseinfo> </chapterinfo>
 
-<title
->Overview</title>
+<title>Overview</title>
 
-<para
-><emphasis
->&konqueror;</emphasis
-> is an advanced <link linkend="filemanager"
->file manager</link
-> for the K Desktop Environment, providing file management functions ranging from simple cut/copy and paste operations to advanced local and remote network file browsing. Folder contents can be displayed in a variety of text and icon <link linkend="viewmode"
->view modes</link
->, which can include thumbnail preview images of file contents. File and folder properties can easily be examined and changed and applications launched with a simple click of the &LMB;.</para>
+<para><emphasis>&konqueror;</emphasis> is an advanced <link linkend="filemanager">file manager</link> for the K Desktop Environment, providing file management functions ranging from simple cut/copy and paste operations to advanced local and remote network file browsing. Folder contents can be displayed in a variety of text and icon <link linkend="viewmode">view modes</link>, which can include thumbnail preview images of file contents. File and folder properties can easily be examined and changed and applications launched with a simple click of the &LMB;.</para>
 
-<para
-><emphasis
->&konqueror;</emphasis
-> is an <acronym
->HTML</acronym
-> 4.01 compliant <link linkend="browser"
->web browser</link
-> with built in support for JavaScript (ECMA-262), <acronym
->CSS</acronym
-> (Cascading Style Sheets) and bidirectional scripts (such as Arabic and Hebrew). It provides support for the secure running of &Java; applets, &Netscape; plugins for viewing &Flash;, &RealAudio; and &RealVideo; and <acronym
->SSL</acronym
-> for secure communications. Advanced features include automatic &URL; and form completion, the ability to import bookmarks from other browsers and tabbed browsing. </para>
+<para><emphasis>&konqueror;</emphasis> is an <acronym>HTML</acronym> 4.01 compliant <link linkend="browser">web browser</link> with built in support for JavaScript (ECMA-262), <acronym>CSS</acronym> (Cascading Style Sheets) and bidirectional scripts (such as Arabic and Hebrew). It provides support for the secure running of &Java; applets, &Netscape; plugins for viewing &Flash;, &RealAudio; and &RealVideo; and <acronym>SSL</acronym> for secure communications. Advanced features include automatic &URL; and form completion, the ability to import bookmarks from other browsers and tabbed browsing. </para>
 
-<para
-><emphasis
->&konqueror;</emphasis
-> is also an excellent full featured <link linkend="ftp"
->FTP</link
-> client.</para>
+<para><emphasis>&konqueror;</emphasis> is also an excellent full featured <link linkend="ftp">FTP</link> client.</para>
 
-<para
-><emphasis
->&konqueror;</emphasis
-> is a universal viewing application, capable of displaying images and documents without having to launch another application. It does this by embedding components (&kde; Parts) provided by other applications; from &kview; for image viewing, &kdvi; for <acronym
->DVI</acronym
-> viewing, &kghostview; for &PostScript; documents and from the various &koffice; applications for their document types. </para>
+<para><emphasis>&konqueror;</emphasis> is a universal viewing application, capable of displaying images and documents without having to launch another application. It does this by embedding components (&kde; Parts) provided by other applications; from &kview; for image viewing, &kdvi; for <acronym>DVI</acronym> viewing, &kghostview; for &PostScript; documents and from the various &koffice; applications for their document types. </para>
 
-<para
-><emphasis
->&konqueror;</emphasis
-> is a fully customisable application which anyone can <link linkend="config"
->configure</link
-> to suit their own needs, from changing the overall style and the sizes of text and icons to selecting which items appear in the Menubar, changing the number and positions of the toolbars and even defining new shortcut key combinations. Different configuration <link linkend="save-settings"
->profiles</link
-> can be saved for easy recall as needed. </para>
+<para><emphasis>&konqueror;</emphasis> is a fully customisable application which anyone can <link linkend="config">configure</link> to suit their own needs, from changing the overall style and the sizes of text and icons to selecting which items appear in the Menubar, changing the number and positions of the toolbars and even defining new shortcut key combinations. Different configuration <link linkend="save-settings">profiles</link> can be saved for easy recall as needed. </para>
 
 </chapter>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/konqueror/path-complete.docbook b/tde-i18n-en_GB/docs/tdebase/konqueror/path-complete.docbook
index 7d2bd6da42b..cbc4ad5ea27 100644
--- a/tde-i18n-en_GB/docs/tdebase/konqueror/path-complete.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/konqueror/path-complete.docbook
@@ -2,125 +2,45 @@
 
 <chapterinfo>
 <authorgroup>
-<author
->&Pamela.Roberts;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
-</authorgroup
-> <date
->2003-11-05</date
-> <releaseinfo
->3.2</releaseinfo
-> </chapterinfo>
+<author>&Pamela.Roberts;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
+</authorgroup> <date>2003-11-05</date> <releaseinfo>3.2</releaseinfo> </chapterinfo>
 
 
-<title
->Automatic Text Completion</title
-> 
+<title>Automatic Text Completion</title> 
 
-<para
->You can get &konqueror; to help you enter a path or &URL; into the Location Toolbar by enabling one of the <guimenuitem
->Text Completion</guimenuitem
-> features. To do this <mousebutton
->right</mousebutton
-> click on a clear part of the Location Toolbar text entry box and select <guisubmenu
->Text Completion</guisubmenu
-> from the pop up menu. This will let you choose between the following options:</para>
+<para>You can get &konqueror; to help you enter a path or &URL; into the Location Toolbar by enabling one of the <guimenuitem>Text Completion</guimenuitem> features. To do this <mousebutton>right</mousebutton> click on a clear part of the Location Toolbar text entry box and select <guisubmenu>Text Completion</guisubmenu> from the pop up menu. This will let you choose between the following options:</para>
 
 <variablelist>
 
 <varlistentry>
-<term
-><guimenuitem
->None</guimenuitem
-></term>
-<listitem
-><para
->What you get is what you type.</para
-></listitem>
+<term><guimenuitem>None</guimenuitem></term>
+<listitem><para>What you get is what you type.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenuitem
->Manual</guimenuitem
-></term>
-<listitem
-><para
->When you have typed part of a path or &URL;, pressing <keycombo action="simul"
->&Ctrl;<keycap
->E</keycap
-></keycombo
-> will complete the entry if it is possible to do so unambiguously.</para
-></listitem
-> 
+<term><guimenuitem>Manual</guimenuitem></term>
+<listitem><para>When you have typed part of a path or &URL;, pressing <keycombo action="simul">&Ctrl;<keycap>E</keycap></keycombo> will complete the entry if it is possible to do so unambiguously.</para></listitem> 
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenuitem
->Automatic</guimenuitem
-></term>
-<listitem
-><para
->As you type into the Location Toolbar window &konqueror; will automatically extend what you type to complete one possible path or &URL;, highlighting the characters it has added. Continue typing if that is not what you wanted or press &Enter; to accept it.</para
-></listitem>
+<term><guimenuitem>Automatic</guimenuitem></term>
+<listitem><para>As you type into the Location Toolbar window &konqueror; will automatically extend what you type to complete one possible path or &URL;, highlighting the characters it has added. Continue typing if that is not what you wanted or press &Enter; to accept it.</para></listitem>
  </varlistentry>
 
 <varlistentry>
-<term
-><guimenuitem
->Dropdown List</guimenuitem
-></term>
-<listitem
-><para
->A drop-down window will appear as you type, showing the possible matches to what you have typed so far. When the path or &URL; that you want appears in the window double click on it with the &LMB;. You can also use the <keysym
->Down Arrow</keysym
-> and <keysym
->Up Arrow</keysym
-> keys to select it then press &Enter;.</para
-></listitem>
+<term><guimenuitem>Dropdown List</guimenuitem></term>
+<listitem><para>A drop-down window will appear as you type, showing the possible matches to what you have typed so far. When the path or &URL; that you want appears in the window double click on it with the &LMB;. You can also use the <keysym>Down Arrow</keysym> and <keysym>Up Arrow</keysym> keys to select it then press &Enter;.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenuitem
->Short Automatic</guimenuitem
-></term>
-<listitem
-><para
->This is like Automatic mode except that it only extends what you have typed as far as the next <keycap
->/</keycap
-> symbol in the path or &URL;. Press <keycombo action="simul"
->&Ctrl;<keycap
->E</keycap
-></keycombo
-> to accept the suggestion, &Enter; when the complete path or &URL; is shown.</para
-></listitem>
+<term><guimenuitem>Short Automatic</guimenuitem></term>
+<listitem><para>This is like Automatic mode except that it only extends what you have typed as far as the next <keycap>/</keycap> symbol in the path or &URL;. Press <keycombo action="simul">&Ctrl;<keycap>E</keycap></keycombo> to accept the suggestion, &Enter; when the complete path or &URL; is shown.</para></listitem>
 </varlistentry>
 
 </variablelist>
-<para
->You should try out these different modes and pick the one that suits you best.</para>
-<para
->The history of recently visited &URL;s that &konqueror; uses for the Text Completion function can be viewed and edited in the <guilabel
->History </guilabel
-> page of the <link linkend="sidebar"
->Navigation Panel</link
->.</para>
+<para>You should try out these different modes and pick the one that suits you best.</para>
+<para>The history of recently visited &URL;s that &konqueror; uses for the Text Completion function can be viewed and edited in the <guilabel>History </guilabel> page of the <link linkend="sidebar">Navigation Panel</link>.</para>
 
 
 </chapter>
diff --git a/tde-i18n-en_GB/docs/tdebase/konqueror/plugins.docbook b/tde-i18n-en_GB/docs/tdebase/konqueror/plugins.docbook
index abf027f72b7..2ad71f8a8c0 100644
--- a/tde-i18n-en_GB/docs/tdebase/konqueror/plugins.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/konqueror/plugins.docbook
@@ -2,265 +2,86 @@
 
 <chapterinfo>
 <authorgroup>
-<author
->&Pamela.Roberts;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Pamela.Roberts;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
-<date
->2002-09-22</date
-> <releaseinfo
->3.1</releaseinfo
-> </chapterinfo>
+<date>2002-09-22</date> <releaseinfo>3.1</releaseinfo> </chapterinfo>
 
 
-<title
->Plugins</title>
+<title>Plugins</title>
 
 <sect1 id="netscape-plugin">
-<title
->&Netscape; Plugins</title>
+<title>&Netscape; Plugins</title>
 
-<para
->Currently, &konqueror; supports &Netscape; 4.x plugins.</para>
+<para>Currently, &konqueror; supports &Netscape; 4.x plugins.</para>
 
-<para
->Selecting <menuchoice
-><guimenu
->Settings</guimenu
-><guisubmenu
-> Configure Konqueror...</guisubmenu
-><guimenuitem
->Plugins</guimenuitem
-> </menuchoice
-> will give you a dialogue box with two tabbed pages; <guilabel
->Scan</guilabel
-> and <guilabel
->Plugins</guilabel
->.</para>
+<para>Selecting <menuchoice><guimenu>Settings</guimenu><guisubmenu> Configure Konqueror...</guisubmenu><guimenuitem>Plugins</guimenuitem> </menuchoice> will give you a dialogue box with two tabbed pages; <guilabel>Scan</guilabel> and <guilabel>Plugins</guilabel>.</para>
 
-<para
->The <guilabel
->Scan</guilabel
-> page controls how &kde; scans for new &Netscape; plugins, either manually by pressing the <guibutton
->Scan for New Plugins</guibutton
-> button or automatically each time &kde; starts up.</para>
+<para>The <guilabel>Scan</guilabel> page controls how &kde; scans for new &Netscape; plugins, either manually by pressing the <guibutton>Scan for New Plugins</guibutton> button or automatically each time &kde; starts up.</para>
 	
-<para
->The scan is done by looking through the folders listed in the <guilabel
->Scan Folders</guilabel
-> list for <literal role="extension"
->.so</literal
-> files containing plugin code. It examines every such file to find out which <acronym
->MIME</acronym
-> types the plugin supports. It then creates <acronym
->MIME</acronym
-> type definitions for &kde; in the user's <filename class="directory"
-> ~/.trinity/share/mimelnk</filename
-> folder to make other applications aware of them.</para>
+<para>The scan is done by looking through the folders listed in the <guilabel>Scan Folders</guilabel> list for <literal role="extension">.so</literal> files containing plugin code. It examines every such file to find out which <acronym>MIME</acronym> types the plugin supports. It then creates <acronym>MIME</acronym> type definitions for &kde; in the user's <filename class="directory"> ~/.trinity/share/mimelnk</filename> folder to make other applications aware of them.</para>
 
-<para
->The <guilabel
->Plugins</guilabel
-> page shows you the &Netscape; plugins that &kde; has found, and for each plugin it lists the <acronym
->MIME</acronym
-> types and the filename suffixes it uses to recognise them.</para>
+<para>The <guilabel>Plugins</guilabel> page shows you the &Netscape; plugins that &kde; has found, and for each plugin it lists the <acronym>MIME</acronym> types and the filename suffixes it uses to recognise them.</para>
 
-<para
->The dialogue box also contains a checkbox <guilabel
-> Enable plugins globally</guilabel
-> which you can use to enable or disable plugins that can be contained in <acronym
->HTML</acronym
-> pages (these can be considered a security risk).</para>
+<para>The dialogue box also contains a checkbox <guilabel> Enable plugins globally</guilabel> which you can use to enable or disable plugins that can be contained in <acronym>HTML</acronym> pages (these can be considered a security risk).</para>
 
 </sect1>
 
 <sect1 id="konq-plugin">
-<title
->&konqueror; Plugins</title>
+<title>&konqueror; Plugins</title>
 
-<para
->The package tdeaddons contains several useful plugins that interact with &konqueror; in various ways. These are explained briefly below, more detailed information may be obtained by looking through the <guimenuitem
->Konqueror Plugins</guimenuitem
-> section in the &kde; Help Centre.</para>
+<para>The package tdeaddons contains several useful plugins that interact with &konqueror; in various ways. These are explained briefly below, more detailed information may be obtained by looking through the <guimenuitem>Konqueror Plugins</guimenuitem> section in the &kde; Help Centre.</para>
 
 <variablelist>
 
 <varlistentry>
-<term
->Web Page Translation</term>
-<listitem
-><para
->This uses AltaVista's BabelFish site to translate the current <acronym
->HTML</acronym
-> page to whatever language you want (within reason). It can be launched with <menuchoice
-><guimenu
->Tools</guimenu
-><guisubmenu
->Translate Web Page</guisubmenu
-></menuchoice
->.</para
-></listitem>
+<term>Web Page Translation</term>
+<listitem><para>This uses AltaVista's BabelFish site to translate the current <acronym>HTML</acronym> page to whatever language you want (within reason). It can be launched with <menuchoice><guimenu>Tools</guimenu><guisubmenu>Translate Web Page</guisubmenu></menuchoice>.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Folder View Filter</term>
-<listitem
-><para
->This is controlled by <menuchoice
-><guimenu
->Tools</guimenu
-><guisubmenu
->View Filter</guisubmenu
-></menuchoice
-> and allows you to choose which types of item are displayed in a folder.</para
-></listitem>
+<term>Folder View Filter</term>
+<listitem><para>This is controlled by <menuchoice><guimenu>Tools</guimenu><guisubmenu>View Filter</guisubmenu></menuchoice> and allows you to choose which types of item are displayed in a folder.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->DOM Tree Viewer</term>
-<listitem
-><para
->Selecting <menuchoice
-><guimenu
->Tools</guimenu
-><guisubmenu
->Show DOM Tree</guisubmenu
-></menuchoice
-> opens a new window which displays the document object model (DOM) of the current <acronym
->HTML</acronym
-> page.</para
-></listitem>
+<term>DOM Tree Viewer</term>
+<listitem><para>Selecting <menuchoice><guimenu>Tools</guimenu><guisubmenu>Show DOM Tree</guisubmenu></menuchoice> opens a new window which displays the document object model (DOM) of the current <acronym>HTML</acronym> page.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->HTML Validator</term>
-<listitem
-><para
->This is started with <menuchoice
-><guimenu
->Tools</guimenu
-><guisubmenu
->Validate Web Page</guisubmenu
-><guimenuitem
->Validate HTML</guimenuitem
-></menuchoice
->. It uses the W3C HTML validator to validate the current page, very useful when creating web pages.</para
-></listitem>
+<term>HTML Validator</term>
+<listitem><para>This is started with <menuchoice><guimenu>Tools</guimenu><guisubmenu>Validate Web Page</guisubmenu><guimenuitem>Validate HTML</guimenuitem></menuchoice>. It uses the W3C HTML validator to validate the current page, very useful when creating web pages.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->CSS Validator</term>
-<listitem
-><para
->Started with <menuchoice
-><guimenu
->Tools</guimenu
-><guisubmenu
->Validate Web Page</guisubmenu
-><guimenuitem
->Validate CSS</guimenuitem
-></menuchoice
->, it uses the W3C CSS validator to validate the current page's Cascading Style Sheets.</para
-></listitem>
+<term>CSS Validator</term>
+<listitem><para>Started with <menuchoice><guimenu>Tools</guimenu><guisubmenu>Validate Web Page</guisubmenu><guimenuitem>Validate CSS</guimenuitem></menuchoice>, it uses the W3C CSS validator to validate the current page's Cascading Style Sheets.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->HTML Settings</term>
-<listitem
-><para
->Select <menuchoice
-><guimenu
->Tools</guimenu
-><guisubmenu
->HTML Settings</guisubmenu
-></menuchoice
-> to enable or disable a number of HTML settings without going through the <guimenu
->Settings</guimenu
-> dialogue. </para
-></listitem>
+<term>HTML Settings</term>
+<listitem><para>Select <menuchoice><guimenu>Tools</guimenu><guisubmenu>HTML Settings</guisubmenu></menuchoice> to enable or disable a number of HTML settings without going through the <guimenu>Settings</guimenu> dialogue. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Image Gallery</term>
-<listitem
-><para
->In File Manager mode, you can select <menuchoice
-><guimenu
->Tools</guimenu
-><guisubmenu
->Create Image Gallery</guisubmenu
-></menuchoice
-> to create an HTML page with thumbnails of all the images in the current folder. By default the HTML page is called <filename
->images.html</filename
-> and the thumbnails are put into a new <filename
->thumbs</filename
-> folder. </para
-></listitem>
+<term>Image Gallery</term>
+<listitem><para>In File Manager mode, you can select <menuchoice><guimenu>Tools</guimenu><guisubmenu>Create Image Gallery</guisubmenu></menuchoice> to create an HTML page with thumbnails of all the images in the current folder. By default the HTML page is called <filename>images.html</filename> and the thumbnails are put into a new <filename>thumbs</filename> folder. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->User Agent Changer</term>
-<listitem
-><para
->Select <menuchoice
-><guimenu
->Tools</guimenu
-><guisubmenu
->Change Browser Identification</guisubmenu
-></menuchoice
-> to get a menu that allows you to change the User Agent string without going through the <guimenu
->Settings </guimenu
-> dialogue procedure. </para
-></listitem>
+<term>User Agent Changer</term>
+<listitem><para>Select <menuchoice><guimenu>Tools</guimenu><guisubmenu>Change Browser Identification</guisubmenu></menuchoice> to get a menu that allows you to change the User Agent string without going through the <guimenu>Settings </guimenu> dialogue procedure. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Archive Web Page</term>
-<listitem
-><para
->Invoked with <menuchoice
-><guimenu
->Tools</guimenu
-><guisubmenu
-> Archive Web Page</guisubmenu
-></menuchoice
->, this tool creates an archive (<literal role="extension"
->.war</literal
-> ) file containing the web page being viewed including the images. <mousebutton
->Left</mousebutton
-> click on the archive file name to view the saved page. </para
-></listitem>
+<term>Archive Web Page</term>
+<listitem><para>Invoked with <menuchoice><guimenu>Tools</guimenu><guisubmenu> Archive Web Page</guisubmenu></menuchoice>, this tool creates an archive (<literal role="extension">.war</literal> ) file containing the web page being viewed including the images. <mousebutton>Left</mousebutton> click on the archive file name to view the saved page. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Navigation Panel Media Player</term>
-<listitem
-><para
->This is a simple media player, embedded as a tab page in the Navigation Panel. You can drag songs or videos onto this page to play them. </para
-></listitem>
+<term>Navigation Panel Media Player</term>
+<listitem><para>This is a simple media player, embedded as a tab page in the Navigation Panel. You can drag songs or videos onto this page to play them. </para></listitem>
 </varlistentry>
 
 </variablelist>
diff --git a/tde-i18n-en_GB/docs/tdebase/konqueror/save-settings.docbook b/tde-i18n-en_GB/docs/tdebase/konqueror/save-settings.docbook
index 75cee3aa13d..e16730b4ad2 100644
--- a/tde-i18n-en_GB/docs/tdebase/konqueror/save-settings.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/konqueror/save-settings.docbook
@@ -2,153 +2,27 @@
 
 <chapterinfo>
 <authorgroup>
-<author
->&Pamela.Roberts;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Pamela.Roberts;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
-<date
->2003-11-06</date
-> <releaseinfo
->3.2</releaseinfo
-> </chapterinfo>
+<date>2003-11-06</date> <releaseinfo>3.2</releaseinfo> </chapterinfo>
 
-<title
->Saving Settings &amp; Profiles</title>
+<title>Saving Settings &amp; Profiles</title>
 <sect1 id="save-settings-general">
-<title
->General Settings</title>
-<para
->When you close down &konqueror; your current <guimenu
->View</guimenu
-> menu settings (such as the <guimenuitem
->View Mode</guimenuitem
->, <guimenuitem
->Use index.html</guimenuitem
-> and <guimenuitem
->Show Hidden Files </guimenuitem
-> items) are automatically saved as the default options to be used next time &konqueror; is started.</para>
+<title>General Settings</title>
+<para>When you close down &konqueror; your current <guimenu>View</guimenu> menu settings (such as the <guimenuitem>View Mode</guimenuitem>, <guimenuitem>Use index.html</guimenuitem> and <guimenuitem>Show Hidden Files </guimenuitem> items) are automatically saved as the default options to be used next time &konqueror; is started.</para>
 
-<para
->But you can also specify different <guimenu
->View</guimenu
-> menu settings for an individual folder. To do this check the <guimenuitem
->View Properties Saved in Folder</guimenuitem
-> box in the <guimenu
->Settings</guimenu
-> menu, change the <guimenu
->View</guimenu
-> settings to whatever you want then uncheck the <guimenuitem
->View Properties saved in Folder</guimenuitem
-> box. Doing this creates a <filename
->.directory</filename
-> file in that folder to hold the folder <guimenu
->View</guimenu
-> settings. Use the <menuchoice
-><guimenu
-> Settings</guimenu
-><guimenuitem
->Remove Folder Properties</guimenuitem
-> </menuchoice
-> option to remove the folder specific settings (or just delete the <filename
->.directory</filename
-> file).</para>
-<note
-><para
->One nice use of this feature is if you have a folder full of pictures. You can set that particular folder to display thumbnails of the pictures (by choosing <guimenuitem
->Icon View</guimenuitem
-> and <menuchoice
-> <guisubmenu
->Preview</guisubmenu
-><guimenuitem
->Show Previews</guimenuitem
-> </menuchoice
-> from the <guimenu
->View</guimenu
-> menu) when you open it, while not displaying images as thumbnails in other folders.</para
-></note>
+<para>But you can also specify different <guimenu>View</guimenu> menu settings for an individual folder. To do this check the <guimenuitem>View Properties Saved in Folder</guimenuitem> box in the <guimenu>Settings</guimenu> menu, change the <guimenu>View</guimenu> settings to whatever you want then uncheck the <guimenuitem>View Properties saved in Folder</guimenuitem> box. Doing this creates a <filename>.directory</filename> file in that folder to hold the folder <guimenu>View</guimenu> settings. Use the <menuchoice><guimenu> Settings</guimenu><guimenuitem>Remove Folder Properties</guimenuitem> </menuchoice> option to remove the folder specific settings (or just delete the <filename>.directory</filename> file).</para>
+<note><para>One nice use of this feature is if you have a folder full of pictures. You can set that particular folder to display thumbnails of the pictures (by choosing <guimenuitem>Icon View</guimenuitem> and <menuchoice> <guisubmenu>Preview</guisubmenu><guimenuitem>Show Previews</guimenuitem> </menuchoice> from the <guimenu>View</guimenu> menu) when you open it, while not displaying images as thumbnails in other folders.</para></note>
 </sect1>
 
 <sect1 id="save-settings-view-profiles">
-<title
->View Profiles</title>
-<para
->&konqueror; can save a whole set of options as a <quote
->View Profile</quote
->. Some view profiles are part of the standard &konqueror; installation, such as <property
->Web Browsing</property
-> and <property
->File Management</property
->, but you can add your own, too.</para>
+<title>View Profiles</title>
+<para>&konqueror; can save a whole set of options as a <quote>View Profile</quote>. Some view profiles are part of the standard &konqueror; installation, such as <property>Web Browsing</property> and <property>File Management</property>, but you can add your own, too.</para>
 
-<para
->To modify a view profile (say, the <property
->Web Browsing</property
-> profile), load the profile with <menuchoice
-><guimenu
->Settings</guimenu
-><guisubmenu
->Load View Profile</guisubmenu
-><guimenuitem
->Web Browsing</guimenuitem
-> </menuchoice
->, and change the &konqueror; settings to whatever you want. Now select <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Save View Profile "Web Browsing"...</guimenuitem
-></menuchoice
->. In the dialogue which appears, you can change the name of the profile, which will create a new profile with that name, or you can leave the name as it is to modify the current profile. If you select <guilabel
->Save URLs in profile</guilabel
->, the current &URL; will be loaded when you load that view profile. This functions in a similar way to the <quote
->Home Page</quote
-> in many web browsers. If you want &konqueror; to start up with an empty window enter <userinput
->about:blank</userinput
-> into the location bar before saving the profile.</para>
+<para>To modify a view profile (say, the <property>Web Browsing</property> profile), load the profile with <menuchoice><guimenu>Settings</guimenu><guisubmenu>Load View Profile</guisubmenu><guimenuitem>Web Browsing</guimenuitem> </menuchoice>, and change the &konqueror; settings to whatever you want. Now select <menuchoice><guimenu>Settings</guimenu><guimenuitem>Save View Profile "Web Browsing"...</guimenuitem></menuchoice>. In the dialogue which appears, you can change the name of the profile, which will create a new profile with that name, or you can leave the name as it is to modify the current profile. If you select <guilabel>Save URLs in profile</guilabel>, the current &URL; will be loaded when you load that view profile. This functions in a similar way to the <quote>Home Page</quote> in many web browsers. If you want &konqueror; to start up with an empty window enter <userinput>about:blank</userinput> into the location bar before saving the profile.</para>
 
-<note
-><para
->You can create a desktop icon to start &konqueror; with your new profile. First create a desktop icon by dragging the &konqueror; icon from the <guimenu
->K</guimenu
-> menu onto the desktop and selecting <guimenuitem
->Copy Here</guimenuitem
->. Then <mousebutton
->right</mousebutton
-> click on the new icon, select <guimenuitem
->Properties...</guimenuitem
-> and change <guilabel
->Program Name</guilabel
-> in the <guilabel
->Execute</guilabel
-> tab page to <userinput
-><command
->kfmclient</command
-> <option
->openProfile <replaceable
->MyNewProfile</replaceable
-></option
-></userinput
->, <replaceable
->MyNewProfile</replaceable
-> being what you called the new profile. Then in the <guilabel
->General</guilabel
-> tab page change the name to something like <filename
->MyNewProfile</filename
-> and pick a more suitable icon.</para
-></note>
+<note><para>You can create a desktop icon to start &konqueror; with your new profile. First create a desktop icon by dragging the &konqueror; icon from the <guimenu>K</guimenu> menu onto the desktop and selecting <guimenuitem>Copy Here</guimenuitem>. Then <mousebutton>right</mousebutton> click on the new icon, select <guimenuitem>Properties...</guimenuitem> and change <guilabel>Program Name</guilabel> in the <guilabel>Execute</guilabel> tab page to <userinput><command>kfmclient</command> <option>openProfile <replaceable>MyNewProfile</replaceable></option></userinput>, <replaceable>MyNewProfile</replaceable> being what you called the new profile. Then in the <guilabel>General</guilabel> tab page change the name to something like <filename>MyNewProfile</filename> and pick a more suitable icon.</para></note>
 
 </sect1>
 </chapter>
diff --git a/tde-i18n-en_GB/docs/tdebase/konqueror/sidebar.docbook b/tde-i18n-en_GB/docs/tdebase/konqueror/sidebar.docbook
index 1bc3cf4e8dd..351ca096f33 100644
--- a/tde-i18n-en_GB/docs/tdebase/konqueror/sidebar.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/konqueror/sidebar.docbook
@@ -2,315 +2,113 @@
 
 <chapterinfo>
 <authorgroup>
-<author
->&Pamela.Roberts;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Pamela.Roberts;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
-<date
->2002-09-22</date
-> <releaseinfo
->3.1</releaseinfo
-> </chapterinfo>
+<date>2002-09-22</date> <releaseinfo>3.1</releaseinfo> </chapterinfo>
 
-<title
->The Navigation Panel</title>
+<title>The Navigation Panel</title>
 
-<para
->The Navigation Panel appears as a separate view at the left of &konqueror;'s window. It can be invoked with <menuchoice
-><guimenu
->Window </guimenu
-><guimenuitem
->Show Navigation Panel</guimenuitem
-></menuchoice
-> or toggled on and off with the <keycap
->F9</keycap
-> key.</para>
+<para>The Navigation Panel appears as a separate view at the left of &konqueror;'s window. It can be invoked with <menuchoice><guimenu>Window </guimenu><guimenuitem>Show Navigation Panel</guimenuitem></menuchoice> or toggled on and off with the <keycap>F9</keycap> key.</para>
 
 <mediaobject>
-<imageobject
-><imagedata format="PNG" fileref="dirtree.png"/></imageobject>
+<imageobject><imagedata format="PNG" fileref="dirtree.png"/></imageobject>
 <textobject>
-<phrase
->With the Navigation Panel</phrase
->  
+<phrase>With the Navigation Panel</phrase>  
 </textobject>
 </mediaobject>
 
-<para
->It contains a number of tabbed pages; <mousebutton
->left</mousebutton
-> click on a tab's icon to view that page. <mousebutton
->Left</mousebutton
-> clicking on the icon for the visible page will collapse the Navigation Panel so that only the tab icons are visible.</para>
+<para>It contains a number of tabbed pages; <mousebutton>left</mousebutton> click on a tab's icon to view that page. <mousebutton>Left</mousebutton> clicking on the icon for the visible page will collapse the Navigation Panel so that only the tab icons are visible.</para>
 <variablelist>
 
 <varlistentry>
-<term
-><guilabel
->Bookmarks</guilabel
-></term>
-<listitem
-><para
->This page shows a tree view of your Bookmarks. <mousebutton
-> Left</mousebutton
-> click on an item to open it in the main view.</para>
+<term><guilabel>Bookmarks</guilabel></term>
+<listitem><para>This page shows a tree view of your Bookmarks. <mousebutton> Left</mousebutton> click on an item to open it in the main view.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->History</guilabel
-></term>
-<listitem
-><para
->This page shows a tree view of your browsing History. <mousebutton
->Left</mousebutton
-> clicking on an item will open it in the main view, or you can open it in a new &konqueror; window by <mousebutton
->right </mousebutton
-> clicking and selecting <guimenuitem
->New Window</guimenuitem
-> from the pop up menu.</para>
-<para
->You can remove an item from the history by <mousebutton
->right </mousebutton
-> clicking on it and selecting <guimenuitem
->Remove Entry </guimenuitem
->. Selecting <guimenuitem
->Clear History...</guimenuitem
-> will clear out the entire history.</para>
-<para
->The pop up menu you get when you <mousebutton
->right</mousebutton
-> click on any entry in the History page also gives you the option of choosing whether the entire history is sorted by name or by date.</para>
-<para
->Selecting <guimenuitem
->Preferences...</guimenuitem
-> from this pop up menu brings up the <guilabel
->History Sidebar</guilabel
-> control module. This can be used to set the maximum size of your history and set a time after which items are automatically removed. You can also set different fonts for new and old &URL;s. The <guilabel
->Detailed tooltips</guilabel
-> checkbox controls how much information is displayed when you hover the mouse pointer over an item in the history page.</para
-></listitem>
+<term><guilabel>History</guilabel></term>
+<listitem><para>This page shows a tree view of your browsing History. <mousebutton>Left</mousebutton> clicking on an item will open it in the main view, or you can open it in a new &konqueror; window by <mousebutton>right </mousebutton> clicking and selecting <guimenuitem>New Window</guimenuitem> from the pop up menu.</para>
+<para>You can remove an item from the history by <mousebutton>right </mousebutton> clicking on it and selecting <guimenuitem>Remove Entry </guimenuitem>. Selecting <guimenuitem>Clear History...</guimenuitem> will clear out the entire history.</para>
+<para>The pop up menu you get when you <mousebutton>right</mousebutton> click on any entry in the History page also gives you the option of choosing whether the entire history is sorted by name or by date.</para>
+<para>Selecting <guimenuitem>Preferences...</guimenuitem> from this pop up menu brings up the <guilabel>History Sidebar</guilabel> control module. This can be used to set the maximum size of your history and set a time after which items are automatically removed. You can also set different fonts for new and old &URL;s. The <guilabel>Detailed tooltips</guilabel> checkbox controls how much information is displayed when you hover the mouse pointer over an item in the history page.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Home Folder</guilabel
-></term>
-<listitem
-><para
->This page shows a tree view of the subfolders your home folder. Note that <quote
->hidden</quote
-> folders (those with names beginning with a dot) are not shown. <mousebutton
->Left</mousebutton
-> click on an item to open it in the main view, or <mousebutton
->right</mousebutton
-> click to display a pop up menu allowing you to open the subfolder in a new window or as a new tab page of the main view. </para
-></listitem>
+<term><guilabel>Home Folder</guilabel></term>
+<listitem><para>This page shows a tree view of the subfolders your home folder. Note that <quote>hidden</quote> folders (those with names beginning with a dot) are not shown. <mousebutton>Left</mousebutton> click on an item to open it in the main view, or <mousebutton>right</mousebutton> click to display a pop up menu allowing you to open the subfolder in a new window or as a new tab page of the main view. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Network</guilabel
-></term>
-<listitem
-><para
->This page is intended to show a tree view of your important network connections, although local folders can also be included. Again, you can <mousebutton
->left</mousebutton
-> click on an item to open it in the main view or <mousebutton
->right</mousebutton
-> click to bring up a menu with a wider range of possibilities.</para>
-<para
->The folders shown in the <guilabel
->Network</guilabel
-> page are held in the folder <filename class="directory"
-> ~/.trinity/share/apps/konqsidebartng/virtual_folders/remote/</filename
->, and you can make new ones just as you would make any other subfolder. The items within these folders are held as <literal role="extension"
->.desktop</literal
-> files and can be created with &konqueror;'s <menuchoice
-><guisubmenu
->Create New</guisubmenu
-> <guimenuitem
->Link to Location (URL)...</guimenuitem
-></menuchoice
-> option.</para>
+<term><guilabel>Network</guilabel></term>
+<listitem><para>This page is intended to show a tree view of your important network connections, although local folders can also be included. Again, you can <mousebutton>left</mousebutton> click on an item to open it in the main view or <mousebutton>right</mousebutton> click to bring up a menu with a wider range of possibilities.</para>
+<para>The folders shown in the <guilabel>Network</guilabel> page are held in the folder <filename class="directory"> ~/.trinity/share/apps/konqsidebartng/virtual_folders/remote/</filename>, and you can make new ones just as you would make any other subfolder. The items within these folders are held as <literal role="extension">.desktop</literal> files and can be created with &konqueror;'s <menuchoice><guisubmenu>Create New</guisubmenu> <guimenuitem>Link to Location (URL)...</guimenuitem></menuchoice> option.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Root Folder</guilabel
-></term>
-<listitem
-><para
->The Root Folder tree has the path <filename class="directory"
->/</filename
->, and is the base folder of your system's local files. If you expand the <quote
->Root</quote
-> folder you will find another folder called <filename class="directory"
->root</filename
->. This belongs to the system administrator or Super User and is her home folder. You will also find a folder called <filename class="directory"
->home</filename
->, in which you should be able to find your own <quote
->Home</quote
-> folder again.</para>
+<term><guilabel>Root Folder</guilabel></term>
+<listitem><para>The Root Folder tree has the path <filename class="directory">/</filename>, and is the base folder of your system's local files. If you expand the <quote>Root</quote> folder you will find another folder called <filename class="directory">root</filename>. This belongs to the system administrator or Super User and is her home folder. You will also find a folder called <filename class="directory">home</filename>, in which you should be able to find your own <quote>Home</quote> folder again.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Services</guilabel
-></term>
-<listitem
-><para
->This page provides quick access to the following services: </para>
-<para
->The <guilabel
->Audio CD Browser</guilabel
->.</para>
-<para
-><guilabel
->Devices</guilabel
->. This shows your hard disc partitions, floppy and &CD-ROM;. <mousebutton
->Left</mousebutton
-> click on a device or partition name to mount it and display its contents in the main view. A mounted device or partition can be unmounted by <mousebutton
->right </mousebutton
-> clicking on the device name and selecting <guimenuitem
->Unmount </guimenuitem
-> from the pop up menu. </para>
-<para
->The <guilabel
->LAN Browser</guilabel
-> allows you to browse other machines connected to your Local Area Network.</para>
-<para
->The <guilabel
->Print System Browser</guilabel
-> tree gives you quick access to &kde;'s print manager <application
->Kprinter</application
->.</para>
+<term><guilabel>Services</guilabel></term>
+<listitem><para>This page provides quick access to the following services: </para>
+<para>The <guilabel>Audio CD Browser</guilabel>.</para>
+<para><guilabel>Devices</guilabel>. This shows your hard disc partitions, floppy and &CD-ROM;. <mousebutton>Left</mousebutton> click on a device or partition name to mount it and display its contents in the main view. A mounted device or partition can be unmounted by <mousebutton>right </mousebutton> clicking on the device name and selecting <guimenuitem>Unmount </guimenuitem> from the pop up menu. </para>
+<para>The <guilabel>LAN Browser</guilabel> allows you to browse other machines connected to your Local Area Network.</para>
+<para>The <guilabel>Print System Browser</guilabel> tree gives you quick access to &kde;'s print manager <application>Kprinter</application>.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->The Navigation Panel configuration can be changed by <mousebutton
->right </mousebutton
-> clicking on the empty area below the bottom tab icon or by <mousebutton
->left</mousebutton
-> clicking on the <guilabel
->Configuration Button</guilabel
-> icon (the top icon in the previous screenshot, it may not be present in your setup). Doing this brings up a menu with the following options:</para>
+<para>The Navigation Panel configuration can be changed by <mousebutton>right </mousebutton> clicking on the empty area below the bottom tab icon or by <mousebutton>left</mousebutton> clicking on the <guilabel>Configuration Button</guilabel> icon (the top icon in the previous screenshot, it may not be present in your setup). Doing this brings up a menu with the following options:</para>
 <variablelist>
 
 <varlistentry>
-<term
-><guisubmenu
->Add New</guisubmenu
-></term>
-<listitem
-><para
->This option lets you add a new tab page to the Navigation Panel. The new page can contain the <guimenuitem
->Sidebar Media Player </guimenuitem
-> (a <link linkend="konq-plugin"
->&konqueror; Plugin</link
-> feature) or a new <guimenuitem
->Folder</guimenuitem
-> tree view.</para>
+<term><guisubmenu>Add New</guisubmenu></term>
+<listitem><para>This option lets you add a new tab page to the Navigation Panel. The new page can contain the <guimenuitem>Sidebar Media Player </guimenuitem> (a <link linkend="konq-plugin">&konqueror; Plugin</link> feature) or a new <guimenuitem>Folder</guimenuitem> tree view.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenuitem
->Multiple Views</guimenuitem
-></term>
-<listitem
-><para
->Selecting this option splits the Navigation Panel so that two tab pages can be seen at once.</para>
+<term><guimenuitem>Multiple Views</guimenuitem></term>
+<listitem><para>Selecting this option splits the Navigation Panel so that two tab pages can be seen at once.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenuitem
->Show Tabs Left</guimenuitem
-></term>
-<listitem
-><para
->This option lets you choose whether the tab icons are shown at the left or right of the Navigation Panel.</para>
+<term><guimenuitem>Show Tabs Left</guimenuitem></term>
+<listitem><para>This option lets you choose whether the tab icons are shown at the left or right of the Navigation Panel.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenuitem
->Show Configuration Button</guimenuitem
-></term>
-<listitem
-><para
->Use this option to show or hide the <guilabel
->Configuration Button</guilabel
-> icon.</para>
+<term><guimenuitem>Show Configuration Button</guimenuitem></term>
+<listitem><para>Use this option to show or hide the <guilabel>Configuration Button</guilabel> icon.</para>
 </listitem>
 </varlistentry>
 
 </variablelist>
 
-<para
-><mousebutton
->Right</mousebutton
-> clicking on a tab icon brings up a menu with the following options:</para>
+<para><mousebutton>Right</mousebutton> clicking on a tab icon brings up a menu with the following options:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guimenuitem
->Set URL</guimenuitem
-></term>
-<listitem
-><para
->Only available for folder pages, this option lets you change the &URL; (path) of the folder viewed in that page.</para
-></listitem>
+<term><guimenuitem>Set URL</guimenuitem></term>
+<listitem><para>Only available for folder pages, this option lets you change the &URL; (path) of the folder viewed in that page.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenuitem
->Set Icon</guimenuitem
-></term>
-<listitem
-><para
->To change the tab icon.</para
-></listitem>
+<term><guimenuitem>Set Icon</guimenuitem></term>
+<listitem><para>To change the tab icon.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenuitem
->Remove</guimenuitem
-></term>
-<listitem
-><para
->To remove the tab page from the Navigation Panel.</para>
+<term><guimenuitem>Remove</guimenuitem></term>
+<listitem><para>To remove the tab page from the Navigation Panel.</para>
 </listitem>
 </varlistentry>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/konsole/index.docbook b/tde-i18n-en_GB/docs/tdebase/konsole/index.docbook
index a29b1a8b4cd..07e3f0ec371 100644
--- a/tde-i18n-en_GB/docs/tdebase/konsole/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/konsole/index.docbook
@@ -10,512 +10,177 @@
 <book lang="&language;">
 
 <bookinfo>
-<title
->The &konsole; Handbook</title>
+<title>The &konsole; Handbook</title>
 <authorgroup>
-<author
->&Jonathan.Singer; &Jonathan.Singer.mail;</author>
-
-<othercredit role="developer"
->&Waldo.Bastian; &Waldo.Bastian.mail; </othercredit>
-
-<othercredit role="reviewer"
->&Mike.McBride; &Mike.McBride.mail; </othercredit>
-
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Jonathan.Singer; &Jonathan.Singer.mail;</author>
+
+<othercredit role="developer">&Waldo.Bastian; &Waldo.Bastian.mail; </othercredit>
+
+<othercredit role="reviewer">&Mike.McBride; &Mike.McBride.mail; </othercredit>
+
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 
 </authorgroup>
 
 <copyright>
-<year
->2000</year
-><year
->2001</year
-><year
->2002</year>
-<holder
->&Jonathan.Singer;</holder>
+<year>2000</year><year>2001</year><year>2002</year>
+<holder>&Jonathan.Singer;</holder>
 </copyright>
 
-<legalnotice
->&FDLNotice;</legalnotice>
+<legalnotice>&FDLNotice;</legalnotice>
 
-<date
->2002-10-05</date>
-<releaseinfo
->1.20.00</releaseinfo>
+<date>2002-10-05</date>
+<releaseinfo>1.20.00</releaseinfo>
 
-<abstract
-><para
->This document is the user handbook for the &konsole; application.</para>
-<para
->&konsole; is an X terminal emulator for &kde;.</para
-></abstract>
+<abstract><para>This document is the user handbook for the &konsole; application.</para>
+<para>&konsole; is an X terminal emulator for &kde;.</para></abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->konsole</keyword>
-<keyword
->tdebase</keyword>
-<keyword
->command</keyword>
-<keyword
->line</keyword>
+<keyword>KDE</keyword>
+<keyword>konsole</keyword>
+<keyword>tdebase</keyword>
+<keyword>command</keyword>
+<keyword>line</keyword>
 </keywordset>
 
 </bookinfo>
 
 <chapter id="introduction">
-<title
->Introduction to &konsole;</title>
+<title>Introduction to &konsole;</title>
 
 <sect1 id="terminal">
-<title
->What is a terminal?</title
-> <para
->&UNIX; operating systems were originally designed as text-only systems, controlled by keyboard commands -- what is known as a command-line interface (<acronym
->CLI</acronym
->). The &X-Window; and &kde; and other projects have since added the graphical interface you are now using. However, the underlying <acronym
->CLI</acronym
-> system is still there, and is frequently the easiest, fastest and most powerful way to perform many tasks.</para
-> <para
->&konsole; is what is known as an X terminal emulator, often referred to as a terminal or a shell. It gives you the equivalent of an old-fashioned text screen on your desktop, but one which can easily share the screen with your graphical applications. Windows users may be familiar with the <application
-> MS-DOS Prompt</application
-> utility, which has the analogous function of offering a <trademark
->DOS</trademark
-> command-line under &Windows;. (Although the &UNIX; <acronym
->CLI</acronym
->s offer far more power and ease of use than does <acronym
->DOS</acronym
->!)</para>
-
-<para
->Explaining the use of the &UNIX; <acronym
->CLI</acronym
-> is beyond the scope of this document, as it would require a lengthy book. Fortunately, many such books are available in every language in any good bookstore or library. There are also tutorials available on the Internet. Enjoy &kde;, but don't be shy about learning to use the command-line! You will find that even learning just the basics will make your computer use much more efficient and enjoyable.</para>
+<title>What is a terminal?</title> <para>&UNIX; operating systems were originally designed as text-only systems, controlled by keyboard commands -- what is known as a command-line interface (<acronym>CLI</acronym>). The &X-Window; and &kde; and other projects have since added the graphical interface you are now using. However, the underlying <acronym>CLI</acronym> system is still there, and is frequently the easiest, fastest and most powerful way to perform many tasks.</para> <para>&konsole; is what is known as an X terminal emulator, often referred to as a terminal or a shell. It gives you the equivalent of an old-fashioned text screen on your desktop, but one which can easily share the screen with your graphical applications. Windows users may be familiar with the <application> MS-DOS Prompt</application> utility, which has the analogous function of offering a <trademark>DOS</trademark> command-line under &Windows;. (Although the &UNIX; <acronym>CLI</acronym>s offer far more power and ease of use than does <acronym>DOS</acronym>!)</para>
+
+<para>Explaining the use of the &UNIX; <acronym>CLI</acronym> is beyond the scope of this document, as it would require a lengthy book. Fortunately, many such books are available in every language in any good bookstore or library. There are also tutorials available on the Internet. Enjoy &kde;, but don't be shy about learning to use the command-line! You will find that even learning just the basics will make your computer use much more efficient and enjoyable.</para>
 </sect1>
 
 <sect1 id="features">
-<title
->What makes &konsole; special?</title
-> <para
->&konsole;'s advanced features include simple configuration and the ability to use multiple terminal shells in a single window, making for a less cluttered desktop.</para>
+<title>What makes &konsole; special?</title> <para>&konsole;'s advanced features include simple configuration and the ability to use multiple terminal shells in a single window, making for a less cluttered desktop.</para>
 
-<para
->Using &konsole;, a user can open:</para>
+<para>Using &konsole;, a user can open:</para>
 <itemizedlist>
-<listitem
-><para
->&Linux; console sessions</para
-></listitem>
-<listitem
-><para
->Shell sessions</para
-></listitem>
-<listitem
-><para
-><application
->Screen</application
-> sessions</para
-></listitem>
-<listitem
-><para
-><application
->Midnight Commander</application
-> file manager sessions</para
-></listitem>
-<listitem
-><para
-><systemitem class="username"
->Root</systemitem
-> console sessions</para
-></listitem>
-<listitem
-><para
-><systemitem class="username"
->Root</systemitem
-> <application
->Midnight Commander</application
-> sessions</para
-></listitem>
+<listitem><para>&Linux; console sessions</para></listitem>
+<listitem><para>Shell sessions</para></listitem>
+<listitem><para><application>Screen</application> sessions</para></listitem>
+<listitem><para><application>Midnight Commander</application> file manager sessions</para></listitem>
+<listitem><para><systemitem class="username">Root</systemitem> console sessions</para></listitem>
+<listitem><para><systemitem class="username">Root</systemitem> <application>Midnight Commander</application> sessions</para></listitem>
 </itemizedlist>
 
-<para
->These sessions can be renamed to help you keep track of all your shells, or signalled (<errorcode
->STOP</errorcode
->, <errorcode
->CONT</errorcode
->, <errorcode
->HUP</errorcode
->, <errorcode
->INT</errorcode
->, <errorcode
->TERM</errorcode
->, <errorcode
->KILL</errorcode
->).</para>
-
-<para
->For more control over &konsole;, a user can:</para>
+<para>These sessions can be renamed to help you keep track of all your shells, or signalled (<errorcode>STOP</errorcode>, <errorcode>CONT</errorcode>, <errorcode>HUP</errorcode>, <errorcode>INT</errorcode>, <errorcode>TERM</errorcode>, <errorcode>KILL</errorcode>).</para>
+
+<para>For more control over &konsole;, a user can:</para>
 <itemizedlist>
-<listitem
-><para
->hide/show the menubar, toolbar, scrollbar and/or frame</para
-></listitem>
-<listitem
-><para
->select the size of a &konsole; window, fonts, colour schemes, and key mapping</para
-></listitem>
-<listitem
-><para
->change location of the scrollbar or hide the scrollbar</para
-></listitem>
+<listitem><para>hide/show the menubar, toolbar, scrollbar and/or frame</para></listitem>
+<listitem><para>select the size of a &konsole; window, fonts, colour schemes, and key mapping</para></listitem>
+<listitem><para>change location of the scrollbar or hide the scrollbar</para></listitem>
 </itemizedlist>
 
-<para
->All chosen settings can be made the default for forthcoming sessions by saving them. </para>
-
-<para
->For those with a deep interest in the taxonomy of free X terminals, there are two others of this kind: <application
->xterm</application
->, the original, written even before X itself (a month or two), and <application
->xvt</application
->, a lightweight <application
->xterm</application
-> clone, on which most other currently available derivatives (notably <application
->eterm</application
->) are based.</para>
-
-<para
->After a decade, &konsole; is the first rewrite from the ground up. While <application
->xterm</application
-> has definitely been hacked to death (its <filename
->README</filename
-> begins with the words <quote
->Abandon All Hope, Ye Who Enter Here</quote
->), &konsole; offers a fresh start using contemporary technologies and understanding of X.</para>
+<para>All chosen settings can be made the default for forthcoming sessions by saving them. </para>
+
+<para>For those with a deep interest in the taxonomy of free X terminals, there are two others of this kind: <application>xterm</application>, the original, written even before X itself (a month or two), and <application>xvt</application>, a lightweight <application>xterm</application> clone, on which most other currently available derivatives (notably <application>eterm</application>) are based.</para>
+
+<para>After a decade, &konsole; is the first rewrite from the ground up. While <application>xterm</application> has definitely been hacked to death (its <filename>README</filename> begins with the words <quote>Abandon All Hope, Ye Who Enter Here</quote>), &konsole; offers a fresh start using contemporary technologies and understanding of X.</para>
 
 </sect1>
 </chapter>
 
 <chapter id="use-of-konsole">
-<title
->Use of &konsole;</title>
+<title>Use of &konsole;</title>
 
 <sect1 id="startup">
-<title
->Startup</title>
+<title>Startup</title>
 
-<para
->When &konsole; is started, an application (typically a &UNIX; shell) runs in the window. Simply type at the prompt.</para>
+<para>When &konsole; is started, an application (typically a &UNIX; shell) runs in the window. Simply type at the prompt.</para>
 
 <screenshot>
-<screeninfo
->&konsole; Screen</screeninfo>
+<screeninfo>&konsole; Screen</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="konsole.png" format="PNG"/>
 </imageobject>
 <textobject>
-<phrase
->&konsole; Screen</phrase>
+<phrase>&konsole; Screen</phrase>
 </textobject>
 </mediaobject>
 </screenshot>
-<para
->A <quote
->Tip of the Day</quote
-> window may also appear on startup, offering hints on the use of &konsole;. If you do not wish to receive tips, uncheck the <guilabel
->Show tips on startup</guilabel
-> box.</para>
+<para>A <quote>Tip of the Day</quote> window may also appear on startup, offering hints on the use of &konsole;. If you do not wish to receive tips, uncheck the <guilabel>Show tips on startup</guilabel> box.</para>
 </sect1>
 
 <sect1 id="history-option">
-<title
->History</title>
-
-<para
->As lines scroll off the top of the screen, they can be reviewed by moving the scroll bar upwards, scrolling with a mouse wheel or through the use of the <keycombo action="simul"
->&Shift;<keycap
->Page Up</keycap
-></keycombo
-> (to move back a page), <keycombo action="simul"
->&Shift;<keycap
->Page Down</keycap
-></keycombo
-> (to move forward a page), <keycombo action="simul"
->&Shift;<keycap
->Up</keycap
-></keycombo
-> (to move up a line) and <keycombo action="simul"
->&Shift;<keycap
->Down</keycap
-></keycombo
-> (to move down a line) keys (provided the <link linkend="settings-menu"
->History</link
-> option is on).</para>
-
-<para
->In addition, &konsole; mimics the FreeBSD console when <keycap
->scroll lock</keycap
-> is pressed. When scroll lock is on, ordinary in- and output from the shell is suspended, and you can scroll through the history with <keycap
->Page Up</keycap
->, <keycap
->Page down</keycap
->, and <keycap
->Up Arrow</keycap
-> and <keycap
->Down Arrow</keycap
->.</para>
+<title>History</title>
+
+<para>As lines scroll off the top of the screen, they can be reviewed by moving the scroll bar upwards, scrolling with a mouse wheel or through the use of the <keycombo action="simul">&Shift;<keycap>Page Up</keycap></keycombo> (to move back a page), <keycombo action="simul">&Shift;<keycap>Page Down</keycap></keycombo> (to move forward a page), <keycombo action="simul">&Shift;<keycap>Up</keycap></keycombo> (to move up a line) and <keycombo action="simul">&Shift;<keycap>Down</keycap></keycombo> (to move down a line) keys (provided the <link linkend="settings-menu">History</link> option is on).</para>
+
+<para>In addition, &konsole; mimics the FreeBSD console when <keycap>scroll lock</keycap> is pressed. When scroll lock is on, ordinary in- and output from the shell is suspended, and you can scroll through the history with <keycap>Page Up</keycap>, <keycap>Page down</keycap>, and <keycap>Up Arrow</keycap> and <keycap>Down Arrow</keycap>.</para>
 
 </sect1>
 
 <sect1 id="sessions">
-<title
->Sessions</title>
-<para
->If you often have to log into remote machines, or always run a similar set of terminal applications, you can use &konsole;'s <quote
->Session</quote
-> feature along with &kde;'s session management to automate a lot of this for you. Let's take the following example: You often have open an <application
->ssh</application
-> session to the machine <replaceable
->administration</replaceable
-> ready for generic administration tasks. You may have noticed the <guibutton
->New</guibutton
-> button on &konsole;'s tab bar contains a menu if you click and hold on it, and you can choose new session types here. We are going to add new entries to this menu. <orderedlist>
-<listitem
-><para
->Click on the menu entry <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Konsole</guimenuitem
-> </menuchoice
-></para
-></listitem>
-<listitem
-><para
->Choose the <guilabel
->Session</guilabel
-> tab.</para>
-</listitem
-> 
-
-<listitem
-><para
->Fill in the first entry with a name. This is the name that will show in the menu, and will be the default label instead of <guilabel
->Shell</guilabel
-> when you start a session of this type. </para
-></listitem
->  
-
-<listitem
-><para
->Enter a command just as you normally would if you opened a new shell and were going to issue that command. For our first example above, you might type <userinput
-><command
->ssh</command
-> <replaceable
->administration</replaceable
-></userinput
->.</para
-></listitem>
-
-<listitem
-><para
->On the lower part of the panel, configure this session's appearance. You can have a different font, colour scheme, and $<envar
->TERM</envar
-> type for each session.</para
-></listitem>
-
-<listitem
-><para
->Press the <guibutton
->Save Session...</guibutton
-> button. A dialogue will ask you to confirm the filename. </para
-></listitem>
-
-<listitem
-><para
->Press <guibutton
->OK</guibutton
->. </para
-></listitem>
+<title>Sessions</title>
+<para>If you often have to log into remote machines, or always run a similar set of terminal applications, you can use &konsole;'s <quote>Session</quote> feature along with &kde;'s session management to automate a lot of this for you. Let's take the following example: You often have open an <application>ssh</application> session to the machine <replaceable>administration</replaceable> ready for generic administration tasks. You may have noticed the <guibutton>New</guibutton> button on &konsole;'s tab bar contains a menu if you click and hold on it, and you can choose new session types here. We are going to add new entries to this menu. <orderedlist>
+<listitem><para>Click on the menu entry <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Konsole</guimenuitem> </menuchoice></para></listitem>
+<listitem><para>Choose the <guilabel>Session</guilabel> tab.</para>
+</listitem> 
+
+<listitem><para>Fill in the first entry with a name. This is the name that will show in the menu, and will be the default label instead of <guilabel>Shell</guilabel> when you start a session of this type. </para></listitem>  
+
+<listitem><para>Enter a command just as you normally would if you opened a new shell and were going to issue that command. For our first example above, you might type <userinput><command>ssh</command> <replaceable>administration</replaceable></userinput>.</para></listitem>
+
+<listitem><para>On the lower part of the panel, configure this session's appearance. You can have a different font, colour scheme, and $<envar>TERM</envar> type for each session.</para></listitem>
+
+<listitem><para>Press the <guibutton>Save Session...</guibutton> button. A dialogue will ask you to confirm the filename. </para></listitem>
+
+<listitem><para>Press <guibutton>OK</guibutton>. </para></listitem>
 
 </orderedlist>
 </para>
-<para
->You should now be able to press and hold the <guibutton
->New</guibutton
-> button on the tab bar, and select your new session type from the list. A new shell session will open within the &konsole; window, with the result of your executed command. In our example, you will be at an <application
->ssh</application
-> passphrase prompt, and when you provide your passphrase, you will be logged into the remote machine. <footnote id="use-ssh-agent"
-><para
->You can avoid this step also, by using ssh-agent, but that is a topic for another goodie.</para
-></footnote
-> Perhaps you want to remotely tail your <acronym
->http</acronym
-> error logs on a webserver, you could use a commandline something like <userinput
-><command
->ssh</command
-> <option
->-f</option
-> <replaceable
->webserver</replaceable
-> <command
->tail</command
-> <option
->-f</option
-> <filename
-><replaceable
->/var/log/httpd-error.log</replaceable
-></filename
-></userinput
->. </para>
-<para
->You can use this to execute local commands as well. Try creating a session where the command is <userinput
-><command
->tail</command
-> <option
->-f</option
-> <filename
-><replaceable
->/var/log/messages</replaceable
-></filename
-></userinput
->. In this case, exiting the running application will close the shell session as well. </para>
-<para
->One really nice use of this feature is if you find you always have the same set of open sessions, &kde; can open them all for you automatically when you start a new &kde; session. Simply have them open as you like when you exit &kde;, and they will be saved with your &kde; session, and restored just like any other application when you restart &kde;. </para>
+<para>You should now be able to press and hold the <guibutton>New</guibutton> button on the tab bar, and select your new session type from the list. A new shell session will open within the &konsole; window, with the result of your executed command. In our example, you will be at an <application>ssh</application> passphrase prompt, and when you provide your passphrase, you will be logged into the remote machine. <footnote id="use-ssh-agent"><para>You can avoid this step also, by using ssh-agent, but that is a topic for another goodie.</para></footnote> Perhaps you want to remotely tail your <acronym>http</acronym> error logs on a webserver, you could use a commandline something like <userinput><command>ssh</command> <option>-f</option> <replaceable>webserver</replaceable> <command>tail</command> <option>-f</option> <filename><replaceable>/var/log/httpd-error.log</replaceable></filename></userinput>. </para>
+<para>You can use this to execute local commands as well. Try creating a session where the command is <userinput><command>tail</command> <option>-f</option> <filename><replaceable>/var/log/messages</replaceable></filename></userinput>. In this case, exiting the running application will close the shell session as well. </para>
+<para>One really nice use of this feature is if you find you always have the same set of open sessions, &kde; can open them all for you automatically when you start a new &kde; session. Simply have them open as you like when you exit &kde;, and they will be saved with your &kde; session, and restored just like any other application when you restart &kde;. </para>
 
 </sect1>
 
 <sect1 id="mousebuttons">
 
-<title
->Mouse Buttons</title>
+<title>Mouse Buttons</title>
 
 <variablelist>
 
 <varlistentry>
-<term
-><mousebutton
->Left</mousebutton
-></term>
+<term><mousebutton>Left</mousebutton></term>
 
-<listitem
-><para
->Clicking the <mousebutton
->left</mousebutton
-> button is passed as an event to the application running in the emulation, if it is mouse-aware. If a program will react on mouse clicks, &konsole; indicates this by showing an arrow cursor. If not, an I-beam (bar) cursor is shown.</para>
+<listitem><para>Clicking the <mousebutton>left</mousebutton> button is passed as an event to the application running in the emulation, if it is mouse-aware. If a program will react on mouse clicks, &konsole; indicates this by showing an arrow cursor. If not, an I-beam (bar) cursor is shown.</para>
 
-<para
->Holding the <mousebutton
->left</mousebutton
-> button down and dragging the mouse over the screen with a mouse-unaware application running will mark a region of the text. While dragging, the marked text is displayed reversed for visual feedback. Select <guimenuitem
->Copy</guimenuitem
-> from the <guimenu
->Edit</guimenu
-> menu to copy the marked text to the clipboard for further use within &konsole; or another application. The selected text can also be dragged and dropped into compatible applications. Click on the selected text and drag it to the desired location. (Depending on your &kde; settings, you may need to hold the &Ctrl; key while dragging.</para>
+<para>Holding the <mousebutton>left</mousebutton> button down and dragging the mouse over the screen with a mouse-unaware application running will mark a region of the text. While dragging, the marked text is displayed reversed for visual feedback. Select <guimenuitem>Copy</guimenuitem> from the <guimenu>Edit</guimenu> menu to copy the marked text to the clipboard for further use within &konsole; or another application. The selected text can also be dragged and dropped into compatible applications. Click on the selected text and drag it to the desired location. (Depending on your &kde; settings, you may need to hold the &Ctrl; key while dragging.</para>
 
-<para
->Normally, new-line characters are inserted at the end of each line selected. This is best for cut and paste of source code, or the output of a particular command. For ordinary text, the line breaks are often not important. One might prefer, however, for the text to be a stream of characters that will be automatically re-formatted when pasted into another application. To select in text-stream mode, hold down the &Ctrl; key while selecting normally.</para>
+<para>Normally, new-line characters are inserted at the end of each line selected. This is best for cut and paste of source code, or the output of a particular command. For ordinary text, the line breaks are often not important. One might prefer, however, for the text to be a stream of characters that will be automatically re-formatted when pasted into another application. To select in text-stream mode, hold down the &Ctrl; key while selecting normally.</para>
 
-<para
->Double-click with the <mousebutton
->left</mousebutton
-> button to select a word; triple-click to select an entire line.</para>
+<para>Double-click with the <mousebutton>left</mousebutton> button to select a word; triple-click to select an entire line.</para>
 
-<para
->If the upper or lower edge of the text area is touched while marking, &konsole; scrolls up or down, eventually exposing text within the history buffer. The scrolling stops when the mouse stops moving.</para>
+<para>If the upper or lower edge of the text area is touched while marking, &konsole; scrolls up or down, eventually exposing text within the history buffer. The scrolling stops when the mouse stops moving.</para>
 
-<para
->After the mouse is released, &konsole; attempts to keep the text in the clipboard visible by holding the marked area reversed. The marked area reverts back to normal as soon as the contents of the clipboard change, the text within the marked area is altered or the <mousebutton
->left</mousebutton
-> mouse button is clicked.</para>
+<para>After the mouse is released, &konsole; attempts to keep the text in the clipboard visible by holding the marked area reversed. The marked area reverts back to normal as soon as the contents of the clipboard change, the text within the marked area is altered or the <mousebutton>left</mousebutton> mouse button is clicked.</para>
 
-<para
->To mark text on a mouse-aware application (Midnight Commander, for example) the &Shift; key has to be pressed when clicking.</para>
+<para>To mark text on a mouse-aware application (Midnight Commander, for example) the &Shift; key has to be pressed when clicking.</para>
 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><mousebutton
->Middle</mousebutton
-></term>
+<term><mousebutton>Middle</mousebutton></term>
 
-<listitem
-><para
->Pressing the <mousebutton
->middle</mousebutton
-> button pastes text currently in the clipboard. Holding down the &Ctrl; key as you press the <mousebutton
->middle</mousebutton
-> button pastes the text and sends it to &konsole;.</para>
+<listitem><para>Pressing the <mousebutton>middle</mousebutton> button pastes text currently in the clipboard. Holding down the &Ctrl; key as you press the <mousebutton>middle</mousebutton> button pastes the text and sends it to &konsole;.</para>
 
-<note
-><para
->If you have a mouse with only two buttons, pressing both the <mousebutton
->left</mousebutton
-> and <mousebutton
->right</mousebutton
-> buttons together emulates the <mousebutton
->middle</mousebutton
-> button of a three button mouse.</para
-></note>
+<note><para>If you have a mouse with only two buttons, pressing both the <mousebutton>left</mousebutton> and <mousebutton>right</mousebutton> buttons together emulates the <mousebutton>middle</mousebutton> button of a three button mouse.</para></note>
 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><mousebutton
->Right</mousebutton
-></term>
+<term><mousebutton>Right</mousebutton></term>
 <listitem>
-<para
->The <mousebutton
->right</mousebutton
-> button brings up a menu with the <guimenuitem
->Show Menubar</guimenuitem
->, <guimenuitem
->Copy</guimenuitem
->, <guimenuitem
->Paste</guimenuitem
->, <guimenuitem
->Send Signal</guimenuitem
->, <guimenuitem
->Detach (or Attach) Session</guimenuitem
->, <guimenuitem
->Rename Session...</guimenuitem
->, <guimenuitem
->Bookmarks</guimenuitem
-> <guimenuitem
->Settings</guimenuitem
-> and <guimenuitem
->Close Session</guimenuitem
-> menu items. The <keycombo action="simul"
->&Ctrl; <mousebutton
->right</mousebutton
-></keycombo
-> button brings up the <guimenu
->Session</guimenu
-> menu. </para>
+<para>The <mousebutton>right</mousebutton> button brings up a menu with the <guimenuitem>Show Menubar</guimenuitem>, <guimenuitem>Copy</guimenuitem>, <guimenuitem>Paste</guimenuitem>, <guimenuitem>Send Signal</guimenuitem>, <guimenuitem>Detach (or Attach) Session</guimenuitem>, <guimenuitem>Rename Session...</guimenuitem>, <guimenuitem>Bookmarks</guimenuitem> <guimenuitem>Settings</guimenuitem> and <guimenuitem>Close Session</guimenuitem> menu items. The <keycombo action="simul">&Ctrl; <mousebutton>right</mousebutton></keycombo> button brings up the <guimenu>Session</guimenu> menu. </para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -523,735 +188,237 @@
 </sect1>
 
 <sect1 id="menubar">
-<title
->Menu Bar</title>
-
-<para
->The menubar is at the top of the &konsole; window. It can be hidden and restored by toggling <guimenuitem
->Show Menubar</guimenuitem
-> in the <guimenu
->Settings</guimenu
-> menu. When the menubar is hidden, <guimenuitem
->Show Menubar</guimenuitem
-> can be reached by <mousebutton
->right</mousebutton
-> clicking in the window or by <keycombo action="simul"
->&Alt;&Ctrl;<keycap
->M</keycap
-> </keycombo
->.</para>
+<title>Menu Bar</title>
+
+<para>The menubar is at the top of the &konsole; window. It can be hidden and restored by toggling <guimenuitem>Show Menubar</guimenuitem> in the <guimenu>Settings</guimenu> menu. When the menubar is hidden, <guimenuitem>Show Menubar</guimenuitem> can be reached by <mousebutton>right</mousebutton> clicking in the window or by <keycombo action="simul">&Alt;&Ctrl;<keycap>M</keycap> </keycombo>.</para>
 
 <sect2 id="session-menu">
-<title
-><guimenu
->Session</guimenu
-> Menu</title>
+<title><guimenu>Session</guimenu> Menu</title>
 
 <variablelist>
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Session</guimenu
-><guimenuitem
->New Shell</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Open a new session</action
-> with a terminal shell. <keycombo action="simul"
->&Alt;&Ctrl;<keycap
->N</keycap
-> </keycombo
-> can also be used, as described in more detail below. </para
-></listitem
-></varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Session</guimenu
-><guimenuitem
->New Linux Console</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Open a new session emulating a text-only &Linux; system.</action
-></para>
-<note
-><para
->See the file <filename
->README.linux.console</filename
-> in the &konsole; source package for detailed information on how the &Linux; console differs from a typical &UNIX; console. If this doesn't mean anything to you, you almost certainly don't need to worry about it.</para
-></note>
+<term><menuchoice><guimenu>Session</guimenu><guimenuitem>New Shell</guimenuitem></menuchoice></term>
+<listitem><para><action>Open a new session</action> with a terminal shell. <keycombo action="simul">&Alt;&Ctrl;<keycap>N</keycap> </keycombo> can also be used, as described in more detail below. </para></listitem></varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Session</guimenu><guimenuitem>New Linux Console</guimenuitem></menuchoice></term>
+<listitem><para><action>Open a new session emulating a text-only &Linux; system.</action></para>
+<note><para>See the file <filename>README.linux.console</filename> in the &konsole; source package for detailed information on how the &Linux; console differs from a typical &UNIX; console. If this doesn't mean anything to you, you almost certainly don't need to worry about it.</para></note>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Session</guimenu
-><guimenuitem
->New Midnight Commander</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Open a new session</action
-> with the <application
->Midnight Commander</application
-> file browser.</para
-></listitem>
+<term><menuchoice><guimenu>Session</guimenu><guimenuitem>New Midnight Commander</guimenuitem></menuchoice></term>
+<listitem><para><action>Open a new session</action> with the <application>Midnight Commander</application> file browser.</para></listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Session</guimenu
-> <guimenuitem
->New Root Console</guimenuitem
-></menuchoice>
+<menuchoice><guimenu>Session</guimenu> <guimenuitem>New Root Console</guimenuitem></menuchoice>
 </term>
 <listitem>
-<para
-><action
->Open a new session with a terminal shell</action
->, as the <systemitem class="username"
->root</systemitem
-> user. </para>
-
-<para
->After being prompted for the <systemitem class="username"
->root</systemitem
-> password, the <prompt
->#</prompt
-> prompt appears, indicating that the user is working with <systemitem class="username"
->root</systemitem
-> privileges. This is frequently necessary for installing new software and other system maintenance, but care should be taken to avoid accidental damage. </para>
+<para><action>Open a new session with a terminal shell</action>, as the <systemitem class="username">root</systemitem> user. </para>
+
+<para>After being prompted for the <systemitem class="username">root</systemitem> password, the <prompt>#</prompt> prompt appears, indicating that the user is working with <systemitem class="username">root</systemitem> privileges. This is frequently necessary for installing new software and other system maintenance, but care should be taken to avoid accidental damage. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Session</guimenu
-> <guimenuitem
->New Root Midnight Commander</guimenuitem
-></menuchoice>
+<menuchoice><guimenu>Session</guimenu> <guimenuitem>New Root Midnight Commander</guimenuitem></menuchoice>
 </term>
 <listitem>
-<para
-><action
->Open a new session</action
-> with the <application
->Midnight Commander</application
-> file browser, as the <systemitem class="username"
->root</systemitem
-> user. </para>
-<para
->After being prompted for the <systemitem class="username"
->root</systemitem
-> password, the <prompt
->#</prompt
-> prompt appears under the browser window, indicating that the user is working with <systemitem class="username"
->root</systemitem
-> privileges. Again, working as <systemitem class="username"
->root</systemitem
-> is frequently necessary but care should be taken to avoid accidental damage. </para>
+<para><action>Open a new session</action> with the <application>Midnight Commander</application> file browser, as the <systemitem class="username">root</systemitem> user. </para>
+<para>After being prompted for the <systemitem class="username">root</systemitem> password, the <prompt>#</prompt> prompt appears under the browser window, indicating that the user is working with <systemitem class="username">root</systemitem> privileges. Again, working as <systemitem class="username">root</systemitem> is frequently necessary but care should be taken to avoid accidental damage. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Session</guimenu
-><guimenuitem
->New Screen Session</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Open a new session</action
-> with the <application
->Screen</application
-> virtual terminal manager. See <userinput
-><command
->man</command
-> <option
->screen</option
-> </userinput
->for more information. </para
-></listitem
-></varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Session</guimenu
-> <guimenuitem
->New Shell at Bookmark</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Start</action
-> a new terminal shell, in a folder chosen from the bookmark list.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Session</guimenu
-> <guimenuitem
->Close Session</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Close</action
-> the current session. </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Session</guimenu
-> <guimenuitem
->Quit</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Quit</action
-> &konsole;, closing all sessions and any applications launched from them.</para
-></listitem>
+<term><menuchoice><guimenu>Session</guimenu><guimenuitem>New Screen Session</guimenuitem></menuchoice></term>
+<listitem><para><action>Open a new session</action> with the <application>Screen</application> virtual terminal manager. See <userinput><command>man</command> <option>screen</option> </userinput>for more information. </para></listitem></varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Session</guimenu> <guimenuitem>New Shell at Bookmark</guimenuitem></menuchoice></term>
+<listitem><para><action>Start</action> a new terminal shell, in a folder chosen from the bookmark list.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Session</guimenu> <guimenuitem>Close Session</guimenuitem></menuchoice></term>
+<listitem><para><action>Close</action> the current session. </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Session</guimenu> <guimenuitem>Quit</guimenuitem></menuchoice></term>
+<listitem><para><action>Quit</action> &konsole;, closing all sessions and any applications launched from them.</para></listitem>
 </varlistentry>
 
 </variablelist>
 
-<para
->You can also open a new session with a key shortcut. By default, <keycombo action="simul"
->&Alt;&Ctrl;<keycap
->N</keycap
-> </keycombo
-> is used. You can also define your own key shortcuts through the <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Shortcuts...</guimenuitem
-></menuchoice
-> menu command.</para>
-
-<para
->The files with a <literal role="extension"
->*.keytab</literal
-> extension in <filename class="directory"
->$<envar
->TDEDIR</envar
->/share/apps/konsole</filename
-> also define keyboard shortcuts. Use the <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Keyboard</guimenuitem
-></menuchoice
-> menu command to choose a keytab file. The file <filename
->README.KeyTab</filename
-> contains more information on defining shortcuts. </para>
-
-<para
->The list of available sessions may differ from those listed here. &konsole; detects your installed programs and customises the list to reflect the available options.</para>
-
-<para
->Finally, note that the session types can be modified, and new types created, by using the configuration dialogue, reached from the <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Konsole...</guimenuitem
-></menuchoice
-> menu entry.</para>
+<para>You can also open a new session with a key shortcut. By default, <keycombo action="simul">&Alt;&Ctrl;<keycap>N</keycap> </keycombo> is used. You can also define your own key shortcuts through the <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Shortcuts...</guimenuitem></menuchoice> menu command.</para>
+
+<para>The files with a <literal role="extension">*.keytab</literal> extension in <filename class="directory">$<envar>TDEDIR</envar>/share/apps/konsole</filename> also define keyboard shortcuts. Use the <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Keyboard</guimenuitem></menuchoice> menu command to choose a keytab file. The file <filename>README.KeyTab</filename> contains more information on defining shortcuts. </para>
+
+<para>The list of available sessions may differ from those listed here. &konsole; detects your installed programs and customises the list to reflect the available options.</para>
+
+<para>Finally, note that the session types can be modified, and new types created, by using the configuration dialogue, reached from the <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Konsole...</guimenuitem></menuchoice> menu entry.</para>
 
 </sect2>
 <sect2 id="edit-menu">
-<title
-><guimenu
->Edit</guimenu
-> Menu</title>
+<title><guimenu>Edit</guimenu> Menu</title>
 <variablelist>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Edit</guimenu
-><guimenuitem
->Copy </guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Copy the selected text to the clipboard.</action
-></para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Edit</guimenu
-><guimenuitem
->Paste </guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Paste text from the clipboard at the cursor location.</action
-></para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Edit</guimenu
-> <guisubmenu
->Send Signal</guisubmenu
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Send Signal - Send the specified signal to the shell process, or other process, that was launched when the new session was started.</action
-></para
-><para
->Currently available signals are:</para>
+<term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Copy </guimenuitem></menuchoice></term>
+<listitem><para><action>Copy the selected text to the clipboard.</action></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Paste </guimenuitem></menuchoice></term>
+<listitem><para><action>Paste text from the clipboard at the cursor location.</action></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Edit</guimenu> <guisubmenu>Send Signal</guisubmenu></menuchoice></term>
+<listitem><para><action>Send Signal - Send the specified signal to the shell process, or other process, that was launched when the new session was started.</action></para><para>Currently available signals are:</para>
 
 <informaltable>
 <tgroup cols="2">
 <tbody>
 <row>
-<entry
-><errorcode
->STOP</errorcode
-></entry>
-<entry
->to stop process</entry>
+<entry><errorcode>STOP</errorcode></entry>
+<entry>to stop process</entry>
 </row>
 <row>
-<entry
-><errorcode
->CONT</errorcode
-></entry>
-<entry
->continue if stopped</entry>
+<entry><errorcode>CONT</errorcode></entry>
+<entry>continue if stopped</entry>
 </row>
 <row>
-<entry
-><errorcode
->HUP</errorcode
-></entry>
-<entry
->hangup detected on controlling terminal, or death of controlling process</entry>
+<entry><errorcode>HUP</errorcode></entry>
+<entry>hangup detected on controlling terminal, or death of controlling process</entry>
 </row>
 <row>
-<entry
-><errorcode
->INT</errorcode
-></entry>
-<entry
->interrupt from keyboard</entry>
+<entry><errorcode>INT</errorcode></entry>
+<entry>interrupt from keyboard</entry>
 </row>
 <row>
-<entry
-><errorcode
->TERM</errorcode
-></entry>
-<entry
->termination signal</entry>
+<entry><errorcode>TERM</errorcode></entry>
+<entry>termination signal</entry>
 </row>
 <row>
-<entry
-><errorcode
->KILL</errorcode
-></entry>
-<entry
->kill signal</entry>
+<entry><errorcode>KILL</errorcode></entry>
+<entry>kill signal</entry>
 </row>
 <row>
-<entry
-><errorcode
->USR1</errorcode
-></entry>
-<entry
->user signal 1</entry>
+<entry><errorcode>USR1</errorcode></entry>
+<entry>user signal 1</entry>
 </row>
 <row>
-<entry
-><errorcode
->USR2</errorcode
-></entry>
-<entry
->user signal 2</entry>
+<entry><errorcode>USR2</errorcode></entry>
+<entry>user signal 2</entry>
 </row>
 </tbody>
 </tgroup>
 </informaltable>
 
-<para
->Refer to your system manual pages for further details by giving the command <userinput
-><command
->man</command
-> <option
->7 signal</option
-></userinput
->.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Edit</guimenu
-><guimenuitem
->Clear Terminal</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Clear all text from the session window.</action
->.</para
-></listitem>
-</varlistentry>
-
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Edit</guimenu
-><guimenuitem
->Reset and Clear Terminal</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Start a new session in the window.</action
->.</para
-></listitem>
-</varlistentry>
-
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Edit</guimenu
-><guimenuitem
->Find in History...</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Find a word or string of text</action
-> in the current history. Options allow case sensitive or backwards searches, and the use of regular expressions in searches. Press the <guibutton
->Edit</guibutton
-> button to use the &kde; graphical editor to create a regular expression.</para
-></listitem>
-</varlistentry>
-
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Edit</guimenu
-><guimenuitem
->Find Next</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Move to the next instance of the text for which you are searching.</action>
-</para
-></listitem>
-</varlistentry>
-
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Edit</guimenu
-><guimenuitem
->Find Previous</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Move to the previous instance of the text for which you are searching.</action>
-</para
-></listitem>
-</varlistentry>
-
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Edit</guimenu
-><guimenuitem
->Save History As...</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Save the current history</action
-> as a text file.</para
-></listitem>
-</varlistentry>
-
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Edit</guimenu
-><guimenuitem
->Clear History </guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Clear the history for the current session.</action
-></para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Edit</guimenu
-><guimenuitem
->Clear All Histories </guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Clear the history for all sessions.</action>
-</para
-></listitem>
+<para>Refer to your system manual pages for further details by giving the command <userinput><command>man</command> <option>7 signal</option></userinput>.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Clear Terminal</guimenuitem></menuchoice></term>
+<listitem><para><action>Clear all text from the session window.</action>.</para></listitem>
+</varlistentry>
+
+
+<varlistentry>
+<term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Reset and Clear Terminal</guimenuitem></menuchoice></term>
+<listitem><para><action>Start a new session in the window.</action>.</para></listitem>
+</varlistentry>
+
+
+<varlistentry>
+<term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Find in History...</guimenuitem></menuchoice></term>
+<listitem><para><action>Find a word or string of text</action> in the current history. Options allow case sensitive or backwards searches, and the use of regular expressions in searches. Press the <guibutton>Edit</guibutton> button to use the &kde; graphical editor to create a regular expression.</para></listitem>
+</varlistentry>
+
+
+<varlistentry>
+<term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Find Next</guimenuitem></menuchoice></term>
+<listitem><para><action>Move to the next instance of the text for which you are searching.</action>
+</para></listitem>
+</varlistentry>
+
+
+<varlistentry>
+<term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Find Previous</guimenuitem></menuchoice></term>
+<listitem><para><action>Move to the previous instance of the text for which you are searching.</action>
+</para></listitem>
+</varlistentry>
+
+
+<varlistentry>
+<term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Save History As...</guimenuitem></menuchoice></term>
+<listitem><para><action>Save the current history</action> as a text file.</para></listitem>
+</varlistentry>
+
+
+<varlistentry>
+<term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Clear History </guimenuitem></menuchoice></term>
+<listitem><para><action>Clear the history for the current session.</action></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Clear All Histories </guimenuitem></menuchoice></term>
+<listitem><para><action>Clear the history for all sessions.</action>
+</para></listitem>
 </varlistentry>
 
 </variablelist>
 </sect2>
 
 <sect2 id="view-menu">
-<title
-><guimenu
->View</guimenu
-> Menu</title>
+<title><guimenu>View</guimenu> Menu</title>
 <variablelist>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Detach Session</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Open the current session in a separate window.</action
-> The name of the session is displayed on the titlebar of the new window. Close the new window to restore the session to its original place, or <mousebutton
->right</mousebutton
->-click on the new window and select <guimenuitem
->Attach Session</guimenuitem
->. Note that if the main window is closed, any detached sessions will be closed with it. </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Rename Session...</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Open a dialogue box allowing you to change the name of the current session.</action
-> The name is displayed on the session tab. <keycombo action="simul"
->&Alt;&Ctrl;<keycap
->S</keycap
-> </keycombo
-> can also be used.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Monitor for Activity</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Flag the current session so it will show an alert if activity occurs.</action
-> An icon of a lit light bulb will appear in the session's tab. Use this to alert you if something happens while you are working in another session. The time before an alert can be modified in the &konsole; preferences.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Monitor for Silence</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Flag the current session so it will show an alert if no activity occurs for 10 seconds.</action
-> An icon of a dark light bulb will appear in the session's tab. Use this to alert you if a task stops while you are working in another session. The time before an alert can be modified in the &konsole; preferences.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Send Input to All Sessions</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Flag the current session so any commands entered into it will be sent to all sessions.</action
-> The session will have a small icon in its tab to remind you to be careful of what you enter! <userinput
-><command
->rm </command
-><parameter
->-rf *</parameter
-></userinput
->, for instance, is probably not a good idea.</para
-></listitem>
-</varlistentry>
-
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Move Session Left</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Move the tab of the current session one tab to the left.</action
-></para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Move Session Right</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Move the tab of the current session one tab to the right.</action
-></para>
-<para
-><keycombo action="simul"
->&Shift; <keycap
->Left</keycap
-></keycombo
-> and <keycombo action="simul"
->&Shift; <keycap
->Right</keycap
-></keycombo
-> can be also be used to move between sessions.</para
-></listitem
-></varlistentry>
-
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Session icons...</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
->At the bottom of the menu is a list of the available sessions. Selecting one makes that session active.</para
-><para
->You can also use the <keycombo action="simul"
->&Shift;<keycap
->Left</keycap
-></keycombo
->/<keycombo action="simul"
->&Shift;<keycap
->Right</keycap
-></keycombo
-> keys to cycle through the available sessions.</para>
+<term><menuchoice><guimenu>View</guimenu><guimenuitem>Detach Session</guimenuitem></menuchoice></term>
+<listitem><para><action>Open the current session in a separate window.</action> The name of the session is displayed on the titlebar of the new window. Close the new window to restore the session to its original place, or <mousebutton>right</mousebutton>-click on the new window and select <guimenuitem>Attach Session</guimenuitem>. Note that if the main window is closed, any detached sessions will be closed with it. </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>View</guimenu><guimenuitem>Rename Session...</guimenuitem></menuchoice></term>
+<listitem><para><action>Open a dialogue box allowing you to change the name of the current session.</action> The name is displayed on the session tab. <keycombo action="simul">&Alt;&Ctrl;<keycap>S</keycap> </keycombo> can also be used.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>View</guimenu><guimenuitem>Monitor for Activity</guimenuitem></menuchoice></term>
+<listitem><para><action>Flag the current session so it will show an alert if activity occurs.</action> An icon of a lit light bulb will appear in the session's tab. Use this to alert you if something happens while you are working in another session. The time before an alert can be modified in the &konsole; preferences.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>View</guimenu><guimenuitem>Monitor for Silence</guimenuitem></menuchoice></term>
+<listitem><para><action>Flag the current session so it will show an alert if no activity occurs for 10 seconds.</action> An icon of a dark light bulb will appear in the session's tab. Use this to alert you if a task stops while you are working in another session. The time before an alert can be modified in the &konsole; preferences.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>View</guimenu><guimenuitem>Send Input to All Sessions</guimenuitem></menuchoice></term>
+<listitem><para><action>Flag the current session so any commands entered into it will be sent to all sessions.</action> The session will have a small icon in its tab to remind you to be careful of what you enter! <userinput><command>rm </command><parameter>-rf *</parameter></userinput>, for instance, is probably not a good idea.</para></listitem>
+</varlistentry>
+
+
+<varlistentry>
+<term><menuchoice><guimenu>View</guimenu><guimenuitem>Move Session Left</guimenuitem></menuchoice></term>
+<listitem><para><action>Move the tab of the current session one tab to the left.</action></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>View</guimenu><guimenuitem>Move Session Right</guimenuitem></menuchoice></term>
+<listitem><para><action>Move the tab of the current session one tab to the right.</action></para>
+<para><keycombo action="simul">&Shift; <keycap>Left</keycap></keycombo> and <keycombo action="simul">&Shift; <keycap>Right</keycap></keycombo> can be also be used to move between sessions.</para></listitem></varlistentry>
+
+
+<varlistentry>
+<term><menuchoice><guimenu>View</guimenu> <guimenuitem>Session icons...</guimenuitem></menuchoice></term>
+<listitem><para>At the bottom of the menu is a list of the available sessions. Selecting one makes that session active.</para><para>You can also use the <keycombo action="simul">&Shift;<keycap>Left</keycap></keycombo>/<keycombo action="simul">&Shift;<keycap>Right</keycap></keycombo> keys to cycle through the available sessions.</para>
 </listitem>
 </varlistentry>
 
@@ -1259,73 +426,30 @@
 </sect2>
 
 <sect2 id="bookmarks-menu">
-<title
-><guimenu
->Bookmarks</guimenu
-> Menu</title>
+<title><guimenu>Bookmarks</guimenu> Menu</title>
 
 <variablelist>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Bookmarks</guimenu
-><guimenuitem
->Add Bookmark</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Add the current location </action
->to the bookmark list.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Bookmarks</guimenu
-><guimenuitem
->Edit Bookmarks</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Edit </action
->the bookmark list.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Bookmarks</guimenu
-><guimenuitem
->New Bookmark Folder...</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Add a new folder </action
->to the bookmark list.</para
-></listitem>
+<term><menuchoice><guimenu>Bookmarks</guimenu><guimenuitem>Add Bookmark</guimenuitem></menuchoice></term>
+<listitem><para><action>Add the current location </action>to the bookmark list.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Bookmarks</guimenu><guimenuitem>Edit Bookmarks</guimenuitem></menuchoice></term>
+<listitem><para><action>Edit </action>the bookmark list.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Bookmarks</guimenu><guimenuitem>New Bookmark Folder...</guimenuitem></menuchoice></term>
+<listitem><para><action>Add a new folder </action>to the bookmark list.</para></listitem>
 </varlistentry>
 
 </variablelist>
 
-<para
->The bookmark list is displayed at the bottom of the menu. Select a bookmark to change to that location.</para>
+<para>The bookmark list is displayed at the bottom of the menu. Select a bookmark to change to that location.</para>
 
-<note
-><para
->You can use the bookmark editor to manually add URLs like ssh://user@host or telnet://host to open remote connections.</para
-></note>
+<note><para>You can use the bookmark editor to manually add URLs like ssh://user@host or telnet://host to open remote connections.</para></note>
 
 
 </sect2>
@@ -1333,292 +457,84 @@
 
 
 <sect2 id="settings-menu">
-<title
-><guimenu
->Settings</guimenu
-> Menu</title>
+<title><guimenu>Settings</guimenu> Menu</title>
 
 <variablelist>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Show Menubar</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Show or hide the menubar.</action
-></para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Show Toolbar</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Show or hide the toolbar.</action
-></para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guisubmenu
->Scrollbar</guisubmenu
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Control location of scrollbar</action
->: <guimenuitem
->none</guimenuitem
->, <guimenuitem
->left</guimenuitem
->, or <guimenuitem
->right</guimenuitem
->.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Fullscreen</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Toggle window between full-screen and normal size.</action
-></para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Bell</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Set the system bell to a &kde; System Notification or a visible flash, or turns it off. </action
-></para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guisubmenu
->Font</guisubmenu
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Set font and font size</action
-></para>
-<para
->Select the <guimenuitem
->Custom</guimenuitem
-> option to use any combination of font, size and style. The <filename
->README.fonts</filename
-> file in the &konsole; source package gives tips on which fonts will work well.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Keyboard</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Choose desired keymapping.</action
-></para>
-<para
->The list of these keymappings is taken from <filename
->$TDEDIR/share/apps/konsole/*.keytab</filename
->. The file <filename
->$TDEDIR/share/apps/konsole/README.KeyTab</filename
-> describes the keytab format in more detail. Add to or modify these files to match your needs.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Schema</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Set colours of text and background.</action
-></para>
-<para
->The list of these schemata is taken from <filename
->$TDEDIR/share/apps/konsole/*.schema</filename
->. The file <filename
->$TDEDIR/share/apps/konsole/README.Schema</filename
-> describes the schema format in more detail. Add to or modify these files to match your needs. You can also create custom schema through the preferences dialogue at <menuchoice
-><guisubmenu
->Settings</guisubmenu
-> <guimenuitem
->Configure Konsole...</guimenuitem
-></menuchoice
->. </para>
+<term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Show Menubar</guimenuitem></menuchoice></term>
+<listitem><para><action>Show or hide the menubar.</action></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Show Toolbar</guimenuitem></menuchoice></term>
+<listitem><para><action>Show or hide the toolbar.</action></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Settings</guimenu> <guisubmenu>Scrollbar</guisubmenu></menuchoice></term>
+<listitem><para><action>Control location of scrollbar</action>: <guimenuitem>none</guimenuitem>, <guimenuitem>left</guimenuitem>, or <guimenuitem>right</guimenuitem>.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Settings</guimenu> <guimenuitem>Fullscreen</guimenuitem></menuchoice></term>
+<listitem><para><action>Toggle window between full-screen and normal size.</action></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Settings</guimenu> <guimenuitem>Bell</guimenuitem></menuchoice></term>
+<listitem><para><action>Set the system bell to a &kde; System Notification or a visible flash, or turns it off. </action></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Settings</guimenu> <guisubmenu>Font</guisubmenu></menuchoice></term>
+<listitem><para><action>Set font and font size</action></para>
+<para>Select the <guimenuitem>Custom</guimenuitem> option to use any combination of font, size and style. The <filename>README.fonts</filename> file in the &konsole; source package gives tips on which fonts will work well.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Settings</guimenu> <guimenuitem>Keyboard</guimenuitem></menuchoice></term>
+<listitem><para><action>Choose desired keymapping.</action></para>
+<para>The list of these keymappings is taken from <filename>$TDEDIR/share/apps/konsole/*.keytab</filename>. The file <filename>$TDEDIR/share/apps/konsole/README.KeyTab</filename> describes the keytab format in more detail. Add to or modify these files to match your needs.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Settings</guimenu> <guimenuitem>Schema</guimenuitem></menuchoice></term>
+<listitem><para><action>Set colours of text and background.</action></para>
+<para>The list of these schemata is taken from <filename>$TDEDIR/share/apps/konsole/*.schema</filename>. The file <filename>$TDEDIR/share/apps/konsole/README.Schema</filename> describes the schema format in more detail. Add to or modify these files to match your needs. You can also create custom schema through the preferences dialogue at <menuchoice><guisubmenu>Settings</guisubmenu> <guimenuitem>Configure Konsole...</guimenuitem></menuchoice>. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guisubmenu
->Size</guisubmenu
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Set size of text area (given in columns x rows).</action
-></para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->History...</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><anchor id="configure-history"/><action
->Open a dialogue where you can configure the history.</action
-> The <guilabel
->Enable</guilabel
-> checkbox toggles saving of lines that have scrolled off the top of the window. You can enter the <guilabel
->Number of lines</guilabel
-> to remember in the text field, or use the spinner buttons to increase or decrease the number in steps of 100 lines. The <guibutton
->Defaults</guibutton
-> button will reset the history to 1000 lines. Setting this value to 0 will cause all history to be saved. Press <guibutton
->OK</guibutton
-> to save your changes, or <guibutton
->Cancel</guibutton
-> to close the dialogue without saving your settings. The <guibutton
->Help</guibutton
-> button will open this manual, and display the text you're reading right now.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Save Settings</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Save the current settings as the new defaults.</action
-></para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Save Sessions Profile...</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Save the current set of sessions </action
->under a name you choose. The profile can then be used by starting &konsole; from the command-line with the <parameter
->--profile</parameter
-> and the name of the profile.</para>
+<term><menuchoice><guimenu>Settings</guimenu> <guisubmenu>Size</guisubmenu></menuchoice></term>
+<listitem><para><action>Set size of text area (given in columns x rows).</action></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Settings</guimenu> <guimenuitem>History...</guimenuitem></menuchoice></term>
+<listitem><para><anchor id="configure-history"/><action>Open a dialogue where you can configure the history.</action> The <guilabel>Enable</guilabel> checkbox toggles saving of lines that have scrolled off the top of the window. You can enter the <guilabel>Number of lines</guilabel> to remember in the text field, or use the spinner buttons to increase or decrease the number in steps of 100 lines. The <guibutton>Defaults</guibutton> button will reset the history to 1000 lines. Setting this value to 0 will cause all history to be saved. Press <guibutton>OK</guibutton> to save your changes, or <guibutton>Cancel</guibutton> to close the dialogue without saving your settings. The <guibutton>Help</guibutton> button will open this manual, and display the text you're reading right now.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Save Settings</guimenuitem></menuchoice></term>
+<listitem><para><action>Save the current settings as the new defaults.</action></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Save Sessions Profile...</guimenuitem></menuchoice></term>
+<listitem><para><action>Save the current set of sessions </action>under a name you choose. The profile can then be used by starting &konsole; from the command-line with the <parameter>--profile</parameter> and the name of the profile.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Shortcuts...</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Customise keyboard shortcuts for &konsole; commands.</action
-></para>
+<term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Shortcuts...</guimenuitem></menuchoice></term>
+<listitem><para><action>Customise keyboard shortcuts for &konsole; commands.</action></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure &konsole;...</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Open the &kcontrolcenter; module, allowing many additional changes to &konsole;'s interface and behaviour, including the creation of custom schemas and modification of the available sessions.</action
-></para>
+<term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &konsole;...</guimenuitem></menuchoice></term>
+<listitem><para><action>Open the &kcontrolcenter; module, allowing many additional changes to &konsole;'s interface and behaviour, including the creation of custom schemas and modification of the available sessions.</action></para>
 </listitem>
 </varlistentry>
 
@@ -1626,100 +542,31 @@
 </sect2>
 
 <sect2 id="help-menu">
-<title
-><guimenu
->Help</guimenu
-> Menu</title>
+<title><guimenu>Help</guimenu> Menu</title>
 
 <variablelist>
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycap
->F1</keycap
-></shortcut
-><guimenu
->Help</guimenu
-> <guimenuitem
->Konsole Handbook</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Open the table of contents of this document.</action
-></para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Help</guimenu
-> <guimenuitem
->Tip of the Day...</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Display a helpful tip about the use of &konsole;. </action
->Check the <guilabel
->Show on start</guilabel
-> box to display a tip each time &konsole; is started.</para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Help</guimenu
-><guimenuitem
->Report Bug...</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Submit a bug report or a feature request</action
-> for &konsole;.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Help</guimenu
-><guimenuitem
->About Konsole...</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Information about</action
-> &konsole;'s author</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Help</guimenu
-><guimenuitem
->About KDE...</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Information about the KDE project</action
-></para
-></listitem>
+<term><menuchoice><shortcut> <keycap>F1</keycap></shortcut><guimenu>Help</guimenu> <guimenuitem>Konsole Handbook</guimenuitem></menuchoice></term>
+<listitem><para><action>Open the table of contents of this document.</action></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Help</guimenu> <guimenuitem>Tip of the Day...</guimenuitem></menuchoice></term>
+<listitem><para><action>Display a helpful tip about the use of &konsole;. </action>Check the <guilabel>Show on start</guilabel> box to display a tip each time &konsole; is started.</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><menuchoice><guimenu>Help</guimenu><guimenuitem>Report Bug...</guimenuitem></menuchoice></term>
+<listitem><para><action>Submit a bug report or a feature request</action> for &konsole;.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Help</guimenu><guimenuitem>About Konsole...</guimenuitem></menuchoice></term>
+<listitem><para><action>Information about</action> &konsole;'s author</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Help</guimenu><guimenuitem>About KDE...</guimenuitem></menuchoice></term>
+<listitem><para><action>Information about the KDE project</action></para></listitem>
 </varlistentry>
 </variablelist>
 
@@ -1728,468 +575,165 @@
 </sect1>
 
 <sect1 id="toolbar">
-<title
->Toolbar</title>
-
-<para
->The toolbar is at the bottom of the &konsole; window.</para>
-
-<para
->It can be hidden and restored by toggling <guimenuitem
->Show Toolbar</guimenuitem
-> in the <guimenu
->Settings</guimenu
-> menu or by clicking the textured <quote
->handle</quote
-> at the side of the bar. The bar contains a <guiicon
->New</guiicon
-> icon and icons for the current sessions. Clicking <guiicon
->New</guiicon
-> opens a new <quote
->Shell</quote
-> session.</para>
-<para
->Double-clicking a session tab opens a dialogue box enabling you to change the name of that session. <keycombo action="simul"
->&Alt;&Ctrl;<keycap
->S</keycap
-> </keycombo
-> can also be used to rename the active session.</para>
-<para
->Clicking an existing session's icon makes that session active.</para
-> <para
->When the toolbar is hidden, <keycombo action="simul"
->&Shift; <keycap
->Left</keycap
-></keycombo
-> and <keycombo action="simul"
->&Shift; <keycap
->Right</keycap
-></keycombo
-> can be used to move between sessions.</para>
+<title>Toolbar</title>
+
+<para>The toolbar is at the bottom of the &konsole; window.</para>
+
+<para>It can be hidden and restored by toggling <guimenuitem>Show Toolbar</guimenuitem> in the <guimenu>Settings</guimenu> menu or by clicking the textured <quote>handle</quote> at the side of the bar. The bar contains a <guiicon>New</guiicon> icon and icons for the current sessions. Clicking <guiicon>New</guiicon> opens a new <quote>Shell</quote> session.</para>
+<para>Double-clicking a session tab opens a dialogue box enabling you to change the name of that session. <keycombo action="simul">&Alt;&Ctrl;<keycap>S</keycap> </keycombo> can also be used to rename the active session.</para>
+<para>Clicking an existing session's icon makes that session active.</para> <para>When the toolbar is hidden, <keycombo action="simul">&Shift; <keycap>Left</keycap></keycombo> and <keycombo action="simul">&Shift; <keycap>Right</keycap></keycombo> can be used to move between sessions.</para>
 
 </sect1>
 
 <sect1 id="command-line-options">
-<title
->Command-line Options</title>
+<title>Command-line Options</title>
 
-<para
->When &konsole; is started from the command-line, various options can be specified to modify its behaviour.</para>
+<para>When &konsole; is started from the command-line, various options can be specified to modify its behaviour.</para>
 
 <variablelist>
 
 <varlistentry>
-<term
-><option
->--help</option
-></term>
-<listitem
-><para
-><action
->List the various options</action
-></para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><option
->--name</option
-> <parameter
->name</parameter
-></term>
-<listitem
-><para
-><action
->Set the name that appears in the titlebar</action
-></para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><option
->--ls</option
-></term>
-<listitem
-><para
-><action
->Start with a login shell environment.</action
-> What that does varies depending on your system, but generally it means that files such as <filename
->~/.profile</filename
-> or <filename
->~/.bash_profile</filename
-> will be read. (If that doesn't mean anything to you, don't worry about it, but keep in the back of your mind for when you realise you need it.)</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><option
->-T</option
-> <parameter
->title</parameter
-></term>
-<listitem
-><para
-><action
->Set the window title</action
-></para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><option
->--tn</option
-> <parameter
->terminal</parameter
-></term>
-<listitem
-><para
-><action
->Sets the environment variable TERM to the specified value.</action
-> Read <userinput
-><command
->man</command
-> <option
->xterm</option
-> </userinput
-> for more information on TERM.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><option
->--xwin</option
-></term>
-<listitem
-><para
-><action
->Ignored</action
-></para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><option
->--noclose</option
-></term>
-<listitem
-><para
-><action
->Prevent &konsole; from closing</action
-> when an <userinput
-><command
->exit</command
-></userinput
-> command is issued in the only session window.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><option
->--nohist</option
-></term>
-<listitem
-><para
-><action
->Disable the saving of lines that scroll off the top of the window</action
-></para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><option
->--nomenubar</option
-></term>
-<listitem
-><para
-><action
->Start &konsole; without a menubar</action
-></para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><option
->--notoolbar</option
-></term>
-<listitem
-><para
-><action
->Start &konsole; without a toolbar</action
-></para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><option
->--noframe</option
-></term>
-<listitem
-><para
-><action
->Start &konsole; without a frame</action
-></para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><option
->--noscrollbar</option
-></term>
-<listitem
-><para
-><action
->Start &konsole; without a scrollbar</action
-></para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><option
->--noxft</option
-></term>
-<listitem
-><para
-><action
->Start &konsole; without Xft antialiasing.</action
-> Antialiasing of a small font may be difficult to read.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><option
->--vt_sz</option
-> <parameter
->CCxLL</parameter
-></term>
-<listitem
-><para
-><action
->Start a terminal window of CC Columns and LL lines</action
-></para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><option
->--type</option
-> <parameter
->type</parameter
-></term>
-<listitem
-><para
-><action
->Start a session of the given type rather than the default.</action
-></para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><option
->--keytab</option
-> <parameter
->file</parameter
-></term>
-<listitem
-><para
-><action
->Start &konsole; using a specified .keytab file</action
-> to customise key bindings.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><option
->--profile</option
-> <parameter
->file</parameter
-></term>
-<listitem
-><para
-><action
->Start &konsole; using a saved set of sessions.</action
-></para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><option
->--schema</option
-> <parameter
->file</parameter
-></term>
-<listitem
-><para
-><action
->Start &konsole; using a specified .schema file</action
-> to customise appearance.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><option
->--script</option
-> <parameter
->file</parameter
-></term>
-<listitem
-><para
-><action
->Allow the use of extended DCOP commands to paste text into sessions.</action
-></para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><option
->--workdir</option
-> <parameter
->dir</parameter
-></term>
-<listitem
-><para
-><action
->Open with</action
-> <parameter
->dir</parameter
-> as the working folder.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><option
->-e</option
-> <parameter
->command</parameter
-></term>
-<listitem
-><para
-><action
->Execute</action
-> <parameter
->command</parameter
-> instead of shell.</para
-></listitem>
+<term><option>--help</option></term>
+<listitem><para><action>List the various options</action></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--name</option> <parameter>name</parameter></term>
+<listitem><para><action>Set the name that appears in the titlebar</action></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--ls</option></term>
+<listitem><para><action>Start with a login shell environment.</action> What that does varies depending on your system, but generally it means that files such as <filename>~/.profile</filename> or <filename>~/.bash_profile</filename> will be read. (If that doesn't mean anything to you, don't worry about it, but keep in the back of your mind for when you realise you need it.)</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>-T</option> <parameter>title</parameter></term>
+<listitem><para><action>Set the window title</action></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--tn</option> <parameter>terminal</parameter></term>
+<listitem><para><action>Sets the environment variable TERM to the specified value.</action> Read <userinput><command>man</command> <option>xterm</option> </userinput> for more information on TERM.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--xwin</option></term>
+<listitem><para><action>Ignored</action></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--noclose</option></term>
+<listitem><para><action>Prevent &konsole; from closing</action> when an <userinput><command>exit</command></userinput> command is issued in the only session window.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--nohist</option></term>
+<listitem><para><action>Disable the saving of lines that scroll off the top of the window</action></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--nomenubar</option></term>
+<listitem><para><action>Start &konsole; without a menubar</action></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--notoolbar</option></term>
+<listitem><para><action>Start &konsole; without a toolbar</action></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--noframe</option></term>
+<listitem><para><action>Start &konsole; without a frame</action></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--noscrollbar</option></term>
+<listitem><para><action>Start &konsole; without a scrollbar</action></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--noxft</option></term>
+<listitem><para><action>Start &konsole; without Xft antialiasing.</action> Antialiasing of a small font may be difficult to read.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--vt_sz</option> <parameter>CCxLL</parameter></term>
+<listitem><para><action>Start a terminal window of CC Columns and LL lines</action></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--type</option> <parameter>type</parameter></term>
+<listitem><para><action>Start a session of the given type rather than the default.</action></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--keytab</option> <parameter>file</parameter></term>
+<listitem><para><action>Start &konsole; using a specified .keytab file</action> to customise key bindings.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--profile</option> <parameter>file</parameter></term>
+<listitem><para><action>Start &konsole; using a saved set of sessions.</action></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--schema</option> <parameter>file</parameter></term>
+<listitem><para><action>Start &konsole; using a specified .schema file</action> to customise appearance.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--script</option> <parameter>file</parameter></term>
+<listitem><para><action>Allow the use of extended DCOP commands to paste text into sessions.</action></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--workdir</option> <parameter>dir</parameter></term>
+<listitem><para><action>Open with</action> <parameter>dir</parameter> as the working folder.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>-e</option> <parameter>command</parameter></term>
+<listitem><para><action>Execute</action> <parameter>command</parameter> instead of shell.</para></listitem>
 </varlistentry>
 </variablelist>
 
-<para
->For instance:</para>
+<para>For instance:</para>
 
 <informalexample>
-<screen
-><prompt
->bash$</prompt>
- <userinput
-><command
->konsole</command
-><option
-> --vt_sz</option>
- <parameter
-> 90x25</parameter
-><option
-> --nohist</option
-></userinput
-></screen>
-
-<para
->starts a &konsole; window with 90 columns and 25 rows, with no history</para>
+<screen><prompt>bash$</prompt>
+ <userinput><command>konsole</command><option> --vt_sz</option>
+ <parameter> 90x25</parameter><option> --nohist</option></userinput></screen>
+
+<para>starts a &konsole; window with 90 columns and 25 rows, with no history</para>
 </informalexample>
 
-<para
->&konsole; also accepts generic &Qt; and &kde; options:</para>
+<para>&konsole; also accepts generic &Qt; and &kde; options:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><option
->--help-qt</option
-></term>
-<listitem
-><para
-><action
->List Qt-specific options</action
-></para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><option
->--help-kde</option
-></term>
-<listitem
-><para
-><action
->List KDE-specific options</action
-></para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><option
->--help-all</option
-></term>
-<listitem
-><para
-><action
->List all options</action
-></para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><option
->--author</option
-></term>
-<listitem
-><para
-><action
->Show the authors' names</action
-></para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><option
->-v,--version</option
-></term>
-<listitem
-><para
-><action
->Show the version number</action
-></para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><option
->--license</option
-></term>
-<listitem
-><para
-><action
->Show licence information</action
-></para
-></listitem>
+<term><option>--help-qt</option></term>
+<listitem><para><action>List Qt-specific options</action></para></listitem>
+</varlistentry>
+<varlistentry>
+<term><option>--help-kde</option></term>
+<listitem><para><action>List KDE-specific options</action></para></listitem>
+</varlistentry>
+<varlistentry>
+<term><option>--help-all</option></term>
+<listitem><para><action>List all options</action></para></listitem>
+</varlistentry>
+<varlistentry>
+<term><option>--author</option></term>
+<listitem><para><action>Show the authors' names</action></para></listitem>
+</varlistentry>
+<varlistentry>
+<term><option>-v,--version</option></term>
+<listitem><para><action>Show the version number</action></para></listitem>
+</varlistentry>
+<varlistentry>
+<term><option>--license</option></term>
+<listitem><para><action>Show licence information</action></para></listitem>
 </varlistentry>
 </variablelist>
 
@@ -2198,38 +742,23 @@
 </chapter>
 
 <chapter id="credits">
-<title
->Credits and Copyright</title>
+<title>Credits and Copyright</title>
 
-<para
->&konsole; is maintained by &Waldo.Bastian; &Waldo.Bastian.mail;</para>
+<para>&konsole; is maintained by &Waldo.Bastian; &Waldo.Bastian.mail;</para>
 
-<para
->The application &konsole; Copyright &copy; 1997-2002 &Lars.Doelle; &Lars.Doelle.mail;</para>
+<para>The application &konsole; Copyright &copy; 1997-2002 &Lars.Doelle; &Lars.Doelle.mail;</para>
 
-<para
->This document was written by &Jonathan.Singer; &Jonathan.Singer.mail;</para>
+<para>This document was written by &Jonathan.Singer; &Jonathan.Singer.mail;</para>
 
-<para
->Originally converted to DocBook <acronym
->SGML</acronym
-> by &Mike.McBride; and &Lauri.Watts;</para>
+<para>Originally converted to DocBook <acronym>SGML</acronym> by &Mike.McBride; and &Lauri.Watts;</para>
 
-<para
->Conversion to British English: John Knight <email
->anarchist_tomato@herzeleid.net</email
-></para
-> 
+<para>Conversion to British English: John Knight <email>anarchist_tomato@herzeleid.net</email></para> 
 &underFDL; &underGPL; </chapter>
 
 <appendix id="porting">
-<title
->&konsole; on non-&Linux; platforms</title>
+<title>&konsole; on non-&Linux; platforms</title>
 
-<para
->Information on building &konsole; on platforms other than &Linux; is available in the <filename
->README.ports</filename
-> file in the &konsole; source package. It provides a list of experts for certain platforms (Tru64, &Solaris;, OpenBSD) and requests volunteers from other &UNIX; platforms.</para>
+<para>Information on building &konsole; on platforms other than &Linux; is available in the <filename>README.ports</filename> file in the &konsole; source package. It provides a list of experts for certain platforms (Tru64, &Solaris;, OpenBSD) and requests volunteers from other &UNIX; platforms.</para>
 
 </appendix>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kpager/index.docbook b/tde-i18n-en_GB/docs/tdebase/kpager/index.docbook
index 038eb916f0b..59d211a2651 100644
--- a/tde-i18n-en_GB/docs/tdebase/kpager/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kpager/index.docbook
@@ -4,262 +4,145 @@
   <!ENTITY kappname "&kpager;">
   <!ENTITY package "tdebase">
   <!ENTITY % addindex "IGNORE">
-  <!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+  <!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <book lang="&language;">
 
 <bookinfo>
-<title
->The &kpager; Handbook</title>
+<title>The &kpager; Handbook</title>
 
 <authorgroup>
-<author
->&Dirk.Doerflinger; &Dirk.Doerflinger.mail;</author>
-
-<othercredit role="developer"
->&Antonio.Larrosa.Jimenez; &Antonio.Larrosa.Jimenez.mail; </othercredit>
-
-<othercredit role="developer"
->&Matthias.Elter; &Matthias.Elter.mail; </othercredit>
-
-<othercredit role="developer"
->&Matthias.Ettrich; &Matthias.Ettrich.mail; </othercredit>
-
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Dirk.Doerflinger; &Dirk.Doerflinger.mail;</author>
+
+<othercredit role="developer">&Antonio.Larrosa.Jimenez; &Antonio.Larrosa.Jimenez.mail; </othercredit>
+
+<othercredit role="developer">&Matthias.Elter; &Matthias.Elter.mail; </othercredit>
+
+<othercredit role="developer">&Matthias.Ettrich; &Matthias.Ettrich.mail; </othercredit>
+
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 
 </authorgroup>
 
 <copyright>
-<year
->2000</year>
-<holder
->&Dirk.Doerflinger;</holder>
+<year>2000</year>
+<holder>&Dirk.Doerflinger;</holder>
 </copyright>
 
-<legalnotice
->&FDLNotice;</legalnotice>
+<legalnotice>&FDLNotice;</legalnotice>
 
-<date
->2001-01-28</date>
-<releaseinfo
->0.02.00</releaseinfo>
+<date>2001-01-28</date>
+<releaseinfo>0.02.00</releaseinfo>
 
 <abstract>
-<para
->&kpager; gives you a thumbnail view of all virtual desktops. </para>
+<para>&kpager; gives you a thumbnail view of all virtual desktops. </para>
 </abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->pager</keyword>
-<keyword
->kpager</keyword>
-<keyword
->desktop</keyword>
-<keyword
->overview</keyword>
+<keyword>KDE</keyword>
+<keyword>pager</keyword>
+<keyword>kpager</keyword>
+<keyword>desktop</keyword>
+<keyword>overview</keyword>
 </keywordset>
 
 </bookinfo>
 
 <chapter id="introduction">
-<title
->Introduction</title>
+<title>Introduction</title>
 
-<para
->&kpager; gives you a thumbnail sketch of all your desktops. It is a handy tool to let you see, resize or close windows on any desktop and move windows around within or between desktops. </para>
+<para>&kpager; gives you a thumbnail sketch of all your desktops. It is a handy tool to let you see, resize or close windows on any desktop and move windows around within or between desktops. </para>
 
 </chapter>
 
 
 <chapter id="using-kpager">
-<title
->Using &kpager;</title>
+<title>Using &kpager;</title>
 
 <screenshot>
-<screeninfo
->Here's a screenshot of &kpager;</screeninfo>
+<screeninfo>Here's a screenshot of &kpager;</screeninfo>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="screenshot.png" format="PNG"/>
 	  </imageobject>
 	  <textobject>
-	    <phrase
->Screenshot</phrase>
+	    <phrase>Screenshot</phrase>
 	  </textobject>
 	</mediaobject>
 </screenshot>
 
 <sect1 id="kpager-features">
-<title
->More &kpager; features</title>
+<title>More &kpager; features</title>
 
-<para
->&kpager; can show all virtual desktops and the applications within them. It can be used to chose an application or even to move applications within virtual desktops or to others.</para>
+<para>&kpager; can show all virtual desktops and the applications within them. It can be used to chose an application or even to move applications within virtual desktops or to others.</para>
 
 </sect1>
 </chapter>
 
 <chapter id="commands">
-<title
->Command Reference</title>
+<title>Command Reference</title>
 
 <sect1 id="kpager-mainwindow">
-<title
->The main &kpager; window</title>
+<title>The main &kpager; window</title>
 
 <sect2>
-<title
->Using the mouse</title>
+<title>Using the mouse</title>
 
-<para
->In &kpager; you can activate applications by clicking them with the <mousebutton
->left</mousebutton
-> button.</para>
+<para>In &kpager; you can activate applications by clicking them with the <mousebutton>left</mousebutton> button.</para>
 
-<para
->The <mousebutton
->middle</mousebutton
-> button of the mouse can be used for dragging applications within &kpager;. Applications can either be moved within a virtual desktop or to another one.</para
-> 
+<para>The <mousebutton>middle</mousebutton> button of the mouse can be used for dragging applications within &kpager;. Applications can either be moved within a virtual desktop or to another one.</para> 
 
-<para
->Clicking the <mousebutton
->right</mousebutton
-> mouse button anywhere in &kpager; will open a context menu.</para>
+<para>Clicking the <mousebutton>right</mousebutton> mouse button anywhere in &kpager; will open a context menu.</para>
 
 </sect2>
 
 <sect2>
-<title
->The Context Menu</title>
-
-<para
->The context menu depends on where the <mousebutton
->right</mousebutton
-> mouse button is clicked: If it is clicked on the empty background of &kpager;, it only has two items: <guimenuitem
->Configure KPager</guimenuitem
-> and <guimenuitem
->Quit</guimenuitem
->. Otherwise, if clicked on a window, there are also the name and the icon of the application, and <guimenuitem
->Minimise</guimenuitem
->, <guimenuitem
->Maximise</guimenuitem
->, <guimenuitem
->To Desktop</guimenuitem
-> and <guimenuitem
->Close</guimenuitem
-> are displayed. See below for a detailed description of the menu items.</para>
+<title>The Context Menu</title>
+
+<para>The context menu depends on where the <mousebutton>right</mousebutton> mouse button is clicked: If it is clicked on the empty background of &kpager;, it only has two items: <guimenuitem>Configure KPager</guimenuitem> and <guimenuitem>Quit</guimenuitem>. Otherwise, if clicked on a window, there are also the name and the icon of the application, and <guimenuitem>Minimise</guimenuitem>, <guimenuitem>Maximise</guimenuitem>, <guimenuitem>To Desktop</guimenuitem> and <guimenuitem>Close</guimenuitem> are displayed. See below for a detailed description of the menu items.</para>
 
 <variablelist>
 <varlistentry>
-<term
-><menuchoice>
-<guimenuitem
->Maximise</guimenuitem>
-</menuchoice
-></term>
-<listitem
-><para
-><action
->Maximises the application window to the whole desktop. This item only appears if right clicked on an application window.</action
-></para
-></listitem>
+<term><menuchoice>
+<guimenuitem>Maximise</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Maximises the application window to the whole desktop. This item only appears if right clicked on an application window.</action></para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice>
-<guimenuitem
->Minimise</guimenuitem>
-</menuchoice
-></term>
-<listitem
-><para
-><action
->Iconifies the application. This item only appears if right clicked on an application window.</action
-></para
-></listitem>
+<term><menuchoice>
+<guimenuitem>Minimise</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Iconifies the application. This item only appears if right clicked on an application window.</action></para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice>
-<guimenuitem
->To Desktop</guimenuitem>
-</menuchoice
-></term>
-<listitem
-><para
-><action
->Sends the application window to the chosen virtual desktop. This item only appears if right clicked on an application window.</action
-></para
-></listitem>
+<term><menuchoice>
+<guimenuitem>To Desktop</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Sends the application window to the chosen virtual desktop. This item only appears if right clicked on an application window.</action></para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice>
-<guimenuitem
->Close</guimenuitem>
-</menuchoice
-></term>
-<listitem
-><para
-><action
->Closes the clicked application. This item only appears if right clicked on an application window.</action
-></para
-></listitem>
+<term><menuchoice>
+<guimenuitem>Close</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Closes the clicked application. This item only appears if right clicked on an application window.</action></para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice>
-<guimenuitem
->Configure Pager</guimenuitem>
-</menuchoice
-></term>
-<listitem
-><para
-><action
->Opens</action
-> the <link linkend="kpager-settings"
->settings dialogue</link
->.</para
-></listitem>
+<term><menuchoice>
+<guimenuitem>Configure Pager</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Opens</action> the <link linkend="kpager-settings">settings dialogue</link>.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice>
-<guimenuitem
->Quit</guimenuitem>
-</menuchoice
-></term>
-<listitem
-><para
-><action
->Quits</action
-> &kpager;.</para
-></listitem>
+<term><menuchoice>
+<guimenuitem>Quit</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Quits</action> &kpager;.</para></listitem>
 </varlistentry>
 </variablelist>
 
@@ -268,121 +151,56 @@
 </sect1>
 
 <sect1 id="kpager-settings">
-<title
->The Settings Dialogue</title>
+<title>The Settings Dialogue</title>
 
 <screenshot>
-<screeninfo
->Here's a screenshot of the settings dialogue</screeninfo>
+<screeninfo>Here's a screenshot of the settings dialogue</screeninfo>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="settings.png" format="PNG"/>
 	  </imageobject>
 	  <textobject>
-	    <phrase
->Screenshot</phrase>
+	    <phrase>Screenshot</phrase>
 	  </textobject>
 	</mediaobject>
 </screenshot>
 
-<para
->In the settings dialogue you will find five check boxes and two groups of radio buttons.</para>
+<para>In the settings dialogue you will find five check boxes and two groups of radio buttons.</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Enable Window Dragging</guilabel
-></term>
-<listitem
-><para
->If this box is checked, you can drag windows inside of &kpager; with the &MMB;. Windows can be dragged over the desktop or even to another desktop.</para
-></listitem>
+<term><guilabel>Enable Window Dragging</guilabel></term>
+<listitem><para>If this box is checked, you can drag windows inside of &kpager; with the &MMB;. Windows can be dragged over the desktop or even to another desktop.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Show Name</guilabel
-></term>
-<listitem
-><para
->If this box is checked, the names of the desktops are shown in the main view of &kpager;.</para
-></listitem>
+<term><guilabel>Show Name</guilabel></term>
+<listitem><para>If this box is checked, the names of the desktops are shown in the main view of &kpager;.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Show Number</guilabel
-></term>
-<listitem
-><para
->If this box is checked, the numbers of the desktops are shown in the main view of &kpager;. If it is checked together with the <guilabel
->Show Name</guilabel
-> box, the name is displayed with ordinals, <abbrev
->e.g.</abbrev
-> <guilabel
->1. Desktop</guilabel
->.</para
-></listitem
-> 
+<term><guilabel>Show Number</guilabel></term>
+<listitem><para>If this box is checked, the numbers of the desktops are shown in the main view of &kpager;. If it is checked together with the <guilabel>Show Name</guilabel> box, the name is displayed with ordinals, <abbrev>e.g.</abbrev> <guilabel>1. Desktop</guilabel>.</para></listitem> 
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Show Background</guilabel
-></term>
-<listitem
-><para
->If this box is checked, the wallpaper of each desktop - if set - will be shown as backgrounds in &kpager;, too.</para
-></listitem>
+<term><guilabel>Show Background</guilabel></term>
+<listitem><para>If this box is checked, the wallpaper of each desktop - if set - will be shown as backgrounds in &kpager;, too.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Show Windows</guilabel
-></term>
-<listitem
-><para
->If this box is checked, the applications on the desktops are shown in &kpager; as small views. Otherwise, &kpager; will remain empty, just for choosing the virtual desktops.</para
-></listitem>
+<term><guilabel>Show Windows</guilabel></term>
+<listitem><para>If this box is checked, the applications on the desktops are shown in &kpager; as small views. Otherwise, &kpager; will remain empty, just for choosing the virtual desktops.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Type of Window</guilabel
-></term>
-<listitem
-><para
->This group of radio buttons sets the kind of view for the application window views. <guilabel
->Plain</guilabel
-> will show just empty rectangles with the proportions of the application window, <guilabel
->Icon</guilabel
-> will show them with their standard icon and <guilabel
->Pixmap</guilabel
-> with a small view of the contents of the application window. Note that using the pixmap mode is only recommended for very fast machines.</para
-></listitem>
+<term><guilabel>Type of Window</guilabel></term>
+<listitem><para>This group of radio buttons sets the kind of view for the application window views. <guilabel>Plain</guilabel> will show just empty rectangles with the proportions of the application window, <guilabel>Icon</guilabel> will show them with their standard icon and <guilabel>Pixmap</guilabel> with a small view of the contents of the application window. Note that using the pixmap mode is only recommended for very fast machines.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Layout</guilabel
-></term>
-<listitem
-><para
->In this group the layout of the &kpager; main view can be set. <guilabel
->Classical</guilabel
-> will show &kpager; in a 2xn grid like pager applications in some other window managers, <guilabel
->Horizontal</guilabel
-> will show the virtual desktops in a horizontal view and <guilabel
->Vertical</guilabel
-> in a vertical row, which may perfectly fit on the side of the desktop.</para
-></listitem>
+<term><guilabel>Layout</guilabel></term>
+<listitem><para>In this group the layout of the &kpager; main view can be set. <guilabel>Classical</guilabel> will show &kpager; in a 2xn grid like pager applications in some other window managers, <guilabel>Horizontal</guilabel> will show the virtual desktops in a horizontal view and <guilabel>Vertical</guilabel> in a vertical row, which may perfectly fit on the side of the desktop.</para></listitem>
 </varlistentry>
 </variablelist>
 
@@ -391,61 +209,35 @@
 </chapter>
 
 <chapter id="faq">
-<title
->Questions and Answers</title>
+<title>Questions and Answers</title>
 
 <qandaset id="faq-questions">
 <qandaentry>
 <question>
-<para
->Why could I need &kpager;?</para>
+<para>Why could I need &kpager;?</para>
 </question>
-<answer
-><para
->&kpager; can be used as an alternative to the pager applet in the panel. It has the advantage of being resizeable and within this able to show icon or pixmap views of the running applications, move the windows across desktops and run outside of the panel.</para
-></answer>
+<answer><para>&kpager; can be used as an alternative to the pager applet in the panel. It has the advantage of being resizeable and within this able to show icon or pixmap views of the running applications, move the windows across desktops and run outside of the panel.</para></answer>
 </qandaentry>
 <qandaentry>
 <question>
-<para
->How can I change the behaviour of &kpager;?</para>
+<para>How can I change the behaviour of &kpager;?</para>
 </question>
-<answer
-><para
->Clicking the <mousebutton
->right</mousebutton
-> mouse button anywhere within &kpager; lets you chose <guilabel
->Configure</guilabel
-> from the context menu for displaying the <link linkend="kpager-settings"
->settings dialogue</link
-></para>
+<answer><para>Clicking the <mousebutton>right</mousebutton> mouse button anywhere within &kpager; lets you chose <guilabel>Configure</guilabel> from the context menu for displaying the <link linkend="kpager-settings">settings dialogue</link></para>
 </answer>
 </qandaentry>
 <qandaentry>
 <question>
-<para
->Windows are transparent by default, how do I turn this off?</para>
+<para>Windows are transparent by default, how do I turn this off?</para>
 </question>
 <answer>
-<para
->Currently, you cannot turn that option off within the config dialogue, but you can do it manually like this:</para>
-
-<para
->Open the file <filename
->$TDEHOME/share/config/kpagerrc</filename
-> with any text editor like &kedit; or <application
->vi</application
->. If you have no rights to write that file, you may need to do it as root or contact your system administrator. In this file you will have to add a new key with the name <userinput
->windowTransparentMode</userinput
-> with a number as value. Values are:</para>
+<para>Currently, you cannot turn that option off within the config dialogue, but you can do it manually like this:</para>
+
+<para>Open the file <filename>$TDEHOME/share/config/kpagerrc</filename> with any text editor like &kedit; or <application>vi</application>. If you have no rights to write that file, you may need to do it as root or contact your system administrator. In this file you will have to add a new key with the name <userinput>windowTransparentMode</userinput> with a number as value. Values are:</para>
 
 <simplelist>
-<member
->0 - No transparent windows at all.</member>
-<member
->1 - Only maximised windows are transparent.</member>
-<member
->2 - all windows are transparent (default).</member>
+<member>0 - No transparent windows at all.</member>
+<member>1 - Only maximised windows are transparent.</member>
+<member>2 - all windows are transparent (default).</member>
 </simplelist>
 
 </answer>
@@ -456,44 +248,31 @@
 <chapter id="credits">
 
 
-<title
->Credits and Licence</title>
+<title>Credits and Licence</title>
 
-<para
->&kpager; </para>
+<para>&kpager; </para>
 
-<para
->Program copyright 2000 Antonio Larrosa <email
->larrosa@kde.org</email
-> </para>
+<para>Program copyright 2000 Antonio Larrosa <email>larrosa@kde.org</email> </para>
 
-<para
->Documentation copyright 2000 by Dirk Doerflinger <email
->ddoerflinger@web.de</email
-> </para>
+<para>Documentation copyright 2000 by Dirk Doerflinger <email>ddoerflinger@web.de</email> </para>
 &underFDL; &underGPL; </chapter>
 
 <appendix id="installation">
-<title
->Installation</title>
+<title>Installation</title>
 
 <sect1 id="getting-kpager">
-<title
->How to obtain &kpager;</title>
+<title>How to obtain &kpager;</title>
 &install.intro.documentation; </sect1>
 
 <sect1 id="requirements">
-<title
->Requirements</title>
+<title>Requirements</title>
 
-<para
->As &kpager; is part of the &package; package, you will just need an installation of the main &kde; packages.</para>
+<para>As &kpager; is part of the &package; package, you will just need an installation of the main &kde; packages.</para>
 
 </sect1>
 
 <sect1 id="compilation">
-<title
->Compilation and Installation</title>
+<title>Compilation and Installation</title>
 &install.compile.documentation; </sect1>
 
 </appendix>
diff --git a/tde-i18n-en_GB/docs/tdebase/ksplashml/index.docbook b/tde-i18n-en_GB/docs/tdebase/ksplashml/index.docbook
index 7308d911061..2b3c23b5f52 100644
--- a/tde-i18n-en_GB/docs/tdebase/ksplashml/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/ksplashml/index.docbook
@@ -9,200 +9,98 @@
 <book lang="&language;">
 
 <bookinfo>
-<title
->The &ksplash; Handbook</title>
+<title>The &ksplash; Handbook</title>
 
 <authorgroup>
-<author
->&Teemu.Rytilahti; &Teemu.Rytilahti.mail; </author>
-
-<othercredit role="developer"
->&Brian.C.Ledbetter; &Brian.C.Ledbetter.mail; </othercredit>
-
-<othercredit role="developer"
->&Ravikiran.Rajagopal; &Ravikiran.Rajagopal.mail; </othercredit>
-
-<othercredit role="translator"
-><firstname
->Jonathan</firstname
-><surname
->Riddell</surname
-><affiliation
-><address
-><email
->kde-en-gb@jriddell.org</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Teemu.Rytilahti; &Teemu.Rytilahti.mail; </author>
+
+<othercredit role="developer">&Brian.C.Ledbetter; &Brian.C.Ledbetter.mail; </othercredit>
+
+<othercredit role="developer">&Ravikiran.Rajagopal; &Ravikiran.Rajagopal.mail; </othercredit>
+
+<othercredit role="translator"><firstname>Jonathan</firstname><surname>Riddell</surname><affiliation><address><email>kde-en-gb@jriddell.org</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 
 </authorgroup>
 
 <copyright>
-<year
->2003</year>
-<holder
->Teemu Rytilahti</holder>
+<year>2003</year>
+<holder>Teemu Rytilahti</holder>
 </copyright>
 <copyright>
-<year
->2003-04</year>
-<holder
->Ravikiran Rajagopal</holder>
+<year>2003-04</year>
+<holder>Ravikiran Rajagopal</holder>
 </copyright>
-<legalnotice
->&FDLNotice;</legalnotice>
+<legalnotice>&FDLNotice;</legalnotice>
 
-<date
->2003-01-10</date>
-<releaseinfo
->1.01.00</releaseinfo>
+<date>2003-01-10</date>
+<releaseinfo>1.01.00</releaseinfo>
 
 <abstract>
-<para
->&ksplash; is a nice splash screen that shows the progress of an application that is loading.</para>
+<para>&ksplash; is a nice splash screen that shows the progress of an application that is loading.</para>
 </abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->tdebase</keyword>
-<keyword
->ksplash</keyword>
-<keyword
->ksplashml</keyword>
-<keyword
->splashscreen</keyword>
-<keyword
->eye candy</keyword>
+<keyword>KDE</keyword>
+<keyword>tdebase</keyword>
+<keyword>ksplash</keyword>
+<keyword>ksplashml</keyword>
+<keyword>splashscreen</keyword>
+<keyword>eye candy</keyword>
 </keywordset>
 
 </bookinfo>
 
 <chapter id="introduction">
-<title
->Introduction</title>
+<title>Introduction</title>
 
-<para
->&ksplash; is a nice splash screen that shows the progress of an application that is loading. Please report any problems or feature requests to the &kde; mailing lists. The principal features of &ksplash;: </para>
+<para>&ksplash; is a nice splash screen that shows the progress of an application that is loading. Please report any problems or feature requests to the &kde; mailing lists. The principal features of &ksplash;: </para>
 <simplelist>
-<member
->Themeable</member>
-<member
->Uses plugins to be completely customisable</member>
-<member
->Can be used by any application that uses DCOP</member>
+<member>Themeable</member>
+<member>Uses plugins to be completely customisable</member>
+<member>Can be used by any application that uses DCOP</member>
 </simplelist>
 
-<para
->This handbook will show you how to create themes for use with plugins that are already available. If none of the plugins available satisfy your tastes, you can learn how to customise the appearance of &ksplash; completely by writing a plugin in C++. </para>
+<para>This handbook will show you how to create themes for use with plugins that are already available. If none of the plugins available satisfy your tastes, you can learn how to customise the appearance of &ksplash; completely by writing a plugin in C++. </para>
 </chapter>
 
 <chapter id="using-themes">
-<title
->Using themes</title>
-
-<para
->To use themes from <ulink url="http://www.kde-look.org"
->KDE-Look</ulink
->, extract them to <filename
->~/.trinity/share/apps/ksplash/Themes/</filename
-> for a single user, or to <filename
->$<envar
->TDEDIR</envar
->/share/apps/ksplash/Themes/</filename
-> to make them available to all users of your system.</para>
-
-<para
->You can also use the <guilabel
->Splash Screen</guilabel
-> module under <guilabel
->Appearance</guilabel
-> in the &kde; control centre to do this automatically.</para>
+<title>Using themes</title>
+
+<para>To use themes from <ulink url="http://www.kde-look.org">KDE-Look</ulink>, extract them to <filename>~/.trinity/share/apps/ksplash/Themes/</filename> for a single user, or to <filename>$<envar>TDEDIR</envar>/share/apps/ksplash/Themes/</filename> to make them available to all users of your system.</para>
+
+<para>You can also use the <guilabel>Splash Screen</guilabel> module under <guilabel>Appearance</guilabel> in the &kde; control centre to do this automatically.</para>
 
 <sect1 id="using-kcontrol-module">
-<title
->Using the &kcontrol; Module</title>
-
-<para
->This module allows you to install, test and remove &ksplash; themes.</para>
-
-<para
->Down the side of the module is a list of currently available &ksplash; themes. As you select one, a preview will display in the main part of the window. When you have selected the one you wish to use, press <guibutton
->OK</guibutton
-> or <guibutton
->Apply</guibutton
->. Press <guibutton
->Cancel</guibutton
-> to exit the module without making changes, and <guibutton
->Defaults</guibutton
-> to restore the system default splash screen.</para>
-
-<para
->To install new modules, press <guibutton
->Add...</guibutton
->, and find the theme on your computer. You do not have to unpack theme files, you can safely select the compressed theme file. Installing a theme does not make it the theme in use until you select it in the list and press either <guibutton
->OK</guibutton
-> or <guibutton
->Apply</guibutton
->.</para>
-
-<para
->Although you can see a preview of the splash screen, you may like to see how it looks in real use, for instance to see what the animation looks like. You can test themes by selecting them in the list and clicking the <guibutton
->Test</guibutton
-> button.</para>
-
-<para
->You can also remove themes you no longer wish to use, by selecting them and pressing the <guibutton
->Remove</guibutton
-> button. Note that your user account may not have the right to remove themes installed system-wide. It is also recommended you do not uninstall the <guilabel
->Default</guilabel
-> splash screen.</para>
+<title>Using the &kcontrol; Module</title>
+
+<para>This module allows you to install, test and remove &ksplash; themes.</para>
+
+<para>Down the side of the module is a list of currently available &ksplash; themes. As you select one, a preview will display in the main part of the window. When you have selected the one you wish to use, press <guibutton>OK</guibutton> or <guibutton>Apply</guibutton>. Press <guibutton>Cancel</guibutton> to exit the module without making changes, and <guibutton>Defaults</guibutton> to restore the system default splash screen.</para>
+
+<para>To install new modules, press <guibutton>Add...</guibutton>, and find the theme on your computer. You do not have to unpack theme files, you can safely select the compressed theme file. Installing a theme does not make it the theme in use until you select it in the list and press either <guibutton>OK</guibutton> or <guibutton>Apply</guibutton>.</para>
+
+<para>Although you can see a preview of the splash screen, you may like to see how it looks in real use, for instance to see what the animation looks like. You can test themes by selecting them in the list and clicking the <guibutton>Test</guibutton> button.</para>
+
+<para>You can also remove themes you no longer wish to use, by selecting them and pressing the <guibutton>Remove</guibutton> button. Note that your user account may not have the right to remove themes installed system-wide. It is also recommended you do not uninstall the <guilabel>Default</guilabel> splash screen.</para>
 
 </sect1>
 
 </chapter>
 
 <chapter id="themes">
-<title
->How to make themes for &ksplash;</title>
+<title>How to make themes for &ksplash;</title>
 <sect1 id="themes-general">
-<title
->General</title>
-<para
->Making your own themes for &ksplash; is easy. After you have finished your themes you can post them on the <ulink url="http://www.kde-look.org"
->KDE-Look</ulink
-> so that others can use it.</para>
+<title>General</title>
+<para>Making your own themes for &ksplash; is easy. After you have finished your themes you can post them on the <ulink url="http://www.kde-look.org">KDE-Look</ulink> so that others can use it.</para>
 
 <sect2 id="theme-syntax">
-<title
->Identifying your theme</title>
-
-<para
->Let us create a theme called <literal
->MyCoolTheme</literal
->. For the theme to be recognised by &ksplash;, it should be stored in a folder called <filename class="directory"
->MyCoolTheme</filename
-> under <filename class="directory"
->~/.trinity/apps/ksplash/Themes/</filename
->. It should have a file called <filename
->Theme.rc</filename
->, containing the settings of the theme. You can specify large numbers of special things to theme, change the plugin engine to use, and so on. You do not have to use all the settings available; usually, the settings have an acceptable default value. The basic syntax for entries in the <filename
->Theme.rc</filename
-> file is <literal
->[option] = [value]</literal
-> You can find the definitions of the various options in the following sections.</para>
+<title>Identifying your theme</title>
+
+<para>Let us create a theme called <literal>MyCoolTheme</literal>. For the theme to be recognised by &ksplash;, it should be stored in a folder called <filename class="directory">MyCoolTheme</filename> under <filename class="directory">~/.trinity/apps/ksplash/Themes/</filename>. It should have a file called <filename>Theme.rc</filename>, containing the settings of the theme. You can specify large numbers of special things to theme, change the plugin engine to use, and so on. You do not have to use all the settings available; usually, the settings have an acceptable default value. The basic syntax for entries in the <filename>Theme.rc</filename> file is <literal>[option] = [value]</literal> You can find the definitions of the various options in the following sections.</para>
 
 <example>
-<title
->Simple <filename
->Theme.rc</filename
-> file</title>
-<programlisting
->[KSplash Theme: MyCoolTheme]
+<title>Simple <filename>Theme.rc</filename> file</title>
+<programlisting>[KSplash Theme: MyCoolTheme]
 Name = MyCoolTheme
 Description = A nice theme using XpLike engine
 Version = 1.0
@@ -214,176 +112,107 @@ Welcome Text = Loading KDE
 </programlisting>
 </example>
 
-<para
->After specifying the name, the description and the author of the theme, you should first choose a theme engine (also known as a plugin). Then, you can customise various features of the theme engine by assigning key-value pairs as in the example file above.</para>
+<para>After specifying the name, the description and the author of the theme, you should first choose a theme engine (also known as a plugin). Then, you can customise various features of the theme engine by assigning key-value pairs as in the example file above.</para>
 
-<para
->It is important that the name of the directory under which the theme files are stored (<filename class="directory"
->~/.trinity/apps/ksplash/Themes/MyCoolTheme</filename
-> in our case) and the identifier (<literal
->[KSplash Theme: MyCoolTheme] </literal
-> in our case) of the theme in the <filename
->Theme.rc</filename
-> file are identical. Otherwise, &ksplash; will not recognise the theme. </para>
+<para>It is important that the name of the directory under which the theme files are stored (<filename class="directory">~/.trinity/apps/ksplash/Themes/MyCoolTheme</filename> in our case) and the identifier (<literal>[KSplash Theme: MyCoolTheme] </literal> in our case) of the theme in the <filename>Theme.rc</filename> file are identical. Otherwise, &ksplash; will not recognise the theme. </para>
 
 </sect2>
 
 <sect2 id="theme-files">
-<title
->Background files</title>
-
-<para
->When &ksplash; starts, it tries to find a background image for your current screen resolution, if the theme engine uses one. The background image file should be named in the following format: <filename
->Background-<replaceable
->WWWxHHH</replaceable
->.png</filename
->.</para>
-
-<para
->For example, you might use a file called <filename
->Background-1024x768</filename
->. If the background image for your screen resolution cannot be found, it tries to resize the original <filename
->Background.png</filename
-> or the file specified in <filename
->Theme.rc</filename
-> to suit the current resolution. Resizing on-the-fly will certainly take some time, so you should provide background images for at least the following sizes: 1280x1024, 1024x768 and 800x600.</para>
+<title>Background files</title>
+
+<para>When &ksplash; starts, it tries to find a background image for your current screen resolution, if the theme engine uses one. The background image file should be named in the following format: <filename>Background-<replaceable>WWWxHHH</replaceable>.png</filename>.</para>
+
+<para>For example, you might use a file called <filename>Background-1024x768</filename>. If the background image for your screen resolution cannot be found, it tries to resize the original <filename>Background.png</filename> or the file specified in <filename>Theme.rc</filename> to suit the current resolution. Resizing on-the-fly will certainly take some time, so you should provide background images for at least the following sizes: 1280x1024, 1024x768 and 800x600.</para>
 </sect2>
 </sect1>
 
 <sect1 id="theme-engines">
-<title
->Options for Theme Engines</title>
+<title>Options for Theme Engines</title>
 
 <sect2 id="standard-themes">
-<title
->Standard Theme</title>
+<title>Standard Theme</title>
 <table>
-<title
->Standard Theme Options</title>
+<title>Standard Theme Options</title>
 <tgroup cols="3">
 <tbody>
 <row>
-<entry
->Name</entry>
-<entry
->Argument</entry>
-<entry
->Explanation</entry>
+<entry>Name</entry>
+<entry>Argument</entry>
+<entry>Explanation</entry>
 </row>
 <!-- Statusbar -->
 <row>
-<entry
->Statusbar Position</entry>
-<entry
->[top/bottom]</entry>
-<entry
->Toggles the position of the statusbar on the screen. Default is bottom.</entry>
+<entry>Statusbar Position</entry>
+<entry>[top/bottom]</entry>
+<entry>Toggles the position of the statusbar on the screen. Default is bottom.</entry>
 </row>
 <row>
-<entry
->Statusbar Visible</entry>
-<entry
->[true/false]</entry>
-<entry
->Indicates whether the statusbar should be shown. Default is true.</entry>
+<entry>Statusbar Visible</entry>
+<entry>[true/false]</entry>
+<entry>Indicates whether the statusbar should be shown. Default is true.</entry>
 </row>
 <row>
-<entry
->Progress Visible</entry>
-<entry
->[true/false]</entry>
-<entry
->Indicates whether loading progress should be shown. Default is true.</entry>
+<entry>Progress Visible</entry>
+<entry>[true/false]</entry>
+<entry>Indicates whether loading progress should be shown. Default is true.</entry>
 </row>
 <!-- Fonts -->
 <row>
-<entry
->Statusbar Font</entry>
-<entry
->[fontname]</entry>
-<entry
->The font used in statusbar. Default is Helvetica.</entry>
+<entry>Statusbar Font</entry>
+<entry>[fontname]</entry>
+<entry>The font used in statusbar. Default is Helvetica.</entry>
 </row>
 <row>
-<entry
->Statusbar Font Size</entry>
-<entry
->[size]</entry>
-<entry
->The font size for the statusbar. Default is 16.</entry>
+<entry>Statusbar Font Size</entry>
+<entry>[size]</entry>
+<entry>The font size for the statusbar. Default is 16.</entry>
 </row>
 <row>
-<entry
->Statusbar Font Bold</entry>
-<entry
->[true/false]</entry>
-<entry
->Indicates whether the statusbar font should be bold. Default is true.</entry>
+<entry>Statusbar Font Bold</entry>
+<entry>[true/false]</entry>
+<entry>Indicates whether the statusbar font should be bold. Default is true.</entry>
 </row>
 <row>
-<entry
->Statusbar Font Italic</entry>
-<entry
->[true/false]</entry>
-<entry
->Indicates whether the statusbar font should be italic. Default is false.</entry>
+<entry>Statusbar Font Italic</entry>
+<entry>[true/false]</entry>
+<entry>Indicates whether the statusbar font should be italic. Default is false.</entry>
 </row>
 <!-- Misc. things -->
 <row>
-<entry
->Statusbar Foreground</entry>
-<entry
->[color]</entry>
-<entry
->The foreground colour of statusbar. Default is white.</entry>
+<entry>Statusbar Foreground</entry>
+<entry>[color]</entry>
+<entry>The foreground colour of statusbar. Default is white.</entry>
 </row>
 <row>
-<entry
->Statusbar Background</entry>
-<entry
->[color]</entry>
-<entry
->The background colour of statusbar. Default is black.</entry>
+<entry>Statusbar Background</entry>
+<entry>[color]</entry>
+<entry>The background colour of statusbar. Default is black.</entry>
 </row>
 <row>
-<entry
->Statusbar Icon</entry>
-<entry
->[true/false]</entry>
-<entry
->Indicates whether the statusbar should have an icon.</entry>
+<entry>Statusbar Icon</entry>
+<entry>[true/false]</entry>
+<entry>Indicates whether the statusbar should have an icon.</entry>
 </row>
 <row>
-<entry
->Icons Visible</entry>
-<entry
->[true/false]</entry>
-<entry
->Indicates whether icons should be visible. Default is true.</entry>
+<entry>Icons Visible</entry>
+<entry>[true/false]</entry>
+<entry>Indicates whether icons should be visible. Default is true.</entry>
 </row>
 <row>
-<entry
->Icons Jumping</entry>
-<entry
->[true/false]</entry>
-<entry
->Indicates whether icons should be jumping. Default is true.</entry>
+<entry>Icons Jumping</entry>
+<entry>[true/false]</entry>
+<entry>Indicates whether icons should be jumping. Default is true.</entry>
 </row>
 <row>
-<entry
->Icon Position</entry>
-<entry
->[0-3,10-13]</entry>
-<entry
->Position where the icons are shown. Default is bottom-left.</entry>
+<entry>Icon Position</entry>
+<entry>[0-3,10-13]</entry>
+<entry>Position where the icons are shown. Default is bottom-left.</entry>
 </row>
 <row>
-<entry
->Splash Screen</entry>
-<entry
->[name]</entry>
-<entry
->Changes the splash screen image that is shown.</entry>
+<entry>Splash Screen</entry>
+<entry>[name]</entry>
+<entry>Changes the splash screen image that is shown.</entry>
 </row>
 </tbody>
 </tgroup>
@@ -391,137 +220,88 @@ Welcome Text = Loading KDE
 </sect2>
 
 <sect2 id="redmond-themes">
-<title
->Redmond theme</title>
+<title>Redmond theme</title>
 <table>
-<title
->Redmond theme options</title>
+<title>Redmond theme options</title>
 <tgroup cols="3">
 <tbody>
 <row>
-<entry
->Name</entry>
-<entry
->Argument</entry>
-<entry
->Explanation</entry>
+<entry>Name</entry>
+<entry>Argument</entry>
+<entry>Explanation</entry>
 </row>
 <!-- Main elements -->
 <row>
-<entry
->Background Image</entry>
-<entry
->[filename]</entry>
-<entry
->User defined background image to use.</entry>
+<entry>Background Image</entry>
+<entry>[filename]</entry>
+<entry>User defined background image to use.</entry>
 </row>
 <row>
-<entry
->User Icon</entry>
-<entry
->[Iconname]</entry>
-<entry
->Name of standard icon to show for user. Default is <constant
->go</constant
->.</entry>
+<entry>User Icon</entry>
+<entry>[Iconname]</entry>
+<entry>Name of standard icon to show for user. Default is <constant>go</constant>.</entry>
 </row>
 <row>
-<entry
->Welcome Text</entry>
-<entry
->[text]</entry>
-<entry
->Text shown in splash screen. Default is "Welcome".</entry>
+<entry>Welcome Text</entry>
+<entry>[text]</entry>
+<entry>Text shown in splash screen. Default is "Welcome".</entry>
 </row>
 <row>
-<entry
->Username Text</entry>
-<entry
->[text]</entry>
-<entry
->Text shown instead of user's real name.</entry>
+<entry>Username Text</entry>
+<entry>[text]</entry>
+<entry>Text shown instead of user's real name.</entry>
 </row>
 <!-- Positioning elements -->
 <row>
-<entry
->Welcome Text Position</entry>
-<entry
->[x,y]</entry>
-<entry
->Position on the screen where the Welcome Text is shown.</entry>
+<entry>Welcome Text Position</entry>
+<entry>[x,y]</entry>
+<entry>Position on the screen where the Welcome Text is shown.</entry>
 </row>
 <row>
-<entry
->Username Text Position</entry>
-<entry
->[x,y]</entry>
-<entry
->Position on the screen where the username is shown.</entry>
+<entry>Username Text Position</entry>
+<entry>[x,y]</entry>
+<entry>Position on the screen where the username is shown.</entry>
 </row>
 <row>
-<entry
->Action Text Position</entry>
-<entry
->[x,y]</entry>
-<entry
->Position on the screen where the current action is shown.</entry>
+<entry>Action Text Position</entry>
+<entry>[x,y]</entry>
+<entry>Position on the screen where the current action is shown.</entry>
 </row>
 <row>
-<entry
->Icon Position</entry>
-<entry
->[x,y]</entry>
-<entry
->Position on the screen where the user icon is shown.</entry>
+<entry>Icon Position</entry>
+<entry>[x,y]</entry>
+<entry>Position on the screen where the user icon is shown.</entry>
 </row>
 <!-- Show to show.. -->
 <row>
-<entry
->Show Welcome Text</entry>
-<entry
->[true/false]</entry>
-<entry
->Toggles showing of welcome text. Default is true.</entry>
+<entry>Show Welcome Text</entry>
+<entry>[true/false]</entry>
+<entry>Toggles showing of welcome text. Default is true.</entry>
 </row>
 <row>
-<entry
->Show Welcome Shadow</entry>
-<entry
->[true/false]</entry>
-<entry
->Toggles showing of welcome text's shadow. Default is true.</entry>
+<entry>Show Welcome Shadow</entry>
+<entry>[true/false]</entry>
+<entry>Toggles showing of welcome text's shadow. Default is true.</entry>
 </row>
 <row>
-<entry
->Show Username</entry>
-<entry
->[true/false]</entry>
-<entry
->Toggles showing of username. Default is true.</entry>
+<entry>Show Username</entry>
+<entry>[true/false]</entry>
+<entry>Toggles showing of username. Default is true.</entry>
 </row>
 <row>
-<entry
->Show Action</entry>
-<entry
->[true/false]</entry>
-<entry
->Toggles showing of action currently being performed. Default is true.</entry>
+<entry>Show Action</entry>
+<entry>[true/false]</entry>
+<entry>Toggles showing of action currently being performed. Default is true.</entry>
 </row>
 <row>
-<entry
->Show Icon</entry>
-<entry
->[true/false]</entry>
-<entry
->Indicates whether icon should be shown. Default is true</entry>
+<entry>Show Icon</entry>
+<entry>[true/false]</entry>
+<entry>Indicates whether icon should be shown. Default is true</entry>
 </row>
 <row>
-<entry
->Use TDM User Icon</entry>
-<entry
->[true/false]</entry>
-<entry
->Show user's login icon. Default is true.</entry>
+<entry>Use TDM User Icon</entry>
+<entry>[true/false]</entry>
+<entry>Show user's login icon. Default is true.</entry>
 </row>
 </tbody>
 </tgroup>
@@ -529,68 +309,45 @@ Welcome Text = Loading KDE
 </sect2>
 
 <sect2 id="macx-themes">
-<title
->MacX Theme</title>
+<title>MacX Theme</title>
 <table>
-<title
->MacX Theme Options</title>
+<title>MacX Theme Options</title>
 <tgroup cols="3">
 <tbody>
 <row>
-<entry
->Name</entry>
-<entry
->Argument</entry>
-<entry
->Explanation</entry>
+<entry>Name</entry>
+<entry>Argument</entry>
+<entry>Explanation</entry>
 </row>
 <row>
-<entry
->Icon Size Minimum</entry>
-<entry
->[size]</entry>
-<entry
->Assign the minimum size for icons. Default is 16.</entry>
+<entry>Icon Size Minimum</entry>
+<entry>[size]</entry>
+<entry>Assign the minimum size for icons. Default is 16.</entry>
 </row>
 <row>
-<entry
->Icon Size Maximum</entry>
-<entry
->[size]</entry>
-<entry
->Assign the maximum size for icons. Default is 64.</entry>
+<entry>Icon Size Maximum</entry>
+<entry>[size]</entry>
+<entry>Assign the maximum size for icons. Default is 64.</entry>
 </row>
 <row>
-<entry
->Optimised Icon Rendering</entry>
-<entry
->[true/false]</entry>
-<entry
->Optimise icon rendering. Default is true.</entry>
+<entry>Optimised Icon Rendering</entry>
+<entry>[true/false]</entry>
+<entry>Optimise icon rendering. Default is true.</entry>
 </row>
 <row>
-<entry
->Progress Bar Visible</entry>
-<entry
->[true/false]</entry>
-<entry
->Default is true.</entry>
+<entry>Progress Bar Visible</entry>
+<entry>[true/false]</entry>
+<entry>Default is true.</entry>
 </row>
 <row>
-<entry
->Progress Bar Position</entry>
-<entry
->[top/bottom]</entry>
-<entry
->Toggles whether statusbar should be in bottom or top. Default is bottom.</entry>
+<entry>Progress Bar Position</entry>
+<entry>[top/bottom]</entry>
+<entry>Toggles whether statusbar should be in bottom or top. Default is bottom.</entry>
 </row>
 <row>
-<entry
->Icons Jumping</entry>
-<entry
->[true/false]</entry>
-<entry
->Indicates whether icons should be jumping. Default is false.</entry>
+<entry>Icons Jumping</entry>
+<entry>[true/false]</entry>
+<entry>Indicates whether icons should be jumping. Default is false.</entry>
 </row>
 </tbody>
 </tgroup>
@@ -598,52 +355,35 @@ Welcome Text = Loading KDE
 </sect2>
 
 <sect2 id="mac-classic-themes">
-<title
->MacClassic Theme</title>
+<title>MacClassic Theme</title>
 <table>
-<title
->MacClassic Theme Options</title>
+<title>MacClassic Theme Options</title>
 <tgroup cols="3">
 <tbody>
 <row>
-<entry
->Name</entry>
-<entry
->Argument</entry>
-<entry
->Explanation</entry>
+<entry>Name</entry>
+<entry>Argument</entry>
+<entry>Explanation</entry>
 </row>
 <row>
-<entry
->Icon Position</entry>
-<entry
->[0-3,10-13]</entry>
-<entry
->Position of the icons on the screen. Default is bottom left.</entry>
+<entry>Icon Position</entry>
+<entry>[0-3,10-13]</entry>
+<entry>Position of the icons on the screen. Default is bottom left.</entry>
 </row>
 <row>
-<entry
->Icons Jumping</entry>
-<entry
->[true/false]</entry>
-<entry
->Indicates whether icons should be jumping. Default is false.</entry>
+<entry>Icons Jumping</entry>
+<entry>[true/false]</entry>
+<entry>Indicates whether icons should be jumping. Default is false.</entry>
 </row>
 <row>
-<entry
->Icons Visible</entry>
-<entry
->[true/false]</entry>
-<entry
->Indicates whether icons should be visible. Default is true.</entry>
+<entry>Icons Visible</entry>
+<entry>[true/false]</entry>
+<entry>Indicates whether icons should be visible. Default is true.</entry>
 </row>
 <row>
-<entry
->Splash Screen</entry>
-<entry
->[name]</entry>
-<entry
->Changes the splash screen image that is shown.</entry>
+<entry>Splash Screen</entry>
+<entry>[name]</entry>
+<entry>Changes the splash screen image that is shown.</entry>
 </row>
 </tbody>
 </tgroup>
@@ -651,84 +391,55 @@ Welcome Text = Loading KDE
 </sect2>
 
 <sect2 id="themes-2k">
-<title
->2k theme</title>
+<title>2k theme</title>
 <table>
-<title
->2k theme options</title>
+<title>2k theme options</title>
 <tgroup cols="3">
 <tbody>
 <row>
-<entry
->Name</entry>
-<entry
->Argument</entry>
-<entry
->Explanation</entry>
+<entry>Name</entry>
+<entry>Argument</entry>
+<entry>Explanation</entry>
 </row>
 <row>
-<entry
->Title Background Colour</entry>
-<entry
->[color]</entry>
-<entry
->The background colour of title. Default is dark blue.</entry>
+<entry>Title Background Colour</entry>
+<entry>[color]</entry>
+<entry>The background colour of title. Default is dark blue.</entry>
 </row>
 <row>
-<entry
->Title Foreground Colour</entry>
-<entry
->[color]</entry>
-<entry
->The foreground colour of title. Default is white.</entry>
+<entry>Title Foreground Colour</entry>
+<entry>[color]</entry>
+<entry>The foreground colour of title. Default is white.</entry>
 </row>
 <row>
-<entry
->Status Text Colour</entry>
-<entry
->[color]</entry>
-<entry
->The colour of status texts. Default is the same as Title Background Colour.</entry>
+<entry>Status Text Colour</entry>
+<entry>[color]</entry>
+<entry>The colour of status texts. Default is the same as Title Background Colour.</entry>
 </row>
 <row>
-<entry
->Rotator Colour 1</entry>
-<entry
->[color]</entry>
-<entry
->Defines the colour of rotator 1. Default is dark blue.</entry>
+<entry>Rotator Colour 1</entry>
+<entry>[color]</entry>
+<entry>Defines the colour of rotator 1. Default is dark blue.</entry>
 </row>
 <row>
-<entry
->Rotator Colour 2</entry>
-<entry
->[color]</entry>
-<entry
->Defines the colour of rotator 2. Default is cyan.</entry>
+<entry>Rotator Colour 2</entry>
+<entry>[color]</entry>
+<entry>Defines the colour of rotator 2. Default is cyan.</entry>
 </row>
 <row>
-<entry
->Rotator Speed</entry>
-<entry
->[value]</entry>
-<entry
->Defines the speed of the rotator. Default is 30.</entry>
+<entry>Rotator Speed</entry>
+<entry>[value]</entry>
+<entry>Defines the speed of the rotator. Default is 30.</entry>
 </row>
 <row>
-<entry
->Window Title</entry>
-<entry
->[text]</entry>
-<entry
->Specifies the title text of the window.</entry>
+<entry>Window Title</entry>
+<entry>[text]</entry>
+<entry>Specifies the title text of the window.</entry>
 </row>
 <row>
-<entry
->Logo File</entry>
-<entry
->[filename]</entry>
-<entry
->Defines the logo used.</entry>
+<entry>Logo File</entry>
+<entry>[filename]</entry>
+<entry>Defines the logo used.</entry>
 </row>
 </tbody>
 </tgroup>
@@ -738,33 +449,22 @@ Welcome Text = Loading KDE
 </chapter>
 
 <chapter id="from-other-applications">
-<title
->Using &ksplash; From Within Your Own Application</title>
+<title>Using &ksplash; From Within Your Own Application</title>
 
-<para
->In this chapter, we describe a simple method for using &ksplash; as the splash screen for your &kde; application. If you do not develop applications for &kde;, you can skip this chapter.</para>
+<para>In this chapter, we describe a simple method for using &ksplash; as the splash screen for your &kde; application. If you do not develop applications for &kde;, you can skip this chapter.</para>
 
 <sect1 id="basic-other-reqs">
-<title
->Basic Requirements</title>
-
-<para
->Your &kde; application must be &DCOP;-aware. &DCOP; is the &kde; technology used to communicate between applications. If you use the standard <ulink url="http://developer.kde.org"
->&kde; application framework</ulink
->, this is taken care of automatically. For information about &DCOP; and related &kde; technologies, please visit the <ulink url="http://developer.kde.org"
->&kde; developers' corner</ulink
->.</para>
+<title>Basic Requirements</title>
+
+<para>Your &kde; application must be &DCOP;-aware. &DCOP; is the &kde; technology used to communicate between applications. If you use the standard <ulink url="http://developer.kde.org">&kde; application framework</ulink>, this is taken care of automatically. For information about &DCOP; and related &kde; technologies, please visit the <ulink url="http://developer.kde.org">&kde; developers' corner</ulink>.</para>
 </sect1>
 
 <sect1 id="other-using">
-<title
->Starting &ksplash;</title>
+<title>Starting &ksplash;</title>
 
-<para
->Before your application starts its computation intensive work, or before it starts loading plugins, &etc;, invoke &ksplash; as follows:</para>
+<para>Before your application starts its computation intensive work, or before it starts loading plugins, &etc;, invoke &ksplash; as follows:</para>
 
-<programlisting
->DCOPClient *c = kapp-&gt;dcopClient();
+<programlisting>DCOPClient *c = kapp-&gt;dcopClient();
 QString error;
 QCString KSplashName;
 int pid = 0;
@@ -777,50 +477,39 @@ if (kapp-&gt;startServiceByDesktopName("ksplash", args, &amp;error, &amp;KSplash
 }
 </programlisting>
 
-<para
->We will assume that there is only one instance of &ksplash; running. Other cases are slightly more complex. Please see the &DCOP; documentation for further details.</para>
+<para>We will assume that there is only one instance of &ksplash; running. Other cases are slightly more complex. Please see the &DCOP; documentation for further details.</para>
 </sect1>
 
 <sect1 id="show-messages">
-<title
->Showing messages</title>
+<title>Showing messages</title>
 
-<para
->Before you show any messages, you need to set up the number of steps you will show. For example, the &kde; startup procedure uses 7 steps.</para>
+<para>Before you show any messages, you need to set up the number of steps you will show. For example, the &kde; startup procedure uses 7 steps.</para>
 
-<programlisting
->QByteArray data;
+<programlisting>QByteArray data;
     QDataStream arg(data,IO_WriteOnly);
     arg &lt;&lt; someNumber;
     if (!(c-&gt;send(KSplashName, "KSplashIface", "setStartupItemCount(int)", data))
       // Some error processing here.
 </programlisting>
 
-<para
->Whenever you want to display a message with or without an icon, use</para>
+<para>Whenever you want to display a message with or without an icon, use</para>
 
-<programlisting
->arg &lt;&lt; QString("iconName") &lt;&lt; QString("programName") &lt;&lt; QString("Some description");
+<programlisting>arg &lt;&lt; QString("iconName") &lt;&lt; QString("programName") &lt;&lt; QString("Some description");
     if (!(c-&gt;send(KSplashName, "KSplashIface", "programStarted(QString,QString,QString)", data))
     {
       // Some error processing here.
     }
 </programlisting>
 
-<para
->Each time you call <constant
->programStarted</constant
->, the steps completed is incremented. When your program has finished its startup, do the following to make the splash screen go away:</para>
+<para>Each time you call <constant>programStarted</constant>, the steps completed is incremented. When your program has finished its startup, do the following to make the splash screen go away:</para>
 
-<programlisting
->if (!(c-&gt;send(KSplashName, "KSplashIface", "startupComplete()", data))
+<programlisting>if (!(c-&gt;send(KSplashName, "KSplashIface", "startupComplete()", data))
     {
       // Some error processing here.
     }
 </programlisting>
 
-<para
->That's it! You don't need anything more to take advantage of all that &ksplash; has to offer you.</para>
+<para>That's it! You don't need anything more to take advantage of all that &ksplash; has to offer you.</para>
 
 </sect1>
 </chapter>
@@ -829,65 +518,25 @@ if (kapp-&gt;startServiceByDesktopName("ksplash", args, &amp;error, &amp;KSplash
 <!-- will have to still translate it ... -->
 
 <chapter id="wrplugins">
-<title
->Writing new &ksplash; plugins</title>
+<title>Writing new &ksplash; plugins</title>
 
-<para
->Writing new &ksplash; plugins is not difficult. In this chapter, we will write a simple plugin that will emulate the splash screen of a well known operating system. This tutorial assumes that you know the basics of C++, and a little bit of KDE/Qt programming.</para>
+<para>Writing new &ksplash; plugins is not difficult. In this chapter, we will write a simple plugin that will emulate the splash screen of a well known operating system. This tutorial assumes that you know the basics of C++, and a little bit of KDE/Qt programming.</para>
 
 <sect1 id="basic-requirements">
-<title
->Basic Requirements</title>
-<para
->We will create a plugin called <literal
->2k</literal
->. The plugin name is used in various places, and is important that you consistently use it so that the plugin is recognised by &ksplash;. &ksplash; plugins are actually dynamically loadable libraries with the following naming convention: </para>
+<title>Basic Requirements</title>
+<para>We will create a plugin called <literal>2k</literal>. The plugin name is used in various places, and is important that you consistently use it so that the plugin is recognised by &ksplash;. &ksplash; plugins are actually dynamically loadable libraries with the following naming convention: </para>
 <simplelist>
-<member
->The library should be named as <filename
->ksplash+lowercasethemename</filename
->. For our theme, it will be <filename
->ksplash2k</filename
->.</member>
-<member
->It should have a corresponding desktop file which is named as <filename
->ksplash+lowercasethemename.desktop</filename
->. For our theme, it will be <filename
->ksplash2k.desktop</filename
->. </member>
-<member
->Finally, the object that is returned by the library should be a class which is named <literal
->Theme+themename</literal
->. For our example, it will be <literal
->Theme2k</literal
->.</member>
+<member>The library should be named as <filename>ksplash+lowercasethemename</filename>. For our theme, it will be <filename>ksplash2k</filename>.</member>
+<member>It should have a corresponding desktop file which is named as <filename>ksplash+lowercasethemename.desktop</filename>. For our theme, it will be <filename>ksplash2k.desktop</filename>. </member>
+<member>Finally, the object that is returned by the library should be a class which is named <literal>Theme+themename</literal>. For our example, it will be <literal>Theme2k</literal>.</member>
 </simplelist>
-<para
->Do not worry about it if you don't understand all of the above. We will consider each of those points in detail later. The other very important detail is that the plugin class should be derived from <literal
->ThemeEngine</literal
->. </para>
+<para>Do not worry about it if you don't understand all of the above. We will consider each of those points in detail later. The other very important detail is that the plugin class should be derived from <literal>ThemeEngine</literal>. </para>
 </sect1>
 <sect1 id="skeleton">
-<title
->Building the skeleton framework</title>
-<para
->We will use the &kde; application framework which will take care of building the plugin and will provide us with platform independence without any work on our part. To do that, make sure you have the <filename
->tdesdk</filename
-> package installed. Run the command <literal
->kapptemplate</literal
-> to produce an application named "2k". It will create a toplevel folder which contains generic files such as AUTHORS, &etc;. We are most interested in the subfolder called <filename class="directory"
->2k</filename
->. Go into that subfolder and delete all the files there. Now we have the skeleton we require. </para>
-<para
->The next step is to create a <filename
->.desktop</filename
-> file which, when installed, will tell &ksplash; that our plugin is available. Consistent with the naming conventions laid out in <link linkend="basic-requirements"
->the preceding section</link
->, create a file called <filename
->ksplash2k.desktop</filename
-> in that folder. It should contain the following lines: </para>
-<programlisting
-><literal>
+<title>Building the skeleton framework</title>
+<para>We will use the &kde; application framework which will take care of building the plugin and will provide us with platform independence without any work on our part. To do that, make sure you have the <filename>tdesdk</filename> package installed. Run the command <literal>kapptemplate</literal> to produce an application named "2k". It will create a toplevel folder which contains generic files such as AUTHORS, &etc;. We are most interested in the subfolder called <filename class="directory">2k</filename>. Go into that subfolder and delete all the files there. Now we have the skeleton we require. </para>
+<para>The next step is to create a <filename>.desktop</filename> file which, when installed, will tell &ksplash; that our plugin is available. Consistent with the naming conventions laid out in <link linkend="basic-requirements">the preceding section</link>, create a file called <filename>ksplash2k.desktop</filename> in that folder. It should contain the following lines: </para>
+<programlisting><literal>
 [Desktop Entry]
 Encoding=UTF-8
 Type=Service
@@ -898,94 +547,29 @@ X-TDE-Library=ksplash2k
 X-KSplash-Default=true
 X-KSplash-PluginName=2k
 X-KSplash-ObjectName=Theme2k
-</literal
->
+</literal>
 </programlisting>
-<para
->The <literal
->Encoding</literal
->, <literal
->Type</literal
->, <literal
->Comment</literal
-> and <literal
->ServiceTypes</literal
-> are the same for all plugins. The plugin name and the library name follow the conventions noted earlier. The entry <literal
->X-KSplash-Default</literal
-> takes a boolean value which determines whether it is shown in the control panel configuration module by default. Except for some very rare cases, it should be <constant
->true</constant
->. </para>
+<para>The <literal>Encoding</literal>, <literal>Type</literal>, <literal>Comment</literal> and <literal>ServiceTypes</literal> are the same for all plugins. The plugin name and the library name follow the conventions noted earlier. The entry <literal>X-KSplash-Default</literal> takes a boolean value which determines whether it is shown in the control panel configuration module by default. Except for some very rare cases, it should be <constant>true</constant>. </para>
 </sect1>
 <sect1 id="headerfile">
-<title
->Declaration of plugin class</title>
-<para
->Now that we have the preliminary work done, let us get into the actual fun part - creating a class that will provide the behaviour we want. While we are free to make this class do almost anything we want it to do, there are a few restrictions.</para>
+<title>Declaration of plugin class</title>
+<para>Now that we have the preliminary work done, let us get into the actual fun part - creating a class that will provide the behaviour we want. While we are free to make this class do almost anything we want it to do, there are a few restrictions.</para>
 <orderedlist>
-<listitem
-><para
->Plugin classes must inherit the <constant
->ThemeEngine</constant
-> class.</para
-></listitem>
-<listitem
-><para
->Plugin classes must be named according to the rule: <classname
->Theme+PluginName</classname
->.</para
-></listitem>
-<listitem
-><para
->Plugin classes should provide a <literal
->static</literal
-> function called <function
->names</function
-> that returns a list of names by which it can be invoked.</para
-></listitem>
-<listitem
-><para
->If the plugin can be configured in the control centre module, it should provide a <literal
->ThemeEngineConfig</literal
->-based class for the configuration.</para
-></listitem>
-<listitem
-><para
->Plugin classes must override at least one of the virtual functions <function
->slotSetText</function
->, <function
->slotSetPixmap</function
->, <function
->slotUpdateProgress</function
-> and <function
->slotUpdateSteps</function
-> to make it usable.</para
-></listitem>
-<listitem
-><para
->The constructor should take the form <literal
->ThemeEngine( QWidget *parent, const char *name, const QStringList &amp;args )</literal
-> so that it can be used with <classname
->KGenericFactory</classname
->.</para
-></listitem>
+<listitem><para>Plugin classes must inherit the <constant>ThemeEngine</constant> class.</para></listitem>
+<listitem><para>Plugin classes must be named according to the rule: <classname>Theme+PluginName</classname>.</para></listitem>
+<listitem><para>Plugin classes should provide a <literal>static</literal> function called <function>names</function> that returns a list of names by which it can be invoked.</para></listitem>
+<listitem><para>If the plugin can be configured in the control centre module, it should provide a <literal>ThemeEngineConfig</literal>-based class for the configuration.</para></listitem>
+<listitem><para>Plugin classes must override at least one of the virtual functions <function>slotSetText</function>, <function>slotSetPixmap</function>, <function>slotUpdateProgress</function> and <function>slotUpdateSteps</function> to make it usable.</para></listitem>
+<listitem><para>The constructor should take the form <literal>ThemeEngine( QWidget *parent, const char *name, const QStringList &amp;args )</literal> so that it can be used with <classname>KGenericFactory</classname>.</para></listitem>
 </orderedlist>
-<para
->The last requirement may seem complicated, but, as we will see later, by adding a single line to your source files, you can usually ignore it.</para>
+<para>The last requirement may seem complicated, but, as we will see later, by adding a single line to your source files, you can usually ignore it.</para>
 </sect1>
 <sect1 id="headercode">
-<title
->Code for the header file</title>
-<para
->Given the constaints, we will now see what the header file <filename
->theme2k.h</filename
-> looks like this:</para>
+<title>Code for the header file</title>
+<para>Given the constaints, we will now see what the header file <filename>theme2k.h</filename> looks like this:</para>
 <example>
-<title
->Listing for <filename
->theme2k.h</filename
-></title>
-<programlisting
->#ifndef __THEME2K_H__
+<title>Listing for <filename>theme2k.h</filename></title>
+<programlisting>#ifndef __THEME2K_H__
 #define __THEME2K_H__
 
 #include &lt;qlabel.h&gt;
@@ -1049,50 +633,20 @@ private:
 #endif
 </programlisting>
 </example>
-<para
->Let us analyse the listing above. The <classname
->Theme2k</classname
-> class satisfies the naming conventions, and is inherited from <classname
->ThemeEngine</classname
->. It provides a <methodname
->Theme2k::names()</methodname
->, and has a constructor that takes the required parameters: <function
->Theme2k( QWidget *, const char *, const QStringList&amp; );</function
-> and also provides a simple <methodname
->Theme2k::slotSetText()</methodname
-> method. For the moment, do not worry about the <classname
->RotWidget</classname
-> class. It is a small widget that provides some eye candy for the user. Our plugin is very simple and does not display any icons or show a progressbar. If you would like to display icons, override the <function
->slotSetPixmap</function
-> function. Similar functions exist for setting the progressbar range (<function
->slotUpdateSteps</function
->) and incrementing(<function
->slotUpdateProgress</function
->) the current step. </para>
+<para>Let us analyse the listing above. The <classname>Theme2k</classname> class satisfies the naming conventions, and is inherited from <classname>ThemeEngine</classname>. It provides a <methodname>Theme2k::names()</methodname>, and has a constructor that takes the required parameters: <function>Theme2k( QWidget *, const char *, const QStringList&amp; );</function> and also provides a simple <methodname>Theme2k::slotSetText()</methodname> method. For the moment, do not worry about the <classname>RotWidget</classname> class. It is a small widget that provides some eye candy for the user. Our plugin is very simple and does not display any icons or show a progressbar. If you would like to display icons, override the <function>slotSetPixmap</function> function. Similar functions exist for setting the progressbar range (<function>slotUpdateSteps</function>) and incrementing(<function>slotUpdateProgress</function>) the current step. </para>
 </sect1>
 <sect1 id="Implementation">
-<title
->Implementation of the plugin</title>
-<para
->We will examine only the relevant parts of the implementation. For a listing of the whole implementation, please see the appendix. The first thing we will do is to get the library requirement out of the way:</para>
+<title>Implementation of the plugin</title>
+<para>We will examine only the relevant parts of the implementation. For a listing of the whole implementation, please see the appendix. The first thing we will do is to get the library requirement out of the way:</para>
 <example>
-<title
->Library requirement</title>
-<programlisting
->K_EXPORT_COMPONENT_FACTORY( ksplash2k, KGenericFactory&lt;Theme2k&gt; );
+<title>Library requirement</title>
+<programlisting>K_EXPORT_COMPONENT_FACTORY( ksplash2k, KGenericFactory&lt;Theme2k&gt; );
 </programlisting>
 </example>
-<para
->The macro <constant
->K_EXPORT_COMPONENT_FACTORY</constant
-> is declared in <filename
->kgenericfactory.h</filename
->. Onwards to the constructor! Since this is a very simple plugin, the constructor is pretty straightforward.</para>
+<para>The macro <constant>K_EXPORT_COMPONENT_FACTORY</constant> is declared in <filename>kgenericfactory.h</filename>. Onwards to the constructor! Since this is a very simple plugin, the constructor is pretty straightforward.</para>
 <example>
-<title
->Plugin constructor</title>
-<programlisting
->Theme2k::Theme2k( QWidget *parent, const char *name, const QStringList &amp;args  )
+<title>Plugin constructor</title>
+<programlisting>Theme2k::Theme2k( QWidget *parent, const char *name, const QStringList &amp;args  )
     :ThemeEngine( parent, name, args )
 {
   readSettings();
@@ -1100,15 +654,10 @@ private:
 }
 </programlisting>
 </example>
-<para
->The method <function
->readSettings()</function
-> illustrates the proper way to obtain your theme settings. (You do want people to use your plugins in their themes, don't you?)</para>
+<para>The method <function>readSettings()</function> illustrates the proper way to obtain your theme settings. (You do want people to use your plugins in their themes, don't you?)</para>
 <example>
-<title
->Obtaining theme settings</title>
-<programlisting
->void Theme2k::readSettings()
+<title>Obtaining theme settings</title>
+<programlisting>void Theme2k::readSettings()
 {
   if( !mTheme )
     return;
@@ -1137,25 +686,14 @@ private:
 }
 </programlisting>
 </example>
-<para
->Since we like our users, we provide sensible defaults for parameters that are not present in the theme file. Note that we should always set our group to "KSplash Theme: themename" to remain compatible with future theme specifications. The <function
->initUI()</function
-> method is not very interesting, as it merely builds up the widgets. Please see the appendix for details. </para>
+<para>Since we like our users, we provide sensible defaults for parameters that are not present in the theme file. Note that we should always set our group to "KSplash Theme: themename" to remain compatible with future theme specifications. The <function>initUI()</function> method is not very interesting, as it merely builds up the widgets. Please see the appendix for details. </para>
 </sect1>
 <sect1 id="compilingfile">
-<title
->Compiling the plugin</title>
-<para
->Since we decided to use the &kde; framework for compiling the plugin, we need to create a <filename
->Makefile.am</filename
->. It should look like this:</para>
+<title>Compiling the plugin</title>
+<para>Since we decided to use the &kde; framework for compiling the plugin, we need to create a <filename>Makefile.am</filename>. It should look like this:</para>
 <example>
-<title
->Listing of <filename
->Makefile.am</filename
-></title>
-<programlisting
->INCLUDES = $(all_includes)
+<title>Listing of <filename>Makefile.am</filename></title>
+<programlisting>INCLUDES = $(all_includes)
 
 kde_module_LTLIBRARIES = ksplash2k.la
 
@@ -1174,103 +712,67 @@ themedir = $(kde_datadir)/ksplash/Themes/2k
 theme_DATA = Theme.rc Preview.png
 </programlisting>
 </example>
-<para
->For more information on writing <filename
->Makefile.am</filename
-> files for &kde;, please see the &kde; developers' <ulink url="http://developer.kde.org/documentation/other/makefile_am_howto.html"
->website</ulink
->. The only thing of note is that we provide a default theme based on this plugin, and provide a preview image for it. As a matter of courtesy to your users, you should provide an example <filename
->Theme.rc</filename
-> file illustrating the use of the various options.</para>
+<para>For more information on writing <filename>Makefile.am</filename> files for &kde;, please see the &kde; developers' <ulink url="http://developer.kde.org/documentation/other/makefile_am_howto.html">website</ulink>. The only thing of note is that we provide a default theme based on this plugin, and provide a preview image for it. As a matter of courtesy to your users, you should provide an example <filename>Theme.rc</filename> file illustrating the use of the various options.</para>
 </sect1>
 </chapter>
 
 <chapter id="faq">
-<title
->Questions and Answers</title>
+<title>Questions and Answers</title>
 &reporting.bugs; &updating.documentation; <qandaset id="faqlist">
 <qandaentry>
 <question>
-<para
->I can't find any themes that work in &ksplash;. Why is that?</para>
+<para>I can't find any themes that work in &ksplash;. Why is that?</para>
 </question>
 <answer>
-<para
->You probably don't have the correct plugins for the theme. The plugins are in the <literal
->kde-artwork</literal
-> package. Download and install it, and try then again.</para>
+<para>You probably don't have the correct plugins for the theme. The plugins are in the <literal>kde-artwork</literal> package. Download and install it, and try then again.</para>
 </answer>
 </qandaentry>
 <qandaentry>
 <question>
-<para
->What is file <filename
->Theme.rc</filename
-> and how do I make one?</para>
+<para>What is file <filename>Theme.rc</filename> and how do I make one?</para>
 </question>
 <answer>
-<para
-><filename
->Theme.rc</filename
-> is the file where you can specify a theme's settings. For more information, take a look at <link linkend="themes"
->How to make themes for &ksplash;</link
->. </para>
+<para><filename>Theme.rc</filename> is the file where you can specify a theme's settings. For more information, take a look at <link linkend="themes">How to make themes for &ksplash;</link>. </para>
 </answer>
 </qandaentry>
 </qandaset>
 </chapter>
 
 <chapter id="credits">
-<title
->Credits and Licence</title>
+<title>Credits and Licence</title>
 
-<para
->&ksplash;</para>
+<para>&ksplash;</para>
 
-<para
->Program Copyright &copy; 2003 &Ravikiran.Rajagopal; &Ravikiran.Rajagopal.mail;</para>
+<para>Program Copyright &copy; 2003 &Ravikiran.Rajagopal; &Ravikiran.Rajagopal.mail;</para>
 
 <itemizedlist>
-<title
->Contributors</title>
-<listitem
-><para
->&Brian.C.Ledbetter; &Brian.C.Ledbetter.mail;</para>
+<title>Contributors</title>
+<listitem><para>&Brian.C.Ledbetter; &Brian.C.Ledbetter.mail;</para>
 </listitem>
 </itemizedlist>
 
-<para
->Documentation Copyright &copy; 2003 &Teemu.Rytilahti; &Teemu.Rytilahti.mail;</para>
+<para>Documentation Copyright &copy; 2003 &Teemu.Rytilahti; &Teemu.Rytilahti.mail;</para>
 &underFDL; &underGPL; </chapter>
 
 <appendix id="installation">
-<title
->Installation</title>
+<title>Installation</title>
 
 <sect1 id="requirements">
-<title
->Requirements</title>
+<title>Requirements</title>
 
-<para
->In order to successfully use &ksplash;, you need &kde; version 3.2 or higher. Some themes may require specific plugins. If a theme does not work, please contact the theme author to find out where to obtain the appropriate plugin.</para>
+<para>In order to successfully use &ksplash;, you need &kde; version 3.2 or higher. Some themes may require specific plugins. If a theme does not work, please contact the theme author to find out where to obtain the appropriate plugin.</para>
 
 </sect1>
 
 <sect1 id="compilation">
-<title
->Compilation and Installation</title>
+<title>Compilation and Installation</title>
 &install.compile.documentation; </sect1>
 </appendix>
 <appendix id="srccode">
-<title
->Source code</title>
+<title>Source code</title>
 <sect1 id="theme2kcpp">
-<title
->Listing of <filename
->theme2k.cpp</filename
-></title>
-<programlisting
->#include &lt;qlabel.h&gt;
+<title>Listing of <filename>theme2k.cpp</filename></title>
+<programlisting>#include &lt;qlabel.h&gt;
 #include &lt;qwidget.h&gt;
 
 #include &lt;tdeapplication.h&gt;
@@ -1377,12 +879,8 @@ void Theme2k::readSettings()
 </programlisting>
 </sect1>
 <sect1 id="rotwidgeth">
-<title
->Listing of <filename
->rotwidget.h</filename
-></title>
-<programlisting
->#ifndef         __ROTWIDGET_H__
+<title>Listing of <filename>rotwidget.h</filename></title>
+<programlisting>#ifndef         __ROTWIDGET_H__
 #define         __ROTWIDGET_H__
 
 #include &lt;qlabel.h&gt;
@@ -1421,12 +919,8 @@ protected:
 </programlisting>
 </sect1>
 <sect1 id="rotwidgetcpp">
-<title
->Listing of <filename
->rotwidget.cpp</filename
-></title>
-<programlisting
->#include &lt;kdebug.h&gt;
+<title>Listing of <filename>rotwidget.cpp</filename></title>
+<programlisting>#include &lt;kdebug.h&gt;
 #include &lt;kdialogbase.h&gt;
 #include &lt;kpixmapeffect.h&gt;
 
diff --git a/tde-i18n-en_GB/docs/tdebase/ksysguard/index.docbook b/tde-i18n-en_GB/docs/tdebase/ksysguard/index.docbook
index 49c19b2d9a5..2ca53be8c21 100644
--- a/tde-i18n-en_GB/docs/tdebase/ksysguard/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/ksysguard/index.docbook
@@ -4,659 +4,318 @@
   <!ENTITY kappname "&ksysguard;">
   <!ENTITY package "tdebase">
   <!ENTITY % addindex "IGNORE">
-  <!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+  <!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <book lang="&language;">
 <bookinfo>
-<title
->The &ksysguard; Handbook</title>
+<title>The &ksysguard; Handbook</title>
 
 <authorgroup>
-<author
->&Chris.Schlaeger;&Chris.Schlaeger.mail; </author>
-
-<othercredit role="developer"
->&Chris.Schlaeger;&Chris.Schlaeger.mail; </othercredit>
-
-<othercredit role="developer"
->&Tobias.Koenig;&Tobias.Koenig.mail; </othercredit>
-
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Chris.Schlaeger;&Chris.Schlaeger.mail; </author>
+
+<othercredit role="developer">&Chris.Schlaeger;&Chris.Schlaeger.mail; </othercredit>
+
+<othercredit role="developer">&Tobias.Koenig;&Tobias.Koenig.mail; </othercredit>
+
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 
 </authorgroup>
 
 <copyright>
-<year
->2000</year>
-<holder
->&Chris.Schlaeger;</holder>
+<year>2000</year>
+<holder>&Chris.Schlaeger;</holder>
 </copyright>
 
-<legalnotice
->&FDLNotice;</legalnotice>
+<legalnotice>&FDLNotice;</legalnotice>
 
-<date
->2000-12-14</date>
-<releaseinfo
->1.00.00</releaseinfo>
+<date>2000-12-14</date>
+<releaseinfo>1.00.00</releaseinfo>
 
-<abstract
-><para
->&ksysguard; is a network enabled task manager and system monitor application, with the additional functionality of <application
->top</application
->.</para
-></abstract
-> 
+<abstract><para>&ksysguard; is a network enabled task manager and system monitor application, with the additional functionality of <application>top</application>.</para></abstract> 
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KSysGuard</keyword>
-<keyword
->process monitor</keyword>
-<keyword
->top</keyword>
-<keyword
->ps</keyword>
+<keyword>KDE</keyword>
+<keyword>KSysGuard</keyword>
+<keyword>process monitor</keyword>
+<keyword>top</keyword>
+<keyword>ps</keyword>
 </keywordset>
 </bookinfo>
 
 <chapter id="introduction">
-<title
->Introduction</title>
+<title>Introduction</title>
 
-<para
->&ksysguard; is the &kde; Task Manager and Performance Monitor. It features a client/server architecture that allows monitoring of local as well as remote hosts. The graphical front end uses so-called sensors to retrieve the information it displays. A sensor can return simple values or more complex information like tables. For each type of information, one or more displays are provided. Displays are organised in work sheets that can be saved and loaded independently from each other. So, &ksysguard; is not only a simple task manager but also a very powerful tool to control large server farms.</para>
+<para>&ksysguard; is the &kde; Task Manager and Performance Monitor. It features a client/server architecture that allows monitoring of local as well as remote hosts. The graphical front end uses so-called sensors to retrieve the information it displays. A sensor can return simple values or more complex information like tables. For each type of information, one or more displays are provided. Displays are organised in work sheets that can be saved and loaded independently from each other. So, &ksysguard; is not only a simple task manager but also a very powerful tool to control large server farms.</para>
 
 </chapter>
 
 
 <chapter id="usingtheksysguard">
-<title
->Using &ksysguard;</title>
+<title>Using &ksysguard;</title>
 
 <sect1 id="getting-started">
-<title
->Getting started</title>
-
-<para
->&ksysguard; can be started from the start menu, using the entry <guimenuitem
->KDE System Guard</guimenuitem
-> in the <guimenu
->Systems</guimenu
-> menu. Alternatively, you can start it by typing <command
->ksysguard</command
-> in a terminal.</para>
-
-<para
->The &ksysguard; main window consists of a menu bar, an optional tool bar and status bar, the sensor browser and the work space. When first started you see your local machine listed as <guilabel
->localhost</guilabel
-> in the sensor browser and 2 pages in the work space area. This is the default setup.</para>
-
-<para
->This default setup is sufficient enough for an inexperienced user to do some system management. An experienced user or even a system administrator of a large computer lab has different needs. To address a wide range of users, &ksysguard; is highly flexible.</para>
+<title>Getting started</title>
+
+<para>&ksysguard; can be started from the start menu, using the entry <guimenuitem>KDE System Guard</guimenuitem> in the <guimenu>Systems</guimenu> menu. Alternatively, you can start it by typing <command>ksysguard</command> in a terminal.</para>
+
+<para>The &ksysguard; main window consists of a menu bar, an optional tool bar and status bar, the sensor browser and the work space. When first started you see your local machine listed as <guilabel>localhost</guilabel> in the sensor browser and 2 pages in the work space area. This is the default setup.</para>
+
+<para>This default setup is sufficient enough for an inexperienced user to do some system management. An experienced user or even a system administrator of a large computer lab has different needs. To address a wide range of users, &ksysguard; is highly flexible.</para>
 </sect1>
 
 <sect1 id="the-sensor-browser">
-<title
->The Sensor Browser</title>
+<title>The Sensor Browser</title>
 
-<para
->The sensor browser displays the registered hosts and their sensors in a tree form. Click on the tree handles to open or close a branch. Each sensor monitors a certain system value.</para>
+<para>The sensor browser displays the registered hosts and their sensors in a tree form. Click on the tree handles to open or close a branch. Each sensor monitors a certain system value.</para>
 
 <sect2 id="connectingtootherhosts">
-<title
->Connecting to other hosts</title>
-
-<para
->To connect to a new host use <guimenuitem
->Connect Hosts</guimenuitem
-> from the <guimenu
->File</guimenu
-> menu. A dialogue box will appear and allows you to enter the name of the host you want to connect to. Below the name you can choose the connection method. The default is <application
->ssh</application
->, the secure shell. Alternatively the <application
->rsh</application
->, the remote shell, or the daemon mode can be used. Click <guibutton
->OK</guibutton
-> to establish the connection. Shortly afterwards the new host will appear in the sensor browser and you can browse the list of sensors.</para>
-
-<para
->To establish a connection, a program called <application
->ksysguardd</application
->, that can be started in the following two modes, must be installed on the new host.</para>
+<title>Connecting to other hosts</title>
+
+<para>To connect to a new host use <guimenuitem>Connect Hosts</guimenuitem> from the <guimenu>File</guimenu> menu. A dialogue box will appear and allows you to enter the name of the host you want to connect to. Below the name you can choose the connection method. The default is <application>ssh</application>, the secure shell. Alternatively the <application>rsh</application>, the remote shell, or the daemon mode can be used. Click <guibutton>OK</guibutton> to establish the connection. Shortly afterwards the new host will appear in the sensor browser and you can browse the list of sensors.</para>
+
+<para>To establish a connection, a program called <application>ksysguardd</application>, that can be started in the following two modes, must be installed on the new host.</para>
 
 <variablelist>
 <varlistentry>
-<term
->daemon mode</term>
+<term>daemon mode</term>
 <listitem>
-<para
->You can start <application
->ksysguardd</application
-> at boot time in <guilabel
->Daemon</guilabel
-> mode by adding <parameter
->-d</parameter
-> as the argument. In this case, you have to select daemon mode at the connection dialogue of <application
->ksysguard</application
->. A disadvantage of this connection type is that you won't be able to kill or renice a process with the <guilabel
->Process Controller</guilabel
-> and the data exchange over network won't be encrypted.</para>
+<para>You can start <application>ksysguardd</application> at boot time in <guilabel>Daemon</guilabel> mode by adding <parameter>-d</parameter> as the argument. In this case, you have to select daemon mode at the connection dialogue of <application>ksysguard</application>. A disadvantage of this connection type is that you won't be able to kill or renice a process with the <guilabel>Process Controller</guilabel> and the data exchange over network won't be encrypted.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->shell mode</term>
+<term>shell mode</term>
 <listitem>
-<para
->In this mode <application
->ksysguardd</application
-> is started at connecting time by <application
->ksysguard</application
->. To make that possible, its location needs to be included in your <envar
->PATH</envar
->. Unfortunately the ssh does not source your <filename
->.profile</filename
-> file, so your regular <envar
->PATH</envar
-> setting will not be available. Instead it uses a default <envar
->PATH</envar
-> like <parameter
->/bin:/usr/bin</parameter
->. Since it is very likely that &kde; is not installed in these folders you need to create or update a file in your home folder. The file is called <filename
->environment</filename
-> and needs to be in a hidden folder called <filename
->.ssh</filename
->. See the manual page for <application
->ssh</application
-> for more details. The file needs to contain a line similar to:</para>
-
-<screen
-><userinput
->PATH=/bin:/usr/bin:/opt/kde/bin</userinput
->
+<para>In this mode <application>ksysguardd</application> is started at connecting time by <application>ksysguard</application>. To make that possible, its location needs to be included in your <envar>PATH</envar>. Unfortunately the ssh does not source your <filename>.profile</filename> file, so your regular <envar>PATH</envar> setting will not be available. Instead it uses a default <envar>PATH</envar> like <parameter>/bin:/usr/bin</parameter>. Since it is very likely that &kde; is not installed in these folders you need to create or update a file in your home folder. The file is called <filename>environment</filename> and needs to be in a hidden folder called <filename>.ssh</filename>. See the manual page for <application>ssh</application> for more details. The file needs to contain a line similar to:</para>
+
+<screen><userinput>PATH=/bin:/usr/bin:/opt/kde/bin</userinput>
 </screen>
 
-<para
->assuming that <application
->ksysguardd</application
-> can be found under <filename
->/opt/kde/bin/ksysguardd</filename
->.</para>
-
-<tip
-><para
->When using <application
->ssh</application
-> you should make sure that you have your <filename
->identity.pub</filename
-> installed on the remote machine and the host key of the remote machine is already registered on your machine. The easiest way to check this is to type <command
->ssh <option
->remotehost ksysguardd</option
-></command
-> in a shell. If you are greeted by <application
->ksysguardd</application
-> you can type <userinput
->quit</userinput
-> and everything is in order.</para
-></tip>
+<para>assuming that <application>ksysguardd</application> can be found under <filename>/opt/kde/bin/ksysguardd</filename>.</para>
+
+<tip><para>When using <application>ssh</application> you should make sure that you have your <filename>identity.pub</filename> installed on the remote machine and the host key of the remote machine is already registered on your machine. The easiest way to check this is to type <command>ssh <option>remotehost ksysguardd</option></command> in a shell. If you are greeted by <application>ksysguardd</application> you can type <userinput>quit</userinput> and everything is in order.</para></tip>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<note
-><para
->For experts: <application
->ksysguardd</application
-> is a very small program that is only linked against the libc. So it can also be used on machines that do not have a fully blown &kde; installation, such as servers. If you choose the custom command option in the host connector you need to specify the complete command to start <application
->ksysguardd</application
->.</para
-></note>
+<note><para>For experts: <application>ksysguardd</application> is a very small program that is only linked against the libc. So it can also be used on machines that do not have a fully blown &kde; installation, such as servers. If you choose the custom command option in the host connector you need to specify the complete command to start <application>ksysguardd</application>.</para></note>
 
 </sect2>
 
 <sect2 id="disconnecting-hosts">
-<title
->Disconnecting hosts</title>
-
-<para
->To disconnect from a host, select the host in the sensor browser and choose <guimenuitem
->Disconnect Host</guimenuitem
-> from the <guimenu
->File</guimenu
-> menu. If you still have sensors in use, the display frames will be greyed and the displays won't update any longer.</para>
+<title>Disconnecting hosts</title>
+
+<para>To disconnect from a host, select the host in the sensor browser and choose <guimenuitem>Disconnect Host</guimenuitem> from the <guimenu>File</guimenu> menu. If you still have sensors in use, the display frames will be greyed and the displays won't update any longer.</para>
 </sect2>
 </sect1>
 
 <sect1 id="the-workspace">
-<title
->The Work Space</title>
-
-<para
->The work space is organised as work sheets. Select <guimenuitem
->New</guimenuitem
-> from the <guimenu
->File</guimenu
-> menu to create a new work sheet. A dialogue will appear where you can set the name, the dimension and the update interval of the work sheet. To remove a work sheet again, select <guimenuitem
->Close</guimenuitem
-> from the <guimenu
->File</guimenu
-> menu. Any modifications will be saved to the work sheet file. If a work sheet has never been saved, you will be asked for a file name. Work sheets consist of cells organised as a grid.</para>
-
-<para
->Each cell can be filled with a display for one or more sensors. You can fill a cell by dragging a sensor from the sensor browser and dropping it over the cell. If there is more than one type of display available for that type of sensor, a popup menu will appear. You can then select which display you prefer to use. Certain types of displays can display more than one sensor. Add more sensors to a display by dragging them over from the sensor browser and dropping them over the already existing display.</para>
-
-<para
->Work sheets can be configured by clicking <guimenuitem
->Configure Worksheet </guimenuitem
-> at the <guimenu
->Edit</guimenu
-> menu. In the appearing dialogue you can set the dimension and the update interval. This update interval is used by all displays of the worksheet, which has the <guilabel
->use update interval of worksheet</guilabel
-> set in its timer configuration dialogue.</para>
-
-<para
->The entry <guimenuitem
->Configure Style</guimenuitem
-> of the <guimenu
->Settings</guimenu
-> menu gives you the possibility to configure the global style attributes and apply them to the current active worksheet.</para>
-
-<para
->Displays can be configured by clicking with the right mouse button on them. A popup menu appear where you can select whether you want to change the properties of that display, remove it from the work sheet, change its update interval type and value or pause and restart its updating.</para>
+<title>The Work Space</title>
+
+<para>The work space is organised as work sheets. Select <guimenuitem>New</guimenuitem> from the <guimenu>File</guimenu> menu to create a new work sheet. A dialogue will appear where you can set the name, the dimension and the update interval of the work sheet. To remove a work sheet again, select <guimenuitem>Close</guimenuitem> from the <guimenu>File</guimenu> menu. Any modifications will be saved to the work sheet file. If a work sheet has never been saved, you will be asked for a file name. Work sheets consist of cells organised as a grid.</para>
+
+<para>Each cell can be filled with a display for one or more sensors. You can fill a cell by dragging a sensor from the sensor browser and dropping it over the cell. If there is more than one type of display available for that type of sensor, a popup menu will appear. You can then select which display you prefer to use. Certain types of displays can display more than one sensor. Add more sensors to a display by dragging them over from the sensor browser and dropping them over the already existing display.</para>
+
+<para>Work sheets can be configured by clicking <guimenuitem>Configure Worksheet </guimenuitem> at the <guimenu>Edit</guimenu> menu. In the appearing dialogue you can set the dimension and the update interval. This update interval is used by all displays of the worksheet, which has the <guilabel>use update interval of worksheet</guilabel> set in its timer configuration dialogue.</para>
+
+<para>The entry <guimenuitem>Configure Style</guimenuitem> of the <guimenu>Settings</guimenu> menu gives you the possibility to configure the global style attributes and apply them to the current active worksheet.</para>
+
+<para>Displays can be configured by clicking with the right mouse button on them. A popup menu appear where you can select whether you want to change the properties of that display, remove it from the work sheet, change its update interval type and value or pause and restart its updating.</para>
 
 <sect2 id="signal-plotter">
-<title
->Signal Plotter</title>
+<title>Signal Plotter</title>
 
-<para
->The signal plotter prints samples of one or more sensors over time. If, several sensors are displayed, the values are piled in different colours. If the display is large enough a grid will be displayed to show the range of the plotted samples. By default, the automatic range mode is active so the minimum and maximum values will be set automatically. Sometimes you want fixed minimum and maximum values. In that case, you can deactivate automatic range mode and set the values in the properties dialogue.</para>
+<para>The signal plotter prints samples of one or more sensors over time. If, several sensors are displayed, the values are piled in different colours. If the display is large enough a grid will be displayed to show the range of the plotted samples. By default, the automatic range mode is active so the minimum and maximum values will be set automatically. Sometimes you want fixed minimum and maximum values. In that case, you can deactivate automatic range mode and set the values in the properties dialogue.</para>
 </sect2>
 
 <sect2 id="multimeter">
-<title
->Multimeter</title>
+<title>Multimeter</title>
 
-<para
->The multimeter displays the sensor values as a digital meter. In the properties dialogue you can specify a lower and upper limit. If the range is exceeded, the display is coloured in the alarm colour.</para>
+<para>The multimeter displays the sensor values as a digital meter. In the properties dialogue you can specify a lower and upper limit. If the range is exceeded, the display is coloured in the alarm colour.</para>
 </sect2>
 
 <sect2 id="process-controller">
-<title
->Process Controller</title>
+<title>Process Controller</title>
 
-<para
->The Process Controller gives you a list of processes on your system. The list can be sorted by each column. Just press the left mouse button at the head of the column. </para>
+<para>The Process Controller gives you a list of processes on your system. The list can be sorted by each column. Just press the left mouse button at the head of the column. </para>
 
-<para
->The list shows the following information about each process. Please note that not all properties are available on every operating system.</para>
+<para>The list shows the following information about each process. Please note that not all properties are available on every operating system.</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Name</guilabel
-></term>
-<listitem
-><para
->The name of the executable that started the process.</para>
+<term><guilabel>Name</guilabel></term>
+<listitem><para>The name of the executable that started the process.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->PID</guilabel
-></term>
-<listitem
-><para
->The Process <abbrev
->ID</abbrev
->. A unique number for each process.</para
-></listitem>
+<term><guilabel>PID</guilabel></term>
+<listitem><para>The Process <abbrev>ID</abbrev>. A unique number for each process.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->PPID</guilabel
-></term>
-<listitem
-><para
->The Process <abbrev
->ID</abbrev
-> of the process parent.</para>
+<term><guilabel>PPID</guilabel></term>
+<listitem><para>The Process <abbrev>ID</abbrev> of the process parent.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->UID</guilabel
-></term>
-<listitem
-><para
->The <abbrev
->ID</abbrev
-> of the user that started the process.</para>
+<term><guilabel>UID</guilabel></term>
+<listitem><para>The <abbrev>ID</abbrev> of the user that started the process.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->GID</guilabel
-></term>
-<listitem
-><para
->The <abbrev
->ID</abbrev
-> of the group the process belongs to.</para>
+<term><guilabel>GID</guilabel></term>
+<listitem><para>The <abbrev>ID</abbrev> of the group the process belongs to.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Status</guilabel
-></term>
-<listitem
-><para
->The process status.</para
-></listitem>
+<term><guilabel>Status</guilabel></term>
+<listitem><para>The process status.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->User%</guilabel
-></term>
+<term><guilabel>User%</guilabel></term>
 <listitem>
-<para
->The processor load of the process in user space (in percent).</para>
+<para>The processor load of the process in user space (in percent).</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->System%</guilabel
-></term>
+<term><guilabel>System%</guilabel></term>
 <listitem>
-<para
->The processor load of the process in system space (in percent).</para>
+<para>The processor load of the process in system space (in percent).</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Nice</guilabel
-></term>
-<listitem
-><para
->The scheduling priority.</para
-></listitem>
+<term><guilabel>Nice</guilabel></term>
+<listitem><para>The scheduling priority.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->VmSize</guilabel
-></term>
-<listitem
-><para
->The total amount of virtual memory used by the process (in kBytes).</para
-></listitem>
+<term><guilabel>VmSize</guilabel></term>
+<listitem><para>The total amount of virtual memory used by the process (in kBytes).</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->VmRss</guilabel
-></term>
-<listitem
-><para
->The total amount of physical memory used by the process (in kBytes).</para
-></listitem>
+<term><guilabel>VmRss</guilabel></term>
+<listitem><para>The total amount of physical memory used by the process (in kBytes).</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Login</guilabel
-></term>
-<listitem
-><para
->The login name of the user that started the process.</para>
+<term><guilabel>Login</guilabel></term>
+<listitem><para>The login name of the user that started the process.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Command</guilabel
-></term>
-<listitem
-><para
->The complete start command of the process.</para
-></listitem>
+<term><guilabel>Command</guilabel></term>
+<listitem><para>The complete start command of the process.</para></listitem>
 </varlistentry>
 </variablelist>
 
-<para
->Underneath the table you find four buttons which will be described now from left to right.</para>
+<para>Underneath the table you find four buttons which will be described now from left to right.</para>
 
 <sect3 id="the-tree-view">
-<title
->The <guibutton
->Tree</guibutton
-> View</title>
+<title>The <guibutton>Tree</guibutton> View</title>
 
-<para
->The tree view has been designed to show the relationships between the running processes. A process that is started by another process is called the child of that process. A tree is an elegant way to show this parent-child relationship. The <emphasis
->init</emphasis
-> process is the ancestor of all processes.</para>
+<para>The tree view has been designed to show the relationships between the running processes. A process that is started by another process is called the child of that process. A tree is an elegant way to show this parent-child relationship. The <emphasis>init</emphasis> process is the ancestor of all processes.</para>
 
-<para
->If you are not interested in the children of a particular process you can click on the little box to the left of the parent and the subtree will collapse. Another click on that box will unfold the subtree again.</para>
+<para>If you are not interested in the children of a particular process you can click on the little box to the left of the parent and the subtree will collapse. Another click on that box will unfold the subtree again.</para>
 
 </sect3>
 
 <sect3 id="the-process-filter">
-<title
->The Process Filter </title>
+<title>The Process Filter </title>
 
-<para
->The Process Filter can be used to reduce the number of processes displayed in the table. You can filter out processes you are not interested in. Currently you can display all processes, system processes only, user processes only or your processes only.</para>
+<para>The Process Filter can be used to reduce the number of processes displayed in the table. You can filter out processes you are not interested in. Currently you can display all processes, system processes only, user processes only or your processes only.</para>
 
 </sect3>
 
 <sect3 id="therefreshbutton">
-<title
->The <guibutton
->Refresh</guibutton
-> Button </title>
+<title>The <guibutton>Refresh</guibutton> Button </title>
 
-<para
->This button can be used to force an immediate update of the process list.</para>
+<para>This button can be used to force an immediate update of the process list.</para>
 
 </sect3>
 
 <sect3 id="thekillbutton">
-<title
->The <guibutton
->Kill</guibutton
-> Button </title>
+<title>The <guibutton>Kill</guibutton> Button </title>
 
-<para
->If you have selected one or more processes you can press the kill button to kill them. A so called <errorcode
->SIGKIL</errorcode
-> is sent to the processes which causes them to terminate immediately. If these applications still have unsaved data this data will be lost. So use this button with care.</para>
+<para>If you have selected one or more processes you can press the kill button to kill them. A so called <errorcode>SIGKIL</errorcode> is sent to the processes which causes them to terminate immediately. If these applications still have unsaved data this data will be lost. So use this button with care.</para>
 
 </sect3>
 </sect2>
 
 <sect2 id="bargraph">
-<title
->BarGraph</title>
+<title>BarGraph</title>
 
-<para
->The bargraph displays the sensor values as dancing bars. In the properties dialogue you can specify minimum and maximum values of range and a lower and upper limit. If the range is exceeded, the display is coloured in the alarm colour.</para>
+<para>The bargraph displays the sensor values as dancing bars. In the properties dialogue you can specify minimum and maximum values of range and a lower and upper limit. If the range is exceeded, the display is coloured in the alarm colour.</para>
 </sect2>
 
 <sect2 id="sensorlogger">
-<title
->Sensor Logger</title>
+<title>Sensor Logger</title>
 
-<para
->The sensor logger does not display any values, but logs them in a file with additional date and time information. For each sensor you can specify a lower and upper limit in the properties dialogue. If the range is exceeded, the entry of the sensor table is coloured in the alarm colour and a <application
->knotify</application
-> event is sent.</para>
+<para>The sensor logger does not display any values, but logs them in a file with additional date and time information. For each sensor you can specify a lower and upper limit in the properties dialogue. If the range is exceeded, the entry of the sensor table is coloured in the alarm colour and a <application>knotify</application> event is sent.</para>
 </sect2>
 
 <sect2 id="logfile">
-<title
->Log File</title>
-
-<para
->The log file monitor displays the content of a file &eg; <filename
->/var/log/messages</filename
->. In the properties dialogue, you can compose a list of regular expressions that will be compared with the content of the file. If one of the expressions match, a <application
->knotify</application
-> event will be sent. </para>
+<title>Log File</title>
+
+<para>The log file monitor displays the content of a file &eg; <filename>/var/log/messages</filename>. In the properties dialogue, you can compose a list of regular expressions that will be compared with the content of the file. If one of the expressions match, a <application>knotify</application> event will be sent. </para>
 </sect2>
 
 <sect2 id="listview">
-<title
->List View</title>
+<title>List View</title>
 
-<para
->The listview displays the data of some sensors in the form of a table.</para>
+<para>The listview displays the data of some sensors in the form of a table.</para>
 </sect2>
 
 </sect1>
 </chapter>
 
 <chapter id="multiple-platforms">
-<title
->Configuring <application
->ksysguardd</application
-></title>
+<title>Configuring <application>ksysguardd</application></title>
 
-<para
->The graphical front-end is available on any platform that &kde; runs on. The back-end is at the moment available on the following flavours of &UNIX;:</para>
+<para>The graphical front-end is available on any platform that &kde; runs on. The back-end is at the moment available on the following flavours of &UNIX;:</para>
 
 <variablelist>
 <varlistentry>
-<term
->&Linux; 2.x</term>
-<listitem
-><para
->For <application
->ksysguardd</application
-> to work it is necessary to compile the &Linux; Kernel with the <filename
->/proc</filename
-> Filesystem enabled. This is the default setting and most &Linux; Distributions have it already.</para
-> </listitem>
+<term>&Linux; 2.x</term>
+<listitem><para>For <application>ksysguardd</application> to work it is necessary to compile the &Linux; Kernel with the <filename>/proc</filename> Filesystem enabled. This is the default setting and most &Linux; Distributions have it already.</para> </listitem>
 </varlistentry>
 <varlistentry>
-<term
->FreeBSD</term>
-<listitem
-><para
->The <application
->ksysguardd</application
-> program needs to be owned by the <systemitem class="groupname"
->kmem</systemitem
-> group and needs to have the setgid bit set.</para
-></listitem
-> 
+<term>FreeBSD</term>
+<listitem><para>The <application>ksysguardd</application> program needs to be owned by the <systemitem class="groupname">kmem</systemitem> group and needs to have the setgid bit set.</para></listitem> 
 </varlistentry>
 <varlistentry>
-<term
->&Solaris;</term>
-<listitem
-><para
->To be written</para
-></listitem>
+<term>&Solaris;</term>
+<listitem><para>To be written</para></listitem>
 </varlistentry>
 </variablelist>
 
-<para
->Support for other platforms is in progress. Your help is greatly appreciated.</para>
+<para>Support for other platforms is in progress. Your help is greatly appreciated.</para>
 </chapter>
 
 <chapter id="credits-and-licenses">
-<title
->Credits and Licences</title>
-
-<para
->&ksysguard; is currently developed and maintained by Chris Schl&auml;ger <email
->cs@kde.org</email
->. &ksysguard; is a rewrite of <application
->KTop</application
->, the KDE 1.x task manager. Several other people have worked on <application
->KTop</application
->:</para>
+<title>Credits and Licences</title>
+
+<para>&ksysguard; is currently developed and maintained by Chris Schl&auml;ger <email>cs@kde.org</email>. &ksysguard; is a rewrite of <application>KTop</application>, the KDE 1.x task manager. Several other people have worked on <application>KTop</application>:</para>
 
 <itemizedlist>
-<listitem
-><para
->A. Sanda <email
->alex@darkstar.ping.at</email
-></para
-></listitem>
-<listitem
-><para
->Ralf Mueller <email
->ralf@bj-ig.de</email
-></para
-></listitem>
-<listitem
-><para
->Bernd Johannes Wuebben <email
->wuebben@math.cornell.edu</email
-></para
-></listitem>
-<listitem
-><para
->Nicolas Leclercq <email
->nicknet@planete.net</email
-></para
-></listitem>
+<listitem><para>A. Sanda <email>alex@darkstar.ping.at</email></para></listitem>
+<listitem><para>Ralf Mueller <email>ralf@bj-ig.de</email></para></listitem>
+<listitem><para>Bernd Johannes Wuebben <email>wuebben@math.cornell.edu</email></para></listitem>
+<listitem><para>Nicolas Leclercq <email>nicknet@planete.net</email></para></listitem>
 </itemizedlist>
 
-<para
->The porting to other platforms than &Linux; was done by:</para>
+<para>The porting to other platforms than &Linux; was done by:</para>
 
 <itemizedlist>
-<listitem
-><para
->FreeBSD: Hans Petter Bieker <email
->zerium@traad.lavvu.no</email
-></para
-></listitem
-> </itemizedlist
-> &underFDL; &underGPL; </chapter>
+<listitem><para>FreeBSD: Hans Petter Bieker <email>zerium@traad.lavvu.no</email></para></listitem> </itemizedlist> &underFDL; &underGPL; </chapter>
 
 </book>
 <!--
diff --git a/tde-i18n-en_GB/docs/tdebase/kwrite/index.docbook b/tde-i18n-en_GB/docs/tdebase/kwrite/index.docbook
index f1247088cc8..a6a9a99b430 100644
--- a/tde-i18n-en_GB/docs/tdebase/kwrite/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kwrite/index.docbook
@@ -1,912 +1,294 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" 
 "dtd/kdex.dtd" [
-  <!ENTITY kappname "&kwrite;"
->  
+  <!ENTITY kappname "&kwrite;">  
   <!ENTITY package "tdebase">
-  <!ENTITY % addindex "IGNORE"
-> 
-  <!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->   
+  <!ENTITY % addindex "IGNORE"> 
+  <!ENTITY % British-English "INCLUDE"> <!-- change language only here -->   
 ]>  
   
-<book lang="&language;"
->  
-
-<bookinfo
->  
-<title
->The &kwrite; Handbook</title
->  
-<authorgroup
->  
-<author
->&Thad.McGinnis; &Thad.McGinnis.mail;</author>
-
-<othercredit role="developer"
->&Christoph.Cullmann; &Christoph.Cullmann.mail; </othercredit>
-
-<othercredit role="reviewer"
->&Lauri.Watts; &Lauri.Watts.mail; </othercredit>
-
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<book lang="&language;">  
+
+<bookinfo>  
+<title>The &kwrite; Handbook</title>  
+<authorgroup>  
+<author>&Thad.McGinnis; &Thad.McGinnis.mail;</author>
+
+<othercredit role="developer">&Christoph.Cullmann; &Christoph.Cullmann.mail; </othercredit>
+
+<othercredit role="reviewer">&Lauri.Watts; &Lauri.Watts.mail; </othercredit>
+
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 
 </authorgroup>
 
 <copyright>
-<year
->2000</year
-><year
->2001</year>
-<holder
->&Thad.McGinnis;</holder>
+<year>2000</year><year>2001</year>
+<holder>&Thad.McGinnis;</holder>
 </copyright>
-<legalnotice
->&FDLNotice;</legalnotice>
+<legalnotice>&FDLNotice;</legalnotice>
 
-<date
->2004-08-27</date>
-<releaseinfo
->2.00.00</releaseinfo>
+<date>2004-08-27</date>
+<releaseinfo>2.00.00</releaseinfo>
 
 <abstract>
-<para
->&kwrite; is a text editor for &kde;</para>
+<para>&kwrite; is a text editor for &kde;</para>
 </abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KWrite</keyword>
-<keyword
->text</keyword>
-<keyword
->editor</keyword>
+<keyword>KDE</keyword>
+<keyword>KWrite</keyword>
+<keyword>text</keyword>
+<keyword>editor</keyword>
 </keywordset>
 
 </bookinfo>
 
 <chapter id="introduction">
-<title
->Introduction</title>
+<title>Introduction</title>
 
-<para
->&kwrite; is more than a text editor for the &kde; Desktop. It is meant to be a programmer's editor, and could be considered as at least a partial alternative to more powerful editors. It may be best used in conjunction with &konqueror; for source file browsing for different languages. &kwrite; also works very well as a simple text editor. One of &kwrite;'s main features is the colourised syntax, customised for many different programming languages such as: C/C++, &Java;, Python, Perl, Bash, Modula 2, <acronym
->HTML</acronym
->, and Ada. </para>
+<para>&kwrite; is more than a text editor for the &kde; Desktop. It is meant to be a programmer's editor, and could be considered as at least a partial alternative to more powerful editors. It may be best used in conjunction with &konqueror; for source file browsing for different languages. &kwrite; also works very well as a simple text editor. One of &kwrite;'s main features is the colourised syntax, customised for many different programming languages such as: C/C++, &Java;, Python, Perl, Bash, Modula 2, <acronym>HTML</acronym>, and Ada. </para>
 
 </chapter>
 
-<chapter id="on-screen-fundamentals"
->  
-<title
->Some Fundamentals</title
->  
+<chapter id="on-screen-fundamentals">  
+<title>Some Fundamentals</title>  
   
-<para
->&kwrite; is very simple to use. Anyone that has used a text editor should have no problems. </para>
+<para>&kwrite; is very simple to use. Anyone that has used a text editor should have no problems. </para>
   
-<sect1 id="drag-and-drop"
->  
-<title
->Drag and Drop</title
->  
+<sect1 id="drag-and-drop">  
+<title>Drag and Drop</title>  
   
-<para
->&kwrite; uses the &kde; Drag and Drop protocol. Files may be dragged and dropped onto &kwrite; from the Desktop, &konqueror; or some remote &FTP; site opened in one of &konqueror;'s windows. </para>
+<para>&kwrite; uses the &kde; Drag and Drop protocol. Files may be dragged and dropped onto &kwrite; from the Desktop, &konqueror; or some remote &FTP; site opened in one of &konqueror;'s windows. </para>
 </sect1>
   
-<sect1 id="command-line-options"
->  
-<title
->Command Line Options</title
->  
-  
-<para
->Though &kwrite; may most often be started from the KDE program menu, or a desktop icon, it can also be opened at the command line prompt of a terminal window. There are a few useful options that are available when doing this. </para>
-  
-<sect2 id="specify-a-file"
->  
-<title
->Specify a File</title
->  
-  
-<para
->By specifying the path and name of a particular file the user can have &kwrite; open (or create) that file immediately upon startup. This option might look something like the following:</para>
-
-<informalexample
-><screen
-><prompt
->%</prompt
-> <userinput
-><command
->kwrite</command
-> 
-<option
-><replaceable
->/home/myhome/docs/myfile.txt</replaceable
-></option
-></userinput
->
+<sect1 id="command-line-options">  
+<title>Command Line Options</title>  
+  
+<para>Though &kwrite; may most often be started from the KDE program menu, or a desktop icon, it can also be opened at the command line prompt of a terminal window. There are a few useful options that are available when doing this. </para>
+  
+<sect2 id="specify-a-file">  
+<title>Specify a File</title>  
+  
+<para>By specifying the path and name of a particular file the user can have &kwrite; open (or create) that file immediately upon startup. This option might look something like the following:</para>
+
+<informalexample><screen><prompt>%</prompt> <userinput><command>kwrite</command> 
+<option><replaceable>/home/myhome/docs/myfile.txt</replaceable></option></userinput>
 </screen>
 </informalexample>
 </sect2>
 <sect2 id="editing-files-on-the-internet">
-<title
->Specify a file on the internet</title>
-
-<para
->The above-mentioned method could even be used to open files on the internet (if the user has an active connection at the time.) An example of this might look like the following:</para>
-
-<informalexample
-><screen
-><prompt
->%</prompt
-> <userinput
-><command
->kwrite</command
-> 
-<option
-><replaceable
->ftp://ftp.kde.org/pub/kde/Welcome.msg</replaceable
-></option
-></userinput
->
+<title>Specify a file on the internet</title>
+
+<para>The above-mentioned method could even be used to open files on the internet (if the user has an active connection at the time.) An example of this might look like the following:</para>
+
+<informalexample><screen><prompt>%</prompt> <userinput><command>kwrite</command> 
+<option><replaceable>ftp://ftp.kde.org/pub/kde/Welcome.msg</replaceable></option></userinput>
 </screen>
 </informalexample>
 
 </sect2>
 
 <sect2 id="other-command-line-options">
-<title
->Other Command Line Options</title>
+<title>Other Command Line Options</title>
 
-<para
->The following command line help options are available</para>
+<para>The following command line help options are available</para>
 
 <variablelist>
-<varlistentry
->  
-<term
-><userinput
-><command
->kwrite</command
-> <option
->--help</option
-></userinput
-></term
->  
-<listitem
-><para
->This lists the most basic options available at the command line.</para
-></listitem
->  
-</varlistentry
->  
-<varlistentry
->  
-<term
-><userinput
-><command
->kwrite</command
-> <option
->--help-qt</option
-></userinput
-></term>
-<listitem
-><para
->This lists the options available for changing the way &kwrite; interacts with &Qt;.</para
-></listitem
->  
-</varlistentry
->  
-<varlistentry
->  
-<term
-><userinput
-><command
->kwrite</command
-> <option
->--help-kde</option
-></userinput
-></term>
-<listitem
-><para
->This lists the options available for changing the way &kwrite; interacts with &kde;.</para
-></listitem
->  
-</varlistentry
->  
-<varlistentry
->  
-<term
-><userinput
-><command
->kwrite</command
-> <option
->--help-all</option
-></userinput
-></term>
-<listitem
-><para
->This lists all of the command line options.</para
-></listitem
->  
-</varlistentry
->  
-<varlistentry
->  
-<term
-><userinput
-><command
->kwrite</command
-> <option
->--author</option
-></userinput
-></term>
-<listitem
-><para
->Lists &kwrite;'s authors in the terminal window</para
-></listitem
->  
-</varlistentry
->  
-<varlistentry
->  
-<term
-><userinput
-><command
->kwrite</command
-> <option
->--version</option
-></userinput
-></term>
-<listitem
-><para
->Lists version information for &Qt;, &kde;, and &kwrite;. Also available through <userinput
-><command
->kwrite</command
-> <option
->-V</option
-></userinput
-> </para
-></listitem>
-</varlistentry
->  
-</variablelist
->  
+<varlistentry>  
+<term><userinput><command>kwrite</command> <option>--help</option></userinput></term>  
+<listitem><para>This lists the most basic options available at the command line.</para></listitem>  
+</varlistentry>  
+<varlistentry>  
+<term><userinput><command>kwrite</command> <option>--help-qt</option></userinput></term>
+<listitem><para>This lists the options available for changing the way &kwrite; interacts with &Qt;.</para></listitem>  
+</varlistentry>  
+<varlistentry>  
+<term><userinput><command>kwrite</command> <option>--help-kde</option></userinput></term>
+<listitem><para>This lists the options available for changing the way &kwrite; interacts with &kde;.</para></listitem>  
+</varlistentry>  
+<varlistentry>  
+<term><userinput><command>kwrite</command> <option>--help-all</option></userinput></term>
+<listitem><para>This lists all of the command line options.</para></listitem>  
+</varlistentry>  
+<varlistentry>  
+<term><userinput><command>kwrite</command> <option>--author</option></userinput></term>
+<listitem><para>Lists &kwrite;'s authors in the terminal window</para></listitem>  
+</varlistentry>  
+<varlistentry>  
+<term><userinput><command>kwrite</command> <option>--version</option></userinput></term>
+<listitem><para>Lists version information for &Qt;, &kde;, and &kwrite;. Also available through <userinput><command>kwrite</command> <option>-V</option></userinput> </para></listitem>
+</varlistentry>  
+</variablelist>  
 </sect2>
-</sect1
->  
-  
-<sect1 id="keybindings"
->  
-<title
->Key Bindings</title
->  
-  
-<para
->Many of the key bindings (shortcuts) are configurable by way of the <link linkend="settings"
->Settings</link
-> menu. By default &kwrite; honours the following key bindings.</para
->  
-  
-<informaltable
->  
-<tgroup cols="2"
->  
-<tbody
->  
-  
-<row
-><entry
-><para
-><keycombo 
-action="simul"
-><keycap
->Insert</keycap
-></keycombo
-></para
-></entry
->  
-<entry
-><para
->Toggle between Insert and Overwrite mode. When in insert mode the editor will add any typed characters to the text while pushing along any data to the right of the text cursor. Overwrite mode causes the entry of each character to eliminate the character immediately to the right of the text cursor.</para
-></entry>
-</row
->  
-<row
->  
-<entry
-><para
-><keycombo action="simul"
-><keycap
->Left Arrow</keycap
-></keycombo
-></para
-></entry
->  
-<entry
-><para
->Move the cursor one character to the left </para
-></entry
->  
-</row
->  
-<row
->  
-<entry
-><para
-><keycombo action="simul"
-><keycap
->Right Arrow</keycap
-></keycombo
-></para
-></entry
->  
-<entry
-><para
->Move the cursor one character to the right </para
-></entry
->  
-</row
->  
-<row
->  
-<entry
-><para
-><keycombo action="simul"
-><keycap
->Up Arrow</keycap
-></keycombo
-></para
-></entry
->  
-<entry
-><para
->Move the cursor up one line </para
-></entry
->  
-</row
->  
-<row
->  
-<entry
-><para
-><keycombo action="simul"
-><keycap
->Down Arrow</keycap
-></keycombo
-></para
-></entry
->  
-<entry
-><para
->Move the cursor down one line </para
-></entry
->  
-</row
->  
-<row
->  
-<entry
-><para
-><keycombo action="simul"
-><keycap
->Page Up</keycap
-></keycombo
-></para
-></entry
->  
-<entry
-><para
->Move the cursor up one page </para
-></entry
->  
+</sect1>  
+  
+<sect1 id="keybindings">  
+<title>Key Bindings</title>  
+  
+<para>Many of the key bindings (shortcuts) are configurable by way of the <link linkend="settings">Settings</link> menu. By default &kwrite; honours the following key bindings.</para>  
+  
+<informaltable>  
+<tgroup cols="2">  
+<tbody>  
+  
+<row><entry><para><keycombo 
+action="simul"><keycap>Insert</keycap></keycombo></para></entry>  
+<entry><para>Toggle between Insert and Overwrite mode. When in insert mode the editor will add any typed characters to the text while pushing along any data to the right of the text cursor. Overwrite mode causes the entry of each character to eliminate the character immediately to the right of the text cursor.</para></entry>
+</row>  
+<row>  
+<entry><para><keycombo action="simul"><keycap>Left Arrow</keycap></keycombo></para></entry>  
+<entry><para>Move the cursor one character to the left </para></entry>  
+</row>  
+<row>  
+<entry><para><keycombo action="simul"><keycap>Right Arrow</keycap></keycombo></para></entry>  
+<entry><para>Move the cursor one character to the right </para></entry>  
+</row>  
+<row>  
+<entry><para><keycombo action="simul"><keycap>Up Arrow</keycap></keycombo></para></entry>  
+<entry><para>Move the cursor up one line </para></entry>  
+</row>  
+<row>  
+<entry><para><keycombo action="simul"><keycap>Down Arrow</keycap></keycombo></para></entry>  
+<entry><para>Move the cursor down one line </para></entry>  
+</row>  
+<row>  
+<entry><para><keycombo action="simul"><keycap>Page Up</keycap></keycombo></para></entry>  
+<entry><para>Move the cursor up one page </para></entry>  
 </row>
-<row
->  
-<entry
-><para
-><keycombo action="simul"
-><keycap
->Page Down</keycap
-></keycombo
-></para
-></entry
->  
-<entry
-><para
->Move the cursor down one page </para
-></entry
->  
-</row
->  
-<row
->  
-<entry
-><para
-><keycombo 
-action="simul"
-><keycap
->Backspace</keycap
-></keycombo
-></para
-></entry
->  
-<entry
-><para
->Delete the character to the left of the cursor </para
-></entry
->  
-</row
->  
-<row
->  
-<entry
-><para
-><keycombo 
-action="simul"
-><keycap
->Home</keycap
-></keycombo
-></para
-></entry
->  
-<entry
-><para
->Move the cursor to the beginning of the line </para
-></entry
->  
-</row
->  
-<row
->  
-<entry
-><para
-><keycombo 
-action="simul"
-><keycap
->End</keycap
-></keycombo
-></para
-></entry
->  
-<entry
-><para
->Move the cursor to the end of the line </para
-></entry
->  
-</row
->  
-<row
->  
-<entry
-><para
-><keycombo 
-action="simul"
-><keycap
->Delete</keycap
-></keycombo
-></para
-></entry
->  
-<entry
-><para
->Delete the character to the right of the cursor (or any selected text)</para
-></entry
->  
-</row
->  
-<row
->  
-<entry
-><para
-><keycombo action="simul"
->&Shift;<keycap
->Left Arrow</keycap
-></keycombo
-></para
-></entry
->  
-<entry
-><para
->Mark text one character to the left </para
-></entry
->  
-</row
->  
-<row
->  
-<entry
-><para
-><keycombo action="simul"
->&Shift;<keycap
->Right Arrow</keycap
-></keycombo
-></para
-></entry
->  
-<entry
-><para
->Mark text one character to the right </para
-></entry
->  
-</row
->  
-<row
->  
-<entry
-><para
-><keycombo 
-action="simul"
-><keycap
->F1</keycap
-></keycombo
-></para
-></entry
->  
-<entry
-><para
->Help</para
-></entry
->  
-</row
->  
-<row
->  
-<entry
-><para
-><keycombo 
-action="simul"
->&Shift;<keycap
->F1</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->What's this?</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
->  
-</row
->  
-<row
->  
-<entry
-><para
-><keycombo 
-action="simul"
-><keycap
->F3</keycap
-></keycombo
-></para
-></entry
->  
-<entry
-><para
-><link linkend="find-again"
->Find again</link
-></para
-></entry
->  
-</row
->  
-<row
->  
-<entry
-><para
-><keycombo 
-action="simul"
->&Ctrl;<keycap
->C</keycap
-></keycombo
-></para
-></entry
->  
-<entry
-><para
->Copy the marked text to the clipboard. </para
-></entry
->  
-</row
->  
-<row
->  
-<entry
-><para
-><keycombo 
-action="simul"
->&Ctrl;<keycap
->B</keycap
-></keycombo
-></para
-></entry
->  
-<entry
-><para
->Set a Bookmark</para
-></entry
->  
-</row
->  
-<row
->  
-<entry
-><para
-><keycombo 
-action="simul"
->&Ctrl;<keycap
->N</keycap
-></keycombo
-></para
-></entry
->  
-<entry
-><para
-><link linkend="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
->  
-</row
->  
+<row>  
+<entry><para><keycombo action="simul"><keycap>Page Down</keycap></keycombo></para></entry>  
+<entry><para>Move the cursor down one page </para></entry>  
+</row>  
+<row>  
+<entry><para><keycombo 
+action="simul"><keycap>Backspace</keycap></keycombo></para></entry>  
+<entry><para>Delete the character to the left of the cursor </para></entry>  
+</row>  
+<row>  
+<entry><para><keycombo 
+action="simul"><keycap>Home</keycap></keycombo></para></entry>  
+<entry><para>Move the cursor to the beginning of the line </para></entry>  
+</row>  
+<row>  
+<entry><para><keycombo 
+action="simul"><keycap>End</keycap></keycombo></para></entry>  
+<entry><para>Move the cursor to the end of the line </para></entry>  
+</row>  
+<row>  
+<entry><para><keycombo 
+action="simul"><keycap>Delete</keycap></keycombo></para></entry>  
+<entry><para>Delete the character to the right of the cursor (or any selected text)</para></entry>  
+</row>  
+<row>  
+<entry><para><keycombo action="simul">&Shift;<keycap>Left Arrow</keycap></keycombo></para></entry>  
+<entry><para>Mark text one character to the left </para></entry>  
+</row>  
+<row>  
+<entry><para><keycombo action="simul">&Shift;<keycap>Right Arrow</keycap></keycombo></para></entry>  
+<entry><para>Mark text one character to the right </para></entry>  
+</row>  
+<row>  
+<entry><para><keycombo 
+action="simul"><keycap>F1</keycap></keycombo></para></entry>  
+<entry><para>Help</para></entry>  
+</row>  
+<row>  
+<entry><para><keycombo 
+action="simul">&Shift;<keycap>F1</keycap></keycombo></para></entry>
+<entry><para>What's this?</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>  
+</row>  
+<row>  
+<entry><para><keycombo 
+action="simul"><keycap>F3</keycap></keycombo></para></entry>  
+<entry><para><link linkend="find-again">Find again</link></para></entry>  
+</row>  
+<row>  
+<entry><para><keycombo 
+action="simul">&Ctrl;<keycap>C</keycap></keycombo></para></entry>  
+<entry><para>Copy the marked text to the clipboard. </para></entry>  
+</row>  
+<row>  
+<entry><para><keycombo 
+action="simul">&Ctrl;<keycap>B</keycap></keycombo></para></entry>  
+<entry><para>Set a Bookmark</para></entry>  
+</row>  
+<row>  
+<entry><para><keycombo 
+action="simul">&Ctrl;<keycap>N</keycap></keycombo></para></entry>  
+<entry><para><link linkend="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>  
+</row>  
 <row>
-<entry
-><para
-><keycombo 
-action="simul"
->&Ctrl;<keycap
->Q</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Quit - close active copy of editor </para
-></entry>
+<entry><para><keycombo 
+action="simul">&Ctrl;<keycap>Q</keycap></keycombo></para></entry>
+<entry><para>Quit - close active copy of editor </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><keycombo 
+action="simul">&Ctrl;<keycap>R</keycap></keycombo></para></entry>
+<entry><para><link linkend="replace">Replace</link></para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo 
-action="simul"
->&Ctrl;<keycap
->S</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Invokes the <link linkend="save"
-><guilabel
->Save</guilabel
-></link
-> command.</para
-></entry>
+<entry><para><keycombo 
+action="simul">&Ctrl;<keycap>S</keycap></keycombo></para></entry>
+<entry><para>Invokes the <link linkend="save"><guilabel>Save</guilabel></link> command.</para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo 
-action="simul"
->&Ctrl;<keycap
->V</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Paste the clipboard text into line edit. </para
-></entry
->  
-</row
->  
-<row
->  
-<entry
-><para
-><keycombo 
-action="simul"
->&Ctrl;<keycap
->X</keycap
-></keycombo
-></para
-></entry
->  
-<entry
-><para
->Delete the marked text and copy it to the clipboard. </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
->  
-</row
->  
-<row
->  
-<entry
-><para
-><keycombo 
-action="simul"
->&Ctrl;&Shift;<keycap
->Z</keycap
-></keycombo
-></para
-></entry
->  
-<entry
-><para
-><link linkend="redo"
->Redo</link
-></para
-></entry
->  
-</row
->  
-</tbody
->  
-</tgroup
->  
-</informaltable
->  
-</sect1
->  
-</chapter
->  
-  
-<chapter id="the-menu-entries"
->  
-<title
->The Menu Entries</title
->  
-  
-<sect1 id="file"
->  
-<title
->The <guimenu
->File</guimenu
-> Menu</title
->  
-  
-<variablelist
->  
-  
-<varlistentry
->  
+<entry><para><keycombo 
+action="simul">&Ctrl;<keycap>V</keycap></keycombo></para></entry>
+<entry><para>Paste the clipboard text into line edit. </para></entry>  
+</row>  
+<row>  
+<entry><para><keycombo 
+action="simul">&Ctrl;<keycap>X</keycap></keycombo></para></entry>  
+<entry><para>Delete the marked text and copy it to the clipboard. </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>  
+</row>  
+<row>  
+<entry><para><keycombo 
+action="simul">&Ctrl;&Shift;<keycap>Z</keycap></keycombo></para></entry>  
+<entry><para><link linkend="redo">Redo</link></para></entry>  
+</row>  
+</tbody>  
+</tgroup>  
+</informaltable>  
+</sect1>  
+</chapter>  
+  
+<chapter id="the-menu-entries">  
+<title>The Menu Entries</title>  
+  
+<sect1 id="file">  
+<title>The <guimenu>File</guimenu> Menu</title>  
+  
+<variablelist>  
+  
+<varlistentry>  
 <term id="new">
-<menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->N</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->New</guimenuitem
-></menuchoice
-></term
->  
+<menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>New</guimenuitem></menuchoice></term>  
 <listitem>
-<para
->This starts a new Document in the editor. If there is a current document with unsaved changes the user is given a chance to save it. </para
->  
-</listitem
->  
-</varlistentry
->  
-  
-<varlistentry
->  
+<para>This starts a new Document in the editor. If there is a current document with unsaved changes the user is given a chance to save it. </para>  
+</listitem>  
+</varlistentry>  
+  
+<varlistentry>  
 <term id="open">
-<menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->O</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Open...</guimenuitem
-> </menuchoice>
-</term
->  
+<menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>O</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Open...</guimenuitem> </menuchoice>
+</term>  
 
 <listitem>
 <!--
@@ -926,12 +308,8 @@ this is a filter which similarly may have data entered directly or
 chosen from a dropdown list of recent filter types.  The filter facility
 lets only files that meet its specifications be displayed in the central
 window. If the filter contained text such as <literal
-role="extension"
->*.txt</literal
-> then only files with the <literal
-role="extension"
->txt</literal
-> extension would be visible in the
+role="extension">*.txt</literal> then only files with the <literal
+role="extension">txt</literal> extension would be visible in the
 selection window. Below the filter is a status bar giving information
 about the number of files and subfolders within the current
 folder.
@@ -954,264 +332,111 @@ even change some basic settings for the dialog box, and finally there is
 dropdown box with a list of some commonly frequented folders.
 </para>
 -->
-<para
->Displays a standard &kde; <guilabel
->Open File</guilabel
-> dialogue. Use the file view to select the file you want to open, and click on <guibutton
->Open</guibutton
-> to open it. You can find more information about the &kde; <guilabel
->Open File</guilabel
-> dialogue in the &kde; User Guide.</para>
+<para>Displays a standard &kde; <guilabel>Open File</guilabel> dialogue. Use the file view to select the file you want to open, and click on <guibutton>Open</guibutton> to open it. You can find more information about the &kde; <guilabel>Open File</guilabel> dialogue in the &kde; User Guide.</para>
 
 </listitem>
-</varlistentry
->  
+</varlistentry>  
   
-<varlistentry
->  
+<varlistentry>  
 <term id="open-recent">
-<menuchoice
-><guimenu
->File</guimenu
-> <guisubmenu
->Open Recent</guisubmenu
-> </menuchoice>
-</term
-> 
+<menuchoice><guimenu>File</guimenu> <guisubmenu>Open Recent</guisubmenu> </menuchoice>
+</term> 
 <listitem>
-<para
->This is a shortcut to open recently saved documents. Clicking on this item opens a list to the side of the menu with several of the most recently saved files. Clicking on a specific file will open it in &kwrite; - if the file still resides at the same location. </para>
+<para>This is a shortcut to open recently saved documents. Clicking on this item opens a list to the side of the menu with several of the most recently saved files. Clicking on a specific file will open it in &kwrite; - if the file still resides at the same location. </para>
 </listitem>
 </varlistentry>
   
-<varlistentry
->  
+<varlistentry>  
 <term id="save">
-<menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->S</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Save</guimenuitem
-> </menuchoice>
-</term
->  
+<menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Save</guimenuitem> </menuchoice>
+</term>  
 <listitem>
-<para
->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 dialogue (described below) will be invoked. </para>
-</listitem
->  
-</varlistentry
->  
-  
-<varlistentry
->  
+<para>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 dialogue (described below) will be invoked. </para>
+</listitem>  
+</varlistentry>  
+  
+<varlistentry>  
 <term id="save-as">
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Save As...</guimenuitem
-> </menuchoice>
-</term
->  
+<menuchoice><guimenu>File</guimenu> <guimenuitem>Save As...</guimenuitem> </menuchoice>
+</term>  
 <listitem>
-<para
->This allows a document to be saved with a new file name. This is done by means of the file dialogue box described above in the <link linkend="open"
->Open</link
-> section of this help file. </para>
+<para>This allows a document to be saved with a new file name. This is done by means of the file dialogue box described above in the <link linkend="open">Open</link> section of this help file. </para>
 </listitem>
 </varlistentry>
   
-<varlistentry
->  
+<varlistentry>  
 <term id="print">
-<menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->P</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Print...</guimenuitem
-> </menuchoice>
-</term
->  
-<listitem
->  
-<para
->Opens a simple print dialogue allowing the user to specify what, where, and how to print </para
->  
-</listitem
->  
-</varlistentry
->  
+<menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>P</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Print...</guimenuitem> </menuchoice>
+</term>  
+<listitem>  
+<para>Opens a simple print dialogue allowing the user to specify what, where, and how to print </para>  
+</listitem>  
+</varlistentry>  
   
 <!--
-<varlistentry
->  
+<varlistentry>  
 <term id="new-view">
-<menuchoice
->  
-<guimenu
->File</guimenu>
-<guimenuitem
->New View</guimenuitem>
+<menuchoice>  
+<guimenu>File</guimenu>
+<guimenuitem>New View</guimenuitem>
 </menuchoice>
-</term
->  
-<listitem
->  
+</term>  
+<listitem>  
 <para>
 This creates a new view of the current document, &ie;, a new instance of
 &kwrite; (as explained in the previous entry) but containing the same
 document.
 </para>
-</listitem
->  
-</varlistentry
->  
+</listitem>  
+</varlistentry>  
   //-->
 
-<varlistentry
->  
+<varlistentry>  
 <term id="close">
-<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
->This will close the editor window, if you have more than one instance of &kwrite; running, through the <guimenuitem
->New View</guimenuitem
-> or <guimenuitem
->New Window</guimenuitem
-> menu items, those instances will not be closed. </para>
+<para>This will close the editor window, if you have more than one instance of &kwrite; running, through the <guimenuitem>New View</guimenuitem> or <guimenuitem>New Window</guimenuitem> menu items, those instances will not be closed. </para>
 </listitem>
-</varlistentry
->  
+</varlistentry>  
   
-</variablelist
->  
+</variablelist>  
   
-</sect1
->  
+</sect1>  
   
-<sect1 id="edit"
->  
-<title
->The <guimenu
->Edit</guimenu
-> Menu</title
->  
+<sect1 id="edit">  
+<title>The <guimenu>Edit</guimenu> Menu</title>  
   
-<variablelist
->  
+<variablelist>  
 <varlistentry>
-<term id="undo"
-><menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->Z</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Undo</guimenuitem
-></menuchoice
-></term>
-<listitem
->  
-<para
->This is used to eliminate or reverse the most recent user action or operation. </para
->   
-</listitem
->  
-</varlistentry
->  
-  
-<varlistentry
->  
-<term
-><anchor id="redo"/><menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;&Shift;<keycap
->Z</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-><guimenuitem
->Redo</guimenuitem
-></menuchoice
-></term
->  
-<listitem
->  
-<para
->This will reverse the most recent change (if any) made using Undo</para
->  
-</listitem
->  
-</varlistentry
->  
-  
-<!--<varlistentry
->  
-<term
-><anchor id="undohistory"/><menuchoice
->  
-<guimenu
->Edit</guimenu
-><guimenuitem
->Undo/Redo 
-History</guimenuitem
-></menuchoice
-></term
->  
-<listitem
->  
-<para
->This will call a display box showing a list of the most recent actions on  
+<term id="undo"><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>Z</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Undo</guimenuitem></menuchoice></term>
+<listitem>  
+<para>This is used to eliminate or reverse the most recent user action or operation. </para>   
+</listitem>  
+</varlistentry>  
+  
+<varlistentry>  
+<term><anchor id="redo"/><menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>Z</keycap></keycombo></shortcut> <guimenu>Edit</guimenu><guimenuitem>Redo</guimenuitem></menuchoice></term>  
+<listitem>  
+<para>This will reverse the most recent change (if any) made using Undo</para>  
+</listitem>  
+</varlistentry>  
+  
+<!--<varlistentry>  
+<term><anchor id="undohistory"/><menuchoice>  
+<guimenu>Edit</guimenu><guimenuitem>Undo/Redo 
+History</guimenuitem></menuchoice></term>  
+<listitem>  
+<para>This will call a display box showing a list of the most recent actions on  
 
 
 the left and another list of actions which have been 'undone' on the right.  
 There are also three buttons at the right of the box labeled  
-<guibutton
->Undo</guibutton
->, <guibutton
->Redo</guibutton
->, and  
-<guibutton
->Close</guibutton
->.  Clicking on the <guibutton
->Undo</guibutton
->  
+<guibutton>Undo</guibutton>, <guibutton>Redo</guibutton>, and  
+<guibutton>Close</guibutton>.  Clicking on the <guibutton>Undo</guibutton>  
 button will cause the action at the top of the Undo list to be reversed which  
 will place that particular action at the top of the Redo list. Likewise,  
-clicking on the <guibutton
->Redo</guibutton
-> button will reinstate the reversed  
+clicking on the <guibutton>Redo</guibutton> button will reinstate the reversed  
 action and move it back to the top of the Undo list.  Clicking on an item below  
 
 
@@ -1226,297 +451,94 @@ useful when the user knows precisely the point to which she or he would like to
 
 
 proceed - making it unnecessary to go through a series of single undo or redo  
-actions.</para
->   
-</listitem
->  
-</varlistentry
->  //-->
-  
-<varlistentry
->  
-<term
-><anchor id="cut"/><menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->X</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-><guimenuitem
->Cut</guimenuitem
-></menuchoice
-></term
->  
-<listitem
->  
-<para
->This command deletes the current selection and places it on the clipboard. The clipboard is a feature of KDE that works invisibly to provide a way to transfer data between applications.</para
->  
-</listitem
->  
-</varlistentry
->  
-  
-<varlistentry
->  
-<term
-><anchor id="copy"/><menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->C</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-><guimenuitem
->Copy</guimenuitem
-></menuchoice
-></term
->  
-<listitem
->  
-<para
->This copies the currently selected text to the clipboard so that it may be pasted elsewhere. The clipboard is a feature of KDE that works invisibly to provide a way to transfer data between applications.</para
->   
-</listitem
->  
-</varlistentry
->  
-  
-<varlistentry
->  
-<term
-><anchor id="paste"/><menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->V</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-><guimenuitem
->Paste</guimenuitem
-></menuchoice
-></term
->  
-<listitem
->  
-<para
->This will insert the contents of the clipboard at the cursor position. The clipboard is feature of KDE that works invisibly to provide a way to transfer data between applications.</para
->  
-</listitem
->  
-</varlistentry
->  
-  
-<varlistentry
->  
-<term
-><anchor id="select-all"/><menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->A</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-><guimenuitem
->Select All</guimenuitem
-></menuchoice
-></term>
-<listitem
->  
-<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="invert-the-selection"/><menuchoice
->  
-<guimenu
->Edit</guimenu
-><guimenuitem
->Invert 
-Selection</guimenuitem
-></menuchoice
-></term
->  
-<listitem
->  
-<para
->This selects any unselected text while unselecting any selected text -  
-effectively reversing the current state of selection.</para
->  
-</listitem
->  
-</varlistentry
->  //-->
-  
-<varlistentry
->  
+actions.</para>   
+</listitem>  
+</varlistentry>  //-->
+  
+<varlistentry>  
+<term><anchor id="cut"/><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>X</keycap></keycombo></shortcut> <guimenu>Edit</guimenu><guimenuitem>Cut</guimenuitem></menuchoice></term>  
+<listitem>  
+<para>This command deletes the current selection and places it on the clipboard. The clipboard is a feature of KDE that works invisibly to provide a way to transfer data between applications.</para>  
+</listitem>  
+</varlistentry>  
+  
+<varlistentry>  
+<term><anchor id="copy"/><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>C</keycap></keycombo></shortcut> <guimenu>Edit</guimenu><guimenuitem>Copy</guimenuitem></menuchoice></term>  
+<listitem>  
+<para>This copies the currently selected text to the clipboard so that it may be pasted elsewhere. The clipboard is a feature of KDE that works invisibly to provide a way to transfer data between applications.</para>   
+</listitem>  
+</varlistentry>  
+  
+<varlistentry>  
+<term><anchor id="paste"/><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>V</keycap></keycombo></shortcut> <guimenu>Edit</guimenu><guimenuitem>Paste</guimenuitem></menuchoice></term>  
+<listitem>  
+<para>This will insert the contents of the clipboard at the cursor position. The clipboard is feature of KDE that works invisibly to provide a way to transfer data between applications.</para>  
+</listitem>  
+</varlistentry>  
+  
+<varlistentry>  
+<term><anchor id="select-all"/><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>A</keycap></keycombo></shortcut> <guimenu>Edit</guimenu><guimenuitem>Select All</guimenuitem></menuchoice></term>
+<listitem>  
+<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="invert-the-selection"/><menuchoice>  
+<guimenu>Edit</guimenu><guimenuitem>Invert 
+Selection</guimenuitem></menuchoice></term>  
+<listitem>  
+<para>This selects any unselected text while unselecting any selected text -  
+effectively reversing the current state of selection.</para>  
+</listitem>  
+</varlistentry>  //-->
+  
+<varlistentry>  
 <term id="go-to-line">
-<menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->G</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Go to line</guimenuitem
-></menuchoice
-></term
->  
-<listitem
->  
-<para
->This opens the goto line dialogue box 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. There is also a slide control to the right of the text box which allows the user to move the goto point in the document in an analogue manner. </para
-> 
-</listitem
-> 
+<menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>G</keycap></keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Go to line</guimenuitem></menuchoice></term>  
+<listitem>  
+<para>This opens the goto line dialogue box 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. There is also a slide control to the right of the text box which allows the user to move the goto point in the document in an analogue manner. </para> 
+</listitem> 
 </varlistentry>
         
-<varlistentry
->  
-<term
-><anchor id="find"/><menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->F</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-><guimenuitem
->Find</guimenuitem
-></menuchoice
-></term>
-<listitem
->  
-<para
->This opens the find dialogue which is used to specify the <guilabel
->Text to Find</guilabel
-> in the document. There is small text box for entering the search pattern which also doubles as a dropdown box. Clicking on the dropdown arrow at the side of the box makes available other recent search patterns. Other parameters are included to make the search more efficient. Selecting <guilabel
->Case Sensitive</guilabel
-> will limit finds to entries that match the case (upper or lower) of each of the characters in the search pattern. <guilabel
->Find Backwards</guilabel
-> directs the search to proceed in an upwardly direction. The <guilabel
->Selected Text</guilabel
-> option keeps the search within currently selected text. Checking <guilabel
->Whole Words Only</guilabel
-> prevents the search from stopping on words that contain the searched for pattern. The <guilabel
->Search from Cursor</guilabel
-> option begins the search from the current position of the cursor within the document rather than from the beginning.</para
->   
-</listitem
->  
-</varlistentry
->  
-
-<varlistentry
->  
-<term
-><anchor id="find-again"/><menuchoice
-><shortcut
-><keycombo action="simul"
-><keycap
->F3</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-><guimenuitem
->Find Next</guimenuitem
-></menuchoice
-></term
->  
-
-
-<listitem
->  
-<para
->This repeats the last find operation, if any, without calling the find dialogue box.</para
-> </listitem
->  
-</varlistentry
->  
+<varlistentry>  
+<term><anchor id="find"/><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo></shortcut> <guimenu>Edit</guimenu><guimenuitem>Find</guimenuitem></menuchoice></term>
+<listitem>  
+<para>This opens the find dialogue which is used to specify the <guilabel>Text to Find</guilabel> in the document. There is small text box for entering the search pattern which also doubles as a dropdown box. Clicking on the dropdown arrow at the side of the box makes available other recent search patterns. Other parameters are included to make the search more efficient. Selecting <guilabel>Case Sensitive</guilabel> will limit finds to entries that match the case (upper or lower) of each of the characters in the search pattern. <guilabel>Find Backwards</guilabel> directs the search to proceed in an upwardly direction. The <guilabel>Selected Text</guilabel> option keeps the search within currently selected text. Checking <guilabel>Whole Words Only</guilabel> prevents the search from stopping on words that contain the searched for pattern. The <guilabel>Search from Cursor</guilabel> option begins the search from the current position of the cursor within the document rather than from the beginning.</para>   
+</listitem>  
+</varlistentry>  
+
+<varlistentry>  
+<term><anchor id="find-again"/><menuchoice><shortcut><keycombo action="simul"><keycap>F3</keycap></keycombo></shortcut> <guimenu>Edit</guimenu><guimenuitem>Find Next</guimenuitem></menuchoice></term>  
+
+
+<listitem>  
+<para>This repeats the last find operation, if any, without calling the find dialogue box.</para> </listitem>  
+</varlistentry>  
   
 <varlistentry>
 <term id="find-previous">
-<menuchoice
-><shortcut
-> <keycombo action="simul"
->&Shift;<keycap
->F3</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Find Previous</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut> <keycombo action="simul">&Shift;<keycap>F3</keycap></keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Find Previous</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->This repeats the last find operation, if any, without calling the find dialogue box, and searching backwards instead of forwards through the document. </para>
+<para>This repeats the last find operation, if any, without calling the find dialogue box, and searching backwards instead of forwards through the document. </para>
 </listitem>
 </varlistentry>
 
-<varlistentry
->  
-<term
-><anchor id="replace"/><menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->R</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-><guimenuitem
->Replace</guimenuitem
-></menuchoice
-></term>
-<listitem
->  
-<para
->This command opens the replace dialogue box. The replace dialogue is almost identical to the above-mentioned find dialogue. In addition to the features in the find dialogue it contains a <guilabel
->Replace With:</guilabel
-> text entry/dropdown box. Using this dialogue the user can specify both the text to be found and text with which to replace it. The additional <guilabel
->Prompt On Replace</guilabel
-> option allows the user to have &kwrite; ask for confirmation before each replacement.</para
-> </listitem>
+<varlistentry>  
+<term><anchor id="replace"/><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo></shortcut> <guimenu>Edit</guimenu><guimenuitem>Replace</guimenuitem></menuchoice></term>
+<listitem>  
+<para>This command opens the replace dialogue box. The replace dialogue is almost identical to the above-mentioned find dialogue. In addition to the features in the find dialogue it contains a <guilabel>Replace With:</guilabel> text entry/dropdown box. Using this dialogue the user can specify both the text to be found and text with which to replace it. The additional <guilabel>Prompt On Replace</guilabel> option allows the user to have &kwrite; ask for confirmation before each replacement.</para> </listitem>
 </varlistentry>
 
 <!--<varlistentry>
 <term>
 <menuchoice>
 <shortcut>
-<keycombo action="simul"
->&Ctrl;<keycap
->M</keycap
-></keycombo>
+<keycombo action="simul">&Ctrl;<keycap>M</keycap></keycombo>
 </shortcut>
-<guimenu
->Edit</guimenu>
-<guimenuitem
->Editing Command</guimenuitem>
+<guimenu>Edit</guimenu>
+<guimenuitem>Editing Command</guimenuitem>
 </menuchoice>
 </term>
 <listitem>
@@ -1524,36 +546,23 @@ effectively reversing the current state of selection.</para
 To be written
 </para>
 </listitem>
-</varlistentry
->//-->
+</varlistentry>//-->
 </variablelist>
 
-</sect1
->  
-  
-<sect1 id="go"
->  
-<title
->The <guimenu
->Bookmarks</guimenu
-> Menu</title
->  
-<variablelist
->  
+</sect1>  
+  
+<sect1 id="go">  
+<title>The <guimenu>Bookmarks</guimenu> Menu</title>  
+<variablelist>  
 <!--
 <varlistentry>
 <term id="toggle-bookmarks">
 <menuchoice>
 <shortcut>
-<keycombo action="simul"
->&Ctrl;<keycap
->B</keycap
-></keycombo>
+<keycombo action="simul">&Ctrl;<keycap>B</keycap></keycombo>
 </shortcut>
-<guimenu
->Bookmarks</guimenu>
-<guimenuitem
->Toggle Bookmark</guimenuitem>
+<guimenu>Bookmarks</guimenu>
+<guimenuitem>Toggle Bookmark</guimenuitem>
 </menuchoice>
 </term>
 <listitem>
@@ -1565,345 +574,129 @@ To be written
 -->
 <varlistentry>
 <term id="clear-bookmarks">
-<menuchoice
-><guimenu
->Bookmarks</guimenu
-> <guimenuitem
->Clear All Bookmarks</guimenuitem
-> </menuchoice>
-</term
->  
-<listitem
->  
-<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
-> 
+<menuchoice><guimenu>Bookmarks</guimenu> <guimenuitem>Clear All Bookmarks</guimenuitem> </menuchoice>
+</term>  
+<listitem>  
+<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> 
 </variablelist>
   
-<para
->At the bottom of this menu, a list of markers appears if any markers are available for this window. </para>
+<para>At the bottom of this menu, a list of markers appears if any markers are available for this window. </para>
 
-</sect1
->  
+</sect1>  
   
-<sect1 id="tools"
->  
-<title
->The <guimenu
->Tools</guimenu
-> Menu</title
->  
+<sect1 id="tools">  
+<title>The <guimenu>Tools</guimenu> Menu</title>  
   
 <variablelist>
 <varlistentry>
-<term
-><anchor id="Spelling..."/><menuchoice
-><guimenu
->Tools</guimenu
-><guimenuitem
->Spelling...</guimenuitem
-></menuchoice
-></term>
-
-<listitem
-><para
-><action
->This initiates the spell checking program - a program designed to help the user catch and correct any spelling errors.</action
-> Clicking on this entry will start the checker and bring up the speller dialogue box through which the user can control the process. There are four settings lined up vertically in the centre of the dialogue with their corresponding labels just to the left. Starting at the top they are:</para>
+<term><anchor id="Spelling..."/><menuchoice><guimenu>Tools</guimenu><guimenuitem>Spelling...</guimenuitem></menuchoice></term>
+
+<listitem><para><action>This initiates the spell checking program - a program designed to help the user catch and correct any spelling errors.</action> Clicking on this entry will start the checker and bring up the speller dialogue box through which the user can control the process. There are four settings lined up vertically in the centre of the dialogue with their corresponding labels just to the left. Starting at the top they are:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Unknown word:</guilabel
-></term>
-<listitem
-><para
->Here, the spell checker indicates the word currently under consideration. This happens when the checker encounters a word not in its dictionary - a file containing a list of correctly spelled words against which it compares each word in the editor.</para
-></listitem>
+<term><guilabel>Unknown word:</guilabel></term>
+<listitem><para>Here, the spell checker indicates the word currently under consideration. This happens when the checker encounters a word not in its dictionary - a file containing a list of correctly spelled words against which it compares each word in the editor.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Replace with:</guilabel
-></term>
-<listitem
-><para
->If the checker has any similar words in its dictionary the first one will be listed here. The user can accept the suggestion, type in his or her own correction, or choose a different suggestion from the next box.</para
-></listitem>
+<term><guilabel>Replace with:</guilabel></term>
+<listitem><para>If the checker has any similar words in its dictionary the first one will be listed here. The user can accept the suggestion, type in his or her own correction, or choose a different suggestion from the next box.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Suggested Words:</guilabel
-></term>
-<listitem
-><para
->The checker may list here a number of possible replacements for the word under consideration. Clicking on any one of the suggestions will cause that word to be entered in the <guilabel
->Replacement:</guilabel
-> box, above.</para
-></listitem>
+<term><guilabel>Suggested Words:</guilabel></term>
+<listitem><para>The checker may list here a number of possible replacements for the word under consideration. Clicking on any one of the suggestions will cause that word to be entered in the <guilabel>Replacement:</guilabel> box, above.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Language:</guilabel
-></term>
-<listitem
-><para
->If you have installed multiple dictionaries, here you can select which dictionary/language should be used.</para
-></listitem>
+<term><guilabel>Language:</guilabel></term>
+<listitem><para>If you have installed multiple dictionaries, here you can select which dictionary/language should be used.</para></listitem>
 </varlistentry>
 </variablelist>
 
-<para
->On the right side of the dialogue box are 5 buttons that allow the user to control the spell check process. They are:</para>
+<para>On the right side of the dialogue box are 5 buttons that allow the user to control the spell check process. They are:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guibutton
->Add to Dictionary</guibutton
-></term>
-<listitem
-><para
->Pressing this button adds the word in the <guilabel
->Misspelled Word:</guilabel
-> box to the checker's dictionary. This means that in the future the checker will always consider this word to be correctly spelled.</para
-></listitem>
+<term><guibutton>Add to Dictionary</guibutton></term>
+<listitem><para>Pressing this button adds the word in the <guilabel>Misspelled Word:</guilabel> box to the checker's dictionary. This means that in the future the checker will always consider this word to be correctly spelled.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guibutton
->Replace</guibutton
-></term>
-<listitem
-><para
->This button has the checker replace the word under consideration in the document with the word in the <guilabel
->Replacement:</guilabel
-> box.</para
-></listitem>
+<term><guibutton>Replace</guibutton></term>
+<listitem><para>This button has the checker replace the word under consideration in the document with the word in the <guilabel>Replacement:</guilabel> box.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guibutton
->Replace All</guibutton
-></term>
-<listitem
-><para
->This button causes the checker to replace not only the current <guilabel
->Unknown word:</guilabel
-> but to automatically make the same substitution for any other occurrences of this <guilabel
->Misspelled Word:</guilabel
-> in the document.</para
-></listitem>
+<term><guibutton>Replace All</guibutton></term>
+<listitem><para>This button causes the checker to replace not only the current <guilabel>Unknown word:</guilabel> but to automatically make the same substitution for any other occurrences of this <guilabel>Misspelled Word:</guilabel> in the document.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guibutton
->Ignore</guibutton
-></term>
-<listitem
-><para
->Activating this button will have the checker move on without making any changes.</para
-></listitem>
+<term><guibutton>Ignore</guibutton></term>
+<listitem><para>Activating this button will have the checker move on without making any changes.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guibutton
->Ignore All</guibutton
-></term>
-<listitem
-><para
->This button tells the checker to do nothing with the current <guilabel
->Unknown word:</guilabel
-> and to pass over any other instances of the same word.</para
-> <note
-><para
->This only applies to the current spell check run. If the checker is run again later it will stop on this same word.</para
-></note
-></listitem>
+<term><guibutton>Ignore All</guibutton></term>
+<listitem><para>This button tells the checker to do nothing with the current <guilabel>Unknown word:</guilabel> and to pass over any other instances of the same word.</para> <note><para>This only applies to the current spell check run. If the checker is run again later it will stop on this same word.</para></note></listitem>
 </varlistentry>
 </variablelist>
 
-<!--<para
->Located horizontally along the bottom of the spell check dialog is a
+<!--<para>Located horizontally along the bottom of the spell check dialog is a
 progress bar.  As the checking process proceeds the bar will fill from left to
 right providing a graphical representation of how far along in the document the
 process has reached.  In addition, the progress is displayed numerically in
-the center of the progress bar.</para
->//-->
+the center of the progress bar.</para>//-->
 
-<!--<note
-><para
->A numerical display of the spell check
+<!--<note><para>A numerical display of the spell check
 process is simultaneously displayed in the status bar of the editor.  The <link
-linkend="show-statusbar"
->status bar</link
-> is the horizontal strip at the bottom
-of the editor just outside of the text entry area.</para
-></note
->//-->
+linkend="show-statusbar">status bar</link> is the horizontal strip at the bottom
+of the editor just outside of the text entry area.</para></note>//-->
 
-<para
->Three more buttons are located horizontally along the bottom of the spell check dialogue. They are:</para>
+<para>Three more buttons are located horizontally along the bottom of the spell check dialogue. They are:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guibutton
->Help</guibutton
-></term>
-<listitem
-><para
->This invokes the KDE help system starting at the &kwrite; help pages (this document).</para
-></listitem>
+<term><guibutton>Help</guibutton></term>
+<listitem><para>This invokes the KDE help system starting at the &kwrite; help pages (this document).</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guibutton
->Finished</guibutton
-></term>
-<listitem
-><para
->This button ends the spell check process, and returns to the document.</para
-></listitem>
+<term><guibutton>Finished</guibutton></term>
+<listitem><para>This button ends the spell check process, and returns to the document.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guibutton
->Cancel</guibutton
-></term>
-<listitem
-><para
->This button cancels the spell check process, all modifications are reverted, and you will return to your document.</para
-></listitem>
+<term><guibutton>Cancel</guibutton></term>
+<listitem><para>This button cancels the spell check process, all modifications are reverted, and you will return to your document.</para></listitem>
 </varlistentry>
 
-<varlistentry
->  
-<term
-><anchor id="indent"/><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->I</keycap
-></keycombo
-> </shortcut
-> <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-indent"
-> indentation settings</link
->.</para
->  
-</listitem
->  
-</varlistentry
->  
-  
-<varlistentry
->  
-<term
-><anchor id="unindent"/><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;&Shift;<keycap
->I</keycap
-></keycombo
-> </shortcut
-> <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-indent"
-> indentation settings</link
->.</para
->  
-</listitem
->  
-</varlistentry
->  
-  
-<varlistentry
->  
-<term
-><anchor id="cleanindent"/><menuchoice
-><guimenu
->Tools</guimenu
-><guimenuitem
->Clean Indentation</guimenuitem
-></menuchoice
-></term
->  <listitem
->  
-<para
->Not yet implemented</para>
-</listitem
->  
-</varlistentry
->  
-  
-<varlistentry
->  
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->D</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Tools</guimenu
-><guimenuitem
->Comment</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
->This adds one space to the beginning of the line where the text cursor is located or to the beginning of any selected lines.</para>
+<varlistentry>  
+<term><anchor id="indent"/><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>I</keycap></keycombo> </shortcut> <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-indent"> indentation settings</link>.</para>  
+</listitem>  
+</varlistentry>  
+  
+<varlistentry>  
+<term><anchor id="unindent"/><menuchoice><shortcut> <keycombo action="simul">&Ctrl;&Shift;<keycap>I</keycap></keycombo> </shortcut> <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-indent"> indentation settings</link>.</para>  
+</listitem>  
+</varlistentry>  
+  
+<varlistentry>  
+<term><anchor id="cleanindent"/><menuchoice><guimenu>Tools</guimenu><guimenuitem>Clean Indentation</guimenuitem></menuchoice></term>  <listitem>  
+<para>Not yet implemented</para>
+</listitem>  
+</varlistentry>  
+  
+<varlistentry>  
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>D</keycap></keycombo> </shortcut> <guimenu>Tools</guimenu><guimenuitem>Comment</guimenuitem></menuchoice></term>
+<listitem><para>This adds one space to the beginning of the line where the text cursor is located or to the beginning of any selected lines.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;&Shift;<keycap
->D</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Tools</guimenu
-><guimenuitem
->Uncomment</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
->This removes one space (if any exist) from the beginning of the line where the text cursor is located or from the beginning of any selected lines.</para
-></listitem>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;&Shift;<keycap>D</keycap></keycombo> </shortcut> <guimenu>Tools</guimenu><guimenuitem>Uncomment</guimenuitem></menuchoice></term>
+<listitem><para>This removes one space (if any exist) from the beginning of the line where the text cursor is located or from the beginning of any selected lines.</para></listitem>
 </varlistentry>
 </variablelist>
 </listitem>
@@ -1913,181 +706,71 @@ of the editor just outside of the text entry area.</para
 </sect1>
 
 <sect1 id="settings">
-<title
->The <guimenu
->Settings</guimenu
-> Menu</title>
+<title>The <guimenu>Settings</guimenu> Menu</title>
 
 <variablelist>
 <varlistentry>
-<term
-><anchor id="show-toolbar"/><menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show Toolbar</guimenuitem
-> </menuchoice>
-</term
->  
-<listitem
->  
-<para
->When checked, this displays a moveable toolbar containing buttons used to initiate frequently used commands. When unchecked the toolbar is hidden. </para
-> 
-</listitem
-> 
+<term><anchor id="show-toolbar"/><menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Toolbar</guimenuitem> </menuchoice>
+</term>  
+<listitem>  
+<para>When checked, this displays a moveable toolbar containing buttons used to initiate frequently used commands. When unchecked the toolbar is hidden. </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 statusbar is hidden.</para
->     
-</listitem
->  
-</varlistentry
->  
-  
-<varlistentry
->  
-<term
-><anchor id="show-path"/><menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Show Path</guimenuitem
-></menuchoice
-></term>
-<listitem
->  
-<para
->When selected, this displays in the title bar the path (its location in the file system) of the current document. When unchecked the path is hidden.</para>
-</listitem
->  
-</varlistentry
->  
-
-<varlistentry
->  
-<term
-><anchor id="preferences"/><menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Editor...</guimenuitem
-> </menuchoice>
+<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 statusbar is hidden.</para>     
+</listitem>  
+</varlistentry>  
+  
+<varlistentry>  
+<term><anchor id="show-path"/><menuchoice><guimenu>Settings</guimenu><guimenuitem>Show Path</guimenuitem></menuchoice></term>
+<listitem>  
+<para>When selected, this displays in the title bar the path (its location in the file system) of the current document. When unchecked the path is hidden.</para>
+</listitem>  
+</varlistentry>  
+
+<varlistentry>  
+<term><anchor id="preferences"/><menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Editor...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->This menu item opens a dialogue whereby several different <link linkend="pref-dialog"
->settings</link
-> may be adjusted. </para>
-</listitem
-> 
+<para>This menu item opens a dialogue whereby several different <link linkend="pref-dialog">settings</link> may be adjusted. </para>
+</listitem> 
 </varlistentry>
   
-<varlistentry
->  
-<term
-><anchor id="configure-keybindings"/><menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Shortcuts...</guimenuitem
-></menuchoice
-></term
->  
-<listitem
->  
-<para
->This command opens a dialogue box whereby the <link linkend="keybindings"
->key bindings</link
-> may be changed. A display window at the top of the dialogue box shows the list of commands (actions) that can have keyboard shortcuts. Below the display are three radio buttons. The user may choose between No Key, Default Key, and Custom Key. (Note that a set of radio buttons only allows the selection of one of the offered items - in the way that buttons on a car radio only offer the selection of one preset station. Also, the Default Key selection is only available for those commands that actually have a 'default' shortcut.) Selecting the Custom Key option activates the three check boxes and key button at the bottom of the dialogue. The user may then select a key combination for the command in question by means of the check boxes and key button. For example, with the About KDE command selected in the display window, the user could select &Ctrl; and <keycap
->Alt</keycap
->, click on the key button, and then press the <keycap
->K</keycap
-> key on the keyboard. This would mean that anytime he or she held down the &Ctrl; and <keycap
->Alt</keycap
-> buttons and pressed <keycap
->K</keycap
-> (while using &kwrite;) the About KDE display box would be called. </para
->   
-</listitem
->  
-</varlistentry
->  
-  
-<varlistentry
->  
-<term
-><anchor id="configure-toolbars"/><menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Toolbars...</guimenuitem
-></menuchoice
-></term
->  
-<listitem
-><para
->This will open the dialogue whereby the toolbar configuration may be changed. The user can choose which shortcut buttons should appear on the toolbar. A display window on the left lists the commands available to placed on the toolbar. A display on the right lists those commands already on the toolbar. A set of four arrow buttons between the two displays manipulates the selections. The right pointing arrow places any command selected in the left pane onto the right pane, <abbrev
->i.e.</abbrev
->, it is added to the toolbar. The left arrow does just the opposite, removing any action selected in the right window from the toolbar. The up and down pointing arrows change the position of an action selected in the right window which changes the position of its button in the toolbar.</para
-> </listitem
->   
-</varlistentry
->  
+<varlistentry>  
+<term><anchor id="configure-keybindings"/><menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Shortcuts...</guimenuitem></menuchoice></term>  
+<listitem>  
+<para>This command opens a dialogue box whereby the <link linkend="keybindings">key bindings</link> may be changed. A display window at the top of the dialogue box shows the list of commands (actions) that can have keyboard shortcuts. Below the display are three radio buttons. The user may choose between No Key, Default Key, and Custom Key. (Note that a set of radio buttons only allows the selection of one of the offered items - in the way that buttons on a car radio only offer the selection of one preset station. Also, the Default Key selection is only available for those commands that actually have a 'default' shortcut.) Selecting the Custom Key option activates the three check boxes and key button at the bottom of the dialogue. The user may then select a key combination for the command in question by means of the check boxes and key button. For example, with the About KDE command selected in the display window, the user could select &Ctrl; and <keycap>Alt</keycap>, click on the key button, and then press the <keycap>K</keycap> key on the keyboard. This would mean that anytime he or she held down the &Ctrl; and <keycap>Alt</keycap> buttons and pressed <keycap>K</keycap> (while using &kwrite;) the About KDE display box would be called. </para>   
+</listitem>  
+</varlistentry>  
+  
+<varlistentry>  
+<term><anchor id="configure-toolbars"/><menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Toolbars...</guimenuitem></menuchoice></term>  
+<listitem><para>This will open the dialogue whereby the toolbar configuration may be changed. The user can choose which shortcut buttons should appear on the toolbar. A display window on the left lists the commands available to placed on the toolbar. A display on the right lists those commands already on the toolbar. A set of four arrow buttons between the two displays manipulates the selections. The right pointing arrow places any command selected in the left pane onto the right pane, <abbrev>i.e.</abbrev>, it is added to the toolbar. The left arrow does just the opposite, removing any action selected in the right window from the toolbar. The up and down pointing arrows change the position of an action selected in the right window which changes the position of its button in the toolbar.</para> </listitem>   
+</varlistentry>  
   
 
   
 <!-- 
-<varlistentry
->  
+<varlistentry>  
 <term>
-<menuchoice
-><guimenu
->
->Settings</guimenu
-><guimenuitem
->Configure
-Highlighting</guimenuitem
-></menuchoice
-></term
->  
-<listitem
-><para
->Opens a dialog box allowing configuration of the syntax  
+<menuchoice><guimenu>>Settings</guimenu><guimenuitem>Configure
+Highlighting</guimenuitem></menuchoice></term>  
+<listitem><para>Opens a dialog box allowing configuration of the syntax  
 highlighting.  The dialog is described in <xref  
-linkend="pref-highlighting"/>.</para
-></listitem
->  
-</varlistentry
->  -->
+linkend="pref-highlighting"/>.</para></listitem>  
+</varlistentry>  -->
   
 <!--<varlistentry>
 <term>
 <menuchoice>
 <shortcut>
-<keycombo action="simul"
-><keycap
->F6</keycap
-></keycombo>
+<keycombo action="simul"><keycap>F6</keycap></keycombo>
 </shortcut>
-<guimenu
->Settings</guimenu>
-<guimenuitem
->Show Icon Border</guimenuitem>
+<guimenu>Settings</guimenu>
+<guimenuitem>Show Icon Border</guimenuitem>
 </menuchoice>
 </term>
 <listitem>
@@ -2096,530 +779,210 @@ Toggle the display of a border on the left of the editing window, where
 bookmarks are displayed next to the line they apply to.
 </para>
 </listitem>
-</varlistentry
->//-->
+</varlistentry>//-->
 
 <!--<varlistentry>
 <term id="vertical-selection">
 <menuchoice>
 <shortcut>
-<keycombo action="simul"
-><keycap
->F4</keycap
-></keycombo>
+<keycombo action="simul"><keycap>F4</keycap></keycombo>
 </shortcut>
-<guimenu
->Settings</guimenu>
-<guimenuitem
->Vertical Selection</guimenuitem>
+<guimenu>Settings</guimenu>
+<guimenuitem>Vertical Selection</guimenuitem>
 </menuchoice>
-</term
->  
-<listitem
->  
+</term>  
+<listitem>  
 <para>
 This is used to turn on or off the vertical selection feature.  Vertical  
 selection allows text to be selected by column as well as by row.  In other  
 words with this feature the user is able to select text contained in only  
 particular contiguous columns and rows.  In affect the user can select a  
 rectangular area of text anywhere in the document.
-</para
->  
-</listitem
->  
-</varlistentry
->  //-->
-  
-<!--<varlistentry
->  
+</para>  
+</listitem>  
+</varlistentry>  //-->
+  
+<!--<varlistentry>  
 <term id="set-highlight">
-<menuchoice
->  
-<guimenu
->Settings</guimenu>
-<guisubmenu
->Highlight Mode</guisubmenu>
+<menuchoice>  
+<guimenu>Settings</guimenu>
+<guisubmenu>Highlight Mode</guisubmenu>
 </menuchoice>
 </term>
-<listitem
->  
+<listitem>  
 <para>
 This allows the user to choose the style of color highlighting which the
 editor uses to display the text. The styles are selected by programming
 language. The font/color information is not stored with the document.
 </para>
-</listitem
->  
-</varlistentry
->  //-->
-  
-<!--<varlistentry
->  
-<term
-><anchor id="end-of-line"/>
-<menuchoice
->  
-<guimenu
->Settings</guimenu
-><guisubmenu
->End of Line</guisubmenu
-></menuchoice
-></term
->  
-<listitem
->  
-<para
->This opens a sub-menu from which the user can select the type of <quote
->end of  
-line</quote
-> code for &kwrite; to use, <abbrev
->i.e.</abbrev
->, the accepted standard  
+</listitem>  
+</varlistentry>  //-->
+  
+<!--<varlistentry>  
+<term><anchor id="end-of-line"/>
+<menuchoice>  
+<guimenu>Settings</guimenu><guisubmenu>End of Line</guisubmenu></menuchoice></term>  
+<listitem>  
+<para>This opens a sub-menu from which the user can select the type of <quote>end of  
+line</quote> code for &kwrite; to use, <abbrev>i.e.</abbrev>, the accepted standard  
 used by &UNIX;, &Mac; or MSDOS/&Windows; systems.</para>
-</listitem
->  
-</varlistentry
->  //-->
-  
-</variablelist
->  
-</sect1
->  
-  
-<sect1 id="help"
->  
-<title
->The <guimenuitem
->Help</guimenuitem
-> Menu</title
-> &help.menu.documentation; </sect1
->  
+</listitem>  
+</varlistentry>  //-->
+  
+</variablelist>  
+</sect1>  
+  
+<sect1 id="help">  
+<title>The <guimenuitem>Help</guimenuitem> Menu</title> &help.menu.documentation; </sect1>  
 </chapter>
   
-<chapter id="pref-dialog"
->  
-<title
->Configure &kwrite;</title>
-
-<para
->Selecting <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Editor</guimenuitem
-></menuchoice
-> from the menu brings up the <guilabel
->Configure Editor</guilabel
-> dialogue box. This dialogue can be used to alter a number of different settings. The settings available for change vary according to which category the user chooses from a vertical list on the left side of the dialogue. By means of three buttons along the bottom of the box the user can control the process. </para>
-
-<para
->She or he may invoke the <guilabel
->Help</guilabel
-> system, accept the current settings and close the dialogue by means of the <guibutton
->OK</guibutton
-> button, or <guibutton
->Cancel</guibutton
-> the process. The categories <guilabel
->Colours</guilabel
->, <guilabel
->Fonts</guilabel
-> <guilabel
->Indent</guilabel
->, <guilabel
->Select</guilabel
->, <guilabel
->Edit</guilabel
->, <guilabel
->Spelling</guilabel
-> and <guilabel
->Highlighting</guilabel
-> are detailed below. </para>
+<chapter id="pref-dialog">  
+<title>Configure &kwrite;</title>
+
+<para>Selecting <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Editor</guimenuitem></menuchoice> from the menu brings up the <guilabel>Configure Editor</guilabel> dialogue box. This dialogue can be used to alter a number of different settings. The settings available for change vary according to which category the user chooses from a vertical list on the left side of the dialogue. By means of three buttons along the bottom of the box the user can control the process. </para>
+
+<para>She or he may invoke the <guilabel>Help</guilabel> system, accept the current settings and close the dialogue by means of the <guibutton>OK</guibutton> button, or <guibutton>Cancel</guibutton> the process. The categories <guilabel>Colours</guilabel>, <guilabel>Fonts</guilabel> <guilabel>Indent</guilabel>, <guilabel>Select</guilabel>, <guilabel>Edit</guilabel>, <guilabel>Spelling</guilabel> and <guilabel>Highlighting</guilabel> are detailed below. </para>
 
 <sect1 id="prefcolors">
-<title
->Colours</title>
-  
-<para
->This section provides access to <link linkend="pref-color-settings"
->two different colour settings</link
->, described below. Each of these settings may be changed by clicking on its corresponding button. These are special wide buttons that are the colour of the current setting. Clicking on one of the buttons calls a special colour dialogue box used to change the setting.</para
->  
-  
-<para
->The colour dialogue box provides a convenient and graphical way to select a colour. In the upper left of the box is a rectangular display of a spectrum of colours. To the immediate right of this, is vertical bar displaying a range of intensity from the most dark at the bottom to the most light at the top. The user may select and adjust a colour by clicking in these two boxes. Clicking in the rectangular display selects a particular mix of red, green, and blue colours and in the vertical bar selects a level of intensity (value). The various colour attributes are displayed in numerical form in small text boxes located directly below the spectral rectangle and the user can see them change as the colour is adjusted. These attributes include the mix of the basic colour components (red, green, and blue) as well as hue and saturation levels. Alternatively the user can enter figures directly in these boxes. There is also a square at the bottom centre of the dialogue box which displays the colour which is under consideration at any time. To the right of this display is another text box labelled <guilabel
->HTML:</guilabel
-> This shows the user the colour code that would be used to specify the particular displayed colour in <acronym
->HTML</acronym
-> code which is widely used for web pages.</para
->  
-  
-<para
->In addition to the above, the colour dialogue allows the capture of any colour currently displayed on the desktop or in another program. Clicking on the button with the dropper icon (located on the right side of the dialogue box,) changes the shape of the mouse cursor to a set of crosshairs. Clicking again will pick up the colour attributes of whatever colour is displayed under the cross hairs.</para
->  
-  
-<para
->Furthermore the user has the option of adding any colour to a personal palette of <quote
->Custom Colours</quote
-> by clicking on the wide button labelled <guibutton
->Add to Custom Colours</guibutton
-> (which is located directly above the display square.) This adds the current colour to the custom colour palette. This palette and any other available palettes can be displayed using the drop down selection box located directly above the palette display at the top right of the dialogue box. Besides the custom colours, the user can access a number of pre-prepared palettes.</para>
-  
-<variablelist
->  
-  
-<varlistentry id="pref-color-settings"
->  
-<term
-><guilabel
->Background</guilabel
-></term
->  
-<listitem
-><para
->Here the user can specify a colour for the general background of &kwrite;.</para
-></listitem
->   
-</varlistentry
->  
-
-<varlistentry
->  
-<term
-><guilabel
->Selected</guilabel
-></term
->  
-<listitem
-><para
->This allows the user to select a colour to be used for indicating selected (or highlighted) portions of the document.</para
-></listitem
-> </varlistentry
->  
-</variablelist
->  
-</sect1
->  
+<title>Colours</title>
+  
+<para>This section provides access to <link linkend="pref-color-settings">two different colour settings</link>, described below. Each of these settings may be changed by clicking on its corresponding button. These are special wide buttons that are the colour of the current setting. Clicking on one of the buttons calls a special colour dialogue box used to change the setting.</para>  
+  
+<para>The colour dialogue box provides a convenient and graphical way to select a colour. In the upper left of the box is a rectangular display of a spectrum of colours. To the immediate right of this, is vertical bar displaying a range of intensity from the most dark at the bottom to the most light at the top. The user may select and adjust a colour by clicking in these two boxes. Clicking in the rectangular display selects a particular mix of red, green, and blue colours and in the vertical bar selects a level of intensity (value). The various colour attributes are displayed in numerical form in small text boxes located directly below the spectral rectangle and the user can see them change as the colour is adjusted. These attributes include the mix of the basic colour components (red, green, and blue) as well as hue and saturation levels. Alternatively the user can enter figures directly in these boxes. There is also a square at the bottom centre of the dialogue box which displays the colour which is under consideration at any time. To the right of this display is another text box labelled <guilabel>HTML:</guilabel> This shows the user the colour code that would be used to specify the particular displayed colour in <acronym>HTML</acronym> code which is widely used for web pages.</para>  
+  
+<para>In addition to the above, the colour dialogue allows the capture of any colour currently displayed on the desktop or in another program. Clicking on the button with the dropper icon (located on the right side of the dialogue box,) changes the shape of the mouse cursor to a set of crosshairs. Clicking again will pick up the colour attributes of whatever colour is displayed under the cross hairs.</para>  
+  
+<para>Furthermore the user has the option of adding any colour to a personal palette of <quote>Custom Colours</quote> by clicking on the wide button labelled <guibutton>Add to Custom Colours</guibutton> (which is located directly above the display square.) This adds the current colour to the custom colour palette. This palette and any other available palettes can be displayed using the drop down selection box located directly above the palette display at the top right of the dialogue box. Besides the custom colours, the user can access a number of pre-prepared palettes.</para>
+  
+<variablelist>  
+  
+<varlistentry id="pref-color-settings">  
+<term><guilabel>Background</guilabel></term>  
+<listitem><para>Here the user can specify a colour for the general background of &kwrite;.</para></listitem>   
+</varlistentry>  
+
+<varlistentry>  
+<term><guilabel>Selected</guilabel></term>  
+<listitem><para>This allows the user to select a colour to be used for indicating selected (or highlighted) portions of the document.</para></listitem> </varlistentry>  
+</variablelist>  
+</sect1>  
 
 <sect1 id="pref-fonts">
-<title
->Fonts</title>
+<title>Fonts</title>
 
-<para
->Here you can choose the default font for &kwrite;. You can choose from any font available on your system, and set a default size and encoding. A sample text displays at the bottom of the dialogue, so you can see the effect of your choices. </para>
+<para>Here you can choose the default font for &kwrite;. You can choose from any font available on your system, and set a default size and encoding. A sample text displays at the bottom of the dialogue, so you can see the effect of your choices. </para>
 
 </sect1>
   
-<sect1 id="pref-indent"
->  
-<title
->Indent</title
->  
-<variablelist
->  
-  
-<varlistentry
->  
-<term
-><guilabel
->Auto Indent</guilabel
-></term
-> <listitem
-><para
->This causes new lines to begin with the same indentation level as the previous line.</para
-></listitem
->  
-</varlistentry
->  
-  
-<varlistentry
->  
-<term
-><guilabel
->Indent With Spaces</guilabel
-></term
-> <listitem
-><para
->This replaces tabs with the number of spaces selected in the Tab Width window in the <link linkend="pref-edit"
->Edit</link
-> section of the preferences dialogue.</para
-></listitem
->  
-</varlistentry
->  
-  
-<varlistentry
->  
-<term
-><guilabel
->Backspace Key Indents</guilabel
-></term
->  
-<listitem
-><para
->This allows the <keycombo action="simul"
-><keycap
->backspace</keycap
-></keycombo
-> key to be used to indent.</para
-></listitem
->  
-</varlistentry
->  
-  
-<varlistentry
->  
-<term
-><guilabel
->Tab Key Indents</guilabel
-></term
-> <listitem
-><para
->This allows the <keycombo action="simul"
-><keycap
->tab</keycap
-></keycombo
-> key to be used to indent.</para
-></listitem
->  
-</varlistentry
->  
-  
-<varlistentry
->  
-<term
-><guilabel
->Keep Extra Spaces</guilabel
-></term
->  
-<listitem
-><para
->Indentations of more than the selected number of spaces will not be shortened.</para
-></listitem
->  
-</varlistentry
->  
-  
-</variablelist
->  
-</sect1
->  
+<sect1 id="pref-indent">  
+<title>Indent</title>  
+<variablelist>  
+  
+<varlistentry>  
+<term><guilabel>Auto Indent</guilabel></term> <listitem><para>This causes new lines to begin with the same indentation level as the previous line.</para></listitem>  
+</varlistentry>  
+  
+<varlistentry>  
+<term><guilabel>Indent With Spaces</guilabel></term> <listitem><para>This replaces tabs with the number of spaces selected in the Tab Width window in the <link linkend="pref-edit">Edit</link> section of the preferences dialogue.</para></listitem>  
+</varlistentry>  
+  
+<varlistentry>  
+<term><guilabel>Backspace Key Indents</guilabel></term>  
+<listitem><para>This allows the <keycombo action="simul"><keycap>backspace</keycap></keycombo> key to be used to indent.</para></listitem>  
+</varlistentry>  
+  
+<varlistentry>  
+<term><guilabel>Tab Key Indents</guilabel></term> <listitem><para>This allows the <keycombo action="simul"><keycap>tab</keycap></keycombo> key to be used to indent.</para></listitem>  
+</varlistentry>  
+  
+<varlistentry>  
+<term><guilabel>Keep Extra Spaces</guilabel></term>  
+<listitem><para>Indentations of more than the selected number of spaces will not be shortened.</para></listitem>  
+</varlistentry>  
+  
+</variablelist>  
+</sect1>  
 
 <!-- 
 2004-08-27
 Out of date - getting it out of the translators' way
 - Phil
-<sect1 id="pref-select"
->  
-<title
->Select</title
->  
-<variablelist
->  
-  
-<varlistentry
->  
-<term
-><guilabel
->Persistent Selections</guilabel
-></term
->  
-<listitem
-><para
->This prevents key input or cursor movement by way of the  
+<sect1 id="pref-select">  
+<title>Select</title>  
+<variablelist>  
+  
+<varlistentry>  
+<term><guilabel>Persistent Selections</guilabel></term>  
+<listitem><para>This prevents key input or cursor movement by way of the  
 arrow keys from causing the elimination of text  
-selection. </para
-><note
-><para
->(Note: If the Overwrite Selections option is  
+selection. </para><note><para>(Note: If the Overwrite Selections option is  
 activated then any typed character input or paste operation will replace  
-the selected text.)</para
-></note
-></listitem
-> </varlistentry
->  
-  
-<varlistentry
-> <term
-><guilabel
->Overwrite Selections</guilabel
-></term
->  
-<listitem
-><para
->Any keyed character input or paste operation will replace  
-the selected text.  </para
-></listitem
->  
-</varlistentry
->  
-  
-<varlistentry
->  
-<term
-><guilabel
->Mouse Autocopy</guilabel
-></term
-> <listitem
-><para
->Any text  
+the selected text.)</para></note></listitem> </varlistentry>  
+  
+<varlistentry> <term><guilabel>Overwrite Selections</guilabel></term>  
+<listitem><para>Any keyed character input or paste operation will replace  
+the selected text.  </para></listitem>  
+</varlistentry>  
+  
+<varlistentry>  
+<term><guilabel>Mouse Autocopy</guilabel></term> <listitem><para>Any text  
 selected with the mouse will be automatically copied to the  
-clipboard.</para
-></listitem
->  
-</varlistentry
->  
-
-<varlistentry
->  
-<term
-><guilabel
->X11-like Single Selection</guilabel
-></term
->  
-<listitem
-><para
->Not implemented yet.</para
-></listitem
->  
-</varlistentry
->  
-
-  
-<varlistentry
->  
-<term
->Toggle Old</term
-> <listitem
-><para
->Not yet implemented</para
-></listitem
->  
-</varlistentry
->  
-  
-</variablelist
->  
-</sect1
->  
+clipboard.</para></listitem>  
+</varlistentry>  
+
+<varlistentry>  
+<term><guilabel>X11-like Single Selection</guilabel></term>  
+<listitem><para>Not implemented yet.</para></listitem>  
+</varlistentry>  
+
+  
+<varlistentry>  
+<term>Toggle Old</term> <listitem><para>Not yet implemented</para></listitem>  
+</varlistentry>  
+  
+</variablelist>  
+</sect1>  
   -->
-<sect1 id="pref-edit"
->  
-<title
->Edit</title
->  
-<variablelist
->  
-<varlistentry
->  
-<term id="pref-word-wrap"
-><guilabel
->Static Word Wrap</guilabel
-></term
->  
-<listitem
-><para
->Word wrap is a feature that causes the editor to automatically start a new line of text and move (wrap) the cursor to the beginning of that new line. &kwrite; will automatically start a new line of text when the current line reaches the length specified by the <link linkend="pref-wrap-words-at"
->Wrap Words At:</link
-> option.</para
-></listitem
->  
-</varlistentry
->  
-  
-<varlistentry
->  
-<term id="pref-wrap-words-at"
-><guilabel
->Wrap Words At:</guilabel
-></term
-><listitem
-><para
->If the <link linkend="pref-word-wrap"
->Word Wrap</link
-> option is selected this entry determines the length (in characters) at which the editor will automatically start a new line.</para
-></listitem
->  
-</varlistentry
->  
-  
-<varlistentry
->  
-<term id="pref-replace-tabs-by-spaces"
-><guilabel
->Replace Tabs By Spaces</guilabel
-></term
-> <listitem
-><para
->&kwrite; will replace any tabs with the number of spaces indicated in the <link linkend="pref-tab-width"
->Tab Width:</link
-> entry.</para
-></listitem
->  
-</varlistentry
->  
-  
-<varlistentry
->  
-<term id="pref-tab-width"
->Tab Width</term
-> <listitem
-><para
->If the <link linkend="pref-word-wrap"
-><guilabel
->Replace Tabs By Spaces</guilabel
-></link
-> option is selected this entry determines the number of spaces with which the editor will automatically replace tabs.</para
-></listitem
->  
-</varlistentry
->  
-  
-<varlistentry
->  
-<term
-><guilabel
->Remove Trailing Spaces</guilabel
-></term
->  
-<listitem
-><para
->&kwrite; will automatically eliminate extra spaces at the ends of lines of text.</para
-></listitem
-> </varlistentry
->  
-  
-<varlistentry
->  
-<term
-><guilabel
->Auto Brackets</guilabel
-></term
-> <listitem
-><para
->When the user types a left bracket ([, (, or {) &kwrite; automatically enters the right bracket (}, ), or ]) to the right of the cursor.</para
-></listitem>
+<sect1 id="pref-edit">  
+<title>Edit</title>  
+<variablelist>  
+<varlistentry>  
+<term id="pref-word-wrap"><guilabel>Static Word Wrap</guilabel></term>  
+<listitem><para>Word wrap is a feature that causes the editor to automatically start a new line of text and move (wrap) the cursor to the beginning of that new line. &kwrite; will automatically start a new line of text when the current line reaches the length specified by the <link linkend="pref-wrap-words-at">Wrap Words At:</link> option.</para></listitem>  
+</varlistentry>  
+  
+<varlistentry>  
+<term id="pref-wrap-words-at"><guilabel>Wrap Words At:</guilabel></term><listitem><para>If the <link linkend="pref-word-wrap">Word Wrap</link> option is selected this entry determines the length (in characters) at which the editor will automatically start a new line.</para></listitem>  
+</varlistentry>  
+  
+<varlistentry>  
+<term id="pref-replace-tabs-by-spaces"><guilabel>Replace Tabs By Spaces</guilabel></term> <listitem><para>&kwrite; will replace any tabs with the number of spaces indicated in the <link linkend="pref-tab-width">Tab Width:</link> entry.</para></listitem>  
+</varlistentry>  
+  
+<varlistentry>  
+<term id="pref-tab-width">Tab Width</term> <listitem><para>If the <link linkend="pref-word-wrap"><guilabel>Replace Tabs By Spaces</guilabel></link> option is selected this entry determines the number of spaces with which the editor will automatically replace tabs.</para></listitem>  
+</varlistentry>  
+  
+<varlistentry>  
+<term><guilabel>Remove Trailing Spaces</guilabel></term>  
+<listitem><para>&kwrite; will automatically eliminate extra spaces at the ends of lines of text.</para></listitem> </varlistentry>  
+  
+<varlistentry>  
+<term><guilabel>Auto Brackets</guilabel></term> <listitem><para>When the user types a left bracket ([, (, or {) &kwrite; automatically enters the right bracket (}, ), or ]) to the right of the cursor.</para></listitem>
 </varlistentry>
 
 <!-- Outdated
 <varlistentry>
-<term id="group-undos"
-><guilabel
->Group Undos</guilabel
-></term>
-<listitem
-><para
->Groups of similar actions are to be considered a single
-<link linkend="undo"
->Undo</link
-> step by &kwrite;. In other words, a series
+<term id="group-undos"><guilabel>Group Undos</guilabel></term>
+<listitem><para>Groups of similar actions are to be considered a single
+<link linkend="undo">Undo</link> step by &kwrite;. In other words, a series
 of regular character keystrokes (words or expressions) would be considered
 one step and therefore be removed by a single undo operation.  If the
 series of character entries were interrupted by a non-character entry
 operation (such as a backspace), invoking undo would only remove the
 entries made since that operation. The next undo would then reverse that
 operation and so on.</para>
-<para
-> When this option is not selected &kwrite; considers
+<para> When this option is not selected &kwrite; considers
 each keystroke to be a single step.  So if the user (with this option
 active) were to type several words or even sentences without having to make
 corrections or cut or paste or some other non-character entry operation
@@ -2628,85 +991,36 @@ since the last non-entry operation.  A second click would eliminate that
 operation and a third any operation or series of entries that occurred
 before the operation and so on.  When not selected three clicks of the undo
 button would only remove the last three letters typed, or the last three
-operations.</para
-></listitem
->  
-</varlistentry
->  
+operations.</para></listitem>  
+</varlistentry>  
 -->  
-<varlistentry
-> <term
-><guilabel
->Show Tabs</guilabel
-></term
->  
-<listitem
-><para
->The editor will display a symbol to indicate the presence of a tab in the text.</para
-></listitem
->  
-</varlistentry
->  
+<varlistentry> <term><guilabel>Show Tabs</guilabel></term>  
+<listitem><para>The editor will display a symbol to indicate the presence of a tab in the text.</para></listitem>  
+</varlistentry>  
 <!--
 <varlistentry>
-<term
-><guilabel
->Smart Home</guilabel
-></term>
-<listitem
-><para
->Not yet implemented</para
-></listitem>
+<term><guilabel>Smart Home</guilabel></term>
+<listitem><para>Not yet implemented</para></listitem>
 </varlistentry>
 -->
 <varlistentry>
-<term
-><guilabel
->Page Up/Down Moves Cursor</guilabel
-></term>
-<listitem
-><para
->This option changes the behaviour of the cursor when the user presses the <keycap
->Page Up</keycap
-> or <keycap
->Page Down</keycap
-> key. If unselected the text cursor will maintain its relative position within the visible text in &kwrite; as new text becomes visible as a result of the operation. So if the cursor is in the middle of the visible text when the operation occurs it will remain there (except when one reaches the beginning or end.) With this option selected, the first key press will cause the cursor to move to either the top or bottom of the visible text as a new page of text is displayed. </para
-></listitem>
+<term><guilabel>Page Up/Down Moves Cursor</guilabel></term>
+<listitem><para>This option changes the behaviour of the cursor when the user presses the <keycap>Page Up</keycap> or <keycap>Page Down</keycap> key. If unselected the text cursor will maintain its relative position within the visible text in &kwrite; as new text becomes visible as a result of the operation. So if the cursor is in the middle of the visible text when the operation occurs it will remain there (except when one reaches the beginning or end.) With this option selected, the first key press will cause the cursor to move to either the top or bottom of the visible text as a new page of text is displayed. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Wrap Cursor</term
-> 
-<listitem
-><para
->When this option is chosen, moving the cursor with the arrow keys off the end of a line (to the right) causes it to jump down to the beginning of the next line. Likewise when the cursor is moved past the beginning of a line (to the left) it jumps up to the end of the preceding line. When this option is not selected, moving the cursor right past the end of a line merely causes it to continue horizontally in the same line and trying to move it left past the beginning does nothing.</para>
-<para
->When this option is chosen, clicking with the mouse past the end of a line of text will place the insert cursor <emphasis
->at the end of the text</emphasis
->, and not in the place you clicked. This avoids accidentally adding an empty space in the middle of text, and is the default behaviour of most editors. </para>
+<term>Wrap Cursor</term> 
+<listitem><para>When this option is chosen, moving the cursor with the arrow keys off the end of a line (to the right) causes it to jump down to the beginning of the next line. Likewise when the cursor is moved past the beginning of a line (to the left) it jumps up to the end of the preceding line. When this option is not selected, moving the cursor right past the end of a line merely causes it to continue horizontally in the same line and trying to move it left past the beginning does nothing.</para>
+<para>When this option is chosen, clicking with the mouse past the end of a line of text will place the insert cursor <emphasis>at the end of the text</emphasis>, and not in the place you clicked. This avoids accidentally adding an empty space in the middle of text, and is the default behaviour of most editors. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><link linkend="undo"
->Undo</link
-> steps:</term
-> <listitem
-><para
->Here the user may specify the number of steps &kwrite; will retain in memory for purposes of undoing entries and actions. This means that the higher the number of steps set the more memory &kwrite; will use for this. Setting this entry to 10 would mean that the user would be be able reverse the last ten operations, <abbrev
->i.e.</abbrev
-> click the <guibutton
->undo</guibutton
-> button 10 times and obtain results.</para
-></listitem
-> </varlistentry>
+<term><link linkend="undo">Undo</link> steps:</term> <listitem><para>Here the user may specify the number of steps &kwrite; will retain in memory for purposes of undoing entries and actions. This means that the higher the number of steps set the more memory &kwrite; will use for this. Setting this entry to 10 would mean that the user would be be able reverse the last ten operations, <abbrev>i.e.</abbrev> click the <guibutton>undo</guibutton> button 10 times and obtain results.</para></listitem> </varlistentry>
 
 <!-- Outdated
 <varlistentry>
-<term
->Encoding</term>
+<term>Encoding</term>
 <listitem>
 <para>
 This sets the character encoding for your file.
@@ -2718,73 +1032,29 @@ This sets the character encoding for your file.
 </sect1>
 
 <sect1 id="prefspellchecker">
-<title
->Spelling</title
-> <para
->A spell checker is a program designed to help the user catch and correct any spelling errors. This section of the preferences dialogue allows certain important settings to be adjusted in this regard.</para>
+<title>Spelling</title> <para>A spell checker is a program designed to help the user catch and correct any spelling errors. This section of the preferences dialogue allows certain important settings to be adjusted in this regard.</para>
 <variablelist>
 
 <varlistentry>
-<term
-><guilabel
->Create root/affix combinations not in dictionary</guilabel
-></term
-> <listitem
-><para
->Selecting this option allows the spell checker to register as 'correct' combinations of root words with suffixes or prefixes even if the particular combination is not listed in its dictionary data base of words.</para
-></listitem>
+<term><guilabel>Create root/affix combinations not in dictionary</guilabel></term> <listitem><para>Selecting this option allows the spell checker to register as 'correct' combinations of root words with suffixes or prefixes even if the particular combination is not listed in its dictionary data base of words.</para></listitem>
 
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Consider run-together words as spelling errors</guilabel
-></term
-> <listitem
-><para
->Selecting this will cause the spell checker to register as 'misspelled' two or more correctly spelled words that are 'run-together', <abbrev
->i.e.</abbrev
->, that do not have spaces separating them.</para
-></listitem>
+<term><guilabel>Consider run-together words as spelling errors</guilabel></term> <listitem><para>Selecting this will cause the spell checker to register as 'misspelled' two or more correctly spelled words that are 'run-together', <abbrev>i.e.</abbrev>, that do not have spaces separating them.</para></listitem>
 
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Dictionary:</guilabel
-></term
-> <listitem
-><para
->Depending on the user's installation one or more different language spelling dictionaries may be available. This drop down box allows the user to choose which language the spell checker should use.</para
-></listitem>
-  
-</varlistentry
->  
-  
-<varlistentry
->  
-<term
-><guilabel
->Encoding:</guilabel
-></term
-> <listitem
-><para
->There are different coding systems used to associate particular codes with particular characters and symbols. If the user knows which code he or she is using this drop down box allows this code to be specified so that the spell checker can do its job correctly. </para
-></listitem
-> </varlistentry>
+<term><guilabel>Dictionary:</guilabel></term> <listitem><para>Depending on the user's installation one or more different language spelling dictionaries may be available. This drop down box allows the user to choose which language the spell checker should use.</para></listitem>
+  
+</varlistentry>  
+  
+<varlistentry>  
+<term><guilabel>Encoding:</guilabel></term> <listitem><para>There are different coding systems used to associate particular codes with particular characters and symbols. If the user knows which code he or she is using this drop down box allows this code to be specified so that the spell checker can do its job correctly. </para></listitem> </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Client:</guilabel
-></term
-> <listitem
-><para
->Since &kwrite; does not contain its own spell checker, an external one must be chosen. This is where the user may specify which spell check program to use.</para
-></listitem
-> </varlistentry>
+<term><guilabel>Client:</guilabel></term> <listitem><para>Since &kwrite; does not contain its own spell checker, an external one must be chosen. This is where the user may specify which spell check program to use.</para></listitem> </varlistentry>
 
 </variablelist>
 </sect1>
@@ -2795,33 +1065,19 @@ This sets the character encoding for your file.
 Whole chapter is out of date, moving out of translators' way
 -Phil
 <chapter id="pref-highlighting">
-<title
->Highlighting</title>
-
-<para
->The <guilabel
->Configure Highlighting</guilabel
-> dialog consists of two
-pages, <guilabel
->Defaults</guilabel
-> and <guilabel
->Highlighting
-Modes</guilabel
->.  The user can select which page to view by clicking on the
+<title>Highlighting</title>
+
+<para>The <guilabel>Configure Highlighting</guilabel> dialog consists of two
+pages, <guilabel>Defaults</guilabel> and <guilabel>Highlighting
+Modes</guilabel>.  The user can select which page to view by clicking on the
 appropriate tab at the top of the dialog</para>
 
-<para
->Items available on the <guilabel
->Defaults</guilabel
-> page are as
+<para>Items available on the <guilabel>Defaults</guilabel> page are as
 follows:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Default Item Styles</guilabel
-></term>
+<term><guilabel>Default Item Styles</guilabel></term>
 <listitem>
 <para>
 The user can configure the default appearance for particular items.
@@ -2831,384 +1087,196 @@ This would allow a programmer to more easily identify different items
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Item</guilabel
-></term>
-<listitem
-><para
->This drop down list offers a variety of items that the user
-might want to highlight.  They include <guilabel
->Normal</guilabel
-> for
-text does not fit in any of the other categories, <guilabel
->Comment</guilabel
->,
-<guilabel
->String</guilabel
->, <guilabel
->Keyword</guilabel
-> and many more.  Not
+<term><guilabel>Item</guilabel></term>
+<listitem><para>This drop down list offers a variety of items that the user
+might want to highlight.  They include <guilabel>Normal</guilabel> for
+text does not fit in any of the other categories, <guilabel>Comment</guilabel>,
+<guilabel>String</guilabel>, <guilabel>Keyword</guilabel> and many more.  Not
 all of these entries will need to be configured for every language and so may be
 selected as needed.  The options in the rest of this section apply
-to the entry selected in this box.</para
-></listitem>
+to the entry selected in this box.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Normal</guilabel
-></term>
-<listitem
-><para
->This allows the user to choose the item's normal
+<term><guilabel>Normal</guilabel></term>
+<listitem><para>This allows the user to choose the item's normal
 (unselected) color.  This is done by means of a color selection
 dialog box, a further explanation of which may be found in the <link
-linkend="prefcolors"
->Colors</link
-> section of <link
-linkend="pref-dialog"
->Configure KWrite</link
->.</para>
+linkend="prefcolors">Colors</link> section of <link
+linkend="pref-dialog">Configure KWrite</link>.</para>
 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Bold</guilabel
-></term>
-<listitem
-><para
->This option determines whether or not the item should be displayed in
-bold text.</para
-></listitem>
+<term><guilabel>Bold</guilabel></term>
+<listitem><para>This option determines whether or not the item should be displayed in
+bold text.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Italic</guilabel
-></term>
-<listitem
-><para
->This option determines whether or not the item should be displayed in italic
-text.</para
-></listitem>
+<term><guilabel>Italic</guilabel></term>
+<listitem><para>This option determines whether or not the item should be displayed in italic
+text.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Selected</guilabel
-></term>
-<listitem
-><para
->This allows the user to choose the item's color
+<term><guilabel>Selected</guilabel></term>
+<listitem><para>This allows the user to choose the item's color
 when selected.  This is done by means of a color selection
 dialog box, a further explanation of which may be found in the <link
-linkend="prefcolors"
->Colors</link
-> section of <link
-linkend="pref-dialog"
->Configure KWrite</link
->.</para>
+linkend="prefcolors">Colors</link> section of <link
+linkend="pref-dialog">Configure KWrite</link>.</para>
 
 </listitem>
 </varlistentry>
 </variablelist>
 </listitem>
 </varlistentry>
-</variablelist
->  
+</variablelist>  
   
-<para
->Items on the <guilabel
->Highlight Modes</guilabel
-> tab allow the user to define
+<para>Items on the <guilabel>Highlight Modes</guilabel> tab allow the user to define
 more specific highlighting depending on the language style.</para>
   
-<para
->One need not set every available option, items not configured
+<para>One need not set every available option, items not configured
 specifically will use the default configuration specified on the previous  
-(<guilabel
->Defaults</guilabel
-> tab.</para
->  
-  
-<variablelist
->  
-<varlistentry
->  
-<term
-><guilabel
->Config Select</guilabel
-></term
->  
-<listitem
-><para
->This group of options is used to customize the highlighting styles
+(<guilabel>Defaults</guilabel> tab.</para>  
+  
+<variablelist>  
+<varlistentry>  
+<term><guilabel>Config Select</guilabel></term>  
+<listitem><para>This group of options is used to customize the highlighting styles
 for each programming language type.  Any changes you made in
 other areas of this dialog apply only to this type.</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Highlight</guilabel
-></term>
-<listitem
-><para
->This is used to choose the language type to
-configure</para
-></listitem
->  
+<term><guilabel>Highlight</guilabel></term>
+<listitem><para>This is used to choose the language type to
+configure</para></listitem>  
 </varlistentry>
-<varlistentry
->  
-<term
-><guilabel
->Item</guilabel
-></term
->  
-<listitem
-><para
->This is to choose the syntax item to configure.  Remember
-this  only configures <emphasis
->this</emphasis
-> item for <emphasis
->this</emphasis>
-language.</para
-></listitem>
+<varlistentry>  
+<term><guilabel>Item</guilabel></term>  
+<listitem><para>This is to choose the syntax item to configure.  Remember
+this  only configures <emphasis>this</emphasis> item for <emphasis>this</emphasis>
+language.</para></listitem>
 </varlistentry>
 </variablelist>
 
-<para
->As an example, if the user wished to configure the appearance of
-<quote
->comments</quote
-> while writing C++, she or he could choose C++ in the
-<guilabel
->Highlight</guilabel
-> drop down list, and then choose Comment in the
-<guilabel
->Item</guilabel
-> drop down list. To have <quote
->comments</quote
-> look
+<para>As an example, if the user wished to configure the appearance of
+<quote>comments</quote> while writing C++, she or he could choose C++ in the
+<guilabel>Highlight</guilabel> drop down list, and then choose Comment in the
+<guilabel>Item</guilabel> drop down list. To have <quote>comments</quote> look
 the same across all languages, the user would need to configure this in the
-<guilabel
->Defaults</guilabel
-> page of this dialog box while leaving
-<quote
->comments</quote
-> unconfigured within the more specific
-<guilabel
->Highlight Modes</guilabel
-> page.</para
-> </listitem
-> </varlistentry>
+<guilabel>Defaults</guilabel> page of this dialog box while leaving
+<quote>comments</quote> unconfigured within the more specific
+<guilabel>Highlight Modes</guilabel> page.</para> </listitem> </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Item Style</guilabel
-></term>
-<listitem
-><para
->Here the user can configure the general appearance of the above
-selected item.  Checking the <guilabel
->Default</guilabel
-> checkbox causes the default
+<term><guilabel>Item Style</guilabel></term>
+<listitem><para>Here the user can configure the general appearance of the above
+selected item.  Checking the <guilabel>Default</guilabel> checkbox causes the default
 style as configured on the previous tab to be set, or the
 appearance can be configured directly.  The available options are the same as on the
-<guilabel
->Defaults</guilabel
-> tab: <guilabel
->Normal</guilabel
->,
-<guilabel
->Selected</guilabel
->, <guilabel
->Bold</guilabel
-> and
-<guilabel
->Italic</guilabel
->.</para
-></listitem
-> </varlistentry>
+<guilabel>Defaults</guilabel> tab: <guilabel>Normal</guilabel>,
+<guilabel>Selected</guilabel>, <guilabel>Bold</guilabel> and
+<guilabel>Italic</guilabel>.</para></listitem> </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Highlight Auto Select</guilabel
-></term
->  
-<listitem
-><para
->&kwrite; can apply syntax highlighting automatically, depending  
+<term><guilabel>Highlight Auto Select</guilabel></term>  
+<listitem><para>&kwrite; can apply syntax highlighting automatically, depending  
 on the file extension or mime-type of the opened file.  The defaults are fairly
 comprehensive, but users that regularly edit files with non-standard extensions
-can add them here.  Wildcards are allowed in the <guilabel
->File
-Extensions</guilabel
-> text box.  For example, the default entry for the C++
-language is <userinput
->*.cpp;*.cc;*.C;*.h</userinput
->.  Opening a file called
-<filename
->foo.h</filename
-> would automatically apply the C++ style to it.
-</para
-></listitem>
+can add them here.  Wildcards are allowed in the <guilabel>File
+Extensions</guilabel> text box.  For example, the default entry for the C++
+language is <userinput>*.cpp;*.cc;*.C;*.h</userinput>.  Opening a file called
+<filename>foo.h</filename> would automatically apply the C++ style to it.
+</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Item Font</guilabel
-></term>
-<listitem
-><para
->Here the user can choose the font for the selected item.</para>
-<para
->The default style can be applied by checking the
-<guilabel
->Default</guilabel
-> checkbox or the user can choose a specific font
-<guilabel
->Family</guilabel
->, <guilabel
->Size</guilabel
-> and
-<guilabel
->Charset</guilabel
->.  The available options are the same as those on
-the <guilabel
->Defaults</guilabel
-> tab.</para
-></listitem>
+<term><guilabel>Item Font</guilabel></term>
+<listitem><para>Here the user can choose the font for the selected item.</para>
+<para>The default style can be applied by checking the
+<guilabel>Default</guilabel> checkbox or the user can choose a specific font
+<guilabel>Family</guilabel>, <guilabel>Size</guilabel> and
+<guilabel>Charset</guilabel>.  The available options are the same as those on
+the <guilabel>Defaults</guilabel> tab.</para></listitem>
 </varlistentry>
 </variablelist>
-</chapter
->  
+</chapter>  
 -->  
-<chapter id="credits"
->  
-<title
->Credits and Licences</title
->  
+<chapter id="credits">  
+<title>Credits and Licences</title>  
   
-<para
->&kwrite; Copyright 2001 by the &kate; team.</para>
+<para>&kwrite; Copyright 2001 by the &kate; team.</para>
 
-<para
->Based on the original &kwrite;, which was Copyright 2000 by Jochen Wilhelmy <email
->digisnap@cs.tu-berlin.de</email
-> </para>
+<para>Based on the original &kwrite;, which was Copyright 2000 by Jochen Wilhelmy <email>digisnap@cs.tu-berlin.de</email> </para>
 
-<para
->Contributions:</para
->  
+<para>Contributions:</para>  
 
 <itemizedlist>
 <listitem>
-<para
->&Christoph.Cullmann; &Christoph.Cullmann.mail;</para>
+<para>&Christoph.Cullmann; &Christoph.Cullmann.mail;</para>
 </listitem>
 
 <listitem>
-<para
->Michael Bartl <email
->michael.bartl1@chello.at</email
-></para>
+<para>Michael Bartl <email>michael.bartl1@chello.at</email></para>
 </listitem>
 
 <listitem>
-<para
->Phlip <email
->phlip_cpp@my-deja.com</email
-></para>
+<para>Phlip <email>phlip_cpp@my-deja.com</email></para>
 </listitem>
 
 <listitem>
-<para
->&Anders.Lund; &Anders.Lund.mail;</para>
+<para>&Anders.Lund; &Anders.Lund.mail;</para>
 </listitem>
 
 <listitem>
-<para
->Matt Newell <email
->newellm@proaxis.com</email
-></para>
+<para>Matt Newell <email>newellm@proaxis.com</email></para>
 </listitem>
 
 <listitem>
-<para
->&Joseph.Wenninger; &Joseph.Wenninger.mail;</para>
+<para>&Joseph.Wenninger; &Joseph.Wenninger.mail;</para>
 </listitem>
 
 <listitem>
-<para
->Jochen Wilhely <email
->digisnap@cs.tu-berlin.de</email
-></para>
+<para>Jochen Wilhely <email>digisnap@cs.tu-berlin.de</email></para>
 </listitem>
 
 <listitem>
-<para
->&Michael.Koch; &Michael.Koch.mail;</para>
+<para>&Michael.Koch; &Michael.Koch.mail;</para>
 </listitem>
 
 <listitem>
-<para
->&Christian.Gebauer; &Christian.Gebauer.mail;</para>
+<para>&Christian.Gebauer; &Christian.Gebauer.mail;</para>
 </listitem>
 
 <listitem>
-<para
->&Simon.Hausmann; &Simon.Hausmann.mail;</para>
+<para>&Simon.Hausmann; &Simon.Hausmann.mail;</para>
 </listitem>
 
 <listitem>
-<para
->Glen Parker <email
->glenebob@nwlink.com</email
-></para>
+<para>Glen Parker <email>glenebob@nwlink.com</email></para>
 </listitem>
 
 <listitem>
-<para
->Scott Manson <email
->sdmanson@altel.net</email
-></para>
+<para>Scott Manson <email>sdmanson@altel.net</email></para>
 </listitem>
 
 <listitem>
-<para
->&John.Firebaugh; &John.Firebaugh.mail;</para>
+<para>&John.Firebaugh; &John.Firebaugh.mail;</para>
 </listitem>
 </itemizedlist>
      
-<para
->Original documentation by &Thad.McGinnis; &Thad.McGinnis.mail; </para>
+<para>Original documentation by &Thad.McGinnis; &Thad.McGinnis.mail; </para>
 
-<para
->This version of the &kwrite; Handbook is based on the original by &Cristian.Tibirna; &Cristian.Tibirna.mail; </para>
+<para>This version of the &kwrite; Handbook is based on the original by &Cristian.Tibirna; &Cristian.Tibirna.mail; </para>
 
-<para
->Converted to docbook/proofreading by &Lauri.Watts; &Lauri.Watts.mail; </para>
+<para>Converted to docbook/proofreading by &Lauri.Watts; &Lauri.Watts.mail; </para>
 
-<para
->Conversion to British English: John Knight <email
->anarchist_tomato@herzeleid.net</email
-></para
-> 
-&underFDL; &underGPL; </chapter
-> 
+<para>Conversion to British English: John Knight <email>anarchist_tomato@herzeleid.net</email></para> 
+&underFDL; &underGPL; </chapter> 
 
 &documentation.index;   
-</book
->  
+</book>  
 <!--  
 Local Variables:  
 mode: sgml  
diff --git a/tde-i18n-en_GB/docs/tdebase/kxkb/index.docbook b/tde-i18n-en_GB/docs/tdebase/kxkb/index.docbook
index 227f8914731..3ed9805ef7a 100644
--- a/tde-i18n-en_GB/docs/tdebase/kxkb/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kxkb/index.docbook
@@ -4,227 +4,117 @@
   <!ENTITY kappname "&kxkb;">
   <!ENTITY package "tdebase">
   <!ENTITY % addindex "IGNORE">
-  <!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+  <!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <book lang="&language;">
 <bookinfo>
-<title
->The &kxkb; Handbook</title>
+<title>The &kxkb; Handbook</title>
 
 <authorgroup>
-<author
->&Andriy.Rysin; &Andriy.Rysin.mail; </author>
-
-<othercredit role="developer"
->&Andriy.Rysin; &Andriy.Rysin.mail; </othercredit>
-
-<othercredit role="translator"
-><firstname
->Jonathan</firstname
-><surname
->Riddell</surname
-><affiliation
-><address
-><email
->kde-en-gb@jriddell.org</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Andriy.Rysin; &Andriy.Rysin.mail; </author>
+
+<othercredit role="developer">&Andriy.Rysin; &Andriy.Rysin.mail; </othercredit>
+
+<othercredit role="translator"><firstname>Jonathan</firstname><surname>Riddell</surname><affiliation><address><email>kde-en-gb@jriddell.org</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 
 </authorgroup>
 
 <copyright>
-<year
->2003</year>
-<holder
->&Andriy.Rysin;</holder>
+<year>2003</year>
+<holder>&Andriy.Rysin;</holder>
 </copyright>
 
-<legalnotice
->&FDLNotice;</legalnotice>
+<legalnotice>&FDLNotice;</legalnotice>
 
-<date
->2003-08-23</date>
-<releaseinfo
->1.01.00</releaseinfo>
+<date>2003-08-23</date>
+<releaseinfo>1.01.00</releaseinfo>
 
-<abstract
-><para
->&kxkb; is a keyboard layout switching utility based on X11 xkb extension.</para
-></abstract
-> 
+<abstract><para>&kxkb; is a keyboard layout switching utility based on X11 xkb extension.</para></abstract> 
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->kxkb</keyword>
-<keyword
->keyboard</keyword>
-<keyword
->layout</keyword>
+<keyword>KDE</keyword>
+<keyword>kxkb</keyword>
+<keyword>keyboard</keyword>
+<keyword>layout</keyword>
 </keywordset>
 </bookinfo>
 
 <chapter id="introduction">
-<title
->Introduction</title>
+<title>Introduction</title>
 
-<para
->&kxkb; is the &kde; keyboard layout switching utility. It is based on X11 xkb extension and allows to use different keyboard layouts for inputing text. &kxkb; features keyboard layout indicator. </para>
+<para>&kxkb; is the &kde; keyboard layout switching utility. It is based on X11 xkb extension and allows to use different keyboard layouts for inputing text. &kxkb; features keyboard layout indicator. </para>
 
 </chapter>
 
 <chapter id="usingthekxkb">
-<title
->Using &kxkb;</title>
+<title>Using &kxkb;</title>
 
 <sect1 id="getting-started">
-<title
->Getting Started</title>
-
-<para
->&kxkb; starts automatically and stays in system tray as a flag with 2 or 3 letter abbreviation of layout name on top of it if more than one layout is defined or <guilabel
->Show indicator for single layout</guilabel
-> option is turned on.</para>
-
-<para
->When &kxkb; is running you can change layouts clicking on its tray icon with the mouse or pressing its keyboard shortcut. Keyboard shortcut or mouse click will switch to next layout or alternatively you can &RMB; click the &kxkb; icon and select layout from the list.</para>
-
-<para
->&RMB; clicking on the &kxkb; icon you can start its configuration by selecting <guimenuitem
->Configure...</guimenuitem
-> or by opening <application
->Control Centre</application
-> and selecting Localisation/Keyboard Layout. Alternatively, you can start it by typing <command
->tdecmshell keyboard_layout</command
-> in a terminal.</para>
+<title>Getting Started</title>
+
+<para>&kxkb; starts automatically and stays in system tray as a flag with 2 or 3 letter abbreviation of layout name on top of it if more than one layout is defined or <guilabel>Show indicator for single layout</guilabel> option is turned on.</para>
+
+<para>When &kxkb; is running you can change layouts clicking on its tray icon with the mouse or pressing its keyboard shortcut. Keyboard shortcut or mouse click will switch to next layout or alternatively you can &RMB; click the &kxkb; icon and select layout from the list.</para>
+
+<para>&RMB; clicking on the &kxkb; icon you can start its configuration by selecting <guimenuitem>Configure...</guimenuitem> or by opening <application>Control Centre</application> and selecting Localisation/Keyboard Layout. Alternatively, you can start it by typing <command>tdecmshell keyboard_layout</command> in a terminal.</para>
 
 </sect1>
 </chapter>
 
 <chapter id="configuringkxkb">
-<title
->Configuring &kxkb;</title>
+<title>Configuring &kxkb;</title>
 
 <sect1 id="general-config">
-<title
->General Information</title>
-<para
->KXKB Configuration consists of two tabs: Layout Configuration and XKB Options which are mutually independent. The first one defines layouts you want to use and their options and second defines parameters for Xkb extension on which &kxkb; is based. Xkb options are property of X and are not handled in any way by kxkb - it just sets it up. </para>
-<note
-><para
->&kxkb; configuration does not change anything in XFree86 configuration files and Layout settings from XFree86 configuration are overridden by &kxkb; if <option
->Enable keyboard layout</option
-> option is turned on. </para
-></note>
-<note
-><para
->To make your XFree86 configuration work you have to turn off both <option
->Enable keyboard layout</option
-> in layout configuration tab <emphasis
->and</emphasis
-> <option
->Enable xkb options</option
-> in Xkb options configuration tab (for the latter the same effect can be reached if <option
->Reset Old Options</option
-> is turned off and none of xkb options are set). </para
-></note>
-<para
->&kxkb; does most of its actions through <command
->setxkbmap</command
-> command. You can see the commandline to be executed for each active layout when you select it and, on the xkb options tab, its available xkb option set. </para>
+<title>General Information</title>
+<para>KXKB Configuration consists of two tabs: Layout Configuration and XKB Options which are mutually independent. The first one defines layouts you want to use and their options and second defines parameters for Xkb extension on which &kxkb; is based. Xkb options are property of X and are not handled in any way by kxkb - it just sets it up. </para>
+<note><para>&kxkb; configuration does not change anything in XFree86 configuration files and Layout settings from XFree86 configuration are overridden by &kxkb; if <option>Enable keyboard layout</option> option is turned on. </para></note>
+<note><para>To make your XFree86 configuration work you have to turn off both <option>Enable keyboard layout</option> in layout configuration tab <emphasis>and</emphasis> <option>Enable xkb options</option> in Xkb options configuration tab (for the latter the same effect can be reached if <option>Reset Old Options</option> is turned off and none of xkb options are set). </para></note>
+<para>&kxkb; does most of its actions through <command>setxkbmap</command> command. You can see the commandline to be executed for each active layout when you select it and, on the xkb options tab, its available xkb option set. </para>
 </sect1>
 
 <sect1 id="layout-config">
-<title
->Layout Configuration</title>
-<para
->In layout configuration dialogue the list of available layouts on your left. You have to choose each layout you want to use and add them (one by one) to the list of active layouts on the right. You can also change the order in which active layouts will be switched when toggled by keyboard shortcut or mouse button. The first layout in the list becomes default layout. </para>
-<para
->Some layouts have several variants. Layout variants usually represent different key maps for the same language. For example, Ukrainian layout might have four variants: basic, winkeys (as in Windows), typewriter (as in typewriters) and phonetic (each Ukrainian letter is placed on a transliterated latin one). If your layout is multi-variant one you can the variant in combobox below the active layouts list. </para>
-<para
->Keyboard model setting is independent of your keyboard layout and refers to the "hardware" model, i.e. the way your keyboard is manufactured. Modern keyboards that come with your computer usually have two extra keys and are referred to as "104-key" models, which is probably what you want if you don't know what kind of keyboard you have. </para>
-<para
->You can also choose switching policy for keyboard layout. By default it's <option
->Global meaning</option
-> all applications will share the same current layout. <option
->Application</option
-> means each application will have it's own layout and switching layout while you are working with one application will not impact layout for any others. <option
->Window</option
-> will make every window have its own layout even if they belong to the same program. </para>
-<para
->If you set only one active layout, at startup kxkb configures the keyboard and exits thus its indicator will not appear. If you still want kxkb indicator select <option
->Show indicator for single layout</option
-> option. </para>
+<title>Layout Configuration</title>
+<para>In layout configuration dialogue the list of available layouts on your left. You have to choose each layout you want to use and add them (one by one) to the list of active layouts on the right. You can also change the order in which active layouts will be switched when toggled by keyboard shortcut or mouse button. The first layout in the list becomes default layout. </para>
+<para>Some layouts have several variants. Layout variants usually represent different key maps for the same language. For example, Ukrainian layout might have four variants: basic, winkeys (as in Windows), typewriter (as in typewriters) and phonetic (each Ukrainian letter is placed on a transliterated latin one). If your layout is multi-variant one you can the variant in combobox below the active layouts list. </para>
+<para>Keyboard model setting is independent of your keyboard layout and refers to the "hardware" model, i.e. the way your keyboard is manufactured. Modern keyboards that come with your computer usually have two extra keys and are referred to as "104-key" models, which is probably what you want if you don't know what kind of keyboard you have. </para>
+<para>You can also choose switching policy for keyboard layout. By default it's <option>Global meaning</option> all applications will share the same current layout. <option>Application</option> means each application will have it's own layout and switching layout while you are working with one application will not impact layout for any others. <option>Window</option> will make every window have its own layout even if they belong to the same program. </para>
+<para>If you set only one active layout, at startup kxkb configures the keyboard and exits thus its indicator will not appear. If you still want kxkb indicator select <option>Show indicator for single layout</option> option. </para>
 <note>
-<para
->If you leave active layout list empty keyboard layouts will be disabled </para>
+<para>If you leave active layout list empty keyboard layouts will be disabled </para>
 </note>
 </sect1>
 
 <sect1 id="xkboptions-config">
-<title
->XKB Options Configuration</title>
-<para
->Xkb options allow you to select behaviour of your keyboard. These options are not handled by &kxkb; but may help tune your keyboard to your needs. </para>
+<title>XKB Options Configuration</title>
+<para>Xkb options allow you to select behaviour of your keyboard. These options are not handled by &kxkb; but may help tune your keyboard to your needs. </para>
 </sect1>
 
 </chapter>
 
 <chapter id="kxkbtroubleshooting">
-<title
->Troubleshooting</title>
+<title>Troubleshooting</title>
 
 <sect1 id="troubles">
-<title
->Common Problems</title>
+<title>Common Problems</title>
 
-<para
->If you switch to some layout and you can not see some characters from your layout as you type, please check your local settings. &eg; <filename
->~/.i18n</filename
-> or <filename
->/etc/sysconfig/i18n</filename
->, locale you have before starting kde applications must have an encoding which contains characters from your layout. For example, to enter ukrainian symbols you must have encoding KOI8-U, CP1251 or UTF-8. The last one is a good choice to try for most of the languages if you have such a problem. </para>
+<para>If you switch to some layout and you can not see some characters from your layout as you type, please check your local settings. &eg; <filename>~/.i18n</filename> or <filename>/etc/sysconfig/i18n</filename>, locale you have before starting kde applications must have an encoding which contains characters from your layout. For example, to enter ukrainian symbols you must have encoding KOI8-U, CP1251 or UTF-8. The last one is a good choice to try for most of the languages if you have such a problem. </para>
 
-<para
->If kxkb does not switch with keyboard shortcut when you switch it to some layout but switching with mouse is ok may mean that your layout does not contain the key assigned in shortcut.</para>
+<para>If kxkb does not switch with keyboard shortcut when you switch it to some layout but switching with mouse is ok may mean that your layout does not contain the key assigned in shortcut.</para>
 
-<para
->In XFree86 prior to version 4.3.0 non-latin layouts mutually included latin group and this group was the default thus pressing <keycombo action="simul"
->&Ctrl;&Alt;<keycap
->k</keycap
-></keycombo
-> always yielded the right combination. From version 4.3.0 by default all layouts contain only one group thus non-latin layouts may not work here.</para>
+<para>In XFree86 prior to version 4.3.0 non-latin layouts mutually included latin group and this group was the default thus pressing <keycombo action="simul">&Ctrl;&Alt;<keycap>k</keycap></keycombo> always yielded the right combination. From version 4.3.0 by default all layouts contain only one group thus non-latin layouts may not work here.</para>
 
-<para
->Possible solutions are:</para>
+<para>Possible solutions are:</para>
 
 <orderedlist>
 <listitem>
-<para
->add your layout to $nonlatin or $oldlayouts lists in <filename
->/etc/X11/xkb/rules/xfree86</filename
-> or the location of the xkb rules on your computer.</para>
+<para>add your layout to $nonlatin or $oldlayouts lists in <filename>/etc/X11/xkb/rules/xfree86</filename> or the location of the xkb rules on your computer.</para>
 </listitem>
 <listitem>
-<para
->Change the shortcut to something language neutral, &eg; <keycombo action="simul"
->&Ctrl;<keycap
->Menu</keycap
-></keycombo
-></para>
+<para>Change the shortcut to something language neutral, &eg; <keycombo action="simul">&Ctrl;<keycap>Menu</keycap></keycombo></para>
 </listitem>
 <listitem>
-<para
->Turn on the option to include the <quote
->us</quote
-> group in your layout (effectively the same as solution 1).</para>
+<para>Turn on the option to include the <quote>us</quote> group in your layout (effectively the same as solution 1).</para>
 </listitem>
 </orderedlist>
 
@@ -232,64 +122,26 @@
 </chapter>
 
 <chapter id="xkb-files">
-<title
->Files and Layout Descriptions</title>
+<title>Files and Layout Descriptions</title>
 <sect1 id="xkb-files-and-layouts">
-<title
-><application
->xkb</application
-> Files and Layouts</title>
-
-<para
->All available keyboard layouts are described in <filename
->/etc/X11/xkb/rules/xfree86.lst</filename
-> (and <filename
->/etc/X11/xkb/rules/xfree86.xml</filename
-> since XFree86 4.3.0), the layouts themselves can be found in <filename
->/etc/X11/xkb/symbols/pc</filename
-> (or <filename
->/etc/X11/xkb/symbols</filename
-> for XFree86 4.2.x and older). Note that the location of these files may differ depending on your operating system and distribution.</para>
-
-<para
->&kxkb; now uses the xkb extension instead of xmodmap, so to define your own layout you have to get one from <filename class="directory"
->/etc/X11/xkb/symbols</filename
-> which is closest to what you want to get (or <filename class="directory"
->/etc/X11/xkb/symbold/pc</filename
-> for XFree86 4.3.0), rename it to something you like and edit it. Then just add the name to <filename
->/etc/X11/xkb/rules/xfree86.lst</filename
-> (and for XFree86 4.3.0 or later it is a good idea to add the name also to <filename
->/etc/X11/xkb/ruls/xfree86.xml</filename
-> - some packages already use it, not &kxkb; though yet) kxkb will pick it up on restart. Note: you have to be root to edit those files.</para>
+<title><application>xkb</application> Files and Layouts</title>
+
+<para>All available keyboard layouts are described in <filename>/etc/X11/xkb/rules/xfree86.lst</filename> (and <filename>/etc/X11/xkb/rules/xfree86.xml</filename> since XFree86 4.3.0), the layouts themselves can be found in <filename>/etc/X11/xkb/symbols/pc</filename> (or <filename>/etc/X11/xkb/symbols</filename> for XFree86 4.2.x and older). Note that the location of these files may differ depending on your operating system and distribution.</para>
+
+<para>&kxkb; now uses the xkb extension instead of xmodmap, so to define your own layout you have to get one from <filename class="directory">/etc/X11/xkb/symbols</filename> which is closest to what you want to get (or <filename class="directory">/etc/X11/xkb/symbold/pc</filename> for XFree86 4.3.0), rename it to something you like and edit it. Then just add the name to <filename>/etc/X11/xkb/rules/xfree86.lst</filename> (and for XFree86 4.3.0 or later it is a good idea to add the name also to <filename>/etc/X11/xkb/ruls/xfree86.xml</filename> - some packages already use it, not &kxkb; though yet) kxkb will pick it up on restart. Note: you have to be root to edit those files.</para>
 
 </sect1>
 
 </chapter>
 
 <chapter id="credits-and-licenses">
-<title
->Credits and Licences</title>
+<title>Credits and Licences</title>
 
-<para
->&kxkb; is currently developed and maintained by Andriy Rysin <email
->rysin@kde.org</email
->. Several other people have worked on <application
->kxkb</application
->:</para>
+<para>&kxkb; is currently developed and maintained by Andriy Rysin <email>rysin@kde.org</email>. Several other people have worked on <application>kxkb</application>:</para>
 
 <itemizedlist>
-<listitem
-><para
->Shaheed Haque <email
->srhaque@iee.org</email
-></para
-></listitem>
-<listitem
-><para
->Ilya Konstantinov <email
->kde-devel@future.galanet.net</email
-></para
-></listitem>
+<listitem><para>Shaheed Haque <email>srhaque@iee.org</email></para></listitem>
+<listitem><para>Ilya Konstantinov <email>kde-devel@future.galanet.net</email></para></listitem>
 </itemizedlist>
 &underFDL; &underGPL; </chapter>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/quickstart/index.docbook b/tde-i18n-en_GB/docs/tdebase/quickstart/index.docbook
index 6d3404a9284..91a053116e2 100644
--- a/tde-i18n-en_GB/docs/tdebase/quickstart/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/quickstart/index.docbook
@@ -4,606 +4,292 @@
   <!ENTITY kappname "&kde; Quick Start Guide">
   <!ENTITY package "tdebase">
   <!ENTITY % addindex "IGNORE">
-  <!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+  <!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <book lang="&language;">
 <bookinfo>
 	
-<title
->An Introduction to &kde;</title>
+<title>An Introduction to &kde;</title>
 
 <authorgroup>
 
 <author>
-<surname
->The KDE Team</surname>
+<surname>The KDE Team</surname>
 </author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2004-08-28</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2004-08-28</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <copyright>
-<year
->1999</year
-><year
->2000</year
-><year
->2001</year
-><year
->2002</year>
-<holder
->The KDE Team</holder>
+<year>1999</year><year>2000</year><year>2001</year><year>2002</year>
+<holder>The KDE Team</holder>
 </copyright>
 
-<legalnotice
->&FDLNotice;</legalnotice>
+<legalnotice>&FDLNotice;</legalnotice>
 
 <abstract>
-<para
->An introduction to the K Desktop Environment</para>
-<para
->Quick Start Guide to &kde;</para
-></abstract>
+<para>An introduction to the K Desktop Environment</para>
+<para>Quick Start Guide to &kde;</para></abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->quick start</keyword>
-<keyword
->introduction</keyword>
+<keyword>KDE</keyword>
+<keyword>quick start</keyword>
+<keyword>introduction</keyword>
 </keywordset>
 </bookinfo>
 
 <chapter id="introduction">
-<title
->Introduction</title>
-
-<para
->This document is a brief introduction to the K Desktop Environment. It will familiarise you with some of the basic features of &kde;. </para>
-
-<para
->This guide is far from covering all aspects of the K Desktop or even most of them. It will only describe some of the most basic ways to accomplish a few of the most common tasks. </para>
-
-<para
->We assume that you are already familiar with at least one graphical user interface, for example <trademark
->CDE</trademark
->, <trademark
->Geos</trademark
->, <trademark
->GEM</trademark
->, &NeXTSTEP;, &Mac;, <trademark
->OS/2</trademark
-> or &Microsoft; &Windows;. So we will not explain the usage of the mouse or the keyboard but concentrate on hopefully more interesting things. </para>
+<title>Introduction</title>
+
+<para>This document is a brief introduction to the K Desktop Environment. It will familiarise you with some of the basic features of &kde;. </para>
+
+<para>This guide is far from covering all aspects of the K Desktop or even most of them. It will only describe some of the most basic ways to accomplish a few of the most common tasks. </para>
+
+<para>We assume that you are already familiar with at least one graphical user interface, for example <trademark>CDE</trademark>, <trademark>Geos</trademark>, <trademark>GEM</trademark>, &NeXTSTEP;, &Mac;, <trademark>OS/2</trademark> or &Microsoft; &Windows;. So we will not explain the usage of the mouse or the keyboard but concentrate on hopefully more interesting things. </para>
 
 </chapter>
 
 <chapter id="an-overview-of-kde">
-<title
->An Overview of &kde;</title>
+<title>An Overview of &kde;</title>
 
-<para
->This section is for users who prefer to learn by exploring and want only a brief orientation to get started. Later sections provide a more thorough introduction to the environment, with helpful hints and shortcuts. If you are impatient to get started, skim this section, go play for a bit, then come back and peruse the other sections of this guide as needed. </para>
+<para>This section is for users who prefer to learn by exploring and want only a brief orientation to get started. Later sections provide a more thorough introduction to the environment, with helpful hints and shortcuts. If you are impatient to get started, skim this section, go play for a bit, then come back and peruse the other sections of this guide as needed. </para>
 
 <note>
-<para
->&kde; provides a highly configurable desktop environment. This overview assumes that you are using the default environment. </para>
+<para>&kde; provides a highly configurable desktop environment. This overview assumes that you are using the default environment. </para>
 </note>
 
 <sect1 id="the-kde-desktop">
-<title
->The &kde; Desktop</title>
+<title>The &kde; Desktop</title>
 
-<para
->A typical &kde; desktop consists of several parts:</para>
+<para>A typical &kde; desktop consists of several parts:</para>
 
 <itemizedlist>
 <listitem>
-<para
->A <interface
->panel</interface
-> at the bottom of the screen, used to start applications and switch between desktops. Among other things, it contains the &kmenu;, a large &ticon; which displays a menu of applications to start when clicked. </para>
+<para>A <interface>panel</interface> at the bottom of the screen, used to start applications and switch between desktops. Among other things, it contains the &kmenu;, a large &ticon; which displays a menu of applications to start when clicked. </para>
 </listitem>
 
 <listitem>
-<para
->A <interface
->taskbar</interface
->, by default embedded in the panel, used to switch between and manage currently running applications. Click on an application on the taskbar to switch to the application. </para>
-</listitem
-> 
+<para>A <interface>taskbar</interface>, by default embedded in the panel, used to switch between and manage currently running applications. Click on an application on the taskbar to switch to the application. </para>
+</listitem> 
 
 <listitem>
-<para
->The <interface
->desktop</interface
-> itself, on which frequently used files and folders may be placed. &kde; provides multiple desktops, each of which has its own windows. Click on the numbered buttons on the panel to switch between desktops. </para>
+<para>The <interface>desktop</interface> itself, on which frequently used files and folders may be placed. &kde; provides multiple desktops, each of which has its own windows. Click on the numbered buttons on the panel to switch between desktops. </para>
 </listitem>
 </itemizedlist>
 
 </sect1>
 
 <sect1 id="ready-set-go">
-<title
->Ready, Set, Go!</title>
+<title>Ready, Set, Go!</title>
 
-<para
->Here are a few quick tips to get you up and running.</para>
+<para>Here are a few quick tips to get you up and running.</para>
 
 <itemizedlist>
 <listitem>
-<para
->To start an application, click on the &ticon; button on the panel (called the <link linkend="starter"
->&kmenu;</link
->) and choose an item from the menu. </para>
+<para>To start an application, click on the &ticon; button on the panel (called the <link linkend="starter">&kmenu;</link>) and choose an item from the menu. </para>
 </listitem>
 <listitem>
-<para
->Click the icon that looks like a folder with a picture of a house on the panel to access the files in your home folder using &konqueror;, &kde;'s File Manager utility. </para>
+<para>Click the icon that looks like a folder with a picture of a house on the panel to access the files in your home folder using &konqueror;, &kde;'s File Manager utility. </para>
 </listitem>
 <listitem>
-<para
->Choose <menuchoice
-><guimenu
->TDE menu</guimenu
-> <guisubmenu
->System</guisubmenu
-> <guimenuitem
->Konsole</guimenuitem
-></menuchoice
-> to get a &UNIX; command prompt, or press <keycombo action="simul"
->&Alt; <keycap
->F2</keycap
-></keycombo
-> to get a mini command prompt window to execute a single command. </para>
+<para>Choose <menuchoice><guimenu>TDE menu</guimenu> <guisubmenu>System</guisubmenu> <guimenuitem>Konsole</guimenuitem></menuchoice> to get a &UNIX; command prompt, or press <keycombo action="simul">&Alt; <keycap>F2</keycap></keycombo> to get a mini command prompt window to execute a single command. </para>
 </listitem>
 
 <listitem>
-<para
->Choose the <menuchoice
-><guisubmenu
->Settings</guisubmenu
-><guimenuitem
->Control Centre</guimenuitem
-> </menuchoice
->item on the &kmenu; to configure &kde;. </para>
-</listitem
-> 
+<para>Choose the <menuchoice><guisubmenu>Settings</guisubmenu><guimenuitem>Control Centre</guimenuitem> </menuchoice>item on the &kmenu; to configure &kde;. </para>
+</listitem> 
 
 <listitem>
-<para
->Press <keycombo action="simul"
->&Alt;<keycap
->Tab</keycap
-></keycombo
-> to switch between applications and <keycombo action="simul"
->&Ctrl;<keycap
->Tab</keycap
-></keycombo
-> to switch between desktops using the keyboard. </para>
-</listitem
-> 
+<para>Press <keycombo action="simul">&Alt;<keycap>Tab</keycap></keycombo> to switch between applications and <keycombo action="simul">&Ctrl;<keycap>Tab</keycap></keycombo> to switch between desktops using the keyboard. </para>
+</listitem> 
 
 <listitem>
-<para
->Use the &RMB; mouse button to access context menus for the panel, desktop, and most &kde; applications. </para>
-</listitem
-> 
+<para>Use the &RMB; mouse button to access context menus for the panel, desktop, and most &kde; applications. </para>
+</listitem> 
 </itemizedlist>
 
 </sect1>
 </chapter>
 
 <chapter id="launching-applications">
-<title
->Launching Applications</title>
+<title>Launching Applications</title>
 
 <sect1 id="starter">
-<title
->Using the &kmenu; and the Panel</title>
+<title>Using the &kmenu; and the Panel</title>
 
-<para
->At the bottom of the screen you will find the desktop panel, which is called &kicker;. You use the panel to launch applications. Have a look at the button on the left with a large &ticon;. </para>
+<para>At the bottom of the screen you will find the desktop panel, which is called &kicker;. You use the panel to launch applications. Have a look at the button on the left with a large &ticon;. </para>
 
-<para
->This button is called the &kmenu;. It has a small arrow on the top to indicate that it will pop up a menu if you click on it. Just do it! The pop-up offers you easy access to all &kde; applications installed on your computer system. </para>
+<para>This button is called the &kmenu;. It has a small arrow on the top to indicate that it will pop up a menu if you click on it. Just do it! The pop-up offers you easy access to all &kde; applications installed on your computer system. </para>
 
 <sect2>
-<title
->Customising &kicker;</title>
+<title>Customising &kicker;</title>
 
 <!-- FIXME: To add a button, use the little arrows on kicker, not the TDE menu -->
-<para
->If you use one application or tool very often, then you may want to have even faster access to it, of course. In this case, you can add a single application, or an entire sub-menu of the &kmenu;, as a special quick-launch button, on to the panel. If you want to reach the &kfind; application directly via a launch button, simply choose <menuchoice
-><guimenu
->TDE menu</guimenu
-> <guisubmenu
->Panel Menu</guisubmenu
-> <guisubmenu
->Add</guisubmenu
-> <guisubmenu
->Button</guisubmenu
-> <guimenuitem
->Find Files</guimenuitem
-></menuchoice
-> (By this we mean that you should first click the &kmenu;, then select <guisubmenu
->Panel Menu</guisubmenu
->, where the small arrow to the right indicates that another menu will pop up. In this menu, choose <guisubmenu
->Add</guisubmenu
->, then <guisubmenu
->Button</guisubmenu
->, and in the next sub-menu, <guimenuitem
->Find Files</guimenuitem
->). </para>
+<para>If you use one application or tool very often, then you may want to have even faster access to it, of course. In this case, you can add a single application, or an entire sub-menu of the &kmenu;, as a special quick-launch button, on to the panel. If you want to reach the &kfind; application directly via a launch button, simply choose <menuchoice><guimenu>TDE menu</guimenu> <guisubmenu>Panel Menu</guisubmenu> <guisubmenu>Add</guisubmenu> <guisubmenu>Button</guisubmenu> <guimenuitem>Find Files</guimenuitem></menuchoice> (By this we mean that you should first click the &kmenu;, then select <guisubmenu>Panel Menu</guisubmenu>, where the small arrow to the right indicates that another menu will pop up. In this menu, choose <guisubmenu>Add</guisubmenu>, then <guisubmenu>Button</guisubmenu>, and in the next sub-menu, <guimenuitem>Find Files</guimenuitem>). </para>
 	
-<para
->You can add an entire menu this way, or one of the &ticon; button sub-menus. For example, if you have &koffice; installed and want quick access to all the &koffice; applications, without having to navigate through the &kmenu;, then instead of choosing an application, click on the <guimenuitem
->Add this menu</guimenuitem
-> menu entry. Now you will have instant access to all the &koffice; applications, without having to put an icon for each on the panel. </para>
+<para>You can add an entire menu this way, or one of the &ticon; button sub-menus. For example, if you have &koffice; installed and want quick access to all the &koffice; applications, without having to navigate through the &kmenu;, then instead of choosing an application, click on the <guimenuitem>Add this menu</guimenuitem> menu entry. Now you will have instant access to all the &koffice; applications, without having to put an icon for each on the panel. </para>
 
 <note>
-<para
->You can move all items of the panel around with the <guimenuitem
->Move</guimenuitem
-> command of the context menu. Just click with the <mousebutton
->third</mousebutton
-> mouse button (the <mousebutton
->third</mousebutton
-> mouse button is normally the <mousebutton
->right</mousebutton
-> button, but if you have configured your mouse differently, for example for left-handers, it might also be the <mousebutton
->left</mousebutton
-> one). A menu will pop up where you can choose <guimenuitem
->Move</guimenuitem
->. Now move the mouse and see how the icon follows while still staying on the panel. When you are done, simply hit the <mousebutton
->first</mousebutton
-> mouse button (by default the <mousebutton
->left</mousebutton
-> one). As you may have noticed, there is also a menu entry <guimenuitem
->Remove</guimenuitem
-> in case you are tired of a certain launch button on your desktop. </para
-> 
+<para>You can move all items of the panel around with the <guimenuitem>Move</guimenuitem> command of the context menu. Just click with the <mousebutton>third</mousebutton> mouse button (the <mousebutton>third</mousebutton> mouse button is normally the <mousebutton>right</mousebutton> button, but if you have configured your mouse differently, for example for left-handers, it might also be the <mousebutton>left</mousebutton> one). A menu will pop up where you can choose <guimenuitem>Move</guimenuitem>. Now move the mouse and see how the icon follows while still staying on the panel. When you are done, simply hit the <mousebutton>first</mousebutton> mouse button (by default the <mousebutton>left</mousebutton> one). As you may have noticed, there is also a menu entry <guimenuitem>Remove</guimenuitem> in case you are tired of a certain launch button on your desktop. </para> 
 </note>
 
 </sect2>
 
 <sect2>
-<title
->Using Context menus</title>
-
-<para
->This leads us to another interesting topic: in many places, you can click the <mousebutton
->right</mousebutton
-> mouse button to display a <interface
->context menu</interface
-> with choices that are applicable to the item you clicked. It is therefore always a good idea to try out the <mousebutton
->third</mousebutton
-> mouse button on something, if you do not know what to do with it. Even the background of the desktops has such a menu! </para>
+<title>Using Context menus</title>
+
+<para>This leads us to another interesting topic: in many places, you can click the <mousebutton>right</mousebutton> mouse button to display a <interface>context menu</interface> with choices that are applicable to the item you clicked. It is therefore always a good idea to try out the <mousebutton>third</mousebutton> mouse button on something, if you do not know what to do with it. Even the background of the desktops has such a menu! </para>
 
 </sect2>
 
 <sect2>
-<title
->Other Panel features</title>
-
-<para
->There are other interesting things possible with the panel. One may be important if you have a low resolution on your monitor: it is the <quote
->hide-and-show</quote
-> function, activated by clicking on the small arrowed button, which is at one or both ends of the panel. </para>
-
-<para
->Perhaps you just don't like the panel extending the full width of the screen. That's easily changed! &RMB; on an empty space in the panel, and choose <menuchoice
-><guimenuitem
->Configure Panel...</guimenuitem
-></menuchoice
->. In the &kcontrol; dialogue that pops up, you can choose <guilabel
->Length</guilabel
-> on the <guilabel
->Appearance</guilabel
-> tab, and use the slider there to set the panel to less than 100% width. </para>
-
-<para
->If you're following along, and have that dialogue open anyway, then feel free to play with all the options, and use the <guibutton
->Apply</guibutton
-> to see the effect they have. You can easily reset everything to the default configuration, by simply pressing the <guibutton
->Use Defaults</guibutton
-> button. </para>
-
-<para
->By the way, if you are not sure what a certain button does in &kde;, just move the mouse pointer over it and wait for a short while: &kde; has a built-in mini context help, called <quote
->tool tips</quote
->, which explains the functionality of such controls in a few words. </para>
+<title>Other Panel features</title>
+
+<para>There are other interesting things possible with the panel. One may be important if you have a low resolution on your monitor: it is the <quote>hide-and-show</quote> function, activated by clicking on the small arrowed button, which is at one or both ends of the panel. </para>
+
+<para>Perhaps you just don't like the panel extending the full width of the screen. That's easily changed! &RMB; on an empty space in the panel, and choose <menuchoice><guimenuitem>Configure Panel...</guimenuitem></menuchoice>. In the &kcontrol; dialogue that pops up, you can choose <guilabel>Length</guilabel> on the <guilabel>Appearance</guilabel> tab, and use the slider there to set the panel to less than 100% width. </para>
+
+<para>If you're following along, and have that dialogue open anyway, then feel free to play with all the options, and use the <guibutton>Apply</guibutton> to see the effect they have. You can easily reset everything to the default configuration, by simply pressing the <guibutton>Use Defaults</guibutton> button. </para>
+
+<para>By the way, if you are not sure what a certain button does in &kde;, just move the mouse pointer over it and wait for a short while: &kde; has a built-in mini context help, called <quote>tool tips</quote>, which explains the functionality of such controls in a few words. </para>
 
 
 </sect2>
 </sect1>
 
 <sect1 id="want-command-line-back">
-<title
->But I want my command line back!</title>
-
-<para
->Just calm down, there is nothing to fear. &kde; does not want to take your beloved (and sometimes very effective) command line away from you. You can move your files with the desktop, but you can also use the &UNIX; commands you are accustomed to. In fact,&kde; puts command line power at your fingertips, in perhaps some surprising places. </para>
-
-<para
->&kde; provides a very sophisticated command line window called &konsole;. Choose <menuchoice
-><guimenu
->TDE menu</guimenu
-> <guisubmenu
->System</guisubmenu
-> <guimenuitem
->Konsole</guimenuitem
-></menuchoice
-> to start it. This may be something you want on your panel: luckily it is already there in the default configuration! </para>
+<title>But I want my command line back!</title>
+
+<para>Just calm down, there is nothing to fear. &kde; does not want to take your beloved (and sometimes very effective) command line away from you. You can move your files with the desktop, but you can also use the &UNIX; commands you are accustomed to. In fact,&kde; puts command line power at your fingertips, in perhaps some surprising places. </para>
+
+<para>&kde; provides a very sophisticated command line window called &konsole;. Choose <menuchoice><guimenu>TDE menu</guimenu> <guisubmenu>System</guisubmenu> <guimenuitem>Konsole</guimenuitem></menuchoice> to start it. This may be something you want on your panel: luckily it is already there in the default configuration! </para>
   
-<para
->Sometimes, you only want to enter one command on the command line. In these cases, you do not need a full-blown terminal. Just hit <keycombo
->&Alt;<keycap
->F2</keycap
-></keycombo
-> and you get a small command line where you can enter one command. The command line window will disappear afterwards, but it remembers your command. </para>
-
-<para
->When you pop up this window (which we call <application
->minicli</application
-> by the way) and hit the <keycap
->Up arrow</keycap
->, you can browse through all the commands you have previously entered. Also, you can enter &URL;s in <application
->minicli</application
-> to open a &konqueror; window with the specified &URL;. </para>
-
-<para
->&konqueror; and the editor &kate; can both display terminal windows, which behave just like &konsole;. In &konqueror;, you can turn this on with the menu choice <menuchoice
-><guimenu
->Window</guimenu
-><guimenuitem
->Show Terminal Emulator</guimenuitem
-></menuchoice
->. The embedded terminal will display at the bottom of your &konqueror; window, and the really clever thing is that it will follow your clicks in the file manager view, changing folder as you do. In &kate; you can display a terminal with the menu choice <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Show Console</guimenuitem
-></menuchoice
->. </para>
+<para>Sometimes, you only want to enter one command on the command line. In these cases, you do not need a full-blown terminal. Just hit <keycombo>&Alt;<keycap>F2</keycap></keycombo> and you get a small command line where you can enter one command. The command line window will disappear afterwards, but it remembers your command. </para>
+
+<para>When you pop up this window (which we call <application>minicli</application> by the way) and hit the <keycap>Up arrow</keycap>, you can browse through all the commands you have previously entered. Also, you can enter &URL;s in <application>minicli</application> to open a &konqueror; window with the specified &URL;. </para>
+
+<para>&konqueror; and the editor &kate; can both display terminal windows, which behave just like &konsole;. In &konqueror;, you can turn this on with the menu choice <menuchoice><guimenu>Window</guimenu><guimenuitem>Show Terminal Emulator</guimenuitem></menuchoice>. The embedded terminal will display at the bottom of your &konqueror; window, and the really clever thing is that it will follow your clicks in the file manager view, changing folder as you do. In &kate; you can display a terminal with the menu choice <menuchoice><guimenu>Settings</guimenu><guimenuitem>Show Console</guimenuitem></menuchoice>. </para>
 
 <tip>
-<para
->To display a &UNIX; man page, enter <userinput
-><command
->man:</command
-><replaceable
->command</replaceable
-></userinput
-> in <application
->minicli</application
->, where <replaceable
->command</replaceable
-> is the name of a &UNIX; command. </para>
+<para>To display a &UNIX; man page, enter <userinput><command>man:</command><replaceable>command</replaceable></userinput> in <application>minicli</application>, where <replaceable>command</replaceable> is the name of a &UNIX; command. </para>
 </tip>
 
 <tip>
-<para
->To search for a word or words on the Google search engine, you can try entering <userinput
-><command
->gg:</command
-><replaceable
->word or words</replaceable
-></userinput
->. There are a whole lot more of these shortcut commands, and you can even add your own! Take a look in &kcontrol;, in the tab <menuchoice
-><guilabel
->Web Browsing</guilabel
-> <guilabel
->Enhanced Browsing</guilabel
-></menuchoice
->. </para>
+<para>To search for a word or words on the Google search engine, you can try entering <userinput><command>gg:</command><replaceable>word or words</replaceable></userinput>. There are a whole lot more of these shortcut commands, and you can even add your own! Take a look in &kcontrol;, in the tab <menuchoice><guilabel>Web Browsing</guilabel> <guilabel>Enhanced Browsing</guilabel></menuchoice>. </para>
 </tip>
 
-<para
->Finally, there's a way to have your command line always available, no matter what you're doing - add one to your &kicker; panel! </para>
-
-<para
->Simply &RMB; click on an empty space in the panel, and choose <menuchoice
-><guimenu
->Panel</guimenu
-> <guisubmenu
->Add</guisubmenu
-> <guisubmenu
->Applet</guisubmenu
-> <guimenuitem
->Application Launcher</guimenuitem
-></menuchoice
->. This will embed a mini-cli directly into your panel, complete with command history. </para>
-
-<para
->So, in conclusion, the command line is never far from view when you're using &kde;. </para>
+<para>Finally, there's a way to have your command line always available, no matter what you're doing - add one to your &kicker; panel! </para>
+
+<para>Simply &RMB; click on an empty space in the panel, and choose <menuchoice><guimenu>Panel</guimenu> <guisubmenu>Add</guisubmenu> <guisubmenu>Applet</guisubmenu> <guimenuitem>Application Launcher</guimenuitem></menuchoice>. This will embed a mini-cli directly into your panel, complete with command history. </para>
+
+<para>So, in conclusion, the command line is never far from view when you're using &kde;. </para>
 
 </sect1>
 </chapter>
 
 <chapter id="working-with-windows">
-<title
->Working with Windows</title>
+<title>Working with Windows</title>
 
-<para
->If you have not already done so, start an application using the <link linkend="starter"
->&kmenu;</link
->; say, <guimenuitem
->Find Files</guimenuitem
->. </para>
+<para>If you have not already done so, start an application using the <link linkend="starter">&kmenu;</link>; say, <guimenuitem>Find Files</guimenuitem>. </para>
 
 <sect1 id="window-what-now">
-<title
->A window! What now?</title>
+<title>A window! What now?</title>
 
-<para
->Well, usually people work <emphasis
->inside</emphasis
-> windows, but sometimes you may want to manipulate windows. Here's a quick overview of some of the most common window related functions: </para>
+<para>Well, usually people work <emphasis>inside</emphasis> windows, but sometimes you may want to manipulate windows. Here's a quick overview of some of the most common window related functions: </para>
 
 <variablelist>
 <varlistentry>
-<term
->Move a window</term>
+<term>Move a window</term>
 <listitem>
-<para
->Drag the window's title bar, or hold the &Alt; key down and drag anywhere in the window. </para>
-</listitem
-> 
+<para>Drag the window's title bar, or hold the &Alt; key down and drag anywhere in the window. </para>
+</listitem> 
 </varlistentry>
 
 <varlistentry>
-<term
->Resize a window:</term>
+<term>Resize a window:</term>
 <listitem>
-<para
->Drag the window's border, or hold the &Alt; key down and drag with the &RMB; anywhere in the window. </para>
+<para>Drag the window's border, or hold the &Alt; key down and drag with the &RMB; anywhere in the window. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Maximise a window</term>
+<term>Maximise a window</term>
 <listitem>
-<para
->Click the maximise button in the title bar (in the default decoration it is the square, next to the X) to make the window fill the screen, or if the window is already maximised, to shrink it back to its original size. Clicking with the &MMB; maximises the window vertically, and with the &RMB;, horizontally. </para>
+<para>Click the maximise button in the title bar (in the default decoration it is the square, next to the X) to make the window fill the screen, or if the window is already maximised, to shrink it back to its original size. Clicking with the &MMB; maximises the window vertically, and with the &RMB;, horizontally. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Iconify a window</term>
+<term>Iconify a window</term>
 <listitem>
-<para
->Click the iconify button in the title bar (next to Maximise) to hide the window. Restore it by clicking on the window's icon in the taskbar. </para>
-</listitem
-> 
+<para>Click the iconify button in the title bar (next to Maximise) to hide the window. Restore it by clicking on the window's icon in the taskbar. </para>
+</listitem> 
 </varlistentry>
 
 <varlistentry>
-<term
->Switch between windows</term>
+<term>Switch between windows</term>
 <listitem>
-<para
->Aside from the usual mouse click to switch to another window, you can use <keycombo action="simul"
->&Alt; <keycap
->Tab</keycap
-></keycombo
-> to switch windows. See below for more techniques. </para>
+<para>Aside from the usual mouse click to switch to another window, you can use <keycombo action="simul">&Alt; <keycap>Tab</keycap></keycombo> to switch windows. See below for more techniques. </para>
 </listitem>
 </varlistentry>
 </variablelist>
 
 <sect2>
-<title
->Title bar buttons</title>
+<title>Title bar buttons</title>
 
-<para
->&kde; windows have some pretty standard buttons on their title bars which give you fast access to some common operations. The default button layout looks like this: </para>
+<para>&kde; windows have some pretty standard buttons on their title bars which give you fast access to some common operations. The default button layout looks like this: </para>
 
 <itemizedlist>
-<title
->On the left side:</title>
+<title>On the left side:</title>
 <listitem>
-<para
->A menu button. This usually shows a mini icon for the application. Click on it to get a window operations menu. Shortcut: <keycombo action="simul"
->&Alt;<keycap
->F3</keycap
-></keycombo
-> opens the window menu. </para>
+<para>A menu button. This usually shows a mini icon for the application. Click on it to get a window operations menu. Shortcut: <keycombo action="simul">&Alt;<keycap>F3</keycap></keycombo> opens the window menu. </para>
 </listitem>
  
 <listitem>
-<para
->A sticky button, with a picture of a tack. What the heck is this? Stay tuned! </para>
-</listitem
-> 
+<para>A sticky button, with a picture of a tack. What the heck is this? Stay tuned! </para>
+</listitem> 
 </itemizedlist>
 
 <itemizedlist>
-<title
->On the right side:</title>
+<title>On the right side:</title>
 <listitem>
-<para
->An iconify button. </para>
+<para>An iconify button. </para>
 </listitem>
 
 <listitem>
-<para
->A maximise button. </para>
+<para>A maximise button. </para>
 </listitem>
 
 <listitem>
-<para
->A close button. This closes the window. Shortcut: <keycombo action="simul"
->&Alt;<keycap
->F4</keycap
-></keycombo
->. </para>
+<para>A close button. This closes the window. Shortcut: <keycombo action="simul">&Alt;<keycap>F4</keycap></keycombo>. </para>
 </listitem>
 </itemizedlist>
 
 </sect2>
 
 <sect2>
-<title
->Switching between windows</title>
+<title>Switching between windows</title>
 
-<para
->Now that we know how to deal with windows, we encourage you to open some other windows using the panel, since we will now discuss how to switch between different windows. Since this is such a common activity, &kde; offers several ways to do it; pick your favourite! </para>
+<para>Now that we know how to deal with windows, we encourage you to open some other windows using the panel, since we will now discuss how to switch between different windows. Since this is such a common activity, &kde; offers several ways to do it; pick your favourite! </para>
 
-<para
->Many window systems require you to click the mouse in another window to begin using it. This is &kde;'s default behaviour, termed <quote
->Click To Focus</quote
-> focus policy. But you can also configure your desktop in a way that moving the mouse pointer on to a window will activate it. This is called <quote
->Focus Follows Mouse</quote
->. If you select this policy using the <link linkend="configure"
->&kde; Control Centre</link
->, the window under the mouse pointer is always the active one. It doesn't necessarily come to the front automatically, but you can still click on to the title bar or the border of a window or, a &kde; special, you can use the &Alt; key and click the &MMB; anywhere on the window to raise it. </para>
+<para>Many window systems require you to click the mouse in another window to begin using it. This is &kde;'s default behaviour, termed <quote>Click To Focus</quote> focus policy. But you can also configure your desktop in a way that moving the mouse pointer on to a window will activate it. This is called <quote>Focus Follows Mouse</quote>. If you select this policy using the <link linkend="configure">&kde; Control Centre</link>, the window under the mouse pointer is always the active one. It doesn't necessarily come to the front automatically, but you can still click on to the title bar or the border of a window or, a &kde; special, you can use the &Alt; key and click the &MMB; anywhere on the window to raise it. </para>
 
-<para
->Here are some other methods to switch windows: </para>
+<para>Here are some other methods to switch windows: </para>
 
 <itemizedlist>
 <listitem>
-<para
->Pick a window from the <emphasis
->window list</emphasis
-> menu. To open the menu, click the &MMB; on an empty area of the desktop, or click the icon with several windows on the panel, or finally click the up arrow at the left hand end of the taskbar in the panel. </para>
-</listitem
-> 
+<para>Pick a window from the <emphasis>window list</emphasis> menu. To open the menu, click the &MMB; on an empty area of the desktop, or click the icon with several windows on the panel, or finally click the up arrow at the left hand end of the taskbar in the panel. </para>
+</listitem> 
 
 <listitem>
-<para
->Hold down the &Alt; key and press <keycap
->Tab</keycap
-> to cycle through the windows. </para>
-</listitem
-> 
+<para>Hold down the &Alt; key and press <keycap>Tab</keycap> to cycle through the windows. </para>
+</listitem> 
 
 <listitem>
-<para
->Use the taskbar (see below). </para>
+<para>Use the taskbar (see below). </para>
 </listitem>
 </itemizedlist>
 
@@ -611,276 +297,144 @@
 </sect1>
 
 <sect1 id="using-taskbar">
-<title
->Using the Taskbar</title>
-
-<para
->The <interface
->taskbar</interface
-> displays a list of small icons, one for each window on the desktop. In the default &kde; setup the taskbar is located inside the panel, but it can also be located at the top or the bottom of the screen. </para>
-
-<para
->The taskbar is very powerful. In the default configuration, if you have more than one window from the same application open, they will be <quote
->grouped</quote
->, so that you see one icon per application in the taskbar.</para>
-
-<para
->A simple &LMB; click on the taskbar button will pop up a list of the open windows for that application and you can choose the window you want to use. Choosing one of these entries with the <mousebutton
->left</mousebutton
-> will bring you to the selected window immediately. Click on a taskbar entry with the <mousebutton
->right</mousebutton
-> and you will see a menu allowing you to operate on all the windows grouped under that icon, or each window individually.</para>
-
-<para
->You can choose to see all the windows on all the desktops in your taskbar, no matter which desktop you are currently viewing, or to only see the icons for the desktop you are looking at. You can also choose to ungroup the icons, so that each open window will have its own icon in the taskbar. These and many more options are available simply by right clicking on the taskbar handle (the small textured bar at the left hand side) and choosing <guimenuitem
->Configure Taskbar...</guimenuitem
->. </para>
-
-<para
->The icons on the taskbar resize themselves to make room for applications, so you can fit many more applications than you might think. Making the panel wider will let the taskbar icons take on a row and column layout, but they will still resize to fit more icons. </para>
+<title>Using the Taskbar</title>
+
+<para>The <interface>taskbar</interface> displays a list of small icons, one for each window on the desktop. In the default &kde; setup the taskbar is located inside the panel, but it can also be located at the top or the bottom of the screen. </para>
+
+<para>The taskbar is very powerful. In the default configuration, if you have more than one window from the same application open, they will be <quote>grouped</quote>, so that you see one icon per application in the taskbar.</para>
+
+<para>A simple &LMB; click on the taskbar button will pop up a list of the open windows for that application and you can choose the window you want to use. Choosing one of these entries with the <mousebutton>left</mousebutton> will bring you to the selected window immediately. Click on a taskbar entry with the <mousebutton>right</mousebutton> and you will see a menu allowing you to operate on all the windows grouped under that icon, or each window individually.</para>
+
+<para>You can choose to see all the windows on all the desktops in your taskbar, no matter which desktop you are currently viewing, or to only see the icons for the desktop you are looking at. You can also choose to ungroup the icons, so that each open window will have its own icon in the taskbar. These and many more options are available simply by right clicking on the taskbar handle (the small textured bar at the left hand side) and choosing <guimenuitem>Configure Taskbar...</guimenuitem>. </para>
+
+<para>The icons on the taskbar resize themselves to make room for applications, so you can fit many more applications than you might think. Making the panel wider will let the taskbar icons take on a row and column layout, but they will still resize to fit more icons. </para>
 
 </sect1>
 
 <sect1 id="using-v-desktops">
-<title
->Using Virtual Desktops</title>
+<title>Using Virtual Desktops</title>
 
-<para
->Now, what was that <quote
->sticky</quote
-> thing? </para>
+<para>Now, what was that <quote>sticky</quote> thing? </para>
 
-<para
->It may happen that you have more windows open than space on your desktop. In this case you have three possibilities: </para>
+<para>It may happen that you have more windows open than space on your desktop. In this case you have three possibilities: </para>
 
 <orderedlist>
 <listitem>
-<para
->Leave all windows open (cluttered desktop) </para>
+<para>Leave all windows open (cluttered desktop) </para>
 </listitem>
 
 <listitem>
-<para
->Iconify those windows which you do not need at present and use the taskbar or <keycombo action="simul"
->&Alt; <keycap
->Tab</keycap
-></keycombo
-> to switch between them (still a bit confusing and much work!) </para>
-</listitem
-> 
+<para>Iconify those windows which you do not need at present and use the taskbar or <keycombo action="simul">&Alt; <keycap>Tab</keycap></keycombo> to switch between them (still a bit confusing and much work!) </para>
+</listitem> 
 
 <listitem>
-<para
->Recommended: Do what a real operating system does if there is not enough physical memory: Use virtual memory, in this case virtual desktops. </para>
+<para>Recommended: Do what a real operating system does if there is not enough physical memory: Use virtual memory, in this case virtual desktops. </para>
 </listitem>
 </orderedlist>
 
-<para
->The third option is the way to go! &kde; can handle several different desktops, each with its own windows. The default configuration provides four desktops. You can switch between the virtual desktops easily with a click on one of the desktop buttons on the panel. Also <keycombo action="simul"
->&Ctrl;<keycap
->F1...F4</keycap
-></keycombo
-> will send you to the corresponding desktop immediately, or <keycombo action="simul"
->&Ctrl; <keycap
->Tab</keycap
-></keycombo
-> will cycle through the desktops. </para>
-
-<para
->Virtual desktops are very nice. But sometimes you want a window to be present on <emphasis
->every</emphasis
-> desktop. This could be, for example, a small chat window, an alarm clock or whatever. In this case you can use the above mentioned <quote
->sticky</quote
-> button which will pin the window on the background so that it will appear on every virtual desktop. </para
-> 
-
-<para
->The sticky button can also be used to move a window from one virtual desktop to another one: push the sticky pin on the window, switch to a different desktop, and release the pin by pushing it again. You can achieve the same result by using the context pop-up menu of the window's entry in the taskbar (menu item <guimenuitem
->To Current Desktop</guimenuitem
->) or the <guimenuitem
->To Desktop</guimenuitem
-> option on the window operations menu. </para>
+<para>The third option is the way to go! &kde; can handle several different desktops, each with its own windows. The default configuration provides four desktops. You can switch between the virtual desktops easily with a click on one of the desktop buttons on the panel. Also <keycombo action="simul">&Ctrl;<keycap>F1...F4</keycap></keycombo> will send you to the corresponding desktop immediately, or <keycombo action="simul">&Ctrl; <keycap>Tab</keycap></keycombo> will cycle through the desktops. </para>
+
+<para>Virtual desktops are very nice. But sometimes you want a window to be present on <emphasis>every</emphasis> desktop. This could be, for example, a small chat window, an alarm clock or whatever. In this case you can use the above mentioned <quote>sticky</quote> button which will pin the window on the background so that it will appear on every virtual desktop. </para> 
+
+<para>The sticky button can also be used to move a window from one virtual desktop to another one: push the sticky pin on the window, switch to a different desktop, and release the pin by pushing it again. You can achieve the same result by using the context pop-up menu of the window's entry in the taskbar (menu item <guimenuitem>To Current Desktop</guimenuitem>) or the <guimenuitem>To Desktop</guimenuitem> option on the window operations menu. </para>
 
 </sect1>
 </chapter>
 
 <chapter id="managing-your-files">
-<title
->Managing your files</title>
+<title>Managing your files</title>
 
 <!-- NB Deliberate use of 'directory' rather than 'folder', since we're talking -->
 <!-- about directories on disk -->
-<para
->A common metaphor of graphical desktops is the use of folders to represent directories on your hard disk. Folders contain files and other folders. A &kde; application called &konqueror;, the K File Manager, uses this metaphor to help you manage your files. </para>
+<para>A common metaphor of graphical desktops is the use of folders to represent directories on your hard disk. Folders contain files and other folders. A &kde; application called &konqueror;, the K File Manager, uses this metaphor to help you manage your files. </para>
 
 <sect1 id="using-konqueror">
-<title
->Using &konqueror;</title>
+<title>Using &konqueror;</title>
 
-<para
->The first time you start &kde;, a window with lots of icons in it appears. This is a &konqueror; window displaying the files in your home folder (the area where your personal files are stored). The pathname of the folder is displayed under the window's tool bar. If you do not see such a window now, click the icon on the panel that looks like a folder with a picture of a house. </para>
+<para>The first time you start &kde;, a window with lots of icons in it appears. This is a &konqueror; window displaying the files in your home folder (the area where your personal files are stored). The pathname of the folder is displayed under the window's tool bar. If you do not see such a window now, click the icon on the panel that looks like a folder with a picture of a house. </para>
 
-<para
->To open a file or folder, simply click it once with the &LMB;. You can also choose <menuchoice
-><guimenu
->Window</guimenu
-><guimenuitem
->Show Navigation Panel</guimenuitem
-></menuchoice
-> from the menu to display the folder hierarchy for more direct navigation. Or you can edit the path displayed under the toolbar to get to a specific folder quickly. </para>
+<para>To open a file or folder, simply click it once with the &LMB;. You can also choose <menuchoice><guimenu>Window</guimenu><guimenuitem>Show Navigation Panel</guimenuitem></menuchoice> from the menu to display the folder hierarchy for more direct navigation. Or you can edit the path displayed under the toolbar to get to a specific folder quickly. </para>
 
 <sect2>
-<title
->Opening Files</title>
+<title>Opening Files</title>
 
-<para
->&kde; comes with a set of applications to view and edit files of many common types, and when you click a file containing, say, a document or image, &konqueror; will start the appropriate application to display the file. If it doesn't know what application to start to open a file you clicked, &konqueror; will prompt you for the name of the application to run, and when you have chosen, &konqueror; will offer to remember your choice for the next time you open a file of that type. </para>
+<para>&kde; comes with a set of applications to view and edit files of many common types, and when you click a file containing, say, a document or image, &konqueror; will start the appropriate application to display the file. If it doesn't know what application to start to open a file you clicked, &konqueror; will prompt you for the name of the application to run, and when you have chosen, &konqueror; will offer to remember your choice for the next time you open a file of that type. </para>
 
 <note>
-<para
->&konqueror; uses MIME types to associate files with applications. </para>
-</note
-> 
+<para>&konqueror; uses MIME types to associate files with applications. </para>
+</note> 
 
 </sect2>
 
 <sect2>
-<title
->Dragging and Dropping Icons</title>
+<title>Dragging and Dropping Icons</title>
 
-<para
->To copy or move a file, simply drag its icon to the desktop, to another &konqueror; window, or to a folder icon. When you release the button, &konqueror; displays a menu to allow you to choose to copy, move, or create a link to the file. </para>
+<para>To copy or move a file, simply drag its icon to the desktop, to another &konqueror; window, or to a folder icon. When you release the button, &konqueror; displays a menu to allow you to choose to copy, move, or create a link to the file. </para>
 
 <note>
-<para
->Note that if you choose to create a link, &kde; creates a &UNIX; symbolic link (not a hard link), so if you move or delete the original file, the link will be broken. </para>
+<para>Note that if you choose to create a link, &kde; creates a &UNIX; symbolic link (not a hard link), so if you move or delete the original file, the link will be broken. </para>
 </note>
 
-<para
->Most &kde; applications also support drag and drop operations: you can drag an icon on to a window of a running application, or on to an icon of an application that is not started, to have the application open the file. Try it! </para>
+<para>Most &kde; applications also support drag and drop operations: you can drag an icon on to a window of a running application, or on to an icon of an application that is not started, to have the application open the file. Try it! </para>
 
 </sect2>
 
 <sect2>
-<title
->Setting File Properties</title>
+<title>Setting File Properties</title>
  
-<para
->To change file properties, such as its name and permissions, &RMB; click the icon and choose <guimenuitem
->Properties</guimenuitem
-> from the menu. </para>
+<para>To change file properties, such as its name and permissions, &RMB; click the icon and choose <guimenuitem>Properties</guimenuitem> from the menu. </para>
 
 </sect2>
 </sect1>
 
 <sect1 id="archives-and-networks">
-<title
->Working with Archives and Networks</title>
-
-<para
->In the recent past, you needed special software to access files on the Internet. Not any more! </para>
-
-<para
->&kde; supports a technology called <quote
->Network Transparent Access</quote
-> (<acronym
->NTA</acronym
->) which allows you to work with files on the other side of the world as easily as those on your local hard disk.</para>
-
-<para
->For example, to access files on an &FTP; server, just choose <menuchoice
-><guimenu
->Location</guimenu
-><guimenuitem
->Open Location</guimenuitem
-></menuchoice
-> from a &konqueror; menu, and enter the <acronym
->URL</acronym
-> of an &FTP; server. You can drag and drop files to and from the folders on the server just as if they were on your local disk. You'll even be able to open files on the &FTP; server without having to manually copy them to your local disk (&kde; does it for you when necessary). </para>
+<title>Working with Archives and Networks</title>
+
+<para>In the recent past, you needed special software to access files on the Internet. Not any more! </para>
+
+<para>&kde; supports a technology called <quote>Network Transparent Access</quote> (<acronym>NTA</acronym>) which allows you to work with files on the other side of the world as easily as those on your local hard disk.</para>
+
+<para>For example, to access files on an &FTP; server, just choose <menuchoice><guimenu>Location</guimenu><guimenuitem>Open Location</guimenuitem></menuchoice> from a &konqueror; menu, and enter the <acronym>URL</acronym> of an &FTP; server. You can drag and drop files to and from the folders on the server just as if they were on your local disk. You'll even be able to open files on the &FTP; server without having to manually copy them to your local disk (&kde; does it for you when necessary). </para>
 
 <note>
-<para
->Note that &konqueror; uses anonymous &FTP; access, which may restrict your access to files on the &FTP; server. If you have an account on the server, you can supply your user <abbrev
->ID</abbrev
-> as part of the <acronym
->URL</acronym
->, like this: <userinput
-><command
->ftp://</command
-><parameter
->userid</parameter
->@<parameter
->server</parameter
->/<parameter
->folder</parameter
-></userinput
-> </para>
-
-<para
->&konqueror; will prompt you for your password, and if the login succeeds, you will have full access to your files on the server. </para>
+<para>Note that &konqueror; uses anonymous &FTP; access, which may restrict your access to files on the &FTP; server. If you have an account on the server, you can supply your user <abbrev>ID</abbrev> as part of the <acronym>URL</acronym>, like this: <userinput><command>ftp://</command><parameter>userid</parameter>@<parameter>server</parameter>/<parameter>folder</parameter></userinput> </para>
+
+<para>&konqueror; will prompt you for your password, and if the login succeeds, you will have full access to your files on the server. </para>
 </note>
 
-<para
->If you are used to the <trademark
-><application
->WinZip</application
-></trademark
-> utility on &Microsoft; &Windows;, then you will be happy to hear that &kde; can look into tar archives, too. It treats such archives just like a normal folder, and you can browse into the archive, open files, &etc; In general, accessing files on the Internet and in archives should look and feel just like accessing files on your local disk, except for delays imposed by the network and extracting the archive. </para>
+<para>If you are used to the <trademark><application>WinZip</application></trademark> utility on &Microsoft; &Windows;, then you will be happy to hear that &kde; can look into tar archives, too. It treats such archives just like a normal folder, and you can browse into the archive, open files, &etc; In general, accessing files on the Internet and in archives should look and feel just like accessing files on your local disk, except for delays imposed by the network and extracting the archive. </para>
 </sect1>
 
 <sect1 id="using-templates">
-<title
->Using Templates to access Applications and Devices</title>
+<title>Using Templates to access Applications and Devices</title>
 
-<para
->In &kde; it's easy to put icons on the panel or the desktop to access your applications. It's just as easy to add icons to access other items of interest. &kde; has templates for shortcuts to: </para>
+<para>In &kde; it's easy to put icons on the panel or the desktop to access your applications. It's just as easy to add icons to access other items of interest. &kde; has templates for shortcuts to: </para>
 
 <itemizedlist>
 <listitem>
-<para
->Applications </para>
+<para>Applications </para>
 </listitem>
 <listitem>
-<para
->Printers </para>
+<para>Printers </para>
 </listitem>
 <listitem>
-<para
->Mountable Devices (&eg; floppy drives) </para>
-</listitem
-> 
+<para>Mountable Devices (&eg; floppy drives) </para>
+</listitem> 
 <listitem>
-<para
->Internet resources (&eg; <acronym
->WWW</acronym
-> documents, &FTP; folders) </para>
+<para>Internet resources (&eg; <acronym>WWW</acronym> documents, &FTP; folders) </para>
 </listitem>
 <listitem>
-<para
->Documents for some of &kde;'s &koffice; applications. </para>
+<para>Documents for some of &kde;'s &koffice; applications. </para>
 </listitem>
 </itemizedlist>
 
-<para
->You can add any of these items to the desktop by &RMB; clicking where you want the icon, and choosing <guisubmenu
->Create New</guisubmenu
-> and selecting the item you want to link to. </para>
-
-<para
->Nearly every item in the &kmenu;, on the desktop, and on the panel refers to a <literal role="extension"
->.desktop</literal
-> file on disk. The <literal role="extension"
->.desktop</literal
-> file specifies what icon to display, as well as specific information about what the icon represents (an application, device, or <acronym
->URL</acronym
->). You can drag any <literal role="extension"
->.desktop</literal
-> file to the panel to create a quick-launch button. </para>
+<para>You can add any of these items to the desktop by &RMB; clicking where you want the icon, and choosing <guisubmenu>Create New</guisubmenu> and selecting the item you want to link to. </para>
+
+<para>Nearly every item in the &kmenu;, on the desktop, and on the panel refers to a <literal role="extension">.desktop</literal> file on disk. The <literal role="extension">.desktop</literal> file specifies what icon to display, as well as specific information about what the icon represents (an application, device, or <acronym>URL</acronym>). You can drag any <literal role="extension">.desktop</literal> file to the panel to create a quick-launch button. </para>
 
 <!-- 
 <sect2>
-<title
->Setting up printers</title>
+<title>Setting up printers</title>
 
 <para>
 You can create icons for your printers so that you can print a file by
@@ -888,467 +442,234 @@ dragging it to a printer icon. Here's how:
 </para>
 
 <procedure>
-<step
-><para
->Open the Templates folder located on the desktop. </para
-></step>
-<step
-><para
->Drag the Program icon in the folder to the desktop. Choose
-<guimenuitem
->Copy</guimenuitem
-> from the menu that appears when you drop the
-icon.</para
-></step>
-<step
-><para
-><mousebutton
->Right</mousebutton
-> click the new icon, and choose
-<guimenuitem
->Properties</guimenuitem
-> from the context menu.</para
-></step>
-<step
-><para
->On the <guilabel
->General</guilabel
-> tab, change the name to
-<filename
->Printer.kdelnk</filename
->.</para
-></step>
-<step
-><para
->On the <guilabel
->Execute</guilabel
-> tab, enter the following in the
-first <guilabel
->Execute</guilabel
-> field:</para>
-<screen
-><command>lpr <option>%f</option></command></screen>
-<note
-><para
->This example assumes that you print using the <command
->lpr</command>
+<step><para>Open the Templates folder located on the desktop. </para></step>
+<step><para>Drag the Program icon in the folder to the desktop. Choose
+<guimenuitem>Copy</guimenuitem> from the menu that appears when you drop the
+icon.</para></step>
+<step><para><mousebutton>Right</mousebutton> click the new icon, and choose
+<guimenuitem>Properties</guimenuitem> from the context menu.</para></step>
+<step><para>On the <guilabel>General</guilabel> tab, change the name to
+<filename>Printer.kdelnk</filename>.</para></step>
+<step><para>On the <guilabel>Execute</guilabel> tab, enter the following in the
+first <guilabel>Execute</guilabel> field:</para>
+<screen><command>lpr <option>%f</option></command></screen>
+<note><para>This example assumes that you print using the <command>lpr</command>
 command. If you use a different command, enter the one you
-use.</para
-></note
-></step>
-<step
-><para
->Still in the <guilabel
->Execute</guilabel
-> tab, click the icon that
-looks like a <guiicon
->cog</guiicon
->, and select the <guiicon
->Printer</guiicon
-> icon from the list that appears.</para
-></step>
+use.</para></note></step>
+<step><para>Still in the <guilabel>Execute</guilabel> tab, click the icon that
+looks like a <guiicon>cog</guiicon>, and select the <guiicon>Printer</guiicon> icon from the list that appears.</para></step>
 </procedure>
 
-<para
->Now you should be able to drag a file to the Printer icon and have it
-printed on your default printer.</para
-> 
+<para>Now you should be able to drag a file to the Printer icon and have it
+printed on your default printer.</para> 
 </sect2>
 
 --> 
 
 <sect2>
-<title
->Mounting devices</title>
-
-<para
->&UNIX; provides access to storage devices other than the primary <hardware
->hard disk</hardware
-> through a process called <emphasis
->mounting</emphasis
->. &kde; uses <literal role="extension"
->.desktop</literal
-> files to allow you to easily mount, unmount, and access files on secondary storage devices such as <hardware
->floppy</hardware
-> drives and &cdrom; drives. </para>
-
-<para
->As an example, here are the steps needed to create an icon to access files on a floppy disk: </para>
+<title>Mounting devices</title>
+
+<para>&UNIX; provides access to storage devices other than the primary <hardware>hard disk</hardware> through a process called <emphasis>mounting</emphasis>. &kde; uses <literal role="extension">.desktop</literal> files to allow you to easily mount, unmount, and access files on secondary storage devices such as <hardware>floppy</hardware> drives and &cdrom; drives. </para>
+
+<para>As an example, here are the steps needed to create an icon to access files on a floppy disk: </para>
 
 <note>
-<para
->Many systems require you to be logged in as <systemitem class="username"
->root</systemitem
-> to mount and unmount devices. </para>
+<para>Many systems require you to be logged in as <systemitem class="username">root</systemitem> to mount and unmount devices. </para>
 </note>
 
 <procedure>
 <step>
-<para
-><mousebutton
->Right</mousebutton
-> click on the desktop and choose <menuchoice
-><guisubmenu
->Create New</guisubmenu
-> <guimenuitem
->Floppy Device...</guimenuitem
-></menuchoice
->. </para>
+<para><mousebutton>Right</mousebutton> click on the desktop and choose <menuchoice><guisubmenu>Create New</guisubmenu> <guimenuitem>Floppy Device...</guimenuitem></menuchoice>. </para>
 </step>
 <step>
-<para
->On the <guilabel
->General</guilabel
-> tab of the resulting dialogue, change the name to whatever you like, in the text box at the top. </para>
+<para>On the <guilabel>General</guilabel> tab of the resulting dialogue, change the name to whatever you like, in the text box at the top. </para>
 </step>
 
 <step>
-<para
->On the <guilabel
->Device</guilabel
-> tab, enter <filename class="devicefile"
->/dev/fd0</filename
-> (or the path to the floppy device as it is named on your system) as the <guilabel
->Device</guilabel
->. </para>
+<para>On the <guilabel>Device</guilabel> tab, enter <filename class="devicefile">/dev/fd0</filename> (or the path to the floppy device as it is named on your system) as the <guilabel>Device</guilabel>. </para>
 </step>
 <step>
-<para
->You can add a <guilabel
->Mount Point</guilabel
-> here too. This should be an existing folder, but empty. Common mount points are <filename class="directory"
->/mnt/floppy</filename
-> or <filename class="directory"
->/floppy</filename
->, but you can just as easily have floppy disks mounted on <filename class="directory"
->~/mydisk</filename
-> if you want. </para>
-</step
-> 
+<para>You can add a <guilabel>Mount Point</guilabel> here too. This should be an existing folder, but empty. Common mount points are <filename class="directory">/mnt/floppy</filename> or <filename class="directory">/floppy</filename>, but you can just as easily have floppy disks mounted on <filename class="directory">~/mydisk</filename> if you want. </para>
+</step> 
 <step>
-<para
->Click the <guilabel
->Unmounted Icon</guilabel
-> and select the picture of a floppy disk without the green light. </para>
+<para>Click the <guilabel>Unmounted Icon</guilabel> and select the picture of a floppy disk without the green light. </para>
 </step>
 <step>
-<para
->Once you're happy with your choices, choose <guibutton
->OK</guibutton
-> and you are finished! </para>
+<para>Once you're happy with your choices, choose <guibutton>OK</guibutton> and you are finished! </para>
 </step>
 </procedure>
 
-<para
->Now, place a properly formatted floppy in the drive and click the <guiicon
->Floppy</guiicon
-> icon to have &kde; mount the floppy drive and display the files on the disk. Before removing the disk from the drive, &RMB; click the <guiicon
->Floppy</guiicon
-> icon and choose <guimenuitem
->Unmount</guimenuitem
-> from the menu. </para>
+<para>Now, place a properly formatted floppy in the drive and click the <guiicon>Floppy</guiicon> icon to have &kde; mount the floppy drive and display the files on the disk. Before removing the disk from the drive, &RMB; click the <guiicon>Floppy</guiicon> icon and choose <guimenuitem>Unmount</guimenuitem> from the menu. </para>
 
 </sect2>
 </sect1>
 </chapter>
 
 <chapter id="configure">
-<title
->Configuring your desktop</title>
+<title>Configuring your desktop</title>
 
-<para
->If you do not like something about the way the desktop looks or operates, you can probably change it. &kde; is very configurable and you can change almost every aspect of the appearance and the behaviour of your desktop. Unlike many other &UNIX; desktop environments, you do not have to edit cryptic configuration files either (but you can if you really want to!) You use the &kcontrol;, a special program for configuring your desktop. </para>
+<para>If you do not like something about the way the desktop looks or operates, you can probably change it. &kde; is very configurable and you can change almost every aspect of the appearance and the behaviour of your desktop. Unlike many other &UNIX; desktop environments, you do not have to edit cryptic configuration files either (but you can if you really want to!) You use the &kcontrol;, a special program for configuring your desktop. </para>
 
 <sect1 id="using-kde-control">
-<title
->Using the <application
->&kde; Control Centre</application
-></title>
-
-<para
->Launch the &kcontrol; from the <link linkend="starter"
->&kmenu;</link
->. A window with two panes appears, displaying a list of modules in the left pane. </para
->  
-
-<para
->Open a module by clicking its name; a list of submodules will appear. Then, click one of the submodule category names to edit its configuration in the right pane. </para>
-
-<para
->Changing the configuration is fairly straightforward. A help button is available on each configuration panel to explain settings that are not obvious. Each panel has buttons labelled <guibutton
->Help</guibutton
->, <guibutton
->Use Defaults</guibutton
->, <guibutton
->Apply</guibutton
->, and <guibutton
->Reset</guibutton
->, which work as follows: </para>
+<title>Using the <application>&kde; Control Centre</application></title>
+
+<para>Launch the &kcontrol; from the <link linkend="starter">&kmenu;</link>. A window with two panes appears, displaying a list of modules in the left pane. </para>  
+
+<para>Open a module by clicking its name; a list of submodules will appear. Then, click one of the submodule category names to edit its configuration in the right pane. </para>
+
+<para>Changing the configuration is fairly straightforward. A help button is available on each configuration panel to explain settings that are not obvious. Each panel has buttons labelled <guibutton>Help</guibutton>, <guibutton>Use Defaults</guibutton>, <guibutton>Apply</guibutton>, and <guibutton>Reset</guibutton>, which work as follows: </para>
 
 <variablelist>
 <varlistentry>
-<term
-><guibutton
->Help</guibutton
-></term>
+<term><guibutton>Help</guibutton></term>
 <listitem>
-<para
->Displays a short help text in the left hand pane, including a link to a longer manual for the module in question. </para>
+<para>Displays a short help text in the left hand pane, including a link to a longer manual for the module in question. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guibutton
->Use Defaults</guibutton
-></term>
+<term><guibutton>Use Defaults</guibutton></term>
 <listitem>
-<para
->Sets all the options in the current module back to the default at the time &kde; was installed. </para>
+<para>Sets all the options in the current module back to the default at the time &kde; was installed. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guibutton
->Apply</guibutton
-></term>
+<term><guibutton>Apply</guibutton></term>
 <listitem>
-<para
->Applies the current settings in the currently open module. </para>
+<para>Applies the current settings in the currently open module. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guibutton
->Reset</guibutton
-></term>
+<term><guibutton>Reset</guibutton></term>
 <listitem>
-<para
->Resets the options to the state they were in when you opened the module. If you have already used the <guibutton
->Apply</guibutton
-> button, then this button will reset the options to the state they were in when you pressed <guibutton
->Apply</guibutton
->. </para>
+<para>Resets the options to the state they were in when you opened the module. If you have already used the <guibutton>Apply</guibutton> button, then this button will reset the options to the state they were in when you pressed <guibutton>Apply</guibutton>. </para>
 </listitem>
 </varlistentry>
 </variablelist>
 
 <note>
-<para
->If you make changes on one configuration panel and move to a different module without clicking <guibutton
->OK</guibutton
-> or <guibutton
->Apply</guibutton
-> first, &kcontrol; will prompt you to ask whether your changes should be applied first. </para>
+<para>If you make changes on one configuration panel and move to a different module without clicking <guibutton>OK</guibutton> or <guibutton>Apply</guibutton> first, &kcontrol; will prompt you to ask whether your changes should be applied first. </para>
 </note>
 
 </sect1>
 
 <sect1 id="configuration-modules">
-<title
->Configuration Modules</title>
+<title>Configuration Modules</title>
 
-<para
->Here is a brief overview of the major configuration modules categories: </para>
+<para>Here is a brief overview of the major configuration modules categories: </para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->File Browsing</guilabel
-></term>
+<term><guilabel>File Browsing</guilabel></term>
 <listitem>
-<para
->Contains options that relate to how you view the contents of your local system. </para>
+<para>Contains options that relate to how you view the contents of your local system. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Information</guilabel
-></term>
+<term><guilabel>Information</guilabel></term>
 <listitem>
-<para
->Contains modules that you normally can't use to change anything. They display useful information about your computer instead. </para>
+<para>Contains modules that you normally can't use to change anything. They display useful information about your computer instead. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Appearance &amp; Themes</guilabel
-></term>
+<term><guilabel>Appearance &amp; Themes</guilabel></term>
 <listitem>
-<para
->Here you find the modules that have the most visible effect on your environment: Colours, styles, window decorations. Nearly everything you see can be customised to suit your tastes, and the few things that can't be, soon will. </para>
+<para>Here you find the modules that have the most visible effect on your environment: Colours, styles, window decorations. Nearly everything you see can be customised to suit your tastes, and the few things that can't be, soon will. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Network</guilabel
-></term>
+<term><guilabel>Network</guilabel></term>
 <listitem>
-<para
->The place to configure how your computer sees the world outside, as well as how the world sees you. Among other things, you can set up central email identities that many &kde; applications can use, to save you having to enter the same information over and over, you can set up SOCKS firewall support, and you can configure &Windows; (<acronym
->SMB</acronym
->) shares... and much more. </para>
+<para>The place to configure how your computer sees the world outside, as well as how the world sees you. Among other things, you can set up central email identities that many &kde; applications can use, to save you having to enter the same information over and over, you can set up SOCKS firewall support, and you can configure &Windows; (<acronym>SMB</acronym>) shares... and much more. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Peripherals</guilabel
-></term>
+<term><guilabel>Peripherals</guilabel></term>
 <listitem>
-<para
->Contains settings for your keyboard and mouse, and for printers. </para>
+<para>Contains settings for your keyboard and mouse, and for printers. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Personalisation</guilabel
-></term>
+<term><guilabel>Personalisation</guilabel></term>
 <listitem>
-<para
->Here you can set up things that make your life easier, from accessibility features to localisation, so that &kde; applications know how you like to see numbers and dates formatted, for example. </para>
+<para>Here you can set up things that make your life easier, from accessibility features to localisation, so that &kde; applications know how you like to see numbers and dates formatted, for example. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Power Control</guilabel
-></term>
+<term><guilabel>Power Control</guilabel></term>
 <listitem>
-<para
->If your computer supports <acronym
->APM</acronym
-> power saving features, or you are using a laptop, this is the place to configure them. </para>
+<para>If your computer supports <acronym>APM</acronym> power saving features, or you are using a laptop, this is the place to configure them. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Sound</guilabel
-></term>
+<term><guilabel>Sound</guilabel></term>
 <listitem>
-<para
->Configure the sound daemon (&artsd;) and other audio behaviour. </para>
+<para>Configure the sound daemon (&artsd;) and other audio behaviour. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->System</guilabel
-></term>
+<term><guilabel>System</guilabel></term>
 <listitem>
-<para
->Here you can set the remaining system features - how the &konsole; and &tdm; applications behave, set up printing, and set your system date. You might not be able to set some of these options unless you are logged in as <systemitem class="username"
->root</systemitem
->, but &kcontrol; will let you know if this is the case. </para>
+<para>Here you can set the remaining system features - how the &konsole; and &tdm; applications behave, set up printing, and set your system date. You might not be able to set some of these options unless you are logged in as <systemitem class="username">root</systemitem>, but &kcontrol; will let you know if this is the case. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Web Browsing</guilabel
-></term>
+<term><guilabel>Web Browsing</guilabel></term>
 <listitem>
-<para
->With the Internet, and especially the web, being such an integral part of today's computer world, there are many options to be set to enhance your experience. You'll find them all here, from setting up custom style sheets, to proxies and caching. </para>
+<para>With the Internet, and especially the web, being such an integral part of today's computer world, there are many options to be set to enhance your experience. You'll find them all here, from setting up custom style sheets, to proxies and caching. </para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->Go ahead! Explore the configuration possibilities and discover the flexibility of &kde;. </para>
+<para>Go ahead! Explore the configuration possibilities and discover the flexibility of &kde;. </para>
 
 </sect1>
 </chapter>
 
 <chapter id="logging-out">
-<title
->Logging out</title>
-
-<para
->We sincerely hope that using &kde; gives you so much fun and pleasure that you never want to log out. But if you do, simply choose <menuchoice
-><guimenu
->TDE menu</guimenu
-> <guimenuitem
->Logout</guimenuitem
-></menuchoice
->. </para>
-
-<para
->There is also a logout button directly on the panel, which looks like a small power button. Or you can press <keycombo action="simul"
->&Ctrl; &Alt; <keycap
->Delete</keycap
-></keycombo
-> to log out. </para>
+<title>Logging out</title>
+
+<para>We sincerely hope that using &kde; gives you so much fun and pleasure that you never want to log out. But if you do, simply choose <menuchoice><guimenu>TDE menu</guimenu> <guimenuitem>Logout</guimenuitem></menuchoice>. </para>
+
+<para>There is also a logout button directly on the panel, which looks like a small power button. Or you can press <keycombo action="simul">&Ctrl; &Alt; <keycap>Delete</keycap></keycombo> to log out. </para>
 
 <sect1 id="session-management">
-<title
->Session Management</title>
-
-<para
->When you log out, &kde; can remember which applications you had open, as well as where all the windows were located, so that it can open them for you the next time you log in. This feature is termed <emphasis
->Session Management</emphasis
->. &kde;-aware applications will restore themselves to the state they were in when you logged out. For example, &kate; remembers which files you were editing. </para>
-
-<para
->Non-&kde; applications do not memorise their state on logout, and &kde; will warn you to make sure that you have saved any important data in them when you start to log out. </para>
-
-<para
->To illustrate session management, choose <menuchoice
-> <guimenu
->TDE menu</guimenu
-><guisubmenu
->Editors</guisubmenu
-> <guimenuitem
->Kate</guimenuitem
-> </menuchoice
-> to start &kate;. Open a text document to edit. Now log out and back in. You will observe that &kate; will be restored to the exact same position on the screen, including the right virtual desktop, and the document we left open in &kate; before we logged out is opened again automatically. &kate; will even remember whether you had unsaved changes to your document before you logged out and will save them to the file you were working on if you choose <guimenuitem
->Save</guimenuitem
-> from the <guimenu
->File</guimenu
-> menu. </para>
+<title>Session Management</title>
+
+<para>When you log out, &kde; can remember which applications you had open, as well as where all the windows were located, so that it can open them for you the next time you log in. This feature is termed <emphasis>Session Management</emphasis>. &kde;-aware applications will restore themselves to the state they were in when you logged out. For example, &kate; remembers which files you were editing. </para>
+
+<para>Non-&kde; applications do not memorise their state on logout, and &kde; will warn you to make sure that you have saved any important data in them when you start to log out. </para>
+
+<para>To illustrate session management, choose <menuchoice> <guimenu>TDE menu</guimenu><guisubmenu>Editors</guisubmenu> <guimenuitem>Kate</guimenuitem> </menuchoice> to start &kate;. Open a text document to edit. Now log out and back in. You will observe that &kate; will be restored to the exact same position on the screen, including the right virtual desktop, and the document we left open in &kate; before we logged out is opened again automatically. &kate; will even remember whether you had unsaved changes to your document before you logged out and will save them to the file you were working on if you choose <guimenuitem>Save</guimenuitem> from the <guimenu>File</guimenu> menu. </para>
 
 </sect1>
 </chapter>
 
 <chapter id="kde-an-exciting-journey">
-<title
->&kde;, an exciting Journey</title>
+<title>&kde;, an exciting Journey</title>
 
-<para
->We hope you enjoyed this brief tour of the K Desktop environment and that this unique desktop environment will help you get your work done faster and more comfortably than ever. </para>
+<para>We hope you enjoyed this brief tour of the K Desktop environment and that this unique desktop environment will help you get your work done faster and more comfortably than ever. </para>
 
-<para
->Please remember that the &kde; project is not a commercial venture, but rather a project run by volunteers from all over the world. We would like to invite you to join the &kde; project and become part of this unique network of people. If you are a programmer you might consider helping us write &kde; applications. If you are an artist or have experience with graphic design, consider creating icons sets, colour schemes, sound schemes and logos for &kde;. If you enjoy writing we would love for you to join our documentation project. </para>
+<para>Please remember that the &kde; project is not a commercial venture, but rather a project run by volunteers from all over the world. We would like to invite you to join the &kde; project and become part of this unique network of people. If you are a programmer you might consider helping us write &kde; applications. If you are an artist or have experience with graphic design, consider creating icons sets, colour schemes, sound schemes and logos for &kde;. If you enjoy writing we would love for you to join our documentation project. </para>
 
-<para
->As you can see there are many ways in which you can help. You are cordially invited to join this world-wide network of people dedicated to making &kde; the best desktop environment for any computer. Please visit <ulink url="http://www.kde.org"
->www.kde.org</ulink
-> for more information. </para>
+<para>As you can see there are many ways in which you can help. You are cordially invited to join this world-wide network of people dedicated to making &kde; the best desktop environment for any computer. Please visit <ulink url="http://www.kde.org">www.kde.org</ulink> for more information. </para>
 
 <para>
-<emphasis
->Welcome aboard on this exciting journey, </emphasis>
+<emphasis>Welcome aboard on this exciting journey, </emphasis>
 </para>
 <para>
-<literal
->Your &kde; Team</literal>
+<literal>Your &kde; Team</literal>
 </para>
 </chapter>
 
@@ -1357,26 +678,18 @@ printed on your default printer.</para
 Removed because it probably shouldn't be here, and it'll only end up
 getting out-of-date if it is (Phil)
 <chapter id="advanced-topics">
-<title
->Advanced Topics</title>
+<title>Advanced Topics</title>
 
 <sect1 id="mime">
-<title
->&MIME; Types</title>
+<title>&MIME; Types</title>
 
 <para>
 &kde; comes with a number of &MIME; types predefined, but you can add
 your own &MIME; types by choosing
-<menuchoice
-><guimenu
->Settings</guimenu>
-<guisubmenu
->Configure Konqueror...</guisubmenu>
-</menuchoice
-> and then <guilabel
->File
-Associations</guilabel
-> in a &konqueror; window.
+<menuchoice><guimenu>Settings</guimenu>
+<guisubmenu>Configure Konqueror...</guisubmenu>
+</menuchoice> and then <guilabel>File
+Associations</guilabel> in a &konqueror; window.
 </para>
 
 <para>
@@ -1389,8 +702,7 @@ click menu on the file in question.
 
 
 <procedure>
-<title
->To link a certain file type with a particular application:</title>
+<title>To link a certain file type with a particular application:</title>
 <step>
 <para>
 Make sure the application you want to start this file type has an
@@ -1399,47 +711,26 @@ entry in the &kmenu;.
 </step>
 
 <step>
-<para
->In &konqueror; find or make a file with the extension you wish to
+<para>In &konqueror; find or make a file with the extension you wish to
 link.
 </para>
-</step
-> 
+</step> 
 
 <step>
 <para>
-<mousebutton
->Right</mousebutton
-> click on the file, and choose
-<guimenuitem
->Edit File Type</guimenuitem
-> from the context menu, or
-choose <menuchoice
-><guimenu
->Edit</guimenu
-><guimenuitem
->Edit File
-Type</guimenuitem
-></menuchoice
-> in &konqueror;'s menu bar.
+<mousebutton>Right</mousebutton> click on the file, and choose
+<guimenuitem>Edit File Type</guimenuitem> from the context menu, or
+choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Edit File
+Type</guimenuitem></menuchoice> in &konqueror;'s menu bar.
 </para>
 </step>
 
-<step
-> <para
-> Add file masks for the application by clicking the
-<guibutton
->Add</guibutton
-> button, and entering the file pattern you
+<step> <para> Add file masks for the application by clicking the
+<guibutton>Add</guibutton> button, and entering the file pattern you
 want. Remember that &UNIX; is case sensitive, so you may need to add
-variations - <userinput
->*.mp3</userinput
-> may need
-<userinput
->*.MP3</userinput
-> added as well, for example.  Add as many
-extensions as you like in this way.  </para
-> </step>
+variations - <userinput>*.mp3</userinput> may need
+<userinput>*.MP3</userinput> added as well, for example.  Add as many
+extensions as you like in this way.  </para> </step>
 
 <step>
 <para>
@@ -1448,13 +739,8 @@ Add a description if you like.  This is optional.
 </step>
 
 <step>
-<para
->In the section labeled <guilabel
->Application Preference
-Order</guilabel
->, press the <guibutton
->Add</guibutton
-> button.  A
+<para>In the section labeled <guilabel>Application Preference
+Order</guilabel>, press the <guibutton>Add</guibutton> button.  A
 miniature copy of the &kmenu; will
 open, where you can choose the application you want files of this type
 to be opened with.
@@ -1468,32 +754,19 @@ file type.  For example, you might like to use &kate; to open text
 files you wish to edit, and &kedit; for text files that you just want
 to take a quick peek into.  You can add more applications in the same
 way as you did in the last step, and you can change the preferred
-order using the <guibutton
->Move Up</guibutton
-> and <guibutton
->Move
-Down</guibutton
-> buttons.
+order using the <guibutton>Move Up</guibutton> and <guibutton>Move
+Down</guibutton> buttons.
 </para>
-</step
-> 
+</step> 
 
 <step>
 <para>
 If you're satisfied with your choices, you can click the
-<guibutton
->Apply</guibutton
-> button to save your changes without
+<guibutton>Apply</guibutton> button to save your changes without
 closing the dialog box.  This gives you the opportunity to test in the
-<application
->Konqueror</application
-> window that your file association
-is correct.  You can choose <guibutton
->OK</guibutton
-> to save your
-changes and close the dialog box, or <guibutton
->Cancel</guibutton
-> if
+<application>Konqueror</application> window that your file association
+is correct.  You can choose <guibutton>OK</guibutton> to save your
+changes and close the dialog box, or <guibutton>Cancel</guibutton> if
 you have changed your mind and just want to close the dialog box.
 </para>
 </step>
@@ -1511,12 +784,9 @@ program needed to edit it should start.
 be used to using file extensions for that purpose, and you may know
 that on &UNIX; systems the file extension often bears little or no
 relation to the contents of the file.  On the other hand, it may be
-vital - for example, some implementations of <command
->gunzip</command>
+vital - for example, some implementations of <command>gunzip</command>
 won't operate on files that aren't named <literal
-role="extension"
->.gz</literal
->.
+role="extension">.gz</literal>.
 </para>
 
 <para>
@@ -1526,19 +796,9 @@ like.  For example, if you always want to open any files relating to a
 particular client with &kate;,  and you make a habit of naming the files
 with the client's name at the beginning so that they naturally group in
 the &konqueror; window, then you can set up a filename pattern that
-matches <literal
->^<replaceable
->clientname</replaceable
->*</literal
->.
-Then any files that have <replaceable
->clientname</replaceable
-> at the
-beginning (the <token
->^</token
-> character means <quote
->starts with...</quote
->) and
+matches <literal>^<replaceable>clientname</replaceable>*</literal>.
+Then any files that have <replaceable>clientname</replaceable> at the
+beginning (the <token>^</token> character means <quote>starts with...</quote>) and
 without any regard to the rest of the filename. 
 </para>
 </note>
@@ -1548,62 +808,21 @@ without any regard to the rest of the filename.
 </chapter>
 -->
 <chapter id="credits">
-<title
->Credits</title>
+<title>Credits</title>
 <sect1 id="authors">
-<title
->Authors</title>
+<title>Authors</title>
 
 <itemizedlist>
-<listitem
-><para
->Matthias Ettrich <email
->ettrich@kde.org</email
-></para
-></listitem>
-<listitem
-><para
->Kalle Dahlheimer <email
->kalle@kde.org</email
-></para
-></listitem>
-<listitem
-><para
->Torben Weiss <email
->weis@kde.org</email
-></para
-></listitem>
-<listitem
-><para
->Bernd Wuebben <email
->wuebben@kde.org</email
-></para
-></listitem>
-<listitem
-><para
->Stephen Schaub <email
->sschaub@bju.edu</email
-> - Editor</para
-></listitem>
-<listitem
-><para
->Robert Williams <email
->rwilliams@kde.org</email
-> - Editor</para
-></listitem>
-<listitem
-><para
->Lauri Watts <email
->lauri@kde.org</email
-></para
-></listitem>
+<listitem><para>Matthias Ettrich <email>ettrich@kde.org</email></para></listitem>
+<listitem><para>Kalle Dahlheimer <email>kalle@kde.org</email></para></listitem>
+<listitem><para>Torben Weiss <email>weis@kde.org</email></para></listitem>
+<listitem><para>Bernd Wuebben <email>wuebben@kde.org</email></para></listitem>
+<listitem><para>Stephen Schaub <email>sschaub@bju.edu</email> - Editor</para></listitem>
+<listitem><para>Robert Williams <email>rwilliams@kde.org</email> - Editor</para></listitem>
+<listitem><para>Lauri Watts <email>lauri@kde.org</email></para></listitem>
 </itemizedlist>
 
-<para
->Conversion to British English: Malcolm Hunter <email
->malcolm.hunter@gmx.co.uk</email
-></para
-> 
+<para>Conversion to British English: Malcolm Hunter <email>malcolm.hunter@gmx.co.uk</email></para> 
 &underFDL; </sect1>
 </chapter>
 </book>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdedebugdialog/index.docbook b/tde-i18n-en_GB/docs/tdebase/tdedebugdialog/index.docbook
index da8a975e139..c2bdb328b71 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdedebugdialog/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdedebugdialog/index.docbook
@@ -1,194 +1,89 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
-  <!ENTITY tdedebugdialog "<application
->TDEDebugDialog</application
->">
+  <!ENTITY tdedebugdialog "<application>TDEDebugDialog</application>">
   <!ENTITY kappname "&tdedebugdialog;">
   <!ENTITY % addindex "IGNORE">
-  <!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+  <!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
   
   
 ]>
 
 <book lang="&language;">
 <bookinfo>
-<title
->The &tdedebugdialog; Handbook</title>
+<title>The &tdedebugdialog; Handbook</title>
 
 <authorgroup>
-<author
->&David.Faure; &David.Faure.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&David.Faure; &David.Faure.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2001-02-13</date>
-<releaseinfo
->0.03.00</releaseinfo>
+<date>2001-02-13</date>
+<releaseinfo>0.03.00</releaseinfo>
 
 <abstract>
-<para
->This document describes &tdedebugdialog;.</para>
+<para>This document describes &tdedebugdialog;.</para>
 </abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->TDEDebugdialog</keyword>
+<keyword>KDE</keyword>
+<keyword>TDEDebugdialog</keyword>
 </keywordset>
 </bookinfo>
 
 <chapter id="Introduction">
-<title
->What is TDEDebugDialog?</title>
-
-<para
->It is a dialogue box for managing diagnostic messages at runtime. </para>
-
-<para
->If you simply start <command
->tdedebugdialog</command
->, you will see a list of <quote
->areas</quote
->, that can be disabled or enabled. A <function
->kdDebug(area)</function
-> call in the code will show something in the debug output only if the area is enabled.</para>
-
-<note
-><para
->Note that kdWarning, kdError and kdFatal always appear, they are NOT controlled by this setting. </para
-></note>
+<title>What is TDEDebugDialog?</title>
+
+<para>It is a dialogue box for managing diagnostic messages at runtime. </para>
+
+<para>If you simply start <command>tdedebugdialog</command>, you will see a list of <quote>areas</quote>, that can be disabled or enabled. A <function>kdDebug(area)</function> call in the code will show something in the debug output only if the area is enabled.</para>
+
+<note><para>Note that kdWarning, kdError and kdFatal always appear, they are NOT controlled by this setting. </para></note>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Area</guilabel
-></term>
+<term><guilabel>Area</guilabel></term>
 <listitem>
-<para
->The areas which should only be output. Every message that is not mentioned here will simply not be output (unless this field remains empty, which is the default, and means that all messages should be output). You can enter several areas separated by commas here, and you can also use area ranges with the syntax start-end. Thus a valid entry could be: 117,214-289,356-359,221. Do not use whitespaces.</para>
+<para>The areas which should only be output. Every message that is not mentioned here will simply not be output (unless this field remains empty, which is the default, and means that all messages should be output). You can enter several areas separated by commas here, and you can also use area ranges with the syntax start-end. Thus a valid entry could be: 117,214-289,356-359,221. Do not use whitespaces.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->If you start <command
->tdedebugdialog</command
-> <option
->--fullmode</option
->, then for every severity level you can define separately what should be done with the diagnostic messages of that level, and the same for each debug area.</para>
+<para>If you start <command>tdedebugdialog</command> <option>--fullmode</option>, then for every severity level you can define separately what should be done with the diagnostic messages of that level, and the same for each debug area.</para>
 
-<para
->In full mode, first you should select the debug area you are interested in from the drop down list at the top.</para>
+<para>In full mode, first you should select the debug area you are interested in from the drop down list at the top.</para>
 
-<para
->You may independently set the output for various types of messages:</para>
+<para>You may independently set the output for various types of messages:</para>
 
 <itemizedlist>
-<listitem
-><para
-><guilabel
->Information</guilabel
-></para
-></listitem>
-<listitem
-><para
-><guilabel
->Warning</guilabel
-></para
-></listitem>
-<listitem
-><para
-><guilabel
->Error</guilabel
-></para
-></listitem>
-<listitem
-><para
-><guilabel
->Fatal Error</guilabel
-></para
-></listitem>
+<listitem><para><guilabel>Information</guilabel></para></listitem>
+<listitem><para><guilabel>Warning</guilabel></para></listitem>
+<listitem><para><guilabel>Error</guilabel></para></listitem>
+<listitem><para><guilabel>Fatal Error</guilabel></para></listitem>
 </itemizedlist>
 
-<para
->For each of these types, you can set the following:</para>
+<para>For each of these types, you can set the following:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Output to:</guilabel
-></term>
+<term><guilabel>Output to:</guilabel></term>
 <listitem>
-<para
->In this Combobox, you can choose where the messages should be output. The choices are: <quote
->File</quote
->, <quote
->Message Box</quote
->, <quote
->Shell</quote
-> (meaning stderr) and <quote
->Syslog</quote
->. Please do not direct fatal messages to syslog unless you are the system administrator yourself. The default is <quote
->Message Box</quote
->.</para
-> 
+<para>In this Combobox, you can choose where the messages should be output. The choices are: <quote>File</quote>, <quote>Message Box</quote>, <quote>Shell</quote> (meaning stderr) and <quote>Syslog</quote>. Please do not direct fatal messages to syslog unless you are the system administrator yourself. The default is <quote>Message Box</quote>.</para> 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Filename:</guilabel
-></term>
-<listitem
-><para
->This is only enabled when you have chosen <quote
->File</quote
-> as the output and provides the name of that file (which is interpreted as relative to the current folder). The default is <filename
->kdebug.dbg</filename
->.</para>
+<term><guilabel>Filename:</guilabel></term>
+<listitem><para>This is only enabled when you have chosen <quote>File</quote> as the output and provides the name of that file (which is interpreted as relative to the current folder). The default is <filename>kdebug.dbg</filename>.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->Apart from this, you can also tick the checkbox <guilabel
->Abort on fatal errors</guilabel
->. In this case, if a diagnostic message with the severity level <computeroutput
->KDEBUG_FATAL</computeroutput
-> is output, the application aborts with a SIGABRT after outputting the message.</para>
-
-<para
->When you close the dialogue by pressing <guibutton
->OK</guibutton
->, your entries apply immediately and are saved in <filename
->kdebugrc</filename
->. When you press <guibutton
->Cancel</guibutton
->, your entries are discarded and the old ones are restored.</para>
-
-<para
->Credits to Kalle Dalheimer for the original version of &tdedebugdialog;</para>
+<para>Apart from this, you can also tick the checkbox <guilabel>Abort on fatal errors</guilabel>. In this case, if a diagnostic message with the severity level <computeroutput>KDEBUG_FATAL</computeroutput> is output, the application aborts with a SIGABRT after outputting the message.</para>
+
+<para>When you close the dialogue by pressing <guibutton>OK</guibutton>, your entries apply immediately and are saved in <filename>kdebugrc</filename>. When you press <guibutton>Cancel</guibutton>, your entries are discarded and the old ones are restored.</para>
+
+<para>Credits to Kalle Dalheimer for the original version of &tdedebugdialog;</para>
 
 </chapter>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/audiocd.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/audiocd.docbook
index 10008a8b8c7..de9a9d33c62 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/audiocd.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/audiocd.docbook
@@ -1,291 +1,112 @@
 <article lang="&language;" id="audiocd">
-<title
->audiocd</title>
+<title>audiocd</title>
 <articleinfo>
 <authorgroup>
-<author
->&Rik.Hemsley; &Rik.Hemsley.mail; </author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Rik.Hemsley; &Rik.Hemsley.mail; </author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2001-07-14</date>
-<releaseinfo
->2.20.00</releaseinfo>
+<date>2001-07-14</date>
+<releaseinfo>2.20.00</releaseinfo>
 
 </articleinfo>
 
-<para
->Allows treating audio <acronym
->CD</acronym
->s like a <quote
->real</quote
-> filesystem, where tracks are represented as files and, when copied from the folder, are digitally extracted from the <acronym
->CD</acronym
->. This ensures a perfect copy of the audio data.</para>
+<para>Allows treating audio <acronym>CD</acronym>s like a <quote>real</quote> filesystem, where tracks are represented as files and, when copied from the folder, are digitally extracted from the <acronym>CD</acronym>. This ensures a perfect copy of the audio data.</para>
 
-<para
->To see how this slave works, insert an audio <acronym
->CD</acronym
-> in your &CD-ROM; drive and type <userinput
->audiocd:/</userinput
-> into &konqueror;. Within a few seconds you should see a list of tracks and some folders.</para>
+<para>To see how this slave works, insert an audio <acronym>CD</acronym> in your &CD-ROM; drive and type <userinput>audiocd:/</userinput> into &konqueror;. Within a few seconds you should see a list of tracks and some folders.</para>
 
-<para
->Audio <acronym
->CD</acronym
->s don't really have folders, but the audiocd slave provides them as a convenience. If you look inside these folders you will see that they all contain the same number of tracks. If you are connected to the Internet, some folders will have the actual track titles shown as the filenames.</para>
+<para>Audio <acronym>CD</acronym>s don't really have folders, but the audiocd slave provides them as a convenience. If you look inside these folders you will see that they all contain the same number of tracks. If you are connected to the Internet, some folders will have the actual track titles shown as the filenames.</para>
 
-<para
->The reason that these separate folders exist are so that you can choose in which format you would like to listen to (or copy) the tracks on the <acronym
->CD</acronym
->.</para>
+<para>The reason that these separate folders exist are so that you can choose in which format you would like to listen to (or copy) the tracks on the <acronym>CD</acronym>.</para>
 
-<para
->If you drag a track from the <filename class="directory"
->Ogg Vorbis</filename
-> folder and drop it on another &konqueror; window open at your home folder, you should see a progress window showing you that the track is being extracted from the <acronym
->CD</acronym
-> and saved to a file. Note that Ogg Vorbis is a compressed format, so the file in your home folder will appear a great deal smaller than it would have been if you had copied the raw data.</para>
+<para>If you drag a track from the <filename class="directory">Ogg Vorbis</filename> folder and drop it on another &konqueror; window open at your home folder, you should see a progress window showing you that the track is being extracted from the <acronym>CD</acronym> and saved to a file. Note that Ogg Vorbis is a compressed format, so the file in your home folder will appear a great deal smaller than it would have been if you had copied the raw data.</para>
 
-<para
->The mechanism behind this is quite simple. When the audiocd slave is asked to retrieve a track from the <filename class="directory"
->Ogg Vorbis</filename
-> folder, it starts extracting the digital audio data from the <acronym
->CD</acronym
->. As it sends the data over to the file in your home folder, it simultaneously encodes it in Ogg Vorbis format (<acronym
->CD</acronym
-> audio is in an uncompressed format to start with).</para>
+<para>The mechanism behind this is quite simple. When the audiocd slave is asked to retrieve a track from the <filename class="directory">Ogg Vorbis</filename> folder, it starts extracting the digital audio data from the <acronym>CD</acronym>. As it sends the data over to the file in your home folder, it simultaneously encodes it in Ogg Vorbis format (<acronym>CD</acronym> audio is in an uncompressed format to start with).</para>
 
-<para
->You could also try dragging a file ending in <literal role="extension"
->.wav</literal
-> and dropping it on the &kde; Media Player, &noatun;. In this case, the procedure that happens behind the scenes is similar, except that instead of encoding the audio data in Ogg Vorbis format, it is put through a very simple conversion, from raw binary data (which the <literal role="extension"
->.cda</literal
-> files in the toplevel folder represent) to <quote
->RIFF WAV</quote
-> format, a non-compressed format that most media players understand.</para>
+<para>You could also try dragging a file ending in <literal role="extension">.wav</literal> and dropping it on the &kde; Media Player, &noatun;. In this case, the procedure that happens behind the scenes is similar, except that instead of encoding the audio data in Ogg Vorbis format, it is put through a very simple conversion, from raw binary data (which the <literal role="extension">.cda</literal> files in the toplevel folder represent) to <quote>RIFF WAV</quote> format, a non-compressed format that most media players understand.</para>
 
-<para
->&noatun; should quite happily play the <literal role="extension"
->.wav</literal
-> file, but if it has trouble, you may consider using the <option
->paranoia_level</option
-> option, explained below.</para>
+<para>&noatun; should quite happily play the <literal role="extension">.wav</literal> file, but if it has trouble, you may consider using the <option>paranoia_level</option> option, explained below.</para>
 
 <variablelist>
-<title
->Options</title>
+<title>Options</title>
 <varlistentry>
-<term
-><option
->device</option
-></term>
+<term><option>device</option></term>
 <listitem>
-<para
->Set the path to the audio <acronym
->CD</acronym
-> device, &eg; <userinput
->audiocd:/<option
->?device</option
->=<parameter
->/dev/sdc</parameter
-></userinput
->. Normally, the slave will try to find a <acronym
->CD</acronym
-> drive with an audio <acronym
->CD</acronym
-> inserted, but if it fails or you have more than one <acronym
->CD</acronym
-> drive, you may want to try this option. Note that the configuration dialogue allows you to set a default value for this option.</para>
+<para>Set the path to the audio <acronym>CD</acronym> device, &eg; <userinput>audiocd:/<option>?device</option>=<parameter>/dev/sdc</parameter></userinput>. Normally, the slave will try to find a <acronym>CD</acronym> drive with an audio <acronym>CD</acronym> inserted, but if it fails or you have more than one <acronym>CD</acronym> drive, you may want to try this option. Note that the configuration dialogue allows you to set a default value for this option.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><option
->paranoia_level</option
-></term>
+<term><option>paranoia_level</option></term>
 <listitem>
-<para
->Set the amount of error detection and correction used when extracting data.</para>
+<para>Set the amount of error detection and correction used when extracting data.</para>
 
 <variablelist>
 <varlistentry>
-<term
->Level 0</term>
+<term>Level 0</term>
 <listitem>
-<para
->No detection or correction. Only useful if you have a perfect <acronym
->CD</acronym
-> drive (unlikely).</para>
+<para>No detection or correction. Only useful if you have a perfect <acronym>CD</acronym> drive (unlikely).</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Level 1</term>
+<term>Level 1</term>
 <listitem>
-<para
->Enable basic error checking and correction.</para>
+<para>Enable basic error checking and correction.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Level 2</term>
+<term>Level 2</term>
 <listitem>
-<para
->Default. Specifies that only a perfect extraction will be accepted.</para>
+<para>Default. Specifies that only a perfect extraction will be accepted.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->Note that there is a disadvantage to level 2. Extraction can be very slow, so real-time digital playback may not work properly. If you have a good quality <acronym
->CD</acronym
-> drive (note that more expensive does not necessarily mean better quality) then you probably won't experience very slow extraction, but a poor drive may take days (!) to extract the audio from one <acronym
->CD</acronym
->.</para>
+<para>Note that there is a disadvantage to level 2. Extraction can be very slow, so real-time digital playback may not work properly. If you have a good quality <acronym>CD</acronym> drive (note that more expensive does not necessarily mean better quality) then you probably won't experience very slow extraction, but a poor drive may take days (!) to extract the audio from one <acronym>CD</acronym>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><option
->use_cddb</option
-></term>
+<term><option>use_cddb</option></term>
 <listitem>
 
-<para
->Specify that track names for the inserted <acronym
->CD</acronym
-> will be looked up on the Internet <acronym
->CD</acronym
-> Database. Audio <acronym
->CD</acronym
->s don't have track names, but the Internet <acronym
->CD</acronym
-> Database is a clever system which uses a special unique identifier generated from the number and length of tracks on each <acronym
->CD</acronym
-> to cross-reference a track listing. Track listings are contributed by the Internet community and made available to all.</para>
+<para>Specify that track names for the inserted <acronym>CD</acronym> will be looked up on the Internet <acronym>CD</acronym> Database. Audio <acronym>CD</acronym>s don't have track names, but the Internet <acronym>CD</acronym> Database is a clever system which uses a special unique identifier generated from the number and length of tracks on each <acronym>CD</acronym> to cross-reference a track listing. Track listings are contributed by the Internet community and made available to all.</para>
 
-<para
->You can submit your own track listings using &kscd;, the &kde; <acronym
->CD</acronym
-> player.</para>
+<para>You can submit your own track listings using &kscd;, the &kde; <acronym>CD</acronym> player.</para>
 
-<para
->This option is on by default. If your Internet connection is not set up correctly, you may find that your <acronym
->CD</acronym
-> tracks don't appear. In this case, you can try <userinput
->audiocd:/?<option
->use_cddb</option
->=<parameter
->0</parameter
-></userinput
-> to switch this option off.</para>
+<para>This option is on by default. If your Internet connection is not set up correctly, you may find that your <acronym>CD</acronym> tracks don't appear. In this case, you can try <userinput>audiocd:/?<option>use_cddb</option>=<parameter>0</parameter></userinput> to switch this option off.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><option
->cddb_server</option
-></term>
+<term><option>cddb_server</option></term>
 <listitem>
-<para
->Set the Internet <acronym
->CD</acronym
-> Database server to contact. By default, this is <systemitem
->freedb.freedb.org:888</systemitem
->, which means server <systemitem
->freedb.freedb.org</systemitem
-> at port 888.</para>
+<para>Set the Internet <acronym>CD</acronym> Database server to contact. By default, this is <systemitem>freedb.freedb.org:888</systemitem>, which means server <systemitem>freedb.freedb.org</systemitem> at port 888.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
 <variablelist>
-<title
->Examples</title>
+<title>Examples</title>
 <varlistentry>
-<term
-><userinput
->audiocd:/?device=/dev/scd0&amp;paranoia_level=0&amp;use_cddb=0</userinput
-></term>
+<term><userinput>audiocd:/?device=/dev/scd0&amp;paranoia_level=0&amp;use_cddb=0</userinput></term>
 <listitem>
-<para
->Gives a listing of the tracks on the audio <acronym
->CD</acronym
-> inserted in <filename class="devicefile"
->/dev/scd0</filename
->, which on &Linux; specifies the first <acronym
->SCSI</acronym
-> &CD-ROM; device. If you copy tracks from the <acronym
->CD</acronym
->, digital extraction will be performed without error correction or detection. No Internet <acronym
->CD</acronym
-> Database will be contacted.</para>
+<para>Gives a listing of the tracks on the audio <acronym>CD</acronym> inserted in <filename class="devicefile">/dev/scd0</filename>, which on &Linux; specifies the first <acronym>SCSI</acronym> &CD-ROM; device. If you copy tracks from the <acronym>CD</acronym>, digital extraction will be performed without error correction or detection. No Internet <acronym>CD</acronym> Database will be contacted.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
 <qandaset>
-<title
->Frequently Asked Question</title>
+<title>Frequently Asked Question</title>
 <qandaentry>
 <question>
-<para
->I get <errorname
->The file or folder / does not exist</errorname
->. How do I fix that? I have an audio <acronym
->CD</acronym
-> in my drive!</para>
+<para>I get <errorname>The file or folder / does not exist</errorname>. How do I fix that? I have an audio <acronym>CD</acronym> in my drive!</para>
 </question>
 
 <answer>
-<para
->Try running <userinput
-><command
->cdparanoia</command
-> <option
->-vsQ</option
-></userinput
-> as yourself (not <systemitem class="username"
->root</systemitem
->). Do you see a track list? If not, make sure you have permission to access the <acronym
->CD</acronym
-> device. If you're using <acronym
->SCSI</acronym
-> emulation (possible if you have an <acronym
->IDE</acronym
-> <acronym
->CD</acronym
-> writer) then make sure you check that you have read and write permissions on the generic <acronym
->SCSI</acronym
-> device, which is probably <filename class="devicefile"
->/dev/sg0</filename
->, <filename class="devicefile"
->/dev/sg1</filename
->, &etc;. If it still doesn't work, try typing <userinput
->audiocd:/?device=/dev/sg0</userinput
-> (or similar) to tell tdeio_audiocd which device your &CD-ROM; is.</para
-> 
+<para>Try running <userinput><command>cdparanoia</command> <option>-vsQ</option></userinput> as yourself (not <systemitem class="username">root</systemitem>). Do you see a track list? If not, make sure you have permission to access the <acronym>CD</acronym> device. If you're using <acronym>SCSI</acronym> emulation (possible if you have an <acronym>IDE</acronym> <acronym>CD</acronym> writer) then make sure you check that you have read and write permissions on the generic <acronym>SCSI</acronym> device, which is probably <filename class="devicefile">/dev/sg0</filename>, <filename class="devicefile">/dev/sg1</filename>, &etc;. If it still doesn't work, try typing <userinput>audiocd:/?device=/dev/sg0</userinput> (or similar) to tell tdeio_audiocd which device your &CD-ROM; is.</para> 
 </answer>
 </qandaentry>
 </qandaset>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/bzip.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/bzip.docbook
index 422781d17ec..f3097629509 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/bzip.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/bzip.docbook
@@ -1,46 +1,18 @@
 <article lang="&language;" id="bzip">
-<title
->bzip</title>
+<title>bzip</title>
 <articleinfo>
 <authorgroup>
-<author
->&Lauri.Watts; &Lauri.Watts.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Lauri.Watts; &Lauri.Watts.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
 
-<para
-><command
->bzip</command
-> is a compression program. It is rarely used today, having been replaced with bzip2, which offers much better compression.</para>
+<para><command>bzip</command> is a compression program. It is rarely used today, having been replaced with bzip2, which offers much better compression.</para>
 
-<para
->The bzip tdeioslave is not directly usable, and is intended for use as a filter. For example, the tar tdeioslave can filter a file through the bzip tdeioslave, in order to display the contents of a <literal role="extension"
->tar.bz</literal
-> file directly in a &konqueror; window.</para>
+<para>The bzip tdeioslave is not directly usable, and is intended for use as a filter. For example, the tar tdeioslave can filter a file through the bzip tdeioslave, in order to display the contents of a <literal role="extension">tar.bz</literal> file directly in a &konqueror; window.</para>
 
-<para
->If you click on a file compressed with a <literal role="extension"
->bz</literal
-> extension in &konqueror;, this tdeioslave is used to uncompress it and display it as a normal (uncompressed) file.</para>
+<para>If you click on a file compressed with a <literal role="extension">bz</literal> extension in &konqueror;, this tdeioslave is used to uncompress it and display it as a normal (uncompressed) file.</para>
 
-<para
->If you are a developer, and would like to use the bzip filter, you can find documentation on using tdeioslaves at <ulink url="http://developer.kde.org"
->http://developer.kde.org</ulink
-></para>
+<para>If you are a developer, and would like to use the bzip filter, you can find documentation on using tdeioslaves at <ulink url="http://developer.kde.org">http://developer.kde.org</ulink></para>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/bzip2.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/bzip2.docbook
index 7c510be806c..8349e4cde52 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/bzip2.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/bzip2.docbook
@@ -1,49 +1,20 @@
 <article lang="&language;" id="bzip2">
-<title
->bzip2</title>
+<title>bzip2</title>
 <articleinfo>
 <authorgroup>
-<author
->&Lauri.Watts; &Lauri.Watts.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Lauri.Watts; &Lauri.Watts.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
 
-<para
->Bzip2 is a compression program</para>
+<para>Bzip2 is a compression program</para>
 
-<para
->The bzip2 tdeioslave is not directly usable, and is intended for use as a filter. For example, the tar tdeioslave can filter a file through the bzip2 tdeioslave, in order to display the contents of a <literal role="extension"
->tar.bz2</literal
-> file directly in a &konqueror; window.</para>
+<para>The bzip2 tdeioslave is not directly usable, and is intended for use as a filter. For example, the tar tdeioslave can filter a file through the bzip2 tdeioslave, in order to display the contents of a <literal role="extension">tar.bz2</literal> file directly in a &konqueror; window.</para>
 
-<para
->If you click on a file compressed with a <literal role="extension"
->.bz2</literal
-> in &konqueror;, this tdeioslave is used to uncompress it and display it as a normal (uncompressed) file.</para>
+<para>If you click on a file compressed with a <literal role="extension">.bz2</literal> in &konqueror;, this tdeioslave is used to uncompress it and display it as a normal (uncompressed) file.</para>
 
-<para
->If you are a developer, and would like to use the bzip2 filter, you can find documentation on using tdeioslaves at <ulink url="http://developer.kde.org"
->http://developer.kde.org</ulink
-></para>
+<para>If you are a developer, and would like to use the bzip2 filter, you can find documentation on using tdeioslaves at <ulink url="http://developer.kde.org">http://developer.kde.org</ulink></para>
 
-<para
->See the manual: <ulink url="man:/bzip2"
->bzip2</ulink
->. </para>
+<para>See the manual: <ulink url="man:/bzip2">bzip2</ulink>. </para>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/cgi.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/cgi.docbook
index b51eae877e8..4d03bd4a59c 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/cgi.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/cgi.docbook
@@ -1,46 +1,14 @@
 <article lang="&language;" id="cgi">
-<title
->cgi</title>
+<title>cgi</title>
 <articleinfo>
 <authorgroup>
-<author
->&Lauri.Watts;&Lauri.Watts.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Lauri.Watts;&Lauri.Watts.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
 
-<para
->The <acronym
->CGI</acronym
-> slave provides a way to execute <acronym
->CGI</acronym
-> programs without the need to have a running web server. This can for example be used for local testing of <acronym
->CGI</acronym
-> programs or for using search engines that only provide a <acronym
->CGI</acronym
-> frontend like the one from <application
->Doxygen</application
->.</para>
+<para>The <acronym>CGI</acronym> slave provides a way to execute <acronym>CGI</acronym> programs without the need to have a running web server. This can for example be used for local testing of <acronym>CGI</acronym> programs or for using search engines that only provide a <acronym>CGI</acronym> frontend like the one from <application>Doxygen</application>.</para>
 
-<para
->The slave implements the <command
->cgi:</command
-> protocol. It uses the filename from the given &URL; and searches a configurable list of folders. If it finds an executable with the given name it executes it, passes the arguments of the &URL; and sets the environment variables needed by <acronym
->CGI</acronym
-> programs.</para>
+<para>The slave implements the <command>cgi:</command> protocol. It uses the filename from the given &URL; and searches a configurable list of folders. If it finds an executable with the given name it executes it, passes the arguments of the &URL; and sets the environment variables needed by <acronym>CGI</acronym> programs.</para>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/data.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/data.docbook
index fe7f3908dda..39c460755f5 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/data.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/data.docbook
@@ -1,75 +1,26 @@
 <article lang="&language;" id="data">
-<title
->Data URLs</title>
+<title>Data URLs</title>
 
 <articleinfo>
 <authorgroup>
-<author
-><personname
-><firstname
->Leo</firstname
-><surname
->Savernik</surname
-></personname
-> <address
-><email
->l.savernik@aon.at</email
-></address
-> </author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author><personname><firstname>Leo</firstname><surname>Savernik</surname></personname> <address><email>l.savernik@aon.at</email></address> </author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2003-02-06</date>
-<!--releaseinfo
->2.20.00</releaseinfo-->
+<date>2003-02-06</date>
+<!--releaseinfo>2.20.00</releaseinfo-->
 
 </articleinfo>
 
-<para
->Data URLs allow small document data to be included in the URL itself. This is useful for very small HTML testcases or other occasions that do not justify a document of their own.</para>
+<para>Data URLs allow small document data to be included in the URL itself. This is useful for very small HTML testcases or other occasions that do not justify a document of their own.</para>
 
-<para
-><userinput
->data:,foobar</userinput
-> (note the comma after the colon) will deliver a text document that contains nothing but <literal
->foobar</literal
-> </para>
+<para><userinput>data:,foobar</userinput> (note the comma after the colon) will deliver a text document that contains nothing but <literal>foobar</literal> </para>
 
-<para
->The last example delivered a text document. For HTML documents one has to specify the MIME type <literal
->text/html</literal
->: <userinput
->data:text/html,&lt;title&gt;Testcase&lt;/title&gt;&lt;p&gt;This is a testcase&lt;/p&gt;</userinput
->. This will produce exactly the same output as if the content had been loaded from a document of its own. </para>
+<para>The last example delivered a text document. For HTML documents one has to specify the MIME type <literal>text/html</literal>: <userinput>data:text/html,&lt;title&gt;Testcase&lt;/title&gt;&lt;p&gt;This is a testcase&lt;/p&gt;</userinput>. This will produce exactly the same output as if the content had been loaded from a document of its own. </para>
 
-<para
->Specifying alternate character sets is also possible. Note that 8-Bit characters have to be escaped by a percentage sign and their two-digit hexadecimal codes: <userinput
->data:;charset=iso-8859-1,Gr%FC%DFe aus Schl%E4gl</userinput
-> results in <literal
->Gr&uuml;&szlig;e aus Schl&auml;gl</literal
-> whereas omitting the charset attribute might lead to something like <literal
->Gr??e aus Schl?gl</literal
-> </para>
+<para>Specifying alternate character sets is also possible. Note that 8-Bit characters have to be escaped by a percentage sign and their two-digit hexadecimal codes: <userinput>data:;charset=iso-8859-1,Gr%FC%DFe aus Schl%E4gl</userinput> results in <literal>Gr&uuml;&szlig;e aus Schl&auml;gl</literal> whereas omitting the charset attribute might lead to something like <literal>Gr??e aus Schl?gl</literal> </para>
 
-<para
-><ulink url="http://www.ietf.org/rfc/rfc2397.txt"
->IETF RFC2397</ulink
-> provides more information.</para>
+<para><ulink url="http://www.ietf.org/rfc/rfc2397.txt">IETF RFC2397</ulink> provides more information.</para>
 
 </article>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/file.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/file.docbook
index b4f6c3fcea3..d9e9c33824d 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/file.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/file.docbook
@@ -1,37 +1,13 @@
 <article lang="&language;" id="file">
-<title
->file</title>
+<title>file</title>
 <articleinfo>
 <authorgroup>
-<author
->&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
 
-<para
->The <emphasis
->file</emphasis
-> protocol is used by all &kde; applications to display locally available files. </para>
-<para
->Entering <userinput
-><command
->file:/directoryname</command
-></userinput
-> in &konqueror; lists the files of this folder. </para>
+<para>The <emphasis>file</emphasis> protocol is used by all &kde; applications to display locally available files. </para>
+<para>Entering <userinput><command>file:/directoryname</command></userinput> in &konqueror; lists the files of this folder. </para>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/finger.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/finger.docbook
index 50d791cf561..179ae3c8826 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/finger.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/finger.docbook
@@ -1,61 +1,24 @@
 <article lang="&language;" id="finger">
-<title
->finger</title>
+<title>finger</title>
 <articleinfo>
 <authorgroup>
-<author
->&Lauri.Watts;&Lauri.Watts.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Lauri.Watts;&Lauri.Watts.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
 
-<para
->Finger is a program to display information about users.</para>
-
-<para
->If finger is enabled on the remote machine, you may be given information on the user's real name, if they are currently logged in, if they have mail and the text of their <filename
->.plan</filename
-> file in their home folder.</para>
-
-<para
->Finger is normally associated with a user@hostname address, which may or may not be the same as a users email address.</para>
-
-<para
->Most Internet Service Providers no longer allow finger access, so, you may find that you get no useful answer for most people.</para>
-
-<para
->Other people use their local <filename
->.plan</filename
-> file to hold such information as <acronym
->PGP</acronym
-> keys, the fact they are on vacation, and all sorts of information.</para>
-
-<para
->Use the finger tdeioslave like this: <userinput
->finger://<replaceable
->username</replaceable
->@<replaceable
->hostname</replaceable
-></userinput
-></para>
-
-<para
->See the manual: <ulink url="man:/finger"
->finger</ulink
->. </para>
+<para>Finger is a program to display information about users.</para>
+
+<para>If finger is enabled on the remote machine, you may be given information on the user's real name, if they are currently logged in, if they have mail and the text of their <filename>.plan</filename> file in their home folder.</para>
+
+<para>Finger is normally associated with a user@hostname address, which may or may not be the same as a users email address.</para>
+
+<para>Most Internet Service Providers no longer allow finger access, so, you may find that you get no useful answer for most people.</para>
+
+<para>Other people use their local <filename>.plan</filename> file to hold such information as <acronym>PGP</acronym> keys, the fact they are on vacation, and all sorts of information.</para>
+
+<para>Use the finger tdeioslave like this: <userinput>finger://<replaceable>username</replaceable>@<replaceable>hostname</replaceable></userinput></para>
+
+<para>See the manual: <ulink url="man:/finger">finger</ulink>. </para>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/fish.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/fish.docbook
index 21173bcbe61..d4925e3ccc9 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/fish.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/fish.docbook
@@ -1,110 +1,22 @@
 <article lang="&language;" id="fish">
-<title
->fish</title>
+<title>fish</title>
 <articleinfo>
 <authorgroup>
-<author
->&Joerg.Walter; &Joerg.Walter.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Joerg.Walter; &Joerg.Walter.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-06-23</date>
-<releaseinfo
->1.1.1</releaseinfo>
+<date>2002-06-23</date>
+<releaseinfo>1.1.1</releaseinfo>
 
 </articleinfo>
 
-<para
->Allows you to access another computer's files using a simple <acronym
->SSH</acronym
-> shell account and standard &UNIX; utilities on the remote side. This way, no server software is needed and you gain access to that computer's files as if they were local (or on <acronym
->NFS</acronym
->, since it is slower than local access). It uses the same protocol as <application
->MidnightCommander</application
->'s #sh <acronym
->VFS</acronym
-> handler.</para>
+<para>Allows you to access another computer's files using a simple <acronym>SSH</acronym> shell account and standard &UNIX; utilities on the remote side. This way, no server software is needed and you gain access to that computer's files as if they were local (or on <acronym>NFS</acronym>, since it is slower than local access). It uses the same protocol as <application>MidnightCommander</application>'s #sh <acronym>VFS</acronym> handler.</para>
 
-<para
->Fish should work with any roughly <acronym
->POSIX</acronym
-> compatible &UNIX; based remote computer. It uses the shell commands <command
->cat</command
->, <command
->chgrp</command
->, <command
->chmod</command
->, <command
->chown</command
->, <command
->cp</command
->, <command
->dd</command
->, <command
->env</command
->, <command
->expr</command
->, <command
->grep</command
->, <command
->ls</command
->, <command
->mkdir</command
->, <command
->mv</command
->, <command
->rm</command
->, <command
->rmdir</command
->, <command
->sed</command
->, and <command
->wc</command
->. Fish starts <command
->/bin/sh</command
-> as its shell and expects it to be a Bourne shell (or compatible, like <command
->bash</command
->). If the <command
->sed</command
-> and <command
->file</command
-> commands are available, as well as a <filename
->/etc/apache/magic</filename
-> file with &MIME; type signatures, these will be used to guess &MIME; types. </para>
+<para>Fish should work with any roughly <acronym>POSIX</acronym> compatible &UNIX; based remote computer. It uses the shell commands <command>cat</command>, <command>chgrp</command>, <command>chmod</command>, <command>chown</command>, <command>cp</command>, <command>dd</command>, <command>env</command>, <command>expr</command>, <command>grep</command>, <command>ls</command>, <command>mkdir</command>, <command>mv</command>, <command>rm</command>, <command>rmdir</command>, <command>sed</command>, and <command>wc</command>. Fish starts <command>/bin/sh</command> as its shell and expects it to be a Bourne shell (or compatible, like <command>bash</command>). If the <command>sed</command> and <command>file</command> commands are available, as well as a <filename>/etc/apache/magic</filename> file with &MIME; type signatures, these will be used to guess &MIME; types. </para>
 
-<para
->If <application
->Perl</application
-> is available on the remote machine, it will be used instead. Then only <command
->env</command
-> and <command
->/bin/sh</command
-> are needed. Using <application
->Perl</application
-> has the additional benefit of being faster.</para>
+<para>If <application>Perl</application> is available on the remote machine, it will be used instead. Then only <command>env</command> and <command>/bin/sh</command> are needed. Using <application>Perl</application> has the additional benefit of being faster.</para>
 
-<para
->Fish may even work on &Windows; machines, if tools like <application
->Cygwin</application
-> are installed. All the above utilities must be in the system <envar
->PATH</envar
->, and the initial shell must be able to process the command <command
->echo FISH:;/bin/sh</command
-> correctly.</para>
+<para>Fish may even work on &Windows; machines, if tools like <application>Cygwin</application> are installed. All the above utilities must be in the system <envar>PATH</envar>, and the initial shell must be able to process the command <command>echo FISH:;/bin/sh</command> correctly.</para>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/floppy.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/floppy.docbook
index 845131fb7c6..4dd257049e6 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/floppy.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/floppy.docbook
@@ -1,83 +1,27 @@
 <article lang="&language;" id="floppy">
-<title
->Floppy</title>
+<title>Floppy</title>
 <articleinfo>
 <authorgroup>
-<author
->&Alexander.Neundorf; &Alexander.Neundorf.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Alexander.Neundorf; &Alexander.Neundorf.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
 
-<para
->The floppy ioslave gives you easy access to the floppy disk drives installed on your system. </para>
+<para>The floppy ioslave gives you easy access to the floppy disk drives installed on your system. </para>
 
-<para
->The drive letter becomes the first subdirectory in the floppy &URL;. Let's say there is a file <filename
->logo.png</filename
-> on your floppy disk in drive A, then the &URL; will be <userinput
-><command
->floppy:</command
-><replaceable
->/a/logo.png</replaceable
-></userinput
-> </para>
+<para>The drive letter becomes the first subdirectory in the floppy &URL;. Let's say there is a file <filename>logo.png</filename> on your floppy disk in drive A, then the &URL; will be <userinput><command>floppy:</command><replaceable>/a/logo.png</replaceable></userinput> </para>
 
-<para
->If you want to access drive B, <userinput
-><command
->floppy:/b</command
-></userinput
-> will do it. <command
->floppy:/</command
-> is a shortcut for <command
->floppy:/a</command
->. </para>
+<para>If you want to access drive B, <userinput><command>floppy:/b</command></userinput> will do it. <command>floppy:/</command> is a shortcut for <command>floppy:/a</command>. </para>
 
-<note
-><para
->Note that <command
->floppy:/logo.png</command
-> means you have a disk drive named <filename
->logo.png</filename
->.</para
-></note>
+<note><para>Note that <command>floppy:/logo.png</command> means you have a disk drive named <filename>logo.png</filename>.</para></note>
 
-<para
->To use it you need to have the mtools package installed, and the floppy ioslave supports everything the various mtools command line utilities support. You don't have to mount your floppy disks, simply enter <userinput
->floppy:/</userinput
-> in any &kde; 3.x app and you will be able to read from and write to your floppy drive.</para>
+<para>To use it you need to have the mtools package installed, and the floppy ioslave supports everything the various mtools command line utilities support. You don't have to mount your floppy disks, simply enter <userinput>floppy:/</userinput> in any &kde; 3.x app and you will be able to read from and write to your floppy drive.</para>
 
-<para
->It also works with USB sticks, ZIP and JAZ drives. You can use <command
->floppy:/u</command
-> for the USB stick and <command
->floppy:/z</command
-> for the zip drive, for example. To make this work, you might need to adjust your <filename
->/etc/mtools</filename
-> file. See the manpage for documentation. </para>
+<para>It also works with USB sticks, ZIP and JAZ drives. You can use <command>floppy:/u</command> for the USB stick and <command>floppy:/z</command> for the zip drive, for example. To make this work, you might need to adjust your <filename>/etc/mtools</filename> file. See the manpage for documentation. </para>
 
-<para
->The ioslave gives read and write access to the floppy drive, but not simultaneously. While you can read and write to the floppy during the same session, reading and writing have to happen one after the other, not at the same time.</para>
+<para>The ioslave gives read and write access to the floppy drive, but not simultaneously. While you can read and write to the floppy during the same session, reading and writing have to happen one after the other, not at the same time.</para>
 
-<para
->Author: Alexander Neundorf <email
->neundorf@kde.org</email
-></para>
+<para>Author: Alexander Neundorf <email>neundorf@kde.org</email></para>
 
 </article>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/ftp.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/ftp.docbook
index b42e7c08e60..28aaf46fbb1 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/ftp.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/ftp.docbook
@@ -1,55 +1,23 @@
 <article id="ftp">
-<title
->&FTP;</title>
+<title>&FTP;</title>
 <articleinfo>
 <authorgroup>
-<author
->&Lauri.Watts; &Lauri.Watts.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Lauri.Watts; &Lauri.Watts.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
 
-<para
->&FTP; is the Internet service used to transfer a data file from the disk of one computer to the disk of another, regardless of the operating system type. </para>
+<para>&FTP; is the Internet service used to transfer a data file from the disk of one computer to the disk of another, regardless of the operating system type. </para>
 
-<para
->Similar to other Internet applications, &FTP; uses the client-server approach &mdash; a user invokes an &FTP; program on the computer, instructs it to contact a remote computer, and then requests the transfer of one or more files. The local &FTP; program becomes a client that uses <acronym
->TCP</acronym
-> to contact an &FTP; server program on the remote computer. Each time the user requests a file transfer, the client and the server programs cooperate to send a copy of the data across the Internet. </para>
+<para>Similar to other Internet applications, &FTP; uses the client-server approach &mdash; a user invokes an &FTP; program on the computer, instructs it to contact a remote computer, and then requests the transfer of one or more files. The local &FTP; program becomes a client that uses <acronym>TCP</acronym> to contact an &FTP; server program on the remote computer. Each time the user requests a file transfer, the client and the server programs cooperate to send a copy of the data across the Internet. </para>
 
-<para
->&FTP; servers which allow <quote
->anonymous &FTP;</quote
-> permit any user, not only users with accounts on the host, to browse the <quote
->ftp</quote
-> archives and download files. Some &FTP; servers are configured to allow users to upload files. </para>
+<para>&FTP; servers which allow <quote>anonymous &FTP;</quote> permit any user, not only users with accounts on the host, to browse the <quote>ftp</quote> archives and download files. Some &FTP; servers are configured to allow users to upload files. </para>
 
-<para
->&FTP; is commonly used to retrieve information and obtain software stored in files at &FTP; archive sites throughout the world. </para>
+<para>&FTP; is commonly used to retrieve information and obtain software stored in files at &FTP; archive sites throughout the world. </para>
 
 
-<para
->Source: Paraphrased from <ulink url="http://tlc.nlm.nih.gov/resources/tutorials/internetdistlrn/ftpdef.htm"
-> http://tlc.nlm.nih.gov/resources/tutorials/internetdistlrn/ftpdef.htm</ulink
-> </para>
+<para>Source: Paraphrased from <ulink url="http://tlc.nlm.nih.gov/resources/tutorials/internetdistlrn/ftpdef.htm"> http://tlc.nlm.nih.gov/resources/tutorials/internetdistlrn/ftpdef.htm</ulink> </para>
 
-<para
->See the manual: <ulink url="man:/ftp"
->ftp</ulink
->.</para>
+<para>See the manual: <ulink url="man:/ftp">ftp</ulink>.</para>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/gopher.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/gopher.docbook
index e65acb27954..f338aa289cb 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/gopher.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/gopher.docbook
@@ -1,49 +1,17 @@
 <article lang="&language;" id="gopher">
-<title
->gopher</title>
+<title>gopher</title>
 <articleinfo>
 <authorgroup>
-<author
->&Lauri.Watts; &Lauri.Watts.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Lauri.Watts; &Lauri.Watts.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
 
-<para
-><command
->gopher</command
-> began as a distributed campus information service at the University of Minnesota. Gopher allows the user to access information on Gopher servers running on Internet hosts.</para>
+<para><command>gopher</command> began as a distributed campus information service at the University of Minnesota. Gopher allows the user to access information on Gopher servers running on Internet hosts.</para>
 
-<para
->Gopher is an Internet information browsing service that uses a menu-driven interface. Users select information from menus, which may return another menu or display a text file. An item may reside on a Gopher server you originally queried, or it may be on another Gopher server (or another host). Gopher can <quote
->tunnel</quote
-> from one Gopher to another without the user knowing that the server and/or host machine have changed. Gopher keeps the exact location of computers hidden from the user, providing the <quote
->illusion</quote
-> of a single, large set of interconnected menus. </para>
+<para>Gopher is an Internet information browsing service that uses a menu-driven interface. Users select information from menus, which may return another menu or display a text file. An item may reside on a Gopher server you originally queried, or it may be on another Gopher server (or another host). Gopher can <quote>tunnel</quote> from one Gopher to another without the user knowing that the server and/or host machine have changed. Gopher keeps the exact location of computers hidden from the user, providing the <quote>illusion</quote> of a single, large set of interconnected menus. </para>
 
-<para
->Gopher permits the user to record an item's location in a <quote
->bookmark</quote
-> thereby allowing users to follow a <quote
->bookmark</quote
-> directly to a particular item without searching the menu system. Gopher menus are not standardised, inasmuch as each Gopher server is individually determined. </para>
+<para>Gopher permits the user to record an item's location in a <quote>bookmark</quote> thereby allowing users to follow a <quote>bookmark</quote> directly to a particular item without searching the menu system. Gopher menus are not standardised, inasmuch as each Gopher server is individually determined. </para>
 
-<para
->Source: <ulink url="http://tlc.nlm.nih.gov/resources/tutorials/internetdistlrn/gophrdef.htm"
-> http://tlc.nlm.nih.gov/resources/tutorials/internetdistlrn/gophrdef.htm</ulink
-> </para>
+<para>Source: <ulink url="http://tlc.nlm.nih.gov/resources/tutorials/internetdistlrn/gophrdef.htm"> http://tlc.nlm.nih.gov/resources/tutorials/internetdistlrn/gophrdef.htm</ulink> </para>
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/gzip.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/gzip.docbook
index 2a53bf30384..3a7f07d42cb 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/gzip.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/gzip.docbook
@@ -1,51 +1,20 @@
 <article lang="&language;" id="gzip">
-<title
->gzip</title>
+<title>gzip</title>
 <articleinfo>
 <authorgroup>
-<author
->&Lauri.Watts; &Lauri.Watts.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Lauri.Watts; &Lauri.Watts.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
 
-<para
-><command
->gzip</command
-> is a compression program</para>
+<para><command>gzip</command> is a compression program</para>
 
-<para
->The gzip tdeioslave is not directly usable, and is intended for use as a filter. For example, the tar tdeioslave can filter a file through the gzip tdeioslave, in order to display the contents of a <literal role="extension"
->tar.gz</literal
-> file directly in a &konqueror; window.</para>
+<para>The gzip tdeioslave is not directly usable, and is intended for use as a filter. For example, the tar tdeioslave can filter a file through the gzip tdeioslave, in order to display the contents of a <literal role="extension">tar.gz</literal> file directly in a &konqueror; window.</para>
 
-<para
->If you click on a file compressed with a <literal role="extension"
->gz</literal
-> extension in &konqueror;, this tdeioslave is used to uncompress it and display it as a normal (uncompressed) file.</para>
+<para>If you click on a file compressed with a <literal role="extension">gz</literal> extension in &konqueror;, this tdeioslave is used to uncompress it and display it as a normal (uncompressed) file.</para>
 
-<para
->If you are a developer, and would like to use the gzip filter, you can find documentation on using tdeioslaves at <ulink url="http://developer.kde.org"
->http://developer.kde.org</ulink
-></para>
+<para>If you are a developer, and would like to use the gzip filter, you can find documentation on using tdeioslaves at <ulink url="http://developer.kde.org">http://developer.kde.org</ulink></para>
 
-<para
->See the manual: <ulink url="man:/gzip"
->gzip</ulink
->. </para>
+<para>See the manual: <ulink url="man:/gzip">gzip</ulink>. </para>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/help.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/help.docbook
index 407fe86647d..730d7a29873 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/help.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/help.docbook
@@ -1,33 +1,13 @@
 <article lang="&language;" id="help">
-<title
->help</title>
+<title>help</title>
 <articleinfo>
 <authorgroup>
-<author
->&Ferdinand.Gassauer;&Ferdinand.Gassauer.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Ferdinand.Gassauer;&Ferdinand.Gassauer.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
 
-<para
->The help system of &kde; </para>
-<para
->See <ulink url="help:/"
->The &khelpcenter;</ulink
->. </para>
+<para>The help system of &kde; </para>
+<para>See <ulink url="help:/">The &khelpcenter;</ulink>. </para>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/http.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/http.docbook
index c8fd823a278..68f69d93dfa 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/http.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/http.docbook
@@ -1,56 +1,18 @@
 <article lang="&language;" id="http">
-<title
->http</title>
+<title>http</title>
 <articleinfo>
 <authorgroup>
-<author
->&Lauri.Watts; &Lauri.Watts.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Lauri.Watts; &Lauri.Watts.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
 
-<para
-><acronym
->http</acronym
-> is the <emphasis
->H</emphasis
->yper<emphasis
->T</emphasis
->ext <emphasis
->T</emphasis
->ransfer <emphasis
->P</emphasis
->rotocol.</para>
+<para><acronym>http</acronym> is the <emphasis>H</emphasis>yper<emphasis>T</emphasis>ext <emphasis>T</emphasis>ransfer <emphasis>P</emphasis>rotocol.</para>
 
-<para
->The http tdeioslave is used by all &kde; applications to handle connections to http servers, that is, web servers. The most common usage is to view web pages in the &konqueror; web browser.</para>
+<para>The http tdeioslave is used by all &kde; applications to handle connections to http servers, that is, web servers. The most common usage is to view web pages in the &konqueror; web browser.</para>
 
-<para
->You can use the http tdeioslave in &konqueror; by giving it a <acronym
->URL</acronym
->. <userinput
->http://<replaceable
->www.kde.org</replaceable
-></userinput
->.</para>
+<para>You can use the http tdeioslave in &konqueror; by giving it a <acronym>URL</acronym>. <userinput>http://<replaceable>www.kde.org</replaceable></userinput>.</para>
 
-<para
->See the manual: <ulink url="man:/http"
->http</ulink
->. </para>
+<para>See the manual: <ulink url="man:/http">http</ulink>. </para>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/https.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/https.docbook
index 41412ed18fb..fe46817c423 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/https.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/https.docbook
@@ -1,34 +1,13 @@
 <article lang="&language;" id="https">
-<title
->https</title>
+<title>https</title>
 <articleinfo>
 <authorgroup>
-<author
->&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
-<para
->HTTPS is <ulink url="help:/tdeioslave/http.html"
->HTTP</ulink
-> encapsulated in an SSL/TLS stream. </para>
-<para
->SSL is the Secure Sockets Layer protocol, a security protocol that provides communications privacy over the Internet. The protocol allows client/server applications to communicate in a way that is designed to prevent eavesdropping, tampering, or message forgery. </para>
-<para
->TLS stands for Transport Layer Security </para>
+<para>HTTPS is <ulink url="help:/tdeioslave/http.html">HTTP</ulink> encapsulated in an SSL/TLS stream. </para>
+<para>SSL is the Secure Sockets Layer protocol, a security protocol that provides communications privacy over the Internet. The protocol allows client/server applications to communicate in a way that is designed to prevent eavesdropping, tampering, or message forgery. </para>
+<para>TLS stands for Transport Layer Security </para>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/imap.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/imap.docbook
index 0dc1aef152b..37a0b21281c 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/imap.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/imap.docbook
@@ -1,44 +1,20 @@
 <article lang="&language;" id="imap">
-<title
->imap</title>
+<title>imap</title>
 <articleinfo>
 <authorgroup>
-<author
->&Michael.Haeckel; &Michael.Haeckel.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Michael.Haeckel; &Michael.Haeckel.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
  
-<date
->2001-08-07</date>
+<date>2001-08-07</date>
 
  
 </articleinfo>
 
-<para
->The IMAP4rev1 protocol (Internet Message Access Protocol) allows access to messages in mail folders on a server. Unlike POP3, which is designed to download the mails and delete them from the server, the purpose of IMAP is to store all mails on the server to be able to access these mails from everywhere. Messages can be stored on the server, retrieved from there or moved between folders.</para>
+<para>The IMAP4rev1 protocol (Internet Message Access Protocol) allows access to messages in mail folders on a server. Unlike POP3, which is designed to download the mails and delete them from the server, the purpose of IMAP is to store all mails on the server to be able to access these mails from everywhere. Messages can be stored on the server, retrieved from there or moved between folders.</para>
 
-<para
->This plugin is currently mainly used by KMail, but you can also use it in any other KDE application that uses tdeioslave plugins.</para>
+<para>This plugin is currently mainly used by KMail, but you can also use it in any other KDE application that uses tdeioslave plugins.</para>
 
-<para
->For example in &konqueror;, simply type <userinput
->imap://username@your.mail.server/</userinput
-> to get your IMAP folders listed. You can then deal with the folders and mails like with folders and files on a local file system. IMAP URLs are defined in <ulink url="http://www.ietf.org/rfc/rfc2192.txt?number=2192"
->RFC 2192</ulink
->. </para>
+<para>For example in &konqueror;, simply type <userinput>imap://username@your.mail.server/</userinput> to get your IMAP folders listed. You can then deal with the folders and mails like with folders and files on a local file system. IMAP URLs are defined in <ulink url="http://www.ietf.org/rfc/rfc2192.txt?number=2192">RFC 2192</ulink>. </para>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/imaps.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/imaps.docbook
index 8d09e5f8f76..b4a7e2f2a3e 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/imaps.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/imaps.docbook
@@ -1,36 +1,16 @@
 <article lang="&language;" id="imaps">
-<title
->imaps</title>
+<title>imaps</title>
 <articleinfo>
 <authorgroup>
-<author
->&Michael.Haeckel; &Michael.Haeckel.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Michael.Haeckel; &Michael.Haeckel.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
  
-<date
->2001-08-07</date>
+<date>2001-08-07</date>
  
  
 </articleinfo>
 
-<para
->IMAPS is the <ulink url="help:/tdeioslave/imap.html"
->IMAP</ulink
-> protocol encrypted via SSL.</para>
+<para>IMAPS is the <ulink url="help:/tdeioslave/imap.html">IMAP</ulink> protocol encrypted via SSL.</para>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/index.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/index.docbook
index 391ecd32b1e..05cad79b5a6 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/index.docbook
@@ -23,8 +23,7 @@
 <!ENTITY tdeio-mailto SYSTEM "mailto.docbook">
 <!ENTITY tdeio-mac SYSTEM "mac.docbook">
 <!ENTITY tdeio-man SYSTEM "man.docbook">
-<!ENTITY tdeio-mrml SYSTEM "mrml.docbook"
-> <!-- post release, put this in the right module -->
+<!ENTITY tdeio-mrml SYSTEM "mrml.docbook"> <!-- post release, put this in the right module -->
 <!ENTITY tdeio-news SYSTEM "news.docbook">
 <!ENTITY tdeio-nfs SYSTEM "nfs.docbook">
 <!ENTITY tdeio-nntp SYSTEM "nntp.docbook">
@@ -41,26 +40,14 @@
 <!ENTITY tdeio-thumbnail SYSTEM "thumbnail.docbook">
 <!ENTITY tdeio-webdav SYSTEM "webdav.docbook">
 <!ENTITY tdeio-webdavs SYSTEM "webdavs.docbook">
-<!ENTITY tdeprint "<application
->TDEPrint</application
->">
-<!ENTITY Ferdinand.Gassauer '<personname
-><firstname
->Ferdinand</firstname
-><surname
->Gassauer</surname
-></personname
->'>
-<!ENTITY Ferdinand.Gassauer.mail '<email
->f.gassauer@aon.at</email
->'>
+<!ENTITY tdeprint "<application>TDEPrint</application>">
+<!ENTITY Ferdinand.Gassauer '<personname><firstname>Ferdinand</firstname><surname>Gassauer</surname></personname>'>
+<!ENTITY Ferdinand.Gassauer.mail '<email>f.gassauer@aon.at</email>'>
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <part lang="&language;">
-<title
->IO-Slaves</title>
+<title>IO-Slaves</title>
 &tdeio-bzip; &tdeio-bzip2; &tdeio-cgi; &tdeio-data; &tdeio-file; &tdeio-finger; &tdeio-fish; &tdeio-floppy; &tdeio-ftp; &tdeio-gopher; &tdeio-gzip; &tdeio-help; &tdeio-http; &tdeio-https; &tdeio-imap; &tdeio-imaps; &tdeio-info; &tdeio-lan; &tdeio-ldap; &tdeio-mailto; &tdeio-mac; &tdeio-man; &tdeio-mrml; &tdeio-news; &tdeio-nfs; &tdeio-nntp; &tdeio-pop3; &tdeio-pop3s; &tdeio-print; &tdeio-rlan; &tdeio-rlogin; &tdeio-sftp; &tdeio-smb; &tdeio-smtp; &tdeio-tar; &tdeio-telnet; &tdeio-thumbnail; &tdeio-webdav; &tdeio-webdavs; </part>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/info.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/info.docbook
index 641c86b4e47..d6edf6da290 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/info.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/info.docbook
@@ -1,58 +1,22 @@
 <article lang="&language;" id="info">
-<title
->Info</title>
+<title>Info</title>
 <articleinfo>
 <authorgroup>
-<author
->&Lauri.Watts; &Lauri.Watts.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Lauri.Watts; &Lauri.Watts.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
 
-<para
->Info is a type of documentation. The documents are in a file format called texinfo, and can be read on the command line with the <command
->info</command
-> program.</para>
+<para>Info is a type of documentation. The documents are in a file format called texinfo, and can be read on the command line with the <command>info</command> program.</para>
 
-<para
->The Info ioslave allows you to read the info pages installed on your system, from within &konqueror;. You can use it very easily:</para>
+<para>The Info ioslave allows you to read the info pages installed on your system, from within &konqueror;. You can use it very easily:</para>
 
-<screen
-><userinput
-><command
->info:/</command
->gcc</userinput
-></screen>
+<screen><userinput><command>info:/</command>gcc</userinput></screen>
 
-<para
->This would show you the top level node of the Info documentation for the <command
->gcc</command
-> compiler.</para>
+<para>This would show you the top level node of the Info documentation for the <command>gcc</command> compiler.</para>
 
-<para
->Info is a <acronym
->GNU</acronym
-> replacement for <command
->man</command
->, but is not widely used outside of <acronym
->GNU</acronym
-> software.</para>
+<para>Info is a <acronym>GNU</acronym> replacement for <command>man</command>, but is not widely used outside of <acronym>GNU</acronym> software.</para>
 
-<para
->You can quite easily browse the info documentation you have installed from within the &khelpcenter; application, or you can use the info ioslave directly from within both &konqueror; and the mini-cli.</para>
+<para>You can quite easily browse the info documentation you have installed from within the &khelpcenter; application, or you can use the info ioslave directly from within both &konqueror; and the mini-cli.</para>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/lan.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/lan.docbook
index bd340b6e345..f0b3b71eb55 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/lan.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/lan.docbook
@@ -1,53 +1,16 @@
 <article lang="&language;" id="lan">
-<title
->lan</title>
+<title>lan</title>
 <articleinfo>
 <authorgroup>
-<author
->&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
 
-<para
->This protocol is intended to provide a kind of <quote
->network neighbourhood</quote
-> but only relying on the TCP/IP protocol stack and with the ability to use other protocols than just <acronym
->SMB</acronym
->.</para>
+<para>This protocol is intended to provide a kind of <quote>network neighbourhood</quote> but only relying on the TCP/IP protocol stack and with the ability to use other protocols than just <acronym>SMB</acronym>.</para>
 
-<para
->The lan tdeioslave can use &FTP;, &HTTP;, <acronym
->SMB</acronym
->, <acronym
->NFS</acronym
->, and <acronym
->FISH</acronym
-></para>
+<para>The lan tdeioslave can use &FTP;, &HTTP;, <acronym>SMB</acronym>, <acronym>NFS</acronym>, and <acronym>FISH</acronym></para>
 
-<para
->It must first be configured in &kcontrol;, <menuchoice
-><guimenu
->Network</guimenu
-><guimenuitem
->LAN-Browsing</guimenuitem
-> </menuchoice
-> and for more information see <ulink url="help:/lisa"
->the Lan Browsing manual</ulink
->.</para>
+<para>It must first be configured in &kcontrol;, <menuchoice><guimenu>Network</guimenu><guimenuitem>LAN-Browsing</guimenuitem> </menuchoice> and for more information see <ulink url="help:/lisa">the Lan Browsing manual</ulink>.</para>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/ldap.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/ldap.docbook
index 36e1daf1ec3..027ea0b8a50 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/ldap.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/ldap.docbook
@@ -1,46 +1,18 @@
 <article lang="&language;" id="ldap">
-<title
->ldap</title>
+<title>ldap</title>
 <articleinfo>
 <authorgroup>
-<author
->&Lauri.Watts; &Lauri.Watts.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Lauri.Watts; &Lauri.Watts.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
 
-<para
-><acronym
->ldap</acronym
-> is the lightweight directory access protocol. It provides access to an X.500 directory, or to a stand-alone <acronym
->LDAP</acronym
-> server.</para>
+<para><acronym>ldap</acronym> is the lightweight directory access protocol. It provides access to an X.500 directory, or to a stand-alone <acronym>LDAP</acronym> server.</para>
 
-<para
->You can use the ldap tdeioslave as follows:</para>
+<para>You can use the ldap tdeioslave as follows:</para>
 
-<para
-><userinput
->ldap://host:port/ou=People,o=where,c=de??sub</userinput
-> for a subtree-query</para>
+<para><userinput>ldap://host:port/ou=People,o=where,c=de??sub</userinput> for a subtree-query</para>
 
-<para
->or <userinput
->ldap://host:port/cn=MM,ou=People,o=where,c=de??base</userinput
-> for a complete branch.</para>
+<para>or <userinput>ldap://host:port/cn=MM,ou=People,o=where,c=de??base</userinput> for a complete branch.</para>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/mac.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/mac.docbook
index 5eba03e0941..848b170bba1 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/mac.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/mac.docbook
@@ -1,77 +1,23 @@
 <article lang="&language;" id="mac">
-<title
->mac</title>
+<title>mac</title>
 <articleinfo>
 <authorgroup>
-<author
-><personname
-><firstname
->Johnathan</firstname
-><surname
->Riddell</surname
-></personname
-><email
->jr@jriddell.org</email
-> </author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author><personname><firstname>Johnathan</firstname><surname>Riddell</surname></personname><email>jr@jriddell.org</email> </author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
 
-<para
->The mac ioslave lets you read an HFS+ partition from &konqueror; or any other &kde; file dialogue. It uses <ulink url="http://www.google.com/search?hl=en&amp;q=hfsplus+utils"
-> hfsplus tools</ulink
->, so you will need these installed for it to work.</para>
+<para>The mac ioslave lets you read an HFS+ partition from &konqueror; or any other &kde; file dialogue. It uses <ulink url="http://www.google.com/search?hl=en&amp;q=hfsplus+utils"> hfsplus tools</ulink>, so you will need these installed for it to work.</para>
 
-<para
->Enter <userinput
->mac:/</userinput
-> into &konqueror; and you should see the contents of your &MacOS; partition. If you have not used tdeio-mac before, you will probably get an error message saying you have not specified the right partition. Enter something like <userinput
->mac:/<option
->?dev=/dev/hda2</option
-></userinput
-> to specify the partition (if you don't know which partition &MacOS; is on, you can probably guess by changing hda2 to hda3 and so on or use the print command from <command
->mac-fdisk</command
->). This partition will be used the next time, so you do not have to specify it each time.</para>
+<para>Enter <userinput>mac:/</userinput> into &konqueror; and you should see the contents of your &MacOS; partition. If you have not used tdeio-mac before, you will probably get an error message saying you have not specified the right partition. Enter something like <userinput>mac:/<option>?dev=/dev/hda2</option></userinput> to specify the partition (if you don't know which partition &MacOS; is on, you can probably guess by changing hda2 to hda3 and so on or use the print command from <command>mac-fdisk</command>). This partition will be used the next time, so you do not have to specify it each time.</para>
 
-<para
-><application
->Hfsplus tools</application
-> let you see the file and copy data from the HFS+ partition, but not to copy data to it or change the filenames.</para>
+<para><application>Hfsplus tools</application> let you see the file and copy data from the HFS+ partition, but not to copy data to it or change the filenames.</para>
 
-<para
->HFS+ actually keeps two files for every one you see (called forks), a resource fork and a data fork. The default copy mode when you are copying files across to your native drive is raw data, which means it only copies the data fork. Text files are copied in text mode (same as raw format but changes the line endings to be &UNIX; friendly and gets rid of some extra characters - strongly advised for text files), unless you specify otherwise. You can also copy the files across in Mac Binary II format or specify text or raw format with another query: <userinput
->mac:/<option
->myfile?mode=b</option
-></userinput
-> or <userinput
->mac:/<option
->myfile?mode=t</option
-></userinput
->. See the <command
->hpcopy</command
-> man page for more.</para>
+<para>HFS+ actually keeps two files for every one you see (called forks), a resource fork and a data fork. The default copy mode when you are copying files across to your native drive is raw data, which means it only copies the data fork. Text files are copied in text mode (same as raw format but changes the line endings to be &UNIX; friendly and gets rid of some extra characters - strongly advised for text files), unless you specify otherwise. You can also copy the files across in Mac Binary II format or specify text or raw format with another query: <userinput>mac:/<option>myfile?mode=b</option></userinput> or <userinput>mac:/<option>myfile?mode=t</option></userinput>. See the <command>hpcopy</command> man page for more.</para>
 
-<para
->Note that you need permissions to read your HFS+ partition. How you get this depends on your distribution. </para>
+<para>Note that you need permissions to read your HFS+ partition. How you get this depends on your distribution. </para>
 
-<para
->For some reason some folders in &MacOS; end in a funny tall <quote
->f</quote
-> character. This seems to confuse hfstools.</para>
+<para>For some reason some folders in &MacOS; end in a funny tall <quote>f</quote> character. This seems to confuse hfstools.</para>
 
 </article>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/mailto.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/mailto.docbook
index 9b5eff6d154..d78fc254b56 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/mailto.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/mailto.docbook
@@ -1,36 +1,12 @@
 <article lang="&language;" id="mailto">
-<title
->mailto</title>
+<title>mailto</title>
 <articleinfo>
 <authorgroup>
-<author
->&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
-<para
->The mailto tdeioslave is used when you click on a mailto link in an <acronym
->HTML</acronym
-> page. &konqueror; will open the preferred mail client you have configured, with a composer window. Any information supplied in the <acronym
->URL</acronym
-> will be filled in for you.</para>
+<para>The mailto tdeioslave is used when you click on a mailto link in an <acronym>HTML</acronym> page. &konqueror; will open the preferred mail client you have configured, with a composer window. Any information supplied in the <acronym>URL</acronym> will be filled in for you.</para>
 
-<para
->See the manual: <ulink url="man:/mailto"
->mailto</ulink
->. </para>
+<para>See the manual: <ulink url="man:/mailto">mailto</ulink>. </para>
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/man.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/man.docbook
index 1176e76b2f4..5f4a1db9dc1 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/man.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/man.docbook
@@ -1,88 +1,35 @@
 <article lang="&language;" id="man">
-<title
->Man</title>
+<title>Man</title>
 <articleinfo>
 <authorgroup>
-<author
->&Lauri.Watts; &Lauri.Watts.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Lauri.Watts; &Lauri.Watts.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
 
-<para
->Using the man ioslave you are able to read the man pages installed on your system. It is easy to use: </para>
+<para>Using the man ioslave you are able to read the man pages installed on your system. It is easy to use: </para>
 
 <variablelist>
 <varlistentry>
-<term
-><userinput
-><command
->man:/</command
-></userinput
-></term>
+<term><userinput><command>man:/</command></userinput></term>
 <listitem>
-<para
->See the sections of the manual, click to find the rest. </para>
+<para>See the sections of the manual, click to find the rest. </para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><userinput
-><command
->man:</command
->fopen</userinput
-></term>
+<term><userinput><command>man:</command>fopen</userinput></term>
 <listitem>
-<para
->See the man page of <command
->fopen</command
->. </para>
+<para>See the man page of <command>fopen</command>. </para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->There is also a shortcut: <userinput
-><command
->#fopen</command
-></userinput
->, which has the same effect as above. </para>
+<para>There is also a shortcut: <userinput><command>#fopen</command></userinput>, which has the same effect as above. </para>
 
-<para
->If you don't find all your man pages, adjust the environment variables <envar
->MANPATH</envar
-> and <envar
->MANSECT</envar
->. </para>
+<para>If you don't find all your man pages, adjust the environment variables <envar>MANPATH</envar> and <envar>MANSECT</envar>. </para>
 
-<para
->As with any other &kde; ioslave, it is possible to enter a &URL;, like <userinput
-><command
->man:socket</command
-></userinput
-> in <emphasis
->any</emphasis
-> &kde; application. Try it in &kwrite; and you will see the man page in <acronym
->HTML</acronym
-> format. </para>
+<para>As with any other &kde; ioslave, it is possible to enter a &URL;, like <userinput><command>man:socket</command></userinput> in <emphasis>any</emphasis> &kde; application. Try it in &kwrite; and you will see the man page in <acronym>HTML</acronym> format. </para>
 
-<para
->Contact mailing list: <email
->kde-devel@kde.org</email
-> </para>
+<para>Contact mailing list: <email>kde-devel@kde.org</email> </para>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/mrml.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/mrml.docbook
index d0cb42f3611..1edaf10a498 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/mrml.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/mrml.docbook
@@ -1,50 +1,20 @@
 <article lang="&language;" id="mrml">
-<title
->mrml</title>
+<title>mrml</title>
 <articleinfo>
 <authorgroup>
-<author
->&Carsten.Pfeiffer; &Carsten.Pfeiffer.mail; </author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Carsten.Pfeiffer; &Carsten.Pfeiffer.mail; </author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
  
-<date
->2003-01-08</date>
+<date>2003-01-08</date>
 
  
 </articleinfo>
 
-<para
-><acronym
->MRML</acronym
-> stands for Multimedia Retrieval Markup Language. <acronym
->MRML</acronym
-> is an XML-based protocol to provide standardised access to Multimedia retrieval software. See <ulink url="http://www.mrml.net"
->http://www.mrml.net</ulink
-> for more information. </para>
+<para><acronym>MRML</acronym> stands for Multimedia Retrieval Markup Language. <acronym>MRML</acronym> is an XML-based protocol to provide standardised access to Multimedia retrieval software. See <ulink url="http://www.mrml.net">http://www.mrml.net</ulink> for more information. </para>
 
-<para
->tdeio_mrml is used for the Image Finding feature in &kde;</para>
+<para>tdeio_mrml is used for the Image Finding feature in &kde;</para>
 
-<para
->&eg; type <userinput
->mrml:/</userinput
-> or <userinput
->mrml:/some.other.server</userinput
-> in &konqueror; to start searching for images. </para>
+<para>&eg; type <userinput>mrml:/</userinput> or <userinput>mrml:/some.other.server</userinput> in &konqueror; to start searching for images. </para>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/news.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/news.docbook
index 32ce32b5491..382745523f1 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/news.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/news.docbook
@@ -1,37 +1,15 @@
 <article lang="&language;" id="news">
-<title
->news</title>
+<title>news</title>
 <articleinfo>
 <authorgroup>
-<author
->&Lauri.Watts; &Lauri.Watts.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Lauri.Watts; &Lauri.Watts.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
 
 
-<para
->The news tdeioslave is used when you click on a news link on a web page. It will open &knode;, and if the group referred to in the news link is available from your server, it will subscribe you to the group, in the first available account you have configured in &knode;</para>
+<para>The news tdeioslave is used when you click on a news link on a web page. It will open &knode;, and if the group referred to in the news link is available from your server, it will subscribe you to the group, in the first available account you have configured in &knode;</para>
 
-<para
->You can unsubscribe from within &knode; if you decide you don't want to read the group, by <mousebutton
->right</mousebutton
-> clicking and selecting <guimenuitem
->Unsubscribe from Group</guimenuitem
->.</para>
+<para>You can unsubscribe from within &knode; if you decide you don't want to read the group, by <mousebutton>right</mousebutton> clicking and selecting <guimenuitem>Unsubscribe from Group</guimenuitem>.</para>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/nfs.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/nfs.docbook
index c627b6d2629..46ed738e733 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/nfs.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/nfs.docbook
@@ -1,55 +1,18 @@
 <article lang="&language;" id="nfs">
-<title
->nfs</title>
+<title>nfs</title>
 <articleinfo>
 <authorgroup>
-<author
->&Lauri.Watts; &Lauri.Watts.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Lauri.Watts; &Lauri.Watts.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
-<para
->Sun's <acronym
->NFS</acronym
-> protocol provides transparent remote access to shared file systems across networks. The <acronym
->NFS</acronym
-> protocol is designed to be machine, operating system, network architecture, and transport protocol independent. This independence is achieved through the use of Remote Procedure Call (<acronym
->RPC</acronym
->) primitives built on top of an eXternal Data Representation (<acronym
->XDR</acronym
->). </para>
+<para>Sun's <acronym>NFS</acronym> protocol provides transparent remote access to shared file systems across networks. The <acronym>NFS</acronym> protocol is designed to be machine, operating system, network architecture, and transport protocol independent. This independence is achieved through the use of Remote Procedure Call (<acronym>RPC</acronym>) primitives built on top of an eXternal Data Representation (<acronym>XDR</acronym>). </para>
 
-<para
->The supporting MOUNT protocol performs the operating system-specific functions that allow clients to attach remote folder trees to a point within the local file system. The mount process also allows the server to grant remote access privileges to a restricted set of clients via export control.</para>
+<para>The supporting MOUNT protocol performs the operating system-specific functions that allow clients to attach remote folder trees to a point within the local file system. The mount process also allows the server to grant remote access privileges to a restricted set of clients via export control.</para>
 
-<para
->The Lock Manager provides support for file locking when used in the <acronym
->NFS</acronym
-> environment. The Network Lock Manager (<acronym
->NLM</acronym
->) protocol isolates the inherently stateful aspects of file locking into a separate protocol.</para>
+<para>The Lock Manager provides support for file locking when used in the <acronym>NFS</acronym> environment. The Network Lock Manager (<acronym>NLM</acronym>) protocol isolates the inherently stateful aspects of file locking into a separate protocol.</para>
 
-<para
->Source: <ulink url="http://www.networksorcery.com/enp/protocol/nfs.htm"
-> http://www.networksorcery.com/enp/protocol/nfs.htm</ulink
-> </para>
+<para>Source: <ulink url="http://www.networksorcery.com/enp/protocol/nfs.htm"> http://www.networksorcery.com/enp/protocol/nfs.htm</ulink> </para>
 
-<para
->See the manual: <ulink url="man:/nfs"
->nfs</ulink
->. </para>
+<para>See the manual: <ulink url="man:/nfs">nfs</ulink>. </para>
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/nntp.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/nntp.docbook
index 6e723e3ba3f..54db48f1c50 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/nntp.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/nntp.docbook
@@ -1,65 +1,23 @@
 <article lang="&language;" id="nntp">
-<title
->nntp</title>
+<title>nntp</title>
 <articleinfo>
 <authorgroup>
-<author
->&Lauri.Watts; &Lauri.Watts.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Lauri.Watts; &Lauri.Watts.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
-<para
->The nntp tdeioslave accesses <acronym
->NNTP</acronym
-> servers directly.</para>
+<para>The nntp tdeioslave accesses <acronym>NNTP</acronym> servers directly.</para>
 
-<para
->This tdeioslave can not be used with servers that do not implement the <command
->GROUP</command
-> command, including some versions of the popular <application
->INN</application
-> news server which is often used by <acronym
->ISP</acronym
->s. It does work with <application
->leafnode</application
->, which many people use to keep an offline cache of news articles on their own hard drive or within their <acronym
->LAN</acronym
->.</para>
+<para>This tdeioslave can not be used with servers that do not implement the <command>GROUP</command> command, including some versions of the popular <application>INN</application> news server which is often used by <acronym>ISP</acronym>s. It does work with <application>leafnode</application>, which many people use to keep an offline cache of news articles on their own hard drive or within their <acronym>LAN</acronym>.</para>
 
-<para
->You can use the nntp tdeioslave by typing <userinput
->nntp://yourserver/groupname</userinput
-> into the &konqueror; <acronym
->URL</acronym
-> bar.</para>
+<para>You can use the nntp tdeioslave by typing <userinput>nntp://yourserver/groupname</userinput> into the &konqueror; <acronym>URL</acronym> bar.</para>
 
-<para
->If you enter a group name, as above, and the group is available, you will see the messages stored for that group as icons in &konqueror;.</para>
+<para>If you enter a group name, as above, and the group is available, you will see the messages stored for that group as icons in &konqueror;.</para>
 
-<para
->Clicking on a message will display it as plain text, including all headers. This could be useful for debugging a news client to news server connection, for example, to ensure that your new <application
->leafnode</application
-> server is working correctly.</para>
+<para>Clicking on a message will display it as plain text, including all headers. This could be useful for debugging a news client to news server connection, for example, to ensure that your new <application>leafnode</application> server is working correctly.</para>
 
-<para
->If you don't enter a group name, and only the server name, you will see a list of available groups. </para>
+<para>If you don't enter a group name, and only the server name, you will see a list of available groups. </para>
 
-<para
->Please be aware that this could take an enormous amount of time, and will cause a lot of network traffic. Some commercial usenet servers have 60,000 or more groups available, and doing such a thing may cause your desktop to freeze.</para
->  
+<para>Please be aware that this could take an enormous amount of time, and will cause a lot of network traffic. Some commercial usenet servers have 60,000 or more groups available, and doing such a thing may cause your desktop to freeze.</para>  
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/pop3.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/pop3.docbook
index 677522da456..9c151245ae2 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/pop3.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/pop3.docbook
@@ -1,28 +1,11 @@
 <article lang="&language;" id="pop3">
-<title
->pop3</title>
+<title>pop3</title>
 <articleinfo>
 <authorgroup>
-<author
->&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
-<para
->The Post Office Protocol (POP3) allows a user's workstation to access mail from a mailbox server. </para>
+<para>The Post Office Protocol (POP3) allows a user's workstation to access mail from a mailbox server. </para>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/pop3s.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/pop3s.docbook
index 27a0540bcb0..e6c9cc972ff 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/pop3s.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/pop3s.docbook
@@ -1,28 +1,11 @@
 <article lang="&language;" id="pop3s">
-<title
->pop3s</title>
+<title>pop3s</title>
 <articleinfo>
 <authorgroup>
-<author
->&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
-<para
->POP3S is the POP3 protocol encrypted via SSL. </para>
+<para>POP3S is the POP3 protocol encrypted via SSL. </para>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/print.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/print.docbook
index bf781fedf7f..79b33943792 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/print.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/print.docbook
@@ -1,217 +1,95 @@
 <article lang="&language;" id="print">
-<title
->print</title>
+<title>print</title>
 <articleinfo>
 <authorgroup>
-<author
->&Kurt.Pfeifle; &Kurt.Pfeifle.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Kurt.Pfeifle; &Kurt.Pfeifle.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 
 </authorgroup>
 
-<date
->2002-06-23</date>
-<releaseinfo
->1.00.00</releaseinfo>
+<date>2002-06-23</date>
+<releaseinfo>1.00.00</releaseinfo>
 
 </articleinfo>
 
-<para
->The <acronym
->print</acronym
-> KIOSlave gives quick access to browse different &tdeprint; sections via <quote
->virtual folders</quote
->. These folders provide some information about and quick access to your print subsystem.</para>
-
-<para
-><command
->print:/</command
-> represents one more of those useful KIOSlaves implemented by &kde;. To access it, just type <userinput
->print:/ </userinput
-> into the address field of &konqueror;. <userinput
->print:/ </userinput
-> doesn't purely provide <quote
->read-only</quote
-> access to your print subsystem, but it also allows you to change settings of your printers, of your print system and lets you create new printers and classes.</para>
-
-<para
->You are asked for the Administrator or root password, if you are not allowed a view or an operation as a normal user.</para>
-
-<para
->You can bookmark frequently used shortcuts like <command
->print:/manager</command
-></para>
-
-<para
->Valid syntax is either <userinput
->print:/[path-to-virtual-folder]</userinput
-> or <userinput
->print:[path-to-virtual-folder]</userinput
-></para>
-
-<para
->Note, that some of the views and actions offered do heavily depend on the print subsystem that is installed on your box and presently activated for &kde;. Pages showing printer information display only those parts that are valid for the &kde; selected print subsystem. (So if you normally run <acronym
->CUPS</acronym
->, but switched temporarily to <quote
->Generic UNIX LPD Printing</quote
->, which is possible, you will see less printer info, because LPD is not capable of using the same amount of print settings as are possible in CUPS).</para>
-
-<para
->Valid syntax to access different virtual folders and a short explanation of what they represent:</para>
+<para>The <acronym>print</acronym> KIOSlave gives quick access to browse different &tdeprint; sections via <quote>virtual folders</quote>. These folders provide some information about and quick access to your print subsystem.</para>
+
+<para><command>print:/</command> represents one more of those useful KIOSlaves implemented by &kde;. To access it, just type <userinput>print:/ </userinput> into the address field of &konqueror;. <userinput>print:/ </userinput> doesn't purely provide <quote>read-only</quote> access to your print subsystem, but it also allows you to change settings of your printers, of your print system and lets you create new printers and classes.</para>
+
+<para>You are asked for the Administrator or root password, if you are not allowed a view or an operation as a normal user.</para>
+
+<para>You can bookmark frequently used shortcuts like <command>print:/manager</command></para>
+
+<para>Valid syntax is either <userinput>print:/[path-to-virtual-folder]</userinput> or <userinput>print:[path-to-virtual-folder]</userinput></para>
+
+<para>Note, that some of the views and actions offered do heavily depend on the print subsystem that is installed on your box and presently activated for &kde;. Pages showing printer information display only those parts that are valid for the &kde; selected print subsystem. (So if you normally run <acronym>CUPS</acronym>, but switched temporarily to <quote>Generic UNIX LPD Printing</quote>, which is possible, you will see less printer info, because LPD is not capable of using the same amount of print settings as are possible in CUPS).</para>
+
+<para>Valid syntax to access different virtual folders and a short explanation of what they represent:</para>
 
 <variablelist>
-<title
->Some examples</title>
+<title>Some examples</title>
 
 <varlistentry>
-<term
-><userinput
->print:/ </userinput
-> (&ie; the root of print-tdeioslave)</term>
+<term><userinput>print:/ </userinput> (&ie; the root of print-tdeioslave)</term>
 <listitem>
-<para
->virtual root for browsing your print subsystem. It displays subfolders <quote
->Classes</quote
->, <quote
->Jobs</quote
->, <quote
->Manager</quote
->, <quote
->Printers</quote
->, and <quote
->Specials</quote
-></para>
+<para>virtual root for browsing your print subsystem. It displays subfolders <quote>Classes</quote>, <quote>Jobs</quote>, <quote>Manager</quote>, <quote>Printers</quote>, and <quote>Specials</quote></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->print:/classes</userinput
-> or <userinput
->print:classes </userinput
-> </term
-> <listitem>
-<para
->view your printer classes (supported by and useful for CUPS only) </para>
+<term><userinput>print:/classes</userinput> or <userinput>print:classes </userinput> </term> <listitem>
+<para>view your printer classes (supported by and useful for CUPS only) </para>
 </listitem>
 </varlistentry>
 
 
 <varlistentry>
-<term
-><userinput
->print:/classes/class_name </userinput
-> or <userinput
->print:classes/class_name </userinput
-> </term
-> <listitem>
-<para
->view all members of the named printer class (supported by and useful only for CUPS) </para>
+<term><userinput>print:/classes/class_name </userinput> or <userinput>print:classes/class_name </userinput> </term> <listitem>
+<para>view all members of the named printer class (supported by and useful only for CUPS) </para>
 </listitem>
 </varlistentry>
 
 
 <varlistentry>
-<term
-><userinput
->print:/jobs </userinput
-> or <userinput
->print:jobs </userinput
-></term>
+<term><userinput>print:/jobs </userinput> or <userinput>print:jobs </userinput></term>
 <listitem>
-<para
->lists the current and pending jobs. </para>
+<para>lists the current and pending jobs. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->print:/printers </userinput
-> or <userinput
->print:printers </userinput
-></term>
+<term><userinput>print:/printers </userinput> or <userinput>print:printers </userinput></term>
 <listitem>
-<para
->lists all your printers. Clicking on a printer name shows more info about that printer. </para>
+<para>lists all your printers. Clicking on a printer name shows more info about that printer. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->print:/printers/printer_name </userinput
-> or <userinput
->print:printers/printer_name </userinput
-> </term>
+<term><userinput>print:/printers/printer_name </userinput> or <userinput>print:printers/printer_name </userinput> </term>
 <listitem>
-<para
->displays useful info about the named printer </para>
+<para>displays useful info about the named printer </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->print:/manager </userinput
-> or <userinput
->print:manager </userinput
-> </term
-> <listitem>
-<para
->opens a page very similar to the &tdeprint; Manager module inside the &kde; Control Centre. Switch to a different printing system here or do every other administrative task. </para>
-<para
->This is the most important of access points to your printing system. </para>
+<term><userinput>print:/manager </userinput> or <userinput>print:manager </userinput> </term> <listitem>
+<para>opens a page very similar to the &tdeprint; Manager module inside the &kde; Control Centre. Switch to a different printing system here or do every other administrative task. </para>
+<para>This is the most important of access points to your printing system. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><userinput
->print:/specials </userinput
-> or <userinput
->print:specials </userinput
-> </term
-><listitem>
-<para
->lists all presently available <quote
->special printers</quote
->: Likely you'll see:</para>
+<term><userinput>print:/specials </userinput> or <userinput>print:specials </userinput> </term><listitem>
+<para>lists all presently available <quote>special printers</quote>: Likely you'll see:</para>
 <itemizedlist>
 <listitem>
-        <para
->The two that let you save a printfile to disk, in &PostScript; or <acronym
->PDF</acronym
-> format.</para>
+        <para>The two that let you save a printfile to disk, in &PostScript; or <acronym>PDF</acronym> format.</para>
 </listitem>
 <listitem>
-        <para
->One that sends it as a <acronym
->PDF</acronym
-> attachment via &kmail;.</para>
+        <para>One that sends it as a <acronym>PDF</acronym> attachment via &kmail;.</para>
 </listitem>
 <listitem>
-        <para
->And last, send it via fax, if you have one of the supported fax backends active, <application
->Hylafax</application
-> or <application
->efax</application
->.</para>
+        <para>And last, send it via fax, if you have one of the supported fax backends active, <application>Hylafax</application> or <application>efax</application>.</para>
 </listitem>
 </itemizedlist>
 </listitem>
@@ -219,32 +97,8 @@
 
 </variablelist>
 
-<tip
-><para
->You can also put <command
->print:/manager</command
-> or similar as the command in the <quote
->Quick Command</quote
-> utility (started via <keycombo action="simul"
->&Alt;<keycap
->F2</keycap
-></keycombo
->)</para
-></tip>
-
-<para
->You can learn more about printing and &tdeprint;'s powerful abilities by reading the <ulink url="help:/tdeprint/index.html"
->&tdeprint; Handbook locally</ulink
-> or at the <ulink url="http://printing.kde.org/"
->&tdeprint; Website</ulink
-> where there are documents online (<acronym
->HTML</acronym
-> and <acronym
->PDF</acronym
->),containing <ulink url="http://printing.kde.org/documentation/tutorials/"
->Tutorials</ulink
->, as well as <ulink url="http://printing.kde.org/faq/"
->FAQs</ulink
-> and Tips and Tricks related to printing in general.</para>
+<tip><para>You can also put <command>print:/manager</command> or similar as the command in the <quote>Quick Command</quote> utility (started via <keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo>)</para></tip>
+
+<para>You can learn more about printing and &tdeprint;'s powerful abilities by reading the <ulink url="help:/tdeprint/index.html">&tdeprint; Handbook locally</ulink> or at the <ulink url="http://printing.kde.org/">&tdeprint; Website</ulink> where there are documents online (<acronym>HTML</acronym> and <acronym>PDF</acronym>),containing <ulink url="http://printing.kde.org/documentation/tutorials/">Tutorials</ulink>, as well as <ulink url="http://printing.kde.org/faq/">FAQs</ulink> and Tips and Tricks related to printing in general.</para>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/rlan.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/rlan.docbook
index 5c486134867..ca2c8100b17 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/rlan.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/rlan.docbook
@@ -1,28 +1,11 @@
 <article lang="&language;" id="rlan">
-<title
->rlan</title>
+<title>rlan</title>
 <articleinfo>
 <authorgroup>
-<corpauthor
->The &kde; team</corpauthor>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<corpauthor>The &kde; team</corpauthor>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
-<para
->Not yet documented</para>
+<para>Not yet documented</para>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/rlogin.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/rlogin.docbook
index 71ada32f0c5..5a97809c265 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/rlogin.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/rlogin.docbook
@@ -1,62 +1,22 @@
 <article lang="&language;" id="rlogin">
-<title
->rlogin</title>
+<title>rlogin</title>
 <articleinfo>
 <authorgroup>
-<author
-><personname
-><firstname
->Christian</firstname
-><surname
->Bunting</surname
-></personname
-></author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author><personname><firstname>Christian</firstname><surname>Bunting</surname></personname></author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
-<para
->Using &konqueror; you can start up an <command
->rlogin</command
-> session with a server hosting the rlogin service.</para>
+<para>Using &konqueror; you can start up an <command>rlogin</command> session with a server hosting the rlogin service.</para>
 
-<para
->To use this tdeioslave feature, in the &konqueror; <acronym
->URL</acronym
-> bar, type <userinput
->rlogin:/host_to_connect_to</userinput
-></para>
+<para>To use this tdeioslave feature, in the &konqueror; <acronym>URL</acronym> bar, type <userinput>rlogin:/host_to_connect_to</userinput></para>
 
-<para
->This will initialise &konsole; with an <command
->rlogin</command
-> session, prompting you for your password.</para>
+<para>This will initialise &konsole; with an <command>rlogin</command> session, prompting you for your password.</para>
 
-<para
->The <command
->rlogin</command
-> tdeioslave uses the username of the account you are currently using in &kde;.</para>
+<para>The <command>rlogin</command> tdeioslave uses the username of the account you are currently using in &kde;.</para>
 
-<para
->After you have successfully entered your password, you can begin your remote session.</para>
+<para>After you have successfully entered your password, you can begin your remote session.</para>
 
-<para
->See the manual: <ulink url="man:/rlogin"
->rlogin</ulink
->. </para>
+<para>See the manual: <ulink url="man:/rlogin">rlogin</ulink>. </para>
 
 
 <!-- By Christian Bunting (need to ask if he wants crediting and email) -->
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/sftp.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/sftp.docbook
index 6783abb2839..3de4eed416d 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/sftp.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/sftp.docbook
@@ -1,41 +1,13 @@
 <article lang="&language;" id="sftp">
-<title
->sftp</title>
+<title>sftp</title>
 <articleinfo>
 <authorgroup>
-<author
->&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
-<para
-><acronym
->SFTP</acronym
-> is a Secure file transfer protocol. <command
->sftp</command
-> is an interactive file transfer program, similar to ftp, but it performs all operations over an encrypted <command
->ssh</command
-> transport. It may use many of the features of <command
->ssh</command
->, including public key authentication and compression.</para>
+<para><acronym>SFTP</acronym> is a Secure file transfer protocol. <command>sftp</command> is an interactive file transfer program, similar to ftp, but it performs all operations over an encrypted <command>ssh</command> transport. It may use many of the features of <command>ssh</command>, including public key authentication and compression.</para>
 
-<para
->See the manual: <ulink url="man:/sftp"
->sftp</ulink
->. </para>
+<para>See the manual: <ulink url="man:/sftp">sftp</ulink>. </para>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/smb.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/smb.docbook
index 163e83eb98b..20150cbf54b 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/smb.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/smb.docbook
@@ -1,108 +1,26 @@
 <article lang="&language;" id="smb">
-<title
->SMB</title>
+<title>SMB</title>
 <articleinfo>
 <authorgroup>
-<author
->&Alexander.Neundorf; &Alexander.Neundorf.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Alexander.Neundorf; &Alexander.Neundorf.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
-<para
->The smb ioslave enables you to browse the shares of a &Windows; (or Samba) network. </para>
+<para>The smb ioslave enables you to browse the shares of a &Windows; (or Samba) network. </para>
 
-<para
->To see the workgroups, enter <userinput
-><command
->smb:/</command
-></userinput
->. </para>
-<para
-><userinput
-><command
->smb:/</command
-><replaceable
->a_workgroup</replaceable
-></userinput
-> will list the hosts in this workgroup. </para>
-<para
->To see the shares of a host, enter <userinput
-><command
->smb://</command
-><replaceable
->the_host</replaceable
-></userinput
-> or <userinput
-><command
->smb:/</command
-><replaceable
->a_workgroup</replaceable
->/<replaceable
->the_host</replaceable
-></userinput
->. </para>
-<para
->To access a share directly enter <userinput
-><command
->smb://</command
-><replaceable
->the_host/the_share</replaceable
-></userinput
-> or <userinput
-><command
->smb:/</command
-><replaceable
->a_workgroup</replaceable
->/<replaceable
->the_host</replaceable
->/<replaceable
->the_share</replaceable
-></userinput
-> </para>
+<para>To see the workgroups, enter <userinput><command>smb:/</command></userinput>. </para>
+<para><userinput><command>smb:/</command><replaceable>a_workgroup</replaceable></userinput> will list the hosts in this workgroup. </para>
+<para>To see the shares of a host, enter <userinput><command>smb://</command><replaceable>the_host</replaceable></userinput> or <userinput><command>smb:/</command><replaceable>a_workgroup</replaceable>/<replaceable>the_host</replaceable></userinput>. </para>
+<para>To access a share directly enter <userinput><command>smb://</command><replaceable>the_host/the_share</replaceable></userinput> or <userinput><command>smb:/</command><replaceable>a_workgroup</replaceable>/<replaceable>the_host</replaceable>/<replaceable>the_share</replaceable></userinput> </para>
 
-<para
->The smb ioslave is a wrapper around the command line tool <command
->smbclient</command
->, which is part of the Samba package. This means you need to have Samba installed to use this ioslave. </para>
+<para>The smb ioslave is a wrapper around the command line tool <command>smbclient</command>, which is part of the Samba package. This means you need to have Samba installed to use this ioslave. </para>
 
-<para
->To be able to authenticate to &Windows; <acronym
->NT</acronym
-> Domain Controllers, you need at least Samba 2.0. To access the shares of &Windows; 2000 machines, you need at least Samba 2.0.7. To be able to write to Windows shares, you need at least Samba 2.2.4 or the patch from <ulink url="http://lisa-home.sourceforge.net/smbclientpatch.html"
->http://lisa-home.sourceforge.net/smbclientpatch.html</ulink
->. </para>
+<para>To be able to authenticate to &Windows; <acronym>NT</acronym> Domain Controllers, you need at least Samba 2.0. To access the shares of &Windows; 2000 machines, you need at least Samba 2.0.7. To be able to write to Windows shares, you need at least Samba 2.2.4 or the patch from <ulink url="http://lisa-home.sourceforge.net/smbclientpatch.html">http://lisa-home.sourceforge.net/smbclientpatch.html</ulink>. </para>
 
-<para
->You can set your default user name and password in the &kcontrol; in <menuchoice
-><guisubmenu
->Network</guisubmenu
-><guimenuitem
->Windows Shares</guimenuitem
-></menuchoice
->. This is especially useful if you are a member of a &Windows; <acronym
->NT</acronym
-> domain. There you can also set your workgroup name, but in most cases this is not required. </para>
+<para>You can set your default user name and password in the &kcontrol; in <menuchoice><guisubmenu>Network</guisubmenu><guimenuitem>Windows Shares</guimenuitem></menuchoice>. This is especially useful if you are a member of a &Windows; <acronym>NT</acronym> domain. There you can also set your workgroup name, but in most cases this is not required. </para>
 
-<para
->This ioslave is tested and developed using mainly Samba 2.0.7, but other versions of Samba should work too. </para>
+<para>This ioslave is tested and developed using mainly Samba 2.0.7, but other versions of Samba should work too. </para>
 
-<para
->Author: Alexander Neundorf <email
->neundorf@kde.org</email
-> </para>
+<para>Author: Alexander Neundorf <email>neundorf@kde.org</email> </para>
 </article>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/smtp.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/smtp.docbook
index 7a9796c0014..e9fc2e10812 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/smtp.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/smtp.docbook
@@ -1,33 +1,13 @@
 <article lang="&language;" id="smtp">
-<title
->smtp</title>
+<title>smtp</title>
 <articleinfo>
 <authorgroup>
-<author
->&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
-<para
->A protocol to send mail from the client workstation to the mail server. </para>
+<para>A protocol to send mail from the client workstation to the mail server. </para>
 
-<para
->See : <ulink url="http://cr.yp.to/smtp.html"
->Simple Mail Transfer Protocol </ulink
->. </para>
+<para>See : <ulink url="http://cr.yp.to/smtp.html">Simple Mail Transfer Protocol </ulink>. </para>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/tar.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/tar.docbook
index b625adf9f4f..2c1078dffc5 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/tar.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/tar.docbook
@@ -1,33 +1,13 @@
 <article lang="&language;" id="tar">
-<title
->tar</title>
+<title>tar</title>
 <articleinfo>
 <authorgroup>
-<author
->&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
-<para
->An archiving program designed to store and extract files from an archive file known as a tarfile. A tarfile may be made on a tape drive, however, it is also common to write a tarfile to a normal file. </para>
+<para>An archiving program designed to store and extract files from an archive file known as a tarfile. A tarfile may be made on a tape drive, however, it is also common to write a tarfile to a normal file. </para>
 
-<para
->See the manual: <ulink url="man:/tar"
->tar</ulink
->. </para>
+<para>See the manual: <ulink url="man:/tar">tar</ulink>. </para>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/telnet.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/telnet.docbook
index 27f5e5d46a9..09cbc6144f4 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/telnet.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/telnet.docbook
@@ -1,33 +1,13 @@
 <article lang="&language;" id="telnet">
-<title
->telnet</title>
+<title>telnet</title>
 <articleinfo>
 <authorgroup>
-<author
->&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
-<para
->The network terminal protocol (TELNET) allows a user to log in on any other computer on the network supporting TELNET. </para>
+<para>The network terminal protocol (TELNET) allows a user to log in on any other computer on the network supporting TELNET. </para>
 
-<para
->See the manual: <ulink url="man:/telnet"
->telnet</ulink
->. </para>
+<para>See the manual: <ulink url="man:/telnet">telnet</ulink>. </para>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/thumbnail.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/thumbnail.docbook
index bc9d6f408d5..7e0649c07c5 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/thumbnail.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/thumbnail.docbook
@@ -1,49 +1,17 @@
 <article lang="&language;" id="thumbnail">
-<title
->thumbnail</title>
+<title>thumbnail</title>
 <articleinfo>
 <authorgroup>
-<author
->&Carsten.Pfeiffer; &Carsten.Pfeiffer.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Carsten.Pfeiffer; &Carsten.Pfeiffer.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </articleinfo>
-<para
->The thumbnail tdeioslave is used by &kde; for network transparent and persistent generation of thumbnails.</para>
+<para>The thumbnail tdeioslave is used by &kde; for network transparent and persistent generation of thumbnails.</para>
 
-<para
->The thumbnail tdeioslave uses plugins to generate the actual thumbnails. You can enable viewing of these thumbnails from the <menuchoice
-><guimenu
->View</guimenu
-> <guisubmenu
->Preview</guisubmenu
-></menuchoice
-> submenu, available in &konqueror; in file manager mode.</para>
+<para>The thumbnail tdeioslave uses plugins to generate the actual thumbnails. You can enable viewing of these thumbnails from the <menuchoice><guimenu>View</guimenu> <guisubmenu>Preview</guisubmenu></menuchoice> submenu, available in &konqueror; in file manager mode.</para>
 
-<para
->The thumbnail tdeioslave is not directly useful to a user, but if you are a developer, you can use it within your own applications to create file previews.</para>
+<para>The thumbnail tdeioslave is not directly useful to a user, but if you are a developer, you can use it within your own applications to create file previews.</para>
 
-<para
->See the documentation in the sources for more information. You will find these at <filename
->$<envar
->TDEDIR</envar
->/include/tdeio/thumbcreator.h</filename
-> or in the source folder <filename class="directory"
->tdebase/tdeioslave/thumbnail</filename
-></para>
+<para>See the documentation in the sources for more information. You will find these at <filename>$<envar>TDEDIR</envar>/include/tdeio/thumbcreator.h</filename> or in the source folder <filename class="directory">tdebase/tdeioslave/thumbnail</filename></para>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/webdav.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/webdav.docbook
index 5fc85060f49..ca9544d7dba 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/webdav.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/webdav.docbook
@@ -1,85 +1,40 @@
 <article lang="&language;" id="webdav">
-<title
->webdav</title>
+<title>webdav</title>
 <articleinfo>
 <authorgroup>
-<author
->&Hamish.Rodda; &Hamish.Rodda.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Hamish.Rodda; &Hamish.Rodda.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-01-21</date>
+<date>2002-01-21</date>
 </articleinfo>
 
-<para
-><acronym
->WebDAV</acronym
-> is a <emphasis
->D</emphasis
->istributed <emphasis
->A</emphasis
->uthoring and <emphasis
->V</emphasis
->ersioning protocol for the World Wide Web. It allows for easy management of documents and scripts on a <ulink url="help:/tdeioslave/webdav.html"
->http</ulink
-> server, and has additional features designed to simplify version management amongst multiple authors.</para>
+<para><acronym>WebDAV</acronym> is a <emphasis>D</emphasis>istributed <emphasis>A</emphasis>uthoring and <emphasis>V</emphasis>ersioning protocol for the World Wide Web. It allows for easy management of documents and scripts on a <ulink url="help:/tdeioslave/webdav.html">http</ulink> server, and has additional features designed to simplify version management amongst multiple authors.</para>
 
-<para
->Usage of this protocol is simple. Type the location you want to view, similar to a <acronym
->http</acronym
-> URL except for the webdav:// protocol name at the start. An example is <userinput
->webdav://<replaceable
->www.hostname.com/path/</replaceable
-></userinput
->. If you specify a folder name, a list of files and folders will be displayed, and you can manipulate these folders and files just as you would with any other filesystem.</para>
+<para>Usage of this protocol is simple. Type the location you want to view, similar to a <acronym>http</acronym> URL except for the webdav:// protocol name at the start. An example is <userinput>webdav://<replaceable>www.hostname.com/path/</replaceable></userinput>. If you specify a folder name, a list of files and folders will be displayed, and you can manipulate these folders and files just as you would with any other filesystem.</para>
 
 <variablelist>
-<title
->WebDAV Features</title>
+<title>WebDAV Features</title>
 <varlistentry>
-<term
->Locking</term>
+<term>Locking</term>
 <listitem>
-<para
->File locking allows users to lock a file, informing others that they are currently working on this file. This way, editing can be done without fear that the changes may be overwritten by another person who is also editing the same document.</para>
+<para>File locking allows users to lock a file, informing others that they are currently working on this file. This way, editing can be done without fear that the changes may be overwritten by another person who is also editing the same document.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->Source file access</term>
+<term>Source file access</term>
 <listitem>
-<para
-><acronym
->WebDAV</acronym
-> allows access to the script which is called to produce a specific page, so changes can be made to the script itself.</para>
+<para><acronym>WebDAV</acronym> allows access to the script which is called to produce a specific page, so changes can be made to the script itself.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->Per-document property support</term>
+<term>Per-document property support</term>
 <listitem>
-<para
->Arbitrary properties may be set to assist identification of a document, such as the author.</para>
+<para>Arbitrary properties may be set to assist identification of a document, such as the author.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->To take advantage of these additional capabilities, you will need an application which supports them. No application currently supports them through this tdeioslave.</para>
+<para>To take advantage of these additional capabilities, you will need an application which supports them. No application currently supports them through this tdeioslave.</para>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/webdavs.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/webdavs.docbook
index 8918fe1986c..659f6d8fdf5 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/webdavs.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/webdavs.docbook
@@ -1,36 +1,16 @@
 <article lang="&language;" id="webdavs">
-<title
->webdavs</title>
+<title>webdavs</title>
 <articleinfo>
 <authorgroup>
-<author
->&Hamish.Rodda; &Hamish.Rodda.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Hamish.Rodda; &Hamish.Rodda.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-01-21</date>
+<date>2002-01-21</date>
 
 
 </articleinfo>
 
-<para
->WebDAVS is the <ulink url="help:/tdeioslave/webdav.html"
->WebDAV</ulink
-> protocol encrypted via SSL.</para>
+<para>WebDAVS is the <ulink url="help:/tdeioslave/webdav.html">WebDAV</ulink> protocol encrypted via SSL.</para>
 
 </article>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeprint/add-printer-wiz.docbook b/tde-i18n-en_GB/docs/tdebase/tdeprint/add-printer-wiz.docbook
index 1ece07bc322..ff7d67d277b 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeprint/add-printer-wiz.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeprint/add-printer-wiz.docbook
@@ -1,341 +1,200 @@
 <chapter id="add-printer-wizard-2">
-<title
->The <quote
->Add Printer Wizard</quote
-> for &CUPS;</title>
-
-<para
->Clicking on the leftmost icon on the toolbar <inlinemediaobject
-><imageobject
-> <imagedata fileref="cr32-action-wizard.png" format="PNG"/></imageobject
-> </inlinemediaobject
-> in the upper part of the window starts the <quote
->Add Printer Wizard</quote
->.</para>
-
-<para
->This wizard steps you through various screens to install a new printer. At present this Wizard works for &CUPS; and the <acronym
->RLPR</acronym
-> environment module. The number of steps depend on the actual print-subsystem which is active and available to you on your box.</para>
+<title>The <quote>Add Printer Wizard</quote> for &CUPS;</title>
+
+<para>Clicking on the leftmost icon on the toolbar <inlinemediaobject><imageobject> <imagedata fileref="cr32-action-wizard.png" format="PNG"/></imageobject> </inlinemediaobject> in the upper part of the window starts the <quote>Add Printer Wizard</quote>.</para>
+
+<para>This wizard steps you through various screens to install a new printer. At present this Wizard works for &CUPS; and the <acronym>RLPR</acronym> environment module. The number of steps depend on the actual print-subsystem which is active and available to you on your box.</para>
 
 <sect1>
-<title
->Starting</title>
+<title>Starting</title>
 
-<para
->The welcome screen informs you that you can go back any time to change a setting. </para>
+<para>The welcome screen informs you that you can go back any time to change a setting. </para>
 
 <screenshot>
-<screeninfo
->The &tdeprint; wizard introduction screen</screeninfo>
+<screeninfo>The &tdeprint; wizard introduction screen</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsaddprinterwizard1.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->The introduction screen of the printer wizard</phrase
-></textobject>
+<phrase>The introduction screen of the printer wizard</phrase></textobject>
 </mediaobject>
 </screenshot>
 
 </sect1>
 <sect1 id="backend-selection">
-<title
->Backend Selection</title>
+<title>Backend Selection</title>
 
-<para
->Choose the <quote
->backend</quote
-> protocol that &CUPS; is supposed to use with your new printer. There are:</para>
+<para>Choose the <quote>backend</quote> protocol that &CUPS; is supposed to use with your new printer. There are:</para>
 
 <itemizedlist>
 <listitem>
-<para
->local printer (serial, parallel, <acronym
->USB</acronym
->)</para>
+<para>local printer (serial, parallel, <acronym>USB</acronym>)</para>
 </listitem>
 <listitem>
-<para
->remote <acronym
->LPD</acronym
-> queue</para>
+<para>remote <acronym>LPD</acronym> queue</para>
 </listitem>
 <listitem>
-<para
-><acronym
->SMB</acronym
-> shared printer (&Windows;)</para>
+<para><acronym>SMB</acronym> shared printer (&Windows;)</para>
 </listitem>
 <listitem>
-<para
->Network Printer (<acronym
->TCP</acronym
->, &HP; JetDirect, AppSocket)</para>
+<para>Network Printer (<acronym>TCP</acronym>, &HP; JetDirect, AppSocket)</para>
 </listitem>
 <listitem>
-<para
->Network printer with &IPP; (&IPP;/<acronym
->HTTP</acronym
->)</para>
+<para>Network printer with &IPP; (&IPP;/<acronym>HTTP</acronym>)</para>
 </listitem>
 <listitem>
-<para
->File printer</para>
+<para>File printer</para>
 </listitem>
 <listitem>
-<para
->serial fax /modem printer</para>
+<para>serial fax /modem printer</para>
 </listitem>
 <listitem>
-<para
->Class of Printers</para>
+<para>Class of Printers</para>
 </listitem>
 </itemizedlist>
 
-<para
->If some choices are greyed out, they are not available. For example, you may have no FAX backend software or no modem installed to use it.</para>
+<para>If some choices are greyed out, they are not available. For example, you may have no FAX backend software or no modem installed to use it.</para>
 
 <screenshot>
-<screeninfo
->Choosing your Printer system</screeninfo>
+<screeninfo>Choosing your Printer system</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsaddprinterwizard2_backendselection.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->Choosing your Printer System</phrase
-></textobject>
+<phrase>Choosing your Printer System</phrase></textobject>
 </mediaobject>
 </screenshot>
 
 </sect1>
 
 <sect1 id="direct-network-settings">
-<title
->Direct Network Setting</title>
+<title>Direct Network Setting</title>
 
-<para
->The contents of your next screen is dependent on your choice in the previous screen. If you know the details, just type them in to configure your network settings directly.</para>
+<para>The contents of your next screen is dependent on your choice in the previous screen. If you know the details, just type them in to configure your network settings directly.</para>
 
-<para
->In other cases the wizard can scan the network for you, to help you decide which setting could be useful. </para>
+<para>In other cases the wizard can scan the network for you, to help you decide which setting could be useful. </para>
 
 <screenshot>
-<screeninfo
->&tdeprint; wizard network scan</screeninfo>
+<screeninfo>&tdeprint; wizard network scan</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsaddprinterwizard3_networkscan.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->In the &tdeprint; wizard, you can enter network details directly, or you can scan the network automatically.</phrase
-></textobject>
+<phrase>In the &tdeprint; wizard, you can enter network details directly, or you can scan the network automatically.</phrase></textobject>
 </mediaobject>
 </screenshot>
 
 </sect1>
 <sect1 id="information-retrieval-by-network-scanning">
-<title
->Information Retrieval by Scanning the Network</title>
-
-<para
->If you use one of the network connections (remote <acronym
->LPD</acronym
->, <acronym
->SMB</acronym
->, remote &CUPS;, network printer with &IPP;), you have an option for scanning the network. Be careful when applying this; in some environments network scanning is considered to be hostile and harmful!</para>
-
-<para
->In the case of <acronym
->SMB</acronym
->, &tdeprint; will use the Samba utilities <command
->nmblookup</command
-> and <command
->smbclient</command
-> (which need to be installed for this to work) to retrieve the information it presents in a tree structure.</para>
-
-<para
->In the case of &IPP; (Port 631) and <acronym
->TCP</acronym
-> Network/AppSocket (Port 9100) &tdeprint; will try to open the port and, if successful, send an <command
->ipp-get-printer-attribute</command
-> request to the printer. For newer &HP; printers the latter usually works, because they support both AppSocket and &IPP;.</para>
-
-<para
->Some printers or manufacturers use other port numbers for direct TCP/IP printing. You may need to look up which one to use. The <guilabel
->Settings</guilabel
-> button in the dialogue lets you configure your scan, including <acronym
->IP</acronym
-> addresses, ports and timeout to use.</para>
-
-<para
->Once again: be careful not to be mistaken for an intruder on your network, if you use the scanning technique.</para>
+<title>Information Retrieval by Scanning the Network</title>
+
+<para>If you use one of the network connections (remote <acronym>LPD</acronym>, <acronym>SMB</acronym>, remote &CUPS;, network printer with &IPP;), you have an option for scanning the network. Be careful when applying this; in some environments network scanning is considered to be hostile and harmful!</para>
+
+<para>In the case of <acronym>SMB</acronym>, &tdeprint; will use the Samba utilities <command>nmblookup</command> and <command>smbclient</command> (which need to be installed for this to work) to retrieve the information it presents in a tree structure.</para>
+
+<para>In the case of &IPP; (Port 631) and <acronym>TCP</acronym> Network/AppSocket (Port 9100) &tdeprint; will try to open the port and, if successful, send an <command>ipp-get-printer-attribute</command> request to the printer. For newer &HP; printers the latter usually works, because they support both AppSocket and &IPP;.</para>
+
+<para>Some printers or manufacturers use other port numbers for direct TCP/IP printing. You may need to look up which one to use. The <guilabel>Settings</guilabel> button in the dialogue lets you configure your scan, including <acronym>IP</acronym> addresses, ports and timeout to use.</para>
+
+<para>Once again: be careful not to be mistaken for an intruder on your network, if you use the scanning technique.</para>
 
 <screenshot>
-<screeninfo
->&tdeprint; wizard network configuration dialogue</screeninfo>
+<screeninfo>&tdeprint; wizard network configuration dialogue</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsaddprinterwizard4_networkscan_config.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->In the &tdeprint; wizard, you can enter parameters to have the wizard scan parts of your network.</phrase
-></textobject>
+<phrase>In the &tdeprint; wizard, you can enter parameters to have the wizard scan parts of your network.</phrase></textobject>
 </mediaobject>
 </screenshot>
 
 </sect1>
 <sect1 id="printer-model-selection">
-<title
->Printer Model Selection</title>
+<title>Printer Model Selection</title>
 
-<para
->The hardest part is probably the <quote
->Printer Model Selection</quote
->. In former years the situation was difficult, because there were hardly any drivers to find. The difficulty now is there are too many; though some of them are very good, many are quite broken. </para>
+<para>The hardest part is probably the <quote>Printer Model Selection</quote>. In former years the situation was difficult, because there were hardly any drivers to find. The difficulty now is there are too many; though some of them are very good, many are quite broken. </para>
 
-<para
->If you have a current <quote
->database</quote
-> of available drivers on your system, select the manufacturer in the left part of the window first, then the device model in the right part. This split window shows all &PPD;s found by &CUPS; in its standard repository of installable &PPD;s. This repository normally is <filename class="directory"
->/usr/share/cups/model/</filename
->. If you want your driver to be found automatically by &CUPS; and &tdeprint;, place it in there.</para>
+<para>If you have a current <quote>database</quote> of available drivers on your system, select the manufacturer in the left part of the window first, then the device model in the right part. This split window shows all &PPD;s found by &CUPS; in its standard repository of installable &PPD;s. This repository normally is <filename class="directory">/usr/share/cups/model/</filename>. If you want your driver to be found automatically by &CUPS; and &tdeprint;, place it in there.</para>
 
 <!-- Insert Screenshot here:  -->
 
 </sect1>
 
 <sect1 id="driver-selection">
-<title
->Driver Selection</title>
+<title>Driver Selection</title>
 
-<para
->On the next screen you will see a description of the driver selected previously. This description is extracted from the actual &PPD; used.</para>
+<para>On the next screen you will see a description of the driver selected previously. This description is extracted from the actual &PPD; used.</para>
 
 <warning>
-<para
->For a real &PostScript; printer <emphasis
->never</emphasis
-> try to install a <quote
->Foomatic</quote
-> or <quote
->Gimp-Print</quote
-> &PPD;, even if it is offered. You won't be happy with it. Instead find the original &PPD; from the manufacturer, preferably the one written for &Windows; NT and use it. </para>
+<para>For a real &PostScript; printer <emphasis>never</emphasis> try to install a <quote>Foomatic</quote> or <quote>Gimp-Print</quote> &PPD;, even if it is offered. You won't be happy with it. Instead find the original &PPD; from the manufacturer, preferably the one written for &Windows; NT and use it. </para>
 </warning>
 
-<para
->Some &Linux; distributions have supplied for &CUPS; every possible combination of <application
->Ghostscript</application
-> filters and <quote
->foomatic</quote
-> &PPD; files they could find on the net. Many of these are quite useless; they were generated a year ago, when the people at <ulink url="http://www.linuxprinting.org"
->www.linuxprinting.org</ulink
-> began their first experiments with supplying third party &PPD;s for &CUPS;. Although dubbed <quote
->Alpha</quote
-> at the time, these started to take on a life of their own and can now be found at various places on the net, doing &CUPS; no favours.</para>
+<para>Some &Linux; distributions have supplied for &CUPS; every possible combination of <application>Ghostscript</application> filters and <quote>foomatic</quote> &PPD; files they could find on the net. Many of these are quite useless; they were generated a year ago, when the people at <ulink url="http://www.linuxprinting.org">www.linuxprinting.org</ulink> began their first experiments with supplying third party &PPD;s for &CUPS;. Although dubbed <quote>Alpha</quote> at the time, these started to take on a life of their own and can now be found at various places on the net, doing &CUPS; no favours.</para>
 
-<para
->If you are not sure which ones to use go to:</para>
+<para>If you are not sure which ones to use go to:</para>
 
 <itemizedlist>
 <listitem>
-<para
-><ulink
-url="http://www.linuxprinting.org"
->http://www.linuxprinting.org</ulink>
+<para><ulink
+url="http://www.linuxprinting.org">http://www.linuxprinting.org</ulink>
 </para>
 </listitem>
 
 <listitem>
 <para>
-<ulink url="http://www.cups.org"
->http://www.cups.org</ulink>
+<ulink url="http://www.cups.org">http://www.cups.org</ulink>
 </para>
 </listitem>
 </itemizedlist>
 
-<para
->And ask for help. At a later stage, a document detailing the differences between the different driver and &PPD; models will appear at <ulink url="http://tdeprint.sourceforge.net"
->http://tdeprint.sourceforge.net/</ulink
-> Watch out for this!</para>
+<para>And ask for help. At a later stage, a document detailing the differences between the different driver and &PPD; models will appear at <ulink url="http://tdeprint.sourceforge.net">http://tdeprint.sourceforge.net/</ulink> Watch out for this!</para>
 
-<para
->Via the <guibutton
->Other...</guibutton
-> button you are able to retrieve any &PPD; located somewhere on your available file system.</para>
+<para>Via the <guibutton>Other...</guibutton> button you are able to retrieve any &PPD; located somewhere on your available file system.</para>
 
 <!-- Insert Screenshot here:  -->
 
 </sect1>
 <sect1 id="printer-test-and-finding-settings">
-<title
->Printer Test and Finding the Right Settings</title>
+<title>Printer Test and Finding the Right Settings</title>
 
-<para
->Specify your first driver settings now. The most important one is the default paper size. In many cases this is set to <quote
->Letter</quote
->. If you live in an <quote
->A4</quote
-> country and don't want your first test page to jam: now is the time to prevent this. </para>
+<para>Specify your first driver settings now. The most important one is the default paper size. In many cases this is set to <quote>Letter</quote>. If you live in an <quote>A4</quote> country and don't want your first test page to jam: now is the time to prevent this. </para>
 
-<para
->You are ready to start a test print. Hit the <guibutton
->Test</guibutton
-> button.</para>
+<para>You are ready to start a test print. Hit the <guibutton>Test</guibutton> button.</para>
 
 <!-- Insert Screenshot here: -->
 
 </sect1>
 
 <sect1 id="banner-selection">
-<title
->Banner Selection</title>
+<title>Banner Selection</title>
 
-<para
->The last but one screen lets you select whether you want banners, and which ones you want to use, to mark the beginning and/or end of every printjob on that printer. You can also select and deselect banners before printing in the job options dialogues.</para>
+<para>The last but one screen lets you select whether you want banners, and which ones you want to use, to mark the beginning and/or end of every printjob on that printer. You can also select and deselect banners before printing in the job options dialogues.</para>
 
-<para
->If you need to use custom banners, copy them into <filename class="directory"
->/usr/share/cups/banners/</filename
-> to make them available for selection. They must be &PostScript; files, however.</para>
+<para>If you need to use custom banners, copy them into <filename class="directory">/usr/share/cups/banners/</filename> to make them available for selection. They must be &PostScript; files, however.</para>
 
 <!-- Insert Screenshot here: -->
 
 </sect1>
 
 <sect1 id="baptizing-your-printer">
-<title
->Finally: Baptising Your New Printer</title>
-
-<para
->The last screen lets you insert a name for your new printer.</para>
-
-<para
->The name must start with a letter and may contain numbers and underscores with a maximum size of 128 characters. Conform to this if you want to avoid erratic behaviour of your &CUPS; daemon. The printer names in &CUPS; are <emphasis
->not</emphasis
-> case sensitive! This is a requirement of &IPP;. So the names <systemitem class="resource"
->DANKA_infotec</systemitem
->, <systemitem class="resource"
->Danka_Infotec</systemitem
-> and <systemitem class="resource"
->danka_infotec</systemitem
-> all represent the same printer.</para>
+<title>Finally: Baptising Your New Printer</title>
+
+<para>The last screen lets you insert a name for your new printer.</para>
+
+<para>The name must start with a letter and may contain numbers and underscores with a maximum size of 128 characters. Conform to this if you want to avoid erratic behaviour of your &CUPS; daemon. The printer names in &CUPS; are <emphasis>not</emphasis> case sensitive! This is a requirement of &IPP;. So the names <systemitem class="resource">DANKA_infotec</systemitem>, <systemitem class="resource">Danka_Infotec</systemitem> and <systemitem class="resource">danka_infotec</systemitem> all represent the same printer.</para>
 
 <!-- Insert Screenshot here: -->
 
 </sect1>
 
 <sect1 id="final-confirmation-screen">
-<title
->The Final Confirmation Screen</title>
+<title>The Final Confirmation Screen</title>
 
-<para
-> 
+<para> 
 <!-- Insert Screenshot here: -->
 </para>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeprint/cups-config.docbook b/tde-i18n-en_GB/docs/tdebase/tdeprint/cups-config.docbook
index 49e387f3a2f..bc3580e81bd 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeprint/cups-config.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeprint/cups-config.docbook
@@ -1,309 +1,184 @@
 <chapter id="cups-configuration">
-<title
->Print Server Configuration: CUPS</title>
-
-<para
->Start the print server configuration (now that you have chosen &CUPS;, this is equivalent to the configuration of the &CUPS; daemon) by clicking on the appropriate button. You can find it by moving the mouse slowly over the buttons and reading the tooltips. It should be the 11th from the left , or third from the right; its icon is a <guiicon
->wrench</guiicon
->.</para>
-
-<para
->The &CUPS; Server Configuration window pops up. It gives you a structured view of all the settings that apply to the &CUPS; daemon. The configuration file for that daemon is normally located in <filename
->/etc/cups/cupsd.conf</filename
->. This is a plain <acronym
->ASCII</acronym
-> file with a syntax similar to the configuration file of the <application
->Apache</application
-> web server. It is a good idea to create a backup copy, just in case something goes wrong with the configuration through &tdeprint;/&CUPS; Server Configuration dialogues:</para>
-
-<screen
-><userinput
-><command
->cp</command
-> <filename
->/etc/cups/cupsd.conf</filename
-> <filename
->/etc/cups/cupsd.conf.bak</filename
-></userinput
-></screen>
-
-<para
->As this graphical user interface to edit the configuration file is such a new feature, you should have the second chance of resorting to the original file. So back it up, please.</para>
+<title>Print Server Configuration: CUPS</title>
+
+<para>Start the print server configuration (now that you have chosen &CUPS;, this is equivalent to the configuration of the &CUPS; daemon) by clicking on the appropriate button. You can find it by moving the mouse slowly over the buttons and reading the tooltips. It should be the 11th from the left , or third from the right; its icon is a <guiicon>wrench</guiicon>.</para>
+
+<para>The &CUPS; Server Configuration window pops up. It gives you a structured view of all the settings that apply to the &CUPS; daemon. The configuration file for that daemon is normally located in <filename>/etc/cups/cupsd.conf</filename>. This is a plain <acronym>ASCII</acronym> file with a syntax similar to the configuration file of the <application>Apache</application> web server. It is a good idea to create a backup copy, just in case something goes wrong with the configuration through &tdeprint;/&CUPS; Server Configuration dialogues:</para>
+
+<screen><userinput><command>cp</command> <filename>/etc/cups/cupsd.conf</filename> <filename>/etc/cups/cupsd.conf.bak</filename></userinput></screen>
+
+<para>As this graphical user interface to edit the configuration file is such a new feature, you should have the second chance of resorting to the original file. So back it up, please.</para>
 
 <sect1 id="quick-help">
-<title
->Quick Help</title>
-
-<para
->One very nice feature is the <quote
->Quick Help</quote
-> available. If you click on the little question mark (<guiicon
->What's this?</guiicon
->) on your window title bar, you'll see the cursor changing its form. Now click on a <command
->cupsd</command
-> configuration setting field to find out what it means and what your options are. In most cases you should understand the meaning immediately, otherwise turn to the excellent &CUPS; documentation. (If your &CUPS; Daemon is running, you have it online on your own host at <ulink url="http://localhost:631/documentation.html"
->http://localhost:631/documentation.html</ulink
->.</para>
-<para
->If &CUPS; is not running, but installed on your system you could find it in your own host's file system. The exact location depends on your &OS;, but on &Linux; the default is <filename class="directory"
->/usr/share/doc/cups/</filename
-> or <filename class="directory"
-> /usr/share/doc/cups/documentation.html</filename
->.</para>
+<title>Quick Help</title>
+
+<para>One very nice feature is the <quote>Quick Help</quote> available. If you click on the little question mark (<guiicon>What's this?</guiicon>) on your window title bar, you'll see the cursor changing its form. Now click on a <command>cupsd</command> configuration setting field to find out what it means and what your options are. In most cases you should understand the meaning immediately, otherwise turn to the excellent &CUPS; documentation. (If your &CUPS; Daemon is running, you have it online on your own host at <ulink url="http://localhost:631/documentation.html">http://localhost:631/documentation.html</ulink>.</para>
+<para>If &CUPS; is not running, but installed on your system you could find it in your own host's file system. The exact location depends on your &OS;, but on &Linux; the default is <filename class="directory">/usr/share/doc/cups/</filename> or <filename class="directory"> /usr/share/doc/cups/documentation.html</filename>.</para>
 
 </sect1>
 <sect1 id="longer-help">
-<title
->Longer Help</title>
+<title>Longer Help</title>
 
-<para
->For the best, most detailed and most recent information you should always refer to the original &CUPS; documentation. &CUPS; is, much like &kde; in a rapid development process. There are constantly new features being added. New features might for times be only configurable by directly editing the configuration files. The &tdeprint; &GUI; might not have caught up with &CUPS; development.</para>
+<para>For the best, most detailed and most recent information you should always refer to the original &CUPS; documentation. &CUPS; is, much like &kde; in a rapid development process. There are constantly new features being added. New features might for times be only configurable by directly editing the configuration files. The &tdeprint; &GUI; might not have caught up with &CUPS; development.</para>
 
-<para
->Just in case you want to look at the original configuration files of your &CUPS; system -- they are here:</para>
+<para>Just in case you want to look at the original configuration files of your &CUPS; system -- they are here:</para>
 
 <note>
-<para
->These paths are based on the default installation. Your &OS; may have installed them to a different prefix, for example, <filename class="directory"
->/usr/local/</filename
->, but the hierarchy should still match that shown below.</para>
+<para>These paths are based on the default installation. Your &OS; may have installed them to a different prefix, for example, <filename class="directory">/usr/local/</filename>, but the hierarchy should still match that shown below.</para>
 </note>
 
 <variablelist>
 <varlistentry>
-<term
-><filename class="directory"
->/etc/cups/</filename
-></term>
+<term><filename class="directory">/etc/cups/</filename></term>
 <listitem>
-<para
->The folder with the configuration files</para>
+<para>The folder with the configuration files</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><filename
->/etc/cups/cupsd.conf</filename
-></term>
+<term><filename>/etc/cups/cupsd.conf</filename></term>
 <listitem>
-<para
->The configuration file for the &CUPS; daemon</para>
+<para>The configuration file for the &CUPS; daemon</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><filename
->/etc/cups/printers.conf</filename
-></term>
+<term><filename>/etc/cups/printers.conf</filename></term>
 <listitem>
-<para
->The configuration file that contains the information about your locally installed printers.</para>
+<para>The configuration file that contains the information about your locally installed printers.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><filename class="directory"
->/etc/cups/ppd/</filename
-></term>
+<term><filename class="directory">/etc/cups/ppd/</filename></term>
 <listitem>
-<para
->The folder with &PPD; files of your installed printers.</para>
+<para>The folder with &PPD; files of your installed printers.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->The following links only work if your &CUPS; daemon is up and running. To access all the original &CUPS; documentation, go to:</para>
+<para>The following links only work if your &CUPS; daemon is up and running. To access all the original &CUPS; documentation, go to:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><ulink url="http://localhost:631/documentation.html"
->http://localhost:631/documentation.html</ulink
-></term>
+<term><ulink url="http://localhost:631/documentation.html">http://localhost:631/documentation.html</ulink></term>
 <listitem>
-<para
->A page with all the links to the other documents.</para>
+<para>A page with all the links to the other documents.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><ulink url="http://localhost:631/sam.html"
->http://localhost:631/sam.html</ulink
-></term>
+<term><ulink url="http://localhost:631/sam.html">http://localhost:631/sam.html</ulink></term>
 <listitem>
-<para
->Direct access to the &CUPS; Software Administrator Manual in <acronym
->HTML</acronym
-> format.</para>
+<para>Direct access to the &CUPS; Software Administrator Manual in <acronym>HTML</acronym> format.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><ulink url="http://localhost:631/sam.pdf"
->http://localhost:631/sam.pdf</ulink
-></term>
+<term><ulink url="http://localhost:631/sam.pdf">http://localhost:631/sam.pdf</ulink></term>
 <listitem>
-<para
->Direct access to the &CUPS; Software Administrator Manual in <acronym
->PDF</acronym
-> format.</para>
+<para>Direct access to the &CUPS; Software Administrator Manual in <acronym>PDF</acronym> format.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><ulink url="http://www.cups.org/documentation.html"
->http://www.cups.org/documentation.html</ulink
-></term>
+<term><ulink url="http://www.cups.org/documentation.html">http://www.cups.org/documentation.html</ulink></term>
 <listitem>
-<para
->The latest on line documentation from the &CUPS; web site.</para>
+<para>The latest on line documentation from the &CUPS; web site.</para>
 </listitem>
 </varlistentry>
 </variablelist>
-<para
->The following links give you access to the same files (probably icons and graphics will be missing) even if your CUPS daemon is not up and running. You need, however, CUPS installed on your system. (Some distributions might place the files somewhere else -- you're on your own then to find out where...) To access all the original CUPS documentation, go to:</para>
+<para>The following links give you access to the same files (probably icons and graphics will be missing) even if your CUPS daemon is not up and running. You need, however, CUPS installed on your system. (Some distributions might place the files somewhere else -- you're on your own then to find out where...) To access all the original CUPS documentation, go to:</para>
 
-<para
->This documentation is available even when the &CUPS; daemon is not installed, although you may find images and icons are missing when you view the <acronym
->HTML</acronym
-> files.</para>
+<para>This documentation is available even when the &CUPS; daemon is not installed, although you may find images and icons are missing when you view the <acronym>HTML</acronym> files.</para>
 
-<para
->As noted above, the hierarchy below should be intact, but your &OS; may have installed &CUPS; to a different location.</para>
+<para>As noted above, the hierarchy below should be intact, but your &OS; may have installed &CUPS; to a different location.</para>
 
 <variablelist>
 <varlistentry>
-<term
-><filename
->/usr/share/doc/cups/documentation.html</filename
-></term>
+<term><filename>/usr/share/doc/cups/documentation.html</filename></term>
 <listitem>
-<para
->A page with all the links to the other documents.</para>
+<para>A page with all the links to the other documents.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><filename
->/usr/share/doc/cups/sam.html</filename
-></term>
+<term><filename>/usr/share/doc/cups/sam.html</filename></term>
 <listitem>
-<para
->Direct access to the &CUPS; Software Administrator Manual in <acronym
->HTML</acronym
-> format.</para>
+<para>Direct access to the &CUPS; Software Administrator Manual in <acronym>HTML</acronym> format.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><filename
->/usr/share/doc/cups/sam.pdf</filename
-></term>
+<term><filename>/usr/share/doc/cups/sam.pdf</filename></term>
 <listitem>
-<para
->Direct access to the &CUPS; Software Administrator Manual in <acronym
->PDF</acronym
-> format.</para>
+<para>Direct access to the &CUPS; Software Administrator Manual in <acronym>PDF</acronym> format.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->There are a few WebSites and Newsgroups discussing &CUPS; (and &Linux; Printing in General) and giving help to newbies at:</para>
+<para>There are a few WebSites and Newsgroups discussing &CUPS; (and &Linux; Printing in General) and giving help to newbies at:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><ulink url="http://www.cups.org/newsgroups.php"
->http://www.cups.org/newsgroups.php</ulink
-></term>
+<term><ulink url="http://www.cups.org/newsgroups.php">http://www.cups.org/newsgroups.php</ulink></term>
 <listitem>
-<para
->The &CUPS; website.</para>
+<para>The &CUPS; website.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><ulink url="http://www.linuxprinting.org/newsportal/"
->http://www.linuxprinting.org/newsportal/</ulink
-></term>
+<term><ulink url="http://www.linuxprinting.org/newsportal/">http://www.linuxprinting.org/newsportal/</ulink></term>
 <listitem>
-<para
->LinuxPrinting.org, the home of the Linuxprinting HOWTO and the &Linux; Printer Database</para>
+<para>LinuxPrinting.org, the home of the Linuxprinting HOWTO and the &Linux; Printer Database</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->And finally, there will be a WebSite for &tdeprint; and related documentation, at <ulink url="http://tdeprint.sourceforge.net/"
-> http://tdeprint.sourceforge.net/</ulink
-></para>
+<para>And finally, there will be a WebSite for &tdeprint; and related documentation, at <ulink url="http://tdeprint.sourceforge.net/"> http://tdeprint.sourceforge.net/</ulink></para>
 
-<para
->In the next section I will step you through most of the configuration options of &tdeprint; with &CUPS;.</para>
+<para>In the next section I will step you through most of the configuration options of &tdeprint; with &CUPS;.</para>
 
 </sect1>
 <sect1 id="explaining-different-gui-elements">
-<title
->Explaining different elements of the &GUI;</title>
+<title>Explaining different elements of the &GUI;</title>
 
 <sect2>
-<title
->Upper Window: View on Printers, both Real and Virtual</title>
+<title>Upper Window: View on Printers, both Real and Virtual</title>
 
-<para
->This section is not yet complete</para>
+<para>This section is not yet complete</para>
 
 <itemizedlist>
 <listitem>
-<para
->Tree view, icon view and list view</para>
+<para>Tree view, icon view and list view</para>
 </listitem>
 <listitem>
-<para
->The icons of the task bar</para>
+<para>The icons of the task bar</para>
 </listitem>
 <listitem>
-<para
->Different fonts for different printers</para>
+<para>Different fonts for different printers</para>
 </listitem>
 <listitem>
-<para
->Different printer icons mean different things</para>
+<para>Different printer icons mean different things</para>
 </listitem>
 </itemizedlist>
 
 </sect2>
 
 <sect2>
-<title
->Lower Window: Tabbed View of Details</title>
+<title>Lower Window: Tabbed View of Details</title>
 
-<para
->This section is not yet complete.</para>
+<para>This section is not yet complete.</para>
 
 <itemizedlist>
 <listitem>
-<para
->The icons of the task bar</para>
+<para>The icons of the task bar</para>
 </listitem>
 <listitem>
-<para
->The Tabs</para>
+<para>The Tabs</para>
 </listitem>
 <listitem>
-<para
->Changing printer settings</para>
+<para>Changing printer settings</para>
 </listitem>
 </itemizedlist>
 
@@ -313,498 +188,229 @@
 
 
 <sect1 id="welcome-to-cups-server-configuration">
-<title
->Welcome to the &CUPS; Server Configuration</title>
+<title>Welcome to the &CUPS; Server Configuration</title>
 
-<para
->This is the Welcome Screen for your server configuration dialogues. Clicking onto one of the items of the tree view on left side of the screen opens the appropriate part of the configuration settings.</para>
+<para>This is the Welcome Screen for your server configuration dialogues. Clicking onto one of the items of the tree view on left side of the screen opens the appropriate part of the configuration settings.</para>
 
-<para
->Every setting has a default value. The defaults let &CUPS; normally work as a fully functional client. The clients listen on TCP/IP Port 631 for infos broadcast by &CUPS; servers on the <acronym
->LAN</acronym
->. This information let the clients print immediately after receiving them, without installing any driver or configuring any printer on the clients.</para>
+<para>Every setting has a default value. The defaults let &CUPS; normally work as a fully functional client. The clients listen on TCP/IP Port 631 for infos broadcast by &CUPS; servers on the <acronym>LAN</acronym>. This information let the clients print immediately after receiving them, without installing any driver or configuring any printer on the clients.</para>
 
-<para
->To configure a &CUPS; server (which is broadcasting its service to the <acronym
->LAN</acronym
->) you need to change settings from the defaults.</para>
+<para>To configure a &CUPS; server (which is broadcasting its service to the <acronym>LAN</acronym>) you need to change settings from the defaults.</para>
 
-<para
->The dialogue to configure the &CUPS; server: welcome screen. </para>
+<para>The dialogue to configure the &CUPS; server: welcome screen. </para>
 <screenshot>
-<screeninfo
->CUPS server configuration dialogue: welcome screen</screeninfo>
+<screeninfo>CUPS server configuration dialogue: welcome screen</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsserverconfiguration1_welcome.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->The dialogue to configure the &CUPS; server: welcome screen</phrase
-></textobject>
-<caption
-><para
->The dialogue to configure the &CUPS; server: welcome screen</para
-></caption>
+<phrase>The dialogue to configure the &CUPS; server: welcome screen</phrase></textobject>
+<caption><para>The dialogue to configure the &CUPS; server: welcome screen</para></caption>
 </mediaobject>
 </screenshot>
 
-<para
->To select the default setting of any item just enable the checkbox on the right side of the screen. To set an item to a different value, disable the checkbox and then go on to do the setting you want on the left side of the screen.</para>
+<para>To select the default setting of any item just enable the checkbox on the right side of the screen. To set an item to a different value, disable the checkbox and then go on to do the setting you want on the left side of the screen.</para>
 
-<para
->The complete server configuration includes:</para>
+<para>The complete server configuration includes:</para>
 
 <itemizedlist>
 <listitem>
-<para
-><link linkend="server-general-configuration"
-><guilabel
->Server</guilabel
-> General Configuration</link
-></para>
+<para><link linkend="server-general-configuration"><guilabel>Server</guilabel> General Configuration</link></para>
 </listitem>
 <listitem>
-<para
-><link linkend="server-logging-configuration"
->Server <guilabel
->Log</guilabel
->ging Configuration</link
-></para>
+<para><link linkend="server-logging-configuration">Server <guilabel>Log</guilabel>ging Configuration</link></para>
 </listitem>
 <listitem>
-<para
-><link
-linkend="server-directories-configuration"
->Server <guilabel
->Folders</guilabel
-> and Path Definitions</link
-></para>
+<para><link
+linkend="server-directories-configuration">Server <guilabel>Folders</guilabel> and Path Definitions</link></para>
 </listitem>
 <listitem>
-<para
-><link linkend="server-configuration"
->Server <guilabel
->HTTP</guilabel
-> Configuration</link
-></para>
+<para><link linkend="server-configuration">Server <guilabel>HTTP</guilabel> Configuration</link></para>
 </listitem>
 <listitem>
-<para
-><link linkend="server-encryption-support-configuration"
->Server <guilabel
->Encryption</guilabel
-> and Certificate Support Configuration</link
-></para>
+<para><link linkend="server-encryption-support-configuration">Server <guilabel>Encryption</guilabel> and Certificate Support Configuration</link></para>
 </listitem>
 <listitem>
-<para
-><link linkend="server-miscellaneous-configuration"
->Server <guilabel
->Misc</guilabel
->ellaneous Configuration</link
-></para>
+<para><link linkend="server-miscellaneous-configuration">Server <guilabel>Misc</guilabel>ellaneous Configuration</link></para>
 </listitem>
 <listitem>
-<para
-><guilabel
->Network</guilabel
-> General Configuration</para>
+<para><guilabel>Network</guilabel> General Configuration</para>
 </listitem>
 <listitem>
-<para
-><link linkend="network-clients-configuration"
->Network <guilabel
->Clients</guilabel
-> Configuration</link
-></para>
+<para><link linkend="network-clients-configuration">Network <guilabel>Clients</guilabel> Configuration</link></para>
 </listitem>
 <listitem>
-<para
-><link
-linkend="browsing-general-configuration"
-><guilabel
->Browsing</guilabel
-> General Configuration</link
-></para>
+<para><link
+linkend="browsing-general-configuration"><guilabel>Browsing</guilabel> General Configuration</link></para>
 </listitem>
 <listitem>
-<para
-><link linkend="browsing-connection-configuration"
->Browsing <guilabel
->Connection</guilabel
-> Configuration</link
-></para>
+<para><link linkend="browsing-connection-configuration">Browsing <guilabel>Connection</guilabel> Configuration</link></para>
 </listitem>
 <listitem>
-<para
-><link
-linkend="browsing-masks-configuration"
->Browsing <guilabel
->Masks</guilabel
-> Configuration</link
-></para>
+<para><link
+linkend="browsing-masks-configuration">Browsing <guilabel>Masks</guilabel> Configuration</link></para>
 </listitem>
 <listitem>
-<para
-><link linkend="browsing-timeouts-configuration"
->Browsing <guilabel
->Timeouts</guilabel
-> Configuration</link
-></para>
+<para><link linkend="browsing-timeouts-configuration">Browsing <guilabel>Timeouts</guilabel> Configuration</link></para>
 </listitem>
 <listitem>
-<para
-><link linkend="browsing-relay-configuration"
->Browsing <guilabel
->Relay</guilabel
-> Configuration</link
-></para>
+<para><link linkend="browsing-relay-configuration">Browsing <guilabel>Relay</guilabel> Configuration</link></para>
 </listitem>
 <listitem>
-<para
-><link
-linkend="security-configuration"
-><guilabel
->Security</guilabel
-> Configuration</link
-></para>
+<para><link
+linkend="security-configuration"><guilabel>Security</guilabel> Configuration</link></para>
 </listitem>
 </itemizedlist>
 
-<para
->Each of these configuration items will be described in the following sections of the manual.</para>
+<para>Each of these configuration items will be described in the following sections of the manual.</para>
 
 </sect1>
 
 <sect1 id="server-general-configuration">
-<title
->Server General Configuration</title>
+<title>Server General Configuration</title>
 
-<para
->The server general configuration is done on this screen. It includes:</para>
+<para>The server general configuration is done on this screen. It includes:</para>
 
 <itemizedlist>
-<listitem
-><para
-><guilabel
->Server name</guilabel
-></para
-></listitem>
-<listitem
-><para
-><guilabel
->Administrator's email</guilabel
-></para
-></listitem>
-<listitem
-><para
-><guilabel
->Server user</guilabel
-></para
-></listitem>
-<listitem
-><para
-><guilabel
->Server group</guilabel
-></para
-></listitem>
-<listitem
-><para
-><guilabel
->Remote user name</guilabel
-></para
-></listitem>
+<listitem><para><guilabel>Server name</guilabel></para></listitem>
+<listitem><para><guilabel>Administrator's email</guilabel></para></listitem>
+<listitem><para><guilabel>Server user</guilabel></para></listitem>
+<listitem><para><guilabel>Server group</guilabel></para></listitem>
+<listitem><para><guilabel>Remote user name</guilabel></para></listitem>
 </itemizedlist>
 
-<para
->The tab window to configure the &CUPS; server general settings lets you the change the default values. Click on the little question mark and then on one of the fields to get a <quote
->Quick Help</quote
-> about the meaning of the setting.</para>
-
-<para
->If you are unsure, leave alone and turn to the original &CUPS; documentation first. If your &CUPS; daemon is already running, it is readable from the &konqueror; by pointing it to &URL; <ulink url="http://localhost:631/documentation.html"
-> http://localhost:631/documentation.html</ulink
->.</para>
-
-<para
->There, first <quote
->make friends</quote
-> with the Software Administrator Manual. Otherwise, for example, if the &CUPS; daemon is not running, try looking in your local file system, by default at <filename class="directory"
->/usr/share/doc/cups/</filename
-> or <filename
->/usr/share/doc/cups/documentation.html</filename
->.</para>
+<para>The tab window to configure the &CUPS; server general settings lets you the change the default values. Click on the little question mark and then on one of the fields to get a <quote>Quick Help</quote> about the meaning of the setting.</para>
+
+<para>If you are unsure, leave alone and turn to the original &CUPS; documentation first. If your &CUPS; daemon is already running, it is readable from the &konqueror; by pointing it to &URL; <ulink url="http://localhost:631/documentation.html"> http://localhost:631/documentation.html</ulink>.</para>
+
+<para>There, first <quote>make friends</quote> with the Software Administrator Manual. Otherwise, for example, if the &CUPS; daemon is not running, try looking in your local file system, by default at <filename class="directory">/usr/share/doc/cups/</filename> or <filename>/usr/share/doc/cups/documentation.html</filename>.</para>
 
 <screenshot>
-<screeninfo
->&CUPS; server general configuration dialogue: ServerName, AdminMail, ServerUser, ServerGroup, RemoteUserName</screeninfo>
+<screeninfo>&CUPS; server general configuration dialogue: ServerName, AdminMail, ServerUser, ServerGroup, RemoteUserName</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsserverconfiguration2_general.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->The dialogue to configure the &CUPS; server general settings: ServerName, AdminMail, ServerUser, ServerGroup, RemoteUserName </phrase
-></textobject>
+<phrase>The dialogue to configure the &CUPS; server general settings: ServerName, AdminMail, ServerUser, ServerGroup, RemoteUserName </phrase></textobject>
 </mediaobject>
 </screenshot>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Server Name</guilabel
-></term>
+<term><guilabel>Server Name</guilabel></term>
 <listitem>
-<para
->The hostname of your server, as advertised to the world. By default, &CUPS; will use the hostname of the system. To set the default server usd by clients, see the <filename
->client.conf</filename
-> file.</para>
+<para>The hostname of your server, as advertised to the world. By default, &CUPS; will use the hostname of the system. To set the default server usd by clients, see the <filename>client.conf</filename> file.</para>
 
 <informalexample>
-<para
->For example, enter <userinput
->myhost.domain.com</userinput
-></para>
+<para>For example, enter <userinput>myhost.domain.com</userinput></para>
 </informalexample>
 
-<para
->This is the hostname that is reported to clients. Should you ever encounter strange problems in accessing the server, put here its <acronym
->IP</acronym
-> address for troubleshooting. This way you eliminate any potential name resolution problems; and you can more easily nail the real problem down.</para>
+<para>This is the hostname that is reported to clients. Should you ever encounter strange problems in accessing the server, put here its <acronym>IP</acronym> address for troubleshooting. This way you eliminate any potential name resolution problems; and you can more easily nail the real problem down.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Administrator's email</guilabel
-></term>
+<term><guilabel>Administrator's email</guilabel></term>
 <listitem>
-<para
->This is the email address to send all complaints or problems to. By default &CUPS; will use <quote
->root@hostname</quote
->.</para>
+<para>This is the email address to send all complaints or problems to. By default &CUPS; will use <quote>root@hostname</quote>.</para>
 
 <informalexample>
-<para
->For example, enter <userinput
->root@myhost.com</userinput
->.</para>
+<para>For example, enter <userinput>root@myhost.com</userinput>.</para>
 </informalexample>
 
 <note>
-<para
->Contrary to what the quickhelp suggests, it is also legal to send an email full of praise and enthusiasm about &CUPS; and &tdeprint; to the server administrator.</para>
+<para>Contrary to what the quickhelp suggests, it is also legal to send an email full of praise and enthusiasm about &CUPS; and &tdeprint; to the server administrator.</para>
 </note>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Server User</guilabel
-></term>
+<term><guilabel>Server User</guilabel></term>
 <listitem>
-<para
->The user the server runs under. Normally this must be <systemitem class="username"
->lp</systemitem
->, however you can configure things for another user if needed.</para>
+<para>The user the server runs under. Normally this must be <systemitem class="username">lp</systemitem>, however you can configure things for another user if needed.</para>
 
 <note>
-<para
->The server must be initially run as root to support the default <acronym
->IPP</acronym
-> port of 631. It changes users whenever an external program is run.</para>
+<para>The server must be initially run as root to support the default <acronym>IPP</acronym> port of 631. It changes users whenever an external program is run.</para>
 </note>
 
 <informalexample>
-<para
->Enter for example <userinput
->lp</userinput
->.</para>
+<para>Enter for example <userinput>lp</userinput>.</para>
 </informalexample>
 
-<para
->This is the &UNIX; user account for filters and <acronym
->CGI</acronym
-> programs to run under. <acronym
->CGI</acronym
-> programs are responsible for showing you the nice web administration interface accessible via <ulink url="http://localhost:631/"
->http://localhost:631/</ulink
->).</para>
+<para>This is the &UNIX; user account for filters and <acronym>CGI</acronym> programs to run under. <acronym>CGI</acronym> programs are responsible for showing you the nice web administration interface accessible via <ulink url="http://localhost:631/">http://localhost:631/</ulink>).</para>
 
 <warning>
-<para
->There is no need to set the <guilabel
->User</guilabel
-> directive to <systemitem class="username"
->root</systemitem
->, so never do this, as it only involves dangers. Should anyone discover security vulnerabilities in one of the used file filters, printer drivers or <acronym
->CGI</acronym
-> programs, he could remotely execute arbitrary commands on your system with root user privileges. Always use an unprivileged account for the server directive <guilabel
->User</guilabel
->.</para>
+<para>There is no need to set the <guilabel>User</guilabel> directive to <systemitem class="username">root</systemitem>, so never do this, as it only involves dangers. Should anyone discover security vulnerabilities in one of the used file filters, printer drivers or <acronym>CGI</acronym> programs, he could remotely execute arbitrary commands on your system with root user privileges. Always use an unprivileged account for the server directive <guilabel>User</guilabel>.</para>
 </warning>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Server group</guilabel
-></term>
+<term><guilabel>Server group</guilabel></term>
 <listitem>
-<para
->The group the server runs under. Normally this must be <systemitem class="groupname"
->sys</systemitem
->, however you can configure things for another group as needed.</para>
+<para>The group the server runs under. Normally this must be <systemitem class="groupname">sys</systemitem>, however you can configure things for another group as needed.</para>
 
 <informalexample>
-<para
->Enter for example <userinput
->sys</userinput
->.</para>
+<para>Enter for example <userinput>sys</userinput>.</para>
 </informalexample>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Remote user name</guilabel
-></term>
+<term><guilabel>Remote user name</guilabel></term>
 <listitem>
-<para
->The name of the user assigned to unauthenticated accesses from remote systems. By default <userinput
->remroot</userinput
->.</para>
+<para>The name of the user assigned to unauthenticated accesses from remote systems. By default <userinput>remroot</userinput>.</para>
 
-<para
->This name will appear in log files and in queries about the job owner &etc;, for all resources and locations of the &CUPS; server that are configured to allow access <emphasis
->without</emphasis
-> authentication. Authenticated entries will carry the authenticated names.</para>
+<para>This name will appear in log files and in queries about the job owner &etc;, for all resources and locations of the &CUPS; server that are configured to allow access <emphasis>without</emphasis> authentication. Authenticated entries will carry the authenticated names.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 </sect1>
 
 <sect1 id="server-logging-configuration">
-<title
->Server Logging Configuration</title>
+<title>Server Logging Configuration</title>
 
-<para
->The server logging configuration is done on this screen. It includes:</para>
+<para>The server logging configuration is done on this screen. It includes:</para>
 
 <itemizedlist>
-<listitem
-><para
-><guilabel
->Access log file</guilabel
-> setting</para
-></listitem>
-<listitem
-><para
-><guilabel
->Error log file</guilabel
-> setting</para
-></listitem>
-<listitem
-><para
-><guilabel
->Page log</guilabel
-> file setting</para
-></listitem>
-<listitem
-><para
-><guilabel
->Log level</guilabel
-> setting</para
-></listitem>
-<listitem
-><para
-><guilabel
->Max log file size</guilabel
-> setting</para
-></listitem>
+<listitem><para><guilabel>Access log file</guilabel> setting</para></listitem>
+<listitem><para><guilabel>Error log file</guilabel> setting</para></listitem>
+<listitem><para><guilabel>Page log</guilabel> file setting</para></listitem>
+<listitem><para><guilabel>Log level</guilabel> setting</para></listitem>
+<listitem><para><guilabel>Max log file size</guilabel> setting</para></listitem>
 </itemizedlist>
 
-<para
->This is an important screen for you. Should you ever encounter problems: here is the place to set the Log level to <quote
->debug</quote
->, restart the &CUPS; daemon and then look at the Error log file defined here for entries that might give you an insight to the trouble.</para>
+<para>This is an important screen for you. Should you ever encounter problems: here is the place to set the Log level to <quote>debug</quote>, restart the &CUPS; daemon and then look at the Error log file defined here for entries that might give you an insight to the trouble.</para>
 
 <screenshot>
-<screeninfo
->&CUPS; server configuration dialogue: <guilabel
->Server logging</guilabel
-> </screeninfo>
+<screeninfo>&CUPS; server configuration dialogue: <guilabel>Server logging</guilabel> </screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsserverconfiguration3_logging.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->The dialogue to configure the &CUPS; server: <guilabel
->Server logging</guilabel
-></phrase
-></textobject>
+<phrase>The dialogue to configure the &CUPS; server: <guilabel>Server logging</guilabel></phrase></textobject>
 </mediaobject>
 </screenshot>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Access log file</guilabel
-></term>
+<term><guilabel>Access log file</guilabel></term>
 <listitem>
-<para
->This is where accesses to the server are logged. If this does not start with a leading <literal
->/</literal
->, then it is assumed to be relative to the server root.</para>
+<para>This is where accesses to the server are logged. If this does not start with a leading <literal>/</literal>, then it is assumed to be relative to the server root.</para>
 
-<para
->You can also use the special name <userinput
->syslog</userinput
-> to send the output to the syslog file or daemon.</para>
+<para>You can also use the special name <userinput>syslog</userinput> to send the output to the syslog file or daemon.</para>
 
 <informalexample>
-<para
->Enter a path, for example <userinput
-><filename
->/var/log/cups/acces_log</filename
-></userinput
->.</para>
+<para>Enter a path, for example <userinput><filename>/var/log/cups/acces_log</filename></userinput>.</para>
 </informalexample>
 
-<para
->The format of this file is stored in the so-called <quote
->Common Log Format</quote
->. This way you can use programs such as <application
->Webalizer</application
-> or any other Web access reporting tool to generate reports on the &CUPS; server activities.</para>
-
-<para
->To include the server name in the file name use a <token
->%s</token
-> in the name. Example: <userinput
-><filename
->/var/log/cups/access_log-%s</filename
-></userinput
->.</para>
-
-<screen
-><prompt
->kurt@transmeta:~ 
-></prompt
-><userinput
-><command
->tail</command
-> <parameter
->/var/log/cups/access_log</parameter
-></userinput>
+<para>The format of this file is stored in the so-called <quote>Common Log Format</quote>. This way you can use programs such as <application>Webalizer</application> or any other Web access reporting tool to generate reports on the &CUPS; server activities.</para>
+
+<para>To include the server name in the file name use a <token>%s</token> in the name. Example: <userinput><filename>/var/log/cups/access_log-%s</filename></userinput>.</para>
+
+<screen><prompt>kurt@transmeta:~ ></prompt><userinput><command>tail</command> <parameter>/var/log/cups/access_log</parameter></userinput>
 <computeroutput>
 127.0.0.1    - - [04/Aug/2001:20:11:39 +0100] "POST /printers/ HTTP/1.1" 200 109
 127.0.0.1    - - [04/Aug/2001:20:11:39 +0100] "POST /admin/ HTTP/1.1" 401 0
@@ -818,127 +424,49 @@ format="PNG"/></imageobject>
 127.0.0.1    - - [04/Aug/2001:20:11:40 +0100] "POST / HTTP/1.1" 200 139
 10.160.16.45 - - [04/Aug/2001:20:11:39 +0100] "GET /printers/DANKA_P450 HTTP/1.0" 200 7319
 10.160.16.45 - - [04/Aug/2001:20:11:40 +0100] "GET /images/title-logo.gif HTTP/1.0" 200 5729
-</computeroutput
-></screen>
-
-<para
->You see a separate line for each single access, showing the <acronym
->IP</acronym
-> address of the accessing client, date and time of access, method of access (<command
->POST</command
-> or <command
->GET</command
->), the requested ressource, the &HTTP; version used by the client, status code and the number of transferred bytes. Status code <errorcode
->200</errorcode
-> means <errorname
->successful-OK</errorname
-> the <errorcode
->401</errorcode
-> in the above example was an <errorname
->unauthorized access</errorname
-> which was denied. For a detailed explanation of the log format go to <ulink url="http://localhost:631/sam.html#7_6_1"
->the &CUPS; Software Administrator Manual</ulink
->.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><guilabel
->Error log file</guilabel
-></term>
-<listitem>
-<para
->If this does not start with a leading <literal
->/</literal
->, then it is assumed to be relative to the server root. The default setting is <filename
->/var/log/cups/error_log</filename
->.</para>
-
-<para
->You can also use the special name <userinput
->syslog</userinput
-> to send the output to the syslog file or daemon.</para>
+</computeroutput></screen>
+
+<para>You see a separate line for each single access, showing the <acronym>IP</acronym> address of the accessing client, date and time of access, method of access (<command>POST</command> or <command>GET</command>), the requested ressource, the &HTTP; version used by the client, status code and the number of transferred bytes. Status code <errorcode>200</errorcode> means <errorname>successful-OK</errorname> the <errorcode>401</errorcode> in the above example was an <errorname>unauthorized access</errorname> which was denied. For a detailed explanation of the log format go to <ulink url="http://localhost:631/sam.html#7_6_1">the &CUPS; Software Administrator Manual</ulink>.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term><guilabel>Error log file</guilabel></term>
+<listitem>
+<para>If this does not start with a leading <literal>/</literal>, then it is assumed to be relative to the server root. The default setting is <filename>/var/log/cups/error_log</filename>.</para>
+
+<para>You can also use the special name <userinput>syslog</userinput> to send the output to the syslog file or daemon.</para>
 
 <informalexample>
-<para
->Enter the path, for example <userinput
-><filename
->/var/log/cups/error_log</filename
-></userinput
->.</para>
+<para>Enter the path, for example <userinput><filename>/var/log/cups/error_log</filename></userinput>.</para>
 </informalexample>
 
-<para
->The error log excerpt below shows you the part logged for printing the test page with the default setting of <guilabel
->Log level</guilabel
-> to <quote
->info</quote
->. For an explanation of the <guilabel
->Log Level</guilabel
-> setting see further below.</para>
-
-<screen
-><prompt
->kurt@transmeta:~ 
-></prompt
-><userinput
-><command
-> tail </command
-> <parameter
->/var/log/cups/error_log</parameter
-></userinput>
+<para>The error log excerpt below shows you the part logged for printing the test page with the default setting of <guilabel>Log level</guilabel> to <quote>info</quote>. For an explanation of the <guilabel>Log Level</guilabel> setting see further below.</para>
+
+<screen><prompt>kurt@transmeta:~ ></prompt><userinput><command> tail </command> <parameter>/var/log/cups/error_log</parameter></userinput>
 <computeroutput>
 I [04/Aug/2001:23:15:10 +0100] Job 213 queued on 'DANKA_P450' by 'root'
 I [04/Aug/2001:23:15:10 +0100] Started filter /usr/lib/cups/filter/pstops (PID 18891) for job 213.
 I [04/Aug/2001:23:15:10 +0100] Started backend /usr/lib/cups/backend/lpd (PID 18892) for job 213.
-</computeroutput
-></screen>
+</computeroutput></screen>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Page log file</guilabel
-></term>
+<term><guilabel>Page log file</guilabel></term>
 <listitem>
-<para
->If this does not start with a leading <literal
->/</literal
-> then it is assumed to be relative to the server root. The default is <filename
->/var/log/cups/page_log</filename
-></para>
+<para>If this does not start with a leading <literal>/</literal> then it is assumed to be relative to the server root. The default is <filename>/var/log/cups/page_log</filename></para>
 
-<para
->You can also use the special name <userinput
->syslog</userinput
-> to send the output to the syslog file or daemon.</para>
+<para>You can also use the special name <userinput>syslog</userinput> to send the output to the syslog file or daemon.</para>
 
 <informalexample>
-<para
->Enter the path, for example <userinput
-><filename
->/var/log/cups/page_log</filename
-></userinput
->.</para>
+<para>Enter the path, for example <userinput><filename>/var/log/cups/page_log</filename></userinput>.</para>
 </informalexample>
-<para
->The page log file has a line for every single page of every job printed.</para>
-
-<para
->Here is what some entries look like:</para>
-
-<screen
-><prompt
->kurt@transmeta:~ 
-></prompt
-><userinput
-><command
-> tail </command
-> <parameter
->/var/log/cups/page_log</parameter
-></userinput>
+<para>The page log file has a line for every single page of every job printed.</para>
+
+<para>Here is what some entries look like:</para>
+
+<screen><prompt>kurt@transmeta:~ ></prompt><userinput><command> tail </command> <parameter>/var/log/cups/page_log</parameter></userinput>
 <computeroutput>
 GIMP_print_stp_HP kdetest 201 [03/Aug/2001:03:18:03 +0100] 4 1
 GIMP_print_stp_HP kdetest 201 [03/Aug/2001:03:18:03 +0100] 5 1
@@ -950,168 +478,81 @@ DANKA_infotec_P450 kurt 204 [04/Aug/2001:03:29:00 +0100] 3 33
 DANKA_infotec_P450 kurt 204 [04/Aug/2001:03:29:00 +0100] 4 33
 DANKA_infotec_P450 root 205 [04/Aug/2001:19:12:34 +0100] 1 14
 DANKA_infotec_P450 root 206 [04/Aug/2001:19:15:20 +0100] 1 1
-</computeroutput
-></screen>
-
-<para
->In this excerpt of the file you find information on the name of the printers (<systemitem class="resource"
->GIMP_print_stp_HP</systemitem
-> and <systemitem class="resource"
->DANKA_infotec_P450</systemitem
->) used through this server, the user names (<systemitem class="username"
->kdetest</systemitem
->, <systemitem class="username"
->kurt</systemitem
-> and <systemitem class="username"
->root</systemitem
->), the job-IDs (<quote
->201</quote
-> to <quote
->205</quote
->), time of printing, page number inside the job and the number of copies for the pages. For example, job-ID 204 had 4 pages and 33 copies printed, job-ID 205 had 14 copies of just 1 page) .</para>
+</computeroutput></screen>
+
+<para>In this excerpt of the file you find information on the name of the printers (<systemitem class="resource">GIMP_print_stp_HP</systemitem> and <systemitem class="resource">DANKA_infotec_P450</systemitem>) used through this server, the user names (<systemitem class="username">kdetest</systemitem>, <systemitem class="username">kurt</systemitem> and <systemitem class="username">root</systemitem>), the job-IDs (<quote>201</quote> to <quote>205</quote>), time of printing, page number inside the job and the number of copies for the pages. For example, job-ID 204 had 4 pages and 33 copies printed, job-ID 205 had 14 copies of just 1 page) .</para>
 
 <note>
-<para
->&CUPS; is dependent (for its calculation of the number of pages in a job) on passing the &PostScript; through the <quote
->pstops</quote
-> filter. See the <link linkend="architecture-diagram"
->&kivio; Flowchart</link
-> on the &CUPS; filter architecture for an idea about were this filter fits into the whole printing process). More, <command
->pstops</command
-> depends for the counting on a <acronym
->DSC</acronym
-> conforming (<acronym
->DSC</acronym
-> is Document Structuring Conventions, a standard defined by Adobe) to be sent by the client. In most cases this is working.</para>
-
-<para
->However, this page accounting does not work for any <quote
->raw</quote
-> printer queues (as those, by definition, don't use any filtering on the &CUPS; host and are by-passing <command
->pstops</command
->.) Every job going through a <quote
->raw</quote
-> queue is counted as a 1-page-job (with possibly multiple copies). This is especially true for all Jobs send from &Microsoft; &Windows; clients via <application
->Samba</application
-> to the &CUPS; server, as those jobs are already arriving in the correct format for the printer, because the clients use the original printer driver.</para>
+<para>&CUPS; is dependent (for its calculation of the number of pages in a job) on passing the &PostScript; through the <quote>pstops</quote> filter. See the <link linkend="architecture-diagram">&kivio; Flowchart</link> on the &CUPS; filter architecture for an idea about were this filter fits into the whole printing process). More, <command>pstops</command> depends for the counting on a <acronym>DSC</acronym> conforming (<acronym>DSC</acronym> is Document Structuring Conventions, a standard defined by Adobe) to be sent by the client. In most cases this is working.</para>
+
+<para>However, this page accounting does not work for any <quote>raw</quote> printer queues (as those, by definition, don't use any filtering on the &CUPS; host and are by-passing <command>pstops</command>.) Every job going through a <quote>raw</quote> queue is counted as a 1-page-job (with possibly multiple copies). This is especially true for all Jobs send from &Microsoft; &Windows; clients via <application>Samba</application> to the &CUPS; server, as those jobs are already arriving in the correct format for the printer, because the clients use the original printer driver.</para>
 </note>
 
 <note>
-<para
->I am still looking for someone who will write a nice &CUPS; page log analysing tool. It should generate a report with a graphical output similar to the <application
->Webalizer</application
->'s access log reports. This way you could have nice statistics to be used for accounting about usage of printers, load dependent on daytime or weekday, users &etc; Anyone?</para>
+<para>I am still looking for someone who will write a nice &CUPS; page log analysing tool. It should generate a report with a graphical output similar to the <application>Webalizer</application>'s access log reports. This way you could have nice statistics to be used for accounting about usage of printers, load dependent on daytime or weekday, users &etc; Anyone?</para>
 </note>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Log level</guilabel
-></term>
+<term><guilabel>Log level</guilabel></term>
 <listitem>
-<para
->This setting controls the number of messages logged to the error log file. It can be one of the following:</para>
+<para>This setting controls the number of messages logged to the error log file. It can be one of the following:</para>
 
 <variablelist>
 <varlistentry>
-<term
->debug2</term>
+<term>debug2</term>
 <listitem>
-<para
->Log everything.</para>
+<para>Log everything.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->debug</term>
+<term>debug</term>
 <listitem>
-<para
->Log almost everything.</para>
+<para>Log almost everything.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->info</term>
+<term>info</term>
 <listitem>
-<para
->Log all requests and state changes.</para>
+<para>Log all requests and state changes.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->warn</term>
+<term>warn</term>
 <listitem>
-<para
->Log errors and warnings.</para>
+<para>Log errors and warnings.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->error</term>
+<term>error</term>
 <listitem>
-<para
->Log only errors.</para>
+<para>Log only errors.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->none</term>
+<term>none</term>
 <listitem>
-<para
->Log nothing.</para>
+<para>Log nothing.</para>
 </listitem>
 </varlistentry>
 
 </variablelist>
 
-<para
->If you need to troubleshoot (or if you want to study the inner workings of &CUPS;), set the log level to debug or debug2. Then the error_log will have a lot more entries (not just errors, but also informational entries).</para
-> 
-
-<para
->You can use this to watch <quote
->live</quote
-> what &CUPS; is doing when you send a print job. In a &konsole; type:</para>
-
-<screen
-><prompt
->kurt@transmeta:~ 
-></prompt
-><userinput
-><command
->tail</command
-> <option
->-f</option
-> <option
->-n</option
-><parameter
->100</parameter
-> <parameter
->/var/log/cups/error_log</parameter
-></userinput
-></screen>
-
-<para
->This will give you the last 100 lines (<option
->-n</option
-> <parameter
->100</parameter
->) of the file onto the screen and a <quote
->realtime</quote
-> update (<option
->-f</option
->)of what is happening. The following listing shows the printing of a test page (some pieces have been cut off for space reasons... Try it yourself if you need more info):</para>
-
-<screen
-><computeroutput
-> 
+<para>If you need to troubleshoot (or if you want to study the inner workings of &CUPS;), set the log level to debug or debug2. Then the error_log will have a lot more entries (not just errors, but also informational entries).</para> 
+
+<para>You can use this to watch <quote>live</quote> what &CUPS; is doing when you send a print job. In a &konsole; type:</para>
+
+<screen><prompt>kurt@transmeta:~ ></prompt><userinput><command>tail</command> <option>-f</option> <option>-n</option><parameter>100</parameter> <parameter>/var/log/cups/error_log</parameter></userinput></screen>
+
+<para>This will give you the last 100 lines (<option>-n</option> <parameter>100</parameter>) of the file onto the screen and a <quote>realtime</quote> update (<option>-f</option>)of what is happening. The following listing shows the printing of a test page (some pieces have been cut off for space reasons... Try it yourself if you need more info):</para>
+
+<screen><computeroutput> 
 I [04/Aug/2001:23:15:12 +0100] Job 214 queued on 'DANKA_P450' by 'root'
 D [04/Aug/2001:23:15:12 +0100] StartJob(214, 08426fe0) 
 D [04/Aug/2001:23:15:12 +0100] StartJob() id = 214, file = 0/1 
@@ -1130,36 +571,20 @@ D [04/Aug/2001:23:15:12 +0100] StartJob: backend = "/usr/lib/cups/backend/lpd"
 D [04/Aug/2001:23:15:12 +0100] StartJob: filterfds[1] = -1, 7 
 D [04/Aug/2001:23:15:12 +0100] start_process("/usr/lib/cups/backend/lpd", [....]  
 I [04/Aug/2001:23:15:12 +0100] Started backend /usr/lib/cups/backend/lpd (PID 18992) for job 214.
-D [04/Aug/2001:23:15:12 +0100] Page = 595x842; 15,16 to 580,833 [....]  </computeroutput
-></screen
-> 
+D [04/Aug/2001:23:15:12 +0100] Page = 595x842; 15,16 to 580,833 [....]  </computeroutput></screen> 
 
-<para
->The lines tagged <quote
->D</quote
-> at the beginning are debug level entries, the ones tagged <quote
->I</quote
-> are there in <quote
->info</quote
-> level.</para>
+<para>The lines tagged <quote>D</quote> at the beginning are debug level entries, the ones tagged <quote>I</quote> are there in <quote>info</quote> level.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Max log file size</guilabel
-></term>
+<term><guilabel>Max log file size</guilabel></term>
 <listitem>
 
-<para
->Controls the maximum size of each log file before they are rotated. Defaults to 1048576 (1 Mb). Set this to 0 to disable log rotation.</para>
+<para>Controls the maximum size of each log file before they are rotated. Defaults to 1048576 (1 Mb). Set this to 0 to disable log rotation.</para>
 
 <informalexample>
-<para
->Enter an size in bytes, for example <userinput
->1048576</userinput
-></para>
+<para>Enter an size in bytes, for example <userinput>1048576</userinput></para>
 </informalexample>
 
 </listitem>
@@ -1168,373 +593,195 @@ D [04/Aug/2001:23:15:12 +0100] Page = 595x842; 15,16 to 580,833 [....]  </comput
 </sect1>
 
 <sect1 id="server-directories-configuration">
-<title
->Server Folders Configuration</title>
+<title>Server Folders Configuration</title>
 
-<para
->The dialogue to configure the &CUPS; server. Different folders are to be set here. Normally you don't need to change anything in this section. In case you play around with fancy (TrueType, &PostScript; or other) fonts on your system, this qis the place to do the settings for using those fonts when printing. Server folder settings include:</para>
+<para>The dialogue to configure the &CUPS; server. Different folders are to be set here. Normally you don't need to change anything in this section. In case you play around with fancy (TrueType, &PostScript; or other) fonts on your system, this qis the place to do the settings for using those fonts when printing. Server folder settings include:</para>
 
 <itemizedlist>
 <listitem>
-<para
-><guilabel
->Executables</guilabel
->: where to find the server executables</para>
+<para><guilabel>Executables</guilabel>: where to find the server executables</para>
 </listitem>
 <listitem>
-<para
-><guilabel
->Configuration</guilabel
->: where to find the server configuration files</para>
+<para><guilabel>Configuration</guilabel>: where to find the server configuration files</para>
 </listitem>
 <listitem>
-<para
-><guilabel
->Data</guilabel
->: where to find the server data files</para>
+<para><guilabel>Data</guilabel>: where to find the server data files</para>
 </listitem>
 <listitem>
-<para
-><guilabel
->Temporary files</guilabel
->: where to put the server temporary print files </para>
+<para><guilabel>Temporary files</guilabel>: where to put the server temporary print files </para>
 </listitem>
 <listitem>
-<para
-><guilabel
->Temporary Requests</guilabel
->: where to find the server </para>
+<para><guilabel>Temporary Requests</guilabel>: where to find the server </para>
 </listitem>
 <listitem>
-<para
-><guilabel
->Font Path</guilabel
->: where to find the server fonts</para>
+<para><guilabel>Font Path</guilabel>: where to find the server fonts</para>
 </listitem>
 </itemizedlist>
 <screenshot>
-<screeninfo
->&CUPS; server configuration dialogue: &HTTP; configuration</screeninfo>
+<screeninfo>&CUPS; server configuration dialogue: &HTTP; configuration</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsserverconfiguration4_directories.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->The dialogue to configure the &CUPS; server: &HTTP; configuration</phrase
-></textobject>
+<phrase>The dialogue to configure the &CUPS; server: &HTTP; configuration</phrase></textobject>
 </mediaobject>
 </screenshot>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Executables</guilabel
-></term>
+<term><guilabel>Executables</guilabel></term>
 <listitem>
-<para
->The root folder for the scheduler executables. By default this is <filename class="directory"
->/usr/lib/cups</filename
-> (or <filename class="directory"
->/usr/lib32/cups</filename
-> on IRIX 6.5)</para>
+<para>The root folder for the scheduler executables. By default this is <filename class="directory">/usr/lib/cups</filename> (or <filename class="directory">/usr/lib32/cups</filename> on IRIX 6.5)</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Configuration</guilabel
-></term>
+<term><guilabel>Configuration</guilabel></term>
 <listitem>
-<para
->The root folder for the scheduler. By default, <filename class="directory"
->/etc/cups</filename
->.</para>
-<para
->On the authors SuSE system, this is <filename class="directory"
->/usr/share/doc/cups</filename
->. It contains all the <acronym
->HTML</acronym
-> or <acronym
->PDF</acronym
-> documentation for &CUPS; which is available through the Web interface at <ulink url="http://localhost:631/documentation.html"
-> http://localhost:631/documentation.html</ulink
-></para>
+<para>The root folder for the scheduler. By default, <filename class="directory">/etc/cups</filename>.</para>
+<para>On the authors SuSE system, this is <filename class="directory">/usr/share/doc/cups</filename>. It contains all the <acronym>HTML</acronym> or <acronym>PDF</acronym> documentation for &CUPS; which is available through the Web interface at <ulink url="http://localhost:631/documentation.html"> http://localhost:631/documentation.html</ulink></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Data</guilabel
-></term>
+<term><guilabel>Data</guilabel></term>
 <listitem>
-<para
->The root folder for the &CUPS; data files. By default this is <filename class="directory"
->/usr/share/cups</filename
-></para>
-<para
->It contains such things as banners, charsets, data, drivers, fonts, and <command
->pstoraster</command
-> templates.</para>
+<para>The root folder for the &CUPS; data files. By default this is <filename class="directory">/usr/share/cups</filename></para>
+<para>It contains such things as banners, charsets, data, drivers, fonts, and <command>pstoraster</command> templates.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Temporary files</guilabel
-></term>
+<term><guilabel>Temporary files</guilabel></term>
 <listitem>
-<para
->The folder to put temporary files in. This folder must be writable by the user defined on the previous screen. This defaults to either <filename class="directory"
->/var/spool/cups/tmp</filename
-> or the value of the <envar
->TMPDIR</envar
-> environment variable.</para>
+<para>The folder to put temporary files in. This folder must be writable by the user defined on the previous screen. This defaults to either <filename class="directory">/var/spool/cups/tmp</filename> or the value of the <envar>TMPDIR</envar> environment variable.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Temporary Requests</guilabel
-></term>
+<term><guilabel>Temporary Requests</guilabel></term>
 <listitem>
-<para
->The folder where request files are stored. By default this is <filename class="directory"
->/var/spool/cups</filename
-></para>
+<para>The folder where request files are stored. By default this is <filename class="directory">/var/spool/cups</filename></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Font path</guilabel
-></term>
+<term><guilabel>Font path</guilabel></term>
 <listitem>
-<para
->The place to configure the &CUPS; server for handling your fancy fonts (TrueType or &PostScript;). &CUPS; will look here for fonts to embed in printfiles. This currently only affects the <command
->pstoraster</command
-> filter, and the default is <filename class="directory"
->/usr/share/cups/fonts</filename
->.</para>
+<para>The place to configure the &CUPS; server for handling your fancy fonts (TrueType or &PostScript;). &CUPS; will look here for fonts to embed in printfiles. This currently only affects the <command>pstoraster</command> filter, and the default is <filename class="directory">/usr/share/cups/fonts</filename>.</para>
 
-<para
->To specify more than one folder, list them with double colons as separator. Do it like this:</para>
+<para>To specify more than one folder, list them with double colons as separator. Do it like this:</para>
 
 <informalexample>
-<para
-><userinput
->/path/to/first/fontdir/:/path/to/second/fontdir/:/path/to/last/fontdir/</userinput
-></para>
+<para><userinput>/path/to/first/fontdir/:/path/to/second/fontdir/:/path/to/last/fontdir/</userinput></para>
 </informalexample>
 
-<para
->For the Font path directive to work as intended, the application that wants to print needs to:</para>
+<para>For the Font path directive to work as intended, the application that wants to print needs to:</para>
 
 <itemizedlist>
 <listitem>
-<para
->Either correctly reference its desired fonts in the header of the generated &PostScript;</para>
+<para>Either correctly reference its desired fonts in the header of the generated &PostScript;</para>
 </listitem>
 <listitem>
-<para
->Or embed the font into the &PostScript; file.</para>
+<para>Or embed the font into the &PostScript; file.</para>
 </listitem>
 </itemizedlist>
 
-<para
-><emphasis
->Referencing</emphasis
-> the font by name leaves it up to the <acronym
->RIP</acronym
-> and print device to respect and actually use it. <acronym
->RIP</acronym
-> or printer <emphasis
->can</emphasis
-> only use the desired font, if it is available on the system.</para>
-
-<para
->In the case of a &PostScript; printer, this needs to be a printer-resident font. If the printer doesn't have this font, it will try and replace it by an adequately similar font.</para>
-
-<para
->In the case of a non &PostScript; printer, this is done by &CUPS; and its <acronym
->RIP</acronym
->-ing filtering system. &CUPS; will use the font path directive to grab the correct font when <acronym
->RIP</acronym
->-ing the &PostScript; in the <command
->pstoraster</command
-> filter. </para>
-
-<para
->In the case of a &PostScript; output device, &CUPS; is just spooling the file (actually, it is passing it through the <command
->pstops</command
-> filter for accounting or n-up purposes), not <quote
->working</quote
-> on it. Therefore, if you print to a &PostScript; printer it is solely the printer's responsibility to use the font asked for. It can't, if the font is neither loaded into the printer nor embedded in the &PostScript;. </para>
+<para><emphasis>Referencing</emphasis> the font by name leaves it up to the <acronym>RIP</acronym> and print device to respect and actually use it. <acronym>RIP</acronym> or printer <emphasis>can</emphasis> only use the desired font, if it is available on the system.</para>
+
+<para>In the case of a &PostScript; printer, this needs to be a printer-resident font. If the printer doesn't have this font, it will try and replace it by an adequately similar font.</para>
+
+<para>In the case of a non &PostScript; printer, this is done by &CUPS; and its <acronym>RIP</acronym>-ing filtering system. &CUPS; will use the font path directive to grab the correct font when <acronym>RIP</acronym>-ing the &PostScript; in the <command>pstoraster</command> filter. </para>
+
+<para>In the case of a &PostScript; output device, &CUPS; is just spooling the file (actually, it is passing it through the <command>pstops</command> filter for accounting or n-up purposes), not <quote>working</quote> on it. Therefore, if you print to a &PostScript; printer it is solely the printer's responsibility to use the font asked for. It can't, if the font is neither loaded into the printer nor embedded in the &PostScript;. </para>
 </listitem>
 </varlistentry>
 </variablelist>
 
 </sect1>
 <sect1 id="server-configuration">
-<title
->Server <acronym
->HTTP</acronym
-> Configuration</title>
-
-<para
->The dialogue to configure the &CUPS; server &HTTP; settings is shown here. </para>
-<para
->&CUPS; server &HTTP; settings are the following ones: </para>
+<title>Server <acronym>HTTP</acronym> Configuration</title>
+
+<para>The dialogue to configure the &CUPS; server &HTTP; settings is shown here. </para>
+<para>&CUPS; server &HTTP; settings are the following ones: </para>
 <itemizedlist>
-<listitem
-><para
->the <guilabel
->Document folder</guilabel
-></para
-></listitem>
-<listitem
-><para
->the <guilabel
->Default Language</guilabel
-></para
-></listitem>
-<listitem
-><para
->the <guilabel
->Default Charset</guilabel
-></para
-></listitem>
+<listitem><para>the <guilabel>Document folder</guilabel></para></listitem>
+<listitem><para>the <guilabel>Default Language</guilabel></para></listitem>
+<listitem><para>the <guilabel>Default Charset</guilabel></para></listitem>
 </itemizedlist>
 
 <screenshot>
-<screeninfo
->Dialogue to configure the &CUPS; server &HTTP; settings </screeninfo>
+<screeninfo>Dialogue to configure the &CUPS; server &HTTP; settings </screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsserverconfiguration5_HTTP.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->Dialogue to configure the &CUPS; server &HTTP; settings </phrase
-></textobject>
+<phrase>Dialogue to configure the &CUPS; server &HTTP; settings </phrase></textobject>
 </mediaobject>
 </screenshot>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Document folder</guilabel
-></term>
+<term><guilabel>Document folder</guilabel></term>
 <listitem>
-<para
->The root folder for &HTTP; documents that are served. By default the compiled in folder, <filename class="directory"
->/usr/share/cups/doc</filename
-></para>
+<para>The root folder for &HTTP; documents that are served. By default the compiled in folder, <filename class="directory">/usr/share/cups/doc</filename></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Default Language</guilabel
-></term>
+<term><guilabel>Default Language</guilabel></term>
 <listitem>
-<para
->The default language, if not specified by the browser. If not specified, the current locale is used.</para>
+<para>The default language, if not specified by the browser. If not specified, the current locale is used.</para>
 <informalexample>
-<para
->Use the two letter locale codes, for example <userinput
->en</userinput
-> or <userinput
->de</userinput
->.</para>
+<para>Use the two letter locale codes, for example <userinput>en</userinput> or <userinput>de</userinput>.</para>
 </informalexample>
 <!-- available languages? -->
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Default charset</guilabel
-></term>
+<term><guilabel>Default charset</guilabel></term>
 <listitem>
-<para
->The default character set to use. If not specified, this defaults to UTF-8. This can also be overridden directly in the <acronym
->HTML</acronym
-> documents.</para>
+<para>The default character set to use. If not specified, this defaults to UTF-8. This can also be overridden directly in the <acronym>HTML</acronym> documents.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 </sect1>
 
 <sect1 id="server-encryption-support-configuration">
-<title
-><guilabel
->Server encryption support configuration</guilabel
-></title>
+<title><guilabel>Server encryption support configuration</guilabel></title>
 
-<para
->This is the dialogue to configure the &CUPS; server security settings. The server encryption support settings are these: </para>
+<para>This is the dialogue to configure the &CUPS; server security settings. The server encryption support settings are these: </para>
 
 <itemizedlist>
-<listitem
-><para
-><guilabel
->Server certificate</guilabel
->: the file to read containing the server's certificate</para
-></listitem
-> 
-<listitem
-><para
->Server key: the file to read containing the server's key</para
-></listitem>
+<listitem><para><guilabel>Server certificate</guilabel>: the file to read containing the server's certificate</para></listitem> 
+<listitem><para>Server key: the file to read containing the server's key</para></listitem>
 </itemizedlist>
 <screenshot>
-<screeninfo
->&CUPS; server configuration dialogue: security overview</screeninfo>
+<screeninfo>&CUPS; server configuration dialogue: security overview</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsserverconfiguration6_encryption.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->The dialogue to configure the &CUPS; server: security settings</phrase
-></textobject>
+<phrase>The dialogue to configure the &CUPS; server: security settings</phrase></textobject>
 </mediaobject>
 </screenshot>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Server certificate</guilabel
-></term>
+<term><guilabel>Server certificate</guilabel></term>
 <listitem>
-<para
->The file to read containing the server's certificate. Defaults to <filename
->/etc/cups/ssl/server.crt</filename
->.</para>
+<para>The file to read containing the server's certificate. Defaults to <filename>/etc/cups/ssl/server.crt</filename>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Server key</guilabel
-></term>
+<term><guilabel>Server key</guilabel></term>
 <listitem>
-<para
->The file to read containing the server's key. Defaults to <filename
->/etc/cups/ssl/server.key</filename
-></para>
+<para>The file to read containing the server's key. Defaults to <filename>/etc/cups/ssl/server.key</filename></para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -1542,251 +789,124 @@ format="PNG"/></imageobject>
 </sect1>
 
 <sect1 id="server-miscellaneous-configuration">
-<title
->Server Miscellaneous Configuration</title>
+<title>Server Miscellaneous Configuration</title>
 
-<para
->The dialogue to configure the &CUPS; server miscellaneous settings is shown here. The following server settings are done through this screen:</para>
+<para>The dialogue to configure the &CUPS; server miscellaneous settings is shown here. The following server settings are done through this screen:</para>
 
 <itemizedlist>
-<listitem
-><para
-><guilabel
->Preserve job history</guilabel
->: whether to preserve a job history for later re-view</para
-></listitem>
-<listitem
-><para
-><guilabel
->Preserve job files</guilabel
->: whether to preserve fully <acronym
->RIP</acronym
->-ed job files for later re-print</para
-></listitem
->  
-<listitem
-><para
-><guilabel
->Printcap file</guilabel
->: setting the name of and the path to a printcap file</para
-></listitem>
-<listitem
-><para
-><guilabel
->RIP Cache</guilabel
->: setting the size of the <acronym
->RIP</acronym
-> cache in memory</para
-></listitem>
-<listitem
-><para
-><guilabel
->Filter Limit</guilabel
->: defining a filter limit</para
-></listitem>
+<listitem><para><guilabel>Preserve job history</guilabel>: whether to preserve a job history for later re-view</para></listitem>
+<listitem><para><guilabel>Preserve job files</guilabel>: whether to preserve fully <acronym>RIP</acronym>-ed job files for later re-print</para></listitem>  
+<listitem><para><guilabel>Printcap file</guilabel>: setting the name of and the path to a printcap file</para></listitem>
+<listitem><para><guilabel>RIP Cache</guilabel>: setting the size of the <acronym>RIP</acronym> cache in memory</para></listitem>
+<listitem><para><guilabel>Filter Limit</guilabel>: defining a filter limit</para></listitem>
 </itemizedlist>
 
 <screenshot>
-<screeninfo
->Dialogue to configure the &CUPS; server miscellaneous settings</screeninfo>
+<screeninfo>Dialogue to configure the &CUPS; server miscellaneous settings</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsserverconfiguration7_miscellanious.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->Dialogue to configure the &CUPS; server miscellaneous settings</phrase
-></textobject>
+<phrase>Dialogue to configure the &CUPS; server miscellaneous settings</phrase></textobject>
 </mediaobject>
 </screenshot>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Preserve job history (after completion)</guilabel
-></term>
+<term><guilabel>Preserve job history (after completion)</guilabel></term>
 <listitem>
-<para
->Whether or not to preserve the job history after a job is completed, canceled, or stopped. The default is yes</para>
+<para>Whether or not to preserve the job history after a job is completed, canceled, or stopped. The default is yes</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Preserve job file (after completion)</guilabel
-></term>
+<term><guilabel>Preserve job file (after completion)</guilabel></term>
 <listitem>
-<para
->Whether or not to preserve the job files after a job is completed, canceled, or stopped. The default is no.</para>
+<para>Whether or not to preserve the job files after a job is completed, canceled, or stopped. The default is no.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Printcap file</guilabel
-></term>
+<term><guilabel>Printcap file</guilabel></term>
 <listitem>
-<para
->The name of the printcap file. The default is no filename. Leave this blank, to disable printcap file generation.</para>
-<para
->The printcap setting is only needed to satisfy older applications in need of such a file.</para>
+<para>The name of the printcap file. The default is no filename. Leave this blank, to disable printcap file generation.</para>
+<para>The printcap setting is only needed to satisfy older applications in need of such a file.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->RIP cache</guilabel
-></term>
+<term><guilabel>RIP cache</guilabel></term>
 <listitem>
-<para
->The amount of memory that each <acronym
->RIP</acronym
-> should use to cache bitmaps. The value can be any real number, followed by <quote
->k</quote
-> for kilobytes, <quote
->m</quote
-> for megabytes, <quote
->g</quote
->for gigabytes, or <quote
->t</quote
-> for tiles, where one tile is 256 x 256 pixels. The default value is 8m.</para>
+<para>The amount of memory that each <acronym>RIP</acronym> should use to cache bitmaps. The value can be any real number, followed by <quote>k</quote> for kilobytes, <quote>m</quote> for megabytes, <quote>g</quote>for gigabytes, or <quote>t</quote> for tiles, where one tile is 256 x 256 pixels. The default value is 8m.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Filter limit</guilabel
-></term>
+<term><guilabel>Filter limit</guilabel></term>
 <listitem>
-<para
->Sets the maximum cost of all job filters that can be run at the same time. A limit of 0 means no limit. A typical job may need a filter limit of at least 200. Limits less than the minimum required by a job force a single job to be printed at any time. The default limit is 0 (unlimited).</para>
+<para>Sets the maximum cost of all job filters that can be run at the same time. A limit of 0 means no limit. A typical job may need a filter limit of at least 200. Limits less than the minimum required by a job force a single job to be printed at any time. The default limit is 0 (unlimited).</para>
 </listitem>
 </varlistentry>
 </variablelist>
 </sect1>
 
 <sect1 id="network-general-configuration">
-<title
->Network General Configuration</title>
+<title>Network General Configuration</title>
 
-<para
->The dialogue to configure the &CUPS; server network settings is shown here. It includes:</para>
+<para>The dialogue to configure the &CUPS; server network settings is shown here. It includes:</para>
 
 <itemizedlist>
-<listitem
-><para
-><guilabel
->Look for hostname on IP addresses</guilabel
-></para
-></listitem>
-<listitem
-><para
-><guilabel
->Port</guilabel
-></para
-></listitem>
-<listitem
-><para
-><guilabel
->Max request size</guilabel
-></para
-></listitem>
-<listitem
-><para
-><guilabel
->Timeout</guilabel
-></para
-></listitem>
+<listitem><para><guilabel>Look for hostname on IP addresses</guilabel></para></listitem>
+<listitem><para><guilabel>Port</guilabel></para></listitem>
+<listitem><para><guilabel>Max request size</guilabel></para></listitem>
+<listitem><para><guilabel>Timeout</guilabel></para></listitem>
 </itemizedlist>
 
 <screenshot>
-<screeninfo
->Dialogue to configure the &CUPS; server network settings</screeninfo>
+<screeninfo>Dialogue to configure the &CUPS; server network settings</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsserverconfiguration8_networkgeneral.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->Dialogue to configure the &CUPS; server network settings</phrase
-></textobject>
+<phrase>Dialogue to configure the &CUPS; server network settings</phrase></textobject>
 </mediaobject>
 </screenshot>
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Look for hostname on IP addresses</guilabel
-></term>
+<term><guilabel>Look for hostname on IP addresses</guilabel></term>
 <listitem>
-<para
->Whether or not to do lookups on <acronym
->IP</acronym
-> addresses to get a fully-qualified hostname. This defaults to off, for performance reasons.</para>
+<para>Whether or not to do lookups on <acronym>IP</acronym> addresses to get a fully-qualified hostname. This defaults to off, for performance reasons.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Port</guilabel
-></term>
+<term><guilabel>Port</guilabel></term>
 <listitem>
-<para
->Enter here Ports and addresses that the server will listen to. The default port 631 is reserved for the Internet Printing Protocol, and is what we use here.</para>
-<para
->You can have multiple entries, to listen to more than one port or address, or to restrict access.</para>
+<para>Enter here Ports and addresses that the server will listen to. The default port 631 is reserved for the Internet Printing Protocol, and is what we use here.</para>
+<para>You can have multiple entries, to listen to more than one port or address, or to restrict access.</para>
 <note>
-<para
->Unfortunately, most web browsers don't support <acronym
->TLS</acronym
-> or &HTTP; upgrades for encryption. If you want to support web-based encryption, you'll probably need to listen on port 443, the <acronym
->HTTPS</acronym
-> port.</para>
+<para>Unfortunately, most web browsers don't support <acronym>TLS</acronym> or &HTTP; upgrades for encryption. If you want to support web-based encryption, you'll probably need to listen on port 443, the <acronym>HTTPS</acronym> port.</para>
 </note>
-<para
->Use the <guibutton
->Add</guibutton
-> and <guibutton
->Remove</guibutton
-> buttons to add and remove entries from the list.</para>
+<para>Use the <guibutton>Add</guibutton> and <guibutton>Remove</guibutton> buttons to add and remove entries from the list.</para>
 <informalexample>
-<para
->You can enter ports on their own, &eg; <userinput
->631</userinput
->, or hostnames with ports, &eg; <userinput
->myhost:80</userinput
-> or <userinput
->1.2.3.4:631</userinput
->.</para>
+<para>You can enter ports on their own, &eg; <userinput>631</userinput>, or hostnames with ports, &eg; <userinput>myhost:80</userinput> or <userinput>1.2.3.4:631</userinput>.</para>
 </informalexample>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Max request size</guilabel
-></term>
+<term><guilabel>Max request size</guilabel></term>
 <listitem>
-<para
->Controls the maximum size of &HTTP; requests and print files. The default setting is 0, which disables this feature.</para>
+<para>Controls the maximum size of &HTTP; requests and print files. The default setting is 0, which disables this feature.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Timeout</guilabel
-></term>
+<term><guilabel>Timeout</guilabel></term>
 <listitem>
-<para
->The timeout (in seconds) before requests time out. The default is 300 seconds.</para>
+<para>The timeout (in seconds) before requests time out. The default is 300 seconds.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -1794,73 +914,45 @@ format="PNG"/></imageobject>
 </sect1>
 
 <sect1 id="network-clients-configuration">
-<title
->Network Clients Configuration</title>
+<title>Network Clients Configuration</title>
 
-<para
->The dialogue to configure the &CUPS; network client settings is shown here. It includes:</para>
+<para>The dialogue to configure the &CUPS; network client settings is shown here. It includes:</para>
 
 <itemizedlist>
-<listitem
-><para
-><guilabel
->Accept "Keep Alive" requests</guilabel
-></para
-></listitem>
-<listitem
-><para
->KeepAliveTimeout:</para
-> </listitem>
-<listitem
-><para
->MaxClients: </para
-></listitem>
+<listitem><para><guilabel>Accept "Keep Alive" requests</guilabel></para></listitem>
+<listitem><para>KeepAliveTimeout:</para> </listitem>
+<listitem><para>MaxClients: </para></listitem>
 </itemizedlist>
 <screenshot>
-<screeninfo
->dialogue to configure the &CUPS; network client settings</screeninfo>
+<screeninfo>dialogue to configure the &CUPS; network client settings</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsserverconfiguration9_networkclients.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->Dialogue to configure the &CUPS; network client settings</phrase
-></textobject>
+<phrase>Dialogue to configure the &CUPS; network client settings</phrase></textobject>
 </mediaobject>
 </screenshot>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Accept "Keep Alive" requests</guilabel
-></term>
+<term><guilabel>Accept "Keep Alive" requests</guilabel></term>
 <listitem>
-<para
->Whether or not to support the Keep-Alive connection option. The default is on.</para>
+<para>Whether or not to support the Keep-Alive connection option. The default is on.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Keep alive timeout</guilabel
-></term>
+<term><guilabel>Keep alive timeout</guilabel></term>
 <listitem>
-<para
->The timeout (in seconds) before Keep-Alive connections are automatically closed. The default is 60 seconds.</para>
+<para>The timeout (in seconds) before Keep-Alive connections are automatically closed. The default is 60 seconds.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Max number of clients</guilabel
-></term>
+<term><guilabel>Max number of clients</guilabel></term>
 <listitem>
-<para
->Controls the maximum number of simultaneous clients that will be handled. Defaults to 100.</para>
+<para>Controls the maximum number of simultaneous clients that will be handled. Defaults to 100.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -1868,405 +960,214 @@ format="PNG"/></imageobject>
 </sect1>
 
 <sect1 id="browsing-general-configuration">
-<title
->Browsing General Configuration</title>
+<title>Browsing General Configuration</title>
 
-<para
->The dialogue to configure the &CUPS; browsing general settings is shown here. It includes: </para>
+<para>The dialogue to configure the &CUPS; browsing general settings is shown here. It includes: </para>
 
 <itemizedlist>
-<listitem
-><para
-><guilabel
->Enable browsing</guilabel
-></para
-></listitem>
-<listitem
-><para
-><guilabel
->Use short names when possible</guilabel
-></para
-></listitem>
-<listitem
-><para
-><guilabel
->Use implicit classes</guilabel
-></para
-></listitem>
+<listitem><para><guilabel>Enable browsing</guilabel></para></listitem>
+<listitem><para><guilabel>Use short names when possible</guilabel></para></listitem>
+<listitem><para><guilabel>Use implicit classes</guilabel></para></listitem>
 </itemizedlist>
 
 
 <screenshot>
-<screeninfo
->Dialogue to configure the &CUPS; browsing general settings</screeninfo>
+<screeninfo>Dialogue to configure the &CUPS; browsing general settings</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsserverconfiguration10_browsinggeneral.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->Dialogue to configure the &CUPS; browsing general settings</phrase
-></textobject>
+<phrase>Dialogue to configure the &CUPS; browsing general settings</phrase></textobject>
 </mediaobject>
 </screenshot>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Enable browsing</guilabel
-></term>
+<term><guilabel>Enable browsing</guilabel></term>
 <listitem>
-<para
->Whether or not to broadcast printer information to other &CUPS; servers. Enabled by default.</para>
+<para>Whether or not to broadcast printer information to other &CUPS; servers. Enabled by default.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Use short names when possible</guilabel
-></term>
+<term><guilabel>Use short names when possible</guilabel></term>
 <listitem>
-<para
->Whether or not to use <quote
->short</quote
-> names for remote printers when possible (&eg; <systemitem class="resource"
->printer</systemitem
-> instead of <systemitem class="resource"
->printer@host</systemitem
->). Enabled by default.</para>
+<para>Whether or not to use <quote>short</quote> names for remote printers when possible (&eg; <systemitem class="resource">printer</systemitem> instead of <systemitem class="resource">printer@host</systemitem>). Enabled by default.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Use implicit classes</guilabel
-></term>
+<term><guilabel>Use implicit classes</guilabel></term>
 <listitem>
-<para
->Whether or not to use implicit classes.</para>
-<para
->Printer classes can be specified explicitly, in the <filename
->classes.conf</filename
-> file, implicitly based upon the printers available on the <acronym
->LAN</acronym
->, or both.</para>
-<para
->When Implicit classes are enabled, printers on the <acronym
->LAN</acronym
-> with the same name (&eg; <systemitem class="resource"
->Acme-LaserPrint-1000</systemitem
->) will be put into a class with the same name. This allows you to setup multiple redundant queues on a <acronym
->LAN</acronym
-> without a lot of administrative difficulties. If a user sends a job to <systemitem class="resource"
->Acme-LaserPrint-1000</systemitem
->, the job will go to the first available queue.</para>
-<para
->This option is enabled by default.</para>
+<para>Whether or not to use implicit classes.</para>
+<para>Printer classes can be specified explicitly, in the <filename>classes.conf</filename> file, implicitly based upon the printers available on the <acronym>LAN</acronym>, or both.</para>
+<para>When Implicit classes are enabled, printers on the <acronym>LAN</acronym> with the same name (&eg; <systemitem class="resource">Acme-LaserPrint-1000</systemitem>) will be put into a class with the same name. This allows you to setup multiple redundant queues on a <acronym>LAN</acronym> without a lot of administrative difficulties. If a user sends a job to <systemitem class="resource">Acme-LaserPrint-1000</systemitem>, the job will go to the first available queue.</para>
+<para>This option is enabled by default.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
 </sect1>
 <sect1 id="browsing-connection-configuration">
-<title
->Browsing Connection Configuration</title>
+<title>Browsing Connection Configuration</title>
 
-<para
->The dialogue to configure the &CUPS; server browsing connection is shown here. Browsing connection settings include:</para>
+<para>The dialogue to configure the &CUPS; server browsing connection is shown here. Browsing connection settings include:</para>
 
 <itemizedlist>
-<listitem
-><para
-><guilabel
->Broadcast addresses</guilabel
->: The (<acronym
->UDP</acronym
->) broadcast address to transmit printer information to</para
-></listitem>
-<listitem
-><para
-><guilabel
->Broadcast Port</guilabel
->: The port number to use for broadcasting</para
-></listitem
-> 
-<listitem
-><para
-><guilabel
->Poll addresses</guilabel
->: The address(es) to poll for information about printers on servers that might not broadcast (or whose broadcasts might not reach your <acronym
->LAN</acronym
-> due to routers in between).</para
-></listitem>
+<listitem><para><guilabel>Broadcast addresses</guilabel>: The (<acronym>UDP</acronym>) broadcast address to transmit printer information to</para></listitem>
+<listitem><para><guilabel>Broadcast Port</guilabel>: The port number to use for broadcasting</para></listitem> 
+<listitem><para><guilabel>Poll addresses</guilabel>: The address(es) to poll for information about printers on servers that might not broadcast (or whose broadcasts might not reach your <acronym>LAN</acronym> due to routers in between).</para></listitem>
 </itemizedlist>
 
 <screenshot>
-<screeninfo
->Dialogue to configure the &CUPS; server browsing connection</screeninfo>
+<screeninfo>Dialogue to configure the &CUPS; server browsing connection</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsserverconfiguration11_browsingconnections.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->Dialogue to configure the &CUPS; server browsing connection</phrase
-></textobject>
+<phrase>Dialogue to configure the &CUPS; server browsing connection</phrase></textobject>
 </mediaobject>
 </screenshot>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Broadcast addresses</guilabel
-></term>
+<term><guilabel>Broadcast addresses</guilabel></term>
 <listitem>
-<para
->After pressing the <guibutton
->Add</guibutton
-> button, you will see the following dialogue to enter a new value for outgoing broadcasting browse packets. It is the same kind of dialogue as for adding other &CUPS; server addresses to be polled for printer information.</para>
+<para>After pressing the <guibutton>Add</guibutton> button, you will see the following dialogue to enter a new value for outgoing broadcasting browse packets. It is the same kind of dialogue as for adding other &CUPS; server addresses to be polled for printer information.</para>
 
 <screenshot>
-<screeninfo
->Dialogue to enter a new value for broadcasting browse packets to</screeninfo>
+<screeninfo>Dialogue to enter a new value for broadcasting browse packets to</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsserverconfig_browsingmasks_add_button.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->Dialogue to enter a new value for broadcasting browse packets to</phrase
-></textobject>
+<phrase>Dialogue to enter a new value for broadcasting browse packets to</phrase></textobject>
 </mediaobject>
 </screenshot>
 
-<para
->This option specifies a broadcast address to be used. By default, browsing information is broadcast to all active interfaces.</para>
+<para>This option specifies a broadcast address to be used. By default, browsing information is broadcast to all active interfaces.</para>
 
 <note>
-<para
->&HP-UX; 10.20 and earlier do not properly handle broadcast unless you have a Class A, B, C or D netmask (&ie;, there is no <acronym
->CIDR</acronym
-> support).</para>
+<para>&HP-UX; 10.20 and earlier do not properly handle broadcast unless you have a Class A, B, C or D netmask (&ie;, there is no <acronym>CIDR</acronym> support).</para>
 </note>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Broadcast port</guilabel
-></term>
+<term><guilabel>Broadcast port</guilabel></term>
 <listitem>
-<para
->The port used for <acronym
->UDP</acronym
-> broadcasts. By default this is the <acronym
->IPP</acronym
-> port; if you change this, you need to do it on all servers. Only one BrowsePort is recognised.</para>
+<para>The port used for <acronym>UDP</acronym> broadcasts. By default this is the <acronym>IPP</acronym> port; if you change this, you need to do it on all servers. Only one BrowsePort is recognised.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Poll addresses</guilabel
-></term>
+<term><guilabel>Poll addresses</guilabel></term>
 <listitem>
-<para
->Poll the named server(s) for printers.</para>
+<para>Poll the named server(s) for printers.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
 </sect1>
 <sect1 id="browsing-masks-configuration">
-<title
->Browsing Masks Configuration</title>
+<title>Browsing Masks Configuration</title>
 
-<para
->The dialogue to configure the &CUPS; server allowed and/or denied browse packets from other servers is shown here. </para>
+<para>The dialogue to configure the &CUPS; server allowed and/or denied browse packets from other servers is shown here. </para>
 
 <itemizedlist>
-<listitem
-><para
-><guilabel
->Browse allow</guilabel
->: </para
-></listitem>
-<listitem
-><para
-><guilabel
->Browse deny</guilabel
->: </para
-></listitem>
-<listitem
-><para
-><guilabel
->Browse order</guilabel
->: </para
-></listitem>
+<listitem><para><guilabel>Browse allow</guilabel>: </para></listitem>
+<listitem><para><guilabel>Browse deny</guilabel>: </para></listitem>
+<listitem><para><guilabel>Browse order</guilabel>: </para></listitem>
 </itemizedlist>
 
 <screenshot>
-<screeninfo
->Dialogue to configure the &CUPS; server allowed and/or denied browse packets from other servers</screeninfo>
+<screeninfo>Dialogue to configure the &CUPS; server allowed and/or denied browse packets from other servers</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsserverconfiguration11_browsingmasks.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->Dialogue to configure the &CUPS; server allowed and/or denied browse packets from other servers</phrase
-></textobject>
+<phrase>Dialogue to configure the &CUPS; server allowed and/or denied browse packets from other servers</phrase></textobject>
 </mediaobject>
 </screenshot>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Add Browse Address</guilabel
-> dialogue</term>
+<term><guilabel>Add Browse Address</guilabel> dialogue</term>
 <listitem>
-<para
->The dialogue to enter a new value for the address of another &CUPS; server to accept browse packets from is shown here. It is opened by clicking on the <guibutton
->Add...</guibutton
-> button beside the field named <guilabel
->Browse Allow:</guilabel
->. It is the same dialogue as for adding <quote
->denied</quote
-> broadcast sending addresses.</para>
+<para>The dialogue to enter a new value for the address of another &CUPS; server to accept browse packets from is shown here. It is opened by clicking on the <guibutton>Add...</guibutton> button beside the field named <guilabel>Browse Allow:</guilabel>. It is the same dialogue as for adding <quote>denied</quote> broadcast sending addresses.</para>
 
-<para
->The dialogue to enter a new value for the address of another &CUPS; server to accept browse packets from is shown here.</para>
+<para>The dialogue to enter a new value for the address of another &CUPS; server to accept browse packets from is shown here.</para>
 
 <screenshot>
-<screeninfo
->Dialogue to enter a new value for the address of another &CUPS; server to accept browse packets from</screeninfo>
+<screeninfo>Dialogue to enter a new value for the address of another &CUPS; server to accept browse packets from</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsserverconfig_browsingmasks_add_button.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->Dialogue to enter a new value for the address of another &CUPS; server to accept browse packets from</phrase
-></textobject>
+<phrase>Dialogue to enter a new value for the address of another &CUPS; server to accept browse packets from</phrase></textobject>
 </mediaobject>
 </screenshot>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Browse allow</guilabel
-> and <guilabel
->Browse deny</guilabel
-></term>
+<term><guilabel>Browse allow</guilabel> and <guilabel>Browse deny</guilabel></term>
 <listitem>
-<para
-><guilabel
->Browse allow</guilabel
-> specifies an address mask to allow for incoming browser packets. The default is to allow packets from all addresses.</para>
-<para
-><guilabel
->Browse deny</guilabel
-> specifies an address mask to deny for incoming browser packets. The default is to deny packets from no addresses.</para>
-<para
->Both <guilabel
->Browse allow</guilabel
-> and <guilabel
->Browse deny</guilabel
-> accept the following notations for addresses:</para>
+<para><guilabel>Browse allow</guilabel> specifies an address mask to allow for incoming browser packets. The default is to allow packets from all addresses.</para>
+<para><guilabel>Browse deny</guilabel> specifies an address mask to deny for incoming browser packets. The default is to deny packets from no addresses.</para>
+<para>Both <guilabel>Browse allow</guilabel> and <guilabel>Browse deny</guilabel> accept the following notations for addresses:</para>
 
 <informalexample>
 <itemizedlist>
 <listitem>
-<para
-><userinput
->All</userinput
-></para>
+<para><userinput>All</userinput></para>
 </listitem>
 <listitem>
-<para
-><userinput
->None</userinput
-></para>
+<para><userinput>None</userinput></para>
 </listitem>
 <listitem>
-<para
-><userinput
->*.domain.com</userinput
-></para>
+<para><userinput>*.domain.com</userinput></para>
 </listitem>
 <listitem>
-<para
-><userinput
->.domain.com</userinput
-></para>
+<para><userinput>.domain.com</userinput></para>
 </listitem>
 <listitem>
-<para
-><userinput
->host.domain.com</userinput
-></para>
+<para><userinput>host.domain.com</userinput></para>
 </listitem>
 <listitem>
-<para
-><userinput
->nnn.*</userinput
-></para>
+<para><userinput>nnn.*</userinput></para>
 </listitem>
 <listitem>
-<para
-><userinput
->nnn.nnn.*</userinput
-></para>
+<para><userinput>nnn.nnn.*</userinput></para>
 </listitem>
 <listitem>
-<para
-><userinput
->nnn.nnn.nnn.*</userinput
-></para>
+<para><userinput>nnn.nnn.nnn.*</userinput></para>
 </listitem>
 <listitem>
-<para
-><userinput
->nnn.nnn.nnn.nnn</userinput
-></para>
+<para><userinput>nnn.nnn.nnn.nnn</userinput></para>
 </listitem>
 <listitem>
-<para
-><userinput
->nnn.nnn.nnn.nnn/mmm</userinput
-></para>
+<para><userinput>nnn.nnn.nnn.nnn/mmm</userinput></para>
 </listitem>
 <listitem>
-<para
-><userinput
->nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm</userinput
-></para>
+<para><userinput>nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm</userinput></para>
 </listitem>
 </itemizedlist>
 </informalexample>
 
-<para
->The hostname/domain name restrictions will only work if you have turned hostname lookups on!</para>
+<para>The hostname/domain name restrictions will only work if you have turned hostname lookups on!</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Browse order</guilabel
-></term>
+<term><guilabel>Browse order</guilabel></term>
 <listitem>
-<para
->Specifies the order of the allow/deny comparisons.</para>
+<para>Specifies the order of the allow/deny comparisons.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -2274,132 +1175,87 @@ format="PNG"/></imageobject>
 </sect1>
 
 <sect1 id="browsing-timeouts-configuration">
-<title
->Browsing Timeouts Configuration</title>
+<title>Browsing Timeouts Configuration</title>
 
-<para
->The dialogue to configure the &CUPS; server browse timeout settings is shown here. Browse timeout settings include:</para>
+<para>The dialogue to configure the &CUPS; server browse timeout settings is shown here. Browse timeout settings include:</para>
 <itemizedlist>
-<listitem
-><para
-><guilabel
->Browse Interval</guilabel
-></para
-></listitem>
-<listitem
-><para
-><guilabel
->Browse Timeout</guilabel
-></para
-></listitem>
+<listitem><para><guilabel>Browse Interval</guilabel></para></listitem>
+<listitem><para><guilabel>Browse Timeout</guilabel></para></listitem>
 </itemizedlist>
 <screenshot>
-<screeninfo
->Dialogue to configure the &CUPS; server browse timeout settings</screeninfo>
+<screeninfo>Dialogue to configure the &CUPS; server browse timeout settings</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsserverconfiguration12_browsingtimeouts.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->dialogue to configure the &CUPS; server browse timeout settings</phrase
-></textobject>
+<phrase>dialogue to configure the &CUPS; server browse timeout settings</phrase></textobject>
 </mediaobject>
 </screenshot>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Browse interval</guilabel
-></term>
+<term><guilabel>Browse interval</guilabel></term>
 <listitem>
-<para
->The time between browsing updates in seconds. The default is 30 seconds.</para>
-<para
->Note that browsing information is sent whenever a printer's state changes as well, so this represents the maximum time between updates.</para>
-<para
->Set this to 0 to disable outgoing broadcasts so your local printers are not advertised, but you can still see printers on other hosts.</para>
+<para>The time between browsing updates in seconds. The default is 30 seconds.</para>
+<para>Note that browsing information is sent whenever a printer's state changes as well, so this represents the maximum time between updates.</para>
+<para>Set this to 0 to disable outgoing broadcasts so your local printers are not advertised, but you can still see printers on other hosts.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Browse timeouts</term>
+<term>Browse timeouts</term>
 <listitem>
-<para
->The timeout (in seconds) for network printers - if we don't get an update within this time, the printer will be removed from the printer list.</para>
-<para
->This number definitely should not be less than the browse interval period, for obvious reasons. Defaults to 300 seconds.</para>
+<para>The timeout (in seconds) for network printers - if we don't get an update within this time, the printer will be removed from the printer list.</para>
+<para>This number definitely should not be less than the browse interval period, for obvious reasons. Defaults to 300 seconds.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
 </sect1>
 <sect1 id="browsing-relay-configuration">
-<title
->Browsing Relay Configuration</title>
+<title>Browsing Relay Configuration</title>
 
-<para
->The dialogue to configure the &CUPS; server as a browsing relay is shown here. Browsing relay settings include:</para>
+<para>The dialogue to configure the &CUPS; server as a browsing relay is shown here. Browsing relay settings include:</para>
 
 <itemizedlist>
-<listitem
-><para
-><guilabel
->Browser packets relay</guilabel
-></para
-></listitem>
+<listitem><para><guilabel>Browser packets relay</guilabel></para></listitem>
 </itemizedlist>
 
 <screenshot>
-<screeninfo
->Dialogue to configure the &CUPS; server as a browsing relay</screeninfo
-> 
+<screeninfo>Dialogue to configure the &CUPS; server as a browsing relay</screeninfo> 
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsserverconfiguration14_browsingrelay.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->Dialogue to configure the &CUPS; server as a browsing relay</phrase
-></textobject
-> 
+<phrase>Dialogue to configure the &CUPS; server as a browsing relay</phrase></textobject> 
 </mediaobject>
 </screenshot>
 
 <variablelist>
 <varlistentry>
-<term
->Add Browse Relay dialogue</term>
+<term>Add Browse Relay dialogue</term>
 <listitem>
-<para
->The dialogue to enter a new value for an address pair to define browsing relaying between a &CUPS; server and a network is shown here.</para>
+<para>The dialogue to enter a new value for an address pair to define browsing relaying between a &CUPS; server and a network is shown here.</para>
 
 <screenshot>
-<screeninfo
->The dialogue to enter a new value for an address pair to define browsing relaying between a &CUPS; server and a network</screeninfo>
+<screeninfo>The dialogue to enter a new value for an address pair to define browsing relaying between a &CUPS; server and a network</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsserverconfig_browse_relay_add_button.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->The dialogue to enter a new value for an address pair to define browsing relaying between a &CUPS; server and a network</phrase
-></textobject>
+<phrase>The dialogue to enter a new value for an address pair to define browsing relaying between a &CUPS; server and a network</phrase></textobject>
 </mediaobject>
 </screenshot>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Browser packets relay</guilabel
-></term>
+<term><guilabel>Browser packets relay</guilabel></term>
 <listitem>
-<para
->Relay browser packets from one address or network to another.</para>
+<para>Relay browser packets from one address or network to another.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -2407,273 +1263,140 @@ format="PNG"/></imageobject>
 </sect1>
 
 <sect1 id="security-configuration">
-<title
->Security Configuration</title>
+<title>Security Configuration</title>
 
-<para
->The dialogue to configure the &CUPS; server security settings for any of the defined server locations is shown here. It contains the following settings, which may be defined separately for any valid resource (or location) of the &CUPS; server:</para>
+<para>The dialogue to configure the &CUPS; server security settings for any of the defined server locations is shown here. It contains the following settings, which may be defined separately for any valid resource (or location) of the &CUPS; server:</para>
 
 <itemizedlist>
-<listitem
-><para
->System Group:</para
-></listitem>
-<listitem
-><para
->Access Permissions: </para
-></listitem>
-<listitem
-><para
->Auth Type:</para
-></listitem>
-<listitem
-><para
->Auth Class:</para
-></listitem>
-<listitem
-><para
->Auth Group Name:</para
-></listitem>
-<listitem
-><para
->Encryption:</para
-></listitem>
-<listitem
-><para
->Allow:</para
-></listitem>
-<listitem
-><para
->Deny:</para
-></listitem>
-<listitem
-><para
->Order:</para
-></listitem>
+<listitem><para>System Group:</para></listitem>
+<listitem><para>Access Permissions: </para></listitem>
+<listitem><para>Auth Type:</para></listitem>
+<listitem><para>Auth Class:</para></listitem>
+<listitem><para>Auth Group Name:</para></listitem>
+<listitem><para>Encryption:</para></listitem>
+<listitem><para>Allow:</para></listitem>
+<listitem><para>Deny:</para></listitem>
+<listitem><para>Order:</para></listitem>
 </itemizedlist>
 
-<para
->Valid resources (or locations) of the &CUPS; server are:</para>
+<para>Valid resources (or locations) of the &CUPS; server are:</para>
 
 <itemizedlist>
-<listitem
-><para
->Server Root Location: <systemitem class="resource"
->/</systemitem
-> </para
-></listitem
-> 
-<listitem
-><para
->Server Administration Location: <systemitem class="resource"
->/admin</systemitem
-></para
-></listitem>
-<listitem
-><para
->All printers on the server: <systemitem class="resource"
->/printers</systemitem
-></para
-></listitem>
-<listitem
-><para
->Any individual printer on the server: &eg; <systemitem class="resource"
->/printers/infotec_P320</systemitem
-></para
-></listitem
-> 
-<listitem
-><para
->All printer classes on the server: <systemitem class="resource"
->/classes</systemitem
->:</para
-></listitem
-> 
-<listitem
-><para
->Any individual printer class on the server: &eg; <systemitem class="resource"
->/classes/all_infotecs_P320_or_P450</systemitem
-></para
-></listitem
-> 
+<listitem><para>Server Root Location: <systemitem class="resource">/</systemitem> </para></listitem> 
+<listitem><para>Server Administration Location: <systemitem class="resource">/admin</systemitem></para></listitem>
+<listitem><para>All printers on the server: <systemitem class="resource">/printers</systemitem></para></listitem>
+<listitem><para>Any individual printer on the server: &eg; <systemitem class="resource">/printers/infotec_P320</systemitem></para></listitem> 
+<listitem><para>All printer classes on the server: <systemitem class="resource">/classes</systemitem>:</para></listitem> 
+<listitem><para>Any individual printer class on the server: &eg; <systemitem class="resource">/classes/all_infotecs_P320_or_P450</systemitem></para></listitem> 
 </itemizedlist>
 
 <screenshot>
-<screeninfo
->Dialogue to configure the &CUPS; server security settings for any of the defined server locations</screeninfo>
+<screeninfo>Dialogue to configure the &CUPS; server security settings for any of the defined server locations</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsserverconfiguration_securityoverview.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->dialogue to configure the &CUPS; server security settings for any of the defined server locations</phrase
-></textobject>
+<phrase>dialogue to configure the &CUPS; server security settings for any of the defined server locations</phrase></textobject>
 
 </mediaobject>
 </screenshot>
 
 <note>
-<para
->For all locations that are not defined separately the setting of the location <quote
->above</quote
-> it is valid.</para>
-
-<para
->For example, you have a printer named <systemitem class="resource"
->infotec_P450</systemitem
-> with no set security options. Then the security of the location <systemitem class="resource"
->/printers</systemitem
-> will take the responsibility for this printer as it is a sub-location of<systemitem class="resource"
->/printers</systemitem
->. If, in turn there is no security set for <systemitem class="resource"
->/printers</systemitem
->, then the security for <systemitem class="resource"
->/</systemitem
-> (the general security) of the server takes responsibility. Either you have set this for your purpose or the compiled-in default value takes over.</para>
+<para>For all locations that are not defined separately the setting of the location <quote>above</quote> it is valid.</para>
+
+<para>For example, you have a printer named <systemitem class="resource">infotec_P450</systemitem> with no set security options. Then the security of the location <systemitem class="resource">/printers</systemitem> will take the responsibility for this printer as it is a sub-location of<systemitem class="resource">/printers</systemitem>. If, in turn there is no security set for <systemitem class="resource">/printers</systemitem>, then the security for <systemitem class="resource">/</systemitem> (the general security) of the server takes responsibility. Either you have set this for your purpose or the compiled-in default value takes over.</para>
 </note>
 
 <variablelist>
 <varlistentry>
-<term
->SystemGroup</term>
+<term>SystemGroup</term>
 <listitem>
-<para
->The group name for <systemitem class="groupname"
->System</systemitem
-> or printer administration access. The default varies depending on the operating system, but will be <systemitem class="groupname"
->sys</systemitem
->, <systemitem class="groupname"
->system</systemitem
-> or <systemitem class="groupname"
->root</systemitem
-> (checked for in that order).</para>
+<para>The group name for <systemitem class="groupname">System</systemitem> or printer administration access. The default varies depending on the operating system, but will be <systemitem class="groupname">sys</systemitem>, <systemitem class="groupname">system</systemitem> or <systemitem class="groupname">root</systemitem> (checked for in that order).</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Access Permissions</term>
+<term>Access Permissions</term>
 <listitem>
-<para
->Access permissions for each folder served by the scheduler. Locations are relative to the document root.</para>
+<para>Access permissions for each folder served by the scheduler. Locations are relative to the document root.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Authorisation Type</term>
+<term>Authorisation Type</term>
 <listitem>
-<para
->The authorisation to use:</para>
+<para>The authorisation to use:</para>
 
 <variablelist>
 <varlistentry>
-<term
->None</term>
+<term>None</term>
 <listitem>
-<para
->Perform no authentication.</para>
+<para>Perform no authentication.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->Basic</term>
+<term>Basic</term>
 <listitem>
-<para
->Perform authentication using the &HTTP; Basic method.</para>
+<para>Perform authentication using the &HTTP; Basic method.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->Digest</term>
+<term>Digest</term>
 <listitem>
-<para
->Perform authentication using the &HTTP; Digest method.</para>
+<para>Perform authentication using the &HTTP; Digest method.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
 <note>
-<para
->Local certificate authentication can be substituted by the client for Basic or Digest, when connecting to the localhost interface.</para>
+<para>Local certificate authentication can be substituted by the client for Basic or Digest, when connecting to the localhost interface.</para>
 </note>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Authorisation Class</term>
+<term>Authorisation Class</term>
 <listitem>
-<para
->The authorisation class. Currently only <quote
->Anonymous</quote
->, <quote
->User</quote
->, <quote
->System</quote
-> (valid user belonging to the group set as system group), and <quote
->group</quote
-> (valid user belonging to the specified group) are supported.</para>
+<para>The authorisation class. Currently only <quote>Anonymous</quote>, <quote>User</quote>, <quote>System</quote> (valid user belonging to the group set as system group), and <quote>group</quote> (valid user belonging to the specified group) are supported.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Authorisation Group Name</term>
+<term>Authorisation Group Name</term>
 <listitem>
-<para
->The group name for <quote
->Group</quote
-> authorisation</para>
+<para>The group name for <quote>Group</quote> authorisation</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Encryption</term>
+<term>Encryption</term>
 <listitem>
-<para
->Whether or not to use encryption. This depends on having the <application
->OpenSSL</application
-> linked into the &CUPS; library and scheduler.</para>
-<para
->Possible values are:</para>
+<para>Whether or not to use encryption. This depends on having the <application>OpenSSL</application> linked into the &CUPS; library and scheduler.</para>
+<para>Possible values are:</para>
 <variablelist>
 <varlistentry>
-<term
->Always</term>
+<term>Always</term>
 <listitem>
-<para
->Always use encryption (<acronym
->SSL</acronym
->)</para>
+<para>Always use encryption (<acronym>SSL</acronym>)</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->Never</term>
+<term>Never</term>
 <listitem>
-<para
->Never use encryption.</para>
+<para>Never use encryption.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->Required</term>
+<term>Required</term>
 <listitem>
-<para
->Use <acronym
->TLS</acronym
-> encryption upgrade.</para>
+<para>Use <acronym>TLS</acronym> encryption upgrade.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->IfRequested</term>
+<term>IfRequested</term>
 <listitem>
-<para
->Use encryption if the server requests it.</para>
+<para>Use encryption if the server requests it.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -2681,310 +1404,189 @@ format="PNG"/></imageobject>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Allow</guilabel
-></term>
+<term><guilabel>Allow</guilabel></term>
 <listitem>
-<para
->Allows access from the specified hostname, domain, <acronym
->IP</acronym
-> address or network. Possible values are:</para>
+<para>Allows access from the specified hostname, domain, <acronym>IP</acronym> address or network. Possible values are:</para>
 
 <informalexample>
 <itemizedlist>
 <listitem>
-<para
-><userinput
->All</userinput
-></para>
+<para><userinput>All</userinput></para>
 </listitem>
 <listitem>
-<para
-><userinput
->None</userinput
-></para>
+<para><userinput>None</userinput></para>
 </listitem>
 <listitem>
-<para
-><userinput
->*.domain.com</userinput
-></para>
+<para><userinput>*.domain.com</userinput></para>
 </listitem>
 <listitem>
-<para
-><userinput
->.domain.com</userinput
-></para>
+<para><userinput>.domain.com</userinput></para>
 </listitem>
 <listitem>
-<para
-><userinput
->host.domain.com</userinput
-></para>
+<para><userinput>host.domain.com</userinput></para>
 </listitem>
 <listitem>
-<para
-><userinput
->nnn.*</userinput
-></para>
+<para><userinput>nnn.*</userinput></para>
 </listitem>
 <listitem>
-<para
-><userinput
->nnn.nnn.*</userinput
-></para>
+<para><userinput>nnn.nnn.*</userinput></para>
 </listitem>
 <listitem>
-<para
-><userinput
->nnn.nnn.nnn.*</userinput
-></para>
+<para><userinput>nnn.nnn.nnn.*</userinput></para>
 </listitem>
 <listitem>
-<para
-><userinput
->nnn.nnn.nnn.nnn</userinput
-></para>
+<para><userinput>nnn.nnn.nnn.nnn</userinput></para>
 </listitem>
 <listitem>
-<para
-><userinput
->nnn.nnn.nnn.nnn/mmm</userinput
-></para>
+<para><userinput>nnn.nnn.nnn.nnn/mmm</userinput></para>
 </listitem>
 <listitem>
-<para
-><userinput
->nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm</userinput
-></para>
+<para><userinput>nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm</userinput></para>
 </listitem>
 </itemizedlist>
 </informalexample>
 
-<para
->The host and domain address require that you enable hostname lookups, as described earlier.</para>
+<para>The host and domain address require that you enable hostname lookups, as described earlier.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Deny</guilabel
-></term>
+<term><guilabel>Deny</guilabel></term>
 <listitem>
-<para
->Denies access from the specified hostname, domain, <acronym
->IP</acronym
-> address or network. Possible values are:</para>
+<para>Denies access from the specified hostname, domain, <acronym>IP</acronym> address or network. Possible values are:</para>
 <informalexample>
 <itemizedlist>
 <listitem>
-<para
-><userinput
->All</userinput
-></para>
+<para><userinput>All</userinput></para>
 </listitem>
 <listitem>
-<para
-><userinput
->None</userinput
-></para>
+<para><userinput>None</userinput></para>
 </listitem>
 <listitem>
-<para
-><userinput
->*.domain.com</userinput
-></para>
+<para><userinput>*.domain.com</userinput></para>
 </listitem>
 <listitem>
-<para
-><userinput
->.domain.com</userinput
-></para>
+<para><userinput>.domain.com</userinput></para>
 </listitem>
 <listitem>
-<para
-><userinput
->host.domain.com</userinput
-></para>
+<para><userinput>host.domain.com</userinput></para>
 </listitem>
 <listitem>
-<para
-><userinput
->nnn.*</userinput
-></para>
+<para><userinput>nnn.*</userinput></para>
 </listitem>
 <listitem>
-<para
-><userinput
->nnn.nnn.*</userinput
-></para>
+<para><userinput>nnn.nnn.*</userinput></para>
 </listitem>
 <listitem>
-<para
-><userinput
->nnn.nnn.nnn.*</userinput
-></para>
+<para><userinput>nnn.nnn.nnn.*</userinput></para>
 </listitem>
 <listitem>
-<para
-><userinput
->nnn.nnn.nnn.nnn</userinput
-></para>
+<para><userinput>nnn.nnn.nnn.nnn</userinput></para>
 </listitem>
 <listitem>
-<para
-><userinput
->nnn.nnn.nnn.nnn/mmm</userinput
-></para>
+<para><userinput>nnn.nnn.nnn.nnn/mmm</userinput></para>
 </listitem>
 <listitem>
-<para
-><userinput
->nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm</userinput
-></para>
+<para><userinput>nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm</userinput></para>
 </listitem>
 </itemizedlist>
 </informalexample>
-<para
->The host and domain address require that you enable hostname lookups, as described earlier.</para>
+<para>The host and domain address require that you enable hostname lookups, as described earlier.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Order</term>
+<term>Order</term>
 <listitem>
-<para
->The order of the allow and deny processing.</para>
+<para>The order of the allow and deny processing.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 </sect1>
 
 <sect1 id="example-how-define-security-for-all-printers">
-<title
->Example: How To Define The Security For All Printers</title>
-
-<para
->The dialogue to configure the &CUPS; server security settings is discussed here. We use the example to add security definitions other than the default ones for the resource named <systemitem class="resource"
->all printers</systemitem
->. For the &CUPS; web server, this is the location you access through <ulink url="http://localhost:631/printers/"
-> http://localhost:631/printers/</ulink
-> or (remotely) through <ulink url="http://cups.server.name:631/printers/"
-> http://cups.server.name:631/printers/</ulink
-></para>
-
-<para
->The first screenshot shows the general location for this setting. <guilabel
->Select</guilabel
-> <guibutton
->Add</guibutton
-> or <guibutton
->Modify</guibutton
-> a resource for which you want to decide about its security settings.</para>
+<title>Example: How To Define The Security For All Printers</title>
+
+<para>The dialogue to configure the &CUPS; server security settings is discussed here. We use the example to add security definitions other than the default ones for the resource named <systemitem class="resource">all printers</systemitem>. For the &CUPS; web server, this is the location you access through <ulink url="http://localhost:631/printers/"> http://localhost:631/printers/</ulink> or (remotely) through <ulink url="http://cups.server.name:631/printers/"> http://cups.server.name:631/printers/</ulink></para>
+
+<para>The first screenshot shows the general location for this setting. <guilabel>Select</guilabel> <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> a resource for which you want to decide about its security settings.</para>
 
 <screenshot>
-<screeninfo
->Dialogue to configure the &CUPS; server security settings</screeninfo
-><mediaobject>
+<screeninfo>Dialogue to configure the &CUPS; server security settings</screeninfo><mediaobject>
 <imageobject>
 <imagedata fileref="cupsserverconfiguration15a_resourceallprinters_defineaccess.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->Dialogue to configure the &CUPS; server security settings</phrase
-></textobject>
+<phrase>Dialogue to configure the &CUPS; server security settings</phrase></textobject>
 </mediaobject>
 </screenshot>
 
-<para
->This dialogue is to add a new resource. It looks similar if you want to modify an already existing resource. Here are the general options:</para>
+<para>This dialogue is to add a new resource. It looks similar if you want to modify an already existing resource. Here are the general options:</para>
 
 <screenshot>
-<screeninfo
->Dialogue to add a new resource.</screeninfo>
+<screeninfo>Dialogue to add a new resource.</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsserverconfiguration15b_resourceallprinters_defineaccess.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->Dialogue to add a new resource.</phrase
-></textobject>
+<phrase>Dialogue to add a new resource.</phrase></textobject>
 </mediaobject>
 </screenshot>
 
-<para
->.This is the second part or the dialogue is to add a new ressource. It looks similar if you want to modify an already existing resource. Here you define the actual access masks for the resource in question. </para>
+<para>.This is the second part or the dialogue is to add a new ressource. It looks similar if you want to modify an already existing resource. Here you define the actual access masks for the resource in question. </para>
 
 <screenshot>
-<screeninfo
->Dialogue to add a new resource.</screeninfo>
+<screeninfo>Dialogue to add a new resource.</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsserverconfiguration15c_resourceallprinters_defineaccess.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->Dialogue to add a new resource.</phrase
-></textobject>
+<phrase>Dialogue to add a new resource.</phrase></textobject>
 </mediaobject>
 </screenshot>
 <screenshot>
-<screeninfo
->Resource dialogue</screeninfo>
+<screeninfo>Resource dialogue</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsserverconfiguration_resourceadminaccessmasks.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->Resource dialogue</phrase
-></textobject>
+<phrase>Resource dialogue</phrase></textobject>
 </mediaobject>
 </screenshot>
 
 <screenshot>
-<screeninfo
->Resource dialogue</screeninfo>
+<screeninfo>Resource dialogue</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsserverconfiguration_resourceadminaddprinters.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->Resource dialogue</phrase
-></textobject>
+<phrase>Resource dialogue</phrase></textobject>
 </mediaobject>
 </screenshot>
 
 <screenshot>
-<screeninfo
->Resource dialogue</screeninfo>
+<screeninfo>Resource dialogue</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsserverconfiguration_resourceadminaddprinters_defineaccess.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->Resource dialogue</phrase
-></textobject>
+<phrase>Resource dialogue</phrase></textobject>
 </mediaobject>
 </screenshot>
 
 <screenshot>
-<screeninfo
->Resource dialogue</screeninfo>
+<screeninfo>Resource dialogue</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsserverconfiguration_resourceadminauthorization.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->Resource dialogue</phrase
-></textobject>
+<phrase>Resource dialogue</phrase></textobject>
 </mediaobject>
 </screenshot>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeprint/cupsoptions.docbook b/tde-i18n-en_GB/docs/tdebase/tdeprint/cupsoptions.docbook
index a6ecddc1ee0..50d5a4fd8f4 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeprint/cupsoptions.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeprint/cupsoptions.docbook
@@ -1,84 +1,48 @@
 <chapter id="cupsoptions-presently-outside-kcontrol">
-<title
->&CUPS; options presently not available through &kcontrol;</title>
+<title>&CUPS; options presently not available through &kcontrol;</title>
 
-<para
->This chapter gives you some hints about further configuration possibilities which may not be available through the &tdeprint; &GUI; interface to &CUPS;.</para>
+<para>This chapter gives you some hints about further configuration possibilities which may not be available through the &tdeprint; &GUI; interface to &CUPS;.</para>
 
 <sect1>
-<title
->Overview of provided features</title>
+<title>Overview of provided features</title>
 
-<para
->All of the most often used features and functions &CUPS; provides are supported in &tdeprint;.</para>
+<para>All of the most often used features and functions &CUPS; provides are supported in &tdeprint;.</para>
 
 <itemizedlist>
 <listitem>
-<para
->Printer management is supported: add, remove, modify, configure, test, disable, enable ...</para>
+<para>Printer management is supported: add, remove, modify, configure, test, disable, enable ...</para>
 </listitem>
 <listitem>
-<para
->Job management is supported: cancel, hold, release, move to different printer</para>
+<para>Job management is supported: cancel, hold, release, move to different printer</para>
 </listitem>
 <listitem>
-<para
->Print options: for full control as provided by &CUPS;.</para>
+<para>Print options: for full control as provided by &CUPS;.</para>
 </listitem>
 </itemizedlist>
 
 </sect1>
 
 <sect1 id="where-to-find-further-chupshelp">
-<title
->Where to find help when using &CUPS;</title>
+<title>Where to find help when using &CUPS;</title>
 
-<para
->A lot of information about the inner workings of &CUPS; is available through the web interface, which &CUPS; will always support. It works with any browser (yes, even text-based ones). Just go to <ulink url="http://localhost:631/"
->http://localhost:631/</ulink
-> for a start. There you find a link to locally available &CUPS; documentation in <acronym
->HTML</acronym
-> and <acronym
->PDF</acronym
-> if you are new to &CUPS;.</para>
+<para>A lot of information about the inner workings of &CUPS; is available through the web interface, which &CUPS; will always support. It works with any browser (yes, even text-based ones). Just go to <ulink url="http://localhost:631/">http://localhost:631/</ulink> for a start. There you find a link to locally available &CUPS; documentation in <acronym>HTML</acronym> and <acronym>PDF</acronym> if you are new to &CUPS;.</para>
 
-<para
->&CUPS; is accessible through other means than &tdeprint;: commandline and browser are two native &CUPS; interfaces. The many commandline utilities add up to the most complete control you have on &CUPS;. The web interface is only a subset of all available configuration or control options. </para>
+<para>&CUPS; is accessible through other means than &tdeprint;: commandline and browser are two native &CUPS; interfaces. The many commandline utilities add up to the most complete control you have on &CUPS;. The web interface is only a subset of all available configuration or control options. </para>
 
-<para
->This is also true for &tdeprint;. Generally, as &CUPS; develops, most new features will first be implemented through the commandline. Be sure to check the latest versions of the man pages for &CUPS; to stay up-to-date with new features after you install a new version.</para>
+<para>This is also true for &tdeprint;. Generally, as &CUPS; develops, most new features will first be implemented through the commandline. Be sure to check the latest versions of the man pages for &CUPS; to stay up-to-date with new features after you install a new version.</para>
 
 <tip>
-<para
->Depending on your update method for &CUPS;, your active configuration file might not have been re-placed by a new one; thus your new, more capable &CUPS;-daemon might not have been told by the old configuration file about the new features to use.</para>
+<para>Depending on your update method for &CUPS;, your active configuration file might not have been re-placed by a new one; thus your new, more capable &CUPS;-daemon might not have been told by the old configuration file about the new features to use.</para>
 </tip>
 
-<para
->A complete list of available files and man pages should always be in the &CUPS; Software Administrator Manual (<ulink url="http://localhost:631/sam.html#FILES"
->http://localhost:631/sam.html#FILES</ulink
->. In the &konqueror; &URL;/location field, type <userinput
->man:/lpadmin</userinput
-> and <userinput
->man:/cupsd.conf</userinput
-> to find out about the most important command and configuration file. You knew already about &konqueror;'s nice abilities to show you the traditional &UNIX; man pages, didn't you? Read this. From there you find more interesting hints and links to other man pages and documentation.</para>
+<para>A complete list of available files and man pages should always be in the &CUPS; Software Administrator Manual (<ulink url="http://localhost:631/sam.html#FILES">http://localhost:631/sam.html#FILES</ulink>. In the &konqueror; &URL;/location field, type <userinput>man:/lpadmin</userinput> and <userinput>man:/cupsd.conf</userinput> to find out about the most important command and configuration file. You knew already about &konqueror;'s nice abilities to show you the traditional &UNIX; man pages, didn't you? Read this. From there you find more interesting hints and links to other man pages and documentation.</para>
 
 <sect2>
-<title
->How to find &CUPS; related man pages</title>
-
-<para
->Here is a way to find out which &CUPS; related man pages there are on your system: </para>
-
-<screen
-><prompt
->kurt@transmeta:~ 
-></prompt
-> <userinput
-><command
->apropos</command
-> <parameter
->cups</parameter
-></userinput>
+<title>How to find &CUPS; related man pages</title>
+
+<para>Here is a way to find out which &CUPS; related man pages there are on your system: </para>
+
+<screen><prompt>kurt@transmeta:~ ></prompt> <userinput><command>apropos</command> <parameter>cups</parameter></userinput>
 <computeroutput>
 cups-calibrate (8)- ESP Printer Calibration Tool
 lpstat (1)        - print cups status information
@@ -103,429 +67,168 @@ lpadmin (8)       - configure cups printers and classes
 printers.conf (5) - printer configuration file for cups
 cupsd.conf (5)    - server configuration file for cups
 filter (1)        - cups file conversion filter interfaces
-</computeroutput
-></screen>
+</computeroutput></screen>
 </sect2>
 </sect1>
 
 <sect1 id="tips-and-tricks-for-cups">
-<title
->Outside &tdeprint;: Hints &amp; Tips Tricks with &CUPS; on the Commandline</title>
+<title>Outside &tdeprint;: Hints &amp; Tips Tricks with &CUPS; on the Commandline</title>
 
-<para
->Here are a few examples of options that are presently only available if you use the commandline. </para>
+<para>Here are a few examples of options that are presently only available if you use the commandline. </para>
 
 <sect2>
-<title
->Allowing or denying printer access for certain users</title>
-
-<para
->When installing (or modifying) a printer through the command line, you can either deny or allow the usage of that printer to certain users:</para>
-
-<screen
-><userinput
-><command
->lpadmin</command
-> <option
->-p</option
-><parameter
->HeidelbergDigimaster9110</parameter
-> <option
->-v</option
-> <parameter
->lpd:/10.160.16.99/mqueue</parameter
-> <option
->-u</option
-> <parameter
->allow:kurt,sylvi,hansjoerg</parameter
-> <option
->-E</option
-> <option
->-P</option
-> <parameter
->/home/kurt/PPDs/DVHV.ppd</parameter
-></userinput
-></screen>
-
-<para
->will allow the usage of this (believe me: very nice and also very professional) printer to only the three mentioned users and at the same time deny it to all others. If another user wants to print on the DigiMaster via this &CUPS; server, he will receive an error message along the lines <errortype
->client-error-not-possible</errortype
->.</para>
-
-<screen
-><userinput
-><command
->lpadmin</command
-> <option
->-p</option
-> <parameter
->HeidelbergDigimaster9110</parameter
-> <option
->-v</option
-> <parameter
->lpd:/10.160.16.99/mqueue</parameter
-> <option
->-u</option
-> <parameter
->deny:tackat,boss,waba</parameter
-> <option
->-E</option
-> <option
->-P</option
-> <parameter
->/home/kurt/PPDs/DVHV.ppd</parameter
-></userinput
-></screen>
-
-<para
->will deny the usage of this same printer to the three mentioned users and at the same time allow it to all others. If <quote
->denied</quote
-> user wants to print on the DigiMaster via this &CUPS; server, he will receive an error message along the lines <errortype
->client-error-not-possible</errortype
->.</para>
+<title>Allowing or denying printer access for certain users</title>
+
+<para>When installing (or modifying) a printer through the command line, you can either deny or allow the usage of that printer to certain users:</para>
+
+<screen><userinput><command>lpadmin</command> <option>-p</option><parameter>HeidelbergDigimaster9110</parameter> <option>-v</option> <parameter>lpd:/10.160.16.99/mqueue</parameter> <option>-u</option> <parameter>allow:kurt,sylvi,hansjoerg</parameter> <option>-E</option> <option>-P</option> <parameter>/home/kurt/PPDs/DVHV.ppd</parameter></userinput></screen>
+
+<para>will allow the usage of this (believe me: very nice and also very professional) printer to only the three mentioned users and at the same time deny it to all others. If another user wants to print on the DigiMaster via this &CUPS; server, he will receive an error message along the lines <errortype>client-error-not-possible</errortype>.</para>
+
+<screen><userinput><command>lpadmin</command> <option>-p</option> <parameter>HeidelbergDigimaster9110</parameter> <option>-v</option> <parameter>lpd:/10.160.16.99/mqueue</parameter> <option>-u</option> <parameter>deny:tackat,boss,waba</parameter> <option>-E</option> <option>-P</option> <parameter>/home/kurt/PPDs/DVHV.ppd</parameter></userinput></screen>
+
+<para>will deny the usage of this same printer to the three mentioned users and at the same time allow it to all others. If <quote>denied</quote> user wants to print on the DigiMaster via this &CUPS; server, he will receive an error message along the lines <errortype>client-error-not-possible</errortype>.</para>
 
 <note>
-<para
->Only one of the two options may be used at one time; at present there is no support to have a similar option in a per-group based way. This will be implemented in the future.</para>
+<para>Only one of the two options may be used at one time; at present there is no support to have a similar option in a per-group based way. This will be implemented in the future.</para>
 </note>
 
 </sect2>
 <sect2>
-<title
->Imposing Quotas for certain printers</title>
+<title>Imposing Quotas for certain printers</title>
 
-<para
->Sometimes you want to impose quotas for certain printers. With quotas you can set upper limits for the number of pages or the amount of data to be printed over a certain period to a certain printer.</para>
+<para>Sometimes you want to impose quotas for certain printers. With quotas you can set upper limits for the number of pages or the amount of data to be printed over a certain period to a certain printer.</para>
 
-<para
->Quotas can be set with the <option
->-o</option
-> option when installing a printer with the <command
->lpadmin</command
-> command, or afterwards for an already existing printer. Following are some guidelines (which are missing at the time of writing in the, official &CUPS; documentation):</para>
+<para>Quotas can be set with the <option>-o</option> option when installing a printer with the <command>lpadmin</command> command, or afterwards for an already existing printer. Following are some guidelines (which are missing at the time of writing in the, official &CUPS; documentation):</para>
 
 <itemizedlist>
 <listitem>
-<para
->With &CUPS; you may have pagecount- and filesize-based quotas for individual printers.</para>
+<para>With &CUPS; you may have pagecount- and filesize-based quotas for individual printers.</para>
 </listitem>
 
 <listitem>
-<para
->Quotas are calculated for each user individually (so a single set of limits applies to all users for the printer concerned).</para>
+<para>Quotas are calculated for each user individually (so a single set of limits applies to all users for the printer concerned).</para>
 </listitem>
 
 <listitem>
-<para
->Quotas include banner pages (if those are used).</para>
+<para>Quotas include banner pages (if those are used).</para>
 </listitem>
 
 <listitem>
-<para
->This means: you can limit every user to 20 pages per day on an expensive printer, but you cannot limit every user except <systemitem class="username"
->Kurt</systemitem
-> or <systemitem class="username"
->root</systemitem
->.</para>
+<para>This means: you can limit every user to 20 pages per day on an expensive printer, but you cannot limit every user except <systemitem class="username">Kurt</systemitem> or <systemitem class="username">root</systemitem>.</para>
 </listitem>
 
 <listitem>
-<para
->There are <option
->job-k-limit</option
->, <option
->job-page-limit</option
->, and <option
->job-quota-period</option
-> options to give when setting up a printer.</para>
+<para>There are <option>job-k-limit</option>, <option>job-page-limit</option>, and <option>job-quota-period</option> options to give when setting up a printer.</para>
 </listitem>
 
 <listitem>
-<para
-><option
->job-quota-period</option
-> sets a time interval for quota computing (intervals are determined in seconds; so a day is 60x60x24=86.400, a week is 60x60x24x7=604,800, and a month is 60x60x24x30=2.592.000 seconds.)</para>
+<para><option>job-quota-period</option> sets a time interval for quota computing (intervals are determined in seconds; so a day is 60x60x24=86.400, a week is 60x60x24x7=604,800, and a month is 60x60x24x30=2.592.000 seconds.)</para>
 </listitem>
 
 <listitem>
-<para
->For quotas to be enforced, the time-period <emphasis
->plus</emphasis
-> at least one job-limit must be set to non-zero.</para>
+<para>For quotas to be enforced, the time-period <emphasis>plus</emphasis> at least one job-limit must be set to non-zero.</para>
 </listitem>
 
 <listitem>
-<para
->The default value of 0 for <option
->job-k-limit</option
-> specifies that there is no limit.</para>
+<para>The default value of 0 for <option>job-k-limit</option> specifies that there is no limit.</para>
 </listitem>
 
 <listitem>
-<para
->The default value of 0 for <option
->job-page-limit</option
-> specifies that there is no limit.</para>
+<para>The default value of 0 for <option>job-page-limit</option> specifies that there is no limit.</para>
 </listitem>
 
 <listitem>
-<para
->The default value of 0 for <option
->job-quota-period</option
-> specifies that the limits apply to all jobs that have been printed by a user that are still known to the system.</para>
+<para>The default value of 0 for <option>job-quota-period</option> specifies that the limits apply to all jobs that have been printed by a user that are still known to the system.</para>
 </listitem>
 </itemizedlist>
 
 <sect3>
-<title
->Working Examples:</title>
-
-<para
->Working, as both, time-period <emphasis
->plus</emphasis
-> one or both job-limits are defined</para>
-
-<screen
-><userinput
-><command
->lpadmin</command
-> <option
->-p</option
-> <parameter
->danka_infotec_4850</parameter
-> <option
->-o</option
-> <parameter
->job-quota-period=604800</parameter
-> <option
->-o</option
-> <parameter
->job-k-limit=1024</parameter
-></userinput
-></screen>
-
-<para
->This sets a limit of a file size of 1 MB (in total) for each user of existing printer <systemitem class="resource"
->danka_infotec_4850</systemitem
-> during one week.</para>
-
-<screen
-><userinput
-><command
->lpadmin</command
-> <option
->p</option
-> <parameter
->danka_infotec_4105</parameter
-> <option
->-o</option
-> <parameter
->job-quota-period=604800</parameter
-> <option
->-o</option
-> <parameter
->job-page-limit=100</parameter
-></userinput
-></screen>
-
-<para
->This sets a limit of 100 pages (in total) for each user of existing printer <systemitem class="resource"
->danka_infotec_4105</systemitem
-> during one week.</para>
-
-<screen
-><userinput
-><command
->lpadmin</command
-> <option
->-p</option
-> <parameter
->danka_infotec_P450</parameter
-> <option
->-o</option
-> <parameter
->job-quota-period=604800</parameter
-> <option
->-o</option
-> <parameter
->job-k-limit=1024</parameter
-> <option
->-o</option
-> <parameter
->job-page-limit=100</parameter
-></userinput
-></screen>
-
-<para
->This sets a combined limit of 1 MB (in total) and 100 pages (in total) for each user of existing printer <systemitem class="resource"
->danka_infotec_P450</systemitem
-> during one week. Whichever limit is reached first will take effect.</para>
+<title>Working Examples:</title>
+
+<para>Working, as both, time-period <emphasis>plus</emphasis> one or both job-limits are defined</para>
+
+<screen><userinput><command>lpadmin</command> <option>-p</option> <parameter>danka_infotec_4850</parameter> <option>-o</option> <parameter>job-quota-period=604800</parameter> <option>-o</option> <parameter>job-k-limit=1024</parameter></userinput></screen>
+
+<para>This sets a limit of a file size of 1 MB (in total) for each user of existing printer <systemitem class="resource">danka_infotec_4850</systemitem> during one week.</para>
+
+<screen><userinput><command>lpadmin</command> <option>p</option> <parameter>danka_infotec_4105</parameter> <option>-o</option> <parameter>job-quota-period=604800</parameter> <option>-o</option> <parameter>job-page-limit=100</parameter></userinput></screen>
+
+<para>This sets a limit of 100 pages (in total) for each user of existing printer <systemitem class="resource">danka_infotec_4105</systemitem> during one week.</para>
+
+<screen><userinput><command>lpadmin</command> <option>-p</option> <parameter>danka_infotec_P450</parameter> <option>-o</option> <parameter>job-quota-period=604800</parameter> <option>-o</option> <parameter>job-k-limit=1024</parameter> <option>-o</option> <parameter>job-page-limit=100</parameter></userinput></screen>
+
+<para>This sets a combined limit of 1 MB (in total) and 100 pages (in total) for each user of existing printer <systemitem class="resource">danka_infotec_P450</systemitem> during one week. Whichever limit is reached first will take effect.</para>
 
 </sect3>
 
 <sect3>
-<title
->Not working examples</title>
-
-<para
-><emphasis
->NOT</emphasis
-> working, as only <emphasis
->one</emphasis
->, time-period <emphasis
->or</emphasis
-> job-limit is defined)</para>
-
-<screen
-><userinput
-><command
->lpadmin</command
-> <option
->-p</option
-> <parameter
->danka_infotec_P320</parameter
-> <option
->-o</option
-> <parameter
->job-quota-period=604800</parameter
-></userinput>
-
-<userinput
-><command
->lpadmin</command
-> <option
->-p</option
-> <parameter
->danka_infotec_FullColor</parameter
-> <option
->-o</option
-> <parameter
->job-page-limit=100</parameter
-></userinput>
-
-<userinput
-><command
->lpadmin</command
-> <option
->-p</option
-> <parameter
->danka_infotec_HiSpeed</parameter
-> <option
->-o</option
-> <parameter
->job-k-limit=1024</parameter
-></userinput
-></screen>
+<title>Not working examples</title>
+
+<para><emphasis>NOT</emphasis> working, as only <emphasis>one</emphasis>, time-period <emphasis>or</emphasis> job-limit is defined)</para>
+
+<screen><userinput><command>lpadmin</command> <option>-p</option> <parameter>danka_infotec_P320</parameter> <option>-o</option> <parameter>job-quota-period=604800</parameter></userinput>
+
+<userinput><command>lpadmin</command> <option>-p</option> <parameter>danka_infotec_FullColor</parameter> <option>-o</option> <parameter>job-page-limit=100</parameter></userinput>
+
+<userinput><command>lpadmin</command> <option>-p</option> <parameter>danka_infotec_HiSpeed</parameter> <option>-o</option> <parameter>job-k-limit=1024</parameter></userinput></screen>
 
 </sect3>
 
 <sect3>
-<title
->Related Error Messages</title>
+<title>Related Error Messages</title>
 
-<para
->Once a user reaches his quota limit, he'll get a <errortype
->client-error-not-possible</errortype
-> message, if he wants to print.</para>
+<para>Once a user reaches his quota limit, he'll get a <errortype>client-error-not-possible</errortype> message, if he wants to print.</para>
 
 </sect3>
 
 </sect2>
 
 <sect2>
-<title
->Installing a <quote
->raw</quote
-> printer</title>
-
-<para
->There are different ways to define a <quote
->raw</quote
-> printer. One comfortable one is to use the <command
->lpadmin</command
-> command. Just don't define a &PPD; file to be used for that printer and it will be a raw one:</para>
-
-<screen
-><userinput
-><command
->lpadmin</command
-> <option
->-p</option
-> <parameter
->Raw_Danka_infotec</parameter
-> <option
->-E</option
-> <option
->-v</option
-> <parameter
->lpd://10.160.16.137/PORT1</parameter
-></userinput
-></screen>
-
-<para
->Raw printer queues are those which don't touch the print file to transform it to a different file format. You need this for example when printing from &Windows; clients via Samba through a &CUPS; server to a <acronym
->PCL</acronym
-> printer: in this case the &Windows; side printer driver would generate the finished print file format for the target printer and filtering it through &CUPS; filters would only harm the purpose. Under certain circumstances (if you want to make sure that the file goes to the printer <quote
->unfiltered</quote
-> by &CUPS;) the <quote
-><command
->lpadmin</command
-> without a &PPD;</quote
-> comes in handy.</para>
+<title>Installing a <quote>raw</quote> printer</title>
+
+<para>There are different ways to define a <quote>raw</quote> printer. One comfortable one is to use the <command>lpadmin</command> command. Just don't define a &PPD; file to be used for that printer and it will be a raw one:</para>
+
+<screen><userinput><command>lpadmin</command> <option>-p</option> <parameter>Raw_Danka_infotec</parameter> <option>-E</option> <option>-v</option> <parameter>lpd://10.160.16.137/PORT1</parameter></userinput></screen>
+
+<para>Raw printer queues are those which don't touch the print file to transform it to a different file format. You need this for example when printing from &Windows; clients via Samba through a &CUPS; server to a <acronym>PCL</acronym> printer: in this case the &Windows; side printer driver would generate the finished print file format for the target printer and filtering it through &CUPS; filters would only harm the purpose. Under certain circumstances (if you want to make sure that the file goes to the printer <quote>unfiltered</quote> by &CUPS;) the <quote><command>lpadmin</command> without a &PPD;</quote> comes in handy.</para>
 
 </sect2>
 
 </sect1>
 <sect1 id="troubleshooting-cups">
-<title
->Troubleshooting &CUPS; in &tdeprint;</title>
+<title>Troubleshooting &CUPS; in &tdeprint;</title>
 
-<para
->This section of the &tdeprint; Handbook will live from the readers' feedback. Here is just a small beginning.</para>
+<para>This section of the &tdeprint; Handbook will live from the readers' feedback. Here is just a small beginning.</para>
 
 <sect2>
-<title
->Error Messages</title>
+<title>Error Messages</title>
 
 <qandaset>
 <qandaentry>
 <question>
-<para
->What does the error <errortype
->client-error-bad-request</errortype
-> mean?</para>
+<para>What does the error <errortype>client-error-bad-request</errortype> mean?</para>
 </question>
 <answer>
-<para
->The user sent a file to the &CUPS; which the server could not process. You get this also upon sending an <quote
->empty</quote
-> file.</para>
+<para>The user sent a file to the &CUPS; which the server could not process. You get this also upon sending an <quote>empty</quote> file.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->And <errortype
->client-error-not-possible</errortype
->?</para>
+<para>And <errortype>client-error-not-possible</errortype>?</para>
 </question>
 <answer>
-<para
->User is either not allowed to print to a certain printer or has achieved his quota (based on file size and/or page number)</para>
+<para>User is either not allowed to print to a certain printer or has achieved his quota (based on file size and/or page number)</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How about <errortype
->client-error-not-found</errortype
->?</para>
+<para>How about <errortype>client-error-not-found</errortype>?</para>
 </question>
 <answer>
-<para
->The user tried to access a nonexistent resource on the &CUPS; server, such as trying to print a nonexistent file, or one that you are denied permission to read.</para>
+<para>The user tried to access a nonexistent resource on the &CUPS; server, such as trying to print a nonexistent file, or one that you are denied permission to read.</para>
 </answer>
 
 </qandaentry>
@@ -534,362 +237,165 @@ filter (1)        - cups file conversion filter interfaces
 </sect2>
 
 <sect2>
-<title
->Questions and Answers</title>
+<title>Questions and Answers</title>
 
 <qandaset>
 <qandaentry>
 <question>
-<para
->Why can't I re-start my jobs?</para>
+<para>Why can't I re-start my jobs?</para>
 </question>
 <answer>
-<para
->To be able to re-start your <quote
->completed</quote
-> jobs from the web interface, you need a setting in the <filename
->/etc/cups/cupsd.conf</filename
-> file: set <userinput
->PreserveJobFiles True</userinput
->.</para>
+<para>To be able to re-start your <quote>completed</quote> jobs from the web interface, you need a setting in the <filename>/etc/cups/cupsd.conf</filename> file: set <userinput>PreserveJobFiles True</userinput>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How do I get rid of the long list of completed jobs in the web interface?</para>
+<para>How do I get rid of the long list of completed jobs in the web interface?</para>
 </question>
 <answer>
-<para
->TODO</para>
+<para>TODO</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How does page accounting work?</para>
+<para>How does page accounting work?</para>
 </question>
 <answer>
-<para
->&CUPS; does the <quote
->print accounting</quote
-> by passing nearly every job through the <quote
->pstops</quote
-> filter. This one does, amongst other things, the page counting. Output of this filter there may be piped into other filters (like pstoraster --> rastertopcl) or sent to the printer directly (if it is a &PostScript; printer).</para>
-
-<para
->In any case, this works for network, parallel, serial or <acronym
->USB</acronym
-> printers the same. For pstops to work, it needs <acronym
->DSC</acronym
->, Document Structuring Convention compliant &PostScript; (or near-equivalent) as input. So it calculates the pages during filtering on the print server and writes info about every single page (what time, which user, which job-ID and -name, which printer, how many copies of which pages of the document, how many kilo-bytes?) into <filename
->/var/log/cups/page_log</filename
->.</para>
-
-<para
->By the way: on my personal <quote
->wishlist</quote
-> is a hack of <quote
->webalizer</quote
-> to read and analyse the page_log and give a similar output. Anyone?</para>
-
-<para
->However, it is <emphasis
->not</emphasis
-> giving correct results in the following cases:</para>
+<para>&CUPS; does the <quote>print accounting</quote> by passing nearly every job through the <quote>pstops</quote> filter. This one does, amongst other things, the page counting. Output of this filter there may be piped into other filters (like pstoraster --> rastertopcl) or sent to the printer directly (if it is a &PostScript; printer).</para>
+
+<para>In any case, this works for network, parallel, serial or <acronym>USB</acronym> printers the same. For pstops to work, it needs <acronym>DSC</acronym>, Document Structuring Convention compliant &PostScript; (or near-equivalent) as input. So it calculates the pages during filtering on the print server and writes info about every single page (what time, which user, which job-ID and -name, which printer, how many copies of which pages of the document, how many kilo-bytes?) into <filename>/var/log/cups/page_log</filename>.</para>
+
+<para>By the way: on my personal <quote>wishlist</quote> is a hack of <quote>webalizer</quote> to read and analyse the page_log and give a similar output. Anyone?</para>
+
+<para>However, it is <emphasis>not</emphasis> giving correct results in the following cases:</para>
 
 <itemizedlist>
 <listitem>
-<para
->The printer jams and maybe therefore throw away the job (real live experience; or maybe throwing away the job because of problems with the data format)</para>
+<para>The printer jams and maybe therefore throw away the job (real live experience; or maybe throwing away the job because of problems with the data format)</para>
 </listitem>
 <listitem>
-<para
->Jobs printed as <quote
->raw</quote
-> are always counted as size of 1 page (and maybe multiple copies).</para>
+<para>Jobs printed as <quote>raw</quote> are always counted as size of 1 page (and maybe multiple copies).</para>
 </listitem>
 </itemizedlist>
 
-<para
->Therefore the page accounting of &CUPS; is <quote
->only</quote
-> an approximation (in many cases an excellent or at least good one, in others a quite poor one). The only reliable print count is the one done by the internal printer counter. (Because this is the one you pay for, if you are on a <quote
->click price</quote
-> or similar.) Some, by far not most, printers can be queried remotely for that information via <acronym
->SNMP</acronym
-> (Simple Network Management Protocol). That means, in a bigger network with many different printers there <emphasis
->is</emphasis
-> just no completely reliable and accurate page accounting tool!</para>
+<para>Therefore the page accounting of &CUPS; is <quote>only</quote> an approximation (in many cases an excellent or at least good one, in others a quite poor one). The only reliable print count is the one done by the internal printer counter. (Because this is the one you pay for, if you are on a <quote>click price</quote> or similar.) Some, by far not most, printers can be queried remotely for that information via <acronym>SNMP</acronym> (Simple Network Management Protocol). That means, in a bigger network with many different printers there <emphasis>is</emphasis> just no completely reliable and accurate page accounting tool!</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Why doesn't page-accounting work with &Windows; clients?</para>
+<para>Why doesn't page-accounting work with &Windows; clients?</para>
 </question>
 <answer>
-<para
->From &Windows; clients jobs nearly always need to be sent as <quote
->raw</quote
->. Why? If &CUPS; works as a print server for &Windows; clients using the original native &Windows; driver for the target print device, this guarantees the correct formatting of the job on the clients already; therefor the server should not touch it and print <quote
->raw</quote
->; therefor no filtering is started (and this is not even possible as the input from the clients is not &PostScript; as pstops expects; hence no page-count other than the default <quote
->1</quote
->.</para>
+<para>From &Windows; clients jobs nearly always need to be sent as <quote>raw</quote>. Why? If &CUPS; works as a print server for &Windows; clients using the original native &Windows; driver for the target print device, this guarantees the correct formatting of the job on the clients already; therefor the server should not touch it and print <quote>raw</quote>; therefor no filtering is started (and this is not even possible as the input from the clients is not &PostScript; as pstops expects; hence no page-count other than the default <quote>1</quote>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How do I get a list of available options for a given printer or a &PPD; file?</para>
+<para>How do I get a list of available options for a given printer or a &PPD; file?</para>
 </question>
 <answer>
-<para
->See the man page for the <command
->lpoptions</command
-> command. You may investigate a &CUPS;-enabled box about any option of its available printers. There is no need to have the printer installed locally. As long as the printer is available locally (through the &CUPS; <quote
->printer browsing</quote
-> feature), it will also work remote.</para>
-
-<para
->To query for a printers' option typing <userinput
-><command
->lpoptions</command
-> <option
->-p</option
-> <parameter
->HitachiDDP70MicroPress</parameter
-> <option
->-l</option
-></userinput
-> will give a long listing of all available options as read from the &PPD; file for the given Hitachi-Printer (in my case installed on remote server transmeta). Remote server <systemitem class="systemname"
->Transmeta</systemitem
-> and its &CUPS; daemon as well as the localhost's &CUPS; daemon need to be up and running for this to succeed.</para>
+<para>See the man page for the <command>lpoptions</command> command. You may investigate a &CUPS;-enabled box about any option of its available printers. There is no need to have the printer installed locally. As long as the printer is available locally (through the &CUPS; <quote>printer browsing</quote> feature), it will also work remote.</para>
+
+<para>To query for a printers' option typing <userinput><command>lpoptions</command> <option>-p</option> <parameter>HitachiDDP70MicroPress</parameter> <option>-l</option></userinput> will give a long listing of all available options as read from the &PPD; file for the given Hitachi-Printer (in my case installed on remote server transmeta). Remote server <systemitem class="systemname">Transmeta</systemitem> and its &CUPS; daemon as well as the localhost's &CUPS; daemon need to be up and running for this to succeed.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How do I read the listing retrieved by the <command
->lpoptions</command
-> command?</para>
+<para>How do I read the listing retrieved by the <command>lpoptions</command> command?</para>
 </question>
 
 <answer>
-<para
->You know that for &PostScript; printer manufacturers it is <quote
->legal</quote
-> to define their own internal names and procedures even for standard &PostScript; options. As long as the driver is able to retrieve the option from the &PPD; and show it to the user in a way that he understands it everything is OK. But what do <emphasis
->you</emphasis
-> do, if you want to use some obscure printer options on the command line? How do you find out its exact syntax?</para>
-
-<para
->Let's take an example. Looking at Hitachi's DDP70 printer and how it implements duplex printing is revealing somehow. How do you tell how to print double sided? duplex or Duplex? Or another name altogether?.</para>
-
-<screen
-><userinput
-><command
->lpoptions</command
-> <option
->-h</option
-> <parameter
->transmeta</parameter
-> <option
->-p</option
-> <parameter
->Hitachi_DDP70_ClusterPrintingSystem</parameter
-> <option
->-l</option
-> | <command
->grep</command
-> <parameter
->uplex</parameter
-></userinput
-></screen>
-
-<para
->This leads to the output</para>
-
-<screen
-><computeroutput
->TR-Duplex/Duplex: False *True</computeroutput
-></screen>
-
-<para
->This is to be interpreted like follows:</para>
+<para>You know that for &PostScript; printer manufacturers it is <quote>legal</quote> to define their own internal names and procedures even for standard &PostScript; options. As long as the driver is able to retrieve the option from the &PPD; and show it to the user in a way that he understands it everything is OK. But what do <emphasis>you</emphasis> do, if you want to use some obscure printer options on the command line? How do you find out its exact syntax?</para>
+
+<para>Let's take an example. Looking at Hitachi's DDP70 printer and how it implements duplex printing is revealing somehow. How do you tell how to print double sided? duplex or Duplex? Or another name altogether?.</para>
+
+<screen><userinput><command>lpoptions</command> <option>-h</option> <parameter>transmeta</parameter> <option>-p</option> <parameter>Hitachi_DDP70_ClusterPrintingSystem</parameter> <option>-l</option> | <command>grep</command> <parameter>uplex</parameter></userinput></screen>
+
+<para>This leads to the output</para>
+
+<screen><computeroutput>TR-Duplex/Duplex: False *True</computeroutput></screen>
+
+<para>This is to be interpreted like follows:</para>
 
 <itemizedlist>
 <listitem>
-<para
->The name of the investigated option is <option
->TR-Duplex</option
->;</para>
+<para>The name of the investigated option is <option>TR-Duplex</option>;</para>
 </listitem>
 <listitem>
-<para
->Behind the slash you see the translation of the option, as it should be shown in a &GUI; or Web interface (<quote
->Duplex</quote
->);</para>
+<para>Behind the slash you see the translation of the option, as it should be shown in a &GUI; or Web interface (<quote>Duplex</quote>);</para>
 </listitem>
 <listitem>
-<para
->The option may take one of the two values <parameter
->False</parameter
-> or <parameter
->True</parameter
->;</para>
+<para>The option may take one of the two values <parameter>False</parameter> or <parameter>True</parameter>;</para>
 </listitem>
 <listitem>
-<para
->The present setting is <parameter
->True</parameter
-> to be recognised by the marking with a star <literal
->*</literal
->.</para>
+<para>The present setting is <parameter>True</parameter> to be recognised by the marking with a star <literal>*</literal>.</para>
 </listitem>
 </itemizedlist>
 
-<para
->To override the present default setting (duplex) and print a job in simplex, you need to use the following command: </para>
-
-<screen
-><userinput
-><command
->lpr</command
-> <option
->-P</option
-> <parameter
->Hitachi_DDP70_ClusterPrintingSystem</parameter
-> <option
->-o</option
-> <parameter
->TR-Duplex=False</parameter
-> <parameter
->/path/to/your/printjob</parameter
-></userinput
-></screen>
+<para>To override the present default setting (duplex) and print a job in simplex, you need to use the following command: </para>
+
+<screen><userinput><command>lpr</command> <option>-P</option> <parameter>Hitachi_DDP70_ClusterPrintingSystem</parameter> <option>-o</option> <parameter>TR-Duplex=False</parameter> <parameter>/path/to/your/printjob</parameter></userinput></screen>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How do I get a nicely formatted listing of available options for a given printer or &PPD;?</para>
+<para>How do I get a nicely formatted listing of available options for a given printer or &PPD;?</para>
 </question>
 <answer>
-<para
->Use the <command
->lphelp</command
-> command which may be installed on your system locally. There is not yet a man page for <command
->lphelp</command
->.</para>
-
-<screen
-><userinput
-><command
->lphelp</command
-> <parameter
->infotecP450</parameter
-></userinput
-></screen>
-
-<para
->This lists the available options for the named printer. It is nicely formatted and does explain every available option and how to use it. You can query different printers' options at once:</para>
-
-<screen
-><userinput
-><command
->lphelp</command
-> <parameter
->infotec7410color</parameter
-> <parameter
->DANKA_fullcolor_D2000</parameter
-> <parameter
->HP_ColorLaserJet8550</parameter
-></userinput
-></screen>
-
-<para
->It also works for &PPD; files. Just specify the path to the &PPD;:</para>
-
-<screen
-><userinput
-><command
->lphelp</command
-> <filename
->/home/kurt/PPDs/HP-ColorLaserJet8550.ppd</filename
-></userinput
-></screen>
+<para>Use the <command>lphelp</command> command which may be installed on your system locally. There is not yet a man page for <command>lphelp</command>.</para>
+
+<screen><userinput><command>lphelp</command> <parameter>infotecP450</parameter></userinput></screen>
+
+<para>This lists the available options for the named printer. It is nicely formatted and does explain every available option and how to use it. You can query different printers' options at once:</para>
+
+<screen><userinput><command>lphelp</command> <parameter>infotec7410color</parameter> <parameter>DANKA_fullcolor_D2000</parameter> <parameter>HP_ColorLaserJet8550</parameter></userinput></screen>
+
+<para>It also works for &PPD; files. Just specify the path to the &PPD;:</para>
+
+<screen><userinput><command>lphelp</command> <filename>/home/kurt/PPDs/HP-ColorLaserJet8550.ppd</filename></userinput></screen>
 </answer>
 </qandaentry>
 </qandaset>
 
 </sect2>
 <sect2>
-<title
->Solving Problems</title>
+<title>Solving Problems</title>
 
-<para
->No system is perfect. Here are some commonly seen traps people have fallen into.</para>
+<para>No system is perfect. Here are some commonly seen traps people have fallen into.</para>
 
 <qandaset>
 <qandaentry>
 <question>
-<para
->My printer named <quote
->3-lp-duplex</quote
-> shows erratic behaviour. What's wrong?</para>
+<para>My printer named <quote>3-lp-duplex</quote> shows erratic behaviour. What's wrong?</para>
 </question>
 <answer>
-<para
->The printer names used in &CUPS; shall start with a letter and may contain up to 128 letters, numbers or underscores. Using dashes may lead to problems. Speaking about naming: printer names in &CUPS; are not case sensitive. So a printer named <systemitem class="resource"
->Best_of_Danka</systemitem
-> will be the same as <systemitem class="resource"
->best_of_danka</systemitem
-> or <systemitem class="resource"
->BEST_OF_DANKA</systemitem
->. (This is a requirement of &IPP;, which &CUPS; is fully compliant with).</para>
+<para>The printer names used in &CUPS; shall start with a letter and may contain up to 128 letters, numbers or underscores. Using dashes may lead to problems. Speaking about naming: printer names in &CUPS; are not case sensitive. So a printer named <systemitem class="resource">Best_of_Danka</systemitem> will be the same as <systemitem class="resource">best_of_danka</systemitem> or <systemitem class="resource">BEST_OF_DANKA</systemitem>. (This is a requirement of &IPP;, which &CUPS; is fully compliant with).</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Why do I get <errortype
->Unable to connect to SAMBA host: Success</errortype
-> with my printer shares from &Windows; accessed via Samba?</para>
+<para>Why do I get <errortype>Unable to connect to SAMBA host: Success</errortype> with my printer shares from &Windows; accessed via Samba?</para>
 </question>
 <answer>
-<para
->Are the rights on the remote &Windows; box set correctly for you? Are you actually allowed to print on the &Windows; shared printer?</para>
+<para>Are the rights on the remote &Windows; box set correctly for you? Are you actually allowed to print on the &Windows; shared printer?</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->My files for printer <systemitem class="resource"
->lp</systemitem
-> sometimes mysteriously disappear and two days later I am told they got printed on a printer three floors below my office. What is going on?</para>
+<para>My files for printer <systemitem class="resource">lp</systemitem> sometimes mysteriously disappear and two days later I am told they got printed on a printer three floors below my office. What is going on?</para>
 </question>
 <answer>
-<para
->Believe me, it is very unlikely that your printer is the only one with the name <systemitem class="resource"
->lp</systemitem
->. Maybe &CUPS; is playing a trick on you. As you might have the setting <quote
->ImplicitClasses On</quote
-> activated, &CUPS; tries to stuff all printers it sees on the network into a <quote
->Class</quote
-> name lp. All jobs destined to lp are sent to this class and the first available member prints it. So if you had this nice fellow (who listened closely when you raved about &CUPS; and &tdeprint;) install &CUPS; and poke around the system...get the idea?</para>
-
-<para
->Take my advice: choose a unique name for any network printer! (Mind you, the one on your parallel port also turns out to be a network printer for the rest of the world if you don't take care of your settings).</para>
+<para>Believe me, it is very unlikely that your printer is the only one with the name <systemitem class="resource">lp</systemitem>. Maybe &CUPS; is playing a trick on you. As you might have the setting <quote>ImplicitClasses On</quote> activated, &CUPS; tries to stuff all printers it sees on the network into a <quote>Class</quote> name lp. All jobs destined to lp are sent to this class and the first available member prints it. So if you had this nice fellow (who listened closely when you raved about &CUPS; and &tdeprint;) install &CUPS; and poke around the system...get the idea?</para>
+
+<para>Take my advice: choose a unique name for any network printer! (Mind you, the one on your parallel port also turns out to be a network printer for the rest of the world if you don't take care of your settings).</para>
 </answer>
 </qandaentry>
 </qandaset>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeprint/extensions.docbook b/tde-i18n-en_GB/docs/tdebase/tdeprint/extensions.docbook
index 8d1feffc7ba..19c5daf9827 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeprint/extensions.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeprint/extensions.docbook
@@ -1,86 +1,53 @@
 <chapter id="extensions-to-all-printsubsystems">
-<title
->&tdeprint; Extensions To All Print Subsystems</title>
+<title>&tdeprint; Extensions To All Print Subsystems</title>
 
 <sect1>
-<title
-><quote
->Virtual</quote
-> Printers</title>
+<title><quote>Virtual</quote> Printers</title>
 
 <sect2>
-<title
->The <quote
->Fax</quote
-> Printer</title>
+<title>The <quote>Fax</quote> Printer</title>
 
-<para
->To be written</para>
+<para>To be written</para>
 
 </sect2>
 
 <sect2>
-<title
->The <quote
->File</quote
-> Printer</title>
+<title>The <quote>File</quote> Printer</title>
 
-<para
->To be written</para>
+<para>To be written</para>
 
 </sect2>
 
 <sect2>
-<title
->The <quote
-><acronym
->PDF</acronym
-></quote
-> Printer</title>
+<title>The <quote><acronym>PDF</acronym></quote> Printer</title>
 
-<para
->To be written</para>
+<para>To be written</para>
 
 </sect2>
 
 </sect1>
 
 <sect1 id="external-filters">
-<title
-><quote
->External</quote
-> Filters</title>
+<title><quote>External</quote> Filters</title>
 
 <sect2>
-<title
->The <command
->enscript</command
-> Filter for Text Files</title>
+<title>The <command>enscript</command> Filter for Text Files</title>
 
-<para
->To be written</para>
+<para>To be written</para>
 
 </sect2>
 
 <sect2>
-<title
->The <quote
->n-up</quote
-> Filter for Any File</title>
+<title>The <quote>n-up</quote> Filter for Any File</title>
 
-<para
->To be written</para>
+<para>To be written</para>
 
 </sect2>
 
 <sect2>
-<title
->Three different <quote
->Make Pamphlet</quote
-> Filters for &PostScript; Files</title>
+<title>Three different <quote>Make Pamphlet</quote> Filters for &PostScript; Files</title>
 
-<para
->To be written</para>
+<para>To be written</para>
 
 </sect2>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeprint/external-command.docbook b/tde-i18n-en_GB/docs/tdebase/tdeprint/external-command.docbook
index 40f62dde1a0..04bd961a719 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeprint/external-command.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeprint/external-command.docbook
@@ -1,26 +1,20 @@
 <chapter id="external-printcommand-module">
-<title
->Module For External Print Command (&Netscape;-like) </title>
+<title>Module For External Print Command (&Netscape;-like) </title>
 
-<para
->This module allows the print command to be specified completely (&Netscape;-like). An edit line is added in the print dialogue for that purpose. Can be used in many cases, for example with a self-made print program. </para>
+<para>This module allows the print command to be specified completely (&Netscape;-like). An edit line is added in the print dialogue for that purpose. Can be used in many cases, for example with a self-made print program. </para>
 
 <sect1>
-<title
->Overview of provided features</title>
+<title>Overview of provided features</title>
 
 <itemizedlist>
 <listitem>
-<para
->Printer management: not supported</para>
+<para>Printer management: not supported</para>
 </listitem>
 <listitem>
-<para
->Job management: not supported.</para>
+<para>Job management: not supported.</para>
 </listitem>
 <listitem>
-<para
->Print options: basic control, depending on your knowledge of the print command</para>
+<para>Print options: basic control, depending on your knowledge of the print command</para>
 </listitem>
 </itemizedlist>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeprint/final-word.docbook b/tde-i18n-en_GB/docs/tdebase/tdeprint/final-word.docbook
index 7fb084fd0e4..2a9fbf094ae 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeprint/final-word.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeprint/final-word.docbook
@@ -1,91 +1,59 @@
 <chapter id="final-word-from-author">
-<title
->Final word from the Author</title>
+<title>Final word from the Author</title>
 
 <sect1 id="who-am-i">
-<title
->Who am I, what is my business? </title>
+<title>Who am I, what is my business? </title>
 
-<para
->My employer is Danka Deutschland GmbH, a leading and manufacturer-independent provider of professional and hi-speed digital printing systems, black-and-white as well as colour. Danka provides hardware, software, service, maintenance, consumables and customised solutions for the products in its portfolio. I work there as a System Engineer. Amongst the brands Danka offers are Heidelberg (formerly Kodak), Canon, &Hewlett-Packard;, Hitachi, Infotec and EfI.</para>
+<para>My employer is Danka Deutschland GmbH, a leading and manufacturer-independent provider of professional and hi-speed digital printing systems, black-and-white as well as colour. Danka provides hardware, software, service, maintenance, consumables and customised solutions for the products in its portfolio. I work there as a System Engineer. Amongst the brands Danka offers are Heidelberg (formerly Kodak), Canon, &Hewlett-Packard;, Hitachi, Infotec and EfI.</para>
 
-<para
->My acquaintance with &Linux; and the Free Software community is not too old. When I started to play around with &Linux; at the beginning of 1999, my deepest disappointment was the poor support for printing. True, I made all our machines spit out simplex prints -- but what about duplex? What about punching the output? How to make sorting work? Or stapling, cover sheets and all the other beautiful finishing options our engines offer to customers? No way -- at least for me as a non-geek!</para>
+<para>My acquaintance with &Linux; and the Free Software community is not too old. When I started to play around with &Linux; at the beginning of 1999, my deepest disappointment was the poor support for printing. True, I made all our machines spit out simplex prints -- but what about duplex? What about punching the output? How to make sorting work? Or stapling, cover sheets and all the other beautiful finishing options our engines offer to customers? No way -- at least for me as a non-geek!</para>
 
-<para
->I began a search on the Internet for a solution. Fortunately not much later, in May 1999, Mike Sweet, principal developer of &CUPS;, announced the first Beta release of this superb piece of printing software. After trying it briefly, I knew this was it!</para>
+<para>I began a search on the Internet for a solution. Fortunately not much later, in May 1999, Mike Sweet, principal developer of &CUPS;, announced the first Beta release of this superb piece of printing software. After trying it briefly, I knew this was it!</para>
 
-<para
->Next thing I attempted: to make &Linux; distributions interested in this new stuff. Believe me -- it was more than tenacious! They seemed to think they already had the best thing they could get in printing. One reason probably was that they (and many &Linux; developers) never had to think about how to best support a printer duplexer -- because one had never come near their own desks...</para>
+<para>Next thing I attempted: to make &Linux; distributions interested in this new stuff. Believe me -- it was more than tenacious! They seemed to think they already had the best thing they could get in printing. One reason probably was that they (and many &Linux; developers) never had to think about how to best support a printer duplexer -- because one had never come near their own desks...</para>
 
-<para
->Finally, my attempts to make some &Linux; print publications interested in &CUPS; <quote
->backfired</quote
-> on me - one editor squeezed me into writing a series on the subject myself. And this is how some people started to give me the nickname <quote
->CUPS Evangelist</quote
->. I will not get rid of this nick anytime soon, now that even the &kde; people wedged me into their timeframe of releases. Oh, boy...</para>
+<para>Finally, my attempts to make some &Linux; print publications interested in &CUPS; <quote>backfired</quote> on me - one editor squeezed me into writing a series on the subject myself. And this is how some people started to give me the nickname <quote>CUPS Evangelist</quote>. I will not get rid of this nick anytime soon, now that even the &kde; people wedged me into their timeframe of releases. Oh, boy...</para>
 
-<para
->Anyway, &CUPS; is now making its way around the world and it might well become a triumphal one: I am a little bit proud to have supported and contributed to this from near the beginning.</para>
+<para>Anyway, &CUPS; is now making its way around the world and it might well become a triumphal one: I am a little bit proud to have supported and contributed to this from near the beginning.</para>
 
-<para
->It should encourage you: even if some more experienced &Linux; users than you are skeptical about it, and even if your programming skills are next to zero (like mine) - there are a lot of tasks and jobs and ideas, and talent that you can contribute to the Free Software community. Not least within the &kde; project... </para>
+<para>It should encourage you: even if some more experienced &Linux; users than you are skeptical about it, and even if your programming skills are next to zero (like mine) - there are a lot of tasks and jobs and ideas, and talent that you can contribute to the Free Software community. Not least within the &kde; project... </para>
 
 </sect1>
 
 <sect1 id="credits">
-<title
->Credits</title>
+<title>Credits</title>
 
-<para
->I'd like to thank...</para>
+<para>I'd like to thank...</para>
 <itemizedlist>
 <listitem>
-<para
->Mike Sweet for developing &CUPS; in the first place</para>
+<para>Mike Sweet for developing &CUPS; in the first place</para>
 </listitem>
 <listitem>
-<para
->Jean-Eric Cuendet for starting <application
->kups</application
-> and <application
->qtcups</application
->, the predecessors of &tdeprint;</para>
+<para>Jean-Eric Cuendet for starting <application>kups</application> and <application>qtcups</application>, the predecessors of &tdeprint;</para>
 </listitem>
 <listitem>
-<para
->Michael Goffioul for doing all the hard work recently</para>
+<para>Michael Goffioul for doing all the hard work recently</para>
 </listitem>
 <listitem>
-<para
->Martin Konold for thinking twice</para>
+<para>Martin Konold for thinking twice</para>
 </listitem>
 <listitem>
-<para
->Sven Guckes for teaching me a few things about the art of <quote
->survival on the terminal</quote
-> (just in case &kde; is not there ;-) )</para>
+<para>Sven Guckes for teaching me a few things about the art of <quote>survival on the terminal</quote> (just in case &kde; is not there ;-) )</para>
 </listitem>
 <listitem>
-<para
->...too numerous others to mention who also let me snatch bits and bytes of knowledge off them</para>
+<para>...too numerous others to mention who also let me snatch bits and bytes of knowledge off them</para>
 </listitem>
 <listitem>
-<para
->and last, but not least: Tom Schwaller for encouraging me to get into <quote
->documentation writing</quote
-></para>
+<para>and last, but not least: Tom Schwaller for encouraging me to get into <quote>documentation writing</quote></para>
 </listitem>
 </itemizedlist>
 
 </sect1>
 
 <sect1 id="caveats">
-<title
->Caveats</title>
+<title>Caveats</title>
 
-<para
->&tdeprint; has been developed on a system using &CUPS; 1.1.6. &tdeprint; has been tested on other versions of &CUPS; and so far no incompatibilities are known. By the time of writing this Handbook, &CUPS; 1.1.9 is out with a few new features not yet supported by &tdeprint;. Of course you are able to access these features, but you will need to bypass &tdeprint; and use the &CUPS; command-line tools or edit configuration files manually. &tdeprint;'s development will go on and this Handbook strives to always be the best available user documentation resource for it.</para>
+<para>&tdeprint; has been developed on a system using &CUPS; 1.1.6. &tdeprint; has been tested on other versions of &CUPS; and so far no incompatibilities are known. By the time of writing this Handbook, &CUPS; 1.1.9 is out with a few new features not yet supported by &tdeprint;. Of course you are able to access these features, but you will need to bypass &tdeprint; and use the &CUPS; command-line tools or edit configuration files manually. &tdeprint;'s development will go on and this Handbook strives to always be the best available user documentation resource for it.</para>
 
 </sect1>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeprint/getting-started.docbook b/tde-i18n-en_GB/docs/tdebase/tdeprint/getting-started.docbook
index 481237028fa..ad6b8bfd8ff 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeprint/getting-started.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeprint/getting-started.docbook
@@ -1,169 +1,80 @@
 <chapter id="getting-started">
-<title
->Getting Started</title>
+<title>Getting Started</title>
 
-<para
->This chapter of the &tdeprint; Handbook will walk you through most of the configuration or selection options of &tdeprint;. It will mainly deal with &CUPS; in this version, as the author is most familiar with it, and also because &tdeprint; started off with supporting &CUPS; best. Later versions of the &tdeprint; software and editions of this handbook will support and explore other printing systems more closely.</para>
+<para>This chapter of the &tdeprint; Handbook will walk you through most of the configuration or selection options of &tdeprint;. It will mainly deal with &CUPS; in this version, as the author is most familiar with it, and also because &tdeprint; started off with supporting &CUPS; best. Later versions of the &tdeprint; software and editions of this handbook will support and explore other printing systems more closely.</para>
 
 <sect1 id="selecting-your-print-subsystem">
-<title
->Selecting Your Print Subsystem</title>
-
-<para
->You need to define your print subsystem, before you are able to install any printer with the &tdeprint; framework. There are two areas where you can define this: either in &kcontrol; (The <guilabel
->Printing Manager</guilabel
-> section), or directly and <quote
->on the fly</quote
-> from the print dialogue.</para>
-
-<para
->Navigate to <menuchoice
-><guimenu
->TDE Menu</guimenu
-> <guisubmenu
->Preferences</guisubmenu
-> <guisubmenu
->System</guisubmenu
-> <guimenuitem
->Printing Manager</guimenuitem
-></menuchoice
->. At the bottom you can see a button that lets you select which printing subsystem you want to use. In &kde; 2.2 you can choose from the following alternatives:</para>
+<title>Selecting Your Print Subsystem</title>
+
+<para>You need to define your print subsystem, before you are able to install any printer with the &tdeprint; framework. There are two areas where you can define this: either in &kcontrol; (The <guilabel>Printing Manager</guilabel> section), or directly and <quote>on the fly</quote> from the print dialogue.</para>
+
+<para>Navigate to <menuchoice><guimenu>TDE Menu</guimenu> <guisubmenu>Preferences</guisubmenu> <guisubmenu>System</guisubmenu> <guimenuitem>Printing Manager</guimenuitem></menuchoice>. At the bottom you can see a button that lets you select which printing subsystem you want to use. In &kde; 2.2 you can choose from the following alternatives:</para>
 
 <itemizedlist>
 <listitem>
-<para
->&CUPS; (Common &UNIX; Printing System)</para>
+<para>&CUPS; (Common &UNIX; Printing System)</para>
 </listitem>
 <listitem>
-<para
->Print through an external program (generic)</para>
+<para>Print through an external program (generic)</para>
 </listitem>
 <listitem>
-<para
-><acronym
->LPR</acronym
-> (Standard <acronym
->BSD</acronym
-> Print System)</para>
+<para><acronym>LPR</acronym> (Standard <acronym>BSD</acronym> Print System)</para>
 </listitem>
 <listitem>
-<para
->Generic &UNIX; <acronym
->LPD</acronym
-> print system (the default)</para>
+<para>Generic &UNIX; <acronym>LPD</acronym> print system (the default)</para>
 </listitem>
 <listitem>
-<para
-><acronym
->RLPR</acronym
-> environment (print to remote <acronym
->LPD</acronym
-> servers from the command line)</para>
+<para><acronym>RLPR</acronym> environment (print to remote <acronym>LPD</acronym> servers from the command line)</para>
 </listitem>
 </itemizedlist>
 
-<para
->Of course, the chosen system must be installed, and up and running on your box prior to your selection, or before it takes effect. </para>
+<para>Of course, the chosen system must be installed, and up and running on your box prior to your selection, or before it takes effect. </para>
 
-<para
->On it's first startup, &tdeprint; will try an autodetection. This only works for:</para>
+<para>On it's first startup, &tdeprint; will try an autodetection. This only works for:</para>
 
 <itemizedlist>
 <listitem>
-<para
->&CUPS;, as it is checking first for a running &CUPS; daemon</para>
+<para>&CUPS;, as it is checking first for a running &CUPS; daemon</para>
 </listitem>
 <listitem>
-<para
-><acronym
->LPD</acronym
->, as it is checking for a running <acronym
->LPD</acronym
-> daemon, plus a <filename
->printcap</filename
-> file.</para>
+<para><acronym>LPD</acronym>, as it is checking for a running <acronym>LPD</acronym> daemon, plus a <filename>printcap</filename> file.</para>
 </listitem>
 </itemizedlist>
 
 <!-- <para>
 Go to System->XY->ABC. Now you can choose from the following
 alternatives: 
-</para
->-->
+</para>-->
 
-<para
->The system you choose must be installed on your system prior to your selection. The author's personal recommendation is &CUPS;.</para>
+<para>The system you choose must be installed on your system prior to your selection. The author's personal recommendation is &CUPS;.</para>
 
-<para
->Once autodetected, chosen, or changed, the active print subsystem will take effect for all &kde; applications. Different users may have different print subsystems in use, if those do exist on the computer and are compliant with each other. Their settings are stored in the <filename
->tdeprintrc</filename
->. This file is unique to every user, and is normally installed in <filename
->$<envar
->HOME</envar
->/.trinity/share/config/tdeprintrc</filename
->.</para>
+<para>Once autodetected, chosen, or changed, the active print subsystem will take effect for all &kde; applications. Different users may have different print subsystems in use, if those do exist on the computer and are compliant with each other. Their settings are stored in the <filename>tdeprintrc</filename>. This file is unique to every user, and is normally installed in <filename>$<envar>HOME</envar>/.trinity/share/config/tdeprintrc</filename>.</para>
 
 <warning>
-<para
->This file is not intended to be directly editable, and all available options can be set from the &tdeprint; &GUI;.</para>
+<para>This file is not intended to be directly editable, and all available options can be set from the &tdeprint; &GUI;.</para>
 </warning>
 
-<para
->You may even select a different printer subsystem, on the fly, from the &kprinter; dialogue box.</para>
+<para>You may even select a different printer subsystem, on the fly, from the &kprinter; dialogue box.</para>
 
 </sect1>
 
 <sect1 id="working-with-printing-manger">
-<title
->Working with the Printing Manager</title>
-
-<para
->Once you have chosen your preferred and installed print subsystem, you are ready to investigate, configure administer and work with this system through the &tdeprint; framework.</para>
-
-<para
->Navigate to <menuchoice
-><guimenu
->TDE Menu</guimenu
-> <guisubmenu
->Preferences</guisubmenu
-> <guisubmenu
->System</guisubmenu
-> <guimenuitem
->Printing Manager</guimenuitem
-></menuchoice
->. In the right part of the window you will see at least 4 printers predefined. These are the virtual or special purpose printers, explained in section . You will probably see a toolbar with 13 icons at the top of the window, and at least 4 tabs in the lower half of the window, labelled <guilabel
->Information</guilabel
->, <guilabel
->Jobs</guilabel
->, <guilabel
->Properties</guilabel
-> and <guilabel
->Instances</guilabel
->.</para>
+<title>Working with the Printing Manager</title>
+
+<para>Once you have chosen your preferred and installed print subsystem, you are ready to investigate, configure administer and work with this system through the &tdeprint; framework.</para>
+
+<para>Navigate to <menuchoice><guimenu>TDE Menu</guimenu> <guisubmenu>Preferences</guisubmenu> <guisubmenu>System</guisubmenu> <guimenuitem>Printing Manager</guimenuitem></menuchoice>. In the right part of the window you will see at least 4 printers predefined. These are the virtual or special purpose printers, explained in section . You will probably see a toolbar with 13 icons at the top of the window, and at least 4 tabs in the lower half of the window, labelled <guilabel>Information</guilabel>, <guilabel>Jobs</guilabel>, <guilabel>Properties</guilabel> and <guilabel>Instances</guilabel>.</para>
 
 <!-- Not needed: the default view is as described, this can be mentioned -->
-<!-- elsewhere <para
->If you start the <guilabel
->Printing -->
-<!-- Manager</guilabel
-> module for the first time, you may be missing -->
-<!-- Icons or tabs. <mousebutton
->Right</mousebutton
->-clicking the mouse -->
+<!-- elsewhere <para>If you start the <guilabel>Printing -->
+<!-- Manager</guilabel> module for the first time, you may be missing -->
+<!-- Icons or tabs. <mousebutton>Right</mousebutton>-clicking the mouse -->
 <!-- on the white background of the right part of the window opens a -->
 <!-- Menu to select your viewing preferences. To get the same view as in -->
-<!-- most screenshots, select: <guimenuitem
->View Toolbar</guimenuitem
-> -->
-<!-- and <guimenuitem
->View Printer Information</guimenuitem
-> and -->
-<!-- <guimenuitem
->View Icons</guimenuitem
-> and <guimenuitem
->Orientation -->
-<!-- Vertical</guimenuitem
->. Moving the mouse over one Button and -->
+<!-- most screenshots, select: <guimenuitem>View Toolbar</guimenuitem> -->
+<!-- and <guimenuitem>View Printer Information</guimenuitem> and -->
+<!-- <guimenuitem>View Icons</guimenuitem> and <guimenuitem>Orientation -->
+<!-- Vertical</guimenuitem>. Moving the mouse over one Button and -->
 <!-- waiting a second gives you a tooltip hint about its functions. -->
 
 <!-- 
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeprint/highlights.docbook b/tde-i18n-en_GB/docs/tdebase/tdeprint/highlights.docbook
index 9f2c2e1fae9..09c3ec3c6c4 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeprint/highlights.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeprint/highlights.docbook
@@ -1,62 +1,28 @@
 <chapter id="tdeprint-highlights">
-<title
->&tdeprint;'s Highlights</title>
+<title>&tdeprint;'s Highlights</title>
 
-<para
->The new &tdeprint; system includes more than one highlight. Having worked in an environment in the past that is not exactly sophisticated, as far as printing is concerned, take a look at some of the benefits that come with &tdeprint;</para>
+<para>The new &tdeprint; system includes more than one highlight. Having worked in an environment in the past that is not exactly sophisticated, as far as printing is concerned, take a look at some of the benefits that come with &tdeprint;</para>
 
 <sect1 id="add-printer-wizard">
-<title
->The <quote
->Add Printer</quote
-> Wizard</title>
-
-<para
->&tdeprint; has an <quote
->Add Printer Wizard</quote
->. The Add Printer Wizard helps you with adding and configuring a new printer. Of course, you may do this manually as well.</para>
-
-<para
->&tdeprint; helps you <quote
->discover</quote
-> printers. It is able to scan the environment for available devices and queues. This works for network connections using <acronym
->TCP</acronym
-> (AppSocket, <acronym
->aka</acronym
-> &HP; <trademark class="registered"
->JetDirect</trademark
->, or <acronym
->IPP</acronym
->) or <acronym
->SMB</acronym
->/Samba (<quote
->shared</quote
-> &Windows;) printers and partially for directly attached printers over parallel, serial, or <acronym
->USB</acronym
-> connections.</para>
+<title>The <quote>Add Printer</quote> Wizard</title>
+
+<para>&tdeprint; has an <quote>Add Printer Wizard</quote>. The Add Printer Wizard helps you with adding and configuring a new printer. Of course, you may do this manually as well.</para>
+
+<para>&tdeprint; helps you <quote>discover</quote> printers. It is able to scan the environment for available devices and queues. This works for network connections using <acronym>TCP</acronym> (AppSocket, <acronym>aka</acronym> &HP; <trademark class="registered">JetDirect</trademark>, or <acronym>IPP</acronym>) or <acronym>SMB</acronym>/Samba (<quote>shared</quote> &Windows;) printers and partially for directly attached printers over parallel, serial, or <acronym>USB</acronym> connections.</para>
 
 <screenshot>
-<screeninfo
->A screenshot of the new <quote
->Add Printer Wizard</quote
-></screeninfo>
+<screeninfo>A screenshot of the new <quote>Add Printer Wizard</quote></screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsaddprinterwizard1.png" format="PNG"/>
 </imageobject>
 <textobject>
-<phrase
->Here's a screenshot of the <quote
->Add Printer Wizard</quote
-> (this one is not very exciting yet; but...)</phrase>
+<phrase>Here's a screenshot of the <quote>Add Printer Wizard</quote> (this one is not very exciting yet; but...)</phrase>
 </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->The wizard makes the installation and handling of the drivers <quote
->a snap</quote
->. Selecting, configuring and testing should be easy as never before on any &Linux;-like system.</para>
+<para>The wizard makes the installation and handling of the drivers <quote>a snap</quote>. Selecting, configuring and testing should be easy as never before on any &Linux;-like system.</para>
 
 <!-- LW: needs some info where to find it, or a pointer to where in this -->
 <!-- doc that is covered -->
@@ -64,82 +30,49 @@
 </sect1>
 
 <sect1 id="print-job-control">
-<title
->Full Print Job Control</title>
+<title>Full Print Job Control</title>
 
-<para
->The Print Job Viewer is automatically started by &kprinter;. It may be docked into the &kde; panel (in the system tray). The Print Job Viewer allows full job management, if supported by the print subsystem.</para>
+<para>The Print Job Viewer is automatically started by &kprinter;. It may be docked into the &kde; panel (in the system tray). The Print Job Viewer allows full job management, if supported by the print subsystem.</para>
 
-<para
->You can:</para>
+<para>You can:</para>
 
 <itemizedlist>
 <listitem>
-<para
->Hold and release jobs,</para>
+<para>Hold and release jobs,</para>
 </listitem>
 <listitem>
-<para
->Move pending jobs to another printer,</para>
+<para>Move pending jobs to another printer,</para>
 </listitem>
 <listitem>
-<para
->Cancel pending or processing jobs.</para>
+<para>Cancel pending or processing jobs.</para>
 </listitem>
 </itemizedlist>
 
-<para
->A screenshot of the &tdeprint; PrintJob Viewer shows the information you get: Job-ID, target printer, job name, job owner, job status and job size. In the next &tdeprint; release you will also see information about the number of pages (as &CUPS; calculates it; see chapter on page accounting for more information about its merits and limitations).</para>
+<para>A screenshot of the &tdeprint; PrintJob Viewer shows the information you get: Job-ID, target printer, job name, job owner, job status and job size. In the next &tdeprint; release you will also see information about the number of pages (as &CUPS; calculates it; see chapter on page accounting for more information about its merits and limitations).</para>
 
 <screenshot>
-<screeninfo
->A screenshot of the &tdeprint; PrintJob Viewer</screeninfo>
+<screeninfo>A screenshot of the &tdeprint; PrintJob Viewer</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="tdeprint-jobviewer.png" format="PNG"/>
 </imageobject>
 <textobject>
-<phrase
->Here's a screenshot of the &tdeprint; PrintJob Viewer.</phrase>
+<phrase>Here's a screenshot of the &tdeprint; PrintJob Viewer.</phrase>
 </textobject>
-<caption
-><para
->A screenshot of the &tdeprint; PrintJob Viewer.</para
-></caption>
+<caption><para>A screenshot of the &tdeprint; PrintJob Viewer.</para></caption>
 </mediaobject>
 </screenshot>
 
-<para
->An alternative way to looking at the same information (and having the same amount of control is through the <inlinemediaobject
-><imageobject
-> <imagedata fileref="kcontrol-icon.png" format="PNG"/></imageobject
-> </inlinemediaobject
-> &kcontrolcenter; selecting <menuchoice
-><guilabel
->System</guilabel
-><guilabel
->Printing Manager</guilabel
-></menuchoice
->. If you don't see the <guilabel
->Printer Information</guilabel
->, <mousebutton
->right</mousebutton
-> click on the window background and select <guilabel
->View Printer Information</guilabel
->. Then go to the <guilabel
->Jobs</guilabel
-> tab to see this:</para>
+<para>An alternative way to looking at the same information (and having the same amount of control is through the <inlinemediaobject><imageobject> <imagedata fileref="kcontrol-icon.png" format="PNG"/></imageobject> </inlinemediaobject> &kcontrolcenter; selecting <menuchoice><guilabel>System</guilabel><guilabel>Printing Manager</guilabel></menuchoice>. If you don't see the <guilabel>Printer Information</guilabel>, <mousebutton>right</mousebutton> click on the window background and select <guilabel>View Printer Information</guilabel>. Then go to the <guilabel>Jobs</guilabel> tab to see this:</para>
 
 <screenshot>
-<screeninfo
-></screeninfo>
+<screeninfo></screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="kcontrolcenter-printmanager-jobcontrol-2.png" format="PNG"/>
 </imageobject>
 <textobject>
-<phrase
->Here's a screenshot of the &tdeprint; PrintJob Viewer.</phrase>
+<phrase>Here's a screenshot of the &tdeprint; PrintJob Viewer.</phrase>
 </textobject>
 </mediaobject>
 </screenshot>
@@ -147,269 +80,140 @@
 </sect1>
 
 <sect1 id="modules-for-different-subsystems">
-<title
->Modules for different print subsystems</title>
+<title>Modules for different print subsystems</title>
 
-<para
->&tdeprint; uses different modules to realise the interface to the possible print subsystems. Not all the modules are yet developed fully, but you will have basic printing functionality with:</para>
+<para>&tdeprint; uses different modules to realise the interface to the possible print subsystems. Not all the modules are yet developed fully, but you will have basic printing functionality with:</para>
 
 <itemizedlist>
 <listitem>
-<para
-><acronym
->LPD</acronym
-> (<acronym
->BSD</acronym
-> style)</para>
+<para><acronym>LPD</acronym> (<acronym>BSD</acronym> style)</para>
 </listitem>
 <listitem>
-<para
-><acronym
->LPRng</acronym
-> (&RedHat;, if you just use it's <acronym
->BSD</acronym
-> style subset),</para>
+<para><acronym>LPRng</acronym> (&RedHat;, if you just use it's <acronym>BSD</acronym> style subset),</para>
 </listitem>
 <listitem>
-<para
-><acronym
->RLPR</acronym
-> (a command-line <acronym
->LPR</acronym
-> utility, which doesn't need a <filename
->printcap</filename
-> file.</para>
+<para><acronym>RLPR</acronym> (a command-line <acronym>LPR</acronym> utility, which doesn't need a <filename>printcap</filename> file.</para>
 </listitem>
 <listitem>
-<para
-><quote
->external</quote
-> print commands (&Netscape; like).</para>
+<para><quote>external</quote> print commands (&Netscape; like).</para>
 </listitem>
 </itemizedlist>
 
-<para
->Most importantly, full support for &CUPS; is already there. Modules for other print subsystems, such as <acronym
->PLP</acronym
->, <acronym
->PPR</acronym
-> and <acronym
->PDQ</acronym
-> may be available later.</para>
+<para>Most importantly, full support for &CUPS; is already there. Modules for other print subsystems, such as <acronym>PLP</acronym>, <acronym>PPR</acronym> and <acronym>PDQ</acronym> may be available later.</para>
 
-<para
->&tdeprint; makes &kde; much more flexible. It gives freedom of choice to &kde; 2.2 users. To use different available print subsystems, these must, of course, be installed independently from &kde;. In former versions, users were stuck with the old <acronym
->LPD</acronym
-> style print subsystems. Now they can even use &CUPS;. In the future, there will be easy integration of new subsystems, as they appear on the scene.</para>
+<para>&tdeprint; makes &kde; much more flexible. It gives freedom of choice to &kde; 2.2 users. To use different available print subsystems, these must, of course, be installed independently from &kde;. In former versions, users were stuck with the old <acronym>LPD</acronym> style print subsystems. Now they can even use &CUPS;. In the future, there will be easy integration of new subsystems, as they appear on the scene.</para>
 
 </sect1>
 
 <sect1 id="tdeprint-goodies">
-<title
->More &tdeprint; <quote
->Goodies</quote
-></title>
-<subtitle
->Benefitting all Print SubSystems.</subtitle>
-
-<para
->Some specific features of &tdeprint; depend on the chosen print subsystem. This dependency might exist because those features are only implemented there; remember, &tdeprint; is an intermediate layer between &kde; applications, and the print subsystem, but it's no replacement for any print subsystem by itself. Such dependency may exist for another reason: that &tdeprint; has not yet implemented an interface to all the features of all the subsystems.</para>
-
-<para
->Other features include benefits from &tdeprint; that are independent of the chosen print subsystem, and are available with all of them. At present there are <quote
->special</quote
-> or <quote
->virtual</quote
-> printers, and some generic <quote
->pre-filters</quote
->.</para>
+<title>More &tdeprint; <quote>Goodies</quote></title>
+<subtitle>Benefitting all Print SubSystems.</subtitle>
+
+<para>Some specific features of &tdeprint; depend on the chosen print subsystem. This dependency might exist because those features are only implemented there; remember, &tdeprint; is an intermediate layer between &kde; applications, and the print subsystem, but it's no replacement for any print subsystem by itself. Such dependency may exist for another reason: that &tdeprint; has not yet implemented an interface to all the features of all the subsystems.</para>
+
+<para>Other features include benefits from &tdeprint; that are independent of the chosen print subsystem, and are available with all of them. At present there are <quote>special</quote> or <quote>virtual</quote> printers, and some generic <quote>pre-filters</quote>.</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Print Preview</guilabel
-></term>
+<term><guilabel>Print Preview</guilabel></term>
 <listitem>
-<para
->From the Print Dialogue, you can select to look at a preview. For this, the print file is passed through filters which make it suitable for displaying on screen using &kghostview;.</para>
+<para>From the Print Dialogue, you can select to look at a preview. For this, the print file is passed through filters which make it suitable for displaying on screen using &kghostview;.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Special Printers</guilabel
-></term>
+<term><guilabel>Special Printers</guilabel></term>
 <listitem>
-<para
->Amongst these additional &tdeprint; features are a few <quote
->special</quote
-> or <quote
->virtual</quote
-> printers:</para>
+<para>Amongst these additional &tdeprint; features are a few <quote>special</quote> or <quote>virtual</quote> printers:</para>
 
-<para
->These special printers may:</para>
+<para>These special printers may:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Print to PDF</guilabel
-></term>
+<term><guilabel>Print to PDF</guilabel></term>
 <listitem>
-<para
->Convert your document into a <acronym
->PDF</acronym
-> file with the help of an external program.</para>
+<para>Convert your document into a <acronym>PDF</acronym> file with the help of an external program.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Print to email</guilabel
-></term>
+<term><guilabel>Print to email</guilabel></term>
 <listitem>
-<para
->Send your document as an email attached <acronym
->PDF</acronym
-> file.</para>
+<para>Send your document as an email attached <acronym>PDF</acronym> file.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Print to PS file</guilabel
-></term>
+<term><guilabel>Print to PS file</guilabel></term>
 <listitem>
-<para
->Save your document as a &PostScript; file.</para>
+<para>Save your document as a &PostScript; file.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Print to Fax</guilabel
-></term>
+<term><guilabel>Print to Fax</guilabel></term>
 <listitem>
-<para
->Send it through an available backend, such as <application
->Hylafax</application
-> as a fax.</para>
+<para>Send it through an available backend, such as <application>Hylafax</application> as a fax.</para>
 </listitem>
 </varlistentry>
 
 </variablelist>
 
-<para
->These <quote
->special</quote
-> printers appear in the user print dialogue just like <quote
->normal</quote
-> printers. They are entirely configurable on a per-user basis.</para>
+<para>These <quote>special</quote> printers appear in the user print dialogue just like <quote>normal</quote> printers. They are entirely configurable on a per-user basis.</para>
 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Generic Pre-Filtering</guilabel
-></term>
+<term><guilabel>Generic Pre-Filtering</guilabel></term>
 <listitem>
-<para
->&tdeprint; provides you with a framework to define and configure your own <quote
->pre-filters</quote
->. These pre-filters may take effect <emphasis
->before</emphasis
-> they are passed to your print subsystem for further processing, but <emphasis
->after</emphasis
-> the (&PostScript;, plain text or other) print files have been generated by your application.</para>
-
-<para
->There are a few useful filters already predefined. These are:</para>
+<para>&tdeprint; provides you with a framework to define and configure your own <quote>pre-filters</quote>. These pre-filters may take effect <emphasis>before</emphasis> they are passed to your print subsystem for further processing, but <emphasis>after</emphasis> the (&PostScript;, plain text or other) print files have been generated by your application.</para>
+
+<para>There are a few useful filters already predefined. These are:</para>
 
 <itemizedlist>
 <listitem>
-<para
->The <quote
->multiple pages per sheet</quote
-> filter,</para>
+<para>The <quote>multiple pages per sheet</quote> filter,</para>
 </listitem>
 
 <listitem>
-<para
->the <quote
->enscript</quote
-> text filter,</para>
+<para>the <quote>enscript</quote> text filter,</para>
 </listitem>
 
 <listitem>
-<para
->and three filters to help print pamphlets.</para>
+<para>and three filters to help print pamphlets.</para>
 </listitem>
 </itemizedlist>
 
-<para
->You may create your own filters based on any third party program that is able to process &PostScript;, plain text or image files, and output any one of those formats.</para>
+<para>You may create your own filters based on any third party program that is able to process &PostScript;, plain text or image files, and output any one of those formats.</para>
 
-<para
->These filters are configured through <acronym
->XML</acronym
-> files. This makes an extension of the concept very easy for experienced developers, but end-user configuration is also done through an intuitive graphical user interface. So, fear not, you don't need to learn <acronym
->XML</acronym
-> because of &tdeprint;!</para>
+<para>These filters are configured through <acronym>XML</acronym> files. This makes an extension of the concept very easy for experienced developers, but end-user configuration is also done through an intuitive graphical user interface. So, fear not, you don't need to learn <acronym>XML</acronym> because of &tdeprint;!</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Multiple Pages Per Sheet Filter</guilabel
-></term>
+<term><guilabel>Multiple Pages Per Sheet Filter</guilabel></term>
 <listitem>
-<para
->This is a predefined filter that installs with &tdeprint;. It allows you to create a modified &PostScript; output, from &PostScript; input, that prints 1, 2, or 4 logical pages on a single sheet of paper.</para>
+<para>This is a predefined filter that installs with &tdeprint;. It allows you to create a modified &PostScript; output, from &PostScript; input, that prints 1, 2, or 4 logical pages on a single sheet of paper.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Enscript Text Filter</guilabel
-></term>
+<term><guilabel>Enscript Text Filter</guilabel></term>
 <listitem>
-<para
->This is a predefined filter that installs with &tdeprint;. It allows you to create &PostScript; output from any text file input, that includes syntax highlighting for program listings, pretty-printing, and nice configurable page frames and headers.</para>
+<para>This is a predefined filter that installs with &tdeprint;. It allows you to create &PostScript; output from any text file input, that includes syntax highlighting for program listings, pretty-printing, and nice configurable page frames and headers.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Pamphlet Printing Filters</guilabel
-></term>
+<term><guilabel>Pamphlet Printing Filters</guilabel></term>
 <listitem>
-<para
->If your printer is able to produce duplex output, using either one-pass or two-pass technology, you may be able to use one, or a combination, of the <quote
->pamphlet</quote
-> filters.</para>
-
-<para
->For duplexing printers, make sure you use the duplex option that <quote
->turns</quote
-> the output along the short paper edge. Folding the printed paper along the middle turns your document into a nice pamphlet.</para>
-
-<para
->If you are stuck with using a simplex-only device, you can do the same, using two different filters and a few additional steps.</para>
-
-<para
->Depending on your model, first use the filter for printing the <quote
->odd</quote
-> pages, then insert the paper in the correct order back into the paper tray to get the even pages printed on the reverse side. These can then be folded to make a pamphlet.</para>
+<para>If your printer is able to produce duplex output, using either one-pass or two-pass technology, you may be able to use one, or a combination, of the <quote>pamphlet</quote> filters.</para>
+
+<para>For duplexing printers, make sure you use the duplex option that <quote>turns</quote> the output along the short paper edge. Folding the printed paper along the middle turns your document into a nice pamphlet.</para>
+
+<para>If you are stuck with using a simplex-only device, you can do the same, using two different filters and a few additional steps.</para>
+
+<para>Depending on your model, first use the filter for printing the <quote>odd</quote> pages, then insert the paper in the correct order back into the paper tray to get the even pages printed on the reverse side. These can then be folded to make a pamphlet.</para>
 </listitem>
 </varlistentry>
 
@@ -420,276 +224,101 @@
 </variablelist>
 </sect1>
 <sect1 id="cups-plugin">
-<title
->&CUPS; Support: the Most Important Module in &tdeprint;</title>
-
-<para
->&tdeprint; contains a module for &CUPS;. &CUPS;, the <quote
->Common &UNIX; Printing System</quote
-> (<ulink url="http://www.cups.org"
->http://www.cups.org/</ulink
->), is the most advanced, powerful and flexible of all print subsystems on &UNIX; and other &UNIX;-like operating systems. It is still quite new on the horizon, but is based on <acronym
->IPP</acronym
->, the Internet Printing Protocol, the newly emerging standard for the future of network printing. &CUPS; is clearly the print system of choice for Michael Goffioul, the principal &tdeprint; developer.</para>
-
-<para
->Experienced &kde; users may already be familiar with Michael's utilities <application
->qtcups</application
-> and <application
->kups</application
-> (co-developed with Jean-Eric Cuendet). These were, up until now, the graphical &GUI; front ends for &CUPS; with a strong relation to &kde;.</para>
+<title>&CUPS; Support: the Most Important Module in &tdeprint;</title>
+
+<para>&tdeprint; contains a module for &CUPS;. &CUPS;, the <quote>Common &UNIX; Printing System</quote> (<ulink url="http://www.cups.org">http://www.cups.org/</ulink>), is the most advanced, powerful and flexible of all print subsystems on &UNIX; and other &UNIX;-like operating systems. It is still quite new on the horizon, but is based on <acronym>IPP</acronym>, the Internet Printing Protocol, the newly emerging standard for the future of network printing. &CUPS; is clearly the print system of choice for Michael Goffioul, the principal &tdeprint; developer.</para>
+
+<para>Experienced &kde; users may already be familiar with Michael's utilities <application>qtcups</application> and <application>kups</application> (co-developed with Jean-Eric Cuendet). These were, up until now, the graphical &GUI; front ends for &CUPS; with a strong relation to &kde;.</para>
 
 <sect2>
-<title
-><application
->qtcups</application
-> and <application
->kups</application
-> &mdash; The Predecessors</title>
-
-<para
->Both utilities are probably still widely used. For those not familiar with them, here are brief explanations.</para>
-
-<para
-><application
->qtcups</application
-> was a graphical front end for the <command
->lp</command
-> or <command
->lpr</command
-> print commands as installed by &CUPS;. Using <application
->qtcups</application
-> opened a dialogue. This dialogue let you comfortably select your printer and the print job options. <application
->qtcups</application
-> worked from the command line, or from within applications, when the application in question had a configurable print command.</para>
-
-<para
-><application
->kups</application
-> was a graphical wrapper to do the administration tasks for your &CUPS; server, and the &CUPS; daemon at the heart of it. You could add, delete, modify, configure, start, and stop printers. You could cancel, delete, move, stop and restart print jobs, and you could change the settings of the daemon, start, stop, and restart it.</para>
+<title><application>qtcups</application> and <application>kups</application> &mdash; The Predecessors</title>
+
+<para>Both utilities are probably still widely used. For those not familiar with them, here are brief explanations.</para>
+
+<para><application>qtcups</application> was a graphical front end for the <command>lp</command> or <command>lpr</command> print commands as installed by &CUPS;. Using <application>qtcups</application> opened a dialogue. This dialogue let you comfortably select your printer and the print job options. <application>qtcups</application> worked from the command line, or from within applications, when the application in question had a configurable print command.</para>
+
+<para><application>kups</application> was a graphical wrapper to do the administration tasks for your &CUPS; server, and the &CUPS; daemon at the heart of it. You could add, delete, modify, configure, start, and stop printers. You could cancel, delete, move, stop and restart print jobs, and you could change the settings of the daemon, start, stop, and restart it.</para>
 
 </sect2>
 
 <sect2>
-<title
->&tdeprint; &mdash; The Heir</title>
-
-<para
->The &CUPS; Module in &tdeprint; now contains all (and more) functions that were provided by <application
->qtcups</application
-> and <application
->kups</application
-> in former &kde; versions.</para>
-
-<para
->Instead of <command
->qtcups</command
-> you can now use the <command
->kprinter</command
-> command. And in place of <command
->kups</command
-> you will probably use <command
->tdecmshell printmgr</command
-> from now on. </para>
-
-<para
->The &tdeprint; module for &CUPS; also lets you fully administer the print subsystem, just like <application
->kups</application
-> did before. It can start, stop and configure your &CUPS; daemon. It can also start, stop, add and delete <quote
->printers</quote
-> (&ie; printer queues) and printer <quote
->instances</quote
->. Printer instances are printer queues that point to the same physical output device but with a different default setting of print options.</para>
+<title>&tdeprint; &mdash; The Heir</title>
+
+<para>The &CUPS; Module in &tdeprint; now contains all (and more) functions that were provided by <application>qtcups</application> and <application>kups</application> in former &kde; versions.</para>
+
+<para>Instead of <command>qtcups</command> you can now use the <command>kprinter</command> command. And in place of <command>kups</command> you will probably use <command>tdecmshell printmgr</command> from now on. </para>
+
+<para>The &tdeprint; module for &CUPS; also lets you fully administer the print subsystem, just like <application>kups</application> did before. It can start, stop and configure your &CUPS; daemon. It can also start, stop, add and delete <quote>printers</quote> (&ie; printer queues) and printer <quote>instances</quote>. Printer instances are printer queues that point to the same physical output device but with a different default setting of print options.</para>
 
 </sect2>
 
 <sect2>
-<title
->&kprinter; &mdash; Graphical Print Command</title>
-
-<para
->&tdeprint;'s &CUPS; module gives you access to a <quote
->graphical print command</quote
->, like <application
->qtcups</application
-> did before.</para>
-
-<para
->Use &kprinter; in any application, even a non-&kde; application, that lets you configure your print command. Examples of these are &Netscape; and <application
->StarOffice</application
->, but <emphasis
->not</emphasis
-> most pre-&kde; 2.2 programs.</para>
-
-<para
->A screenshot how to use the new <command
->kprinter</command
-> print command instead of the old-fashioned <command
->lpr</command
->... Of course you need to have <command
->kprinter</command
-> in your $<envar
->PATH</envar
->, or give the full path in the dialogue; &eg; <userinput
-><filename
->/opt/kde/bin/kprinter</filename
-></userinput
->. &Netscape; will remember this and with further print jobs you will get the <command
->kprinter</command
-> dialogue to configure your printouts.</para>
+<title>&kprinter; &mdash; Graphical Print Command</title>
+
+<para>&tdeprint;'s &CUPS; module gives you access to a <quote>graphical print command</quote>, like <application>qtcups</application> did before.</para>
+
+<para>Use &kprinter; in any application, even a non-&kde; application, that lets you configure your print command. Examples of these are &Netscape; and <application>StarOffice</application>, but <emphasis>not</emphasis> most pre-&kde; 2.2 programs.</para>
+
+<para>A screenshot how to use the new <command>kprinter</command> print command instead of the old-fashioned <command>lpr</command>... Of course you need to have <command>kprinter</command> in your $<envar>PATH</envar>, or give the full path in the dialogue; &eg; <userinput><filename>/opt/kde/bin/kprinter</filename></userinput>. &Netscape; will remember this and with further print jobs you will get the <command>kprinter</command> dialogue to configure your printouts.</para>
 
 <screenshot>
-<screeninfo
->A screenshot of the <command
->kprinter</command
-> print command in action.</screeninfo>
+<screeninfo>A screenshot of the <command>kprinter</command> print command in action.</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="kprinter-as-netscape-printcommand.png" format="PNG"/>
 </imageobject>
 <textobject>
-<phrase
->Here's a screenshot showing how to use the new <command
->kprinter</command
-> print command instead of the old-fashioned <command
->lp</command
-> or <command
->lpr</command
-> in &Netscape;.</phrase>
+<phrase>Here's a screenshot showing how to use the new <command>kprinter</command> print command instead of the old-fashioned <command>lp</command> or <command>lpr</command> in &Netscape;.</phrase>
 </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->You can also use <command
->&kprinter;</command
-> from the command line and see the resulting dialogue box pop up:</para>
+<para>You can also use <command>&kprinter;</command> from the command line and see the resulting dialogue box pop up:</para>
 
 <screenshot>
-<screeninfo
->Screenshot of the <command
->kprinter</command
-> command</screeninfo>
+<screeninfo>Screenshot of the <command>kprinter</command> command</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="kprinter.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->Screenshot showing use of the <command
->kprinter</command
-> command from the command line.</phrase
-></textobject>
+<phrase>Screenshot showing use of the <command>kprinter</command> command from the command line.</phrase></textobject>
 </mediaobject>
 </screenshot>
 
-<note
-><para
->Just make sure you give at least the file to be printed from the command line as well: <userinput
-><command
->kprinter</command
-> <option
->/usr/share/doc/packages/cups/sam.pdf</option
-></userinput
->. This will hand over the &CUPS; Software Administrator Manual to the <command
->kprinter</command
-> dialogue, which will then pop up with the default printer pre-selected.</para>
-
-<para
->To pre-select a specific printer from the command line, use the <option
->-d</option
-> option, &eg;: <userinput
-><command
->kprinter</command
-> <option
->-d DANKAcolorC2000</option
-> <option
->/home/kurt/linuxtag2001-paper.ps</option
-></userinput
->. You can still de-select the printer <option
->DANKAcolorC2000</option
-> and choose a different one.</para>
-
-<para
->You <emphasis
->cannot</emphasis
-> however call <userinput
-><command
->kprinter</command
-></userinput
-> without a print file and hope to open a file selection dialogue box from the &kprinter; window. This is a feature that will be implemented only in the next version.</para>
+<note><para>Just make sure you give at least the file to be printed from the command line as well: <userinput><command>kprinter</command> <option>/usr/share/doc/packages/cups/sam.pdf</option></userinput>. This will hand over the &CUPS; Software Administrator Manual to the <command>kprinter</command> dialogue, which will then pop up with the default printer pre-selected.</para>
+
+<para>To pre-select a specific printer from the command line, use the <option>-d</option> option, &eg;: <userinput><command>kprinter</command> <option>-d DANKAcolorC2000</option> <option>/home/kurt/linuxtag2001-paper.ps</option></userinput>. You can still de-select the printer <option>DANKAcolorC2000</option> and choose a different one.</para>
+
+<para>You <emphasis>cannot</emphasis> however call <userinput><command>kprinter</command></userinput> without a print file and hope to open a file selection dialogue box from the &kprinter; window. This is a feature that will be implemented only in the next version.</para>
 </note>
 
-<para
->Using <command
->kprinter</command
-> you are able to <quote
->ring all the bells and blow all the whistles</quote
-> of your printer. You will need a device-specific so-called &PPD; (&PostScript; Printer Description) to enable &CUPS; to make this nice tandem team do this for you. Read more about this in <xref linkend="ppd-files"/>.</para>
+<para>Using <command>kprinter</command> you are able to <quote>ring all the bells and blow all the whistles</quote> of your printer. You will need a device-specific so-called &PPD; (&PostScript; Printer Description) to enable &CUPS; to make this nice tandem team do this for you. Read more about this in <xref linkend="ppd-files"/>.</para>
 
 </sect2>
 
 </sect1>
 
 <sect1 id="future-plans">
-<title
->Plans for Future Development</title>
-
-<para
->What you have now is the first, already very feature-rich version of &tdeprint;. This version is, of course, fully usable for printing. You might even think that <quote
->it was never so easy</quote
-> (not even back in the days when you had to use &Microsoft; &Windows;).</para>
-
-<para
->In the future, &tdeprint; will become even better. It will do a better job of <quote
->detecting</quote
-> your installed print subsystem itself. Already &tdeprint; is doing quite well in automatically sensing if you have &CUPS; on your system. But in many cases you will have to tell &tdeprint; what you are using, if you want to keep a legacy print system.</para>
-
-<para
->The most important improvement in the near future will be a completion of the <application
->LPRng</application
-> plugin. This at present is still very basic. It is restricted to the pure classical <acronym
->LPD</acronym
-> part of <application
->LPRng</application
->.</para>
-
-<para
->Also, you may be able to add printers directly from the print dialogue to your system <quote
->just in time</quote
->, without going to &kcontrol; first.</para>
-
-<para
->Some smaller improvements already planned are:</para>
+<title>Plans for Future Development</title>
+
+<para>What you have now is the first, already very feature-rich version of &tdeprint;. This version is, of course, fully usable for printing. You might even think that <quote>it was never so easy</quote> (not even back in the days when you had to use &Microsoft; &Windows;).</para>
+
+<para>In the future, &tdeprint; will become even better. It will do a better job of <quote>detecting</quote> your installed print subsystem itself. Already &tdeprint; is doing quite well in automatically sensing if you have &CUPS; on your system. But in many cases you will have to tell &tdeprint; what you are using, if you want to keep a legacy print system.</para>
+
+<para>The most important improvement in the near future will be a completion of the <application>LPRng</application> plugin. This at present is still very basic. It is restricted to the pure classical <acronym>LPD</acronym> part of <application>LPRng</application>.</para>
+
+<para>Also, you may be able to add printers directly from the print dialogue to your system <quote>just in time</quote>, without going to &kcontrol; first.</para>
+
+<para>Some smaller improvements already planned are:</para>
 
 <itemizedlist>
-<listitem
-><para
->add a file selection dialogue from the &kprinter; window to allow combining of additional files to the present printjob</para
-></listitem
-> <listitem
-><para
->add a <quote
->history</quote
-> button to the <application
->KJobViewer</application
-> window and also a column to show the number of pages &CUPS; calculates for the job.</para
-></listitem>
+<listitem><para>add a file selection dialogue from the &kprinter; window to allow combining of additional files to the present printjob</para></listitem> <listitem><para>add a <quote>history</quote> button to the <application>KJobViewer</application> window and also a column to show the number of pages &CUPS; calculates for the job.</para></listitem>
 </itemizedlist>
 
-<para
->Finally, there will be an <quote
->IO slave</quote
-> that will give you access to your print subsystem, via &konqueror; for example. With this you will soon be able to browse your print subsystem from &konqueror; through a &URL; like shortcut such as <userinput
->print://printers/printername</userinput
->. A KPart will add a virtual folder to the services section of the &konqueror; navigation panel, giving a nice integrated way to browse and manage your print system via the &URL; <userinput
->print:/manager</userinput
->.</para>
-
-<para
->Please contact Michael Goffioul at <email
->tdeprint@swing.be</email
-> with any further user or developer suggestions.</para>
+<para>Finally, there will be an <quote>IO slave</quote> that will give you access to your print subsystem, via &konqueror; for example. With this you will soon be able to browse your print subsystem from &konqueror; through a &URL; like shortcut such as <userinput>print://printers/printername</userinput>. A KPart will add a virtual folder to the services section of the &konqueror; navigation panel, giving a nice integrated way to browse and manage your print system via the &URL; <userinput>print:/manager</userinput>.</para>
+
+<para>Please contact Michael Goffioul at <email>tdeprint@swing.be</email> with any further user or developer suggestions.</para>
 
 </sect1>
 </chapter>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeprint/index.docbook b/tde-i18n-en_GB/docs/tdebase/tdeprint/index.docbook
index 47edbac8971..f511c1833f7 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeprint/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeprint/index.docbook
@@ -1,24 +1,12 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" 
 "dtd/kdex.dtd" [
-  <!ENTITY tdeprint "<application
->TDEPrint</application
->">
-  <!ENTITY kprinter "<command
->kprinter</command
->">
-  <!ENTITY CUPS "<acronym
->CUPS</acronym
->">
-  <!ENTITY PPD "<acronym
->PPD</acronym
->">
-  <!ENTITY IPP "<acronym
->IPP</acronym
->">
-  <!ENTITY ghostscript "<application
->ghostscript</application
->">
+  <!ENTITY tdeprint "<application>TDEPrint</application>">
+  <!ENTITY kprinter "<command>kprinter</command>">
+  <!ENTITY CUPS "<acronym>CUPS</acronym>">
+  <!ENTITY PPD "<acronym>PPD</acronym>">
+  <!ENTITY IPP "<acronym>IPP</acronym>">
+  <!ENTITY ghostscript "<application>ghostscript</application>">
   <!ENTITY tech-overview-doc SYSTEM "tech-overview.docbook">
   <!ENTITY highlights-doc SYSTEM "highlights.docbook">
   <!ENTITY getting-started-doc SYSTEM "getting-started.docbook">
@@ -34,172 +22,90 @@
   <!ENTITY external-command-doc SYSTEM "external-command.docbook">
   <!ENTITY extensions-doc SYSTEM "extensions.docbook">
   <!ENTITY final-word-doc SYSTEM "final-word.docbook">
-  <!ENTITY kappname "&tdeprint;"
-><!-- replace kapp here -->
+  <!ENTITY kappname "&tdeprint;"><!-- replace kapp here -->
   <!ENTITY % addindex "IGNORE">
-  <!ENTITY % British-English "INCLUDE"
-><!-- change language only here -->
+  <!ENTITY % British-English "INCLUDE"><!-- change language only here -->
 ]>
 	
 <book lang="&language;">
   
 <bookinfo>
-<title
->The &tdeprint; Handbook</title>
+<title>The &tdeprint; Handbook</title>
 
 <authorgroup>
-<author
-><firstname
->Kurt</firstname
-> <surname
->Pfeifle</surname
-> <affiliation
-> <address
-><email
->kpfeifle@danka.de</email
-></address>
+<author><firstname>Kurt</firstname> <surname>Pfeifle</surname> <affiliation> <address><email>kpfeifle@danka.de</email></address>
 </affiliation>
 </author>
         
-<othercredit role="developer"
-><firstname
->Michael</firstname
-> <surname
->Goffioul</surname
-> <affiliation
-> <address
-><email
->tdeprint@swing.be</email
-></address>
+<othercredit role="developer"><firstname>Michael</firstname> <surname>Goffioul</surname> <affiliation> <address><email>tdeprint@swing.be</email></address>
 </affiliation>
-<contrib
->Developer</contrib>
+<contrib>Developer</contrib>
 </othercredit>
 
-<othercredit role="reviewer"
-><firstname
->Lauri</firstname
-> <surname
->Watts</surname
-> <affiliation
-> <address
-><email
->lauri@kde.org</email
-></address>
+<othercredit role="reviewer"><firstname>Lauri</firstname> <surname>Watts</surname> <affiliation> <address><email>lauri@kde.org</email></address>
 </affiliation>
-<contrib
->Reviewer</contrib>
+<contrib>Reviewer</contrib>
 </othercredit>
 
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 
 </authorgroup>
 
 <copyright>
-<year
->2001</year>
-<holder
->Kurt Pfeifle</holder>
+<year>2001</year>
+<holder>Kurt Pfeifle</holder>
 </copyright>
 
-<legalnotice
->&FDLNotice;</legalnotice>
+<legalnotice>&FDLNotice;</legalnotice>
 
-<date
->2001-08-09</date>
-<releaseinfo
->1.00.04</releaseinfo>
+<date>2001-08-09</date>
+<releaseinfo>1.00.04</releaseinfo>
 
 <abstract>
-<para
->This handbook describes &tdeprint;. &tdeprint; is not a standalone program. It is the new printing framework for &kde; 2.2. &tdeprint; is an intermediate layer between &kde; (or other) applications and the selected (and installed) print subsystem of your OS (&OS;).</para>
+<para>This handbook describes &tdeprint;. &tdeprint; is not a standalone program. It is the new printing framework for &kde; 2.2. &tdeprint; is an intermediate layer between &kde; (or other) applications and the selected (and installed) print subsystem of your OS (&OS;).</para>
 </abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->tdebase</keyword>
-<keyword
->tdeprint</keyword>
-<keyword
->print</keyword>
-<keyword
->printing</keyword>
-<keyword
->CUPS</keyword>
-<keyword
->LPR</keyword>
+<keyword>KDE</keyword>
+<keyword>tdebase</keyword>
+<keyword>tdeprint</keyword>
+<keyword>print</keyword>
+<keyword>printing</keyword>
+<keyword>CUPS</keyword>
+<keyword>LPR</keyword>
 </keywordset>
 
 </bookinfo>
 
 <chapter id="introduction">
-<title
->Introduction</title>
+<title>Introduction</title>
 
-<para
->This handbook describes &tdeprint;. &tdeprint; is not a standalone program. It is the new printing framework for &kde; 2.2. &tdeprint; is an intermediate layer between &kde; (or other) applications and the selected (and installed) print subsystem of your OS (&OS;).</para>
+<para>This handbook describes &tdeprint;. &tdeprint; is not a standalone program. It is the new printing framework for &kde; 2.2. &tdeprint; is an intermediate layer between &kde; (or other) applications and the selected (and installed) print subsystem of your OS (&OS;).</para>
 
-<para
->It should be noted that both the developer of this application, and the author of this document are most familiar with &CUPS; as a printing system. At the time of writing, &CUPS; is the best supported printing subsystem, and it is the best documented.</para>
+<para>It should be noted that both the developer of this application, and the author of this document are most familiar with &CUPS; as a printing system. At the time of writing, &CUPS; is the best supported printing subsystem, and it is the best documented.</para>
 
-<para
->This handbook is a work in progress, and later versions of the &tdeprint; software and editions of this handbook will support and explore more closely other printing systems.</para>
+<para>This handbook is a work in progress, and later versions of the &tdeprint; software and editions of this handbook will support and explore more closely other printing systems.</para>
 
-<para
->In the meantime, even if your printing subsystem is not yet well covered, you are encouraged to explore the <guilabel
->Printing Manager</guilabel
-> module in &kcontrol;, and you will find its operation to hopefully be fairly self evident, no matter what printing subsystem you use.</para>
+<para>In the meantime, even if your printing subsystem is not yet well covered, you are encouraged to explore the <guilabel>Printing Manager</guilabel> module in &kcontrol;, and you will find its operation to hopefully be fairly self evident, no matter what printing subsystem you use.</para>
 
-<para
->Lauri Watts, &kde; documentation team</para>
+<para>Lauri Watts, &kde; documentation team</para>
 
-<!-- Insert here screenshot : <steinbruch_scaled.png
-> -->
+<!-- Insert here screenshot : <steinbruch_scaled.png> -->
 
 <sect1>
-<title
->To configure your printing subsystem from &kcontrol;</title>
-
-<para
->To configure your printing subsystem from &kcontrol;, go to <menuchoice
-><guilabel
->System</guilabel
-><guilabel
->Printing Manager</guilabel
-></menuchoice
-> and select your subsystem. Or you can let &tdeprint; try to determine it... </para>
+<title>To configure your printing subsystem from &kcontrol;</title>
+
+<para>To configure your printing subsystem from &kcontrol;, go to <menuchoice><guilabel>System</guilabel><guilabel>Printing Manager</guilabel></menuchoice> and select your subsystem. Or you can let &tdeprint; try to determine it... </para>
 
 <screenshot>
-<screeninfo
->&CUPS; Printing Manager dialogue: overview via &kcontrol;</screeninfo>
+<screeninfo>&CUPS; Printing Manager dialogue: overview via &kcontrol;</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="steinbruch_scaled.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->The dialogue to configure the &CUPS; server: security settings</phrase
-></textobject>
-<caption
-><para
->Configuration of printing subsystem from &kcontrol;</para
-></caption>
+<phrase>The dialogue to configure the &CUPS; server: security settings</phrase></textobject>
+<caption><para>Configuration of printing subsystem from &kcontrol;</para></caption>
 </mediaobject>
 </screenshot>
 </sect1>
@@ -235,22 +141,10 @@ format="PNG"/></imageobject>
 &final-word-doc;
 
 <chapter id="credits-and-license">
-<title
->Credits And Licences</title>
-
-<para
->&tdeprint; copyright 2001, Michael Goffioul <email
->tdeprint@swing.be</email
-></para>
-&underGPL; <para
->Documentation copyright 2001, Kurt Pfeifle, <email
->kpfeifle@danka.de</email
-></para
-> &underFDL; <para
->Conversion to British English: Malcolm Hunter <email
->malcolm.hunter@gmx.co.uk</email
-></para
-> 
+<title>Credits And Licences</title>
+
+<para>&tdeprint; copyright 2001, Michael Goffioul <email>tdeprint@swing.be</email></para>
+&underGPL; <para>Documentation copyright 2001, Kurt Pfeifle, <email>kpfeifle@danka.de</email></para> &underFDL; <para>Conversion to British English: Malcolm Hunter <email>malcolm.hunter@gmx.co.uk</email></para> 
 
 </chapter>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeprint/lpd.docbook b/tde-i18n-en_GB/docs/tdebase/tdeprint/lpd.docbook
index 8c39ba87173..e99e2abeea7 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeprint/lpd.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeprint/lpd.docbook
@@ -1,27 +1,13 @@
 <chapter id="lpd-module">
-<title
->Generic <acronym
->LPD</acronym
-> Module (&UNIX;)</title>
+<title>Generic <acronym>LPD</acronym> Module (&UNIX;)</title>
 
 
 <sect1>
-<title
->Overview of Provided Features</title>
+<title>Overview of Provided Features</title>
 
-<para
->Module used by default (on first start for example).</para>
+<para>Module used by default (on first start for example).</para>
 
-<para
->Generic module that only allows sending of print jobs. No printer or job management supported. It is made to work on a wide variety of &UNIX; flavours: &Linux;/<acronym
->LPR</acronym
->, &HP-UX;, Solaris, &IRIX;. It also supports some <application
->LPRng</application
-> extensions (like the absence of continuation character <literal
->\</literal
-> in <filename
->printcap</filename
-> files).</para>
+<para>Generic module that only allows sending of print jobs. No printer or job management supported. It is made to work on a wide variety of &UNIX; flavours: &Linux;/<acronym>LPR</acronym>, &HP-UX;, Solaris, &IRIX;. It also supports some <application>LPRng</application> extensions (like the absence of continuation character <literal>\</literal> in <filename>printcap</filename> files).</para>
 
 </sect1>
 </chapter>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeprint/lpr-bsd.docbook b/tde-i18n-en_GB/docs/tdebase/tdeprint/lpr-bsd.docbook
index 9d6bcbbf86d..cda258b7be3 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeprint/lpr-bsd.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeprint/lpr-bsd.docbook
@@ -1,36 +1,20 @@
 <chapter id="lpr-bsd-style-module">
-<title
-><acronym
->LPR</acronym
-> (<acronym
->BSD</acronym
->)</title>
+<title><acronym>LPR</acronym> (<acronym>BSD</acronym>)</title>
 
-<para
->Plain (old?) <acronym
->LPR</acronym
-> support. An <acronym
->LPRng</acronym
-> module is in development, and hopefully available for 2.3 release.</para>
+<para>Plain (old?) <acronym>LPR</acronym> support. An <acronym>LPRng</acronym> module is in development, and hopefully available for 2.3 release.</para>
 
 <sect1>
-<title
->Overview of Provided Features</title>
+<title>Overview of Provided Features</title>
 
 <itemizedlist>
 <listitem>
-<para
->Printer management: basic support to add/remove/configure a printer, compatible with &RedHat;-6.x systems (<command
->printtool</command
-> + rhs-printfilers packages).</para>
+<para>Printer management: basic support to add/remove/configure a printer, compatible with &RedHat;-6.x systems (<command>printtool</command> + rhs-printfilers packages).</para>
 </listitem>
 <listitem>
-<para
->Job management: not supported</para>
+<para>Job management: not supported</para>
 </listitem>
 <listitem>
-<para
->Print options: basic control</para>
+<para>Print options: basic control</para>
 </listitem>
 </itemizedlist>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeprint/lprng.docbook b/tde-i18n-en_GB/docs/tdebase/tdeprint/lprng.docbook
index 193747db5f2..a765cbc23ff 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeprint/lprng.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeprint/lprng.docbook
@@ -1,12 +1,6 @@
 <chapter id="lprng-module">
-<title
-><application
->LPRng</application
-></title>
+<title><application>LPRng</application></title>
 
-<para
->An <application
->LPRng</application
-> module for &tdeprint; is in development, and hopefully available for the &kde; 2.3 release.</para>
+<para>An <application>LPRng</application> module for &tdeprint; is in development, and hopefully available for the &kde; 2.3 release.</para>
 
 </chapter>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeprint/rlpr.docbook b/tde-i18n-en_GB/docs/tdebase/tdeprint/rlpr.docbook
index 88b2ac1dd7b..3c7858fda5d 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeprint/rlpr.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeprint/rlpr.docbook
@@ -1,24 +1,12 @@
 <chapter id="rlpr-module">
-<title
->Module Built Around <application
->rlpr</application
-> Utility</title>
+<title>Module Built Around <application>rlpr</application> Utility</title>
 
 <sect1>
-<title
->Overview of provided features</title>
+<title>Overview of provided features</title>
 
-<para
->Printer management: basic operations are supported (add/remove/modify).</para>
+<para>Printer management: basic operations are supported (add/remove/modify).</para>
 
-<para
->Each user can predefine the printers he wants to use by specifying the host and related printer queues. Printers are stored on a <quote
->per user basis</quote
->. This module is built around the <application
->rlpr</application
-> utility <ulink url="http://truffula.com/rlpr/"
->rlpr</ulink
-></para>
+<para>Each user can predefine the printers he wants to use by specifying the host and related printer queues. Printers are stored on a <quote>per user basis</quote>. This module is built around the <application>rlpr</application> utility <ulink url="http://truffula.com/rlpr/">rlpr</ulink></para>
 
 </sect1>
 </chapter>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeprint/tech-overview.docbook b/tde-i18n-en_GB/docs/tdebase/tdeprint/tech-overview.docbook
index 05bfbc915c4..37fa1a89985 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeprint/tech-overview.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeprint/tech-overview.docbook
@@ -1,164 +1,86 @@
 <chapter id="technical-overview">
-<title
->Technical Overview</title>
+<title>Technical Overview</title>
 
-<para
->This chapter aims to give a technical overview of &tdeprint; which non-programmers can comprehend.</para>
+<para>This chapter aims to give a technical overview of &tdeprint; which non-programmers can comprehend.</para>
 
-<para
->&tdeprint; is a new and revolutionary tool to give easy access to printing services for both &kde; users and &kde; developers.</para>
+<para>&tdeprint; is a new and revolutionary tool to give easy access to printing services for both &kde; users and &kde; developers.</para>
 
 <sect1 id="brief-description">
-<title
->A Brief Description of &tdeprint;</title>
+<title>A Brief Description of &tdeprint;</title>
 
-<para
->You can access the functions of &tdeprint; in different ways: through the Printing Manger in the &kcontrol;, through the <command
->kprinter</command
-> command or through the dialogue that pops up if you want to print.</para>
+<para>You can access the functions of &tdeprint; in different ways: through the Printing Manger in the &kcontrol;, through the <command>kprinter</command> command or through the dialogue that pops up if you want to print.</para>
 
 <sect2 id="what-tdeprint-is-not">
-<title
->What it is <emphasis
->not</emphasis
-></title>
-
-<para
->&tdeprint; is <emphasis
->not</emphasis
-> a replacement for the printing subsystem itself. &tdeprint; does <emphasis
->not</emphasis
-> therefore give provision for spooling, and it does <emphasis
->not</emphasis
-> do the basic processing of &PostScript; or other print data.</para>
+<title>What it is <emphasis>not</emphasis></title>
+
+<para>&tdeprint; is <emphasis>not</emphasis> a replacement for the printing subsystem itself. &tdeprint; does <emphasis>not</emphasis> therefore give provision for spooling, and it does <emphasis>not</emphasis> do the basic processing of &PostScript; or other print data.</para>
 
 </sect2>
 
 <sect2 id="what-kde-print-is">
-<title
->What it <emphasis
->is</emphasis
-></title>
-<para
->&tdeprint; is an intermediate layer between the spooling and the data processing print subsystem (as installed), and the application that seeks to print. &tdeprint; provides a common interface for &kde; developers and &kde; users, to various supported print subsystems. At the same time, it is customisable, and highly configurable.</para>
+<title>What it <emphasis>is</emphasis></title>
+<para>&tdeprint; is an intermediate layer between the spooling and the data processing print subsystem (as installed), and the application that seeks to print. &tdeprint; provides a common interface for &kde; developers and &kde; users, to various supported print subsystems. At the same time, it is customisable, and highly configurable.</para>
 
-<para
->&tdeprint; is easy to use for both &kde; developers and end-users. Developers can port their applications, with minimal changes, to use &tdeprint; instead of the old &Qt; print <quote
->system</quote
->. Users can easily choose and configure their print subsystem.</para>
+<para>&tdeprint; is easy to use for both &kde; developers and end-users. Developers can port their applications, with minimal changes, to use &tdeprint; instead of the old &Qt; print <quote>system</quote>. Users can easily choose and configure their print subsystem.</para>
 
-<para
->For a reference to new &kde; users: &Qt; is the basic library and graphical toolkit, which is used by all &kde; applications; &Qt; is developed by TrollTech, a Norwegian software company.</para>
+<para>For a reference to new &kde; users: &Qt; is the basic library and graphical toolkit, which is used by all &kde; applications; &Qt; is developed by TrollTech, a Norwegian software company.</para>
 
 </sect2>
 
 </sect1>
 
 <sect1 id="different-users">
-<title
->&tdeprint; -- Different Usage for Different People</title>
+<title>&tdeprint; -- Different Usage for Different People</title>
 
-<para
->&tdeprint; has different faces for different people.</para>
+<para>&tdeprint; has different faces for different people.</para>
 
 <sect2 id="what-users-can-do">
-<title
->What users and administrators can do with &tdeprint;</title>
-
-<para
->&tdeprint; allows users and/or administrators, depending on their rights, access to printing subsystems (&CUPS;, <acronym
->LPD</acronym
->, <acronym
->RLPR</acronym
->, <application
->LPRng</application
->, <application
->PDQ</application
-> &etc;) through a &kde; graphical user interface (&GUI;). Using &tdeprint;, they can print, administer jobs, printers and the printing daemon, all in a comfortable manner.</para>
-
-<para
->Experienced users will like the capability to plug any working filter for the print data between the output of their application and the input, into the chosen print subsystem. Some examples for this already ship with <quote
->plain vanilla</quote
-> &tdeprint;. Read on.</para>
+<title>What users and administrators can do with &tdeprint;</title>
+
+<para>&tdeprint; allows users and/or administrators, depending on their rights, access to printing subsystems (&CUPS;, <acronym>LPD</acronym>, <acronym>RLPR</acronym>, <application>LPRng</application>, <application>PDQ</application> &etc;) through a &kde; graphical user interface (&GUI;). Using &tdeprint;, they can print, administer jobs, printers and the printing daemon, all in a comfortable manner.</para>
+
+<para>Experienced users will like the capability to plug any working filter for the print data between the output of their application and the input, into the chosen print subsystem. Some examples for this already ship with <quote>plain vanilla</quote> &tdeprint;. Read on.</para>
 
 </sect2>
 
 
 <sect2 id="what-developers-can-do">
-<title
->What &kde; developers can do with it...</title>
-
-<para
->If a &kde; developer needs printing access for his application, he does not code the printing functions from scratch. Before &kde; 2.2 this service was provided by the <classname
->QPrinter</classname
-> class, a library function of the &Qt; Toolkit. The <classname
->QPrinter</classname
-> class relied on the out-moded <quote
->Line Printer Daemon</quote
-> (<acronym
->LPD</acronym
->). The &tdeprint; library bases itself firmly on the more modern Common &UNIX; Printing System (&CUPS;), while at the same time keeping backward compatibility with <acronym
->LPD</acronym
-> and other legacy, or less elaborate, print systems. It also <quote
->leaves the door open</quote
-> for any new development that might occur.</para>
-
-<para
->For &kde; developers to use the new &tdeprint; class in their applications, they require only minimal changes to their code: for every call of <classname
->QPrinter</classname
->, they just need to change this to <classname
->KPrinter</classname
->. Replacing one (!) letter in a few spots, and automatically they are done; their application can then use all of the features of the new &tdeprint; library.</para>
-
-<para
->More ambitious developers, or ones with special requirements, can do more: despite &tdeprint;'s feature-rich framework, they are still able to customise the print dialogue of their application by creating an additional <quote
->Tab</quote
->, where their extensions to the standard &tdeprint; will feel right at home.</para>
-
-
-<para
->This last mentioned feature has not been used widely inside &kde; so far, as developers are not yet fully aware of &tdeprint;'s power. Expect more of this in the near future. One example I discovered is the &kcron; application. It lets you edit the crontab through a &GUI;. The developers have implemented a printing feature that lets you (or <systemitem class="username"
->root</systemitem
->) choose if you want to print the whole of crontab (for all users) or just the part that is marked. You can see the effects on &tdeprint; in the following screenshots.</para>
-
-<para
->This shot shows a sample from the &kcron; utility. <screenshot>
-<screeninfo
->&kcron; utility: a small sample of a system's cronjobs as shown through the &kde; <acronym
->GUI</acronym
->&GUI;.</screeninfo>
+<title>What &kde; developers can do with it...</title>
+
+<para>If a &kde; developer needs printing access for his application, he does not code the printing functions from scratch. Before &kde; 2.2 this service was provided by the <classname>QPrinter</classname> class, a library function of the &Qt; Toolkit. The <classname>QPrinter</classname> class relied on the out-moded <quote>Line Printer Daemon</quote> (<acronym>LPD</acronym>). The &tdeprint; library bases itself firmly on the more modern Common &UNIX; Printing System (&CUPS;), while at the same time keeping backward compatibility with <acronym>LPD</acronym> and other legacy, or less elaborate, print systems. It also <quote>leaves the door open</quote> for any new development that might occur.</para>
+
+<para>For &kde; developers to use the new &tdeprint; class in their applications, they require only minimal changes to their code: for every call of <classname>QPrinter</classname>, they just need to change this to <classname>KPrinter</classname>. Replacing one (!) letter in a few spots, and automatically they are done; their application can then use all of the features of the new &tdeprint; library.</para>
+
+<para>More ambitious developers, or ones with special requirements, can do more: despite &tdeprint;'s feature-rich framework, they are still able to customise the print dialogue of their application by creating an additional <quote>Tab</quote>, where their extensions to the standard &tdeprint; will feel right at home.</para>
+
+
+<para>This last mentioned feature has not been used widely inside &kde; so far, as developers are not yet fully aware of &tdeprint;'s power. Expect more of this in the near future. One example I discovered is the &kcron; application. It lets you edit the crontab through a &GUI;. The developers have implemented a printing feature that lets you (or <systemitem class="username">root</systemitem>) choose if you want to print the whole of crontab (for all users) or just the part that is marked. You can see the effects on &tdeprint; in the following screenshots.</para>
+
+<para>This shot shows a sample from the &kcron; utility. <screenshot>
+<screeninfo>&kcron; utility: a small sample of a system's cronjobs as shown through the &kde; <acronym>GUI</acronym>&GUI;.</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="kcron_to_be_printed.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->The &kcron; developers let you choose to print the whole of the cron table or just the marked part of it.</phrase
-></textobject>
+<phrase>The &kcron; developers let you choose to print the whole of the cron table or just the marked part of it.</phrase></textobject>
 </mediaobject>
 </screenshot>
 </para>
 
-<para
->The dialogue to configure &kcron;'s printing options: the additional tab titled <guilabel
->Cron Options</guilabel
-> is from inside &kcron;, not &tdeprint;; it is a special extension added by the &kcron; developers for printing purposes, not originating from, but executed by &tdeprint;. Developers of other applications are free to implement their own goodies, if they feel need for it.</para>
+<para>The dialogue to configure &kcron;'s printing options: the additional tab titled <guilabel>Cron Options</guilabel> is from inside &kcron;, not &tdeprint;; it is a special extension added by the &kcron; developers for printing purposes, not originating from, but executed by &tdeprint;. Developers of other applications are free to implement their own goodies, if they feel need for it.</para>
 
 
 <screenshot>
-<screeninfo
->&kcron;'s addition to the &tdeprint; dialogue.</screeninfo>
+<screeninfo>&kcron;'s addition to the &tdeprint; dialogue.</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="kprinter_with_kcron_developer_special.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->&kcron;'s addition to the &tdeprint; dialogue.</phrase
-></textobject>
+<phrase>&kcron;'s addition to the &tdeprint; dialogue.</phrase></textobject>
 <caption>
-<para
->&kcron;'s addition to the &tdeprint; dialogue.</para>
+<para>&kcron;'s addition to the &tdeprint; dialogue.</para>
 </caption>
 </mediaobject>
 </screenshot>
@@ -166,161 +88,69 @@ format="PNG"/></imageobject>
 </sect2>
 
 <sect2>
-<title
->What &tdeprint; offers to everybody...</title>
-
-<para
->&tdeprint;'s easy-to-use interface for all supported print subsystems of course does not eliminate basic traditional weaknesses of some of those systems. But it smooths some rough edges. Different users may use different printing systems on the same box. A user is free to even switch <quote
->on the fly</quote
->, from the print dialogue, the print subsystem to be used for the next job. (This is possible if different systems are installed in a way that they don't <quote
->get in each other's way</quote
->.)</para>
-
-<para
->Most &UNIX; users are used to <acronym
->LPD</acronym
-> printing. <acronym
->LPD</acronym
-> provides only basic printing functions, is very inflexible and does not utilise the many options of more modern print systems like &CUPS;. While also working remotely over any distance (like every TCP/IP based protocol), <acronym
->LPD</acronym
-> lacks bi-directional communication, authentication, access control and encryption support.</para>
-
-<para
->&tdeprint; can use &CUPS; to support:</para>
+<title>What &tdeprint; offers to everybody...</title>
+
+<para>&tdeprint;'s easy-to-use interface for all supported print subsystems of course does not eliminate basic traditional weaknesses of some of those systems. But it smooths some rough edges. Different users may use different printing systems on the same box. A user is free to even switch <quote>on the fly</quote>, from the print dialogue, the print subsystem to be used for the next job. (This is possible if different systems are installed in a way that they don't <quote>get in each other's way</quote>.)</para>
+
+<para>Most &UNIX; users are used to <acronym>LPD</acronym> printing. <acronym>LPD</acronym> provides only basic printing functions, is very inflexible and does not utilise the many options of more modern print systems like &CUPS;. While also working remotely over any distance (like every TCP/IP based protocol), <acronym>LPD</acronym> lacks bi-directional communication, authentication, access control and encryption support.</para>
+
+<para>&tdeprint; can use &CUPS; to support:</para>
 
 <itemizedlist>
 <listitem>
-<para
->Querying the <acronym
->LAN</acronym
-> for available printers,</para>
+<para>Querying the <acronym>LAN</acronym> for available printers,</para>
 </listitem>
 <listitem>
-<para
->Basic, Digest, and Certificate Authentication,</para>
+<para>Basic, Digest, and Certificate Authentication,</para>
 </listitem>
 <listitem>
-<para
->Access Control based on <acronym
->IP</acronym
-> addresses, net addresses, netmasks, host- and domain names,</para>
+<para>Access Control based on <acronym>IP</acronym> addresses, net addresses, netmasks, host- and domain names,</para>
 </listitem>
 <listitem>
-<para
->and 128-Bit TLS or SSL3 encryption of print data, to prevent eavesdropping, or at least make it much more difficult.</para>
+<para>and 128-Bit TLS or SSL3 encryption of print data, to prevent eavesdropping, or at least make it much more difficult.</para>
 </listitem>
 </itemizedlist>
 
-<para
->This makes &tdeprint; a much more robust and reliable solution than using the venerable <acronym
->LPD</acronym
->.</para>
+<para>This makes &tdeprint; a much more robust and reliable solution than using the venerable <acronym>LPD</acronym>.</para>
 
 </sect2>
 <sect2>
-<title
->How to access &tdeprint; </title>
+<title>How to access &tdeprint; </title>
 
-<para
->You get access to &tdeprint;, or parts of it, in four different ways:</para>
+<para>You get access to &tdeprint;, or parts of it, in four different ways:</para>
 
 <itemizedlist>
-<listitem
-><para
->through your applications: if you call the printing dialogue (either <menuchoice
-><guilabel
->File</guilabel
-> <guilabel
->Print...</guilabel
-></menuchoice
->) or the button with the little printer icon on it; this opens the printing dialogue.</para
-></listitem>
-
-<listitem
-><para
->through the typed command <command
->kprinter</command
-> in a <application
->terminal</application
-> or a &konsole; window or from the <guilabel
->Run Command...</guilabel
-> mini-<acronym
->CLI</acronym
-> window: this also opens the printing dialogue.</para
-></listitem>
-
-<listitem
-><para
->from the <inlinemediaobject
-><imageobject
-> <imagedata fileref="kcontrol-icon.png" format="PNG"/></imageobject
-> </inlinemediaobject
-> button, starting &kcontrol;, and then go to <menuchoice
-><guilabel
->System</guilabel
-><guilabel
->Printing Manager</guilabel
-></menuchoice
->. This opens the &tdeprint; administration which is part of the &kcontrolcenter; and also lets you switch to other parts of the &kcontrol;</para
-></listitem>
-
-<listitem
-><para
->from a command line (&konsole; or mini-<acronym
->CLI</acronym
->) type <userinput
-> <command
->tdecmshell</command
-> <option
->printmgr</option
-></userinput
->. This opens just the &tdeprint; part of &kcontrol; to change your settings </para
-></listitem>
+<listitem><para>through your applications: if you call the printing dialogue (either <menuchoice><guilabel>File</guilabel> <guilabel>Print...</guilabel></menuchoice>) or the button with the little printer icon on it; this opens the printing dialogue.</para></listitem>
+
+<listitem><para>through the typed command <command>kprinter</command> in a <application>terminal</application> or a &konsole; window or from the <guilabel>Run Command...</guilabel> mini-<acronym>CLI</acronym> window: this also opens the printing dialogue.</para></listitem>
+
+<listitem><para>from the <inlinemediaobject><imageobject> <imagedata fileref="kcontrol-icon.png" format="PNG"/></imageobject> </inlinemediaobject> button, starting &kcontrol;, and then go to <menuchoice><guilabel>System</guilabel><guilabel>Printing Manager</guilabel></menuchoice>. This opens the &tdeprint; administration which is part of the &kcontrolcenter; and also lets you switch to other parts of the &kcontrol;</para></listitem>
+
+<listitem><para>from a command line (&konsole; or mini-<acronym>CLI</acronym>) type <userinput> <command>tdecmshell</command> <option>printmgr</option></userinput>. This opens just the &tdeprint; part of &kcontrol; to change your settings </para></listitem>
 </itemizedlist>
 <screenshot>
-<screeninfo
->&kprinter; dialogue to be started from <guilabel
->Run Command...</guilabel
-> window</screeninfo>
+<screeninfo>&kprinter; dialogue to be started from <guilabel>Run Command...</guilabel> window</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="kprinter_called_from_run_command.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->Starting the &kprinter; dialogue from a <guilabel
->Run Command...</guilabel
-> window.</phrase
-></textobject>
-<caption
-><para
->Starting the &kprinter; dialogue from a <guilabel
->Run Command...</guilabel
-> window.</para
-></caption>
+<phrase>Starting the &kprinter; dialogue from a <guilabel>Run Command...</guilabel> window.</phrase></textobject>
+<caption><para>Starting the &kprinter; dialogue from a <guilabel>Run Command...</guilabel> window.</para></caption>
 </mediaobject>
 </screenshot>
 
-<!-- TODO: This one ought to be a screenshot LW. --> <para
->Here is a &kivio; drawing of the &kprinter; dialogue as it pops up after being started... You can always add a new printer by clicking on the small <guiicon
->Wizard</guiicon
-> button (marked red/yellow in this drawing).</para>
+<!-- TODO: This one ought to be a screenshot LW. --> <para>Here is a &kivio; drawing of the &kprinter; dialogue as it pops up after being started... You can always add a new printer by clicking on the small <guiicon>Wizard</guiicon> button (marked red/yellow in this drawing).</para>
   
 <screenshot>
-<screeninfo
->&kprinter; dialogue started (&kivio; draft drawing) </screeninfo>
+<screeninfo>&kprinter; dialogue started (&kivio; draft drawing) </screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="kprinter-kivio.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->&kprinter; dialogue started (&kivio; draft drawing)</phrase
-></textobject>
-<caption
-><para
->&kprinter; dialogue started (&kivio; draft drawing)</para
-></caption>
+<phrase>&kprinter; dialogue started (&kivio; draft drawing)</phrase></textobject>
+<caption><para>&kprinter; dialogue started (&kivio; draft drawing)</para></caption>
 </mediaobject>
 </screenshot>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeprint/theory.docbook b/tde-i18n-en_GB/docs/tdebase/tdeprint/theory.docbook
index d39e0969f85..7578f1a633b 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeprint/theory.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeprint/theory.docbook
@@ -1,75 +1,36 @@
 <chapter id="theory">
-<title
->Some Theoretical Background: &CUPS;, <acronym
->IPP</acronym
->, &PostScript; and <application
->Ghostscript</application
-></title>
-
-<para
->This chapter aims to give a bit of theoretical background to printing in general, and to &CUPS; especially. If you are not in need of this, you might like to skip ahead to the <link linkend="getting-started"
->next chapter</link
->. Chances are you will come back to this chapter at some point anyway, because sometimes one needs extra theory to solve a practical problem.</para>
+<title>Some Theoretical Background: &CUPS;, <acronym>IPP</acronym>, &PostScript; and <application>Ghostscript</application></title>
+
+<para>This chapter aims to give a bit of theoretical background to printing in general, and to &CUPS; especially. If you are not in need of this, you might like to skip ahead to the <link linkend="getting-started">next chapter</link>. Chances are you will come back to this chapter at some point anyway, because sometimes one needs extra theory to solve a practical problem.</para>
 
 <sect1 id="basics-of-printing">
-<title
->Basics About Printing</title>
+<title>Basics About Printing</title>
 
-<para
->Printing is one of the more complicated chapters in <acronym
->IT</acronym
-> technology.</para>
+<para>Printing is one of the more complicated chapters in <acronym>IT</acronym> technology.</para>
 
 
-<para
->Earlier on in history, every developer of a program that was capable of producing printable output had to write his own printer drivers too. That was quite complicated, because different programs have different file formats. Even programs with the same purpose, for example: word processors, often do not understand each other's formats. There was therefore no common interface to all printers, hence the programmers often supported only a few selected models.</para>
+<para>Earlier on in history, every developer of a program that was capable of producing printable output had to write his own printer drivers too. That was quite complicated, because different programs have different file formats. Even programs with the same purpose, for example: word processors, often do not understand each other's formats. There was therefore no common interface to all printers, hence the programmers often supported only a few selected models.</para>
 
-<para
->A new device appearing on the market required the program authors to write a new driver if they wanted their program to support it. Also for manufacturers, it was impossible to make sure their device was supported by any program known to the world (although there were far fewer than today).</para>
+<para>A new device appearing on the market required the program authors to write a new driver if they wanted their program to support it. Also for manufacturers, it was impossible to make sure their device was supported by any program known to the world (although there were far fewer than today).</para>
 
-<para
->Having to support ten application programs and a dozen printers, meant a system administrator had to deal with 120 drivers. So the development of unified interfaces between programs and printers became an urgent need.</para>
+<para>Having to support ten application programs and a dozen printers, meant a system administrator had to deal with 120 drivers. So the development of unified interfaces between programs and printers became an urgent need.</para>
 
-<para
->The appearance of <quote
->Page Description Languages</quote
->, describing the graphical representation of ink and toner on sheets of paper (or other output devices, like monitors, photo typesetters, &etc;) in a common way, was a move that filled a big gap. </para>
+<para>The appearance of <quote>Page Description Languages</quote>, describing the graphical representation of ink and toner on sheets of paper (or other output devices, like monitors, photo typesetters, &etc;) in a common way, was a move that filled a big gap. </para>
 
-<para
->One such development was &PostScript; by Adobe. It meant that an application programmer could concentrate on making his program generate a &PostScript; language description of his printable page, while printing device developers could focus on making their devices &PostScript; literate.</para>
+<para>One such development was &PostScript; by Adobe. It meant that an application programmer could concentrate on making his program generate a &PostScript; language description of his printable page, while printing device developers could focus on making their devices &PostScript; literate.</para>
 
-<para
->Of course, over time, there came the development of other description methods. The most important competitors to &PostScript; were <acronym
->PCL</acronym
-> (<quote
->Print Control Language</quote
->, from &Hewlett-Packard;), <quote
->ESC/P</quote
-> (from Epson) and <acronym
->GDI</acronym
-> (<quote
->Graphical Device Interface</quote
-> from &Microsoft;).</para>
+<para>Of course, over time, there came the development of other description methods. The most important competitors to &PostScript; were <acronym>PCL</acronym> (<quote>Print Control Language</quote>, from &Hewlett-Packard;), <quote>ESC/P</quote> (from Epson) and <acronym>GDI</acronym> (<quote>Graphical Device Interface</quote> from &Microsoft;).</para>
 
-<para
->The appearance of these page description languages made life easier, and facilitated further development for everybody. Yet the fact that there still remained different, incompatible, and competing page description languages keeps life for users, administrators, developers and manufacturers difficult enough.</para>
+<para>The appearance of these page description languages made life easier, and facilitated further development for everybody. Yet the fact that there still remained different, incompatible, and competing page description languages keeps life for users, administrators, developers and manufacturers difficult enough.</para>
 
 <sect2>
-<title
->&PostScript; in memory - Bitmaps on Paper</title>
+<title>&PostScript; in memory - Bitmaps on Paper</title>
 
-<para
->&PostScript; is most heavily used in professional printing environments such as PrePress and printing service industries. In the &UNIX; and &Linux; domains, &PostScript; is the predominant standard as a <acronym
->PDL</acronym
->. Here, nearly every program generates a &PostScript; representation of its pages once you push the <quote
->Print</quote
-> button. Let us look at a simple example of (hand-made) &PostScript; code. The following listing describes two simple drawings:</para>
+<para>&PostScript; is most heavily used in professional printing environments such as PrePress and printing service industries. In the &UNIX; and &Linux; domains, &PostScript; is the predominant standard as a <acronym>PDL</acronym>. Here, nearly every program generates a &PostScript; representation of its pages once you push the <quote>Print</quote> button. Let us look at a simple example of (hand-made) &PostScript; code. The following listing describes two simple drawings:</para>
 
 <example id="coded-postscript">
-<title
->&PostScript; Code</title>
-<screen
->%!PS
+<title>&PostScript; Code</title>
+<screen>%!PS
 100 100 moveto
 0 50 rlineto
 50 0 rlineto
@@ -85,193 +46,98 @@ closepath
 .2 setgray fill</screen>
 </example>
 
-<para
->This tells the imaginary &PostScript; <quote
->pen</quote
-> to draw a path of a certain shape, and then fill it with different shades of grey. The first part translates into more comprehensive English as <quote
->Go to coordinate (100,100), draw a line with length 50 upward; then one from there to the right, then down again, and finally close this part. Now fill the drawn shape with 70% darkness grey.</quote
-></para>
+<para>This tells the imaginary &PostScript; <quote>pen</quote> to draw a path of a certain shape, and then fill it with different shades of grey. The first part translates into more comprehensive English as <quote>Go to coordinate (100,100), draw a line with length 50 upward; then one from there to the right, then down again, and finally close this part. Now fill the drawn shape with 70% darkness grey.</quote></para>
 
 <example id="rendered-postscript">
-<title
->Rendered &PostScript;</title>
+<title>Rendered &PostScript;</title>
 <mediaobject>
 <imageobject>
 <imagedata fileref="ps-boxes.png" format="PNG"/>
 </imageobject>
 <textobject>
-<phrase
-><xref linkend="coded-postscript"/> example rendered as an image.</phrase>
+<phrase><xref linkend="coded-postscript"/> example rendered as an image.</phrase>
 </textobject>
 </mediaobject>
 </example>
 
-<para
->Of course, &PostScript; can be much more complicated than this simplistic example. It is a fully fledged programming language with many different operators and functions. You may even write &PostScript; programs to compute the value of Pi, format a hard disk or write to a file. The main value and strength of &PostScript; however lies in the field to describe the layout of graphical objects on a page: it also can scale, mirror, translate, transform, rotate and distort everything you can imagine on a piece of paper -- such as letters in different font representations, figures, shapes, shades, colours, lines, dots, raster...</para>
+<para>Of course, &PostScript; can be much more complicated than this simplistic example. It is a fully fledged programming language with many different operators and functions. You may even write &PostScript; programs to compute the value of Pi, format a hard disk or write to a file. The main value and strength of &PostScript; however lies in the field to describe the layout of graphical objects on a page: it also can scale, mirror, translate, transform, rotate and distort everything you can imagine on a piece of paper -- such as letters in different font representations, figures, shapes, shades, colours, lines, dots, raster...</para>
 
-<para
->A &PostScript; file is a representation of one or more pages to be printed, in a relatively abstract way. Ideally, it is meant to describe the pages in a device-independent way. &PostScript; is not directly <quote
->visible</quote
->; it only lives on hard disks and in <acronym
->RAM</acronym
-> as a coded representation of future printouts.</para>
+<para>A &PostScript; file is a representation of one or more pages to be printed, in a relatively abstract way. Ideally, it is meant to describe the pages in a device-independent way. &PostScript; is not directly <quote>visible</quote>; it only lives on hard disks and in <acronym>RAM</acronym> as a coded representation of future printouts.</para>
 
 </sect2>
 
 <sect2>
-<title
->Raster Images on Paper Sheets</title>
-
-<para
->What you see on a piece of paper is nearly always a <quote
->raster image</quote
->. Even if your brain suggests to you that your eyes see a line: take a good magnifying glass and you will discover lots of small dots... (One example to the contrary are lines that have been drawn by <quote
->pen plotters</quote
->). And that is the only thing that the <quote
->marking engines</quote
-> of today's printers can put on paper: simple dots of different colours, size and resolution, to make up a complete <quote
->page image</quote
-> composed of different bitmap patterns.</para>
-
-<para
->Different printers need the raster image prepared in different ways. Thinking about an inkjet device: depending on its resolution, the number of inks used (the very good ones need 7 different inks, while cheaper ones might only use 3), the number of available jets (some print heads have more than 100!) dispensing ink simultaneously, the <quote
->dithering algorithm</quote
-> used, and many other things, the final raster format and transfer order to the marking engine is heavily dependent on the exact model used.</para>
-
-<para
->Back in the early life of the <quote
->Line Printer Daemon</quote
->, printers were machines that hammered rows of <acronym
->ASCII</acronym
-> text mechanically on to long media, folded as a zig-zag paper <acronym
->snake</acronym
->, drawn from a cardboard box beneath the table... What a difference from today!</para>
+<title>Raster Images on Paper Sheets</title>
+
+<para>What you see on a piece of paper is nearly always a <quote>raster image</quote>. Even if your brain suggests to you that your eyes see a line: take a good magnifying glass and you will discover lots of small dots... (One example to the contrary are lines that have been drawn by <quote>pen plotters</quote>). And that is the only thing that the <quote>marking engines</quote> of today's printers can put on paper: simple dots of different colours, size and resolution, to make up a complete <quote>page image</quote> composed of different bitmap patterns.</para>
+
+<para>Different printers need the raster image prepared in different ways. Thinking about an inkjet device: depending on its resolution, the number of inks used (the very good ones need 7 different inks, while cheaper ones might only use 3), the number of available jets (some print heads have more than 100!) dispensing ink simultaneously, the <quote>dithering algorithm</quote> used, and many other things, the final raster format and transfer order to the marking engine is heavily dependent on the exact model used.</para>
+
+<para>Back in the early life of the <quote>Line Printer Daemon</quote>, printers were machines that hammered rows of <acronym>ASCII</acronym> text mechanically on to long media, folded as a zig-zag paper <acronym>snake</acronym>, drawn from a cardboard box beneath the table... What a difference from today!</para>
 
 </sect2>
 
 
 <sect2>
-<title
-><acronym
->RIP</acronym
->: From &PostScript; to Raster</title>
-
-<para
->Before the final raster images are put on paper cut-sheets, they have to be calculated somehow out of their abstract &PostScript; representation. This is a very computing-intensive process. It is called the <quote
->Raster Imaging Process</quote
->, more commonly <quote
-><acronym
->RIP</acronym
-></quote
->).</para>
-
-<para
->With &PostScript; printers the <acronym
->RIP</acronym
->-ping is taken care of by the device itself. You just send the &PostScript; file to it. The <quote
->Raster Imaging Processor</quote
-> (also called the <acronym
->RIP</acronym
->) inside the printer is responsible (and specialized) to fulfill quite well this task of interpreting the &PostScript;-page descriptions and put the raster image on paper.</para>
-
-<para
->Smaller &PostScript; devices have a hardware-<acronym
->RIP</acronym
-> built in; it is etched in silicon, on a special chip. Big professional printers often have their <acronym
->RIP</acronym
-> implemented as a software-<acronym
->RIP</acronym
-> inside a dedicated fast &UNIX; run computer, often a Sun SPARC Solaris or a &SGI; &IRIX; machine.</para>
+<title><acronym>RIP</acronym>: From &PostScript; to Raster</title>
+
+<para>Before the final raster images are put on paper cut-sheets, they have to be calculated somehow out of their abstract &PostScript; representation. This is a very computing-intensive process. It is called the <quote>Raster Imaging Process</quote>, more commonly <quote><acronym>RIP</acronym></quote>).</para>
+
+<para>With &PostScript; printers the <acronym>RIP</acronym>-ping is taken care of by the device itself. You just send the &PostScript; file to it. The <quote>Raster Imaging Processor</quote> (also called the <acronym>RIP</acronym>) inside the printer is responsible (and specialized) to fulfill quite well this task of interpreting the &PostScript;-page descriptions and put the raster image on paper.</para>
+
+<para>Smaller &PostScript; devices have a hardware-<acronym>RIP</acronym> built in; it is etched in silicon, on a special chip. Big professional printers often have their <acronym>RIP</acronym> implemented as a software-<acronym>RIP</acronym> inside a dedicated fast &UNIX; run computer, often a Sun SPARC Solaris or a &SGI; &IRIX; machine.</para>
 
 </sect2>
 
 <sect2>
-<title
-><application
->Ghostscript</application
-> as a Software <acronym
->RIP</acronym
-></title>
+<title><application>Ghostscript</application> as a Software <acronym>RIP</acronym></title>
 
-<para
->But what happens, if you are not lucky enough to have a &PostScript; printer available?</para>
+<para>But what happens, if you are not lucky enough to have a &PostScript; printer available?</para>
 
-<para
->You need to do the <acronym
->RIP</acronym
->-ing before you send the print data to the marking engine. You need to digest the &PostScript; generated by your application on the host machine (the print client) itself. You need to know how the exact raster format of the target printer's marking engine must be composed.</para>
+<para>You need to do the <acronym>RIP</acronym>-ing before you send the print data to the marking engine. You need to digest the &PostScript; generated by your application on the host machine (the print client) itself. You need to know how the exact raster format of the target printer's marking engine must be composed.</para>
 
-<para
->In other words, as you can't rely on the printer to understand and interpret the &PostScript; itself, the issue becomes quite a bit more complicated. You need software that tries to solve for you the issues involved.</para>
+<para>In other words, as you can't rely on the printer to understand and interpret the &PostScript; itself, the issue becomes quite a bit more complicated. You need software that tries to solve for you the issues involved.</para>
 
-<para
->This is exactly what the omnipresent &ghostscript; package is doing for many &Linux;, *BSD and other &UNIX; boxes that need to print to non-&PostScript; printers: &ghostscript; is a &PostScript; interpreter, a software <acronym
->RIP</acronym
-> capable of running many different devices.</para>
+<para>This is exactly what the omnipresent &ghostscript; package is doing for many &Linux;, *BSD and other &UNIX; boxes that need to print to non-&PostScript; printers: &ghostscript; is a &PostScript; interpreter, a software <acronym>RIP</acronym> capable of running many different devices.</para>
 
 </sect2>
 
 <sect2>
-<title
-><quote
->Drivers</quote
-> and <quote
->Filters</quote
-> in General</title>
-
-<para
->To produce rasterised bitmaps from &PostScript; input, the concept of <quote
->filters</quote
-> is used by &ghostscript;. There are many different filters in &ghostscript;, some of them specialised for a certain model of printer. &ghostscript; filterspecializedin devices have often been developed without the consent or support of the manufacturer concerned. Without access to the specifications and documentation, it was a very painstaking process to reverse engineer protocols and data formats.</para>
-
-<para
->Not all &ghostscript; filters work equally well for their printers. Yet, some of the newer ones, like the <application
->stp</application
-> Filter of the <application
->Gimp</application
-> Print project, produce excellent results leading to photographic quality on a par or even superior to their &Microsoft; &Windows; driver counterparts.</para>
-
-<para
->&PostScript; is what most application programs produce for printing in &UNIX; and &Linux;. Filters are the true workhorses of any printing system there. Essentially they produce the right bitmaps from any &PostScript; input for non-&PostScript; target engines.</para>
+<title><quote>Drivers</quote> and <quote>Filters</quote> in General</title>
+
+<para>To produce rasterised bitmaps from &PostScript; input, the concept of <quote>filters</quote> is used by &ghostscript;. There are many different filters in &ghostscript;, some of them specialised for a certain model of printer. &ghostscript; filterspecializedin devices have often been developed without the consent or support of the manufacturer concerned. Without access to the specifications and documentation, it was a very painstaking process to reverse engineer protocols and data formats.</para>
+
+<para>Not all &ghostscript; filters work equally well for their printers. Yet, some of the newer ones, like the <application>stp</application> Filter of the <application>Gimp</application> Print project, produce excellent results leading to photographic quality on a par or even superior to their &Microsoft; &Windows; driver counterparts.</para>
+
+<para>&PostScript; is what most application programs produce for printing in &UNIX; and &Linux;. Filters are the true workhorses of any printing system there. Essentially they produce the right bitmaps from any &PostScript; input for non-&PostScript; target engines.</para>
 
 </sect2>
 
 <sect2>
-<title
->Drivers and Filters and Backends in CUPS</title>
+<title>Drivers and Filters and Backends in CUPS</title>
 
-<para
->&CUPS; uses its own filters, though the filtering system is based on Ghostscript. Namely the pstoraster and the imagetoraster filters are directly derived from Ghostscript code. &CUPS; has reorganised and streamlined the whole mechanics of this legacy code and organised it into a few clear and distinct modules.</para>
+<para>&CUPS; uses its own filters, though the filtering system is based on Ghostscript. Namely the pstoraster and the imagetoraster filters are directly derived from Ghostscript code. &CUPS; has reorganised and streamlined the whole mechanics of this legacy code and organised it into a few clear and distinct modules.</para>
 
-<para
->This next drawing (done with the help of &kivio;) gives an overview of the filters and backends inside &CUPS; and how they fit together. The <quote
->flow</quote
-> is from top to bottom. Backends are special filters: they don't convert date to a different format, but they send the ready files to the printer. There are different backends for different transfer protocols.</para>
+<para>This next drawing (done with the help of &kivio;) gives an overview of the filters and backends inside &CUPS; and how they fit together. The <quote>flow</quote> is from top to bottom. Backends are special filters: they don't convert date to a different format, but they send the ready files to the printer. There are different backends for different transfer protocols.</para>
 
 <screenshot id="architecture-diagram">
-<screeninfo
->&kprinter; dialogue started (&kivio; draft drawing) </screeninfo>
+<screeninfo>&kprinter; dialogue started (&kivio; draft drawing) </screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cups-filterarchitecture-kivio-70Percent-scaled.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase
->&kprinter; dialogue started (&kivio; draft drawing)</phrase
-></textobject>
+<phrase>&kprinter; dialogue started (&kivio; draft drawing)</phrase></textobject>
 </mediaobject>
 </screenshot>
 
 </sect2>
 <sect2>
-<title
->Spoolers and Printing Daemons</title>
+<title>Spoolers and Printing Daemons</title>
 
-<para
->Besides the heavy part of the filtering task to generate a print-ready bitmap, any printing software needs to use a SPOOLing mechanism: this is to line up different jobs from different users for different printers and different filters and send them accordingly to the destinations. The printing daemon takes care of all this.</para>
+<para>Besides the heavy part of the filtering task to generate a print-ready bitmap, any printing software needs to use a SPOOLing mechanism: this is to line up different jobs from different users for different printers and different filters and send them accordingly to the destinations. The printing daemon takes care of all this.</para>
 
-<para
->This daemon is keeping the house in order: it is also responsible for the job control: users should be allowed to cancel, stop, restart, &etc; their jobs (but not other peoples's jobs) and so on.</para>
+<para>This daemon is keeping the house in order: it is also responsible for the job control: users should be allowed to cancel, stop, restart, &etc; their jobs (but not other peoples's jobs) and so on.</para>
 
 </sect2>
 
@@ -280,258 +146,117 @@ format="PNG"/></imageobject>
 
 
 <sect1 id="cups-and-ppd">
-<title
->Excursion: How <quote
->CUPS</quote
-> uses the power of &PPD;s</title>
-
-<para
->Now that you know how a &PostScript; language file (which describes the page layout in a largely device independent way) is transformed into a Raster Image, you might ask: <quote
->Well, there are different kinds of raster output devices: first they differ in their resolution; then there are the different paper sizes; it goes on with many finishing options (duplex prints, pamphlets, punched and stapled output with different sheets of coloured paper being drawn from different trays, &etc;). How does this fit into our model of device-independent &PostScript;?</quote
-></para>
-
-<para
->The answer comes with so called &PostScript; Printer Description (&PPD; files. A &PPD; describes all the device dependent features which can be utilised by a certain printer model. It also contains the coded commands that must be used to call certain features of the device. But &PPD;s are not a closed book, they are simple <acronym
->ASCII</acronym
-> text files.</para>
-
-<para
->&PPD;s were <quote
->invented</quote
-> by Adobe to make it easy for manufacturers to implement their own features into &PostScript; printers, and at the same time retain a standard way of doing so. &PPD;s are well documented and described by Adobe. Their specification is a de-facto open standard.</para>
+<title>Excursion: How <quote>CUPS</quote> uses the power of &PPD;s</title>
+
+<para>Now that you know how a &PostScript; language file (which describes the page layout in a largely device independent way) is transformed into a Raster Image, you might ask: <quote>Well, there are different kinds of raster output devices: first they differ in their resolution; then there are the different paper sizes; it goes on with many finishing options (duplex prints, pamphlets, punched and stapled output with different sheets of coloured paper being drawn from different trays, &etc;). How does this fit into our model of device-independent &PostScript;?</quote></para>
+
+<para>The answer comes with so called &PostScript; Printer Description (&PPD; files. A &PPD; describes all the device dependent features which can be utilised by a certain printer model. It also contains the coded commands that must be used to call certain features of the device. But &PPD;s are not a closed book, they are simple <acronym>ASCII</acronym> text files.</para>
+
+<para>&PPD;s were <quote>invented</quote> by Adobe to make it easy for manufacturers to implement their own features into &PostScript; printers, and at the same time retain a standard way of doing so. &PPD;s are well documented and described by Adobe. Their specification is a de-facto open standard.</para>
 
 <sect2 id="ppd-files">
-<title
->Device Dependent Print Options</title>
+<title>Device Dependent Print Options</title>
 
-<para
->Remember, advanced &PostScript; printing was originally only developed for use on &Microsoft; &Windows; and Apple &Mac; systems. For a long time, all of the feature rich printing on modern devices was simply unavailable for &Linux; and &UNIX;. &CUPS; changes this decisively. &CUPS; is closely tied with &PPD;s, and therefore existing &PPD;s can be utilised to the full by all systems powered by &CUPS;.</para>
+<para>Remember, advanced &PostScript; printing was originally only developed for use on &Microsoft; &Windows; and Apple &Mac; systems. For a long time, all of the feature rich printing on modern devices was simply unavailable for &Linux; and &UNIX;. &CUPS; changes this decisively. &CUPS; is closely tied with &PPD;s, and therefore existing &PPD;s can be utilised to the full by all systems powered by &CUPS;.</para>
 
-<para
->Using &PPD;s, printer manufacturers were able to insert device-specific hardware features into their products, for features such as duplexing, stapling, punching, finishing, &etc;. The printer drivers load this &PPD; just like an additional configuration file. Thus the printer driver learns about the available device options and how to call them; the driver also presents them in a &GUI; to the user. Through this mechanism you are still able to print <quote
->device-independent</quote
-> &PostScript; page description language files and specify device-dependent finishing options on top, which are added to the application-generated &PostScript;.</para>
+<para>Using &PPD;s, printer manufacturers were able to insert device-specific hardware features into their products, for features such as duplexing, stapling, punching, finishing, &etc;. The printer drivers load this &PPD; just like an additional configuration file. Thus the printer driver learns about the available device options and how to call them; the driver also presents them in a &GUI; to the user. Through this mechanism you are still able to print <quote>device-independent</quote> &PostScript; page description language files and specify device-dependent finishing options on top, which are added to the application-generated &PostScript;.</para>
 
 </sect2>
 
 <sect2>
-<title
->Where to get the &PPD;s for &PostScript; Printers</title>
+<title>Where to get the &PPD;s for &PostScript; Printers</title>
 
-<para
->&PPD;s originally were not used routinely in &UNIX; and &Linux; systems. The vendors providing those &PPD;s never intended them for anything other than the originally supported &OS;s: &Microsoft; &Windows; and &MacOS;. Through its brilliant move to fully support and utilise the existing &PPD; specification, &CUPS; now gives the power to use all features of modern printers to users of &Linux; and &Linux;-like systems. &tdeprint; makes its usage even more comfortable than the &CUPS; developers ever dreamed of.</para>
+<para>&PPD;s originally were not used routinely in &UNIX; and &Linux; systems. The vendors providing those &PPD;s never intended them for anything other than the originally supported &OS;s: &Microsoft; &Windows; and &MacOS;. Through its brilliant move to fully support and utilise the existing &PPD; specification, &CUPS; now gives the power to use all features of modern printers to users of &Linux; and &Linux;-like systems. &tdeprint; makes its usage even more comfortable than the &CUPS; developers ever dreamed of.</para>
 
-<para
->&CUPS; can use original &Windows; &PPD;s, distributed by the vendors in the case of &PostScript; printers. Those normally don't cost any money, and they can be grabbed from any &Windows; computer with an installed &PostScript; driver for the model concerned, or from the disks provided with the printer. There are also several places on the web to download them.</para>
+<para>&CUPS; can use original &Windows; &PPD;s, distributed by the vendors in the case of &PostScript; printers. Those normally don't cost any money, and they can be grabbed from any &Windows; computer with an installed &PostScript; driver for the model concerned, or from the disks provided with the printer. There are also several places on the web to download them.</para>
 
 </sect2>
 
 <sect2>
-<title
->How Special &PPD;s are Now Useful Even For Non-&PostScript; Printers.</title>
+<title>How Special &PPD;s are Now Useful Even For Non-&PostScript; Printers.</title>
 
-<para
->Now you know how &PostScript;-Printers can use &PPD;s. But what about non-&PostScript; printers? &CUPS; has done a very good trick: by using the same format and data structure as the &PostScript; Printer Descriptions (&PPD;s) in the &PostScript; world, it can describe the available print job options for non-&PostScript; printers just the same. For its own special purposes &CUPS; just added a few special options (namely the line which defines the filter to be used for further processing of the &PostScript; file).</para>
+<para>Now you know how &PostScript;-Printers can use &PPD;s. But what about non-&PostScript; printers? &CUPS; has done a very good trick: by using the same format and data structure as the &PostScript; Printer Descriptions (&PPD;s) in the &PostScript; world, it can describe the available print job options for non-&PostScript; printers just the same. For its own special purposes &CUPS; just added a few special options (namely the line which defines the filter to be used for further processing of the &PostScript; file).</para>
 
-<para
->So, the developers could use the same software engine to parse the Printer Description Files for available options for all sorts of printers. Of course the &CUPS; developers could not rely on the non-&PostScript; hardware manufacturers to suddenly develop &PPD;s. They had to do the difficult start themselves and write them from scratch. More than 1000 of these are available through the commercial version of &CUPS;, called <application
->ESP PrintPro</application
->.</para>
+<para>So, the developers could use the same software engine to parse the Printer Description Files for available options for all sorts of printers. Of course the &CUPS; developers could not rely on the non-&PostScript; hardware manufacturers to suddenly develop &PPD;s. They had to do the difficult start themselves and write them from scratch. More than 1000 of these are available through the commercial version of &CUPS;, called <application>ESP PrintPro</application>.</para>
 
-<para
->Meanwhile there are a lot of &CUPS;-specific &PPD;s available. Even now those are in most cases not originating from the printer manufacturers, but from Free software developers. The &CUPS; folks proofed it, and others followed suit: where &Linux; and &UNIX; printing one or two years ago still was a kludge, it is now able to support a big range of printers, including 7-colour inkjets capable of pushing them to Photo Quality output.</para>
+<para>Meanwhile there are a lot of &CUPS;-specific &PPD;s available. Even now those are in most cases not originating from the printer manufacturers, but from Free software developers. The &CUPS; folks proofed it, and others followed suit: where &Linux; and &UNIX; printing one or two years ago still was a kludge, it is now able to support a big range of printers, including 7-colour inkjets capable of pushing them to Photo Quality output.</para>
 
 </sect2>
 
 <sect2>
-<title
->Different Ways to get &PPD;s for non-&PostScript; Printers</title>
+<title>Different Ways to get &PPD;s for non-&PostScript; Printers</title>
 
-<para
->You can get &PPD;s to be used with &CUPS; and non-&PostScript; printers from different areas in the Web:</para>
+<para>You can get &PPD;s to be used with &CUPS; and non-&PostScript; printers from different areas in the Web:</para>
 
 <itemizedlist>
 <listitem>
-<para
->first, there is the repository at <ulink url="http://www.linuxprinting.org"
->www.linuxprinting.org</ulink
->, which lets you generate a <quote
->CUPS-O-Matic</quote
->-&PPD; online for any printer that had been supported by traditional &ghostscript; printing already. This helps you to switch over to &CUPS; with little effort, if you wish so. If your printer was doing well with the traditional way of &ghostscript; printing, take CUPS-O-Matic to plug your driver into the &CUPS; system and you'll have the best of both worlds.</para>
+<para>first, there is the repository at <ulink url="http://www.linuxprinting.org">www.linuxprinting.org</ulink>, which lets you generate a <quote>CUPS-O-Matic</quote>-&PPD; online for any printer that had been supported by traditional &ghostscript; printing already. This helps you to switch over to &CUPS; with little effort, if you wish so. If your printer was doing well with the traditional way of &ghostscript; printing, take CUPS-O-Matic to plug your driver into the &CUPS; system and you'll have the best of both worlds.</para>
 </listitem>
 
 <listitem>
-<para
->second, there are &CUPS;-&PPD;s for the more than 120 printer models, which are driven by the new universal <application
->stp</application
-> driver. <application
->stp</application
-> (stood originally for Stylus Photo) is now developed by the gimp-print project; it was started by Mike Sweet, the leading &CUPS; developer and is now available through <ulink url="http://gimp-print.sourceforge.net"
->gimp-print.sourceforge.net</ulink
->. This driver prints real Photo quality on many modern inkjets and can be configured to make 120 &CUPS;-&PPD;s along its own compilation. &HP; Laser- and DeskJet, <trademark class="registered"
->Epson</trademark
-> Stylus and Photo Colour models as well as some <trademark class="registered"
->Canon</trademark
-> and <trademark class="registered"
->Lexmark</trademark
-> are covered.</para>
+<para>second, there are &CUPS;-&PPD;s for the more than 120 printer models, which are driven by the new universal <application>stp</application> driver. <application>stp</application> (stood originally for Stylus Photo) is now developed by the gimp-print project; it was started by Mike Sweet, the leading &CUPS; developer and is now available through <ulink url="http://gimp-print.sourceforge.net">gimp-print.sourceforge.net</ulink>. This driver prints real Photo quality on many modern inkjets and can be configured to make 120 &CUPS;-&PPD;s along its own compilation. &HP; Laser- and DeskJet, <trademark class="registered">Epson</trademark> Stylus and Photo Colour models as well as some <trademark class="registered">Canon</trademark> and <trademark class="registered">Lexmark</trademark> are covered.</para>
 </listitem>
 
 <listitem>
-<para
->third, there is the commercial extension to &CUPS; from the &CUPS; developers themselves: it is called <application
->ESP PrintPro</application
-> and comes with more than 2.300 printer drivers. There are even improved imagetoraster and pstoraster filters included.</para>
+<para>third, there is the commercial extension to &CUPS; from the &CUPS; developers themselves: it is called <application>ESP PrintPro</application> and comes with more than 2.300 printer drivers. There are even improved imagetoraster and pstoraster filters included.</para>
 </listitem>
 </itemizedlist>
 
-<para
->&CUPS; makes it really easy for manufacturers to start supporting &Linux; and &UNIX; printing for their models at reasonably low cost. The modular framework of &CUPS; facilitates to plug in any filter (=driver) with minimal effort and to access and utilise the whole printing framework that &CUPS; is creating.</para>
+<para>&CUPS; makes it really easy for manufacturers to start supporting &Linux; and &UNIX; printing for their models at reasonably low cost. The modular framework of &CUPS; facilitates to plug in any filter (=driver) with minimal effort and to access and utilise the whole printing framework that &CUPS; is creating.</para>
 
-<para
->Read more about the exciting &CUPS; features in the available &CUPS; documentation at <ulink url="http://www.cups.org/documentation.html"
->http://www.cups.org/documentation.html</ulink
-> and <ulink url="http://wwww.danka.de/printpro/faq.html"
->http://www.danka.de/printpro/faq.html</ulink
->. Also at <ulink url="http://www.linuxprinting.org"
->http://www.linuxprinting.org/</ulink
-> is a universal repository for all issues related to &Linux; and &UNIX; printing.</para>
+<para>Read more about the exciting &CUPS; features in the available &CUPS; documentation at <ulink url="http://www.cups.org/documentation.html">http://www.cups.org/documentation.html</ulink> and <ulink url="http://wwww.danka.de/printpro/faq.html">http://www.danka.de/printpro/faq.html</ulink>. Also at <ulink url="http://www.linuxprinting.org">http://www.linuxprinting.org/</ulink> is a universal repository for all issues related to &Linux; and &UNIX; printing.</para>
 
 </sect2>
 
 </sect1>
 
 <sect1 id="cups-ipp-support">
-<title
->How &IPP; Support Makes &CUPS; the Best Choice Around</title>
+<title>How &IPP; Support Makes &CUPS; the Best Choice Around</title>
 
 <sect2>
-<title
-><quote
-><acronym
->LPD</acronym
-> Must Die!</quote
-></title>
-
-<para
->For a long time many developers were deeply dissatisfied with good old <acronym
->LPD</acronym
->. Quite a few new projects were started to improve printing: <application
->LPRng</application
-> is the best known example. Others are <acronym
->PDQ</acronym
->, <acronym
->PPR</acronym
->, <acronym
->PLP</acronym
->, <acronym
->GNUlpr</acronym
-> and <acronym
->RLPR</acronym
->. But none of the new programs were seen as a <quote
->big shot</quote
->; most of them are just implementing the same old <acronym
->LPD</acronym
-> specification with a few (or many) new extensions, which again make them incompatible with each other.</para>
-
-<para
->Having seen the development of not just one, but different viable alternatives to venerable <acronym
->BSD</acronym
->-style <acronym
->LPD</acronym
->, Grant Taylor, author of the <citetitle
->Linux Printing HOWTO</citetitle
->, finally rallied the call <citetitle
->LPD Must Die!</citetitle
-> in his <quote
->Campaign To Abolish The Line Printer Daemon</quote
->.</para>
+<title><quote><acronym>LPD</acronym> Must Die!</quote></title>
+
+<para>For a long time many developers were deeply dissatisfied with good old <acronym>LPD</acronym>. Quite a few new projects were started to improve printing: <application>LPRng</application> is the best known example. Others are <acronym>PDQ</acronym>, <acronym>PPR</acronym>, <acronym>PLP</acronym>, <acronym>GNUlpr</acronym> and <acronym>RLPR</acronym>. But none of the new programs were seen as a <quote>big shot</quote>; most of them are just implementing the same old <acronym>LPD</acronym> specification with a few (or many) new extensions, which again make them incompatible with each other.</para>
+
+<para>Having seen the development of not just one, but different viable alternatives to venerable <acronym>BSD</acronym>-style <acronym>LPD</acronym>, Grant Taylor, author of the <citetitle>Linux Printing HOWTO</citetitle>, finally rallied the call <citetitle>LPD Must Die!</citetitle> in his <quote>Campaign To Abolish The Line Printer Daemon</quote>.</para>
 
 <!-- FIXME: look up URLs for the above -->
 
 </sect2>
 
 <sect2>
-<title
->How the &IPP; Came to Be</title>
-
-<para
->Along with the above, on the industry side of things, there were efforts to overcome the well-known weaknesses of <acronym
->LPD</acronym
->. It started with proprietary extensions to plain old <acronym
->LPD</acronym
->, and stretched as far as &Hewlett-Packard;'s attempt to establish &HP; JetDirect as a new standard for a network printing protocol. The result were even more incompatibilities.</para>
-
-<para
->In the end, an initiative to define a new common industry and <acronym
->IETF</acronym
-> standard took shape. The <quote
->Printer Working Group</quote
-> or <acronym
->PWG</acronym
->, a loose aggregation of vendors in hardware, software, and operating systems, drafted the new <quote
->Internet Printing Protocol</quote
->, &IPP;. &IPP; v1.1 has now been approved by the <acronym
->IETF</acronym
-> (Internet Engineering Task Force) as a proposed standard, and now enjoys the unanimous support throughout the industry in Europe, USA and Japan. Most current network printer models have now built in &IPP; support on top of traditional <acronym
->LPR</acronym
->/<acronym
->LPD</acronym
-> or JetDirect Printing.</para>
+<title>How the &IPP; Came to Be</title>
+
+<para>Along with the above, on the industry side of things, there were efforts to overcome the well-known weaknesses of <acronym>LPD</acronym>. It started with proprietary extensions to plain old <acronym>LPD</acronym>, and stretched as far as &Hewlett-Packard;'s attempt to establish &HP; JetDirect as a new standard for a network printing protocol. The result were even more incompatibilities.</para>
+
+<para>In the end, an initiative to define a new common industry and <acronym>IETF</acronym> standard took shape. The <quote>Printer Working Group</quote> or <acronym>PWG</acronym>, a loose aggregation of vendors in hardware, software, and operating systems, drafted the new <quote>Internet Printing Protocol</quote>, &IPP;. &IPP; v1.1 has now been approved by the <acronym>IETF</acronym> (Internet Engineering Task Force) as a proposed standard, and now enjoys the unanimous support throughout the industry in Europe, USA and Japan. Most current network printer models have now built in &IPP; support on top of traditional <acronym>LPR</acronym>/<acronym>LPD</acronym> or JetDirect Printing.</para>
 
 </sect2>
 
 <sect2>
-<title
->Why &IPP; is Solving Many Problems</title>
+<title>Why &IPP; is Solving Many Problems</title>
 
-<para
->&IPP; promises to solve a lot of problems network administrators face. This trade normally deals with heterogeneous network environments and spends more than half of its working hours dealing with printing problems.</para>
+<para>&IPP; promises to solve a lot of problems network administrators face. This trade normally deals with heterogeneous network environments and spends more than half of its working hours dealing with printing problems.</para>
 
-<para
->By creating a unified set of query functions for &IPP; enabled printers and servers, for transferring files and setting job-control attributes &etc;, &IPP; is destined to work across all &OS; platforms. It's rollout however, will not happen overnight, as many legacy print devices will still be in use for many years to come. Therefore, in &IPP; there is a provision made for backwards compatibility of all &IPP; implementations. &CUPS; is proving the viability of &IPP; printing in all environments.</para>
+<para>By creating a unified set of query functions for &IPP; enabled printers and servers, for transferring files and setting job-control attributes &etc;, &IPP; is destined to work across all &OS; platforms. It's rollout however, will not happen overnight, as many legacy print devices will still be in use for many years to come. Therefore, in &IPP; there is a provision made for backwards compatibility of all &IPP; implementations. &CUPS; is proving the viability of &IPP; printing in all environments.</para>
 
-<para
->The most striking advantage will be it's integration into the existing set of other robust <acronym
->IP</acronym
-> protocols. Being an extension of the proven and robust <acronym
->HTTP</acronym
-> 1.1 protocol, for the special task of handling print file and related data, it is also very easy to plug in other standards as they are being developed and deployed:</para>
+<para>The most striking advantage will be it's integration into the existing set of other robust <acronym>IP</acronym> protocols. Being an extension of the proven and robust <acronym>HTTP</acronym> 1.1 protocol, for the special task of handling print file and related data, it is also very easy to plug in other standards as they are being developed and deployed:</para>
 
 <itemizedlist>
 <listitem>
-<para
->Basic, Digest, and Certificate Authentication for users seeking access to print services.</para>
+<para>Basic, Digest, and Certificate Authentication for users seeking access to print services.</para>
 </listitem>
 <listitem>
-<para
->SSL3 and <acronym
->TLS</acronym
-> encryption for transferring data.</para>
+<para>SSL3 and <acronym>TLS</acronym> encryption for transferring data.</para>
 </listitem>
 <listitem>
-<para
->Bi directional communication of clients with print devices, using the <acronym
->HTTP</acronym
->/&IPP; <command
->GET</command
-> and <command
->POST</command
-> mechanism.</para>
+<para>Bi directional communication of clients with print devices, using the <acronym>HTTP</acronym>/&IPP; <command>GET</command> and <command>POST</command> mechanism.</para>
 </listitem>
 <listitem>
-<para
->LDAP directory service integration to keep a consistent database of available printers, their capabilities and page-costs, &etc;, as well as user passwords, <acronym
->ACL</acronym
->s &etc;.</para>
+<para>LDAP directory service integration to keep a consistent database of available printers, their capabilities and page-costs, &etc;, as well as user passwords, <acronym>ACL</acronym>s &etc;.</para>
 </listitem>
 <listitem>
-<para
-><quote
->Pull</quote
-> (as opposed to the usual <quote
->Push</quote
-> model) printing, where a server or printer just needs to be told the &URL; of a document, whereupon it is retrieved from the resource on the internet and printed.</para>
+<para><quote>Pull</quote> (as opposed to the usual <quote>Push</quote> model) printing, where a server or printer just needs to be told the &URL; of a document, whereupon it is retrieved from the resource on the internet and printed.</para>
 </listitem>
 </itemizedlist>
 
@@ -539,147 +264,63 @@ format="PNG"/></imageobject>
 
 <!--
 <sect2>
-<title
->&CUPS;, &IPP; and &kde;</title>
+<title>&CUPS;, &IPP; and &kde;</title>
 
-<para
->&CUPS; is the most advanced implementation of &IPP; on all &OS;
+<para>&CUPS; is the most advanced implementation of &IPP; on all &OS;
 platforms.  That makes &CUPS; a crucial ally to help "conquer the
 desktop" for projects like &kde;. &tdeprint; is the best utility to
 make &CUPS; core functionality available to &kde; Desktop
 users.</para>
 
-</sect2
-> -->
+</sect2> -->
 
 <sect2>
-<title
->Printer <quote
->Plug'n'Play</quote
-> for Clients</title>
-
-<para
->Have you ever seen a demonstration about &CUPS; capabilities in the network? You must have been quite impressed if you didn't know in advance what to expect.</para>
-
-<para
->Imagine you as the administrator of a <quote
->LAN</quote
->. For testing purposes you fully installed one &kde;/&CUPS; box on your net, complete with a dozen printers configured and functional: &PostScript;, LaserJets, InkJets and BubbleJets, and so on. Your &kde; users on that box are very happy, they can print like never before, <quote
->ringing all the bells and whistles</quote
-> of every printer. It took you 2 hours to make everything run perfectly... and now all the other 100 users on the network want the same. Two hours again for every box? No way you could do that before next year, you think?</para>
-
-<para
->Wrong. Just change one setting in the original &CUPS; box to make it a <quote
->server</quote
->. Install &CUPS; on five other boxes, as <quote
->clients</quote
->. By the time you turn back to your first client, you find the users happily playing with the settings for the dozen printers you had defined earlier on the <quote
->server</quote
->. Somehow magically the printers had appeared on all the <quote
->Print</quote
-> dialogues of the five new &CUPS; client boxes.</para>
-
-<para
->Your users print, but not a single driver had been installed on the clients, nor a printer queue defined.</para>
-
-<para
->So, how does this magic work?</para>
+<title>Printer <quote>Plug'n'Play</quote> for Clients</title>
+
+<para>Have you ever seen a demonstration about &CUPS; capabilities in the network? You must have been quite impressed if you didn't know in advance what to expect.</para>
+
+<para>Imagine you as the administrator of a <quote>LAN</quote>. For testing purposes you fully installed one &kde;/&CUPS; box on your net, complete with a dozen printers configured and functional: &PostScript;, LaserJets, InkJets and BubbleJets, and so on. Your &kde; users on that box are very happy, they can print like never before, <quote>ringing all the bells and whistles</quote> of every printer. It took you 2 hours to make everything run perfectly... and now all the other 100 users on the network want the same. Two hours again for every box? No way you could do that before next year, you think?</para>
+
+<para>Wrong. Just change one setting in the original &CUPS; box to make it a <quote>server</quote>. Install &CUPS; on five other boxes, as <quote>clients</quote>. By the time you turn back to your first client, you find the users happily playing with the settings for the dozen printers you had defined earlier on the <quote>server</quote>. Somehow magically the printers had appeared on all the <quote>Print</quote> dialogues of the five new &CUPS; client boxes.</para>
+
+<para>Your users print, but not a single driver had been installed on the clients, nor a printer queue defined.</para>
+
+<para>So, how does this magic work?</para>
 
 </sect2>
 
 <sect2>
-<title
-><quote
->Seeing</quote
-> Printers Not Installed Locally?</title>
-
-<para
->The answer is not complicated at all.</para>
-
-<para
->If a &CUPS; server is on the <acronym
->LAN</acronym
->, it broadcasts the names of all available printers to the <acronym
->LAN</acronym
->, using the <acronym
->UDP</acronym
-> protocol and port 631. Port 631 is reserved as a <quote
->well-known port</quote
-> by <acronym
->IANA</acronym
-> (the <quote
->Internet Assigning Numbers Authority</quote
->) for &IPP; purposes. All &CUPS; clients listen to &CUPS; server info sent to their port 631. That's how they know about available printers, and that's how they learn about the <quote
->path</quote
-> to the printers as well.</para>
-
-<para
->Using &IPP;, which is really a clever extension to <acronym
->HTTP</acronym
-> v1.1, &CUPS; is able to address all objects related to the printing system via <quote
->Universal Resource Locators</quote
-> or <acronym
->URL</acronym
->s. Print jobs to be deleted or restarted, printers to be queried or modified, admin tasks to be performed on the server, with &IPP; and &CUPS;, everything is addressable by a certain <acronym
->URL</acronym
->. Many important things can be done through the web interface to &CUPS;, accessible for example with &konqueror;.</para>
+<title><quote>Seeing</quote> Printers Not Installed Locally?</title>
+
+<para>The answer is not complicated at all.</para>
+
+<para>If a &CUPS; server is on the <acronym>LAN</acronym>, it broadcasts the names of all available printers to the <acronym>LAN</acronym>, using the <acronym>UDP</acronym> protocol and port 631. Port 631 is reserved as a <quote>well-known port</quote> by <acronym>IANA</acronym> (the <quote>Internet Assigning Numbers Authority</quote>) for &IPP; purposes. All &CUPS; clients listen to &CUPS; server info sent to their port 631. That's how they know about available printers, and that's how they learn about the <quote>path</quote> to the printers as well.</para>
+
+<para>Using &IPP;, which is really a clever extension to <acronym>HTTP</acronym> v1.1, &CUPS; is able to address all objects related to the printing system via <quote>Universal Resource Locators</quote> or <acronym>URL</acronym>s. Print jobs to be deleted or restarted, printers to be queried or modified, admin tasks to be performed on the server, with &IPP; and &CUPS;, everything is addressable by a certain <acronym>URL</acronym>. Many important things can be done through the web interface to &CUPS;, accessible for example with &konqueror;.</para>
 
 </sect2>
 
 <sect2>
-<title
->Printing Without Installing a Driver</title>
-
-<para
->And more, the clients basically can <quote
->administer</quote
-> and <quote
->use</quote
-> any printer they see, just as if it was a locally installed one. Of course, you can set restrictions on it with access control lists &etc;, so that not <emphasis
->any</emphasis
-> clients may use <emphasis
->any</emphasis
-> printer as it likes.</para>
-
-<para
->The clients even are able to print without the appropriate filter (or driver) installed locally.</para>
-
-<para
->So how does this work? If a client wants to know about and select printer-specific options, it sends a request (called <command
->CUPS-get-ppd</command
->) to the server. The server tells the client all about all printer-specific options, as read from the server side &PPD;. The user on the client side can see the options and select the required ones. He then sends the print file, usually unfiltered <quote
->raw</quote
-> &PostScript;, spiced up with the printer-options to the printer server, using &IPP; as the transport protocol. All further processing, especially the filtering to generate the final format for the target printer, is then done by the server. The server has the necessary programs (<quote
->drivers</quote
-> or <quote
->filters</quote
->) to do this.</para>
-
-<para
->This way a client prints without needing to install a driver locally.</para>
-
-<para
->Any change on the server, such as adding or modifying a printer, is instantly <quote
->known</quote
-> to the clients with no further configuration.</para>
+<title>Printing Without Installing a Driver</title>
+
+<para>And more, the clients basically can <quote>administer</quote> and <quote>use</quote> any printer they see, just as if it was a locally installed one. Of course, you can set restrictions on it with access control lists &etc;, so that not <emphasis>any</emphasis> clients may use <emphasis>any</emphasis> printer as it likes.</para>
+
+<para>The clients even are able to print without the appropriate filter (or driver) installed locally.</para>
+
+<para>So how does this work? If a client wants to know about and select printer-specific options, it sends a request (called <command>CUPS-get-ppd</command>) to the server. The server tells the client all about all printer-specific options, as read from the server side &PPD;. The user on the client side can see the options and select the required ones. He then sends the print file, usually unfiltered <quote>raw</quote> &PostScript;, spiced up with the printer-options to the printer server, using &IPP; as the transport protocol. All further processing, especially the filtering to generate the final format for the target printer, is then done by the server. The server has the necessary programs (<quote>drivers</quote> or <quote>filters</quote>) to do this.</para>
+
+<para>This way a client prints without needing to install a driver locally.</para>
+
+<para>Any change on the server, such as adding or modifying a printer, is instantly <quote>known</quote> to the clients with no further configuration.</para>
 
 </sect2>
 
 <sect2>
-<title
-><quote
->Zero Administration</quote
->, Load Balancing, and <quote
->Failover Switching</quote
-></title>
-
-<para
->Some other advanced features built into &CUPS; are the capacity to do <quote
->load balancing</quote
->.</para>
-
-<para
->If you define the same printer queues on two or more different servers, the clients will send their jobs to the first responding or available server. This implies an automatic load balancing amongst servers. If you have to take one server off the network for maintenance, the others will just take over its tasks without the users even noticing the difference.</para>
+<title><quote>Zero Administration</quote>, Load Balancing, and <quote>Failover Switching</quote></title>
+
+<para>Some other advanced features built into &CUPS; are the capacity to do <quote>load balancing</quote>.</para>
+
+<para>If you define the same printer queues on two or more different servers, the clients will send their jobs to the first responding or available server. This implies an automatic load balancing amongst servers. If you have to take one server off the network for maintenance, the others will just take over its tasks without the users even noticing the difference.</para>
 
 </sect2>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/tdesu/index.docbook b/tde-i18n-en_GB/docs/tdebase/tdesu/index.docbook
index 9f0be4d3b98..86ab90e1b15 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdesu/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdesu/index.docbook
@@ -4,472 +4,185 @@
   <!ENTITY kappname "&tdesu;">
   <!ENTITY package "tdebase">
   <!ENTITY % addindex "IGNORE">
-  <!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+  <!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <book lang="&language;">
 <bookinfo>
 
-<title
->The &tdesu; handbook</title>
+<title>The &tdesu; handbook</title>
 
 <authorgroup>
-<author
->&Geert.Jansen; &Geert.Jansen.mail;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Geert.Jansen; &Geert.Jansen.mail;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
 <copyright>
-<year
->2000</year>
-<holder
->&Geert.Jansen;</holder>
+<year>2000</year>
+<holder>&Geert.Jansen;</holder>
 </copyright>
 
-<legalnotice
->&FDLNotice;</legalnotice>
+<legalnotice>&FDLNotice;</legalnotice>
 
-<date
->2002-01-18</date>
-<releaseinfo
->1.00.00</releaseinfo>
+<date>2002-01-18</date>
+<releaseinfo>1.00.00</releaseinfo>
 
 
-<abstract
-><para
->&tdesu; is a graphical front end for the &UNIX; <command
->su</command
-> command.</para
-></abstract>
+<abstract><para>&tdesu; is a graphical front end for the &UNIX; <command>su</command> command.</para></abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->su</keyword>
-<keyword
->password</keyword>
-<keyword
->root</keyword>
+<keyword>KDE</keyword>
+<keyword>su</keyword>
+<keyword>password</keyword>
+<keyword>root</keyword>
 </keywordset>
 
 </bookinfo>
 
 <chapter id="introduction">
-<title
->Introduction</title>
-
-<para
->Welcome to &tdesu;! &tdesu; is a graphical front end for the &UNIX; <command
->su</command
-> command for the K Desktop Environment. It allows you to run a program as different user by supplying the password for that user. &tdesu; is an unprivileged program; it uses the system's <command
->su</command
->.</para>
-
-<para
->&tdesu; has one additional feature: it can remember passwords for you. If you are using this feature, you only need to enter the password once for each command. See <xref linkend="sec-password-keeping"/> for more information on this and a security analysis.</para>
-
-<para
->This program is meant to be started from the command line or from <filename
->.desktop</filename
-> files. Although it asks for the <systemitem class="username"
->root</systemitem
-> password using a &GUI; dialogue, I consider it to be more of a command line &lt;-&gt; &GUI; glue instead of a pure &GUI; program.</para>
+<title>Introduction</title>
+
+<para>Welcome to &tdesu;! &tdesu; is a graphical front end for the &UNIX; <command>su</command> command for the K Desktop Environment. It allows you to run a program as different user by supplying the password for that user. &tdesu; is an unprivileged program; it uses the system's <command>su</command>.</para>
+
+<para>&tdesu; has one additional feature: it can remember passwords for you. If you are using this feature, you only need to enter the password once for each command. See <xref linkend="sec-password-keeping"/> for more information on this and a security analysis.</para>
+
+<para>This program is meant to be started from the command line or from <filename>.desktop</filename> files. Although it asks for the <systemitem class="username">root</systemitem> password using a &GUI; dialogue, I consider it to be more of a command line &lt;-&gt; &GUI; glue instead of a pure &GUI; program.</para>
 
 </chapter>
 
 <chapter id="using-tdesu">
-<title
->Using &tdesu;</title>
-
-<para
->Usage of &tdesu; is easy. The syntax is like this:</para>
-
-    <cmdsynopsis
-><command
->tdesu</command
-> <arg
->USER</arg
-> <arg
->-n</arg
-> <arg
->-t</arg
-> <arg
->-q</arg
-> <arg
->-d</arg
-> <arg
->-f <replaceable
->FILE</replaceable
-></arg
-> <arg
->-c <group
-> <arg
-> <replaceable
->COMMAND</replaceable
-> <arg
-><replaceable
->ARG1</replaceable
-></arg
-> <arg
-><replaceable
->ARG2</replaceable
-></arg
-> <arg rep="repeat"
-><replaceable
-></replaceable
-></arg
-> </arg
-> </group
-> </arg
-> </cmdsynopsis>
-
-    <cmdsynopsis
-><command
->tdesu</command
-> <group
-> <arg
->-v</arg
-> <arg
->-h</arg
-> <arg
->-s</arg
-> </group
-> </cmdsynopsis>
-
-<para
->The command line options are explained below.</para>
+<title>Using &tdesu;</title>
+
+<para>Usage of &tdesu; is easy. The syntax is like this:</para>
+
+    <cmdsynopsis><command>tdesu</command> <arg>USER</arg> <arg>-n</arg> <arg>-t</arg> <arg>-q</arg> <arg>-d</arg> <arg>-f <replaceable>FILE</replaceable></arg> <arg>-c <group> <arg> <replaceable>COMMAND</replaceable> <arg><replaceable>ARG1</replaceable></arg> <arg><replaceable>ARG2</replaceable></arg> <arg rep="repeat"><replaceable></replaceable></arg> </arg> </group> </arg> </cmdsynopsis>
+
+    <cmdsynopsis><command>tdesu</command> <group> <arg>-v</arg> <arg>-h</arg> <arg>-s</arg> </group> </cmdsynopsis>
+
+<para>The command line options are explained below.</para>
 
 <variablelist>
 <varlistentry>
-<term
-><option
->-c <replaceable
->PROGRAM</replaceable
-></option
-></term>
-<listitem
-><para
->This specifies the program to run as root. It has to be passed in one argument. So if, for example, you want to start a new file manager, you would enter at the prompt: <userinput
-><command
->tdesu <option
->-c <replaceable
->kfm -sw</replaceable
-></option
-></command
-></userinput
-></para
-></listitem>
+<term><option>-c <replaceable>PROGRAM</replaceable></option></term>
+<listitem><para>This specifies the program to run as root. It has to be passed in one argument. So if, for example, you want to start a new file manager, you would enter at the prompt: <userinput><command>tdesu <option>-c <replaceable>kfm -sw</replaceable></option></command></userinput></para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><option
->-f <replaceable
->FILE</replaceable
-></option
-></term>
-<listitem
-><para
->This option allow efficient use of &tdesu; in <filename
->.desktop</filename
-> files. It tells &tdesu; to examine the file specified by <parameter
->FILE</parameter
->. If this file is writable by the current user, &tdesu; will execute the command as the current user. If it is not writable, the command is executed as user <parameter
->USER</parameter
-> (defaults to root).</para>
-<para
-><parameter
->FILE</parameter
-> is evaluated like this: if <parameter
->FILE</parameter
-> starts with a <literal
->/</literal
->, it is taken as an absolute filename. Otherwise, it is taken as the name of a global &kde; configuration file. For example: to configure the K display manager, <application
->tdm</application
->, you could issue <command
->tdesu <option
->-c tdmconfig -f tdmrc</option
-></command
-></para
-></listitem>
+<term><option>-f <replaceable>FILE</replaceable></option></term>
+<listitem><para>This option allow efficient use of &tdesu; in <filename>.desktop</filename> files. It tells &tdesu; to examine the file specified by <parameter>FILE</parameter>. If this file is writable by the current user, &tdesu; will execute the command as the current user. If it is not writable, the command is executed as user <parameter>USER</parameter> (defaults to root).</para>
+<para><parameter>FILE</parameter> is evaluated like this: if <parameter>FILE</parameter> starts with a <literal>/</literal>, it is taken as an absolute filename. Otherwise, it is taken as the name of a global &kde; configuration file. For example: to configure the K display manager, <application>tdm</application>, you could issue <command>tdesu <option>-c tdmconfig -f tdmrc</option></command></para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><option
->-t</option
-></term>
-<listitem
-><para
->Enable terminal output. This disables password keeping. This is largely for debugging purposes; if you want to run a console mode app, use the standard <command
->su</command
-> instead.</para
-> </listitem>
+<term><option>-t</option></term>
+<listitem><para>Enable terminal output. This disables password keeping. This is largely for debugging purposes; if you want to run a console mode app, use the standard <command>su</command> instead.</para> </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><option
->-n</option
-></term>
-<listitem
-><para
->Do not keep the password. This disables the <guilabel
->keep password</guilabel
-> checkbox in the password dialogue.</para
-></listitem>
+<term><option>-n</option></term>
+<listitem><para>Do not keep the password. This disables the <guilabel>keep password</guilabel> checkbox in the password dialogue.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><option
->-q</option
-></term>
-<listitem
-><para
->Be quiet.</para
-></listitem>
+<term><option>-q</option></term>
+<listitem><para>Be quiet.</para></listitem>
 <!-- Lauri: This could do with a little expansion.  quiet as in no screen -->
 <!-- output, quiet as in no gui prompt for the password, or quiet as in no -->
 <!-- beeping? -->
 </varlistentry>
 
 <varlistentry>
-<term
-><option
->-d</option
-></term>
-<listitem
-><para
->Show debug information.</para
-></listitem>
+<term><option>-d</option></term>
+<listitem><para>Show debug information.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><option
->-v</option
-></term>
-<listitem
-><para
->Print version information and exit.</para
-></listitem>
+<term><option>-v</option></term>
+<listitem><para>Print version information and exit.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><option
->-h</option
-></term>
-<listitem
-><para
->Print some help.</para
-></listitem>
+<term><option>-h</option></term>
+<listitem><para>Print some help.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><option
->-s</option
-></term>
-<listitem
-><para
->Stop the tdesu daemon. See <xref linkend="sec-password-keeping"/>.</para
-></listitem>
+<term><option>-s</option></term>
+<listitem><para>Stop the tdesu daemon. See <xref linkend="sec-password-keeping"/>.</para></listitem>
 </varlistentry>
 </variablelist>
 
 </chapter>
 
 <chapter id="configuration">
-<title
->Configuration</title>
-
-<para
->&tdesu; comes with a control module named <application
->kcmtdesu</application
->. You can find it in the <guimenu
->K</guimenu
-> menu under <menuchoice
-><guisubmenu
->Settings</guisubmenu
-> <guisubmenu
->Applications</guisubmenu
-> <guimenuitem
->KDE su</guimenuitem
-></menuchoice
->. You can change the following things:</para>
+<title>Configuration</title>
+
+<para>&tdesu; comes with a control module named <application>kcmtdesu</application>. You can find it in the <guimenu>K</guimenu> menu under <menuchoice><guisubmenu>Settings</guisubmenu> <guisubmenu>Applications</guisubmenu> <guimenuitem>KDE su</guimenuitem></menuchoice>. You can change the following things:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Echo Mode</guilabel
-></term>
-<listitem
-><para
->This is how characters you type are echoed to the screen. Possible choices are: one star per character, three stars or no echo at all. The default is one star per character.</para
-></listitem>
+<term><guilabel>Echo Mode</guilabel></term>
+<listitem><para>This is how characters you type are echoed to the screen. Possible choices are: one star per character, three stars or no echo at all. The default is one star per character.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Keeping passwords</guilabel
-></term>
-<listitem
-><para
->You can instruct &tdesu; remember passwords you enter by checking the <guilabel
->keep password</guilabel
-> check box. If this checked, you can enter a timeout value in the text field below it. This is the amount of time, in minutes, that the password will be remembered. The default is not to remember passwords.</para
-></listitem>
+<term><guilabel>Keeping passwords</guilabel></term>
+<listitem><para>You can instruct &tdesu; remember passwords you enter by checking the <guilabel>keep password</guilabel> check box. If this checked, you can enter a timeout value in the text field below it. This is the amount of time, in minutes, that the password will be remembered. The default is not to remember passwords.</para></listitem>
 </varlistentry>
 </variablelist>
 
 </chapter>
 
 <chapter id="Internals">
-<title
->Internals</title>
+<title>Internals</title>
 
 <sect1 id="x-authentication">
-<title
->X authentication</title>
+<title>X authentication</title>
 
-<para
->The program you execute will run under the root user id and will generally have no authority to access your X display. &tdesu; gets around this by adding an authentication cookie for your display to a temporary <filename
->.Xauthority</filename
-> file. After the command exits, this file is removed. </para>
+<para>The program you execute will run under the root user id and will generally have no authority to access your X display. &tdesu; gets around this by adding an authentication cookie for your display to a temporary <filename>.Xauthority</filename> file. After the command exits, this file is removed. </para>
 
-<para
->If you don't use X cookies, you are on your own. &tdesu; will detect this and will not add a cookie but you will have to make sure that root is allowed to access to your display.</para>
+<para>If you don't use X cookies, you are on your own. &tdesu; will detect this and will not add a cookie but you will have to make sure that root is allowed to access to your display.</para>
 
 </sect1>
 
 <sect1 id="interface-to-su">
-<title
->Interface to <command
->su</command
-></title>
-
-<para
->&tdesu; uses the sytem's <command
->su</command
-> for acquiring priviliges. In this section, I explain the details of how &tdesu; does this. </para>
-
-<para
->Because some <command
->su</command
-> implementations (&ie; the one from &RedHat;) don't want to read the password from <literal
->stdin</literal
->, &tdesu; creates a pty/tty pair and executes <command
->su</command
-> with it's standard filedescriptors connected to the tty.</para>
-
-<para
->To execute the command the user selected, rather than an interactive shell, &tdesu; uses the <option
->-c</option
-> argument with <command
->su</command
->. This argument is understood by every shell that I know of so it should work portably. <command
->su</command
-> passes this <option
->-c</option
-> argument to the target user's shell, and the shell executes the program. Example command: <command
->su <option
->root -c <replaceable
->the_program</replaceable
-></option
-></command
->.</para>
-
-<para
->Instead of executing the user command directly with <command
->su</command
->, &tdesu; executes a little stub program called <application
->tdesu_stub</application
->. This stub (running as the target user), requests some information from &tdesu; over the pty/tty channel (the stub's stdin and stdout) and then executes the user's program. The information passed over is: the X display, an X authentication cookie (if available), the <envar
->PATH</envar
-> and the command to run. The reason why a stub program is used is that the X cookie is private information and therefore cannot be passed on the command line.</para>
+<title>Interface to <command>su</command></title>
+
+<para>&tdesu; uses the sytem's <command>su</command> for acquiring priviliges. In this section, I explain the details of how &tdesu; does this. </para>
+
+<para>Because some <command>su</command> implementations (&ie; the one from &RedHat;) don't want to read the password from <literal>stdin</literal>, &tdesu; creates a pty/tty pair and executes <command>su</command> with it's standard filedescriptors connected to the tty.</para>
+
+<para>To execute the command the user selected, rather than an interactive shell, &tdesu; uses the <option>-c</option> argument with <command>su</command>. This argument is understood by every shell that I know of so it should work portably. <command>su</command> passes this <option>-c</option> argument to the target user's shell, and the shell executes the program. Example command: <command>su <option>root -c <replaceable>the_program</replaceable></option></command>.</para>
+
+<para>Instead of executing the user command directly with <command>su</command>, &tdesu; executes a little stub program called <application>tdesu_stub</application>. This stub (running as the target user), requests some information from &tdesu; over the pty/tty channel (the stub's stdin and stdout) and then executes the user's program. The information passed over is: the X display, an X authentication cookie (if available), the <envar>PATH</envar> and the command to run. The reason why a stub program is used is that the X cookie is private information and therefore cannot be passed on the command line.</para>
 
 </sect1>
 
 <sect1 id="password-checking">
-<title
->Password Checking</title>
+<title>Password Checking</title>
 
-<para
->&tdesu; will check the password you entered and gives an error message if it is not correct. The checking is done by executing a test program: <filename
->/bin/true</filename
->. If this succeeds, the password is assumed to be correct.</para>
+<para>&tdesu; will check the password you entered and gives an error message if it is not correct. The checking is done by executing a test program: <filename>/bin/true</filename>. If this succeeds, the password is assumed to be correct.</para>
 
 </sect1>
 
 <sect1 id="sec-password-keeping">
-<title
->Password Keeping</title>
-
-<para
->For your comfort, &tdesu; implements a <quote
->keep password</quote
-> feature. If you are interested in security, you should read this paragraph.</para>
-
-<para
->Allowing &tdesu; to remember passwords opens up a (small) security hole in your system. Obviously, &tdesu; does not allow anybody but your user id to use the passwords, but, if done without caution, this would lower <systemitem class="username"
->root</systemitem
->'s security level to that of a normal user (you). A hacker who breaks into your account, would get <systemitem class="username"
->root</systemitem
-> access. &tdesu; tries to prevent this. The security scheme it uses is, in my opinion at least, reasonably safe and is explained here.</para>
-
-<para
->&tdesu; uses a daemon, called <application
->tdesud</application
->. The daemon listens to a &UNIX; socket in <filename
->/tmp</filename
-> for commands. The mode of the socket is 0600 so that only your user id can connect to it. If password keeping is enabled, &tdesu; executes commands through this daemon. It writes the command and <systemitem class="username"
->root</systemitem
->'s password to the socket and the daemon executes the command using <command
->su</command
->, as describe before. After this, the command and the password are not thrown away. Instead, they are kept for a specified amount of time. This is the timeout value from in the control module. If another request for the same command is coming within this time period, the client does not have to supply the password. To keep hackers who broke into your account from stealing passwords from the daemon (for example, by attaching a debugger), the daemon is installed set-group-id nogroup. This should prevent all normal users (including you) from getting passwords from the <application
->tdesud</application
-> process. Also, the daemon sets the <envar
->DISPLAY</envar
-> environment variable to the value it had when it was started. The only thing a hacker can do is execute an application on your display.</para>
-
-<para
->One weak spot in this scheme is that the programs you execute are probably not written with security in mind (like setuid <systemitem class="username"
->root</systemitem
-> programs). This means that they might have buffer overruns or other problems and a hacker could exploit those.</para>
-
-<para
->The use of the password keeping feature is a tradeoff between security and comfort. I encourage you to think it over and decide for yourself if you want to use it or not.</para>
+<title>Password Keeping</title>
+
+<para>For your comfort, &tdesu; implements a <quote>keep password</quote> feature. If you are interested in security, you should read this paragraph.</para>
+
+<para>Allowing &tdesu; to remember passwords opens up a (small) security hole in your system. Obviously, &tdesu; does not allow anybody but your user id to use the passwords, but, if done without caution, this would lower <systemitem class="username">root</systemitem>'s security level to that of a normal user (you). A hacker who breaks into your account, would get <systemitem class="username">root</systemitem> access. &tdesu; tries to prevent this. The security scheme it uses is, in my opinion at least, reasonably safe and is explained here.</para>
+
+<para>&tdesu; uses a daemon, called <application>tdesud</application>. The daemon listens to a &UNIX; socket in <filename>/tmp</filename> for commands. The mode of the socket is 0600 so that only your user id can connect to it. If password keeping is enabled, &tdesu; executes commands through this daemon. It writes the command and <systemitem class="username">root</systemitem>'s password to the socket and the daemon executes the command using <command>su</command>, as describe before. After this, the command and the password are not thrown away. Instead, they are kept for a specified amount of time. This is the timeout value from in the control module. If another request for the same command is coming within this time period, the client does not have to supply the password. To keep hackers who broke into your account from stealing passwords from the daemon (for example, by attaching a debugger), the daemon is installed set-group-id nogroup. This should prevent all normal users (including you) from getting passwords from the <application>tdesud</application> process. Also, the daemon sets the <envar>DISPLAY</envar> environment variable to the value it had when it was started. The only thing a hacker can do is execute an application on your display.</para>
+
+<para>One weak spot in this scheme is that the programs you execute are probably not written with security in mind (like setuid <systemitem class="username">root</systemitem> programs). This means that they might have buffer overruns or other problems and a hacker could exploit those.</para>
+
+<para>The use of the password keeping feature is a tradeoff between security and comfort. I encourage you to think it over and decide for yourself if you want to use it or not.</para>
 
 </sect1>
 </chapter>
 
 <chapter id="Author">
-<title
->Author</title>
+<title>Author</title>
 
-<para
->&tdesu;</para>
+<para>&tdesu;</para>
 
-<para
->Copyright 2000 &Geert.Jansen;</para>
+<para>Copyright 2000 &Geert.Jansen;</para>
 
-<para
->&tdesu; is written by &Geert.Jansen;. It is somewhat based on Pietro Iglio's &tdesu;, version 0.3. Pietro and I agreed that I will maintain this program in the future.</para>
+<para>&tdesu; is written by &Geert.Jansen;. It is somewhat based on Pietro Iglio's &tdesu;, version 0.3. Pietro and I agreed that I will maintain this program in the future.</para>
 
-<para
->The author can be reached through email at &Geert.Jansen.mail;. Please report any bugs you find to me so that I can fix them. If you have a suggestion, feel free to contact me.</para>
+<para>The author can be reached through email at &Geert.Jansen.mail;. Please report any bugs you find to me so that I can fix them. If you have a suggestion, feel free to contact me.</para>
 &underFDL; &underArtisticLicense; </chapter>
 
 </book>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdm/index.docbook b/tde-i18n-en_GB/docs/tdebase/tdm/index.docbook
index c0c5a7e2a2a..beac753f9f1 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdm/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdm/index.docbook
@@ -3,116 +3,69 @@
 "dtd/kdex.dtd" [
   <!ENTITY kappname "&tdm;">
   <!ENTITY package "tdebase">
-  <!ENTITY tdmrc "<filename
->tdmrc</filename
->">
-  <!ENTITY XDMCP "<acronym
->XDMCP</acronym
->">
-  <!ENTITY xdm "<application
->xdm</application
->">
+  <!ENTITY tdmrc "<filename>tdmrc</filename>">
+  <!ENTITY XDMCP "<acronym>XDMCP</acronym>">
+  <!ENTITY xdm "<application>xdm</application>">
   <!ENTITY tdmrc-ref SYSTEM "tdmrc-ref.docbook">
   <!ENTITY % addindex "INCLUDE">
-  <!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+  <!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <book lang="&language;">
 <bookinfo>
-<title
->The &tdm; Handbook</title>
+<title>The &tdm; Handbook</title>
 
 <authorgroup>
-<author
->&Oswald.Buddenhagen; &Oswald.Buddenhagen.mail; </author
-><!-- 
+<author>&Oswald.Buddenhagen; &Oswald.Buddenhagen.mail; </author><!-- 
 <othercredit role="developer">
 &Oswald.Buddenhagen; &Oswald.Buddenhagen.mail;
-<contrib
->Developer</contrib>
+<contrib>Developer</contrib>
 </othercredit>
 <othercredit role="reviewer">
 &Lauri.Watts; &Lauri.Watts.mail;
-<contrib
->Reviewer</contrib>
-</othercredit
-> -->
-
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<contrib>Reviewer</contrib>
+</othercredit> -->
+
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 
 </authorgroup>
 
 <copyright>
-<year
->2000</year>
-<holder
->&Neal.Crook;</holder>
+<year>2000</year>
+<holder>&Neal.Crook;</holder>
 </copyright>
 
 <copyright>
-<year
->2002</year>
-<holder
->&Oswald.Buddenhagen;</holder>
+<year>2002</year>
+<holder>&Oswald.Buddenhagen;</holder>
 </copyright>
 
 <copyright>
-<year
->2003</year>
-<holder
->&Lauri.Watts;</holder>
+<year>2003</year>
+<holder>&Lauri.Watts;</holder>
 </copyright>
 
-<date
->2003-03-01</date>
-<releaseinfo
->0.05.02</releaseinfo>
+<date>2003-03-01</date>
+<releaseinfo>0.05.02</releaseinfo>
 
 <abstract>
-<para
->This document describes &tdm; the &kde; Display Manager. &tdm; is also known as the <quote
->Login Manager</quote
->.</para>
+<para>This document describes &tdm; the &kde; Display Manager. &tdm; is also known as the <quote>Login Manager</quote>.</para>
 </abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->tdm</keyword>
-<keyword
->xdm</keyword>
-<keyword
->display manager</keyword>
-<keyword
->login manager</keyword>
+<keyword>KDE</keyword>
+<keyword>tdm</keyword>
+<keyword>xdm</keyword>
+<keyword>display manager</keyword>
+<keyword>login manager</keyword>
 </keywordset>
 </bookinfo>
 
 <!-- ********************************************************************** -->  
 <chapter id="introduction">
-<title
->Introduction</title>
+<title>Introduction</title>
 
-<para
->&tdm; provides a graphical interface that allows you to log in to a system. It prompts for login (username) and password, authenticates the user and starts a <quote
->session</quote
->. &tdm; is superior to &xdm;, the X Display Manager, in a number of ways.</para>
+<para>&tdm; provides a graphical interface that allows you to log in to a system. It prompts for login (username) and password, authenticates the user and starts a <quote>session</quote>. &tdm; is superior to &xdm;, the X Display Manager, in a number of ways.</para>
 
 </chapter>
 
@@ -131,1083 +84,473 @@
 -->
 
 <chapter id="quickstart">
-<title
->Quick Start Guide</title>
+<title>Quick Start Guide</title>
 
-<para
->This is a quick start guide for users who fit the following pattern:</para>
+<para>This is a quick start guide for users who fit the following pattern:</para>
 
 <itemizedlist>
 <listitem>
-<para
->X is configured and works with the command <command
->startx</command
-> from the commandline.</para>
+<para>X is configured and works with the command <command>startx</command> from the commandline.</para>
 </listitem>
 <listitem>
-<para
->Each user will generally only use a single window manager or desktop environment, and does not change this choice very often, or is comfortable editing a single text file in order to change their choice.</para>
+<para>Each user will generally only use a single window manager or desktop environment, and does not change this choice very often, or is comfortable editing a single text file in order to change their choice.</para>
 </listitem>
 </itemizedlist>
 
-<para
->This scenario will be sufficient for many environments where a single user or several users normally boot the computer and log into their preferred environment.</para>
+<para>This scenario will be sufficient for many environments where a single user or several users normally boot the computer and log into their preferred environment.</para>
 
 <procedure>
-<title
->Setting up a Default Session</title>
+<title>Setting up a Default Session</title>
 <step>
-<para
->Create or open the file <filename
->~/.xinitrc</filename
-></para>
-<para
->If you already have a working <filename
->~/.xinitrc</filename
->, go to the next step</para>
+<para>Create or open the file <filename>~/.xinitrc</filename></para>
+<para>If you already have a working <filename>~/.xinitrc</filename>, go to the next step</para>
 </step>
 <step>
-<para
->If one does not already exist, add a line to the <filename
->~/.xinitrc</filename
-> to start your preferred window manager or desktop environment.</para>
-<para
->For &kde; you should enter:</para>
-<screen
-><userinput
->starttde</userinput
-></screen>
-<para
->For other window managers or desktop environments, you should look in their documentation for the correct command.</para>
+<para>If one does not already exist, add a line to the <filename>~/.xinitrc</filename> to start your preferred window manager or desktop environment.</para>
+<para>For &kde; you should enter:</para>
+<screen><userinput>starttde</userinput></screen>
+<para>For other window managers or desktop environments, you should look in their documentation for the correct command.</para>
 </step>
-<step
-><para
->Make a link as follows:</para>
-<screen
-><userinput
-><command
->ln</command
-> <option
->-s</option
-> <parameter
->~/.xinitrc ~/.xsession</parameter
-></userinput
-></screen>
+<step><para>Make a link as follows:</para>
+<screen><userinput><command>ln</command> <option>-s</option> <parameter>~/.xinitrc ~/.xsession</parameter></userinput></screen>
 </step>
 </procedure>
 
-<para
->At this point, typing <userinput
-><command
->startx</command
-></userinput
-> on the commandline should start X, with a &kde; session. The next task is to try &tdm;.</para>
-
-<para
->As <systemitem class="username"
->root</systemitem
->, type <userinput
-><command
->tdm</command
-></userinput
-> at the prompt.</para>
-
-<para
->You should see a login window, which is described more fully in<xref linkend="login"/>.</para>
-
-<para
->Typing your normal username and password in the fields provided, and leaving <option
->default</option
-> selected as the session type should now open a &kde; session for your user.</para>
-
-<para
->If you have other users to configure, you should repeat the procedure above for each of them.</para>
+<para>At this point, typing <userinput><command>startx</command></userinput> on the commandline should start X, with a &kde; session. The next task is to try &tdm;.</para>
+
+<para>As <systemitem class="username">root</systemitem>, type <userinput><command>tdm</command></userinput> at the prompt.</para>
+
+<para>You should see a login window, which is described more fully in<xref linkend="login"/>.</para>
+
+<para>Typing your normal username and password in the fields provided, and leaving <option>default</option> selected as the session type should now open a &kde; session for your user.</para>
+
+<para>If you have other users to configure, you should repeat the procedure above for each of them.</para>
 
 <note>
-<para
->This is a quick guide to getting up and running only. You probably will want to customise &tdm; further, for example, to hide the names of the system accounts, to allow further sessions, and much more. Please read through the rest of this manual to find out how to do these things.</para>
+<para>This is a quick guide to getting up and running only. You probably will want to customise &tdm; further, for example, to hide the names of the system accounts, to allow further sessions, and much more. Please read through the rest of this manual to find out how to do these things.</para>
 </note>
 
 </chapter>
 
-<chapter id="login"
-> 
-<title
->The Login Window</title
-> 
+<chapter id="login"> 
+<title>The Login Window</title> 
 
-<para
->The user interface to &tdm; consists of two dialogue boxes. The main dialogue box has these controls:</para>
+<para>The user interface to &tdm; consists of two dialogue boxes. The main dialogue box has these controls:</para>
 
-<itemizedlist
-> 
+<itemizedlist> 
 <listitem>
-<para
->A <guilabel
->Username:</guilabel
-> field for you to enter your username.</para>
+<para>A <guilabel>Username:</guilabel> field for you to enter your username.</para>
 </listitem>
 
 <listitem>
-<para
->A <guilabel
->Password:</guilabel
-> field for you to enter your password.</para>
+<para>A <guilabel>Password:</guilabel> field for you to enter your password.</para>
 </listitem>
 
 <listitem>
-<para
->(Optionally) a graphical image of each user (for example, a digitised photograph). Clicking on an image is equivalent to typing the associated username into the <guilabel
->Username:</guilabel
-> field. (This feature is an imitation of the login box on IRIX).</para
-> </listitem>
+<para>(Optionally) a graphical image of each user (for example, a digitised photograph). Clicking on an image is equivalent to typing the associated username into the <guilabel>Username:</guilabel> field. (This feature is an imitation of the login box on IRIX).</para> </listitem>
 
 <listitem>
-<para
->A <guilabel
->Menu</guilabel
-> drop-down box that allows &tdm; to be used to start sessions with various different window managers or desktop environments installed on the system.</para>
+<para>A <guilabel>Menu</guilabel> drop-down box that allows &tdm; to be used to start sessions with various different window managers or desktop environments installed on the system.</para>
 </listitem>
 
 <listitem>
-<para
->(Optionally) a region to the right of the <guilabel
->Username:</guilabel
->, <guilabel
->Password:</guilabel
-> and <guilabel
->Session Type:</guilabel
-> fields which can be used to display either a static image or an analogue clock.</para>
+<para>(Optionally) a region to the right of the <guilabel>Username:</guilabel>, <guilabel>Password:</guilabel> and <guilabel>Session Type:</guilabel> fields which can be used to display either a static image or an analogue clock.</para>
 </listitem>
 
 <listitem>
-<para
->A <guibutton
->Login</guibutton
-> button that validates the username/password combination and attempts to start a session of the selected type.</para
-> 
+<para>A <guibutton>Login</guibutton> button that validates the username/password combination and attempts to start a session of the selected type.</para> 
 </listitem>
 
 <listitem>
-<para
->A <guibutton
->Clear</guibutton
-> button that clears the text from the <guilabel
->Login</guilabel
-> and <guilabel
->Pass</guilabel
-> fields.</para>
-</listitem
-> 
+<para>A <guibutton>Clear</guibutton> button that clears the text from the <guilabel>Login</guilabel> and <guilabel>Pass</guilabel> fields.</para>
+</listitem> 
 
 <listitem>
-<para
->(Optionally) A <guibutton
->Shutdown</guibutton
-> button that displays the <guibutton
->Shutdown</guibutton
-> dialogue box.</para>
+<para>(Optionally) A <guibutton>Shutdown</guibutton> button that displays the <guibutton>Shutdown</guibutton> dialogue box.</para>
 </listitem>
 <listitem>
-<para
->A <guibutton
->Menu</guibutton
-> button that opens an action menu with the following items:</para>
+<para>A <guibutton>Menu</guibutton> button that opens an action menu with the following items:</para>
  
 <itemizedlist>
 <listitem>
-<para
->(On local displays) a <guimenuitem
->Restart X Server</guimenuitem
-> item that terminates the currently running &X-Server;, starts a new one and displays the login dialogue again. You can use this if the display content seems to be broken somehow.</para>
+<para>(On local displays) a <guimenuitem>Restart X Server</guimenuitem> item that terminates the currently running &X-Server;, starts a new one and displays the login dialogue again. You can use this if the display content seems to be broken somehow.</para>
 </listitem>
 
 <listitem>
-<para
->(On remote displays) A <guimenuitem
->Close Connection</guimenuitem
-> item that closes the connection to the XDMCP server you are currently connected to. If you got to this server through a host chooser, this will bring you back to the chooser, otherwise it will only reset the &X-Server; and bring up the login dialogue again.</para>
+<para>(On remote displays) A <guimenuitem>Close Connection</guimenuitem> item that closes the connection to the XDMCP server you are currently connected to. If you got to this server through a host chooser, this will bring you back to the chooser, otherwise it will only reset the &X-Server; and bring up the login dialogue again.</para>
 </listitem>
 
 <listitem>
-<para
->(Optionally on local displays) A <guimenuitem
->Console Mode</guimenuitem
-> item that terminates the currently running &X-Server; and leaves you alone with a console login. &tdm; will resume the graphical login if nobody is logged in at the console for some time. To make this work, you need to use the local@&lt;console&gt; syntax in the <filename
->Xservers</filename
-> file (see comments in that file).</para>
+<para>(Optionally on local displays) A <guimenuitem>Console Mode</guimenuitem> item that terminates the currently running &X-Server; and leaves you alone with a console login. &tdm; will resume the graphical login if nobody is logged in at the console for some time. To make this work, you need to use the local@&lt;console&gt; syntax in the <filename>Xservers</filename> file (see comments in that file).</para>
 </listitem>
 </itemizedlist>
 </listitem>
 
 <listitem>
-<para
->(Optionally) A <guibutton
->Shutdown...</guibutton
-> button that displays the shutdown dialogue box.</para>
+<para>(Optionally) A <guibutton>Shutdown...</guibutton> button that displays the shutdown dialogue box.</para>
 </listitem>
 </itemizedlist>
 
-<para
->The <guilabel
->Shutdown</guilabel
-> dialogue box presents a set of radio buttons that allow one of these options to be selected:</para>
+<para>The <guilabel>Shutdown</guilabel> dialogue box presents a set of radio buttons that allow one of these options to be selected:</para>
 
 <variablelist>
 <varlistentry>
-<term
->Shutdown</term>
-<listitem
-><para
->Shut the system down in a controlled manner, ready for power-down.</para
-></listitem>
+<term>Shutdown</term>
+<listitem><para>Shut the system down in a controlled manner, ready for power-down.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Restart</term>
-<listitem
-><para
->Shut the system down and reboot. For systems that use <application
->Lilo</application
->, an optional drop-down box allows you to select a particular operating-system kernel to be used for the reboot.</para>
+<term>Restart</term>
+<listitem><para>Shut the system down and reboot. For systems that use <application>Lilo</application>, an optional drop-down box allows you to select a particular operating-system kernel to be used for the reboot.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->Restart X Server</term
-> 
+<term>Restart X Server</term> 
 <listitem>
-<para
->Stop and then restart the X-server. Typically, you might need to use this option if you have changed your X11 configuration in some way.</para>
-</listitem
-> 
+<para>Stop and then restart the X-server. Typically, you might need to use this option if you have changed your X11 configuration in some way.</para>
+</listitem> 
 </varlistentry>
 <varlistentry>
-<term
->Console Mode</term>
+<term>Console Mode</term>
 <listitem>
-<para
->Stop the &X-Server; and return the system to console mode. This is achieved by bringing the system down to run-level 3. Typically, the system manager might need to use this option before upgrading or re-configuring X11 software.</para>
-</listitem
-> 
+<para>Stop the &X-Server; and return the system to console mode. This is achieved by bringing the system down to run-level 3. Typically, the system manager might need to use this option before upgrading or re-configuring X11 software.</para>
+</listitem> 
 </varlistentry>
 </variablelist>
 
-<para
->Pressing the <guibutton
->OK</guibutton
-> button initiates the selected action; pressing the <guibutton
->Cancel</guibutton
-> button returns to the main &tdm; dialogue box. </para>
+<para>Pressing the <guibutton>OK</guibutton> button initiates the selected action; pressing the <guibutton>Cancel</guibutton> button returns to the main &tdm; dialogue box. </para>
 
 </chapter>
 
 <!-- *********************************************************************** -->
 <chapter id="configuring-tdm">
-<title
->Configuring &tdm;</title>
-
-<para
->This chapter assumes that &tdm; is already up and running on your system, and that you simply want to change its behaviour in some way.</para>
-
-<para
->When &tdm; starts up, it reads its configuration from the folder <filename class="directory"
->$TDEDIR/share/config/tdm/</filename
-> (this may be <filename class="directory"
->/etc/kde3/tdm/</filename
-> or something else on your system).</para>
-
-<para
->The main configuration file is &tdmrc;; all other files are referenced from there and could be stored under any name anywhere on the system - but usually that would not make much sense for obvious reasons (one particular exception is referencing configuration files of an already installed &xdm; - however when a new &tdm; is installed, it will import settings from those files if it finds an already installed &xdm;).</para>
-
-<para
->Since &tdm; must run before any user is logged in, it is not associated with any particular user. Therefore, it is not possible to have user-specific configuration files; all users share the common &tdmrc;. It follows from this that the configuration of &tdm; can only be altered by those users that have write access to <filename
->$<envar
->TDEDIR</envar
->/share/config/tdm/tdmrc</filename
-> (normally restricted to system administrators logged in as <systemitem class="username"
->root</systemitem
->).</para>
-
-<para
->You can view the &tdmrc; file currently in use on your system, and you can configure &tdm; by editing this file. Alternatively, you can use the graphical configuration tool provided by the &kcontrolcenter; (under <menuchoice
-><guisubmenu
->System Administration</guisubmenu
-><guimenuitem
->Login Manager</guimenuitem
-></menuchoice
->), which is described in <ulink url="help:/kcontrol/login-manager.html"
->the &kcontrol; help files</ulink
->. </para>
-
-<para
->The remainder of this chapter describes configuration of &tdm; via the &kcontrol; module, and the <link linkend="tdm-files"
->next chapter</link
-> describes the options available in &tdmrc; itself. If you only need to configure for local users, the &kcontrol; module should be sufficient for your needs. If you need to configure remote logins, or have multiple &tdm; sessions running, you will need to read on.</para>
+<title>Configuring &tdm;</title>
+
+<para>This chapter assumes that &tdm; is already up and running on your system, and that you simply want to change its behaviour in some way.</para>
+
+<para>When &tdm; starts up, it reads its configuration from the folder <filename class="directory">$TDEDIR/share/config/tdm/</filename> (this may be <filename class="directory">/etc/kde3/tdm/</filename> or something else on your system).</para>
+
+<para>The main configuration file is &tdmrc;; all other files are referenced from there and could be stored under any name anywhere on the system - but usually that would not make much sense for obvious reasons (one particular exception is referencing configuration files of an already installed &xdm; - however when a new &tdm; is installed, it will import settings from those files if it finds an already installed &xdm;).</para>
+
+<para>Since &tdm; must run before any user is logged in, it is not associated with any particular user. Therefore, it is not possible to have user-specific configuration files; all users share the common &tdmrc;. It follows from this that the configuration of &tdm; can only be altered by those users that have write access to <filename>$<envar>TDEDIR</envar>/share/config/tdm/tdmrc</filename> (normally restricted to system administrators logged in as <systemitem class="username">root</systemitem>).</para>
+
+<para>You can view the &tdmrc; file currently in use on your system, and you can configure &tdm; by editing this file. Alternatively, you can use the graphical configuration tool provided by the &kcontrolcenter; (under <menuchoice><guisubmenu>System Administration</guisubmenu><guimenuitem>Login Manager</guimenuitem></menuchoice>), which is described in <ulink url="help:/kcontrol/login-manager.html">the &kcontrol; help files</ulink>. </para>
+
+<para>The remainder of this chapter describes configuration of &tdm; via the &kcontrol; module, and the <link linkend="tdm-files">next chapter</link> describes the options available in &tdmrc; itself. If you only need to configure for local users, the &kcontrol; module should be sufficient for your needs. If you need to configure remote logins, or have multiple &tdm; sessions running, you will need to read on.</para>
 
 <sect1 id="tdm-kcontrol-module">
 <sect1info>
 <authorgroup>
-<author
->&Thomas.Tanghus; &Thomas.Tanghus.mail;</author>
-<author
->&Steffen.Hansen; &Steffen.Hansen.mail;</author>
-<author
->&Mike.McBride; &Mike.McBride.mail;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Thomas.Tanghus; &Thomas.Tanghus.mail;</author>
+<author>&Steffen.Hansen; &Steffen.Hansen.mail;</author>
+<author>&Mike.McBride; &Mike.McBride.mail;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 </sect1info>
 
-<title
->The Login Manager &kcontrol; Module</title>
-
-<para
->Using this module, you can configure the &kde; graphical login manager, &tdm;. You can change how the login screen looks, who has access using the login manager and who can shutdown the computer.</para>
-
-<note
-><para
->All settings will be written to the configuration file &tdmrc;, which in it's original state has many comments to help you configure &tdm;. Using this &kcontrol; module will strip these comments from the file. All available options in &tdmrc; are covered in <xref linkend="tdm-files"/>.</para>
-
-<para
->The options listed in this chapter are cross referenced with their equivalents in &tdmrc;. All options available in the &kcontrol; module are also available directly in &tdmrc; but the reverse is not true.</para
-></note>
-
-<para
->In order to organise all of these options, this module is divided into several sections: <link linkend="tdmconfig-appearance"
-><guilabel
->Appearance</guilabel
-></link
->, <link linkend="tdmconfig-font"
-><guilabel
->Font</guilabel
-></link
->, <link linkend="tdmconfig-background"
-><guilabel
->Background</guilabel
-></link
->, <link linkend="tdmconfig-shutdown"
-><guilabel
->Shutdown</guilabel
-></link
->, <link linkend="tdmconfig-users"
-><guilabel
->Users</guilabel
-></link
-> and <link linkend="tdmconfig-convenience"
-><guilabel
->Convenience</guilabel
-></link
->.</para>
-
-<para
->You can switch between the sections using the tabs at the top of the window.</para>
-
-<note
-><para
->If you are not currently logged in as a superuser, you will need to click the <guibutton
->Administrator Mode</guibutton
-> Button. You will then be asked for a superuser password. Entering a correct password will allow you to modify the settings of this module.</para
-></note>
+<title>The Login Manager &kcontrol; Module</title>
+
+<para>Using this module, you can configure the &kde; graphical login manager, &tdm;. You can change how the login screen looks, who has access using the login manager and who can shutdown the computer.</para>
+
+<note><para>All settings will be written to the configuration file &tdmrc;, which in it's original state has many comments to help you configure &tdm;. Using this &kcontrol; module will strip these comments from the file. All available options in &tdmrc; are covered in <xref linkend="tdm-files"/>.</para>
+
+<para>The options listed in this chapter are cross referenced with their equivalents in &tdmrc;. All options available in the &kcontrol; module are also available directly in &tdmrc; but the reverse is not true.</para></note>
+
+<para>In order to organise all of these options, this module is divided into several sections: <link linkend="tdmconfig-appearance"><guilabel>Appearance</guilabel></link>, <link linkend="tdmconfig-font"><guilabel>Font</guilabel></link>, <link linkend="tdmconfig-background"><guilabel>Background</guilabel></link>, <link linkend="tdmconfig-shutdown"><guilabel>Shutdown</guilabel></link>, <link linkend="tdmconfig-users"><guilabel>Users</guilabel></link> and <link linkend="tdmconfig-convenience"><guilabel>Convenience</guilabel></link>.</para>
+
+<para>You can switch between the sections using the tabs at the top of the window.</para>
+
+<note><para>If you are not currently logged in as a superuser, you will need to click the <guibutton>Administrator Mode</guibutton> Button. You will then be asked for a superuser password. Entering a correct password will allow you to modify the settings of this module.</para></note>
 
 <sect2 id="tdmconfig-appearance">
-<title
->Appearance</title>
-
-<para
->From this page you can change the visual appearance of &tdm;, &kde;'s graphical login manager.</para>
-
-<para
->The <guilabel
->Greeting:</guilabel
-> is the title of the login screen. Setting this is especially useful if you have many servers users may log in to. You may use various placeholders, which are described along with the corresponding key <link linkend="option-greetstring"
-><option
->GreetString</option
-></link
-> in &tdmrc;. </para>
-
-<para
->You can then choose to show either the current system time, a logo or nothing special in the login box. Make your choice in the radio buttons labelled <guilabel
->Logo area:</guilabel
->. This corresponds to <link linkend="option-logoarea"
-><option
->LogoArea</option
-></link
-> in &tdmrc;</para>
-
-<para
->If you chose <guilabel
->Show logo</guilabel
-> you can now choose a logo:</para>
+<title>Appearance</title>
+
+<para>From this page you can change the visual appearance of &tdm;, &kde;'s graphical login manager.</para>
+
+<para>The <guilabel>Greeting:</guilabel> is the title of the login screen. Setting this is especially useful if you have many servers users may log in to. You may use various placeholders, which are described along with the corresponding key <link linkend="option-greetstring"><option>GreetString</option></link> in &tdmrc;. </para>
+
+<para>You can then choose to show either the current system time, a logo or nothing special in the login box. Make your choice in the radio buttons labelled <guilabel>Logo area:</guilabel>. This corresponds to <link linkend="option-logoarea"><option>LogoArea</option></link> in &tdmrc;</para>
+
+<para>If you chose <guilabel>Show logo</guilabel> you can now choose a logo:</para>
 
 <itemizedlist>
 <listitem>
-<para
->Drop an image file on the image button.</para>
+<para>Drop an image file on the image button.</para>
 </listitem>
 <listitem>
-<para
->Click on the image button and select a new image from the image chooser dialogue.</para>
+<para>Click on the image button and select a new image from the image chooser dialogue.</para>
 </listitem>
 </itemizedlist>
 
-<para
->If you do not specify a logo the default <filename
->$<envar
->TDEDIR</envar
->/share/apps/tdm/pics/kdelogo.xpm</filename
-> will be displayed.</para>
-
-<para
->Normally the login box is centred on the screen. Use the <guilabel
->Position:</guilabel
-> options if you want it to appear elsewhere on the screen. You can specify the relative position (percentage of the screen size) for the centre of the login window, relative to the top left of the display, in the fields labelled <guilabel
->X:</guilabel
-> and <guilabel
->Y:</guilabel
-> respectively. These correspond to the key <link linkend="option-greeterpos"
-><option
->GreeterPos</option
-></link
-> in &tdmrc;.</para>
-
-<para
->While &kde;'s style depends on the settings of the user logged in, the style used by &tdm; can be configured using the <guilabel
->GUI Style:</guilabel
-> and <guilabel
->Colour Scheme:</guilabel
-> options. These correspond to the keys <link linkend="option-guistyle"
-><option
->GUIStyle</option
-></link
-> and <link linkend="option-colorscheme"
-><option
->ColorScheme</option
-></link
-> in &tdmrc; respectively.</para>
-
-<para
->Below that, you have a dropdown box to choose the language for your login box, corresponding to setting <option
->Language</option
-> in &tdmrc;.</para>
+<para>If you do not specify a logo the default <filename>$<envar>TDEDIR</envar>/share/apps/tdm/pics/kdelogo.xpm</filename> will be displayed.</para>
+
+<para>Normally the login box is centred on the screen. Use the <guilabel>Position:</guilabel> options if you want it to appear elsewhere on the screen. You can specify the relative position (percentage of the screen size) for the centre of the login window, relative to the top left of the display, in the fields labelled <guilabel>X:</guilabel> and <guilabel>Y:</guilabel> respectively. These correspond to the key <link linkend="option-greeterpos"><option>GreeterPos</option></link> in &tdmrc;.</para>
+
+<para>While &kde;'s style depends on the settings of the user logged in, the style used by &tdm; can be configured using the <guilabel>GUI Style:</guilabel> and <guilabel>Colour Scheme:</guilabel> options. These correspond to the keys <link linkend="option-guistyle"><option>GUIStyle</option></link> and <link linkend="option-colorscheme"><option>ColorScheme</option></link> in &tdmrc; respectively.</para>
+
+<para>Below that, you have a dropdown box to choose the language for your login box, corresponding to setting <option>Language</option> in &tdmrc;.</para>
 
 </sect2>
 
 <sect2 id="tdmconfig-font">
-<title
->Font</title>
-
-<para
->From this section of the module you can change the fonts used in the login window. Only fonts available to all users are available here, not fonts you have installed on a per user basis.</para>
-
-<para
->You can select three different font styles from the drop down box (<guilabel
->General:</guilabel
->, <guilabel
->Failures:</guilabel
->, <guilabel
->Greeting</guilabel
->). When you click on the <guibutton
->Choose...</guibutton
-> button a dialogue appears from which you can select the new characteristics for the font style.</para>
+<title>Font</title>
+
+<para>From this section of the module you can change the fonts used in the login window. Only fonts available to all users are available here, not fonts you have installed on a per user basis.</para>
+
+<para>You can select three different font styles from the drop down box (<guilabel>General:</guilabel>, <guilabel>Failures:</guilabel>, <guilabel>Greeting</guilabel>). When you click on the <guibutton>Choose...</guibutton> button a dialogue appears from which you can select the new characteristics for the font style.</para>
 
 <itemizedlist>
 <listitem>
-<para
->The <guilabel
->General:</guilabel
-> font is used in all other places in the login window.</para>
+<para>The <guilabel>General:</guilabel> font is used in all other places in the login window.</para>
 </listitem>
 <listitem>
-<para
->The <guilabel
->Failures:</guilabel
-> font is used when a login fails.</para>
+<para>The <guilabel>Failures:</guilabel> font is used when a login fails.</para>
 </listitem>
 <listitem>
-<para
->The <guilabel
->Greeting:</guilabel
-> font is the font used for the title (Greeting String).</para>
+<para>The <guilabel>Greeting:</guilabel> font is the font used for the title (Greeting String).</para>
 </listitem>
 </itemizedlist>
 
-<para
->You can also check the box labelled <guilabel
->Use anti-aliasing for fonts</guilabel
-> if you want smoothed fonts in the login dialogue.</para>
+<para>You can also check the box labelled <guilabel>Use anti-aliasing for fonts</guilabel> if you want smoothed fonts in the login dialogue.</para>
 
-<para
->An example of each font can be seen in the <guilabel
->Example</guilabel
-> Box.</para>
+<para>An example of each font can be seen in the <guilabel>Example</guilabel> Box.</para>
 
 </sect2>
 
 <sect2 id="tdmconfig-background">
-<title
->Background</title>
+<title>Background</title>
 
-<para
->Here you can change the desktop background which will be displayed before a user logs in. You can have a single colour or an image as a background. If you have an image as the background and select centre, the selected background colour will be used around the image if it is not large enough to cover the entire desktop.</para>
+<para>Here you can change the desktop background which will be displayed before a user logs in. You can have a single colour or an image as a background. If you have an image as the background and select centre, the selected background colour will be used around the image if it is not large enough to cover the entire desktop.</para>
 
-<para
->The background colours and effects are controlled by the options on the tab labelled <guilabel
->Background</guilabel
-> and you select a background image and its placement from the options on the tab labelled <guilabel
->Wallpaper</guilabel
->.</para>
+<para>The background colours and effects are controlled by the options on the tab labelled <guilabel>Background</guilabel> and you select a background image and its placement from the options on the tab labelled <guilabel>Wallpaper</guilabel>.</para>
 
-<para
->To change the default background colour(s) simply click either of the colour buttons and select a new colour.</para>
+<para>To change the default background colour(s) simply click either of the colour buttons and select a new colour.</para>
 
-<para
->The dropdown box above the colour buttons provides you with several different blend effects. Choose one from the list, and it will be previewed on the small monitor at the top of the window. Your choices are:</para>
+<para>The dropdown box above the colour buttons provides you with several different blend effects. Choose one from the list, and it will be previewed on the small monitor at the top of the window. Your choices are:</para>
 
 <variablelist>
 <varlistentry>
-<term
->Flat</term>
-<listitem
-><para
->By choosing this mode, you select one colour (using the colour button labelled <guibutton
->Colour 1</guibutton
->), and the entire background is covered with this one colour.</para
-></listitem>
+<term>Flat</term>
+<listitem><para>By choosing this mode, you select one colour (using the colour button labelled <guibutton>Colour 1</guibutton>), and the entire background is covered with this one colour.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Pattern</term>
-<listitem
-><para
->By choosing this mode, you select two colours (using both colour buttons). </para
-> <para
->You then select a pattern by clicking <guilabel
->Setup</guilabel
->. This opens a new dialogue window, which gives you the opportunity to select a pattern. Simply click once on the pattern of your choice, then click on <guilabel
->OK</guilabel
->, and &kde; will render the pattern you selected using the two colours you selected. For more on patterns, see the section <ulink url="help:/kcontrol/background/index.html#bkgnd-patterns"
->Background: Adding, Removing and Modifying Patterns</ulink
->.</para
-></listitem>
+<term>Pattern</term>
+<listitem><para>By choosing this mode, you select two colours (using both colour buttons). </para> <para>You then select a pattern by clicking <guilabel>Setup</guilabel>. This opens a new dialogue window, which gives you the opportunity to select a pattern. Simply click once on the pattern of your choice, then click on <guilabel>OK</guilabel>, and &kde; will render the pattern you selected using the two colours you selected. For more on patterns, see the section <ulink url="help:/kcontrol/background/index.html#bkgnd-patterns">Background: Adding, Removing and Modifying Patterns</ulink>.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Background Program</term>
-<listitem
-><para
->By selecting this option, you can have &kde; use an external program to determine the background. This can be any program of your choosing. For more information on this option, see the section entitled <ulink url="help:/kcontrol/background/index.html#bkgnd-programs"
->Background: Using an external program</ulink
->.</para
-></listitem>
+<term>Background Program</term>
+<listitem><para>By selecting this option, you can have &kde; use an external program to determine the background. This can be any program of your choosing. For more information on this option, see the section entitled <ulink url="help:/kcontrol/background/index.html#bkgnd-programs">Background: Using an external program</ulink>.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Horizontal Gradient</term>
-<listitem
-><para
->By choosing this mode, you select two colours (using both colour buttons). &kde; will then start with the colour selected by <guilabel
->Colour 1</guilabel
-> on the left edge of the screen, and slowly transform into the colour selected by <guilabel
->Colour 2</guilabel
-> by the time it gets to the right edge of the screen.</para
-></listitem>
+<term>Horizontal Gradient</term>
+<listitem><para>By choosing this mode, you select two colours (using both colour buttons). &kde; will then start with the colour selected by <guilabel>Colour 1</guilabel> on the left edge of the screen, and slowly transform into the colour selected by <guilabel>Colour 2</guilabel> by the time it gets to the right edge of the screen.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Vertical Gradient</term>
-<listitem
-><para
->By choosing this mode, you select two colours (using both colour buttons). &kde; will then start with the colour selected by <guilabel
->Colour 1</guilabel
-> on the top edge of the screen, and slowly transform into the colour selected by <guilabel
->Colour 2</guilabel
-> as it moves to the bottom of the screen.</para
-></listitem>
+<term>Vertical Gradient</term>
+<listitem><para>By choosing this mode, you select two colours (using both colour buttons). &kde; will then start with the colour selected by <guilabel>Colour 1</guilabel> on the top edge of the screen, and slowly transform into the colour selected by <guilabel>Colour 2</guilabel> as it moves to the bottom of the screen.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Pyramid Gradient</term>
-<listitem
-><para
->By choosing this mode, you select two colours (using both colour buttons). &kde; will then start with the colour selected by <guilabel
->Colour 1</guilabel
-> in each corner of the screen, and slowly transform into the colour selected by <guilabel
->Colour 2</guilabel
-> as it moves to the centre of the screen.</para
-></listitem
-> 
+<term>Pyramid Gradient</term>
+<listitem><para>By choosing this mode, you select two colours (using both colour buttons). &kde; will then start with the colour selected by <guilabel>Colour 1</guilabel> in each corner of the screen, and slowly transform into the colour selected by <guilabel>Colour 2</guilabel> as it moves to the centre of the screen.</para></listitem> 
 </varlistentry>
 <varlistentry>
-<term
->Pipecross Gradient</term>
-<listitem
-><para
->By choosing this mode, you select two colours (using both colour buttons). &kde; will then start with the colour selected by <guilabel
->Colour 1</guilabel
-> in each corner of the screen, and slowly transform into the colour selected by <guilabel
->Colour 2</guilabel
-> as it moves to the centre of the screen. The <quote
->shape</quote
-> of this gradient is different then the pyramid gradient.</para
-></listitem>
+<term>Pipecross Gradient</term>
+<listitem><para>By choosing this mode, you select two colours (using both colour buttons). &kde; will then start with the colour selected by <guilabel>Colour 1</guilabel> in each corner of the screen, and slowly transform into the colour selected by <guilabel>Colour 2</guilabel> as it moves to the centre of the screen. The <quote>shape</quote> of this gradient is different then the pyramid gradient.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Elliptic Gradient</term>
-<listitem
-><para
->By choosing this mode, you select two colours (using both colour buttons). &kde; will then start with the colour selected by <guilabel
->Colour 2</guilabel
-> in the centre of the screen, and slowly transform into the colour selected by <guilabel
->Colour 1</guilabel
-> as it moves to the edges, in an elliptical pattern.</para
-></listitem
-> 
+<term>Elliptic Gradient</term>
+<listitem><para>By choosing this mode, you select two colours (using both colour buttons). &kde; will then start with the colour selected by <guilabel>Colour 2</guilabel> in the centre of the screen, and slowly transform into the colour selected by <guilabel>Colour 1</guilabel> as it moves to the edges, in an elliptical pattern.</para></listitem> 
 </varlistentry>
 </variablelist>
 
-<para
->The setup button is only needed for if you select <guilabel
->Background program</guilabel
-> or <guilabel
->Patterns</guilabel
->. In these instances, another window will appear to configure the specifics.</para>
-<para
-><emphasis
->Wallpaper</emphasis
-></para>
-<para
->To select a new background image first, click on the <guilabel
->Wallpapers</guilabel
-> tab, then you can either select an image from the drop-down list labelled <guilabel
->Wallpaper</guilabel
-> or select <guibutton
->Browse...</guibutton
-> and select an image file from a file selector.</para>
-
-<para
->The image can be displayed in six different ways:</para>
+<para>The setup button is only needed for if you select <guilabel>Background program</guilabel> or <guilabel>Patterns</guilabel>. In these instances, another window will appear to configure the specifics.</para>
+<para><emphasis>Wallpaper</emphasis></para>
+<para>To select a new background image first, click on the <guilabel>Wallpapers</guilabel> tab, then you can either select an image from the drop-down list labelled <guilabel>Wallpaper</guilabel> or select <guibutton>Browse...</guibutton> and select an image file from a file selector.</para>
+
+<para>The image can be displayed in six different ways:</para>
 <variablelist>
 <varlistentry>
-<term
->No wallpaper</term
-> 
-<listitem
-><para
->No image is displayed. Just the background colours.</para>
-</listitem
-></varlistentry>
+<term>No wallpaper</term> 
+<listitem><para>No image is displayed. Just the background colours.</para>
+</listitem></varlistentry>
 <varlistentry>
-<term
->Centred</term
-> 
-<listitem
-><para
->The image will be centred on the screen. The background colours will be present anywhere the image does not cover.</para
-> </listitem>
+<term>Centred</term> 
+<listitem><para>The image will be centred on the screen. The background colours will be present anywhere the image does not cover.</para> </listitem>
 </varlistentry>
 <varlistentry>
-<term
->Tiled</term>
-<listitem
-><para
->The image will be duplicated until it fills the entire desktop. The first image will be placed in the upper left corner of the screen, and duplicated downward and to the right.</para
-> </listitem>
+<term>Tiled</term>
+<listitem><para>The image will be duplicated until it fills the entire desktop. The first image will be placed in the upper left corner of the screen, and duplicated downward and to the right.</para> </listitem>
 </varlistentry>
 <varlistentry>
-<term
->Centre Tiled</term>
-<listitem
-><para
->The image will be duplicated until it fills the entire desktop. The first image will be placed in the centre of the screen, and duplicated upwards, downwards to the right, and to the left.</para
-> </listitem>
+<term>Centre Tiled</term>
+<listitem><para>The image will be duplicated until it fills the entire desktop. The first image will be placed in the centre of the screen, and duplicated upwards, downwards to the right, and to the left.</para> </listitem>
 </varlistentry>
 <varlistentry>
-<term
->Centred Maxpect</term>
-<listitem
-><para
->The image will be placed in the centre of the screen. It will be scaled to fit the desktop, but it will not change the aspect ratio of the original image. This will provide you with an image that is not distorted. </para
-> </listitem>
+<term>Centred Maxpect</term>
+<listitem><para>The image will be placed in the centre of the screen. It will be scaled to fit the desktop, but it will not change the aspect ratio of the original image. This will provide you with an image that is not distorted. </para> </listitem>
 </varlistentry>
 <varlistentry>
-<term
->Scaled</term>
-<listitem
-><para
->The image will be scaled to fit the desktop. It will be stretched to fit all four corners.</para
-> </listitem>
+<term>Scaled</term>
+<listitem><para>The image will be scaled to fit the desktop. It will be stretched to fit all four corners.</para> </listitem>
 </varlistentry>
 </variablelist>
 
 </sect2>
 
 <sect2 id="tdmconfig-shutdown">
-<title
-><guilabel
->Shutdown</guilabel
-></title>
-
-<para
-><guilabel
->Allow Shutdown</guilabel
-></para>
-<para
->Use these dropdown box to choose who is allowed to shut down:</para>
+<title><guilabel>Shutdown</guilabel></title>
+
+<para><guilabel>Allow Shutdown</guilabel></para>
+<para>Use these dropdown box to choose who is allowed to shut down:</para>
 <itemizedlist>
 <listitem>
-<para
-><guilabel
->Nobody</guilabel
->: No one can shutdown the computer using &tdm;. You must be logged in, and execute a command.</para>
+<para><guilabel>Nobody</guilabel>: No one can shutdown the computer using &tdm;. You must be logged in, and execute a command.</para>
 </listitem>
 <listitem>
-<para
-><guilabel
->Everybody</guilabel
->: Everyone can shutdown the computer using &tdm;.</para>
+<para><guilabel>Everybody</guilabel>: Everyone can shutdown the computer using &tdm;.</para>
 </listitem>
-<listitem
-><para
-><guilabel
->Only Root</guilabel
->: &tdm; requires that the <systemitem
->root</systemitem
-> password be entered before shutting down the computer.</para
-></listitem
-> 
+<listitem><para><guilabel>Only Root</guilabel>: &tdm; requires that the <systemitem>root</systemitem> password be entered before shutting down the computer.</para></listitem> 
 </itemizedlist>
 
-<para
->You can independently configure who is allowed to issue a shutdown command for the <guilabel
->Local:</guilabel
-> and <guilabel
->Remote:</guilabel
-> users.</para>
-
-<para
-><emphasis
->Commands</emphasis
-></para
-> <para
->Use these text fields to define the exact shutdown command.</para
-> <para
->The <guilabel
->Halt:</guilabel
-> command defaults to <command
->/sbin/halt</command
->. The restart command defaults to <command
->/sbin/reboot</command
->.</para>
-
-<para
->When <guilabel
->Show boot options</guilabel
-> is enabled, &tdm; will on reboot offer you options for the lilo boot manager. For this feature to work, you will need to supply the correct paths to your <command
->lilo</command
-> command and to lilo's map file.</para>
+<para>You can independently configure who is allowed to issue a shutdown command for the <guilabel>Local:</guilabel> and <guilabel>Remote:</guilabel> users.</para>
+
+<para><emphasis>Commands</emphasis></para> <para>Use these text fields to define the exact shutdown command.</para> <para>The <guilabel>Halt:</guilabel> command defaults to <command>/sbin/halt</command>. The restart command defaults to <command>/sbin/reboot</command>.</para>
+
+<para>When <guilabel>Show boot options</guilabel> is enabled, &tdm; will on reboot offer you options for the lilo boot manager. For this feature to work, you will need to supply the correct paths to your <command>lilo</command> command and to lilo's map file.</para>
 
 
 <sect3 id="tdmconfig-sess">
-<title
->Session types</title>
-
-<para
->Define which session types should be accessible from the login window.</para>
-
-<para
->For more information on this subject, look at <filename class="directory"
->/etc/X11/xdm/Xsession</filename
-> to find your <application
->xdm</application
-> setup files. Also review the <ulink url="man:xdm"
->xdm man pages</ulink
->, especially under the SESSION PROGRAM section.</para>
-
-<para
->To add a session, type its name in the blank entitled <guilabel
->New types</guilabel
->, and click <guibutton
->Add new</guibutton
->. </para>
-
-<para
->To remove a session, select the session from the list and click <guibutton
->Remove</guibutton
->.</para>
+<title>Session types</title>
+
+<para>Define which session types should be accessible from the login window.</para>
+
+<para>For more information on this subject, look at <filename class="directory">/etc/X11/xdm/Xsession</filename> to find your <application>xdm</application> setup files. Also review the <ulink url="man:xdm">xdm man pages</ulink>, especially under the SESSION PROGRAM section.</para>
+
+<para>To add a session, type its name in the blank entitled <guilabel>New types</guilabel>, and click <guibutton>Add new</guibutton>. </para>
+
+<para>To remove a session, select the session from the list and click <guibutton>Remove</guibutton>.</para>
 
 </sect3>
 </sect2>
 <sect2 id="tdmconfig-users">
-<title
->Users</title>
+<title>Users</title>
 
-<para
->From here you can change the way users are represented in the login window.</para>
+<para>From here you can change the way users are represented in the login window.</para>
 
-<para
->You may disable the user list in &tdm; entirely in the <guilabel
->Show Users</guilabel
-> section. You can choose from:</para>
+<para>You may disable the user list in &tdm; entirely in the <guilabel>Show Users</guilabel> section. You can choose from:</para>
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->None</guilabel
-></term>
+<term><guilabel>None</guilabel></term>
 <listitem>
-<para
->Do not show any users. This is the most secure setting, since an attacker would then have to guess a valid login name as well as a password. It's also the preferred option if you have more than a handful of users to list, or the list itself would become unwieldy.</para>
+<para>Do not show any users. This is the most secure setting, since an attacker would then have to guess a valid login name as well as a password. It's also the preferred option if you have more than a handful of users to list, or the list itself would become unwieldy.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Selected only</guilabel
-></term>
+<term><guilabel>Selected only</guilabel></term>
 <listitem>
-<para
->Only show users you have specifically enabled.</para>
+<para>Only show users you have specifically enabled.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Not hidden</guilabel
-></term>
+<term><guilabel>Not hidden</guilabel></term>
 <listitem>
-<para
->Allows you to select a list of users that should <emphasis
->not</emphasis
-> be shown, and all other users will be listed.</para>
+<para>Allows you to select a list of users that should <emphasis>not</emphasis> be shown, and all other users will be listed.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->Independently of the users you specify by name, you can use the <guilabel
->System UIDs</guilabel
-> to specify a range of valid <acronym
->UID</acronym
->s that are shown in the list. By default user id's under 1000, which are often system or daemon users, and user id's over 65000, are not shown.</para>
+<para>Independently of the users you specify by name, you can use the <guilabel>System UIDs</guilabel> to specify a range of valid <acronym>UID</acronym>s that are shown in the list. By default user id's under 1000, which are often system or daemon users, and user id's over 65000, are not shown.</para>
 
-<para
->You can also enable the <guilabel
->Sort users</guilabel
-> checkbox, to have the user list sorted alphabetically. If this is disabled, users will appear in the order they are listed in the password file.</para>
+<para>You can also enable the <guilabel>Sort users</guilabel> checkbox, to have the user list sorted alphabetically. If this is disabled, users will appear in the order they are listed in the password file.</para>
 
-<para
->If you choose to show users, then the login window will show images (which you select), of a list of users. When someone is ready to login, they may select their user name/image, enter their password, and they are granted access. </para>
+<para>If you choose to show users, then the login window will show images (which you select), of a list of users. When someone is ready to login, they may select their user name/image, enter their password, and they are granted access. </para>
 
-<para
->If you permit a user image, then you can configure the source for those images.</para>
+<para>If you permit a user image, then you can configure the source for those images.</para>
 
-<para
->The available options for the <guilabel
->User Image Source</guilabel
-> are:</para>
+<para>The available options for the <guilabel>User Image Source</guilabel> are:</para>
 <!-- user image sources list here -->
 
-<para
->You can configure the admin picture here, for each user on the system. Depending on the order selected above, users may be able to override your selection.</para>
+<para>You can configure the admin picture here, for each user on the system. Depending on the order selected above, users may be able to override your selection.</para>
 
-<para
->If you choose not to show users, then the login window will be more traditional. Users will need to type their username and password to gain entrance. This is the preferred way if you have many users on this terminal.</para>
+<para>If you choose not to show users, then the login window will be more traditional. Users will need to type their username and password to gain entrance. This is the preferred way if you have many users on this terminal.</para>
 
 <sect3 id="tdmconfig-showusers">
-<title
->To show (and sort) or not to show users</title>
+<title>To show (and sort) or not to show users</title>
 
-<para
->Along the right edge of the window are two check boxes:</para>
+<para>Along the right edge of the window are two check boxes:</para>
 
-<para
->If <guilabel
->Show users</guilabel
-> is selected you have chosen to show images of users, instead of making them type their login name.</para>
+<para>If <guilabel>Show users</guilabel> is selected you have chosen to show images of users, instead of making them type their login name.</para>
 
-<para
->If <guilabel
->Sort users</guilabel
-> is selected, then the list of users will be sorted alphabetically in the login window. If unchecked, users will be listed in the same order as they are on this page. If <guilabel
->Show users</guilabel
-> is not checked, this has no effect.</para>
+<para>If <guilabel>Sort users</guilabel> is selected, then the list of users will be sorted alphabetically in the login window. If unchecked, users will be listed in the same order as they are on this page. If <guilabel>Show users</guilabel> is not checked, this has no effect.</para>
 
 </sect3>
 
 <sect3 id="tdmconfig-whichusers">
-<title
->How to determine which users to show and which users to hide</title>
+<title>How to determine which users to show and which users to hide</title>
 
-<para
->Below the user image box, and above the <guilabel
->Show users</guilabel
-> check box, is a set of two radio buttions:</para>
+<para>Below the user image box, and above the <guilabel>Show users</guilabel> check box, is a set of two radio buttions:</para>
 
 <itemizedlist>
-<listitem
-><para
->Show only selected users: If this option is selected, only the users contained in the list labelled <guilabel
->Selected Users</guilabel
->, will be displayed in the login window. If <guilabel
->Show users</guilabel
-> is not checked, this has no effect.</para
-></listitem>
-<listitem
-><para
->Show all users but no-show users: If this option is selected, all users will be listed, <emphasis
->except</emphasis
-> those users contained in the list entitled <guilabel
->No show users</guilabel
->. If <guilabel
->Show users</guilabel
-> is not checked, this has no effect. </para
-></listitem>
+<listitem><para>Show only selected users: If this option is selected, only the users contained in the list labelled <guilabel>Selected Users</guilabel>, will be displayed in the login window. If <guilabel>Show users</guilabel> is not checked, this has no effect.</para></listitem>
+<listitem><para>Show all users but no-show users: If this option is selected, all users will be listed, <emphasis>except</emphasis> those users contained in the list entitled <guilabel>No show users</guilabel>. If <guilabel>Show users</guilabel> is not checked, this has no effect. </para></listitem>
 </itemizedlist>
 
 </sect3>
 
 <sect3 id="tdmconfig-select">
-<title
->Select users</title>
+<title>Select users</title>
 
-<para
->This page contains three listboxes. The large listbox on the left shows all the users on the system which might be a genuine user.</para>
+<para>This page contains three listboxes. The large listbox on the left shows all the users on the system which might be a genuine user.</para>
 
-<para
->The top rightmost listbox shows the selected users and the bottom rightmost listbox shows the users we do not want displayed in the login window.</para>
+<para>The top rightmost listbox shows the selected users and the bottom rightmost listbox shows the users we do not want displayed in the login window.</para>
 
-<para
->To move a user from one listbox to another you click on the username in the listbox and click <guibutton
->&gt;&gt;</guibutton
-> to move the user from the leftmost box the the rightmost box or <guibutton
->&lt;&lt;</guibutton
-> to move the user from the rightmost box to the leftmost box.</para>
+<para>To move a user from one listbox to another you click on the username in the listbox and click <guibutton>&gt;&gt;</guibutton> to move the user from the leftmost box the the rightmost box or <guibutton>&lt;&lt;</guibutton> to move the user from the rightmost box to the leftmost box.</para>
 
 </sect3>
 
 <sect3 id="tdmconfig-image">
-<title
->Images</title>
-
-<note
-><para
->This section of the manual only applies if <guilabel
->Show users</guilabel
-> is selected. If it is not, this image box has no effect.</para
-></note>
-
-<para
->Every user on the system can be represented by an image. The image for each user is kept in a file called <filename
->$<envar
->TDEDIR</envar
->/share/apps/tdm/pics/users/$<envar
->USER</envar
->.xpm</filename
->. If there is no such file for a particular user, the file <filename
->$<envar
->TDEDIR</envar
->/share/apps/tdm/pics/users/default.xpm</filename
-> will be used instead.</para>
-
-<para
->To assign a new image to a user just select the user in one of the listboxes and either drop an imagefile on the image button to the right or click on the image button and select a new image from the image selector.</para>
-
-<para
->If no user is currently selected you will be asked if you want to change the default image.</para>
-
-<para
->The replacement is performed by a &konqueror; process so if the imagefile already exists you will be prompted by &konqueror; if you want to replace it. If you confirm the image will be replaced - you will <emphasis
->NOT</emphasis
-> have to press the <guibutton
->Apply</guibutton
-> button.</para>
+<title>Images</title>
+
+<note><para>This section of the manual only applies if <guilabel>Show users</guilabel> is selected. If it is not, this image box has no effect.</para></note>
+
+<para>Every user on the system can be represented by an image. The image for each user is kept in a file called <filename>$<envar>TDEDIR</envar>/share/apps/tdm/pics/users/$<envar>USER</envar>.xpm</filename>. If there is no such file for a particular user, the file <filename>$<envar>TDEDIR</envar>/share/apps/tdm/pics/users/default.xpm</filename> will be used instead.</para>
+
+<para>To assign a new image to a user just select the user in one of the listboxes and either drop an imagefile on the image button to the right or click on the image button and select a new image from the image selector.</para>
+
+<para>If no user is currently selected you will be asked if you want to change the default image.</para>
+
+<para>The replacement is performed by a &konqueror; process so if the imagefile already exists you will be prompted by &konqueror; if you want to replace it. If you confirm the image will be replaced - you will <emphasis>NOT</emphasis> have to press the <guibutton>Apply</guibutton> button.</para>
 
 </sect3>
 </sect2>
 
 <sect2 id="tdmconfig-convenience">
-<title
->Convenience</title>
+<title>Convenience</title>
 
-<para
->In the <guilabel
->convenience</guilabel
-> tab you can configure some options that make life easier for lazy people, like automatic login or disabling passwords.</para>
+<para>In the <guilabel>convenience</guilabel> tab you can configure some options that make life easier for lazy people, like automatic login or disabling passwords.</para>
 
-<important
-><para
->Please think more than twice before using these options. Every option in the <guilabel
->Convenience</guilabel
-> tab is well-suited to seriously compromise your system security. Practically, these options are only to be used in a completely non-critical environment, &eg; a private computer at home. </para
-></important>
+<important><para>Please think more than twice before using these options. Every option in the <guilabel>Convenience</guilabel> tab is well-suited to seriously compromise your system security. Practically, these options are only to be used in a completely non-critical environment, &eg; a private computer at home. </para></important>
 
 <sect3 id="loginmanager-convenience-autologin">
-<title
->Automatic Login</title>
+<title>Automatic Login</title>
 
-<para
->Automatic login will give anyone access to a certain account on your system without doing any authentication. You can enable it using the option <guilabel
->Enable auto-login</guilabel
->.</para>
+<para>Automatic login will give anyone access to a certain account on your system without doing any authentication. You can enable it using the option <guilabel>Enable auto-login</guilabel>.</para>
 
-<para
->You can choose the account to be used for automatic login from the list labelled <guilabel
->User:</guilabel
->.</para>
+<para>You can choose the account to be used for automatic login from the list labelled <guilabel>User:</guilabel>.</para>
 
 </sect3>
 
 <sect3 id="loginmanager-convenience-nopasswd">
-<title
-><guilabel
->Password-Less Login</guilabel
-></title>
-
-<para
->Using this feature, you can allow certain users to login without having to provide their password. Enable this feature using the <guilabel
->Enable password-less logins</guilabel
-> option.</para>
-
-<para
->Below this option you'll see a list of users on the system. Enable password-less login for specific users by checking the checkbox next to the login names. By default, this feature is disabled for all users.</para>
-
-<important
-><para
->Again, this option should only be used in a safe environment. If you enable it on a rather public system you should take care that only users with heavy access restrictions are granted password-less login, &eg; <systemitem
->guest</systemitem
->.</para
-></important>
-
-<para
->The <guilabel
->Automatically login after X server crash</guilabel
-> option allows you to skip the authentication procedure when your X server accidentally crashed.</para>
-
-<para
->You can also choose which user is <quote
->preselected</quote
-> when &tdm; starts. The default is <guilabel
->None</guilabel
->, but you can choose <guilabel
->Previous</guilabel
-> to have &tdm; default to the last successfully logged in user, or you can <guilabel
->Specify</guilabel
-> a particular user to always be selected from the list. You can also have &tdm; set the focus to the password field, so that when you reach the &tdm; login screen, you can type the password immediately.</para>
+<title><guilabel>Password-Less Login</guilabel></title>
+
+<para>Using this feature, you can allow certain users to login without having to provide their password. Enable this feature using the <guilabel>Enable password-less logins</guilabel> option.</para>
+
+<para>Below this option you'll see a list of users on the system. Enable password-less login for specific users by checking the checkbox next to the login names. By default, this feature is disabled for all users.</para>
+
+<important><para>Again, this option should only be used in a safe environment. If you enable it on a rather public system you should take care that only users with heavy access restrictions are granted password-less login, &eg; <systemitem>guest</systemitem>.</para></important>
+
+<para>The <guilabel>Automatically login after X server crash</guilabel> option allows you to skip the authentication procedure when your X server accidentally crashed.</para>
+
+<para>You can also choose which user is <quote>preselected</quote> when &tdm; starts. The default is <guilabel>None</guilabel>, but you can choose <guilabel>Previous</guilabel> to have &tdm; default to the last successfully logged in user, or you can <guilabel>Specify</guilabel> a particular user to always be selected from the list. You can also have &tdm; set the focus to the password field, so that when you reach the &tdm; login screen, you can type the password immediately.</para>
 
 </sect3>
 
@@ -1221,29 +564,16 @@
 
 <!-- ************************************************************ -->   
 <chapter id="configuring-your-system-for-tdm">
-<title
->Configuring your system to use &tdm;</title>
+<title>Configuring your system to use &tdm;</title>
 
-<para
->This chapter assumes that your system is already configured to run the X Window System, and that you only need to reconfigure it to allow graphical login.</para>
+<para>This chapter assumes that your system is already configured to run the X Window System, and that you only need to reconfigure it to allow graphical login.</para>
 
 <sect1 id="setting-up-tdm">
-<title
->Setting up &tdm;</title>
-
-<para
->The fundamental thing that controls whether your computer boots to a terminal prompt (console mode) or a graphical login prompt is the default runlevel. The runlevel is set by the program <application
-> <ulink url="man:init"
->/sbin/init</ulink
-></application
-> under the control of the configuration file <filename
->/etc/inittab</filename
->. The default runlevels used by different &UNIX; systems (and different &Linux; distributions) vary, but if you look at <filename
->/etc/inittab</filename
-> the start of it should be something like this:</para>
-
-<screen
-># Default runlevel. The runlevels used by RHS are:
+<title>Setting up &tdm;</title>
+
+<para>The fundamental thing that controls whether your computer boots to a terminal prompt (console mode) or a graphical login prompt is the default runlevel. The runlevel is set by the program <application> <ulink url="man:init">/sbin/init</ulink></application> under the control of the configuration file <filename>/etc/inittab</filename>. The default runlevels used by different &UNIX; systems (and different &Linux; distributions) vary, but if you look at <filename>/etc/inittab</filename> the start of it should be something like this:</para>
+
+<screen># Default runlevel. The runlevels used by RHS are:
 # 0 - halt (Do NOT set initdefault to this)
 # 1 - Single user mode
 # 2 - Multiuser, without NFS
@@ -1255,263 +585,107 @@
 id:3:initdefault:  
 </screen>
 
-<para
->All but the last line of this extract are comments. The comments show that runlevel 5 is used for X11 and that runlevel 3 is used for multi-user mode without X11 (console mode). The final line specifies that the default runlevel of the system is 3 (console mode). If your system currently uses graphical login (for example, using &xdm;) its default runlevel will match the runlevel specified for X11.</para>
+<para>All but the last line of this extract are comments. The comments show that runlevel 5 is used for X11 and that runlevel 3 is used for multi-user mode without X11 (console mode). The final line specifies that the default runlevel of the system is 3 (console mode). If your system currently uses graphical login (for example, using &xdm;) its default runlevel will match the runlevel specified for X11.</para>
 
-<para
->The runlevel with graphical login (&xdm;) for some common &Linux; distributions are:</para>
+<para>The runlevel with graphical login (&xdm;) for some common &Linux; distributions are:</para>
 
 <itemizedlist>
-<listitem
-><para
->5 for &RedHat; 3.x and later, and for &Mandrake;</para
-></listitem>
-<listitem
-><para
->4 for Slackware</para
-></listitem>
-<listitem
-><para
->3 for &SuSE;. 4.x and 5.x</para
-></listitem>
+<listitem><para>5 for &RedHat; 3.x and later, and for &Mandrake;</para></listitem>
+<listitem><para>4 for Slackware</para></listitem>
+<listitem><para>3 for &SuSE;. 4.x and 5.x</para></listitem>
 </itemizedlist>
 
-<para
->The first step in configuring your system is to ensure that you can start &tdm; from the command line. Once this is working, you can change your system configuration so that &tdm; starts automatically each time you reboot your system.</para>
-
-<para
->To test &tdm;, you must first bring your system to a runlevel that does not run &xdm;. To do so, issue a command like this:</para>
-
-<screen
-><command
->/sbin/init <option
->3</option
-></command
-></screen>
-
-<para
->Instead of the number <option
->3</option
-> you should specify the appropriate runlevel for console mode on your system.</para>
-
-<para
->If your system uses Pluggable Authentication Modules (<abbrev
->PAM</abbrev
->), which is normal with recent &Linux; and Solaris systems, you should check that your <abbrev
->PAM</abbrev
-> configuration permits login through the service named <literal
->kde</literal
->. If you previously used &xdm; successfully, you should not need to make any changes to your <abbrev
->PAM</abbrev
-> configuration in order to use &tdm;. <filename
->/etc/pam.conf</filename
-> or <filename
->/etc/pam.d/kde</filename
->. Information on configuring <abbrev
->PAM</abbrev
-> is beyond the scope of this handbook, but <abbrev
->PAM</abbrev
-> comes with comprehensive documentation (try looking in <filename
->/usr/share/doc/*pam*/html/</filename
->).</para>
-
-<para
->Now it's time for you to test &tdm; by issuing the following command:</para>
-
-<screen
-><command
->tdm <option
->-nodaemon</option
-></command
->
+<para>The first step in configuring your system is to ensure that you can start &tdm; from the command line. Once this is working, you can change your system configuration so that &tdm; starts automatically each time you reboot your system.</para>
+
+<para>To test &tdm;, you must first bring your system to a runlevel that does not run &xdm;. To do so, issue a command like this:</para>
+
+<screen><command>/sbin/init <option>3</option></command></screen>
+
+<para>Instead of the number <option>3</option> you should specify the appropriate runlevel for console mode on your system.</para>
+
+<para>If your system uses Pluggable Authentication Modules (<abbrev>PAM</abbrev>), which is normal with recent &Linux; and Solaris systems, you should check that your <abbrev>PAM</abbrev> configuration permits login through the service named <literal>kde</literal>. If you previously used &xdm; successfully, you should not need to make any changes to your <abbrev>PAM</abbrev> configuration in order to use &tdm;. <filename>/etc/pam.conf</filename> or <filename>/etc/pam.d/kde</filename>. Information on configuring <abbrev>PAM</abbrev> is beyond the scope of this handbook, but <abbrev>PAM</abbrev> comes with comprehensive documentation (try looking in <filename>/usr/share/doc/*pam*/html/</filename>).</para>
+
+<para>Now it's time for you to test &tdm; by issuing the following command:</para>
+
+<screen><command>tdm <option>-nodaemon</option></command>
 </screen>
 
-<para
->If you get a &tdm; login dialogue and you are able to log in, things are going well. The main thing that can go wrong here is that the run-time linker might not find the shared &Qt; or &kde; libraries. If you have a binary distribution of the &kde; libraries, make sure &tdm; is installed where the libraries believe &kde; is installed and try setting some environment variables to point to your &kde; and &Qt; libraries.</para>
-
-<para
->For example:</para>
-
-<screen
-><command
->export 
-<option
->TDEDIR=<replaceable
->/opt/kde</replaceable
-></option
-></command>
-<command
->export 
-<option
->QTDIR=<replaceable
->/usr/lib/qt2</replaceable
-></option
-></command>
-<command
->export 
-<option
->PATH=<replaceable
->$TDEDIR/bin:$QTDIR/bin:$PATH</replaceable
-></option
-></command>
-<command
->export 
-<option
->LD_LIBRARY_PATH=<replaceable
->$TDEDIR/lib:$QTDIR/lib</replaceable
-></option
-></command
->
+<para>If you get a &tdm; login dialogue and you are able to log in, things are going well. The main thing that can go wrong here is that the run-time linker might not find the shared &Qt; or &kde; libraries. If you have a binary distribution of the &kde; libraries, make sure &tdm; is installed where the libraries believe &kde; is installed and try setting some environment variables to point to your &kde; and &Qt; libraries.</para>
+
+<para>For example:</para>
+
+<screen><command>export 
+<option>TDEDIR=<replaceable>/opt/kde</replaceable></option></command>
+<command>export 
+<option>QTDIR=<replaceable>/usr/lib/qt2</replaceable></option></command>
+<command>export 
+<option>PATH=<replaceable>$TDEDIR/bin:$QTDIR/bin:$PATH</replaceable></option></command>
+<command>export 
+<option>LD_LIBRARY_PATH=<replaceable>$TDEDIR/lib:$QTDIR/lib</replaceable></option></command>
 </screen>
 
-<para
->If you are still unsuccessful, try starting &xdm; instead, to make sure that you are not suffering from a more serious X configuration problem.</para>
+<para>If you are still unsuccessful, try starting &xdm; instead, to make sure that you are not suffering from a more serious X configuration problem.</para>
 
-<para
->When you are able to start &tdm; successfully, you can start to replace &xdm; by &tdm;. Again, this is distribution-dependent.</para>
+<para>When you are able to start &tdm; successfully, you can start to replace &xdm; by &tdm;. Again, this is distribution-dependent.</para>
 
 <itemizedlist>
 <listitem>
-<para
->For &RedHat;, edit <filename
->/etc/inittab</filename
->, look for the string xdm and replace it with &tdm; (including all paths).</para>
+<para>For &RedHat;, edit <filename>/etc/inittab</filename>, look for the string xdm and replace it with &tdm; (including all paths).</para>
 </listitem>
 <listitem>
-<para
->For &Mandrake;, the X11 runlevel in <filename
->/etc/inittab</filename
-> invokes the shell script <filename
->/etc/X11/prefdm</filename
->, which is set up to select from amongst several display managers, including &tdm;. Make sure that all the paths are correct for your installation.</para
-> 
+<para>For &Mandrake;, the X11 runlevel in <filename>/etc/inittab</filename> invokes the shell script <filename>/etc/X11/prefdm</filename>, which is set up to select from amongst several display managers, including &tdm;. Make sure that all the paths are correct for your installation.</para> 
 </listitem>
 <listitem>
-<para
->For &SuSE;, edit <filename
->/sbin/init.d/xdm</filename
-> to add a first line:</para>
+<para>For &SuSE;, edit <filename>/sbin/init.d/xdm</filename> to add a first line:</para>
 
-<screen
->. /etc/rc.config
+<screen>. /etc/rc.config
 DISPLAYMANAGER=tdm
 export DISPLAYMANAGER</screen>
 </listitem>
-<listitem
-><para
->For FreeBSD, edit <filename
->/etc/ttys</filename
-> and find the line like this: <screen
->ttyv8   "/usr/X11R6/bin/xdm -nodaemon"  xterm   off secure</screen
-> and edit it to this: <screen
->ttyv8   "/usr/local/bin/tdm -nodaemon"  xterm   on secure</screen>
+<listitem><para>For FreeBSD, edit <filename>/etc/ttys</filename> and find the line like this: <screen>ttyv8   "/usr/X11R6/bin/xdm -nodaemon"  xterm   off secure</screen> and edit it to this: <screen>ttyv8   "/usr/local/bin/tdm -nodaemon"  xterm   on secure</screen>
 </para>
 </listitem>
 
-<listitem
-><para
->Most other distributions are a variation of one of these.</para
-></listitem>
+<listitem><para>Most other distributions are a variation of one of these.</para></listitem>
 </itemizedlist>
 
-<para
->At this stage, you can test &tdm; again by bringing your system to the runlevel that should now run &tdm;. To do so, issue a command like this:</para>
+<para>At this stage, you can test &tdm; again by bringing your system to the runlevel that should now run &tdm;. To do so, issue a command like this:</para>
 
-<screen
-><command
->/sbin/init <option
->5</option
-></command
->
+<screen><command>/sbin/init <option>5</option></command>
 </screen>
 
-<para
->Instead of the number <option
->5</option
-> you should specify the appropriate runlevel for running X11 on your system.</para>
-
-<para
->The final step is to edit the <parameter
->initdefault</parameter
-> entry in <filename
->/etc/inittab</filename
-> to specify the appropriate runlevel for X11.</para>
-
-<warning
-><para
->Before you make this change, ensure that you have a way to reboot your system if a problem occurs. This might be a <quote
->rescue</quote
-> floppy-disk provided by your operating system distribution or a specially-designed <quote
->rescue</quote
-> floppy-disk, such as <literal
->tomsrtbt</literal
->. Ignore this advice at your peril.</para
-></warning>
-
-<para
->When you reboot your system, you should end up with the graphical &tdm; login dialogue.</para>
-
-<para
->If this step is unsuccessful the most likely problem is that the environment used at boot time differs from the environment that you used for testing at the command line. If you are trying to get two versions of KDE to co-exist, be particularly careful that the settings you use for your <envar
->PATH</envar
-> and <envar
->LD_LIBRARY_PATH</envar
-> environment variables are consistent, and that the startup scripts are not over-riding them in some way.</para>
+<para>Instead of the number <option>5</option> you should specify the appropriate runlevel for running X11 on your system.</para>
+
+<para>The final step is to edit the <parameter>initdefault</parameter> entry in <filename>/etc/inittab</filename> to specify the appropriate runlevel for X11.</para>
+
+<warning><para>Before you make this change, ensure that you have a way to reboot your system if a problem occurs. This might be a <quote>rescue</quote> floppy-disk provided by your operating system distribution or a specially-designed <quote>rescue</quote> floppy-disk, such as <literal>tomsrtbt</literal>. Ignore this advice at your peril.</para></warning>
+
+<para>When you reboot your system, you should end up with the graphical &tdm; login dialogue.</para>
+
+<para>If this step is unsuccessful the most likely problem is that the environment used at boot time differs from the environment that you used for testing at the command line. If you are trying to get two versions of KDE to co-exist, be particularly careful that the settings you use for your <envar>PATH</envar> and <envar>LD_LIBRARY_PATH</envar> environment variables are consistent, and that the startup scripts are not over-riding them in some way.</para>
 
 </sect1>
 
 </chapter>
 
 <chapter id="different-window-managers-with-tdm">
-<title
->Supporting multiple window managers</title>
-
-<para
->The main dialogue box for &tdm; includes a <guilabel
->Session Type:</guilabel
-> drop-down box, which allows you to select a window manager to use for your session. This chapter describes the changes that you must make to your configuration files in order to support this feature.</para>
-
-<para
->The options that appear in the <guilabel
->Session Type:</guilabel
-> drop-down box are <ulink url="TDM"
->configured</ulink
-> by entries in the <literal
->TDM</literal
-> section of &tdmrc;.</para>
-
-<para
->When you log in using &tdm;, the shell script <filename
->Xsession</filename
-> is executed. The session type that you select is passed as a command-line argument. (<filename
->Xsession</filename
-> can be found in <filename
->/etc/X11/xdm/</filename
-> for Redhat and Mandrake, and in <filename
->/usr/X11R6/lib/X11/xdm/</filename
-> for S.u.S.E.). Whilst debugging, you might find it helpful to add this line to <filename
->Xsession</filename
->:</para>
+<title>Supporting multiple window managers</title>
+
+<para>The main dialogue box for &tdm; includes a <guilabel>Session Type:</guilabel> drop-down box, which allows you to select a window manager to use for your session. This chapter describes the changes that you must make to your configuration files in order to support this feature.</para>
+
+<para>The options that appear in the <guilabel>Session Type:</guilabel> drop-down box are <ulink url="TDM">configured</ulink> by entries in the <literal>TDM</literal> section of &tdmrc;.</para>
+
+<para>When you log in using &tdm;, the shell script <filename>Xsession</filename> is executed. The session type that you select is passed as a command-line argument. (<filename>Xsession</filename> can be found in <filename>/etc/X11/xdm/</filename> for Redhat and Mandrake, and in <filename>/usr/X11R6/lib/X11/xdm/</filename> for S.u.S.E.). Whilst debugging, you might find it helpful to add this line to <filename>Xsession</filename>:</para>
       
-<screen
->echo "$0 || $1 || $2" 
-> $HOME/.Xsession_args </screen>
+<screen>echo "$0 || $1 || $2" > $HOME/.Xsession_args </screen>
 
-<para
->How you proceed now depends upon how your system usually starts up window managers. Here are two different approaches, with examples of the changes that you must make:</para>
+<para>How you proceed now depends upon how your system usually starts up window managers. Here are two different approaches, with examples of the changes that you must make:</para>
 
 <itemizedlist>
 
-<listitem
-><para
->The window manager is started by commands within <filename
->Xsession</filename
->. In this case, you can add a case statement to start the appropriate window manager. Linux Mandrake uses this approach; here is an extract from <filename
->Xsession</filename
->:</para>
+<listitem><para>The window manager is started by commands within <filename>Xsession</filename>. In this case, you can add a case statement to start the appropriate window manager. Linux Mandrake uses this approach; here is an extract from <filename>Xsession</filename>:</para>
 
-<screen
-># now, we see if xdm/gdm/tdm has asked for a specific environment
+<screen># now, we see if xdm/gdm/tdm has asked for a specific environment
 case $# in
 1)
     case $1 in
@@ -1536,50 +710,17 @@ esac
 </screen>
 </listitem>
 
-<listitem
-><para
->The window manager is started by another script that is invoked by <filename
->Xsession</filename
->. In this case you must ensure that the parameter passed to <filename
->Xsession</filename
-> is passed on to that other script. For example, if the window manager is started like this:</para>
-
-<screen
-><command
->exec <option
->$startup</option
-></command
-></screen>
-
-<para
->you would need to change it to:</para>
-
-<screen
-><command
->exec <option
->$startup</option
-><option
->$@</option
-></command
-></screen>
-
-<para
->Having made this change, you must trace your way through the startup to find the place where the window manager is started. One approach uses <filename
->xinitrc</filename
-> to start the window manager; this allows a system-wide file <filename
->/etc/X11/xinit/xinitrc</filename
-> or a user-specific file <filename
->$HOME/.xinitrc</filename
-> to be used. If you edit <filename
->$HOME/.xinitrc</filename
->, you may want to save a copy in <filename
->/etc/skel</filename
->, so that it will be automatically generated in every user account you create from now on. Here is an example <filename
->xinitrc</filename
-> for a system using this approach:</para>
-
-<screen
->#!/bin/bash
+<listitem><para>The window manager is started by another script that is invoked by <filename>Xsession</filename>. In this case you must ensure that the parameter passed to <filename>Xsession</filename> is passed on to that other script. For example, if the window manager is started like this:</para>
+
+<screen><command>exec <option>$startup</option></command></screen>
+
+<para>you would need to change it to:</para>
+
+<screen><command>exec <option>$startup</option><option>$@</option></command></screen>
+
+<para>Having made this change, you must trace your way through the startup to find the place where the window manager is started. One approach uses <filename>xinitrc</filename> to start the window manager; this allows a system-wide file <filename>/etc/X11/xinit/xinitrc</filename> or a user-specific file <filename>$HOME/.xinitrc</filename> to be used. If you edit <filename>$HOME/.xinitrc</filename>, you may want to save a copy in <filename>/etc/skel</filename>, so that it will be automatically generated in every user account you create from now on. Here is an example <filename>xinitrc</filename> for a system using this approach:</para>
+
+<screen>#!/bin/bash
 #
 # .xsession/.xinitrc
 #
@@ -1639,164 +780,82 @@ exec $WINDOWMANAGER
 </chapter>
 
 <chapter id="xdmcp-with-tdm">
-<title
->Using &tdm; for Remote Logins (&XDMCP;)</title>
+<title>Using &tdm; for Remote Logins (&XDMCP;)</title>
 
-<para
->&XDMCP; is the Open Group standard, the <quote
->X Display Manager Control Protocol</quote
->. This is used to set up connections between remote systems over the network.</para>
+<para>&XDMCP; is the Open Group standard, the <quote>X Display Manager Control Protocol</quote>. This is used to set up connections between remote systems over the network.</para>
 
-<para
->&XDMCP; is useful in multiuser situations where there are users with workstations and a more powerful server that can provide the resources to run multiple X sessions. For example, &XDMCP; is a good way to reuse old computers - a Pentium or even 486 computer with 16 Mb RAM is sufficient to run X itself, and using XDMCP such a computer can run a full modern &kde; session from a server. For the server part, once a single &kde; (or other environment) session is running, running another one requires very few extra resources.</para>
+<para>&XDMCP; is useful in multiuser situations where there are users with workstations and a more powerful server that can provide the resources to run multiple X sessions. For example, &XDMCP; is a good way to reuse old computers - a Pentium or even 486 computer with 16 Mb RAM is sufficient to run X itself, and using XDMCP such a computer can run a full modern &kde; session from a server. For the server part, once a single &kde; (or other environment) session is running, running another one requires very few extra resources.</para>
 
-<para
->However, allowing another method of login to your machine obviously has security implications. You should run this service only if you need to allow remote X Servers to start login sessions on your system. Users with a single &UNIX; computer should not need to run this.</para>
+<para>However, allowing another method of login to your machine obviously has security implications. You should run this service only if you need to allow remote X Servers to start login sessions on your system. Users with a single &UNIX; computer should not need to run this.</para>
 
 <!-- Write more stuff -->
 </chapter>
 
 <!-- *********************************************************************** -->
 <chapter id="Other-Information">
-<title
->Other sources of information</title>
-
-<para
->Since &tdm; is descended from &xdm;, the <ulink url="man:xdm"
->xdm man page</ulink
-> may provide useful background information. For X-related problems try the man pages <ulink url="man:X"
->X</ulink
-> and <ulink url="man:startx"
->startx</ulink
->. If you have questions about &tdm; that are not answered by this handbook, take advantage of the fact the &tdm; is provided under the terms of the <abbrev
->GNU</abbrev
-> General Public Licence: look at the source code. </para>
+<title>Other sources of information</title>
+
+<para>Since &tdm; is descended from &xdm;, the <ulink url="man:xdm">xdm man page</ulink> may provide useful background information. For X-related problems try the man pages <ulink url="man:X">X</ulink> and <ulink url="man:startx">startx</ulink>. If you have questions about &tdm; that are not answered by this handbook, take advantage of the fact the &tdm; is provided under the terms of the <abbrev>GNU</abbrev> General Public Licence: look at the source code. </para>
 
 </chapter>
 
 <!-- *********************************************************************** -->
-<chapter id="credits"
-><title
->Credits and Licence</title>
-
-<para
->&tdm; is derived from, and includes code from, &xdm; (C) Keith Packard, MIT X Consortium.</para>
-
-<para
->&tdm; 0.1 was written by Matthias Ettrich. Later versions till &kde; 2.0.x were written by Steffen Hansen. Some new features for &kde; 2.1.x and a major rewrite for &kde; 2.2.x made by Oswald Buddenhagen.</para>
-
-<para
->Other parts of the &tdm; code are copyright by the authors, and licensed under the terms of the <ulink url="common/gpl-license.html"
->GNU GPL</ulink
->. Anyone is allowed to change &tdm; and redistribute the result as long as the names of the authors are mentioned.</para>
-
-<para
->&tdm; requires the Qt library, which is copyright Troll Tech AS.</para>
-
-<para
->Documentation contributors: <itemizedlist>
-
-<listitem
-><para
->Documentation written by Steffen Hansen <email
->stefh@dit.ou.dk</email
-></para
-></listitem>
-
-<listitem
-><para
->Documentation extended by Gregor Zumstein<email
->zumstein@ssd.ethz.ch</email
->. Last update August 9, 1998</para
-></listitem>
-
-<listitem
-><para
->Documentation revised for KDE 2 by Neal Crook<email
->nac@forth.org</email
->. Last update August 6, 2000</para
-></listitem>
-
-<listitem
-><para
->Documentation extended and revised for KDE 2.2 by Oswald Buddenhagen<email
->ossi@kde.org</email
->. Last update August, 2001</para
-></listitem>
-
-</itemizedlist
-></para>
-
-<para
->Documentation copyright Steffen Hansen, Gregor Zumstein, Neal Crook and Oswald Buddenhagen. This document also includes large parts of the &xdm; man page, which is (C) Keith Packard.</para>
-
-<para
->Conversion to British English: John Knight <email
->anarchist_tomato@herzeleid.net</email
-></para
-> 
+<chapter id="credits"><title>Credits and Licence</title>
+
+<para>&tdm; is derived from, and includes code from, &xdm; (C) Keith Packard, MIT X Consortium.</para>
+
+<para>&tdm; 0.1 was written by Matthias Ettrich. Later versions till &kde; 2.0.x were written by Steffen Hansen. Some new features for &kde; 2.1.x and a major rewrite for &kde; 2.2.x made by Oswald Buddenhagen.</para>
+
+<para>Other parts of the &tdm; code are copyright by the authors, and licensed under the terms of the <ulink url="common/gpl-license.html">GNU GPL</ulink>. Anyone is allowed to change &tdm; and redistribute the result as long as the names of the authors are mentioned.</para>
+
+<para>&tdm; requires the Qt library, which is copyright Troll Tech AS.</para>
+
+<para>Documentation contributors: <itemizedlist>
+
+<listitem><para>Documentation written by Steffen Hansen <email>stefh@dit.ou.dk</email></para></listitem>
+
+<listitem><para>Documentation extended by Gregor Zumstein<email>zumstein@ssd.ethz.ch</email>. Last update August 9, 1998</para></listitem>
+
+<listitem><para>Documentation revised for KDE 2 by Neal Crook<email>nac@forth.org</email>. Last update August 6, 2000</para></listitem>
+
+<listitem><para>Documentation extended and revised for KDE 2.2 by Oswald Buddenhagen<email>ossi@kde.org</email>. Last update August, 2001</para></listitem>
+
+</itemizedlist></para>
+
+<para>Documentation copyright Steffen Hansen, Gregor Zumstein, Neal Crook and Oswald Buddenhagen. This document also includes large parts of the &xdm; man page, which is (C) Keith Packard.</para>
+
+<para>Conversion to British English: John Knight <email>anarchist_tomato@herzeleid.net</email></para> 
 &underFDL; &underGPL; </chapter>
 
 <appendix id="building-and-installing-tdm">
-<title
->Building and Installing tdm</title>
-
-<para
->&tdm; is part of the KDE project. The various component parts of the KDE project are broken into sections, called packages. &tdm; is part of the package called tdebase. You can get KDE source code from various Linux and BSD distribution CDs, or by download from <ulink url="http://www.kde.org"
->www.kde.org</ulink
-> or its mirrors. If you have an out-of-date source code tree, you can use one of the KDE cvsup servers to bring it up-to-date whilst using minimal network bandwidth. </para>
-
-<para
->Before building tdebase, you must have built and installed (in this order) version 2 of the qt library and the KDE packages tdesupport (optionally) and tdelibs.</para>
-
-<para
->In order to build any of the above, you must already have the X Window System installed, together with a C++ compiler. If are you building from CVS you will also need the GNU configuration tools <application
->automake</application
-> and <application
->autoconf</application
->.</para>
-
-<para
->If the last few paragraphs seemed like a foreign language, then either you have strayed into an Inappropriate Area of this handbook, or you are about to undergo a Great Learning Experience.</para>
-
-<para
->If you managed to satisfy all of the prerequisites, you are unlikely to have any problems with building and installing tdebase. &tdm; is installed in your <filename
->$TDEDIR/bin</filename
-> folder.</para>
-
-<note
-><para
-><command
->make <option
->install</option
-></command
-> will <emphasis
->not</emphasis
-> overwrite your previous &tdm; config files including &tdmrc;.</para
-></note>
+<title>Building and Installing tdm</title>
+
+<para>&tdm; is part of the KDE project. The various component parts of the KDE project are broken into sections, called packages. &tdm; is part of the package called tdebase. You can get KDE source code from various Linux and BSD distribution CDs, or by download from <ulink url="http://www.kde.org">www.kde.org</ulink> or its mirrors. If you have an out-of-date source code tree, you can use one of the KDE cvsup servers to bring it up-to-date whilst using minimal network bandwidth. </para>
+
+<para>Before building tdebase, you must have built and installed (in this order) version 2 of the qt library and the KDE packages tdesupport (optionally) and tdelibs.</para>
+
+<para>In order to build any of the above, you must already have the X Window System installed, together with a C++ compiler. If are you building from CVS you will also need the GNU configuration tools <application>automake</application> and <application>autoconf</application>.</para>
+
+<para>If the last few paragraphs seemed like a foreign language, then either you have strayed into an Inappropriate Area of this handbook, or you are about to undergo a Great Learning Experience.</para>
+
+<para>If you managed to satisfy all of the prerequisites, you are unlikely to have any problems with building and installing tdebase. &tdm; is installed in your <filename>$TDEDIR/bin</filename> folder.</para>
+
+<note><para><command>make <option>install</option></command> will <emphasis>not</emphasis> overwrite your previous &tdm; config files including &tdmrc;.</para></note>
 
 </appendix>
 
 <glossary id="glossary">
-<title
->Glossary</title>
+<title>Glossary</title>
 
 <glossentry id="gloss-greeter">
-<glossterm
->greeter</glossterm>
-<glossdef
-><para
->The greeter is the login dialogue, &ie; the part of &tdm; which the user sees.</para>
+<glossterm>greeter</glossterm>
+<glossdef><para>The greeter is the login dialogue, &ie; the part of &tdm; which the user sees.</para>
 </glossdef>
 </glossentry>
 
 <glossentry>
-<glossterm id="gloss-entropy"
->entropy</glossterm>
-<glossdef
-><para
->...</para
-></glossdef>
+<glossterm id="gloss-entropy">entropy</glossterm>
+<glossdef><para>...</para></glossdef>
 </glossentry>
 
 </glossary>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdm/tdmrc-ref.docbook b/tde-i18n-en_GB/docs/tdebase/tdm/tdmrc-ref.docbook
index a778a4b0d2f..4e122e4c1d4 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdm/tdmrc-ref.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdm/tdmrc-ref.docbook
@@ -1,138 +1,66 @@
 <!-- generated from ../../tdm/kfrontend/config.def - DO NOT EDIT! -->
 
 <chapter id="tdm-files">
-<title
->The Files &tdm; Uses for Configuration</title>
+<title>The Files &tdm; Uses for Configuration</title>
 
-<para
->This chapter documents the files that control &tdm;'s behaviour. Some of this can be also controlled from the &kcontrol; module, but not all.</para>
+<para>This chapter documents the files that control &tdm;'s behaviour. Some of this can be also controlled from the &kcontrol; module, but not all.</para>
 
 <sect1>
-<title
->&tdmrc; - The &tdm; master configuration file</title>
-
-<para
->The basic format of the file is <quote
->INI-like</quote
->. Options are key/value pairs, placed in sections. Everything in the file is case sensitive. Syntactic errors and unrecognised key/section identifiers cause &tdm; to issue non-fatal error messages.</para>
-
-<para
->Lines beginning with <literal
->#</literal
-> are comments; empty lines are ignored as well.</para>
-
-<para
->Sections are denoted by <literal
->[</literal
-><replaceable
->Name of Section</replaceable
-><literal
->]</literal
->. </para>
-
-<para
->You can configure every X-display individually.</para>
-<para
->Every display has a display name, which consists of a host name (which is empty for local displays specified in the Xservers file), a colon and a display number. Additionally, a display belongs to a display class (which can be ignored in most cases).</para>
-
-<para
->Sections with display-specific settings have the formal syntax <literal
->[X-</literal
->&nbsp;<replaceable
->host</replaceable
->&nbsp;[&nbsp;<literal
->:</literal
->&nbsp;<replaceable
->number</replaceable
->&nbsp;[&nbsp;<literal
->_</literal
->&nbsp;<replaceable
->class</replaceable
->&nbsp;]&nbsp;]&nbsp;<literal
->-</literal
->&nbsp;<replaceable
->sub-section</replaceable
->&nbsp;<literal
->]</literal
-> </para>
-<para
->All sections with the same <replaceable
->sub-section</replaceable
-> make up a section class.</para>
-
-<para
->You can use the <literal
->*</literal
-> wildcard for <replaceable
->host</replaceable
->, <replaceable
->number</replaceable
-> and <replaceable
->class</replaceable
->. You may omit trailing components; they are assumed to be <literal
->*</literal
-> then. The host part may be a domain specification like <replaceable
->.inf.tu-dresden.de</replaceable
->.</para>
-
-<para
->From which section a setting is actually taken is determined by these rules:</para>
+<title>&tdmrc; - The &tdm; master configuration file</title>
+
+<para>The basic format of the file is <quote>INI-like</quote>. Options are key/value pairs, placed in sections. Everything in the file is case sensitive. Syntactic errors and unrecognised key/section identifiers cause &tdm; to issue non-fatal error messages.</para>
+
+<para>Lines beginning with <literal>#</literal> are comments; empty lines are ignored as well.</para>
+
+<para>Sections are denoted by <literal>[</literal><replaceable>Name of Section</replaceable><literal>]</literal>. </para>
+
+<para>You can configure every X-display individually.</para>
+<para>Every display has a display name, which consists of a host name (which is empty for local displays specified in the Xservers file), a colon and a display number. Additionally, a display belongs to a display class (which can be ignored in most cases).</para>
+
+<para>Sections with display-specific settings have the formal syntax <literal>[X-</literal>&nbsp;<replaceable>host</replaceable>&nbsp;[&nbsp;<literal>:</literal>&nbsp;<replaceable>number</replaceable>&nbsp;[&nbsp;<literal>_</literal>&nbsp;<replaceable>class</replaceable>&nbsp;]&nbsp;]&nbsp;<literal>-</literal>&nbsp;<replaceable>sub-section</replaceable>&nbsp;<literal>]</literal> </para>
+<para>All sections with the same <replaceable>sub-section</replaceable> make up a section class.</para>
+
+<para>You can use the <literal>*</literal> wildcard for <replaceable>host</replaceable>, <replaceable>number</replaceable> and <replaceable>class</replaceable>. You may omit trailing components; they are assumed to be <literal>*</literal> then. The host part may be a domain specification like <replaceable>.inf.tu-dresden.de</replaceable>.</para>
+
+<para>From which section a setting is actually taken is determined by these rules:</para>
 
 <itemizedlist>
 <listitem>
-<para
->An exact match takes precedence over a partial match (for the host part), which in turn takes precedence over a wildcard.</para>
+<para>An exact match takes precedence over a partial match (for the host part), which in turn takes precedence over a wildcard.</para>
 </listitem>
 
 <listitem>
-<para
->Precedence decreases from left to right for equally exact matches.</para>
+<para>Precedence decreases from left to right for equally exact matches.</para>
 </listitem>
 
 <listitem>
 
-<para
->Example: display name <quote
->myhost:0</quote
->, class <quote
->dpy</quote
-> </para>
+<para>Example: display name <quote>myhost:0</quote>, class <quote>dpy</quote> </para>
 <itemizedlist>
 <listitem>
-<para
->[X-myhost:0_dpy] precedes</para>
+<para>[X-myhost:0_dpy] precedes</para>
 </listitem>
 <listitem>
-<para
->[X-myhost:0_*] (same as [X-myhost:0]) precedes</para>
+<para>[X-myhost:0_*] (same as [X-myhost:0]) precedes</para>
 </listitem>
 <listitem>
-<para
->[X-myhost:*_dpy] precedes</para>
+<para>[X-myhost:*_dpy] precedes</para>
 </listitem>
 <listitem>
-<para
->[X-myhost:*_*] (same as [X-myhost]) precedes</para>
+<para>[X-myhost:*_*] (same as [X-myhost]) precedes</para>
 </listitem>
 <listitem>
-<para
->[X-*:0_dpy] precedes</para>
+<para>[X-*:0_dpy] precedes</para>
 </listitem>
 <listitem>
-<para
->[X-*:0_*] (same as [X-*:0]) precedes</para>
+<para>[X-*:0_*] (same as [X-*:0]) precedes</para>
 </listitem>
 <listitem>
-<para
->[X-*:*_*] (same as [X-*]).</para>
+<para>[X-*:*_*] (same as [X-*]).</para>
 </listitem>
 <listitem>
-<para
->These sections do <emphasis
->not</emphasis
-> match this display:</para>
-<para
->[X-hishost], [X-myhost:0_dec], [X-*:1], [X-:*]</para>
+<para>These sections do <emphasis>not</emphasis> match this display:</para>
+<para>[X-hishost], [X-myhost:0_dec], [X-*:1], [X-:*]</para>
 </listitem>
 </itemizedlist>
 
@@ -140,287 +68,143 @@
 
 </itemizedlist>
 
-<para
->Common sections are [X-*] (all displays), [X-:*] (all local displays) and [X-:0] (the first local display).</para>
+<para>Common sections are [X-*] (all displays), [X-:*] (all local displays) and [X-:0] (the first local display).</para>
 
-<para
->The format for all keys is <userinput
-><option
-><replaceable
->key</replaceable
-></option
->&nbsp;<literal
->=</literal
->&nbsp;<parameter
->value</parameter
-></userinput
->. Keys are only valid in the section class they are defined for. Some keys do not apply to particular displays, in which case they are ignored. </para>
+<para>The format for all keys is <userinput><option><replaceable>key</replaceable></option>&nbsp;<literal>=</literal>&nbsp;<parameter>value</parameter></userinput>. Keys are only valid in the section class they are defined for. Some keys do not apply to particular displays, in which case they are ignored. </para>
 
-<para
->If a setting is not found in any matching section, the default is used.</para>
+<para>If a setting is not found in any matching section, the default is used.</para>
 
-<note
-><para
->A pristine &tdmrc; is very thoroughly commented. All comments will be lost if you change this file with the kcontrol frontend.</para
-></note>
+<note><para>A pristine &tdmrc; is very thoroughly commented. All comments will be lost if you change this file with the kcontrol frontend.</para></note>
 
 
 <sect2 id="tdmrc-general">
-<title
->The [General] section of &tdmrc;</title>
+<title>The [General] section of &tdmrc;</title>
 
-<para
->This section contains global options that do not fit into any specific section. </para>
+<para>This section contains global options that do not fit into any specific section. </para>
 
 <variablelist>
 
 <varlistentry>
-<term id="option-configversion"
-><option
->ConfigVersion</option
-></term>
+<term id="option-configversion"><option>ConfigVersion</option></term>
 <listitem>
-<para
->This option exists solely for the purpose of clean automatic upgrades. <emphasis
->Do not</emphasis
-> change it, you may interfere with future upgrades and this could result in &tdm; failing to run. </para>
+<para>This option exists solely for the purpose of clean automatic upgrades. <emphasis>Do not</emphasis> change it, you may interfere with future upgrades and this could result in &tdm; failing to run. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-xservers"
-><option
->Xservers</option
-></term>
+<term id="option-xservers"><option>Xservers</option></term>
 <listitem>
-<para
->If the value starts with a slash (/), it specifies a file to read &X-Server; definitions from; otherwise, it is an &X-Server; definition by itself. See <xref linkend="tdmrc-xservers"/> for the details. </para
-><para
->The default is an &X-Server; definition that is usually reasonable for the system on which &tdm; was built. </para>
+<para>If the value starts with a slash (/), it specifies a file to read &X-Server; definitions from; otherwise, it is an &X-Server; definition by itself. See <xref linkend="tdmrc-xservers"/> for the details. </para><para>The default is an &X-Server; definition that is usually reasonable for the system on which &tdm; was built. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-servervts"
-><option
->ServerVTs</option
-></term>
+<term id="option-servervts"><option>ServerVTs</option></term>
 <listitem>
-<para
->List of Virtual Terminals to allocate to &X-Server;s. For negative numbers the absolute value is used, and the <acronym
->VT</acronym
-> will be allocated only if the kernel says it is free. If &tdm; exhausts this list, it will allocate free <acronym
->VT</acronym
->s greater than the absolute value of the last entry in this list. </para>
-<para
->Empty by default.</para>
+<para>List of Virtual Terminals to allocate to &X-Server;s. For negative numbers the absolute value is used, and the <acronym>VT</acronym> will be allocated only if the kernel says it is free. If &tdm; exhausts this list, it will allocate free <acronym>VT</acronym>s greater than the absolute value of the last entry in this list. </para>
+<para>Empty by default.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-pidfile"
-><option
->PidFile</option
-></term>
+<term id="option-pidfile"><option>PidFile</option></term>
 <listitem>
-<para
->The filename specified will be created to contain an ASCII representation of the process ID of the main &tdm; process; the PID will not be stored if the filename is empty. </para>
-<para
->Empty by default.</para>
+<para>The filename specified will be created to contain an ASCII representation of the process ID of the main &tdm; process; the PID will not be stored if the filename is empty. </para>
+<para>Empty by default.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-lockpidfile"
-><option
->LockPidFile</option
-></term>
+<term id="option-lockpidfile"><option>LockPidFile</option></term>
 <listitem>
-<para
->This option controls whether &tdm; uses file locking to keep multiple display managers from running onto each other. </para>
-<para
->The default is <quote
->true</quote
->.</para>
+<para>This option controls whether &tdm; uses file locking to keep multiple display managers from running onto each other. </para>
+<para>The default is <quote>true</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-authdir"
-><option
->AuthDir</option
-></term>
+<term id="option-authdir"><option>AuthDir</option></term>
 <listitem>
-<para
->This names a directory under which &tdm; stores &X-Server; authorisation files while initialising the session. &tdm; expects the system to clean up this directory from stale files on reboot. </para
-><para
->The authorisation file to be used for a particular display can be specified with the <option
->AuthFile</option
-> option in [X-*-Core]. </para>
-<para
->The default is <quote
->/var/run/xauth</quote
->.</para>
+<para>This names a directory under which &tdm; stores &X-Server; authorisation files while initialising the session. &tdm; expects the system to clean up this directory from stale files on reboot. </para><para>The authorisation file to be used for a particular display can be specified with the <option>AuthFile</option> option in [X-*-Core]. </para>
+<para>The default is <quote>/var/run/xauth</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-autorescan"
-><option
->AutoRescan</option
-></term>
+<term id="option-autorescan"><option>AutoRescan</option></term>
 <listitem>
-<para
->This boolean controls whether &tdm; automatically re-reads its configuration files if it finds them to have changed. </para>
-<para
->The default is <quote
->true</quote
->.</para>
+<para>This boolean controls whether &tdm; automatically re-reads its configuration files if it finds them to have changed. </para>
+<para>The default is <quote>true</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-exportlist"
-><option
->ExportList</option
-></term>
+<term id="option-exportlist"><option>ExportList</option></term>
 <listitem>
-<para
->Additional environment variables &tdm; should pass on to all programs it runs. <envar
->LD_LIBRARY_PATH</envar
-> and <envar
->XCURSOR_THEME</envar
-> are good candidates; otherwise, it should not be necessary very often. </para>
-<para
->Empty by default.</para>
+<para>Additional environment variables &tdm; should pass on to all programs it runs. <envar>LD_LIBRARY_PATH</envar> and <envar>XCURSOR_THEME</envar> are good candidates; otherwise, it should not be necessary very often. </para>
+<para>Empty by default.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-randomfile"
-><option
->RandomFile</option
-></term>
+<term id="option-randomfile"><option>RandomFile</option></term>
 <listitem>
-<para
->If the system has no native entropy source like /dev/urandom (see <option
->RandomDevice</option
->) and no entropy daemon like EGD (see <option
->PrngdSocket</option
-> and <option
->PrngdPort</option
->) is running, &tdm; will fall back to its own pseudo-random number generator that will, among other things, successively checksum parts of this file (which, obviously, should change frequently). </para
-><para
->This option does not exist on Linux and various BSDs. </para>
-<para
->The default is <quote
->/dev/mem</quote
->.</para>
+<para>If the system has no native entropy source like /dev/urandom (see <option>RandomDevice</option>) and no entropy daemon like EGD (see <option>PrngdSocket</option> and <option>PrngdPort</option>) is running, &tdm; will fall back to its own pseudo-random number generator that will, among other things, successively checksum parts of this file (which, obviously, should change frequently). </para><para>This option does not exist on Linux and various BSDs. </para>
+<para>The default is <quote>/dev/mem</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-prngdsocket"
-><option
->PrngdSocket</option
-></term>
+<term id="option-prngdsocket"><option>PrngdSocket</option></term>
 <listitem>
-<para
->If the system has no native entropy source like /dev/urandom (see <option
->RandomDevice</option
->), read random data from a Pseudo-Random Number Generator Daemon, like EGD (http://egd.sourceforge.net) via this UNIX domain socket. </para
-><para
->This option does not exist on Linux and various BSDs. </para>
-<para
->Empty by default.</para>
+<para>If the system has no native entropy source like /dev/urandom (see <option>RandomDevice</option>), read random data from a Pseudo-Random Number Generator Daemon, like EGD (http://egd.sourceforge.net) via this UNIX domain socket. </para><para>This option does not exist on Linux and various BSDs. </para>
+<para>Empty by default.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-prngdport"
-><option
->PrngdPort</option
-></term>
+<term id="option-prngdport"><option>PrngdPort</option></term>
 <listitem>
-<para
->Same as <option
->PrngdSocket</option
->, only use a TCP socket on localhost. </para>
+<para>Same as <option>PrngdSocket</option>, only use a TCP socket on localhost. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-randomdevice"
-><option
->RandomDevice</option
-></term>
+<term id="option-randomdevice"><option>RandomDevice</option></term>
 <listitem>
-<para
->The path to a character device which TDM should read random data from. Empty means to use the system's preferred entropy device if there is one. </para
-><para
->This option does not exist on OpenBSD, as it uses the arc4_random function instead. </para>
-<para
->Empty by default.</para>
+<para>The path to a character device which TDM should read random data from. Empty means to use the system's preferred entropy device if there is one. </para><para>This option does not exist on OpenBSD, as it uses the arc4_random function instead. </para>
+<para>Empty by default.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-fifodir"
-><option
->FifoDir</option
-></term>
+<term id="option-fifodir"><option>FifoDir</option></term>
 <listitem>
-<para
->The directory in which the command <acronym
->FiFo</acronym
->s should be created; make it empty to disable them. </para>
-<para
->The default is <quote
->/var/run/xdmctl</quote
->.</para>
+<para>The directory in which the command <acronym>FiFo</acronym>s should be created; make it empty to disable them. </para>
+<para>The default is <quote>/var/run/xdmctl</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-fifogroup"
-><option
->FifoGroup</option
-></term>
+<term id="option-fifogroup"><option>FifoGroup</option></term>
 <listitem>
-<para
->The group to which the global command <acronym
->FiFo</acronym
-> should belong; can be either a name or a numerical ID. </para>
+<para>The group to which the global command <acronym>FiFo</acronym> should belong; can be either a name or a numerical ID. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-datadir"
-><option
->DataDir</option
-></term>
+<term id="option-datadir"><option>DataDir</option></term>
 <listitem>
-<para
->The directory in which &tdm; should store persistent working data; such data is, for example, the previous user that logged in on a particular display. </para>
-<para
->The default is <quote
->/var/lib/tdm</quote
->.</para>
+<para>The directory in which &tdm; should store persistent working data; such data is, for example, the previous user that logged in on a particular display. </para>
+<para>The default is <quote>/var/lib/tdm</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-dmrcdir"
-><option
->DmrcDir</option
-></term>
+<term id="option-dmrcdir"><option>DmrcDir</option></term>
 <listitem>
-<para
->The directory in which &tdm; should store users' <filename
->.dmrc</filename
-> files. This is only needed if the home directories are not readable before actually logging in (like with AFS). </para>
-<para
->Empty by default.</para>
+<para>The directory in which &tdm; should store users' <filename>.dmrc</filename> files. This is only needed if the home directories are not readable before actually logging in (like with AFS). </para>
+<para>Empty by default.</para>
 </listitem>
 </varlistentry>
 
@@ -429,133 +213,73 @@
 
 
 <sect2 id="tdmrc-xdmcp">
-<title
->The [Xdmcp] section of &tdmrc;</title>
+<title>The [Xdmcp] section of &tdmrc;</title>
 
-<para
->This section contains options that control &tdm;'s handling of &XDMCP; requests. </para>
+<para>This section contains options that control &tdm;'s handling of &XDMCP; requests. </para>
 
 <variablelist>
 
 <varlistentry>
-<term id="option-enable"
-><option
->Enable</option
-></term>
+<term id="option-enable"><option>Enable</option></term>
 <listitem>
-<para
->Whether &tdm; should listen to incoming &XDMCP; requests. </para>
-<para
->The default is <quote
->true</quote
->.</para>
+<para>Whether &tdm; should listen to incoming &XDMCP; requests. </para>
+<para>The default is <quote>true</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-port"
-><option
->Port</option
-></term>
+<term id="option-port"><option>Port</option></term>
 <listitem>
-<para
->This indicates the UDP port number which &tdm; uses to listen for incoming &XDMCP; requests. Unless you need to debug the system, leave this with its default value. </para>
-<para
->The default is <quote
->177</quote
->.</para>
+<para>This indicates the UDP port number which &tdm; uses to listen for incoming &XDMCP; requests. Unless you need to debug the system, leave this with its default value. </para>
+<para>The default is <quote>177</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-keyfile"
-><option
->KeyFile</option
-></term>
+<term id="option-keyfile"><option>KeyFile</option></term>
 <listitem>
-<para
->XDM-AUTHENTICATION-1 style &XDMCP; authentication requires a private key to be shared between &tdm; and the terminal. This option specifies the file containing those values. Each entry in the file consists of a display name and the shared key. </para>
-<para
->Empty by default.</para>
+<para>XDM-AUTHENTICATION-1 style &XDMCP; authentication requires a private key to be shared between &tdm; and the terminal. This option specifies the file containing those values. Each entry in the file consists of a display name and the shared key. </para>
+<para>Empty by default.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-xaccess"
-><option
->Xaccess</option
-></term>
+<term id="option-xaccess"><option>Xaccess</option></term>
 <listitem>
-<para
->To prevent unauthorised &XDMCP; service and to allow forwarding of &XDMCP; IndirectQuery requests, this file contains a database of hostnames which are either allowed direct access to this machine, or have a list of hosts to which queries should be forwarded to. The format of this file is described in <xref linkend="tdmrc-xaccess"/>. </para>
-<para
->The default is <quote
->${<envar
->kde_confdir</envar
->}/tdm/Xaccess</quote
->.</para>
+<para>To prevent unauthorised &XDMCP; service and to allow forwarding of &XDMCP; IndirectQuery requests, this file contains a database of hostnames which are either allowed direct access to this machine, or have a list of hosts to which queries should be forwarded to. The format of this file is described in <xref linkend="tdmrc-xaccess"/>. </para>
+<para>The default is <quote>${<envar>kde_confdir</envar>}/tdm/Xaccess</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-choicetimeout"
-><option
->ChoiceTimeout</option
-></term>
+<term id="option-choicetimeout"><option>ChoiceTimeout</option></term>
 <listitem>
-<para
->Number of seconds to wait for the display to respond after the user has selected a host from the chooser. If the display sends an &XDMCP; IndirectQuery within this time, the request is forwarded to the chosen host; otherwise, it is assumed to be from a new session and the chooser is offered again. </para>
-<para
->The default is <quote
->15</quote
->.</para>
+<para>Number of seconds to wait for the display to respond after the user has selected a host from the chooser. If the display sends an &XDMCP; IndirectQuery within this time, the request is forwarded to the chosen host; otherwise, it is assumed to be from a new session and the chooser is offered again. </para>
+<para>The default is <quote>15</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-removedomainname"
-><option
->RemoveDomainname</option
-></term>
+<term id="option-removedomainname"><option>RemoveDomainname</option></term>
 <listitem>
-<para
->When computing the display name for &XDMCP; clients, the name resolver will typically create a fully qualified host name for the terminal. As this is sometimes confusing, &tdm; will remove the domain name portion of the host name if it is the same as the domain name of the local host when this option is enabled. </para>
-<para
->The default is <quote
->true</quote
->.</para>
+<para>When computing the display name for &XDMCP; clients, the name resolver will typically create a fully qualified host name for the terminal. As this is sometimes confusing, &tdm; will remove the domain name portion of the host name if it is the same as the domain name of the local host when this option is enabled. </para>
+<para>The default is <quote>true</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-sourceaddress"
-><option
->SourceAddress</option
-></term>
+<term id="option-sourceaddress"><option>SourceAddress</option></term>
 <listitem>
-<para
->Use the numeric IP address of the incoming connection on multihomed hosts instead of the host name. This is to avoid trying to connect on the wrong interface which might be down at this time. </para>
-<para
->The default is <quote
->false</quote
->.</para>
+<para>Use the numeric IP address of the incoming connection on multihomed hosts instead of the host name. This is to avoid trying to connect on the wrong interface which might be down at this time. </para>
+<para>The default is <quote>false</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-willing"
-><option
->Willing</option
-></term>
+<term id="option-willing"><option>Willing</option></term>
 <listitem>
-<para
->This specifies a program which is run (as <systemitem class="username"
->root</systemitem
->) when an &XDMCP; DirectQuery or BroadcastQuery is received and this host is configured to offer &XDMCP; display management. The output of this program may be displayed in a chooser window. If no program is specified, the string <quote
->Willing to manage</quote
-> is sent. </para>
-<para
->Empty by default.</para>
+<para>This specifies a program which is run (as <systemitem class="username">root</systemitem>) when an &XDMCP; DirectQuery or BroadcastQuery is received and this host is configured to offer &XDMCP; display management. The output of this program may be displayed in a chooser window. If no program is specified, the string <quote>Willing to manage</quote> is sent. </para>
+<para>Empty by default.</para>
 </listitem>
 </varlistentry>
 
@@ -564,138 +288,63 @@
 
 
 <sect2 id="tdmrc-shutdown">
-<title
->The [Shutdown] section of &tdmrc;</title>
+<title>The [Shutdown] section of &tdmrc;</title>
 
-<para
->This section contains global options concerning system shutdown. </para>
+<para>This section contains global options concerning system shutdown. </para>
 
 <variablelist>
 
 <varlistentry>
-<term id="option-haltcmd"
-><option
->HaltCmd</option
-></term>
+<term id="option-haltcmd"><option>HaltCmd</option></term>
 <listitem>
-<para
->The command to run to halt/poweroff the system. </para
-><para
->The default is something reasonable for the system on which &tdm; was built, like <command
->/sbin/shutdown&nbsp;<option
->-h</option
->&nbsp;<parameter
->now</parameter
-></command
->. </para>
+<para>The command to run to halt/poweroff the system. </para><para>The default is something reasonable for the system on which &tdm; was built, like <command>/sbin/shutdown&nbsp;<option>-h</option>&nbsp;<parameter>now</parameter></command>. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-rebootcmd"
-><option
->RebootCmd</option
-></term>
+<term id="option-rebootcmd"><option>RebootCmd</option></term>
 <listitem>
-<para
->The command to run to reboot the system. </para
-><para
->The default is something reasonable for the system &tdm; on which was built, like <command
->/sbin/shutdown&nbsp;<option
->-r</option
->&nbsp;<parameter
->now</parameter
-></command
->. </para>
+<para>The command to run to reboot the system. </para><para>The default is something reasonable for the system &tdm; on which was built, like <command>/sbin/shutdown&nbsp;<option>-r</option>&nbsp;<parameter>now</parameter></command>. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-allowfifo"
-><option
->AllowFifo</option
-></term>
+<term id="option-allowfifo"><option>AllowFifo</option></term>
 <listitem>
-<para
->Whether it is allowed to shut down the system via the global command <acronym
->FiFo</acronym
->. </para>
-<para
->The default is <quote
->false</quote
->.</para>
+<para>Whether it is allowed to shut down the system via the global command <acronym>FiFo</acronym>. </para>
+<para>The default is <quote>false</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-allowfifonow"
-><option
->AllowFifoNow</option
-></term>
+<term id="option-allowfifonow"><option>AllowFifoNow</option></term>
 <listitem>
-<para
->Whether it is allowed to abort active sessions when shutting down the system via the global command <acronym
->FiFo</acronym
->. </para
-><para
->This will have no effect unless <option
->AllowFifo</option
-> is enabled. </para>
-<para
->The default is <quote
->true</quote
->.</para>
+<para>Whether it is allowed to abort active sessions when shutting down the system via the global command <acronym>FiFo</acronym>. </para><para>This will have no effect unless <option>AllowFifo</option> is enabled. </para>
+<para>The default is <quote>true</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-uselilo"
-><option
->UseLilo</option
-></term>
+<term id="option-uselilo"><option>UseLilo</option></term>
 <listitem>
-<para
->Instructs &tdm; to offer LiLo boot options in the shutdown dialogue. </para
-><para
->Only available on Linux i386 &amp; x86-64. </para>
-<para
->The default is <quote
->false</quote
->.</para>
+<para>Instructs &tdm; to offer LiLo boot options in the shutdown dialogue. </para><para>Only available on Linux i386 &amp; x86-64. </para>
+<para>The default is <quote>false</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-lilocmd"
-><option
->LiloCmd</option
-></term>
+<term id="option-lilocmd"><option>LiloCmd</option></term>
 <listitem>
-<para
->The location of the LiLo binary. </para
-><para
->Only available on Linux i386 &amp; x86-64. </para>
-<para
->The default is <quote
->/sbin/lilo</quote
->.</para>
+<para>The location of the LiLo binary. </para><para>Only available on Linux i386 &amp; x86-64. </para>
+<para>The default is <quote>/sbin/lilo</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-lilomap"
-><option
->LiloMap</option
-></term>
+<term id="option-lilomap"><option>LiloMap</option></term>
 <listitem>
-<para
->The location of the map file LiLo should use. </para
-><para
->Only available on Linux i386 &amp; x86-64. </para>
-<para
->The default is <quote
->/boot/map</quote
->.</para>
+<para>The location of the map file LiLo should use. </para><para>Only available on Linux i386 &amp; x86-64. </para>
+<para>The default is <quote>/boot/map</quote>.</para>
 </listitem>
 </varlistentry>
 
@@ -704,859 +353,383 @@
 
 
 <sect2 id="tdmrc-core">
-<title
->The [X-*-Core] section class of &tdmrc;</title>
+<title>The [X-*-Core] section class of &tdmrc;</title>
 
-<para
->This section class contains options concerning the configuration of the &tdm; backend (core). </para>
+<para>This section class contains options concerning the configuration of the &tdm; backend (core). </para>
 
 <variablelist>
 
 <varlistentry>
-<term id="option-opendelay"
-><option
->OpenDelay</option
-></term>
+<term id="option-opendelay"><option>OpenDelay</option></term>
 <listitem>
-<para
->See <option
->OpenRepeat</option
->. </para>
-<para
->The default is <quote
->15</quote
->.</para>
+<para>See <option>OpenRepeat</option>. </para>
+<para>The default is <quote>15</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-opentimeout"
-><option
->OpenTimeout</option
-></term>
+<term id="option-opentimeout"><option>OpenTimeout</option></term>
 <listitem>
-<para
->See <option
->OpenRepeat</option
->. </para>
-<para
->The default is <quote
->120</quote
->.</para>
+<para>See <option>OpenRepeat</option>. </para>
+<para>The default is <quote>120</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-openrepeat"
-><option
->OpenRepeat</option
-></term>
+<term id="option-openrepeat"><option>OpenRepeat</option></term>
 <listitem>
-<para
->These options control the behaviour of &tdm; when attempting to open a connection to an &X-Server;. <option
->OpenDelay</option
-> is the length of the pause (in seconds) between successive attempts, <option
->OpenRepeat</option
-> is the number of attempts to make and <option
->OpenTimeout</option
-> is the amount of time to spend on a connection attempt. After <option
->OpenRepeat</option
-> attempts have been made, or if <option
->OpenTimeout</option
-> seconds elapse in any particular connection attempt, the start attempt is considered failed. </para>
-<para
->The default is <quote
->5</quote
->.</para>
+<para>These options control the behaviour of &tdm; when attempting to open a connection to an &X-Server;. <option>OpenDelay</option> is the length of the pause (in seconds) between successive attempts, <option>OpenRepeat</option> is the number of attempts to make and <option>OpenTimeout</option> is the amount of time to spend on a connection attempt. After <option>OpenRepeat</option> attempts have been made, or if <option>OpenTimeout</option> seconds elapse in any particular connection attempt, the start attempt is considered failed. </para>
+<para>The default is <quote>5</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-startattempts"
-><option
->StartAttempts</option
-></term>
+<term id="option-startattempts"><option>StartAttempts</option></term>
 <listitem>
-<para
->How many times &tdm; should attempt to start a <literal
->foreign</literal
-> display listed in the <filename
->Xservers</filename
-> file before giving up and disabling it. Local displays are attempted only once, and &XDMCP; displays are retried indefinitely by the client (unless the option <option
->-once</option
-> was given to the &X-Server;). </para>
-<para
->The default is <quote
->4</quote
->.</para>
+<para>How many times &tdm; should attempt to start a <literal>foreign</literal> display listed in the <filename>Xservers</filename> file before giving up and disabling it. Local displays are attempted only once, and &XDMCP; displays are retried indefinitely by the client (unless the option <option>-once</option> was given to the &X-Server;). </para>
+<para>The default is <quote>4</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-serverattempts"
-><option
->ServerAttempts</option
-></term>
+<term id="option-serverattempts"><option>ServerAttempts</option></term>
 <listitem>
-<para
->How many times &tdm; should attempt to start up a local &X-Server;. Starting up includes executing it and waiting for it to come up. </para>
-<para
->The default is <quote
->1</quote
->.</para>
+<para>How many times &tdm; should attempt to start up a local &X-Server;. Starting up includes executing it and waiting for it to come up. </para>
+<para>The default is <quote>1</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-servertimeout"
-><option
->ServerTimeout</option
-></term>
+<term id="option-servertimeout"><option>ServerTimeout</option></term>
 <listitem>
-<para
->How many seconds &tdm; should wait for a local &X-Server; to come up. </para>
-<para
->The default is <quote
->15</quote
->.</para>
+<para>How many seconds &tdm; should wait for a local &X-Server; to come up. </para>
+<para>The default is <quote>15</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-pinginterval"
-><option
->PingInterval</option
-></term>
+<term id="option-pinginterval"><option>PingInterval</option></term>
 <listitem>
-<para
->See <option
->PingTimeout</option
->. </para>
-<para
->The default is <quote
->5</quote
->.</para>
+<para>See <option>PingTimeout</option>. </para>
+<para>The default is <quote>5</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-pingtimeout"
-><option
->PingTimeout</option
-></term>
+<term id="option-pingtimeout"><option>PingTimeout</option></term>
 <listitem>
-<para
->To discover when <emphasis
->remote</emphasis
-> displays disappear, &tdm; regularly pings them. <option
->PingInterval</option
-> specifies the time (in minutes) between the pings and <option
->PingTimeout</option
-> specifies the maximum amount of time (in minutes) to wait for the terminal to respond to the request. If the terminal does not respond, the session is declared dead and terminated. </para
-><para
->If you frequently use X terminals which can become isolated from the managing host, you may wish to increase the timeout. The only worry is that sessions will continue to exist after the terminal has been accidentally disabled. </para>
-<para
->The default is <quote
->5</quote
->.</para>
+<para>To discover when <emphasis>remote</emphasis> displays disappear, &tdm; regularly pings them. <option>PingInterval</option> specifies the time (in minutes) between the pings and <option>PingTimeout</option> specifies the maximum amount of time (in minutes) to wait for the terminal to respond to the request. If the terminal does not respond, the session is declared dead and terminated. </para><para>If you frequently use X terminals which can become isolated from the managing host, you may wish to increase the timeout. The only worry is that sessions will continue to exist after the terminal has been accidentally disabled. </para>
+<para>The default is <quote>5</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-terminateserver"
-><option
->TerminateServer</option
-></term>
+<term id="option-terminateserver"><option>TerminateServer</option></term>
 <listitem>
-<para
->Whether &tdm; should restart the local &X-Server; after session exit instead of resetting it. Use this if the &X-Server; leaks memory or crashes the system on reset attempts. </para>
-<para
->The default is <quote
->false</quote
->.</para>
+<para>Whether &tdm; should restart the local &X-Server; after session exit instead of resetting it. Use this if the &X-Server; leaks memory or crashes the system on reset attempts. </para>
+<para>The default is <quote>false</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-resetsignal"
-><option
->ResetSignal</option
-></term>
+<term id="option-resetsignal"><option>ResetSignal</option></term>
 <listitem>
-<para
->The signal number to use to reset the local &X-Server;. </para>
-<para
->The default is <quote
->1 (SIGHUP)</quote
->.</para>
+<para>The signal number to use to reset the local &X-Server;. </para>
+<para>The default is <quote>1 (SIGHUP)</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-termsignal"
-><option
->TermSignal</option
-></term>
+<term id="option-termsignal"><option>TermSignal</option></term>
 <listitem>
-<para
->The signal number to use to terminate the local &X-Server;. </para>
-<para
->The default is <quote
->15 (SIGTERM)</quote
->.</para>
+<para>The signal number to use to terminate the local &X-Server;. </para>
+<para>The default is <quote>15 (SIGTERM)</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-authorize"
-><option
->Authorise</option
-></term>
+<term id="option-authorize"><option>Authorise</option></term>
 <listitem>
-<para
->Controls whether &tdm; generates and uses authorisation for <emphasis
->local</emphasis
-> &X-Server; connections. For &XDMCP; displays the authorisation requested by the display is used; foreign non-&XDMCP; displays do not support authorisation at all. </para>
-<para
->The default is <quote
->true</quote
->.</para>
+<para>Controls whether &tdm; generates and uses authorisation for <emphasis>local</emphasis> &X-Server; connections. For &XDMCP; displays the authorisation requested by the display is used; foreign non-&XDMCP; displays do not support authorisation at all. </para>
+<para>The default is <quote>true</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-authnames"
-><option
->AuthNames</option
-></term>
+<term id="option-authnames"><option>AuthNames</option></term>
 <listitem>
-<para
->If <option
->Authorize</option
-> is true, use the authorisation mechanisms listed herein. The MIT-MAGIC-COOKIE-1 authorisation is always available; XDM-AUTHORIZATION-1, SUN-DES-1 and MIT-KERBEROS-5 might be available as well, depending on the build configuration. </para>
-<para
->The default is <quote
->DEF_AUTH_NAME</quote
->.</para>
+<para>If <option>Authorize</option> is true, use the authorisation mechanisms listed herein. The MIT-MAGIC-COOKIE-1 authorisation is always available; XDM-AUTHORIZATION-1, SUN-DES-1 and MIT-KERBEROS-5 might be available as well, depending on the build configuration. </para>
+<para>The default is <quote>DEF_AUTH_NAME</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-resetforauth"
-><option
->ResetForAuth</option
-></term>
+<term id="option-resetforauth"><option>ResetForAuth</option></term>
 <listitem>
-<para
->Some <emphasis
->old</emphasis
-> &X-Server;s re-read the authorisation file at &X-Server; reset time, instead of when checking the initial connection. As &tdm; generates the authorisation information just before connecting to the display, an old &X-Server; would not get up-to-date authorisation information. This option causes &tdm; to send SIGHUP to the &X-Server; after setting up the file, causing an additional &X-Server; reset to occur, during which time the new authorisation information will be read. </para>
-<para
->The default is <quote
->false</quote
->.</para>
+<para>Some <emphasis>old</emphasis> &X-Server;s re-read the authorisation file at &X-Server; reset time, instead of when checking the initial connection. As &tdm; generates the authorisation information just before connecting to the display, an old &X-Server; would not get up-to-date authorisation information. This option causes &tdm; to send SIGHUP to the &X-Server; after setting up the file, causing an additional &X-Server; reset to occur, during which time the new authorisation information will be read. </para>
+<para>The default is <quote>false</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-authfile"
-><option
->AuthFile</option
-></term>
+<term id="option-authfile"><option>AuthFile</option></term>
 <listitem>
-<para
->This file is used to communicate the authorisation data from &tdm; to the &X-Server;, using the <option
->-auth</option
-> &X-Server; command line option. It should be kept in a directory which is not world-writable as it could easily be removed, disabling the authorisation mechanism in the &X-Server;. If not specified, a random name is generated from <option
->AuthDir</option
-> and the name of the display. </para>
-<para
->Empty by default.</para>
+<para>This file is used to communicate the authorisation data from &tdm; to the &X-Server;, using the <option>-auth</option> &X-Server; command line option. It should be kept in a directory which is not world-writable as it could easily be removed, disabling the authorisation mechanism in the &X-Server;. If not specified, a random name is generated from <option>AuthDir</option> and the name of the display. </para>
+<para>Empty by default.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-resources"
-><option
->Resources</option
-></term>
+<term id="option-resources"><option>Resources</option></term>
 <listitem>
-<para
->This option specifies the name of the file to be loaded by <command
->xrdb</command
-> as the resource database onto the root window of screen 0 of the display. KDE programs generally do not use X-resources, so this option is only needed if the <option
->Setup</option
-> program needs some X-resources. </para>
-<para
->Empty by default.</para>
+<para>This option specifies the name of the file to be loaded by <command>xrdb</command> as the resource database onto the root window of screen 0 of the display. KDE programs generally do not use X-resources, so this option is only needed if the <option>Setup</option> program needs some X-resources. </para>
+<para>Empty by default.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-xrdb"
-><option
->Xrdb</option
-></term>
+<term id="option-xrdb"><option>Xrdb</option></term>
 <listitem>
-<para
->The <command
->xrdb</command
-> program to use to read the X-resources file specified in <option
->Recources</option
->. </para>
-<para
->The default is <quote
->${<envar
->x_bindir</envar
->}/xrdb</quote
->.</para>
+<para>The <command>xrdb</command> program to use to read the X-resources file specified in <option>Recources</option>. </para>
+<para>The default is <quote>${<envar>x_bindir</envar>}/xrdb</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-setup"
-><option
->Setup</option
-></term>
+<term id="option-setup"><option>Setup</option></term>
 <listitem>
-<para
->This specifies a program which is run (as <systemitem class="username"
->root</systemitem
->) before offering the greeter window. This may be used to change the appearance of the screen around the greeter window or to put up other windows (e.g., you may want to run <command
->xconsole</command
-> here). The conventional name for a file used here is <command
->Xsetup</command
->. See <xref linkend="tdmrc-xsetup"/>. </para>
-<para
->Empty by default.</para>
+<para>This specifies a program which is run (as <systemitem class="username">root</systemitem>) before offering the greeter window. This may be used to change the appearance of the screen around the greeter window or to put up other windows (e.g., you may want to run <command>xconsole</command> here). The conventional name for a file used here is <command>Xsetup</command>. See <xref linkend="tdmrc-xsetup"/>. </para>
+<para>Empty by default.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-startup"
-><option
->Startup</option
-></term>
+<term id="option-startup"><option>Startup</option></term>
 <listitem>
-<para
->This specifies a program which is run (as <systemitem class="username"
->root</systemitem
->) after the user authentication process succeeds. The conventional name for a file used here is <command
->Xstartup</command
->. See <xref linkend="tdmrc-xstartup"/>. </para>
-<para
->Empty by default.</para>
+<para>This specifies a program which is run (as <systemitem class="username">root</systemitem>) after the user authentication process succeeds. The conventional name for a file used here is <command>Xstartup</command>. See <xref linkend="tdmrc-xstartup"/>. </para>
+<para>Empty by default.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-reset"
-><option
->Reset</option
-></term>
+<term id="option-reset"><option>Reset</option></term>
 <listitem>
-<para
->This specifies a program which is run (as <systemitem class="username"
->root</systemitem
->) after the session terminates. The conventional name for a file used here is <command
->Xreset</command
->. See <xref linkend="tdmrc-xreset"/>. </para>
-<para
->Empty by default.</para>
+<para>This specifies a program which is run (as <systemitem class="username">root</systemitem>) after the session terminates. The conventional name for a file used here is <command>Xreset</command>. See <xref linkend="tdmrc-xreset"/>. </para>
+<para>Empty by default.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-session"
-><option
->Session</option
-></term>
+<term id="option-session"><option>Session</option></term>
 <listitem>
-<para
->This specifies the session program to be executed (as the user owning the session). The conventional name for a file used here is <command
->Xsession</command
->. See <xref linkend="tdmrc-xsession"/>. </para>
-<para
->The default is <quote
->${<envar
->x_bindir</envar
->}/xterm -ls -T</quote
->.</para>
+<para>This specifies the session program to be executed (as the user owning the session). The conventional name for a file used here is <command>Xsession</command>. See <xref linkend="tdmrc-xsession"/>. </para>
+<para>The default is <quote>${<envar>x_bindir</envar>}/xterm -ls -T</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-failsafeclient"
-><option
->FailsafeClient</option
-></term>
+<term id="option-failsafeclient"><option>FailsafeClient</option></term>
 <listitem>
-<para
->If the <option
->Session</option
-> program fails to execute, &tdm; will fall back to this program. This program is executed with no arguments, but executes using the same environment variables as the session would have had (see <xref linkend="tdmrc-xsession"/>). </para>
-<para
->The default is <quote
->${<envar
->x_bindir</envar
->}/xterm</quote
->.</para>
+<para>If the <option>Session</option> program fails to execute, &tdm; will fall back to this program. This program is executed with no arguments, but executes using the same environment variables as the session would have had (see <xref linkend="tdmrc-xsession"/>). </para>
+<para>The default is <quote>${<envar>x_bindir</envar>}/xterm</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-userpath"
-><option
->UserPath</option
-></term>
+<term id="option-userpath"><option>UserPath</option></term>
 <listitem>
-<para
->The <envar
->PATH</envar
-> environment variable for non-<systemitem class="username"
->root</systemitem
-> <option
->Session</option
->s. </para
-><para
->The default depends on the system &tdm; was built on. </para>
+<para>The <envar>PATH</envar> environment variable for non-<systemitem class="username">root</systemitem> <option>Session</option>s. </para><para>The default depends on the system &tdm; was built on. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-systempath"
-><option
->SystemPath</option
-></term>
+<term id="option-systempath"><option>SystemPath</option></term>
 <listitem>
-<para
->The <envar
->PATH</envar
-> environment variable for all programs but non-<systemitem class="username"
->root</systemitem
-> <option
->Session</option
->s. Note that it is good practice not to include <literal
->.</literal
-> (the current directory) into this entry. </para
-><para
->The default depends on the system &tdm; was built on. </para>
+<para>The <envar>PATH</envar> environment variable for all programs but non-<systemitem class="username">root</systemitem> <option>Session</option>s. Note that it is good practice not to include <literal>.</literal> (the current directory) into this entry. </para><para>The default depends on the system &tdm; was built on. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-systemshell"
-><option
->SystemShell</option
-></term>
+<term id="option-systemshell"><option>SystemShell</option></term>
 <listitem>
-<para
->The <envar
->SHELL</envar
-> environment variable for all programs but the <option
->Session</option
->. </para>
-<para
->The default is <quote
->/bin/sh</quote
->.</para>
+<para>The <envar>SHELL</envar> environment variable for all programs but the <option>Session</option>. </para>
+<para>The default is <quote>/bin/sh</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-userauthdir"
-><option
->UserAuthDir</option
-></term>
+<term id="option-userauthdir"><option>UserAuthDir</option></term>
 <listitem>
-<para
->When &tdm; is unable to write to the usual user authorisation file ($<envar
->HOME</envar
->/.Xauthority), it creates a unique file name in this directory and points the environment variable <envar
->XAUTHORITY</envar
-> at the created file. </para>
-<para
->The default is <quote
->/tmp</quote
->.</para>
+<para>When &tdm; is unable to write to the usual user authorisation file ($<envar>HOME</envar>/.Xauthority), it creates a unique file name in this directory and points the environment variable <envar>XAUTHORITY</envar> at the created file. </para>
+<para>The default is <quote>/tmp</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-autorelogin"
-><option
->AutoReLogin</option
-></term>
+<term id="option-autorelogin"><option>AutoReLogin</option></term>
 <listitem>
-<para
->If enabled, &tdm; will automatically restart a session after an &X-Server; crash (or if it is killed by Alt-Ctrl-BackSpace). Note that enabling this feature opens a security hole: a secured display lock can be circumvented (unless &kde;'s built-in screen locker is used). </para>
-<para
->The default is <quote
->false</quote
->.</para>
+<para>If enabled, &tdm; will automatically restart a session after an &X-Server; crash (or if it is killed by Alt-Ctrl-BackSpace). Note that enabling this feature opens a security hole: a secured display lock can be circumvented (unless &kde;'s built-in screen locker is used). </para>
+<para>The default is <quote>false</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-allowrootlogin"
-><option
->AllowRootLogin</option
-></term>
+<term id="option-allowrootlogin"><option>AllowRootLogin</option></term>
 <listitem>
-<para
->If disabled, do not allow <systemitem class="username"
->root</systemitem
-> (and any other user with UID = 0) to log in directly. </para>
-<para
->The default is <quote
->true</quote
->.</para>
+<para>If disabled, do not allow <systemitem class="username">root</systemitem> (and any other user with UID = 0) to log in directly. </para>
+<para>The default is <quote>true</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-allownullpasswd"
-><option
->AllowNullPasswd</option
-></term>
+<term id="option-allownullpasswd"><option>AllowNullPasswd</option></term>
 <listitem>
-<para
->If disabled, only users that have passwords assigned can log in. </para>
-<para
->The default is <quote
->true</quote
->.</para>
+<para>If disabled, only users that have passwords assigned can log in. </para>
+<para>The default is <quote>true</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-allowshutdown"
-><option
->AllowShutdown</option
-></term>
+<term id="option-allowshutdown"><option>AllowShutdown</option></term>
 <listitem>
-<para
->Who is allowed to shut down the system. This applies both to the greeter and to the command <acronym
->FiFo</acronym
->. </para>
+<para>Who is allowed to shut down the system. This applies both to the greeter and to the command <acronym>FiFo</acronym>. </para>
 <variablelist>
 <varlistentry>
-<term
-><parameter
->None</parameter
-></term>
-<listitem
-><para
->no <guilabel
->Shutdown...</guilabel
-> menu entry is shown at all</para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><parameter
->Root</parameter
-></term>
-<listitem
-><para
->the <systemitem class="username"
->root</systemitem
-> password must be entered to shut down</para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><parameter
->All</parameter
-></term>
-<listitem
-><para
->everybody can shut down the machine</para
-></listitem>
+<term><parameter>None</parameter></term>
+<listitem><para>no <guilabel>Shutdown...</guilabel> menu entry is shown at all</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><parameter>Root</parameter></term>
+<listitem><para>the <systemitem class="username">root</systemitem> password must be entered to shut down</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><parameter>All</parameter></term>
+<listitem><para>everybody can shut down the machine</para></listitem>
 </varlistentry>
 </variablelist>
-<para
->The default is <quote
->All</quote
->.</para>
+<para>The default is <quote>All</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-allowsdforcenow"
-><option
->AllowSdForceNow</option
-></term>
+<term id="option-allowsdforcenow"><option>AllowSdForceNow</option></term>
 <listitem>
-<para
->Who is allowed to abort active sessions when shutting down. </para>
+<para>Who is allowed to abort active sessions when shutting down. </para>
 <variablelist>
 <varlistentry>
-<term
-><parameter
->None</parameter
-></term>
-<listitem
-><para
->no forced shutdown is allowed at all</para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><parameter
->Root</parameter
-></term>
-<listitem
-><para
->the <systemitem class="username"
->root</systemitem
-> password must be entered to shut down forcibly</para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><parameter
->All</parameter
-></term>
-<listitem
-><para
->everybody can shut down the machine forcibly</para
-></listitem>
+<term><parameter>None</parameter></term>
+<listitem><para>no forced shutdown is allowed at all</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><parameter>Root</parameter></term>
+<listitem><para>the <systemitem class="username">root</systemitem> password must be entered to shut down forcibly</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><parameter>All</parameter></term>
+<listitem><para>everybody can shut down the machine forcibly</para></listitem>
 </varlistentry>
 </variablelist>
-<para
->The default is <quote
->All</quote
->.</para>
+<para>The default is <quote>All</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-defaultsdmode"
-><option
->DefaultSdMode</option
-></term>
+<term id="option-defaultsdmode"><option>DefaultSdMode</option></term>
 <listitem>
-<para
->The default choice for the shutdown condition/timing. </para>
+<para>The default choice for the shutdown condition/timing. </para>
 <variablelist>
 <varlistentry>
-<term
-><parameter
->Schedule</parameter
-></term>
-<listitem
-><para
->shut down after all active sessions exit (possibly at once)</para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><parameter
->TryNow</parameter
-></term>
-<listitem
-><para
->shut down, if no active sessions are open; otherwise, do nothing</para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><parameter
->ForceNow</parameter
-></term>
-<listitem
-><para
->shut down unconditionally</para
-></listitem>
+<term><parameter>Schedule</parameter></term>
+<listitem><para>shut down after all active sessions exit (possibly at once)</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><parameter>TryNow</parameter></term>
+<listitem><para>shut down, if no active sessions are open; otherwise, do nothing</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><parameter>ForceNow</parameter></term>
+<listitem><para>shut down unconditionally</para></listitem>
 </varlistentry>
 </variablelist>
-<para
->The default is <quote
->Schedule</quote
->.</para>
+<para>The default is <quote>Schedule</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-scheduledsd"
-><option
->ScheduledSd</option
-></term>
+<term id="option-scheduledsd"><option>ScheduledSd</option></term>
 <listitem>
-<para
->How to offer shutdown scheduling options: </para>
+<para>How to offer shutdown scheduling options: </para>
 <variablelist>
 <varlistentry>
-<term
-><parameter
->Never</parameter
-></term>
-<listitem
-><para
->not at all</para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><parameter
->Optional</parameter
-></term>
-<listitem
-><para
->as a button in the simple shutdown dialogues</para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><parameter
->Always</parameter
-></term>
-<listitem
-><para
->instead of the simple shutdown dialogues</para
-></listitem>
+<term><parameter>Never</parameter></term>
+<listitem><para>not at all</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><parameter>Optional</parameter></term>
+<listitem><para>as a button in the simple shutdown dialogues</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><parameter>Always</parameter></term>
+<listitem><para>instead of the simple shutdown dialogues</para></listitem>
 </varlistentry>
 </variablelist>
-<para
->The default is <quote
->Never</quote
->.</para>
+<para>The default is <quote>Never</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-nopassenable"
-><option
->NoPassEnable</option
-></term>
+<term id="option-nopassenable"><option>NoPassEnable</option></term>
 <listitem>
-<para
->Enable password-less logins on this display. <emphasis
->Use with extreme care!</emphasis
-> </para>
-<para
->The default is <quote
->false</quote
->.</para>
+<para>Enable password-less logins on this display. <emphasis>Use with extreme care!</emphasis> </para>
+<para>The default is <quote>false</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-nopassusers"
-><option
->NoPassUsers</option
-></term>
+<term id="option-nopassusers"><option>NoPassUsers</option></term>
 <listitem>
-<para
->The users that do not need to provide a password to log in. Items which are prefixed with <literal
->@</literal
-> represent all users in the user group named by that item. <literal
->*</literal
-> means all users but <systemitem class="username"
->root</systemitem
-> (and any other user with UID = 0). <emphasis
->Never</emphasis
-> list <systemitem class="username"
->root</systemitem
->. </para>
-<para
->Empty by default.</para>
+<para>The users that do not need to provide a password to log in. Items which are prefixed with <literal>@</literal> represent all users in the user group named by that item. <literal>*</literal> means all users but <systemitem class="username">root</systemitem> (and any other user with UID = 0). <emphasis>Never</emphasis> list <systemitem class="username">root</systemitem>. </para>
+<para>Empty by default.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-autologinenable"
-><option
->AutoLoginEnable</option
-></term>
+<term id="option-autologinenable"><option>AutoLoginEnable</option></term>
 <listitem>
-<para
->Enable automatic login. <emphasis
->Use with extreme care!</emphasis
-> </para>
-<para
->The default is <quote
->false</quote
->.</para>
+<para>Enable automatic login. <emphasis>Use with extreme care!</emphasis> </para>
+<para>The default is <quote>false</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-autologinuser"
-><option
->AutoLoginUser</option
-></term>
+<term id="option-autologinuser"><option>AutoLoginUser</option></term>
 <listitem>
-<para
->The user to log in automatically. <emphasis
->Never</emphasis
-> specify <systemitem class="username"
->root</systemitem
->! </para>
-<para
->Empty by default.</para>
+<para>The user to log in automatically. <emphasis>Never</emphasis> specify <systemitem class="username">root</systemitem>! </para>
+<para>Empty by default.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-autologinpass"
-><option
->AutoLoginPass</option
-></term>
+<term id="option-autologinpass"><option>AutoLoginPass</option></term>
 <listitem>
-<para
->The password for the user to log in automatically. This is <emphasis
->not</emphasis
-> required unless the user is logged into a <acronym
->NIS</acronym
-> or Kerberos domain. If you use this option, you should <command
->chmod&nbsp;<option
->600</option
->&nbsp;<filename
->tdmrc</filename
-></command
-> for obvious reasons. </para>
-<para
->Empty by default.</para>
+<para>The password for the user to log in automatically. This is <emphasis>not</emphasis> required unless the user is logged into a <acronym>NIS</acronym> or Kerberos domain. If you use this option, you should <command>chmod&nbsp;<option>600</option>&nbsp;<filename>tdmrc</filename></command> for obvious reasons. </para>
+<para>Empty by default.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-sessionsdirs"
-><option
->SessionsDirs</option
-></term>
+<term id="option-sessionsdirs"><option>SessionsDirs</option></term>
 <listitem>
-<para
->A list of directories containing session type definitions. </para>
-<para
->The default is <quote
->${<envar
->kde_datadir</envar
->}/tdm/sessions</quote
->.</para>
+<para>A list of directories containing session type definitions. </para>
+<para>The default is <quote>${<envar>kde_datadir</envar>}/tdm/sessions</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-clientlogfile"
-><option
->ClientLogFile</option
-></term>
+<term id="option-clientlogfile"><option>ClientLogFile</option></term>
 <listitem>
-<para
->The file (relative to the user's home directory) to redirect the session output to. One occurrence of <parameter
->%s</parameter
-> in this string will be substituted with the display name. Use <parameter
->%%</parameter
-> to obtain a literal <literal
->%</literal
->. </para>
-<para
->The default is <quote
->.xsession-errors</quote
->.</para>
+<para>The file (relative to the user's home directory) to redirect the session output to. One occurrence of <parameter>%s</parameter> in this string will be substituted with the display name. Use <parameter>%%</parameter> to obtain a literal <literal>%</literal>. </para>
+<para>The default is <quote>.xsession-errors</quote>.</para>
 </listitem>
 </varlistentry>
 
@@ -1565,1096 +738,485 @@
 
 
 <sect2 id="tdmrc-greeter">
-<title
->The [X-*-Greeter] section class of &tdmrc;</title>
+<title>The [X-*-Greeter] section class of &tdmrc;</title>
 
-<para
->This section class contains options concerning the configuration of the &tdm; frontend (greeter). </para>
+<para>This section class contains options concerning the configuration of the &tdm; frontend (greeter). </para>
 
 <variablelist>
 
 <varlistentry>
-<term id="option-guistyle"
-><option
->GUIStyle</option
-></term>
+<term id="option-guistyle"><option>GUIStyle</option></term>
 <listitem>
-<para
->Specify the widget style for the greeter. Empty means to use the built-in default which currently is <literal
->Keramik</literal
->. </para>
-<para
->Empty by default.</para>
+<para>Specify the widget style for the greeter. Empty means to use the built-in default which currently is <literal>Keramik</literal>. </para>
+<para>Empty by default.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-colorscheme"
-><option
->ColorScheme</option
-></term>
+<term id="option-colorscheme"><option>ColorScheme</option></term>
 <listitem>
-<para
->Specify the widget colour scheme for the greeter. Empty means to use the built-in default which currently is yellowish grey with some light blue and yellow elements. </para>
-<para
->Empty by default.</para>
+<para>Specify the widget colour scheme for the greeter. Empty means to use the built-in default which currently is yellowish grey with some light blue and yellow elements. </para>
+<para>Empty by default.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-logoarea"
-><option
->LogoArea</option
-></term>
+<term id="option-logoarea"><option>LogoArea</option></term>
 <listitem>
-<para
->What should be shown in the greeter righthand of the input lines (if <option
->UserList</option
-> is disabled) or above them (if <option
->UserList</option
-> is enabled): </para>
+<para>What should be shown in the greeter righthand of the input lines (if <option>UserList</option> is disabled) or above them (if <option>UserList</option> is enabled): </para>
 <variablelist>
 <varlistentry>
-<term
-><parameter
->None</parameter
-></term>
-<listitem
-><para
->nothing</para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><parameter
->Logo</parameter
-></term>
-<listitem
-><para
->the image specified by <option
->LogoPixmap</option
-></para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><parameter
->Clock</parameter
-></term>
-<listitem
-><para
->a neat analogue clock</para
-></listitem>
+<term><parameter>None</parameter></term>
+<listitem><para>nothing</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><parameter>Logo</parameter></term>
+<listitem><para>the image specified by <option>LogoPixmap</option></para></listitem>
+</varlistentry>
+<varlistentry>
+<term><parameter>Clock</parameter></term>
+<listitem><para>a neat analogue clock</para></listitem>
 </varlistentry>
 </variablelist>
-<para
->The default is <quote
->Clock</quote
->.</para>
+<para>The default is <quote>Clock</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-logopixmap"
-><option
->LogoPixmap</option
-></term>
+<term id="option-logopixmap"><option>LogoPixmap</option></term>
 <listitem>
-<para
->The image to show in the greeter if <option
->LogoArea</option
-> is <literal
->Logo</literal
->. </para>
-<para
->Empty by default.</para>
+<para>The image to show in the greeter if <option>LogoArea</option> is <literal>Logo</literal>. </para>
+<para>Empty by default.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-greeterpos"
-><option
->GreeterPos</option
-></term>
+<term id="option-greeterpos"><option>GreeterPos</option></term>
 <listitem>
-<para
->The relative coordinates (percentages of the screen size; X,Y) at which the centre of the greeter is put. &tdm; aligns the greeter to the edges of the screen it would cross otherwise. </para>
-<para
->The default is <quote
->50,50</quote
->.</para>
+<para>The relative coordinates (percentages of the screen size; X,Y) at which the centre of the greeter is put. &tdm; aligns the greeter to the edges of the screen it would cross otherwise. </para>
+<para>The default is <quote>50,50</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-greeterscreen"
-><option
->GreeterScreen</option
-></term>
+<term id="option-greeterscreen"><option>GreeterScreen</option></term>
 <listitem>
-<para
->The screen the greeter should be displayed on in multi-headed and Xinerama setups. The numbering starts with 0. For Xinerama, it corresponds to the listing order in the active ServerLayout section of XF86Config; -1 means to use the upper-left screen, -2 means to use the upper-right screen. </para>
+<para>The screen the greeter should be displayed on in multi-headed and Xinerama setups. The numbering starts with 0. For Xinerama, it corresponds to the listing order in the active ServerLayout section of XF86Config; -1 means to use the upper-left screen, -2 means to use the upper-right screen. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-greetstring"
-><option
->GreetString</option
-></term>
+<term id="option-greetstring"><option>GreetString</option></term>
 <listitem>
-<para
->The headline in the greeter. An empty greeting means none at all. </para
-><para
->The following character pairs are replaced by their value: <variablelist>
+<para>The headline in the greeter. An empty greeting means none at all. </para><para>The following character pairs are replaced by their value: <variablelist>
 <varlistentry>
-<term
-><parameter
->%d</parameter
-></term>
-<listitem
-><para
->name of the current display</para
-></listitem>
+<term><parameter>%d</parameter></term>
+<listitem><para>name of the current display</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><parameter
->%h</parameter
-></term>
-<listitem
-><para
->local host name, possibly with the domain name</para
-></listitem>
+<term><parameter>%h</parameter></term>
+<listitem><para>local host name, possibly with the domain name</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><parameter
->%n</parameter
-></term>
-<listitem
-><para
->local node name, most probably the host name without the domain name</para
-></listitem>
+<term><parameter>%n</parameter></term>
+<listitem><para>local node name, most probably the host name without the domain name</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><parameter
->%s</parameter
-></term>
-<listitem
-><para
->operating system</para
-></listitem>
+<term><parameter>%s</parameter></term>
+<listitem><para>operating system</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><parameter
->%r</parameter
-></term>
-<listitem
-><para
->operating system version</para
-></listitem>
+<term><parameter>%r</parameter></term>
+<listitem><para>operating system version</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><parameter
->%m</parameter
-></term>
-<listitem
-><para
->machine (hardware) type</para
-></listitem>
+<term><parameter>%m</parameter></term>
+<listitem><para>machine (hardware) type</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><parameter
->%%</parameter
-></term>
-<listitem
-><para
->a single <literal
->%</literal
-></para
-></listitem>
+<term><parameter>%%</parameter></term>
+<listitem><para>a single <literal>%</literal></para></listitem>
 </varlistentry>
 </variablelist>
 </para>
-<para
->The default is <quote
->Welcome to %s at %n</quote
->.</para>
+<para>The default is <quote>Welcome to %s at %n</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-greetfont"
-><option
->GreetFont</option
-></term>
+<term id="option-greetfont"><option>GreetFont</option></term>
 <listitem>
-<para
->The font for the greeter headline. </para>
-<para
->The default is <quote
->charter,24,bold</quote
->.</para>
+<para>The font for the greeter headline. </para>
+<para>The default is <quote>charter,24,bold</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-stdfont"
-><option
->StdFont</option
-></term>
+<term id="option-stdfont"><option>StdFont</option></term>
 <listitem>
-<para
->The normal font used in the greeter. </para>
-<para
->The default is <quote
->helvetica,12</quote
->.</para>
+<para>The normal font used in the greeter. </para>
+<para>The default is <quote>helvetica,12</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-failfont"
-><option
->FailFont</option
-></term>
+<term id="option-failfont"><option>FailFont</option></term>
 <listitem>
-<para
->The font used for the <quote
->Login Failed</quote
-> message. </para>
-<para
->The default is <quote
->helvetica,12,bold</quote
->.</para>
+<para>The font used for the <quote>Login Failed</quote> message. </para>
+<para>The default is <quote>helvetica,12,bold</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-antialiasing"
-><option
->AntiAliasing</option
-></term>
+<term id="option-antialiasing"><option>AntiAliasing</option></term>
 <listitem>
-<para
->Whether the fonts used in the greeter should be antialiased. </para>
-<para
->The default is <quote
->false</quote
->.</para>
+<para>Whether the fonts used in the greeter should be antialiased. </para>
+<para>The default is <quote>false</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-numlock"
-><option
->NumLock</option
-></term>
+<term id="option-numlock"><option>NumLock</option></term>
 <listitem>
-<para
->What to do with the Num Lock modifier for the time the greeter is running: </para>
+<para>What to do with the Num Lock modifier for the time the greeter is running: </para>
 <variablelist>
 <varlistentry>
-<term
-><parameter
->Off</parameter
-></term>
-<listitem
-><para
->turn off</para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><parameter
->On</parameter
-></term>
-<listitem
-><para
->turn on</para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><parameter
->Keep</parameter
-></term>
-<listitem
-><para
->do not change the state</para
-></listitem>
+<term><parameter>Off</parameter></term>
+<listitem><para>turn off</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><parameter>On</parameter></term>
+<listitem><para>turn on</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><parameter>Keep</parameter></term>
+<listitem><para>do not change the state</para></listitem>
 </varlistentry>
 </variablelist>
-<para
->The default is <quote
->Keep</quote
->.</para>
-</listitem>
+<para>The default is <quote>Keep</quote>.</para>
+</listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-language"
-><option
->Language</option
-></term>
+<term id="option-language"><option>Language</option></term>
 <listitem>
-<para
->Language and locale to use in the greeter, encoded like $<envar
->LC_LANG</envar
->. </para>
-<para
->The default is <quote
->en_US</quote
->.</para>
+<para>Language and locale to use in the greeter, encoded like $<envar>LC_LANG</envar>. </para>
+<para>The default is <quote>en_US</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-usercompletion"
-><option
->UserCompletion</option
-></term>
+<term id="option-usercompletion"><option>UserCompletion</option></term>
 <listitem>
-<para
->Enable autocompletion in the username line edit. </para>
-<para
->The default is <quote
->false</quote
->.</para>
+<para>Enable autocompletion in the username line edit. </para>
+<para>The default is <quote>false</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-userlist"
-><option
->UserList</option
-></term>
+<term id="option-userlist"><option>UserList</option></term>
 <listitem>
-<para
->Show a user list with unix login names, real names and images in the greeter. </para>
-<para
->The default is <quote
->true</quote
->.</para>
+<para>Show a user list with unix login names, real names and images in the greeter. </para>
+<para>The default is <quote>true</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-showusers"
-><option
->ShowUsers</option
-></term>
+<term id="option-showusers"><option>ShowUsers</option></term>
 <listitem>
-<para
->This option controls which users will be shown in the user view (<option
->UserList</option
->) and/or offered for autocompletion (<option
->UserCompletion</option
->). If it is <literal
->Selected</literal
->, <option
->SelectedUsers</option
-> contains the final list of users. If it is <literal
->NotHidden</literal
->, the initial user list are all users found on the system. Users contained in <option
->HiddenUsers</option
-> are removed from the list, just like all users with a UID greater than specified in <option
->MaxShowUID</option
-> and users with a non-zero UID less than specified in <option
->MinShowUID</option
->. Items in <option
->SelectedUsers</option
-> and <option
->HiddenUsers</option
-> which are prefixed with <literal
->@</literal
-> represent all users in the user group named by that item. Finally, the user list will be sorted alphabetically, if <option
->SortUsers</option
-> is enabled. </para>
-<para
->The default is <quote
->NotHidden</quote
->.</para>
+<para>This option controls which users will be shown in the user view (<option>UserList</option>) and/or offered for autocompletion (<option>UserCompletion</option>). If it is <literal>Selected</literal>, <option>SelectedUsers</option> contains the final list of users. If it is <literal>NotHidden</literal>, the initial user list are all users found on the system. Users contained in <option>HiddenUsers</option> are removed from the list, just like all users with a UID greater than specified in <option>MaxShowUID</option> and users with a non-zero UID less than specified in <option>MinShowUID</option>. Items in <option>SelectedUsers</option> and <option>HiddenUsers</option> which are prefixed with <literal>@</literal> represent all users in the user group named by that item. Finally, the user list will be sorted alphabetically, if <option>SortUsers</option> is enabled. </para>
+<para>The default is <quote>NotHidden</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-selectedusers"
-><option
->SelectedUsers</option
-></term>
+<term id="option-selectedusers"><option>SelectedUsers</option></term>
 <listitem>
-<para
->See <option
->ShowUsers</option
->. </para>
-<para
->Empty by default.</para>
+<para>See <option>ShowUsers</option>. </para>
+<para>Empty by default.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-hiddenusers"
-><option
->HiddenUsers</option
-></term>
+<term id="option-hiddenusers"><option>HiddenUsers</option></term>
 <listitem>
-<para
->See <option
->ShowUsers</option
->. </para>
-<para
->Empty by default.</para>
+<para>See <option>ShowUsers</option>. </para>
+<para>Empty by default.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-minshowuid"
-><option
->MinShowUID</option
-></term>
+<term id="option-minshowuid"><option>MinShowUID</option></term>
 <listitem>
-<para
->See <option
->ShowUsers</option
->. </para>
+<para>See <option>ShowUsers</option>. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-maxshowuid"
-><option
->MaxShowUID</option
-></term>
+<term id="option-maxshowuid"><option>MaxShowUID</option></term>
 <listitem>
-<para
->See <option
->ShowUsers</option
->. </para>
-<para
->The default is <quote
->65535</quote
->.</para>
+<para>See <option>ShowUsers</option>. </para>
+<para>The default is <quote>65535</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-sortusers"
-><option
->SortUsers</option
-></term>
+<term id="option-sortusers"><option>SortUsers</option></term>
 <listitem>
-<para
->See <option
->ShowUsers</option
->. </para>
-<para
->The default is <quote
->true</quote
->.</para>
+<para>See <option>ShowUsers</option>. </para>
+<para>The default is <quote>true</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-facesource"
-><option
->FaceSource</option
-></term>
+<term id="option-facesource"><option>FaceSource</option></term>
 <listitem>
-<para
->If <option
->UserList</option
-> is enabled, this specifies where &tdm; gets the images from: </para>
+<para>If <option>UserList</option> is enabled, this specifies where &tdm; gets the images from: </para>
 <variablelist>
 <varlistentry>
-<term
-><parameter
->AdminOnly</parameter
-></term>
-<listitem
-><para
->from <filename
->&lt;<option
->FaceDir</option
->&gt;/$<envar
->USER</envar
->.face[.icon]</filename
-></para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><parameter
->PreferAdmin</parameter
-></term>
-<listitem
-><para
->prefer &lt;<option
->FaceDir</option
->&gt;, fallback on $<envar
->HOME</envar
-></para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><parameter
->PreferUser</parameter
-></term>
-<listitem
-><para
->... and the other way round</para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><parameter
->UserOnly</parameter
-></term>
-<listitem
-><para
->from the user's <filename
->$<envar
->HOME</envar
->/.face[.icon]</filename
-></para
-></listitem>
+<term><parameter>AdminOnly</parameter></term>
+<listitem><para>from <filename>&lt;<option>FaceDir</option>&gt;/$<envar>USER</envar>.face[.icon]</filename></para></listitem>
+</varlistentry>
+<varlistentry>
+<term><parameter>PreferAdmin</parameter></term>
+<listitem><para>prefer &lt;<option>FaceDir</option>&gt;, fallback on $<envar>HOME</envar></para></listitem>
+</varlistentry>
+<varlistentry>
+<term><parameter>PreferUser</parameter></term>
+<listitem><para>... and the other way round</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><parameter>UserOnly</parameter></term>
+<listitem><para>from the user's <filename>$<envar>HOME</envar>/.face[.icon]</filename></para></listitem>
 </varlistentry>
 </variablelist>
 
-<para
->The images can be in any format Qt recognises, but the filename must match &tdm;'s expectations: <literal
->.face.icon</literal
-> should be a 48x48 icon, while <literal
->.face</literal
-> should be a 300x300 image. Currently the big image is used only as a fallback and is scaled down, but in the future it might be displayed full-size in the logo area or a tooltip. </para>
-<para
->The default is <quote
->AdminOnly</quote
->.</para>
+<para>The images can be in any format Qt recognises, but the filename must match &tdm;'s expectations: <literal>.face.icon</literal> should be a 48x48 icon, while <literal>.face</literal> should be a 300x300 image. Currently the big image is used only as a fallback and is scaled down, but in the future it might be displayed full-size in the logo area or a tooltip. </para>
+<para>The default is <quote>AdminOnly</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-facedir"
-><option
->FaceDir</option
-></term>
+<term id="option-facedir"><option>FaceDir</option></term>
 <listitem>
-<para
->See <option
->FaceSource</option
->. </para>
-<para
->The default is <quote
->${<envar
->kde_datadir</envar
->}/tdm/faces</quote
->.</para>
+<para>See <option>FaceSource</option>. </para>
+<para>The default is <quote>${<envar>kde_datadir</envar>}/tdm/faces</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-preselectuser"
-><option
->PreselectUser</option
-></term>
+<term id="option-preselectuser"><option>PreselectUser</option></term>
 <listitem>
-<para
->Specify, if/which user should be preselected for log in: </para>
+<para>Specify, if/which user should be preselected for log in: </para>
 <variablelist>
 <varlistentry>
-<term
-><parameter
->None</parameter
-></term>
-<listitem
-><para
->do not preselect any user</para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><parameter
->Previous</parameter
-></term>
-<listitem
-><para
->the user which successfully logged in last time</para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><parameter
->Default</parameter
-></term>
-<listitem
-><para
->the user specified in the <option
->DefaultUser</option
-> option</para
-></listitem>
+<term><parameter>None</parameter></term>
+<listitem><para>do not preselect any user</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><parameter>Previous</parameter></term>
+<listitem><para>the user which successfully logged in last time</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><parameter>Default</parameter></term>
+<listitem><para>the user specified in the <option>DefaultUser</option> option</para></listitem>
 </varlistentry>
 </variablelist>
 
-<para
->If <option
->FocusPasswd</option
-> is enabled and a user was preselected, the cursor is placed in the password input field automatically. </para>
-<note
-><para
->Enabling user preselection can be considered a security hole, as it presents a valid login name to a potential attacker, so he <quote
->only</quote
-> needs to guess the password. On the other hand, one could set <option
->DefaultUser</option
-> to a fake login name.</para
-></note>
+<para>If <option>FocusPasswd</option> is enabled and a user was preselected, the cursor is placed in the password input field automatically. </para>
+<note><para>Enabling user preselection can be considered a security hole, as it presents a valid login name to a potential attacker, so he <quote>only</quote> needs to guess the password. On the other hand, one could set <option>DefaultUser</option> to a fake login name.</para></note>
  
-<para
->The default is <quote
->None</quote
->.</para>
+<para>The default is <quote>None</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-defaultuser"
-><option
->DefaultUser</option
-></term>
+<term id="option-defaultuser"><option>DefaultUser</option></term>
 <listitem>
-<para
->See <option
->PreselectUser</option
->. </para>
-<para
->Empty by default.</para>
+<para>See <option>PreselectUser</option>. </para>
+<para>Empty by default.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-focuspasswd"
-><option
->FocusPasswd</option
-></term>
+<term id="option-focuspasswd"><option>FocusPasswd</option></term>
 <listitem>
-<para
->See <option
->PreselectUser</option
->. </para>
-<para
->The default is <quote
->false</quote
->.</para>
+<para>See <option>PreselectUser</option>. </para>
+<para>The default is <quote>false</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-echomode"
-><option
->EchoMode</option
-></term>
+<term id="option-echomode"><option>EchoMode</option></term>
 <listitem>
-<para
->The password input fields cloak the typed in text. Specify, how to do it: </para>
+<para>The password input fields cloak the typed in text. Specify, how to do it: </para>
 <variablelist>
 <varlistentry>
-<term
-><parameter
->OneStar</parameter
-></term>
-<listitem
-><para
-><literal
->*</literal
-> is shown for every typed letter</para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><parameter
->ThreeStars</parameter
-></term>
-<listitem
-><para
-><literal
->***</literal
-> is shown for every typed letter</para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><parameter
->NoEcho</parameter
-></term>
-<listitem
-><para
->nothing is shown at all, the cursor does not move</para
-></listitem>
+<term><parameter>OneStar</parameter></term>
+<listitem><para><literal>*</literal> is shown for every typed letter</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><parameter>ThreeStars</parameter></term>
+<listitem><para><literal>***</literal> is shown for every typed letter</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><parameter>NoEcho</parameter></term>
+<listitem><para>nothing is shown at all, the cursor does not move</para></listitem>
 </varlistentry>
 </variablelist>
-<para
->The default is <quote
->OneStar</quote
->.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term id="option-usebackground"
-><option
->UseBackground</option
-></term>
-<listitem>
-<para
->If enabled, &tdm; will automatically start the <command
->krootimage</command
-> program to set up the background; otherwise, the <option
->Setup</option
-> program is responsible for the background. </para>
-<para
->The default is <quote
->true</quote
->.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term id="option-backgroundcfg"
-><option
->BackgroundCfg</option
-></term>
-<listitem>
-<para
->The configuration file to be used by <command
->krootimage</command
->. It contains a section named <literal
->[Desktop0]</literal
-> like <filename
->kdesktoprc</filename
-> does. Its options are not described herein; guess their meanings or use the control centre. </para>
-<para
->The default is <quote
->${<envar
->kde_confdir</envar
->}/tdm/backgroundrc</quote
->.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term id="option-grabserver"
-><option
->GrabServer</option
-></term>
-<listitem>
-<para
->To improve security, the greeter grabs the &X-Server; and then the keyboard when it starts up. This option specifies if the &X-Server; grab should be held for the duration of the name/password reading. When disabled, the &X-Server; is ungrabbed after the keyboard grab succeeds; otherwise, the &X-Server; is grabbed until just before the session begins. </para>
-<note
-><para
->Enabling this option disables <option
->UseBackground</option
-> and <option
->Setup</option
->.</para
-></note>
+<para>The default is <quote>OneStar</quote>.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="option-usebackground"><option>UseBackground</option></term>
+<listitem>
+<para>If enabled, &tdm; will automatically start the <command>krootimage</command> program to set up the background; otherwise, the <option>Setup</option> program is responsible for the background. </para>
+<para>The default is <quote>true</quote>.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="option-backgroundcfg"><option>BackgroundCfg</option></term>
+<listitem>
+<para>The configuration file to be used by <command>krootimage</command>. It contains a section named <literal>[Desktop0]</literal> like <filename>kdesktoprc</filename> does. Its options are not described herein; guess their meanings or use the control centre. </para>
+<para>The default is <quote>${<envar>kde_confdir</envar>}/tdm/backgroundrc</quote>.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="option-grabserver"><option>GrabServer</option></term>
+<listitem>
+<para>To improve security, the greeter grabs the &X-Server; and then the keyboard when it starts up. This option specifies if the &X-Server; grab should be held for the duration of the name/password reading. When disabled, the &X-Server; is ungrabbed after the keyboard grab succeeds; otherwise, the &X-Server; is grabbed until just before the session begins. </para>
+<note><para>Enabling this option disables <option>UseBackground</option> and <option>Setup</option>.</para></note>
  
-<para
->The default is <quote
->false</quote
->.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term id="option-grabtimeout"
-><option
->GrabTimeout</option
-></term>
-<listitem>
-<para
->This option specifies the maximum time &tdm; will wait for the grabs to succeed. A grab may fail if some other X-client has the &X-Server; or the keyboard grabbed, or possibly if the network latencies are very high. You should be cautious when raising the timeout, as a user can be spoofed by a look-alike window on the display. If a grab fails, &tdm; kills and restarts the &X-Server; (if possible) and the session. </para>
-<para
->The default is <quote
->3</quote
->.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term id="option-authcomplain"
-><option
->AuthComplain</option
-></term>
-<listitem>
-<para
->Warn, if a display has no X-authorisation. This will be the case if <itemizedlist>
- <listitem
-><para
->the authorisation file for a local &X-Server; could not be created, </para
-></listitem>
- <listitem
-><para
->a remote display from &XDMCP; did not request any authorisation or </para
-></listitem>
- <listitem
-><para
->the display is a <literal
->foreign</literal
-> display from the <filename
->Xservers</filename
-> file. </para
-></listitem>
+<para>The default is <quote>false</quote>.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="option-grabtimeout"><option>GrabTimeout</option></term>
+<listitem>
+<para>This option specifies the maximum time &tdm; will wait for the grabs to succeed. A grab may fail if some other X-client has the &X-Server; or the keyboard grabbed, or possibly if the network latencies are very high. You should be cautious when raising the timeout, as a user can be spoofed by a look-alike window on the display. If a grab fails, &tdm; kills and restarts the &X-Server; (if possible) and the session. </para>
+<para>The default is <quote>3</quote>.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="option-authcomplain"><option>AuthComplain</option></term>
+<listitem>
+<para>Warn, if a display has no X-authorisation. This will be the case if <itemizedlist>
+ <listitem><para>the authorisation file for a local &X-Server; could not be created, </para></listitem>
+ <listitem><para>a remote display from &XDMCP; did not request any authorisation or </para></listitem>
+ <listitem><para>the display is a <literal>foreign</literal> display from the <filename>Xservers</filename> file. </para></listitem>
 </itemizedlist>
 </para>
-<para
->The default is <quote
->true</quote
->.</para>
+<para>The default is <quote>true</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-loginmode"
-><option
->LoginMode</option
-></term>
+<term id="option-loginmode"><option>LoginMode</option></term>
 <listitem>
-<para
->Specify whether the greeter of local displays should start up in host chooser (remote) or login (local) mode and whether it is allowed to switch to the other mode. </para>
+<para>Specify whether the greeter of local displays should start up in host chooser (remote) or login (local) mode and whether it is allowed to switch to the other mode. </para>
 <variablelist>
 <varlistentry>
-<term
-><parameter
->LocalOnly</parameter
-></term>
-<listitem
-><para
->only local login possible</para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><parameter
->DefaultLocal</parameter
-></term>
-<listitem
-><para
->start up in local mode, but allow switching to remote mode</para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><parameter
->DefaultRemote</parameter
-></term>
-<listitem
-><para
->... and the other way round</para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
-><parameter
->RemoteOnly</parameter
-></term>
-<listitem
-><para
->only choice of remote host possible</para
-></listitem>
+<term><parameter>LocalOnly</parameter></term>
+<listitem><para>only local login possible</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><parameter>DefaultLocal</parameter></term>
+<listitem><para>start up in local mode, but allow switching to remote mode</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><parameter>DefaultRemote</parameter></term>
+<listitem><para>... and the other way round</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><parameter>RemoteOnly</parameter></term>
+<listitem><para>only choice of remote host possible</para></listitem>
 </varlistentry>
 </variablelist>
-<para
->The default is <quote
->LocalOnly</quote
->.</para>
+<para>The default is <quote>LocalOnly</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-chooserhosts"
-><option
->ChooserHosts</option
-></term>
+<term id="option-chooserhosts"><option>ChooserHosts</option></term>
 <listitem>
-<para
->A list of hosts to be automatically added to the remote login menu. The special name <literal
->*</literal
-> means broadcast. Has no effect if <option
->LoginMode</option
-> is <literal
->LocalOnly</literal
->. </para>
-<para
->The default is <quote
->*</quote
->.</para>
+<para>A list of hosts to be automatically added to the remote login menu. The special name <literal>*</literal> means broadcast. Has no effect if <option>LoginMode</option> is <literal>LocalOnly</literal>. </para>
+<para>The default is <quote>*</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-forgingseed"
-><option
->ForgingSeed</option
-></term>
+<term id="option-forgingseed"><option>ForgingSeed</option></term>
 <listitem>
-<para
->Use this number as a random seed when forging saved session types, etc. of unknown users. This is used to avoid telling an attacker about existing users by reverse conclusion. This value should be random but constant across the login domain. </para>
+<para>Use this number as a random seed when forging saved session types, etc. of unknown users. This is used to avoid telling an attacker about existing users by reverse conclusion. This value should be random but constant across the login domain. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-showlog"
-><option
->ShowLog</option
-></term>
+<term id="option-showlog"><option>ShowLog</option></term>
 <listitem>
-<para
->Enable &tdm;'s built-in <command
->xconsole</command
->. Note that this can be enabled for only one display at a time. This option is available only if &tdm; was <command
->configure</command
->d with <option
->--enable-tdm-xconsole</option
->. </para>
-<para
->The default is <quote
->false</quote
->.</para>
+<para>Enable &tdm;'s built-in <command>xconsole</command>. Note that this can be enabled for only one display at a time. This option is available only if &tdm; was <command>configure</command>d with <option>--enable-tdm-xconsole</option>. </para>
+<para>The default is <quote>false</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-logsource"
-><option
->LogSource</option
-></term>
+<term id="option-logsource"><option>LogSource</option></term>
 <listitem>
-<para
->The data source for &tdm;'s built-in <command
->xconsole</command
->. If empty, a console log redirection is requested from <filename
->/dev/console</filename
->. Has no effect if <option
->ShowLog</option
-> is disabled. </para>
-<para
->Empty by default.</para>
+<para>The data source for &tdm;'s built-in <command>xconsole</command>. If empty, a console log redirection is requested from <filename>/dev/console</filename>. Has no effect if <option>ShowLog</option> is disabled. </para>
+<para>Empty by default.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-pluginslogin"
-><option
->PluginsLogin</option
-></term>
+<term id="option-pluginslogin"><option>PluginsLogin</option></term>
 <listitem>
-<para
->Specify conversation plugins for the login dialogue; the first in the list is selected initially. Each plugin can be specified as a base name (which expands to <filename
->$<envar
->kde_modulesdir</envar
->/kgreet_<replaceable
->base</replaceable
-></filename
->) or as a full pathname. </para
-><para
->Conversation plugins are modules for the greeter which obtain authentication data from the user. Currently only the <literal
->classic</literal
-> plugin is shipped with &kde;; it presents the well-known username and password form. </para>
-<para
->The default is <quote
->classic</quote
->.</para>
+<para>Specify conversation plugins for the login dialogue; the first in the list is selected initially. Each plugin can be specified as a base name (which expands to <filename>$<envar>kde_modulesdir</envar>/kgreet_<replaceable>base</replaceable></filename>) or as a full pathname. </para><para>Conversation plugins are modules for the greeter which obtain authentication data from the user. Currently only the <literal>classic</literal> plugin is shipped with &kde;; it presents the well-known username and password form. </para>
+<para>The default is <quote>classic</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-pluginsshutdown"
-><option
->PluginsShutdown</option
-></term>
+<term id="option-pluginsshutdown"><option>PluginsShutdown</option></term>
 <listitem>
-<para
->Same as <option
->PluginsLogin</option
->, but for the shutdown dialogue. </para>
-<para
->The default is <quote
->classic</quote
->.</para>
+<para>Same as <option>PluginsLogin</option>, but for the shutdown dialogue. </para>
+<para>The default is <quote>classic</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-pluginoptions"
-><option
->PluginOptions</option
-></term>
+<term id="option-pluginoptions"><option>PluginOptions</option></term>
 <listitem>
-<para
->A list of options of the form <replaceable
->Key</replaceable
-><literal
->=</literal
-><replaceable
->Value</replaceable
->. The conversation plugins can query these settings; it is up to them what possible keys are. </para>
-<para
->Empty by default.</para>
+<para>A list of options of the form <replaceable>Key</replaceable><literal>=</literal><replaceable>Value</replaceable>. The conversation plugins can query these settings; it is up to them what possible keys are. </para>
+<para>Empty by default.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-allowconsole"
-><option
->AllowConsole</option
-></term>
+<term id="option-allowconsole"><option>AllowConsole</option></term>
 <listitem>
-<para
->Show the <guilabel
->Console Login</guilabel
-> action in the greeter. For this to work, a console must be configured for this particular display, see <xref linkend="tdmrc-xservers"/>. </para>
-<para
->The default is <quote
->true</quote
->.</para>
+<para>Show the <guilabel>Console Login</guilabel> action in the greeter. For this to work, a console must be configured for this particular display, see <xref linkend="tdmrc-xservers"/>. </para>
+<para>The default is <quote>true</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-allowclose"
-><option
->AllowClose</option
-></term>
+<term id="option-allowclose"><option>AllowClose</option></term>
 <listitem>
-<para
->Show the <guilabel
->Restart X Server</guilabel
->/<guilabel
->Close Connection</guilabel
-> action in the greeter. </para>
-<para
->The default is <quote
->true</quote
->.</para>
+<para>Show the <guilabel>Restart X Server</guilabel>/<guilabel>Close Connection</guilabel> action in the greeter. </para>
+<para>The default is <quote>true</quote>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term id="option-preloader"
-><option
->Preloader</option
-></term>
+<term id="option-preloader"><option>Preloader</option></term>
 <listitem>
-<para
->A program to run while the greeter is visible. It is supposed to preload as much as possible of the session that is going to be started (most probably). </para>
-<para
->Empty by default.</para>
+<para>A program to run while the greeter is visible. It is supposed to preload as much as possible of the session that is going to be started (most probably). </para>
+<para>Empty by default.</para>
 </listitem>
 </varlistentry>
 
@@ -2666,524 +1228,190 @@
 </sect1>
 
 <sect1 id="tdmrc-xservers">
-<title
->Specifying permanent &X-Server;s</title>
-
-<para
->Each specification indicates a display which should constantly be managed and which is not using &XDMCP;. This method is typically used only for local &X-Server;s that are started by &tdm;, but &tdm; can manage externally started (<quote
->foreign</quote
->) &X-Server;s as well, may they run on the local machine or rather remotely.</para>
-
-<para
->The formal syntax of a specification is <screen>
-<userinput
-><replaceable
->display&nbsp;name</replaceable
->&nbsp;[<replaceable
->display&nbsp;class</replaceable
->]&nbsp;<literal
->local</literal
->[<literal
->@</literal
-><replaceable
->tty</replaceable
->]&nbsp;[<literal
->reserve</literal
->]&nbsp;<replaceable
->server&nbsp;command</replaceable
-></userinput>
-</screen
-> for own &X-Server;s and <screen>
-<userinput
-><replaceable
->display&nbsp;name</replaceable
->&nbsp;[<replaceable
->display&nbsp;class</replaceable
->]&nbsp;<literal
->foreign</literal
-></userinput>
-</screen
-> for foreign &X-Server;s.</para>
-
-<para
->The <replaceable
->display name</replaceable
-> must be something that can be passed in the <option
->-display</option
-> option to an X program. This string is used to generate the display-specific section names, so be careful to match the names. The display name of &XDMCP; displays is derived from the display's address by reverse host name resolution. For configuration purposes, the <literal
->localhost</literal
-> prefix from locally running &XDMCP; displays is <emphasis
->not</emphasis
-> stripped to make them distinguishable from local &X-Server;s started by &tdm;.</para>
-
-<para
->The <replaceable
->display class</replaceable
-> portion is also used in the display-specific sections. This is useful if you have a large collection of similar displays (such as a corral of X terminals) and would like to set options for groups of them. When using &XDMCP;, the display is required to specify the display class, so the manual for your particular X terminal should document the display class string for your device. If it does not, you can run &tdm; in debug mode and <command
->grep</command
-> the log for <quote
->class</quote
->.</para>
-
-<para
->The <replaceable
->tty</replaceable
-> specifies which text console an &X-Server; is <quote
->covering</quote
->, so &tdm; knows which console it should monitor for activity after switching to <guilabel
->Console login</guilabel
-> to find out when the console session ends. Note that this concept (originating from Solaris) is not perfectly suited for Linux, as there &X-Server;s run on separate virtual terminals and consequently do not actually cover consoles (<command
->getty</command
->s). </para>
-
-<para
->The <literal
->reserve</literal
-> keyword instructs &tdm; to start the display not when &tdm; starts up, but when it is explicitly requested via the command <acronym
->FiFo</acronym
->. If reserve displays are specified, the &kde; menu will have a <guilabel
->Start New Session</guilabel
-> item near the bottom; use that to activate a reserve display with a new login session. The monitor will switch to the new display, and you will have a minute to login. If there are no more reserve displays available, selecting the menu item will have no effect.</para>
-
-<para
->The <replaceable
->server command</replaceable
-> specifies the complete &X-Server; command line, including a display number for secondary displays. When &tdm; starts a session, it sets up authorisation data for the &X-Server;. For local servers, &tdm; passes <command
-><option
->-auth</option
->&nbsp;<filename
-><replaceable
->filename</replaceable
-></filename
-></command
-> on the &X-Server;'s command line to point it at its authorisation data. For &XDMCP; displays, &tdm; passes the authorisation data to the &X-Server; via the <quote
->Accept</quote
-> &XDMCP; message.</para>
+<title>Specifying permanent &X-Server;s</title>
+
+<para>Each specification indicates a display which should constantly be managed and which is not using &XDMCP;. This method is typically used only for local &X-Server;s that are started by &tdm;, but &tdm; can manage externally started (<quote>foreign</quote>) &X-Server;s as well, may they run on the local machine or rather remotely.</para>
+
+<para>The formal syntax of a specification is <screen>
+<userinput><replaceable>display&nbsp;name</replaceable>&nbsp;[<replaceable>display&nbsp;class</replaceable>]&nbsp;<literal>local</literal>[<literal>@</literal><replaceable>tty</replaceable>]&nbsp;[<literal>reserve</literal>]&nbsp;<replaceable>server&nbsp;command</replaceable></userinput>
+</screen> for own &X-Server;s and <screen>
+<userinput><replaceable>display&nbsp;name</replaceable>&nbsp;[<replaceable>display&nbsp;class</replaceable>]&nbsp;<literal>foreign</literal></userinput>
+</screen> for foreign &X-Server;s.</para>
+
+<para>The <replaceable>display name</replaceable> must be something that can be passed in the <option>-display</option> option to an X program. This string is used to generate the display-specific section names, so be careful to match the names. The display name of &XDMCP; displays is derived from the display's address by reverse host name resolution. For configuration purposes, the <literal>localhost</literal> prefix from locally running &XDMCP; displays is <emphasis>not</emphasis> stripped to make them distinguishable from local &X-Server;s started by &tdm;.</para>
+
+<para>The <replaceable>display class</replaceable> portion is also used in the display-specific sections. This is useful if you have a large collection of similar displays (such as a corral of X terminals) and would like to set options for groups of them. When using &XDMCP;, the display is required to specify the display class, so the manual for your particular X terminal should document the display class string for your device. If it does not, you can run &tdm; in debug mode and <command>grep</command> the log for <quote>class</quote>.</para>
+
+<para>The <replaceable>tty</replaceable> specifies which text console an &X-Server; is <quote>covering</quote>, so &tdm; knows which console it should monitor for activity after switching to <guilabel>Console login</guilabel> to find out when the console session ends. Note that this concept (originating from Solaris) is not perfectly suited for Linux, as there &X-Server;s run on separate virtual terminals and consequently do not actually cover consoles (<command>getty</command>s). </para>
+
+<para>The <literal>reserve</literal> keyword instructs &tdm; to start the display not when &tdm; starts up, but when it is explicitly requested via the command <acronym>FiFo</acronym>. If reserve displays are specified, the &kde; menu will have a <guilabel>Start New Session</guilabel> item near the bottom; use that to activate a reserve display with a new login session. The monitor will switch to the new display, and you will have a minute to login. If there are no more reserve displays available, selecting the menu item will have no effect.</para>
+
+<para>The <replaceable>server command</replaceable> specifies the complete &X-Server; command line, including a display number for secondary displays. When &tdm; starts a session, it sets up authorisation data for the &X-Server;. For local servers, &tdm; passes <command><option>-auth</option>&nbsp;<filename><replaceable>filename</replaceable></filename></command> on the &X-Server;'s command line to point it at its authorisation data. For &XDMCP; displays, &tdm; passes the authorisation data to the &X-Server; via the <quote>Accept</quote> &XDMCP; message.</para>
 
 </sect1>
 
 <sect1 id="tdmrc-xaccess">
-<title
->&XDMCP; access control</title>
-
-<para
->The file specified by the <option
->AccessFile</option
-> option provides information which &tdm; uses to control access from displays requesting service via &XDMCP;. The file contains four types of entries: entries which control the response to <quote
->Direct</quote
-> and <quote
->Broadcast</quote
-> queries, entries which control the response to <quote
->Indirect</quote
-> queries, macro definitions for <quote
->Indirect</quote
-> entries and entries which control on which network interfaces &tdm; listens for &XDMCP; queries. Blank lines are ignored, <literal
->#</literal
-> is treated as a comment delimiter causing the rest of that line to be ignored and <literal
->\</literal
-> causes an immediately following newline to be ignored, allowing indirect host lists to span multiple lines. </para>
-
-<para
->The format of the <quote
->Direct</quote
-> entries is simple, either a host name or a pattern, which is compared against the host name of the display device. Patterns are distinguished from host names by the inclusion of one or more meta characters; <literal
->*</literal
-> matches any sequence of 0 or more characters, and <literal
->?</literal
-> matches any single character. If the entry is a host name, all comparisons are done using network addresses, so any name which converts to the correct network address may be used. Note that only the first network address returned for a host name is used. For patterns, only canonical host names are used in the comparison, so ensure that you do not attempt to match aliases. Host names from &XDMCP; queries always contain the local domain name even if the reverse lookup returns a short name, so you can use patterns for the local domain. Preceding the entry with a <literal
->!</literal
-> character causes hosts which match that entry to be excluded. To only respond to <quote
->Direct</quote
-> queries for a host or pattern, it can be followed by the optional <literal
->NOBROADCAST</literal
-> keyword. This can be used to prevent a &tdm; server from appearing on menus based on <quote
->Broadcast</quote
-> queries.</para>
-
-<para
->An <quote
->Indirect</quote
-> entry also contains a host name or pattern, but follows it with a list of host names or macros to which the queries should be forwarded. <quote
->Indirect</quote
-> entries can be excluding as well, in which case a (valid) dummy host name must be supplied to make the entry distinguishable from a <quote
->Direct</quote
-> entry. If compiled with IPv6 support, multicast address groups may also be included in the list of addresses the queries are forwarded to. If the indirect host list contains the keyword <literal
->CHOOSER</literal
->, <quote
->Indirect</quote
-> queries are not forwarded, but instead a host chooser dialogue is displayed by &tdm;. The chooser will send a <quote
->Direct</quote
-> query to each of the remaining host names in the list and offer a menu of all the hosts that respond. The host list may contain the keyword <literal
->BROADCAST</literal
->, to make the chooser send a <quote
->Broadcast</quote
-> query as well; note that on some operating systems, UDP packets cannot be broadcast, so this feature will not work. </para>
-
-<para
->When checking access for a particular display host, each entry is scanned in turn and the first matching entry determines the response. <quote
->Direct</quote
-> and <quote
->Broadcast</quote
-> entries are ignored when scanning for an <quote
->Indirect</quote
-> entry and vice-versa.</para>
-
-<para
->A macro definition contains a macro name and a list of host names and other macros that the macro expands to. To distinguish macros from hostnames, macro names start with a <literal
->%</literal
-> character.</para>
-
-<para
->The last entry type is the <literal
->LISTEN</literal
-> directive. The formal syntax is <screen>
-<userinput
->&nbsp;<literal
->LISTEN</literal
->&nbsp;[<replaceable
->interface</replaceable
->&nbsp;[<replaceable
->multicast&nbsp;list</replaceable
->]]</userinput>
-</screen
-> If one or more <literal
->LISTEN</literal
-> lines are specified, &tdm; listens for &XDMCP; requests only on the specified interfaces. <replaceable
->interface</replaceable
-> may be a hostname or IP address representing a network interface on this machine, or the wildcard <literal
->*</literal
-> to represent all available network interfaces. If multicast group addresses are listed on a <literal
->LISTEN</literal
-> line, &tdm; joins the multicast groups on the given interface. For IPv6 multicasts, the IANA has assigned ff0<replaceable
->X</replaceable
->:0:0:0:0:0:0:12b as the permanently assigned range of multicast addresses for &XDMCP;. The <replaceable
->X</replaceable
-> in the prefix may be replaced by any valid scope identifier, such as 1 for Node-Local, 2 for Link-Local, 5 for Site-Local, and so on (see IETF RFC 2373 or its replacement for further details and scope definitions). &tdm; defaults to listening on the Link-Local scope address ff02:0:0:0:0:0:0:12b to most closely match the IPv4 subnet broadcast behavior. If no <literal
->LISTEN</literal
-> lines are given, &tdm; listens on all interfaces and joins the default &XDMCP; IPv6 multicast group (when compiled with IPv6 support). To disable listening for &XDMCP; requests altogether, a <literal
->LISTEN</literal
-> line with no addresses may be specified, but using the <literal
->[Xdmcp]</literal
-> <option
->Enable</option
-> option is preferred. </para>
+<title>&XDMCP; access control</title>
+
+<para>The file specified by the <option>AccessFile</option> option provides information which &tdm; uses to control access from displays requesting service via &XDMCP;. The file contains four types of entries: entries which control the response to <quote>Direct</quote> and <quote>Broadcast</quote> queries, entries which control the response to <quote>Indirect</quote> queries, macro definitions for <quote>Indirect</quote> entries and entries which control on which network interfaces &tdm; listens for &XDMCP; queries. Blank lines are ignored, <literal>#</literal> is treated as a comment delimiter causing the rest of that line to be ignored and <literal>\</literal> causes an immediately following newline to be ignored, allowing indirect host lists to span multiple lines. </para>
+
+<para>The format of the <quote>Direct</quote> entries is simple, either a host name or a pattern, which is compared against the host name of the display device. Patterns are distinguished from host names by the inclusion of one or more meta characters; <literal>*</literal> matches any sequence of 0 or more characters, and <literal>?</literal> matches any single character. If the entry is a host name, all comparisons are done using network addresses, so any name which converts to the correct network address may be used. Note that only the first network address returned for a host name is used. For patterns, only canonical host names are used in the comparison, so ensure that you do not attempt to match aliases. Host names from &XDMCP; queries always contain the local domain name even if the reverse lookup returns a short name, so you can use patterns for the local domain. Preceding the entry with a <literal>!</literal> character causes hosts which match that entry to be excluded. To only respond to <quote>Direct</quote> queries for a host or pattern, it can be followed by the optional <literal>NOBROADCAST</literal> keyword. This can be used to prevent a &tdm; server from appearing on menus based on <quote>Broadcast</quote> queries.</para>
+
+<para>An <quote>Indirect</quote> entry also contains a host name or pattern, but follows it with a list of host names or macros to which the queries should be forwarded. <quote>Indirect</quote> entries can be excluding as well, in which case a (valid) dummy host name must be supplied to make the entry distinguishable from a <quote>Direct</quote> entry. If compiled with IPv6 support, multicast address groups may also be included in the list of addresses the queries are forwarded to. If the indirect host list contains the keyword <literal>CHOOSER</literal>, <quote>Indirect</quote> queries are not forwarded, but instead a host chooser dialogue is displayed by &tdm;. The chooser will send a <quote>Direct</quote> query to each of the remaining host names in the list and offer a menu of all the hosts that respond. The host list may contain the keyword <literal>BROADCAST</literal>, to make the chooser send a <quote>Broadcast</quote> query as well; note that on some operating systems, UDP packets cannot be broadcast, so this feature will not work. </para>
+
+<para>When checking access for a particular display host, each entry is scanned in turn and the first matching entry determines the response. <quote>Direct</quote> and <quote>Broadcast</quote> entries are ignored when scanning for an <quote>Indirect</quote> entry and vice-versa.</para>
+
+<para>A macro definition contains a macro name and a list of host names and other macros that the macro expands to. To distinguish macros from hostnames, macro names start with a <literal>%</literal> character.</para>
+
+<para>The last entry type is the <literal>LISTEN</literal> directive. The formal syntax is <screen>
+<userinput>&nbsp;<literal>LISTEN</literal>&nbsp;[<replaceable>interface</replaceable>&nbsp;[<replaceable>multicast&nbsp;list</replaceable>]]</userinput>
+</screen> If one or more <literal>LISTEN</literal> lines are specified, &tdm; listens for &XDMCP; requests only on the specified interfaces. <replaceable>interface</replaceable> may be a hostname or IP address representing a network interface on this machine, or the wildcard <literal>*</literal> to represent all available network interfaces. If multicast group addresses are listed on a <literal>LISTEN</literal> line, &tdm; joins the multicast groups on the given interface. For IPv6 multicasts, the IANA has assigned ff0<replaceable>X</replaceable>:0:0:0:0:0:0:12b as the permanently assigned range of multicast addresses for &XDMCP;. The <replaceable>X</replaceable> in the prefix may be replaced by any valid scope identifier, such as 1 for Node-Local, 2 for Link-Local, 5 for Site-Local, and so on (see IETF RFC 2373 or its replacement for further details and scope definitions). &tdm; defaults to listening on the Link-Local scope address ff02:0:0:0:0:0:0:12b to most closely match the IPv4 subnet broadcast behavior. If no <literal>LISTEN</literal> lines are given, &tdm; listens on all interfaces and joins the default &XDMCP; IPv6 multicast group (when compiled with IPv6 support). To disable listening for &XDMCP; requests altogether, a <literal>LISTEN</literal> line with no addresses may be specified, but using the <literal>[Xdmcp]</literal> <option>Enable</option> option is preferred. </para>
 
 </sect1>
 
 <sect1>
-<title
->Supplementary programs</title>
+<title>Supplementary programs</title>
 
-<para
->The following programs are run by &tdm; at various stages of a session. They typically are shell scripts. </para>
+<para>The following programs are run by &tdm; at various stages of a session. They typically are shell scripts. </para>
 
-<para
->The Setup, Startup and Reset programs are run as <systemitem class="username"
->root</systemitem
->, so they should be careful about security. Their first argument is <literal
->auto</literal
-> if the session results from an automatic login; otherwise, no arguments are passed to them. </para>
+<para>The Setup, Startup and Reset programs are run as <systemitem class="username">root</systemitem>, so they should be careful about security. Their first argument is <literal>auto</literal> if the session results from an automatic login; otherwise, no arguments are passed to them. </para>
 
 <sect2 id="tdmrc-xsetup">
-<title
->Setup program</title>
-
-<para
->The <filename
->Xsetup</filename
-> program is run after the &X-Server; is started or reset, but before the greeter is offered. This is the place to change the root background (if <option
->UseBackground</option
-> is disabled) or bring up other windows that should appear on the screen along with the greeter. </para>
-
-<para
->In addition to any specified by <option
->ExportList</option
->, the following environment variables are passed:</para>
+<title>Setup program</title>
+
+<para>The <filename>Xsetup</filename> program is run after the &X-Server; is started or reset, but before the greeter is offered. This is the place to change the root background (if <option>UseBackground</option> is disabled) or bring up other windows that should appear on the screen along with the greeter. </para>
+
+<para>In addition to any specified by <option>ExportList</option>, the following environment variables are passed:</para>
 <variablelist>
  <varlistentry>
-  <term
->DISPLAY</term>
-  <listitem
-><para
->the associated display name</para
-></listitem>
+  <term>DISPLAY</term>
+  <listitem><para>the associated display name</para></listitem>
  </varlistentry>
  <varlistentry>
-  <term
->PATH</term>
-  <listitem
-><para
->the value of <option
->SystemPath</option
-></para
-></listitem>
+  <term>PATH</term>
+  <listitem><para>the value of <option>SystemPath</option></para></listitem>
  </varlistentry>
  <varlistentry>
-  <term
->SHELL</term>
-  <listitem
-><para
->the value of <option
->SystemShell</option
-></para
-></listitem>
+  <term>SHELL</term>
+  <listitem><para>the value of <option>SystemShell</option></para></listitem>
  </varlistentry>
  <varlistentry>
-  <term
->XAUTHORITY</term>
-  <listitem
-><para
->may be set to an authority file</para
-></listitem>
+  <term>XAUTHORITY</term>
+  <listitem><para>may be set to an authority file</para></listitem>
  </varlistentry>
  <varlistentry>
-  <term
->DM_CONTROL</term>
-  <listitem
-><para
->the value of <option
->FifoDir</option
-></para
-></listitem>
+  <term>DM_CONTROL</term>
+  <listitem><para>the value of <option>FifoDir</option></para></listitem>
  </varlistentry>
 </variablelist>
 
-<para
->Note that since &tdm; grabs the keyboard, any other windows will not be able to receive keyboard input. They will be able to interact with the mouse, however; beware of potential security holes here. If <option
->GrabServer</option
-> is set, <filename
->Xsetup</filename
-> will not be able to connect to the display at all. Resources for this program can be put into the file named by <option
->Resources</option
->. </para>
+<para>Note that since &tdm; grabs the keyboard, any other windows will not be able to receive keyboard input. They will be able to interact with the mouse, however; beware of potential security holes here. If <option>GrabServer</option> is set, <filename>Xsetup</filename> will not be able to connect to the display at all. Resources for this program can be put into the file named by <option>Resources</option>. </para>
 
 </sect2>
 
 <sect2 id="tdmrc-xstartup">
-<title
->Startup program</title>
-
-<para
->The <filename
->Xstartup</filename
-> program is run as <systemitem class="username"
->root</systemitem
-> when the user logs in. This is the place to put commands which add entries to <filename
->utmp</filename
-> (the <command
->sessreg</command
-> program may be useful here), mount users' home directories from file servers, or abort the session if some requirements are not met (but note that on modern systems, many of these tasks are already taken care of by <acronym
->PAM</acronym
-> modules).</para>
-
-<para
->In addition to any specified by <option
->ExportList</option
->, the following environment variables are passed:</para>
+<title>Startup program</title>
+
+<para>The <filename>Xstartup</filename> program is run as <systemitem class="username">root</systemitem> when the user logs in. This is the place to put commands which add entries to <filename>utmp</filename> (the <command>sessreg</command> program may be useful here), mount users' home directories from file servers, or abort the session if some requirements are not met (but note that on modern systems, many of these tasks are already taken care of by <acronym>PAM</acronym> modules).</para>
+
+<para>In addition to any specified by <option>ExportList</option>, the following environment variables are passed:</para>
 <variablelist>
  <varlistentry>
-  <term
->DISPLAY</term>
-  <listitem
-><para
->the associated display name</para
-></listitem>
+  <term>DISPLAY</term>
+  <listitem><para>the associated display name</para></listitem>
  </varlistentry>
  <varlistentry>
-  <term
->HOME</term>
-  <listitem
-><para
->the initial working directory of the user</para
-></listitem>
+  <term>HOME</term>
+  <listitem><para>the initial working directory of the user</para></listitem>
  </varlistentry>
  <varlistentry>
-  <term
->LOGNAME</term>
-  <listitem
-><para
->the username</para
-></listitem>
+  <term>LOGNAME</term>
+  <listitem><para>the username</para></listitem>
  </varlistentry>
  <varlistentry>
-  <term
->USER</term>
-  <listitem
-><para
->the username</para
-></listitem>
+  <term>USER</term>
+  <listitem><para>the username</para></listitem>
  </varlistentry>
  <varlistentry>
-  <term
->PATH</term>
-  <listitem
-><para
->the value of <option
->SystemPath</option
-></para
-></listitem>
+  <term>PATH</term>
+  <listitem><para>the value of <option>SystemPath</option></para></listitem>
  </varlistentry>
  <varlistentry>
-  <term
->SHELL</term>
-  <listitem
-><para
->the value of <option
->SystemShell</option
-></para
-></listitem>
+  <term>SHELL</term>
+  <listitem><para>the value of <option>SystemShell</option></para></listitem>
  </varlistentry>
  <varlistentry>
-  <term
->XAUTHORITY</term>
-  <listitem
-><para
->may be set to an authority file</para
-></listitem>
+  <term>XAUTHORITY</term>
+  <listitem><para>may be set to an authority file</para></listitem>
  </varlistentry>
  <varlistentry>
-  <term
->DM_CONTROL</term>
-  <listitem
-><para
->the value of <option
->FifoDir</option
-></para
-></listitem>
+  <term>DM_CONTROL</term>
+  <listitem><para>the value of <option>FifoDir</option></para></listitem>
  </varlistentry>
 </variablelist>
 
-<para
->&tdm; waits until this program exits before starting the user session. If the exit value of this program is non-zero, &tdm; discontinues the session and starts another authentication cycle.</para>
+<para>&tdm; waits until this program exits before starting the user session. If the exit value of this program is non-zero, &tdm; discontinues the session and starts another authentication cycle.</para>
 
 </sect2>
 
 <sect2 id="tdmrc-xsession">
-<title
->Session program</title>
-
-<para
->The <filename
->Xsession</filename
-> program is the command which is run as the user's session. It is run with the permissions of the authorised user. One of the keywords <literal
->failsafe</literal
->, <literal
->default</literal
-> or <literal
->custom</literal
->, or a string to <command
->eval</command
-> by a Bourne-compatible shell is passed as the first argument.</para>
-
-<para
->In addition to any specified by <option
->ExportList</option
->, the following environment variables are passed:</para>
+<title>Session program</title>
+
+<para>The <filename>Xsession</filename> program is the command which is run as the user's session. It is run with the permissions of the authorised user. One of the keywords <literal>failsafe</literal>, <literal>default</literal> or <literal>custom</literal>, or a string to <command>eval</command> by a Bourne-compatible shell is passed as the first argument.</para>
+
+<para>In addition to any specified by <option>ExportList</option>, the following environment variables are passed:</para>
 <variablelist>
  <varlistentry>
-  <term
->DISPLAY</term>
-  <listitem
-><para
->the associated display name</para
-></listitem>
+  <term>DISPLAY</term>
+  <listitem><para>the associated display name</para></listitem>
  </varlistentry>
  <varlistentry>
-  <term
->HOME</term>
-  <listitem
-><para
->the initial working directory of the user</para
-></listitem>
+  <term>HOME</term>
+  <listitem><para>the initial working directory of the user</para></listitem>
  </varlistentry>
  <varlistentry>
-  <term
->LOGNAME</term>
-  <listitem
-><para
->the username</para
-></listitem>
+  <term>LOGNAME</term>
+  <listitem><para>the username</para></listitem>
  </varlistentry>
  <varlistentry>
-  <term
->USER</term>
-  <listitem
-><para
->the username</para
-></listitem>
+  <term>USER</term>
+  <listitem><para>the username</para></listitem>
  </varlistentry>
  <varlistentry>
-  <term
->PATH</term>
-  <listitem
-><para
->the value of <option
->UserPath</option
-> (or <option
->SystemPath</option
-> for <systemitem class="username"
->root</systemitem
-> user sessions)</para>
+  <term>PATH</term>
+  <listitem><para>the value of <option>UserPath</option> (or <option>SystemPath</option> for <systemitem class="username">root</systemitem> user sessions)</para>
   </listitem>
  </varlistentry>
  <varlistentry>
-  <term
->SHELL</term>
-  <listitem
-><para
->the user's default shell</para
-></listitem>
+  <term>SHELL</term>
+  <listitem><para>the user's default shell</para></listitem>
  </varlistentry>
  <varlistentry>
-  <term
->XAUTHORITY</term>
-  <listitem
-><para
->may be set to a non-standard authority file</para
-></listitem>
+  <term>XAUTHORITY</term>
+  <listitem><para>may be set to a non-standard authority file</para></listitem>
  </varlistentry>
  <varlistentry>
-  <term
->KRBTKFILE</term>
-  <listitem
-><para
->may be set to a Kerberos4 credentials cache name</para>
+  <term>KRBTKFILE</term>
+  <listitem><para>may be set to a Kerberos4 credentials cache name</para>
   </listitem>
  </varlistentry>
  <varlistentry>
-  <term
->KRB5CCNAME</term>
-  <listitem
-><para
->may be set to a Kerberos5 credentials cache name</para>
+  <term>KRB5CCNAME</term>
+  <listitem><para>may be set to a Kerberos5 credentials cache name</para>
   </listitem>
  </varlistentry>
  <varlistentry>
-  <term
->DM_CONTROL</term>
-  <listitem
-><para
->the value of <option
->FifoDir</option
-></para
-></listitem>
+  <term>DM_CONTROL</term>
+  <listitem><para>the value of <option>FifoDir</option></para></listitem>
  </varlistentry>
  <varlistentry>
-  <term
->XDM_MANAGED</term>
-  <listitem
-><para
->will contain a comma-separated list of parameters the session might find interesting, like the location of the command <acronym
->FiFo</acronym
-> and its capabilities, and which conversation plugin was used for the login</para>
+  <term>XDM_MANAGED</term>
+  <listitem><para>will contain a comma-separated list of parameters the session might find interesting, like the location of the command <acronym>FiFo</acronym> and its capabilities, and which conversation plugin was used for the login</para>
   </listitem>
  </varlistentry>
  <varlistentry>
-  <term
->DESKTOP_SESSION</term>
-  <listitem
-><para
->the name of the session the user has chosen to run</para>
+  <term>DESKTOP_SESSION</term>
+  <listitem><para>the name of the session the user has chosen to run</para>
   </listitem>
  </varlistentry>
 </variablelist>
@@ -3191,28 +1419,11 @@
 </sect2>
 
 <sect2 id="tdmrc-xreset">
-<title
->Reset program</title>
-
-<para
->Symmetrical with <filename
->Xstartup</filename
->, the <filename
->Xreset</filename
-> program is run after the user session has terminated. Run as <systemitem class="username"
->root</systemitem
->, it should contain commands that undo the effects of commands in <filename
->Xstartup</filename
->, removing entries from <filename
->utmp</filename
-> or unmounting directories from file servers.</para>
-
-<para
->The environment variables that were passed to <filename
->Xstartup</filename
-> are also passed to <filename
->Xreset</filename
->. </para>
+<title>Reset program</title>
+
+<para>Symmetrical with <filename>Xstartup</filename>, the <filename>Xreset</filename> program is run after the user session has terminated. Run as <systemitem class="username">root</systemitem>, it should contain commands that undo the effects of commands in <filename>Xstartup</filename>, removing entries from <filename>utmp</filename> or unmounting directories from file servers.</para>
+
+<para>The environment variables that were passed to <filename>Xstartup</filename> are also passed to <filename>Xreset</filename>. </para>
 
 </sect2>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/userguide/about-desktop.docbook b/tde-i18n-en_GB/docs/tdebase/userguide/about-desktop.docbook
index 26670ccb6c1..6609f70e907 100644
--- a/tde-i18n-en_GB/docs/tdebase/userguide/about-desktop.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/userguide/about-desktop.docbook
@@ -1,567 +1,243 @@
 <chapter id="all-about-your-desktop">
-<title
->All About Your Desktop</title>
+<title>All About Your Desktop</title>
 
 <epigraph>
-<attribution
->Little Red Riding Hood</attribution>
-<para
->Grandma, what big eyes you have!</para>
+<attribution>Little Red Riding Hood</attribution>
+<para>Grandma, what big eyes you have!</para>
 </epigraph>
 
 <epigraph>
-<attribution
->The Wolf</attribution>
-<para
->The better to see you!</para>
+<attribution>The Wolf</attribution>
+<para>The better to see you!</para>
 </epigraph>
 
-<para
->The more you see, the more efficiently you can use your desktop. &kde; gives you the opportunity to make the desktop look and work the way you prefer, enabling you to work faster and more productively. It even gives you the opportunity to be warned if a wolf is trying to eat you, or (if you happen to be a granny) alert you when Little Red Riding Hood is on her way to bring you the goodies. Now that's service. </para>
+<para>The more you see, the more efficiently you can use your desktop. &kde; gives you the opportunity to make the desktop look and work the way you prefer, enabling you to work faster and more productively. It even gives you the opportunity to be warned if a wolf is trying to eat you, or (if you happen to be a granny) alert you when Little Red Riding Hood is on her way to bring you the goodies. Now that's service. </para>
 
 <sect1 id="the-autostart-folder">
-<title
->Autostarting Applications</title>
+<title>Autostarting Applications</title>
 
-<para
->Native &kde; programs and many third party applications left open at the end of a session will save their state and reappear when you login again, but there are some programs (like some versions of &Netscape;) that will not. You can use the <filename
->Autostart</filename
-> folder for these programs.</para>
+<para>Native &kde; programs and many third party applications left open at the end of a session will save their state and reappear when you login again, but there are some programs (like some versions of &Netscape;) that will not. You can use the <filename>Autostart</filename> folder for these programs.</para>
 
-<para
->To launch programs when &kde; is started, do the following:</para>
+<para>To launch programs when &kde; is started, do the following:</para>
 
 <procedure>
 <step>
-<para
->Open the <filename
->Autostart</filename
-> folder. By default this folder is at <filename class="directory"
->$<envar
->HOME</envar
->/.trinity/Autostart</filename
-></para>
+<para>Open the <filename>Autostart</filename> folder. By default this folder is at <filename class="directory">$<envar>HOME</envar>/.trinity/Autostart</filename></para>
 </step>
 <step>
-<para
->Open a &konqueror; window and browse to the program you want to add. If you do not know how to do this, it was covered in <xref linkend="the-filemanager-screen"/>.</para>
+<para>Open a &konqueror; window and browse to the program you want to add. If you do not know how to do this, it was covered in <xref linkend="the-filemanager-screen"/>.</para>
 </step>
 <step>
-<para
->Drag and drop the desired program from the &konqueror; window on to the <filename class="directory"
->Autostart</filename
-> folder. When asked, choose <guimenuitem
->Link</guimenuitem
-> to create a symbolic link rather than a full copy, as this saves a great deal of disk space.</para>
+<para>Drag and drop the desired program from the &konqueror; window on to the <filename class="directory">Autostart</filename> folder. When asked, choose <guimenuitem>Link</guimenuitem> to create a symbolic link rather than a full copy, as this saves a great deal of disk space.</para>
 </step>
 <step>
-<para
->Repeat the above steps for every program you want started when &kde; is launched. Remember, you do not need to add native &kde; applications, just leave them open when you log out, and they will open up again as if nothing had happened the next time you log in to &kde;.</para>
+<para>Repeat the above steps for every program you want started when &kde; is launched. Remember, you do not need to add native &kde; applications, just leave them open when you log out, and they will open up again as if nothing had happened the next time you log in to &kde;.</para>
 </step>
 <step>
-<para
->Restart &kde; if you want to see the autostart function in action.</para>
+<para>Restart &kde; if you want to see the autostart function in action.</para>
 </step>
 </procedure>
 
-<para
->Your programs should have launched automatically when &kde; restarted.</para>
+<para>Your programs should have launched automatically when &kde; restarted.</para>
 
-<para
->Do not forget though that you will only need the Autostart folder for a few applications. Many applications, including almost all native &kde; applications, now understand session management, and you can simply leave them open when you log out in order for them to be restarted exactly as you left them. You can leave a &konqueror; window open with your favourite website, &kmail; looking at your inbox, and &kate; with a half dozen files open, log out, log back in, and find your desktop exactly as you left it.</para>
+<para>Do not forget though that you will only need the Autostart folder for a few applications. Many applications, including almost all native &kde; applications, now understand session management, and you can simply leave them open when you log out in order for them to be restarted exactly as you left them. You can leave a &konqueror; window open with your favourite website, &kmail; looking at your inbox, and &kate; with a half dozen files open, log out, log back in, and find your desktop exactly as you left it.</para>
 
 </sect1>
 
 <sect1 id="adding-programs">
-<title
->Adding Programs and Shortcut Icons to Your &kmenu; and Panel</title>
+<title>Adding Programs and Shortcut Icons to Your &kmenu; and Panel</title>
 
-<para
->The &kde; &kmenu; and &kicker; are not limited to the setup you find right after installing &kde;. The &kde; panel is designed to be extended, and there are two main ways of doing that: Adding new programs, and adding shortcut icons.</para>
+<para>The &kde; &kmenu; and &kicker; are not limited to the setup you find right after installing &kde;. The &kde; panel is designed to be extended, and there are two main ways of doing that: Adding new programs, and adding shortcut icons.</para>
 
 <sect2 id="menu-items-add">
-<title
->Adding menu entries</title>
-
-<para
->&kde; comes with a great many applications already in the menu. Depending on your operating system and distribution, this could include many non-&kde; applications. &kde; also includes an application that will search your hard drive for more applications, and add them to the menu for you. Try pressing <keycombo action="simul"
->&Alt;<keycap
->F2</keycap
-></keycombo
-> and entering <userinput
->kappfinder</userinput
-> to see it in action &mdash; operation is very straightforward.</para>
-
-<para
->&kappfinder; is clever enough, but it doesn't know about every application there is. Or perhaps you simply don't want to have all those applications in the menu, and just want to add a single extra program.</para>
-
-<para
->To add your favourite programs to the &kde; menu, you can use the <application
->KDE Menu Editor</application
->. To start it, use the &kmenu; and choose <menuchoice
-><guimenuitem
->Settings</guimenuitem
-><guimenuitem
->Menu Editor</guimenuitem
-></menuchoice
->.</para>
-
-<para
->A window will open showing the existing &kmenu; on the left, and an empty menu entry dialogue on the right</para>
-
-<para
->For this example, we will be adding an entry for the <application
->Gimp</application
-> under the <guisubmenu
->Graphics</guisubmenu
-> submenu. If you already have a <guimenuitem
->Gimp</guimenuitem
-> entry there and don't want a new one, you can still follow through this example, but just don't click the <guibutton
->Apply</guibutton
-> when you are done.</para>
+<title>Adding menu entries</title>
+
+<para>&kde; comes with a great many applications already in the menu. Depending on your operating system and distribution, this could include many non-&kde; applications. &kde; also includes an application that will search your hard drive for more applications, and add them to the menu for you. Try pressing <keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo> and entering <userinput>kappfinder</userinput> to see it in action &mdash; operation is very straightforward.</para>
+
+<para>&kappfinder; is clever enough, but it doesn't know about every application there is. Or perhaps you simply don't want to have all those applications in the menu, and just want to add a single extra program.</para>
+
+<para>To add your favourite programs to the &kde; menu, you can use the <application>KDE Menu Editor</application>. To start it, use the &kmenu; and choose <menuchoice><guimenuitem>Settings</guimenuitem><guimenuitem>Menu Editor</guimenuitem></menuchoice>.</para>
+
+<para>A window will open showing the existing &kmenu; on the left, and an empty menu entry dialogue on the right</para>
+
+<para>For this example, we will be adding an entry for the <application>Gimp</application> under the <guisubmenu>Graphics</guisubmenu> submenu. If you already have a <guimenuitem>Gimp</guimenuitem> entry there and don't want a new one, you can still follow through this example, but just don't click the <guibutton>Apply</guibutton> when you are done.</para>
 
 <procedure>
-<step
-><para
->Navigate down the left hand tree to the <guisubmenu
->Graphics</guisubmenu
-> entry.</para
-></step>
+<step><para>Navigate down the left hand tree to the <guisubmenu>Graphics</guisubmenu> entry.</para></step>
 <step>
-<para
->Click on it once with the <mousebutton
->left</mousebutton
-> mouse button to expand the entry.</para>
+<para>Click on it once with the <mousebutton>left</mousebutton> mouse button to expand the entry.</para>
 </step>
 <step>
-<para
->Click the icon labelled <guiicon
->New Item</guiicon
-> in the toolbar, or choose <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->New Item</guimenuitem
-></menuchoice
-> in the menu bar.</para>
+<para>Click the icon labelled <guiicon>New Item</guiicon> in the toolbar, or choose <menuchoice><guimenu>File</guimenu><guimenuitem>New Item</guimenuitem></menuchoice> in the menu bar.</para>
 </step>
 <step>
-<para
->In the dialogue box that pops up, enter the name you want your new menu entry to have. For this example, enter <userinput
->Gimp</userinput
->.</para
-><para
->Then press <guibutton
->OK</guibutton
-> in the dialogue.</para>
+<para>In the dialogue box that pops up, enter the name you want your new menu entry to have. For this example, enter <userinput>Gimp</userinput>.</para><para>Then press <guibutton>OK</guibutton> in the dialogue.</para>
 </step>
 <step>
-<para
->Click on the new <guimenuitem
->Gimp</guimenuitem
-> menu entry that was created for you under the <guisubmenu
->Graphics</guisubmenu
-> submenu. The menu entry dialogue to the right will now change to be mostly empty, except for the name you already gave.</para>
+<para>Click on the new <guimenuitem>Gimp</guimenuitem> menu entry that was created for you under the <guisubmenu>Graphics</guisubmenu> submenu. The menu entry dialogue to the right will now change to be mostly empty, except for the name you already gave.</para>
 </step>
 <step>
-<para
->Fill in an optional <guilabel
->Comment</guilabel
->. You might like to put <userinput
->An image editor</userinput
-> for the example. Text entered here will be shown as a tool-tip in the &kmenu;.</para>
+<para>Fill in an optional <guilabel>Comment</guilabel>. You might like to put <userinput>An image editor</userinput> for the example. Text entered here will be shown as a tool-tip in the &kmenu;.</para>
 </step>
 <step>
-<para
->Enter in the box labelled <guilabel
->Command</guilabel
->, the command you would type on the command line to open your application. For this example, this is <command
->gimp</command
->. You may also enter any optional command line parameters if you wish. You can use this to make a menu entry that always opens a particular document or image, for example. Check the application's documentation to find out more about command line parameters.</para>
+<para>Enter in the box labelled <guilabel>Command</guilabel>, the command you would type on the command line to open your application. For this example, this is <command>gimp</command>. You may also enter any optional command line parameters if you wish. You can use this to make a menu entry that always opens a particular document or image, for example. Check the application's documentation to find out more about command line parameters.</para>
 </step>
 <step>
-<para
->If you want the application to operate from a particular folder (for example, for <application
->Gimp</application
-> to begin its <guilabel
->Load Image</guilabel
-> dialogue in a particular place) enter this path in the box labelled <guilabel
->Work Path</guilabel
->. This is optional.</para>
+<para>If you want the application to operate from a particular folder (for example, for <application>Gimp</application> to begin its <guilabel>Load Image</guilabel> dialogue in a particular place) enter this path in the box labelled <guilabel>Work Path</guilabel>. This is optional.</para>
 </step>
 <step>
-<para
->If you wish to change the icon from the default <quote
->unknown</quote
->, click on the <guiicon
->icon</guiicon
-> to the right of the dialogue, to open a standard &kde; icon chooser.</para>
+<para>If you wish to change the icon from the default <quote>unknown</quote>, click on the <guiicon>icon</guiicon> to the right of the dialogue, to open a standard &kde; icon chooser.</para>
 </step>
 <step>
-<para
->Some applications must be <guilabel
->run in a terminal</guilabel
-> window (for example <application
->Pine</application
->). If this is the case, check the appropriate check box.</para>
+<para>Some applications must be <guilabel>run in a terminal</guilabel> window (for example <application>Pine</application>). If this is the case, check the appropriate check box.</para>
 </step>
 <step>
-<para
->If you want to run your application as a different user, check the box labelled <guilabel
->Run as a different user</guilabel
-> and enter the appropriate user name in the text box.</para>
+<para>If you want to run your application as a different user, check the box labelled <guilabel>Run as a different user</guilabel> and enter the appropriate user name in the text box.</para>
 </step>
 <step>
-<para
->If you're happy with your menu entry, press <guibutton
->Apply</guibutton
->. If you would like to start over, press <guibutton
->Reset</guibutton
->.</para>
+<para>If you're happy with your menu entry, press <guibutton>Apply</guibutton>. If you would like to start over, press <guibutton>Reset</guibutton>.</para>
 </step>
 </procedure>
 
-<para
->And that's all. You now have a new menu entry.</para>
+<para>And that's all. You now have a new menu entry.</para>
 
 </sect2>
 
 <sect2 id="icons-add">
-<title
->Shortcut Icons</title>
+<title>Shortcut Icons</title>
 
-<para
->Although &kde; is much more comfortable than the average &UNIX; window manager, everyone wants a solution for a one-click way to start a program. Later, you will learn how to create links and files on your desktop, but this also has some disadvantages: sometimes all your desktops are filled up with windows, and you cannot reach your icons without minimising all the windows that cover them. For commonly used programs, you can minimise this problem and speed access by creating shortcut icons on the &kde; panel.</para>
+<para>Although &kde; is much more comfortable than the average &UNIX; window manager, everyone wants a solution for a one-click way to start a program. Later, you will learn how to create links and files on your desktop, but this also has some disadvantages: sometimes all your desktops are filled up with windows, and you cannot reach your icons without minimising all the windows that cover them. For commonly used programs, you can minimise this problem and speed access by creating shortcut icons on the &kde; panel.</para>
 
-<para
->To create a shortcut on the &kicker; panel, you have some choices: Drag-and-drop, or via a menu. </para>
+<para>To create a shortcut on the &kicker; panel, you have some choices: Drag-and-drop, or via a menu. </para>
 
 <procedure>
-<title
->Adding a shortcut icon with the menu</title>
-<step
-><para
->Click on the &ticon; and choose <menuchoice
-><guisubmenu
->Panel Menu</guisubmenu
-><guisubmenu
->Add</guisubmenu
-><guimenuitem
->Application</guimenuitem
-> </menuchoice
->.</para
-></step>
-<step
-><para
->You will see the top level of the &kmenu; again. Go through the menus to find the entry for which you want to create the shortcut, such as <guimenuitem
->Home folder</guimenuitem
-> or &konqueror;. Click on the program you want.</para>
+<title>Adding a shortcut icon with the menu</title>
+<step><para>Click on the &ticon; and choose <menuchoice><guisubmenu>Panel Menu</guisubmenu><guisubmenu>Add</guisubmenu><guimenuitem>Application</guimenuitem> </menuchoice>.</para></step>
+<step><para>You will see the top level of the &kmenu; again. Go through the menus to find the entry for which you want to create the shortcut, such as <guimenuitem>Home folder</guimenuitem> or &konqueror;. Click on the program you want.</para>
 </step>
 </procedure>
 
-<para
->A new icon will appear on the panel. Click on it, and the program will start.</para>
+<para>A new icon will appear on the panel. Click on it, and the program will start.</para>
 
-<para
->Adding a shortcut icon with drag-and-drop is even simpler - just drag any icon from your desktop, or a &konqueror; window, to an empty space on the panel.</para>
+<para>Adding a shortcut icon with drag-and-drop is even simpler - just drag any icon from your desktop, or a &konqueror; window, to an empty space on the panel.</para>
 
-<para
->What happens when you drag an item to your panel depends on what kind of item it is:</para>
+<para>What happens when you drag an item to your panel depends on what kind of item it is:</para>
 
 <variablelist>
 <varlistentry>
-<term
->If you drag a folder...</term
-> <listitem
-><para
->A menu will pop up giving you a choice of <guimenuitem
->Add as a File Manager URL</guimenuitem
-> or <guimenuitem
->Add as a QuickBrowser</guimenuitem
->. Choosing the first will create an icon that opens a &konqueror; window, starting at this folder, while choosing the latter will open that folder as a menu from the Panel.</para
-></listitem>
+<term>If you drag a folder...</term> <listitem><para>A menu will pop up giving you a choice of <guimenuitem>Add as a File Manager URL</guimenuitem> or <guimenuitem>Add as a QuickBrowser</guimenuitem>. Choosing the first will create an icon that opens a &konqueror; window, starting at this folder, while choosing the latter will open that folder as a menu from the Panel.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->If you drag a shortcut from your desktop...</term>
-<listitem
-><para
->It will be copied to the panel.</para
-></listitem>
+<term>If you drag a shortcut from your desktop...</term>
+<listitem><para>It will be copied to the panel.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->If you drag a document...</term>
-<listitem
-><para
->A link will be made on the panel, leaving the original in place. Clicking on the resulting icon will open that document in the default application.</para
-></listitem>
+<term>If you drag a document...</term>
+<listitem><para>A link will be made on the panel, leaving the original in place. Clicking on the resulting icon will open that document in the default application.</para></listitem>
 </varlistentry>
 </variablelist>
 
-<para
->In any case, if you want to move the icon, click on it using the &RMB; and choose <guimenuitem
->Move <replaceable
->Name of Button</replaceable
-></guimenuitem
-> Move the icon to the position you want and press the &LMB;. If you wish to remove the icon, click on it using the &RMB; and choose <guimenuitem
->Remove <replaceable
->Name of Button</replaceable
-></guimenuitem
->.</para>
+<para>In any case, if you want to move the icon, click on it using the &RMB; and choose <guimenuitem>Move <replaceable>Name of Button</replaceable></guimenuitem> Move the icon to the position you want and press the &LMB;. If you wish to remove the icon, click on it using the &RMB; and choose <guimenuitem>Remove <replaceable>Name of Button</replaceable></guimenuitem>.</para>
 
 </sect2>
 </sect1>
 
 <sect1 id="creating-new-files-on-your-desktop">
-<title
->Creating New Files On Your Desktop</title>
+<title>Creating New Files On Your Desktop</title>
 
-<para
->Your desktop can be an efficient place to work. Every time you start &kde;, you can see the complete files, folders and &URL;s which you often use.</para>
+<para>Your desktop can be an efficient place to work. Every time you start &kde;, you can see the complete files, folders and &URL;s which you often use.</para>
 
-<para
->There are two ways to create and edit files on your desktop. In any application, you can say that you want to save your work in the Desktop subfolder of your home folder. For example, my home folder is <filename class="directory"
->/home/stupiddog</filename
->, so my Desktop folder is <filename class="directory"
->/home/stupiddog/Desktop</filename
->. Everything you save there will be put on your desktop.</para>
+<para>There are two ways to create and edit files on your desktop. In any application, you can say that you want to save your work in the Desktop subfolder of your home folder. For example, my home folder is <filename class="directory">/home/stupiddog</filename>, so my Desktop folder is <filename class="directory">/home/stupiddog/Desktop</filename>. Everything you save there will be put on your desktop.</para>
 
-<para
->If you want to move existing files to your Desktop, the best way to achieve this is to use &konqueror;. Open a file manager window and drag the files you need to your desktop. You can choose to copy them if you want to keep all your common stuff on the desktop now, or you can create symbolic links to the real files. Everything you change in the link files will be automatically updated in the originals. For more information on how to use drag &amp; drop and the file manager, see the chapter <link linkend="moving-files-with-drag-and-drop"
->Moving files with drag &amp; drop.</link
-></para>
+<para>If you want to move existing files to your Desktop, the best way to achieve this is to use &konqueror;. Open a file manager window and drag the files you need to your desktop. You can choose to copy them if you want to keep all your common stuff on the desktop now, or you can create symbolic links to the real files. Everything you change in the link files will be automatically updated in the originals. For more information on how to use drag &amp; drop and the file manager, see the chapter <link linkend="moving-files-with-drag-and-drop">Moving files with drag &amp; drop.</link></para>
 
 </sect1>
 
 <sect1 id="desktop-links">
-<title
->Placing Links on Your Desktop</title>
+<title>Placing Links on Your Desktop</title>
 
-<para
->Placing files on your desktop may shorten the paths you need to enter. However, sometimes it would be nice if you could start &kedit; with a commonly edited file already opened in it. And how often do you find yourself frustrated after browsing through endless lists of bookmarks to find a site you visit often? Wouldn't it be nice if everything necessary to deliver you to that site was done automatically after clicking a single icon?</para>
+<para>Placing files on your desktop may shorten the paths you need to enter. However, sometimes it would be nice if you could start &kedit; with a commonly edited file already opened in it. And how often do you find yourself frustrated after browsing through endless lists of bookmarks to find a site you visit often? Wouldn't it be nice if everything necessary to deliver you to that site was done automatically after clicking a single icon?</para>
 <!-- 
 <sect2 id="using-mimetype">
-<title
->Using Templates</title>
+<title>Using Templates</title>
 
-<para
->Templates provide a convenient mechanism for performing tasks
+<para>Templates provide a convenient mechanism for performing tasks
 such as those outlined above.  Templates can also be used to associate
 particular file extensions with a specific application.  When a file
 ending in a known extension is double-clicked, the application
 associated with that extension is automatically started.  In short,
-<emphasis
->templates</emphasis
-> help you get the most out of
+<emphasis>templates</emphasis> help you get the most out of
 &kde;.</para>
 
-<para
->Example: You want to put an icon for visiting the &kde; web site
+<para>Example: You want to put an icon for visiting the &kde; web site
 on your desktop.</para>
 
 <procedure>
-<step
-><para
-><mousebutton
->Right</mousebutton
-> click on an empty space
-in the desktop.</para
-></step
-> <step
-><para
->Choose
-<menuchoice
-><guisubmenu
->Create
-New</guisubmenu
-><guisubmenu
->File</guisubmenu
-><guimenuitem
->Link to
-Location (URL)</guimenuitem
-></menuchoice
-> from the context
-menu.</para
-></step
-> <step
-><para
->A dialog box will open where you can
-type in the address you are making a shortcut to.</para
-></step>
-<step
-><para
->A new icon will be created on your desktop.</para
-></step>
+<step><para><mousebutton>Right</mousebutton> click on an empty space
+in the desktop.</para></step> <step><para>Choose
+<menuchoice><guisubmenu>Create
+New</guisubmenu><guisubmenu>File</guisubmenu><guimenuitem>Link to
+Location (URL)</guimenuitem></menuchoice> from the context
+menu.</para></step> <step><para>A dialog box will open where you can
+type in the address you are making a shortcut to.</para></step>
+<step><para>A new icon will be created on your desktop.</para></step>
 </procedure>
 
-<para
->Your new Internet shortcut can be customized like any other
-shortcut icon.  <mousebutton
->Right</mousebutton
-> click on the icon and
-choose <guimenuitem
->Properties</guimenuitem
->, and you can change the
+<para>Your new Internet shortcut can be customized like any other
+shortcut icon.  <mousebutton>Right</mousebutton> click on the icon and
+choose <guimenuitem>Properties</guimenuitem>, and you can change the
 icon, or the name of the shortcut as you wish.</para>
 
 </sect2>
 -->
 
 <sect2>
-<title
->Using &MIME; Types and File Associations</title>
-
-<para
->&MIME; Types are very powerful. Employing them, you can easily customise your system such that clicking on a file of a specific type starts the application with which that file type has been associated. For example, all <literal role="extension"
->.mod</literal
-> files could be set to start &noatun;, <literal role="extension"
->.html</literal
-> files could open a &konqueror; window showing the file, and a <filename
->core</filename
-> file can be viewed with the &khexedit; by simply clicking on the <filename
->core</filename
-> file.</para>
+<title>Using &MIME; Types and File Associations</title>
+
+<para>&MIME; Types are very powerful. Employing them, you can easily customise your system such that clicking on a file of a specific type starts the application with which that file type has been associated. For example, all <literal role="extension">.mod</literal> files could be set to start &noatun;, <literal role="extension">.html</literal> files could open a &konqueror; window showing the file, and a <filename>core</filename> file can be viewed with the &khexedit; by simply clicking on the <filename>core</filename> file.</para>
 
 <warning>
-<para
->Although &MIME; types are very powerful, they are not without dangers. Playing around with &MIME; types as the system administrator (<systemitem class="username"
->root</systemitem
->) can damage a &kde; system so severely that it cannot be restarted! In this example, you will create your <emphasis
->personal</emphasis
-> &MIME; style, which is only relevant for you. It will only affect other users if you copy or move it to <filename class="directory"
->$<envar
->TDEDIR</envar
->/share/mimelnk</filename
->.</para>
+<para>Although &MIME; types are very powerful, they are not without dangers. Playing around with &MIME; types as the system administrator (<systemitem class="username">root</systemitem>) can damage a &kde; system so severely that it cannot be restarted! In this example, you will create your <emphasis>personal</emphasis> &MIME; style, which is only relevant for you. It will only affect other users if you copy or move it to <filename class="directory">$<envar>TDEDIR</envar>/share/mimelnk</filename>.</para>
 </warning>
 
-<para
->To link a certain file type with a particular application:</para>
+<para>To link a certain file type with a particular application:</para>
 
 <procedure>
 
-<step
-><para
->Make sure the application you want to start this file type has an entry in the &kmenu;.</para
-></step>
-
-<step
-><para
->In &konqueror; find or make a file with the extension you wish to link.</para
-></step>
-
-<step
-><para
-><mousebutton
->Right</mousebutton
-> click on the file, and choose <guimenuitem
->Properties</guimenuitem
-> from the context menu and then press the tiny button with an icon next to the <guilabel
->Type</guilabel
-> resulting properties dialogue. Or, choose <menuchoice
-><guimenu
->Edit</guimenu
-><guimenuitem
->Edit File Type...</guimenuitem
-></menuchoice
-> in the &konqueror; menu bar.</para
-></step>
-
-<step
-><para
->Add file masks for the application by clicking the <guibutton
->Add</guibutton
-> button, and entering the file pattern you want. Remember that &UNIX; is case sensitive, so you may need to add variations - <userinput
->*.mp3</userinput
-> may need <userinput
->*.MP3</userinput
-> added as well, for example. Add as many masks as you like in this way.</para
-></step>
-
-<step
-><para
->Add a description if you like. This is optional.</para
-></step>
-
-<step
-><para
->In the section labelled <guilabel
->Application Preference Order</guilabel
->, press the <guibutton
->Add</guibutton
-> button. A miniature copy of the &kmenu; will open, where you can choose the application you want files of this type to be opened with.</para
-></step>
-
-<step
-><para
->Sometimes, you may want to use a different application to open this file type. For example, you might like to use &kate; to open text files you wish to edit, and &kedit; for text files that you just want to take a quick peek into. You can add more applications in the same way as you did in the last step, and you can change the preferred order using the <guibutton
->Move Up</guibutton
-> and <guibutton
->Move Down</guibutton
-> buttons.</para
-></step>
-
-<step
-><para
->If you're satisfied with your choices, you can click the <guibutton
->Apply</guibutton
-> button to save your changes without closing the dialogue box. This gives you the opportunity to test in the &konqueror; window that your file association is correct. You can choose <guibutton
->OK</guibutton
-> to save your changes and close the dialogue box, or <guibutton
->Cancel</guibutton
-> if you have changed your mind and just want to close the dialogue box.</para
-></step>
+<step><para>Make sure the application you want to start this file type has an entry in the &kmenu;.</para></step>
+
+<step><para>In &konqueror; find or make a file with the extension you wish to link.</para></step>
+
+<step><para><mousebutton>Right</mousebutton> click on the file, and choose <guimenuitem>Properties</guimenuitem> from the context menu and then press the tiny button with an icon next to the <guilabel>Type</guilabel> resulting properties dialogue. Or, choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Edit File Type...</guimenuitem></menuchoice> in the &konqueror; menu bar.</para></step>
+
+<step><para>Add file masks for the application by clicking the <guibutton>Add</guibutton> button, and entering the file pattern you want. Remember that &UNIX; is case sensitive, so you may need to add variations - <userinput>*.mp3</userinput> may need <userinput>*.MP3</userinput> added as well, for example. Add as many masks as you like in this way.</para></step>
+
+<step><para>Add a description if you like. This is optional.</para></step>
+
+<step><para>In the section labelled <guilabel>Application Preference Order</guilabel>, press the <guibutton>Add</guibutton> button. A miniature copy of the &kmenu; will open, where you can choose the application you want files of this type to be opened with.</para></step>
+
+<step><para>Sometimes, you may want to use a different application to open this file type. For example, you might like to use &kate; to open text files you wish to edit, and &kedit; for text files that you just want to take a quick peek into. You can add more applications in the same way as you did in the last step, and you can change the preferred order using the <guibutton>Move Up</guibutton> and <guibutton>Move Down</guibutton> buttons.</para></step>
+
+<step><para>If you're satisfied with your choices, you can click the <guibutton>Apply</guibutton> button to save your changes without closing the dialogue box. This gives you the opportunity to test in the &konqueror; window that your file association is correct. You can choose <guibutton>OK</guibutton> to save your changes and close the dialogue box, or <guibutton>Cancel</guibutton> if you have changed your mind and just want to close the dialogue box.</para></step>
 </procedure>
   
-<para
->Be sure to try your new association by opening a folder containing a file of the type you just selected. Click on the file, and the program needed to edit it should start.</para>
+<para>Be sure to try your new association by opening a folder containing a file of the type you just selected. Click on the file, and the program needed to edit it should start.</para>
 
 <note>
-<para
->&MIME; types are a way of describing the contents of files. You may be used to using file extensions for that purpose, and you may know that on &UNIX; systems the file extension often bears little or no relation to the contents of the file. On the other hand, it may be vital - for example, some implementations of <command
->gunzip</command
-> won't operate on files that aren't named <literal role="extension"
->.gz</literal
->. </para>
-
-<para
->&MIME; types naturally make use of filename patterns, but not necessarily the extensions - you can set up any filename pattern you like. For example, if you always want to open any files relating to a particular client with &kate;, and you make a habit of naming the files with the client's name at the beginning so that they naturally group in the &konqueror; window, then you can set up a filename pattern that matches <literal
->^<replaceable
->clientname</replaceable
->*</literal
->. Then any files that have <replaceable
->clientname</replaceable
-> at the beginning (the <literal
->^</literal
-> character means <quote
->starts with...</quote
->) will be opened with the application you choose. </para>
+<para>&MIME; types are a way of describing the contents of files. You may be used to using file extensions for that purpose, and you may know that on &UNIX; systems the file extension often bears little or no relation to the contents of the file. On the other hand, it may be vital - for example, some implementations of <command>gunzip</command> won't operate on files that aren't named <literal role="extension">.gz</literal>. </para>
+
+<para>&MIME; types naturally make use of filename patterns, but not necessarily the extensions - you can set up any filename pattern you like. For example, if you always want to open any files relating to a particular client with &kate;, and you make a habit of naming the files with the client's name at the beginning so that they naturally group in the &konqueror; window, then you can set up a filename pattern that matches <literal>^<replaceable>clientname</replaceable>*</literal>. Then any files that have <replaceable>clientname</replaceable> at the beginning (the <literal>^</literal> character means <quote>starts with...</quote>) will be opened with the application you choose. </para>
 </note>
 </sect2>
 
 </sect1>
 
 <sect1 id="using-the-trashcan">
-<title
->Using the Trash Can</title>
-
-<para
->Under normal circumstances, deleting a file under &UNIX; is something which cannot be undone. However, with &kde;, you can choose <guimenuitem
->Move to Trash</guimenuitem
-> instead of <guimenuitem
->Delete</guimenuitem
->. This will move the file into the <filename class="directory"
->Trash</filename
-> Folder, which, by default, is accessible as an icon on your desktop. In the <filename class="directory"
->Trash</filename
-> Folder, you can always recover deleted files. Remember to empty the trashcan now and then by clicking on it using the right mouse button, then choosing <guimenuitem
->Empty trashcan</guimenuitem
->, otherwise you might run out of disk space because the files still need space. Note, however, that once you empty the <filename
->Trash</filename
-> Folder, the files contained therein are lost forever.</para>
+<title>Using the Trash Can</title>
+
+<para>Under normal circumstances, deleting a file under &UNIX; is something which cannot be undone. However, with &kde;, you can choose <guimenuitem>Move to Trash</guimenuitem> instead of <guimenuitem>Delete</guimenuitem>. This will move the file into the <filename class="directory">Trash</filename> Folder, which, by default, is accessible as an icon on your desktop. In the <filename class="directory">Trash</filename> Folder, you can always recover deleted files. Remember to empty the trashcan now and then by clicking on it using the right mouse button, then choosing <guimenuitem>Empty trashcan</guimenuitem>, otherwise you might run out of disk space because the files still need space. Note, however, that once you empty the <filename>Trash</filename> Folder, the files contained therein are lost forever.</para>
 
 </sect1>
 </chapter>
diff --git a/tde-i18n-en_GB/docs/tdebase/userguide/first-impressions.docbook b/tde-i18n-en_GB/docs/tdebase/userguide/first-impressions.docbook
index 3817d62f9b2..f7444d839b4 100644
--- a/tde-i18n-en_GB/docs/tdebase/userguide/first-impressions.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/userguide/first-impressions.docbook
@@ -1,357 +1,149 @@
 <chapter id="first-impressions">
-<title
->First Impressions </title>
+<title>First Impressions </title>
 
 <epigraph>
-<attribution
->Origin unknown</attribution>
-<para
->You see to sea to see all that you can see is sea</para>
+<attribution>Origin unknown</attribution>
+<para>You see to sea to see all that you can see is sea</para>
 </epigraph>
 
-<para
->First impressions are so important -- this is not only true for Agatha Christie's famous thriller <quote
->The Mousetrap</quote
-> -- but also for &kde;. As we mentioned before, &kde; is supposed to be the most intuitive, easy to learn user interface available. In fact, we will have reached our goal when users no longer need this book in order to work with &kde;, causing the authors to lose their (unpaid and voluntary) jobs as documenters. </para>
+<para>First impressions are so important -- this is not only true for Agatha Christie's famous thriller <quote>The Mousetrap</quote> -- but also for &kde;. As we mentioned before, &kde; is supposed to be the most intuitive, easy to learn user interface available. In fact, we will have reached our goal when users no longer need this book in order to work with &kde;, causing the authors to lose their (unpaid and voluntary) jobs as documenters. </para>
 
 <sect1 id="starting-kde">
-<title
->Starting &kde; </title>
+<title>Starting &kde; </title>
 
-<para
->When you boot a &UNIX; system, one of three things should happen (that is, if the system works correctly; everything else is an undocumented fourth case). Either you stay in text mode and get a login prompt, you are logged into your &GUI; of choice automatically, or you are presented with a graphical login window. In the first case, you must log into your system and type: </para>
+<para>When you boot a &UNIX; system, one of three things should happen (that is, if the system works correctly; everything else is an undocumented fourth case). Either you stay in text mode and get a login prompt, you are logged into your &GUI; of choice automatically, or you are presented with a graphical login window. In the first case, you must log into your system and type: </para>
 
-<screen
-><command
->startx</command
->  
+<screen><command>startx</command>  
 </screen>
 
-<para
->If the installation was successful, the &kde; desktop should appear after a few seconds of initialisation. </para>
+<para>If the installation was successful, the &kde; desktop should appear after a few seconds of initialisation. </para>
 
-<para
->If a graphical login window is presented, then all that should be required is your login name and password. Assuming the &kde; installation was successful, &kde; should start without further intervention. </para>
+<para>If a graphical login window is presented, then all that should be required is your login name and password. Assuming the &kde; installation was successful, &kde; should start without further intervention. </para>
 
-<para
->If you have not done so already, we recommend changing your X display manager from <application
->xdm</application
-> to &tdm;, which includes the same functionality, but with the advanced features of the K Desktop Environment. </para>
+<para>If you have not done so already, we recommend changing your X display manager from <application>xdm</application> to &tdm;, which includes the same functionality, but with the advanced features of the K Desktop Environment. </para>
 
-<para
->If your system is configured to automatically log you into a &GUI; you will need to consult your operating system manuals or support forums for instructions how to have &kde; be that &GUI;.</para>
+<para>If your system is configured to automatically log you into a &GUI; you will need to consult your operating system manuals or support forums for instructions how to have &kde; be that &GUI;.</para>
 
 </sect1>
 
 <sect1 id="desktop-components">
-<title
->Desktop Components </title>
+<title>Desktop Components </title>
 
-<para
->After everything has come up, take some time to explore the new environment. If you have already worked with <emphasis
->&Windows;</emphasis
->, <emphasis
->OS/2</emphasis
-> or <emphasis
->&MacOS;</emphasis
->, many things should look familiar to you. The main visible parts of &kde; that you will see are the desktop itself, and the panel.</para>
+<para>After everything has come up, take some time to explore the new environment. If you have already worked with <emphasis>&Windows;</emphasis>, <emphasis>OS/2</emphasis> or <emphasis>&MacOS;</emphasis>, many things should look familiar to you. The main visible parts of &kde; that you will see are the desktop itself, and the panel.</para>
 
 
 <sect2 id="kde-logout">
-<title
->Panel </title>
+<title>Panel </title>
 
-<para
->When you start &kde; for the first time, the panel is situated at the bottom of the screen. From here, you will start your programs and switch between the virtual screens. </para>
+<para>When you start &kde; for the first time, the panel is situated at the bottom of the screen. From here, you will start your programs and switch between the virtual screens. </para>
 
 <variablelist>
 <varlistentry>
-<term
->&ticon; button</term>
-<listitem
-><para
->The &ticon; button is one of the most important places on your &kde; desktop. From here, you can start all &kde; applications installed. Later, when you learn how to use <link linkend="adding-programs"
->the TDE Menu Editor</link
->, you can also add other programs here as well. To start a program, just click on the button. You will see a list of different categories, plus some special entries. Whenever you move your mouse over an entry that has an arrow to the right, a new menu will appear. When you find the program you want to start, just click on it with the <mousebutton
->left</mousebutton
-> mouse button.</para
-></listitem>
+<term>&ticon; button</term>
+<listitem><para>The &ticon; button is one of the most important places on your &kde; desktop. From here, you can start all &kde; applications installed. Later, when you learn how to use <link linkend="adding-programs">the TDE Menu Editor</link>, you can also add other programs here as well. To start a program, just click on the button. You will see a list of different categories, plus some special entries. Whenever you move your mouse over an entry that has an arrow to the right, a new menu will appear. When you find the program you want to start, just click on it with the <mousebutton>left</mousebutton> mouse button.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Virtual Desktop buttons</term>
-<listitem
-><para
->When you start &kde; for the first time, note the four buttons labelled, appropriately enough, <guilabel
->1</guilabel
->, <guilabel
->2</guilabel
->, <guilabel
->3</guilabel
-> and <guilabel
->4</guilabel
->. These represent your four <emphasis
->desktops</emphasis
->. Just click one of them. Don't worry; though they have <quote
->disappeared</quote
->, any open windows are still active (just take a look at the task list!). Using multiple desktops is one of the most powerful features of &kde; and the &X-Window;. Instead of placing one window over another, as you would when using &Windows; or OS/2, you can say <quote
->Well, on the first desktop, I will write the &kde; User Guide. On the second desktop I'll run the <command
->meinproc</command
-> documentation compiler and see my results while compiling my &Linux; kernel on the third desktop, and reading my email on the fourth.</quote
-> </para
-></listitem>
+<term>Virtual Desktop buttons</term>
+<listitem><para>When you start &kde; for the first time, note the four buttons labelled, appropriately enough, <guilabel>1</guilabel>, <guilabel>2</guilabel>, <guilabel>3</guilabel> and <guilabel>4</guilabel>. These represent your four <emphasis>desktops</emphasis>. Just click one of them. Don't worry; though they have <quote>disappeared</quote>, any open windows are still active (just take a look at the task list!). Using multiple desktops is one of the most powerful features of &kde; and the &X-Window;. Instead of placing one window over another, as you would when using &Windows; or OS/2, you can say <quote>Well, on the first desktop, I will write the &kde; User Guide. On the second desktop I'll run the <command>meinproc</command> documentation compiler and see my results while compiling my &Linux; kernel on the third desktop, and reading my email on the fourth.</quote> </para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Icon bar</term>
+<term>Icon bar</term>
 <listitem>
-<para
->Some people are so lazy that they consider even the two or three motions through the application's menu to be too much (me included). For them, additional buttons can be placed next to the desktop buttons; for example, shortcuts to your home folder, to your trashcan, to the <application
->Konsole</application
-> terminal emulator and to the documents you use often. For information on how to add icons to the taskbar, read <link linkend="icons-add"
->Adding icons to your taskbar</link
->. </para>
-<para
->&kde; by default installs several commonly used buttons, including links to &khelpcenter;, &kwrite; and &kcontrol;.</para
-></listitem>
+<para>Some people are so lazy that they consider even the two or three motions through the application's menu to be too much (me included). For them, additional buttons can be placed next to the desktop buttons; for example, shortcuts to your home folder, to your trashcan, to the <application>Konsole</application> terminal emulator and to the documents you use often. For information on how to add icons to the taskbar, read <link linkend="icons-add">Adding icons to your taskbar</link>. </para>
+<para>&kde; by default installs several commonly used buttons, including links to &khelpcenter;, &kwrite; and &kcontrol;.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Time and date</term>
-<listitem
-><para
->At the far right end of the &kde; panel, you can always see the time and date.</para
-></listitem>
+<term>Time and date</term>
+<listitem><para>At the far right end of the &kde; panel, you can always see the time and date.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->The task list</term>
+<term>The task list</term>
 <listitem>
-<para
->In another section of the panel, find a button for each open window. Just click on the button corresponding to the windows you want to open. Another click will minimise the window. A <mousebutton
->right</mousebutton
-> mouse button click will give you a menu allowing you to move the window to another desktop, manipulate it's size, or close the application.</para
-></listitem>
+<para>In another section of the panel, find a button for each open window. Just click on the button corresponding to the windows you want to open. Another click will minimise the window. A <mousebutton>right</mousebutton> mouse button click will give you a menu allowing you to move the window to another desktop, manipulate it's size, or close the application.</para></listitem>
 </varlistentry>
 </variablelist>
 
 </sect2>
 <sect2>
-<title
->Using Windows </title>
+<title>Using Windows </title>
 
 <variablelist>
 <varlistentry>
-<term
->Window menu</term>
+<term>Window menu</term>
 <listitem>
-<para
-><mousebutton
->Right</mousebutton
-> mouse button clicking in the title bar of the window (where you see the application's name), you can see a window manipulation icon. This is the same menu you see if you <mousebutton
->right</mousebutton
-> click on an application's icon in the panel taskbar. When you click on it, a context menu containing commands to manipulate the window is presented. The available commands are as follows:</para>
+<para><mousebutton>Right</mousebutton> mouse button clicking in the title bar of the window (where you see the application's name), you can see a window manipulation icon. This is the same menu you see if you <mousebutton>right</mousebutton> click on an application's icon in the panel taskbar. When you click on it, a context menu containing commands to manipulate the window is presented. The available commands are as follows:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guimenuitem
->Move</guimenuitem
-></term>
-<listitem
-><para
->Lets you move the window with your mouse. Click on the <mousebutton
->left</mousebutton
-> mouse button when you have the window where you want it to be.</para
-></listitem>
+<term><guimenuitem>Move</guimenuitem></term>
+<listitem><para>Lets you move the window with your mouse. Click on the <mousebutton>left</mousebutton> mouse button when you have the window where you want it to be.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guimenuitem
->Resize</guimenuitem
-></term>
-<listitem
-><para
->Enables you to make the window smaller or larger. Move your mouse around and click when you are satisfied with the new size.</para
-></listitem>
+<term><guimenuitem>Resize</guimenuitem></term>
+<listitem><para>Enables you to make the window smaller or larger. Move your mouse around and click when you are satisfied with the new size.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guimenuitem
->Minimise</guimenuitem
-></term>
-<listitem
-><para
->Hides the window, leaving only an icon in the taskbar. Notice that the window title in this icon is now shown in (parentheses). To bring the window to the desktop again, click the icon.</para
-></listitem>
+<term><guimenuitem>Minimise</guimenuitem></term>
+<listitem><para>Hides the window, leaving only an icon in the taskbar. Notice that the window title in this icon is now shown in (parentheses). To bring the window to the desktop again, click the icon.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guimenuitem
->Maximise</guimenuitem
-></term>
-<listitem
-><para
->This will expand the window to the largest size possible. Note that &kde; will take the size of your <emphasis
->virtual desktop</emphasis
->, which means that the window could be bigger than your screen. </para
-></listitem>
+<term><guimenuitem>Maximise</guimenuitem></term>
+<listitem><para>This will expand the window to the largest size possible. Note that &kde; will take the size of your <emphasis>virtual desktop</emphasis>, which means that the window could be bigger than your screen. </para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guimenuitem
->Shade</guimenuitem
-></term>
-<listitem
-><para
-><quote
->Roll</quote
-> up the window, leaving only the titlebar visible. You can achieve the same effect by double clicking in the titlebar. To display the entire window again, select <guimenuitem
->Shade</guimenuitem
-> again, or double click in the titlebar.</para
-></listitem>
+<term><guimenuitem>Shade</guimenuitem></term>
+<listitem><para><quote>Roll</quote> up the window, leaving only the titlebar visible. You can achieve the same effect by double clicking in the titlebar. To display the entire window again, select <guimenuitem>Shade</guimenuitem> again, or double click in the titlebar.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guisubmenu
->Advanced</guisubmenu
-></term>
-<listitem
-><para
->Here you can find menu options that allow you to manipulate how windows may cover each other up, and more:</para>
+<term><guisubmenu>Advanced</guisubmenu></term>
+<listitem><para>Here you can find menu options that allow you to manipulate how windows may cover each other up, and more:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guimenuitem
->Keep Above Others</guimenuitem
-></term>
-<listitem
-><para
->Selecting this will keep this window on top of all other applications, even when it does not have the focus.</para
-></listitem>
+<term><guimenuitem>Keep Above Others</guimenuitem></term>
+<listitem><para>Selecting this will keep this window on top of all other applications, even when it does not have the focus.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guimenuitem
->Keep Below Others</guimenuitem
-></term>
-<listitem
-><para
->Selecting this will keep this window below all others, even when it does have the focus.</para
-></listitem>
+<term><guimenuitem>Keep Below Others</guimenuitem></term>
+<listitem><para>Selecting this will keep this window below all others, even when it does have the focus.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guimenuitem
->Fullscreen</guimenuitem
-></term>
-<listitem
-><para
->Selecting this makes the window take up the entire screen, similar to maximising, however, there are no window decorations showing. To switch to other applications, you may need to use the keybindings. For instance <keycombo action="simul"
->&Alt;&Tab;</keycombo
-> to switch to another window or <keycombo action="simul"
->&Ctrl;&Tab;</keycombo
-> to switch to another virtual desktop.</para>
-<para
->To revert from fullscreen mode, you can use the <keycombo action="simul"
->&Alt;<keycap
->F3</keycap
-></keycombo
-> shortcut to show the window operations menu and deselect <menuchoice
-><guisubmenu
->Advanced</guisubmenu
-><guimenuitem
->Fullscreen</guimenuitem
-> </menuchoice
->.</para>
+<term><guimenuitem>Fullscreen</guimenuitem></term>
+<listitem><para>Selecting this makes the window take up the entire screen, similar to maximising, however, there are no window decorations showing. To switch to other applications, you may need to use the keybindings. For instance <keycombo action="simul">&Alt;&Tab;</keycombo> to switch to another window or <keycombo action="simul">&Ctrl;&Tab;</keycombo> to switch to another virtual desktop.</para>
+<para>To revert from fullscreen mode, you can use the <keycombo action="simul">&Alt;<keycap>F3</keycap></keycombo> shortcut to show the window operations menu and deselect <menuchoice><guisubmenu>Advanced</guisubmenu><guimenuitem>Fullscreen</guimenuitem> </menuchoice>.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guimenuitem
->No Border</guimenuitem
-></term>
+<term><guimenuitem>No Border</guimenuitem></term>
 <listitem>
-<para
->Remove the window decoration and border from this window. This is useful for <quote
->monitor</quote
-> type applications, such as &kpager; which you keep on screen all the time and will never need the window decorations for. Many people also like to use this for <application
->xterm</application
-> and &konsole; windows.</para>
-<para
->To revert from no border mode, you can use the <keycombo action="simul"
->&Alt;<keycap
->F3</keycap
-></keycombo
-> shortcut to show the window operations menu and deselect <menuchoice
-><guisubmenu
->Advanced</guisubmenu
-><guimenuitem
->No Border</guimenuitem
-> </menuchoice
->.</para>
+<para>Remove the window decoration and border from this window. This is useful for <quote>monitor</quote> type applications, such as &kpager; which you keep on screen all the time and will never need the window decorations for. Many people also like to use this for <application>xterm</application> and &konsole; windows.</para>
+<para>To revert from no border mode, you can use the <keycombo action="simul">&Alt;<keycap>F3</keycap></keycombo> shortcut to show the window operations menu and deselect <menuchoice><guisubmenu>Advanced</guisubmenu><guimenuitem>No Border</guimenuitem> </menuchoice>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guimenuitem
->Store Window Settings</guimenuitem
-></term>
-<listitem
-><para
->Stored the current settings for this window (position, size, whether it should always stay on top of all other windows &etc;.). This configuration will then be loaded the next time the window gets opened.</para>
+<term><guimenuitem>Store Window Settings</guimenuitem></term>
+<listitem><para>Stored the current settings for this window (position, size, whether it should always stay on top of all other windows &etc;.). This configuration will then be loaded the next time the window gets opened.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guimenuitem
->To Desktop</guimenuitem
-></term>
-<listitem
-><para
->Enables you to send a window to another desktop. Choose the desktop where you want the window to be. The window will disappear at once. To see your window again, select the appropriate <guiicon
->Desktop Button</guiicon
-> on the &kde; <application
->Panel</application
->. Selecting <guimenuitem
->All Desktops</guimenuitem
-> will make the window <quote
->sticky</quote
-> - it will display on all desktops at once, so you can alway see this window.</para
-></listitem>
+<term><guimenuitem>To Desktop</guimenuitem></term>
+<listitem><para>Enables you to send a window to another desktop. Choose the desktop where you want the window to be. The window will disappear at once. To see your window again, select the appropriate <guiicon>Desktop Button</guiicon> on the &kde; <application>Panel</application>. Selecting <guimenuitem>All Desktops</guimenuitem> will make the window <quote>sticky</quote> - it will display on all desktops at once, so you can alway see this window.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guimenuitem
->Configure Window Behaviour...</guimenuitem
-></term>
-<listitem
-><para
->Allows you to change the look and feel, of all the windows in &kde;. This changes the window decoration widgets, including the titlebar buttons, but also including things such as checkboxes and buttons within dialogues, scrollbars, and the titlebar itself. The default is <guilabel
->Keramik</guilabel
->.</para>
-<para
->You can further customise nearly everything about the window manager itself, including how windows behave when moved, what different mouse button clicks will do in different parts of the window, and how to decide which windows have focus.</para>
+<term><guimenuitem>Configure Window Behaviour...</guimenuitem></term>
+<listitem><para>Allows you to change the look and feel, of all the windows in &kde;. This changes the window decoration widgets, including the titlebar buttons, but also including things such as checkboxes and buttons within dialogues, scrollbars, and the titlebar itself. The default is <guilabel>Keramik</guilabel>.</para>
+<para>You can further customise nearly everything about the window manager itself, including how windows behave when moved, what different mouse button clicks will do in different parts of the window, and how to decide which windows have focus.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guimenuitem
->Close</guimenuitem
-></term>
-<listitem
-><para
->This will close the window. Sometimes the application will allow you to save your work, but in some cases (&eg;, old X11 applications) this does not work. It is best to close an application with its own commands, using this menu item only as a last resort.</para>
-<para
->If the application itself is experiencing a problem that doesn't allow you to close it normally, using this menu item, or the window decoration close button will offer you the chance to <quote
->kill</quote
-> it as gracefully as possible. Note that this may still leave the application open in the background but not showing any windows. Allowing the application to be killed in this manner will most likely allow you back into the desktop however, so you can check in a terminal window and clean up any remaining processes.</para>
+<term><guimenuitem>Close</guimenuitem></term>
+<listitem><para>This will close the window. Sometimes the application will allow you to save your work, but in some cases (&eg;, old X11 applications) this does not work. It is best to close an application with its own commands, using this menu item only as a last resort.</para>
+<para>If the application itself is experiencing a problem that doesn't allow you to close it normally, using this menu item, or the window decoration close button will offer you the chance to <quote>kill</quote> it as gracefully as possible. Note that this may still leave the application open in the background but not showing any windows. Allowing the application to be killed in this manner will most likely allow you back into the desktop however, so you can check in a terminal window and clean up any remaining processes.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -360,93 +152,34 @@
 </variablelist>
 
 <variablelist>
-<title
->Window Decoration Buttons</title>
+<title>Window Decoration Buttons</title>
 <varlistentry>
-<term
->Sticky button</term>
-<listitem
-><para
->This button looks like a plus symbol in the default window decoration (Keramik) and may look like a thumb tack in others. It performs the same operation as selecting <menuchoice
-><guimenu
->To Desktop</guimenu
-><guimenuitem
->All Desktops</guimenuitem
-> </menuchoice
-> in the <guimenu
->Window Menu</guimenu
->, but requires fewer steps to invoke.</para
-></listitem>
+<term>Sticky button</term>
+<listitem><para>This button looks like a plus symbol in the default window decoration (Keramik) and may look like a thumb tack in others. It performs the same operation as selecting <menuchoice><guimenu>To Desktop</guimenu><guimenuitem>All Desktops</guimenuitem> </menuchoice> in the <guimenu>Window Menu</guimenu>, but requires fewer steps to invoke.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Title bar</term>
-<listitem
-><para
->The title bar containing the name of the window can be double-clicked in order to shade it. Use the <mousebutton
->right</mousebutton
-> mouse button: The <guimenu
->Window menu</guimenu
-> will reappear, allowing you to (un)maximise, iconify, move, resize, (un)sticky the window, to move it to another desktop (this works faster than the method with the sticky button). When a program does not react anymore, you can close (which will sometimes give you the opportunity to save your work) it. </para
-></listitem>
+<term>Title bar</term>
+<listitem><para>The title bar containing the name of the window can be double-clicked in order to shade it. Use the <mousebutton>right</mousebutton> mouse button: The <guimenu>Window menu</guimenu> will reappear, allowing you to (un)maximise, iconify, move, resize, (un)sticky the window, to move it to another desktop (this works faster than the method with the sticky button). When a program does not react anymore, you can close (which will sometimes give you the opportunity to save your work) it. </para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guibutton
->Minimise</guibutton
->, <guibutton
->Maximise</guibutton
-> and <guibutton
->Close</guibutton
-> Buttons</term>
-<listitem
-><para
->To the right of the title bar, there are two buttons that can also be used to iconify or maximise the window (this is faster than using the window manipulation menu). Iconified windows can be brought back with a click on the taskbar. </para>
-<para
->At the far left of the titlebar (with the default window decoration) is a button to close the window.</para
-></listitem>
+<term><guibutton>Minimise</guibutton>, <guibutton>Maximise</guibutton> and <guibutton>Close</guibutton> Buttons</term>
+<listitem><para>To the right of the title bar, there are two buttons that can also be used to iconify or maximise the window (this is faster than using the window manipulation menu). Iconified windows can be brought back with a click on the taskbar. </para>
+<para>At the far left of the titlebar (with the default window decoration) is a button to close the window.</para></listitem>
 </varlistentry>
 </variablelist>
 
-<para
->To move a window, place the cursor on the title bar and hold down the &LMB;. Without releasing the mouse button, move the window to the location of your choice, then release the mouse button. If you want to resize a window, move the mouse cursor to the window border you wish to change. Once you have reached the correct spot, the cursor will change from an arrow to a bracket and an arrow. Hold down the &LMB; and drag the side in question to the location you wish, then release the button. Note that you may drag sides or corners (which will adjust the size in two dimensions at once.)</para>
+<para>To move a window, place the cursor on the title bar and hold down the &LMB;. Without releasing the mouse button, move the window to the location of your choice, then release the mouse button. If you want to resize a window, move the mouse cursor to the window border you wish to change. Once you have reached the correct spot, the cursor will change from an arrow to a bracket and an arrow. Hold down the &LMB; and drag the side in question to the location you wish, then release the button. Note that you may drag sides or corners (which will adjust the size in two dimensions at once.)</para>
 
-<para
->Using the menu bar of each &kde; window is easy. Just click on what you want to do, and it will be done.</para>
+<para>Using the menu bar of each &kde; window is easy. Just click on what you want to do, and it will be done.</para>
 
-<para
->Below the menu bar, there is a set of tool symbols you can use to execute commands. Whenever you move over them, an active picture will be marked. But the menu bar can do even more for you. Notice the textured stripe on the left of the menu and icon bars? Depress your <mousebutton
->right</mousebutton
-> mouse button and a context menu will appear, allowing you to put the menu bar on the <guimenuitem
->top</guimenuitem
->, <guimenuitem
->left</guimenuitem
->, <guimenuitem
->right</guimenuitem
->, or <guimenuitem
->bottom</guimenuitem
-> of the window. You can also hide the menubar by selecting <guimenuitem
->Flat</guimenuitem
-></para>
+<para>Below the menu bar, there is a set of tool symbols you can use to execute commands. Whenever you move over them, an active picture will be marked. But the menu bar can do even more for you. Notice the textured stripe on the left of the menu and icon bars? Depress your <mousebutton>right</mousebutton> mouse button and a context menu will appear, allowing you to put the menu bar on the <guimenuitem>top</guimenuitem>, <guimenuitem>left</guimenuitem>, <guimenuitem>right</guimenuitem>, or <guimenuitem>bottom</guimenuitem> of the window. You can also hide the menubar by selecting <guimenuitem>Flat</guimenuitem></para>
 
 </sect2>
 
 <sect2>
-<title
->Getting Help </title>
+<title>Getting Help </title>
 
-<para
->Help is available basically everywhere: On the desktop, just use the <mousebutton
->right</mousebutton
-> mouse button and choose <menuchoice
-><guisubmenu
->Help</guisubmenu
-><guimenuitem
->KDesktop Handbook</guimenuitem
-></menuchoice
->. On the &kde; panel, open the application menu and choose <guimenu
->Help</guimenu
->. Every &kde; program has a help menu.</para>
+<para>Help is available basically everywhere: On the desktop, just use the <mousebutton>right</mousebutton> mouse button and choose <menuchoice><guisubmenu>Help</guisubmenu><guimenuitem>KDesktop Handbook</guimenuitem></menuchoice>. On the &kde; panel, open the application menu and choose <guimenu>Help</guimenu>. Every &kde; program has a help menu.</para>
 
 </sect2>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdebase/userguide/getting-started.docbook b/tde-i18n-en_GB/docs/tdebase/userguide/getting-started.docbook
index 1a89fef7871..4580dc1d287 100644
--- a/tde-i18n-en_GB/docs/tdebase/userguide/getting-started.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/userguide/getting-started.docbook
@@ -1,567 +1,237 @@
 <chapter id="getting-started">
-<title
->Getting Started </title>
+<title>Getting Started </title>
 
 <epigraph>
-<attribution
->Help for one of the toughest riddles in <quote
->The 7th Guest</quote
-></attribution>
-<para
->Using only what you see, can you get from A to B?</para>
+<attribution>Help for one of the toughest riddles in <quote>The 7th Guest</quote></attribution>
+<para>Using only what you see, can you get from A to B?</para>
 </epigraph>
 
-<para
->So far, you may be thinking that &kde; is little more than another window manager. Relax, and read this chapter, and we'll introduce you to some features that will assure you that &kde; is very much more than a window manager &mdash; it's a full fledged environment.</para>
+<para>So far, you may be thinking that &kde; is little more than another window manager. Relax, and read this chapter, and we'll introduce you to some features that will assure you that &kde; is very much more than a window manager &mdash; it's a full fledged environment.</para>
 
 <sect1 id="editing-files">
-<title
->Editing Files </title>
-
-<para
->Since you do not only have &kde; applications installed on your system, you probably know the mess of editing <abbrev
->ASCII</abbrev
-> style configuration files. But in fact, there are a lot of other file types that need to be edited this way. For example, the raw &XML; source for this guide was written <abbrev
->ASCII</abbrev
-> style, as was the source code for the &kde; programs themselves. We will now show you how you can use the &kwrite; facility in &kde; to edit <abbrev
->ASCII</abbrev
-> files of your own. </para>
+<title>Editing Files </title>
+
+<para>Since you do not only have &kde; applications installed on your system, you probably know the mess of editing <abbrev>ASCII</abbrev> style configuration files. But in fact, there are a lot of other file types that need to be edited this way. For example, the raw &XML; source for this guide was written <abbrev>ASCII</abbrev> style, as was the source code for the &kde; programs themselves. We will now show you how you can use the &kwrite; facility in &kde; to edit <abbrev>ASCII</abbrev> files of your own. </para>
 
 <sect2 id="the-filemanager-screen">
-<title
->Opening a Window Containing Your Home Folder </title>
-
-<para
->Click on the &ticon; button and choose <guimenuitem
->Home (Personal Files)</guimenuitem
->. A window showing the contents of your home folder will pop up. To see a more detailed listing of files in your home folder, select <guimenuitem
->Show Hidden Files</guimenuitem
-> from the <guimenu
->View</guimenu
-> menu.</para>
-
-<para
->On the left hand of the window, a tree view of your file system structure should appear, while on the right hand side, you can see icons for each file in your Home folder, including any <quote
->hidden files</quote
-> &mdash; files or folders beginning with a period. </para>
+<title>Opening a Window Containing Your Home Folder </title>
+
+<para>Click on the &ticon; button and choose <guimenuitem>Home (Personal Files)</guimenuitem>. A window showing the contents of your home folder will pop up. To see a more detailed listing of files in your home folder, select <guimenuitem>Show Hidden Files</guimenuitem> from the <guimenu>View</guimenu> menu.</para>
+
+<para>On the left hand of the window, a tree view of your file system structure should appear, while on the right hand side, you can see icons for each file in your Home folder, including any <quote>hidden files</quote> &mdash; files or folders beginning with a period. </para>
 
 </sect2>
 
 <sect2>
-<title
->The File Manager Screen </title>
-
-<para
->We tried to make the File Manager as easy as possible to use, and if you know other window managers (including those built into other Operating Systems) with integrated file management, many of the following concepts should be familiar to you.</para>
-
-<para
->On the top, there is a <guimenu
->Location</guimenu
-> menu which contains functions to open and close file manager windows. You can also print the current contents.</para>
-
-<note
-><para
->Want to visit the Internet? There are several paths you can take. You could choose <menuchoice
-><guimenu
->Location</guimenu
-><guimenuitem
->Open Location</guimenuitem
-></menuchoice
-> (or press <keycombo
->&Ctrl;<keycap
->O</keycap
-></keycombo
->) and enter a &URL;.</para>
-
-<para
->The simplest way however, is to simply type in the address you want to go to in the location bar itself.</para>
-
-<para
->For example, if you want to visit the &kde; homepage, enter <userinput
->http://www.kde.org</userinput
->. You can also quickly transfer files over &FTP; using this method. &kde; is <quote
->Internet ready</quote
->, which means that you can load and save files not only on your local hard disk, but also on remote &FTP; and other remote servers that you have write access to. While other operating systems and desktops make a distinction between local and remote file systems, &kde; does not.</para>
+<title>The File Manager Screen </title>
+
+<para>We tried to make the File Manager as easy as possible to use, and if you know other window managers (including those built into other Operating Systems) with integrated file management, many of the following concepts should be familiar to you.</para>
+
+<para>On the top, there is a <guimenu>Location</guimenu> menu which contains functions to open and close file manager windows. You can also print the current contents.</para>
+
+<note><para>Want to visit the Internet? There are several paths you can take. You could choose <menuchoice><guimenu>Location</guimenu><guimenuitem>Open Location</guimenuitem></menuchoice> (or press <keycombo>&Ctrl;<keycap>O</keycap></keycombo>) and enter a &URL;.</para>
+
+<para>The simplest way however, is to simply type in the address you want to go to in the location bar itself.</para>
+
+<para>For example, if you want to visit the &kde; homepage, enter <userinput>http://www.kde.org</userinput>. You can also quickly transfer files over &FTP; using this method. &kde; is <quote>Internet ready</quote>, which means that you can load and save files not only on your local hard disk, but also on remote &FTP; and other remote servers that you have write access to. While other operating systems and desktops make a distinction between local and remote file systems, &kde; does not.</para>
 </note>
 
-<para
->The <guimenu
->Edit</guimenu
-> menu offers functions to select, copy and move files. We will use them later. Already having used the <guimenu
->View</guimenu
-> menu, you have probably seen that you can view the content in many different ways. Just play around a bit and see what happens.</para>
+<para>The <guimenu>Edit</guimenu> menu offers functions to select, copy and move files. We will use them later. Already having used the <guimenu>View</guimenu> menu, you have probably seen that you can view the content in many different ways. Just play around a bit and see what happens.</para>
 
-<para
->You will undoubtedly find the <guimenu
->Bookmarks</guimenu
-> to be extremely useful: Now you can remember virtually any link, be it on the local machine or somewhere on the Internet. &kde;'s network transparency works both ways, allowing you to treat files and folders on your hard drive as if they were Internet bookmarks.</para>
+<para>You will undoubtedly find the <guimenu>Bookmarks</guimenu> to be extremely useful: Now you can remember virtually any link, be it on the local machine or somewhere on the Internet. &kde;'s network transparency works both ways, allowing you to treat files and folders on your hard drive as if they were Internet bookmarks.</para>
 
-<para
->The <guimenu
->Tools</guimenu
-> menu helps you find the notorious file-that-I-put-somewhere-I-do-not-remember-anymore.</para>
+<para>The <guimenu>Tools</guimenu> menu helps you find the notorious file-that-I-put-somewhere-I-do-not-remember-anymore.</para>
 
 </sect2>
 
 <sect2>
-<title
->Navigating Through Folders </title>
-
-<para
->We will now pick one of your configuration files and edit it. First, we must change the folder in the File Manager.</para>
-
-<para
->&konqueror; started with your home folder as the top of the <quote
->tree</quote
->. For most day-to-day purposes, this is where you are likely to be working, so it is a practical default. Sometimes you need to see the broader picture though, so the rest of your file system is not far away.</para>
-
-<para
->You can quickly display the <filename class="directory"
->/</filename
-> or <quote
->root</quote
-> folder several ways: click the small <guiicon
->folder</guiicon
-> icon beside the navigation pane to switch to a full filesystem tree, use the <guiicon
->Up</guiicon
-> arrow on the toolbar above to go to the top of your filesystem in the right hand pane, or type in <userinput
->/</userinput
-> in the location bar.</para>
-
-<para
->For the purpose of following this guide, press the small blue folder icon beside the navigation pane, so that the navigation pane switches to a full filesystem view. Notice that part of the tree is expanded, and your home folder is still selected. Now you can see how your home folder fits into the whole hierarchy, and your home folder files are still visible in the right hand pane.</para>
-
-<para
->Scroll down the navigation pane on the left side of the window until you find the folder <filename
->/etc</filename
->. Double-click on <filename
->etc</filename
->. You will see a long list of files in the right window.</para>
+<title>Navigating Through Folders </title>
+
+<para>We will now pick one of your configuration files and edit it. First, we must change the folder in the File Manager.</para>
+
+<para>&konqueror; started with your home folder as the top of the <quote>tree</quote>. For most day-to-day purposes, this is where you are likely to be working, so it is a practical default. Sometimes you need to see the broader picture though, so the rest of your file system is not far away.</para>
+
+<para>You can quickly display the <filename class="directory">/</filename> or <quote>root</quote> folder several ways: click the small <guiicon>folder</guiicon> icon beside the navigation pane to switch to a full filesystem tree, use the <guiicon>Up</guiicon> arrow on the toolbar above to go to the top of your filesystem in the right hand pane, or type in <userinput>/</userinput> in the location bar.</para>
+
+<para>For the purpose of following this guide, press the small blue folder icon beside the navigation pane, so that the navigation pane switches to a full filesystem view. Notice that part of the tree is expanded, and your home folder is still selected. Now you can see how your home folder fits into the whole hierarchy, and your home folder files are still visible in the right hand pane.</para>
+
+<para>Scroll down the navigation pane on the left side of the window until you find the folder <filename>/etc</filename>. Double-click on <filename>etc</filename>. You will see a long list of files in the right window.</para>
 
 </sect2>
 
 <sect2 id="opening-a-file">
-<title
->Opening A File </title>
-
-<para
->Some of the files you see here are at the heart of your operating system, so making permanent changes to them require you to be the <systemitem class="username"
->root</systemitem
-> or superuser. We are going to practice on a file that will not hurt anything if a mistake is made, called <filename
->motd</filename
->.</para>
-
-<para
->Scroll down until you find the file <filename
->motd</filename
-> and click on it with the <mousebutton
->right</mousebutton
-> mouse button. In the <guimenu
->context menu</guimenu
->, select <guimenuitem
->Open With</guimenuitem
->. A new menu will pop up. Choose <guimenuitem
->&kwrite;</guimenuitem
->. Voila!</para>
-
-<para
->There are many ways to open a file, and this is just one of them. &kwrite; is an editor with a simple and probably familiar interface. You could also have navigated down the small tree in the popup dialogue to the <guilabel
->Editors</guilabel
-> section, and chosen another editor, or simply double click the file to open it in the default editor.</para>
-
-<para
->In the meantime, you have the file <filename
->/etc/motd</filename
-> open in &kwrite; and we're ready to do some editing.</para>
+<title>Opening A File </title>
+
+<para>Some of the files you see here are at the heart of your operating system, so making permanent changes to them require you to be the <systemitem class="username">root</systemitem> or superuser. We are going to practice on a file that will not hurt anything if a mistake is made, called <filename>motd</filename>.</para>
+
+<para>Scroll down until you find the file <filename>motd</filename> and click on it with the <mousebutton>right</mousebutton> mouse button. In the <guimenu>context menu</guimenu>, select <guimenuitem>Open With</guimenuitem>. A new menu will pop up. Choose <guimenuitem>&kwrite;</guimenuitem>. Voila!</para>
+
+<para>There are many ways to open a file, and this is just one of them. &kwrite; is an editor with a simple and probably familiar interface. You could also have navigated down the small tree in the popup dialogue to the <guilabel>Editors</guilabel> section, and chosen another editor, or simply double click the file to open it in the default editor.</para>
+
+<para>In the meantime, you have the file <filename>/etc/motd</filename> open in &kwrite; and we're ready to do some editing.</para>
 
 </sect2>
 
 <sect2>
-<title
->The Editor Screen </title>
-
-<para
->The more you work with &kde;, the more you will notice that most screens and applications look and feel the same. The &kwrite; <guimenu
->File</guimenu
-> menu is a great example of this. Almost every other &kde; program has the same menu, allowing you to create new files, open existing files from your local file system or (coming soon) even the web, save them (soon even on the web, too!), print it or mail it to somebody else.</para>
-
-<para
->The <guimenu
->Edit</guimenu
-> menu can also be found in most &kde; applications, allowing you to cut and paste information between programs. You can also search and replace text. Using the <guimenu
->Settings</guimenu
-> Menu, you can customise the editor in many different ways. For example, you can increase the font size to suit your monitor resolution &mdash; and your eyes. Of course, as in any other &kde; application, you find a <guimenu
->Help</guimenu
-> Menu, offering you on-line help whenever you need it. </para>
+<title>The Editor Screen </title>
+
+<para>The more you work with &kde;, the more you will notice that most screens and applications look and feel the same. The &kwrite; <guimenu>File</guimenu> menu is a great example of this. Almost every other &kde; program has the same menu, allowing you to create new files, open existing files from your local file system or (coming soon) even the web, save them (soon even on the web, too!), print it or mail it to somebody else.</para>
+
+<para>The <guimenu>Edit</guimenu> menu can also be found in most &kde; applications, allowing you to cut and paste information between programs. You can also search and replace text. Using the <guimenu>Settings</guimenu> Menu, you can customise the editor in many different ways. For example, you can increase the font size to suit your monitor resolution &mdash; and your eyes. Of course, as in any other &kde; application, you find a <guimenu>Help</guimenu> Menu, offering you on-line help whenever you need it. </para>
 
 </sect2>
 
 <sect2>
-<title
->Using the Editor </title>
-
-<para
->Most <filename
->motd</filename
-> files contain useless stuff like <quote
->Do not forget to back up your data</quote
-> or <quote
->Do not annoy the system manager</quote
->. Boring. Let's change the text so that users logging in get the really important information. You can navigate through the text using the arrow keys, and mark sections of text with <keycombo
->&Shift;<keycap
->Arrows</keycap
-> </keycombo
->or by using the mouse with the <mousebutton
->left</mousebutton
-> button pressed. Use the <guimenu
->Edit</guimenu
-> Menu to cut and paste text. Enter whatever you want, or use the following (great) example: </para>
-
-<screen
-><userinput
->Welcome!
+<title>Using the Editor </title>
+
+<para>Most <filename>motd</filename> files contain useless stuff like <quote>Do not forget to back up your data</quote> or <quote>Do not annoy the system manager</quote>. Boring. Let's change the text so that users logging in get the really important information. You can navigate through the text using the arrow keys, and mark sections of text with <keycombo>&Shift;<keycap>Arrows</keycap> </keycombo>or by using the mouse with the <mousebutton>left</mousebutton> button pressed. Use the <guimenu>Edit</guimenu> Menu to cut and paste text. Enter whatever you want, or use the following (great) example: </para>
+
+<screen><userinput>Welcome!
  
 This machine now has KDE installed, providing you with a great, 
 easy-to-use interface and a consistent Look-and-Feel for all your 
 applications. For more information on how to get KDE running on your 
-account, please email the administrator. </userinput
-></screen>
+account, please email the administrator. </userinput></screen>
 
 </sect2>
 
 <sect2 id="saving-files">
-<title
->Saving Your Work </title>
-
-<para
->Now that you have changed the <filename
->motd</filename
-> file, it is time to save the file, putting the changes into effect. To do this, you can use either the <guimenu
->File</guimenu
-> Menu, or you can use the <guiicon
->Save</guiicon
-> Icon on the toolbar.</para>
-
-<para
->At this point, reality hits us. You need to have <systemitem class="username"
->root</systemitem
-> permission to save the changes to this file. &kde; handles this by asking you for the <systemitem class="username"
->root</systemitem
-> password.</para>
-
-<para
->You probably don't really want to save this file, so you can press <guibutton
->Cancel</guibutton
-> in the password dialogue and <guibutton
->Cancel</guibutton
-> again in the save dialogue.</para>
-
-<para
->Finally, finish your work by closing the editor and file manager window. You can do this by clicking the <guibutton
->X</guibutton
-> button on the top left of the window, by using the window menu of the title bar, or by choosing <menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Quit</guimenuitem
-></menuchoice
->. Simple and elegant, isn't it? </para>
+<title>Saving Your Work </title>
+
+<para>Now that you have changed the <filename>motd</filename> file, it is time to save the file, putting the changes into effect. To do this, you can use either the <guimenu>File</guimenu> Menu, or you can use the <guiicon>Save</guiicon> Icon on the toolbar.</para>
+
+<para>At this point, reality hits us. You need to have <systemitem class="username">root</systemitem> permission to save the changes to this file. &kde; handles this by asking you for the <systemitem class="username">root</systemitem> password.</para>
+
+<para>You probably don't really want to save this file, so you can press <guibutton>Cancel</guibutton> in the password dialogue and <guibutton>Cancel</guibutton> again in the save dialogue.</para>
+
+<para>Finally, finish your work by closing the editor and file manager window. You can do this by clicking the <guibutton>X</guibutton> button on the top left of the window, by using the window menu of the title bar, or by choosing <menuchoice><guimenu>File</guimenu> <guimenuitem>Quit</guimenuitem></menuchoice>. Simple and elegant, isn't it? </para>
 
 </sect2>
 
 <sect2 id="creating-new-files">
-<title
->Creating New Files</title>
-
-<para
->As with everything in &kde;, there are several ways to create a new file. You could open up the file manager, <mousebutton
->right</mousebutton
-> click on an empty space in a folder you own, and choose <menuchoice
-><guisubmenu
->Create New</guisubmenu
-><guisubmenu
->File</guisubmenu
-><guimenuitem
->Text File...</guimenuitem
-></menuchoice
->. A new empty file will appear, which you can open just like any other. You can even do this right on the desktop itself.</para>
-
-<para
->More often you are already in an application and want to start a new file. Most &kde; applications offer a <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->New</guimenuitem
-></menuchoice
-> menu item, and an icon on the toolbar to complement it. A new empty document will appear that you can immediately begin working in.</para>
-
-<para
->Both these approaches have advantages, so use the one that is most practical at the time.</para>
+<title>Creating New Files</title>
+
+<para>As with everything in &kde;, there are several ways to create a new file. You could open up the file manager, <mousebutton>right</mousebutton> click on an empty space in a folder you own, and choose <menuchoice><guisubmenu>Create New</guisubmenu><guisubmenu>File</guisubmenu><guimenuitem>Text File...</guimenuitem></menuchoice>. A new empty file will appear, which you can open just like any other. You can even do this right on the desktop itself.</para>
+
+<para>More often you are already in an application and want to start a new file. Most &kde; applications offer a <menuchoice><guimenu>File</guimenu><guimenuitem>New</guimenuitem></menuchoice> menu item, and an icon on the toolbar to complement it. A new empty document will appear that you can immediately begin working in.</para>
+
+<para>Both these approaches have advantages, so use the one that is most practical at the time.</para>
 
 </sect2>
 
 </sect1>
 
 <sect1 id="moving-files-with-drag-and-drop">
-<title
->Moving Files With Drag and Drop </title>
+<title>Moving Files With Drag and Drop </title>
 
-<para
->As you have seen in the previous section, working with files is as easy as 1-2-3. However, when you want to copy and move files, the whole copy-and-paste business can get annoying. Don't worry &mdash; a procedure called <quote
->drag and drop</quote
-> allows you to copy and move files more quickly and easily. </para>
+<para>As you have seen in the previous section, working with files is as easy as 1-2-3. However, when you want to copy and move files, the whole copy-and-paste business can get annoying. Don't worry &mdash; a procedure called <quote>drag and drop</quote> allows you to copy and move files more quickly and easily. </para>
 
 <sect2>
-<title
->Opening Two File Manager Windows </title>
-
-<para
->Before you can start, you will need to open two file manager windows. The simplest way to open a new window is to press the gear wheel button on the right of the icon bar. If you do not see the tree view in the new window, activate it (<menuchoice
-><guimenu
->Window</guimenu
-><guimenuitem
->Navigation Panel</guimenuitem
-> </menuchoice
-> or press <keycap
->F9</keycap
->).</para>
+<title>Opening Two File Manager Windows </title>
+
+<para>Before you can start, you will need to open two file manager windows. The simplest way to open a new window is to press the gear wheel button on the right of the icon bar. If you do not see the tree view in the new window, activate it (<menuchoice><guimenu>Window</guimenu><guimenuitem>Navigation Panel</guimenuitem> </menuchoice> or press <keycap>F9</keycap>).</para>
 
 </sect2>
 
 <sect2>
-<title
->Dragging a File From One Window To Another </title>
-
-<para
->In the first window, open the <filename
->/etc</filename
-> folder and scroll until you see the <filename
->motd</filename
-> file we modified in the previous section.</para>
-
-<para
->In the second window, open your home folder.</para>
-
-<para
->Click on the <filename
->motd</filename
-> file. Hold your <mousebutton
->left</mousebutton
-> mouse button and drag your file into your home folder. Release the <mousebutton
->left</mousebutton
-> mouse button (this is called <emphasis
->dropping</emphasis
-> the file). You will be presented up to four options: <guimenuitem
->Copy Here</guimenuitem
->, <guimenuitem
->Move Here</guimenuitem
->, <guimenuitem
->Link Here</guimenuitem
-> and <guimenuitem
->Cancel</guimenuitem
->. In this example, since you are not <systemitem class="username"
->root</systemitem
->, you cannot move the file, so this option is not presented. <guimenuitem
->Link Here</guimenuitem
-> will create a symbolic link to the file, while <guimenuitem
->Copy Here</guimenuitem
-> and <guimenuitem
->Move Here</guimenuitem
-> do exactly what they say. Select <guimenuitem
->Copy Here</guimenuitem
->. You should now have a copy of the <filename
->motd</filename
-> file in your home folder. </para>
+<title>Dragging a File From One Window To Another </title>
+
+<para>In the first window, open the <filename>/etc</filename> folder and scroll until you see the <filename>motd</filename> file we modified in the previous section.</para>
+
+<para>In the second window, open your home folder.</para>
+
+<para>Click on the <filename>motd</filename> file. Hold your <mousebutton>left</mousebutton> mouse button and drag your file into your home folder. Release the <mousebutton>left</mousebutton> mouse button (this is called <emphasis>dropping</emphasis> the file). You will be presented up to four options: <guimenuitem>Copy Here</guimenuitem>, <guimenuitem>Move Here</guimenuitem>, <guimenuitem>Link Here</guimenuitem> and <guimenuitem>Cancel</guimenuitem>. In this example, since you are not <systemitem class="username">root</systemitem>, you cannot move the file, so this option is not presented. <guimenuitem>Link Here</guimenuitem> will create a symbolic link to the file, while <guimenuitem>Copy Here</guimenuitem> and <guimenuitem>Move Here</guimenuitem> do exactly what they say. Select <guimenuitem>Copy Here</guimenuitem>. You should now have a copy of the <filename>motd</filename> file in your home folder. </para>
 
 </sect2>
 </sect1>
 
 <sect1 id="using-command-line-and-terminals">
-<title
->Using Command Line And Terminals </title>
+<title>Using Command Line And Terminals </title>
 
-<para
->So far, you have only worked with the tools and programs &kde; provides. Undoubtedly, you will want to use other &UNIX; programs as well. There are two ways of running them: The quick command line and the terminal.</para>
+<para>So far, you have only worked with the tools and programs &kde; provides. Undoubtedly, you will want to use other &UNIX; programs as well. There are two ways of running them: The quick command line and the terminal.</para>
 
 <sect2>
-<title
->Quick Command Line </title>
+<title>Quick Command Line </title>
 
-<para
->Pressing <keycombo action="simul"
->&Alt; <keycap
->F2</keycap
-></keycombo
-> pops up a small window where you can enter a command to run. Please note that you will not see any text output generated from a program started in this manner! This method is only recommended for starting &X-Window; based programs or for running tools where you do not need to see or type anything. For other programs, you will still need to use the terminal.</para>
+<para>Pressing <keycombo action="simul">&Alt; <keycap>F2</keycap></keycombo> pops up a small window where you can enter a command to run. Please note that you will not see any text output generated from a program started in this manner! This method is only recommended for starting &X-Window; based programs or for running tools where you do not need to see or type anything. For other programs, you will still need to use the terminal.</para>
 
 </sect2>
 
 <sect2>
-<title
->The &UNIX; Terminal Emulator </title>
-
-<para
->From the application menu, choose <menuchoice
-><guisubmenu
->System</guisubmenu
-><guimenuitem
->Terminal</guimenuitem
-> </menuchoice
->. A terminal window will open. Here you can use regular &UNIX; shell commands: <command
->ls</command
->, <command
->cat</command
->, <command
->less</command
->, and so forth. Using the <guimenu
->Settings</guimenu
-> menu, you can customise the terminal emulator to suit your needs. </para>
+<title>The &UNIX; Terminal Emulator </title>
+
+<para>From the application menu, choose <menuchoice><guisubmenu>System</guisubmenu><guimenuitem>Terminal</guimenuitem> </menuchoice>. A terminal window will open. Here you can use regular &UNIX; shell commands: <command>ls</command>, <command>cat</command>, <command>less</command>, and so forth. Using the <guimenu>Settings</guimenu> menu, you can customise the terminal emulator to suit your needs. </para>
 
 </sect2>
 </sect1>
 
 <sect1 id="finding-your-lost-files">
-<title
->Finding Your Lost Files </title>
+<title>Finding Your Lost Files </title>
 
-<para
->Everyone has undoubtedly encountered the following problem: You start <command
->ftp</command
->, log into a great site like ftp.kde.org and start downloading files. It is late in the evening and you shut down your machine after completing the transfer. The next morning, you are at the keyboard again, and you start wondering into which folder you placed the recently transferred files. Using &kde;'s &kfind; utility makes finding those lost files a snap.</para>
+<para>Everyone has undoubtedly encountered the following problem: You start <command>ftp</command>, log into a great site like ftp.kde.org and start downloading files. It is late in the evening and you shut down your machine after completing the transfer. The next morning, you are at the keyboard again, and you start wondering into which folder you placed the recently transferred files. Using &kde;'s &kfind; utility makes finding those lost files a snap.</para>
 
 <sect2>
-<title
->Starting &kfind;</title>
-
-<para
->Starting &kfind; is simple: Choose <guimenuitem
->Find Files</guimenuitem
-> in the &kmenu;. &kfind; uses an interface part you probably have not yet met in &kde;: tabs. When &kfind; starts, you see that <guilabel
->Name/Location</guilabel
-> is selected. When you click on <guilabel
->Date Range</guilabel
->, the tab content changes. Since you have never run a search before, most of the icons on the toolbar and most of the menu entries are disabled. We will change this now.</para>
+<title>Starting &kfind;</title>
+
+<para>Starting &kfind; is simple: Choose <guimenuitem>Find Files</guimenuitem> in the &kmenu;. &kfind; uses an interface part you probably have not yet met in &kde;: tabs. When &kfind; starts, you see that <guilabel>Name/Location</guilabel> is selected. When you click on <guilabel>Date Range</guilabel>, the tab content changes. Since you have never run a search before, most of the icons on the toolbar and most of the menu entries are disabled. We will change this now.</para>
 
 </sect2>
 
 <sect2>
-<title
->Finding a File by Knowing Parts of Its Name </title>
-
-<para
->As long as you know a bit of the file name, searching is easy. Select the <guilabel
->Name/Location</guilabel
-> tab, and enter the file name in the <guilabel
->Named</guilabel
-> field. Wildcards may be used as needed. As a test, type <userinput
->*.tar.gz</userinput
->. By default, the search begins in your home folder, but you can select any starting folder you wish by clicking on the <guilabel
->Look in</guilabel
-> or <guibutton
->Browse...</guibutton
->. To start searching, press the <guibutton
->Find</guibutton
-> button. After a moment, a list of files will appear in the search results window. If they do not appear, you started the search in the wrong folder, made a spelling mistake in the <guilabel
->Named</guilabel
-> field, or no files ending with a <filename
->.tar.gz</filename
-> extension are located on your machine.</para>
+<title>Finding a File by Knowing Parts of Its Name </title>
+
+<para>As long as you know a bit of the file name, searching is easy. Select the <guilabel>Name/Location</guilabel> tab, and enter the file name in the <guilabel>Named</guilabel> field. Wildcards may be used as needed. As a test, type <userinput>*.tar.gz</userinput>. By default, the search begins in your home folder, but you can select any starting folder you wish by clicking on the <guilabel>Look in</guilabel> or <guibutton>Browse...</guibutton>. To start searching, press the <guibutton>Find</guibutton> button. After a moment, a list of files will appear in the search results window. If they do not appear, you started the search in the wrong folder, made a spelling mistake in the <guilabel>Named</guilabel> field, or no files ending with a <filename>.tar.gz</filename> extension are located on your machine.</para>
 
 </sect2>
 
 <sect2 id="finding-with-complex-criteria">
-<title
->Finding a File by More Complex Criteria </title>
+<title>Finding a File by More Complex Criteria </title>
 
-<para
->There are many categories you can use to make your search more precise. <emphasis
->The more you know about the file, the better are your chances of finding it</emphasis
->.</para>
+<para>There are many categories you can use to make your search more precise. <emphasis>The more you know about the file, the better are your chances of finding it</emphasis>.</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Date Range</guilabel
-></term>
+<term><guilabel>Date Range</guilabel></term>
 <listitem>
-<para
->Here, you can specify that you only want to see files which were last touched in a given period of time. You can also specify that you only want to see files that were touched since a specified number of months or days ago.</para>
+<para>Here, you can specify that you only want to see files which were last touched in a given period of time. You can also specify that you only want to see files that were touched since a specified number of months or days ago.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->File Type</guilabel
-> in the <guilabel
->Contents</guilabel
-> tab.</term>
-<listitem
-><para
->If you know that the file was of a special type (&eg;, a tar/gzip archive or a jpeg picture), you can tell &kfind; to find only this type of file.</para
-></listitem>
+<term><guilabel>File Type</guilabel> in the <guilabel>Contents</guilabel> tab.</term>
+<listitem><para>If you know that the file was of a special type (&eg;, a tar/gzip archive or a jpeg picture), you can tell &kfind; to find only this type of file.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Containing text</guilabel
-> in the <guilabel
->Advanced</guilabel
-> tab</term>
+<term><guilabel>Containing text</guilabel> in the <guilabel>Advanced</guilabel> tab</term>
 <listitem>
-<para
->You can specify text that the file must contain. </para>
+<para>You can specify text that the file must contain. </para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->File size is</guilabel
->, in the <guilabel
->Properties</guilabel
-> tab</term>
-<listitem
-><para
->If you know the file size, you can limit your search in this regard, as well. </para
-></listitem>
+<term><guilabel>File size is</guilabel>, in the <guilabel>Properties</guilabel> tab</term>
+<listitem><para>If you know the file size, you can limit your search in this regard, as well. </para></listitem>
 </varlistentry>
 </variablelist>
 
-<para
->&kfind; has many more options to refine searches, explore them all!</para>
+<para>&kfind; has many more options to refine searches, explore them all!</para>
 
 </sect2>
 </sect1>
 
 <sect1 id="using-multiple-desktops">
-<title
->Using Multiple Desktops </title>
+<title>Using Multiple Desktops </title>
 
-<para
->Using multiple desktops helps you organise your work. You can place your programs on different desktops, and name the desktops so you know what you do there. This increases and optimises your workspace. It also helps you when you are surfing the net instead of doing your work and your boss comes in. But, of course, this is rare &mdash; at least in the office where I work. </para>
+<para>Using multiple desktops helps you organise your work. You can place your programs on different desktops, and name the desktops so you know what you do there. This increases and optimises your workspace. It also helps you when you are surfing the net instead of doing your work and your boss comes in. But, of course, this is rare &mdash; at least in the office where I work. </para>
 
-<para
->You can switch between desktops by clicking the desktop buttons on the &kicker; panel. If you want to rename them, you can do so by double-clicking on them. </para>
+<para>You can switch between desktops by clicking the desktop buttons on the &kicker; panel. If you want to rename them, you can do so by double-clicking on them. </para>
 
-<para
->You can use windows on multiple desktops. If you want to have a window present everywhere, just click the sticky button on the top-left of the window. To send a window to another desktop, click on the title bar with the <mousebutton
->right</mousebutton
-> mouse button, choose <guimenuitem
->To Desktop</guimenuitem
->, and select the desktop where you would like the window moved. </para>
+<para>You can use windows on multiple desktops. If you want to have a window present everywhere, just click the sticky button on the top-left of the window. To send a window to another desktop, click on the title bar with the <mousebutton>right</mousebutton> mouse button, choose <guimenuitem>To Desktop</guimenuitem>, and select the desktop where you would like the window moved. </para>
 
 </sect1>
 
 <sect1 id="quitting-kde">
-<title
->Quitting &kde;</title>
-
-<para
->To quit working with &kde;, you can use the <guimenuitem
->Logout</guimenuitem
-> entry in the &kmenu;. You will be asked if you really want to quit &kde;. Quitting will close all windows and return you to your console or display manager. For information on how programs can save your work during logout, please read <link linkend="kde-logout"
->the notes for logging out.</link
-> </para>
+<title>Quitting &kde;</title>
+
+<para>To quit working with &kde;, you can use the <guimenuitem>Logout</guimenuitem> entry in the &kmenu;. You will be asked if you really want to quit &kde;. Quitting will close all windows and return you to your console or display manager. For information on how programs can save your work during logout, please read <link linkend="kde-logout">the notes for logging out.</link> </para>
 
 </sect1>
 </chapter>
diff --git a/tde-i18n-en_GB/docs/tdebase/userguide/history.docbook b/tde-i18n-en_GB/docs/tdebase/userguide/history.docbook
index 6b5bff13bf4..df73da9a0b9 100644
--- a/tde-i18n-en_GB/docs/tdebase/userguide/history.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/userguide/history.docbook
@@ -1,171 +1,90 @@
 <chapter id="history">
-<title
->A Short Guided Tour of &kde;'s History</title>
+<title>A Short Guided Tour of &kde;'s History</title>
 
 <epigraph>
-<attribution
->The <abbrev
->CEO</abbrev
-> of a big software company, at the beginning of the 80s...(apocryphal)</attribution
-> 
-<para
->640KB ought to be enough for everybody </para>
+<attribution>The <abbrev>CEO</abbrev> of a big software company, at the beginning of the 80s...(apocryphal)</attribution> 
+<para>640KB ought to be enough for everybody </para>
 </epigraph>
 
 <sect1 id="before-kde">
-<title
->Before &kde;</title>
-
-<para
->Since the beginning of &UNIX; development, there has been one great problem: There were stable kernels, and good, powerful software. Unfortunately, only a few people could use &UNIX;, because it was written mainly for those students and professionals who had studied the system for a long time. For example, the standard method for reading USENET news was:</para>
-
-<screen
-><userinput
-><command
->find</command
-> <filename
->/var/spool/news</filename
-> <parameter
->-name '[0-9]*' -exec cat {} \;</parameter
-> | <command
->more</command
-></userinput
->
+<title>Before &kde;</title>
+
+<para>Since the beginning of &UNIX; development, there has been one great problem: There were stable kernels, and good, powerful software. Unfortunately, only a few people could use &UNIX;, because it was written mainly for those students and professionals who had studied the system for a long time. For example, the standard method for reading USENET news was:</para>
+
+<screen><userinput><command>find</command> <filename>/var/spool/news</filename> <parameter>-name '[0-9]*' -exec cat {} \;</parameter> | <command>more</command></userinput>
 </screen>
 
-<para
->Although fast and relatively efficient, this couldn't be called user friendly. Today, there are many good front ends available, such as <application
->tin</application
-> and &knode;, which provide easy-to-use, intuitive graphical user interfaces (&GUI;s). Unfortunately, the &GUI;s lack a common look-and-feel. Commercial libraries for programmers like &Motif; promised a solution to this, but these libraries remained, until recently, far too expensive and far too slow. </para>
-
-<para
->The configuration of programs is also often difficult. While compiling is usually done with a command line such as <userinput
-><command
->./configure</command
-> &amp;&amp; <command
->make</command
-> &amp;&amp; <command
->make <option
->install</option
-></command
-></userinput
-> only a very few programs can be configured with menus or scripts. In most cases, you must edit text configuration files yourself. It often happens that a misplaced period ruins the whole file, forcing you to restart the configuration process. Whenever you need to change your settings or reconfigure a program, the whole mess comes up again.</para>
-
-<para
->All this contributes to the fact that &Linux; and other &UNIX;'s fail to reach a wider audience. At the same time, many people are not satisfied with their current operating system, often because of the lack of stability and performance found in those operating systems. Other people hate to buy a new computer each time a new version of the program they cannot live without comes out, because it needs more <acronym
->RAM</acronym
-> and more disk space. Often the new version provides functions few people really need. </para>
-
-<para
-><emphasis
->&kde; is different.</emphasis
-> Although we do not try to replace the standard &UNIX; shell, we are working on a tool that will make using &UNIX; easier. We also want to attract more users to the &UNIX; environment. Simple things will be made easy, yet complex things will still be just as possible. A single interface will be provided, instead of the dozens currently required. </para>
+<para>Although fast and relatively efficient, this couldn't be called user friendly. Today, there are many good front ends available, such as <application>tin</application> and &knode;, which provide easy-to-use, intuitive graphical user interfaces (&GUI;s). Unfortunately, the &GUI;s lack a common look-and-feel. Commercial libraries for programmers like &Motif; promised a solution to this, but these libraries remained, until recently, far too expensive and far too slow. </para>
+
+<para>The configuration of programs is also often difficult. While compiling is usually done with a command line such as <userinput><command>./configure</command> &amp;&amp; <command>make</command> &amp;&amp; <command>make <option>install</option></command></userinput> only a very few programs can be configured with menus or scripts. In most cases, you must edit text configuration files yourself. It often happens that a misplaced period ruins the whole file, forcing you to restart the configuration process. Whenever you need to change your settings or reconfigure a program, the whole mess comes up again.</para>
+
+<para>All this contributes to the fact that &Linux; and other &UNIX;'s fail to reach a wider audience. At the same time, many people are not satisfied with their current operating system, often because of the lack of stability and performance found in those operating systems. Other people hate to buy a new computer each time a new version of the program they cannot live without comes out, because it needs more <acronym>RAM</acronym> and more disk space. Often the new version provides functions few people really need. </para>
+
+<para><emphasis>&kde; is different.</emphasis> Although we do not try to replace the standard &UNIX; shell, we are working on a tool that will make using &UNIX; easier. We also want to attract more users to the &UNIX; environment. Simple things will be made easy, yet complex things will still be just as possible. A single interface will be provided, instead of the dozens currently required. </para>
 
 </sect1>
 
 
 <sect1 id="what-kde-can-do-for-you">
-<title
->What &kde; Can Do For You</title>
+<title>What &kde; Can Do For You</title>
 
-<para
->&kde; is designed for everyone.</para>
+<para>&kde; is designed for everyone.</para>
 
-<para
->Those new to &UNIX;, or those who simply have no interest in learning to use new technologies and commands not found in their previous operating systems don't need to face the intricacies of the command line unless they want to. Yet there is much &kde; offers that is of value to experienced &UNIX; users, with &GUI; tools to make simple what were previously complex tasks, and the command line just a mouse click away if you want it.</para>
+<para>Those new to &UNIX;, or those who simply have no interest in learning to use new technologies and commands not found in their previous operating systems don't need to face the intricacies of the command line unless they want to. Yet there is much &kde; offers that is of value to experienced &UNIX; users, with &GUI; tools to make simple what were previously complex tasks, and the command line just a mouse click away if you want it.</para>
 
-<para
->No matter what your level of experience with &UNIX; or any other operating system, &kde; brings you:</para>
+<para>No matter what your level of experience with &UNIX; or any other operating system, &kde; brings you:</para>
 
 <itemizedlist>
 <listitem>
-<para
->A good looking, easy to use desktop environment.</para>
+<para>A good looking, easy to use desktop environment.</para>
 </listitem>
 <listitem>
-<para
->A powerful, easy to use file manager</para>
+<para>A powerful, easy to use file manager</para>
 </listitem>
 <listitem>
-<para
->An equally powerful and easy to use web browser</para>
+<para>An equally powerful and easy to use web browser</para>
 </listitem>
 <listitem>
-<para
->A simple, centralised configuration</para>
+<para>A simple, centralised configuration</para>
 </listitem>
 <listitem>
-<para
->A comprehensive list of applications, so you can be productive within minutes of your first &kde; login.</para>
+<para>A comprehensive list of applications, so you can be productive within minutes of your first &kde; login.</para>
 </listitem>
 <listitem>
-<para
->Online help to support you in every situation.</para>
+<para>Online help to support you in every situation.</para>
 </listitem>
 <listitem>
-<para
->Consistency of interface. Menus are in the same place across applications, keybindings behave the same way, toolbar icons, once learned, always work the same.</para>
+<para>Consistency of interface. Menus are in the same place across applications, keybindings behave the same way, toolbar icons, once learned, always work the same.</para>
 </listitem>
 </itemizedlist>
 
 </sect1>
 
 <sect1 id="background-of-kde">
-<title
->The Background Of &kde;</title>
+<title>The Background Of &kde;</title>
 
-<para
->In October 1996, German <application
->LyX</application
-> developer Matthias Ettrich initiated the development of &kde; with a USENET posting. Soon after, a couple of interested developers began planning and programming parts of the new project. One year later, the window and file managers, the terminal emulator, the help system and the display configuration tool were released for Alpha and Beta testing and proved to be relatively stable. </para>
+<para>In October 1996, German <application>LyX</application> developer Matthias Ettrich initiated the development of &kde; with a USENET posting. Soon after, a couple of interested developers began planning and programming parts of the new project. One year later, the window and file managers, the terminal emulator, the help system and the display configuration tool were released for Alpha and Beta testing and proved to be relatively stable. </para>
 
-<para
->In July 1998, &kde; 1.0 was released. It was the stable version for the next six months, while developers continued work on improving &kde; without stability constraints. In January 1999, their improvements were consolidated and integrated to produce &kde; 1.1, the new standard, stable version. </para>
+<para>In July 1998, &kde; 1.0 was released. It was the stable version for the next six months, while developers continued work on improving &kde; without stability constraints. In January 1999, their improvements were consolidated and integrated to produce &kde; 1.1, the new standard, stable version. </para>
 
-<para
->Development continued from there with &kde; 2.0, an almost complete rewrite of the desktop, being released on October 23rd 2000. The &kde; 2.x version evolved through six minor releases over the period of a year, each bringing an already impressive desktop further features and stability.</para>
+<para>Development continued from there with &kde; 2.0, an almost complete rewrite of the desktop, being released on October 23rd 2000. The &kde; 2.x version evolved through six minor releases over the period of a year, each bringing an already impressive desktop further features and stability.</para>
 
-<para
->At the time of writing, &kde; 3.2 is in preparation for release, introducing a broad range of improvements over the 2.0 series. Although the &GUI; didn't change as dramatically as it did during the move from &kde; 1 to &kde; 2, many refinements like a completely new printing system, vastly improved <acronym
->SSL</acronym
-> support (for secure Internet transactions) or full support for languages which are written right-to-left (like Arabic or Hebrew) found their way into the desktop. You can find more information about this exciting development at &kde-http;. </para>
+<para>At the time of writing, &kde; 3.2 is in preparation for release, introducing a broad range of improvements over the 2.0 series. Although the &GUI; didn't change as dramatically as it did during the move from &kde; 1 to &kde; 2, many refinements like a completely new printing system, vastly improved <acronym>SSL</acronym> support (for secure Internet transactions) or full support for languages which are written right-to-left (like Arabic or Hebrew) found their way into the desktop. You can find more information about this exciting development at &kde-http;. </para>
 
-<para
->The developers and users communicate primarily via several mailing lists, as described in the <link linkend="mailing-lists"
->Mailing Lists</link
-> section. If you would like to help, please do, &kde; is driven by volunteer contribution, and you are always welcome to take part.</para>
+<para>The developers and users communicate primarily via several mailing lists, as described in the <link linkend="mailing-lists">Mailing Lists</link> section. If you would like to help, please do, &kde; is driven by volunteer contribution, and you are always welcome to take part.</para>
 
 </sect1>
 
 <sect1 id="getting-kde">
-<title
->How To Get New Components</title>
-
-<para
->The main web site for &kde; is &kde-http;. Here you can find all important information regarding &kde;, including announcements, bugfixes, developer information and much more.</para>
-
-<para
->For software upgrades, please visit our &FTP; site, &kde-ftp;, or use a mirror if one exists near you. You can find an up to date list of mirrors at <ulink url="http://www.kde.org/ftpmirrors.html"
->http://www.kde.org/ftpmirrors.html</ulink
->.</para>
-
-<para
->On the &FTP; servers, the folder <filename
->unstable</filename
-> always contains brand new software, but it is often untested and may not even compile. If you are looking for more reliable components, please take a look in the <filename
->stable</filename
-> folder, where we put Beta and release versions. </para>
-
-<para
->If you are interested in developing &kde; applications of your own, you should visit <ulink url="http://developer.kde.org/"
->http://developer.kde.org/"</ulink
-> where you will find a wealth of information, including tutorials, <acronym
->API</acronym
-> guides to the &kde; libraries, and much more. You should also visit Troll Tech's server (<ulink url="http://www.trolltech.com/"
->http://www.trolltech.com</ulink
->) which features a great deal of information concerning the &Qt; library used by &kde;. You will probably find it valuable to join <link linkend="mailing-lists"
->the &kde; developer mailing list</link
->.</para>
+<title>How To Get New Components</title>
+
+<para>The main web site for &kde; is &kde-http;. Here you can find all important information regarding &kde;, including announcements, bugfixes, developer information and much more.</para>
+
+<para>For software upgrades, please visit our &FTP; site, &kde-ftp;, or use a mirror if one exists near you. You can find an up to date list of mirrors at <ulink url="http://www.kde.org/ftpmirrors.html">http://www.kde.org/ftpmirrors.html</ulink>.</para>
+
+<para>On the &FTP; servers, the folder <filename>unstable</filename> always contains brand new software, but it is often untested and may not even compile. If you are looking for more reliable components, please take a look in the <filename>stable</filename> folder, where we put Beta and release versions. </para>
+
+<para>If you are interested in developing &kde; applications of your own, you should visit <ulink url="http://developer.kde.org/">http://developer.kde.org/"</ulink> where you will find a wealth of information, including tutorials, <acronym>API</acronym> guides to the &kde; libraries, and much more. You should also visit Troll Tech's server (<ulink url="http://www.trolltech.com/">http://www.trolltech.com</ulink>) which features a great deal of information concerning the &Qt; library used by &kde;. You will probably find it valuable to join <link linkend="mailing-lists">the &kde; developer mailing list</link>.</para>
 
 </sect1>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/userguide/index.docbook b/tde-i18n-en_GB/docs/tdebase/userguide/index.docbook
index d1d8b2db1ee..d012ee25a18 100644
--- a/tde-i18n-en_GB/docs/tdebase/userguide/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/userguide/index.docbook
@@ -14,73 +14,39 @@
   <!ENTITY staff SYSTEM "staff.docbook">
   <!ENTITY notices-and-trademarks SYSTEM "notices-trademarks.docbook">
   <!ENTITY % addindex "IGNORE">
-  <!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+  <!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <book lang="&language;">
 <bookinfo>
-<title
->K Desktop Environment</title>
+<title>K Desktop Environment</title>
 <authorgroup>
 <author>
-<surname
->The KDE Team</surname>
+<surname>The KDE Team</surname>
 </author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2003-10-19</date>
-<releaseinfo
->3.2</releaseinfo>
+<date>2003-10-19</date>
+<releaseinfo>3.2</releaseinfo>
 
 <copyright>
-<year
->2000</year
-><year
->2001</year
-><year
->2002</year
-><year
->2003</year>
-<holder
->The KDE Team</holder>
+<year>2000</year><year>2001</year><year>2002</year><year>2003</year>
+<holder>The KDE Team</holder>
 </copyright>
 
-<legalnotice
->&GPLNotice;</legalnotice>
+<legalnotice>&GPLNotice;</legalnotice>
 
 <!-- Please note: This is NOT the final KDE Users Guide, which is not complete.
 This is a quick rewrite of the KDE 1.1x user guide, because it was badly out of
 date, and so that KDE wasn't released without a users guide entirely.  -->
 
-<abstract
-><para
->This is the &kde; User's Guide, a complete documentation of the K Desktop Environment from the user perspective. The K Desktop Environment is a collection of tools that will make your &UNIX; life easier and more enjoyable. </para
-></abstract>
+<abstract><para>This is the &kde; User's Guide, a complete documentation of the K Desktop Environment from the user perspective. The K Desktop Environment is a collection of tools that will make your &UNIX; life easier and more enjoyable. </para></abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->user</keyword>
-<keyword
->guide</keyword>
+<keyword>KDE</keyword>
+<keyword>user</keyword>
+<keyword>guide</keyword>
 </keywordset>
 </bookinfo>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/userguide/installation.docbook b/tde-i18n-en_GB/docs/tdebase/userguide/installation.docbook
index 1383128cd72..f1df426ff0c 100644
--- a/tde-i18n-en_GB/docs/tdebase/userguide/installation.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/userguide/installation.docbook
@@ -1,596 +1,189 @@
 <chapter id="installation">
-<title
->Installation </title>
+<title>Installation </title>
 
 <epigraph>
-<attribution
->Linus Torvalds, after finding one of his file systems smashed by a new Beta kernel</attribution>
-<para
->Core dumping fsck's tend to make me nervous</para>
+<attribution>Linus Torvalds, after finding one of his file systems smashed by a new Beta kernel</attribution>
+<para>Core dumping fsck's tend to make me nervous</para>
 </epigraph>
 
-<para
->Don't worry! Although the use of some Beta software can cause considerable grief, it is unlikely that the installation of KDE will trash your hard disk. In fact, this chapter is designed to guide you through the installation process, so that you can take a look at your new desktop as quickly (and with as little grief) as possible. As with all new Window Manager installs, it is recommended that you back up all your X11-specific configuration files before you begin the install. If you do not know the exact location of them, try all the hidden (<filename
->.*</filename
->) files in your home folder and the folder <filename
->/usr/X11/lib/X11/xdm</filename
->. </para
-> 
+<para>Don't worry! Although the use of some Beta software can cause considerable grief, it is unlikely that the installation of KDE will trash your hard disk. In fact, this chapter is designed to guide you through the installation process, so that you can take a look at your new desktop as quickly (and with as little grief) as possible. As with all new Window Manager installs, it is recommended that you back up all your X11-specific configuration files before you begin the install. If you do not know the exact location of them, try all the hidden (<filename>.*</filename>) files in your home folder and the folder <filename>/usr/X11/lib/X11/xdm</filename>. </para> 
 
 <sect1 id="requirements">
-<title
->Requirements </title>
+<title>Requirements </title>
 
-<para
->Before installing KDE, ascertain that your system fulfills the following requirements: </para>
+<para>Before installing KDE, ascertain that your system fulfills the following requirements: </para>
 
 <itemizedlist>
 
-<listitem
-><para
->A running POSIX compatible UNIX system. UNIX's that are known to work with KDE include: Linux, FreeBSD, Solaris, HP-UX, and MkLinux. We are working to make KDE available for more platforms soon. </para
-></listitem>
-
-<listitem
-><para
->Some free hard disk space on the partition where <filename
->/opt/kde</filename
-> will be created. We recommend that you reserve about 50MB if your system supports shared libraries, and considerably more if it does not. If you need or want to build KDE from the source tree, please remember to reserve about 100MB in <filename
->/usr/src</filename
->.</para
-></listitem>
-
-<listitem
-><para
->A running X11 system with or without <application
->xdm</application
->. If you have not installed the X Window System yet, first check your UNIX installation media for an installable version. If you cannot find any version working, visit <ulink url="http://www.xfree86.org"
->the XFree86 web site</ulink
-> for more information on how to get and install the X Window System, or contact your UNIX vendor support. </para
-></listitem>
-
-<listitem
-><para
->The &Qt; libraries, version 3.2 or higher. You can obtain these at <ulink url="ftp://ftp.trolltech.com/qt"
->Troll Tech's FTP Server</ulink
-> in tgz format. </para>
+<listitem><para>A running POSIX compatible UNIX system. UNIX's that are known to work with KDE include: Linux, FreeBSD, Solaris, HP-UX, and MkLinux. We are working to make KDE available for more platforms soon. </para></listitem>
+
+<listitem><para>Some free hard disk space on the partition where <filename>/opt/kde</filename> will be created. We recommend that you reserve about 50MB if your system supports shared libraries, and considerably more if it does not. If you need or want to build KDE from the source tree, please remember to reserve about 100MB in <filename>/usr/src</filename>.</para></listitem>
+
+<listitem><para>A running X11 system with or without <application>xdm</application>. If you have not installed the X Window System yet, first check your UNIX installation media for an installable version. If you cannot find any version working, visit <ulink url="http://www.xfree86.org">the XFree86 web site</ulink> for more information on how to get and install the X Window System, or contact your UNIX vendor support. </para></listitem>
+
+<listitem><para>The &Qt; libraries, version 3.2 or higher. You can obtain these at <ulink url="ftp://ftp.trolltech.com/qt">Troll Tech's FTP Server</ulink> in tgz format. </para>
 </listitem>
 </itemizedlist>
 
-<warning
-><para
->A warning before you start: Before upgrading from a previous version of &kde;, we recommend that you do the following:</para>
-
-<screen
-><command
->cd <filename
->/opt/kde</filename
-></command
-> 
-<command
->tar <option
->cfvz <replaceable
->~/KDE-old-version-backup.tar.gz</replaceable
-> * </option
-></command
->
+<warning><para>A warning before you start: Before upgrading from a previous version of &kde;, we recommend that you do the following:</para>
+
+<screen><command>cd <filename>/opt/kde</filename></command> 
+<command>tar <option>cfvz <replaceable>~/KDE-old-version-backup.tar.gz</replaceable> * </option></command>
 </screen>
 </warning>
 
 </sect1>
 
 <sect1 id="linux-installing-rpms">
-<title
->Linux: Installing RPMs for RedHat, Caldera and SuSE.</title>
-
-<para
->Using RPMs is the easiest method to get KDE up and running. Just visit your favourite KDE mirror and visit the folder <filename
->/pub/kde/stable/distribution/rpm</filename
->. There, you can see folders for different operating systems. Currently, the i386, alpha and sparc architectures are supported. The RPM packages can also be found on the Red Hat contrib sites like sunsite.unc.edu or ftp.redhat.com. </para>
-
-<para
->The basic system consists of the files <filename
->kde-<replaceable
->component</replaceable
->.<replaceable
->architecture</replaceable
->.rpm</filename
-> You need at least tdesupport, tdelibs and tdebase. After getting the base distribution, feel free to download any other RPMs that you think may come in handy. </para>
-
-<para
->Next, start installing with the base package. If you are installing KDE for the first time, use </para>
-
-<screen
-><userinput
-><command
->rpm</command
-> <option
->-i</option
-> <filename
->tdesupport.arch.rpm</filename
-></userinput>
-<userinput
-><command
->rpm</command
-> <option
->-i</option
-> <filename
->tdelibs.arch.rpm</filename
-></userinput>
-<userinput
-><command
->rpm</command
-> <option
->-i</option
-> <filename
->tdebase.arch.rpm</filename
-></userinput
->
+<title>Linux: Installing RPMs for RedHat, Caldera and SuSE.</title>
+
+<para>Using RPMs is the easiest method to get KDE up and running. Just visit your favourite KDE mirror and visit the folder <filename>/pub/kde/stable/distribution/rpm</filename>. There, you can see folders for different operating systems. Currently, the i386, alpha and sparc architectures are supported. The RPM packages can also be found on the Red Hat contrib sites like sunsite.unc.edu or ftp.redhat.com. </para>
+
+<para>The basic system consists of the files <filename>kde-<replaceable>component</replaceable>.<replaceable>architecture</replaceable>.rpm</filename> You need at least tdesupport, tdelibs and tdebase. After getting the base distribution, feel free to download any other RPMs that you think may come in handy. </para>
+
+<para>Next, start installing with the base package. If you are installing KDE for the first time, use </para>
+
+<screen><userinput><command>rpm</command> <option>-i</option> <filename>tdesupport.arch.rpm</filename></userinput>
+<userinput><command>rpm</command> <option>-i</option> <filename>tdelibs.arch.rpm</filename></userinput>
+<userinput><command>rpm</command> <option>-i</option> <filename>tdebase.arch.rpm</filename></userinput>
 </screen>
  
-<important
-><para
->It is important that these components are installed in the order listed, and that they are installed before any other KDE component.</para
-></important>
-
-<para
->If you are upgrading from a previous release, try <screen
-><userinput
-><command
->rpm</command
-> <option
->-Uvh</option
-> <filename
->kde-<replaceable
->component</replaceable
->.<replaceable
->arch</replaceable
->.rpm</filename
-></userinput
->
+<important><para>It is important that these components are installed in the order listed, and that they are installed before any other KDE component.</para></important>
+
+<para>If you are upgrading from a previous release, try <screen><userinput><command>rpm</command> <option>-Uvh</option> <filename>kde-<replaceable>component</replaceable>.<replaceable>arch</replaceable>.rpm</filename></userinput>
 </screen>
 </para>
 
-<para
->Once again, the order given above should be preserved, and the given components should be installed before any other KDE components.</para>
+<para>Once again, the order given above should be preserved, and the given components should be installed before any other KDE components.</para>
 
-<para
->This will unpack the base distribution and install it by default in <filename
->/opt/kde</filename
->.</para>
+<para>This will unpack the base distribution and install it by default in <filename>/opt/kde</filename>.</para>
 
-<para
->If the installation of the base packages has been successful, you can install the remaining packages (use <option
->-Uvh</option
-> instead of <option
->-i</option
-> once again to update an existing version) the same way. </para>
+<para>If the installation of the base packages has been successful, you can install the remaining packages (use <option>-Uvh</option> instead of <option>-i</option> once again to update an existing version) the same way. </para>
 
 </sect1>
 
 <sect1 id="installing-debian">
-<title
->Linux: Installing <acronym
->DEB</acronym
->s for debian</title>
+<title>Linux: Installing <acronym>DEB</acronym>s for debian</title>
 
-<para
->The installation for a Debian system is also rather straightforward. You will only find KDE 2.0 packages for Debian 2.2 (Potato) and 3.0 (Woody). We describe here how to install packages for Debian 2.2, the stable version, since Debian 3.0 is still in development. However, the installation for both versions, is almost identical. The main difference is that KDE is officially included in Debian 3.0 and you do not need to specify any special location to find the deb packages for KDE.</para>
+<para>The installation for a Debian system is also rather straightforward. You will only find KDE 2.0 packages for Debian 2.2 (Potato) and 3.0 (Woody). We describe here how to install packages for Debian 2.2, the stable version, since Debian 3.0 is still in development. However, the installation for both versions, is almost identical. The main difference is that KDE is officially included in Debian 3.0 and you do not need to specify any special location to find the deb packages for KDE.</para>
 
-<para
->The first step is to tell your system where it can find the deb packages for KDE. A list of locations for the Debian packages is kept on your hard disk in <filename
->/etc/apt/sources.list</filename
->. You should add to that file the following line: <userinput
->http://kde.tdyc.com/ stable kde2</userinput
-></para>
+<para>The first step is to tell your system where it can find the deb packages for KDE. A list of locations for the Debian packages is kept on your hard disk in <filename>/etc/apt/sources.list</filename>. You should add to that file the following line: <userinput>http://kde.tdyc.com/ stable kde2</userinput></para>
 
  
-<para
->Then you have to update your local package database so that your system knows that there are new packages available. Type the following command:</para>
-
-<screen
-><userinput
-><command
->apt-get</command
-> <option
->update</option
-></userinput
->
+<para>Then you have to update your local package database so that your system knows that there are new packages available. Type the following command:</para>
+
+<screen><userinput><command>apt-get</command> <option>update</option></userinput>
 </screen>
  
-<para
->Finally you should install the KDE base components. This is accomplished by typing:</para>
-
-<screen
-><userinput
-><command
->apt-get</command
-> <option
->install tdebase</option
-></userinput
->
+<para>Finally you should install the KDE base components. This is accomplished by typing:</para>
+
+<screen><userinput><command>apt-get</command> <option>install tdebase</option></userinput>
 </screen>
  
-<para
->If you want to install other components you should try some, or all of these options:</para>
-
-<screen
-><userinput
-><command
->apt-get</command
-> <option
->install task-tdenetwork</option
-></userinput>
-<userinput
-><command
->apt-get</command
-> <option
->install task-tdeadmin</option
-></userinput>
-<userinput
-><command
->apt-get</command
-> <option
->install task-tdetoys</option
-></userinput>
-<userinput
-><command
->apt-get</command
-> <option
->install task-tdeutils</option
-></userinput>
-<userinput
-><command
->apt-get</command
-> <option
->install task-tdemultimedia</option
-></userinput>
-<userinput
-><command
->apt-get</command
-> <option
->install task-tdegraphics</option
-></userinput>
-<userinput
-><command
->apt-get</command
-> <option
->install task-tdepim</option
-></userinput>
-<userinput
-><command
->apt-get</command
-> <option
->install task-tdegames</option
-></userinput>
-<userinput
-><command
->apt-get</command
-> <option
->install task-koffice</option
-></userinput>
-<userinput
-><command
->apt-get</command
-> <option
->install tdebase-docs</option
-></userinput>
-<userinput
-><command
->apt-get</command
-> <option
->install tdm</option
-></userinput
->
+<para>If you want to install other components you should try some, or all of these options:</para>
+
+<screen><userinput><command>apt-get</command> <option>install task-tdenetwork</option></userinput>
+<userinput><command>apt-get</command> <option>install task-tdeadmin</option></userinput>
+<userinput><command>apt-get</command> <option>install task-tdetoys</option></userinput>
+<userinput><command>apt-get</command> <option>install task-tdeutils</option></userinput>
+<userinput><command>apt-get</command> <option>install task-tdemultimedia</option></userinput>
+<userinput><command>apt-get</command> <option>install task-tdegraphics</option></userinput>
+<userinput><command>apt-get</command> <option>install task-tdepim</option></userinput>
+<userinput><command>apt-get</command> <option>install task-tdegames</option></userinput>
+<userinput><command>apt-get</command> <option>install task-koffice</option></userinput>
+<userinput><command>apt-get</command> <option>install tdebase-docs</option></userinput>
+<userinput><command>apt-get</command> <option>install tdm</option></userinput>
 </screen>
 
-<para
->You may also be interested in installing your language.</para>
-
-<screen
-><userinput
-><command
->apt-get</command
-> <option
->install
-tde-i18n-<replaceable
->xx</replaceable
-></option
-></userinput
->
+<para>You may also be interested in installing your language.</para>
+
+<screen><userinput><command>apt-get</command> <option>install
+tde-i18n-<replaceable>xx</replaceable></option></userinput>
  </screen>
-<para
->where <replaceable
->xx</replaceable
-> has to be substituted by the country code.</para>
-
-<para
->The control files for some TDE applications will be placed at <filename class="directory"
->/etc/kde2</filename
->, the executables will go in <filename class="directory"
->/usr/bin</filename
-> and most of the auxiliary files in <filename class="directory"
->/usr/share</filename
-> under different folders. </para>
-
-<para
->If you are upgrading from a previous version of KDE you should perform the following steps. First, update file <filename
->/etc/apt/sources.list</filename
-> by changing the line with the location of KDE packages with line: <userinput
->http://kde.tdyc.com/ stable kde2</userinput
->. Second update your package database:</para>
-
-<screen
-><userinput
-><command
->apt-get</command
-> <option
->update</option
-></userinput
->
+<para>where <replaceable>xx</replaceable> has to be substituted by the country code.</para>
+
+<para>The control files for some TDE applications will be placed at <filename class="directory">/etc/kde2</filename>, the executables will go in <filename class="directory">/usr/bin</filename> and most of the auxiliary files in <filename class="directory">/usr/share</filename> under different folders. </para>
+
+<para>If you are upgrading from a previous version of KDE you should perform the following steps. First, update file <filename>/etc/apt/sources.list</filename> by changing the line with the location of KDE packages with line: <userinput>http://kde.tdyc.com/ stable kde2</userinput>. Second update your package database:</para>
+
+<screen><userinput><command>apt-get</command> <option>update</option></userinput>
 </screen>
  
-<para
->Finally install the KDE base system:</para>
-
-<screen
-><userinput
-><command
->apt-get</command
-> <option
->install tdebase</option
-></userinput>
-<userinput
-><command
->apt-get</command
-> <option
->dist-upgrade</option
-></userinput
->
+<para>Finally install the KDE base system:</para>
+
+<screen><userinput><command>apt-get</command> <option>install tdebase</option></userinput>
+<userinput><command>apt-get</command> <option>dist-upgrade</option></userinput>
 </screen>
  
-<para
->If you want to install more KDE components try some, or all of these options.</para>
-
-<screen
-><userinput
-><command
->apt-get</command
-> <option
->install task-tdenetwork</option
-></userinput>
-<userinput
-><command
->apt-get</command
-> <option
->install task-tdeadmin</option
-></userinput>
-<userinput
-><command
->apt-get</command
-> <option
->install task-tdetoys</option
-></userinput>
-<userinput
-><command
->apt-get</command
-> <option
->install task-tdeutils</option
-></userinput>
-<userinput
-><command
->apt-get</command
-> <option
->install task-tdemultimedia</option
-></userinput>
-<userinput
-><command
->apt-get</command
-> <option
->install task-tdegraphics</option
-></userinput>
-<userinput
-><command
->apt-get</command
-> <option
->install task-tdepim</option
-></userinput>
-<userinput
-><command
->apt-get</command
-> <option
->install task-tdegames</option
-></userinput>
-<userinput
-><command
->apt-get</command
-> <option
->install task-koffice</option
-></userinput>
-<userinput
-><command
->apt-get</command
-> <option
->install tdebase-docs</option
-></userinput>
-<userinput
-><command
->apt-get</command
-> <option
->install tdm</option
-></userinput
->
+<para>If you want to install more KDE components try some, or all of these options.</para>
+
+<screen><userinput><command>apt-get</command> <option>install task-tdenetwork</option></userinput>
+<userinput><command>apt-get</command> <option>install task-tdeadmin</option></userinput>
+<userinput><command>apt-get</command> <option>install task-tdetoys</option></userinput>
+<userinput><command>apt-get</command> <option>install task-tdeutils</option></userinput>
+<userinput><command>apt-get</command> <option>install task-tdemultimedia</option></userinput>
+<userinput><command>apt-get</command> <option>install task-tdegraphics</option></userinput>
+<userinput><command>apt-get</command> <option>install task-tdepim</option></userinput>
+<userinput><command>apt-get</command> <option>install task-tdegames</option></userinput>
+<userinput><command>apt-get</command> <option>install task-koffice</option></userinput>
+<userinput><command>apt-get</command> <option>install tdebase-docs</option></userinput>
+<userinput><command>apt-get</command> <option>install tdm</option></userinput>
 </screen>
 
 </sect1>
 
 <sect1 id="source-distribution">
-<title
->Using Source Compilation to Install on Top of Other Systems </title>
+<title>Using Source Compilation to Install on Top of Other Systems </title>
 
-<para
->If your Linux distribution did not come with an RPM or DEB archive format, or you are not using Linux at all, you must compile KDE on your own. In the future, we are planning to provide a binary distribution which includes its own installation program. </para>
+<para>If your Linux distribution did not come with an RPM or DEB archive format, or you are not using Linux at all, you must compile KDE on your own. In the future, we are planning to provide a binary distribution which includes its own installation program. </para>
 
-<para
->In order to compile and install KDE properly, you need to have the following items installed on your hard disk: </para>
+<para>In order to compile and install KDE properly, you need to have the following items installed on your hard disk: </para>
 
 <itemizedlist>
-<listitem
-><para
->An ANSI-C compiler, <abbrev
->e.g.</abbrev
-> the <abbrev
->GNU</abbrev
-> C compiler. </para
-></listitem>
-<listitem
-><para
->An ANSI-C++ compiler, <abbrev
->e.g.</abbrev
-> <abbrev
->GNU</abbrev
-> C++. </para
-></listitem>
-<listitem
-><para
->The <application
->make</application
-> utility. </para
-></listitem>
-<listitem
-><para
->Qt development version 2.2 or higher.</para
-></listitem>
-<listitem
-><para
->X11 development version (include files are often missing) </para
-></listitem>
+<listitem><para>An ANSI-C compiler, <abbrev>e.g.</abbrev> the <abbrev>GNU</abbrev> C compiler. </para></listitem>
+<listitem><para>An ANSI-C++ compiler, <abbrev>e.g.</abbrev> <abbrev>GNU</abbrev> C++. </para></listitem>
+<listitem><para>The <application>make</application> utility. </para></listitem>
+<listitem><para>Qt development version 2.2 or higher.</para></listitem>
+<listitem><para>X11 development version (include files are often missing) </para></listitem>
 </itemizedlist>
 
-<para
->Once you have all the needed helper applications, go to your favourite KDE mirror and retrieve the following files from the folder <filename
->/pub/kde/stable/<replaceable
->newest version</replaceable
-></filename
->:</para>
+<para>Once you have all the needed helper applications, go to your favourite KDE mirror and retrieve the following files from the folder <filename>/pub/kde/stable/<replaceable>newest version</replaceable></filename>:</para>
 
 <itemizedlist>
-<listitem
-><para
-><filename
->tdesupport-<replaceable
->version</replaceable
->.tar.gz</filename
-></para
-></listitem>
-<listitem
-><para
-><filename
->tdelibs-<replaceable
->version</replaceable
->.tar.gz</filename>
-</para
-></listitem>
-<listitem
-><para
-><filename
->tdebase-<replaceable
->version</replaceable
->.tar.gz</filename
-></para
-></listitem>
-<listitem
-><para
->any other packages you wish to install. We advise you to get at least tdeutils. </para
-></listitem>
+<listitem><para><filename>tdesupport-<replaceable>version</replaceable>.tar.gz</filename></para></listitem>
+<listitem><para><filename>tdelibs-<replaceable>version</replaceable>.tar.gz</filename>
+</para></listitem>
+<listitem><para><filename>tdebase-<replaceable>version</replaceable>.tar.gz</filename></para></listitem>
+<listitem><para>any other packages you wish to install. We advise you to get at least tdeutils. </para></listitem>
 </itemizedlist>
 
-<para
->In all cases above, <replaceable
->version</replaceable
-> stands for the current version number. Once you have downloaded all you need, extract these files to <filename
->/usr/src</filename
->. This process should yield the following folder structure:</para>
+<para>In all cases above, <replaceable>version</replaceable> stands for the current version number. Once you have downloaded all you need, extract these files to <filename>/usr/src</filename>. This process should yield the following folder structure:</para>
 
 <itemizedlist>
-<listitem
-><para
-><filename
->/usr/src/tdesupport</filename
-></para
-></listitem>
-<listitem
-><para
-><filename
->/usr/src/tdelibs</filename
-></para
-></listitem>
-<listitem
-><para
-><filename
->/usr/src/tdebase</filename
-></para
-></listitem>
-<listitem
-><para
-><filename
->/usr/src/...</filename
-> (any other packages)</para
-></listitem>
+<listitem><para><filename>/usr/src/tdesupport</filename></para></listitem>
+<listitem><para><filename>/usr/src/tdelibs</filename></para></listitem>
+<listitem><para><filename>/usr/src/tdebase</filename></para></listitem>
+<listitem><para><filename>/usr/src/...</filename> (any other packages)</para></listitem>
 </itemizedlist>
 
-<para
->Make sure you have write permissions to <filename
->/opt/kde</filename
->.</para>
+<para>Make sure you have write permissions to <filename>/opt/kde</filename>.</para>
 
-<para
->Next you must compile and install the packages using the following: </para>
+<para>Next you must compile and install the packages using the following: </para>
 
 <procedure>
-<step
-><para
-><command
->cd</command
-> into the folder of the package, you want to install (see above)</para
-></step>
-<step
-><para
-><command
->./configure</command
-> (with the options you want to apply)</para
-></step>
-<step
-><para
-><command
->make</command
-></para
-></step>
-<step
-><para
-><command
->make install</command
-></para
-></step>
+<step><para><command>cd</command> into the folder of the package, you want to install (see above)</para></step>
+<step><para><command>./configure</command> (with the options you want to apply)</para></step>
+<step><para><command>make</command></para></step>
+<step><para><command>make install</command></para></step>
 </procedure>
 
-<para
->Apply the above steps to every package you want to install.</para>
+<para>Apply the above steps to every package you want to install.</para>
 
-<note
-><para
->These instructions can be used for almost every source package available, not just KDE packages. </para
-></note>
+<note><para>These instructions can be used for almost every source package available, not just KDE packages. </para></note>
 
-<para
->Every configure script has several options available. Some are common between the packages while others are specific to an individual package. The following is a small part of the result of <command
->configure <option
->--help</option
-></command
-> in tdelibs:</para>
+<para>Every configure script has several options available. Some are common between the packages while others are specific to an individual package. The following is a small part of the result of <command>configure <option>--help</option></command> in tdelibs:</para>
 
-<screen
-><computeroutput>
+<screen><computeroutput>
  Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
                           [/usr/local/kde-cvs]
@@ -604,113 +197,45 @@ Optional Features:
   --enable-strict         compiles with strict compiler options (may not work!)
   --disable-warnings      disables compilation with -Wall and similar
 ... 
-</computeroutput
->
+</computeroutput>
 </screen>
 
-<para
->Several options are not required and are only useful as workarounds for known problems (&eg; <option
->--disable-FEATURE</option
->). Since some are important options, for instance <emphasis
->--with-shadow</emphasis
->, you should always check the available options.</para>
-
-<para
->An important option is <option
->--prefix</option
->. This option specifies the path where configure should install (for tdesupport and tdelibs) or where to look for libraries (for the other packages). By default, configure will look in <filename
->/usr/local/kde</filename
-> . If you want to install &kde; into <filename
->/opt/kde</filename
->, you have to use <command
->configure <option
->--prefix /opt/kde</option
-></command
->.</para>
-
-<para
->If you have installed the &Qt; libraries in an uncommon place, for instance in <filename
->$HOME/src/qt</filename
->, you must use <command
->configure <option
->--with-qt-dir=$HOME/src/qt</option
-></command
->. By default configure looks in the most common places for &Qt; before it gives up.</para>
-
-<para
->If you have problems that you are not able to solve, send a copy of the <filename
->config.log</filename
-> file to the address given in the offending package's <filename
->README</filename
-> file.</para>
-
-<para
->You must install KDE in the following order: arts, tdelibs, then the application packages (for example tdebase). All the application packages should only depend on tdelibs, so you can compile them at the same time (if you have a powerful machine).</para>
-
-<para
->If you want to take advantage of multiprocessor systems, try <command
->make <option
-> -j <replaceable
->Number of processors</replaceable
-></option
-></command
-> instead of <command
->make</command
->. </para>
+<para>Several options are not required and are only useful as workarounds for known problems (&eg; <option>--disable-FEATURE</option>). Since some are important options, for instance <emphasis>--with-shadow</emphasis>, you should always check the available options.</para>
+
+<para>An important option is <option>--prefix</option>. This option specifies the path where configure should install (for tdesupport and tdelibs) or where to look for libraries (for the other packages). By default, configure will look in <filename>/usr/local/kde</filename> . If you want to install &kde; into <filename>/opt/kde</filename>, you have to use <command>configure <option>--prefix /opt/kde</option></command>.</para>
+
+<para>If you have installed the &Qt; libraries in an uncommon place, for instance in <filename>$HOME/src/qt</filename>, you must use <command>configure <option>--with-qt-dir=$HOME/src/qt</option></command>. By default configure looks in the most common places for &Qt; before it gives up.</para>
+
+<para>If you have problems that you are not able to solve, send a copy of the <filename>config.log</filename> file to the address given in the offending package's <filename>README</filename> file.</para>
+
+<para>You must install KDE in the following order: arts, tdelibs, then the application packages (for example tdebase). All the application packages should only depend on tdelibs, so you can compile them at the same time (if you have a powerful machine).</para>
+
+<para>If you want to take advantage of multiprocessor systems, try <command>make <option> -j <replaceable>Number of processors</replaceable></option></command> instead of <command>make</command>. </para>
 
 <sect2>
-<title
->Platform Specific Building Notes </title>
+<title>Platform Specific Building Notes </title>
 
 <sect3>
-<title
->Linux </title>
-
-<para
->For &Linux;, most of the utilities needed to build &kde; can be found either at <ulink url="ftp://sunsite.unc.edu/pub/Linux/GCC"
->ftp://sunsite.unc.edu/pub/Linux/GCC</ulink
-> or <ulink url="ftp://sunsite.unc.edu/pub/GNU"
->ftp://sunsite.unc.edu/pub/GNU</ulink
->. The Qt libraries can be found at <ulink url="ftp://ftp.troll.no/pub/qt/source"
->ftp://ftp.troll.no/pub/qt/source</ulink
->, available as source code. Detailed instructions on how to install them are provided. Include files for X11 programs should be available at <ulink url="ftp://ftp.xfree86.org"
->ftp://ftp.xfree86.org</ulink
-> in the xdevel section. </para>
+<title>Linux </title>
+
+<para>For &Linux;, most of the utilities needed to build &kde; can be found either at <ulink url="ftp://sunsite.unc.edu/pub/Linux/GCC">ftp://sunsite.unc.edu/pub/Linux/GCC</ulink> or <ulink url="ftp://sunsite.unc.edu/pub/GNU">ftp://sunsite.unc.edu/pub/GNU</ulink>. The Qt libraries can be found at <ulink url="ftp://ftp.troll.no/pub/qt/source">ftp://ftp.troll.no/pub/qt/source</ulink>, available as source code. Detailed instructions on how to install them are provided. Include files for X11 programs should be available at <ulink url="ftp://ftp.xfree86.org">ftp://ftp.xfree86.org</ulink> in the xdevel section. </para>
 
 </sect3>
 </sect2>
 </sect1>
 
 <sect1 id="suse-install">
-<title
->Required Changes To Your Configuration Files </title>
-<para
->After you have placed the KDE binaries into their destination folder, there are a few adjustments you must make to your startup scripts. </para>
-<para
->The following procedure was tested on SuSE Linux 5.0, and should be compatible with the other popular UNIX's as well. <emphasis
->Always make backups of configuration files before changing them!</emphasis
-> Add the following to the end of your /etc/profile: </para>
-<para
-> 
-<screen
->export PATH=$PATH:/opt/kde/bin 
+<title>Required Changes To Your Configuration Files </title>
+<para>After you have placed the KDE binaries into their destination folder, there are a few adjustments you must make to your startup scripts. </para>
+<para>The following procedure was tested on SuSE Linux 5.0, and should be compatible with the other popular UNIX's as well. <emphasis>Always make backups of configuration files before changing them!</emphasis> Add the following to the end of your /etc/profile: </para>
+<para> 
+<screen>export PATH=$PATH:/opt/kde/bin 
 export TDEDIR=/opt/kde
 </screen>
  </para>
-<para
->Next, edit the .xinitrc file in your home folder. Look for the line that calls your window manager and replace it with <literal
->starttde</literal
->.</para>
-<para
->Now that everything needed to run KDE has been installed, you can go on to chapter 4 where you will start KDE for the first time. If something goes wrong, you may need to compile KDE on your own. Read<emphasis
-> <link linkend="source-distribution"
->Using Source Compilation to Install on Top of Other Systems</link
-> </emphasis
->for more information. </para>
-<para
->We have made the installation as bulletproof as possible, so you should not encounter any serious problems unless your configuration is exotic. If you do experience difficulties feel free to use <link linkend="mailing-lists"
->the KDE mailing lists</link
-> </para>
+<para>Next, edit the .xinitrc file in your home folder. Look for the line that calls your window manager and replace it with <literal>starttde</literal>.</para>
+<para>Now that everything needed to run KDE has been installed, you can go on to chapter 4 where you will start KDE for the first time. If something goes wrong, you may need to compile KDE on your own. Read<emphasis> <link linkend="source-distribution">Using Source Compilation to Install on Top of Other Systems</link> </emphasis>for more information. </para>
+<para>We have made the installation as bulletproof as possible, so you should not encounter any serious problems unless your configuration is exotic. If you do experience difficulties feel free to use <link linkend="mailing-lists">the KDE mailing lists</link> </para>
 </sect1>
 </chapter>
 <!--
diff --git a/tde-i18n-en_GB/docs/tdebase/userguide/intro.docbook b/tde-i18n-en_GB/docs/tdebase/userguide/intro.docbook
index e1900a1800b..a3cb77bc823 100644
--- a/tde-i18n-en_GB/docs/tdebase/userguide/intro.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/userguide/intro.docbook
@@ -1,21 +1,15 @@
 <chapter id="introduction">
-<title
->Introduction</title>
+<title>Introduction</title>
 
-<para
->Welcome to the K Desktop Environment User Guide.</para>
+<para>Welcome to the K Desktop Environment User Guide.</para>
 
-<para
->This book is intended to be an introduction to the K Desktop Environment as a whole, with a broad description of the user interface, some practical examples on how to use &kde; for daily work, and some hints on how to customise the &kde; desktop.</para>
+<para>This book is intended to be an introduction to the K Desktop Environment as a whole, with a broad description of the user interface, some practical examples on how to use &kde; for daily work, and some hints on how to customise the &kde; desktop.</para>
 
-<para
->Included is a table of shortcuts, and some tips and tricks intended to help you find your way around quickly and efficiently.</para>
+<para>Included is a table of shortcuts, and some tips and tricks intended to help you find your way around quickly and efficiently.</para>
 
-<para
->This book is not a guide to the use of the individual applications, as they each have their own User Manual. However, &kde; is an integrated environment &mdash; what you learn in this manual and in your own exploration of &kde;'s interface is consistent and readily transferable between &kde; applications.</para>
+<para>This book is not a guide to the use of the individual applications, as they each have their own User Manual. However, &kde; is an integrated environment &mdash; what you learn in this manual and in your own exploration of &kde;'s interface is consistent and readily transferable between &kde; applications.</para>
 
-<para
->This book also explores some of the philosophy behind &kde; and some of its history, and rounds out with how to find more information, should you need it.</para>
+<para>This book also explores some of the philosophy behind &kde; and some of its history, and rounds out with how to find more information, should you need it.</para>
 
 </chapter>
 <!--
diff --git a/tde-i18n-en_GB/docs/tdebase/userguide/more-help.docbook b/tde-i18n-en_GB/docs/tdebase/userguide/more-help.docbook
index a62047b4dab..00f24de827b 100644
--- a/tde-i18n-en_GB/docs/tdebase/userguide/more-help.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/userguide/more-help.docbook
@@ -1,54 +1,29 @@
 <chapter id="more-help">
-<title
->Further Help</title>
+<title>Further Help</title>
 
 <sect1 id="mailing-lists">
-<title
->Other Sources for Help </title>
+<title>Other Sources for Help </title>
 
-<para
->Take a look at the &kde-http; for the most up-to-date information available about &kde; on the web. You may also want to subscribe to our mailing lists. </para>
+<para>Take a look at the &kde-http; for the most up-to-date information available about &kde; on the web. You may also want to subscribe to our mailing lists. </para>
 
-<para
->You can subscribe at the web pages listed below:</para>
+<para>You can subscribe at the web pages listed below:</para>
 
 <simplelist>
 
-<member
->&kde; announcements - <ulink url="http://mail.kde.org/mailman/listinfo/kde-announce"
-> http://mail.kde.org/mailman/listinfo/kde-announce</ulink
-></member>
+<member>&kde; announcements - <ulink url="http://mail.kde.org/mailman/listinfo/kde-announce"> http://mail.kde.org/mailman/listinfo/kde-announce</ulink></member>
 
-<member
->&kde; users' mailing list - <ulink url="http://mail.kde.org/mailman/listinfo/kde"
-> http://mail.kde.org/mailman/listinfo/kde</ulink
-></member>
+<member>&kde; users' mailing list - <ulink url="http://mail.kde.org/mailman/listinfo/kde"> http://mail.kde.org/mailman/listinfo/kde</ulink></member>
 
-<member
->KDE developers' mailing list - <ulink url="http://mail.kde.org/mailman/listinfo/kde-devel"
-> http://mail.kde.org/mailman/listinfo/kde-devel</ulink
-></member>
+<member>KDE developers' mailing list - <ulink url="http://mail.kde.org/mailman/listinfo/kde-devel"> http://mail.kde.org/mailman/listinfo/kde-devel</ulink></member>
 
-<member
->KDE look and feel discussions - <ulink url="http://mail.kde.org/mailman/listinfo/kde-look"
-> http://mail.kde.org/mailman/listinfo/kde-look </ulink
-></member>
+<member>KDE look and feel discussions - <ulink url="http://mail.kde.org/mailman/listinfo/kde-look"> http://mail.kde.org/mailman/listinfo/kde-look </ulink></member>
 
-<member
->KDE licensing questions - <ulink url="http://mail.kde.org/mailman/listinfo/kde-licensing"
-> http://mail.kde.org/mailman/listinfo/kde-licensing </ulink
-></member>
+<member>KDE licensing questions - <ulink url="http://mail.kde.org/mailman/listinfo/kde-licensing"> http://mail.kde.org/mailman/listinfo/kde-licensing </ulink></member>
 
-<member
->KDE Documenters' list - <ulink url="http://mail.kde.org/mailman/listinfo/kde-doc-english"
-> http://mail.kde.org/mailman/listinfo/kde-doc-english </ulink
-></member>
+<member>KDE Documenters' list - <ulink url="http://mail.kde.org/mailman/listinfo/kde-doc-english"> http://mail.kde.org/mailman/listinfo/kde-doc-english </ulink></member>
 </simplelist>
 
-<para
->Many &kde; applications and sub-projects maintain more specific lists for themselves. You can find a complete list of archives at <ulink url="http://lists.kde.org/"
->http://lists.kde.org/</ulink
->.</para>
+<para>Many &kde; applications and sub-projects maintain more specific lists for themselves. You can find a complete list of archives at <ulink url="http://lists.kde.org/">http://lists.kde.org/</ulink>.</para>
 
 </sect1>
 </chapter>
diff --git a/tde-i18n-en_GB/docs/tdebase/userguide/notices-trademarks.docbook b/tde-i18n-en_GB/docs/tdebase/userguide/notices-trademarks.docbook
index 49fda79a921..dad2bc61317 100644
--- a/tde-i18n-en_GB/docs/tdebase/userguide/notices-trademarks.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/userguide/notices-trademarks.docbook
@@ -1,84 +1,45 @@
 <appendix id="legal-notices-and-trademarks">
-<title
->Legal Notices</title>
+<title>Legal Notices</title>
 <sect1 id="legal-status">
-<title
->Licence</title>
+<title>Licence</title>
 
-<para
->&kde; is open source software, and all of &kde; is released under free licenses such as the GPL.</para>
+<para>&kde; is open source software, and all of &kde; is released under free licenses such as the GPL.</para>
 
 </sect1>
 
 <sect1 id="trademarks-list">
-<title
->Trademarks</title>
+<title>Trademarks</title>
 
-<!-- <para
->&kde; and <quote
->K Desktop Environment</quote
-> are registered
-trademarks of KDE e.V.</para
-> -->
+<!-- <para>&kde; and <quote>K Desktop Environment</quote> are registered
+trademarks of KDE e.V.</para> -->
 
-<para
->All trademarks mentioned on this web server or in &kde; documentation are recognised as belonging to their respective owners, including but not limited to:</para>
+<para>All trademarks mentioned on this web server or in &kde; documentation are recognised as belonging to their respective owners, including but not limited to:</para>
 
 <simplelist>
-<member
->&AIX; is a registered trademark of IBM Corporation</member>
-<member
->&CSS;, &XHTML;, &XSL; and &XML; are common law trademarks of the Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, or Keio University on behalf of the World Wide Web Consortium.</member>
-<member
->&Handspring; and &Visor; are trademarks of Handspring, Inc. and may be registered in certain jurisdictions.</member>
-<member
->&Hewlett-Packard;, &HP; &LaserJet;,&HP-UX; PCL, PCL 5 and PCL 6 are U.S. registered trademarks of Hewlett Packard Company.</member>
-<member
->&IRIX; is a registered trademark and &SGI; is a trademark of Silicon Graphics, Inc.</member>
-<member
->&Java; and all Java-based trademarks and logos are trademarks or registered trademarks of Sun Microsystems, Inc. in the U.S. and other countries.</member>
-<member
->&Jini; and all Jini-based trademarks and logos are trademarks or registered trademarks of Sun Microsystems, Inc. in the US and other countries.</member>
-<member
->&Linux; is a registered trademark of Linus Torvalds</member>
-<member
->&LinuxPPC; is a trademark of LinuxPPC Inc.</member>
-<member
->&Mac; is a trademark of Apple Computer Inc., registered in the United States and other countries.</member>
-<member
->&Mandrake; and &Linux-Mandrake; are trademarks of MandrakeSoft.</member>
-<member
->&Netscape; is a registered trademark of Netscape Communications Corporation in the United States and other countries.</member>
-<member
->&NeXTSTEP; is a trademark of NeXT Software, Inc., registered in the U.S. and other countries. </member>
-<member
->&PalmOS;, &HotSync; and &PalmPilot; are registered trademarks of Palm, Inc.</member>
-<member
->&PostScript; is a registered trademark of Adobe Systems Incorporated.</member>
-<member
->&Qt; is a trademark of Trolltech AS</member>
-<member
->&RedHat; and all Red Hat-based trademarks and logos are trademarks or registered trademarks of Red Hat, Inc. in the United States and other countries. </member>
-<member
->&Sendmail; is a registered trademark of Sendmail Inc.</member>
-<member
->&Solaris;, <trademark
->Sun</trademark
-> and <trademark
->SunOS</trademark
-> are trademarks of Sun Microsystems Inc.</member>
-<member
->&SuSE; is a registered trademark of SuSE AG</member>
-<member
->&ThreeCom; is a registered trademark of 3com corporation in the United States and other countries.</member>
-<member
->&Motif;, &UNIX; and the <quote
->X</quote
-> device are registered trademark of The Open Group in the United States and other countries</member>
-<member
->&Microsoft; and &Windows; are registered trademarks of the Microsoft Corporation</member>
-<member
->XFree86 is pending trademark registration by The XFree86 Project, Inc.</member>
+<member>&AIX; is a registered trademark of IBM Corporation</member>
+<member>&CSS;, &XHTML;, &XSL; and &XML; are common law trademarks of the Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, or Keio University on behalf of the World Wide Web Consortium.</member>
+<member>&Handspring; and &Visor; are trademarks of Handspring, Inc. and may be registered in certain jurisdictions.</member>
+<member>&Hewlett-Packard;, &HP; &LaserJet;,&HP-UX; PCL, PCL 5 and PCL 6 are U.S. registered trademarks of Hewlett Packard Company.</member>
+<member>&IRIX; is a registered trademark and &SGI; is a trademark of Silicon Graphics, Inc.</member>
+<member>&Java; and all Java-based trademarks and logos are trademarks or registered trademarks of Sun Microsystems, Inc. in the U.S. and other countries.</member>
+<member>&Jini; and all Jini-based trademarks and logos are trademarks or registered trademarks of Sun Microsystems, Inc. in the US and other countries.</member>
+<member>&Linux; is a registered trademark of Linus Torvalds</member>
+<member>&LinuxPPC; is a trademark of LinuxPPC Inc.</member>
+<member>&Mac; is a trademark of Apple Computer Inc., registered in the United States and other countries.</member>
+<member>&Mandrake; and &Linux-Mandrake; are trademarks of MandrakeSoft.</member>
+<member>&Netscape; is a registered trademark of Netscape Communications Corporation in the United States and other countries.</member>
+<member>&NeXTSTEP; is a trademark of NeXT Software, Inc., registered in the U.S. and other countries. </member>
+<member>&PalmOS;, &HotSync; and &PalmPilot; are registered trademarks of Palm, Inc.</member>
+<member>&PostScript; is a registered trademark of Adobe Systems Incorporated.</member>
+<member>&Qt; is a trademark of Trolltech AS</member>
+<member>&RedHat; and all Red Hat-based trademarks and logos are trademarks or registered trademarks of Red Hat, Inc. in the United States and other countries. </member>
+<member>&Sendmail; is a registered trademark of Sendmail Inc.</member>
+<member>&Solaris;, <trademark>Sun</trademark> and <trademark>SunOS</trademark> are trademarks of Sun Microsystems Inc.</member>
+<member>&SuSE; is a registered trademark of SuSE AG</member>
+<member>&ThreeCom; is a registered trademark of 3com corporation in the United States and other countries.</member>
+<member>&Motif;, &UNIX; and the <quote>X</quote> device are registered trademark of The Open Group in the United States and other countries</member>
+<member>&Microsoft; and &Windows; are registered trademarks of the Microsoft Corporation</member>
+<member>XFree86 is pending trademark registration by The XFree86 Project, Inc.</member>
 </simplelist>
 
 <!-- Others that needs to be covered above:
diff --git a/tde-i18n-en_GB/docs/tdebase/userguide/shortcuts.docbook b/tde-i18n-en_GB/docs/tdebase/userguide/shortcuts.docbook
index 39b1c62c17f..aad11c3e350 100644
--- a/tde-i18n-en_GB/docs/tdebase/userguide/shortcuts.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/userguide/shortcuts.docbook
@@ -1,337 +1,154 @@
 <chapter id="shortcuts">
-<title
->Tips &amp; Tricks for Your Daily Work </title>
+<title>Tips &amp; Tricks for Your Daily Work </title>
 
 <epigraph>
-<attribution
->Fortune Cookies</attribution>
-<para
->Everyone can make an omelette with eggs. The trick is to make one with none.</para>
+<attribution>Fortune Cookies</attribution>
+<para>Everyone can make an omelette with eggs. The trick is to make one with none.</para>
 </epigraph>
 
-<para
->Nearly everyone can use &kde;; this is why the developers made it. There are no cryptic switches with which to cope, and few configuration files you need edit in <acronym
->ASCII</acronym
-> style. However, there are some ways you can do your work more elegantly, saving you time for the truly important things, like &ksirtet;.</para>
+<para>Nearly everyone can use &kde;; this is why the developers made it. There are no cryptic switches with which to cope, and few configuration files you need edit in <acronym>ASCII</acronym> style. However, there are some ways you can do your work more elegantly, saving you time for the truly important things, like &ksirtet;.</para>
 
 <sect1 id="shortcut-table">
-<title
->Shortcut Table </title>
+<title>Shortcut Table </title>
 
 <variablelist>
 
 <varlistentry>
-<term
-><keycombo
->&Alt;<keycap
->Tab</keycap
-> </keycombo
-> or <keycombo
->&Alt;&Shift;<keycap
->Tab</keycap
-></keycombo
-></term>
-<listitem
-><para
->Cycle through the windows </para
-></listitem>
+<term><keycombo>&Alt;<keycap>Tab</keycap> </keycombo> or <keycombo>&Alt;&Shift;<keycap>Tab</keycap></keycombo></term>
+<listitem><para>Cycle through the windows </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><keycombo
->&Ctrl;<keycap
->Tab</keycap
-></keycombo
-> or <keycombo
->&Ctrl;&Shift;<keycap
->Tab</keycap
-> </keycombo
-></term>
-<listitem
-><para
->Cycle through your desktops </para
-></listitem>
+<term><keycombo>&Ctrl;<keycap>Tab</keycap></keycombo> or <keycombo>&Ctrl;&Shift;<keycap>Tab</keycap> </keycombo></term>
+<listitem><para>Cycle through your desktops </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><keycombo
->&Alt;<keycap
->F2</keycap
-> </keycombo
-></term>
-<listitem
-><para
->Mini Command line</para
-></listitem>
+<term><keycombo>&Alt;<keycap>F2</keycap> </keycombo></term>
+<listitem><para>Mini Command line</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><keycombo
->&Alt;<keycap
->F3</keycap
-></keycombo
-></term>
-<listitem
-><para
->Window Menu </para
-></listitem>
+<term><keycombo>&Alt;<keycap>F3</keycap></keycombo></term>
+<listitem><para>Window Menu </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><keycombo
->&Alt;<keycap
->F4</keycap
-> </keycombo
-></term>
-<listitem
-><para
->Close the current window </para
-></listitem>
+<term><keycombo>&Alt;<keycap>F4</keycap> </keycombo></term>
+<listitem><para>Close the current window </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><keycombo
->&Ctrl;<keycap
->F{1..8}</keycap
-></keycombo
-></term>
-<listitem
-><para
->Switch to a specific desktop </para
-></listitem>
+<term><keycombo>&Ctrl;<keycap>F{1..8}</keycap></keycombo></term>
+<listitem><para>Switch to a specific desktop </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><keycombo
->&Ctrl;&Alt;<keycap
->Esc</keycap
-> </keycombo
-></term>
-<listitem
-><para
->Window destroyer (every window you click on will be destroyed). Press this key combination again to cancel the killer cursor. </para
-></listitem>
+<term><keycombo>&Ctrl;&Alt;<keycap>Esc</keycap> </keycombo></term>
+<listitem><para>Window destroyer (every window you click on will be destroyed). Press this key combination again to cancel the killer cursor. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><keycombo
->&Ctrl;&Alt;<keycap
->Backspace</keycap
-> </keycombo
-></term>
-<listitem
-><para
->This exits &kde; (without saving!) Use this as a last resort </para
-></listitem>
+<term><keycombo>&Ctrl;&Alt;<keycap>Backspace</keycap> </keycombo></term>
+<listitem><para>This exits &kde; (without saving!) Use this as a last resort </para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><keycombo
->&Ctrl;&Alt;<keycap
->Numpad +</keycap
-></keycombo
-></term>
-<listitem
-><para
->Cycles to the next screen resolution. You need to configure this in your &X-Server; configuration for it to work. </para
-></listitem>
+<term><keycombo>&Ctrl;&Alt;<keycap>Numpad +</keycap></keycombo></term>
+<listitem><para>Cycles to the next screen resolution. You need to configure this in your &X-Server; configuration for it to work. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><keycombo
->&Ctrl;&Alt;<keycap
->Numpad -</keycap
-> </keycombo
-></term>
-<listitem
-><para
->Cycles to the previous screen resolution. You need to configure this in your &X-Server; configuration for it to work.</para
-></listitem>
+<term><keycombo>&Ctrl;&Alt;<keycap>Numpad -</keycap> </keycombo></term>
+<listitem><para>Cycles to the previous screen resolution. You need to configure this in your &X-Server; configuration for it to work.</para></listitem>
 </varlistentry>
 </variablelist>
 
 </sect1>
 
 <sect1 id="mouse-techniques">
-<title
->Mouse Techniques </title>
+<title>Mouse Techniques </title>
 
-<para
->Note these are defaults only, and you can customise them to your liking.</para>
+<para>Note these are defaults only, and you can customise them to your liking.</para>
 
 <variablelist>
 
 <varlistentry>
-<term
->Clicking on the border or the titlebar</term>
+<term>Clicking on the border or the titlebar</term>
 <listitem>
 <variablelist>
 
 <varlistentry>
-<term
-><mousebutton
->Left</mousebutton
-></term>
-<listitem
-><para
->Activates and raises the window.</para
-></listitem>
+<term><mousebutton>Left</mousebutton></term>
+<listitem><para>Activates and raises the window.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><mousebutton
->Middle</mousebutton
-></term>
-<listitem
-><para
->Lowers the window</para
-></listitem>
+<term><mousebutton>Middle</mousebutton></term>
+<listitem><para>Lowers the window</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><mousebutton
->Right</mousebutton
-></term>
-<listitem
-><para
->Shows the <guimenu
->Window menu</guimenu
-> if the window is active, otherwise activates the window.</para
-></listitem>
+<term><mousebutton>Right</mousebutton></term>
+<listitem><para>Shows the <guimenu>Window menu</guimenu> if the window is active, otherwise activates the window.</para></listitem>
 </varlistentry>
 </variablelist>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Doubleclick on the window title</term>
-<listitem
-><para
->Shades the window (<quote
->rolls it up</quote
-> so only the titlebar is visible).</para
-></listitem>
+<term>Doubleclick on the window title</term>
+<listitem><para>Shades the window (<quote>rolls it up</quote> so only the titlebar is visible).</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Drag on the titlebar</term>
-<listitem
-><para
->Moves the window around.</para
-></listitem>
+<term>Drag on the titlebar</term>
+<listitem><para>Moves the window around.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Drag on corners or edges</term>
-<listitem
-><para
->Resizes the window.</para
-></listitem>
+<term>Drag on corners or edges</term>
+<listitem><para>Resizes the window.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><keycombo
->&Alt;<mousebutton
->Left</mousebutton
-></keycombo
-> Button</term>
-<listitem
-><para
->Moves the window around.</para
-></listitem>
+<term><keycombo>&Alt;<mousebutton>Left</mousebutton></keycombo> Button</term>
+<listitem><para>Moves the window around.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><keycombo
->&Alt;<mousebutton
->Middle</mousebutton
-> </keycombo
-> Button</term>
-<listitem
-><para
->Raises the window.</para
-></listitem>
+<term><keycombo>&Alt;<mousebutton>Middle</mousebutton> </keycombo> Button</term>
+<listitem><para>Raises the window.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><keycombo
->&Alt;<mousebutton
->Right</mousebutton
-> </keycombo
-> Button</term>
-<listitem
-><para
->Resizes the window in the direction you drag the mouse.</para
-></listitem>
+<term><keycombo>&Alt;<mousebutton>Right</mousebutton> </keycombo> Button</term>
+<listitem><para>Resizes the window in the direction you drag the mouse.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Click on the Icon on the top left</term>
-<listitem
-><para
->Close the application</para
-></listitem>
+<term>Click on the Icon on the top left</term>
+<listitem><para>Close the application</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->Click on the Sticky Button</term>
-<listitem
-><para
->toggles sticky </para
-></listitem>
+<term>Click on the Sticky Button</term>
+<listitem><para>toggles sticky </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Clicking on Maximise</term>
+<term>Clicking on Maximise</term>
 <listitem>
 <variablelist>
 <varlistentry>
-<term
-><mousebutton
->Left</mousebutton
-></term>
-<listitem
-><para
->Maximises the window</para
-></listitem>
+<term><mousebutton>Left</mousebutton></term>
+<listitem><para>Maximises the window</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><mousebutton
->Middle</mousebutton
-></term>
-<listitem
-><para
->Maximises only vertically</para
-></listitem>
+<term><mousebutton>Middle</mousebutton></term>
+<listitem><para>Maximises only vertically</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><mousebutton
->Right</mousebutton
-></term>
-<listitem
-><para
->Maximises horizontally</para
-></listitem>
+<term><mousebutton>Right</mousebutton></term>
+<listitem><para>Maximises horizontally</para></listitem>
 </varlistentry>
 </variablelist>
 </listitem>
diff --git a/tde-i18n-en_GB/docs/tdebase/userguide/staff.docbook b/tde-i18n-en_GB/docs/tdebase/userguide/staff.docbook
index 76bdd4d3a82..218e936783d 100644
--- a/tde-i18n-en_GB/docs/tdebase/userguide/staff.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/userguide/staff.docbook
@@ -1,138 +1,66 @@
 <chapter id="docu-staff">
-<title
->Epilogue </title>
+<title>Epilogue </title>
 
 <epigraph>
-<attribution
->The end of Evita</attribution>
-<para
->She had her moments, she had some style, the best show in town was the crowd, outside the Casa Rosada crying 'Eva Peron'; but that's all gone now...</para
-></epigraph>
+<attribution>The end of Evita</attribution>
+<para>She had her moments, she had some style, the best show in town was the crowd, outside the Casa Rosada crying 'Eva Peron'; but that's all gone now...</para></epigraph>
 
-<para
->We hope that you found this documentation useful, informative and perhaps even entertaining. The following things are not necessary to understand the Trinity Desktop Environment, but you still may want to read it. </para>
+<para>We hope that you found this documentation useful, informative and perhaps even entertaining. The following things are not necessary to understand the Trinity Desktop Environment, but you still may want to read it. </para>
 
 <sect1 id="the-k-documentation-staff">
-<title
->The K Documentation Staff </title>
+<title>The K Documentation Staff </title>
 
-<para
->This User Guide has been updated for 3.0, and is currently maintained by Lauri Watts <email
->lauri@kde.org</email
-></para>
+<para>This User Guide has been updated for 3.0, and is currently maintained by Lauri Watts <email>lauri@kde.org</email></para>
 
-<para
->Others who have contributed to this guide.</para>
+<para>Others who have contributed to this guide.</para>
 <itemizedlist>
-<listitem
-><para
->Pablo de Vicente <email
->vicente@oan.es</email
->, who updated the section regarding installing on Debian for KDE 2.0</para
-></listitem>
-<listitem
-><para
->Andreas Buschka <email
->andi@circe.tops.net</email
-></para
-></listitem>
-<listitem
-><para
->Robert D. Williams <email
->rwilliam@kde.org</email
-></para
-></listitem>
-<listitem
-><para
->Poul Gerhard</para
-></listitem>
-<listitem
-><para
->John Waalkes</para
-></listitem>
-<listitem
-><para
->Vernon Wells</para
-></listitem>
-<listitem
-><para
->Kay Lutz</para
-></listitem>
-<listitem
-><para
->Stephan Kulow</para
-></listitem>
+<listitem><para>Pablo de Vicente <email>vicente@oan.es</email>, who updated the section regarding installing on Debian for KDE 2.0</para></listitem>
+<listitem><para>Andreas Buschka <email>andi@circe.tops.net</email></para></listitem>
+<listitem><para>Robert D. Williams <email>rwilliam@kde.org</email></para></listitem>
+<listitem><para>Poul Gerhard</para></listitem>
+<listitem><para>John Waalkes</para></listitem>
+<listitem><para>Vernon Wells</para></listitem>
+<listitem><para>Kay Lutz</para></listitem>
+<listitem><para>Stephan Kulow</para></listitem>
 </itemizedlist>
 </sect1>
 
 <sect1 id="we-still-need-people">
-<title
->We still need people! </title>
+<title>We still need people! </title>
 
-<para
->KDE is a huge project, and every KDE supporter has already realised that. All of us are trying very hard to create a user interface that is easy to use and maybe also has the potential to make UNIX ready for the desktop PC. You have the chance to participate in this project too, and we would be thankful if you did. Developers and interested users communicate via several mailing lists described in <xref linkend="mailing-lists"/>. If you would like to help, please do so! We are still looking for helpers in the following departments: </para>
+<para>KDE is a huge project, and every KDE supporter has already realised that. All of us are trying very hard to create a user interface that is easy to use and maybe also has the potential to make UNIX ready for the desktop PC. You have the chance to participate in this project too, and we would be thankful if you did. Developers and interested users communicate via several mailing lists described in <xref linkend="mailing-lists"/>. If you would like to help, please do so! We are still looking for helpers in the following departments: </para>
 
 <itemizedlist>
-<listitem
-><para
->Development (Libraries and Applications)</para
-></listitem>
-<listitem
-><para
->Documentation</para
-></listitem>
-<listitem
-><para
->Graphics</para
-></listitem>
-<listitem
-><para
->Beta-Testing</para
-></listitem>
-<listitem
-><para
->and everywhere else, too :-) </para
-></listitem>
+<listitem><para>Development (Libraries and Applications)</para></listitem>
+<listitem><para>Documentation</para></listitem>
+<listitem><para>Graphics</para></listitem>
+<listitem><para>Beta-Testing</para></listitem>
+<listitem><para>and everywhere else, too :-) </para></listitem>
 </itemizedlist>
 
 </sect1>
 
 <sect1 id="legal-notices">
-<title
->Legal notices </title>
+<title>Legal notices </title>
 
-<para
->This document contains copyrighted material from Andreas Buschka, Gerhard Poul and Robert David Williams. All trademarks and branded names mentioned are properties of their legal owners. </para>
+<para>This document contains copyrighted material from Andreas Buschka, Gerhard Poul and Robert David Williams. All trademarks and branded names mentioned are properties of their legal owners. </para>
 
 </sect1>
 
 <sect1 id="sources-of-information-used-during-the-creat">
-<title
->Sources of information used during the creation of this book </title>
+<title>Sources of information used during the creation of this book </title>
 
-<para
->During the creation of this documentation, the authors used the following sources for information: </para>
+<para>During the creation of this documentation, the authors used the following sources for information: </para>
 
 <itemizedlist>
-<listitem
-><para
->The KDE Mailing lists </para
-></listitem>
-<listitem
-><para
->Various <filename
->README</filename
-> and <abbrev
->HTML</abbrev
-> help files that came with the KDE components </para
-></listitem>
+<listitem><para>The KDE Mailing lists </para></listitem>
+<listitem><para>Various <filename>README</filename> and <abbrev>HTML</abbrev> help files that came with the KDE components </para></listitem>
 </itemizedlist>
 
 </sect1>
 
 <sect1 id="license">
-<title
->Licence</title>
+<title>Licence</title>
 &underGPL; </sect1>
 </chapter>
 <!--
diff --git a/tde-i18n-en_GB/docs/tdebase/userguide/ug-faq.docbook b/tde-i18n-en_GB/docs/tdebase/userguide/ug-faq.docbook
index 9a94f503c70..b5d6dd9bd13 100644
--- a/tde-i18n-en_GB/docs/tdebase/userguide/ug-faq.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/userguide/ug-faq.docbook
@@ -1,110 +1,53 @@
 <chapter id="frequently-asked-questions">
-<title
->Frequently Asked Questions About &kde; </title>
+<title>Frequently Asked Questions About &kde; </title>
 
 <epigraph>
-<attribution
->Batman Animated Series</attribution>
-<para
->What are you?</para>
-<para
->I'm your worst nightmare...</para>
+<attribution>Batman Animated Series</attribution>
+<para>What are you?</para>
+<para>I'm your worst nightmare...</para>
 </epigraph>
 
-<para
->There are some questions that are always raised on the &kde; mailing lists. To keep the traffic as low as possible (making the lists more readable), we have included them in this section. So please be kind and do not ask them in the mailing lists anymore - think of the quote above! </para>
+<para>There are some questions that are always raised on the &kde; mailing lists. To keep the traffic as low as possible (making the lists more readable), we have included them in this section. So please be kind and do not ask them in the mailing lists anymore - think of the quote above! </para>
 
 <!-- pretty short list.. going to watch mailing lists a little, and
 see if there aren't any more questions that ought to be here -->
 
 <qandaset id="faq">
 <qandaentry>
-<question
-><para
->What does <quote
->&kde;</quote
-> stand for?</para
-></question>
-<answer
-><para
->Originally the <emphasis
->K</emphasis
-> stood for <emphasis
->Kool</emphasis
->, nowadays the K has no meaning and &kde; simply stands for the <emphasis
->K Desktop Environment</emphasis
->. &kde; is intended to be a collection of small tools, a window manager, a file manager and tools that bring all this together. It is created to make your life with &UNIX; easier. </para
-></answer>
+<question><para>What does <quote>&kde;</quote> stand for?</para></question>
+<answer><para>Originally the <emphasis>K</emphasis> stood for <emphasis>Kool</emphasis>, nowadays the K has no meaning and &kde; simply stands for the <emphasis>K Desktop Environment</emphasis>. &kde; is intended to be a collection of small tools, a window manager, a file manager and tools that bring all this together. It is created to make your life with &UNIX; easier. </para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->I cannot compile package xxx</para
-></question>
+<question><para>I cannot compile package xxx</para></question>
 <answer>
 
-<para
->Always be sure that you have the newest version of the &kde; libraries installed. The software is in constant development, so the dependencies can change from one day to another if you are using <acronym
->CVS</acronym
->. For most users, using a released version is much more practical.</para>
+<para>Always be sure that you have the newest version of the &kde; libraries installed. The software is in constant development, so the dependencies can change from one day to another if you are using <acronym>CVS</acronym>. For most users, using a released version is much more practical.</para>
 
-<para
->Another problem could be that you are using a program written for a very old version of &kde;, which depends on outdated include files. Check in the source archive's <filename
->README</filename
-> to see if it explains which version of &kde; the application is looking for. If that file doesn't exist, check the file dates. They should be more recent than your current &kde; version.</para>
+<para>Another problem could be that you are using a program written for a very old version of &kde;, which depends on outdated include files. Check in the source archive's <filename>README</filename> to see if it explains which version of &kde; the application is looking for. If that file doesn't exist, check the file dates. They should be more recent than your current &kde; version.</para>
 </answer>
 </qandaentry>
 
-<qandaentry
-> 
+<qandaentry> 
 
-<question
-><para
->What version of &kde; should I use for a stable desktop?</para
-></question>
-<answer
-><para
->One can, in general, obtain &kde; in many ways. Obtaining pre-compiled binaries in a package format (rpm,deb,tgz) labeled with a particular version (&eg; 3.2) is the best way to encourage stability on your &kde; desktop.</para>
+<question><para>What version of &kde; should I use for a stable desktop?</para></question>
+<answer><para>One can, in general, obtain &kde; in many ways. Obtaining pre-compiled binaries in a package format (rpm,deb,tgz) labeled with a particular version (&eg; 3.2) is the best way to encourage stability on your &kde; desktop.</para>
 
 </answer>
 </qandaentry>
 
-<qandaentry
-> 
-<question
-><para
->But I heard that my problem/wishlist item is <quote
->already in <acronym
->CVS</acronym
-></quote
->. I want to get my hands on the new features, why shouldn't I try <acronym
->CVS</acronym
->?</para
-></question>
+<qandaentry> 
+<question><para>But I heard that my problem/wishlist item is <quote>already in <acronym>CVS</acronym></quote>. I want to get my hands on the new features, why shouldn't I try <acronym>CVS</acronym>?</para></question>
 
 <answer>
-<para
->The price of stability is that one must wait for each release to get new features. Conversely the price of being the first to see new features, is that you risk stability. &kde; has a fairly frequent release schedule, and stability of released versions is a particular focus. For the majority of &kde; users, unless you are planning to help develop &kde;, there is little advantage to running development versions of &kde;.</para>
+<para>The price of stability is that one must wait for each release to get new features. Conversely the price of being the first to see new features, is that you risk stability. &kde; has a fairly frequent release schedule, and stability of released versions is a particular focus. For the majority of &kde; users, unless you are planning to help develop &kde;, there is little advantage to running development versions of &kde;.</para>
 
-<para
->However, there is always a place for experienced users who know what they are letting themselves in for, and are willing to report bugs found. If this is you, then there is no reason not to try the <acronym
->CVS</acronym
-> versions. Be prepared for things to break occasionally, <acronym
->CVS</acronym
-> gives you a snapshot of source code that is currently being worked on.</para>
+<para>However, there is always a place for experienced users who know what they are letting themselves in for, and are willing to report bugs found. If this is you, then there is no reason not to try the <acronym>CVS</acronym> versions. Be prepared for things to break occasionally, <acronym>CVS</acronym> gives you a snapshot of source code that is currently being worked on.</para>
 
-<para
->These are daily snapshots of whatever the developers are working on, and some things are guaranteed to be broken.</para
-> 
+<para>These are daily snapshots of whatever the developers are working on, and some things are guaranteed to be broken.</para> 
 
 <warning>
-<para
-><emphasis
->Do not rely on <acronym
->CVS</acronym
-> snapshots to maintain operational desktops</emphasis
->. You will get burned eventually!</para>
+<para><emphasis>Do not rely on <acronym>CVS</acronym> snapshots to maintain operational desktops</emphasis>. You will get burned eventually!</para>
 </warning>
 
 </answer>
diff --git a/tde-i18n-en_GB/docs/tdebase/visualdict/index.docbook b/tde-i18n-en_GB/docs/tdebase/visualdict/index.docbook
index c9178c95461..a6b7bd0174f 100644
--- a/tde-i18n-en_GB/docs/tdebase/visualdict/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/visualdict/index.docbook
@@ -3,8 +3,7 @@
 "dtd/kdex.dtd" [
   <!ENTITY kappname "Visual Guide to &kde;">
   <!ENTITY % addindex "IGNORE">
-  <!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+  <!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
   
   
 ]>
@@ -12,57 +11,29 @@
 <book lang="&language;">
   
 <bookinfo>
-<title
->The &kde; Visual Guide</title>
+<title>The &kde; Visual Guide</title>
 <authorgroup>
-<corpauthor
->The KDE Team </corpauthor>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<corpauthor>The KDE Team </corpauthor>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2000-10-04</date>
-<releaseinfo
->2.00.00</releaseinfo>
+<date>2000-10-04</date>
+<releaseinfo>2.00.00</releaseinfo>
 
 <copyright>
-<year
->2000</year>
-<holder
->The KDE Team</holder>
+<year>2000</year>
+<holder>The KDE Team</holder>
 </copyright>
 
-<legalnotice
->&FDLNotice;</legalnotice>
+<legalnotice>&FDLNotice;</legalnotice>
 
-<abstract
-><para
->A visual guide to &kde;'s interface. This is a very early version of the document. Eventually, this will be a graphical tour of &kde;.</para
-></abstract>
+<abstract><para>A visual guide to &kde;'s interface. This is a very early version of the document. Eventually, this will be a graphical tour of &kde;.</para></abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->Visual</keyword>
-<keyword
->Dictionary</keyword>
-<keyword
->Guide</keyword>
+<keyword>KDE</keyword>
+<keyword>Visual</keyword>
+<keyword>Dictionary</keyword>
+<keyword>Guide</keyword>
 </keywordset>
 
 </bookinfo>
@@ -73,23 +44,14 @@
 <!-- dictionary on the i18n website, please make sure the translations here -->
 <!-- match that file exactly. -->
 
-<title
->&kde; Visual Dictionary of terms</title>
+<title>&kde; Visual Dictionary of terms</title>
 
-<para
->This project was started to help unify the vocabulary used in &kde; documentation.</para>
+<para>This project was started to help unify the vocabulary used in &kde; documentation.</para>
 
-<para
->We provide this for you here as an aid to learning your way around the &kde; Graphical User Interface. These names have been standardised within &kde; documentation, so that you will always find interface items referred to in the same way.</para>
+<para>We provide this for you here as an aid to learning your way around the &kde; Graphical User Interface. These names have been standardised within &kde; documentation, so that you will always find interface items referred to in the same way.</para>
 
-<tip
-><para
->The term <quote
->Widget</quote
-> refers to the basic building block of a computer program's interface.</para>
-<para
->Each widget operates in a similar manner each time it is used, but the effect that the widget has depends on its place within the program.</para
-></tip>
+<tip><para>The term <quote>Widget</quote> refers to the basic building block of a computer program's interface.</para>
+<para>Each widget operates in a similar manner each time it is used, but the effect that the widget has depends on its place within the program.</para></tip>
 
 <!-- TODO:
 Widgets to add: combo buttons (eg, the 'back' button in konq), popup 
@@ -98,20 +60,16 @@ menus/context menus, passive popups, sidebar buttons?
 Perhaps list deprecated names, for search/replace purposes?
 -->
 <sect1 id="widget-table">
-<title
->Listing of Common &kde; Widgets</title>
-<para
->Currently, this guide consists of a table of the names of the graphical elements often found in &kde; documentation, and an example of each one. </para>
-<para
->Our hope, eventually, is to make this a much more complete document, which will take you on a visual tour of &kde;.</para>
+<title>Listing of Common &kde; Widgets</title>
+<para>Currently, this guide consists of a table of the names of the graphical elements often found in &kde; documentation, and an example of each one. </para>
+<para>Our hope, eventually, is to make this a much more complete document, which will take you on a visual tour of &kde;.</para>
 
 <informaltable>
 <tgroup cols="2">
 <tbody>
 
 <row>
-<entry
->Button</entry>
+<entry>Button</entry>
 <entry>
 <inlinemediaobject>
 <imageobject>
@@ -122,8 +80,7 @@ Perhaps list deprecated names, for search/replace purposes?
 </row>
 
 <row>
-<entry
->Check Boxes</entry>
+<entry>Check Boxes</entry>
 <entry>
 <inlinemediaobject>
 <imageobject>
@@ -134,8 +91,7 @@ Perhaps list deprecated names, for search/replace purposes?
 </row>
 
 <row>
-<entry
->Colour Selector</entry>
+<entry>Colour Selector</entry>
 <entry>
 <inlinemediaobject>
 <imageobject>
@@ -146,8 +102,7 @@ Perhaps list deprecated names, for search/replace purposes?
 </row>
 
 <row>
-<entry
->Combo Box</entry>
+<entry>Combo Box</entry>
 <entry>
 <inlinemediaobject>
 <imageobject>
@@ -158,8 +113,7 @@ Perhaps list deprecated names, for search/replace purposes?
 </row>
 
 <row>
-<entry
->Dialogue Box</entry>
+<entry>Dialogue Box</entry>
 <entry>
 <inlinemediaobject>
 <imageobject>
@@ -170,8 +124,7 @@ Perhaps list deprecated names, for search/replace purposes?
 </row>
 
 <row>
-<entry
->Drop Down Box</entry>
+<entry>Drop Down Box</entry>
 <entry>
 <inlinemediaobject>
 <imageobject>
@@ -182,8 +135,7 @@ Perhaps list deprecated names, for search/replace purposes?
 </row>
 
 <row>
-<entry
->Icon List</entry>
+<entry>Icon List</entry>
 <entry>
 <inlinemediaobject>
 <imageobject>
@@ -194,8 +146,7 @@ Perhaps list deprecated names, for search/replace purposes?
 </row>
 
 <row>
-<entry
->List Box</entry>
+<entry>List Box</entry>
 <entry>
 <inlinemediaobject>
 <imageobject>
@@ -206,8 +157,7 @@ Perhaps list deprecated names, for search/replace purposes?
 </row>
 
 <row>
-<entry
->Menubar</entry>
+<entry>Menubar</entry>
 <entry>
 <inlinemediaobject>
 <imageobject>
@@ -218,8 +168,7 @@ Perhaps list deprecated names, for search/replace purposes?
 </row>
 
 <row>
-<entry
->Progress Bar</entry>
+<entry>Progress Bar</entry>
 <entry>
 <inlinemediaobject>
 <imageobject>
@@ -230,8 +179,7 @@ Perhaps list deprecated names, for search/replace purposes?
 </row>
 
 <row>
-<entry
->Radio Buttons</entry>
+<entry>Radio Buttons</entry>
 <entry>
 <inlinemediaobject>
 <imageobject>
@@ -242,8 +190,7 @@ Perhaps list deprecated names, for search/replace purposes?
 </row>
 
 <row>
-<entry
->Scroll Bar</entry>
+<entry>Scroll Bar</entry>
 <entry>
 <inlinemediaobject>
 <imageobject>
@@ -254,8 +201,7 @@ Perhaps list deprecated names, for search/replace purposes?
 </row>
 
 <row>
-<entry
->Slider</entry>
+<entry>Slider</entry>
 <entry>
 <inlinemediaobject>
 <imageobject>
@@ -266,8 +212,7 @@ Perhaps list deprecated names, for search/replace purposes?
 </row>
 
 <row>
-<entry
->Spin Box</entry>
+<entry>Spin Box</entry>
 <entry>
 <inlinemediaobject>
 <imageobject>
@@ -278,8 +223,7 @@ Perhaps list deprecated names, for search/replace purposes?
 </row>
 
 <row>
-<entry
->Status Bar</entry>
+<entry>Status Bar</entry>
 <entry>
 <inlinemediaobject>
 <imageobject>
@@ -290,8 +234,7 @@ Perhaps list deprecated names, for search/replace purposes?
 </row>
 
 <row>
-<entry
->Text Box</entry>
+<entry>Text Box</entry>
 <entry>
 <inlinemediaobject>
 <imageobject>
@@ -303,8 +246,7 @@ Perhaps list deprecated names, for search/replace purposes?
 
 
 <row>
-<entry
->Toolbar</entry>
+<entry>Toolbar</entry>
 <entry>
 <inlinemediaobject>
 <imageobject>
@@ -315,8 +257,7 @@ Perhaps list deprecated names, for search/replace purposes?
 </row>
 
 <row>
-<entry
->Tree View</entry>
+<entry>Tree View</entry>
 <entry>
 <inlinemediaobject>
 <imageobject>
@@ -328,8 +269,7 @@ Perhaps list deprecated names, for search/replace purposes?
 
 
 <row>
-<entry
->Window Titlebar</entry>
+<entry>Window Titlebar</entry>
 <entry>
 <inlinemediaobject>
 <imageobject>
@@ -345,13 +285,10 @@ Perhaps list deprecated names, for search/replace purposes?
 </sect1>
 </chapter>
 <chapter id="credits">
-<title
->Credits and Licences</title>
-<para
->&kappname;</para>
+<title>Credits and Licences</title>
+<para>&kappname;</para>
 
-<para
->Documentation by the KDE Documentation Team.</para>
+<para>Documentation by the KDE Documentation Team.</para>
 &underFDL; </chapter>
 
 </book>
diff --git a/tde-i18n-en_GB/docs/tdeedu/klatin/adjectives.docbook b/tde-i18n-en_GB/docs/tdeedu/klatin/adjectives.docbook
index fa210644c49..f15d20ba73a 100644
--- a/tde-i18n-en_GB/docs/tdeedu/klatin/adjectives.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/klatin/adjectives.docbook
@@ -1,181 +1,114 @@
 <!-- Please don't translate Latin words -->
 <!-- Please translate the following -->
 <sect1 id="adjectives">
-<title
->KLatin Notes - Adjectives</title>
+<title>KLatin Notes - Adjectives</title>
 
-<para
->Adjectives are words to describe nouns, and so they agree with the nouns. Agreeing means that they match the noun they refer to in three ways: gender, number and case. </para>
+<para>Adjectives are words to describe nouns, and so they agree with the nouns. Agreeing means that they match the noun they refer to in three ways: gender, number and case. </para>
 
 <table frame="none">
 <!--Please translate title-->
-<title
->1st and 2nd Declension Adjectives (212)</title>
+<title>1st and 2nd Declension Adjectives (212)</title>
 <tgroup cols="4" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <row>
 <!-- Please translate SINGULAR and Like-->
-<entry
->SINGULAR</entry>
-<entry
->Like Servus</entry>
-<entry
->Like Puella</entry>
-<entry
->Like Bellum</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>SINGULAR</entry>
+<entry>Like Servus</entry>
+<entry>Like Puella</entry>
+<entry>Like Bellum</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate the first entry of each row-->
-<entry
->Nominative</entry>
-<entry
->bon-us</entry>
-<entry
->bon-a</entry>
-<entry
->bon-um</entry>
-</row>
-<row>
-<entry
->Vocative</entry>
-<entry
->bon-e</entry>
-<entry
->bon-a</entry>
-<entry
->bon-um</entry>
-</row>
-<row>
-<entry
->Accusative</entry>
-<entry
->bon-um</entry>
-<entry
->bon-am</entry>
-<entry
->bon-um</entry>
-</row>
-<row>
-<entry
->Genitive</entry>
-<entry
->bon-i</entry>
-<entry
->bon-ae</entry>
-<entry
->bon-i</entry>
-</row>
-<row>
-<entry
->Dative</entry>
-<entry
->bon-o</entry>
-<entry
->bon-ae</entry>
-<entry
->bon-o</entry>
-</row>
-<row>
-<entry
->Ablative</entry>
-<entry
->bon-o</entry>
-<entry
->bon-a</entry>
-<entry
->bon-o</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>Nominative</entry>
+<entry>bon-us</entry>
+<entry>bon-a</entry>
+<entry>bon-um</entry>
+</row>
+<row>
+<entry>Vocative</entry>
+<entry>bon-e</entry>
+<entry>bon-a</entry>
+<entry>bon-um</entry>
+</row>
+<row>
+<entry>Accusative</entry>
+<entry>bon-um</entry>
+<entry>bon-am</entry>
+<entry>bon-um</entry>
+</row>
+<row>
+<entry>Genitive</entry>
+<entry>bon-i</entry>
+<entry>bon-ae</entry>
+<entry>bon-i</entry>
+</row>
+<row>
+<entry>Dative</entry>
+<entry>bon-o</entry>
+<entry>bon-ae</entry>
+<entry>bon-o</entry>
+</row>
+<row>
+<entry>Ablative</entry>
+<entry>bon-o</entry>
+<entry>bon-a</entry>
+<entry>bon-o</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate the first entry of each row-->
-<entry
->PLURAL</entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-</row>
-<row>
-<entry
->Nominative</entry>
-<entry
->bon-i</entry>
-<entry
->bon-ae</entry>
-<entry
->bon-a</entry>
-</row>
-<row>
-<entry
->Vocative</entry>
-<entry
->bon-i</entry>
-<entry
->bon-ae</entry>
-<entry
->bon-a</entry>
-</row>
-<row>
-<entry
->Accusative</entry>
-<entry
->bon-os</entry>
-<entry
->bon-as</entry>
-<entry
->bon-a</entry>
-</row>
-<row>
-<entry
->Genitive</entry>
-<entry
->bon-orum</entry>
-<entry
->bon-arum</entry>
-<entry
->bon-orum</entry>
-</row>
-<row>
-<entry
->Dative</entry>
-<entry
->bon-is</entry>
-<entry
->bon-is</entry>
-<entry
->bon-is</entry>
-</row>
-<row>
-<entry
->Ablative</entry>
-<entry
->bon-is</entry>
-<entry
->bon-is</entry>
-<entry
->bon-is</entry>
+<entry>PLURAL</entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+</row>
+<row>
+<entry>Nominative</entry>
+<entry>bon-i</entry>
+<entry>bon-ae</entry>
+<entry>bon-a</entry>
+</row>
+<row>
+<entry>Vocative</entry>
+<entry>bon-i</entry>
+<entry>bon-ae</entry>
+<entry>bon-a</entry>
+</row>
+<row>
+<entry>Accusative</entry>
+<entry>bon-os</entry>
+<entry>bon-as</entry>
+<entry>bon-a</entry>
+</row>
+<row>
+<entry>Genitive</entry>
+<entry>bon-orum</entry>
+<entry>bon-arum</entry>
+<entry>bon-orum</entry>
+</row>
+<row>
+<entry>Dative</entry>
+<entry>bon-is</entry>
+<entry>bon-is</entry>
+<entry>bon-is</entry>
+</row>
+<row>
+<entry>Ablative</entry>
+<entry>bon-is</entry>
+<entry>bon-is</entry>
+<entry>bon-is</entry>
 </row>
 </tbody>
 </tgroup>
@@ -183,174 +116,109 @@
 
 <table frame="none">
 <!--Please translate the title-->
-<title
->3rd Declension Adjectives (333)</title>
+<title>3rd Declension Adjectives (333)</title>
 
 <tgroup cols="4" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <row>
 <!-- Please translate SINGULAR and Like-->
-<entry
->SINGULAR</entry>
-<entry
->Like Rex</entry>
-<entry
->Like Rex</entry>
-<entry
->Like Opus</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>SINGULAR</entry>
+<entry>Like Rex</entry>
+<entry>Like Rex</entry>
+<entry>Like Opus</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate the first entry of each row-->
-<entry
->Nominative</entry>
-<entry
->trist-is</entry>
-<entry
->trist-is</entry>
-<entry
->trist-e</entry>
-</row>
-<row>
-<entry
->Vocative</entry>
-<entry
->trist-is</entry>
-<entry
->trist-is</entry>
-<entry
->trist-e</entry>
-</row>
-<row>
-<entry
->Accusative</entry>
-<entry
->trist-em</entry>
-<entry
->trist-em</entry>
-<entry
->trist-e</entry>
-</row>
-<row>
-<entry
->Genitive</entry>
-<entry
->trist-i</entry>
-<entry
->trist-i</entry>
-<entry
->trist-is</entry>
-</row>
-<row>
-<entry
->Dative</entry>
-<entry
->trist-is</entry>
-<entry
->trist-is</entry>
-<entry
->trist-i</entry>
-</row>
-<row>
-<entry
->Ablative</entry>
-<entry
->trist-i</entry>
-<entry
->trist-i</entry>
-<entry
->trist-i</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>Nominative</entry>
+<entry>trist-is</entry>
+<entry>trist-is</entry>
+<entry>trist-e</entry>
+</row>
+<row>
+<entry>Vocative</entry>
+<entry>trist-is</entry>
+<entry>trist-is</entry>
+<entry>trist-e</entry>
+</row>
+<row>
+<entry>Accusative</entry>
+<entry>trist-em</entry>
+<entry>trist-em</entry>
+<entry>trist-e</entry>
+</row>
+<row>
+<entry>Genitive</entry>
+<entry>trist-i</entry>
+<entry>trist-i</entry>
+<entry>trist-is</entry>
+</row>
+<row>
+<entry>Dative</entry>
+<entry>trist-is</entry>
+<entry>trist-is</entry>
+<entry>trist-i</entry>
+</row>
+<row>
+<entry>Ablative</entry>
+<entry>trist-i</entry>
+<entry>trist-i</entry>
+<entry>trist-i</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate the first entry of each row-->
-<entry
->PLURAL</entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-</row>
-<row>
-<entry
->Nominative</entry>
-<entry
->trist-es</entry>
-<entry
->trist-es</entry>
-<entry
->trist-ia</entry>
-</row>
-<row>
-<entry
->Vocative</entry>
-<entry
->trist-es</entry>
-<entry
->trist-es</entry>
-<entry
->trist-ia</entry>
-</row>
-<row>
-<entry
->Accusative</entry>
-<entry
->trist-es</entry>
-<entry
->trist-es</entry>
-<entry
->trist-ia</entry>
-</row>
-<row>
-<entry
->Genitive</entry>
-<entry
->trist-ium</entry>
-<entry
->trist-ium</entry>
-<entry
->trist-ium</entry>
-</row>
-<row>
-<entry
->Dative</entry>
-<entry
->trist-ibus</entry>
-<entry
->trist-ibus</entry>
-<entry
->trist-ibus</entry>
-</row>
-<row>
-<entry
->Ablative</entry>
-<entry
->trist-ibus</entry>
-<entry
->trist-ibus</entry>
-<entry
->trist-ibus</entry>
+<entry>PLURAL</entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+</row>
+<row>
+<entry>Nominative</entry>
+<entry>trist-es</entry>
+<entry>trist-es</entry>
+<entry>trist-ia</entry>
+</row>
+<row>
+<entry>Vocative</entry>
+<entry>trist-es</entry>
+<entry>trist-es</entry>
+<entry>trist-ia</entry>
+</row>
+<row>
+<entry>Accusative</entry>
+<entry>trist-es</entry>
+<entry>trist-es</entry>
+<entry>trist-ia</entry>
+</row>
+<row>
+<entry>Genitive</entry>
+<entry>trist-ium</entry>
+<entry>trist-ium</entry>
+<entry>trist-ium</entry>
+</row>
+<row>
+<entry>Dative</entry>
+<entry>trist-ibus</entry>
+<entry>trist-ibus</entry>
+<entry>trist-ibus</entry>
+</row>
+<row>
+<entry>Ablative</entry>
+<entry>trist-ibus</entry>
+<entry>trist-ibus</entry>
+<entry>trist-ibus</entry>
 </row>
 </tbody>
 </tgroup>
@@ -358,76 +226,47 @@
 
 <table frame="none">
 <!-- Please translate the title -->
-<title
->Comparison of Adjectives</title>
+<title>Comparison of Adjectives</title>
 <!-- Please translate -->
 <tgroup cols="4" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <row>
-<entry
->Positive</entry>
-<entry
->Comparative</entry>
-<entry
->Superlative</entry>
-<entry
->Notes</entry>
+<entry>Positive</entry>
+<entry>Comparative</entry>
+<entry>Superlative</entry>
+<entry>Notes</entry>
 </row>
 <row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
-<entry
->Normal form of Adjective</entry>
+<entry>Normal form of Adjective</entry>
 <!--Please stop translating -->
-<entry
->Stem + ior,-ius</entry>
-<entry
->Stem + issimus,-a,-um</entry>
-<entry
-></entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
->Stem + rimus,-a,-um</entry>
-<entry
->For adjectives which end with <emphasis
->-er</emphasis
->. For example: acer-rimus,-a,-um</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
->Stem + limus,-a,-um</entry>
-<entry
->For adjectives which end with <emphasis
->-ilis</emphasis
->. For example: facil-limus,-a,-um</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
->Per/Prae + Adjective</entry>
-<entry
-></entry>
+<entry>Stem + ior,-ius</entry>
+<entry>Stem + issimus,-a,-um</entry>
+<entry></entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry>Stem + rimus,-a,-um</entry>
+<entry>For adjectives which end with <emphasis>-er</emphasis>. For example: acer-rimus,-a,-um</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry>Stem + limus,-a,-um</entry>
+<entry>For adjectives which end with <emphasis>-ilis</emphasis>. For example: facil-limus,-a,-um</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry>Per/Prae + Adjective</entry>
+<entry></entry>
 </row>
 </tbody>
 </tgroup>
diff --git a/tde-i18n-en_GB/docs/tdeedu/klatin/index.docbook b/tde-i18n-en_GB/docs/tdeedu/klatin/index.docbook
index ad9a51227d3..92d75940c03 100644
--- a/tde-i18n-en_GB/docs/tdeedu/klatin/index.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/klatin/index.docbook
@@ -1,399 +1,200 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kapp "&klatin;"
-><!-- replace klatin here -->
+  <!ENTITY kapp "&klatin;"><!-- replace klatin here -->
   <!ENTITY kappname "&klatin;">
   <!ENTITY package "tdeedu">
-  <!ENTITY kwordquiz "<application
->KWordQuiz</application
->">
-  <!ENTITY kvtml "<acronym
->KVTML</acronym
->">
-  <!--<!ENTITY klatin-index SYSTEM "klatin-index.docbook"
->-->
+  <!ENTITY kwordquiz "<application>KWordQuiz</application>">
+  <!ENTITY kvtml "<acronym>KVTML</acronym>">
+  <!--<!ENTITY klatin-index SYSTEM "klatin-index.docbook">-->
   <!ENTITY numbers SYSTEM "numbers.docbook">
   <!ENTITY verbs SYSTEM "verbs.docbook">
   <!ENTITY adjectives SYSTEM "adjectives.docbook">
   <!ENTITY nouns SYSTEM "nouns.docbook">
   <!ENTITY pronouns SYSTEM "pronouns.docbook">
   <!ENTITY % addindex "IGNORE">
-  <!ENTITY % British-English "INCLUDE"
-><!-- change language only here -->
+  <!ENTITY % British-English "INCLUDE"><!-- change language only here -->
 ]>
 
 <book lang="&language;">
 
 <bookinfo>
-<title
->The &klatin; Handbook</title>
+<title>The &klatin; Handbook</title>
 
 <authorgroup>
-<author
-><firstname
->George</firstname
-> <surname
->Wright</surname
-> <affiliation
-> <address
-><email
->gwright@users.sourceforge.net</email
-></address>
+<author><firstname>George</firstname> <surname>Wright</surname> <affiliation> <address><email>gwright@users.sourceforge.net</email></address>
 </affiliation>
 </author>
-<othercredit role="developer"
-><firstname
->Anne-Marie</firstname
-> <surname
->Mahfouf</surname
-> <affiliation
-> <address
-><email
->annma@kde.org</email
-></address>
+<othercredit role="developer"><firstname>Anne-Marie</firstname> <surname>Mahfouf</surname> <affiliation> <address><email>annma@kde.org</email></address>
 </affiliation>
-<contrib
->Help in documentation</contrib>
+<contrib>Help in documentation</contrib>
 </othercredit>
 </authorgroup>
 
-<othercredit role="translator"
-><firstname
->Andrew </firstname
-><surname
->Coles</surname
-><affiliation
-><address
-><email
->andrew_coles@yahoo.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Andrew </firstname><surname>Coles</surname><affiliation><address><email>andrew_coles@yahoo.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 
 <copyright>
-<year
->2001-2004</year>
-<holder
->George Wright</holder>
+<year>2001-2004</year>
+<holder>George Wright</holder>
 </copyright>
 
-<legalnotice
->&FDLNotice;</legalnotice>
+<legalnotice>&FDLNotice;</legalnotice>
 
-<date
->2004-08-23</date>
-<releaseinfo
->0.9</releaseinfo>
+<date>2004-08-23</date>
+<releaseinfo>0.9</releaseinfo>
 
 <abstract>
-<para
->&klatin; is a &kde; application to help revise/teach Latin. </para>
+<para>&klatin; is a &kde; application to help revise/teach Latin. </para>
 </abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->tdeedu</keyword>
-<keyword
->KLatin</keyword>
-<keyword
->Latin</keyword>
-<keyword
->education</keyword>
-<keyword
->language</keyword>
-<keyword
->latin</keyword>
+<keyword>KDE</keyword>
+<keyword>tdeedu</keyword>
+<keyword>KLatin</keyword>
+<keyword>Latin</keyword>
+<keyword>education</keyword>
+<keyword>language</keyword>
+<keyword>latin</keyword>
 </keywordset>
 
 </bookinfo>
 
 <chapter id="introduction">
-<title
->Introduction</title>
-
-<para
->&klatin; is a program to help revise Latin. There are three <quote
->sections</quote
-> in which different aspects of the language can be revised. These are the vocabulary, grammar and verb testing sections. In addition there is a set of revision notes that can be used for self-guided revision. </para>
-<para
->In the vocabulary section an &XML; file is loaded containing various words and their local language translations. &klatin; asks you what each of these words translate into. The questions take place in a multiple-choice environment. </para>
-<para
->In the grammar and verb sections &klatin; asks for a particular part of a noun or a verb, such as the <quote
->ablative singular</quote
->, or the <quote
->1st person indicative passive plural</quote
->, and is not multiple choice. </para>
+<title>Introduction</title>
+
+<para>&klatin; is a program to help revise Latin. There are three <quote>sections</quote> in which different aspects of the language can be revised. These are the vocabulary, grammar and verb testing sections. In addition there is a set of revision notes that can be used for self-guided revision. </para>
+<para>In the vocabulary section an &XML; file is loaded containing various words and their local language translations. &klatin; asks you what each of these words translate into. The questions take place in a multiple-choice environment. </para>
+<para>In the grammar and verb sections &klatin; asks for a particular part of a noun or a verb, such as the <quote>ablative singular</quote>, or the <quote>1st person indicative passive plural</quote>, and is not multiple choice. </para>
 </chapter>
 
 <chapter id="using-klatin">
-<title
->Using &klatin;</title>
+<title>Using &klatin;</title>
 
-<para
->When you start &klatin;, you are greeted by four options that you can choose from. </para>
+<para>When you start &klatin;, you are greeted by four options that you can choose from. </para>
 
 <screenshot>
-<screeninfo
->&klatin; main screen, directly after the first start</screeninfo>
+<screeninfo>&klatin; main screen, directly after the first start</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="klatin1.png" format="PNG"/>
 </imageobject>
 <textobject>
-<phrase
->&klatin; main screen</phrase>
+<phrase>&klatin; main screen</phrase>
 </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->The first one, <guilabel
->Vocabulary</guilabel
->, is a multiple-choice vocabulary tester. </para>
+<para>The first one, <guilabel>Vocabulary</guilabel>, is a multiple-choice vocabulary tester. </para>
 
 <screenshot>
-<screeninfo
->&klatin; vocabulary section</screeninfo>
+<screeninfo>&klatin; vocabulary section</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="klatin2.png" format="PNG"/>
 </imageobject>
 <textobject>
-<phrase
->&klatin; vocabulary</phrase>
+<phrase>&klatin; vocabulary</phrase>
 </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->After you finish your test, a results screen is displayed. </para>
+<para>After you finish your test, a results screen is displayed. </para>
 
 <screenshot>
-<screeninfo
->&klatin; vocabulary results</screeninfo>
+<screeninfo>&klatin; vocabulary results</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="results.png" format="PNG"/>
 </imageobject>
 <textobject>
-<phrase
->&klatin; results</phrase>
+<phrase>&klatin; results</phrase>
 </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->The second, <guilabel
->Grammar</guilabel
-> tests you on grammatical parts of nouns. </para>
+<para>The second, <guilabel>Grammar</guilabel> tests you on grammatical parts of nouns. </para>
  
 <screenshot>
-<screeninfo
->&klatin; grammar section</screeninfo>
+<screeninfo>&klatin; grammar section</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="klatin3.png" format="PNG"/>
 </imageobject>
 <textobject>
-<phrase
->&klatin; grammar</phrase>
+<phrase>&klatin; grammar</phrase>
 </textobject>
 </mediaobject>
 </screenshot>
 
-<para
-><guilabel
->Verbs</guilabel
-> is almost the same as the <guilabel
->Grammar</guilabel
-> section, except that it tests you on verb forms. </para>
+<para><guilabel>Verbs</guilabel> is almost the same as the <guilabel>Grammar</guilabel> section, except that it tests you on verb forms. </para>
 
 <screenshot>
-<screeninfo
->&klatin; verbs section</screeninfo>
+<screeninfo>&klatin; verbs section</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="klatin4.png" format="PNG"/>
 </imageobject>
 <textobject>
-<phrase
->&klatin; verbs</phrase>
+<phrase>&klatin; verbs</phrase>
 </textobject>
 </mediaobject>
-</screenshot
-> 
+</screenshot> 
  
-<para
->The fourth section, <guilabel
->Revision</guilabel
->, loads &konqueror; into the &klatin; revision notes section. </para>
-
-<para
->In addition to the options, you can also launch these sections via the menubar, in the <guimenu
->Section</guimenu
->. </para>
-
-<para
->The configuration dialog for &klatin; can be accessed by choosing <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure &klatin;...</guimenuitem
-></menuchoice
-> from the menu. In the <guilabel
->Vocabulary</guilabel
-> page, you can set whether you want the test to take place from your language into Latin, or vice versa. You can also choose the default file which you want to use to test your vocabulary on, and you can also set how many questions you want to be tested on. </para>
+<para>The fourth section, <guilabel>Revision</guilabel>, loads &konqueror; into the &klatin; revision notes section. </para>
+
+<para>In addition to the options, you can also launch these sections via the menubar, in the <guimenu>Section</guimenu>. </para>
+
+<para>The configuration dialog for &klatin; can be accessed by choosing <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &klatin;...</guimenuitem></menuchoice> from the menu. In the <guilabel>Vocabulary</guilabel> page, you can set whether you want the test to take place from your language into Latin, or vice versa. You can also choose the default file which you want to use to test your vocabulary on, and you can also set how many questions you want to be tested on. </para>
 
 </chapter>
 
 <chapter id="klatin-mainwindow">
-<title
->The &klatin; main window</title>
-<para
->The &klatin; main window consists of four option buttons to choose which section to enter, and a menubar.</para>
-<para
->Choose from the <guilabel
->Revision Sections</guilabel
-> list a section and click <guibutton
->Start!</guibutton
-> to start the chosen section.</para>
+<title>The &klatin; main window</title>
+<para>The &klatin; main window consists of four option buttons to choose which section to enter, and a menubar.</para>
+<para>Choose from the <guilabel>Revision Sections</guilabel> list a section and click <guibutton>Start!</guibutton> to start the chosen section.</para>
  
-<para
->When you are finished with that section, click <guibutton
->Back</guibutton
-> to return to &klatin;'s main menu.</para>
+<para>When you are finished with that section, click <guibutton>Back</guibutton> to return to &klatin;'s main menu.</para>
 
 </chapter>
 
 <chapter id="commands">
-<title
->Command Reference</title>
+<title>Command Reference</title>
 <sect1 id="menu-file">
-<title
->The <guimenu
->File</guimenu
-> Menu</title>
+<title>The <guimenu>File</guimenu> Menu</title>
 
 <variablelist>
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->Q</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Quit</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
->Quits</action
-> &klatin;</para
-></listitem>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Quit</guimenuitem> </menuchoice></term>
+<listitem><para><action>Quits</action> &klatin;</para></listitem>
 </varlistentry>
 </variablelist>
 </sect1>
 
 <sect1 id="menu-section">
-<title
->The <guimenu
->Section</guimenu
-> Menu</title>
+<title>The <guimenu>Section</guimenu> Menu</title>
 <variablelist>
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Section</guimenu
-> <guimenuitem
->Load Vocabulary File</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
->Loads</action
-> a new vocabulary file. This menu is only enabled if you are in the Vocabulary section</para
-></listitem>
+<term><menuchoice><guimenu>Section</guimenu> <guimenuitem>Load Vocabulary File</guimenuitem> </menuchoice></term>
+<listitem><para><action>Loads</action> a new vocabulary file. This menu is only enabled if you are in the Vocabulary section</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Section</guimenu
-> <guimenuitem
->Load Vocabulary</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
->Loads</action
-> the vocabulary section</para
-></listitem>
+<term><menuchoice><guimenu>Section</guimenu> <guimenuitem>Load Vocabulary</guimenuitem> </menuchoice></term>
+<listitem><para><action>Loads</action> the vocabulary section</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Section</guimenu
-> <guimenuitem
->Load Grammar</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
->Loads</action
-> the grammar section</para
-></listitem>
+<term><menuchoice><guimenu>Section</guimenu> <guimenuitem>Load Grammar</guimenuitem> </menuchoice></term>
+<listitem><para><action>Loads</action> the grammar section</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Section</guimenu
-> <guimenuitem
->Load Verbs</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
->Loads</action
-> the verbs section</para
-></listitem>
+<term><menuchoice><guimenu>Section</guimenu> <guimenuitem>Load Verbs</guimenuitem> </menuchoice></term>
+<listitem><para><action>Loads</action> the verbs section</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Section</guimenu
-> <guimenuitem
->Load Revision</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
->Loads</action
-> the revision section</para
-></listitem>
+<term><menuchoice><guimenu>Section</guimenu> <guimenuitem>Load Revision</guimenuitem> </menuchoice></term>
+<listitem><para><action>Loads</action> the revision section</para></listitem>
 </varlistentry>
 
 
@@ -401,44 +202,18 @@
 
 </sect1>
 <sect1 id="menu-settings">
-<title
->The <guimenu
->Settings</guimenu
-> Menu</title>
+<title>The <guimenu>Settings</guimenu> Menu</title>
 
 <variablelist>
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Shortcuts...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
->Configure</action
-> the keyboard keys you use to access the different actions.</para>
+<term><menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Shortcuts...</guimenuitem> </menuchoice></term>
+<listitem><para><action>Configure</action> the keyboard keys you use to access the different actions.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure &klatin;...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
->Display</action
-> the &klatin; settings dialogue </para
-></listitem>
+<term><menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure &klatin;...</guimenuitem> </menuchoice></term>
+<listitem><para><action>Display</action> the &klatin; settings dialogue </para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -446,210 +221,104 @@
 </sect1>
 
 <sect1 id="menu-help">
-<title
->The <guimenu
->Help</guimenu
-> Menu</title>
+<title>The <guimenu>Help</guimenu> Menu</title>
 &help.menu.documentation; </sect1>
 </chapter>
 
 <chapter id="translation">
-<title
->Translation Guide to &klatin;</title>
+<title>Translation Guide to &klatin;</title>
 
-<para
->Only the vocabulary files have to be translated in your language. The vocabulary files use the &kvtml; format, which is the same as other programs such as &kwordquiz; use. &kwordquiz; is very useful as you can create the vocabulary files in that and load them directly into &klatin;. </para>
-<para
->Below is explained how you can translate &klatin; vocabulary files. At the moment, the files are only in English. </para>
+<para>Only the vocabulary files have to be translated in your language. The vocabulary files use the &kvtml; format, which is the same as other programs such as &kwordquiz; use. &kwordquiz; is very useful as you can create the vocabulary files in that and load them directly into &klatin;. </para>
+<para>Below is explained how you can translate &klatin; vocabulary files. At the moment, the files are only in English. </para>
 <sect1 id="translate_vocab">
-<title
->How To Translate &klatin; vocabulary files</title>
+<title>How To Translate &klatin; vocabulary files</title>
 <procedure>
 <step>
-<para
->Get the latest &klatin; code from CVS or a latest release. The words are stored in <filename class="directory"
->source_dir_of_tdeedu/klatin/klatin/data/vocab/en/</filename
-> in files like <filename
->A.kvtml</filename
-> for Latin words beginning with A, <filename
->BC.kvtml</filename
-> for Latin words beginning with B and C and so on. </para>
+<para>Get the latest &klatin; code from CVS or a latest release. The words are stored in <filename class="directory">source_dir_of_tdeedu/klatin/klatin/data/vocab/en/</filename> in files like <filename>A.kvtml</filename> for Latin words beginning with A, <filename>BC.kvtml</filename> for Latin words beginning with B and C and so on. </para>
 </step>
 
 <step>
-<para
->Create a new subdirectory in <filename class="directory"
->data/vocab/</filename
-> named as your language code (for example, <filename class="directory"
->fr</filename
-> for French, <filename class="directory"
->ja</filename
-> for Japanese). Copy all the English vocabulary files there as well as the <filename
->Makefile.am</filename
->. Edit the <filename
->Makefile.am</filename
-> and replace <quote
->en</quote
-> with your language code. </para>
+<para>Create a new subdirectory in <filename class="directory">data/vocab/</filename> named as your language code (for example, <filename class="directory">fr</filename> for French, <filename class="directory">ja</filename> for Japanese). Copy all the English vocabulary files there as well as the <filename>Makefile.am</filename>. Edit the <filename>Makefile.am</filename> and replace <quote>en</quote> with your language code. </para>
 </step>
 
 <step>
-<para
->In <filename class="directory"
->data/vocab/<replaceable
->your_language_code</replaceable
-></filename
->, edit all the files and translate the English words, &ie; those that are between the <sgmltag class="starttag"
->t</sgmltag
-> and <sgmltag class="endtag"
->t</sgmltag
-> tags. </para>
+<para>In <filename class="directory">data/vocab/<replaceable>your_language_code</replaceable></filename>, edit all the files and translate the English words, &ie; those that are between the <sgmltag class="starttag">t</sgmltag> and <sgmltag class="endtag">t</sgmltag> tags. </para>
 </step>
 <step>
-<para
->Commit your files to CVS HEAD or tar them and send them to George <email
->gwright@users.sourceforge.net</email
-> or to Anne-Marie <email
->annma@kde.org</email
->. </para>
+<para>Commit your files to CVS HEAD or tar them and send them to George <email>gwright@users.sourceforge.net</email> or to Anne-Marie <email>annma@kde.org</email>. </para>
 </step>
 </procedure>
 </sect1>
 </chapter>
 
 <chapter id="developers">
-<title
->Developer's Guide to &klatin;</title>
+<title>Developer's Guide to &klatin;</title>
 <sect1 id="add_files">
-<title
->Create new vocabulary files</title>
-<para
->The &klatin; vocabulary database system is very easy to extend. Just look at the files and you'll understand! It uses the &kvtml; format, which is the same as other programs such as &kwordquiz; use. So you can open &kwordquiz; and use it to create the vocabulary files. </para>
-<para
->You can save your new files in the corresponding folder depending on what language they refer to in <filename class="directory"
->.kde/share/apps/klatin/data/vocab/<replaceable
->language_code</replaceable
->/</filename
->. For example, English &kvtml; files are kept in a directory called <filename class="directory"
->en</filename
->, German files in <filename class="directory"
->de</filename
->, and so on. You can also send me your files so I can add them in the next &klatin; release. </para>
+<title>Create new vocabulary files</title>
+<para>The &klatin; vocabulary database system is very easy to extend. Just look at the files and you'll understand! It uses the &kvtml; format, which is the same as other programs such as &kwordquiz; use. So you can open &kwordquiz; and use it to create the vocabulary files. </para>
+<para>You can save your new files in the corresponding folder depending on what language they refer to in <filename class="directory">.kde/share/apps/klatin/data/vocab/<replaceable>language_code</replaceable>/</filename>. For example, English &kvtml; files are kept in a directory called <filename class="directory">en</filename>, German files in <filename class="directory">de</filename>, and so on. You can also send me your files so I can add them in the next &klatin; release. </para>
 </sect1>
 <!-- FIXME: They will still need specifically outlining -->
 </chapter>
 
 <chapter id="credits">
 
-<title
->Credits and Licence</title>
-
-<para
->&klatin; </para>
-<para
->Program copyright 2001-2004 George Wright <email
->gwright@users.sourceforge.net</email
-> </para>
-<para
->Contributors: <itemizedlist>
-
-<listitem
-><para
->Neil Stevens <email
->neil@qualityassistant.org</email
-></para>
+<title>Credits and Licence</title>
+
+<para>&klatin; </para>
+<para>Program copyright 2001-2004 George Wright <email>gwright@users.sourceforge.net</email> </para>
+<para>Contributors: <itemizedlist>
+
+<listitem><para>Neil Stevens <email>neil@qualityassistant.org</email></para>
 </listitem>
-<listitem
-><para
->Anne-Marie Mahfouf <email
->annma@kde.org</email
-></para>
+<listitem><para>Anne-Marie Mahfouf <email>annma@kde.org</email></para>
 </listitem>
-<listitem
-><para
->Mark Westcott <email
->mark@houseoffish.org</email
-></para>
+<listitem><para>Mark Westcott <email>mark@houseoffish.org</email></para>
 </listitem>
 
 </itemizedlist>
 </para>
 
-<para
->Documentation copyright 2001-2004 George Wright <email
->gwright@users.sourceforge.net</email
-> </para>
+<para>Documentation copyright 2001-2004 George Wright <email>gwright@users.sourceforge.net</email> </para>
 
-<para
->Andrew Coles<email
->andrew_coles@yahoo.co.uk</email
-></para
-> 
+<para>Andrew Coles<email>andrew_coles@yahoo.co.uk</email></para> 
 &underFDL; &underGPL; </chapter>
 
 <chapter id="klatin-index">
-<title
->&klatin; notes</title>
+<title>&klatin; notes</title>
 
-<para
->Welcome to the &klatin; notes section. This is aimed to help you in your revision and covers the English <acronym
->GCSE</acronym
-> syllabus (England). </para>
+<para>Welcome to the &klatin; notes section. This is aimed to help you in your revision and covers the English <acronym>GCSE</acronym> syllabus (England). </para>
 
-<para
->Here are the different sections you can get help for: </para>
+<para>Here are the different sections you can get help for: </para>
 
 <itemizedlist>
-<listitem
-><para
-><link
-linkend="numbers"
->Latin numbers</link>
-</para
-></listitem>
-<listitem
-><para
-><link
-linkend="verbs"
->Latin verbs</link>
-</para
-></listitem>
-<listitem
-><para
-><link
-linkend="nouns"
->Latin nouns</link>
-</para
-></listitem>
-<listitem
-><para
-><link
-linkend="adjectives"
->Latin adjectives</link>
-</para
-></listitem>
-<listitem
-><para
-><link
-linkend="pronouns"
->Latin pronouns</link>
-</para
-></listitem>
+<listitem><para><link
+linkend="numbers">Latin numbers</link>
+</para></listitem>
+<listitem><para><link
+linkend="verbs">Latin verbs</link>
+</para></listitem>
+<listitem><para><link
+linkend="nouns">Latin nouns</link>
+</para></listitem>
+<listitem><para><link
+linkend="adjectives">Latin adjectives</link>
+</para></listitem>
+<listitem><para><link
+linkend="pronouns">Latin pronouns</link>
+</para></listitem>
 </itemizedlist>
 &numbers; &verbs; &nouns; &adjectives; &pronouns; </chapter>
 
 <appendix id="installation">
-<title
->Installation</title>
+<title>Installation</title>
 
 <sect1 id="getting-klatin">
-<title
->How to obtain &klatin;</title>
+<title>How to obtain &klatin;</title>
 &install.intro.documentation; </sect1>
 
 <sect1 id="compilation">
-<title
->Compilation and Installation</title>
+<title>Compilation and Installation</title>
 &install.compile.documentation; </sect1>
 
 </appendix>
diff --git a/tde-i18n-en_GB/docs/tdeedu/klatin/nouns.docbook b/tde-i18n-en_GB/docs/tdeedu/klatin/nouns.docbook
index 8a180766639..84c338570c0 100644
--- a/tde-i18n-en_GB/docs/tdeedu/klatin/nouns.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/klatin/nouns.docbook
@@ -1,363 +1,198 @@
 <!-- Please don't translate Latin words -->
 <!-- Please translate -->
 <sect1 id="nouns">
-<title
->KLatin Notes - Nouns </title>
+<title>KLatin Notes - Nouns </title>
 
-<para
->Nouns, like verbs, are divided into groups, called <emphasis
->declensions</emphasis
->. There are five declensions and three genders: masculine, feminine and neuter. </para>
-<para
->The stem of a noun is the basic part of the noun that does not change. To get the stem of a noun, take the genitive singular of the noun and take off its ending. For example: the stem of <emphasis
->puella</emphasis
-> is <emphasis
->puell</emphasis
->; while the stem of <emphasis
->rex</emphasis
-> is <emphasis
->reg</emphasis
->, because its genitive is <emphasis
->reg-is</emphasis
->. </para>
+<para>Nouns, like verbs, are divided into groups, called <emphasis>declensions</emphasis>. There are five declensions and three genders: masculine, feminine and neuter. </para>
+<para>The stem of a noun is the basic part of the noun that does not change. To get the stem of a noun, take the genitive singular of the noun and take off its ending. For example: the stem of <emphasis>puella</emphasis> is <emphasis>puell</emphasis>; while the stem of <emphasis>rex</emphasis> is <emphasis>reg</emphasis>, because its genitive is <emphasis>reg-is</emphasis>. </para>
 
 <sect2 id="listing">
-<title
->Latin Nouns</title>
+<title>Latin Nouns</title>
 
 <table frame="none">
-<title
->Noun listings</title>
+<title>Noun listings</title>
 <tgroup cols="9" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <row>
 <!-- Please translate -->
-<entry
->SINGULAR</entry>
-<entry
->1st Feminine</entry>
-<entry
->2nd Masculine</entry>
-<entry
->2nd Neuter</entry>
-<entry
->3rd Masc/Fem</entry>
-<entry
->3rd Neuter</entry>
-<entry
->4th Masculine</entry>
-<entry
->4th Neuter</entry>
-<entry
->5th Feminine</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>SINGULAR</entry>
+<entry>1st Feminine</entry>
+<entry>2nd Masculine</entry>
+<entry>2nd Neuter</entry>
+<entry>3rd Masc/Fem</entry>
+<entry>3rd Neuter</entry>
+<entry>4th Masculine</entry>
+<entry>4th Neuter</entry>
+<entry>5th Feminine</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!--From now on please just translate first entry of each row-->
-<entry
->Nominative</entry>
-<entry
->puell-a</entry>
-<entry
->serv-us</entry>
-<entry
->bell-um</entry>
-<entry
-><emphasis
->rex</emphasis
-></entry>
-<entry
->opus</entry>
-<entry
->grad-us</entry>
-<entry
->genu</entry>
-<entry
->res</entry>
-</row>
-<row>
-<entry
->Vocative</entry>
-<entry
->puell-a</entry>
-<entry
->serv-e</entry>
-<entry
->bell-um</entry>
-<entry
-><emphasis
->rex</emphasis
-></entry>
-<entry
->opus</entry>
-<entry
->grad-us</entry>
-<entry
->genu</entry>
-<entry
->res</entry>
-</row>
-<row>
-<entry
->Accusative</entry>
-<entry
->puell-am</entry>
-<entry
->serv-um</entry>
-<entry
->bell-um</entry>
-<entry
->reg-em</entry>
-<entry
->opus</entry>
-<entry
->grad-um</entry>
-<entry
->genu</entry>
-<entry
->re-m</entry>
-</row>
-<row>
-<entry
->Genitive</entry>
-<entry
->puell-ae</entry>
-<entry
->serv-i</entry>
-<entry
->bell-i</entry>
-<entry
->reg-is</entry>
-<entry
->oper-is</entry>
-<entry
->grad-us</entry>
-<entry
->gen-u</entry>
-<entry
->re-i</entry>
-</row>
-<row>
-<entry
->Dative</entry>
-<entry
->puell-ae</entry>
-<entry
->serv-o</entry>
-<entry
->bell-o</entry>
-<entry
->reg-i</entry>
-<entry
->oper-i</entry>
-<entry
->grad-ui</entry>
-<entry
->gen-u</entry>
-<entry
->re-i</entry>
-</row>
-<row>
-<entry
->Ablative</entry>
-<entry
->puell-a</entry>
-<entry
->serv-o</entry>
-<entry
->bell-o</entry>
-<entry
->reg-e</entry>
-<entry
->oper-e</entry>
-<entry
->grad-u</entry>
-<entry
->gen-u</entry>
-<entry
->re</entry>
+<entry>Nominative</entry>
+<entry>puell-a</entry>
+<entry>serv-us</entry>
+<entry>bell-um</entry>
+<entry><emphasis>rex</emphasis></entry>
+<entry>opus</entry>
+<entry>grad-us</entry>
+<entry>genu</entry>
+<entry>res</entry>
+</row>
+<row>
+<entry>Vocative</entry>
+<entry>puell-a</entry>
+<entry>serv-e</entry>
+<entry>bell-um</entry>
+<entry><emphasis>rex</emphasis></entry>
+<entry>opus</entry>
+<entry>grad-us</entry>
+<entry>genu</entry>
+<entry>res</entry>
+</row>
+<row>
+<entry>Accusative</entry>
+<entry>puell-am</entry>
+<entry>serv-um</entry>
+<entry>bell-um</entry>
+<entry>reg-em</entry>
+<entry>opus</entry>
+<entry>grad-um</entry>
+<entry>genu</entry>
+<entry>re-m</entry>
+</row>
+<row>
+<entry>Genitive</entry>
+<entry>puell-ae</entry>
+<entry>serv-i</entry>
+<entry>bell-i</entry>
+<entry>reg-is</entry>
+<entry>oper-is</entry>
+<entry>grad-us</entry>
+<entry>gen-u</entry>
+<entry>re-i</entry>
+</row>
+<row>
+<entry>Dative</entry>
+<entry>puell-ae</entry>
+<entry>serv-o</entry>
+<entry>bell-o</entry>
+<entry>reg-i</entry>
+<entry>oper-i</entry>
+<entry>grad-ui</entry>
+<entry>gen-u</entry>
+<entry>re-i</entry>
+</row>
+<row>
+<entry>Ablative</entry>
+<entry>puell-a</entry>
+<entry>serv-o</entry>
+<entry>bell-o</entry>
+<entry>reg-e</entry>
+<entry>oper-e</entry>
+<entry>grad-u</entry>
+<entry>gen-u</entry>
+<entry>re</entry>
 </row>
 
 <row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row -->
-<entry
->PLURAL</entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-</row>
-<row>
-<entry
->Nominative</entry>
-<entry
->puell-ae</entry>
-<entry
->serv-i</entry>
-<entry
->bell-a</entry>
-<entry
->reg-es</entry>
-<entry
->oper-a</entry>
-<entry
->grad-us</entry>
-<entry
->gen-ua</entry>
-<entry
->res</entry>
-</row>
-<row>
-<entry
->Vocative</entry>
-<entry
->puell-ae</entry>
-<entry
->serv-i</entry>
-<entry
->bell-a</entry>
-<entry
->reg-es</entry>
-<entry
->oper-a</entry>
-<entry
->grad-us</entry>
-<entry
->gen-ua</entry>
-<entry
->res</entry>
-</row>
-<row>
-<entry
->Accusative</entry>
-<entry
->puell-as</entry>
-<entry
->serv-os</entry>
-<entry
->bell-a</entry>
-<entry
->reg-es</entry>
-<entry
->oper-a</entry>
-<entry
->grad-us</entry>
-<entry
->gen-ua</entry>
-<entry
->res</entry>
-</row>
-<row>
-<entry
->Genitive</entry>
-<entry
->puell-arum</entry>
-<entry
->serv-orum</entry>
-<entry
->bell-orum</entry>
-<entry
->reg-um</entry>
-<entry
->oper-um</entry>
-<entry
->grad-uum</entry>
-<entry
->gen-uum</entry>
-<entry
->re-rum</entry>
-</row>
-<row>
-<entry
->Dative</entry>
-<entry
->puell-is</entry>
-<entry
->serv-is</entry>
-<entry
->bell-is</entry>
-<entry
->reg-ibus</entry>
-<entry
->oper-ibus</entry>
-<entry
->grad-ibus</entry>
-<entry
->gen-ibus</entry>
-<entry
->re-bus</entry>
-</row>
-<row>
-<entry
->Ablative</entry>
-<entry
->puell-is</entry>
-<entry
->serv-is</entry>
-<entry
->bell-is</entry>
-<entry
->reg-ibus</entry>
-<entry
->oper-ibus</entry>
-<entry
->grad-ibus</entry>
-<entry
->gen-ibus</entry>
-<entry
->re-bus</entry>
+<entry>PLURAL</entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+</row>
+<row>
+<entry>Nominative</entry>
+<entry>puell-ae</entry>
+<entry>serv-i</entry>
+<entry>bell-a</entry>
+<entry>reg-es</entry>
+<entry>oper-a</entry>
+<entry>grad-us</entry>
+<entry>gen-ua</entry>
+<entry>res</entry>
+</row>
+<row>
+<entry>Vocative</entry>
+<entry>puell-ae</entry>
+<entry>serv-i</entry>
+<entry>bell-a</entry>
+<entry>reg-es</entry>
+<entry>oper-a</entry>
+<entry>grad-us</entry>
+<entry>gen-ua</entry>
+<entry>res</entry>
+</row>
+<row>
+<entry>Accusative</entry>
+<entry>puell-as</entry>
+<entry>serv-os</entry>
+<entry>bell-a</entry>
+<entry>reg-es</entry>
+<entry>oper-a</entry>
+<entry>grad-us</entry>
+<entry>gen-ua</entry>
+<entry>res</entry>
+</row>
+<row>
+<entry>Genitive</entry>
+<entry>puell-arum</entry>
+<entry>serv-orum</entry>
+<entry>bell-orum</entry>
+<entry>reg-um</entry>
+<entry>oper-um</entry>
+<entry>grad-uum</entry>
+<entry>gen-uum</entry>
+<entry>re-rum</entry>
+</row>
+<row>
+<entry>Dative</entry>
+<entry>puell-is</entry>
+<entry>serv-is</entry>
+<entry>bell-is</entry>
+<entry>reg-ibus</entry>
+<entry>oper-ibus</entry>
+<entry>grad-ibus</entry>
+<entry>gen-ibus</entry>
+<entry>re-bus</entry>
+</row>
+<row>
+<entry>Ablative</entry>
+<entry>puell-is</entry>
+<entry>serv-is</entry>
+<entry>bell-is</entry>
+<entry>reg-ibus</entry>
+<entry>oper-ibus</entry>
+<entry>grad-ibus</entry>
+<entry>gen-ibus</entry>
+<entry>re-bus</entry>
 </row>
 </tbody>
 </tgroup>
diff --git a/tde-i18n-en_GB/docs/tdeedu/klatin/numbers.docbook b/tde-i18n-en_GB/docs/tdeedu/klatin/numbers.docbook
index 2fef0ebc4d4..ded3f6e5254 100644
--- a/tde-i18n-en_GB/docs/tdeedu/klatin/numbers.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/klatin/numbers.docbook
@@ -1,337 +1,214 @@
 <!-- Please don't translate Latin words -->
 <!-- Please translate -->
 <sect1 id="numbers">
-<title
->KLatin Notes - Numbers </title>
+<title>KLatin Notes - Numbers </title>
 
-<para
->The Romans had a particular set of numerals and had names for each of their numbers. In this section are listed some numbers and their corresponding symbol. </para>
+<para>The Romans had a particular set of numerals and had names for each of their numbers. In this section are listed some numbers and their corresponding symbol. </para>
 <table frame="none">
-<title
->Numbers</title>
+<title>Numbers</title>
 <!-- translators: don't translate the following -->
 <tgroup cols="3" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <row>
-<entry
->1</entry>
-<entry
->I</entry>
-<entry
->unus</entry>
+<entry>1</entry>
+<entry>I</entry>
+<entry>unus</entry>
 </row>
 <row>
-<entry
->2</entry>
-<entry
->II</entry>
-<entry
->duo</entry>
+<entry>2</entry>
+<entry>II</entry>
+<entry>duo</entry>
 </row>
 <row>
-<entry
->3</entry>
-<entry
->III</entry>
-<entry
->tres</entry>
+<entry>3</entry>
+<entry>III</entry>
+<entry>tres</entry>
 </row>
 <row>
-<entry
->4</entry>
-<entry
->IV</entry>
-<entry
->quattuor</entry>
+<entry>4</entry>
+<entry>IV</entry>
+<entry>quattuor</entry>
 </row>
 <row>
-<entry
->5</entry>
-<entry
->V</entry>
-<entry
->quinque</entry>
+<entry>5</entry>
+<entry>V</entry>
+<entry>quinque</entry>
 </row>
 <row>
-<entry
->6</entry>
-<entry
->VI</entry>
-<entry
->sex</entry>
+<entry>6</entry>
+<entry>VI</entry>
+<entry>sex</entry>
 </row>
 <row>
-<entry
->7</entry>
-<entry
->VII</entry>
-<entry
->septem</entry>
+<entry>7</entry>
+<entry>VII</entry>
+<entry>septem</entry>
 </row>
 <row>
-<entry
->8</entry>
-<entry
->VIII</entry>
-<entry
->octo</entry>
+<entry>8</entry>
+<entry>VIII</entry>
+<entry>octo</entry>
 </row>
 <row>
-<entry
->9</entry>
-<entry
->IX</entry>
-<entry
->novem</entry>
+<entry>9</entry>
+<entry>IX</entry>
+<entry>novem</entry>
 </row>
 <row>
-<entry
->10</entry>
-<entry
->X</entry>
-<entry
->decem</entry>
+<entry>10</entry>
+<entry>X</entry>
+<entry>decem</entry>
 </row>
 <row>
-<entry
->11</entry>
-<entry
->XI</entry>
-<entry
->undecim</entry>
+<entry>11</entry>
+<entry>XI</entry>
+<entry>undecim</entry>
 </row>
 <row>
-<entry
->12</entry>
-<entry
->XII</entry>
-<entry
->duodecim</entry>
+<entry>12</entry>
+<entry>XII</entry>
+<entry>duodecim</entry>
 </row>
 <row>
-<entry
->13</entry>
-<entry
->XIII</entry>
-<entry
->tredecim</entry>
+<entry>13</entry>
+<entry>XIII</entry>
+<entry>tredecim</entry>
 </row>
 <row>
-<entry
->14</entry>
-<entry
->XIV</entry>
-<entry
->quattuordecim</entry>
+<entry>14</entry>
+<entry>XIV</entry>
+<entry>quattuordecim</entry>
 </row>
 <row>
-<entry
->15</entry>
-<entry
->XV</entry>
-<entry
->quindecim</entry>
+<entry>15</entry>
+<entry>XV</entry>
+<entry>quindecim</entry>
 </row>
 <row>
-<entry
->16</entry>
-<entry
->XVI</entry>
-<entry
->sedecim</entry>
+<entry>16</entry>
+<entry>XVI</entry>
+<entry>sedecim</entry>
 </row>
 <row>
-<entry
->17</entry>
-<entry
->XVII</entry>
-<entry
->septendecim</entry>
+<entry>17</entry>
+<entry>XVII</entry>
+<entry>septendecim</entry>
 </row>
 <row>
-<entry
->18</entry>
-<entry
->XVIII</entry>
-<entry
->duodeviginti</entry>
+<entry>18</entry>
+<entry>XVIII</entry>
+<entry>duodeviginti</entry>
 </row>
 <row>
-<entry
->19</entry>
-<entry
->XIX</entry>
-<entry
->undeviginti</entry>
+<entry>19</entry>
+<entry>XIX</entry>
+<entry>undeviginti</entry>
 </row>
 <row>
-<entry
->20</entry>
-<entry
->XX</entry>
-<entry
->viginti</entry>
+<entry>20</entry>
+<entry>XX</entry>
+<entry>viginti</entry>
 </row>
 <row>
-<entry
->21</entry>
-<entry
->XXI</entry>
-<entry
->vigintiunus</entry>
+<entry>21</entry>
+<entry>XXI</entry>
+<entry>vigintiunus</entry>
 </row>
 <row>
-<entry
->22</entry>
-<entry
->XXII</entry>
-<entry
->vigintiduo</entry>
+<entry>22</entry>
+<entry>XXII</entry>
+<entry>vigintiduo</entry>
 </row>
 <row>
-<entry
->30</entry>
-<entry
->XXX</entry>
-<entry
->triginta</entry>
+<entry>30</entry>
+<entry>XXX</entry>
+<entry>triginta</entry>
 </row>
 <row>
-<entry
->40</entry>
-<entry
->XL</entry>
-<entry
->quadraginta</entry>
+<entry>40</entry>
+<entry>XL</entry>
+<entry>quadraginta</entry>
 </row>
 <row>
-<entry
->50</entry>
-<entry
->L</entry>
-<entry
->quinquaginta</entry>
+<entry>50</entry>
+<entry>L</entry>
+<entry>quinquaginta</entry>
 </row>
 <row>
-<entry
->60</entry>
-<entry
->LX</entry>
-<entry
->sexaginta</entry>
+<entry>60</entry>
+<entry>LX</entry>
+<entry>sexaginta</entry>
 </row>
 <row>
-<entry
->70</entry>
-<entry
->LXX</entry>
-<entry
->septuaginta</entry>
+<entry>70</entry>
+<entry>LXX</entry>
+<entry>septuaginta</entry>
 </row>
 <row>
-<entry
->80</entry>
-<entry
->LXXX</entry>
-<entry
->octoginta</entry>
-</row>
+<entry>80</entry>
+<entry>LXXX</entry>
+<entry>octoginta</entry>
+</row>
 <row>
-<entry
->90</entry>
-<entry
->XC</entry>
-<entry
->nonaginta</entry>
-</row>
+<entry>90</entry>
+<entry>XC</entry>
+<entry>nonaginta</entry>
+</row>
 <row>
-<entry
->100</entry>
-<entry
->C</entry>
-<entry
->centum</entry>
-</row>
+<entry>100</entry>
+<entry>C</entry>
+<entry>centum</entry>
+</row>
 <row>
-<entry
->200</entry>
-<entry
->CC</entry>
-<entry
->ducenti</entry>
-</row>
+<entry>200</entry>
+<entry>CC</entry>
+<entry>ducenti</entry>
+</row>
 <row>
-<entry
->300</entry>
-<entry
->CCC</entry>
-<entry
->trecenti</entry>
-</row>
+<entry>300</entry>
+<entry>CCC</entry>
+<entry>trecenti</entry>
+</row>
 <row>
-<entry
->400</entry>
-<entry
->CD</entry>
-<entry
->quadrigenti</entry>
-</row>
+<entry>400</entry>
+<entry>CD</entry>
+<entry>quadrigenti</entry>
+</row>
 <row>
-<entry
->500</entry>
-<entry
->D</entry>
-<entry
->quingenti</entry>
-</row>
+<entry>500</entry>
+<entry>D</entry>
+<entry>quingenti</entry>
+</row>
 <row>
-<entry
->600</entry>
-<entry
->DC</entry>
-<entry
->sescenti</entry>
-</row>
+<entry>600</entry>
+<entry>DC</entry>
+<entry>sescenti</entry>
+</row>
 <row>
-<entry
->700</entry>
-<entry
->DCC</entry>
-<entry
->septigenti</entry>
-</row>
+<entry>700</entry>
+<entry>DCC</entry>
+<entry>septigenti</entry>
+</row>
 <row>
-<entry
->800</entry>
-<entry
->DCCC</entry>
-<entry
->octigenti</entry>
-</row>
+<entry>800</entry>
+<entry>DCCC</entry>
+<entry>octigenti</entry>
+</row>
 <row>
-<entry
->900</entry>
-<entry
->CM</entry>
-<entry
->nongenti</entry>
-</row>
+<entry>900</entry>
+<entry>CM</entry>
+<entry>nongenti</entry>
+</row>
 <row>
-<entry
->1000</entry>
-<entry
->M</entry>
-<entry
->mille</entry>
-</row>
+<entry>1000</entry>
+<entry>M</entry>
+<entry>mille</entry>
+</row>
 <row>
-<entry
->2000</entry>
-<entry
->MM</entry>
-<entry
->duo milia</entry>
+<entry>2000</entry>
+<entry>MM</entry>
+<entry>duo milia</entry>
 </row>
 </tbody>
 </tgroup>
diff --git a/tde-i18n-en_GB/docs/tdeedu/klatin/pronouns.docbook b/tde-i18n-en_GB/docs/tdeedu/klatin/pronouns.docbook
index 4d3edb21703..83192de6286 100644
--- a/tde-i18n-en_GB/docs/tdeedu/klatin/pronouns.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/klatin/pronouns.docbook
@@ -1,105 +1,68 @@
 <!-- Please translate the following -->
 <sect1 id="pronouns">
-<title
->KLatin Notes - Pronouns </title>
-<para
->Here are some pronouns. </para>
+<title>KLatin Notes - Pronouns </title>
+<para>Here are some pronouns. </para>
 
 <table frame="none">
-<title
->Personal Pronouns</title>
+<title>Personal Pronouns</title>
 <!-- Please don't translate the following until next title -->
 <tgroup cols="2" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <!-- Translate the following two entries -->
 <row>
-<entry
-><emphasis
->Me</emphasis
-></entry>
-<entry
-><emphasis
->You</emphasis
-></entry>
+<entry><emphasis>Me</emphasis></entry>
+<entry><emphasis>You</emphasis></entry>
 </row>
 
 <row>
-<entry
->ego</entry>
-<entry
->tu</entry>
+<entry>ego</entry>
+<entry>tu</entry>
 </row>
 <row>
-<entry
->me</entry>
-<entry
->te</entry>
+<entry>me</entry>
+<entry>te</entry>
 </row>
 <row>
-<entry
->mei</entry>
-<entry
->tui</entry>
+<entry>mei</entry>
+<entry>tui</entry>
 </row>
 <row>
-<entry
->mihi</entry>
-<entry
->tibi</entry>
+<entry>mihi</entry>
+<entry>tibi</entry>
 </row>
 <row>
-<entry
->me</entry>
-<entry
->te</entry>
+<entry>me</entry>
+<entry>te</entry>
 </row>
 <row>
-<entry
-></entry>
-<entry
-></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <!-- Translate the following two entries -->
 <row>
-<entry
-><emphasis
->We</emphasis
-></entry>
-<entry
-><emphasis
->You (Pl)</emphasis
-></entry>
+<entry><emphasis>We</emphasis></entry>
+<entry><emphasis>You (Pl)</emphasis></entry>
 </row>
 <row>
-<entry
->nos</entry>
-<entry
->vos</entry>
+<entry>nos</entry>
+<entry>vos</entry>
 </row>
 <row>
-<entry
->nos</entry>
-<entry
->vos</entry>
+<entry>nos</entry>
+<entry>vos</entry>
 </row>
 <row>
-<entry
->nostri/nostrum</entry>
-<entry
->vestri/vestrum</entry>
+<entry>nostri/nostrum</entry>
+<entry>vestri/vestrum</entry>
 </row>
 <row>
-<entry
->nobis</entry>
-<entry
->vobis</entry>
+<entry>nobis</entry>
+<entry>vobis</entry>
 </row>
 <row>
-<entry
->nobis</entry>
-<entry
->vobis</entry>
+<entry>nobis</entry>
+<entry>vobis</entry>
 </row>
 </tbody>
 </tgroup>
@@ -107,128 +70,77 @@
  
 <table frame="none">
 <!-- Please translate title-->
-<title
->3rd Person Personal Pronouns</title>
+<title>3rd Person Personal Pronouns</title>
 <!-- Please don't translate the following until next title-->
 <tgroup cols="4" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <!-- Translate the following entry -->
 <row>
-<entry
-></entry>
-<entry
-><emphasis
->He,</emphasis
-></entry>
-<entry
-><emphasis
->She,</emphasis
-></entry>
-<entry
-><emphasis
->It</emphasis
-></entry>
-</row>
-<row>
-<entry
->SINGULAR</entry>
-<entry
->is</entry>
-<entry
->ea</entry>
-<entry
->id</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->eum</entry>
-<entry
->eum</entry>
-<entry
->id</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->eius</entry>
-<entry
->eius</entry>
-<entry
->eius</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ei</entry>
-<entry
->ei</entry>
-<entry
->ei</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->eo</entry>
-<entry
->ea</entry>
-<entry
->eo</entry>
-</row>
-<row>
-<entry
->PLURAL</entry>
-<entry
->ei</entry>
-<entry
->eae</entry>
-<entry
->ea</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->eos</entry>
-<entry
->eas</entry>
-<entry
->ea</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->eorum</entry>
-<entry
->earum</entry>
-<entry
->eorum</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->eis</entry>
-<entry
->eis</entry>
-<entry
->eis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->eis</entry>
-<entry
->eis</entry>
-<entry
->eis</entry>
+<entry></entry>
+<entry><emphasis>He,</emphasis></entry>
+<entry><emphasis>She,</emphasis></entry>
+<entry><emphasis>It</emphasis></entry>
+</row>
+<row>
+<entry>SINGULAR</entry>
+<entry>is</entry>
+<entry>ea</entry>
+<entry>id</entry>
+</row>
+<row>
+<entry></entry>
+<entry>eum</entry>
+<entry>eum</entry>
+<entry>id</entry>
+</row>
+<row>
+<entry></entry>
+<entry>eius</entry>
+<entry>eius</entry>
+<entry>eius</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ei</entry>
+<entry>ei</entry>
+<entry>ei</entry>
+</row>
+<row>
+<entry></entry>
+<entry>eo</entry>
+<entry>ea</entry>
+<entry>eo</entry>
+</row>
+<row>
+<entry>PLURAL</entry>
+<entry>ei</entry>
+<entry>eae</entry>
+<entry>ea</entry>
+</row>
+<row>
+<entry></entry>
+<entry>eos</entry>
+<entry>eas</entry>
+<entry>ea</entry>
+</row>
+<row>
+<entry></entry>
+<entry>eorum</entry>
+<entry>earum</entry>
+<entry>eorum</entry>
+</row>
+<row>
+<entry></entry>
+<entry>eis</entry>
+<entry>eis</entry>
+<entry>eis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>eis</entry>
+<entry>eis</entry>
+<entry>eis</entry>
 </row>
 </tbody>
 </tgroup>
@@ -236,285 +148,178 @@
  
 <table frame="none">
 <!-- Please translate the title-->
-<title
->Demonstrative Pronouns</title>
+<title>Demonstrative Pronouns</title>
 <!-- Please don't translate the following -->
 <tgroup cols="4" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <!-- Translate the following entry -->
 <row>
-<entry
-><emphasis
->This</emphasis
-></entry>
-</row>
-<row>
-<entry
->SINGULAR</entry>
-<entry
->hic</entry>
-<entry
->haec</entry>
-<entry
->hoc</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->hunc</entry>
-<entry
->hanc</entry>
-<entry
->hoc</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->huius</entry>
-<entry
->huius</entry>
-<entry
->huius</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->huic</entry>
-<entry
->huic</entry>
-<entry
->huic</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->hoc</entry>
-<entry
->hac</entry>
-<entry
->hoc</entry>
-</row>
-<row>
-<entry
->PLURAL</entry>
-<entry
->hi</entry>
-<entry
->hae</entry>
-<entry
->haec</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->hos</entry>
-<entry
->has</entry>
-<entry
->heac</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->horum</entry>
-<entry
->harum</entry>
-<entry
->horum</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->his</entry>
-<entry
->his</entry>
-<entry
->his</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->his</entry>
-<entry
->his</entry>
-<entry
->his</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry><emphasis>This</emphasis></entry>
+</row>
+<row>
+<entry>SINGULAR</entry>
+<entry>hic</entry>
+<entry>haec</entry>
+<entry>hoc</entry>
+</row>
+<row>
+<entry></entry>
+<entry>hunc</entry>
+<entry>hanc</entry>
+<entry>hoc</entry>
+</row>
+<row>
+<entry></entry>
+<entry>huius</entry>
+<entry>huius</entry>
+<entry>huius</entry>
+</row>
+<row>
+<entry></entry>
+<entry>huic</entry>
+<entry>huic</entry>
+<entry>huic</entry>
+</row>
+<row>
+<entry></entry>
+<entry>hoc</entry>
+<entry>hac</entry>
+<entry>hoc</entry>
+</row>
+<row>
+<entry>PLURAL</entry>
+<entry>hi</entry>
+<entry>hae</entry>
+<entry>haec</entry>
+</row>
+<row>
+<entry></entry>
+<entry>hos</entry>
+<entry>has</entry>
+<entry>heac</entry>
+</row>
+<row>
+<entry></entry>
+<entry>horum</entry>
+<entry>harum</entry>
+<entry>horum</entry>
+</row>
+<row>
+<entry></entry>
+<entry>his</entry>
+<entry>his</entry>
+<entry>his</entry>
+</row>
+<row>
+<entry></entry>
+<entry>his</entry>
+<entry>his</entry>
+<entry>his</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <!-- Translate the following entry -->
 <row>
-<entry
-><emphasis
->That</emphasis
-></entry>
-</row>
-<row>
-<entry
->SINGULAR</entry>
-<entry
->ille</entry>
-<entry
->illa</entry>
-<entry
->illud</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->illum</entry>
-<entry
->illam</entry>
-<entry
->illud</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->illius</entry>
-<entry
->illius</entry>
-<entry
->illius</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->illi</entry>
-<entry
->illi</entry>
-<entry
->illi</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->illo</entry>
-<entry
->illa</entry>
-<entry
->illo</entry>
-</row>
-<row>
-<entry
->PLURAL</entry>
-<entry
->illi</entry>
-<entry
->illae</entry>
-<entry
->illa</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->illos</entry>
-<entry
->illas</entry>
-<entry
->illa</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->illorum</entry>
-<entry
->illarum</entry>
-<entry
->illorum</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->illis</entry>
-<entry
->illis</entry>
-<entry
->illis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->illis</entry>
-<entry
->illis</entry>
-<entry
->illis</entry>
+<entry><emphasis>That</emphasis></entry>
+</row>
+<row>
+<entry>SINGULAR</entry>
+<entry>ille</entry>
+<entry>illa</entry>
+<entry>illud</entry>
+</row>
+<row>
+<entry></entry>
+<entry>illum</entry>
+<entry>illam</entry>
+<entry>illud</entry>
+</row>
+<row>
+<entry></entry>
+<entry>illius</entry>
+<entry>illius</entry>
+<entry>illius</entry>
+</row>
+<row>
+<entry></entry>
+<entry>illi</entry>
+<entry>illi</entry>
+<entry>illi</entry>
+</row>
+<row>
+<entry></entry>
+<entry>illo</entry>
+<entry>illa</entry>
+<entry>illo</entry>
+</row>
+<row>
+<entry>PLURAL</entry>
+<entry>illi</entry>
+<entry>illae</entry>
+<entry>illa</entry>
+</row>
+<row>
+<entry></entry>
+<entry>illos</entry>
+<entry>illas</entry>
+<entry>illa</entry>
+</row>
+<row>
+<entry></entry>
+<entry>illorum</entry>
+<entry>illarum</entry>
+<entry>illorum</entry>
+</row>
+<row>
+<entry></entry>
+<entry>illis</entry>
+<entry>illis</entry>
+<entry>illis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>illis</entry>
+<entry>illis</entry>
+<entry>illis</entry>
 </row>
 </tbody>
 </tgroup>
 </table>
 
 <table frame="none">
-<title
->Negative Pronouns</title>
+<title>Negative Pronouns</title>
 <!-- Please don't translate the following until next title -->
 <tgroup cols="2" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <!-- Translate the following two entries -->
 <row>
-<entry
-><emphasis
->Noone</emphasis
-></entry>
-<entry
-><emphasis
->Nothing</emphasis
-></entry>
+<entry><emphasis>Noone</emphasis></entry>
+<entry><emphasis>Nothing</emphasis></entry>
 </row>
 <row>
-<entry
->nemo</entry>
-<entry
->nihil</entry>
+<entry>nemo</entry>
+<entry>nihil</entry>
 </row>
 <row>
-<entry
->neminem</entry>
-<entry
->nihil/nil</entry>
+<entry>neminem</entry>
+<entry>nihil/nil</entry>
 </row>
 <row>
-<entry
->nullius/neminis</entry>
-<entry
->nullius rei</entry>
+<entry>nullius/neminis</entry>
+<entry>nullius rei</entry>
 </row>
 <row>
-<entry
->nemini/nulli</entry>
-<entry
->nulli rei</entry>
+<entry>nemini/nulli</entry>
+<entry>nulli rei</entry>
 </row>
 <row>
-<entry
->nullo/nemine</entry>
-<entry
->nulla re</entry>
+<entry>nullo/nemine</entry>
+<entry>nulla re</entry>
 </row>
 </tbody>
 </tgroup>
diff --git a/tde-i18n-en_GB/docs/tdeedu/klatin/verbs.docbook b/tde-i18n-en_GB/docs/tdeedu/klatin/verbs.docbook
index 2585211cf0b..b6f73c6c888 100644
--- a/tde-i18n-en_GB/docs/tdeedu/klatin/verbs.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/klatin/verbs.docbook
@@ -1,638 +1,368 @@
 <!-- Translators: please don't translate Latin words -->
 <sect1 id="verbs">
 <!-- Please translate -->
-<title
->KLatin Notes - Verbs </title>
+<title>KLatin Notes - Verbs </title>
 
-<para
->All languages have verbs. Latin verbs are divided into four categories, called <emphasis
->conjugations</emphasis
->. These conjugations are divisions of verbs that, generally, use the same stem formation and have the same endings. </para>
+<para>All languages have verbs. Latin verbs are divided into four categories, called <emphasis>conjugations</emphasis>. These conjugations are divisions of verbs that, generally, use the same stem formation and have the same endings. </para>
 
-<para
->The stem of a verb is the basic part of the verb that does not change. For example, the stem of <emphasis
->moneo</emphasis
-> is <emphasis
->mone</emphasis
->. To get the stem of the verb, take the first person singular of the verb, and take off the -o ending. The verb <quote
->sum</quote
-> (I am) is totally irregular, and does not have a consistent stem. </para>
+<para>The stem of a verb is the basic part of the verb that does not change. For example, the stem of <emphasis>moneo</emphasis> is <emphasis>mone</emphasis>. To get the stem of the verb, take the first person singular of the verb, and take off the -o ending. The verb <quote>sum</quote> (I am) is totally irregular, and does not have a consistent stem. </para>
 
 <table frame="none">
 <!-- Please translate the title-->
-<title
->Verb listings - Indicative Active</title>
+<title>Verb listings - Indicative Active</title>
 <tgroup cols="6" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <row>
 <!-- Please translate -->
-<entry
->TENSE</entry>
-<entry
->1st</entry>
-<entry
->2nd</entry>
-<entry
->3rd</entry>
-<entry
->4th</entry>
-<entry
->SUM - I</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>TENSE</entry>
+<entry>1st</entry>
+<entry>2nd</entry>
+<entry>3rd</entry>
+<entry>4th</entry>
+<entry>SUM - I</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- translate only the first entry of each row if there is one -->
-<entry
->PRESENT</entry>
-<entry
->am-o</entry>
-<entry
->mone-o</entry>
-<entry
->reg-o</entry>
-<entry
->audi-o</entry>
-<entry
->sum</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-s</entry>
-<entry
->mone-s</entry>
-<entry
->regi-s</entry>
-<entry
->audi-s</entry>
-<entry
->es</entry>
-</row>
-<row>
-<entry
->I love, am loving</entry>
-<entry
->ama-t</entry>
-<entry
->mone-t</entry>
-<entry
->regi-t</entry>
-<entry
->audi-t</entry>
-<entry
->est</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-mus</entry>
-<entry
->mone-mus</entry>
-<entry
->regi-mus</entry>
-<entry
->audi-mus</entry>
-<entry
->sumus</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-tis</entry>
-<entry
->mone-tis</entry>
-<entry
->regi-tis</entry>
-<entry
->audi-tis</entry>
-<entry
->estis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-nt</entry>
-<entry
->mone-nt</entry>
-<entry
->regu-nt</entry>
-<entry
->audi-unt</entry>
-<entry
->sunt</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>PRESENT</entry>
+<entry>am-o</entry>
+<entry>mone-o</entry>
+<entry>reg-o</entry>
+<entry>audi-o</entry>
+<entry>sum</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-s</entry>
+<entry>mone-s</entry>
+<entry>regi-s</entry>
+<entry>audi-s</entry>
+<entry>es</entry>
+</row>
+<row>
+<entry>I love, am loving</entry>
+<entry>ama-t</entry>
+<entry>mone-t</entry>
+<entry>regi-t</entry>
+<entry>audi-t</entry>
+<entry>est</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-mus</entry>
+<entry>mone-mus</entry>
+<entry>regi-mus</entry>
+<entry>audi-mus</entry>
+<entry>sumus</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-tis</entry>
+<entry>mone-tis</entry>
+<entry>regi-tis</entry>
+<entry>audi-tis</entry>
+<entry>estis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-nt</entry>
+<entry>mone-nt</entry>
+<entry>regu-nt</entry>
+<entry>audi-unt</entry>
+<entry>sunt</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row if there is one -->
-<entry
->FUTURE</entry>
-<entry
->ama-bo</entry>
-<entry
->mone-bo</entry>
-<entry
->reg-am</entry>
-<entry
->audi-am</entry>
-<entry
->ero</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-bis</entry>
-<entry
->mone-bis</entry>
-<entry
->reg-es</entry>
-<entry
->audi-es</entry>
-<entry
->eris</entry>
-</row>
-<row>
-<entry
->I will love</entry>
-<entry
->ama-bit</entry>
-<entry
->mone-bit</entry>
-<entry
->reg-et</entry>
-<entry
->audi-et</entry>
-<entry
->erit</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-bimus</entry>
-<entry
->mone-bimus</entry>
-<entry
->reg-emus</entry>
-<entry
->audi-emus</entry>
-<entry
->erimus</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-bitis</entry>
-<entry
->mone-bitis</entry>
-<entry
->reg-etis</entry>
-<entry
->audi-etis</entry>
-<entry
->eritis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-bunt</entry>
-<entry
->mone-bunt</entry>
-<entry
->reg-ent</entry>
-<entry
->audi-ent</entry>
-<entry
->erunt</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>FUTURE</entry>
+<entry>ama-bo</entry>
+<entry>mone-bo</entry>
+<entry>reg-am</entry>
+<entry>audi-am</entry>
+<entry>ero</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-bis</entry>
+<entry>mone-bis</entry>
+<entry>reg-es</entry>
+<entry>audi-es</entry>
+<entry>eris</entry>
+</row>
+<row>
+<entry>I will love</entry>
+<entry>ama-bit</entry>
+<entry>mone-bit</entry>
+<entry>reg-et</entry>
+<entry>audi-et</entry>
+<entry>erit</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-bimus</entry>
+<entry>mone-bimus</entry>
+<entry>reg-emus</entry>
+<entry>audi-emus</entry>
+<entry>erimus</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-bitis</entry>
+<entry>mone-bitis</entry>
+<entry>reg-etis</entry>
+<entry>audi-etis</entry>
+<entry>eritis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-bunt</entry>
+<entry>mone-bunt</entry>
+<entry>reg-ent</entry>
+<entry>audi-ent</entry>
+<entry>erunt</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row if there is one -->
-<entry
->IMPERFECT</entry>
-<entry
->ama-bam</entry>
-<entry
->mone-bam</entry>
-<entry
->rege-bam</entry>
-<entry
->audi-bam</entry>
-<entry
->eram</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-bas</entry>
-<entry
->mone-bas</entry>
-<entry
->rege-bas</entry>
-<entry
->audi-bas</entry>
-<entry
->eras</entry>
-</row>
-<row>
-<entry
->I was loving</entry>
-<entry
->ama-bat</entry>
-<entry
->mone-bat</entry>
-<entry
->rege-bat</entry>
-<entry
->audi-bat</entry>
-<entry
->erat</entry>
-</row>
-<row>
-<entry
->I used to love</entry>
-<entry
->ama-bamus</entry>
-<entry
->mone-bamus</entry>
-<entry
->rege-bamus</entry>
-<entry
->audi-bamus</entry>
-<entry
->eramus</entry>
-</row>
-<row>
-<entry
->I began to love</entry>
-<entry
->ama-batis</entry>
-<entry
->mone-batis</entry>
-<entry
->rege-batis</entry>
-<entry
->audi-batis</entry>
-<entry
->eratis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-bant</entry>
-<entry
->mone-bant</entry>
-<entry
->rege-bant</entry>
-<entry
->audi-bant</entry>
-<entry
->erant</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>IMPERFECT</entry>
+<entry>ama-bam</entry>
+<entry>mone-bam</entry>
+<entry>rege-bam</entry>
+<entry>audi-bam</entry>
+<entry>eram</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-bas</entry>
+<entry>mone-bas</entry>
+<entry>rege-bas</entry>
+<entry>audi-bas</entry>
+<entry>eras</entry>
+</row>
+<row>
+<entry>I was loving</entry>
+<entry>ama-bat</entry>
+<entry>mone-bat</entry>
+<entry>rege-bat</entry>
+<entry>audi-bat</entry>
+<entry>erat</entry>
+</row>
+<row>
+<entry>I used to love</entry>
+<entry>ama-bamus</entry>
+<entry>mone-bamus</entry>
+<entry>rege-bamus</entry>
+<entry>audi-bamus</entry>
+<entry>eramus</entry>
+</row>
+<row>
+<entry>I began to love</entry>
+<entry>ama-batis</entry>
+<entry>mone-batis</entry>
+<entry>rege-batis</entry>
+<entry>audi-batis</entry>
+<entry>eratis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-bant</entry>
+<entry>mone-bant</entry>
+<entry>rege-bant</entry>
+<entry>audi-bant</entry>
+<entry>erant</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row if there is one -->
-<entry
->PERFECT</entry>
-<entry
->amav-i</entry>
-<entry
->monu-i</entry>
-<entry
->rex-i</entry>
-<entry
->audiv-i</entry>
-<entry
->fu-i</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-isti</entry>
-<entry
->monu-isti</entry>
-<entry
->rex-isti</entry>
-<entry
->audiv-isti</entry>
-<entry
->fu-isti</entry>
-</row>
-<row>
-<entry
->I have loved</entry>
-<entry
->amav-it</entry>
-<entry
->monu-it</entry>
-<entry
->rex-it</entry>
-<entry
->audiv-it</entry>
-<entry
->fu-it</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-imus</entry>
-<entry
->monu-imus</entry>
-<entry
->rex-imus</entry>
-<entry
->audiv-imus</entry>
-<entry
->fu-imus</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-istis</entry>
-<entry
->monu-istis</entry>
-<entry
->rex-istis</entry>
-<entry
->audiv-istis</entry>
-<entry
->fu-istis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-erunt</entry>
-<entry
->monu-erunt</entry>
-<entry
->rex-erunt</entry>
-<entry
->audiv-erunt</entry>
-<entry
->fu-erunt</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>PERFECT</entry>
+<entry>amav-i</entry>
+<entry>monu-i</entry>
+<entry>rex-i</entry>
+<entry>audiv-i</entry>
+<entry>fu-i</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-isti</entry>
+<entry>monu-isti</entry>
+<entry>rex-isti</entry>
+<entry>audiv-isti</entry>
+<entry>fu-isti</entry>
+</row>
+<row>
+<entry>I have loved</entry>
+<entry>amav-it</entry>
+<entry>monu-it</entry>
+<entry>rex-it</entry>
+<entry>audiv-it</entry>
+<entry>fu-it</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-imus</entry>
+<entry>monu-imus</entry>
+<entry>rex-imus</entry>
+<entry>audiv-imus</entry>
+<entry>fu-imus</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-istis</entry>
+<entry>monu-istis</entry>
+<entry>rex-istis</entry>
+<entry>audiv-istis</entry>
+<entry>fu-istis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-erunt</entry>
+<entry>monu-erunt</entry>
+<entry>rex-erunt</entry>
+<entry>audiv-erunt</entry>
+<entry>fu-erunt</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row if there is one -->
-<entry
->FUTURE PERFECT</entry>
-<entry
->amav-ero</entry>
-<entry
->monu-ero</entry>
-<entry
->rex-ero</entry>
-<entry
->audiv-ero</entry>
-<entry
->fu-ero</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-eris</entry>
-<entry
->monu-eris</entry>
-<entry
->rex-eris</entry>
-<entry
->audiv-eris</entry>
-<entry
->fu-eris</entry>
-</row>
-<row>
-<entry
->I will have loved</entry>
-<entry
->amav-erit</entry>
-<entry
->monu-erit</entry>
-<entry
->rex-erit</entry>
-<entry
->audiv-erit</entry>
-<entry
->fu-erit</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-erimus</entry>
-<entry
->monu-erimus</entry>
-<entry
->rex-erimus</entry>
-<entry
->audiv-erimus</entry>
-<entry
->fu-erimus</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-eritis</entry>
-<entry
->monu-eritis</entry>
-<entry
->rex-eritis</entry>
-<entry
->audiv-eritis</entry>
-<entry
->fu-eritis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-erint</entry>
-<entry
->monu-erint</entry>
-<entry
->rex-erint</entry>
-<entry
->audiv-erint</entry>
-<entry
->fu-erint</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>FUTURE PERFECT</entry>
+<entry>amav-ero</entry>
+<entry>monu-ero</entry>
+<entry>rex-ero</entry>
+<entry>audiv-ero</entry>
+<entry>fu-ero</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-eris</entry>
+<entry>monu-eris</entry>
+<entry>rex-eris</entry>
+<entry>audiv-eris</entry>
+<entry>fu-eris</entry>
+</row>
+<row>
+<entry>I will have loved</entry>
+<entry>amav-erit</entry>
+<entry>monu-erit</entry>
+<entry>rex-erit</entry>
+<entry>audiv-erit</entry>
+<entry>fu-erit</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-erimus</entry>
+<entry>monu-erimus</entry>
+<entry>rex-erimus</entry>
+<entry>audiv-erimus</entry>
+<entry>fu-erimus</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-eritis</entry>
+<entry>monu-eritis</entry>
+<entry>rex-eritis</entry>
+<entry>audiv-eritis</entry>
+<entry>fu-eritis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-erint</entry>
+<entry>monu-erint</entry>
+<entry>rex-erint</entry>
+<entry>audiv-erint</entry>
+<entry>fu-erint</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row if there is one -->
-<entry
->PLUPERFECT</entry>
-<entry
->amav-eram</entry>
-<entry
->monu-eram</entry>
-<entry
->rex-eram</entry>
-<entry
->audiv-eram</entry>
-<entry
->fu-eram</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-eras</entry>
-<entry
->monu-eras</entry>
-<entry
->rex-eras</entry>
-<entry
->audiv-eras</entry>
-<entry
->fu-eras</entry>
-</row>
-<row>
-<entry
->I had loved</entry>
-<entry
->amav-erat</entry>
-<entry
->monu-erat</entry>
-<entry
->rex-erat</entry>
-<entry
->audiv-erat</entry>
-<entry
->fu-erat</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-eramus</entry>
-<entry
->monu-eramus</entry>
-<entry
->rex-eramus</entry>
-<entry
->audiv-eramus</entry>
-<entry
->fu-eramus</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-eratis</entry>
-<entry
->monu-eratis</entry>
-<entry
->rex-eratis</entry>
-<entry
->audiv-eratis</entry>
-<entry
->fu-eratis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-erant</entry>
-<entry
->monu-erant</entry>
-<entry
->rex-erant</entry>
-<entry
->audiv-erant</entry>
-<entry
->fu-erant</entry>
+<entry>PLUPERFECT</entry>
+<entry>amav-eram</entry>
+<entry>monu-eram</entry>
+<entry>rex-eram</entry>
+<entry>audiv-eram</entry>
+<entry>fu-eram</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-eras</entry>
+<entry>monu-eras</entry>
+<entry>rex-eras</entry>
+<entry>audiv-eras</entry>
+<entry>fu-eras</entry>
+</row>
+<row>
+<entry>I had loved</entry>
+<entry>amav-erat</entry>
+<entry>monu-erat</entry>
+<entry>rex-erat</entry>
+<entry>audiv-erat</entry>
+<entry>fu-erat</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-eramus</entry>
+<entry>monu-eramus</entry>
+<entry>rex-eramus</entry>
+<entry>audiv-eramus</entry>
+<entry>fu-eramus</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-eratis</entry>
+<entry>monu-eratis</entry>
+<entry>rex-eratis</entry>
+<entry>audiv-eratis</entry>
+<entry>fu-eratis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-erant</entry>
+<entry>monu-erant</entry>
+<entry>rex-erant</entry>
+<entry>audiv-erant</entry>
+<entry>fu-erant</entry>
 </row>
 </tbody>
 </tgroup>
@@ -641,421 +371,246 @@
 
 <table frame="none">
 <!-- Please translate the title-->
-<title
->Verb listings - Subjunctive Active</title>
+<title>Verb listings - Subjunctive Active</title>
 <tgroup cols="6" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <row>
 <!-- Please translate -->
-<entry
->TENSE</entry>
-<entry
->1st</entry>
-<entry
->2nd</entry>
-<entry
->3rd</entry>
-<entry
->4th</entry>
-<entry
->SUM - I</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>TENSE</entry>
+<entry>1st</entry>
+<entry>2nd</entry>
+<entry>3rd</entry>
+<entry>4th</entry>
+<entry>SUM - I</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- translate only the first entry of each row if there is one -->
-<entry
->PRESENT</entry>
-<entry
->ame-m</entry>
-<entry
->monea-m</entry>
-<entry
->rega-m</entry>
-<entry
->audi-o</entry>
-<entry
->sim</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ame-s</entry>
-<entry
->monea-s</entry>
-<entry
->rega-s</entry>
-<entry
->audi-s</entry>
-<entry
->sis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ame-t</entry>
-<entry
->monea-t</entry>
-<entry
->rega-t</entry>
-<entry
->audi-t</entry>
-<entry
->sit</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ame-mus</entry>
-<entry
->monea-mus</entry>
-<entry
->rega-mus</entry>
-<entry
->audi-mus</entry>
-<entry
->simus</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ame-tis</entry>
-<entry
->monea-tis</entry>
-<entry
->rega-tis</entry>
-<entry
->audi-tis</entry>
-<entry
->sitis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ame-nt</entry>
-<entry
->monea-nt</entry>
-<entry
->rega-nt</entry>
-<entry
->audi-unt</entry>
-<entry
->sint</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>PRESENT</entry>
+<entry>ame-m</entry>
+<entry>monea-m</entry>
+<entry>rega-m</entry>
+<entry>audi-o</entry>
+<entry>sim</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ame-s</entry>
+<entry>monea-s</entry>
+<entry>rega-s</entry>
+<entry>audi-s</entry>
+<entry>sis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ame-t</entry>
+<entry>monea-t</entry>
+<entry>rega-t</entry>
+<entry>audi-t</entry>
+<entry>sit</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ame-mus</entry>
+<entry>monea-mus</entry>
+<entry>rega-mus</entry>
+<entry>audi-mus</entry>
+<entry>simus</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ame-tis</entry>
+<entry>monea-tis</entry>
+<entry>rega-tis</entry>
+<entry>audi-tis</entry>
+<entry>sitis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ame-nt</entry>
+<entry>monea-nt</entry>
+<entry>rega-nt</entry>
+<entry>audi-unt</entry>
+<entry>sint</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row if there is one -->
-<entry
->IMPERFECT</entry>
-<entry
->ama-rem</entry>
-<entry
->mone-rem</entry>
-<entry
->rege-rem</entry>
-<entry
->audi-rem</entry>
-<entry
->essem</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-res</entry>
-<entry
->mone-res</entry>
-<entry
->rege-res</entry>
-<entry
->audi-res</entry>
-<entry
->esset</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-ret</entry>
-<entry
->mone-ret</entry>
-<entry
->rege-ret</entry>
-<entry
->audi-ret</entry>
-<entry
->esset</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-remus</entry>
-<entry
->mone-remus</entry>
-<entry
->rege-remus</entry>
-<entry
->audi-remus</entry>
-<entry
->essemus</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-retis</entry>
-<entry
->mone-retis</entry>
-<entry
->rege-retis</entry>
-<entry
->audi-retis</entry>
-<entry
->essetis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-rent</entry>
-<entry
->mone-rent</entry>
-<entry
->rege-rent</entry>
-<entry
->audi-rent</entry>
-<entry
->essent</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>IMPERFECT</entry>
+<entry>ama-rem</entry>
+<entry>mone-rem</entry>
+<entry>rege-rem</entry>
+<entry>audi-rem</entry>
+<entry>essem</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-res</entry>
+<entry>mone-res</entry>
+<entry>rege-res</entry>
+<entry>audi-res</entry>
+<entry>esset</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-ret</entry>
+<entry>mone-ret</entry>
+<entry>rege-ret</entry>
+<entry>audi-ret</entry>
+<entry>esset</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-remus</entry>
+<entry>mone-remus</entry>
+<entry>rege-remus</entry>
+<entry>audi-remus</entry>
+<entry>essemus</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-retis</entry>
+<entry>mone-retis</entry>
+<entry>rege-retis</entry>
+<entry>audi-retis</entry>
+<entry>essetis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-rent</entry>
+<entry>mone-rent</entry>
+<entry>rege-rent</entry>
+<entry>audi-rent</entry>
+<entry>essent</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row if there is one -->
-<entry
->PERFECT</entry>
-<entry
->amav-erim</entry>
-<entry
->monu-erim</entry>
-<entry
->rex-erim</entry>
-<entry
->audiv-erim</entry>
-<entry
->fu-erim</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-eris</entry>
-<entry
->monu-eris</entry>
-<entry
->rex-eris</entry>
-<entry
->audiv-eris</entry>
-<entry
->fu-eris</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-erit</entry>
-<entry
->monu-erit</entry>
-<entry
->rex-erit</entry>
-<entry
->audiv-erit</entry>
-<entry
->fu-erit</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-erimus</entry>
-<entry
->monu-erimus</entry>
-<entry
->rex-erimus</entry>
-<entry
->audiv-erimus</entry>
-<entry
->fu-erimus</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-eritis</entry>
-<entry
->monu-eritis</entry>
-<entry
->rex-eritis</entry>
-<entry
->audiv-eritis</entry>
-<entry
->fu-eritis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-erint</entry>
-<entry
->monu-erint</entry>
-<entry
->rex-erint</entry>
-<entry
->audiv-erint</entry>
-<entry
->fu-erint</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>PERFECT</entry>
+<entry>amav-erim</entry>
+<entry>monu-erim</entry>
+<entry>rex-erim</entry>
+<entry>audiv-erim</entry>
+<entry>fu-erim</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-eris</entry>
+<entry>monu-eris</entry>
+<entry>rex-eris</entry>
+<entry>audiv-eris</entry>
+<entry>fu-eris</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-erit</entry>
+<entry>monu-erit</entry>
+<entry>rex-erit</entry>
+<entry>audiv-erit</entry>
+<entry>fu-erit</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-erimus</entry>
+<entry>monu-erimus</entry>
+<entry>rex-erimus</entry>
+<entry>audiv-erimus</entry>
+<entry>fu-erimus</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-eritis</entry>
+<entry>monu-eritis</entry>
+<entry>rex-eritis</entry>
+<entry>audiv-eritis</entry>
+<entry>fu-eritis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-erint</entry>
+<entry>monu-erint</entry>
+<entry>rex-erint</entry>
+<entry>audiv-erint</entry>
+<entry>fu-erint</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row if there is one -->
-<entry
->PLUPERFECT</entry>
-<entry
->amav-issem</entry>
-<entry
->monu-issem</entry>
-<entry
->rex-issem</entry>
-<entry
->audiv-issem</entry>
-<entry
->fu-issem</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-isses</entry>
-<entry
->monu-isses</entry>
-<entry
->rex-isses</entry>
-<entry
->audiv-isses</entry>
-<entry
->fu-isses</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-isset</entry>
-<entry
->monu-isset</entry>
-<entry
->rex-isset</entry>
-<entry
->audiv-isset</entry>
-<entry
->fu-isset</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-issemus</entry>
-<entry
->monu-issemus</entry>
-<entry
->rex-issemus</entry>
-<entry
->audiv-issemus</entry>
-<entry
->fu-issemus</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-issetis</entry>
-<entry
->monu-issetis</entry>
-<entry
->rex-issetis</entry>
-<entry
->audiv-issetis</entry>
-<entry
->fu-issetis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amav-issent</entry>
-<entry
->monu-issent</entry>
-<entry
->rex-issent</entry>
-<entry
->audiv-issent</entry>
-<entry
->fu-issent</entry>
+<entry>PLUPERFECT</entry>
+<entry>amav-issem</entry>
+<entry>monu-issem</entry>
+<entry>rex-issem</entry>
+<entry>audiv-issem</entry>
+<entry>fu-issem</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-isses</entry>
+<entry>monu-isses</entry>
+<entry>rex-isses</entry>
+<entry>audiv-isses</entry>
+<entry>fu-isses</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-isset</entry>
+<entry>monu-isset</entry>
+<entry>rex-isset</entry>
+<entry>audiv-isset</entry>
+<entry>fu-isset</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-issemus</entry>
+<entry>monu-issemus</entry>
+<entry>rex-issemus</entry>
+<entry>audiv-issemus</entry>
+<entry>fu-issemus</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-issetis</entry>
+<entry>monu-issetis</entry>
+<entry>rex-issetis</entry>
+<entry>audiv-issetis</entry>
+<entry>fu-issetis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amav-issent</entry>
+<entry>monu-issent</entry>
+<entry>rex-issent</entry>
+<entry>audiv-issent</entry>
+<entry>fu-issent</entry>
 </row>
 </tbody>
 </tgroup>
@@ -1063,139 +618,84 @@
 
 <table frame="none">
 <!-- Please translate the title-->
-<title
->Verb listings - Imperative Active</title>
+<title>Verb listings - Imperative Active</title>
 <tgroup cols="6" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <row>
 <!-- Please translate -->
-<entry
->TENSE</entry>
-<entry
->1st</entry>
-<entry
->2nd</entry>
-<entry
->3rd</entry>
-<entry
->4th</entry>
-<entry
->SUM - I</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>TENSE</entry>
+<entry>1st</entry>
+<entry>2nd</entry>
+<entry>3rd</entry>
+<entry>4th</entry>
+<entry>SUM - I</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- translate only the first entry of each row if there is one -->
-<entry
->PRESENT</entry>
-<entry
->am-a</entry>
-<entry
->mon-e</entry>
-<entry
->reg-e</entry>
-<entry
->aud-i</entry>
-<entry
->es</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->am-ate</entry>
-<entry
->mon-ete</entry>
-<entry
->reg-ite</entry>
-<entry
->aud-ite</entry>
-<entry
->este</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>PRESENT</entry>
+<entry>am-a</entry>
+<entry>mon-e</entry>
+<entry>reg-e</entry>
+<entry>aud-i</entry>
+<entry>es</entry>
+</row>
+<row>
+<entry></entry>
+<entry>am-ate</entry>
+<entry>mon-ete</entry>
+<entry>reg-ite</entry>
+<entry>aud-ite</entry>
+<entry>este</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row if there is one -->
-<entry
->FUTURE</entry>
-<entry
->am-ato</entry>
-<entry
->mon-eto</entry>
-<entry
->reg-ito</entry>
-<entry
->aud-ito</entry>
-<entry
->esto</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->am-ato</entry>
-<entry
->mon-eto</entry>
-<entry
->reg-ito</entry>
-<entry
->aud-ito</entry>
-<entry
->esto</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->am-atote</entry>
-<entry
->mon-etote</entry>
-<entry
->reg-itote</entry>
-<entry
->aud-itote</entry>
-<entry
->estote</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->am-anto</entry>
-<entry
->mon-ento</entry>
-<entry
->reg-unto</entry>
-<entry
->aud-iunto</entry>
-<entry
->sunto</entry>
+<entry>FUTURE</entry>
+<entry>am-ato</entry>
+<entry>mon-eto</entry>
+<entry>reg-ito</entry>
+<entry>aud-ito</entry>
+<entry>esto</entry>
+</row>
+<row>
+<entry></entry>
+<entry>am-ato</entry>
+<entry>mon-eto</entry>
+<entry>reg-ito</entry>
+<entry>aud-ito</entry>
+<entry>esto</entry>
+</row>
+<row>
+<entry></entry>
+<entry>am-atote</entry>
+<entry>mon-etote</entry>
+<entry>reg-itote</entry>
+<entry>aud-itote</entry>
+<entry>estote</entry>
+</row>
+<row>
+<entry></entry>
+<entry>am-anto</entry>
+<entry>mon-ento</entry>
+<entry>reg-unto</entry>
+<entry>aud-iunto</entry>
+<entry>sunto</entry>
 </row>
 </tbody>
 </tgroup>
@@ -1203,70 +703,44 @@
 
 <table frame="none">
 <!-- Please translate the title-->
-<title
->Verb listings - Gerund Active</title>
+<title>Verb listings - Gerund Active</title>
 <tgroup cols="5" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <row>
-<entry
-></entry>
-<entry
->1st</entry>
-<entry
->2nd</entry>
-<entry
->3rd</entry>
-<entry
->4th</entry>
-</row>
-<row>
-<entry
->Accusative</entry>
-<entry
->(ad) am-andum</entry>
-<entry
->(ad) mon-endum</entry>
-<entry
->(ad) reg-endum</entry>
-<entry
->(ad) aud-iendum</entry>
-</row>
-<row>
-<entry
->Genitive</entry>
-<entry
->am-andi</entry>
-<entry
->mon-endi</entry>
-<entry
->reg-endi</entry>
-<entry
->aud-iendi</entry>
-</row>
-<row>
-<entry
->Dative</entry>
-<entry
->am-ando</entry>
-<entry
->mon-endo</entry>
-<entry
->reg-endo</entry>
-<entry
->aud-iendo</entry>
-</row>
-<row>
-<entry
->Ablative</entry>
-<entry
->am-ando</entry>
-<entry
->mon-endo</entry>
-<entry
->reg-endo</entry>
-<entry
->aud-iendo</entry>
+<entry></entry>
+<entry>1st</entry>
+<entry>2nd</entry>
+<entry>3rd</entry>
+<entry>4th</entry>
+</row>
+<row>
+<entry>Accusative</entry>
+<entry>(ad) am-andum</entry>
+<entry>(ad) mon-endum</entry>
+<entry>(ad) reg-endum</entry>
+<entry>(ad) aud-iendum</entry>
+</row>
+<row>
+<entry>Genitive</entry>
+<entry>am-andi</entry>
+<entry>mon-endi</entry>
+<entry>reg-endi</entry>
+<entry>aud-iendi</entry>
+</row>
+<row>
+<entry>Dative</entry>
+<entry>am-ando</entry>
+<entry>mon-endo</entry>
+<entry>reg-endo</entry>
+<entry>aud-iendo</entry>
+</row>
+<row>
+<entry>Ablative</entry>
+<entry>am-ando</entry>
+<entry>mon-endo</entry>
+<entry>reg-endo</entry>
+<entry>aud-iendo</entry>
 </row>
 </tbody>
 </tgroup>
@@ -1274,80 +748,49 @@
 
 <table frame="none">
 <!-- Please translate the title-->
-<title
->Verb listings - Infinitive Active</title>
+<title>Verb listings - Infinitive Active</title>
 <tgroup cols="6" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <row>
-<entry
->TENSE</entry>
-<entry
->1st</entry>
-<entry
->2nd</entry>
-<entry
->3rd</entry>
-<entry
->4th</entry>
-<entry
->SUM - I</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-</row>
-<row>
-<entry
->PRESENT</entry>
-<entry
->am-are</entry>
-<entry
->mon-ere</entry>
-<entry
->reg-ere</entry>
-<entry
->aud-ire</entry>
-<entry
->esse</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-</row>
-<row>
-<entry
->PERFECT</entry>
-<entry
->amav-isse</entry>
-<entry
->monu-isse</entry>
-<entry
->rex-isse</entry>
-<entry
->audiv-isse</entry>
-<entry
->fu-isse</entry>
+<entry>TENSE</entry>
+<entry>1st</entry>
+<entry>2nd</entry>
+<entry>3rd</entry>
+<entry>4th</entry>
+<entry>SUM - I</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+</row>
+<row>
+<entry>PRESENT</entry>
+<entry>am-are</entry>
+<entry>mon-ere</entry>
+<entry>reg-ere</entry>
+<entry>aud-ire</entry>
+<entry>esse</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+</row>
+<row>
+<entry>PERFECT</entry>
+<entry>amav-isse</entry>
+<entry>monu-isse</entry>
+<entry>rex-isse</entry>
+<entry>audiv-isse</entry>
+<entry>fu-isse</entry>
 </row>
 </tbody>
 </tgroup>
@@ -1355,80 +798,49 @@
 
 <table frame="none">
 <!-- Please translate the title-->
-<title
->Verb listings - Participle Active</title>
+<title>Verb listings - Participle Active</title>
 <tgroup cols="6" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <row>
-<entry
->TENSE</entry>
-<entry
->1st</entry>
-<entry
->2nd</entry>
-<entry
->3rd</entry>
-<entry
->4th</entry>
-<entry
->SUM - I</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-</row>
-<row>
-<entry
->PRESENT</entry>
-<entry
->am-ans,-antis</entry>
-<entry
->mon-ens,-entis</entry>
-<entry
->reg-ens,-entis</entry>
-<entry
->aud-iens,-ientis</entry>
-<entry
-></entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-</row>
-<row>
-<entry
->FUTURE</entry>
-<entry
->amat-urus,-a,-um</entry>
-<entry
->monit-urus,-a,-um</entry>
-<entry
->rect-urus,-a,-um</entry>
-<entry
->audit-urus,-a,-um</entry>
-<entry
->futurus,-a,-um</entry>
+<entry>TENSE</entry>
+<entry>1st</entry>
+<entry>2nd</entry>
+<entry>3rd</entry>
+<entry>4th</entry>
+<entry>SUM - I</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+</row>
+<row>
+<entry>PRESENT</entry>
+<entry>am-ans,-antis</entry>
+<entry>mon-ens,-entis</entry>
+<entry>reg-ens,-entis</entry>
+<entry>aud-iens,-ientis</entry>
+<entry></entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+</row>
+<row>
+<entry>FUTURE</entry>
+<entry>amat-urus,-a,-um</entry>
+<entry>monit-urus,-a,-um</entry>
+<entry>rect-urus,-a,-um</entry>
+<entry>audit-urus,-a,-um</entry>
+<entry>futurus,-a,-um</entry>
 </row>
 </tbody>
 </tgroup>
@@ -1436,545 +848,323 @@
 
 <table frame="none">
 <!-- Please translate the title-->
-<title
->Verb listings - Indicative Passive</title>
+<title>Verb listings - Indicative Passive</title>
 <tgroup align="center" cols="5" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <row>
 <!-- Please translate -->
-<entry
->TENSE</entry>
-<entry
->1st</entry>
-<entry
->2nd</entry>
-<entry
->3rd</entry>
-<entry
->4th</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>TENSE</entry>
+<entry>1st</entry>
+<entry>2nd</entry>
+<entry>3rd</entry>
+<entry>4th</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row if there is one -->
-<entry
->PRESENT</entry>
-<entry
->am-or</entry>
-<entry
->mone-or</entry>
-<entry
->reg-or</entry>
-<entry
->audi-or</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-ris</entry>
-<entry
->mone-ris</entry>
-<entry
->reg-eris</entry>
-<entry
->audi-eris</entry>
-</row>
-<row>
-<entry
->I am loved</entry>
-<entry
->ama-tur</entry>
-<entry
->mone-tur</entry>
-<entry
->regi-tur</entry>
-<entry
->audi-tur</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-mur</entry>
-<entry
->mone-mur</entry>
-<entry
->regi-mur</entry>
-<entry
->audi-mur</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-mini</entry>
-<entry
->mone-mini</entry>
-<entry
->regi-mini</entry>
-<entry
->audi-mini</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-ntur</entry>
-<entry
->mone-ntur</entry>
-<entry
->regu-ntur</entry>
-<entry
->audiu-unt</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>PRESENT</entry>
+<entry>am-or</entry>
+<entry>mone-or</entry>
+<entry>reg-or</entry>
+<entry>audi-or</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-ris</entry>
+<entry>mone-ris</entry>
+<entry>reg-eris</entry>
+<entry>audi-eris</entry>
+</row>
+<row>
+<entry>I am loved</entry>
+<entry>ama-tur</entry>
+<entry>mone-tur</entry>
+<entry>regi-tur</entry>
+<entry>audi-tur</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-mur</entry>
+<entry>mone-mur</entry>
+<entry>regi-mur</entry>
+<entry>audi-mur</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-mini</entry>
+<entry>mone-mini</entry>
+<entry>regi-mini</entry>
+<entry>audi-mini</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-ntur</entry>
+<entry>mone-ntur</entry>
+<entry>regu-ntur</entry>
+<entry>audiu-unt</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row if there is one -->
-<entry
->FUTURE</entry>
-<entry
->ama-bor</entry>
-<entry
->mone-bor</entry>
-<entry
->reg-ar</entry>
-<entry
->audi-ar</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-beris</entry>
-<entry
->mone-beris</entry>
-<entry
->reg-eris</entry>
-<entry
->audi-eris</entry>
-</row>
-<row>
-<entry
->I will be loved</entry>
-<entry
->ama-bitur</entry>
-<entry
->mone-bitur</entry>
-<entry
->reg-etur</entry>
-<entry
->audi-etur</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-bimur</entry>
-<entry
->mone-bimur</entry>
-<entry
->reg-emur</entry>
-<entry
->audi-emur</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-bimini</entry>
-<entry
->mone-bimini</entry>
-<entry
->reg-emini</entry>
-<entry
->audi-emini</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-buntur</entry>
-<entry
->mone-buntur</entry>
-<entry
->reg-entur</entry>
-<entry
->audi-entur</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>FUTURE</entry>
+<entry>ama-bor</entry>
+<entry>mone-bor</entry>
+<entry>reg-ar</entry>
+<entry>audi-ar</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-beris</entry>
+<entry>mone-beris</entry>
+<entry>reg-eris</entry>
+<entry>audi-eris</entry>
+</row>
+<row>
+<entry>I will be loved</entry>
+<entry>ama-bitur</entry>
+<entry>mone-bitur</entry>
+<entry>reg-etur</entry>
+<entry>audi-etur</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-bimur</entry>
+<entry>mone-bimur</entry>
+<entry>reg-emur</entry>
+<entry>audi-emur</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-bimini</entry>
+<entry>mone-bimini</entry>
+<entry>reg-emini</entry>
+<entry>audi-emini</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-buntur</entry>
+<entry>mone-buntur</entry>
+<entry>reg-entur</entry>
+<entry>audi-entur</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row if there is one -->
-<entry
->IMPERFECT</entry>
-<entry
->ama-bar</entry>
-<entry
->mone-bar</entry>
-<entry
->rege-bar</entry>
-<entry
->audie-bar</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-baris</entry>
-<entry
->mone-baris</entry>
-<entry
->rege-baris</entry>
-<entry
->audie-baris</entry>
-</row>
-<row>
-<entry
->I was loved</entry>
-<entry
->ama-batur</entry>
-<entry
->mone-batur</entry>
-<entry
->rege-batur</entry>
-<entry
->audie-batur</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-bamur</entry>
-<entry
->mone-bamur</entry>
-<entry
->rege-bamur</entry>
-<entry
->audie-bamur</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-bamini</entry>
-<entry
->mone-bamini</entry>
-<entry
->rege-bamini</entry>
-<entry
->audie-bamini</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->ama-bantur</entry>
-<entry
->mone-bantur</entry>
-<entry
->rege-bantur</entry>
-<entry
->audie-bantur</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>IMPERFECT</entry>
+<entry>ama-bar</entry>
+<entry>mone-bar</entry>
+<entry>rege-bar</entry>
+<entry>audie-bar</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-baris</entry>
+<entry>mone-baris</entry>
+<entry>rege-baris</entry>
+<entry>audie-baris</entry>
+</row>
+<row>
+<entry>I was loved</entry>
+<entry>ama-batur</entry>
+<entry>mone-batur</entry>
+<entry>rege-batur</entry>
+<entry>audie-batur</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-bamur</entry>
+<entry>mone-bamur</entry>
+<entry>rege-bamur</entry>
+<entry>audie-bamur</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-bamini</entry>
+<entry>mone-bamini</entry>
+<entry>rege-bamini</entry>
+<entry>audie-bamini</entry>
+</row>
+<row>
+<entry></entry>
+<entry>ama-bantur</entry>
+<entry>mone-bantur</entry>
+<entry>rege-bantur</entry>
+<entry>audie-bantur</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row if there is one -->
-<entry
->PERFECT</entry>
-<entry
->amatus sum</entry>
-<entry
->monitus sum</entry>
-<entry
->rectus sum</entry>
-<entry
->auditus sum</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amatus es</entry>
-<entry
->monitus es</entry>
-<entry
->rectus es</entry>
-<entry
->auditus es</entry>
-</row>
-<row>
-<entry
->I have been loved</entry>
-<entry
->amatus est</entry>
-<entry
->monitus est</entry>
-<entry
->rectus est</entry>
-<entry
->auditus est</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amati sumus</entry>
-<entry
->moniti sumus</entry>
-<entry
->recti sumus</entry>
-<entry
->auditi sumus</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amati estis</entry>
-<entry
->moniti estis</entry>
-<entry
->recti estis</entry>
-<entry
->auditi estis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amati sunt</entry>
-<entry
->moniti sunt</entry>
-<entry
->recti sunt</entry>
-<entry
->auditi sunt</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>PERFECT</entry>
+<entry>amatus sum</entry>
+<entry>monitus sum</entry>
+<entry>rectus sum</entry>
+<entry>auditus sum</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amatus es</entry>
+<entry>monitus es</entry>
+<entry>rectus es</entry>
+<entry>auditus es</entry>
+</row>
+<row>
+<entry>I have been loved</entry>
+<entry>amatus est</entry>
+<entry>monitus est</entry>
+<entry>rectus est</entry>
+<entry>auditus est</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amati sumus</entry>
+<entry>moniti sumus</entry>
+<entry>recti sumus</entry>
+<entry>auditi sumus</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amati estis</entry>
+<entry>moniti estis</entry>
+<entry>recti estis</entry>
+<entry>auditi estis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amati sunt</entry>
+<entry>moniti sunt</entry>
+<entry>recti sunt</entry>
+<entry>auditi sunt</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row if there is one -->
-<entry
->FUTURE PERFECT</entry>
-<entry
->amatus ero</entry>
-<entry
->monitus ero</entry>
-<entry
->rectus ero</entry>
-<entry
->auditus ero</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amatus eris</entry>
-<entry
->monitus eris</entry>
-<entry
->rectus eris</entry>
-<entry
->auditus eris</entry>
-</row>
-<row>
-<entry
->I will have been loved</entry>
-<entry
->amatus erit</entry>
-<entry
->monitus erit</entry>
-<entry
->rectus erit</entry>
-<entry
->auditus erit</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amati erimus</entry>
-<entry
->moniti erimus</entry>
-<entry
->recti erimus</entry>
-<entry
->auditi erimus</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amati eritis</entry>
-<entry
->moniti eritis</entry>
-<entry
->recti eritis</entry>
-<entry
->auditi eritis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amati erunt</entry>
-<entry
->moniti erunt</entry>
-<entry
->recti erunt</entry>
-<entry
->auditi erunt</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
+<entry>FUTURE PERFECT</entry>
+<entry>amatus ero</entry>
+<entry>monitus ero</entry>
+<entry>rectus ero</entry>
+<entry>auditus ero</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amatus eris</entry>
+<entry>monitus eris</entry>
+<entry>rectus eris</entry>
+<entry>auditus eris</entry>
+</row>
+<row>
+<entry>I will have been loved</entry>
+<entry>amatus erit</entry>
+<entry>monitus erit</entry>
+<entry>rectus erit</entry>
+<entry>auditus erit</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amati erimus</entry>
+<entry>moniti erimus</entry>
+<entry>recti erimus</entry>
+<entry>auditi erimus</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amati eritis</entry>
+<entry>moniti eritis</entry>
+<entry>recti eritis</entry>
+<entry>auditi eritis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amati erunt</entry>
+<entry>moniti erunt</entry>
+<entry>recti erunt</entry>
+<entry>auditi erunt</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
 </row>
 <row>
 <!-- Please translate only the first entry of each row if there is one -->
-<entry
->PLUPERFECT</entry>
-<entry
->amatus eram</entry>
-<entry
->monitus eram</entry>
-<entry
->rectus eram</entry>
-<entry
->auditus eram</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amatus eras</entry>
-<entry
->monitus eras</entry>
-<entry
->rectus eras</entry>
-<entry
->auditus eras</entry>
-</row>
-<row>
-<entry
->I had been loved</entry>
-<entry
->amatus erat</entry>
-<entry
->monitus erat</entry>
-<entry
->rectus erat</entry>
-<entry
->auditus erat</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amati eramus</entry>
-<entry
->moniti eramus</entry>
-<entry
->recti eramus</entry>
-<entry
->auditi eramus</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amati eratis</entry>
-<entry
->moniti eratis</entry>
-<entry
->recti eratis</entry>
-<entry
->auditi eratis</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amati erant</entry>
-<entry
->moniti erant</entry>
-<entry
->recti erant</entry>
-<entry
->auditi erant</entry>
+<entry>PLUPERFECT</entry>
+<entry>amatus eram</entry>
+<entry>monitus eram</entry>
+<entry>rectus eram</entry>
+<entry>auditus eram</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amatus eras</entry>
+<entry>monitus eras</entry>
+<entry>rectus eras</entry>
+<entry>auditus eras</entry>
+</row>
+<row>
+<entry>I had been loved</entry>
+<entry>amatus erat</entry>
+<entry>monitus erat</entry>
+<entry>rectus erat</entry>
+<entry>auditus erat</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amati eramus</entry>
+<entry>moniti eramus</entry>
+<entry>recti eramus</entry>
+<entry>auditi eramus</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amati eratis</entry>
+<entry>moniti eratis</entry>
+<entry>recti eratis</entry>
+<entry>auditi eratis</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amati erant</entry>
+<entry>moniti erant</entry>
+<entry>recti erant</entry>
+<entry>auditi erant</entry>
 </row>
 </tbody>
 </tgroup>
@@ -1982,40 +1172,27 @@
 
 <table frame="none">
 <!-- Please translate the title-->
-<title
->Verb listings - Gerundive Passive</title>
+<title>Verb listings - Gerundive Passive</title>
 <tgroup cols="4" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <row>
-<entry
->1st</entry>
-<entry
->2nd</entry>
-<entry
->3rd</entry>
-<entry
->4th</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-</row>
-<row>
-<entry
->am-andus,-a,-um</entry>
-<entry
->mon-endus,-a,-um</entry>
-<entry
->reg-endus,-a,-um</entry>
-<entry
->aud-iendus,-a,-um</entry>
+<entry>1st</entry>
+<entry>2nd</entry>
+<entry>3rd</entry>
+<entry>4th</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+</row>
+<row>
+<entry>am-andus,-a,-um</entry>
+<entry>mon-endus,-a,-um</entry>
+<entry>reg-endus,-a,-um</entry>
+<entry>aud-iendus,-a,-um</entry>
 </row>
 </tbody>
 </tgroup>
@@ -2023,106 +1200,65 @@
 
 <table frame="none">
 <!-- Please translate the title-->
-<title
->Verb listings - Infinitive Passive</title>
+<title>Verb listings - Infinitive Passive</title>
 <tgroup cols="5" colsep="1" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
 <row>
-<entry
->TENSE</entry>
-<entry
->1st</entry>
-<entry
->2nd</entry>
-<entry
->3rd</entry>
-<entry
->4th</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-</row>
-<row>
-<entry
->PRESENT</entry>
-<entry
->am-ari</entry>
-<entry
->mon-eri</entry>
-<entry
->reg-i</entry>
-<entry
->aud-iri</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-</row>
-<row>
-<entry
->PERFECT</entry>
-<entry
->amat-um,-am,-um esse</entry>
-<entry
->monit-um,-am,-um esse</entry>
-<entry
->rect-um,-am,-um esse</entry>
-<entry
->audit-um,-am,-um esse</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
->amat-os,-as,-a esse</entry>
-<entry
->monit-os,-as,-a esse</entry>
-<entry
->rect-os,-as,-a esse</entry>
-<entry
->audit-os,-as,-a esse</entry>
-</row>
-<row>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-<entry
-></entry>
-</row>
-<row>
-<entry
->FUTURE</entry>
-<entry
->amat-um iri</entry>
-<entry
->monit-um iri</entry>
-<entry
->rect-um iri</entry>
-<entry
->audit-um iri</entry>
+<entry>TENSE</entry>
+<entry>1st</entry>
+<entry>2nd</entry>
+<entry>3rd</entry>
+<entry>4th</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+</row>
+<row>
+<entry>PRESENT</entry>
+<entry>am-ari</entry>
+<entry>mon-eri</entry>
+<entry>reg-i</entry>
+<entry>aud-iri</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+</row>
+<row>
+<entry>PERFECT</entry>
+<entry>amat-um,-am,-um esse</entry>
+<entry>monit-um,-am,-um esse</entry>
+<entry>rect-um,-am,-um esse</entry>
+<entry>audit-um,-am,-um esse</entry>
+</row>
+<row>
+<entry></entry>
+<entry>amat-os,-as,-a esse</entry>
+<entry>monit-os,-as,-a esse</entry>
+<entry>rect-os,-as,-a esse</entry>
+<entry>audit-os,-as,-a esse</entry>
+</row>
+<row>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+<entry></entry>
+</row>
+<row>
+<entry>FUTURE</entry>
+<entry>amat-um iri</entry>
+<entry>monit-um iri</entry>
+<entry>rect-um iri</entry>
+<entry>audit-um iri</entry>
 </row>
 </tbody>
 </tgroup>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kmplot/commands.docbook b/tde-i18n-en_GB/docs/tdeedu/kmplot/commands.docbook
index ff3cfda6893..b56b8d066fc 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kmplot/commands.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kmplot/commands.docbook
@@ -1,338 +1,134 @@
 <chapter id="commands">
-<title
->Command Reference</title
-> 
+<title>Command Reference</title> 
 
 <sect1 id="a-file-menu">
-<title
->The <guimenu
->File</guimenu
-> Menu</title>
+<title>The <guimenu>File</guimenu> Menu</title>
 
 <variablelist>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->N</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->New</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>New</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
-><action
->Starts a new Plot by clearing the coordinate system and resetting the function parser.</action
-></para
-> 
+<para><action>Starts a new Plot by clearing the coordinate system and resetting the function parser.</action></para> 
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->O</keycap
-></keycombo
-></shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Open...</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Opens an existing document.</action>
-</para
-></listitem>
+<menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>O</keycap></keycombo></shortcut> <guimenu>File</guimenu> <guimenuitem>Open...</guimenuitem></menuchoice></term>
+<listitem><para><action>Opens an existing document.</action>
+</para></listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->S</keycap
-></keycombo
-></shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Save</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Saves the document.</action
-></para
-></listitem>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo></shortcut> <guimenu>File</guimenu> <guimenuitem>Save</guimenuitem></menuchoice></term>
+<listitem><para><action>Saves the document.</action></para></listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Save As...</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Saves the document under another name.</action
-></para
-></listitem>
+<menuchoice><guimenu>File</guimenu> <guimenuitem>Save As...</guimenuitem></menuchoice></term>
+<listitem><para><action>Saves the document under another name.</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
->Sends the plot to a printer or file.</action
-></para>
+<para><action>Sends the plot to a printer or file.</action></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
-> &Ctrl;<keycap
->Q</keycap
-> </keycombo
-></shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Quit</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Exits</action
-> &kmplot;.</para
-></listitem>
+<menuchoice><shortcut><keycombo action="simul"> &Ctrl;<keycap>Q</keycap> </keycombo></shortcut> <guimenu>File</guimenu> <guimenuitem>Quit</guimenuitem></menuchoice></term>
+<listitem><para><action>Exits</action> &kmplot;.</para></listitem>
 </varlistentry>
 </variablelist>
 </sect1>
 
 <sect1 id="a-view-menu">
-<title
->The <guimenu
->Edit</guimenu
-> Menu</title>
+<title>The <guimenu>Edit</guimenu> Menu</title>
 
 <variablelist>
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Edit</guimenu
-><guimenuitem
->Colours...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Displays the <guilabel
->Colour Settings</guilabel
-> dialogue box. See <xref linkend="configuration"/>. </para>
+<term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Colours...</guimenuitem> </menuchoice></term>
+<listitem><para>Displays the <guilabel>Colour Settings</guilabel> dialogue box. See <xref linkend="configuration"/>. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Edit</guimenu
-><guimenuitem
->Coordinate System...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Displays the <guilabel
->Coordinate System</guilabel
-> dialogue box. See <xref linkend="configuration"/>. </para>
+<term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Coordinate System...</guimenuitem> </menuchoice></term>
+<listitem><para>Displays the <guilabel>Coordinate System</guilabel> dialogue box. See <xref linkend="configuration"/>. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Edit</guimenu
-><guimenuitem
->Scaling...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Displays the <guilabel
->Scaling Settings</guilabel
-> dialogue box. See <xref linkend="configuration"/>. </para>
+<term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Scaling...</guimenuitem> </menuchoice></term>
+<listitem><para>Displays the <guilabel>Scaling Settings</guilabel> dialogue box. See <xref linkend="configuration"/>. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Edit</guimenu
-><guimenuitem
->Fonts...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Displays the <guilabel
->Font Settings</guilabel
-> dialogue box. See <xref linkend="configuration"/>. </para>
+<term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Fonts...</guimenuitem> </menuchoice></term>
+<listitem><para>Displays the <guilabel>Font Settings</guilabel> dialogue box. See <xref linkend="configuration"/>. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Edit</guimenu
-><guimenuitem
->Coordinate System I</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Show both positive and negative x- and y-values on the grid. </para>
+<term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Coordinate System I</guimenuitem> </menuchoice></term>
+<listitem><para>Show both positive and negative x- and y-values on the grid. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Edit</guimenu
-><guimenuitem
->Coordinate System II</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Show positive and negative y-values, but positive x-values only </para>
+<term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Coordinate System II</guimenuitem> </menuchoice></term>
+<listitem><para>Show positive and negative y-values, but positive x-values only </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Edit</guimenu
-><guimenuitem
->Coordinate System III</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Show only positive x- and y-values. </para>
+<term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Coordinate System III</guimenuitem> </menuchoice></term>
+<listitem><para>Show only positive x- and y-values. </para>
 </listitem>
 </varlistentry>
 </variablelist>
 </sect1>
 
 <sect1 id="a-functions-menu">
-<title
->The <guimenu
->Plot</guimenu
-> Menu</title>
+<title>The <guimenu>Plot</guimenu> Menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Functions</guimenu
-> <guimenuitem
->New Function Plot...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Functions</guimenu> <guimenuitem>New Function Plot...</guimenuitem> </menuchoice>
 </term>
-<listitem
-><para
->Opens the dialogue for creating a new function plot. See <xref linkend="using-kmplot"/>.</para
-></listitem>
+<listitem><para>Opens the dialogue for creating a new function plot. See <xref linkend="using-kmplot"/>.</para></listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Functions</guimenu
-> <guimenuitem
->New Parametric Plot...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Functions</guimenu> <guimenuitem>New Parametric Plot...</guimenuitem> </menuchoice>
 </term>
-<listitem
-><para
->Opens the dialogue for creating a new parametric plot. See <xref linkend="using-kmplot"/>.</para
-></listitem>
+<listitem><para>Opens the dialogue for creating a new parametric plot. See <xref linkend="using-kmplot"/>.</para></listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Functions</guimenu
-> <guimenuitem
->New Polar Plot...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Functions</guimenu> <guimenuitem>New Polar Plot...</guimenuitem> </menuchoice>
 </term>
-<listitem
-><para
->Opens the dialogue for creating a new polar plot. See <xref linkend="using-kmplot"/>.</para
-></listitem>
+<listitem><para>Opens the dialogue for creating a new polar plot. See <xref linkend="using-kmplot"/>.</para></listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Functions</guimenu
-> <guimenuitem
->Edit Plots...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Functions</guimenu> <guimenuitem>Edit Plots...</guimenuitem> </menuchoice>
 </term>
-<listitem
-><para
->Displays the functions dialogue. There you can add, edit and remove functions. See <xref linkend="using-kmplot"/>.</para
-></listitem>
+<listitem><para>Displays the functions dialogue. There you can add, edit and remove functions. See <xref linkend="using-kmplot"/>.</para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -340,26 +136,14 @@
 </sect1>
 
 <sect1 id="a-zoom-menu">
-<title
->The <guimenu
->Zoom</guimenu
-> Menu</title>
-<para
->The first five items in the menu change zoom-mode.</para>
+<title>The <guimenu>Zoom</guimenu> Menu</title>
+<para>The first five items in the menu change zoom-mode.</para>
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Zoom</guimenu
-> <guimenuitem
->No Zoom</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Zoom</guimenu> <guimenuitem>No Zoom</guimenuitem> </menuchoice>
 </term>
-<listitem
-><para
->Disable the zoom-mode.</para
-></listitem>
+<listitem><para>Disable the zoom-mode.</para></listitem>
 </varlistentry>
 </variablelist>
 
@@ -367,85 +151,45 @@
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Zoom</guimenu
-> <guimenuitem
->Zoom rectangular</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Zoom</guimenu> <guimenuitem>Zoom rectangular</guimenuitem> </menuchoice>
 </term>
-<listitem
-><para
->Let the user draw a rectangle. The minimum and maximum values will be set to the coordinates of the rectangle.</para
-></listitem>
+<listitem><para>Let the user draw a rectangle. The minimum and maximum values will be set to the coordinates of the rectangle.</para></listitem>
 </varlistentry>
 </variablelist>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Zoom</guimenu
-> <guimenuitem
->Zoom in</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Zoom</guimenu> <guimenuitem>Zoom in</guimenuitem> </menuchoice>
 </term>
-<listitem
-><para
->The minimum and maximum values will come closer to each other and the selected point in the graph will be centred.</para
-></listitem>
+<listitem><para>The minimum and maximum values will come closer to each other and the selected point in the graph will be centred.</para></listitem>
 </varlistentry>
 </variablelist>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Zoom</guimenu
-> <guimenuitem
->Zoom out</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Zoom</guimenu> <guimenuitem>Zoom out</guimenuitem> </menuchoice>
 </term>
-<listitem
-><para
->The minimum and maximum values will be more separated from each other and the selected point in the graph will be centred.</para
-></listitem>
+<listitem><para>The minimum and maximum values will be more separated from each other and the selected point in the graph will be centred.</para></listitem>
 </varlistentry>
 </variablelist>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Zoom</guimenu
-> <guimenuitem
->Centre a point</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Zoom</guimenu> <guimenuitem>Centre a point</guimenuitem> </menuchoice>
 </term>
-<listitem
-><para
->The selected point in the graph will be centred.</para
-></listitem>
+<listitem><para>The selected point in the graph will be centred.</para></listitem>
 </varlistentry>
 </variablelist>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Zoom</guimenu
-> <guimenuitem
->Fit widget to trigonometric functions</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Zoom</guimenu> <guimenuitem>Fit widget to trigonometric functions</guimenuitem> </menuchoice>
 </term>
-<listitem
-><para
->The scale will be adapted to trigonometric functions. This works both for radians and degrees.</para
-></listitem>
+<listitem><para>The scale will be adapted to trigonometric functions. This works both for radians and degrees.</para></listitem>
 </varlistentry>
 </variablelist>
 
@@ -453,94 +197,41 @@
 
 
 <sect1 id="a-settings-menu">
-<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
-></term>
+<term><menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Toolbar</guimenuitem> </menuchoice></term>
 <listitem>
-<para
-><action
->Toggle on and off the display of the toolbar.</action
-> The default is on.</para>
+<para><action>Toggle on and off the display of the toolbar.</action> The default is on.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show Statusbar</guimenuitem
-> </menuchoice
-></term>
+<term><menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Statusbar</guimenuitem> </menuchoice></term>
 <listitem>
-<para
-><action
->Toggle on and off the display of the statusbar at the bottom of the &kmplot; main window.</action
-> The default is on.</para>
+<para><action>Toggle on and off the display of the statusbar at the bottom of the &kmplot; main window.</action> The default is on.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Shortcuts...</guimenuitem
-> </menuchoice
-></term>
+<term><menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Shortcuts...</guimenuitem> </menuchoice></term>
 <listitem>
-<para
-><action
->Personalise the keybindings</action
-> for &kmplot;.</para>
+<para><action>Personalise the keybindings</action> for &kmplot;.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Toolbars...</guimenuitem
-> </menuchoice
-></term>
+<term><menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Toolbars...</guimenuitem> </menuchoice></term>
 <listitem>
-<para
-><action
->Personalise the toolbars</action
-> for &kmplot;.</para>
+<para><action>Personalise the toolbars</action> for &kmplot;.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure &kmplot;</guimenuitem
-> </menuchoice
-></term>
+<term><menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure &kmplot;</guimenuitem> </menuchoice></term>
 <listitem>
-<para
-><action
->Customise</action
-> &kmplot;. The options available to you are described in <xref linkend="configuration"/>.</para>
+<para><action>Customise</action> &kmplot;. The options available to you are described in <xref linkend="configuration"/>.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -548,64 +239,35 @@
 </sect1>
 
 <sect1 id="a-tools-menu">
-<title
->The <guimenu
->Tools</guimenu
-> Menu</title>
+<title>The <guimenu>Tools</guimenu> Menu</title>
 
-<para
->This menu constains some tools for the functions that can be useful:</para>
+<para>This menu constains some tools for the functions that can be useful:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Get y-value</guimenuitem
-> </menuchoice
-></term>
+<term><menuchoice><guimenu>Tools</guimenu> <guimenuitem>Get y-value</guimenuitem> </menuchoice></term>
 <listitem>
-<para
->Let the user get the y-value from a specific x-value. At the moment, only plot functions are supported. Type a value or expression in the textbox under "X:". In the list below all the available functions are shown. Press the "Calculate" button to find the function's y-value. The result will be shown in the y-value box.</para>
+<para>Let the user get the y-value from a specific x-value. At the moment, only plot functions are supported. Type a value or expression in the textbox under "X:". In the list below all the available functions are shown. Press the "Calculate" button to find the function's y-value. The result will be shown in the y-value box.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 </sect1>
 
 <sect1 id="a-help-menu">
-<title
->The <guimenu
->Help</guimenu
-> Menu</title>
+<title>The <guimenu>Help</guimenu> Menu</title>
 
-<para
->&kmplot; has a standard &kde; <guimenu
->Help</guimenu
-> as described below, with one addition:</para>
+<para>&kmplot; has a standard &kde; <guimenu>Help</guimenu> as described below, with one addition:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Help</guimenu
-> <guimenuitem
->Names...</guimenuitem
-> </menuchoice
-></term>
+<term><menuchoice><guimenu>Help</guimenu> <guimenuitem>Names...</guimenuitem> </menuchoice></term>
 <listitem>
-<para
->Opens a window with a list of the predefined function names and constants that &kmplot; knows.</para>
+<para>Opens a window with a list of the predefined function names and constants that &kmplot; knows.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->The standard &kde; <guimenu
->Help</guimenu
-> entries are:</para>
+<para>The standard &kde; <guimenu>Help</guimenu> entries are:</para>
 &help.menu.documentation; </sect1>
 
 
diff --git a/tde-i18n-en_GB/docs/tdeedu/kmplot/configuration.docbook b/tde-i18n-en_GB/docs/tdeedu/kmplot/configuration.docbook
index 89ed12f53c0..a696a9ddbcd 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kmplot/configuration.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kmplot/configuration.docbook
@@ -1,45 +1,23 @@
 <chapter id="configuration">
-<title
->Configuring &kmplot;</title
-> 
-<para
->To access the &kmplot; configuration dialogue, select <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KmPlot...</guimenuitem
-></menuchoice
->. A number of settings can also be changed from options in the <guimenu
->Edit</guimenu
-> menu, as well. </para>
+<title>Configuring &kmplot;</title> 
+<para>To access the &kmplot; configuration dialogue, select <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KmPlot...</guimenuitem></menuchoice>. A number of settings can also be changed from options in the <guimenu>Edit</guimenu> menu, as well. </para>
 
 <note>
-<para
->Settings changed in the &kmplot; configuration dialogue become the default for &kmplot;, and only take effect when a new plot is started. Settings changed in the <guimenu
->View</guimenu
-> menu take effect immediately, but do not persist after &kmplot; is exited.</para>
+<para>Settings changed in the &kmplot; configuration dialogue become the default for &kmplot;, and only take effect when a new plot is started. Settings changed in the <guimenu>View</guimenu> menu take effect immediately, but do not persist after &kmplot; is exited.</para>
 </note>
 
 <sect1 id="general-config">
-<title
-><guilabel
->General</guilabel
-> Configuration</title>
-<para
->Here you can set global settings which automatic will be saved when you exit &kmplot;. In the first tab you can set calculation-precision, angle-mode (radians and degrees), background colour and zoom in and zoom out factors. </para
-><para
->The second tab let you define you own constants. &kmplot; saves the constains in the same file as KCalc does. That means you can create a constant in &kmplot;, close the program and load it in KCalc and vice versa. &kmplot; only supports constant names that consist one capital character and if you in KCalc define a constant name that is not one character, the name will be truncated. E.g, if you already have the constants "apple" and "bananas" in KCalc, they will be renamed to "A" and "B" in &kmplot;.</para>
+<title><guilabel>General</guilabel> Configuration</title>
+<para>Here you can set global settings which automatic will be saved when you exit &kmplot;. In the first tab you can set calculation-precision, angle-mode (radians and degrees), background colour and zoom in and zoom out factors. </para><para>The second tab let you define you own constants. &kmplot; saves the constains in the same file as KCalc does. That means you can create a constant in &kmplot;, close the program and load it in KCalc and vice versa. &kmplot; only supports constant names that consist one capital character and if you in KCalc define a constant name that is not one character, the name will be truncated. E.g, if you already have the constants "apple" and "bananas" in KCalc, they will be renamed to "A" and "B" in &kmplot;.</para>
 
 <screenshot>
-<screeninfo
->Here is a screenshot of the &kmplot; welcome window</screeninfo>
+<screeninfo>Here is a screenshot of the &kmplot; welcome window</screeninfo>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="settingsdlg.png" format="PNG"/>
 	  </imageobject>
 	  <textobject>
-	    <phrase
->Screenshot</phrase>
+	    <phrase>Screenshot</phrase>
 	  </textobject>
 	</mediaobject>
 </screenshot>
@@ -48,115 +26,58 @@
 
 
 <sect1 id="colors-config">
-<title
-><guilabel
->Colours</guilabel
-> Configuration</title>
-<para
->In the <guilabel
->Coords</guilabel
-> tab of the <guilabel
->Colours</guilabel
-> configuration option, you can change the colours of the axes and grid of the main &kmplot; area.</para>
-<para
->In the <guilabel
->Functions</guilabel
-> tab, you can change the colours used for the graphs of the ten functions allowed in &kmplot;.</para>
+<title><guilabel>Colours</guilabel> Configuration</title>
+<para>In the <guilabel>Coords</guilabel> tab of the <guilabel>Colours</guilabel> configuration option, you can change the colours of the axes and grid of the main &kmplot; area.</para>
+<para>In the <guilabel>Functions</guilabel> tab, you can change the colours used for the graphs of the ten functions allowed in &kmplot;.</para>
 </sect1>
 
 <sect1 id="coords-config">
-<title
-><guilabel
->Coords</guilabel
-> Configuration</title>
+<title><guilabel>Coords</guilabel> Configuration</title>
 
 <sect2 id="axes-config">
-<title
->The <guilabel
->Axes</guilabel
-> Configuration</title>
+<title>The <guilabel>Axes</guilabel> Configuration</title>
 <para>
 <variablelist>
 
 <varlistentry>
-<term
-><guilabel
->X-Axis</guilabel
-></term>
+<term><guilabel>X-Axis</guilabel></term>
 <listitem>
-<para
->Sets the range for the x-axis scale. You can choose one of the predefined ranges, or select <guilabel
->Custom</guilabel
-> to make your own. Note that in the <guilabel
->Custom</guilabel
-> boxes, you can use the predefined functions and constants (see <xref linkend="func-predefined"/>) as the extremes of the range (&eg;, set <guilabel
->min:</guilabel
-> to <userinput
->2*pi</userinput
->). You can even use functions you have defined to set the extremes of the axis range. For example, if you have defined a function <userinput
->f(x)=x^2</userinput
->, you could set <guilabel
->min:</guilabel
-> to <userinput
->f(3)</userinput
->, which would make the lower end of the range equal to 9.</para>
+<para>Sets the range for the x-axis scale. You can choose one of the predefined ranges, or select <guilabel>Custom</guilabel> to make your own. Note that in the <guilabel>Custom</guilabel> boxes, you can use the predefined functions and constants (see <xref linkend="func-predefined"/>) as the extremes of the range (&eg;, set <guilabel>min:</guilabel> to <userinput>2*pi</userinput>). You can even use functions you have defined to set the extremes of the axis range. For example, if you have defined a function <userinput>f(x)=x^2</userinput>, you could set <guilabel>min:</guilabel> to <userinput>f(3)</userinput>, which would make the lower end of the range equal to 9.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Y-Axis</guilabel
-></term>
+<term><guilabel>Y-Axis</guilabel></term>
 <listitem>
-<para
->Sets the range for the y-axis. See <quote
->X-Axis</quote
-> above.</para>
+<para>Sets the range for the y-axis. See <quote>X-Axis</quote> above.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Axes line width</guilabel
-></term>
+<term><guilabel>Axes line width</guilabel></term>
 <listitem>
-<para
->Sets the width of the lines representing the axes.</para>
+<para>Sets the width of the lines representing the axes.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Tic width</guilabel
-></term>
+<term><guilabel>Tic width</guilabel></term>
 <listitem>
-<para
->Sets the width of the lines representing tics on the axes.</para>
+<para>Sets the width of the lines representing tics on the axes.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Tic length</guilabel
-></term>
+<term><guilabel>Tic length</guilabel></term>
 <listitem>
-<para
->Sets the length of the lines representing tics on the axes.</para>
+<para>Sets the length of the lines representing tics on the axes.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Labels</guilabel
-></term>
+<term><guilabel>Labels</guilabel></term>
 <listitem>
-<para
->If checked, the names (x, y) of the axes are shown on the plot.</para>
+<para>If checked, the names (x, y) of the axes are shown on the plot.</para>
 </listitem>
 </varlistentry>
 
@@ -166,101 +87,52 @@
 </sect2>
 
 <sect2 id="grid-config">
-<title
->The <guilabel
->Grid</guilabel
-> Configuration</title>
-<para
->You can set the <guilabel
->Grid Style</guilabel
-> to one of four options: <variablelist>
+<title>The <guilabel>Grid</guilabel> Configuration</title>
+<para>You can set the <guilabel>Grid Style</guilabel> to one of four options: <variablelist>
 
 <varlistentry>
-<term
-><guilabel
->No Grid</guilabel
-></term>
+<term><guilabel>No Grid</guilabel></term>
 <listitem>
-<para
->No gridlines are drawn on the plot area</para>
+<para>No gridlines are drawn on the plot area</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Lines</guilabel
-></term>
+<term><guilabel>Lines</guilabel></term>
 <listitem>
-<para
->Straight lines form a grid of squares on the plot area.</para>
+<para>Straight lines form a grid of squares on the plot area.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Crosses</guilabel
-></term>
+<term><guilabel>Crosses</guilabel></term>
 <listitem>
-<para
->Crosses are drawn to indicate points where x and y have integer values (&eg;, (1,1), (4,2) &etc;).</para>
+<para>Crosses are drawn to indicate points where x and y have integer values (&eg;, (1,1), (4,2) &etc;).</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Polar Grid</guilabel
-></term>
+<term><guilabel>Polar Grid</guilabel></term>
 <listitem>
-<para
->Lines of constant radius and of constant angle are drawn on the plot area.</para>
+<para>Lines of constant radius and of constant angle are drawn on the plot area.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 </para>
-<para
->The <guilabel
->Line width</guilabel
-> option is used to set the width of the lines of the grid.</para>
+<para>The <guilabel>Line width</guilabel> option is used to set the width of the lines of the grid.</para>
 </sect2>
 
 <sect2 id="font-config">
-<title
->The <guilabel
->Fonts</guilabel
-> Configuration</title>
-<para
-><guilabel
->Header table</guilabel
-> sets the font for the information table shown in &kmplot; printouts, and <guilabel
->Axes labels</guilabel
-> sets the font used for all labels on the axes in the plot area.</para>
+<title>The <guilabel>Fonts</guilabel> Configuration</title>
+<para><guilabel>Header table</guilabel> sets the font for the information table shown in &kmplot; printouts, and <guilabel>Axes labels</guilabel> sets the font used for all labels on the axes in the plot area.</para>
 </sect2>
 
 </sect1>
 
 <sect1 id="scaling-config">
-<title
-><guilabel
->Scaling</guilabel
-> Configuration</title>
+<title><guilabel>Scaling</guilabel> Configuration</title>
 
-<para
->For each axis, you can set the <guilabel
->Scaling</guilabel
-> and <guilabel
->Printing</guilabel
-> of one tic. The <guilabel
->Scaling</guilabel
-> option selects how many units apart the axis tics will be (and therefore, how far apart grid lines will be drawn), and the <guilabel
->Printing</guilabel
-> option selects the length of one tic when displayed on the screen or printed. In this way, these options can be used to change the size of the graph on screen or on a page: For example, doubling the <guilabel
->Printing</guilabel
-> setting whilst keeping the <guilabel
->Scaling</guilabel
-> setting the same will result in the graph doubling in in height or width.</para>
+<para>For each axis, you can set the <guilabel>Scaling</guilabel> and <guilabel>Printing</guilabel> of one tic. The <guilabel>Scaling</guilabel> option selects how many units apart the axis tics will be (and therefore, how far apart grid lines will be drawn), and the <guilabel>Printing</guilabel> option selects the length of one tic when displayed on the screen or printed. In this way, these options can be used to change the size of the graph on screen or on a page: For example, doubling the <guilabel>Printing</guilabel> setting whilst keeping the <guilabel>Scaling</guilabel> setting the same will result in the graph doubling in in height or width.</para>
 </sect1>
 
 </chapter>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kmplot/credits.docbook b/tde-i18n-en_GB/docs/tdeedu/kmplot/credits.docbook
index 4bfbcd13e51..ea9a1a7f8db 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kmplot/credits.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kmplot/credits.docbook
@@ -1,56 +1,27 @@
 <chapter id="credits">
-<title
->Credits and Licence</title>
+<title>Credits and Licence</title>
 
-<para
->&kmplot; </para>
+<para>&kmplot; </para>
 
-<para
->Program copyright 2000-2002 Klaus-Dieter M&ouml;ller <email
->kd.moeller@t-online.de</email
-> </para>
+<para>Program copyright 2000-2002 Klaus-Dieter M&ouml;ller <email>kd.moeller@t-online.de</email> </para>
 
 <itemizedlist>
-<title
->Contributors</title>
+<title>Contributors</title>
   <listitem>
-    <para
-><acronym
->CVS</acronym
->: Robert Gogolok <email
->mail@robert-gogoloh.de</email
-></para>
+    <para><acronym>CVS</acronym>: Robert Gogolok <email>mail@robert-gogoloh.de</email></para>
   </listitem>
   <listitem>
-    <para
->Porting &GUI; to &kde; 3 and Translating: Matthias Messmer <email
->bmlmessmer@web.de</email
-></para>
+    <para>Porting &GUI; to &kde; 3 and Translating: Matthias Messmer <email>bmlmessmer@web.de</email></para>
   </listitem>
   <listitem>
-    <para
->Various improvements: Fredrik Edemar <email
->f_edemar@linux.se</email
-></para>
-  </listitem
->  
+    <para>Various improvements: Fredrik Edemar <email>f_edemar@linux.se</email></para>
+  </listitem>  
 </itemizedlist>
 
-<para
->Documentation copyright 2000--2002 by Klaus-Dieter M&ouml;ller <email
->kd.moeller@t-online.de</email
->. </para>
-<para
->Documentation extended and updated for &kde; 3.2 by &Philip.Rodrigues; &Philip.Rodrigues.mail;.</para>
-<para
->Documentation extended and updated for &kde; 3.3 by &Philip.Rodrigues; &Philip.Rodrigues.mail; and Fredrik Edemar <email
->f_edemar@linux.se</email
->.</para>
-<para
->Andrew Coles<email
->andrew_coles@yahoo.co.uk</email
-></para
-> 
+<para>Documentation copyright 2000--2002 by Klaus-Dieter M&ouml;ller <email>kd.moeller@t-online.de</email>. </para>
+<para>Documentation extended and updated for &kde; 3.2 by &Philip.Rodrigues; &Philip.Rodrigues.mail;.</para>
+<para>Documentation extended and updated for &kde; 3.3 by &Philip.Rodrigues; &Philip.Rodrigues.mail; and Fredrik Edemar <email>f_edemar@linux.se</email>.</para>
+<para>Andrew Coles<email>andrew_coles@yahoo.co.uk</email></para> 
 &underFDL; &underGPL; </chapter>
 
 <!--
diff --git a/tde-i18n-en_GB/docs/tdeedu/kmplot/developer.docbook b/tde-i18n-en_GB/docs/tdeedu/kmplot/developer.docbook
index 926abaf07b7..885865b69d4 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kmplot/developer.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kmplot/developer.docbook
@@ -1,13 +1,7 @@
 <chapter id="developers">
-<title
->Developer's Guide to &kmplot;</title>
+<title>Developer's Guide to &kmplot;</title>
 
-<para
->If you want to contribute to &kmplot; feel free to send a mail to <email
->kd.moeller@t-online.de</email
-> or <email
->f_edemar@linux.se</email
-> </para>
+<para>If you want to contribute to &kmplot; feel free to send a mail to <email>kd.moeller@t-online.de</email> or <email>f_edemar@linux.se</email> </para>
 
 </chapter>
 
diff --git a/tde-i18n-en_GB/docs/tdeedu/kmplot/firststeps.docbook b/tde-i18n-en_GB/docs/tdeedu/kmplot/firststeps.docbook
index 2bd4bc1b9cb..79316ac3671 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kmplot/firststeps.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kmplot/firststeps.docbook
@@ -1,70 +1,29 @@
 <chapter id="first-steps">
-<title
->First Steps With &kmplot;</title>
+<title>First Steps With &kmplot;</title>
 
 <sect1 id="simple-function-plot">
-<title
->Simple Function Plot</title>
+<title>Simple Function Plot</title>
 
-<para
->In the main toolbar there is a simple text box in which you can enter a function expression. Simply enter: <screen
-><userinput
->x^2</userinput
-></screen
-> and press &Enter;. This will draw the plot of y=x^2 in the coordinate system. Enter another expression in the text box like <screen
-><userinput
->5*sin(x)</userinput
-></screen
-> and another plot will be added. </para>
+<para>In the main toolbar there is a simple text box in which you can enter a function expression. Simply enter: <screen><userinput>x^2</userinput></screen> and press &Enter;. This will draw the plot of y=x^2 in the coordinate system. Enter another expression in the text box like <screen><userinput>5*sin(x)</userinput></screen> and another plot will be added. </para>
 
-<para
->Click on one of the lines you have just plotted. Now the cross hair gets the colour of the plot and is attached to the plot. You can use the mouse to move the cross hair along the plot. In the status bar at the bottom of the window the coordinates of the current position is displayed. Note that if the plot touches the x-axis the root will be displayed in the status bar, too.</para>
+<para>Click on one of the lines you have just plotted. Now the cross hair gets the colour of the plot and is attached to the plot. You can use the mouse to move the cross hair along the plot. In the status bar at the bottom of the window the coordinates of the current position is displayed. Note that if the plot touches the x-axis the root will be displayed in the status bar, too.</para>
 
-<para
->Click the mouse again and the cross hair will be detached from the plot.</para>
+<para>Click the mouse again and the cross hair will be detached from the plot.</para>
 </sect1>
 
 <sect1 id="edit-properties">
-<title
->Edit Properties</title>
+<title>Edit Properties</title>
 
-<para
->Let us make some changes to the function and change the colour of the plot.</para>
+<para>Let us make some changes to the function and change the colour of the plot.</para>
 
-<para
->You can edit all functions with the <menuchoice
-><guimenu
->Plot</guimenu
-><guimenuitem
->Edit Plots...</guimenuitem
-> </menuchoice
-> menu entry. A dialogue appears which lists all the functions that you have plotted. Notice that &kmplot; has automatically found a unique function name for your expressions and completed the expression to a function equation.</para>
+<para>You can edit all functions with the <menuchoice><guimenu>Plot</guimenu><guimenuitem>Edit Plots...</guimenuitem> </menuchoice> menu entry. A dialogue appears which lists all the functions that you have plotted. Notice that &kmplot; has automatically found a unique function name for your expressions and completed the expression to a function equation.</para>
 
-<para
->Select <guilabel
->f(x)=x^2</guilabel
-> in the list. A double click or pressing the <guibutton
->Edit</guibutton
-> button will show you a dialogue window. Here you have access to a lot of options. Let us rename the function and move the plot 5 units down. Change the function equation to <screen
-><userinput
->parabola(x)=x^2-5</userinput
-></screen>
+<para>Select <guilabel>f(x)=x^2</guilabel> in the list. A double click or pressing the <guibutton>Edit</guibutton> button will show you a dialogue window. Here you have access to a lot of options. Let us rename the function and move the plot 5 units down. Change the function equation to <screen><userinput>parabola(x)=x^2-5</userinput></screen>
 </para>
 
-<para
->Select another colour for the plot using the <guibutton
->Color</guibutton
-> button. Finally press <guibutton
->OK</guibutton
-> and your changes take effect in the coordinate system.</para>
+<para>Select another colour for the plot using the <guibutton>Color</guibutton> button. Finally press <guibutton>OK</guibutton> and your changes take effect in the coordinate system.</para>
 
-<note
-><para
->All changes can be undone until you press <guibutton
->OK</guibutton
-> in the <guilabel
->Edit Plots</guilabel
-> dialogue.</para>
+<note><para>All changes can be undone until you press <guibutton>OK</guibutton> in the <guilabel>Edit Plots</guilabel> dialogue.</para>
 </note>
 
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kmplot/index.docbook b/tde-i18n-en_GB/docs/tdeedu/kmplot/index.docbook
index 4fc94bce89d..43e7f16fb61 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kmplot/index.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kmplot/index.docbook
@@ -1,8 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
-  <!ENTITY kappname "&kmplot;"
-><!-- replace kmplot here -->
+  <!ENTITY kappname "&kmplot;"><!-- replace kmplot here -->
   <!ENTITY package "tdeedu">
   <!ENTITY introduction SYSTEM "introduction.docbook">
   <!ENTITY firststeps SYSTEM "firststeps.docbook">
@@ -15,108 +14,54 @@
   <!ENTITY reference SYSTEM "reference.docbook">
   <!ENTITY configuration SYSTEM "configuration.docbook">
   <!ENTITY % addindex "IGNORE">
-  <!ENTITY % British-English "INCLUDE"
-><!-- change language only here -->
+  <!ENTITY % British-English "INCLUDE"><!-- change language only here -->
 ]>
 <!-- The language must NOT be changed here. -->
 
 <book lang="&language;">
 
 <bookinfo>
-<title
->The &kmplot; Handbook</title>
+<title>The &kmplot; Handbook</title>
 <authorgroup>
-<author
-><firstname
->Klaus-Dieter</firstname
-> <othername
-></othername
-> <surname
->M&ouml;ller</surname
-> <affiliation
-> <address
-><email
->kd.moeller@t-online.de</email
-></address>
+<author><firstname>Klaus-Dieter</firstname> <othername></othername> <surname>M&ouml;ller</surname> <affiliation> <address><email>kd.moeller@t-online.de</email></address>
 </affiliation>
 </author>
-<author
->&Philip.Rodrigues; &Philip.Rodrigues.mail; </author>
+<author>&Philip.Rodrigues; &Philip.Rodrigues.mail; </author>
 </authorgroup>
 
-<othercredit role="translator"
-><firstname
->Andrew</firstname
-><surname
->Coles</surname
-><affiliation
-><address
-><email
->andrew_coles@yahoo.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Andrew</firstname><surname>Coles</surname><affiliation><address><email>andrew_coles@yahoo.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 
 <copyright>
-<year
->2000</year
-><year
->2001</year
-><year
->2002</year>
-<holder
->Klaus-Dieter M&ouml;ller</holder>
+<year>2000</year><year>2001</year><year>2002</year>
+<holder>Klaus-Dieter M&ouml;ller</holder>
 </copyright>
 
 <copyright>
-<year
->2003</year>
-<holder
->&Philip.Rodrigues; &Philip.Rodrigues.mail;</holder>
+<year>2003</year>
+<holder>&Philip.Rodrigues; &Philip.Rodrigues.mail;</holder>
 </copyright>
 
-<legalnotice
->&FDLNotice;</legalnotice>
+<legalnotice>&FDLNotice;</legalnotice>
 
-<date
->2003-09-25</date>
-<releaseinfo
->1.0</releaseinfo>
+<date>2003-09-25</date>
+<releaseinfo>1.0</releaseinfo>
 
 <!-- Abstract about this handbook -->
 
 <abstract>
-<para
->&kmplot; is a mathematical function plotter for the &kde; Desktop.</para>
-<para
-> <inlinemediaobject
-><imageobject
-><imagedata
+<para>&kmplot; is a mathematical function plotter for the &kde; Desktop.</para>
+<para> <inlinemediaobject><imageobject><imagedata
 fileref="edu-logo.png"
-format="PNG"/></imageobject
-></inlinemediaobject
-> &kmplot; is part of the KDE-EDU Project: <ulink url="http://edu.kde.org/"
->http://edu.kde.org/</ulink
-></para
-></abstract>
+format="PNG"/></imageobject></inlinemediaobject> &kmplot; is part of the KDE-EDU Project: <ulink url="http://edu.kde.org/">http://edu.kde.org/</ulink></para></abstract>
 
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KMPlot</keyword>
-<keyword
->EDU</keyword>
-<keyword
->edutainment</keyword>
-<keyword
->plotting</keyword>
-<keyword
->math</keyword>
+<keyword>KDE</keyword>
+<keyword>KMPlot</keyword>
+<keyword>EDU</keyword>
+<keyword>edutainment</keyword>
+<keyword>plotting</keyword>
+<keyword>math</keyword>
 </keywordset>
 
 </bookinfo>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kmplot/install.docbook b/tde-i18n-en_GB/docs/tdeedu/kmplot/install.docbook
index 63119be75fe..c6d037cbe2f 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kmplot/install.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kmplot/install.docbook
@@ -1,25 +1,17 @@
 <appendix id="installation">
-<title
->Installation</title>
+<title>Installation</title>
 
 &install.intro.documentation;
 
 <mediaobject>
-<imageobject
->			
+<imageobject>			
 <imagedata fileref="edu-logo.png" format="PNG"/>
 </imageobject>
 </mediaobject>
 
-<para
->&kmplot; is part of the &kde; EDU Project: <ulink url="http://edu.kde.org/"
->http://edu.kde.org/</ulink
-></para>
+<para>&kmplot; is part of the &kde; EDU Project: <ulink url="http://edu.kde.org/">http://edu.kde.org/</ulink></para>
 
-<para
->&kmplot; has its own homepage on <ulink url="http://kmplot.sourceforge.net"
->SourceForge</ulink
->. You can also find archives of older versions of &kmplot; there, for example, for &kde; 2.x</para>
+<para>&kmplot; has its own homepage on <ulink url="http://kmplot.sourceforge.net">SourceForge</ulink>. You can also find archives of older versions of &kmplot; there, for example, for &kde; 2.x</para>
 
 &install.compile.documentation;
 
diff --git a/tde-i18n-en_GB/docs/tdeedu/kmplot/introduction.docbook b/tde-i18n-en_GB/docs/tdeedu/kmplot/introduction.docbook
index bd019128b9e..8450b4612e2 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kmplot/introduction.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kmplot/introduction.docbook
@@ -1,47 +1,23 @@
 <chapter id="introduction">
-<title
->Introduction</title>
+<title>Introduction</title>
 
-<para
->&kmplot; is a mathematical function plotter for the &kde; Desktop. It has a powerful built-in parser. You can plot different functions simultaneously and combine them to build new functions.</para>
+<para>&kmplot; is a mathematical function plotter for the &kde; Desktop. It has a powerful built-in parser. You can plot different functions simultaneously and combine them to build new functions.</para>
 
 <screenshot>
-<screeninfo
->Examples</screeninfo>
+<screeninfo>Examples</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="threeplots.png" format="PNG"/>
 </imageobject>
 <textobject>
-<phrase
->Examples</phrase>
+<phrase>Examples</phrase>
 </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->&kmplot; supports parametric functions and functions in polar coordinates. Several grid modes are supported. Plots may be printed with high precision in the correct scale.</para>
+<para>&kmplot; supports parametric functions and functions in polar coordinates. Several grid modes are supported. Plots may be printed with high precision in the correct scale.</para>
 
-<para
->&kmplot; also provides some numerical an visual features like: <itemizedlist
-> <listitem
-><para
->Filling and calculating the area between the plot and the first axis</para
-> </listitem
-> <listitem
-><para
->Finding maximum and minimum values</para
-> </listitem
-> <listitem
-><para
->Changing function parameters dynamically</para
-> </listitem
-> <listitem
-><para
->Plotting derivatives and integral functions.</para
-> </listitem
-> </itemizedlist
-> These features help in learning the relationship between mathematical functions and their graphical representation in a coordinate system.</para>
+<para>&kmplot; also provides some numerical an visual features like: <itemizedlist> <listitem><para>Filling and calculating the area between the plot and the first axis</para> </listitem> <listitem><para>Finding maximum and minimum values</para> </listitem> <listitem><para>Changing function parameters dynamically</para> </listitem> <listitem><para>Plotting derivatives and integral functions.</para> </listitem> </itemizedlist> These features help in learning the relationship between mathematical functions and their graphical representation in a coordinate system.</para>
 
 </chapter>
 
diff --git a/tde-i18n-en_GB/docs/tdeedu/kmplot/menu.docbook b/tde-i18n-en_GB/docs/tdeedu/kmplot/menu.docbook
index a95730f1f30..837f45c4b1d 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kmplot/menu.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kmplot/menu.docbook
@@ -1,122 +1,57 @@
 <chapter id="menu-entries">
-<title
->The Menu Entries</title>
+<title>The Menu Entries</title>
 
 <sect1 id="file-menu">
-<title
->The <guimenu
->File</guimenu
-> Menu</title>
+<title>The <guimenu>File</guimenu> Menu</title>
 <para>
 <variablelist>
 
 <varlistentry>
   <term>
-    <menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->N</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->New</guimenuitem
-> </menuchoice>
+    <menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>New</guimenuitem> </menuchoice>
   </term>
   <listitem>
-    <para
-><action
->Starts a new Plot by clearing the coordinate system and resetting the function parser.</action
-></para
-> 
+    <para><action>Starts a new Plot by clearing the coordinate system and resetting the function parser.</action></para> 
   </listitem>
 </varlistentry>
 
 <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 document</action>
+      <action>Saves the document</action>
     </para>
   </listitem>
 </varlistentry>
 
 <varlistentry>
   <term>
-    <menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Save As...</guimenuitem
-> </menuchoice>
+    <menuchoice><guimenu>File</guimenu> <guimenuitem>Save As...</guimenuitem> </menuchoice>
   </term>
   <listitem>
     <para>
-      <action
->Saves the document to a specific file</action>
+      <action>Saves the document to a specific 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
->Sends the plot to the printer or to a file</action
-></para>
+    <para><action>Sends the plot to the printer or to a file</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</action
-> &kmplot;</para>
+    <para><action>Quits</action> &kmplot;</para>
   </listitem>
 </varlistentry>
 </variablelist>
@@ -125,33 +60,15 @@
 </sect1>
 
 <sect1 id="func-menu">
-<title
->The <guimenu
->Functions</guimenu
-> Menu</title>
+<title>The <guimenu>Functions</guimenu> Menu</title>
 
 <variablelist>
 <varlistentry>
   <term>
-    <menuchoice
-><guimenu
->Functions</guimenu
-> <guimenuitem
-> Functions </guimenuitem
-> </menuchoice>
+    <menuchoice><guimenu>Functions</guimenu> <guimenuitem> Functions </guimenuitem> </menuchoice>
   </term>
   <listitem>
-	  <para
-><guiicon
-><inlinemediaobject
-> <imageobject
-> <imagedata fileref="kfkt.png" format="PNG"/> </imageobject
-> </inlinemediaobject
-> </guiicon
-> <action
->Shows the Functions Dialogue Window where you can enter the function equations and some attributes of the plot.</action
-></para
-> 
+	  <para><guiicon><inlinemediaobject> <imageobject> <imagedata fileref="kfkt.png" format="PNG"/> </imageobject> </inlinemediaobject> </guiicon> <action>Shows the Functions Dialogue Window where you can enter the function equations and some attributes of the plot.</action></para> 
   </listitem>
 </varlistentry>
 
@@ -159,81 +76,45 @@
 </sect1>
 
 <sect1 id="settings-menu">
-<title
->The <guimenu
->Settings</guimenu
-> Menu</title>
+<title>The <guimenu>Settings</guimenu> Menu</title>
 
-<para
->It contains the standard entries for enabling/disabling the toolbar and the statusbar. In addition there are the following options: </para>
+<para>It contains the standard entries for enabling/disabling the toolbar and the statusbar. In addition there are the following options: </para>
 
 <variablelist>
 
 <varlistentry>
   <term>
-    <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Axes...</guimenuitem
-> </menuchoice>
+    <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Axes...</guimenuitem> </menuchoice>
   </term>
   <listitem>
-    <para
-><action
->...</action
-></para>
+    <para><action>...</action></para>
   </listitem>
 </varlistentry>
 
 <varlistentry>
   <term>
-    <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Scale...</guimenuitem
-> </menuchoice>
+    <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Scale...</guimenuitem> </menuchoice>
   </term>
   <listitem>
-    <para
-><action
->...</action
-></para>
+    <para><action>...</action></para>
   </listitem>
 </varlistentry>
 
 <varlistentry>
   <term>
-    <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Grid...</guimenuitem
-> </menuchoice>
+    <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Grid...</guimenuitem> </menuchoice>
   </term>
   <listitem>
-    <para
-><action
->...</action
-></para>
+    <para><action>...</action></para>
   </listitem>
 </varlistentry>
 
 <varlistentry>
   <term>
-    <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Step...</guimenuitem
-> </menuchoice>
+    <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Step...</guimenuitem> </menuchoice>
   </term>
   <listitem>
-    <para
-><action
->...</action
-></para>
+    <para><action>...</action></para>
   </listitem>
 </varlistentry>
 
@@ -242,37 +123,20 @@
 </sect1>
 
 <sect1 id="help-menu">
-<title
->The <guimenu
->Help</guimenu
-> Menu</title>
+<title>The <guimenu>Help</guimenu> Menu</title>
 
-<para
->&kmplot; has a standard &kde; <guimenu
->Help</guimenu
-> as described below, with one addition:</para>
+<para>&kmplot; has a standard &kde; <guimenu>Help</guimenu> as described below, with one addition:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Help</guimenu
-> <guimenuitem
->Names...</guimenuitem
-> </menuchoice
-></term>
+<term><menuchoice><guimenu>Help</guimenu> <guimenuitem>Names...</guimenuitem> </menuchoice></term>
 <listitem>
-<para
->Opens a window with a list of function names, to help you remember them.</para>
+<para>Opens a window with a list of function names, to help you remember them.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->The standard &kde; <guimenu
->Help</guimenu
-> entries are:</para>
+<para>The standard &kde; <guimenu>Help</guimenu> entries are:</para>
 &help.menu.documentation; </sect1>
 </chapter>
 
diff --git a/tde-i18n-en_GB/docs/tdeedu/kmplot/reference.docbook b/tde-i18n-en_GB/docs/tdeedu/kmplot/reference.docbook
index 652d63e0869..900ac45478d 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kmplot/reference.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kmplot/reference.docbook
@@ -1,6 +1,5 @@
 <chapter id="reference">
-<title
->&kmplot; Reference</title>
+<title>&kmplot; Reference</title>
 
 <!--
 <mediaobject>
@@ -9,310 +8,204 @@
 </imageobject>
 </mediaobject>
 
-<para
->This menu entry or toolbar button opens the Functions Editor.  Here
+<para>This menu entry or toolbar button opens the Functions Editor.  Here
 you can enter up to 10 functions or
-function groups.  The parser knows <firstterm
->explicit</firstterm
-> and
-<firstterm
->parametric</firstterm
-> form.  With specific extensions it
+function groups.  The parser knows <firstterm>explicit</firstterm> and
+<firstterm>parametric</firstterm> form.  With specific extensions it
 is possible to add first and second derivatives and to choose values
 for the function group parameter.</para>
 -->
 
 <sect1 id="func-syntax">
-<title
->Function Syntax</title>
+<title>Function Syntax</title>
 
-<para
->Some syntax rules must be complied with:</para>
+<para>Some syntax rules must be complied with:</para>
 
-<screen
-><userinput
->name(var1[, var2])=term [;extensions]</userinput
->
+<screen><userinput>name(var1[, var2])=term [;extensions]</userinput>
 </screen>
 
 
 <variablelist>
 <varlistentry>
-<term
->name</term>
+<term>name</term>
 <listitem>
 
-<para
->The function name. If the first character is <quote
->r</quote
-> the parser assumes that you are using polar coordinates. If the first character is <quote
->x</quote
-> (for instance <quote
->xfunc</quote
->) the parser expects a second function with a leading <quote
->y</quote
-> (here <quote
->yfunc</quote
->) to define the function in parametric form. </para>
+<para>The function name. If the first character is <quote>r</quote> the parser assumes that you are using polar coordinates. If the first character is <quote>x</quote> (for instance <quote>xfunc</quote>) the parser expects a second function with a leading <quote>y</quote> (here <quote>yfunc</quote>) to define the function in parametric form. </para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->var1</term>
-<listitem
-><para
->The function's variable</para
-></listitem>
+<term>var1</term>
+<listitem><para>The function's variable</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->var2</term
-> 
-<listitem
-><para
->The function <quote
->group parameter</quote
->. It must be separated from the function's variable by a comma. You can use the group parameter to, for example, plot a number of graphs from one function. The parameter values can be selected manually or you can choose to have a slider bar that controls one parameter. By changing the value of the slider the value parameter will be changed. The slider can be set to an integer between 0 and 100.</para
-></listitem>
+<term>var2</term> 
+<listitem><para>The function <quote>group parameter</quote>. It must be separated from the function's variable by a comma. You can use the group parameter to, for example, plot a number of graphs from one function. The parameter values can be selected manually or you can choose to have a slider bar that controls one parameter. By changing the value of the slider the value parameter will be changed. The slider can be set to an integer between 0 and 100.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
->term</term>
-<listitem
-><para
->The expression defining the function.</para
-></listitem>
+<term>term</term>
+<listitem><para>The expression defining the function.</para></listitem>
 </varlistentry>
 </variablelist>
 </sect1>
 
 <sect1 id="func-predefined">
-<title
->Predefined Function Names and Constants</title>
-
-<para
->All the predefined functions and constants that &kmplot; knows can be shown by selecting <menuchoice
-><guimenu
->Help</guimenu
-><guimenuitem
->Names</guimenuitem
-> </menuchoice
->. They are: <variablelist>
+<title>Predefined Function Names and Constants</title>
+
+<para>All the predefined functions and constants that &kmplot; knows can be shown by selecting <menuchoice><guimenu>Help</guimenu><guimenuitem>Names</guimenuitem> </menuchoice>. They are: <variablelist>
 
 <varlistentry>
-<term
->sqr, sqrt</term>
+<term>sqr, sqrt</term>
 <listitem>
-<para
->Return the square and square root of a number, respectively.</para>
+<para>Return the square and square root of a number, respectively.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->exp, ln</term>
+<term>exp, ln</term>
 <listitem>
-<para
->Return the exponential and natural logarithm of a number, respectively.</para>
+<para>Return the exponential and natural logarithm of a number, respectively.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->log</term>
+<term>log</term>
 <listitem>
-<para
->Returns the logarithm to base 10 of a number.</para>
+<para>Returns the logarithm to base 10 of a number.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->sin, arcsin</term>
+<term>sin, arcsin</term>
 <listitem>
-<para
->Return the sine and inverse sine of a number, respectively. Note that the argument to sin and the return value of arcsin are in radians.</para>
+<para>Return the sine and inverse sine of a number, respectively. Note that the argument to sin and the return value of arcsin are in radians.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->cos, arccos</term>
+<term>cos, arccos</term>
 <listitem>
-<para
->Return the cosine and inverse cosine of a number, respectively. Also in radians.</para>
+<para>Return the cosine and inverse cosine of a number, respectively. Also in radians.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->tan, arctan</term>
+<term>tan, arctan</term>
 <listitem>
-<para
->Return the tangent and inverse tangent of a number, respectively. Also in radians.</para>
+<para>Return the tangent and inverse tangent of a number, respectively. Also in radians.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->sinh, arcsinh</term>
+<term>sinh, arcsinh</term>
 <listitem>
-<para
->Return the hyperbolic sine and inverse hyperbolic sine of a number, respectively.</para>
+<para>Return the hyperbolic sine and inverse hyperbolic sine of a number, respectively.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->cosh, arccosh</term>
+<term>cosh, arccosh</term>
 <listitem>
-<para
->Return the hyperbolic cosine and inverse hyperbolic cosine of a number, respectively.</para>
+<para>Return the hyperbolic cosine and inverse hyperbolic cosine of a number, respectively.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->tanh, arctanh</term>
+<term>tanh, arctanh</term>
 <listitem>
-<para
->Return the hyperbolic tangent and inverse hyperbolic tangent of a number, respectively.</para>
+<para>Return the hyperbolic tangent and inverse hyperbolic tangent of a number, respectively.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->sin, arcsin</term>
+<term>sin, arcsin</term>
 <listitem>
-<para
->Return the sine and inverse sine of a number, respectively. Note that the argument to sin and the return value of arcsin are in radians.</para>
+<para>Return the sine and inverse sine of a number, respectively. Note that the argument to sin and the return value of arcsin are in radians.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->cos, arccos</term>
+<term>cos, arccos</term>
 <listitem>
-<para
->Return the cosine and inverse cosine of a number, respectively. Also in radians.</para>
+<para>Return the cosine and inverse cosine of a number, respectively. Also in radians.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->pi, e</term>
+<term>pi, e</term>
 <listitem>
-<para
->Constants representing &pgr; (3.14159...) and e (2.71828...), respectively.</para>
+<para>Constants representing &pgr; (3.14159...) and e (2.71828...), respectively.</para>
 </listitem>
 </varlistentry>
 
 </variablelist>
 </para>
 
-<para
->These functions and constants and even all user defined functions can be used to determine the axes settings as well. See <xref linkend="axes-config"/>. </para>
+<para>These functions and constants and even all user defined functions can be used to determine the axes settings as well. See <xref linkend="axes-config"/>. </para>
 
 </sect1>
 
 <sect1 id="math-syntax">
-<title
->Mathematical Syntax</title>
-<para
->&kmplot; uses a common way of expressing mathematical functions, so you should have no trouble working it out. The operators &kmplot; understands are, in order of decreasing precedence: <variablelist>
+<title>Mathematical Syntax</title>
+<para>&kmplot; uses a common way of expressing mathematical functions, so you should have no trouble working it out. The operators &kmplot; understands are, in order of decreasing precedence: <variablelist>
 
 <varlistentry>
-<term
->^</term>
-<listitem
-><para
->The caret symbol performs exponentiation. &eg;, <userinput
->2^4</userinput
-> returns 16.</para>
+<term>^</term>
+<listitem><para>The caret symbol performs exponentiation. &eg;, <userinput>2^4</userinput> returns 16.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->*, /</term>
+<term>*, /</term>
 <listitem>
-<para
->The asterisk and slash symbols perform multiplication and division . &eg;, <userinput
->3*4/2</userinput
-> returns 6.</para>
+<para>The asterisk and slash symbols perform multiplication and division . &eg;, <userinput>3*4/2</userinput> returns 6.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->+, -</term>
-<listitem
-><para
->The plus and minus symbols perform addition and subtraction. &eg;, <userinput
->1+3-2</userinput
-> returns 2.</para>
+<term>+, -</term>
+<listitem><para>The plus and minus symbols perform addition and subtraction. &eg;, <userinput>1+3-2</userinput> returns 2.</para>
 </listitem>
 </varlistentry>
 
 </variablelist>
 </para>
-<para
->Note the precedence, which means that if parentheses are not used, exponentiation is performed before multiplication/division, which is performed before addition/subtraction. So <userinput
->1+2*4^2</userinput
-> returns 33, and not, say 144. To override this, use parentheses. To use the above example, <userinput
->((1+2)*4)^2</userinput
-> <emphasis
->will</emphasis
-> return 144. </para>
+<para>Note the precedence, which means that if parentheses are not used, exponentiation is performed before multiplication/division, which is performed before addition/subtraction. So <userinput>1+2*4^2</userinput> returns 33, and not, say 144. To override this, use parentheses. To use the above example, <userinput>((1+2)*4)^2</userinput> <emphasis>will</emphasis> return 144. </para>
 </sect1>
 
 <!--
 <sect1 id="coord-system">
-<title
->Coordinate Systems</title>
+<title>Coordinate Systems</title>
 
-<para
-><inlinemediaobject>
+<para><inlinemediaobject>
 <imageobject>
 <imagedata fileref="ksys1.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-></para>
+</inlinemediaobject></para>
 
 <para>
 <inlinemediaobject>
 <imageobject>
 <imagedata fileref="ksys2.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-></para>
+</inlinemediaobject></para>
 
 <para>
 <inlinemediaobject>
 <imageobject>
 <imagedata fileref="ksys3.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-></para>
+</inlinemediaobject></para>
 -->
-<sect1 id="coord-area"
-><title
->Plotting Area</title>
-<para
->By default, explicitly given functions are plotted for the whole of the visible part of the x-axis. You can specify an other range in the edit-dialogue for the function. For every pixel on the x-axis &kmplot; calculates a function value. If the plotting area contains the resulting point it is connected to the last drawn point by a line. </para>
-<para
->Parametric functions are plotted for parameter values from 0 up to 2&pgr;. You can set the plotting range in the dialogue for the function too. </para>
+<sect1 id="coord-area"><title>Plotting Area</title>
+<para>By default, explicitly given functions are plotted for the whole of the visible part of the x-axis. You can specify an other range in the edit-dialogue for the function. For every pixel on the x-axis &kmplot; calculates a function value. If the plotting area contains the resulting point it is connected to the last drawn point by a line. </para>
+<para>Parametric functions are plotted for parameter values from 0 up to 2&pgr;. You can set the plotting range in the dialogue for the function too. </para>
 </sect1>
 
 <sect1 id="coord-cross">
-<title
->Cross Hair Cursor</title>
-<para
->While the mouse cursor is over the plotting area the cursor changes to a cross hair. The current coordinates can be seen at the intersections with the coordinate axes and also in the status bar at the bottom of the main window. </para>
-<para
->You can trace a function's values more precisely by clicking onto or next to a graph. The selected function is shown in the statusbar in the right column. The cross hair then will be caught and be coloured in the same colour as the graph. If the graph has the same colour as the background colour, the cross hair will have the inverted colour of the background. When moving the mouse or pressing the keys Left or Right the cross hair will follow the function and you see the current x- and y-value. If the cross hair is close to y-axis, the root-value is shown in the statusbar. You can switch function with the Up and Down keys. A second click anywhere in the window or pressing any non-navigating key will leave this trace mode. </para>
-<para
->Note that tracing is only possible with explicitly given functions. The coordinates are always displayed according to a Cartesian system of coordinates. Neither non-single-point parametric functions nor functions given in polar coordinates can be traced in this way. </para>
+<title>Cross Hair Cursor</title>
+<para>While the mouse cursor is over the plotting area the cursor changes to a cross hair. The current coordinates can be seen at the intersections with the coordinate axes and also in the status bar at the bottom of the main window. </para>
+<para>You can trace a function's values more precisely by clicking onto or next to a graph. The selected function is shown in the statusbar in the right column. The cross hair then will be caught and be coloured in the same colour as the graph. If the graph has the same colour as the background colour, the cross hair will have the inverted colour of the background. When moving the mouse or pressing the keys Left or Right the cross hair will follow the function and you see the current x- and y-value. If the cross hair is close to y-axis, the root-value is shown in the statusbar. You can switch function with the Up and Down keys. A second click anywhere in the window or pressing any non-navigating key will leave this trace mode. </para>
+<para>Note that tracing is only possible with explicitly given functions. The coordinates are always displayed according to a Cartesian system of coordinates. Neither non-single-point parametric functions nor functions given in polar coordinates can be traced in this way. </para>
 
 </sect1>
 
diff --git a/tde-i18n-en_GB/docs/tdeedu/kmplot/using.docbook b/tde-i18n-en_GB/docs/tdeedu/kmplot/using.docbook
index 1f0e7611dd3..7f6cd5f9382 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kmplot/using.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kmplot/using.docbook
@@ -1,185 +1,78 @@
 <chapter id="using-kmplot">
-<title
->Using &kmplot;</title>
-
-<para
->&kmplot; deals with named functions, which can be specified in terms of Cartesian coordinates (called <quote
->explicit functions</quote
->), polar coordinates or as parametric functions. To enter a function, choose <menuchoice
-><guimenu
->Plot</guimenu
-><guimenuitem
->Edit Plots...</guimenuitem
-> </menuchoice
->. You can also enter new functions in the <guilabel
->Function equation</guilabel
-> text box in the main &kmplot; window. The text box can handle explicit and polar functions. Each function you enter must have a unique name (&ie;, a name that is not taken by any of the existing functions displayed in the list box). A function name will be automatically generated if you do not specify one.</para>
-
-<para
->For more information on &kmplot; functions, see <xref linkend="reference"/>. </para>
+<title>Using &kmplot;</title>
+
+<para>&kmplot; deals with named functions, which can be specified in terms of Cartesian coordinates (called <quote>explicit functions</quote>), polar coordinates or as parametric functions. To enter a function, choose <menuchoice><guimenu>Plot</guimenu><guimenuitem>Edit Plots...</guimenuitem> </menuchoice>. You can also enter new functions in the <guilabel>Function equation</guilabel> text box in the main &kmplot; window. The text box can handle explicit and polar functions. Each function you enter must have a unique name (&ie;, a name that is not taken by any of the existing functions displayed in the list box). A function name will be automatically generated if you do not specify one.</para>
+
+<para>For more information on &kmplot; functions, see <xref linkend="reference"/>. </para>
 
 <screenshot>
-<screeninfo
->Here is a screenshot of the &kmplot; welcome window</screeninfo>
+<screeninfo>Here is a screenshot of the &kmplot; welcome window</screeninfo>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="main.png" format="PNG"/>
 	  </imageobject>
 	  <textobject>
-	    <phrase
->Screenshot</phrase>
+	    <phrase>Screenshot</phrase>
 	  </textobject>
 	</mediaobject>
 </screenshot>
 
 <sect1 id="function-types">
-<title
->Function Types</title>
+<title>Function Types</title>
 
 <sect2 id="explicit-functions">
-<title
->Explicit Functions</title>
-<para
->To enter an explicit function (&ie;, a function in the form y=f(x)) into &kmplot;, just enter it in the following form: <screen>
-<userinput
-><replaceable
->f</replaceable
->(<replaceable
->x</replaceable
->)=<replaceable
->expression</replaceable
-></userinput>
-</screen
-> Where: <itemizedlist>
-<listitem
-><para
-><replaceable
->f</replaceable
-> is the name of the function, and can be any string of letters and numbers you like, provided it does not start with any of the letters x, y or r (since these are used for parametric and polar functions).</para>
+<title>Explicit Functions</title>
+<para>To enter an explicit function (&ie;, a function in the form y=f(x)) into &kmplot;, just enter it in the following form: <screen>
+<userinput><replaceable>f</replaceable>(<replaceable>x</replaceable>)=<replaceable>expression</replaceable></userinput>
+</screen> Where: <itemizedlist>
+<listitem><para><replaceable>f</replaceable> is the name of the function, and can be any string of letters and numbers you like, provided it does not start with any of the letters x, y or r (since these are used for parametric and polar functions).</para>
 </listitem>
 
-<listitem
-><para
-><replaceable
->x</replaceable
-> is the x-coordinate, to be used in the expression following the equals sign. It is in fact a dummy variable, so you can use any variable name you like, but the effect will be the same.</para>
+<listitem><para><replaceable>x</replaceable> is the x-coordinate, to be used in the expression following the equals sign. It is in fact a dummy variable, so you can use any variable name you like, but the effect will be the same.</para>
 </listitem>
 
 <listitem>
-<para
-><replaceable
->expression</replaceable
-> is the expression to be plotted, given in appropriate syntax for &kmplot;. See <xref linkend="math-syntax"/>. </para>
+<para><replaceable>expression</replaceable> is the expression to be plotted, given in appropriate syntax for &kmplot;. See <xref linkend="math-syntax"/>. </para>
 </listitem>
 
 </itemizedlist>
 </para>
-<para
->As an example, to draw the graph of y=x<superscript
->2</superscript
->+2x, enter the following into the functions dialogue of &kmplot;: <screen
->f(x)=x^2+2x
+<para>As an example, to draw the graph of y=x<superscript>2</superscript>+2x, enter the following into the functions dialogue of &kmplot;: <screen>f(x)=x^2+2x
 </screen>
 </para>
 </sect2>
 
 <sect2 id="parametric-functions">
-<title
->Parametric Functions</title>
-<para
->Parametric functions are those in which the x and y coordinates are defined by separate functions of another variable, often called t. To enter a parametric function in &kmplot;, follow the procedure as for an explicit function, but prefix the name of the function describing the x-coordinate with the letter x, and the function describing the y-coordinate with the letter y. As with explicit functions, you may use any variable name you wish for the parameter. To draw a parametric function, you must go to <guimenu
->Functions</guimenu
-><guimenuitem
->New Parametric Plot...</guimenuitem
->. A function name will be created automatic if you do not specify one.</para>
-<para
->As an example, suppose you want to draw a circle, which has parametric equations x=sin(t), y=cos(t). In the &kmplot; functions dialogue, do the following: <orderedlist
-> <listitem
-><para
->Open the parametric plot dialogue with <menuchoice
-><guimenu
->Plot</guimenu
-><guimenuitem
->New Parametric Plot...</guimenuitem
-> </menuchoice
->.</para
-> </listitem
-> <listitem
-><para
->Enter a name for the function, say, <userinput
->circle</userinput
->, in the <guilabel
->Name</guilabel
-> box. The names of the x and y functions change to match this name: the x function becomes <guilabel
->xcircle(t)</guilabel
-> and the y function becomes <guilabel
->ycircle(t)</guilabel
->.</para
-> </listitem
-> <listitem
-> <para
->In the x and y boxes, enter the appropriate equations, &ie;, <guilabel
->xcircle(t)=</guilabel
-><userinput
->sin(t)</userinput
-> and <guilabel
->ycircle(t)=</guilabel
-><userinput
->cos(t)</userinput
->.</para
-> </listitem
-> </orderedlist
-> Click on <guibutton
->OK</guibutton
-> and the function will be drawn. </para>
-<para
->You can set some further options for the plot in this dialogue: <variablelist>
+<title>Parametric Functions</title>
+<para>Parametric functions are those in which the x and y coordinates are defined by separate functions of another variable, often called t. To enter a parametric function in &kmplot;, follow the procedure as for an explicit function, but prefix the name of the function describing the x-coordinate with the letter x, and the function describing the y-coordinate with the letter y. As with explicit functions, you may use any variable name you wish for the parameter. To draw a parametric function, you must go to <guimenu>Functions</guimenu><guimenuitem>New Parametric Plot...</guimenuitem>. A function name will be created automatic if you do not specify one.</para>
+<para>As an example, suppose you want to draw a circle, which has parametric equations x=sin(t), y=cos(t). In the &kmplot; functions dialogue, do the following: <orderedlist> <listitem><para>Open the parametric plot dialogue with <menuchoice><guimenu>Plot</guimenu><guimenuitem>New Parametric Plot...</guimenuitem> </menuchoice>.</para> </listitem> <listitem><para>Enter a name for the function, say, <userinput>circle</userinput>, in the <guilabel>Name</guilabel> box. The names of the x and y functions change to match this name: the x function becomes <guilabel>xcircle(t)</guilabel> and the y function becomes <guilabel>ycircle(t)</guilabel>.</para> </listitem> <listitem> <para>In the x and y boxes, enter the appropriate equations, &ie;, <guilabel>xcircle(t)=</guilabel><userinput>sin(t)</userinput> and <guilabel>ycircle(t)=</guilabel><userinput>cos(t)</userinput>.</para> </listitem> </orderedlist> Click on <guibutton>OK</guibutton> and the function will be drawn. </para>
+<para>You can set some further options for the plot in this dialogue: <variablelist>
 
 <varlistentry>
-<term
-><guilabel
->Hide</guilabel
-></term>
+<term><guilabel>Hide</guilabel></term>
 <listitem>
-<para
->If this option is selected, the plot is not drawn, but &kmplot; remembers the function definition, so you can use it to define other functions.</para>
+<para>If this option is selected, the plot is not drawn, but &kmplot; remembers the function definition, so you can use it to define other functions.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Custom Plot Range</guilabel
-></term>
+<term><guilabel>Custom Plot Range</guilabel></term>
 <listitem>
-<para
->If this option is selected, you can change the maximum and minimum values of the parameter t for which the function is plotted using the <guilabel
->min</guilabel
-> and <guilabel
->max</guilabel
-> boxes.</para>
+<para>If this option is selected, you can change the maximum and minimum values of the parameter t for which the function is plotted using the <guilabel>min</guilabel> and <guilabel>max</guilabel> boxes.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Line width</guilabel
-></term>
+<term><guilabel>Line width</guilabel></term>
 <listitem>
-<para
->With this option you can set the width of the line drawn on the plot area, in units of 0.1mm.</para>
+<para>With this option you can set the width of the line drawn on the plot area, in units of 0.1mm.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Colour</guilabel
-></term>
+<term><guilabel>Colour</guilabel></term>
 <listitem>
-<para
->Click on the colour box and pick a colour in the dialogue that appears. The line on the plot will be drawn in this colour.</para>
+<para>Click on the colour box and pick a colour in the dialogue that appears. The line on the plot will be drawn in this colour.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -187,182 +80,100 @@
 </sect2>
 
 <sect2 id="polar-functions">
-<title
->Entering Functions in Polar Coordinates</title>
-
-<para
->Polar coordinates represent a point by its distance from the origin (usually called r), and the angle a line from the origin to the point makes with the x-axis (usually represented by the Greek letter theta). To enter functions in polar coordinates, use the menu entry <menuchoice
-><guimenu
->Plot</guimenu
-><guimenuitem
->New Polar Plot...</guimenuitem
-> </menuchoice
->. In the box labelled <guilabel
->r</guilabel
->, complete the function definition, including the name of the theta variable you want to use, &eg;, to draw the Archimedes' spiral r=theta, enter: <screen>
+<title>Entering Functions in Polar Coordinates</title>
+
+<para>Polar coordinates represent a point by its distance from the origin (usually called r), and the angle a line from the origin to the point makes with the x-axis (usually represented by the Greek letter theta). To enter functions in polar coordinates, use the menu entry <menuchoice><guimenu>Plot</guimenu><guimenuitem>New Polar Plot...</guimenuitem> </menuchoice>. In the box labelled <guilabel>r</guilabel>, complete the function definition, including the name of the theta variable you want to use, &eg;, to draw the Archimedes' spiral r=theta, enter: <screen>
 <userinput>
 (theta)=theta
 </userinput>
-</screen
-> so that the whole line reads <quote
->r(theta)=theta</quote
->. Note that you can use any name for the theta variable, so <quote
->r(foo)=foo</quote
-> would have produced exactly the same output. </para>
+</screen> so that the whole line reads <quote>r(theta)=theta</quote>. Note that you can use any name for the theta variable, so <quote>r(foo)=foo</quote> would have produced exactly the same output. </para>
 
 </sect2>
 
 </sect1>
 
 <sect1 id="combining-functions">
-<title
->Combining Functions</title>
-<para
->Functions can be combined to produce new ones. Simply enter the functions after the equals sign in an expression as if the functions were variables. For example, if you have defined functions f(x) and g(x), you can plot the sum of f and g with: <screen
-><userinput>
+<title>Combining Functions</title>
+<para>Functions can be combined to produce new ones. Simply enter the functions after the equals sign in an expression as if the functions were variables. For example, if you have defined functions f(x) and g(x), you can plot the sum of f and g with: <screen><userinput>
 sum(x)=f(x)+g(x)
-</userinput
->
+</userinput>
 </screen>
 </para>
-<para
->Note that you can only combine functions of the same type, &eg; an explicit function cannot be combined with a polar function.</para>
+<para>Note that you can only combine functions of the same type, &eg; an explicit function cannot be combined with a polar function.</para>
 </sect1>
 
 <sect1 id="function-appearance">
-<title
->Changing the appearance of functions</title>
-
-<para
->To change the appearance of a function's graph on the main plot window, select the function in the <guilabel
->Edit Plots</guilabel
-> dialogue, and click on the <guibutton
->Edit</guibutton
-> button. In the dialogue which appears, you can change the line width in the text box, and the colour of the function's graph by clicking on the colour button at the bottom. If you are editing an explicit function, you will see a dialogue with three tabs. In the first one you specify the equation of the function. The <guilabel
->Derivatives</guilabel
-> tab lets you draw the first and second derivative to the function. With the <guilabel
->Integral</guilabel
-> tab you can draw the integral of the function which is calculated using Euler's method. </para>
-<para
->Another way to edit a function is to right click on the graph. In the popup menu that appears, choose <guibutton
->Edit</guibutton
-></para>
-
-<para
->For more information on the popup menu, see <xref linkend="popupmenu"/>. </para>
+<title>Changing the appearance of functions</title>
+
+<para>To change the appearance of a function's graph on the main plot window, select the function in the <guilabel>Edit Plots</guilabel> dialogue, and click on the <guibutton>Edit</guibutton> button. In the dialogue which appears, you can change the line width in the text box, and the colour of the function's graph by clicking on the colour button at the bottom. If you are editing an explicit function, you will see a dialogue with three tabs. In the first one you specify the equation of the function. The <guilabel>Derivatives</guilabel> tab lets you draw the first and second derivative to the function. With the <guilabel>Integral</guilabel> tab you can draw the integral of the function which is calculated using Euler's method. </para>
+<para>Another way to edit a function is to right click on the graph. In the popup menu that appears, choose <guibutton>Edit</guibutton></para>
+
+<para>For more information on the popup menu, see <xref linkend="popupmenu"/>. </para>
 </sect1>
 
 <sect1 id="popupmenu">
-<title
->Popup menu</title>
+<title>Popup menu</title>
 
-<para
->When right-clicking on a plot function or a single-point parametric plot function a popup menu will appear. In the menu there are seven items available:</para>
+<para>When right-clicking on a plot function or a single-point parametric plot function a popup menu will appear. In the menu there are seven items available:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><menuchoice
-><guimenuitem
->Hide</guimenuitem>
-</menuchoice
-></term>
+<term><menuchoice><guimenuitem>Hide</guimenuitem>
+</menuchoice></term>
 <listitem>
-<para
->Hides the selected graph. Other plots of the graph's function will still be shown.</para>
+<para>Hides the selected graph. Other plots of the graph's function will still be shown.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenuitem
->Remove</guimenuitem>
-</menuchoice
-></term>
+<term><menuchoice><guimenuitem>Remove</guimenuitem>
+</menuchoice></term>
 <listitem>
-<para
->Removes the function. All its graphs will disappear.</para>
+<para>Removes the function. All its graphs will disappear.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenuitem
->Edit</guimenuitem>
-</menuchoice
-></term>
+<term><menuchoice><guimenuitem>Edit</guimenuitem>
+</menuchoice></term>
 <listitem>
-<para
->Shows the editor dialogue for the selected function.</para>
+<para>Shows the editor dialogue for the selected function.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->For plot functions the following four items are also available:</para>
+<para>For plot functions the following four items are also available:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><menuchoice
-><guimenuitem
->Get y-value</guimenuitem>
-</menuchoice
-></term>
+<term><menuchoice><guimenuitem>Get y-value</guimenuitem>
+</menuchoice></term>
 <listitem>
-<para
->Opens a dialogue in which you can find the y-value corresponding to a specific x-value. The selected graph will be highlighted in the dialogue. Enter an x value in the <guilabel
->X</guilabel
-> box, and click on <guibutton
->Find</guibutton
-> (or press &Enter;). The corresponding y value will be shown under <guilabel
->Y</guilabel
->. </para>
+<para>Opens a dialogue in which you can find the y-value corresponding to a specific x-value. The selected graph will be highlighted in the dialogue. Enter an x value in the <guilabel>X</guilabel> box, and click on <guibutton>Find</guibutton> (or press &Enter;). The corresponding y value will be shown under <guilabel>Y</guilabel>. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenuitem
->Search for Minimum Value</guimenuitem>
-</menuchoice
-></term>
+<term><menuchoice><guimenuitem>Search for Minimum Value</guimenuitem>
+</menuchoice></term>
 <listitem>
-<para
->Find the minimum value of the graph in a specified range. The selected graph will be highlighted in the dialogue that appears. Enter the lower and upper boundaries of the region in which you want to search for a minimum, and click <guibutton
->Find</guibutton
->. The x and y values at the minimum will be shown.</para>
+<para>Find the minimum value of the graph in a specified range. The selected graph will be highlighted in the dialogue that appears. Enter the lower and upper boundaries of the region in which you want to search for a minimum, and click <guibutton>Find</guibutton>. The x and y values at the minimum will be shown.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenuitem
->Search for Maximum Value</guimenuitem>
-</menuchoice
-></term>
+<term><menuchoice><guimenuitem>Search for Maximum Value</guimenuitem>
+</menuchoice></term>
 <listitem>
-<para
->This is the same as <guimenuitem
->Search for minimum value</guimenuitem
-> above, but finds maximum values instead of minima. </para>
+<para>This is the same as <guimenuitem>Search for minimum value</guimenuitem> above, but finds maximum values instead of minima. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenuitem
->Area Under Graph</guimenuitem>
-</menuchoice
-></term>
+<term><menuchoice><guimenuitem>Area Under Graph</guimenuitem>
+</menuchoice></term>
 <listitem>
-<para
->Draws the area between the graph and the x-axis. The selected graph will be highlighted in the new dialogue that appears. For more information on the Search for Area Under Graph-feature, see <xref linkend="a-tools-menu"/>.</para>
+<para>Draws the area between the graph and the x-axis. The selected graph will be highlighted in the new dialogue that appears. For more information on the Search for Area Under Graph-feature, see <xref linkend="a-tools-menu"/>.</para>
 </listitem>
 </varlistentry>
 </variablelist>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/ai-contents.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/ai-contents.docbook
index 84d694de674..b6baa343c10 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/ai-contents.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/ai-contents.docbook
@@ -1,200 +1,45 @@
 <sect1 id="ai-contents">
-<title
->AstroInfo: Table of Contents</title>
+<title>AstroInfo: Table of Contents</title>
 
-<itemizedlist
-><title
->The Sky and Coordinate Systems</title>
-  <listitem
-><para
-><link linkend="ai-skycoords"
->Celestial Coordinate Systems</link
-></para
-></listitem>
-  <listitem
-><para
-><link linkend="ai-cequator"
->Celestial Equator</link
-></para
-></listitem>
-  <listitem
-><para
-><link linkend="ai-cpoles"
->Celestial Poles</link
-></para
-></listitem>
-  <listitem
-><para
-><link linkend="ai-csphere"
->Celestial Sphere</link
-></para
-></listitem>
-  <listitem
-><para
-><link linkend="ai-ecliptic"
->The Ecliptic</link
-></para
-></listitem>
-  <listitem
-><para
-><link linkend="ai-equinox"
->The Equinoxes</link
-></para
-></listitem>
-  <listitem
-><para
-><link linkend="ai-geocoords"
->Geographic Coordinates</link
-></para
-></listitem>
-  <listitem
-><para
-><link linkend="ai-greatcircle"
->Great Circles</link
-></para
-></listitem>
-  <listitem
-><para
-><link linkend="ai-horizon"
->The Horizon</link
-></para
-></listitem>
-  <listitem
-><para
-><link linkend="ai-hourangle"
->Hour Angle</link
-></para
-></listitem>
-  <listitem
-><para
-><link linkend="ai-meridian"
->Local Meridian</link
-></para
-></listitem
-> 
-  <listitem
-><para
-><link linkend="ai-precession"
->Precession</link
-></para
-></listitem>
-  <listitem
-><para
-><link linkend="ai-zenith"
->The Zenith</link
-></para
-></listitem>
+<itemizedlist><title>The Sky and Coordinate Systems</title>
+  <listitem><para><link linkend="ai-skycoords">Celestial Coordinate Systems</link></para></listitem>
+  <listitem><para><link linkend="ai-cequator">Celestial Equator</link></para></listitem>
+  <listitem><para><link linkend="ai-cpoles">Celestial Poles</link></para></listitem>
+  <listitem><para><link linkend="ai-csphere">Celestial Sphere</link></para></listitem>
+  <listitem><para><link linkend="ai-ecliptic">The Ecliptic</link></para></listitem>
+  <listitem><para><link linkend="ai-equinox">The Equinoxes</link></para></listitem>
+  <listitem><para><link linkend="ai-geocoords">Geographic Coordinates</link></para></listitem>
+  <listitem><para><link linkend="ai-greatcircle">Great Circles</link></para></listitem>
+  <listitem><para><link linkend="ai-horizon">The Horizon</link></para></listitem>
+  <listitem><para><link linkend="ai-hourangle">Hour Angle</link></para></listitem>
+  <listitem><para><link linkend="ai-meridian">Local Meridian</link></para></listitem> 
+  <listitem><para><link linkend="ai-precession">Precession</link></para></listitem>
+  <listitem><para><link linkend="ai-zenith">The Zenith</link></para></listitem>
 </itemizedlist>
 
-<itemizedlist
-><title
->Time</title>
-  <listitem
-><para
-><link linkend="ai-julianday"
->Julian Day</link
-></para
-></listitem>
-  <listitem
-><para
-><link linkend="ai-leapyear"
->Leap Years</link
-></para
-></listitem>
-  <listitem
-><para
-><link linkend="ai-sidereal"
->Sidereal Time</link
-></para
-></listitem>
-  <listitem
-><para
-><link linkend="ai-timezones"
->Time Zones</link
-></para
-></listitem>
-  <listitem
-><para
-><link linkend="ai-utime"
->Universal Time</link
-></para
-></listitem>
+<itemizedlist><title>Time</title>
+  <listitem><para><link linkend="ai-julianday">Julian Day</link></para></listitem>
+  <listitem><para><link linkend="ai-leapyear">Leap Years</link></para></listitem>
+  <listitem><para><link linkend="ai-sidereal">Sidereal Time</link></para></listitem>
+  <listitem><para><link linkend="ai-timezones">Time Zones</link></para></listitem>
+  <listitem><para><link linkend="ai-utime">Universal Time</link></para></listitem>
 </itemizedlist>
 
-<itemizedlist
-><title
->Physics</title>
-  <listitem
-><para
-><link linkend="ai-blackbody"
->Blackbody Radiation</link
-></para
-></listitem>
-  <listitem
-><para
-><link linkend="ai-darkmatter"
->Dark Matter</link
-></para
-></listitem>
-  <listitem
-><para
-><link linkend="ai-flux"
->Flux</link
-></para
-></listitem>
-  <listitem
-><para
-><link linkend="ai-luminosity"
->Luminosity</link
-></para
-></listitem>
-  <listitem
-><para
-><link linkend="ai-parallax"
->Parallax</link
-></para
-></listitem>
-  <listitem
-><para
-><link linkend="ai-retrograde"
->Retrograde Motion</link
-></para
-></listitem>
+<itemizedlist><title>Physics</title>
+  <listitem><para><link linkend="ai-blackbody">Blackbody Radiation</link></para></listitem>
+  <listitem><para><link linkend="ai-darkmatter">Dark Matter</link></para></listitem>
+  <listitem><para><link linkend="ai-flux">Flux</link></para></listitem>
+  <listitem><para><link linkend="ai-luminosity">Luminosity</link></para></listitem>
+  <listitem><para><link linkend="ai-parallax">Parallax</link></para></listitem>
+  <listitem><para><link linkend="ai-retrograde">Retrograde Motion</link></para></listitem>
 </itemizedlist>
 
-<itemizedlist
-><title
->Astrophysics</title>
-  <listitem
-><para
-><link linkend="ai-ellipgal"
->Elliptical Galaxies</link
-></para
-></listitem>
-  <listitem
-><para
-><link linkend="ai-spiralgal"
->Spiral Galaxies</link
-></para
-></listitem>
-  <listitem
-><para
-><link linkend="ai-magnitude"
->The Magnitude Scale</link
-></para
-></listitem>
-  <listitem
-><para
-><link linkend="ai-stars"
->Stars: An Introductory FAQ</link
-></para
-></listitem>
-  <listitem
-><para
-><link linkend="ai-colorandtemp"
->Star Colours and Temperatures</link
-></para
-></listitem>
+<itemizedlist><title>Astrophysics</title>
+  <listitem><para><link linkend="ai-ellipgal">Elliptical Galaxies</link></para></listitem>
+  <listitem><para><link linkend="ai-spiralgal">Spiral Galaxies</link></para></listitem>
+  <listitem><para><link linkend="ai-magnitude">The Magnitude Scale</link></para></listitem>
+  <listitem><para><link linkend="ai-stars">Stars: An Introductory FAQ</link></para></listitem>
+  <listitem><para><link linkend="ai-colorandtemp">Star Colours and Temperatures</link></para></listitem>
 </itemizedlist>
 
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/altvstime.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/altvstime.docbook
index 5761864a34e..b5752cff68a 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/altvstime.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/altvstime.docbook
@@ -1,75 +1,30 @@
 <sect1 id="tool-altvstime">
-<title
->Altitude vs. Time Tool</title>
-<indexterm
-><primary
->Tools</primary>
-<secondary
->Altitude vs. Time Tool</secondary>
+<title>Altitude vs. Time Tool</title>
+<indexterm><primary>Tools</primary>
+<secondary>Altitude vs. Time Tool</secondary>
 </indexterm>
 
 <screenshot>
-<screeninfo
->The Altitude vs. Time Tool </screeninfo>
+<screeninfo>The Altitude vs. Time Tool </screeninfo>
 <mediaobject>
   <imageobject>
     <imagedata fileref="altvstime.png" format="PNG"/>
   </imageobject>
   <textobject>
-    <phrase
->Altitude vs. Time Plotter</phrase>
+    <phrase>Altitude vs. Time Plotter</phrase>
   </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->This tool plots the altitude of any objects as a function of time, for any date and location on Earth. The top section is a graphical plot of altitude angle on the vertical axis, and time on the horizontal axis. The time is shown both as standard local time along the bottom, and <link linkend="ai-sidereal"
->sidereal time</link
-> along the top. The bottom half of the graph is shaded green to indicate that points in this region are below the horizon. </para>
-<para
->There are a few ways to add curves to the plot. The simplest way to add the curve of an existing object is to simply type its name in the <guilabel
->Name</guilabel
-> input field, and press Enter, or the <guibutton
->Plot</guibutton
-> button. If the text you enter is found in the object database, the object's curve is added to the graph. You can also press the <guibutton
->Browse</guibutton
-> button to open the <link linkend="findobjects"
->Find Object Window</link
-> to select an object from the list of known objects. If you want to add a point that does not exist in the object database, simply enter a name for the point, and then fill in the coordinates in the <guilabel
->RA</guilabel
-> and <guilabel
->Dec</guilabel
-> input fields. Then press the <guibutton
->Plot</guibutton
-> button to add the curve for your custom object to the plot (note that you have to pick a name that does not already exist in the object database for this to work). </para>
-<para
->When you add an object to the plot, its altitude vs. time curve is plotted with a thick white line, and its name is added to the listbox at the lower right. Any objects that were already present are plotted with a thinner red curve. You can choose which object is plotted with the thick white curve by highlighting its name in the listbox. </para>
-<para
->These curves show the objects' Altitude (angle above the <link linkend="ai-horizon"
->horizon</link
->) as a function of time. When a curve passes from the lower half to the upper half, the object has risen; when it falls back to the lower half, it has set. For example, in the screenshot, the minor planet <firstterm
->Quaoar</firstterm
-> is rising at around 15:30 local time, and is setting at about 00:30. </para>
-<para
->The Altitude of an object depends on both where you are on Earth, and on the Date. By default, the Tool adopts the Location and Date from the current KStars settings. You can change these parameters in the <guilabel
->Date &amp; Location</guilabel
-> Tab. To change the Location, you can press the <guibutton
->Choose City...</guibutton
-> button to open the <link linkend="setgeo"
->Set Geographic Location</link
-> Window, or enter Longitude and Latitude values manually in the input fields, and press the <guibutton
->Update</guibutton
-> button. To change the Date, use the <guilabel
->Date</guilabel
-> picker widget, then press <guibutton
->Update</guibutton
->. Note that any curves you had already plotted will be automatically updated when you change the Date and/or Location. </para>
+<para>This tool plots the altitude of any objects as a function of time, for any date and location on Earth. The top section is a graphical plot of altitude angle on the vertical axis, and time on the horizontal axis. The time is shown both as standard local time along the bottom, and <link linkend="ai-sidereal">sidereal time</link> along the top. The bottom half of the graph is shaded green to indicate that points in this region are below the horizon. </para>
+<para>There are a few ways to add curves to the plot. The simplest way to add the curve of an existing object is to simply type its name in the <guilabel>Name</guilabel> input field, and press Enter, or the <guibutton>Plot</guibutton> button. If the text you enter is found in the object database, the object's curve is added to the graph. You can also press the <guibutton>Browse</guibutton> button to open the <link linkend="findobjects">Find Object Window</link> to select an object from the list of known objects. If you want to add a point that does not exist in the object database, simply enter a name for the point, and then fill in the coordinates in the <guilabel>RA</guilabel> and <guilabel>Dec</guilabel> input fields. Then press the <guibutton>Plot</guibutton> button to add the curve for your custom object to the plot (note that you have to pick a name that does not already exist in the object database for this to work). </para>
+<para>When you add an object to the plot, its altitude vs. time curve is plotted with a thick white line, and its name is added to the listbox at the lower right. Any objects that were already present are plotted with a thinner red curve. You can choose which object is plotted with the thick white curve by highlighting its name in the listbox. </para>
+<para>These curves show the objects' Altitude (angle above the <link linkend="ai-horizon">horizon</link>) as a function of time. When a curve passes from the lower half to the upper half, the object has risen; when it falls back to the lower half, it has set. For example, in the screenshot, the minor planet <firstterm>Quaoar</firstterm> is rising at around 15:30 local time, and is setting at about 00:30. </para>
+<para>The Altitude of an object depends on both where you are on Earth, and on the Date. By default, the Tool adopts the Location and Date from the current KStars settings. You can change these parameters in the <guilabel>Date &amp; Location</guilabel> Tab. To change the Location, you can press the <guibutton>Choose City...</guibutton> button to open the <link linkend="setgeo">Set Geographic Location</link> Window, or enter Longitude and Latitude values manually in the input fields, and press the <guibutton>Update</guibutton> button. To change the Date, use the <guilabel>Date</guilabel> picker widget, then press <guibutton>Update</guibutton>. Note that any curves you had already plotted will be automatically updated when you change the Date and/or Location. </para>
 
 <tip>
-<para
->Exercise:</para>
-<para
->Plot the Sun's Altitude curve. Make sure the geographic location is not near the equator. Change the Date to some time in June, and then again to sometime in January. You can see easily why we have seasons; in the winter, the Sun is above the horizon for less time (the days are shorter), and its altitude is never very high. </para>
+<para>Exercise:</para>
+<para>Plot the Sun's Altitude curve. Make sure the geographic location is not near the equator. Change the Date to some time in June, and then again to sometime in January. You can see easily why we have seasons; in the winter, the Sun is above the horizon for less time (the days are shorter), and its altitude is never very high. </para>
 </tip>
 
 
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/astroinfo.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/astroinfo.docbook
index d054cd6c01b..ee9148b0ee6 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/astroinfo.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/astroinfo.docbook
@@ -1,9 +1,5 @@
 <chapter id="astroinfo">
-<title
->The AstroInfo Project</title>
+<title>The AstroInfo Project</title>
 
-<para
->Here you can find a collection of short articles that explain various astronomical concepts used in &kstars;. From coordinate systems to celestial mechanics, you can find answers to your questions here. </para
-><para
->The articles sometimes also contain exercises that you can perform with &kstars; to illustrate the concept behind the article. </para>
+<para>Here you can find a collection of short articles that explain various astronomical concepts used in &kstars;. From coordinate systems to celestial mechanics, you can find answers to your questions here. </para><para>The articles sometimes also contain exercises that you can perform with &kstars; to illustrate the concept behind the article. </para>
 &contents; &skycoords; &cequator; &cpoles; &csphere; &ecliptic; &equinox; &geocoords; &greatcircle; &horizon; &hourangle; &meridian; &precession; &zenith; &julianday; &leapyear; &sidereal; &timezones; &utime; &blackbody; &darkmatter; &flux; &luminosity; &parallax; &retrograde; &ellipgal; &spiralgal; &magnitude; &stars; &colorandtemp; </chapter>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/blackbody.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/blackbody.docbook
index 9d9603657f8..be18f216e0a 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/blackbody.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/blackbody.docbook
@@ -2,71 +2,38 @@
 
 <sect1info>
 
-<author
-><firstname
->Jasem</firstname
-> <surname
->Mutlaq</surname
-> <affiliation
-><address
-> <email
->mutlaqja@ku.edu</email>
-</address
-></affiliation>
+<author><firstname>Jasem</firstname> <surname>Mutlaq</surname> <affiliation><address> <email>mutlaqja@ku.edu</email>
+</address></affiliation>
 </author>
 </sect1info>
 
-<title
->Blackbody Radiation</title>
-<indexterm
-><primary
->Blackbody Radiation</primary>
-<seealso
->Star Colours and Temperatures</seealso>
+<title>Blackbody Radiation</title>
+<indexterm><primary>Blackbody Radiation</primary>
+<seealso>Star Colours and Temperatures</seealso>
 </indexterm>
 
-<para
->A <firstterm
->blackbody</firstterm
-> refers to an opaque object that emits <firstterm
->thermal radiation</firstterm
->. A perfect blackbody is one that absorbs all incoming light and does not reflect any. At room temperature, such an object would appear to be perfectly black (hence the term <emphasis
->blackbody</emphasis
->). However, if heated to a high temperature, a blackbody will begin to glow with <firstterm
->thermal radiation</firstterm
->. </para>
+<para>A <firstterm>blackbody</firstterm> refers to an opaque object that emits <firstterm>thermal radiation</firstterm>. A perfect blackbody is one that absorbs all incoming light and does not reflect any. At room temperature, such an object would appear to be perfectly black (hence the term <emphasis>blackbody</emphasis>). However, if heated to a high temperature, a blackbody will begin to glow with <firstterm>thermal radiation</firstterm>. </para>
 
-<para
->In fact, all objects emit thermal radiation (as long as their temperature is above Absolute Zero, or -273.15 degrees Celsius), but no object emits thermal radiation perfectly; rather, they are better at emitting/absorbing some wavelengths of light than others. These uneven efficiencies make it difficult to study the interaction of light, heat and matter using normal objects. </para>
+<para>In fact, all objects emit thermal radiation (as long as their temperature is above Absolute Zero, or -273.15 degrees Celsius), but no object emits thermal radiation perfectly; rather, they are better at emitting/absorbing some wavelengths of light than others. These uneven efficiencies make it difficult to study the interaction of light, heat and matter using normal objects. </para>
 
-<para
->Fortunately, it is possible to construct a nearly-perfect blackbody. Construct a box made of a thermally conductive material, such as metal. The box should be completely closed on all sides, so that the inside forms a cavity that does not receive light from the surroundings. Then, make a small hole somewhere on the box. The light coming out of this hole will almost perfectly resemble the light from an ideal blackbody, for the temperature of the air inside the box. </para>
+<para>Fortunately, it is possible to construct a nearly-perfect blackbody. Construct a box made of a thermally conductive material, such as metal. The box should be completely closed on all sides, so that the inside forms a cavity that does not receive light from the surroundings. Then, make a small hole somewhere on the box. The light coming out of this hole will almost perfectly resemble the light from an ideal blackbody, for the temperature of the air inside the box. </para>
 
-<para
->At the beginning of the 20th century, scientists Lord Rayleigh, and Max Planck (among others) studied the blackbody radiation using such a device. After much work, Planck was able to empirically describe the intensity of light emitted by a blackbody as a function of wavelength. Furthermore, he was able to describe how this spectrum would change as the temperature changed. Planck's work on blackbody radiation is one of the areas of physics that led to the foundation of the wonderful science of Quantum Mechanics, but that is unfortunately beyond the scope of this article. </para>
+<para>At the beginning of the 20th century, scientists Lord Rayleigh, and Max Planck (among others) studied the blackbody radiation using such a device. After much work, Planck was able to empirically describe the intensity of light emitted by a blackbody as a function of wavelength. Furthermore, he was able to describe how this spectrum would change as the temperature changed. Planck's work on blackbody radiation is one of the areas of physics that led to the foundation of the wonderful science of Quantum Mechanics, but that is unfortunately beyond the scope of this article. </para>
 
-<para
->What Planck and the others found was that as the temperature of a blackbody increases, the total amount of light emitted per second increases, and the wavelength of the spectrum's peak shifts to bluer colours (see Figure 1). </para>
+<para>What Planck and the others found was that as the temperature of a blackbody increases, the total amount of light emitted per second increases, and the wavelength of the spectrum's peak shifts to bluer colours (see Figure 1). </para>
 
 <para>
 <mediaobject>
 <imageobject>
 <imagedata fileref="blackbody.png" format="PNG"/>
 </imageobject>
-<caption
-><para
-><phrase
->Figure 1</phrase
-></para
-></caption>
+<caption><para><phrase>Figure 1</phrase></para></caption>
 </mediaobject>
 </para>
 
-<para
->For example, an iron bar becomes orange-red when heated to high temperatures and its colour progressively shifts toward blue and white as it is heated further. </para>
+<para>For example, an iron bar becomes orange-red when heated to high temperatures and its colour progressively shifts toward blue and white as it is heated further. </para>
 
-<para
->In 1893, German physicist Wilhelm Wien quantified the relationship between blackbody temperature and the wavelength of the spectral peak with the following equation: </para>
+<para>In 1893, German physicist Wilhelm Wien quantified the relationship between blackbody temperature and the wavelength of the spectral peak with the following equation: </para>
 
 <para>
 <mediaobject>
@@ -76,22 +43,17 @@
 </mediaobject>
 </para>
 
-<para
->where T is the temperature in Kelvin. Wien's law (also known as Wien's displacement law) states that the wavelength of maximum emission from a blackbody is inversely proportional to its temperature. This makes sense; shorter-wavelength (higher-frequency) light corresponds to higher-energy photons, which you would expect from a higher-temperature object. </para>
+<para>where T is the temperature in Kelvin. Wien's law (also known as Wien's displacement law) states that the wavelength of maximum emission from a blackbody is inversely proportional to its temperature. This makes sense; shorter-wavelength (higher-frequency) light corresponds to higher-energy photons, which you would expect from a higher-temperature object. </para>
 
-<para
->For example, the sun has an average temperature of 5800 K, so its wavelength of maximum emission is given by: <mediaobject
-> <imageobject>
+<para>For example, the sun has an average temperature of 5800 K, so its wavelength of maximum emission is given by: <mediaobject> <imageobject>
 <imagedata fileref="lambda_ex.png" format="PNG"/>
 </imageobject>
 </mediaobject>
 </para>
 
-<para
->This wavelengths falls in the green region of the visible light spectrum, but the sun's continuum radiates photons both longer and shorter than lambda(max) and the human eyes perceives the sun's colour as yellow/white. </para>
+<para>This wavelengths falls in the green region of the visible light spectrum, but the sun's continuum radiates photons both longer and shorter than lambda(max) and the human eyes perceives the sun's colour as yellow/white. </para>
 
-<para
->In 1879, Austrian physicist Stephan Josef Stefan showed that the luminosity, L, of a black body is proportional to the 4th power of its temperature T. </para>
+<para>In 1879, Austrian physicist Stephan Josef Stefan showed that the luminosity, L, of a black body is proportional to the 4th power of its temperature T. </para>
 
 <para>
 <mediaobject>
@@ -101,11 +63,9 @@
 </mediaobject>
 </para>
 
-<para
->where A is the surface area, alpha is a constant of proportionality, and T is the temperature in Kelvin. That is, if we double the temperature (e.g. 1000 K to 2000 K) then the total energy radiated from a blackbody increase by a factor of 2^4 or 16. </para>
+<para>where A is the surface area, alpha is a constant of proportionality, and T is the temperature in Kelvin. That is, if we double the temperature (e.g. 1000 K to 2000 K) then the total energy radiated from a blackbody increase by a factor of 2^4 or 16. </para>
 
-<para
->Five years later, Austrian physicist Ludwig Boltzman derived the same equation and is now known as the Stefan-Boltzman law. If we assume a spherical star with radius R, then the luminosity of such a star is </para>
+<para>Five years later, Austrian physicist Ludwig Boltzman derived the same equation and is now known as the Stefan-Boltzman law. If we assume a spherical star with radius R, then the luminosity of such a star is </para>
 
 <para>
 <mediaobject>
@@ -115,9 +75,7 @@
 </mediaobject>
 </para>
 
-<para
->where R is the star radius in cm, and the alpha is the Stefan-Boltzman constant, which has the value: <mediaobject
-> <imageobject>
+<para>where R is the star radius in cm, and the alpha is the Stefan-Boltzman constant, which has the value: <mediaobject> <imageobject>
 <imagedata fileref="alpha.png" format="PNG"/>
 </imageobject>
 </mediaobject>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/calc-angdist.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/calc-angdist.docbook
index 15de62623e9..f790d92b077 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/calc-angdist.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/calc-angdist.docbook
@@ -1,39 +1,23 @@
 <sect2 id="calc-angdist">
-<title
->Angular Distance module</title>
-<indexterm
-><primary
->Tools</primary>
-<secondary
->Astrocalculator</secondary>
-<tertiary
->Angular Distance module</tertiary>
+<title>Angular Distance module</title>
+<indexterm><primary>Tools</primary>
+<secondary>Astrocalculator</secondary>
+<tertiary>Angular Distance module</tertiary>
 </indexterm>
 
 <screenshot>
-<screeninfo
->The Angular Distance calculator module </screeninfo>
+<screeninfo>The Angular Distance calculator module </screeninfo>
 <mediaobject>
   <imageobject>
     <imagedata fileref="calc-angdist.png" format="PNG"/>
   </imageobject>
   <textobject>
-    <phrase
->Angular Distance</phrase>
+    <phrase>Angular Distance</phrase>
   </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->The Angular Distance tool is used to measure the angle between any two points on the sky. You simply specify the <link linkend="equatorial"
->Equatorial coordinates</link
-> of the desired pair of points, and then press the <guibutton
->Compute</guibutton
-> button to obtain the angle between the two points. </para>
-<para
->There is also a Batch mode for this module. In batch mode, you specify an input filename which contains four numbers per line: the RA and Dec values for pairs of points. Alternatively, you can specify a single value for any of these four coordinates in the calculator panel (the corresponding values in the input file should be skipped if they are specified in the calculator). </para>
-<para
->Once you have specified the input filename and an output filename, simply press the <guibutton
->Run</guibutton
-> button to generate the output file. </para>
+<para>The Angular Distance tool is used to measure the angle between any two points on the sky. You simply specify the <link linkend="equatorial">Equatorial coordinates</link> of the desired pair of points, and then press the <guibutton>Compute</guibutton> button to obtain the angle between the two points. </para>
+<para>There is also a Batch mode for this module. In batch mode, you specify an input filename which contains four numbers per line: the RA and Dec values for pairs of points. Alternatively, you can specify a single value for any of these four coordinates in the calculator panel (the corresponding values in the input file should be skipped if they are specified in the calculator). </para>
+<para>Once you have specified the input filename and an output filename, simply press the <guibutton>Run</guibutton> button to generate the output file. </para>
 </sect2>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/calc-apcoords.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/calc-apcoords.docbook
index 03471f5fccc..24bad248c16 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/calc-apcoords.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/calc-apcoords.docbook
@@ -1,45 +1,22 @@
 <sect2 id="calc-apcoords">
-<title
->Apparent Coordinates module</title>
-<indexterm
-><primary
->Tools</primary>
-<secondary
->Astrocalculator</secondary>
-<tertiary
->Apparent Coordinates module</tertiary>
+<title>Apparent Coordinates module</title>
+<indexterm><primary>Tools</primary>
+<secondary>Astrocalculator</secondary>
+<tertiary>Apparent Coordinates module</tertiary>
 </indexterm>
 
 <screenshot>
-<screeninfo
->The Apparent Coordinates calculator module </screeninfo>
+<screeninfo>The Apparent Coordinates calculator module </screeninfo>
 <mediaobject>
   <imageobject>
     <imagedata fileref="calc-apcoords.png" format="PNG"/>
   </imageobject>
   <textobject>
-    <phrase
->Apparent Coordinates</phrase>
+    <phrase>Apparent Coordinates</phrase>
   </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->The Apparent Coordinates module converts the <firstterm
->catalogue coordinates</firstterm
-> of a point in the sky to its <firstterm
->apparent coordinates</firstterm
-> for any date. The coordinates of objects in the sky are not fixed, because of <link linkend="ai-precession"
->precession</link
->, nutation and aberration. This module takes these effects into account. </para>
-<para
->To use the module, first enter the desired target date and time in the <guilabel
->Target Time/Date</guilabel
-> section. Then, enter the catalogue coordinates in the <guilabel
->Catalog Coordinates</guilabel
-> section. You can also specify the catalogue's epoch here (usually 2000.0 for modern object catalogues). Finally, press the <guibutton
->Compute</guibutton
-> button, and the object's coordinates for the target date will be displayed in the <guilabel
->Apparent Coordinates</guilabel
-> section. </para>
+<para>The Apparent Coordinates module converts the <firstterm>catalogue coordinates</firstterm> of a point in the sky to its <firstterm>apparent coordinates</firstterm> for any date. The coordinates of objects in the sky are not fixed, because of <link linkend="ai-precession">precession</link>, nutation and aberration. This module takes these effects into account. </para>
+<para>To use the module, first enter the desired target date and time in the <guilabel>Target Time/Date</guilabel> section. Then, enter the catalogue coordinates in the <guilabel>Catalog Coordinates</guilabel> section. You can also specify the catalogue's epoch here (usually 2000.0 for modern object catalogues). Finally, press the <guibutton>Compute</guibutton> button, and the object's coordinates for the target date will be displayed in the <guilabel>Apparent Coordinates</guilabel> section. </para>
 </sect2>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/calc-dayduration.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/calc-dayduration.docbook
index 956b3a8c41d..88d58f778fa 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/calc-dayduration.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/calc-dayduration.docbook
@@ -1,31 +1,21 @@
 <sect2 id="calc-dayduration">
-<title
->Day Duration module</title>
-<indexterm
-><primary
->Tools</primary>
-<secondary
->Astrocalculator</secondary>
-<tertiary
->Day Duration module</tertiary>
+<title>Day Duration module</title>
+<indexterm><primary>Tools</primary>
+<secondary>Astrocalculator</secondary>
+<tertiary>Day Duration module</tertiary>
 </indexterm>
 
 <screenshot>
-<screeninfo
->The Day Duration calculator module </screeninfo>
+<screeninfo>The Day Duration calculator module </screeninfo>
 <mediaobject>
   <imageobject>
     <imagedata fileref="calc-daylength.png" format="PNG"/>
   </imageobject>
   <textobject>
-    <phrase
->Day Duration</phrase>
+    <phrase>Day Duration</phrase>
   </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->This module computes the length of day as well as sunrise, sun-transit (noon), and sunset times for any calendar date, for any location on Earth. First fill in the desired geographic coordinates and date, then press the <guibutton
->Compute</guibutton
-> button. </para>
+<para>This module computes the length of day as well as sunrise, sun-transit (noon), and sunset times for any calendar date, for any location on Earth. First fill in the desired geographic coordinates and date, then press the <guibutton>Compute</guibutton> button. </para>
 </sect2>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/calc-ecliptic.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/calc-ecliptic.docbook
index 28487e4dfb4..fcf18203ece 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/calc-ecliptic.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/calc-ecliptic.docbook
@@ -1,45 +1,22 @@
 <sect2 id="calc-ecliptic">
-<title
->Ecliptic Coordinates module</title>
-<indexterm
-><primary
->Tools</primary>
-<secondary
->Astrocalculator</secondary>
-<tertiary
->Ecliptic Coordinates module</tertiary>
+<title>Ecliptic Coordinates module</title>
+<indexterm><primary>Tools</primary>
+<secondary>Astrocalculator</secondary>
+<tertiary>Ecliptic Coordinates module</tertiary>
 </indexterm>
 
 <screenshot>
-<screeninfo
->The Ecliptic Coordinates calculator module </screeninfo>
+<screeninfo>The Ecliptic Coordinates calculator module </screeninfo>
 <mediaobject>
   <imageobject>
     <imagedata fileref="calc-ecliptic.png" format="PNG"/>
   </imageobject>
   <textobject>
-    <phrase
->Ecliptic Coordinates</phrase>
+    <phrase>Ecliptic Coordinates</phrase>
   </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->This module converts between <link linkend="equatorial"
->Equatorial coordinates</link
-> and <link linkend="ecliptic"
->Ecliptic coordinates</link
->. First, select which coordinates should be taken as input values in the <guilabel
->Choose Input Coordinates</guilabel
-> section. Then, fill in the corresponding coordinate values in either the <guilabel
->Ecliptic coordinates</guilabel
-> or <guilabel
->Equatorial coordinates</guilabel
-> section. Finally, press the <guibutton
->Compute</guibutton
-> button, and the complementary coordinates will be filled in. </para>
-<para
->The module contains a batch mode for converting several coordinate pairs at once. You must construct an input file in which each line contains two values: the input coordinate pairs (either Equatorial or Ecliptic). Then specify which coordinates you are using as input, and identify the input and output filenames. Finally, press the <guibutton
->Run</guibutton
-> button to generate the output file, which will contain the converted coordinates (Equatorial or Ecliptic; the complement of what you chose as the input values). </para>
+<para>This module converts between <link linkend="equatorial">Equatorial coordinates</link> and <link linkend="ecliptic">Ecliptic coordinates</link>. First, select which coordinates should be taken as input values in the <guilabel>Choose Input Coordinates</guilabel> section. Then, fill in the corresponding coordinate values in either the <guilabel>Ecliptic coordinates</guilabel> or <guilabel>Equatorial coordinates</guilabel> section. Finally, press the <guibutton>Compute</guibutton> button, and the complementary coordinates will be filled in. </para>
+<para>The module contains a batch mode for converting several coordinate pairs at once. You must construct an input file in which each line contains two values: the input coordinate pairs (either Equatorial or Ecliptic). Then specify which coordinates you are using as input, and identify the input and output filenames. Finally, press the <guibutton>Run</guibutton> button to generate the output file, which will contain the converted coordinates (Equatorial or Ecliptic; the complement of what you chose as the input values). </para>
 </sect2>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/calc-eqgal.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/calc-eqgal.docbook
index 9c53a0b0e64..2ee39560dcf 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/calc-eqgal.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/calc-eqgal.docbook
@@ -1,42 +1,22 @@
 <sect2 id="calc-eqgal">
-<title
->Equatorial/Galactic Coordinates module</title>
-<indexterm
-><primary
->Tools</primary>
-<secondary
->Astrocalculator</secondary>
-<tertiary
->Equatorial/Galactic Coordinates module</tertiary>
+<title>Equatorial/Galactic Coordinates module</title>
+<indexterm><primary>Tools</primary>
+<secondary>Astrocalculator</secondary>
+<tertiary>Equatorial/Galactic Coordinates module</tertiary>
 </indexterm>
 
 <screenshot>
-<screeninfo
->The Equatorial/Galactic Coordinates calculator module </screeninfo>
+<screeninfo>The Equatorial/Galactic Coordinates calculator module </screeninfo>
 <mediaobject>
   <imageobject>
     <imagedata fileref="calc-eqgal.png" format="PNG"/>
   </imageobject>
   <textobject>
-    <phrase
->Equatorial/Galactic Coordinates</phrase>
+    <phrase>Equatorial/Galactic Coordinates</phrase>
   </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->This module converts from <link linkend="equatorial"
->Equatorial coordinates</link
-> to <link linkend="galactic"
->Galactic coordinates</link
->, and vice versa. First, select which coordinates should be taken as input values in the <guilabel
->Input Selection</guilabel
-> section. Then, fill in the corresponding coordinate values in either the <guilabel
->Galactic coordinates</guilabel
-> or <guilabel
->Equatorial coordinates</guilabel
-> section. Finally, press the <guibutton
->Compute</guibutton
-> button, and the complementary coordinates will be filled in. </para>
+<para>This module converts from <link linkend="equatorial">Equatorial coordinates</link> to <link linkend="galactic">Galactic coordinates</link>, and vice versa. First, select which coordinates should be taken as input values in the <guilabel>Input Selection</guilabel> section. Then, fill in the corresponding coordinate values in either the <guilabel>Galactic coordinates</guilabel> or <guilabel>Equatorial coordinates</guilabel> section. Finally, press the <guibutton>Compute</guibutton> button, and the complementary coordinates will be filled in. </para>
 </sect2>
 
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/calc-equinox.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/calc-equinox.docbook
index 04ab0393713..98b9b52ae68 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/calc-equinox.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/calc-equinox.docbook
@@ -1,37 +1,22 @@
 <sect2 id="calc-equinox">
-<title
->Equinoxes and Solstices module</title>
-<indexterm
-><primary
->Tools</primary>
-<secondary
->Astrocalculator</secondary>
-<tertiary
->Equinoxes and Solstices module</tertiary>
+<title>Equinoxes and Solstices module</title>
+<indexterm><primary>Tools</primary>
+<secondary>Astrocalculator</secondary>
+<tertiary>Equinoxes and Solstices module</tertiary>
 </indexterm>
 
 <screenshot>
-<screeninfo
->The Equinoxes and Solstices calculator module </screeninfo>
+<screeninfo>The Equinoxes and Solstices calculator module </screeninfo>
 <mediaobject>
   <imageobject>
     <imagedata fileref="calc-equinox.png" format="PNG"/>
   </imageobject>
   <textobject>
-    <phrase
->Equinoxes and Solstices</phrase>
+    <phrase>Equinoxes and Solstices</phrase>
   </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->The <link linkend="ai-equinox"
->Equinoxes</link
-> and Solstices module calculates the date and time of an equinox or solstice for a given year. You specify which event (Spring Equinox, Summer Solstice, Autumn Equinox or Winter Solstice) should be investigated, and the year. Then press the <guibutton
->Compute</guibutton
-> button to obtain the date and time of the event, and the length of the corresponding season, in days. </para>
-<para
->There is a batch mode for this module. To use it, simply generate an input file whose lines each contain a year for which the Equinox and Solstice data will be computed. Then specify the input and output filenames, and press the <guibutton
->Run</guibutton
-> button to generate the output file. Each line in the output file contains the input year, the date and time of each event, and the length of each season. </para>
+<para>The <link linkend="ai-equinox">Equinoxes</link> and Solstices module calculates the date and time of an equinox or solstice for a given year. You specify which event (Spring Equinox, Summer Solstice, Autumn Equinox or Winter Solstice) should be investigated, and the year. Then press the <guibutton>Compute</guibutton> button to obtain the date and time of the event, and the length of the corresponding season, in days. </para>
+<para>There is a batch mode for this module. To use it, simply generate an input file whose lines each contain a year for which the Equinox and Solstice data will be computed. Then specify the input and output filenames, and press the <guibutton>Run</guibutton> button to generate the output file. Each line in the output file contains the input year, the date and time of each event, and the length of each season. </para>
 </sect2>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/calc-geodetic.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/calc-geodetic.docbook
index 0419968435f..82a49753d3b 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/calc-geodetic.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/calc-geodetic.docbook
@@ -1,45 +1,22 @@
 <sect2 id="calc-geodetic">
-<title
->Geodetic Coordinates module</title>
-<indexterm
-><primary
->Tools</primary>
-<secondary
->Astrocalculator</secondary>
-<tertiary
->Geodetic Coordinates module</tertiary>
+<title>Geodetic Coordinates module</title>
+<indexterm><primary>Tools</primary>
+<secondary>Astrocalculator</secondary>
+<tertiary>Geodetic Coordinates module</tertiary>
 </indexterm>
 
 <screenshot>
-<screeninfo
->The Geodetic Coordinates calculator module </screeninfo>
+<screeninfo>The Geodetic Coordinates calculator module </screeninfo>
 <mediaobject>
   <imageobject>
     <imagedata fileref="calc-geodetic.png" format="PNG"/>
   </imageobject>
   <textobject>
-    <phrase
->Geodetic Coordinates</phrase>
+    <phrase>Geodetic Coordinates</phrase>
   </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->The normal <link linkend="ai-geocoords"
->geographic coordinate system</link
-> assumes that the Earth is a perfect sphere. This is nearly true, so for most purposes geographic coordinates are fine. If very high precision is required, then we must take the true shape of the Earth into account. The Earth is an ellipsoid; the distance around the equator is about 0.3% longer than a <link linkend="ai-greatcircle"
->Great Circle</link
-> that passes through the poles. The <firstterm
->Geodetic Coordinate system</firstterm
-> takes this ellipsoidal shape into account, and expresses the position on the Earth's surface in Cartesian coordinates (X, Y, and Z). </para>
-<para
->To use the module, first select which coordinates you will use as input in the <guilabel
->Input Selection</guilabel
-> section. Then, fill in the input coordinates in either the <guilabel
->Cartesian Coordinates</guilabel
-> section or the <guilabel
->Geographic Coordinates</guilabel
-> section. When you press the <guibutton
->Compute</guibutton
-> button, the corresponding coordinates will be filled in. </para>
+<para>The normal <link linkend="ai-geocoords">geographic coordinate system</link> assumes that the Earth is a perfect sphere. This is nearly true, so for most purposes geographic coordinates are fine. If very high precision is required, then we must take the true shape of the Earth into account. The Earth is an ellipsoid; the distance around the equator is about 0.3% longer than a <link linkend="ai-greatcircle">Great Circle</link> that passes through the poles. The <firstterm>Geodetic Coordinate system</firstterm> takes this ellipsoidal shape into account, and expresses the position on the Earth's surface in Cartesian coordinates (X, Y, and Z). </para>
+<para>To use the module, first select which coordinates you will use as input in the <guilabel>Input Selection</guilabel> section. Then, fill in the input coordinates in either the <guilabel>Cartesian Coordinates</guilabel> section or the <guilabel>Geographic Coordinates</guilabel> section. When you press the <guibutton>Compute</guibutton> button, the corresponding coordinates will be filled in. </para>
 </sect2>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/calc-horizontal.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/calc-horizontal.docbook
index da36d32fc0e..e1ee7ea1786 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/calc-horizontal.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/calc-horizontal.docbook
@@ -1,42 +1,22 @@
 <sect2 id="calc-horiz">
-<title
->Horizontal Coordinates module</title>
-<indexterm
-><primary
->Tools</primary>
-<secondary
->Astrocalculator</secondary>
-<tertiary
->Horizontal Coordinates module</tertiary>
+<title>Horizontal Coordinates module</title>
+<indexterm><primary>Tools</primary>
+<secondary>Astrocalculator</secondary>
+<tertiary>Horizontal Coordinates module</tertiary>
 </indexterm>
 
 <screenshot>
-<screeninfo
->The Horizontal Coordinates calculator module </screeninfo>
+<screeninfo>The Horizontal Coordinates calculator module </screeninfo>
 <mediaobject>
   <imageobject>
     <imagedata fileref="calc-horizontal.png" format="PNG"/>
   </imageobject>
   <textobject>
-    <phrase
->Horizontal Coordinates</phrase>
+    <phrase>Horizontal Coordinates</phrase>
   </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->This module converts from <link linkend="equatorial"
->Equatorial coordinates</link
-> to <link linkend="horizontal"
->Horizontal coordinates</link
->. First, select the date, time, and geographic coordinates for the calculation in the <guilabel
->Input Data</guilabel
-> section. Then, fill in the equatorial coordinates to be converted and their catalogue epoch in the <guilabel
->Equatorial Coordinates</guilabel
-> section. When you press the <guibutton
->Compute</guibutton
-> button, the corresponding Horizontal coordinates will be presented in the <guilabel
->Horizontal Coordinates</guilabel
-> section. </para>
+<para>This module converts from <link linkend="equatorial">Equatorial coordinates</link> to <link linkend="horizontal">Horizontal coordinates</link>. First, select the date, time, and geographic coordinates for the calculation in the <guilabel>Input Data</guilabel> section. Then, fill in the equatorial coordinates to be converted and their catalogue epoch in the <guilabel>Equatorial Coordinates</guilabel> section. When you press the <guibutton>Compute</guibutton> button, the corresponding Horizontal coordinates will be presented in the <guilabel>Horizontal Coordinates</guilabel> section. </para>
 </sect2>
 
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/calc-julianday.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/calc-julianday.docbook
index bd8b957c38d..3e675a4ff47 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/calc-julianday.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/calc-julianday.docbook
@@ -1,45 +1,27 @@
 <sect2 id="calc-julian">
-<title
->Julian Day module</title>
-<indexterm
-><primary
->Tools</primary>
-<secondary
->Astrocalculator</secondary>
-<tertiary
->Julian Day module</tertiary>
+<title>Julian Day module</title>
+<indexterm><primary>Tools</primary>
+<secondary>Astrocalculator</secondary>
+<tertiary>Julian Day module</tertiary>
 </indexterm>
 
 <screenshot>
-<screeninfo
->The Julian Day calculator module </screeninfo>
+<screeninfo>The Julian Day calculator module </screeninfo>
 <mediaobject>
   <imageobject>
     <imagedata fileref="calc-julian.png" format="PNG"/>
   </imageobject>
   <textobject>
-    <phrase
->Julian Day</phrase>
+    <phrase>Julian Day</phrase>
   </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->This module converts between the calendar date, the <link linkend="ai-julianday"
->Julian Day</link
-> and the <firstterm
->Modified Julian Day</firstterm
->. The Modified Julian Day is simply equal to the Julian Day - 2,400,000.5. </para
-><para
->To use the module, select which of the three dates will be the input, and then fill in its value. Then press the <guibutton
->Compute</guibutton
-> button, and the corresponding values for the other two date systems will be displayed. </para>
+<para>This module converts between the calendar date, the <link linkend="ai-julianday">Julian Day</link> and the <firstterm>Modified Julian Day</firstterm>. The Modified Julian Day is simply equal to the Julian Day - 2,400,000.5. </para><para>To use the module, select which of the three dates will be the input, and then fill in its value. Then press the <guibutton>Compute</guibutton> button, and the corresponding values for the other two date systems will be displayed. </para>
 
 <tip>
-<para
->Exercise:</para>
-<para
->What calendar date does MJD = 0.0 correspond to? </para>
+<para>Exercise:</para>
+<para>What calendar date does MJD = 0.0 correspond to? </para>
 </tip>
 
 </sect2>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/calc-planetcoords.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/calc-planetcoords.docbook
index 0188d75b90b..1e7d51d6d76 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/calc-planetcoords.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/calc-planetcoords.docbook
@@ -1,43 +1,22 @@
 <sect2 id="calc-planetcoords">
-<title
->Planet Coordinates module</title>
-<indexterm
-><primary
->Tools</primary>
-<secondary
->Astrocalculator</secondary>
-<tertiary
->Planet Coordinates module</tertiary>
+<title>Planet Coordinates module</title>
+<indexterm><primary>Tools</primary>
+<secondary>Astrocalculator</secondary>
+<tertiary>Planet Coordinates module</tertiary>
 </indexterm>
 
 <screenshot>
-<screeninfo
->The Planet Coordinates calculator module </screeninfo>
+<screeninfo>The Planet Coordinates calculator module </screeninfo>
 <mediaobject>
   <imageobject>
     <imagedata fileref="calc-planetcoords.png" format="PNG"/>
   </imageobject>
   <textobject>
-    <phrase
->Planet Coordinates</phrase>
+    <phrase>Planet Coordinates</phrase>
   </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->The Planet Coordinates module computes positional data for any major solar system body, for any time and date and any geographic location. Simply select the <guilabel
->solar system body</guilabel
-> from the drop-down list, and specify the desired date, time and geographic coordinates (these values are preset to the current &kstars; settings). Then press the <guibutton
->Compute</guibutton
-> button to determine the <link linkend="equatorial"
->Equatorial</link
->, <link linkend="horizontal"
->Horizontal</link
-> and <link linkend="ecliptic"
->Ecliptic</link
-> coordinates of the body. </para>
-<para
->There is a batch mode for this module. You must construct an input file in which each line specifies values for the input parameters (solar system body, date, time, longitude, and latitude). You may choose to specify a constant value for some of the parameters in the calculator window (these parameters should be skipped in the input file). You may also specify which of the output parameters (Equatorial, Horizontal and Ecliptic coordinates) should be calculated. Finally, specify the input and output filenames, and press the <guibutton
->Run</guibutton
-> button to generate the output file with the computed values. </para>
+<para>The Planet Coordinates module computes positional data for any major solar system body, for any time and date and any geographic location. Simply select the <guilabel>solar system body</guilabel> from the drop-down list, and specify the desired date, time and geographic coordinates (these values are preset to the current &kstars; settings). Then press the <guibutton>Compute</guibutton> button to determine the <link linkend="equatorial">Equatorial</link>, <link linkend="horizontal">Horizontal</link> and <link linkend="ecliptic">Ecliptic</link> coordinates of the body. </para>
+<para>There is a batch mode for this module. You must construct an input file in which each line specifies values for the input parameters (solar system body, date, time, longitude, and latitude). You may choose to specify a constant value for some of the parameters in the calculator window (these parameters should be skipped in the input file). You may also specify which of the output parameters (Equatorial, Horizontal and Ecliptic coordinates) should be calculated. Finally, specify the input and output filenames, and press the <guibutton>Run</guibutton> button to generate the output file with the computed values. </para>
 </sect2>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/calc-precess.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/calc-precess.docbook
index 27195079140..13e6f528b4a 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/calc-precess.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/calc-precess.docbook
@@ -1,43 +1,22 @@
 <sect2 id="calc-precess">
-<title
->Precession module</title>
-<indexterm
-><primary
->Tools</primary>
-<secondary
->Astrocalculator</secondary>
-<tertiary
->Precession module</tertiary>
+<title>Precession module</title>
+<indexterm><primary>Tools</primary>
+<secondary>Astrocalculator</secondary>
+<tertiary>Precession module</tertiary>
 </indexterm>
 
 <screenshot>
-<screeninfo
->The Precession calculator module </screeninfo>
+<screeninfo>The Precession calculator module </screeninfo>
 <mediaobject>
   <imageobject>
     <imagedata fileref="calc-precess.png" format="PNG"/>
   </imageobject>
   <textobject>
-    <phrase
->Precession</phrase>
+    <phrase>Precession</phrase>
   </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->This module is similar to the <link linkend="calc-apcoords"
->Apparent Coordinates module</link
->, but it only applies the effect of <link linkend="ai-precession"
->precession</link
->, not of nutation or aberration. </para>
-<para
->To use the module, first enter the input coordinates and their epoch in the <guilabel
->Original Coordinates</guilabel
-> section. You must also fill in the target epoch in the <guilabel
->Precessed Coordinates</guilabel
-> section. Then, press the <guibutton
->Compute</guibutton
-> button, and the object's coordinates, precessed to the target Epoch, are presented in the <guilabel
->Precessed Coordinates</guilabel
-> section. </para>
+<para>This module is similar to the <link linkend="calc-apcoords">Apparent Coordinates module</link>, but it only applies the effect of <link linkend="ai-precession">precession</link>, not of nutation or aberration. </para>
+<para>To use the module, first enter the input coordinates and their epoch in the <guilabel>Original Coordinates</guilabel> section. You must also fill in the target epoch in the <guilabel>Precessed Coordinates</guilabel> section. Then, press the <guibutton>Compute</guibutton> button, and the object's coordinates, precessed to the target Epoch, are presented in the <guilabel>Precessed Coordinates</guilabel> section. </para>
 </sect2>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/calc-sidereal.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/calc-sidereal.docbook
index 77a4ebb6112..3844ec1f877 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/calc-sidereal.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/calc-sidereal.docbook
@@ -1,37 +1,21 @@
 <sect2 id="calc-sidereal">
-<title
->Sidereal Time module</title>
-<indexterm
-><primary
->Tools</primary>
-<secondary
->Astrocalculator</secondary>
-<tertiary
->Sidereal Time module</tertiary>
+<title>Sidereal Time module</title>
+<indexterm><primary>Tools</primary>
+<secondary>Astrocalculator</secondary>
+<tertiary>Sidereal Time module</tertiary>
 </indexterm>
 
 <screenshot>
-<screeninfo
->The Sidereal Time calculator module </screeninfo>
+<screeninfo>The Sidereal Time calculator module </screeninfo>
 <mediaobject>
   <imageobject>
     <imagedata fileref="calc-sidereal.png" format="PNG"/>
   </imageobject>
   <textobject>
-    <phrase
->Sidereal Time</phrase>
+    <phrase>Sidereal Time</phrase>
   </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->This module converts between <link linkend="ai-utime"
->Universal Time</link
-> and Local <link linkend="ai-sidereal"
->Sidereal Time</link
->. First, select whether you will use Universal Time or Sidereal Time as an input value in the <guilabel
->Input Selection</guilabel
-> section. You must also specify a geographic longitude, and a date for the calculation, in addition to either the Universal Time or the Sidereal Time value. When you press the <guibutton
->Compute</guibutton
-> button, the corresponding value for the other Time will be displayed. </para>
+<para>This module converts between <link linkend="ai-utime">Universal Time</link> and Local <link linkend="ai-sidereal">Sidereal Time</link>. First, select whether you will use Universal Time or Sidereal Time as an input value in the <guilabel>Input Selection</guilabel> section. You must also specify a geographic longitude, and a date for the calculation, in addition to either the Universal Time or the Sidereal Time value. When you press the <guibutton>Compute</guibutton> button, the corresponding value for the other Time will be displayed. </para>
 </sect2>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/calculator.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/calculator.docbook
index b36104194c3..40fe46136aa 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/calculator.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/calculator.docbook
@@ -1,101 +1,28 @@
 <sect1 id="tool-calculator">
-<title
->The Astrocalculator</title>
-<indexterm
-><primary
->Tools</primary>
-<secondary
->Astrocalculator</secondary>
+<title>The Astrocalculator</title>
+<indexterm><primary>Tools</primary>
+<secondary>Astrocalculator</secondary>
 </indexterm>
 
-<para
->The &kstars; Astrocalculator provides several modules that give you direct access to algorithms used by the program. The modules are organised by subject: <itemizedlist
-><title
->Coordinate Converters</title>
-<listitem
-><para
-><link linkend="calc-angdist"
->Angular Distance</link
-></para
-></listitem>
-<listitem
-><para
-><link linkend="calc-apcoords"
->Apparent Coordinates</link
-></para
-></listitem>
-<listitem
-><para
-><link linkend="calc-ecliptic"
->Ecliptic Coordinates</link
-></para
-></listitem>
-<listitem
-><para
-><link linkend="calc-eqgal"
->Equatorial/Galactic Coordinates</link
-></para
-></listitem>
-<listitem
-><para
-><link linkend="calc-horiz"
->Horizontal Coordinates</link
-></para
-></listitem>
-<listitem
-><para
-><link linkend="calc-precess"
->Precession</link
-></para
-></listitem>
+<para>The &kstars; Astrocalculator provides several modules that give you direct access to algorithms used by the program. The modules are organised by subject: <itemizedlist><title>Coordinate Converters</title>
+<listitem><para><link linkend="calc-angdist">Angular Distance</link></para></listitem>
+<listitem><para><link linkend="calc-apcoords">Apparent Coordinates</link></para></listitem>
+<listitem><para><link linkend="calc-ecliptic">Ecliptic Coordinates</link></para></listitem>
+<listitem><para><link linkend="calc-eqgal">Equatorial/Galactic Coordinates</link></para></listitem>
+<listitem><para><link linkend="calc-horiz">Horizontal Coordinates</link></para></listitem>
+<listitem><para><link linkend="calc-precess">Precession</link></para></listitem>
 </itemizedlist>
-<itemizedlist
-><title
->Earth Coordinates</title>
-<listitem
-><para
-><link linkend="calc-geodetic"
->Geodetic Coordinates</link
-></para
-></listitem>
+<itemizedlist><title>Earth Coordinates</title>
+<listitem><para><link linkend="calc-geodetic">Geodetic Coordinates</link></para></listitem>
 </itemizedlist>
-<itemizedlist
-><title
->Solar System</title>
-<listitem
-><para
-><link linkend="calc-planetcoords"
->Planets Coordinates</link
-></para
-></listitem>
+<itemizedlist><title>Solar System</title>
+<listitem><para><link linkend="calc-planetcoords">Planets Coordinates</link></para></listitem>
 </itemizedlist>
-<itemizedlist
-><title
->Time Calculators</title>
-<listitem
-><para
-><link linkend="calc-dayduration"
->Day Duration</link
-></para
-></listitem>
-<listitem
-><para
-><link linkend="calc-equinox"
->Equinoxes and Solstices</link
-></para
-></listitem>
-<listitem
-><para
-><link linkend="calc-julian"
->Julian Day</link
-></para
-></listitem>
-<listitem
-><para
-><link linkend="calc-sidereal"
->Sidereal Time</link
-></para
-></listitem>
+<itemizedlist><title>Time Calculators</title>
+<listitem><para><link linkend="calc-dayduration">Day Duration</link></para></listitem>
+<listitem><para><link linkend="calc-equinox">Equinoxes and Solstices</link></para></listitem>
+<listitem><para><link linkend="calc-julian">Julian Day</link></para></listitem>
+<listitem><para><link linkend="calc-sidereal">Sidereal Time</link></para></listitem>
 </itemizedlist>
 </para>
 &calc-angdist; &calc-apcoords; &calc-ecliptic; &calc-eqgal; &calc-horiz; &calc-precess; &calc-geodetic; &calc-planetcoords; &calc-dayduration; &calc-equinox; &calc-julian; &calc-sidereal; </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/cequator.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/cequator.docbook
index 112cc4f234a..da6a7700909 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/cequator.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/cequator.docbook
@@ -1,34 +1,11 @@
 <sect1 id="ai-cequator">
 <sect1info>
-<author
-><firstname
->Jason</firstname
-> <surname
->Harris</surname
-> </author>
+<author><firstname>Jason</firstname> <surname>Harris</surname> </author>
 </sect1info>
-<title
->The Celestial Equator</title>
-<indexterm
-><primary
->Celestial Equator</primary>
-<seealso
->Equatorial Coordinates</seealso>
+<title>The Celestial Equator</title>
+<indexterm><primary>Celestial Equator</primary>
+<seealso>Equatorial Coordinates</seealso>
 </indexterm>
-<para
->The <firstterm
->Celestial Equator</firstterm
-> is an imaginary <link linkend="ai-greatcircle"
->great circle</link
-> on the <link linkend="ai-csphere"
->celestial sphere</link
->. The celestial equator is the fundamental plane of the <link linkend="equatorial"
->Equatorial Coordinate System</link
->, so it is defined as the locus of points with Declination of zero degrees. It is also the projection of the Earth's equator onto the sky. </para>
-<para
->The Celestial Equator and the <link linkend="ai-ecliptic"
->Ecliptic</link
-> are set at an angle of 23.5 degrees in the sky. The points where they intersect are the Vernal and Autumnal <link linkend="ai-equinox"
->Equinoxes</link
->. </para>
+<para>The <firstterm>Celestial Equator</firstterm> is an imaginary <link linkend="ai-greatcircle">great circle</link> on the <link linkend="ai-csphere">celestial sphere</link>. The celestial equator is the fundamental plane of the <link linkend="equatorial">Equatorial Coordinate System</link>, so it is defined as the locus of points with Declination of zero degrees. It is also the projection of the Earth's equator onto the sky. </para>
+<para>The Celestial Equator and the <link linkend="ai-ecliptic">Ecliptic</link> are set at an angle of 23.5 degrees in the sky. The points where they intersect are the Vernal and Autumnal <link linkend="ai-equinox">Equinoxes</link>. </para>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/colorandtemp.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/colorandtemp.docbook
index bf4663dbcd8..1e41ecaf81f 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/colorandtemp.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/colorandtemp.docbook
@@ -2,124 +2,62 @@
 
 <sect1info>
 
-<author
-><firstname
->Jasem</firstname
-> <surname
->Mutlaq</surname
-> <affiliation
-><address
-> <email
->mutlaqja@ku.edu</email>
-</address
-></affiliation>
+<author><firstname>Jasem</firstname> <surname>Mutlaq</surname> <affiliation><address> <email>mutlaqja@ku.edu</email>
+</address></affiliation>
 </author>
 </sect1info>
 
-<title
->Star Colours and Temperatures</title>
-<indexterm
-><primary
->Star Colours and Temperatures</primary>
-<seealso
->Blackbody Radiation</seealso
-> <seealso
->Magnitude Scale</seealso
-> </indexterm>
+<title>Star Colours and Temperatures</title>
+<indexterm><primary>Star Colours and Temperatures</primary>
+<seealso>Blackbody Radiation</seealso> <seealso>Magnitude Scale</seealso> </indexterm>
 
-<para
->Stars appear to be exclusively white at first glance. But if we look carefully, we can notice a range of colours: blue, white, red and even gold. In the winter constellation of Orion, a beautiful contrast is seen between the red Betelgeuse at Orion's "armpit" and the blue Bellatrix at the shoulder. What causes stars to exhibit different colours remained a mystery until two centuries ago, when Physicists gained enough understanding of the nature of light and the properties of matter at immensely high temperatures. </para>
+<para>Stars appear to be exclusively white at first glance. But if we look carefully, we can notice a range of colours: blue, white, red and even gold. In the winter constellation of Orion, a beautiful contrast is seen between the red Betelgeuse at Orion's "armpit" and the blue Bellatrix at the shoulder. What causes stars to exhibit different colours remained a mystery until two centuries ago, when Physicists gained enough understanding of the nature of light and the properties of matter at immensely high temperatures. </para>
 
-<para
->Specifically, it was the physics of <link linkend="ai-blackbody"
->blackbody radiation</link
-> that enabled us to understand the variation of stellar colours. Shortly after blackbody radiation was understood, it was noticed that the spectra of stars look extremely similar to blackbody radiation curves of various temperatures, ranging from a few thousand Kelvin to ~50,000 Kelvin. The obvious conclusion is that stars are similar to blackbodies, and that the colour variation of stars is a direct consequence of their surface temperatures. </para>
+<para>Specifically, it was the physics of <link linkend="ai-blackbody">blackbody radiation</link> that enabled us to understand the variation of stellar colours. Shortly after blackbody radiation was understood, it was noticed that the spectra of stars look extremely similar to blackbody radiation curves of various temperatures, ranging from a few thousand Kelvin to ~50,000 Kelvin. The obvious conclusion is that stars are similar to blackbodies, and that the colour variation of stars is a direct consequence of their surface temperatures. </para>
 
-<para
->Cool stars (i.e., Spectral Type K and M) radiate most of their energy in the red and infrared region of the electromagnetic spectrum and thus appear red, while hot stars (i.e., Spectral Type O and B) emit mostly at blue and ultra-violet wavelengths, making them appear blue or white. </para>
+<para>Cool stars (i.e., Spectral Type K and M) radiate most of their energy in the red and infrared region of the electromagnetic spectrum and thus appear red, while hot stars (i.e., Spectral Type O and B) emit mostly at blue and ultra-violet wavelengths, making them appear blue or white. </para>
 
-<para
->To estimate the surface temperature of a star, we can use the known relationship between the temperature of a blackbody, and the wavelength of light where its spectrum peaks. That is, as you increase the temperature of a blackbody, the peak of its spectrum moves to shorter (bluer) wavelengths of light. This is illustrated in Figure 1 where the intensity of three hypothetical stars is plotted against wavelength. The "rainbow" indicates the range of wavelengths that are visible to the human eye. </para>
+<para>To estimate the surface temperature of a star, we can use the known relationship between the temperature of a blackbody, and the wavelength of light where its spectrum peaks. That is, as you increase the temperature of a blackbody, the peak of its spectrum moves to shorter (bluer) wavelengths of light. This is illustrated in Figure 1 where the intensity of three hypothetical stars is plotted against wavelength. The "rainbow" indicates the range of wavelengths that are visible to the human eye. </para>
 
 <para>
 <mediaobject>
 <imageobject>
   <imagedata fileref="star_colors.png" format="PNG"/>
 </imageobject>
-<caption
-><para
-><phrase
->Figure 1</phrase
-></para
-></caption>
+<caption><para><phrase>Figure 1</phrase></para></caption>
 </mediaobject>
 </para>
 
-<para
->This simple method is conceptually correct, but it cannot be used to obtain stellar temperatures accurately, because stars are <emphasis
->not</emphasis
-> perfect blackbodies. The presence of various elements in the star's atmosphere will cause certain wavelengths of light to be absorbed. Because these absorption lines are not uniformly distributed over the spectrum, they can skew the position of the spectral peak. Moreover, obtaining a usable spectrum of a star is a time-intensive process and is prohibitively inefficient for large samples of stars. </para>
-
-<para
->An alternative method utilises photometry to measure the intensity of light passing through different filters. Each filter allows <emphasis
->only</emphasis
-> a specific part of the spectrum of light to pass through while rejecting all others. A widely used photometric system is called the <firstterm
->Johnson UBV system</firstterm
->. It employs three bandpass filters: U ("Ultra-violet"), B ("Blue"), and V ("Visible"); each occupying different regions of the electromagnetic spectrum. </para>
-
-<para
->The process of UBV photometry involves using light sensitive devices (such as film or CCD cameras) and aiming a telescope at a star to measure the intensity of light that passes through each of the filters individually. This procedure gives three apparent brightnesses or <link linkend="ai-flux"
->fluxes</link
-> (amount of energy per cm^2 per second) designated by Fu, Fb, and Fv. The ratio of fluxes Fu/Fb and Fb/Fv is a quantitative measure of the star's "colour", and these ratios can be used to establish a temperature scale for stars. Generally speaking, the larger the Fu/Fb and Fb/Fv ratios of a star, the hotter its surface temperature. </para>
-
-<para
->For example, the star Bellatrix in Orion has Fb/Fv = 1.22, indicating that it is brighter through the B filter than through the V filter. furthermore, its Fu/Fb ratio is 2.22, so it is brightest through the U filter. This indicates that the star must be very hot indeed, since the position of its spectral peak must be somewhere in the range of the U filter, or at an even shorter wavelength. The surface temperature of Bellatrix (as determined from comparing its spectrum to detailed models that account for its absorption lines) is about 25,000 Kelvin. </para>
-
-<para
->We can repeat this analysis for the star Betelgeuse. Its Fb/Fv and Fu/Fb ratios are 0.15 and 0.18, respectively, so it is brightest in V and dimmest in U. So, the spectral peak of Betelgeuse must be somewhere in the range of the V filter, or at an even longer wavelength. The surface temperature of Betelgeuse is only 2,400 Kelvin. </para>
-
-<para
->Astronomers prefer to express star colours in terms of a difference in <link linkend="ai-magnitude"
->magnitudes</link
->, rather than a ratio of <link linkend="ai-flux"
->fluxes</link
->. Therefore, going back to blue Bellatrix we have a colour index equal to </para>
-
-<para
->B - V = -2.5 log (Fb/Fv) = -2.5 log (1.22) = -0.22, </para>
-
-<para
->Similarly, the colour index for red Betelgeuse is </para>
-
-<para
->B - V = -2.5 log (Fb/Fv) = -2.5 log (0.18) = 1.85 </para>
-
-<para
->The colour indices, like the <link linkend="ai-magnitude"
->magnitude scale</link
->, run backward. <emphasis
->Hot and blue</emphasis
-> stars have <emphasis
->smaller and negative</emphasis
-> values of B-V than the cooler and redder stars. </para>
-
-<para
->An Astronomer can then use the colour indices for a star, after correcting for reddening and interstellar extinction, to obtain an accurate temperature of that star. The relationship between B-V and temperature is illustrated in Figure 2. </para>
+<para>This simple method is conceptually correct, but it cannot be used to obtain stellar temperatures accurately, because stars are <emphasis>not</emphasis> perfect blackbodies. The presence of various elements in the star's atmosphere will cause certain wavelengths of light to be absorbed. Because these absorption lines are not uniformly distributed over the spectrum, they can skew the position of the spectral peak. Moreover, obtaining a usable spectrum of a star is a time-intensive process and is prohibitively inefficient for large samples of stars. </para>
+
+<para>An alternative method utilises photometry to measure the intensity of light passing through different filters. Each filter allows <emphasis>only</emphasis> a specific part of the spectrum of light to pass through while rejecting all others. A widely used photometric system is called the <firstterm>Johnson UBV system</firstterm>. It employs three bandpass filters: U ("Ultra-violet"), B ("Blue"), and V ("Visible"); each occupying different regions of the electromagnetic spectrum. </para>
+
+<para>The process of UBV photometry involves using light sensitive devices (such as film or CCD cameras) and aiming a telescope at a star to measure the intensity of light that passes through each of the filters individually. This procedure gives three apparent brightnesses or <link linkend="ai-flux">fluxes</link> (amount of energy per cm^2 per second) designated by Fu, Fb, and Fv. The ratio of fluxes Fu/Fb and Fb/Fv is a quantitative measure of the star's "colour", and these ratios can be used to establish a temperature scale for stars. Generally speaking, the larger the Fu/Fb and Fb/Fv ratios of a star, the hotter its surface temperature. </para>
+
+<para>For example, the star Bellatrix in Orion has Fb/Fv = 1.22, indicating that it is brighter through the B filter than through the V filter. furthermore, its Fu/Fb ratio is 2.22, so it is brightest through the U filter. This indicates that the star must be very hot indeed, since the position of its spectral peak must be somewhere in the range of the U filter, or at an even shorter wavelength. The surface temperature of Bellatrix (as determined from comparing its spectrum to detailed models that account for its absorption lines) is about 25,000 Kelvin. </para>
+
+<para>We can repeat this analysis for the star Betelgeuse. Its Fb/Fv and Fu/Fb ratios are 0.15 and 0.18, respectively, so it is brightest in V and dimmest in U. So, the spectral peak of Betelgeuse must be somewhere in the range of the V filter, or at an even longer wavelength. The surface temperature of Betelgeuse is only 2,400 Kelvin. </para>
+
+<para>Astronomers prefer to express star colours in terms of a difference in <link linkend="ai-magnitude">magnitudes</link>, rather than a ratio of <link linkend="ai-flux">fluxes</link>. Therefore, going back to blue Bellatrix we have a colour index equal to </para>
+
+<para>B - V = -2.5 log (Fb/Fv) = -2.5 log (1.22) = -0.22, </para>
+
+<para>Similarly, the colour index for red Betelgeuse is </para>
+
+<para>B - V = -2.5 log (Fb/Fv) = -2.5 log (0.18) = 1.85 </para>
+
+<para>The colour indices, like the <link linkend="ai-magnitude">magnitude scale</link>, run backward. <emphasis>Hot and blue</emphasis> stars have <emphasis>smaller and negative</emphasis> values of B-V than the cooler and redder stars. </para>
+
+<para>An Astronomer can then use the colour indices for a star, after correcting for reddening and interstellar extinction, to obtain an accurate temperature of that star. The relationship between B-V and temperature is illustrated in Figure 2. </para>
 
 <para>
 <mediaobject>
 <imageobject>
   <imagedata fileref="color_indices.png"/>
 </imageobject>
-<caption
-><para
-><phrase
->Figure 2</phrase
-></para
-></caption>
+<caption><para><phrase>Figure 2</phrase></para></caption>
 </mediaobject>
 </para>
 
-<para
->The Sun with surface temperature of 5,800 K has a B-V index of 0.62. </para>
+<para>The Sun with surface temperature of 5,800 K has a B-V index of 0.62. </para>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/commands.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/commands.docbook
index 39c258fa711..3ed65823e21 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/commands.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/commands.docbook
@@ -1,826 +1,245 @@
 <chapter id="commands">
-<title
->Command Reference</title>
+<title>Command Reference</title>
 
 <sect1 id="kstars-menus">
-<title
->Menu Commands</title>
-<indexterm
-><primary
->Commands</primary
-><secondary
->Menu</secondary
-></indexterm>
+<title>Menu Commands</title>
+<indexterm><primary>Commands</primary><secondary>Menu</secondary></indexterm>
 
 <sect2 id="filemenu">
-<title
-><guimenu
->File</guimenu
-> Menu</title>
+<title><guimenu>File</guimenu> Menu</title>
 
 <variablelist>
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->N</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->New Window</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Open another &kstars; window </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->W</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Close Window</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Close &kstars; window </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->D</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Download Data...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Open the <guilabel
->Download Extra Data</guilabel
-> tool </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->O</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Open FITS...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Open a FITS image in the FITS Editor tool </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->I</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Save Sky Image...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Create image on disk from current display </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->R</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Run Script...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Run the specified KStars script </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->P</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Print...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Send the current sky map to the printer (or to a PostScript/PDF file) </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->Q</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Quit</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Quit &kstars; </para
-></listitem>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>New Window</guimenuitem> </menuchoice></term>
+<listitem><para>Open another &kstars; window </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>W</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Close Window</guimenuitem> </menuchoice></term>
+<listitem><para>Close &kstars; window </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>D</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Download Data...</guimenuitem> </menuchoice></term>
+<listitem><para>Open the <guilabel>Download Extra Data</guilabel> tool </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>O</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Open FITS...</guimenuitem> </menuchoice></term>
+<listitem><para>Open a FITS image in the FITS Editor tool </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>I</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Save Sky Image...</guimenuitem> </menuchoice></term>
+<listitem><para>Create image on disk from current display </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Run Script...</guimenuitem> </menuchoice></term>
+<listitem><para>Run the specified KStars script </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>P</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Print...</guimenuitem> </menuchoice></term>
+<listitem><para>Send the current sky map to the printer (or to a PostScript/PDF file) </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Quit</guimenuitem> </menuchoice></term>
+<listitem><para>Quit &kstars; </para></listitem>
 </varlistentry>
 </variablelist>
 
 </sect2>
 
 <sect2 id="timemenu">
-<title
-><guimenu
->Time</guimenu
-> Menu</title>
+<title><guimenu>Time</guimenu> Menu</title>
 
 <variablelist>
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->E</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Time</guimenu
-> <guimenuitem
->Set Time to Now</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Sync time to system clock</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->S</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Time</guimenu
-> <guimenuitem
->Set Time...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Set time and date</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Time</guimenu
-> <guimenuitem
->Start/Stop Clock</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Toggle whether time passes</para
-></listitem>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>E</keycap></keycombo> </shortcut> <guimenu>Time</guimenu> <guimenuitem>Set Time to Now</guimenuitem> </menuchoice></term>
+<listitem><para>Sync time to system clock</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo> </shortcut> <guimenu>Time</guimenu> <guimenuitem>Set Time...</guimenuitem> </menuchoice></term>
+<listitem><para>Set time and date</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Time</guimenu> <guimenuitem>Start/Stop Clock</guimenuitem> </menuchoice></term>
+<listitem><para>Toggle whether time passes</para></listitem>
 </varlistentry>
 </variablelist>
 
 </sect2>
 
 <sect2 id="pointmenu">
-<title
-><guimenu
->Pointing</guimenu
-> Menu</title>
+<title><guimenu>Pointing</guimenu> Menu</title>
 
 <variablelist>
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycap
->Z</keycap
-> </shortcut
-> <guimenu
->Pointing</guimenu
-> <guimenuitem
->Zenith</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Centre the display at the <link linkend="ai-zenith"
->Zenith</link
-> point (straight up) </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycap
->N</keycap
-> </shortcut
-> <guimenu
->Pointing</guimenu
-> <guimenuitem
->North</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Centre the display above the North point on the horizon</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycap
->E</keycap
-> </shortcut
-> <guimenu
->Pointing</guimenu
-> <guimenuitem
->East</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Centre the display above the East point on the horizon</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycap
->S</keycap
-> </shortcut
-> <guimenu
->Pointing</guimenu
-> <guimenuitem
->South</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Centre the display above the South point on the horizon</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycap
->W</keycap
-> </shortcut
-> <guimenu
->Pointing</guimenu
-> <guimenuitem
->West</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Centre the display above the West point on the horizon</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->M</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Pointing</guimenu
-> <guimenuitem
->Set Focus Manually...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Centre the display on specific <link linkend="ai-skycoords"
->sky coordinates</link
-> </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->F</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Pointing</guimenu
-> <guimenuitem
->Find Object</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Locate an object by name using the <link linkend="findobjects"
->Find Object Window</link
-></para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->T</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Pointing</guimenu
-> <guimenuitem
->Engage/Stop Tracking</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Toggle tracking on/off. While tracking, the display will remain centred on the current position or object.</para
-></listitem>
+<term><menuchoice><shortcut> <keycap>Z</keycap> </shortcut> <guimenu>Pointing</guimenu> <guimenuitem>Zenith</guimenuitem> </menuchoice></term>
+<listitem><para>Centre the display at the <link linkend="ai-zenith">Zenith</link> point (straight up) </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycap>N</keycap> </shortcut> <guimenu>Pointing</guimenu> <guimenuitem>North</guimenuitem> </menuchoice></term>
+<listitem><para>Centre the display above the North point on the horizon</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycap>E</keycap> </shortcut> <guimenu>Pointing</guimenu> <guimenuitem>East</guimenuitem> </menuchoice></term>
+<listitem><para>Centre the display above the East point on the horizon</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycap>S</keycap> </shortcut> <guimenu>Pointing</guimenu> <guimenuitem>South</guimenuitem> </menuchoice></term>
+<listitem><para>Centre the display above the South point on the horizon</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycap>W</keycap> </shortcut> <guimenu>Pointing</guimenu> <guimenuitem>West</guimenuitem> </menuchoice></term>
+<listitem><para>Centre the display above the West point on the horizon</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>M</keycap></keycombo> </shortcut> <guimenu>Pointing</guimenu> <guimenuitem>Set Focus Manually...</guimenuitem> </menuchoice></term>
+<listitem><para>Centre the display on specific <link linkend="ai-skycoords">sky coordinates</link> </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo> </shortcut> <guimenu>Pointing</guimenu> <guimenuitem>Find Object</guimenuitem> </menuchoice></term>
+<listitem><para>Locate an object by name using the <link linkend="findobjects">Find Object Window</link></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>T</keycap></keycombo> </shortcut> <guimenu>Pointing</guimenu> <guimenuitem>Engage/Stop Tracking</guimenuitem> </menuchoice></term>
+<listitem><para>Toggle tracking on/off. While tracking, the display will remain centred on the current position or object.</para></listitem>
 </varlistentry>
 </variablelist>
 
 </sect2>
 
 <sect2 id="viewmenu">
-<title
-><guimenu
->View</guimenu
-> Menu</title>
+<title><guimenu>View</guimenu> Menu</title>
 
 <variablelist>
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycap
->+</keycap
-> </shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Zoom in</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Zooms view in</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycap
->-</keycap
-> </shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Zoom out</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Zooms view out</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->Z</keycap
-></keycombo
-> </shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Default Zoom</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Restore the default Zoom setting</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;&Shift;<keycap
->Z</keycap
-></keycombo
-> </shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Zoom to Angular Size...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Zoom to specified field-of-view angle</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;&Shift;<keycap
->F</keycap
-></keycombo
-> </shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Full Screen Mode</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Toggle full-screen mode</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycap
->Space</keycap
-> </shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Horizontal/Equatorial Coordinates</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Toggle between the <link linkend="horizontal"
->Horizontal</link
-> and <link linkend="equatorial"
->Equatorial</link
-> <link linkend="ai-skycoords"
->Coordinate Systems</link
-></para
-></listitem>
+<term><menuchoice><shortcut> <keycap>+</keycap> </shortcut> <guimenu>View</guimenu> <guimenuitem>Zoom in</guimenuitem> </menuchoice></term>
+<listitem><para>Zooms view in</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycap>-</keycap> </shortcut> <guimenu>View</guimenu> <guimenuitem>Zoom out</guimenuitem> </menuchoice></term>
+<listitem><para>Zooms view out</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>Z</keycap></keycombo> </shortcut> <guimenu>View</guimenu> <guimenuitem>Default Zoom</guimenuitem> </menuchoice></term>
+<listitem><para>Restore the default Zoom setting</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;&Shift;<keycap>Z</keycap></keycombo> </shortcut> <guimenu>View</guimenu> <guimenuitem>Zoom to Angular Size...</guimenuitem> </menuchoice></term>
+<listitem><para>Zoom to specified field-of-view angle</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;&Shift;<keycap>F</keycap></keycombo> </shortcut> <guimenu>View</guimenu> <guimenuitem>Full Screen Mode</guimenuitem> </menuchoice></term>
+<listitem><para>Toggle full-screen mode</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycap>Space</keycap> </shortcut> <guimenu>View</guimenu> <guimenuitem>Horizontal/Equatorial Coordinates</guimenuitem> </menuchoice></term>
+<listitem><para>Toggle between the <link linkend="horizontal">Horizontal</link> and <link linkend="equatorial">Equatorial</link> <link linkend="ai-skycoords">Coordinate Systems</link></para></listitem>
 </varlistentry>
 </variablelist>
 </sect2>
 
 <sect2 id="devicemenu">
-<title
-><guimenu
->Devices</guimenu
-> Menu</title>
+<title><guimenu>Devices</guimenu> Menu</title>
 
 <variablelist>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Devices</guimenu
-> <guimenuitem
->Telescope Wizard...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Opens the <guilabel
->Telescope Wizard</guilabel
->, which provides a step-by-step guide to help you connect to your telescope and control it with &kstars;.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Devices</guimenu
-> <guimenuitem
->Capture Image Sequence...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Acquire images from a CCD camera or webcam device</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Devices</guimenu
-> <guimenuitem
->Device Manager</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Opens up the device manager, which allows you to start/shutdown device drivers and connect to remote INDI servers.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Devices</guimenu
-> <guimenuitem
->INDI Control Panel</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Opens up INDI Control Panel, which allows you to control all the features supported by a device.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Devices</guimenu
-> <guimenuitem
->Configure INDI</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Opens up a dialogue to configure INDI-related features such as automatic device updates.</para
-></listitem>
+<term><menuchoice><guimenu>Devices</guimenu> <guimenuitem>Telescope Wizard...</guimenuitem> </menuchoice></term>
+<listitem><para>Opens the <guilabel>Telescope Wizard</guilabel>, which provides a step-by-step guide to help you connect to your telescope and control it with &kstars;.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Devices</guimenu> <guimenuitem>Capture Image Sequence...</guimenuitem> </menuchoice></term>
+<listitem><para>Acquire images from a CCD camera or webcam device</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Devices</guimenu> <guimenuitem>Device Manager</guimenuitem> </menuchoice></term>
+<listitem><para>Opens up the device manager, which allows you to start/shutdown device drivers and connect to remote INDI servers.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Devices</guimenu> <guimenuitem>INDI Control Panel</guimenuitem> </menuchoice></term>
+<listitem><para>Opens up INDI Control Panel, which allows you to control all the features supported by a device.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Devices</guimenu> <guimenuitem>Configure INDI</guimenuitem> </menuchoice></term>
+<listitem><para>Opens up a dialogue to configure INDI-related features such as automatic device updates.</para></listitem>
 </varlistentry>
 
 </variablelist>
 </sect2>
 
 <sect2 id="toolmenu">
-<title
-><guimenu
->Tools</guimenu
-> Menu</title>
+<title><guimenu>Tools</guimenu> Menu</title>
 
 <variablelist>
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->C</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Tools</guimenu
-> <guimenuitem
->Calculator...</guimenuitem
-> </menuchoice
-></term>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>C</keycap></keycombo> </shortcut> <guimenu>Tools</guimenu> <guimenuitem>Calculator...</guimenuitem> </menuchoice></term>
 <listitem>
-<para
->Opens the <link linkend="tool-calculator"
->AstroCalculator</link
-> Tool, which provides full access to many of the mathematical functions used by &kstars;. </para>
+<para>Opens the <link linkend="tool-calculator">AstroCalculator</link> Tool, which provides full access to many of the mathematical functions used by &kstars;. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->V</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Tools</guimenu
-> <guimenuitem
->AAVSO Light Curves...</guimenuitem
-> </menuchoice
-></term>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>V</keycap></keycombo> </shortcut> <guimenu>Tools</guimenu> <guimenuitem>AAVSO Light Curves...</guimenuitem> </menuchoice></term>
 <listitem>
-<para
->Opens the <link linkend="tool-aavso"
->AAVSO Light Curve Generator</link
-> Tool, which allows you to download a light curve for any variable star from the American Association of Variable Star Observers. </para>
+<para>Opens the <link linkend="tool-aavso">AAVSO Light Curve Generator</link> Tool, which allows you to download a light curve for any variable star from the American Association of Variable Star Observers. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->A</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Tools</guimenu
-> <guimenuitem
->Altitude vs. Time...</guimenuitem
-> </menuchoice
-></term>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>A</keycap></keycombo> </shortcut> <guimenu>Tools</guimenu> <guimenuitem>Altitude vs. Time...</guimenuitem> </menuchoice></term>
 <listitem>
-<para
->Opens the <link linkend="tool-altvstime"
->Altitude vs. Time</link
-> Tool, which can plot curves representing the altitude of any object as a function of time. This is useful for planning observing sessions. </para>
+<para>Opens the <link linkend="tool-altvstime">Altitude vs. Time</link> Tool, which can plot curves representing the altitude of any object as a function of time. This is useful for planning observing sessions. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->U</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Tools</guimenu
-> <guimenuitem
->What's Up Tonight...</guimenuitem
-> </menuchoice
-></term>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>U</keycap></keycombo> </shortcut> <guimenu>Tools</guimenu> <guimenuitem>What's Up Tonight...</guimenuitem> </menuchoice></term>
 <listitem>
-<para
->Opens the <link linkend="tool-whatsup"
->What's Up Tonight</link
-> Tool, which presents a summary of the objects which are observable from your location on a given date. </para>
+<para>Opens the <link linkend="tool-whatsup">What's Up Tonight</link> Tool, which presents a summary of the objects which are observable from your location on a given date. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->B</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Tools</guimenu
-> <guimenuitem
->Script Builder...</guimenuitem
-> </menuchoice
-></term>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>B</keycap></keycombo> </shortcut> <guimenu>Tools</guimenu> <guimenuitem>Script Builder...</guimenuitem> </menuchoice></term>
 <listitem>
-<para
->Opens the <link linkend="tool-scriptbuilder"
->Script Builder</link
-> Tool, which provides a GUI interface for building &kstars; DCOP scripts. </para>
+<para>Opens the <link linkend="tool-scriptbuilder">Script Builder</link> Tool, which provides a GUI interface for building &kstars; DCOP scripts. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->Y</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Tools</guimenu
-> <guimenuitem
->Solar System...</guimenuitem
-> </menuchoice
-></term>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>Y</keycap></keycombo> </shortcut> <guimenu>Tools</guimenu> <guimenuitem>Solar System...</guimenuitem> </menuchoice></term>
 <listitem>
-<para
->Opens the <link linkend="tool-solarsys"
->Solar System Viewer</link
->, which displays an overhead view of the solar system on the current simulation date. </para>
+<para>Opens the <link linkend="tool-solarsys">Solar System Viewer</link>, which displays an overhead view of the solar system on the current simulation date. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->J</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Tools</guimenu
-> <guimenuitem
->Jupiter's Moons...</guimenuitem
-> </menuchoice
-></term>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>J</keycap></keycombo> </shortcut> <guimenu>Tools</guimenu> <guimenuitem>Jupiter's Moons...</guimenuitem> </menuchoice></term>
 <listitem>
-<para
->Opens the <link linkend="tool-jmoons"
->Jupiter Moons Tool</link
->, which displays the positions of Jupiter's four brightest moons as a function of time. </para>
+<para>Opens the <link linkend="tool-jmoons">Jupiter Moons Tool</link>, which displays the positions of Jupiter's four brightest moons as a function of time. </para>
 </listitem>
 </varlistentry>
 
@@ -828,378 +247,136 @@
 </sect2>
 
 <sect2 id="settingmenu">
-<title
-><guimenu
->Settings</guimenu
-> Menu</title>
+<title><guimenu>Settings</guimenu> Menu</title>
 
 <variablelist>
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guisubmenu
->Info Boxes</guisubmenu
-> <guimenuitem
->Hide/Show Info Boxes</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Toggle display of all three Info Boxes </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guisubmenu
->Info Boxes</guisubmenu
-> <guimenuitem
->Hide/Show Time</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Toggle display of the Time Info Box </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guisubmenu
->Info Boxes</guisubmenu
-> <guimenuitem
->Hide/Show Focus</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Toggle display of the Focus Info Box </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guisubmenu
->Info Boxes</guisubmenu
-> <guimenuitem
->Hide/Show Location</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Toggle display of the Location Info Box </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guisubmenu
->Toolbars</guisubmenu
-> <guimenuitem
->Hide/Show Main Toolbar</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Toggle display of the Main Toolbar </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guisubmenu
->Toolbars</guisubmenu
-> <guimenuitem
->Hide/Show View Toolbar</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Toggle display of the View Toolbar </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guisubmenu
->Statusbar</guisubmenu
-> <guimenuitem
->Hide/Show Statusbar</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Toggle display of the Statusbar </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guisubmenu
->Statusbar</guisubmenu
-> <guimenuitem
->Hide/Show Az/Alt field</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Toggle display of the mouse cursor's horizontal coordinates in the statusbar </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guisubmenu
->Statusbar</guisubmenu
-> <guimenuitem
->Hide/Show RA/Dec field</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Toggle display of the mouse cursor's horizontal coordinates in the statusbar </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guisubmenu
->Colour Schemes</guisubmenu
-> </menuchoice
-></term>
-<listitem
-><para
->This submenu contains all of the defined colour schemes, including your custom schemes. Select any item to set that colour scheme. </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guisubmenu
->FOV Symbols</guisubmenu
-> </menuchoice
-></term>
-<listitem
-><para
->This submenu lists the available field-of-view (FOV) Symbols. The FOV Symbol is drawn at the centre of the display. You may choose from the list of predefined symbols (No symbol, 7x35 Binoculars, One degree, or HST WFPC2), or you may define your own symbols (or modify existing symbols) using the <guimenuitem
->Edit FOV symbols...</guimenuitem
-> item. </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->G</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Settings</guimenu
-> <guimenuitem
->Set Geographic Location...</guimenuitem
-> </menuchoice
-></term>
+<term><menuchoice><guimenu>Settings</guimenu> <guisubmenu>Info Boxes</guisubmenu> <guimenuitem>Hide/Show Info Boxes</guimenuitem> </menuchoice></term>
+<listitem><para>Toggle display of all three Info Boxes </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Settings</guimenu> <guisubmenu>Info Boxes</guisubmenu> <guimenuitem>Hide/Show Time</guimenuitem> </menuchoice></term>
+<listitem><para>Toggle display of the Time Info Box </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Settings</guimenu> <guisubmenu>Info Boxes</guisubmenu> <guimenuitem>Hide/Show Focus</guimenuitem> </menuchoice></term>
+<listitem><para>Toggle display of the Focus Info Box </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Settings</guimenu> <guisubmenu>Info Boxes</guisubmenu> <guimenuitem>Hide/Show Location</guimenuitem> </menuchoice></term>
+<listitem><para>Toggle display of the Location Info Box </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Settings</guimenu> <guisubmenu>Toolbars</guisubmenu> <guimenuitem>Hide/Show Main Toolbar</guimenuitem> </menuchoice></term>
+<listitem><para>Toggle display of the Main Toolbar </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Settings</guimenu> <guisubmenu>Toolbars</guisubmenu> <guimenuitem>Hide/Show View Toolbar</guimenuitem> </menuchoice></term>
+<listitem><para>Toggle display of the View Toolbar </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Settings</guimenu> <guisubmenu>Statusbar</guisubmenu> <guimenuitem>Hide/Show Statusbar</guimenuitem> </menuchoice></term>
+<listitem><para>Toggle display of the Statusbar </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Settings</guimenu> <guisubmenu>Statusbar</guisubmenu> <guimenuitem>Hide/Show Az/Alt field</guimenuitem> </menuchoice></term>
+<listitem><para>Toggle display of the mouse cursor's horizontal coordinates in the statusbar </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Settings</guimenu> <guisubmenu>Statusbar</guisubmenu> <guimenuitem>Hide/Show RA/Dec field</guimenuitem> </menuchoice></term>
+<listitem><para>Toggle display of the mouse cursor's horizontal coordinates in the statusbar </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Settings</guimenu> <guisubmenu>Colour Schemes</guisubmenu> </menuchoice></term>
+<listitem><para>This submenu contains all of the defined colour schemes, including your custom schemes. Select any item to set that colour scheme. </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><guimenu>Settings</guimenu> <guisubmenu>FOV Symbols</guisubmenu> </menuchoice></term>
+<listitem><para>This submenu lists the available field-of-view (FOV) Symbols. The FOV Symbol is drawn at the centre of the display. You may choose from the list of predefined symbols (No symbol, 7x35 Binoculars, One degree, or HST WFPC2), or you may define your own symbols (or modify existing symbols) using the <guimenuitem>Edit FOV symbols...</guimenuitem> item. </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>G</keycap></keycombo> </shortcut> <guimenu>Settings</guimenu> <guimenuitem>Set Geographic Location...</guimenuitem> </menuchoice></term>
 <listitem>
-<para
->Select a new <link linkend="setgeo"
->geographic location</link
-> </para>
+<para>Select a new <link linkend="setgeo">geographic location</link> </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure &kstars;...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Modify <link linkend="config"
->configuration options</link
-></para
-></listitem>
+<term><menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure &kstars;...</guimenuitem> </menuchoice></term>
+<listitem><para>Modify <link linkend="config">configuration options</link></para></listitem>
 </varlistentry>
 </variablelist>
 </sect2>
 
 <sect2 id="helpmenu">
-<title
-><guimenu
->Help</guimenu
-> Menu</title>
+<title><guimenu>Help</guimenu> Menu</title>
 &help.menu.documentation; </sect2>
 
 <sect2 id="popup-menu">
-<title
->Popup Menu</title>
-<indexterm
-><primary
->Popup Menu</primary
-><secondary
->Description</secondary
-></indexterm>
-
-<para
->The <mousebutton
->right</mousebutton
-> click popup menu is context-sensitive, meaning its content varies depending on what kind of object you click on. We list all possible popup menu items here, with the relevant object type [in brackets].</para>
+<title>Popup Menu</title>
+<indexterm><primary>Popup Menu</primary><secondary>Description</secondary></indexterm>
+
+<para>The <mousebutton>right</mousebutton> click popup menu is context-sensitive, meaning its content varies depending on what kind of object you click on. We list all possible popup menu items here, with the relevant object type [in brackets].</para>
 
 <variablelist>
 <varlistentry>
-<term
->[All]</term>
-<listitem
-><para
->Identification and type: The top one to three lines are devoted to the name(s) of the object and its type. For stars, the Spectral Type is also shown here. </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
->[All]</term>
-<listitem
-><para
->Rise, Transit and Set times for the object on the current simulation date are shown on the next three lines. </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
->[All]</term>
-<listitem
-><para
-><guimenuitem
->Centre and Track</guimenuitem
->: Centre the display on this location, and engage tracking. Equivalent to double-clicking. </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
->[All]</term>
-<listitem
-><para
-><guimenuitem
->Angular Distance To...</guimenuitem
->: Enter "angular distance mode". In this mode, a dotted line is drawn from the first target object to the current mouse position. When you invoke the popup menu of a second object, this item will read <guilabel
->Compute Angular Distance</guilabel
->. Selecting this item will display the angular distance between the two objects in the statusbar. You can press the <keycap
->Esc</keycap
-> key to exit angular distance mode without measuring an angle. </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
->[All]</term>
-<listitem
-><para
-><guimenuitem
->Details</guimenuitem
->: Open the <link linkend="tool-details"
->Object Details window</link
-> for this object. </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
->[All]</term>
-<listitem
-><para
-><guimenuitem
->Attach Label</guimenuitem
->: Attach a permanent name label to the object. If the object already has a label attached, this item will read <guilabel
->Remove Label</guilabel
->. </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
->[All]</term>
-<listitem
-><para
-><guimenuitem
->Show ... Image</guimenuitem
->: download an image of the object from the internet, and display it in the Image Viewer tool. The "..." text is replaced by a short description of the image's source. An object may have multiple image links available in its popup menu. </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
->[All]</term>
-<listitem
-><para
-><guimenuitem
->... Page</guimenuitem
->: Display a webpage about the object in your default web browser. The "..." text is replaced by a short description of the page. An object may have multiple web links available in its popup menu. </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
->[All Named Objects]</term>
-<listitem
-><para>
-<indexterm
-><primary
->Objects in the Sky</primary>
-<secondary
->Internet Links</secondary>
-<tertiary
->Customising</tertiary
-></indexterm>
-<guimenuitem
->Add Link...</guimenuitem
->: This allows you to add your own custom links to the popup menu of any object. It opens a small window in which you enter the &URL; of the link, and the text you want to appear in the popup menu. There is also a pair of radio buttons which allow you to specify whether the &URL; is an image or an <acronym
->HTML</acronym
-> document, so &kstars; knows whether to launch the web browser or the image viewer. You can use this to add links to files on your local disk, so this feature could be used to attach observing logs or other custom information to objects in &kstars;. Your custom links are automatically loaded whenever &kstars; starts up, and they are stored in the folder <filename class="directory"
->~/.trinity/share/apps/kstars/</filename
->, in files <filename
->myimage_url.dat</filename
-> and <filename
->myinfo_url.dat</filename
->. If you build an extensive list of custom links, consider submitting them to us, we would like to include them in the next version of &kstars;! </para>
+<term>[All]</term>
+<listitem><para>Identification and type: The top one to three lines are devoted to the name(s) of the object and its type. For stars, the Spectral Type is also shown here. </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>[All]</term>
+<listitem><para>Rise, Transit and Set times for the object on the current simulation date are shown on the next three lines. </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>[All]</term>
+<listitem><para><guimenuitem>Centre and Track</guimenuitem>: Centre the display on this location, and engage tracking. Equivalent to double-clicking. </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>[All]</term>
+<listitem><para><guimenuitem>Angular Distance To...</guimenuitem>: Enter "angular distance mode". In this mode, a dotted line is drawn from the first target object to the current mouse position. When you invoke the popup menu of a second object, this item will read <guilabel>Compute Angular Distance</guilabel>. Selecting this item will display the angular distance between the two objects in the statusbar. You can press the <keycap>Esc</keycap> key to exit angular distance mode without measuring an angle. </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>[All]</term>
+<listitem><para><guimenuitem>Details</guimenuitem>: Open the <link linkend="tool-details">Object Details window</link> for this object. </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>[All]</term>
+<listitem><para><guimenuitem>Attach Label</guimenuitem>: Attach a permanent name label to the object. If the object already has a label attached, this item will read <guilabel>Remove Label</guilabel>. </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>[All]</term>
+<listitem><para><guimenuitem>Show ... Image</guimenuitem>: download an image of the object from the internet, and display it in the Image Viewer tool. The "..." text is replaced by a short description of the image's source. An object may have multiple image links available in its popup menu. </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>[All]</term>
+<listitem><para><guimenuitem>... Page</guimenuitem>: Display a webpage about the object in your default web browser. The "..." text is replaced by a short description of the page. An object may have multiple web links available in its popup menu. </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>[All Named Objects]</term>
+<listitem><para>
+<indexterm><primary>Objects in the Sky</primary>
+<secondary>Internet Links</secondary>
+<tertiary>Customising</tertiary></indexterm>
+<guimenuitem>Add Link...</guimenuitem>: This allows you to add your own custom links to the popup menu of any object. It opens a small window in which you enter the &URL; of the link, and the text you want to appear in the popup menu. There is also a pair of radio buttons which allow you to specify whether the &URL; is an image or an <acronym>HTML</acronym> document, so &kstars; knows whether to launch the web browser or the image viewer. You can use this to add links to files on your local disk, so this feature could be used to attach observing logs or other custom information to objects in &kstars;. Your custom links are automatically loaded whenever &kstars; starts up, and they are stored in the folder <filename class="directory">~/.trinity/share/apps/kstars/</filename>, in files <filename>myimage_url.dat</filename> and <filename>myinfo_url.dat</filename>. If you build an extensive list of custom links, consider submitting them to us, we would like to include them in the next version of &kstars;! </para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -1208,244 +385,101 @@
 </sect1>
 
 <sect1 id="kstars-keys">
-<title
->Keyboard Commands</title>
-<indexterm
-><primary
->Commands</primary>
-<secondary
->Keyboard</secondary
-></indexterm>
+<title>Keyboard Commands</title>
+<indexterm><primary>Commands</primary>
+<secondary>Keyboard</secondary></indexterm>
 
 <sect2 id="nav-keys">
-<title
->Navigation Keys</title>
-<indexterm
-><primary
->Navigation Controls</primary>
-<secondary
->Keyboard</secondary
-></indexterm>
+<title>Navigation Keys</title>
+<indexterm><primary>Navigation Controls</primary>
+<secondary>Keyboard</secondary></indexterm>
 
 <variablelist>
-<varlistentry
-><term
->Arrow Keys</term>
-<listitem
-><para
->Use the arrow keys to pan the display. Holding down the &Shift; key doubles the scrolling speed. </para
-></listitem
-></varlistentry>
-
-<varlistentry>
-<term
-><keycap
->+</keycap
-> / <keycap
->-</keycap
-></term>
-<listitem
-><para
->Zoom In/Out</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><keycombo action="simul"
->&Ctrl;<keycap
->Z</keycap
-></keycombo
-></term>
-<listitem
-><para
->Restore the default Zoom setting</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><keycombo action="simul"
->&Ctrl;&Shift;<keycap
->Z</keycap
-></keycombo
-></term>
-<listitem
-><para
->Zoom to specified field-of-view angle</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
->0&ndash;9</term>
-<listitem
-><para
->Center Display on a major Solar System body: <itemizedlist>
-<listitem
-><para
->0: Sun</para
-></listitem>
-<listitem
-><para
->1: Mercury</para
-></listitem>
-<listitem
-><para
->2: Venus</para
-></listitem>
-<listitem
-><para
->3: Moon</para
-></listitem>
-<listitem
-><para
->4: Mars</para
-></listitem>
-<listitem
-><para
->5: Jupiter</para
-></listitem>
-<listitem
-><para
->6: Saturn</para
-></listitem>
-<listitem
-><para
->7: Uranus</para
-></listitem>
-<listitem
-><para
->8: Neptune</para
-></listitem>
-<listitem
-><para
->9: Pluto</para
-></listitem>
+<varlistentry><term>Arrow Keys</term>
+<listitem><para>Use the arrow keys to pan the display. Holding down the &Shift; key doubles the scrolling speed. </para></listitem></varlistentry>
+
+<varlistentry>
+<term><keycap>+</keycap> / <keycap>-</keycap></term>
+<listitem><para>Zoom In/Out</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><keycombo action="simul">&Ctrl;<keycap>Z</keycap></keycombo></term>
+<listitem><para>Restore the default Zoom setting</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><keycombo action="simul">&Ctrl;&Shift;<keycap>Z</keycap></keycombo></term>
+<listitem><para>Zoom to specified field-of-view angle</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>0&ndash;9</term>
+<listitem><para>Center Display on a major Solar System body: <itemizedlist>
+<listitem><para>0: Sun</para></listitem>
+<listitem><para>1: Mercury</para></listitem>
+<listitem><para>2: Venus</para></listitem>
+<listitem><para>3: Moon</para></listitem>
+<listitem><para>4: Mars</para></listitem>
+<listitem><para>5: Jupiter</para></listitem>
+<listitem><para>6: Saturn</para></listitem>
+<listitem><para>7: Uranus</para></listitem>
+<listitem><para>8: Neptune</para></listitem>
+<listitem><para>9: Pluto</para></listitem>
 </itemizedlist>
-</para
-></listitem>
+</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><keycap
->Z</keycap
-></term>
-<listitem
-><para
->Centre the display at the <link linkend="ai-zenith"
->Zenith</link
-> Point (straight up)</para
-></listitem>
+<term><keycap>Z</keycap></term>
+<listitem><para>Centre the display at the <link linkend="ai-zenith">Zenith</link> Point (straight up)</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><keycap
->N</keycap
-></term>
-<listitem
-><para
->Centre the display above the North point on the horizon</para
-></listitem>
+<term><keycap>N</keycap></term>
+<listitem><para>Centre the display above the North point on the horizon</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><keycap
->E</keycap
-></term>
-<listitem
-><para
->Centre the display above the East point on the horizon</para
-></listitem>
+<term><keycap>E</keycap></term>
+<listitem><para>Centre the display above the East point on the horizon</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><keycap
->S</keycap
-></term>
-<listitem
-><para
->Centre the display above the South point on the horizon</para>
+<term><keycap>S</keycap></term>
+<listitem><para>Centre the display above the South point on the horizon</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><keycap
->W</keycap
-></term>
-<listitem
-><para
->Centre the display above the West point on the horizon</para
-></listitem>
+<term><keycap>W</keycap></term>
+<listitem><para>Centre the display above the West point on the horizon</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><keycombo action="simul"
->&Ctrl;<keycap
->F</keycap
-></keycombo
-></term>
-<listitem
-><para
->Open the <link linkend="findobjects"
->Find Object window</link
->, for specifying a sky object on which to centre</para
-></listitem>
+<term><keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo></term>
+<listitem><para>Open the <link linkend="findobjects">Find Object window</link>, for specifying a sky object on which to centre</para></listitem>
 </varlistentry>
 
-<varlistentry
-><term
-><keycombo action="simul"
->&Ctrl;<keycap
->M</keycap
-></keycombo>
+<varlistentry><term><keycombo action="simul">&Ctrl;<keycap>M</keycap></keycombo>
 </term>
-<listitem
-><para
->Open the <guilabel
->Set Manual Focus</guilabel
-> tool, for specifying RA/Dec or Az/Alt coordinates on which to centre</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><keycombo action="simul"
->&Ctrl;<keycap
->T</keycap
-></keycombo
-></term>
-<listitem
-><para
->Toggle tracking mode</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><keycap
->&lt;</keycap
-></term>
-<listitem
-><para
->Advance the simulation clock backwards by one time step</para>
+<listitem><para>Open the <guilabel>Set Manual Focus</guilabel> tool, for specifying RA/Dec or Az/Alt coordinates on which to centre</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><keycombo action="simul">&Ctrl;<keycap>T</keycap></keycombo></term>
+<listitem><para>Toggle tracking mode</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><keycap>&lt;</keycap></term>
+<listitem><para>Advance the simulation clock backwards by one time step</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><keycap
->&gt;</keycap
-></term>
-<listitem
-><para
->Advance the simulation clock forwards by one time step</para>
+<term><keycap>&gt;</keycap></term>
+<listitem><para>Advance the simulation clock forwards by one time step</para>
 </listitem>
 </varlistentry>
 
@@ -1454,306 +488,116 @@
 </sect2>
 
 <sect2 id="menu-keys">
-<title
->Menu Shortcuts</title>
+<title>Menu Shortcuts</title>
 
 <variablelist>
 <varlistentry>
-<term
-><keycombo action="simul"
->&Ctrl;<keycap
->N</keycap
-></keycombo
-></term>
-<listitem
-><para
->Open a new &kstars; window</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><keycombo action="simul"
->&Ctrl;<keycap
->W</keycap
-></keycombo
-></term>
-<listitem
-><para
->Close a &kstars; window</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><keycombo action="simul"
->&Ctrl;<keycap
->D</keycap
-></keycombo
-></term>
-<listitem
-><para
->Download extra data</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><keycombo action="simul"
->&Ctrl;<keycap
->O</keycap
-></keycombo
-></term>
-<listitem
-><para
->Open a FITS image in the FITS Editor</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><keycombo action="simul"
->&Ctrl;<keycap
->I</keycap
-></keycombo
-></term>
-<listitem
-><para
->Export sky image to a file</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><keycombo action="simul"
->&Ctrl;<keycap
->R</keycap
-></keycombo
-></term>
-<listitem
-><para
->Run a &kstars; DCOP script</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><keycombo action="simul"
->&Ctrl;<keycap
->P</keycap
-></keycombo
-></term>
-<listitem
-><para
->Print the current sky map</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><keycombo action="simul"
->&Ctrl;<keycap
->Q</keycap
-></keycombo
-></term>
-<listitem
-><para
->Quit &kstars;</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><keycombo action="simul"
->&Ctrl;<keycap
->E</keycap
-></keycombo
-></term>
-<listitem
-><para
->Sync the simulation clock with the current system time</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><keycombo action="simul"
->&Ctrl;<keycap
->S</keycap
-></keycombo
-></term>
-<listitem
-><para
->Set the simulation clock to a specified Time and Date</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><keycombo action="simul"
->&Ctrl;&Shift;<keycap
->F</keycap
-></keycombo
-></term>
-<listitem
-><para
->Toggle full-screen mode</para
-></listitem>
-</varlistentry>
-
-<varlistentry
-><term
-><keycap
->Space</keycap
-></term>
-<listitem
-><para
->Toggle between the <link linkend="horizontal"
->Horizontal</link
-> and <link linkend="equatorial"
->Equatorial</link
-> <link linkend="ai-skycoords"
->Coordinate Systems</link
-> </para
-></listitem
-></varlistentry>
-
-<varlistentry>
-<term
-><keycap
->F1</keycap
-></term>
-<listitem
-><para
->Open the &kstars; Handbook</para
-></listitem>
+<term><keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo></term>
+<listitem><para>Open a new &kstars; window</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><keycombo action="simul">&Ctrl;<keycap>W</keycap></keycombo></term>
+<listitem><para>Close a &kstars; window</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><keycombo action="simul">&Ctrl;<keycap>D</keycap></keycombo></term>
+<listitem><para>Download extra data</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><keycombo action="simul">&Ctrl;<keycap>O</keycap></keycombo></term>
+<listitem><para>Open a FITS image in the FITS Editor</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><keycombo action="simul">&Ctrl;<keycap>I</keycap></keycombo></term>
+<listitem><para>Export sky image to a file</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo></term>
+<listitem><para>Run a &kstars; DCOP script</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><keycombo action="simul">&Ctrl;<keycap>P</keycap></keycombo></term>
+<listitem><para>Print the current sky map</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo></term>
+<listitem><para>Quit &kstars;</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><keycombo action="simul">&Ctrl;<keycap>E</keycap></keycombo></term>
+<listitem><para>Sync the simulation clock with the current system time</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo></term>
+<listitem><para>Set the simulation clock to a specified Time and Date</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><keycombo action="simul">&Ctrl;&Shift;<keycap>F</keycap></keycombo></term>
+<listitem><para>Toggle full-screen mode</para></listitem>
+</varlistentry>
+
+<varlistentry><term><keycap>Space</keycap></term>
+<listitem><para>Toggle between the <link linkend="horizontal">Horizontal</link> and <link linkend="equatorial">Equatorial</link> <link linkend="ai-skycoords">Coordinate Systems</link> </para></listitem></varlistentry>
+
+<varlistentry>
+<term><keycap>F1</keycap></term>
+<listitem><para>Open the &kstars; Handbook</para></listitem>
 </varlistentry>
 </variablelist>
 </sect2>
 
 <sect2 id="tools-keys">
-<title
->Opening Tools</title>
+<title>Opening Tools</title>
 
 <variablelist>
 <varlistentry>
-<term
-><keycombo action="simul"
->&Ctrl;<keycap
->G</keycap
-></keycombo
-></term>
-<listitem
-><para
->Open the <link linkend="setgeo"
->Set Geographic Location</link
-> window</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><keycombo action="simul"
->&Ctrl;<keycap
->C</keycap
-></keycombo
-></term>
-<listitem
-><para
->Open the <link linkend="tool-calculator"
->AstroCalculator</link
-> </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><keycombo action="simul"
->&Ctrl;<keycap
->V</keycap
-></keycombo
-></term>
-<listitem
-><para
->Open the <link linkend="tool-aavso"
->AAVSO Lightcurve Generator</link
-></para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><keycombo action="simul"
->&Ctrl;<keycap
->A</keycap
-></keycombo
-></term>
-<listitem
-><para
->Open the <link linkend="tool-altvstime"
->Altitude vs. Time</link
-> tool</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><keycombo action="simul"
->&Ctrl;<keycap
->U</keycap
-></keycombo
-></term>
-<listitem
-><para
->Open the <link linkend="tool-whatsup"
->What's Up Tonight?</link
-> tool </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><keycombo action="simul"
->&Ctrl;<keycap
->B</keycap
-></keycombo
-></term>
-<listitem
-><para
->Open the <link linkend="tool-scriptbuilder"
->Script Builder</link
-> tool</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><keycombo action="simul"
->&Ctrl;<keycap
->Y</keycap
-></keycombo
-></term>
-<listitem
-><para
->Open the <link linkend="tool-solarsys"
->Solar System Viewer</link
-> </para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><keycombo action="simul"
->&Ctrl;<keycap
->J</keycap
-></keycombo
-></term>
-<listitem
-><para
->Open the <link linkend="tool-jmoons"
->Jupiter Moons</link
-> tool</para
-></listitem>
+<term><keycombo action="simul">&Ctrl;<keycap>G</keycap></keycombo></term>
+<listitem><para>Open the <link linkend="setgeo">Set Geographic Location</link> window</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><keycombo action="simul">&Ctrl;<keycap>C</keycap></keycombo></term>
+<listitem><para>Open the <link linkend="tool-calculator">AstroCalculator</link> </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><keycombo action="simul">&Ctrl;<keycap>V</keycap></keycombo></term>
+<listitem><para>Open the <link linkend="tool-aavso">AAVSO Lightcurve Generator</link></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><keycombo action="simul">&Ctrl;<keycap>A</keycap></keycombo></term>
+<listitem><para>Open the <link linkend="tool-altvstime">Altitude vs. Time</link> tool</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><keycombo action="simul">&Ctrl;<keycap>U</keycap></keycombo></term>
+<listitem><para>Open the <link linkend="tool-whatsup">What's Up Tonight?</link> tool </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><keycombo action="simul">&Ctrl;<keycap>B</keycap></keycombo></term>
+<listitem><para>Open the <link linkend="tool-scriptbuilder">Script Builder</link> tool</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><keycombo action="simul">&Ctrl;<keycap>Y</keycap></keycombo></term>
+<listitem><para>Open the <link linkend="tool-solarsys">Solar System Viewer</link> </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><keycombo action="simul">&Ctrl;<keycap>J</keycap></keycombo></term>
+<listitem><para>Open the <link linkend="tool-jmoons">Jupiter Moons</link> tool</para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -1761,133 +605,60 @@
 </sect1>
 
 <sect1 id="kstars-mouse">
-<title
->Mouse Commands</title>
-<indexterm
-><primary
->Commands</primary>
-<secondary
->Mouse</secondary
-></indexterm>
-<indexterm
-><primary
->Navigation Controls</primary>
-<secondary
->Mouse</secondary
-></indexterm>
+<title>Mouse Commands</title>
+<indexterm><primary>Commands</primary>
+<secondary>Mouse</secondary></indexterm>
+<indexterm><primary>Navigation Controls</primary>
+<secondary>Mouse</secondary></indexterm>
 
 <variablelist>
-<varlistentry
-><term
->Moving the mouse</term>
-<listitem
-><para
->The sky coordinates (RA/Dec and Az/Alt) of the mouse cursor are updated in the status bar </para
-></listitem>
-</varlistentry>
-
-<varlistentry
-><term
->"Hovering" the mouse</term>
-<listitem
-><para
->A temporary name label is attached to the object nearest to the mouse cursor. </para
-></listitem>
-</varlistentry>
-
-<varlistentry
-><term
->Left-clicking</term>
+<varlistentry><term>Moving the mouse</term>
+<listitem><para>The sky coordinates (RA/Dec and Az/Alt) of the mouse cursor are updated in the status bar </para></listitem>
+</varlistentry>
+
+<varlistentry><term>"Hovering" the mouse</term>
+<listitem><para>A temporary name label is attached to the object nearest to the mouse cursor. </para></listitem>
+</varlistentry>
+
+<varlistentry><term>Left-clicking</term>
 <listitem>
 <para>
-<indexterm
-><primary
->Objects in the Sky</primary>
-<secondary
->Identifying</secondary
-></indexterm>
-The object nearest the mouse click is identified in the status bar. </para
-></listitem>
-</varlistentry>
-
-<varlistentry
-><term
->Double-clicking</term>
+<indexterm><primary>Objects in the Sky</primary>
+<secondary>Identifying</secondary></indexterm>
+The object nearest the mouse click is identified in the status bar. </para></listitem>
+</varlistentry>
+
+<varlistentry><term>Double-clicking</term>
 <listitem>
 <para>
-<indexterm
-><primary
->Objects in the Sky</primary>
-<secondary
->Centring</secondary
-></indexterm>
-Centre and track on the location or object nearest the mouse click. Double-clicking on an Info Box will <quote
->shade</quote
-> it to show/hide extra information. </para
-></listitem>
-</varlistentry>
-
-<varlistentry
-><term
->Right-clicking</term>
+<indexterm><primary>Objects in the Sky</primary>
+<secondary>Centring</secondary></indexterm>
+Centre and track on the location or object nearest the mouse click. Double-clicking on an Info Box will <quote>shade</quote> it to show/hide extra information. </para></listitem>
+</varlistentry>
+
+<varlistentry><term>Right-clicking</term>
 <listitem>
 <para>
-<indexterm
-><primary
->Objects in the Sky</primary>
-<secondary
->Invoking Popup Menu for</secondary
-></indexterm>
-Open the <link linkend="popup-menu"
->popup menu</link
-> for the location or object nearest the mouse cursor. </para
-></listitem>
-</varlistentry>
-
-<varlistentry
-><term
->Scrolling the mouse wheel</term>
-<listitem
-><para
->Zoom the display in or out. If you do not have a mouse wheel, you can hold the middle mouse button and drag vertically. </para
-></listitem>
-</varlistentry>
-
-<varlistentry
-><term
->Click-and-dragging</term>
-<listitem
-><para>
+<indexterm><primary>Objects in the Sky</primary>
+<secondary>Invoking Popup Menu for</secondary></indexterm>
+Open the <link linkend="popup-menu">popup menu</link> for the location or object nearest the mouse cursor. </para></listitem>
+</varlistentry>
+
+<varlistentry><term>Scrolling the mouse wheel</term>
+<listitem><para>Zoom the display in or out. If you do not have a mouse wheel, you can hold the middle mouse button and drag vertically. </para></listitem>
+</varlistentry>
+
+<varlistentry><term>Click-and-dragging</term>
+<listitem><para>
 	<variablelist>
-	<varlistentry
-><term
->Dragging the sky map</term>
-	<listitem
-><para
->Pan the display, following the drag motion. </para
-></listitem
-></varlistentry>
-	<varlistentry
-><term
->&Ctrl;+dragging the sky map</term>
-	<listitem
-><para
->Define a rectangle in the map. When the mouse button is released, the display is zoomed in to match the field-of-view to the bounds of the rectangle. </para
-></listitem
-></varlistentry>
-	<varlistentry
-><term
->Dragging an Info Box</term>
-	<listitem
-><para
->The Info Box is repositioned in the map. Info Boxes will <quote
->stick</quote
-> to window edges, so that they remain on the edge when the window is resized. </para
-></listitem
-></varlistentry>
+	<varlistentry><term>Dragging the sky map</term>
+	<listitem><para>Pan the display, following the drag motion. </para></listitem></varlistentry>
+	<varlistentry><term>&Ctrl;+dragging the sky map</term>
+	<listitem><para>Define a rectangle in the map. When the mouse button is released, the display is zoomed in to match the field-of-view to the bounds of the rectangle. </para></listitem></varlistentry>
+	<varlistentry><term>Dragging an Info Box</term>
+	<listitem><para>The Info Box is repositioned in the map. Info Boxes will <quote>stick</quote> to window edges, so that they remain on the edge when the window is resized. </para></listitem></varlistentry>
 	</variablelist>
-</para
-></listitem>
+</para></listitem>
 </varlistentry>
 </variablelist>
 
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/config.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/config.docbook
index 00d23420ded..4d5300df447 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/config.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/config.docbook
@@ -1,494 +1,154 @@
 <chapter id="config">
-<title
->Configuring &kstars;</title>
+<title>Configuring &kstars;</title>
 
 <sect1 id="setgeo">
-<title
->Setting the Geographic Location</title>
+<title>Setting the Geographic Location</title>
 
-<para
->Here is a screenshot of the <guilabel
->Set Geographic Location</guilabel
-> window: <screenshot>
-<screeninfo
->Changing the Geographic Location</screeninfo>
+<para>Here is a screenshot of the <guilabel>Set Geographic Location</guilabel> window: <screenshot>
+<screeninfo>Changing the Geographic Location</screeninfo>
 <mediaobject>
   <imageobject>
     <imagedata fileref="geolocator.png" format="PNG"/>
   </imageobject>
   <textobject>
-    <phrase
->Set Location Window</phrase>
+    <phrase>Set Location Window</phrase>
   </textobject>
 </mediaobject>
 </screenshot>
 </para>
 
-<para
->There is a list of over 2500 predefined cities available to choose from. You set your location by highlighting a city from this list. Each city is represented in the world map as a small dot, and when a city is highlighted in the list, a red crosshairs appears on its location in the map. </para>
+<para>There is a list of over 2500 predefined cities available to choose from. You set your location by highlighting a city from this list. Each city is represented in the world map as a small dot, and when a city is highlighted in the list, a red crosshairs appears on its location in the map. </para>
 
 <para>
-<indexterm
-><primary
->Geographic Location Tool</primary>
-<secondary
->Filtering</secondary
-></indexterm>
-It is not practical to scroll through the full list of 2500 locations, looking for a specific city. To make searches easier, the list can be filtered by entering text in the boxes below the map. For example, in the screenshot, the text <quote
->Ba</quote
-> appears in the <guilabel
->City Filter</guilabel
-> box, while <quote
->M</quote
-> has been entered in the <guilabel
->Province Filter</guilabel
-> box, and <quote
->USA</quote
-> is in the <guilabel
->Country Filter</guilabel
-> box. Note that all of the cities displayed in the list have city, province and country names that begin with the entered filter strings, and that the message below the filter boxes indicates that 7 cities are matched by the filters. Also notice that the dots representing these seven cities in the map have been coloured white, while the unmatched cities remain grey. </para
-><para
->The list can also be filtered by location in the map. Clicking anywhere in the world map will show only those cities within two degrees of the clicked location. At this time, you can search by name, or by location, but not both at once. In other words, when you click on the map, the name filters are ignored, and vice versa. </para
-><para>
-<indexterm
-><primary
->Geographic Location Tool</primary>
-<secondary
->Custom locations</secondary
-></indexterm>
-The <link linkend="ai-geocoords"
->longitude, latitude</link
-> and <link linkend="ai-timezones"
->time zone</link
-> information for the currently-selected location are displayed in the boxes at the bottom of the window. If you feel that any of these values are inaccurate, you can modify them and press the <guibutton
->Add to List</guibutton
-> button to record your custom version of the location. You can also define a completely new location by pressing the <guibutton
->Clear Fields</guibutton
-> button, and entering the data for the new location. Note that all fields except the optional <guilabel
->State/Province</guilabel
-> must be filled before the new location can be added to the list. &kstars; will automatically load your custom locations for all future sessions. Please note, at this point, the only way to remove a custom location is to remove the appropriate line from the file <filename
->~/.trinity/share/apps/kstars/mycities.dat</filename
->. </para
-><para
->If you add custom locations (or modify existing ones), please send us your <filename
->mycities.dat</filename
-> file so that we can add your locations to the master list. </para>
+<indexterm><primary>Geographic Location Tool</primary>
+<secondary>Filtering</secondary></indexterm>
+It is not practical to scroll through the full list of 2500 locations, looking for a specific city. To make searches easier, the list can be filtered by entering text in the boxes below the map. For example, in the screenshot, the text <quote>Ba</quote> appears in the <guilabel>City Filter</guilabel> box, while <quote>M</quote> has been entered in the <guilabel>Province Filter</guilabel> box, and <quote>USA</quote> is in the <guilabel>Country Filter</guilabel> box. Note that all of the cities displayed in the list have city, province and country names that begin with the entered filter strings, and that the message below the filter boxes indicates that 7 cities are matched by the filters. Also notice that the dots representing these seven cities in the map have been coloured white, while the unmatched cities remain grey. </para><para>The list can also be filtered by location in the map. Clicking anywhere in the world map will show only those cities within two degrees of the clicked location. At this time, you can search by name, or by location, but not both at once. In other words, when you click on the map, the name filters are ignored, and vice versa. </para><para>
+<indexterm><primary>Geographic Location Tool</primary>
+<secondary>Custom locations</secondary></indexterm>
+The <link linkend="ai-geocoords">longitude, latitude</link> and <link linkend="ai-timezones">time zone</link> information for the currently-selected location are displayed in the boxes at the bottom of the window. If you feel that any of these values are inaccurate, you can modify them and press the <guibutton>Add to List</guibutton> button to record your custom version of the location. You can also define a completely new location by pressing the <guibutton>Clear Fields</guibutton> button, and entering the data for the new location. Note that all fields except the optional <guilabel>State/Province</guilabel> must be filled before the new location can be added to the list. &kstars; will automatically load your custom locations for all future sessions. Please note, at this point, the only way to remove a custom location is to remove the appropriate line from the file <filename>~/.trinity/share/apps/kstars/mycities.dat</filename>. </para><para>If you add custom locations (or modify existing ones), please send us your <filename>mycities.dat</filename> file so that we can add your locations to the master list. </para>
 </sect1>
 
 <sect1 id="settime">
-<title
->Setting the Time</title>
+<title>Setting the Time</title>
 <para>
-<indexterm
-><primary
->Date and Time</primary>
-<secondary
->The simulation clock</secondary
-></indexterm>
-When &kstars; starts up, the time is set to your computer's system clock, and the &kstars; clock is running to keep up with the real time. If you want to stop the clock, select <guimenuitem
->Stop Clock</guimenuitem
-> from the <guimenu
->Time</guimenu
-> menu, or simply click on the <guiicon
->Pause</guiicon
-> icon in the toolbar. You can make the clock run slower or faster than normal, or even make it run backward, using the time-step spinbox in the toolbar. This spinbox has two sets of up/down buttons. The first one will step through all 83 available time steps, one by one. The second one will skip to the next higher (or lower) unit of time, which allows you to make large timestep changes more quickly. </para>
+<indexterm><primary>Date and Time</primary>
+<secondary>The simulation clock</secondary></indexterm>
+When &kstars; starts up, the time is set to your computer's system clock, and the &kstars; clock is running to keep up with the real time. If you want to stop the clock, select <guimenuitem>Stop Clock</guimenuitem> from the <guimenu>Time</guimenu> menu, or simply click on the <guiicon>Pause</guiicon> icon in the toolbar. You can make the clock run slower or faster than normal, or even make it run backward, using the time-step spinbox in the toolbar. This spinbox has two sets of up/down buttons. The first one will step through all 83 available time steps, one by one. The second one will skip to the next higher (or lower) unit of time, which allows you to make large timestep changes more quickly. </para>
 <para>
-<indexterm
-><primary
->Date and Time</primary>
-<secondary
->Setting</secondary
-></indexterm>
-You can set the time and date by selecting <guimenuitem
->Set Time...</guimenuitem
-> from the <guimenu
->Time</guimenu
-> menu, or by pressing the <guiicon
->time</guiicon
-> icon in the toolbar. The <guilabel
->Set Time</guilabel
-> window uses a standard &kde; Date Picker widget, coupled with three spinboxes for setting the hours, minutes and seconds. If you want to re-synchronise the simulation clock back to the current CPU time, just select <guimenuitem
->Set Time to Now</guimenuitem
-> from the <guimenu
->Time</guimenu
-> menu.</para>
+<indexterm><primary>Date and Time</primary>
+<secondary>Setting</secondary></indexterm>
+You can set the time and date by selecting <guimenuitem>Set Time...</guimenuitem> from the <guimenu>Time</guimenu> menu, or by pressing the <guiicon>time</guiicon> icon in the toolbar. The <guilabel>Set Time</guilabel> window uses a standard &kde; Date Picker widget, coupled with three spinboxes for setting the hours, minutes and seconds. If you want to re-synchronise the simulation clock back to the current CPU time, just select <guimenuitem>Set Time to Now</guimenuitem> from the <guimenu>Time</guimenu> menu.</para>
 
-<note
-><para>
-<indexterm
-><primary
->Date and Time</primary>
-<secondary
->Extended range of dates</secondary
-></indexterm>
-&kstars; can accept very remote dates beyond the usual limits imposed by QDate. Currently, you can set the date between the years -50000 and +50000. We may extend this range even further in future releases. However, please be aware that the accuracy of the simulation becomes more and more degraded as more remote dates are examined. This is especially true for the positions of solar system bodies. </para
-></note>
+<note><para>
+<indexterm><primary>Date and Time</primary>
+<secondary>Extended range of dates</secondary></indexterm>
+&kstars; can accept very remote dates beyond the usual limits imposed by QDate. Currently, you can set the date between the years -50000 and +50000. We may extend this range even further in future releases. However, please be aware that the accuracy of the simulation becomes more and more degraded as more remote dates are examined. This is especially true for the positions of solar system bodies. </para></note>
 </sect1>
 
 <sect1 id="viewops">
-<title
->The Configure &kstars; Window</title>
+<title>The Configure &kstars; Window</title>
 <para>
-<indexterm
-><primary
->Configure &kstars; window</primary
-></indexterm
-> The <guilabel
->Configure &kstars;</guilabel
-> window allows you to modify a wide range of display options. You can access the window with the <guiicon
->configure</guiicon
-> toolbar icon, or by selecting <guimenuitem
->Configure &kstars;...</guimenuitem
-> from the <guimenu
->Settings</guimenu
-> menu. The window is depicted below: <screenshot>
-<screeninfo
->Configure &kstars; Window</screeninfo>
+<indexterm><primary>Configure &kstars; window</primary></indexterm> The <guilabel>Configure &kstars;</guilabel> window allows you to modify a wide range of display options. You can access the window with the <guiicon>configure</guiicon> toolbar icon, or by selecting <guimenuitem>Configure &kstars;...</guimenuitem> from the <guimenu>Settings</guimenu> menu. The window is depicted below: <screenshot>
+<screeninfo>Configure &kstars; Window</screeninfo>
 <mediaobject>
   <imageobject>
     <imagedata fileref="viewops.png" format="PNG"/>
   </imageobject>
   <textobject>
-    <phrase
->Configure &kstars; Window</phrase>
+    <phrase>Configure &kstars; Window</phrase>
   </textobject>
 </mediaobject>
 </screenshot>
 </para>
 
-<para
->The <guilabel
->Configure &kstars;</guilabel
-> window is divided into five tabs: <guilabel
->Catalogues</guilabel
->, <guilabel
->Guides</guilabel
->, <guilabel
->Solar System</guilabel
->, <guilabel
->Colours</guilabel
-> and <guilabel
->Advanced</guilabel
->. </para>
+<para>The <guilabel>Configure &kstars;</guilabel> window is divided into five tabs: <guilabel>Catalogues</guilabel>, <guilabel>Guides</guilabel>, <guilabel>Solar System</guilabel>, <guilabel>Colours</guilabel> and <guilabel>Advanced</guilabel>. </para>
 <para>
-<indexterm
-><primary
->Configure &kstars; window</primary>
-<secondary
->Catalogues Tab</secondary
-></indexterm>
-In the <guilabel
->Catalogues</guilabel
-> tab, you determine which object catalogues are displayed in the map. The <guilabel
->Stars</guilabel
-> section also allows you to set the <quote
->faint <link linkend="ai-magnitude"
->magnitude</link
-> limit</quote
-> for stars, and the <link linkend="ai-magnitude"
->magnitude</link
-> limit for displaying the names and/or magnitudes of stars. Below the stars section, the <guilabel
->Deep-Sky Objects</guilabel
-> section controls the display of several non-stellar object catalogues. By default, the list includes the Messier, NGC and IC catalogues. You can add your own custom object catalogues by pressing the <guibutton
->Add Custom Catalog</guibutton
-> button. For detailed instructions on preparing a catalogue data file, see the <filename
->README.customize</filename
-> file that ships with &kstars;. </para>
+<indexterm><primary>Configure &kstars; window</primary>
+<secondary>Catalogues Tab</secondary></indexterm>
+In the <guilabel>Catalogues</guilabel> tab, you determine which object catalogues are displayed in the map. The <guilabel>Stars</guilabel> section also allows you to set the <quote>faint <link linkend="ai-magnitude">magnitude</link> limit</quote> for stars, and the <link linkend="ai-magnitude">magnitude</link> limit for displaying the names and/or magnitudes of stars. Below the stars section, the <guilabel>Deep-Sky Objects</guilabel> section controls the display of several non-stellar object catalogues. By default, the list includes the Messier, NGC and IC catalogues. You can add your own custom object catalogues by pressing the <guibutton>Add Custom Catalog</guibutton> button. For detailed instructions on preparing a catalogue data file, see the <filename>README.customize</filename> file that ships with &kstars;. </para>
 <para>
-<indexterm
-><primary
->Configure &kstars; window</primary>
-<secondary
->Solar System Tab</secondary
-></indexterm>
-In the <guilabel
->Solar System</guilabel
-> tab, you can specify whether the Sun, Moon, planets, comets and asteroids are displayed, and whether the major bodies are drawn as coloured circles or actual images. You can also toggle whether solar system bodies have name labels attached, and control how many of the comets and asteroids get name labels. There is an option to automatically attach a temporary <quote
->orbit trail</quote
-> whenever a solar system body is tracked, and another to toggle whether the colour of the orbit trail fades into the background sky colour. </para>
+<indexterm><primary>Configure &kstars; window</primary>
+<secondary>Solar System Tab</secondary></indexterm>
+In the <guilabel>Solar System</guilabel> tab, you can specify whether the Sun, Moon, planets, comets and asteroids are displayed, and whether the major bodies are drawn as coloured circles or actual images. You can also toggle whether solar system bodies have name labels attached, and control how many of the comets and asteroids get name labels. There is an option to automatically attach a temporary <quote>orbit trail</quote> whenever a solar system body is tracked, and another to toggle whether the colour of the orbit trail fades into the background sky colour. </para>
 <para>
-<indexterm
-><primary
->Configure &kstars; window</primary>
-<secondary
->Guides Tab</secondary
-></indexterm>
-The <guilabel
->Guides</guilabel
-> tab lets you toggle whether non-objects are displayed (&ie;, constellation lines, constellation names, the Milky Way contour, the <link linkend="ai-cequator"
->celestial equator</link
->, <link linkend="ai-ecliptic"
->the ecliptic</link
->, <link linkend="ai-horizon"
->the horizon line</link
->, and the opaque ground). You can also choose whether you would like to see Latin constellation names, <acronym
->IAU</acronym
->-standard three-letter abbreviations, or constellation names using your local language. </para>
+<indexterm><primary>Configure &kstars; window</primary>
+<secondary>Guides Tab</secondary></indexterm>
+The <guilabel>Guides</guilabel> tab lets you toggle whether non-objects are displayed (&ie;, constellation lines, constellation names, the Milky Way contour, the <link linkend="ai-cequator">celestial equator</link>, <link linkend="ai-ecliptic">the ecliptic</link>, <link linkend="ai-horizon">the horizon line</link>, and the opaque ground). You can also choose whether you would like to see Latin constellation names, <acronym>IAU</acronym>-standard three-letter abbreviations, or constellation names using your local language. </para>
 <para>
-<indexterm
-><primary
->Configure &kstars; window</primary>
-<secondary
->Colours Tab</secondary
-></indexterm>
-<indexterm
-><primary
->Colour Schemes</primary>
-<secondary
->Customising</secondary
-></indexterm>
-The <guilabel
->Colours</guilabel
-> tab allows you to set the colour scheme, and to define custom colour schemes. The tab is split into two panels: </para>
-<para
->The left panel shows a list of all display items with adjustable colours. Click on any item to bring up a colour selection window to adjust its colour. Below the list is the <guilabel
->Star Colour Mode</guilabel
-> selection box. By default, &kstars; draws stars with a <link linkend="ai-colorandtemp"
->realistic colour</link
-> tint according to the spectral type of the star. However, you may also choose to draw the stars as solid white, black or red circles. If you are using the realistic star colours, you can set the saturation level of the star colours with the <guilabel
->Star Colour Intensity</guilabel
-> spinbox. </para>
-<para
->The right panel lists the defined colour schemes. There are four predefined schemes: the <guilabel
->Default</guilabel
-> scheme, <guilabel
->Star Chart</guilabel
->, which uses black stars on a white background, <guilabel
->Night Vision</guilabel
->, which uses only shades of red in order to protect dark-adapted vision, and <guilabel
->Moonless Night</guilabel
->, a more realistic, dark theme. Additionally, you can save the current colour settings as a custom scheme by clicking the <guibutton
->Save Current Colors</guibutton
-> button. It will prompt you for a name for the new scheme, and then your scheme will appear in the list in all future &kstars; sessions. To remove a custom scheme, simply highlight it in the list, and press the <guibutton
->Remove Colour Scheme</guibutton
-> button. </para
-><para>
-<indexterm
-><primary
->Configure &kstars; window</primary>
-<secondary
->Advanced Tab</secondary
-></indexterm>
-The <guilabel
->Advanced</guilabel
-> Tab provides fine-grained control over the more subtle behaviours of &kstars;. </para
-><para>
-<indexterm
-><primary
->Atmospheric Refraction</primary
-></indexterm
-> The <guilabel
->Correct for atmospheric refraction</guilabel
-> checkbox controls whether the positions of objects are corrected for the effects of the atmosphere. Because the atmosphere is a spherical shell, light from outer space is <quote
->bent</quote
-> as it passes through the atmosphere to our telescopes or eyes on the Earth's surface. The effect is largest for objects near the horizon, and actually changes the predicted rise or set times of objects by a few minutes. In fact, when you <quote
->see</quote
-> a sunset, the Sun's actual position is already well below the horizon; atmospheric refraction makes it seem as if the Sun is still in the sky. Note that atmospheric refraction is never applied if you are using <guilabel
->Equatorial coordinates</guilabel
->. </para
-><para>
-<indexterm
-><primary
->Animated Slewing</primary
-></indexterm
-> The <guilabel
->Use animating slewing</guilabel
-> checkbox controls how the display changes when a new focus position is selected in the map. By default, you will see the sky drift or <quote
->slew</quote
-> to the new position; if you untick this option, then the display will instead <quote
->snap</quote
-> immediately to the new focus position. </para
-><para>
-<indexterm
-><primary
->Objects in the Sky</primary>
-<secondary
->Labelling</secondary>
-<tertiary
->Automatic</tertiary>
+<indexterm><primary>Configure &kstars; window</primary>
+<secondary>Colours Tab</secondary></indexterm>
+<indexterm><primary>Colour Schemes</primary>
+<secondary>Customising</secondary></indexterm>
+The <guilabel>Colours</guilabel> tab allows you to set the colour scheme, and to define custom colour schemes. The tab is split into two panels: </para>
+<para>The left panel shows a list of all display items with adjustable colours. Click on any item to bring up a colour selection window to adjust its colour. Below the list is the <guilabel>Star Colour Mode</guilabel> selection box. By default, &kstars; draws stars with a <link linkend="ai-colorandtemp">realistic colour</link> tint according to the spectral type of the star. However, you may also choose to draw the stars as solid white, black or red circles. If you are using the realistic star colours, you can set the saturation level of the star colours with the <guilabel>Star Colour Intensity</guilabel> spinbox. </para>
+<para>The right panel lists the defined colour schemes. There are four predefined schemes: the <guilabel>Default</guilabel> scheme, <guilabel>Star Chart</guilabel>, which uses black stars on a white background, <guilabel>Night Vision</guilabel>, which uses only shades of red in order to protect dark-adapted vision, and <guilabel>Moonless Night</guilabel>, a more realistic, dark theme. Additionally, you can save the current colour settings as a custom scheme by clicking the <guibutton>Save Current Colors</guibutton> button. It will prompt you for a name for the new scheme, and then your scheme will appear in the list in all future &kstars; sessions. To remove a custom scheme, simply highlight it in the list, and press the <guibutton>Remove Colour Scheme</guibutton> button. </para><para>
+<indexterm><primary>Configure &kstars; window</primary>
+<secondary>Advanced Tab</secondary></indexterm>
+The <guilabel>Advanced</guilabel> Tab provides fine-grained control over the more subtle behaviours of &kstars;. </para><para>
+<indexterm><primary>Atmospheric Refraction</primary></indexterm> The <guilabel>Correct for atmospheric refraction</guilabel> checkbox controls whether the positions of objects are corrected for the effects of the atmosphere. Because the atmosphere is a spherical shell, light from outer space is <quote>bent</quote> as it passes through the atmosphere to our telescopes or eyes on the Earth's surface. The effect is largest for objects near the horizon, and actually changes the predicted rise or set times of objects by a few minutes. In fact, when you <quote>see</quote> a sunset, the Sun's actual position is already well below the horizon; atmospheric refraction makes it seem as if the Sun is still in the sky. Note that atmospheric refraction is never applied if you are using <guilabel>Equatorial coordinates</guilabel>. </para><para>
+<indexterm><primary>Animated Slewing</primary></indexterm> The <guilabel>Use animating slewing</guilabel> checkbox controls how the display changes when a new focus position is selected in the map. By default, you will see the sky drift or <quote>slew</quote> to the new position; if you untick this option, then the display will instead <quote>snap</quote> immediately to the new focus position. </para><para>
+<indexterm><primary>Objects in the Sky</primary>
+<secondary>Labelling</secondary>
+<tertiary>Automatic</tertiary>
 </indexterm>
-If the <guilabel
->Attach label to centred object</guilabel
-> checkbox is selected, then a name label will automatically be attached to an object when it is being tracked by the program. The label will be removed when the object is no longer being tracked. Note that you can also manually attach a persistent name label to any object with its <link linkend="popup-menu"
->popup menu</link
->. </para
-><para>
-<indexterm
-><primary
->Objects in the Sky</primary>
-<secondary
->Hiding</secondary
-></indexterm>
-There are three situations when &kstars; must redraw the sky display very rapidly: when a new focus position is selected (and <guilabel
->Use animated slewing</guilabel
-> is checked), when the sky is dragged with the mouse, and when the time step is large. In these situations, the positions of all objects must be recomputed as rapidly as possible, which can put a large load on the <abbrev
->CPU</abbrev
->. If the <abbrev
->CPU</abbrev
-> cannot keep up with the demand, then the display will seem sluggish or jerky. To mitigate this, &kstars; will hide certain objects during these rapid-redraw situations, as long as the <guilabel
->Hide objects while moving</guilabel
-> checkbox is selected. The timestep threshold above which objects will be hidden is determined by the <guilabel
->Also hide if timescale greater than:</guilabel
-> timestep-spinbox. You can specify the objects that should be hidden in the <guilabel
->Configure Hidden Objects</guilabel
-> group box. </para>
+If the <guilabel>Attach label to centred object</guilabel> checkbox is selected, then a name label will automatically be attached to an object when it is being tracked by the program. The label will be removed when the object is no longer being tracked. Note that you can also manually attach a persistent name label to any object with its <link linkend="popup-menu">popup menu</link>. </para><para>
+<indexterm><primary>Objects in the Sky</primary>
+<secondary>Hiding</secondary></indexterm>
+There are three situations when &kstars; must redraw the sky display very rapidly: when a new focus position is selected (and <guilabel>Use animated slewing</guilabel> is checked), when the sky is dragged with the mouse, and when the time step is large. In these situations, the positions of all objects must be recomputed as rapidly as possible, which can put a large load on the <abbrev>CPU</abbrev>. If the <abbrev>CPU</abbrev> cannot keep up with the demand, then the display will seem sluggish or jerky. To mitigate this, &kstars; will hide certain objects during these rapid-redraw situations, as long as the <guilabel>Hide objects while moving</guilabel> checkbox is selected. The timestep threshold above which objects will be hidden is determined by the <guilabel>Also hide if timescale greater than:</guilabel> timestep-spinbox. You can specify the objects that should be hidden in the <guilabel>Configure Hidden Objects</guilabel> group box. </para>
 </sect1>
 
 <sect1 id="customize">
-<title
->Customising the Display</title>
+<title>Customising the Display</title>
 
-<para
->There are several ways to modify the display to your liking.</para>
+<para>There are several ways to modify the display to your liking.</para>
 <itemizedlist>
-<listitem
-><para>
-<indexterm
-><primary
->Colour Schemes</primary
-><secondary
->Selecting</secondary
-></indexterm>
-Select a different colour scheme in the <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Colour Schemes</guimenuitem
-></menuchoice
-> menu. There are four predefined colour schemes, and you can define your own in the <link linkend="config"
-><guilabel
->Configure &kstars;</guilabel
-></link
-> window. </para
-></listitem>
-<listitem
-><para>
-<indexterm
-><primary
->Toolbars</primary>
-<secondary
->Customising</secondary
-></indexterm>
-Toggle whether the Toolbars are drawn in the <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Toolbars</guimenuitem
-></menuchoice
-> menu. Like most KDE toolbars, they can also be dragged around and anchored on any window edge, or even detached from the window completely. </para
-></listitem>
-<listitem
-><para>
-<indexterm
-><primary
->Info Boxes</primary
-><secondary
->Customising</secondary
-></indexterm>
-<indexterm
-><primary
->Info Boxes</primary
-><secondary
->Shading</secondary
-></indexterm>
-Toggle whether the Info Boxes are drawn in the <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Info Boxes</guimenuitem
-></menuchoice
-> menu. In addition, you can manipulate the three Info Boxes with the mouse. Each box has additional lines of data that are hidden by default. You can toggle whether these additional lines are visible by double-clicking a box to <quote
->shade</quote
-> it. Also, you can reposition a box by dragging it with the mouse. When a box hits a window edge, it will <quote
->stick</quote
-> to the edge when the window is resized. </para
-></listitem>
+<listitem><para>
+<indexterm><primary>Colour Schemes</primary><secondary>Selecting</secondary></indexterm>
+Select a different colour scheme in the <menuchoice><guimenu>Settings</guimenu><guimenuitem>Colour Schemes</guimenuitem></menuchoice> menu. There are four predefined colour schemes, and you can define your own in the <link linkend="config"><guilabel>Configure &kstars;</guilabel></link> window. </para></listitem>
+<listitem><para>
+<indexterm><primary>Toolbars</primary>
+<secondary>Customising</secondary></indexterm>
+Toggle whether the Toolbars are drawn in the <menuchoice><guimenu>Settings</guimenu><guimenuitem>Toolbars</guimenuitem></menuchoice> menu. Like most KDE toolbars, they can also be dragged around and anchored on any window edge, or even detached from the window completely. </para></listitem>
+<listitem><para>
+<indexterm><primary>Info Boxes</primary><secondary>Customising</secondary></indexterm>
+<indexterm><primary>Info Boxes</primary><secondary>Shading</secondary></indexterm>
+Toggle whether the Info Boxes are drawn in the <menuchoice><guimenu>Settings</guimenu><guimenuitem>Info Boxes</guimenuitem></menuchoice> menu. In addition, you can manipulate the three Info Boxes with the mouse. Each box has additional lines of data that are hidden by default. You can toggle whether these additional lines are visible by double-clicking a box to <quote>shade</quote> it. Also, you can reposition a box by dragging it with the mouse. When a box hits a window edge, it will <quote>stick</quote> to the edge when the window is resized. </para></listitem>
 <listitem>
 <para>
-<indexterm
-><primary
->Field-of-View Symbols</primary
-><secondary
->Description</secondary
-></indexterm>
-Choose an <quote
->FOV Symbol</quote
-> using the <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->FOV Symbols</guimenuitem
-></menuchoice
-> menu. <firstterm
->FOV</firstterm
-> is an acronym for <quote
->field-of-view</quote
->. An FOV symbol is drawn at the centre of the window to indicate where the display is pointing. Different symbols have different angular sizes; you can use a symbol to show what the view through a particular telescope would look like. For example, if you choose the <quote
->7x35 Binoculars</quote
-> FOV symbol, then a circle is drawn on the display that is 9.2 degrees in diameter; this is the field-of-view for 7x35 binoculars. </para>
+<indexterm><primary>Field-of-View Symbols</primary><secondary>Description</secondary></indexterm>
+Choose an <quote>FOV Symbol</quote> using the <menuchoice><guimenu>Settings</guimenu><guimenuitem>FOV Symbols</guimenuitem></menuchoice> menu. <firstterm>FOV</firstterm> is an acronym for <quote>field-of-view</quote>. An FOV symbol is drawn at the centre of the window to indicate where the display is pointing. Different symbols have different angular sizes; you can use a symbol to show what the view through a particular telescope would look like. For example, if you choose the <quote>7x35 Binoculars</quote> FOV symbol, then a circle is drawn on the display that is 9.2 degrees in diameter; this is the field-of-view for 7x35 binoculars. </para>
 <para>
-<indexterm
-><primary
->Field-of-View Symbols</primary
-><secondary
->Customising</secondary
-></indexterm>
-You can define your own FOV symbols (or modify the existing symbols) using the <guimenuitem
->Edit FOV Symbols...</guimenuitem
-> menu item, which launches the FOV Editor: </para>
+<indexterm><primary>Field-of-View Symbols</primary><secondary>Customising</secondary></indexterm>
+You can define your own FOV symbols (or modify the existing symbols) using the <guimenuitem>Edit FOV Symbols...</guimenuitem> menu item, which launches the FOV Editor: </para>
 <screenshot>
-<screeninfo
->Field-of-View Symbols Editor</screeninfo>
+<screeninfo>Field-of-View Symbols Editor</screeninfo>
 <mediaobject>
   <imageobject>
     <imagedata fileref="fovdialog.png" format="PNG"/>
   </imageobject>
   <textobject>
-    <phrase
->FOV Symbol Editor</phrase>
+    <phrase>FOV Symbol Editor</phrase>
   </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->The list of defined FOV symbols is displayed on the left. On the right are buttons for adding a new symbol, editing the highlighted symbol's properties, and removing the highlighted symbol from the list. Note that you can even modify or remove the four predefined symbols (if you remove all symbols, the four defaults will be restored the next time you start &kstars;). Below these three buttons is a graphical preview display showing the highlighted symbol from the list. When the <guibutton
->New...</guibutton
-> or <guibutton
->Edit...</guibutton
-> button is pressed, the <guilabel
->New FOV Symbol</guilabel
-> window is opened: </para>
+<para>The list of defined FOV symbols is displayed on the left. On the right are buttons for adding a new symbol, editing the highlighted symbol's properties, and removing the highlighted symbol from the list. Note that you can even modify or remove the four predefined symbols (if you remove all symbols, the four defaults will be restored the next time you start &kstars;). Below these three buttons is a graphical preview display showing the highlighted symbol from the list. When the <guibutton>New...</guibutton> or <guibutton>Edit...</guibutton> button is pressed, the <guilabel>New FOV Symbol</guilabel> window is opened: </para>
 
 <screenshot>
-<screeninfo
->New Field-of-View Symbol</screeninfo>
+<screeninfo>New Field-of-View Symbol</screeninfo>
 <mediaobject>
   <imageobject>
     <imagedata fileref="newfov.png" format="PNG"/>
   </imageobject>
   <textobject>
-    <phrase
->New FOV Symbol</phrase>
+    <phrase>New FOV Symbol</phrase>
   </textobject>
 </mediaobject>
 </screenshot>
 
 <para>
-<indexterm
-><primary
->Field-of-View Symbols</primary
-><secondary
->Defining New</secondary
-></indexterm>
-This window lets you modify the four properties that define a FOV symbol: name, size, shape and colour. The angular size for the symbol can either be entered directly in the <guilabel
->Field of View</guilabel
-> edit box, or you can use the Eyepiece/Camera Tabs to calculate the field-of-view angle, given parameters of your telescope/eyepiece or telescope/camera setup. The four available shapes are: Circle, Square, Crosshairs, and Bullseye. Once you have specified all four parameters, press <guibutton
->Ok</guibutton
->, and the symbol will appear in the list of defined symbols. It will also be available from the <guimenu
->Settings</guimenu
-> | <guisubmenu
->FOV</guisubmenu
-> menu. </para>
+<indexterm><primary>Field-of-View Symbols</primary><secondary>Defining New</secondary></indexterm>
+This window lets you modify the four properties that define a FOV symbol: name, size, shape and colour. The angular size for the symbol can either be entered directly in the <guilabel>Field of View</guilabel> edit box, or you can use the Eyepiece/Camera Tabs to calculate the field-of-view angle, given parameters of your telescope/eyepiece or telescope/camera setup. The four available shapes are: Circle, Square, Crosshairs, and Bullseye. Once you have specified all four parameters, press <guibutton>Ok</guibutton>, and the symbol will appear in the list of defined symbols. It will also be available from the <guimenu>Settings</guimenu> | <guisubmenu>FOV</guisubmenu> menu. </para>
 </listitem>
 </itemizedlist>
 
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/cpoles.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/cpoles.docbook
index 062494cefea..cef6911fc82 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/cpoles.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/cpoles.docbook
@@ -1,64 +1,14 @@
 <sect1 id="ai-cpoles">
 <sect1info>
-<author
-><firstname
->Jason</firstname
-> <surname
->Harris</surname
-> </author>
+<author><firstname>Jason</firstname> <surname>Harris</surname> </author>
 </sect1info>
-<title
->The Celestial Poles</title>
-<indexterm
-><primary
->Celestial Poles</primary>
-<seealso
->Equatorial Coordinates</seealso>
+<title>The Celestial Poles</title>
+<indexterm><primary>Celestial Poles</primary>
+<seealso>Equatorial Coordinates</seealso>
 </indexterm>
-<para
->The sky appears to drift overhead from east to west, completing a full circuit around the sky in 24 (<link linkend="ai-sidereal"
->Sidereal</link
->) hours. This phenomenon is due to the spinning of the Earth on its axis. The Earth's spin axis intersects the <link linkend="ai-csphere"
->Celestial Sphere</link
-> at two points. These points are the <firstterm
->Celestial Poles</firstterm
->. As the Earth spins; they remain fixed in the sky, and all other points seem to rotate around them. The celestial poles are also the poles of the <link linkend="equatorial"
->Equatorial Coordinate System</link
->, meaning they have <firstterm
->Declinations</firstterm
-> of +90 degrees and -90 degrees (for the North and South celestial poles, respectively). </para
-><para
->The North Celestial Pole currently has nearly the same coordinates as the bright star <firstterm
->Polaris</firstterm
-> (which is Latin for <quote
->Pole Star</quote
->). This makes Polaris useful for navigation: not only is it always above the North point of the horizon, but its <link linkend="horizontal"
->Altitude</link
-> angle is always (nearly) equal to the observer's <link linkend="ai-geocoords"
->Geographic Latitude</link
-> (however, Polaris can only be seen from locations in the Northern hemisphere). </para
-><para
->The fact that Polaris is near the pole is purely a coincidence. In fact, because of <link linkend="ai-precession"
->Precession</link
->, Polaris is only near the pole for a small fraction of the time. </para>
+<para>The sky appears to drift overhead from east to west, completing a full circuit around the sky in 24 (<link linkend="ai-sidereal">Sidereal</link>) hours. This phenomenon is due to the spinning of the Earth on its axis. The Earth's spin axis intersects the <link linkend="ai-csphere">Celestial Sphere</link> at two points. These points are the <firstterm>Celestial Poles</firstterm>. As the Earth spins; they remain fixed in the sky, and all other points seem to rotate around them. The celestial poles are also the poles of the <link linkend="equatorial">Equatorial Coordinate System</link>, meaning they have <firstterm>Declinations</firstterm> of +90 degrees and -90 degrees (for the North and South celestial poles, respectively). </para><para>The North Celestial Pole currently has nearly the same coordinates as the bright star <firstterm>Polaris</firstterm> (which is Latin for <quote>Pole Star</quote>). This makes Polaris useful for navigation: not only is it always above the North point of the horizon, but its <link linkend="horizontal">Altitude</link> angle is always (nearly) equal to the observer's <link linkend="ai-geocoords">Geographic Latitude</link> (however, Polaris can only be seen from locations in the Northern hemisphere). </para><para>The fact that Polaris is near the pole is purely a coincidence. In fact, because of <link linkend="ai-precession">Precession</link>, Polaris is only near the pole for a small fraction of the time. </para>
 <tip>
-<para
->Exercises:</para>
-<para
->Use the <guilabel
->Find Object</guilabel
-> window (<keycombo action="simul"
->&Ctrl;<keycap
->F</keycap
-></keycombo
->) to locate Polaris. Notice that its Declination is almost (but not exactly) +90 degrees. Compare the Altitude reading when focused on Polaris to your location's geographic latitude. They are always within one degree of each other. They are not exactly the same because Polaris isn't exactly at the Pole. (you can point exactly at the pole by switching to Equatorial coordinates, and pressing the up-arrow key until the sky stops scrolling). </para
-><para
->Use the <guilabel
->Time Step</guilabel
-> spinbox in the toolbar to accelerate time to a step of 100 seconds. You can see the entire sky appears to rotate around Polaris, while Polaris itself remains nearly stationary. </para
-><para
->We said that the celestial pole is the pole of the Equatorial coordinate system. What do you think is the pole of the horizontal (Altitude/Azimuth) coordinate system? (The <link linkend="ai-zenith"
->Zenith</link
->). </para>
+<para>Exercises:</para>
+<para>Use the <guilabel>Find Object</guilabel> window (<keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo>) to locate Polaris. Notice that its Declination is almost (but not exactly) +90 degrees. Compare the Altitude reading when focused on Polaris to your location's geographic latitude. They are always within one degree of each other. They are not exactly the same because Polaris isn't exactly at the Pole. (you can point exactly at the pole by switching to Equatorial coordinates, and pressing the up-arrow key until the sky stops scrolling). </para><para>Use the <guilabel>Time Step</guilabel> spinbox in the toolbar to accelerate time to a step of 100 seconds. You can see the entire sky appears to rotate around Polaris, while Polaris itself remains nearly stationary. </para><para>We said that the celestial pole is the pole of the Equatorial coordinate system. What do you think is the pole of the horizontal (Altitude/Azimuth) coordinate system? (The <link linkend="ai-zenith">Zenith</link>). </para>
 </tip>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/credits.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/credits.docbook
index ee7bded9340..2ef8ce2824a 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/credits.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/credits.docbook
@@ -1,111 +1,45 @@
 <chapter id="credits">
-<title
->Credits and Licence</title>
+<title>Credits and Licence</title>
 
-<para
->&kstars;</para>
-<para
->Program copyright 2001-2003 The &kstars; Team <email
->kstars@30doradus.org</email
-> </para>
+<para>&kstars;</para>
+<para>Program copyright 2001-2003 The &kstars; Team <email>kstars@30doradus.org</email> </para>
 
-<para
->The &kstars; Team: <itemizedlist>
-<listitem
-><para
->Jason Harris <email
->kstars@30doradus.org</email
-></para>
+<para>The &kstars; Team: <itemizedlist>
+<listitem><para>Jason Harris <email>kstars@30doradus.org</email></para>
 </listitem>
-<listitem
-><para
->Jasem Mutlaq <email
->mutlaqja@ku.edu</email
-></para>
+<listitem><para>Jasem Mutlaq <email>mutlaqja@ku.edu</email></para>
 </listitem>
-<listitem
-><para
->Pablo de Vicente <email
->pvicentea@wanadoo.es</email
-></para>
+<listitem><para>Pablo de Vicente <email>pvicentea@wanadoo.es</email></para>
 </listitem>
-<listitem
-><para
->Heiko Evermann <email
->heiko@evermann.de</email
-></para>
+<listitem><para>Heiko Evermann <email>heiko@evermann.de</email></para>
 </listitem>
-<listitem
-><para
->Thomas Kabelmann <email
->tk78@gmx.de</email
-></para>
+<listitem><para>Thomas Kabelmann <email>tk78@gmx.de</email></para>
 </listitem>
-<listitem
-><para
->Mark Hollomon <email
->mhh@mindspring.com</email
-></para>
+<listitem><para>Mark Hollomon <email>mhh@mindspring.com</email></para>
 </listitem>
-<listitem
-><para
->Carsten Niehaus <email
->cniehaus@gmx.de</email
-></para>
+<listitem><para>Carsten Niehaus <email>cniehaus@gmx.de</email></para>
 </listitem>
 </itemizedlist>
 </para>
 
-<para
->Data Sources: <itemizedlist>
+<para>Data Sources: <itemizedlist>
 <listitem>
-<para
->Object catalogues and planet position tables: <ulink url="http://adc.gsfc.nasa.gov"
->NASA Astronomical Data Center</ulink
-></para>
+<para>Object catalogues and planet position tables: <ulink url="http://adc.gsfc.nasa.gov">NASA Astronomical Data Center</ulink></para>
 </listitem>
 <listitem>
-<para
->Detailed credit information for all of the images used in the program is presented in the file README.images </para>
+<para>Detailed credit information for all of the images used in the program is presented in the file README.images </para>
 </listitem>
 </itemizedlist>
 </para>
-<para
->References: <itemizedlist>
-<listitem
-><para
-><quote
->Practical Astronomy With Your Calculator</quote
-> by Peter Duffet-Smith</para
-></listitem>
-<listitem
-><para
-><quote
->Astronomical Algorithms</quote
-> by Jean Meeus</para
-></listitem>
+<para>References: <itemizedlist>
+<listitem><para><quote>Practical Astronomy With Your Calculator</quote> by Peter Duffet-Smith</para></listitem>
+<listitem><para><quote>Astronomical Algorithms</quote> by Jean Meeus</para></listitem>
 </itemizedlist>
 </para>
 
-<para
->Special thanks: To the &kde; and &Qt; developers for providing the world with a peerless set of free <acronym
->API</acronym
-> libraries. To the <application
->KDevelop</application
-> team, for their excellent <acronym
->IDE</acronym
->, which made developing &kstars; so much easier and more fun. To everyone on the <application
->KDevelop</application
-> message board, the &kde; mailing lists, and on irc.kde.org, for answering our frequent questions. Thank you to Anne-Marie Mahfouf, for inviting &kstars; to join the &kde;-Edu module. Finally, thanks to everyone who has submitted bug reports and other feedback. Thank you, everyone. </para>
+<para>Special thanks: To the &kde; and &Qt; developers for providing the world with a peerless set of free <acronym>API</acronym> libraries. To the <application>KDevelop</application> team, for their excellent <acronym>IDE</acronym>, which made developing &kstars; so much easier and more fun. To everyone on the <application>KDevelop</application> message board, the &kde; mailing lists, and on irc.kde.org, for answering our frequent questions. Thank you to Anne-Marie Mahfouf, for inviting &kstars; to join the &kde;-Edu module. Finally, thanks to everyone who has submitted bug reports and other feedback. Thank you, everyone. </para>
 
-<para
->Documentation copyright 2001-2003 Jason Harris and the KStars Team <email
->kstars@30doradus.org</email
-> </para>
+<para>Documentation copyright 2001-2003 Jason Harris and the KStars Team <email>kstars@30doradus.org</email> </para>
 
-<para
->Andrew Coles<email
->andrew_coles@yahoo.co.uk</email
-></para
-> 
+<para>Andrew Coles<email>andrew_coles@yahoo.co.uk</email></para> 
 &underFDL; &underGPL; </chapter>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/csphere.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/csphere.docbook
index 9237efa55e7..c953ad8f3f9 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/csphere.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/csphere.docbook
@@ -1,28 +1,10 @@
 <sect1 id="ai-csphere">
 <sect1info>
-<author
-><firstname
->Jason</firstname
-> <surname
->Harris</surname
-> </author>
+<author><firstname>Jason</firstname> <surname>Harris</surname> </author>
 </sect1info>
-<title
->The Celestial Sphere</title>
-<indexterm
-><primary
->Celestial Sphere</primary>
-<seealso
->Celestial Coordinate Systems</seealso>
+<title>The Celestial Sphere</title>
+<indexterm><primary>Celestial Sphere</primary>
+<seealso>Celestial Coordinate Systems</seealso>
 </indexterm>
-<para
->The celestial sphere is an imaginary sphere of gigantic radius, centred on the Earth. All objects which can be seen in the sky can be thought of as lying on the surface of this sphere. </para
-><para
->Of course, we know that the objects in the sky are not on the surface of a sphere centred on the Earth, so why bother with such a construct? Everything we see in the sky is so very far away, that their distances are impossible to gauge just by looking at them. Since their distances are indeterminate, you only need to know the <emphasis
->direction</emphasis
-> toward the object to locate it in the sky. In this sense, the celestial sphere model is a very practical model for mapping the sky. </para
-><para
->The directions toward various objects in the sky can be quantified by constructing a <link linkend="ai-skycoords"
->Celestial Coordinate System</link
->. </para>
+<para>The celestial sphere is an imaginary sphere of gigantic radius, centred on the Earth. All objects which can be seen in the sky can be thought of as lying on the surface of this sphere. </para><para>Of course, we know that the objects in the sky are not on the surface of a sphere centred on the Earth, so why bother with such a construct? Everything we see in the sky is so very far away, that their distances are impossible to gauge just by looking at them. Since their distances are indeterminate, you only need to know the <emphasis>direction</emphasis> toward the object to locate it in the sky. In this sense, the celestial sphere model is a very practical model for mapping the sky. </para><para>The directions toward various objects in the sky can be quantified by constructing a <link linkend="ai-skycoords">Celestial Coordinate System</link>. </para>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/darkmatter.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/darkmatter.docbook
index 688ca6eb6a1..e52105623b4 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/darkmatter.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/darkmatter.docbook
@@ -1,86 +1,34 @@
 <sect1 id="ai-darkmatter">
 
 <sect1info>
-<author
-><firstname
->Jasem</firstname
-> <surname
->Mutlaq</surname
-> <affiliation
-><address
-> <email
->mutlaqja@ku.edu</email>
-</address
-></affiliation>
+<author><firstname>Jasem</firstname> <surname>Mutlaq</surname> <affiliation><address> <email>mutlaqja@ku.edu</email>
+</address></affiliation>
 </author>
 </sect1info>
 
-<title
->Dark Matter</title>
-<indexterm
-><primary
->Dark Matter</primary>
+<title>Dark Matter</title>
+<indexterm><primary>Dark Matter</primary>
 </indexterm>
 
-<para
->Scientists are now quite comfortable with the idea that 90% of the mass is the universe is in a form of matter that cannot be seen. </para>
+<para>Scientists are now quite comfortable with the idea that 90% of the mass is the universe is in a form of matter that cannot be seen. </para>
 
-<para
->Despite comprehensive maps of the nearby universe that cover the spectrum from radio to gamma rays, we are only able to account of 10% of the mass that must be out there. As Bruce H. Margon, an astronomer at the University of Washington, told the New York Times in 2001: <citation
->It's a fairly embarrassing situation to admit that we can't find 90 percent of the universe</citation
->. </para>
+<para>Despite comprehensive maps of the nearby universe that cover the spectrum from radio to gamma rays, we are only able to account of 10% of the mass that must be out there. As Bruce H. Margon, an astronomer at the University of Washington, told the New York Times in 2001: <citation>It's a fairly embarrassing situation to admit that we can't find 90 percent of the universe</citation>. </para>
 
-<para
->The term given this <quote
->missing mass</quote
-> is <firstterm
->Dark Matter</firstterm
->, and those two words pretty well sum up everything we know about it at this point. We know there is <quote
->Matter</quote
->, because we can see the effects of its gravitational influence. However, the matter emits no detectable electromagnetic radiation at all, hence it is <quote
->Dark</quote
->. There exist several theories to account for the missing mass ranging from exotic subatomic particles, to a population of isolated black holes, to less exotic brown and white dwarfs. The term <quote
->missing mass</quote
-> might be misleading, since the mass itself is not missing, just its light. But what is exactly dark matter and how do we really know it exists, if we cannot see it? </para>
+<para>The term given this <quote>missing mass</quote> is <firstterm>Dark Matter</firstterm>, and those two words pretty well sum up everything we know about it at this point. We know there is <quote>Matter</quote>, because we can see the effects of its gravitational influence. However, the matter emits no detectable electromagnetic radiation at all, hence it is <quote>Dark</quote>. There exist several theories to account for the missing mass ranging from exotic subatomic particles, to a population of isolated black holes, to less exotic brown and white dwarfs. The term <quote>missing mass</quote> might be misleading, since the mass itself is not missing, just its light. But what is exactly dark matter and how do we really know it exists, if we cannot see it? </para>
 
-<para
->The story began in 1933 when Astronomer Fritz Zwicky was studying the motions of distant and massive clusters of galaxies, specifically the Coma cluster and the Virgo cluster. Zwicky estimated the mass of each galaxy in the cluster based on their luminosity, and added up all of the galaxy masses to get a total cluster mass. He then made a second, independent estimate of the cluster mass, based on measuring the spread in velocities of the individual galaxies in the cluster. To his suprise, this second <firstterm
->dynamical mass</firstterm
-> estimate was <emphasis
->400 times</emphasis
-> larger than the estimate based on the galaxy light. </para>
+<para>The story began in 1933 when Astronomer Fritz Zwicky was studying the motions of distant and massive clusters of galaxies, specifically the Coma cluster and the Virgo cluster. Zwicky estimated the mass of each galaxy in the cluster based on their luminosity, and added up all of the galaxy masses to get a total cluster mass. He then made a second, independent estimate of the cluster mass, based on measuring the spread in velocities of the individual galaxies in the cluster. To his suprise, this second <firstterm>dynamical mass</firstterm> estimate was <emphasis>400 times</emphasis> larger than the estimate based on the galaxy light. </para>
 
-<para
->Although the evidence was strong at Zwicky's time, it was not until the 1970s that scientists began to explore this discrepancy comprehensively. It was at this time that the existence of Dark Matter began to be taken seriously. The existence of such matter would not only resolve the mass deficit in galaxy clusters; it would also have far more reaching consequences for the evolution and fate of the universe itself. </para>
+<para>Although the evidence was strong at Zwicky's time, it was not until the 1970s that scientists began to explore this discrepancy comprehensively. It was at this time that the existence of Dark Matter began to be taken seriously. The existence of such matter would not only resolve the mass deficit in galaxy clusters; it would also have far more reaching consequences for the evolution and fate of the universe itself. </para>
 
-<para
->Another phenomenon that suggested the need for dark matter is the rotational curves of <firstterm
->Spiral Galaxies</firstterm
->. Spiral Galaxies contain a large population of stars that orbit the Galactic centre on nearly circular orbits, much like planets orbit a star. Like planetary orbits, stars with larger galactic orbits are expected to have slower orbital speeds (this is just a statement of Kepler's 3rd Law). Actually, Kepler's 3rd Law only applies to stars near the perimeter of a Spiral Galaxy, because it assumes the mass enclosed by the orbit to be constant. </para>
+<para>Another phenomenon that suggested the need for dark matter is the rotational curves of <firstterm>Spiral Galaxies</firstterm>. Spiral Galaxies contain a large population of stars that orbit the Galactic centre on nearly circular orbits, much like planets orbit a star. Like planetary orbits, stars with larger galactic orbits are expected to have slower orbital speeds (this is just a statement of Kepler's 3rd Law). Actually, Kepler's 3rd Law only applies to stars near the perimeter of a Spiral Galaxy, because it assumes the mass enclosed by the orbit to be constant. </para>
 
-<para
->However, astronomers have made observations of the orbital speeds of stars in the outer parts of a large number of spiral galaxies, and none of them follow Kepler's 3rd Law as expected. Instead of falling off at larger radii, the orbital speeds remain remarkably constant. The implication is that the mass enclosed by larger-radius orbits increases, even for stars that are apparently near the edge of the galaxy. While they are near the edge of the luminous part of the galaxy, the galaxy has a mass profile that apparently continues well beyond the regions occupied by stars. </para>
+<para>However, astronomers have made observations of the orbital speeds of stars in the outer parts of a large number of spiral galaxies, and none of them follow Kepler's 3rd Law as expected. Instead of falling off at larger radii, the orbital speeds remain remarkably constant. The implication is that the mass enclosed by larger-radius orbits increases, even for stars that are apparently near the edge of the galaxy. While they are near the edge of the luminous part of the galaxy, the galaxy has a mass profile that apparently continues well beyond the regions occupied by stars. </para>
 
-<para
->Here is another way to think about it: Consider the stars near the perimeter of a spiral galaxy, with typical observed orbital velocities of 200 kilometers per second. If the galaxy consisted of only the matter that we can see, these stars would very quickly fly off from the galaxy, because their orbital speeds are four times larger than the galaxy's escape velocity. Since galaxies are not seen to be spinning apart, there must be mass in the galaxy that we are not accounting for when we add up all the parts we can see. </para>
+<para>Here is another way to think about it: Consider the stars near the perimeter of a spiral galaxy, with typical observed orbital velocities of 200 kilometers per second. If the galaxy consisted of only the matter that we can see, these stars would very quickly fly off from the galaxy, because their orbital speeds are four times larger than the galaxy's escape velocity. Since galaxies are not seen to be spinning apart, there must be mass in the galaxy that we are not accounting for when we add up all the parts we can see. </para>
 
-<para
->Several theories have surfaced in literature to account for the missing mass such as <acronym
->WIMP</acronym
->s (Weakly Interacting Massive Particles), <acronym
->MACHO</acronym
->s (MAssive Compact Halo Objects), primordial black holes, massive neutrinos, and others; each with their pros and cons. No single theory has yet been accepted by the astronomical community, because we so far lack the means to conclusively test one theory against the other. </para>
+<para>Several theories have surfaced in literature to account for the missing mass such as <acronym>WIMP</acronym>s (Weakly Interacting Massive Particles), <acronym>MACHO</acronym>s (MAssive Compact Halo Objects), primordial black holes, massive neutrinos, and others; each with their pros and cons. No single theory has yet been accepted by the astronomical community, because we so far lack the means to conclusively test one theory against the other. </para>
 
 <tip>
-<para
->You can see the galaxy clusters that Professor Zwicky studied to discover Dark Matter. Use the &kstars; Find Object Window (<keycombo action="simul"
->&Ctrl;<keycap
->F</keycap
-></keycombo
->) to centre on <quote
->M 87</quote
-> to find the Virgo Cluster, and on <quote
->NGC 4884</quote
-> to find the Coma Cluster. You may have to zoom in to see the galaxies. Note that the Virgo Cluster appears to be much larger on the sky. In reality, Coma is the larger cluster; it only appears smaller because it is further away. </para>
+<para>You can see the galaxy clusters that Professor Zwicky studied to discover Dark Matter. Use the &kstars; Find Object Window (<keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo>) to centre on <quote>M 87</quote> to find the Virgo Cluster, and on <quote>NGC 4884</quote> to find the Coma Cluster. You may have to zoom in to see the galaxies. Note that the Virgo Cluster appears to be much larger on the sky. In reality, Coma is the larger cluster; it only appears smaller because it is further away. </para>
 </tip>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/dcop.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/dcop.docbook
index ffae09c3af5..e70a31da1da 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/dcop.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/dcop.docbook
@@ -1,173 +1,54 @@
 <chapter id="dcop">
-<title
->Scripting KStars: The DCOP Interface</title>
-<para
->One of the goals of &kstars; is to provide the ability to playback complicated behaviours from a script. This will allow you to create <quote
->virtual tours</quote
-> of the heavens, and will enable teachers to construct classroom demos to illustrate certain astronomical concepts. It is already possible to write such scripts for &kstars;, although not all of the desired functions have been included. Also, while we will eventually have a GUI-based script builder tool, the scripts must currently be written by hand. This chapter will explain how to write &kstars; scripts. </para>
-<para
->The &kde; architecture provides the necessary framework for scriptable applications via the <abbrev
->DCOP</abbrev
-> interface. <abbrev
->DCOP</abbrev
-> stands for <quote
->Desktop Communication Protocol</quote
->; through <abbrev
->DCOP</abbrev
->, &kde; applications can be controlled by other applications, from a terminal prompt, or through a text script. </para>
+<title>Scripting KStars: The DCOP Interface</title>
+<para>One of the goals of &kstars; is to provide the ability to playback complicated behaviours from a script. This will allow you to create <quote>virtual tours</quote> of the heavens, and will enable teachers to construct classroom demos to illustrate certain astronomical concepts. It is already possible to write such scripts for &kstars;, although not all of the desired functions have been included. Also, while we will eventually have a GUI-based script builder tool, the scripts must currently be written by hand. This chapter will explain how to write &kstars; scripts. </para>
+<para>The &kde; architecture provides the necessary framework for scriptable applications via the <abbrev>DCOP</abbrev> interface. <abbrev>DCOP</abbrev> stands for <quote>Desktop Communication Protocol</quote>; through <abbrev>DCOP</abbrev>, &kde; applications can be controlled by other applications, from a terminal prompt, or through a text script. </para>
 
 <sect1 id="dcop-interface">
-<title
->DCOP Functions</title>
-<para
->The &kstars; <abbrev
->DCOP</abbrev
-> Interface includes the following functions: <itemizedlist>
-<listitem
-><para
-><function
-> lookTowards( const QString direction )</function
->: Point the display focus in a direction specified by the argument. This can be the name of any object in the sky, or one of the following directional words or abbreviations: zenith (or z), north (n), northeast (ne), east (e), southeast (se), south (s), southwest(sw), west(w), northwest (nw). </para
-></listitem>
-
-<listitem
-><para
-><function
-> setRaDec( double ra, double dec )</function
->: Point the display focus at the specified equatorial coordinates. </para
-></listitem>
-
-<listitem
-><para
-><function
-> setAltAz(double alt, double az)</function
->: Point the display focus at the specified horizontal coordinates. </para
-></listitem>
-
-<listitem
-><para
-><function
-> zoomIn()</function
->: Increase the display's Zoom level. </para
-></listitem>
-
-<listitem
-><para
-><function
-> zoomOut()</function
->: Decrease the display's Zoom level. </para
-></listitem>
-
-<listitem
-><para
-><function
-> defaultZoom()</function
->: Reset the display to Zoom level = 3 (the default). </para
-></listitem>
-
-<listitem
-><para
-><function
-> setLocalTime(int yr, int mth, int day, int hr, int min, int sec)</function
->: Set the simulation clock to the specified date and time. </para
-></listitem>
-
-<listitem
-><para
-><function
-> waitFor( double t )</function
->: Pause for t seconds before continuing with subsequent script commands. </para
-></listitem>
-
-<listitem
-><para
-><function
-> waitForKey( const QString k )</function
->: Halt the script execution until the user presses the specified key. At this point, you cannot specify combination keystrokes (such as <keycombo action="simul"
->&Ctrl;<keycap
->C</keycap
-></keycombo
->); just use simple keys. You can type <quote
->space</quote
-> to indicate the spacebar. </para
-></listitem>
-
-<listitem
-><para
-><function
-> setTracking( bool track )</function
->: Toggle whether tracking mode is engaged. </para
-></listitem>
-
-<listitem
-><para
-><function
-> changeViewOption( const QString option, const QString value )</function
->: Adjust a view option. There are dozens and dozens of options available; basically everything you can change in the <guilabel
->Configure &kstars; Window</guilabel
-> can be changed here as well. The first argument is the name of the option (the names are taken from the <filename
->kstarsrc</filename
-> configuration file), and the second argument is the desired value. The argument parser is designed to be robust, so if you accidentally send it bad data it should fail gracefully. </para
-></listitem>
-
-<listitem
-><para
-><function
-> setGeoLocation( const QString city, const QString province, const QString country )</function
->: Change the observing location to the specified city. If no city matching the argument strings is found, then nothing happens. </para
-></listitem>
-
-<listitem
-><para
-><function
-> stop()</function
-> [clock]: Halt the simulation clock. </para
-></listitem>
-
-<listitem
-><para
-><function
-> start()</function
-> [clock]: Start the simulation clock. </para
-></listitem>
-
-<listitem
-><para
-><function
-> setScale(float s)</function
-> [clock]: Set the rate of the simulation clock. s=1.0 corresponds to real time; 2.0 is twice as fast as real-time, etc. </para
-></listitem>
+<title>DCOP Functions</title>
+<para>The &kstars; <abbrev>DCOP</abbrev> Interface includes the following functions: <itemizedlist>
+<listitem><para><function> lookTowards( const QString direction )</function>: Point the display focus in a direction specified by the argument. This can be the name of any object in the sky, or one of the following directional words or abbreviations: zenith (or z), north (n), northeast (ne), east (e), southeast (se), south (s), southwest(sw), west(w), northwest (nw). </para></listitem>
+
+<listitem><para><function> setRaDec( double ra, double dec )</function>: Point the display focus at the specified equatorial coordinates. </para></listitem>
+
+<listitem><para><function> setAltAz(double alt, double az)</function>: Point the display focus at the specified horizontal coordinates. </para></listitem>
+
+<listitem><para><function> zoomIn()</function>: Increase the display's Zoom level. </para></listitem>
+
+<listitem><para><function> zoomOut()</function>: Decrease the display's Zoom level. </para></listitem>
+
+<listitem><para><function> defaultZoom()</function>: Reset the display to Zoom level = 3 (the default). </para></listitem>
+
+<listitem><para><function> setLocalTime(int yr, int mth, int day, int hr, int min, int sec)</function>: Set the simulation clock to the specified date and time. </para></listitem>
+
+<listitem><para><function> waitFor( double t )</function>: Pause for t seconds before continuing with subsequent script commands. </para></listitem>
+
+<listitem><para><function> waitForKey( const QString k )</function>: Halt the script execution until the user presses the specified key. At this point, you cannot specify combination keystrokes (such as <keycombo action="simul">&Ctrl;<keycap>C</keycap></keycombo>); just use simple keys. You can type <quote>space</quote> to indicate the spacebar. </para></listitem>
+
+<listitem><para><function> setTracking( bool track )</function>: Toggle whether tracking mode is engaged. </para></listitem>
+
+<listitem><para><function> changeViewOption( const QString option, const QString value )</function>: Adjust a view option. There are dozens and dozens of options available; basically everything you can change in the <guilabel>Configure &kstars; Window</guilabel> can be changed here as well. The first argument is the name of the option (the names are taken from the <filename>kstarsrc</filename> configuration file), and the second argument is the desired value. The argument parser is designed to be robust, so if you accidentally send it bad data it should fail gracefully. </para></listitem>
+
+<listitem><para><function> setGeoLocation( const QString city, const QString province, const QString country )</function>: Change the observing location to the specified city. If no city matching the argument strings is found, then nothing happens. </para></listitem>
+
+<listitem><para><function> stop()</function> [clock]: Halt the simulation clock. </para></listitem>
+
+<listitem><para><function> start()</function> [clock]: Start the simulation clock. </para></listitem>
+
+<listitem><para><function> setScale(float s)</function> [clock]: Set the rate of the simulation clock. s=1.0 corresponds to real time; 2.0 is twice as fast as real-time, etc. </para></listitem>
 </itemizedlist>
 </para>
 </sect1>
 
 <sect1 id="dcop-test">
-<title
->Testing the DCOP Functions</title>
-<para
->You can try out the DCOP functions very easily using the <application
->kdcop</application
-> program. When you run <application
->kdcop</application
->, you will see a tree-list of all running programs; if &kstars; is running it will be listed. Most of the <abbrev
->DCOP</abbrev
-> functions are listed under the <quote
->KStarsInterface</quote
-> heading, but the clock functions are listed under <quote
->clock</quote
->. Double-click on any function to execute it. If the function requires arguments, a window will open in which you can input the values. </para>
+<title>Testing the DCOP Functions</title>
+<para>You can try out the DCOP functions very easily using the <application>kdcop</application> program. When you run <application>kdcop</application>, you will see a tree-list of all running programs; if &kstars; is running it will be listed. Most of the <abbrev>DCOP</abbrev> functions are listed under the <quote>KStarsInterface</quote> heading, but the clock functions are listed under <quote>clock</quote>. Double-click on any function to execute it. If the function requires arguments, a window will open in which you can input the values. </para>
 </sect1>
 
 <sect1 id="dcop-script">
-<title
->Writing a DCOP Script</title>
-<para
-><abbrev
->DCOP</abbrev
-> functions can also be called from the UNIX command line, and these can be encapsulated in a script. We will create an example script that switches to Equatorial coordinates, points the display at the Moon, zooms in a bit, and accelerates the clock to 1 hour per second. After tracking the Moon for 20 seconds, the clock is paused and the display zooms out. You can use this script as a template for making new scripts. I will list the entire script first, and then explain its various parts. </para>
+<title>Writing a DCOP Script</title>
+<para><abbrev>DCOP</abbrev> functions can also be called from the UNIX command line, and these can be encapsulated in a script. We will create an example script that switches to Equatorial coordinates, points the display at the Moon, zooms in a bit, and accelerates the clock to 1 hour per second. After tracking the Moon for 20 seconds, the clock is paused and the display zooms out. You can use this script as a template for making new scripts. I will list the entire script first, and then explain its various parts. </para>
 <para>
-<programlisting
->#!/bin/bash
+<programlisting>#!/bin/bash
 #KStars script: Track the Moon!
 #
 KSTARS=`dcopfind -a 'kstars*'`
@@ -189,60 +70,10 @@ dcop $KSTARS $MAIN  defaultZoom
 ##
 </programlisting>
 </para>
-<para
->Save this script to a file. The filename can be anything you like; I suggest something descriptive like <filename
->trackmoon.kstars</filename
->. Then type the following command to make the script executable: <userinput
-><command
->chmod</command
-> <option
->a+x</option
-> <parameter
->trackmoon.kstars</parameter
-> </userinput
->. The script can then be executed at any time by typing <userinput
-><command
->./trackmoon.kstars</command
-></userinput
-> in the folder which contains the script. Note that the script will only work if an instance of &kstars; is already running. You can use the <command
->dcopstart</command
-> command in a script to launch a new instance &kstars;. </para>
-<para
->Now to the explanation of the script. The top line identifies the file as a <command
->BASH</command
-> shell script. The following two lines are <firstterm
->comments</firstterm
-> (any line beginning with <quote
->#</quote
-> is a comment, and is ignored by the shell). The next three lines define some convenience variables that will be used later. The <varname
->KSTARS</varname
-> variable identifies the currently-running &kstars; process, using the <command
->dcopfind</command
-> command. <varname
->MAIN</varname
-> and <varname
->CLOCK</varname
-> identify the two <abbrev
->DCOP</abbrev
-> interfaces associated with &kstars;. </para>
-<para
->The remainder of the script is the actual list of <abbrev
->DCOP</abbrev
-> calls. The first command sets the display to use Equatorial coordinates by setting the <quote
->UseAltAz</quote
-> option to <quote
->false</quote
-> (again, you can see a list of all options that <quote
->changeViewOption</quote
-> can use by examining your <filename
->kstarsrc</filename
-> configuration file). The next command centres the display on the Moon, and automatically engages tracking. We then set the default zoom level, and then zoom in five times. Next, the clock's timescale is set to 1 hour per second (3600 seconds is one hour), and the clock is started (in case it was not already running). The next line pauses the script for 20 seconds while we track the Moon as it moves across the sky. Finally, we stop the clock and reset the zoom level to its default setting. </para>
-<para
->We hope you enjoy the scripting abilities of KStars. If you create an interesting script, please email it to <email
->kstars@30doradus.org</email
->; we would like to see what you have done, and may post some scripts on our webpage. Also, if you have any ideas for how to improve scripting (or any part of &kstars;), let us know at <email
->kstars-devel@lists.sourceforge.net</email
-> or submit a wishlist item to bugzilla. </para>
+<para>Save this script to a file. The filename can be anything you like; I suggest something descriptive like <filename>trackmoon.kstars</filename>. Then type the following command to make the script executable: <userinput><command>chmod</command> <option>a+x</option> <parameter>trackmoon.kstars</parameter> </userinput>. The script can then be executed at any time by typing <userinput><command>./trackmoon.kstars</command></userinput> in the folder which contains the script. Note that the script will only work if an instance of &kstars; is already running. You can use the <command>dcopstart</command> command in a script to launch a new instance &kstars;. </para>
+<para>Now to the explanation of the script. The top line identifies the file as a <command>BASH</command> shell script. The following two lines are <firstterm>comments</firstterm> (any line beginning with <quote>#</quote> is a comment, and is ignored by the shell). The next three lines define some convenience variables that will be used later. The <varname>KSTARS</varname> variable identifies the currently-running &kstars; process, using the <command>dcopfind</command> command. <varname>MAIN</varname> and <varname>CLOCK</varname> identify the two <abbrev>DCOP</abbrev> interfaces associated with &kstars;. </para>
+<para>The remainder of the script is the actual list of <abbrev>DCOP</abbrev> calls. The first command sets the display to use Equatorial coordinates by setting the <quote>UseAltAz</quote> option to <quote>false</quote> (again, you can see a list of all options that <quote>changeViewOption</quote> can use by examining your <filename>kstarsrc</filename> configuration file). The next command centres the display on the Moon, and automatically engages tracking. We then set the default zoom level, and then zoom in five times. Next, the clock's timescale is set to 1 hour per second (3600 seconds is one hour), and the clock is started (in case it was not already running). The next line pauses the script for 20 seconds while we track the Moon as it moves across the sky. Finally, we stop the clock and reset the zoom level to its default setting. </para>
+<para>We hope you enjoy the scripting abilities of KStars. If you create an interesting script, please email it to <email>kstars@30doradus.org</email>; we would like to see what you have done, and may post some scripts on our webpage. Also, if you have any ideas for how to improve scripting (or any part of &kstars;), let us know at <email>kstars-devel@lists.sourceforge.net</email> or submit a wishlist item to bugzilla. </para>
 </sect1>
 </chapter>
 
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/details.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/details.docbook
index bb45fc9477f..9bf2b313550 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/details.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/details.docbook
@@ -1,110 +1,39 @@
 <sect1 id="tool-details">
-<title
->Object Details Window</title>
-<indexterm
-><primary
->Tools</primary>
-<secondary
->Object Details Window</secondary
-></indexterm>
-<indexterm
-><primary
->Objects in the Sky</primary>
-<secondary
->Details</secondary
-></indexterm>
+<title>Object Details Window</title>
+<indexterm><primary>Tools</primary>
+<secondary>Object Details Window</secondary></indexterm>
+<indexterm><primary>Objects in the Sky</primary>
+<secondary>Details</secondary></indexterm>
 
 <screenshot>
-<screeninfo
->The Object Details Window </screeninfo>
+<screeninfo>The Object Details Window </screeninfo>
 <mediaobject>
   <imageobject>
     <imagedata fileref="detaildialog.png" format="PNG"/>
   </imageobject>
   <textobject>
-    <phrase
->Object Details Window</phrase>
+    <phrase>Object Details Window</phrase>
   </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->The Object Details Window presents advanced data available about a specific object in the sky. To access this tool, <mousebutton
->right</mousebutton
->-click on any object, and select the <guimenuitem
->Details...</guimenuitem
-> item from the popup menu. </para>
-<para
->The window is divided into a number of Tabs. In the <guilabel
->General</guilabel
-> Tab, we present basic data about the current object. This includes names and catalogue designations, object type, and <link linkend="ai-magnitude"
->magnitude</link
-> (brightness). Also shown are the object's Equatorial and Horizontal coordinates, as well as its rise, set and transit times. </para>
+<para>The Object Details Window presents advanced data available about a specific object in the sky. To access this tool, <mousebutton>right</mousebutton>-click on any object, and select the <guimenuitem>Details...</guimenuitem> item from the popup menu. </para>
+<para>The window is divided into a number of Tabs. In the <guilabel>General</guilabel> Tab, we present basic data about the current object. This includes names and catalogue designations, object type, and <link linkend="ai-magnitude">magnitude</link> (brightness). Also shown are the object's Equatorial and Horizontal coordinates, as well as its rise, set and transit times. </para>
 <para>
-<indexterm
-><primary
->Objects in the Sky</primary>
-<secondary
->Internet Links</secondary>
-<tertiary
->Customising</tertiary
-></indexterm>
-In the <guilabel
->Links</guilabel
-> tab, you can manage the internet links associated with this object. The Image and Information links associated with the object are listed. These are the links that appear in the popup menu when the object is <mousebutton
->right</mousebutton
->-clicked. You can add custom links to the object with the <guibutton
->Add Link...</guibutton
-> button. This will open a window in which you fill in the URL and link text for the new link (you can also test the URL in the web browser from this window). Keep in mind that the custom link can easily point to a file on your local disk, so you can use this feature to index your personal astronomical images or observing logs. </para>
-<para
->You can also modify or remove any link using the <guibutton
->Edit Link...</guibutton
-> and <guibutton
->Remove Link...</guibutton
-> buttons. </para>
-<para
->The <guilabel
->Advanced</guilabel
-> Tab allows you to query professional astronomical databases on the internet for information regarding the current object. To use these databases, simply highlight the desired database in the list, and press the <guibutton
->View</guibutton
-> button to see the results of your query in a web browser window. The query is made using the primary name of the object you clicked on to open the Details Dialogue. The following databases are available for querying: <itemizedlist>
-<listitem
-><para
->High Energy Astrophysical Archive (HEASARC). Here you can retrieve data about the current object from a number of <quote
->High-energy</quote
-> observatories, which covers the Ultraviolet, X-ray and Gamma Ray portions of the electromagnetic spectrum.</para
-></listitem>
-<listitem
-><para
->Multimission Archive at Space Telescope (MAST). The Space Telescope Science Institute provides access to the entire collection of images and spectra taken with the Hubble Space Telescope, as well as several other space-based observatories. </para
-></listitem>
-<listitem
-><para
->NASA Astrophysical Data System (ADS). This incredible bibliographic database encompass the entire body of literature published in international peer-review Journals about astronomy and astrophysics. The database is divided into four general subject areas (Astronomy and Astrophysics, Astrophysics Preprints, Instrumentation, and Physics and Geophysics). Each of these has three sub-nodes that query the database in different ways. <quote
->Keyword search</quote
-> will return articles which listed the object's name as a keyword. <quote
->Title word search</quote
-> will return articles which included the object name in their Title, and the <quote
->Title &amp; Keyword search</quote
-> uses both options together. </para
-></listitem>
-<listitem
-><para
->NASA/IPAC Extragalactic Database (NED). NED provides encapsulated data and bibliographic links about extragalactic objects. You should only use NED if your target is extragalactic; &ie; if it is itself a galaxy. </para
-></listitem>
-<listitem
-><para
->Set of Identifications, Measurements, and Bibliography for Astronomical Data (SIMBAD). SIMBAD is similar to NED, except it provides data about all kinds of objects, not just galaxies. </para
-></listitem>
-<listitem
-><para
->SkyView provides images from All-Sky surveys that have been performed in dozens of different parts of the spectrum, from Gamma Rays to the Radio. The &kstars; interface will retrieve an image from any of these surveys, centred on the selected object. </para
-></listitem>
+<indexterm><primary>Objects in the Sky</primary>
+<secondary>Internet Links</secondary>
+<tertiary>Customising</tertiary></indexterm>
+In the <guilabel>Links</guilabel> tab, you can manage the internet links associated with this object. The Image and Information links associated with the object are listed. These are the links that appear in the popup menu when the object is <mousebutton>right</mousebutton>-clicked. You can add custom links to the object with the <guibutton>Add Link...</guibutton> button. This will open a window in which you fill in the URL and link text for the new link (you can also test the URL in the web browser from this window). Keep in mind that the custom link can easily point to a file on your local disk, so you can use this feature to index your personal astronomical images or observing logs. </para>
+<para>You can also modify or remove any link using the <guibutton>Edit Link...</guibutton> and <guibutton>Remove Link...</guibutton> buttons. </para>
+<para>The <guilabel>Advanced</guilabel> Tab allows you to query professional astronomical databases on the internet for information regarding the current object. To use these databases, simply highlight the desired database in the list, and press the <guibutton>View</guibutton> button to see the results of your query in a web browser window. The query is made using the primary name of the object you clicked on to open the Details Dialogue. The following databases are available for querying: <itemizedlist>
+<listitem><para>High Energy Astrophysical Archive (HEASARC). Here you can retrieve data about the current object from a number of <quote>High-energy</quote> observatories, which covers the Ultraviolet, X-ray and Gamma Ray portions of the electromagnetic spectrum.</para></listitem>
+<listitem><para>Multimission Archive at Space Telescope (MAST). The Space Telescope Science Institute provides access to the entire collection of images and spectra taken with the Hubble Space Telescope, as well as several other space-based observatories. </para></listitem>
+<listitem><para>NASA Astrophysical Data System (ADS). This incredible bibliographic database encompass the entire body of literature published in international peer-review Journals about astronomy and astrophysics. The database is divided into four general subject areas (Astronomy and Astrophysics, Astrophysics Preprints, Instrumentation, and Physics and Geophysics). Each of these has three sub-nodes that query the database in different ways. <quote>Keyword search</quote> will return articles which listed the object's name as a keyword. <quote>Title word search</quote> will return articles which included the object name in their Title, and the <quote>Title &amp; Keyword search</quote> uses both options together. </para></listitem>
+<listitem><para>NASA/IPAC Extragalactic Database (NED). NED provides encapsulated data and bibliographic links about extragalactic objects. You should only use NED if your target is extragalactic; &ie; if it is itself a galaxy. </para></listitem>
+<listitem><para>Set of Identifications, Measurements, and Bibliography for Astronomical Data (SIMBAD). SIMBAD is similar to NED, except it provides data about all kinds of objects, not just galaxies. </para></listitem>
+<listitem><para>SkyView provides images from All-Sky surveys that have been performed in dozens of different parts of the spectrum, from Gamma Rays to the Radio. The &kstars; interface will retrieve an image from any of these surveys, centred on the selected object. </para></listitem>
 </itemizedlist>
 </para>
-<para
->Finally, in the <guilabel
->Log</guilabel
-> Tab, you can type in some text that will remain associated with this object's Details window. You could use this to attach personal observing notes, for example. </para>
+<para>Finally, in the <guilabel>Log</guilabel> Tab, you can type in some text that will remain associated with this object's Details window. You could use this to attach personal observing notes, for example. </para>
 </sect1>
 
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/dumpmode.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/dumpmode.docbook
index 515e54a5bc7..158839ae986 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/dumpmode.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/dumpmode.docbook
@@ -1,76 +1,12 @@
 <chapter id="dumpmode">
-<title
->Command-Line mode for Image Generation</title>
-<indexterm
-><primary
->Image-dump Mode</primary
-></indexterm>
+<title>Command-Line mode for Image Generation</title>
+<indexterm><primary>Image-dump Mode</primary></indexterm>
 
-<para
->You can use &kstars; to generate an image of the sky without actually launching the <acronym
->GUI</acronym
-> portion of the program. To use this feature, start &kstars; from a command prompt using arguments to specify the filename for the image, as well as the desired image dimensions: <cmdsynopsis
-><command
->kstars</command
-> <arg choice="plain"
->--dump</arg
-> <arg
->--filename <replaceable
->kstars.png</replaceable
-></arg
-> <arg
->--height <replaceable
->640</replaceable
-></arg
-> <arg
->--width <replaceable
->480</replaceable
-></arg
-> <arg
->--script <replaceable
->myscript.kstars</replaceable
-></arg
-> </cmdsynopsis>
+<para>You can use &kstars; to generate an image of the sky without actually launching the <acronym>GUI</acronym> portion of the program. To use this feature, start &kstars; from a command prompt using arguments to specify the filename for the image, as well as the desired image dimensions: <cmdsynopsis><command>kstars</command> <arg choice="plain">--dump</arg> <arg>--filename <replaceable>kstars.png</replaceable></arg> <arg>--height <replaceable>640</replaceable></arg> <arg>--width <replaceable>480</replaceable></arg> <arg>--script <replaceable>myscript.kstars</replaceable></arg> </cmdsynopsis>
 </para>
-<para
->If no filename is specified, it generates a file named <filename
->kstars.png</filename
->. It will attempt to generate an image that matches the extension of your filename. The following extensions are recognised: <quote
->png</quote
->, <quote
->jpg</quote
->, <quote
->jpeg</quote
->, <quote
->gif</quote
->, <quote
->pnm</quote
->, and <quote
->bmp</quote
->. If the filename extension is not recognised, it defaults to the <acronym
->PNG</acronym
-> image type. </para>
-<para
->Likewise, if the image width and height are not specified, they default to 640 and 480, respectively. </para>
-<para
->By default, &kstars; will read in the options values stored in your <filename
->$TDEHOME/share/config/kstarsrc</filename
-> file to determine where the image will be centred, and how it is rendered. This means you need to run &kstars; in normal GUI mode, and exit the program when it is set up with the desired options for the generated images. This is not very flexible, so we also provide the ability to execute a &kstars; <acronym
->DCOP</acronym
-> script to set the scene before generating the image. The filename you specify as the script argument should be a valid &kstars; <acronym
->DCOP</acronym
-> script, such as one created with the <link linkend="tool-scriptbuilder"
->Script Builder Tool</link
->. The script can be used to set where the image is pointing, set the geographic location, set the time and date, change the Zoom level and adjust other view options. Some of the <acronym
->DCOP</acronym
-> functions make no sense in non-GUI mode (such as <function
->waitForKey()</function
->); if these functions are encountered while parsing the script, they are simply ignored. </para>
-<para
->As an alternative to having to execute a &kstars; <acronym
->DCOP</acronym
-> script, we will provide an argument to specify an alternate <filename
->kstarsrc</filename
-> config file, in a future version of &kstars;. </para>
+<para>If no filename is specified, it generates a file named <filename>kstars.png</filename>. It will attempt to generate an image that matches the extension of your filename. The following extensions are recognised: <quote>png</quote>, <quote>jpg</quote>, <quote>jpeg</quote>, <quote>gif</quote>, <quote>pnm</quote>, and <quote>bmp</quote>. If the filename extension is not recognised, it defaults to the <acronym>PNG</acronym> image type. </para>
+<para>Likewise, if the image width and height are not specified, they default to 640 and 480, respectively. </para>
+<para>By default, &kstars; will read in the options values stored in your <filename>$TDEHOME/share/config/kstarsrc</filename> file to determine where the image will be centred, and how it is rendered. This means you need to run &kstars; in normal GUI mode, and exit the program when it is set up with the desired options for the generated images. This is not very flexible, so we also provide the ability to execute a &kstars; <acronym>DCOP</acronym> script to set the scene before generating the image. The filename you specify as the script argument should be a valid &kstars; <acronym>DCOP</acronym> script, such as one created with the <link linkend="tool-scriptbuilder">Script Builder Tool</link>. The script can be used to set where the image is pointing, set the geographic location, set the time and date, change the Zoom level and adjust other view options. Some of the <acronym>DCOP</acronym> functions make no sense in non-GUI mode (such as <function>waitForKey()</function>); if these functions are encountered while parsing the script, they are simply ignored. </para>
+<para>As an alternative to having to execute a &kstars; <acronym>DCOP</acronym> script, we will provide an argument to specify an alternate <filename>kstarsrc</filename> config file, in a future version of &kstars;. </para>
 
 </chapter>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/ecliptic.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/ecliptic.docbook
index 1b256948263..c06194841a8 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/ecliptic.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/ecliptic.docbook
@@ -1,56 +1,14 @@
 <sect1 id="ai-ecliptic">
 <sect1info>
-<author
-><firstname
->John</firstname
-> <surname
->Cirillo</surname
-> </author>
+<author><firstname>John</firstname> <surname>Cirillo</surname> </author>
 </sect1info>
-<title
->The Ecliptic</title>
-<indexterm
-><primary
->Ecliptic</primary>
-<seealso
->Ecliptic Coordinates</seealso>
+<title>The Ecliptic</title>
+<indexterm><primary>Ecliptic</primary>
+<seealso>Ecliptic Coordinates</seealso>
 </indexterm>
-<para
->The ecliptic is an imaginary <link linkend="ai-greatcircle"
->Great Circle</link
-> on the <link linkend="ai-csphere"
->Celestial Sphere</link
-> along which the Sun appears to move over the course of a year. Of course, it is really the Earth's orbit around the Sun causing the change in the Sun's apparent direction. The ecliptic is inclined from the <link linkend="ai-cequator"
->Celestial Equator</link
-> by 23.5 degrees. The two points where the Ecliptic crosses the Celestial Equator are known as the <link linkend="ai-equinox"
->Equinoxes</link
->. </para
-><para
->Since our solar system is relatively flat, the orbits of the planets are also close to the plane of the ecliptic. In addition, the constellations of the zodiac are located along the ecliptic. This makes the ecliptic a very useful line of reference to anyone attempting to locate the planets or the constellations of the zodiac, since they all literally <quote
->follow the Sun</quote
->. </para
-><para
->Because of the 23.5-degree tilt of the Ecliptic, the <firstterm
->Altitude</firstterm
-> of the Sun at noon changes over the course of the year, as it follows the path of the Ecliptic across the sky. This causes the seasons. In the Summer, the Sun is high in the sky at noon, and it remains above the <link linkend="ai-horizon"
->Horizon</link
-> for more than twelve hours. Whereas, in the winter, the Sun is low in the sky at noon, and remains above the Horizon for less than twelve hours. In addition, sunlight is received at the Earth's surface at a more direct angle in the Summer, which means that a given area at the surface receives more energy per second in the Summer than in Winter. The differences in day duration and in energy received per unit area lead to the differences in temperature we experience in Summer and Winter. </para>
+<para>The ecliptic is an imaginary <link linkend="ai-greatcircle">Great Circle</link> on the <link linkend="ai-csphere">Celestial Sphere</link> along which the Sun appears to move over the course of a year. Of course, it is really the Earth's orbit around the Sun causing the change in the Sun's apparent direction. The ecliptic is inclined from the <link linkend="ai-cequator">Celestial Equator</link> by 23.5 degrees. The two points where the Ecliptic crosses the Celestial Equator are known as the <link linkend="ai-equinox">Equinoxes</link>. </para><para>Since our solar system is relatively flat, the orbits of the planets are also close to the plane of the ecliptic. In addition, the constellations of the zodiac are located along the ecliptic. This makes the ecliptic a very useful line of reference to anyone attempting to locate the planets or the constellations of the zodiac, since they all literally <quote>follow the Sun</quote>. </para><para>Because of the 23.5-degree tilt of the Ecliptic, the <firstterm>Altitude</firstterm> of the Sun at noon changes over the course of the year, as it follows the path of the Ecliptic across the sky. This causes the seasons. In the Summer, the Sun is high in the sky at noon, and it remains above the <link linkend="ai-horizon">Horizon</link> for more than twelve hours. Whereas, in the winter, the Sun is low in the sky at noon, and remains above the Horizon for less than twelve hours. In addition, sunlight is received at the Earth's surface at a more direct angle in the Summer, which means that a given area at the surface receives more energy per second in the Summer than in Winter. The differences in day duration and in energy received per unit area lead to the differences in temperature we experience in Summer and Winter. </para>
 <tip>
-<para
->Exercises:</para>
-<para
->Make sure your location is set to somewhere that is not very near the equator for these experiments. Open the <guilabel
->Configure &kstars;</guilabel
-> window, and switch to Horizontal coordinates, with the Opaque Ground shown. Open the <guilabel
->Set Time</guilabel
-> window (<keycombo action="simul"
->&Ctrl;<keycap
->S</keycap
-></keycombo
->),and change the Date to sometime in the middle of Summer, and the Time to 12:00 Noon. Back in the Main Window, point toward the Southern Horizon (press <keycap
->S</keycap
->). Note the height of the Sun above the Horizon at Noon in the Summer. Now, change the Date to something in the middle of Winter (but keep the Time at 12:00 Noon). The Sun is now much lower in the Sky. You will also notice that the day durations are different if you open the <guilabel
->What's Up Tonight?</guilabel
-> tool for each date. </para>
+<para>Exercises:</para>
+<para>Make sure your location is set to somewhere that is not very near the equator for these experiments. Open the <guilabel>Configure &kstars;</guilabel> window, and switch to Horizontal coordinates, with the Opaque Ground shown. Open the <guilabel>Set Time</guilabel> window (<keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo>),and change the Date to sometime in the middle of Summer, and the Time to 12:00 Noon. Back in the Main Window, point toward the Southern Horizon (press <keycap>S</keycap>). Note the height of the Sun above the Horizon at Noon in the Summer. Now, change the Date to something in the middle of Winter (but keep the Time at 12:00 Noon). The Sun is now much lower in the Sky. You will also notice that the day durations are different if you open the <guilabel>What's Up Tonight?</guilabel> tool for each date. </para>
 </tip>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/ellipticalgalaxies.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/ellipticalgalaxies.docbook
index 37bad450a7e..1509438d84b 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/ellipticalgalaxies.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/ellipticalgalaxies.docbook
@@ -1,98 +1,49 @@
 <sect1 id="ai-ellipgal">
 <sect1info>
-<author
-><firstname
->Jasem</firstname
-> <surname
->Mutlaq</surname
-> <affiliation
-><address
-> <email
->mutlaqja@ku.edu</email>
-</address
-></affiliation>
+<author><firstname>Jasem</firstname> <surname>Mutlaq</surname> <affiliation><address> <email>mutlaqja@ku.edu</email>
+</address></affiliation>
 </author>
 </sect1info>
 
-<title
->Elliptical Galaxies</title>
-<indexterm
-><primary
->Elliptical Galaxies</primary>
+<title>Elliptical Galaxies</title>
+<indexterm><primary>Elliptical Galaxies</primary>
 </indexterm>
 
-<para
->Elliptical galaxies are spheroidal concentrations of billions of stars that resemble Globular Clusters on a grand scale. They have very little internal structure; the density of stars declines smoothly from the concentrated centre to the diffuse edge, and they can have a broad range of ellipticities (or aspect ratios). They typically contain very little interstellar gas and dust, and no young stellar populations (although there are exceptions to these rules). Edwin Hubble referred to Elliptical galaxies as <quote
->early-type</quote
-> galaxies, because he thought that they evolved to become Spiral Galaxies (which he called <quote
->late-type</quote
-> galaxies). Astronomers actually now believe the opposite is the case (&ie;, that Spiral galaxies can turn into Elliptical galaxies), but Hubble's early- and late-type labels are still used. </para>
+<para>Elliptical galaxies are spheroidal concentrations of billions of stars that resemble Globular Clusters on a grand scale. They have very little internal structure; the density of stars declines smoothly from the concentrated centre to the diffuse edge, and they can have a broad range of ellipticities (or aspect ratios). They typically contain very little interstellar gas and dust, and no young stellar populations (although there are exceptions to these rules). Edwin Hubble referred to Elliptical galaxies as <quote>early-type</quote> galaxies, because he thought that they evolved to become Spiral Galaxies (which he called <quote>late-type</quote> galaxies). Astronomers actually now believe the opposite is the case (&ie;, that Spiral galaxies can turn into Elliptical galaxies), but Hubble's early- and late-type labels are still used. </para>
 
-<para
->Once thought to be a simple galaxy type, ellipticals are now known to be quite complex objects. Part of this complexity is due to their amazing history: ellipticals are thought to be the end product of the merger of two Spiral galaxies. You can view a computer simulation MPEG movie of such a merger at <ulink url="http://oposite.stsci.edu/pubinfo/pr/2002/11/vid/v0211d3.mpg"
-> this NASA HST webpage</ulink
-> (warning: the file is 3.4 MB). </para>
+<para>Once thought to be a simple galaxy type, ellipticals are now known to be quite complex objects. Part of this complexity is due to their amazing history: ellipticals are thought to be the end product of the merger of two Spiral galaxies. You can view a computer simulation MPEG movie of such a merger at <ulink url="http://oposite.stsci.edu/pubinfo/pr/2002/11/vid/v0211d3.mpg"> this NASA HST webpage</ulink> (warning: the file is 3.4 MB). </para>
 
-<para
->Elliptical galaxies span a very wide range of sizes and luminosities, from giant Ellipticals hundreds of thousands of light years across and nearly a trillion times brighter than the sun, to dwarf Ellipticals just a bit brighter than the average globular cluster. They are divided to several morphological classes: </para>
+<para>Elliptical galaxies span a very wide range of sizes and luminosities, from giant Ellipticals hundreds of thousands of light years across and nearly a trillion times brighter than the sun, to dwarf Ellipticals just a bit brighter than the average globular cluster. They are divided to several morphological classes: </para>
 
 <variablelist>
 <varlistentry>
-<term
->cD galaxies:</term>
-<listitem
-><para
->Immense and bright objects that can measure nearly 1 Megaparsec (3 million light years) across. These titans are only found near the centres of large, dense clusters of galaxies, and are likely the result of many galaxy mergers.</para
-></listitem>
+<term>cD galaxies:</term>
+<listitem><para>Immense and bright objects that can measure nearly 1 Megaparsec (3 million light years) across. These titans are only found near the centres of large, dense clusters of galaxies, and are likely the result of many galaxy mergers.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Normal Elliptical galaxies</term>
-<listitem
-><para
->Condensed Object with relatively high central surface brightness. They include the giant ellipticals (gE'e), intermediate-luminosity ellipticals (E's), and compact ellipticals.</para
-></listitem>
+<term>Normal Elliptical galaxies</term>
+<listitem><para>Condensed Object with relatively high central surface brightness. They include the giant ellipticals (gE'e), intermediate-luminosity ellipticals (E's), and compact ellipticals.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Dwarf elliptical galaxies (dE's)</term>
-<listitem
-><para
->This class of galaxies is fundamentally different from normal ellipticals. Their diameters on the order of 1 to 10 kiloparsec with surface brightness that is much lower than normal ellipticals, giving them a much more diffuse appearance. They display the same characteristic gradual decline of star density from a relatively dense core out to a diffuse periphery.</para
-></listitem>
+<term>Dwarf elliptical galaxies (dE's)</term>
+<listitem><para>This class of galaxies is fundamentally different from normal ellipticals. Their diameters on the order of 1 to 10 kiloparsec with surface brightness that is much lower than normal ellipticals, giving them a much more diffuse appearance. They display the same characteristic gradual decline of star density from a relatively dense core out to a diffuse periphery.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Dwarf spheroidal galaxies (dSph's)</term>
-<listitem
-><para
->Extreme low-luminosity, low surface-brightness and have only been observed in the vicinity of the Milky Way, and possibly other very nearby galaxy groups, such as the Leo group. Their absolute magnitudes are only -8 to -15 mag. The Draco dwarf spheroidal galaxy has an absolute magnitude of -8.6, making it fainter than the average globular cluster in the Milky Way! </para
-></listitem>
+<term>Dwarf spheroidal galaxies (dSph's)</term>
+<listitem><para>Extreme low-luminosity, low surface-brightness and have only been observed in the vicinity of the Milky Way, and possibly other very nearby galaxy groups, such as the Leo group. Their absolute magnitudes are only -8 to -15 mag. The Draco dwarf spheroidal galaxy has an absolute magnitude of -8.6, making it fainter than the average globular cluster in the Milky Way! </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Blue compact dwarf galaxies (BCD's)</term>
+<term>Blue compact dwarf galaxies (BCD's)</term>
 <listitem>
-<para
->Small galaxies that are unusually blue. Thehave photometric colors of B-V = 0.0 to 0.30 mag, which is typical for relatively young stars of <firstterm
->spectral type</firstterm
-> A. This suggests that BCDs are currently actively forming stars. These systems also have abundant interstellar gas (unlike other Elliptical galaxies). </para
-></listitem>
+<para>Small galaxies that are unusually blue. Thehave photometric colors of B-V = 0.0 to 0.30 mag, which is typical for relatively young stars of <firstterm>spectral type</firstterm> A. This suggests that BCDs are currently actively forming stars. These systems also have abundant interstellar gas (unlike other Elliptical galaxies). </para></listitem>
 </varlistentry>
 </variablelist>
 
 <tip>
-<para
->You can see examples of Elliptical galaxies in &kstars;, using the Find Object window (<keycombo action="simul"
->&Ctrl;<keycap
->F</keycap
-></keycombo
->). Search for NGC 4881, which is the Giant cD galaxy in the Coma cluster of galaxies. M 86 is a normal Elliptical galaxy in the Virgo cluster of galaxies. M 32 is a dwarf Elliptical that is a satellite of our neighbour, the Andromeda galaxy (M 31). M 110 is another satellite of M 31 that is a borderline dwarf spheroidal galaxy (<quote
->borderline</quote
-> because it is somewhat brighter than most other dwarf spheroidals). </para>
+<para>You can see examples of Elliptical galaxies in &kstars;, using the Find Object window (<keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo>). Search for NGC 4881, which is the Giant cD galaxy in the Coma cluster of galaxies. M 86 is a normal Elliptical galaxy in the Virgo cluster of galaxies. M 32 is a dwarf Elliptical that is a satellite of our neighbour, the Andromeda galaxy (M 31). M 110 is another satellite of M 31 that is a borderline dwarf spheroidal galaxy (<quote>borderline</quote> because it is somewhat brighter than most other dwarf spheroidals). </para>
 </tip>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/equinox.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/equinox.docbook
index 8b4a0611550..8cc41f4568e 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/equinox.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/equinox.docbook
@@ -1,44 +1,9 @@
 <sect1 id="ai-equinox">
 <sect1info>
-<author
-><firstname
->Jason</firstname
-> <surname
->Harris</surname
-> </author>
+<author><firstname>Jason</firstname> <surname>Harris</surname> </author>
 </sect1info>
-<title
->The Equinoxes</title>
-<indexterm
-><primary
->Equinoxes</primary>
-<seealso
->Celestial Equator</seealso
-> <seealso
->Ecliptic</seealso
-> </indexterm>
-<para
->Most people know the Vernal and Autumnal Equinoxes as calendar dates, signifying the beginning of the Northern hemisphere's Spring and Autumn, respectively. Did you know that the equinoxes are also positions in the sky? </para
-><para
->The <link linkend="ai-cequator"
->Celestial Equator</link
-> and the <link linkend="ai-ecliptic"
->Ecliptic</link
-> are two <link linkend="ai-greatcircle"
->Great Circles</link
-> on the <link linkend="ai-csphere"
->Celestial Sphere</link
->, set at an angle of 23.5 degrees. The two points where they intersect are called the <firstterm
->Equinoxes</firstterm
->. The <firstterm
->Vernal Equinox</firstterm
-> has coordinates RA=0.0 hours, Dec=0.0 degrees. The <firstterm
->Autumnal Equinox</firstterm
-> has coordinates RA=12.0 hours, Dec=0.0 degrees. </para
-><para
->The Equinoxes are important for marking the seasons. Because they are on the <link linkend="ai-ecliptic"
->Ecliptic</link
->, the Sun passes through each equinox every year. When the Sun passes through the Vernal Equinox (usually on March 21st), it crosses the <link linkend="ai-cequator"
->Celestial Equator</link
-> from South to North, signifying the end of Winter for the Northern hemisphere. Similarly, whenthe Sun passes through the Autumnal Equinox (usually on September 21st), it crosses the Celestial Equator from North to South, signifying the end of Winter for the Southern hemisphere. </para>
+<title>The Equinoxes</title>
+<indexterm><primary>Equinoxes</primary>
+<seealso>Celestial Equator</seealso> <seealso>Ecliptic</seealso> </indexterm>
+<para>Most people know the Vernal and Autumnal Equinoxes as calendar dates, signifying the beginning of the Northern hemisphere's Spring and Autumn, respectively. Did you know that the equinoxes are also positions in the sky? </para><para>The <link linkend="ai-cequator">Celestial Equator</link> and the <link linkend="ai-ecliptic">Ecliptic</link> are two <link linkend="ai-greatcircle">Great Circles</link> on the <link linkend="ai-csphere">Celestial Sphere</link>, set at an angle of 23.5 degrees. The two points where they intersect are called the <firstterm>Equinoxes</firstterm>. The <firstterm>Vernal Equinox</firstterm> has coordinates RA=0.0 hours, Dec=0.0 degrees. The <firstterm>Autumnal Equinox</firstterm> has coordinates RA=12.0 hours, Dec=0.0 degrees. </para><para>The Equinoxes are important for marking the seasons. Because they are on the <link linkend="ai-ecliptic">Ecliptic</link>, the Sun passes through each equinox every year. When the Sun passes through the Vernal Equinox (usually on March 21st), it crosses the <link linkend="ai-cequator">Celestial Equator</link> from South to North, signifying the end of Winter for the Northern hemisphere. Similarly, whenthe Sun passes through the Autumnal Equinox (usually on September 21st), it crosses the Celestial Equator from North to South, signifying the end of Winter for the Southern hemisphere. </para>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/faq.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/faq.docbook
index e9c663aec38..a97df5c0a50 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/faq.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/faq.docbook
@@ -1,55 +1,28 @@
 <chapter id="faq">
-<title
->Questions and Answers</title>
+<title>Questions and Answers</title>
 &reporting.bugs; &updating.documentation; <qandaset id="faqlist">
 
 <qandaentry>
 <question>
-<para
->What is the &kstars; Icon?</para>
+<para>What is the &kstars; Icon?</para>
 </question>
 <answer>
-<para
->The <guiicon
->&kstars; Icon</guiicon
-> is a sextant, a handheld telescope which was used by navigators on sailing ships back when the stars were important for navigation. By carefully reckoning the positions of the stars, the navigator could get an accurate estimate of the ship's current <link linkend="ai-geocoords"
->longitude and latitude</link
->. </para>
+<para>The <guiicon>&kstars; Icon</guiicon> is a sextant, a handheld telescope which was used by navigators on sailing ships back when the stars were important for navigation. By carefully reckoning the positions of the stars, the navigator could get an accurate estimate of the ship's current <link linkend="ai-geocoords">longitude and latitude</link>. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->What do the different symbols for deep-sky objects mean?</para>
+<para>What do the different symbols for deep-sky objects mean?</para>
 </question>
 <answer>
-<para
->The symbol indicates the object type: <itemizedlist>
-<listitem
-><para
->dotted circle: Open Cluster</para
-></listitem>
-<listitem
-><para
->cross-in-circle: Globular Cluster</para
-></listitem>
-<listitem
-><para
->box: Gaseous Nebula</para
-></listitem>
-<listitem
-><para
->diamond: Supernova Remnant</para
-></listitem>
-<listitem
-><para
->circle with outer lines: Planetary Nebula</para
-></listitem>
-<listitem
-><para
->ellipse: Galaxy</para
-></listitem>
+<para>The symbol indicates the object type: <itemizedlist>
+<listitem><para>dotted circle: Open Cluster</para></listitem>
+<listitem><para>cross-in-circle: Globular Cluster</para></listitem>
+<listitem><para>box: Gaseous Nebula</para></listitem>
+<listitem><para>diamond: Supernova Remnant</para></listitem>
+<listitem><para>circle with outer lines: Planetary Nebula</para></listitem>
+<listitem><para>ellipse: Galaxy</para></listitem>
 </itemizedlist>
 </para>
 </answer>
@@ -57,88 +30,57 @@
 
 <qandaentry>
 <question>
-<para
->What do the different colours of Deep-sky objects mean?</para>
+<para>What do the different colours of Deep-sky objects mean?</para>
 </question>
 <answer>
-<para
->Generally, the different colours indicate to which catalogue the object belongs (Messier, NGC or IC). However, some objects have a different colour which indicates that there are extra images available in the <link linkend="popup-menu"
->popup menu</link
-> (the default <quote
->extras</quote
-> colour is red). </para>
+<para>Generally, the different colours indicate to which catalogue the object belongs (Messier, NGC or IC). However, some objects have a different colour which indicates that there are extra images available in the <link linkend="popup-menu">popup menu</link> (the default <quote>extras</quote> colour is red). </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Why are there so many more U.S. cities than in other countries? Is it a conspiracy? </para>
+<para>Why are there so many more U.S. cities than in other countries? Is it a conspiracy? </para>
 </question>
 <answer>
-<para
->It may be a conspiracy, but &kstars; is not involved! We were unable to find a single longitude/latitude database that covers the globe equitably. We are currently working on adding many more non-U.S. cities to the database. We have already received city lists from users in Norway, Italy and Korea. If you can contribute to this effort, please let us know. </para>
+<para>It may be a conspiracy, but &kstars; is not involved! We were unable to find a single longitude/latitude database that covers the globe equitably. We are currently working on adding many more non-U.S. cities to the database. We have already received city lists from users in Norway, Italy and Korea. If you can contribute to this effort, please let us know. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Why can I not display the ground when using Equatorial Coordinates</para>
+<para>Why can I not display the ground when using Equatorial Coordinates</para>
 </question>
 <answer>
-<para
->The short answer is, this is a temporary limitation. There is a problem when constructing the filled polygon that represents the ground when in Equatorial mode. However, it does not make too much sense to draw the ground in equatorial coordinates, which is why this fix has been given a low priority. </para>
+<para>The short answer is, this is a temporary limitation. There is a problem when constructing the filled polygon that represents the ground when in Equatorial mode. However, it does not make too much sense to draw the ground in equatorial coordinates, which is why this fix has been given a low priority. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Why do some objects disappear when I am scrolling the display? </para>
+<para>Why do some objects disappear when I am scrolling the display? </para>
 </question>
 <answer>
-<para
->When the display is in motion, &kstars; must recompute the screen coordinates of every object in its database, which involves some pretty heavy trigonometry. When scrolling the display (either with the arrow keys or by dragging with the mouse), the display may become slow and jerky, because the computer is having trouble keeping up. By excluding many of the objects, the computational load is greatly reduced, which allows for smoother scrolling. You can turn off this feature in the <guilabel
->Configure &kstars;</guilabel
-> window, and you can also configure which objects get hidden. </para>
+<para>When the display is in motion, &kstars; must recompute the screen coordinates of every object in its database, which involves some pretty heavy trigonometry. When scrolling the display (either with the arrow keys or by dragging with the mouse), the display may become slow and jerky, because the computer is having trouble keeping up. By excluding many of the objects, the computational load is greatly reduced, which allows for smoother scrolling. You can turn off this feature in the <guilabel>Configure &kstars;</guilabel> window, and you can also configure which objects get hidden. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->I do not understand all the terms used in &kstars;. Where can I learn more about the astronomy behind the program?</para>
+<para>I do not understand all the terms used in &kstars;. Where can I learn more about the astronomy behind the program?</para>
 </question>
 <answer>
-<para
->The &kstars; Handbook includes the <link linkend="astroinfo"
->AstroInfo Project</link
->; a series of short, hyperlinked articles about astronomical topics that can be explored and illustrated with &kstars;. AstroInfo is a community effort, like GNUpedia or Everything2. If you'd like to contribute to AstroInfo, please join our mailing list: <email
->kstars-info@lists.sourceforge.net</email
->. </para>
+<para>The &kstars; Handbook includes the <link linkend="astroinfo">AstroInfo Project</link>; a series of short, hyperlinked articles about astronomical topics that can be explored and illustrated with &kstars;. AstroInfo is a community effort, like GNUpedia or Everything2. If you'd like to contribute to AstroInfo, please join our mailing list: <email>kstars-info@lists.sourceforge.net</email>. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How accurate/precise is &kstars;?</para>
+<para>How accurate/precise is &kstars;?</para>
 </question>
 <answer>
-<para
->&kstars; is pretty accurate, but it is not (yet) as precise as it can possibly be. The problem with high-precision calculations is that you start having to deal with a large number of complicating factors. If you are not a professional astronomer, you will probably never have a problem with its accuracy or precision. </para>
-<para
->Here is a list of some of the complicating factors which limit the program's precision: <itemizedlist
-> <listitem>
-<para
->Planet positions are only accurate for dates within 4000 years or so of the current epoch. The planet positions are predicted using a Fourier-like analysis of their orbits, as observed over the past few centuries. We learnt in school that planets follow simple elliptical orbits around the Sun, but this is not strictly true. It would be true only if there was only one planet in the Solar system, and if the Sun and the planet were both point masses. As it is, the planets are constantly tugging on each other, perturbing the orbits slightly, and tidal effects also induce precessional wobbling. In fact, recent analysis suggests that the planets' orbits may not even be stable in the long term (i.e., millions or billions of years). As a rule of thumb, you can expect the position of a planet to be accurate to a few arcseconds between the dates -2000 and 6000. </para
-><para
->Pluto is the exception to this; its position is perhaps ten times less precise than the positions of the other planets. Still, for dates near the present epoch, its position can be trusted to about an arcsecond. </para
-><para
->The moon's position is the most difficult to predict to high precision. This is because its motion is quite perturbed by the Earth. Also, since it is so nearby, even minute effects that would be undetectable in more distant bodies are easily apparent in the moon. </para
-><para
->The objects with the worst long-term precision in the program are the comets and asteroids. We use a very simplistic orbital model for the minor planets that does not include third-body perturbations. Therefore, their positions can only be trusted for dates near the present epoch. Even for the present epoch, one can expect positional errors among the minor planets of order 10 arcseconds or more. </para>
+<para>&kstars; is pretty accurate, but it is not (yet) as precise as it can possibly be. The problem with high-precision calculations is that you start having to deal with a large number of complicating factors. If you are not a professional astronomer, you will probably never have a problem with its accuracy or precision. </para>
+<para>Here is a list of some of the complicating factors which limit the program's precision: <itemizedlist> <listitem>
+<para>Planet positions are only accurate for dates within 4000 years or so of the current epoch. The planet positions are predicted using a Fourier-like analysis of their orbits, as observed over the past few centuries. We learnt in school that planets follow simple elliptical orbits around the Sun, but this is not strictly true. It would be true only if there was only one planet in the Solar system, and if the Sun and the planet were both point masses. As it is, the planets are constantly tugging on each other, perturbing the orbits slightly, and tidal effects also induce precessional wobbling. In fact, recent analysis suggests that the planets' orbits may not even be stable in the long term (i.e., millions or billions of years). As a rule of thumb, you can expect the position of a planet to be accurate to a few arcseconds between the dates -2000 and 6000. </para><para>Pluto is the exception to this; its position is perhaps ten times less precise than the positions of the other planets. Still, for dates near the present epoch, its position can be trusted to about an arcsecond. </para><para>The moon's position is the most difficult to predict to high precision. This is because its motion is quite perturbed by the Earth. Also, since it is so nearby, even minute effects that would be undetectable in more distant bodies are easily apparent in the moon. </para><para>The objects with the worst long-term precision in the program are the comets and asteroids. We use a very simplistic orbital model for the minor planets that does not include third-body perturbations. Therefore, their positions can only be trusted for dates near the present epoch. Even for the present epoch, one can expect positional errors among the minor planets of order 10 arcseconds or more. </para>
 </listitem>
 </itemizedlist>
 </para>
@@ -147,44 +89,28 @@
 
 <qandaentry>
 <question>
-<para
->Why do I have to download an improved NGC/IC catalogue and Messier object images? Why not just include them as part of the &kstars; distribution?</para>
+<para>Why do I have to download an improved NGC/IC catalogue and Messier object images? Why not just include them as part of the &kstars; distribution?</para>
 </question>
 <answer>
-<para
->The author of the downloadable NGC/IC catalogue has released it with the restriction that it may not be used commercially. For most &kstars; users, this is not a problem. However, it is technically against the &kstars; license (the <acronym
->GPL</acronym
->) to restrict usage in this way. We removed the Messier object images from the standard distribution for two reasons: to simply reduce the size of &kstars;, and also because of similar licensing concerns with a couple of the images. The inline images are significantly compressed to a very low quality from their original form, so I doubt there is a real copyright concern, but I did obtain explicit permission from the images' authors to use the few images for which there was any question about it (see <filename
->README.images</filename
->). Still, just to be absolutely safe, I removed them from the standard distribution, and marked the download archive as being "free for non-commercial use". </para>
+<para>The author of the downloadable NGC/IC catalogue has released it with the restriction that it may not be used commercially. For most &kstars; users, this is not a problem. However, it is technically against the &kstars; license (the <acronym>GPL</acronym>) to restrict usage in this way. We removed the Messier object images from the standard distribution for two reasons: to simply reduce the size of &kstars;, and also because of similar licensing concerns with a couple of the images. The inline images are significantly compressed to a very low quality from their original form, so I doubt there is a real copyright concern, but I did obtain explicit permission from the images' authors to use the few images for which there was any question about it (see <filename>README.images</filename>). Still, just to be absolutely safe, I removed them from the standard distribution, and marked the download archive as being "free for non-commercial use". </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->I am really enjoying the beautiful images I have downloaded through &kstars;! I would like to share them with the world; can I publish a calendar featuring these images (or are there any usage restrictions on the images)?</para>
+<para>I am really enjoying the beautiful images I have downloaded through &kstars;! I would like to share them with the world; can I publish a calendar featuring these images (or are there any usage restrictions on the images)?</para>
 </question>
 <answer>
-<para
->It depends on the image, but many of the images restrict against commercial usage. The Image Viewer's statusbar will usually contain information about the image's copyright holder, and what usage restrictions apply. As a rule of thumb: anything published by NASA is in the public domain (including all HST images). For everything else, you can pretty safely assume that the images may not be used commercially without permission. When in doubt, contact the image's copyright holder directly. </para>
+<para>It depends on the image, but many of the images restrict against commercial usage. The Image Viewer's statusbar will usually contain information about the image's copyright holder, and what usage restrictions apply. As a rule of thumb: anything published by NASA is in the public domain (including all HST images). For everything else, you can pretty safely assume that the images may not be used commercially without permission. When in doubt, contact the image's copyright holder directly. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Can I help contribute to future versions of &kstars;?</para>
+<para>Can I help contribute to future versions of &kstars;?</para>
 </question>
 <answer>
-<para
->Yes, definitely! Introduce yourself on our mailing list: <email
->kstars-devel@kde.org</email
->. If you want to help with the coding, download the latest <ulink url="http://edu.kde.org/kstars/cvs.html"
->CVS</ulink
-> version of the code and dive right in. There are several README files in the distribution that explain some of the code's subsystems. If you need ideas of what to work on, see the TODO file. You can submit patches to kstars-devel, and feel free to post any questions you have about the code there as well. </para
-><para
->If you are not into coding, we can still use your help with i18n, docs, AstroInfo articles, URL links, bug reports and feature requests. </para>
+<para>Yes, definitely! Introduce yourself on our mailing list: <email>kstars-devel@kde.org</email>. If you want to help with the coding, download the latest <ulink url="http://edu.kde.org/kstars/cvs.html">CVS</ulink> version of the code and dive right in. There are several README files in the distribution that explain some of the code's subsystems. If you need ideas of what to work on, see the TODO file. You can submit patches to kstars-devel, and feel free to post any questions you have about the code there as well. </para><para>If you are not into coding, we can still use your help with i18n, docs, AstroInfo articles, URL links, bug reports and feature requests. </para>
 </answer>
 </qandaentry>
 
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/flux.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/flux.docbook
index a59d1e7210b..dece6cafe39 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/flux.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/flux.docbook
@@ -2,70 +2,38 @@
 
 <sect1info>
 
-<author
-><firstname
->Jasem</firstname
-> <surname
->Mutlaq</surname
-> <affiliation
-><address
-> <email
->mutlaqja@ku.edu</email>
-</address
-></affiliation>
+<author><firstname>Jasem</firstname> <surname>Mutlaq</surname> <affiliation><address> <email>mutlaqja@ku.edu</email>
+</address></affiliation>
 </author>
 </sect1info>
 
-<title
->Flux</title>
-<indexterm
-><primary
->Flux</primary>
-<seealso
->Luminosity</seealso>
+<title>Flux</title>
+<indexterm><primary>Flux</primary>
+<seealso>Luminosity</seealso>
 </indexterm>
 
-<para
->The <firstterm
->flux</firstterm
-> is the amount of energy that passes through a unit area each second. </para>
+<para>The <firstterm>flux</firstterm> is the amount of energy that passes through a unit area each second. </para>
 
-<para
->Astronomers use flux to denote the apparent brightness of a celestial body. The apparent brightness is defined as the the amount of light received from a star above the earth atmosphere passing through a unit area each second. Therefore, the apparent brightness is simply the flux we receive from a star. </para>
+<para>Astronomers use flux to denote the apparent brightness of a celestial body. The apparent brightness is defined as the the amount of light received from a star above the earth atmosphere passing through a unit area each second. Therefore, the apparent brightness is simply the flux we receive from a star. </para>
 
-<para
->The flux measures the <emphasis
->rate of flow</emphasis
-> of energy that passes through each cm^2 (or any unit area) of an object's surface each second. The detected flux depends on the distance from the source that radiates the energy. This is because the energy has to spread over a volume of space before it reaches us. Let us assume that we have an imaginary balloon that encloses a star. Each dot on the balloon represents a unit of energy emitted from the star. Initially, the dots in an area of one cm^2 are in close proximity to each other and the flux (energy emitted per square centimetre per second) is high. After a distance d, the volume and surface area of the balloon increased causing the dots to <emphasis
->spread away</emphasis
-> from each. Consequently, the number of dots (or energy) enclosed in one cm^2 has decreased as illustrated in Figure 1. </para>
+<para>The flux measures the <emphasis>rate of flow</emphasis> of energy that passes through each cm^2 (or any unit area) of an object's surface each second. The detected flux depends on the distance from the source that radiates the energy. This is because the energy has to spread over a volume of space before it reaches us. Let us assume that we have an imaginary balloon that encloses a star. Each dot on the balloon represents a unit of energy emitted from the star. Initially, the dots in an area of one cm^2 are in close proximity to each other and the flux (energy emitted per square centimetre per second) is high. After a distance d, the volume and surface area of the balloon increased causing the dots to <emphasis>spread away</emphasis> from each. Consequently, the number of dots (or energy) enclosed in one cm^2 has decreased as illustrated in Figure 1. </para>
 
 <para>
 <mediaobject>
 <imageobject>
 <imagedata fileref="flux.png" format="PNG"/>
 </imageobject>
-<caption
-><para
-><phrase
->Figure 1</phrase
-></para
-></caption>
+<caption><para><phrase>Figure 1</phrase></para></caption>
 </mediaobject>
 </para>
 
-<para
->The flux is inversely proportional to distance by a simple r^2 relation. Therefore, if the distance is doubled, we receive 1/2^2 or 1/4th of the original flux. From a fundamental standpoint, the flux is the <link linkend="ai-luminosity"
->luminosity</link
-> per unit area: <mediaobject
-> <imageobject>
+<para>The flux is inversely proportional to distance by a simple r^2 relation. Therefore, if the distance is doubled, we receive 1/2^2 or 1/4th of the original flux. From a fundamental standpoint, the flux is the <link linkend="ai-luminosity">luminosity</link> per unit area: <mediaobject> <imageobject>
 <imagedata fileref="flux1.png" format="PNG"/>
 </imageobject>
 </mediaobject>
 </para>
 
-<para
->where (4 * PI * R^2) is the surface area of a sphere (or a balloon!) with a radius R. Flux is measured in Watts/m^2/s or as commonly used by astronomers: Ergs/cm^2/s. For example, the luminosity of the sun is L = 3.90 * 10^26 W. That is, in one second the sun radiates 3.90 * 10^26 joules of energy into space. Thus, the flux we receive passing through one square centimetre from the sun at a distance of one AU (1.496 * 10^13 cm) is: </para>
+<para>where (4 * PI * R^2) is the surface area of a sphere (or a balloon!) with a radius R. Flux is measured in Watts/m^2/s or as commonly used by astronomers: Ergs/cm^2/s. For example, the luminosity of the sun is L = 3.90 * 10^26 W. That is, in one second the sun radiates 3.90 * 10^26 joules of energy into space. Thus, the flux we receive passing through one square centimetre from the sun at a distance of one AU (1.496 * 10^13 cm) is: </para>
 
 <para>
 <mediaobject>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/geocoords.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/geocoords.docbook
index 5f8d87bf8a7..96330b24325 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/geocoords.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/geocoords.docbook
@@ -1,66 +1,15 @@
 <sect1 id="ai-geocoords">
 <sect1info>
-<author
-><firstname
->Jason</firstname
-> <surname
->Harris</surname
-> </author>
+<author><firstname>Jason</firstname> <surname>Harris</surname> </author>
 </sect1info>
-<title
->Geographic Coordinates</title>
-<indexterm
-><primary
->Geographic Coordinate System</primary
-></indexterm>
-<indexterm
-><primary
->Longitude</primary
-><see
->Geographic Coordinate System</see
-></indexterm>
-<indexterm
-><primary
->Latitude</primary
-><see
->Geographic Coordinate System</see
-></indexterm>
-<para
->Locations on Earth can be specified using a spherical coordinate system. The geographic (<quote
->earth-mapping</quote
->) coordinate system is aligned with the spin axis of the Earth. It defines two angles measured from the centre of the Earth. One angle, called the <firstterm
->Latitude</firstterm
->, measures the angle between any point and the Equator. The other angle, called the <firstterm
->Longitude</firstterm
->, measures the angle <emphasis
->along</emphasis
-> the Equator from an arbitrary point on the Earth (Greenwich, England is the accepted zero-longitude point in most modern societies). </para
-><para
->By combining these two angles, any location on Earth can be specified. For example, Baltimore, Maryland (USA) has a latitude of 39.3 degrees North, and a longitude of 76.6 degrees West. So, a vector drawn from the centre of the Earth to a point 39.3 degrees above the Equator and 76.6 degrees west of Greenwich, England will pass through Baltimore. </para
-><para
->The Equator is obviously an important part of this coordinate system; it represents the <emphasis
->zeropoint</emphasis
-> of the latitude angle, and the halfway point between the poles. The Equator is the <firstterm
->Fundamental Plane</firstterm
-> of the geographic coordinate system. <link linkend="ai-skycoords"
->All Spherical Coordinate Systems</link
-> define such a Fundamental Plane. </para
-><para
->Lines of constant Latitude are called <firstterm
->Parallels</firstterm
->. They trace circles on the surface of the Earth, but the only parallel that is a <link linkend="ai-greatcircle"
->Great Circle</link
-> is the Equator (Latitude=0 degrees). Lines of constant Longitude are called <firstterm
->Meridians</firstterm
->. The Meridian passing through Greenwich is the <firstterm
->Prime Meridian</firstterm
-> (longitude=0 degrees). Unlike Parallels, all Meridians are great circles, and Meridians are not parallel: they intersect at the north and south poles. </para>
+<title>Geographic Coordinates</title>
+<indexterm><primary>Geographic Coordinate System</primary></indexterm>
+<indexterm><primary>Longitude</primary><see>Geographic Coordinate System</see></indexterm>
+<indexterm><primary>Latitude</primary><see>Geographic Coordinate System</see></indexterm>
+<para>Locations on Earth can be specified using a spherical coordinate system. The geographic (<quote>earth-mapping</quote>) coordinate system is aligned with the spin axis of the Earth. It defines two angles measured from the centre of the Earth. One angle, called the <firstterm>Latitude</firstterm>, measures the angle between any point and the Equator. The other angle, called the <firstterm>Longitude</firstterm>, measures the angle <emphasis>along</emphasis> the Equator from an arbitrary point on the Earth (Greenwich, England is the accepted zero-longitude point in most modern societies). </para><para>By combining these two angles, any location on Earth can be specified. For example, Baltimore, Maryland (USA) has a latitude of 39.3 degrees North, and a longitude of 76.6 degrees West. So, a vector drawn from the centre of the Earth to a point 39.3 degrees above the Equator and 76.6 degrees west of Greenwich, England will pass through Baltimore. </para><para>The Equator is obviously an important part of this coordinate system; it represents the <emphasis>zeropoint</emphasis> of the latitude angle, and the halfway point between the poles. The Equator is the <firstterm>Fundamental Plane</firstterm> of the geographic coordinate system. <link linkend="ai-skycoords">All Spherical Coordinate Systems</link> define such a Fundamental Plane. </para><para>Lines of constant Latitude are called <firstterm>Parallels</firstterm>. They trace circles on the surface of the Earth, but the only parallel that is a <link linkend="ai-greatcircle">Great Circle</link> is the Equator (Latitude=0 degrees). Lines of constant Longitude are called <firstterm>Meridians</firstterm>. The Meridian passing through Greenwich is the <firstterm>Prime Meridian</firstterm> (longitude=0 degrees). Unlike Parallels, all Meridians are great circles, and Meridians are not parallel: they intersect at the north and south poles. </para>
 <tip>
-<para
->Exercise:</para>
-<para
->What is the longitude of the North Pole? Its latitude is 90 degrees North. </para>
-<para
->This is a trick question. The Longitude is meaningless at the north pole (and the south pole too). It has all longitudes at the same time. </para>
+<para>Exercise:</para>
+<para>What is the longitude of the North Pole? Its latitude is 90 degrees North. </para>
+<para>This is a trick question. The Longitude is meaningless at the north pole (and the south pole too). It has all longitudes at the same time. </para>
 </tip>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/greatcircle.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/greatcircle.docbook
index 5d6783ddc24..352f29cda52 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/greatcircle.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/greatcircle.docbook
@@ -1,32 +1,10 @@
 <sect1 id="ai-greatcircle">
 <sect1info>
-<author
-><firstname
->Jason</firstname
-> <surname
->Harris</surname
-> </author>
+<author><firstname>Jason</firstname> <surname>Harris</surname> </author>
 </sect1info>
-<title
->Great Circles</title>
-<indexterm
-><primary
->Great Circles</primary>
-<seealso
->Celestial Sphere</seealso>
+<title>Great Circles</title>
+<indexterm><primary>Great Circles</primary>
+<seealso>Celestial Sphere</seealso>
 </indexterm>
-<para
->Consider a sphere, such as the Earth, or the <link linkend="ai-csphere"
->Celestial Sphere</link
->. The intersection of any plane with the sphere will result in a circle on the surface of the sphere. If the plane happens to contain the centre of the sphere, the intersection circle is a <firstterm
->Great Circle</firstterm
->. Great circles are the largest circles that can be drawn on a sphere. Also, the shortest path between any two points on a sphere is always along a great circle. </para
-><para
->Some examples of great circles on the celestial sphere include: the <link linkend="ai-horizon"
->Horizon</link
->, the <link linkend="ai-cequator"
->Celestial Equator</link
->, and the <link linkend="ai-ecliptic"
->Ecliptic</link
->. </para>
+<para>Consider a sphere, such as the Earth, or the <link linkend="ai-csphere">Celestial Sphere</link>. The intersection of any plane with the sphere will result in a circle on the surface of the sphere. If the plane happens to contain the centre of the sphere, the intersection circle is a <firstterm>Great Circle</firstterm>. Great circles are the largest circles that can be drawn on a sphere. Also, the shortest path between any two points on a sphere is always along a great circle. </para><para>Some examples of great circles on the celestial sphere include: the <link linkend="ai-horizon">Horizon</link>, the <link linkend="ai-cequator">Celestial Equator</link>, and the <link linkend="ai-ecliptic">Ecliptic</link>. </para>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/horizon.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/horizon.docbook
index 03968069fd8..d3672208da2 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/horizon.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/horizon.docbook
@@ -1,30 +1,10 @@
 <sect1 id="ai-horizon">
 <sect1info>
-<author
-><firstname
->Jason</firstname
-> <surname
->Harris</surname
-> </author>
+<author><firstname>Jason</firstname> <surname>Harris</surname> </author>
 </sect1info>
-<title
->The Horizon</title>
-<indexterm
-><primary
->Horizon</primary>
-<seealso
->Horizontal Coordinates</seealso>
+<title>The Horizon</title>
+<indexterm><primary>Horizon</primary>
+<seealso>Horizontal Coordinates</seealso>
 </indexterm>
-<para
->The <firstterm
->Horizon</firstterm
-> is the line that separates Earth from Sky. More precisely, it is the line that divides all of the directions you can possibly look into two categories: those which intersect the Earth, and those which do not. At many locations, the Horizon is obscured by trees, buildings, mountains &etc;. However, if you are on a ship at sea, the Horizon is strikingly apparent. </para
-><para
->The horizon is the <firstterm
->Fundamental Plane</firstterm
-> of the <link linkend="horizontal"
->Horizontal Coordinate System</link
->. In other words, it is the locus of points which have an <firstterm
->Altitude</firstterm
-> of zero degrees. </para>
+<para>The <firstterm>Horizon</firstterm> is the line that separates Earth from Sky. More precisely, it is the line that divides all of the directions you can possibly look into two categories: those which intersect the Earth, and those which do not. At many locations, the Horizon is obscured by trees, buildings, mountains &etc;. However, if you are on a ship at sea, the Horizon is strikingly apparent. </para><para>The horizon is the <firstterm>Fundamental Plane</firstterm> of the <link linkend="horizontal">Horizontal Coordinate System</link>. In other words, it is the locus of points which have an <firstterm>Altitude</firstterm> of zero degrees. </para>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/hourangle.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/hourangle.docbook
index 19d3e1b1a58..659c22cd242 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/hourangle.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/hourangle.docbook
@@ -1,46 +1,9 @@
 <sect1 id="ai-hourangle">
 <sect1info>
-<author
-><firstname
->Jason</firstname
-> <surname
->Harris</surname
-> </author>
+<author><firstname>Jason</firstname> <surname>Harris</surname> </author>
 </sect1info>
-<title
->Hour Angle</title>
-<indexterm
-><primary
->Hour Angle</primary>
-<seealso
->Local Meridian</seealso
-> <seealso
->Sidereal Time</seealso
-> </indexterm>
-<para
->As explained in the <link linkend="ai-sidereal"
->Sidereal Time</link
-> article, the <firstterm
->Right Ascension</firstterm
-> of an object indicates the Sidereal Time at which it will transit across your <link linkend="ai-meridian"
->Local Meridian</link
->. An object's <firstterm
->Hour Angle</firstterm
-> is defined as the difference between the current Local Sidereal Time and the Right Ascension of the object: </para
-><para
-><abbrev
->HA</abbrev
-><subscript
->obj</subscript
-> = <abbrev
->LST</abbrev
-> - <abbrev
->RA</abbrev
-><subscript
->obj</subscript
-> </para
-><para
->Thus, the object's Hour Angle indicates how much Sidereal Time has passed since the object was on the Local Meridian. It is also the angular distance between the object and the meridian, measured in hours (1 hour = 15 degrees). For example, if an object has an hour angle of 2.5 hours, it transited across the Local Meridian 2.5 hours ago, and is currently 37.5 degrees West of the Meridian. Negative Hour Angles indicate the time until the <emphasis
->next</emphasis
-> transit across the Local Meridian. Of course, an Hour Angle of zero means the object is currently on the Local Meridian. </para>
+<title>Hour Angle</title>
+<indexterm><primary>Hour Angle</primary>
+<seealso>Local Meridian</seealso> <seealso>Sidereal Time</seealso> </indexterm>
+<para>As explained in the <link linkend="ai-sidereal">Sidereal Time</link> article, the <firstterm>Right Ascension</firstterm> of an object indicates the Sidereal Time at which it will transit across your <link linkend="ai-meridian">Local Meridian</link>. An object's <firstterm>Hour Angle</firstterm> is defined as the difference between the current Local Sidereal Time and the Right Ascension of the object: </para><para><abbrev>HA</abbrev><subscript>obj</subscript> = <abbrev>LST</abbrev> - <abbrev>RA</abbrev><subscript>obj</subscript> </para><para>Thus, the object's Hour Angle indicates how much Sidereal Time has passed since the object was on the Local Meridian. It is also the angular distance between the object and the meridian, measured in hours (1 hour = 15 degrees). For example, if an object has an hour angle of 2.5 hours, it transited across the Local Meridian 2.5 hours ago, and is currently 37.5 degrees West of the Meridian. Negative Hour Angles indicate the time until the <emphasis>next</emphasis> transit across the Local Meridian. Of course, an Hour Angle of zero means the object is currently on the Local Meridian. </para>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/index.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/index.docbook
index 9259fd9f8fa..f467909f5ad 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/index.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/index.docbook
@@ -65,232 +65,86 @@
   <!ENTITY utime SYSTEM "utime.docbook">
   <!ENTITY zenith SYSTEM "zenith.docbook">
   <!ENTITY % addindex "INCLUDE">
-  <!ENTITY % British-English "INCLUDE"
-><!-- change language only here -->
+  <!ENTITY % British-English "INCLUDE"><!-- change language only here -->
 ]>
 
 <book lang="&language;">
-<title
->The &kstars; Handbook</title>
+<title>The &kstars; Handbook</title>
 <bookinfo>
 
 <authorgroup>
-<author
-><firstname
->Jason</firstname
-> <surname
->Harris</surname
-> <affiliation
-> <address
-><email
->kstars@30doradus.org</email
-></address>
+<author><firstname>Jason</firstname> <surname>Harris</surname> <affiliation> <address><email>kstars@30doradus.org</email></address>
 </affiliation>
 </author>
 
-<othercredit role="developer"
-><firstname
->Heiko</firstname
-> <surname
->Evermann</surname
-> <affiliation
-> <address
-><email
->heiko@evermann.de</email
-></address>
+<othercredit role="developer"><firstname>Heiko</firstname> <surname>Evermann</surname> <affiliation> <address><email>heiko@evermann.de</email></address>
 </affiliation>
-<contrib
->Core Developer</contrib>
+<contrib>Core Developer</contrib>
 </othercredit>
 
-<othercredit role="developer"
-><firstname
->Thomas</firstname
-> <surname
->Kabelmann</surname
-> <affiliation
-> <address
-><email
->tk78@gmx.de</email
-></address>
+<othercredit role="developer"><firstname>Thomas</firstname> <surname>Kabelmann</surname> <affiliation> <address><email>tk78@gmx.de</email></address>
 </affiliation>
-<contrib
->Core Developer</contrib>
+<contrib>Core Developer</contrib>
 </othercredit>
 
-<othercredit role="developer"
-><firstname
->Pablo</firstname
-> <surname
->de Vicente</surname
-> <affiliation
-> <address
-><email
->pvicentea@wanadoo.es</email
-></address>
+<othercredit role="developer"><firstname>Pablo</firstname> <surname>de Vicente</surname> <affiliation> <address><email>pvicentea@wanadoo.es</email></address>
 </affiliation>
-<contrib
->Core Developer</contrib>
+<contrib>Core Developer</contrib>
 </othercredit>
 
-<othercredit role="developer"
-><firstname
->Jasem</firstname
-> <surname
->Mutlaq</surname
-> <affiliation
-> <address
-><email
->mutlaqja@ikarustech.com</email
-></address>
+<othercredit role="developer"><firstname>Jasem</firstname> <surname>Mutlaq</surname> <affiliation> <address><email>mutlaqja@ikarustech.com</email></address>
 </affiliation>
-<contrib
->Core Developer</contrib>
+<contrib>Core Developer</contrib>
 </othercredit>
 
-<othercredit role="developer"
-><firstname
->Carsten</firstname
-> <surname
->Niehaus</surname
-> <affiliation
-> <address
-><email
->cniehaus@gmx.de</email
-></address>
+<othercredit role="developer"><firstname>Carsten</firstname> <surname>Niehaus</surname> <affiliation> <address><email>cniehaus@gmx.de</email></address>
 </affiliation>
-<contrib
->Core Developer</contrib>
+<contrib>Core Developer</contrib>
 </othercredit>
 
-<othercredit role="developer"
-><firstname
->Mark</firstname
-> <surname
->Holloman</surname
-> <affiliation
-> <address
-><email
->mhh@mindspring.com</email
-></address>
+<othercredit role="developer"><firstname>Mark</firstname> <surname>Holloman</surname> <affiliation> <address><email>mhh@mindspring.com</email></address>
 </affiliation>
-<contrib
->Core Developer</contrib>
+<contrib>Core Developer</contrib>
 </othercredit>
 
 </authorgroup>
 
-<othercredit role="translator"
-><firstname
->Andrew</firstname
-><surname
->Coles</surname
-><affiliation
-><address
-><email
->andrew_coles@yahoo.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Andrew</firstname><surname>Coles</surname><affiliation><address><email>andrew_coles@yahoo.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 
 <copyright>
-<year
->2001</year
-><year
->2002</year
-><year
->2003</year>
-<holder
->Jason Harris and the KStars Team</holder>
+<year>2001</year><year>2002</year><year>2003</year>
+<holder>Jason Harris and the KStars Team</holder>
 </copyright>
 
-<legalnotice
->&FDLNotice;</legalnotice>
+<legalnotice>&FDLNotice;</legalnotice>
 
-<date
->2002-10-08</date>
-<releaseinfo
->1.0</releaseinfo>
+<date>2002-10-08</date>
+<releaseinfo>1.0</releaseinfo>
 
 <abstract>
-<para
->&kstars; is a graphical desktop planetarium for KDE. It depicts an accurate simulation of the night sky, including stars, constellations, star clusters, nebulae, galaxies, all planets, the Sun, the Moon, comets and asteroids. You can see the sky as it appears from any location on Earth, on any date. The user interface is highly intuitive and flexible; the display can be panned and zoomed with the mouse, and you can easily identify objects and track their motion across the sky. &kstars; includes many powerful features, yet the interface is clean and simple, and fun to use. </para>
+<para>&kstars; is a graphical desktop planetarium for KDE. It depicts an accurate simulation of the night sky, including stars, constellations, star clusters, nebulae, galaxies, all planets, the Sun, the Moon, comets and asteroids. You can see the sky as it appears from any location on Earth, on any date. The user interface is highly intuitive and flexible; the display can be panned and zoomed with the mouse, and you can easily identify objects and track their motion across the sky. &kstars; includes many powerful features, yet the interface is clean and simple, and fun to use. </para>
 </abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->tdeedu</keyword>
-<keyword
->Astronomy</keyword>
-<keyword
->KStars</keyword>
+<keyword>KDE</keyword>
+<keyword>tdeedu</keyword>
+<keyword>Astronomy</keyword>
+<keyword>KStars</keyword>
 </keywordset>
 
 </bookinfo>
 
 <chapter id="introduction">
-<title
->Introduction</title>
-
-<para
->&kstars; lets you explore the night sky from the comfort of your computer chair. It provides an accurate graphical representation of the night sky for any date, from any location on Earth. The display includes 126,000 stars to 9th magnitude (well below the naked-eye limit), 13,000 deep-sky objects (Messier, NGC, and IC catalogs), all planets, the Sun and Moon, hundreds of comets and asteroids, the Milky Way, 88 constellations, and guide lines such as the <link linkend="ai-cequator"
->celestial equator</link
->, the <link linkend="ai-horizon"
->horizon</link
-> and the <link linkend="ai-ecliptic"
->ecliptic</link
->. </para>
-<para
->However, &kstars; is more than a simple night-sky simulator. The display provides a compelling interface to a number of tools with which you can learn more about astronomy and the night sky. There is a customised <link linkend="popup-menu"
->popup menu</link
-> attached to each displayed object, which displays object-specific information and actions. Hundreds of objects provide links in their popup menus to informative webpages and beautiful images taken by the Hubble Space Telescope and other observatories. </para
-><para
->From an object's popup menu, you can open its <link linkend="tool-details"
->Detailed Information Window</link
->, where you can examine positional data about the object, and query a huge treasury of online databases for professional-grade astronomical data and literature references about the object. You can even attach your own internet links, images and text notes, making &kstars; a graphical front-end to your observing logs and your personal astronomical notebook. </para>
-<para
->Our <link linkend="tool-calculator"
->Astrocalculator</link
-> tool provides direct access to many of the algorithms the program uses behind the scenes, including coordinate converters and time calculators. The <link linkend="tool-aavso"
->AAVSO Lightcurve Generator</link
-> tool will download a lightcurve for any of the 6000+ variable stars monitored by the American Association of Variable Star Observers (AAVSO). The lightcurves are generated <quote
->on the fly</quote
-> by querying the AAVSO server directly, ensuring that you have the very latest data points. </para>
-<para
->You can plan an observing session using our <link linkend="tool-altvstime"
->Altitude vs. Time</link
-> tool, which will plot curves representing the Altitude as a function of time for any group of objects. If that is too much detail, we also provide a <link linkend="tool-whatsup"
->What's Up Tonight?</link
-> tool that summarises the objects that you will be able to see from your location on any given night. </para>
-<para
->&kstars; also provides a <link linkend="tool-solarsys"
->Solar System Viewer</link
->, which shows the current configuration of the major planets in our solar system. There is also a <link linkend="tool-jmoons"
->Jupiter Moons Tool</link
-> which shows the positions of Jupiter's four largest moons as a function of time. </para>
-<para
->Our primary goal is to make &kstars; an interactive educational tool for learning about astronomy and the night sky. To this end, the &kstars; Handbook includes the <link linkend="astroinfo"
->AstroInfo Project</link
->, a series of short, hyperlinked articles on astronomical topics that can be explored with &kstars;. In addition, &kstars; includes DCOP functions that allow you to <link linkend="tool-scriptbuilder"
->write complex scripts</link
->, making &kstars; a powerful "demo engine" for classroom use or general illustration of astronomical topics. </para>
-<para
->You can even control telescopes with &kstars;, using the elegant and powerful <link linkend="indi"
->INDI</link
-> hardware interface. &kstars; supports several popular telescopes including Meade's LX200 family and Celestron GPS. Several popular CCD cameras, webcams and computerised focusers are also supported. Simple slew/track commands are integrated directly into the main window's popup menu, and the INDI Control Panel provides full access to all of your telescope's functions. INDI's Client/Server architecture allows for seamless control of any number of <link linkend="indi-kstars-setup"
->local</link
-> or <link linkend="indi-remote-control"
->remote</link
-> telescopes using a single &kstars; session. </para>
-<para
->We are very interested in your feedback; please report bugs or feature requests to the &kstars; development mailing list: <email
->kstars-devel@kde.org</email
->. You can also use the automated bug reporting tool, accessible from the Help menu. </para>
+<title>Introduction</title>
+
+<para>&kstars; lets you explore the night sky from the comfort of your computer chair. It provides an accurate graphical representation of the night sky for any date, from any location on Earth. The display includes 126,000 stars to 9th magnitude (well below the naked-eye limit), 13,000 deep-sky objects (Messier, NGC, and IC catalogs), all planets, the Sun and Moon, hundreds of comets and asteroids, the Milky Way, 88 constellations, and guide lines such as the <link linkend="ai-cequator">celestial equator</link>, the <link linkend="ai-horizon">horizon</link> and the <link linkend="ai-ecliptic">ecliptic</link>. </para>
+<para>However, &kstars; is more than a simple night-sky simulator. The display provides a compelling interface to a number of tools with which you can learn more about astronomy and the night sky. There is a customised <link linkend="popup-menu">popup menu</link> attached to each displayed object, which displays object-specific information and actions. Hundreds of objects provide links in their popup menus to informative webpages and beautiful images taken by the Hubble Space Telescope and other observatories. </para><para>From an object's popup menu, you can open its <link linkend="tool-details">Detailed Information Window</link>, where you can examine positional data about the object, and query a huge treasury of online databases for professional-grade astronomical data and literature references about the object. You can even attach your own internet links, images and text notes, making &kstars; a graphical front-end to your observing logs and your personal astronomical notebook. </para>
+<para>Our <link linkend="tool-calculator">Astrocalculator</link> tool provides direct access to many of the algorithms the program uses behind the scenes, including coordinate converters and time calculators. The <link linkend="tool-aavso">AAVSO Lightcurve Generator</link> tool will download a lightcurve for any of the 6000+ variable stars monitored by the American Association of Variable Star Observers (AAVSO). The lightcurves are generated <quote>on the fly</quote> by querying the AAVSO server directly, ensuring that you have the very latest data points. </para>
+<para>You can plan an observing session using our <link linkend="tool-altvstime">Altitude vs. Time</link> tool, which will plot curves representing the Altitude as a function of time for any group of objects. If that is too much detail, we also provide a <link linkend="tool-whatsup">What's Up Tonight?</link> tool that summarises the objects that you will be able to see from your location on any given night. </para>
+<para>&kstars; also provides a <link linkend="tool-solarsys">Solar System Viewer</link>, which shows the current configuration of the major planets in our solar system. There is also a <link linkend="tool-jmoons">Jupiter Moons Tool</link> which shows the positions of Jupiter's four largest moons as a function of time. </para>
+<para>Our primary goal is to make &kstars; an interactive educational tool for learning about astronomy and the night sky. To this end, the &kstars; Handbook includes the <link linkend="astroinfo">AstroInfo Project</link>, a series of short, hyperlinked articles on astronomical topics that can be explored with &kstars;. In addition, &kstars; includes DCOP functions that allow you to <link linkend="tool-scriptbuilder">write complex scripts</link>, making &kstars; a powerful "demo engine" for classroom use or general illustration of astronomical topics. </para>
+<para>You can even control telescopes with &kstars;, using the elegant and powerful <link linkend="indi">INDI</link> hardware interface. &kstars; supports several popular telescopes including Meade's LX200 family and Celestron GPS. Several popular CCD cameras, webcams and computerised focusers are also supported. Simple slew/track commands are integrated directly into the main window's popup menu, and the INDI Control Panel provides full access to all of your telescope's functions. INDI's Client/Server architecture allows for seamless control of any number of <link linkend="indi-kstars-setup">local</link> or <link linkend="indi-remote-control">remote</link> telescopes using a single &kstars; session. </para>
+<para>We are very interested in your feedback; please report bugs or feature requests to the &kstars; development mailing list: <email>kstars-devel@kde.org</email>. You can also use the automated bug reporting tool, accessible from the Help menu. </para>
 </chapter>
 
 &quicktour;   <!--A Quick Tour of KStars-->
@@ -304,8 +158,7 @@
 &credits;     <!--Credits and License-->
 &install;     <!--Installation-->
 
-<index id='doc-index'
-></index>
+<index id='doc-index'></index>
 <!-- For DocBook 4.2, remove the above line and use this instead
 &documentation.index;
 -->
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/indi.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/indi.docbook
index d608b666029..041fb745850 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/indi.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/indi.docbook
@@ -1,453 +1,249 @@
 <chapter id="indi">
-<title
->Astronomical Device Control with <acronym
->INDI</acronym
-></title>
-<indexterm
-><primary
->INDI Control</primary>
-<secondary
->Overview</secondary>
+<title>Astronomical Device Control with <acronym>INDI</acronym></title>
+<indexterm><primary>INDI Control</primary>
+<secondary>Overview</secondary>
 </indexterm>
 
-<para
->KStars provides an interface to configure and control astronomical instruments via the <acronym
-><link linkend="what-is-indi"
->INDI</link
-></acronym
-> protocol.</para>
+<para>KStars provides an interface to configure and control astronomical instruments via the <acronym><link linkend="what-is-indi">INDI</link></acronym> protocol.</para>
 
-<para
->The <acronym
->INDI</acronym
-> protocol supports a variety of astronomical instruments such as CCD cameras and focusers. Currently, KStars supports the following devices:</para>
+<para>The <acronym>INDI</acronym> protocol supports a variety of astronomical instruments such as CCD cameras and focusers. Currently, KStars supports the following devices:</para>
 
 <table id="device-table" pgwide="1" frame="all">
-<title
->Supported Telescopes</title>
+<title>Supported Telescopes</title>
 <tgroup cols="3" colsep="1" rowsep="1">
 <thead>
 <row>
-<entry
->Telescope</entry>
-<entry
->Device driver</entry>
-<entry
->Version</entry>
+<entry>Telescope</entry>
+<entry>Device driver</entry>
+<entry>Version</entry>
 </row>
 </thead>
 <tbody>
 <row>
-<entry
->LX200 8"-12" Classic</entry>
-<entry
->LX200 Classic</entry>
-<entry
->0.5</entry>
+<entry>LX200 8"-12" Classic</entry>
+<entry>LX200 Classic</entry>
+<entry>0.5</entry>
 </row>
 <row>
-<entry
->Autostar based telescopes</entry>
-<entry
->LX200 Autostar</entry>
-<entry
->0.5</entry>
+<entry>Autostar based telescopes</entry>
+<entry>LX200 Autostar</entry>
+<entry>0.5</entry>
 </row>
 <row>
-<entry
->LX200 GPS 8"-16"</entry>
-<entry
->LX200 GPS</entry>
-<entry
->0.5</entry>
+<entry>LX200 GPS 8"-16"</entry>
+<entry>LX200 GPS</entry>
+<entry>0.5</entry>
 </row>
 <row>
-<entry
->LX200 Classic 16"</entry>
-<entry
->LX00 16"</entry>
-<entry
->0.5</entry>
+<entry>LX200 Classic 16"</entry>
+<entry>LX00 16"</entry>
+<entry>0.5</entry>
 </row>
 <row>
-<entry
->NexStar GPS, CGE, AS-GT</entry>
-<entry
->Celestron GPS</entry>
-<entry
->0.5</entry>
+<entry>NexStar GPS, CGE, AS-GT</entry>
+<entry>Celestron GPS</entry>
+<entry>0.5</entry>
 </row>
 <row>
-<entry
->New GT, NexStar 5i/8i</entry>
-<entry
->Celestron GPS</entry>
-<entry
->0.5</entry>
+<entry>New GT, NexStar 5i/8i</entry>
+<entry>Celestron GPS</entry>
+<entry>0.5</entry>
 </row>
 <row>
-<entry
->Astro-Physics AP</entry>
-<entry
->LX200 Generic</entry>
-<entry
->0.1</entry>
+<entry>Astro-Physics AP</entry>
+<entry>LX200 Generic</entry>
+<entry>0.1</entry>
 </row>
 <row>
-<entry
->Astro-Electronic FS-2</entry>
-<entry
->LX200 Generic</entry>
-<entry
->0.1</entry>
+<entry>Astro-Electronic FS-2</entry>
+<entry>LX200 Generic</entry>
+<entry>0.1</entry>
 </row>
 <row>
-<entry
->Losmandy Gemini</entry>
-<entry
->LX200 Generic</entry>
-<entry
->0.1</entry>
+<entry>Losmandy Gemini</entry>
+<entry>LX200 Generic</entry>
+<entry>0.1</entry>
 </row>
 <row>
-<entry
->Mel Bartels Controllers</entry>
-<entry
->LX200 Generic</entry>
-<entry
->0.1</entry>
+<entry>Mel Bartels Controllers</entry>
+<entry>LX200 Generic</entry>
+<entry>0.1</entry>
 </row>
 </tbody>
 </tgroup>
 </table>
-<para
-></para>
+<para></para>
 <table id="focuser-table" pgwide="1" frame="all">
-<title
->Supported Focusers</title>
+<title>Supported Focusers</title>
 <tgroup cols="3" colsep="1" rowsep="1">
 <thead>
 <row>
-<entry
->Focuser</entry>
-<entry
->Device driver</entry>
-<entry
->Version</entry>
+<entry>Focuser</entry>
+<entry>Device driver</entry>
+<entry>Version</entry>
 </row>
 </thead>
 <tbody>
 <row>
-<entry
->Meade LX200GPS Microfocuser</entry>
-<entry
->LX200 GPS</entry>
-<entry
->0.1</entry>
+<entry>Meade LX200GPS Microfocuser</entry>
+<entry>LX200 GPS</entry>
+<entry>0.1</entry>
 </row>
 <row>
-<entry
->Meade 1206 Primary Mirror Focuser</entry>
-<entry
->LX200 Generic</entry>
-<entry
->0.1</entry>
+<entry>Meade 1206 Primary Mirror Focuser</entry>
+<entry>LX200 Generic</entry>
+<entry>0.1</entry>
 </row>
 <row>
-<entry
->JMI NGF Series</entry>
-<entry
->LX200 Generic</entry>
-<entry
->0.1</entry>
+<entry>JMI NGF Series</entry>
+<entry>LX200 Generic</entry>
+<entry>0.1</entry>
 </row>
 <row>
-<entry
->JMI MOTOFOCUS</entry>
-<entry
->LX200 Generic</entry>
-<entry
->0.1</entry>
+<entry>JMI MOTOFOCUS</entry>
+<entry>LX200 Generic</entry>
+<entry>0.1</entry>
 </row>
 </tbody>
 </tgroup>
 </table>
 
 <note>
-<title
->Focuser connection</title>
-<para
->The focusers must be connected to the focuser port in the LX200 GPS, Autostar or Classic telescopes <emphasis
->only</emphasis
->.</para>
+<title>Focuser connection</title>
+<para>The focusers must be connected to the focuser port in the LX200 GPS, Autostar or Classic telescopes <emphasis>only</emphasis>.</para>
 </note>
 
-<para
-></para>
+<para></para>
 <table id="ccd-table" pgwide="1" frame="all">
-<title
->Supported CCDs</title>
+<title>Supported CCDs</title>
 <tgroup cols="3" colsep="1" rowsep="1">
 <thead>
 <row>
-<entry
->CCD</entry>
-<entry
->Device driver</entry>
-<entry
->Version</entry>
+<entry>CCD</entry>
+<entry>Device driver</entry>
+<entry>Version</entry>
 </row>
 </thead>
 <tbody>
 <row>
-<entry
->Finger Lakes Instruments CCDs</entry>
-<entry
->fliccd</entry>
-<entry
->0.1</entry>
+<entry>Finger Lakes Instruments CCDs</entry>
+<entry>fliccd</entry>
+<entry>0.1</entry>
 </row>
 </tbody>
 </tgroup>
 </table>
 
-<para
-></para>
+<para></para>
 <table id="video-table" pgwide="1" frame="all">
-<title
->Supported Webcams</title>
+<title>Supported Webcams</title>
 <tgroup cols="3" colsep="1" rowsep="1">
 <thead>
 <row>
-<entry
->Webcam</entry>
-<entry
->Device driver</entry>
-<entry
->Version</entry>
+<entry>Webcam</entry>
+<entry>Device driver</entry>
+<entry>Version</entry>
 </row>
 </thead>
 <tbody>
 <row>
-<entry
->Any Video4Linux compatible device</entry>
-<entry
->v4ldriver</entry>
-<entry
->0.1</entry>
+<entry>Any Video4Linux compatible device</entry>
+<entry>v4ldriver</entry>
+<entry>0.1</entry>
 </row>
 <row>
-<entry
->Philips webcam</entry>
-<entry
->v4lphilips</entry>
-<entry
->0.1</entry>
+<entry>Philips webcam</entry>
+<entry>v4lphilips</entry>
+<entry>0.1</entry>
 </row>
 </tbody>
 </tgroup>
 </table>
 
 <sect1 id="indi-kstars-setup">
-<title
->INDI Setup</title>
-<indexterm
-><primary
->INDI</primary>
-<secondary
->Setup</secondary>
+<title>INDI Setup</title>
+<indexterm><primary>INDI</primary>
+<secondary>Setup</secondary>
 </indexterm>
-<para
->KStars can control local and remote devices seamlessly via the <link linkend="what-is-indi"
->INDI</link
-> server/client architecture. INDI devices may be run in three different modes:</para>
+<para>KStars can control local and remote devices seamlessly via the <link linkend="what-is-indi">INDI</link> server/client architecture. INDI devices may be run in three different modes:</para>
 
 <orderedlist>
-<listitem
-><para
->Local: The local mode the most common and is used to control local device (&ie; a device attached to your machine).</para
-></listitem>
-<listitem
-><para
->Server: The server mode establishes an INDI server for a particular device and waits for connections from remote clients. You cannot operate server devices, you can only start and shut them down.</para
-></listitem>
-<listitem
-><para
->Client: The client mode is used to connect to remote INDI servers running INDI devices. You can control remote devices seamlessly like local devices.</para
-></listitem>
+<listitem><para>Local: The local mode the most common and is used to control local device (&ie; a device attached to your machine).</para></listitem>
+<listitem><para>Server: The server mode establishes an INDI server for a particular device and waits for connections from remote clients. You cannot operate server devices, you can only start and shut them down.</para></listitem>
+<listitem><para>Client: The client mode is used to connect to remote INDI servers running INDI devices. You can control remote devices seamlessly like local devices.</para></listitem>
 </orderedlist>
 
-<para
->You can run local device, establish INDI servers, and connect to remote clients from the <guimenuitem
->Device Manager</guimenuitem
-> in the <guimenu
->Devices</guimenu
-> menu.</para>
+<para>You can run local device, establish INDI servers, and connect to remote clients from the <guimenuitem>Device Manager</guimenuitem> in the <guimenu>Devices</guimenu> menu.</para>
 
-<para
->Here is a screenshot of the <guilabel
->Device Manager</guilabel
-> window:</para>
+<para>Here is a screenshot of the <guilabel>Device Manager</guilabel> window:</para>
 
 <screenshot>
-<screeninfo
->Running device drivers</screeninfo>
+<screeninfo>Running device drivers</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="devicemanager.png" format="PNG"/>
 </imageobject>
 <textobject>
-<phrase
->Start device drivers</phrase>
+<phrase>Start device drivers</phrase>
 </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->You can run devices by browsing the device tree, selecting a specific device, and then clicking on the <guibutton
->Run Service button</guibutton
->. You can select the operation mode, either local or server as defined above.</para>
+<para>You can run devices by browsing the device tree, selecting a specific device, and then clicking on the <guibutton>Run Service button</guibutton>. You can select the operation mode, either local or server as defined above.</para>
 
-<para
->To control remove devices, refer to the <link linkend="indi-remote-control"
->remote device control</link
-> section.</para>
+<para>To control remove devices, refer to the <link linkend="indi-remote-control">remote device control</link> section.</para>
 </sect1>
 
 <sect1 id="indi-telescope-setup">
-<title
->Telescope Setup</title>
-<indexterm
-><primary
->INDI</primary>
-<secondary
->Setup</secondary>
+<title>Telescope Setup</title>
+<indexterm><primary>INDI</primary>
+<secondary>Setup</secondary>
 </indexterm>
 
-<para
->Most telescopes are equipped with <hardware
->RS232</hardware
-> interface for remote control. Connect the RS232 jack in your telescope to your computer's <hardware
->Serial/USB</hardware
-> port. Traditionally, the RS232 connects to the serial port of your computer, but since many new laptops abandoned the serial port in favour of <hardware
->USB/FireWire</hardware
-> ports, you might need to obtain a Serial to USB adaptor to use with new laptops.</para>
-
-<para
->After connecting your telescope to the Serial/USB port, turn your telescope on. It is <emphasis
->highly</emphasis
-> recommended that you download and install the latest firmware for your telescope controller.</para>
-
-<para
->The telescope needs to be aligned before it can be used properly. Align your telescope (one or two stars alignment) as illustrated in your telescope manual.</para>
-
-<para
->&kstars; needs to verify time and location settings before connecting to the telescope. This insures proper tracking and synchronisation between the telescope and &kstars;. The following steps will enable you to connect to a device that is connected to your computer. To connect and control remote devices, please refer to <link linkend="indi-remote-control"
->remote device control</link
-> section.</para>
-
-<para
->You can use the Telescope Setup Wizard and it will verify all the required information in the process. It can automatically scan ports for attached telescopes. You can run the wizard by selecting <guimenuitem
->Telescope Setup Wizard</guimenuitem
-> from the <guimenu
->Devices</guimenu
-> menu.</para>
-
-<para
->Alternatively, you can connect to a local telescope by performing the following steps:</para>
+<para>Most telescopes are equipped with <hardware>RS232</hardware> interface for remote control. Connect the RS232 jack in your telescope to your computer's <hardware>Serial/USB</hardware> port. Traditionally, the RS232 connects to the serial port of your computer, but since many new laptops abandoned the serial port in favour of <hardware>USB/FireWire</hardware> ports, you might need to obtain a Serial to USB adaptor to use with new laptops.</para>
+
+<para>After connecting your telescope to the Serial/USB port, turn your telescope on. It is <emphasis>highly</emphasis> recommended that you download and install the latest firmware for your telescope controller.</para>
+
+<para>The telescope needs to be aligned before it can be used properly. Align your telescope (one or two stars alignment) as illustrated in your telescope manual.</para>
+
+<para>&kstars; needs to verify time and location settings before connecting to the telescope. This insures proper tracking and synchronisation between the telescope and &kstars;. The following steps will enable you to connect to a device that is connected to your computer. To connect and control remote devices, please refer to <link linkend="indi-remote-control">remote device control</link> section.</para>
+
+<para>You can use the Telescope Setup Wizard and it will verify all the required information in the process. It can automatically scan ports for attached telescopes. You can run the wizard by selecting <guimenuitem>Telescope Setup Wizard</guimenuitem> from the <guimenu>Devices</guimenu> menu.</para>
+
+<para>Alternatively, you can connect to a local telescope by performing the following steps:</para>
 
 <orderedlist>
-<listitem
-><para
->Set your geographical location. Open the <guilabel
->Set Geographic Location</guilabel
-> window by selecting <guimenuitem
->Set Geographic Location...</guimenuitem
-> from the <guimenu
->Settings</guimenu
-> menu, or by pressing the <guiicon
->Globe</guiicon
-> icon in the toolbar, or by pressing <keycombo action="simul"
->&Ctrl;<keycap
->g</keycap
-></keycombo
->.</para>
+<listitem><para>Set your geographical location. Open the <guilabel>Set Geographic Location</guilabel> window by selecting <guimenuitem>Set Geographic Location...</guimenuitem> from the <guimenu>Settings</guimenu> menu, or by pressing the <guiicon>Globe</guiicon> icon in the toolbar, or by pressing <keycombo action="simul">&Ctrl;<keycap>g</keycap></keycombo>.</para>
 </listitem>
-<listitem
-><para
->Set your local time and date. You can change to any time or date by selecting <guimenuitem
->Set Time...</guimenuitem
-> from the <guimenu
->Time</guimenu
-> menu, or by pressing the <guiicon
->time</guiicon
-> icon in the toolbar. The <guilabel
->Set Time</guilabel
-> window uses a standard &kde; Date Picker widget, coupled with three spinboxes for setting the hours, minutes and seconds. If you ever need to reset the clock back to the current time, just select <guimenuitem
->Set Time to Now</guimenuitem
-> from the <guimenu
->Time</guimenu
-> menu.</para>
+<listitem><para>Set your local time and date. You can change to any time or date by selecting <guimenuitem>Set Time...</guimenuitem> from the <guimenu>Time</guimenu> menu, or by pressing the <guiicon>time</guiicon> icon in the toolbar. The <guilabel>Set Time</guilabel> window uses a standard &kde; Date Picker widget, coupled with three spinboxes for setting the hours, minutes and seconds. If you ever need to reset the clock back to the current time, just select <guimenuitem>Set Time to Now</guimenuitem> from the <guimenu>Time</guimenu> menu.</para>
 </listitem>
 <listitem>
-<para
->Click on the <guimenu
->Devices</guimenu
-> menu and select the <guimenuitem
->Device Manager</guimenuitem
->.</para>
+<para>Click on the <guimenu>Devices</guimenu> menu and select the <guimenuitem>Device Manager</guimenuitem>.</para>
 </listitem>
 <listitem>
-<para
->Under the <guilabel
->Device</guilabel
-> column, select your telescope model.</para>
+<para>Under the <guilabel>Device</guilabel> column, select your telescope model.</para>
 </listitem>
 <listitem>
-<para
-><mousebutton
->Right</mousebutton
->-click on the device and select <guilabel
->Run Service</guilabel
->.</para>
+<para><mousebutton>Right</mousebutton>-click on the device and select <guilabel>Run Service</guilabel>.</para>
 </listitem>
 <listitem>
-<para
->Click <guibutton
->Ok</guibutton
-> to close the Device Manager Dialogue.</para>
+<para>Click <guibutton>Ok</guibutton> to close the Device Manager Dialogue.</para>
 </listitem>
 </orderedlist>
 
 <note id="geo-time-note">
-<title
->Frequent Settings</title>
-<para
->You do not need to set the geographic location and time every time you connect to a telescope. Only adjust the settings as needed.</para
-></note>
+<title>Frequent Settings</title>
+<para>You do not need to set the geographic location and time every time you connect to a telescope. Only adjust the settings as needed.</para></note>
 
-<para
->You are now ready to use the device features, &kstars; conveniently provides two interchangeable GUI interfaces for controlling telescopes:</para>
+<para>You are now ready to use the device features, &kstars; conveniently provides two interchangeable GUI interfaces for controlling telescopes:</para>
 
 <orderedlist>
-<title
->Controlling your telescope</title>
+<title>Controlling your telescope</title>
 <listitem>
-<para
-><guilabel
->Sky map Control</guilabel
->: For each device you run in the <guilabel
->Device Manager</guilabel
->, a corresponding entry will show up in popup menu that allows you to control the properties of the device. You can issue commands like <command
->Slew, Sync,</command
-> and <command
->Track</command
-> directly from the sky map. </para>
-<para
->Here is a screenshot of the popup menu with an active LX200 Classic device:</para>
+<para><guilabel>Sky map Control</guilabel>: For each device you run in the <guilabel>Device Manager</guilabel>, a corresponding entry will show up in popup menu that allows you to control the properties of the device. You can issue commands like <command>Slew, Sync,</command> and <command>Track</command> directly from the sky map. </para>
+<para>Here is a screenshot of the popup menu with an active LX200 Classic device:</para>
 <screenshot>
-<screeninfo
->Controlling devices from sky map</screeninfo>
+<screeninfo>Controlling devices from sky map</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="skymapdevice.png" format="PNG"/>
@@ -457,36 +253,22 @@
 </listitem>
 
 <listitem>
-<para
-><guilabel
->INDI Control Panel</guilabel
->: The panel offers the user with all the features supported by a device. </para>
+<para><guilabel>INDI Control Panel</guilabel>: The panel offers the user with all the features supported by a device. </para>
 
-<para
->The panel is divided into three main sections:</para>
+<para>The panel is divided into three main sections:</para>
 <itemizedlist>
 <listitem>
-<para
-><guilabel
->Device tabs</guilabel
->: Each additional active device occupies a tab in the INDI panel. Multiple devices can run simultaneously without affecting the operation of other devices. </para>
+<para><guilabel>Device tabs</guilabel>: Each additional active device occupies a tab in the INDI panel. Multiple devices can run simultaneously without affecting the operation of other devices. </para>
 </listitem>
 <listitem>
-<para
-><guilabel
->Property view</guilabel
->: Properties are the key element in INDI architecture. Each device defines a set of properties to communicate with the client. The current position of the telescope is an example of a property. Semantically similar properties are usually contained in logical blocks or groupings. </para>
+<para><guilabel>Property view</guilabel>: Properties are the key element in INDI architecture. Each device defines a set of properties to communicate with the client. The current position of the telescope is an example of a property. Semantically similar properties are usually contained in logical blocks or groupings. </para>
 </listitem>
 <listitem>
-<para
-><guilabel
->Log viewers</guilabel
->: Devices report their status and acknowledge commands by sending INDI messages. Each device has its own log view, and all devices share one generic log viewer. A device usually sends messages to its device driver only, but a device is permitted to send a generic message when appropriate. </para>
+<para><guilabel>Log viewers</guilabel>: Devices report their status and acknowledge commands by sending INDI messages. Each device has its own log view, and all devices share one generic log viewer. A device usually sends messages to its device driver only, but a device is permitted to send a generic message when appropriate. </para>
 </listitem>
 </itemizedlist>
 <screenshot>
-<screeninfo
->INDI Control Panel</screeninfo>
+<screeninfo>INDI Control Panel</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="indicontrolpanel.png" format="PNG"/>
@@ -496,267 +278,127 @@
 </listitem>
 </orderedlist>
 
-<para
->You are not restricted on using one interface over another as they can be both used simultaneously. Actions from the <guilabel
->Sky map</guilabel
-> are automatically reflected in the <guilabel
->INDI Control Panel</guilabel
-> and vice versa.</para>
-
-<para
->To connect to your telescope, you can either select <guimenuitem
->Connect</guimenuitem
-> from your device popup menu or alternatively, you can press <guibutton
->Connect</guibutton
-> under your device tab in the <guilabel
->INDI Control Panel</guilabel
->.</para>
-
-<important
-><para
->By default, KStars will try to connect to the <constant
->/dev/ttyS0</constant
-> port. To change the connection port, select <guilabel
->INDI Control Panel</guilabel
-> from the <guimenu
->Devices</guimenu
-> menu and change the port under your device tab.</para
-></important>
-
-<para
->&kstars; automatically updates the telescope's longitude, latitude, and time based on current settings in &kstars;. You can enable/disable these updates from <guimenuitem
->Configure INDI</guimenuitem
-> dialogue under the <guimenu
->Devices</guimenu
-> menu. </para>
-
-<para
->If &kstars; communicates successfully with the telescope, it will retrieve the current <abbrev
->RA</abbrev
-> and <abbrev
->DEC</abbrev
-> from the telescope and will display a crosshair on the sky map indicating the telescope position.</para>
+<para>You are not restricted on using one interface over another as they can be both used simultaneously. Actions from the <guilabel>Sky map</guilabel> are automatically reflected in the <guilabel>INDI Control Panel</guilabel> and vice versa.</para>
+
+<para>To connect to your telescope, you can either select <guimenuitem>Connect</guimenuitem> from your device popup menu or alternatively, you can press <guibutton>Connect</guibutton> under your device tab in the <guilabel>INDI Control Panel</guilabel>.</para>
+
+<important><para>By default, KStars will try to connect to the <constant>/dev/ttyS0</constant> port. To change the connection port, select <guilabel>INDI Control Panel</guilabel> from the <guimenu>Devices</guimenu> menu and change the port under your device tab.</para></important>
+
+<para>&kstars; automatically updates the telescope's longitude, latitude, and time based on current settings in &kstars;. You can enable/disable these updates from <guimenuitem>Configure INDI</guimenuitem> dialogue under the <guimenu>Devices</guimenu> menu. </para>
+
+<para>If &kstars; communicates successfully with the telescope, it will retrieve the current <abbrev>RA</abbrev> and <abbrev>DEC</abbrev> from the telescope and will display a crosshair on the sky map indicating the telescope position.</para>
 
 <note id="indi-sync">
-<title
->Synchronising your telescope</title>
-<para
->If you aligned your telescope and the last alignment star was, for example, Vega, then the crosshair should be centred around Vega. If the crosshair was off target, then you can <mousebutton
->right</mousebutton
->-click Vega from the sky map and select <command
->Sync</command
-> from your telescope menu. This action will instruct the telescope to synchronise its internal coordinates to match those of Vega, and the telescope's crosshair should now be centred around Vega. </para>
+<title>Synchronising your telescope</title>
+<para>If you aligned your telescope and the last alignment star was, for example, Vega, then the crosshair should be centred around Vega. If the crosshair was off target, then you can <mousebutton>right</mousebutton>-click Vega from the sky map and select <command>Sync</command> from your telescope menu. This action will instruct the telescope to synchronise its internal coordinates to match those of Vega, and the telescope's crosshair should now be centred around Vega. </para>
 </note>
 
-<para
->That is it: your telescope is ready to explore the heavens.</para>
+<para>That is it: your telescope is ready to explore the heavens.</para>
 
 <warning>
-<title
->WARNING</title>
-<para
->Never use the telescope to look at the sun. Looking at the sun might cause irreversible damage to your eyes and as well as your equipment.</para>
+<title>WARNING</title>
+<para>Never use the telescope to look at the sun. Looking at the sun might cause irreversible damage to your eyes and as well as your equipment.</para>
 </warning>
 </sect1>
 
 <sect1 id="indi-other-setup">
-<title
->CCD and Video-Capture Setup</title>
-<indexterm
-><primary
->CCD Video Control</primary>
-<secondary
->Setup</secondary>
+<title>CCD and Video-Capture Setup</title>
+<indexterm><primary>CCD Video Control</primary>
+<secondary>Setup</secondary>
 </indexterm>
 
-<para
->KStars supports Finger Lakes instruments CCDs and any Video4Linux compatible device. Philips webcam extended features are supported as well.</para>
-<para
->You can run CCD and Video Capture devices from the <guimenuitem
->Device Manager</guimenuitem
-> in the <guimenu
->Devices</guimenu
-> menu. Like all INDI devices, some of the device controls will be accessible from the skymap. The device can be controlled fully from the <guimenuitem
->INDI Control Panel.</guimenuitem
-></para>
-
-<para
->The standard format for image capture is FITS. Once an image is captured and downloaded, it will be displayed in the KStars FITSViewer. To capture a sequence of images, use the <guimenuitem
->Capture Image Sequence</guimenuitem
-> tool from the <guimenu
->Devices</guimenu
-> menu. This tool is inactive until you establish a connection to an image device.</para>
+<para>KStars supports Finger Lakes instruments CCDs and any Video4Linux compatible device. Philips webcam extended features are supported as well.</para>
+<para>You can run CCD and Video Capture devices from the <guimenuitem>Device Manager</guimenuitem> in the <guimenu>Devices</guimenu> menu. Like all INDI devices, some of the device controls will be accessible from the skymap. The device can be controlled fully from the <guimenuitem>INDI Control Panel.</guimenuitem></para>
+
+<para>The standard format for image capture is FITS. Once an image is captured and downloaded, it will be displayed in the KStars FITSViewer. To capture a sequence of images, use the <guimenuitem>Capture Image Sequence</guimenuitem> tool from the <guimenu>Devices</guimenu> menu. This tool is inactive until you establish a connection to an image device.</para>
 </sect1>
 
 <sect1 id="indi-concepts">
-<title
->INDI Concepts</title>
-<indexterm
-><primary
->Telescope Control</primary>
-<secondary
->Concepts</secondary>
+<title>INDI Concepts</title>
+<indexterm><primary>Telescope Control</primary>
+<secondary>Concepts</secondary>
 </indexterm>
 
-<para
->The INDI control panel offers many device properties not accessible from the sky map. The properties offered differ from one device to another. Nevertheless, all properties share common features that constrains how they are displayed and used:</para>
+<para>The INDI control panel offers many device properties not accessible from the sky map. The properties offered differ from one device to another. Nevertheless, all properties share common features that constrains how they are displayed and used:</para>
 
 <itemizedlist>
 <listitem>
-<para
->Permission: All properties can either be read-only, write-only, or read and write enabled. An example of a read-write property is the telescope's Right Ascension. You can enter a new Right Ascension and the telescope, based on current settings, will either slew or sync to the new input. Furthermore, when the telescope slews, its Right Ascension gets updated and sent back to the client.</para
-><para
-></para>
+<para>Permission: All properties can either be read-only, write-only, or read and write enabled. An example of a read-write property is the telescope's Right Ascension. You can enter a new Right Ascension and the telescope, based on current settings, will either slew or sync to the new input. Furthermore, when the telescope slews, its Right Ascension gets updated and sent back to the client.</para><para></para>
 </listitem>
 <listitem>
-<para
->State: Prefixed to each property is a state indicator (round LED). Each property has a state and an associated colour code:</para>
-<table frame="top"
-><title
->INDI State colour code</title>
+<para>State: Prefixed to each property is a state indicator (round LED). Each property has a state and an associated colour code:</para>
+<table frame="top"><title>INDI State colour code</title>
 <tgroup cols="3" colsep="1" rowsep="1">
 <thead>
 <row>
-<entry
->State</entry>
-<entry
->Colour</entry>
-<entry
->Description</entry>
+<entry>State</entry>
+<entry>Colour</entry>
+<entry>Description</entry>
 </row>
 </thead>
 <tbody>
 <row>
-<entry
->Idle</entry>
-<entry
->Grey</entry>
-<entry
->Device is performing no action with respect to this property</entry>
+<entry>Idle</entry>
+<entry>Grey</entry>
+<entry>Device is performing no action with respect to this property</entry>
 </row>
 <row>
-<entry
->Ok</entry>
-<entry
->Green</entry>
-<entry
->Last operation performed on this property was successful and active</entry>
+<entry>Ok</entry>
+<entry>Green</entry>
+<entry>Last operation performed on this property was successful and active</entry>
 </row>
 <row>
-<entry
->Busy</entry>
-<entry
->Yellow</entry>
-<entry
->The property is performing an action</entry>
+<entry>Busy</entry>
+<entry>Yellow</entry>
+<entry>The property is performing an action</entry>
 </row>
 <row>
-<entry
->Alert</entry>
-<entry
->Red</entry>
-<entry
->The property is in critical condition and needs immediate attention</entry>
+<entry>Alert</entry>
+<entry>Red</entry>
+<entry>The property is in critical condition and needs immediate attention</entry>
 	</row>
 	</tbody>
 </tgroup>
 </table>
-<para
-></para>
-<para
->The device driver updates the property state in real-time when necessary. For example, if the telescope is in the process of slewing to a target, then the RA/DEC properties will be signalled as <guilabel
->Busy</guilabel
->. When the slew process is completed successfully, the properties will be signalled as <guilabel
->Ok</guilabel
->.</para
-><para
-></para>
+<para></para>
+<para>The device driver updates the property state in real-time when necessary. For example, if the telescope is in the process of slewing to a target, then the RA/DEC properties will be signalled as <guilabel>Busy</guilabel>. When the slew process is completed successfully, the properties will be signalled as <guilabel>Ok</guilabel>.</para><para></para>
 </listitem>
 <listitem>
-<para
->Context: Numerical properties can accept and process numbers in two formats: decimal and sexagesimal. The sexagesimal format is convenient when expressing time or equatorial/geographical coordinates. You can use any format at your convenience. For example, all the following numbers are equal:</para>
+<para>Context: Numerical properties can accept and process numbers in two formats: decimal and sexagesimal. The sexagesimal format is convenient when expressing time or equatorial/geographical coordinates. You can use any format at your convenience. For example, all the following numbers are equal:</para>
 <itemizedlist>
-<listitem
-><para
->-156.40</para
-></listitem>
-<listitem
-><para
->-156:24:00</para
-></listitem>
-<listitem
-><para
->-156:24</para
-><para
-></para
-></listitem>
+<listitem><para>-156.40</para></listitem>
+<listitem><para>-156:24:00</para></listitem>
+<listitem><para>-156:24</para><para></para></listitem>
 </itemizedlist>
 </listitem>
 <listitem>
-<para
->Time: The standard time for all INDI-related communications is Universal Time UTC specified as YYYY-MM-DDTHH:MM:SS in accord with ISO 8601. &kstars; communicates the correct UTC time with device drivers automatically. You can enable/disable automatic time updates from the <guimenuitem
->Configure INDI</guimenuitem
-> dialogue under the <guimenu
->Devices</guimenu
-> menu. </para>
+<para>Time: The standard time for all INDI-related communications is Universal Time UTC specified as YYYY-MM-DDTHH:MM:SS in accord with ISO 8601. &kstars; communicates the correct UTC time with device drivers automatically. You can enable/disable automatic time updates from the <guimenuitem>Configure INDI</guimenuitem> dialogue under the <guimenu>Devices</guimenu> menu. </para>
 </listitem>
 </itemizedlist>
 </sect1>
 
 <sect1 id="indi-remote-control">
-<title
->Remote Device Control</title>
-<indexterm
-><primary
->Telescope Control</primary>
-<secondary
->Remote Devices</secondary>
+<title>Remote Device Control</title>
+<indexterm><primary>Telescope Control</primary>
+<secondary>Remote Devices</secondary>
 </indexterm>
 
-<para
->KStars provides a simple yet powerful layer for remote device control. A detailed description of the layer is described in the INDI <ulink url="http://www.clearskyinstitute.com/INDI/INDI.pdf"
->white paper</ulink
->.</para>
+<para>KStars provides a simple yet powerful layer for remote device control. A detailed description of the layer is described in the INDI <ulink url="http://www.clearskyinstitute.com/INDI/INDI.pdf">white paper</ulink>.</para>
 
-<para
->You need to configure both the server and client machines for remote control:</para>
+<para>You need to configure both the server and client machines for remote control:</para>
 
 <orderedlist>
 <listitem>
-<para
->Server: To prepare a device for remote control, follow the same steps in the <link linkend="indi-kstars-setup"
->local/server</link
-> setup. When you start a device service in the <guimenu
->Device Manager</guimenu
->, a port number is displayed under the <guilabel
->Listening port</guilabel
-> column. In addition to the port number, you also need the hostname or IP address of your server. </para>
-<para
-></para>
+<para>Server: To prepare a device for remote control, follow the same steps in the <link linkend="indi-kstars-setup">local/server</link> setup. When you start a device service in the <guimenu>Device Manager</guimenu>, a port number is displayed under the <guilabel>Listening port</guilabel> column. In addition to the port number, you also need the hostname or IP address of your server. </para>
+<para></para>
 </listitem>
 <listitem>
-<para
->Client: Select the <guimenuitem
->Device Manager</guimenuitem
-> from the <guimenu
->Device</guimenu
-> menu and click on the <guilabel
->Client</guilabel
-> tab. You can add, modify, or delete hosts under the <guilabel
->Client</guilabel
-> tab. Add a host by clicking on the <guibutton
->Add</guibutton
-> button. Enter the hostname/IP address of the server in the <guilabel
->Host</guilabel
-> field, and enter the port number obtained from the <emphasis
->server</emphasis
-> machine in step 1. </para>
+<para>Client: Select the <guimenuitem>Device Manager</guimenuitem> from the <guimenu>Device</guimenu> menu and click on the <guilabel>Client</guilabel> tab. You can add, modify, or delete hosts under the <guilabel>Client</guilabel> tab. Add a host by clicking on the <guibutton>Add</guibutton> button. Enter the hostname/IP address of the server in the <guilabel>Host</guilabel> field, and enter the port number obtained from the <emphasis>server</emphasis> machine in step 1. </para>
 </listitem>
 </orderedlist>
 
 <screenshot>
-<screeninfo
->INDI Client</screeninfo>
+<screeninfo>INDI Client</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="indiclient.png" format="PNG"/>
@@ -764,216 +406,99 @@
 </mediaobject>
 </screenshot>
 
-<para
->After you add a host, right click on the host to <guimenuitem
->Connect</guimenuitem
-> or <guimenuitem
->Disconnect</guimenuitem
->. If a connection is established, you can control the telescope from the <guilabel
->Sky map</guilabel
-> or <guilabel
->INDI Control Panel</guilabel
-> exactly as described in the <link linkend="indi-kstars-setup"
->local/server</link
-> section. It is as easy at that. </para>
+<para>After you add a host, right click on the host to <guimenuitem>Connect</guimenuitem> or <guimenuitem>Disconnect</guimenuitem>. If a connection is established, you can control the telescope from the <guilabel>Sky map</guilabel> or <guilabel>INDI Control Panel</guilabel> exactly as described in the <link linkend="indi-kstars-setup">local/server</link> section. It is as easy at that. </para>
 
 <sect2 id="indi-commandline">
-<title
->Running an INDI server from the command line</title>
-<para
->While &kstars; allows you to easily deploy an INDI server; you can launch an INDI server from the command line. </para>
-
-<para
->Since INDI is an independent backend component, you can run an INDI server on a host without KStars. INDI can be compiled separately to run on remote hosts. Furthermore, device drivers log messages to <constant
->stderr</constant
-> and that can be helpful in a debugging situation. The syntax for INDI server is as following:</para>
-
-<para
->$ <command
->indiserver</command
-> [options] [<filename
->driver</filename
-> ...]</para>
-
-<para
->Options:</para>
-<para
->-p p : alternate IP port, default 7624</para>
-<para
->-r n : max restart attempts, default 2</para>
-<para
->-v : more verbose to stderr</para>
-
-<para
->For example, if you want to start an INDI server running an LX200 GPS driver and listening to connections on port 8000, you would run the following command:</para>
-
-<para
->$ <command
->indiserver</command
-> -p 8000 <filename
->lx200gps</filename
-></para>
+<title>Running an INDI server from the command line</title>
+<para>While &kstars; allows you to easily deploy an INDI server; you can launch an INDI server from the command line. </para>
+
+<para>Since INDI is an independent backend component, you can run an INDI server on a host without KStars. INDI can be compiled separately to run on remote hosts. Furthermore, device drivers log messages to <constant>stderr</constant> and that can be helpful in a debugging situation. The syntax for INDI server is as following:</para>
+
+<para>$ <command>indiserver</command> [options] [<filename>driver</filename> ...]</para>
+
+<para>Options:</para>
+<para>-p p : alternate IP port, default 7624</para>
+<para>-r n : max restart attempts, default 2</para>
+<para>-v : more verbose to stderr</para>
+
+<para>For example, if you want to start an INDI server running an LX200 GPS driver and listening to connections on port 8000, you would run the following command:</para>
+
+<para>$ <command>indiserver</command> -p 8000 <filename>lx200gps</filename></para>
 </sect2>
 
 <sect2 id="indi-secure-remote">
-<title
->Secure Remote Operation</title>
-
-<para
->Suppose we want to run an indiserver with INDI drivers on a remote host, <constant
->remote_host</constant
->, and connect them to &kstars; running on the local machine.</para>
-
-<para
->From the local machine log onto the remote host, <constant
->remote_host</constant
->, by typing:</para>
-
-<para
->$ <command
->ssh</command
-> -L <varname
->local_port</varname
->:<constant
->remote_host</constant
->:<varname
->remote_port</varname
-></para>
-
-<para
->This binds the <varname
->local_port</varname
-> on the local machine to the <varname
->remote_port</varname
-> on the <constant
->remote_host</constant
->. After logging in, run indiserver on the remote host:</para>
-
-<para
->$ <command
->indiserver</command
-> -p <varname
->remote_port</varname
-> [<filename
->driver</filename
->...]</para>
-
-<para
->Back on the local machine, start &kstars; then open the <guimenuitem
->Device Manager</guimenuitem
-> and add a host under the <guilabel
->Client</guilabel
-> tab. The host should be the local host (usually 127.0.0.1) and the port number should be the <varname
->local_port</varname
-> used in the steps above. <mousebutton
->Right</mousebutton
->-click on the host and select <guimenuitem
->Connect</guimenuitem
-> from the popup menu. &kstars; will connect to the remote INDI server securely. The host information will be saved for future sessions.</para>
+<title>Secure Remote Operation</title>
+
+<para>Suppose we want to run an indiserver with INDI drivers on a remote host, <constant>remote_host</constant>, and connect them to &kstars; running on the local machine.</para>
+
+<para>From the local machine log onto the remote host, <constant>remote_host</constant>, by typing:</para>
+
+<para>$ <command>ssh</command> -L <varname>local_port</varname>:<constant>remote_host</constant>:<varname>remote_port</varname></para>
+
+<para>This binds the <varname>local_port</varname> on the local machine to the <varname>remote_port</varname> on the <constant>remote_host</constant>. After logging in, run indiserver on the remote host:</para>
+
+<para>$ <command>indiserver</command> -p <varname>remote_port</varname> [<filename>driver</filename>...]</para>
+
+<para>Back on the local machine, start &kstars; then open the <guimenuitem>Device Manager</guimenuitem> and add a host under the <guilabel>Client</guilabel> tab. The host should be the local host (usually 127.0.0.1) and the port number should be the <varname>local_port</varname> used in the steps above. <mousebutton>Right</mousebutton>-click on the host and select <guimenuitem>Connect</guimenuitem> from the popup menu. &kstars; will connect to the remote INDI server securely. The host information will be saved for future sessions.</para>
 </sect2>
 </sect1>
 
 <sect1 id="indi-faq">
-<title
->INDI Frequently Asked Questions</title>
-<indexterm
-><primary
->Telescope Control</primary>
-<secondary
-><acronym
->FAQ</acronym
-></secondary>
+<title>INDI Frequently Asked Questions</title>
+<indexterm><primary>Telescope Control</primary>
+<secondary><acronym>FAQ</acronym></secondary>
 </indexterm>
 
 <qandaset defaultlabel="qanda">
 <qandaentry>
 <question id="what-is-indi">
-<para
->What is INDI?</para>
+<para>What is INDI?</para>
 </question>
 <answer>
-<para
-><acronym
->INDI</acronym
-> is the <ulink url="http://indi.sourceforge.net"
-> Instrument-Neutral-Distributed-Interface</ulink
-> control protocol developed by <author
-><firstname
->Elwood</firstname
-><surname
->C. Downey</surname
-></author
-> of <ulink url="http://www.clearskyinstitute.com/"
->ClearSky Institute</ulink
->. &kstars; employs device drivers that are compatible with the INDI protocol. INDI has many advantages including loose coupling between hardware devices and software drivers. Clients that use the device drivers (like &kstars;) are completely unaware of the device capabilities. In run time, &kstars; communicates with the device drivers and builds a completely dynamical GUI based on services provided by the device. Therefore, new device drivers can be written or updated and KStars can take full advantage of them without any changes on the client side.</para>
+<para><acronym>INDI</acronym> is the <ulink url="http://indi.sourceforge.net"> Instrument-Neutral-Distributed-Interface</ulink> control protocol developed by <author><firstname>Elwood</firstname><surname>C. Downey</surname></author> of <ulink url="http://www.clearskyinstitute.com/">ClearSky Institute</ulink>. &kstars; employs device drivers that are compatible with the INDI protocol. INDI has many advantages including loose coupling between hardware devices and software drivers. Clients that use the device drivers (like &kstars;) are completely unaware of the device capabilities. In run time, &kstars; communicates with the device drivers and builds a completely dynamical GUI based on services provided by the device. Therefore, new device drivers can be written or updated and KStars can take full advantage of them without any changes on the client side.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Do you plan to support more devices? </para>
+<para>Do you plan to support more devices? </para>
 </question>
 <answer>
-<para
->Yes. We plan to support major CCD cameras and focusers and extend support for more telescopes. If you would like INDI to support a particular device, please send an email to <email
->indi-devel@lists.sourceforge.net</email
-> </para>
+<para>Yes. We plan to support major CCD cameras and focusers and extend support for more telescopes. If you would like INDI to support a particular device, please send an email to <email>indi-devel@lists.sourceforge.net</email> </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->I do not have a serial port, how can I connect to the telescope?</para>
+<para>I do not have a serial port, how can I connect to the telescope?</para>
 </question>
 <answer>
-<para
->Many modern laptops do not have a serial port. You will need a Serial To USB adaptor that is supported under Linux. For example, <trademark
->Keyspan</trademark
->'s USA-19QW Serial to USB adaptor is well supported under Linux and had been tested with &kstars;. You need to refer to your adaptor's documentation to find which ports they provide (e.g. <constant
->/dev/ttyUSB0 .... /dev/ttyUSB9</constant
->). </para>
+<para>Many modern laptops do not have a serial port. You will need a Serial To USB adaptor that is supported under Linux. For example, <trademark>Keyspan</trademark>'s USA-19QW Serial to USB adaptor is well supported under Linux and had been tested with &kstars;. You need to refer to your adaptor's documentation to find which ports they provide (e.g. <constant>/dev/ttyUSB0 .... /dev/ttyUSB9</constant>). </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->When I try to <guibutton
->Connect</guibutton
->, &kstars; reports that the telescope is not connected to the serial/USB port. What can I do? </para>
+<para>When I try to <guibutton>Connect</guibutton>, &kstars; reports that the telescope is not connected to the serial/USB port. What can I do? </para>
 </question>
 <answer>
-<para
->This message is triggered when &kstars; cannot communicate with the telescope. Here are few things you can do:</para>
+<para>This message is triggered when &kstars; cannot communicate with the telescope. Here are few things you can do:</para>
 
    <orderedlist>
    <listitem>
-<para
->Check that you have both reading and writing permission for the port you are trying to connect to.</para>
+<para>Check that you have both reading and writing permission for the port you are trying to connect to.</para>
    </listitem>
    <listitem>
-<para
->Check the connection cable, make sure it is in good condition and test it with other applications.</para>
+<para>Check the connection cable, make sure it is in good condition and test it with other applications.</para>
    </listitem>
    <listitem>
-<para
->Check your telescope power, make sure the power is on and that the telescope is getting enough power.</para>
+<para>Check your telescope power, make sure the power is on and that the telescope is getting enough power.</para>
    </listitem>
    <listitem>
-<para
->Set the correct port in the <guilabel
->INDI Control Panel</guilabel
-> under the <guimenu
->Devices</guimenu
-> menu. The default port is <constant
->/dev/ttyS0</constant
-></para>
+<para>Set the correct port in the <guilabel>INDI Control Panel</guilabel> under the <guimenu>Devices</guimenu> menu. The default port is <constant>/dev/ttyS0</constant></para>
    </listitem>
    <listitem>
-   <para
->Restart &kstars; and retry again.</para>
+   <para>Restart &kstars; and retry again.</para>
    </listitem>
    </orderedlist>
 </answer>
@@ -981,68 +506,47 @@
 
 <qandaentry>
 <question>
-<para
->&kstars; reports that the telescope is online and ready, but I cannot find the telescope's crosshair, where is it?</para>
+<para>&kstars; reports that the telescope is online and ready, but I cannot find the telescope's crosshair, where is it?</para>
 </question>
 <answer>
-<para
->&kstars; retrieves the telescopes RA and DEC coordinates upon connection. If your alignment was performed correctly, then you should see the crosshair around your target in the Sky Map. However, the RA and DEC coordinates provided by the telescope may be incorrect (even below the horizon) and you need to <link linkend="indi-sync"
->Sync</link
-> your telescope to your current target.</para>
+<para>&kstars; retrieves the telescopes RA and DEC coordinates upon connection. If your alignment was performed correctly, then you should see the crosshair around your target in the Sky Map. However, the RA and DEC coordinates provided by the telescope may be incorrect (even below the horizon) and you need to <link linkend="indi-sync">Sync</link> your telescope to your current target.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->The telescope is moving erratically or not moving at all. What can I do?</para>
+<para>The telescope is moving erratically or not moving at all. What can I do?</para>
 </question>
 <answer>
-<para
->This behaviour is mostly due to incorrect settings, please verify the following check list:</para>
+<para>This behaviour is mostly due to incorrect settings, please verify the following check list:</para>
 <orderedlist>
 <listitem>
-<para
->Is the telescope aligned?</para>
+<para>Is the telescope aligned?</para>
 </listitem>
 <listitem>
-<para
->Is the telescope alignment mode correct? Use <guilabel
->INDI Control Panel</guilabel
-> to check and change these settings (<constant
->Alt/Az,Polar, Land</constant
->).</para>
+<para>Is the telescope alignment mode correct? Use <guilabel>INDI Control Panel</guilabel> to check and change these settings (<constant>Alt/Az,Polar, Land</constant>).</para>
 </listitem>
 <listitem>
-<para
->Are the telescope's time and date settings correct?</para>
+<para>Are the telescope's time and date settings correct?</para>
 </listitem>
 <listitem>
-<para
->Are the telescope's longitude and latitude settings correct?</para>
+<para>Are the telescope's longitude and latitude settings correct?</para>
 </listitem>
 <listitem>
-<para
->Is the telescope's UTC offset correct?</para>
+<para>Is the telescope's UTC offset correct?</para>
 </listitem>
 <listitem>
-<para
->Are the telescope's RA and DEC axis locked firmly?</para>
+<para>Are the telescope's RA and DEC axis locked firmly?</para>
 </listitem>
 <listitem>
-<para
->Is the telescope's N/S switch (when applicable) setup correctly for your hemisphere?</para>
+<para>Is the telescope's N/S switch (when applicable) setup correctly for your hemisphere?</para>
 </listitem>
 <listitem>
-<para
->Is the cable between the telescope and computer in good condition?</para>
+<para>Is the cable between the telescope and computer in good condition?</para>
 </listitem>
 </orderedlist>
 
-<para
->If you think all settings are correct but the telescope still moves erratically or not at all, then please send a report to <email
->kstars-devel@kde.org</email
-></para>
+<para>If you think all settings are correct but the telescope still moves erratically or not at all, then please send a report to <email>kstars-devel@kde.org</email></para>
 </answer>
 </qandaentry>
 </qandaset>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/install.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/install.docbook
index 8f8905cafca..ac95f5f3540 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/install.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/install.docbook
@@ -1,138 +1,42 @@
 <appendix id="installation">
-<title
->Installation</title>
+<title>Installation</title>
 
 <sect1 id="getting-kstars">
-<title
->How to obtain &kstars;</title>
-<para
->&kstars; is distributed with &kde; as part of the tdeedu "Edutainment" module. </para>
-<para
->We also occasionally make an independent release. These independent releases will be available as a gzipped tar archive from the following website: <ulink url="http://prdownloads.sourceforge.net/kstars/"
->http://prdownloads.sourceforge.net/kstars/</ulink
->. </para>
-<para
->Independent releases are announced through the <email
->kstars-announce@lists.sourceforge.net</email
-> mailing list. Releases are also posted to <ulink url="http://edu.kde.org/kstars"
->the &kstars; home page</ulink
->, <ulink url="http://www.kde-apps.org/content/show.php?content=9862"
->kde-apps.org</ulink
->, and <ulink url="http://freshmeat.net/projects/kstars"
->freshmeat.net</ulink
->. </para>
-<para
->&kstars; is been packaged by many Linux/BSD distributions, including Redhat, Suse, and Mandrake. Some distributions package &kstars; as a separate application, some just provide a tdeedu package, which includes &kstars;. </para
-><para
->If you would like the latest CVS development version of &kstars;, please follow <ulink url="http://edu.kde.org/kstars/cvs.html"
->these instructions</ulink
->. </para>
+<title>How to obtain &kstars;</title>
+<para>&kstars; is distributed with &kde; as part of the tdeedu "Edutainment" module. </para>
+<para>We also occasionally make an independent release. These independent releases will be available as a gzipped tar archive from the following website: <ulink url="http://prdownloads.sourceforge.net/kstars/">http://prdownloads.sourceforge.net/kstars/</ulink>. </para>
+<para>Independent releases are announced through the <email>kstars-announce@lists.sourceforge.net</email> mailing list. Releases are also posted to <ulink url="http://edu.kde.org/kstars">the &kstars; home page</ulink>, <ulink url="http://www.kde-apps.org/content/show.php?content=9862">kde-apps.org</ulink>, and <ulink url="http://freshmeat.net/projects/kstars">freshmeat.net</ulink>. </para>
+<para>&kstars; is been packaged by many Linux/BSD distributions, including Redhat, Suse, and Mandrake. Some distributions package &kstars; as a separate application, some just provide a tdeedu package, which includes &kstars;. </para><para>If you would like the latest CVS development version of &kstars;, please follow <ulink url="http://edu.kde.org/kstars/cvs.html">these instructions</ulink>. </para>
 </sect1>
 
 <sect1 id="requirements">
-<title
->Requirements</title>
-<para
->In order to successfully run &kstars;, you need &kde; 
->=3.2 and &Qt;
->=3.2. </para>
-<para
->To compile &kstars;, you will also have to have the following packages installed: <itemizedlist>
-<listitem
-><para
->tdelibs-devel</para
-></listitem>
-<listitem
-><para
->qt-devel</para
-></listitem>
-<listitem
-><para
->zlib-devel</para
-></listitem>
-<listitem
-><para
->fam-devel</para
-></listitem>
-<listitem
-><para
->png-devel</para
-></listitem>
-<listitem
-><para
->jpeg-devel</para
-></listitem>
-<listitem
-><para
->autoconf (
->=2.5)</para
-></listitem>
-</itemizedlist
-></para>
+<title>Requirements</title>
+<para>In order to successfully run &kstars;, you need &kde; >=3.2 and &Qt;>=3.2. </para>
+<para>To compile &kstars;, you will also have to have the following packages installed: <itemizedlist>
+<listitem><para>tdelibs-devel</para></listitem>
+<listitem><para>qt-devel</para></listitem>
+<listitem><para>zlib-devel</para></listitem>
+<listitem><para>fam-devel</para></listitem>
+<listitem><para>png-devel</para></listitem>
+<listitem><para>jpeg-devel</para></listitem>
+<listitem><para>autoconf (>=2.5)</para></listitem>
+</itemizedlist></para>
 
-<para
->On my system, &kstars; uses about 60 MB of system memory with the default settings. Most of this usage is due to the loaded object databases. You can dramatically reduce the memory footprint by reducing the faint limit for stars in the Configuration Window, or eliminating catalogs of objects (NGC, IC, comets, asteroids, &etc;). If &kstars; is idling, it uses very little <acronym
->CPU</acronym
->; but it will use as much as you have got when panning or zooming. </para>
+<para>On my system, &kstars; uses about 60 MB of system memory with the default settings. Most of this usage is due to the loaded object databases. You can dramatically reduce the memory footprint by reducing the faint limit for stars in the Configuration Window, or eliminating catalogs of objects (NGC, IC, comets, asteroids, &etc;). If &kstars; is idling, it uses very little <acronym>CPU</acronym>; but it will use as much as you have got when panning or zooming. </para>
 </sect1>
 
 <sect1 id="compilation">
-<title
->Compilation and Installation</title>
+<title>Compilation and Installation</title>
 
-<para
->In order to compile and install &kstars; on your system, type the following in the base folder of the unpacked &kstars; distribution: <screen width="40"
-><prompt
->%</prompt
-> <userinput
->./configure --prefix=$TDEDIR</userinput>
-<prompt
->%</prompt
-> <userinput
->make</userinput>
-<prompt
->%</prompt
-> <userinput
->make install</userinput
->
+<para>In order to compile and install &kstars; on your system, type the following in the base folder of the unpacked &kstars; distribution: <screen width="40"><prompt>%</prompt> <userinput>./configure --prefix=$TDEDIR</userinput>
+<prompt>%</prompt> <userinput>make</userinput>
+<prompt>%</prompt> <userinput>make install</userinput>
 </screen>
-</para
-><para
->Please do not forget the prefix argument to configure. If your <envar
->TDEDIR</envar
-> variable is not set, set prefix to whatever folder &kde; is installed in: this is usually either <filename class="directory"
->/usr</filename
->, <filename class="directory"
->/opt/kde</filename
->, or <filename class="directory"
->/opt/kde3</filename
->. Also, make sure you do the last step as <systemitem class="username"
->root</systemitem
->. </para
-><para
->&kstars; uses <command
->autoconf</command
-> and <command
->automake</command
->, so you should not have trouble compiling it. Should you run into problems please report them to the &kstars; mailing list <email
->kstars-devel@kde.org</email
->. </para>
+</para><para>Please do not forget the prefix argument to configure. If your <envar>TDEDIR</envar> variable is not set, set prefix to whatever folder &kde; is installed in: this is usually either <filename class="directory">/usr</filename>, <filename class="directory">/opt/kde</filename>, or <filename class="directory">/opt/kde3</filename>. Also, make sure you do the last step as <systemitem class="username">root</systemitem>. </para><para>&kstars; uses <command>autoconf</command> and <command>automake</command>, so you should not have trouble compiling it. Should you run into problems please report them to the &kstars; mailing list <email>kstars-devel@kde.org</email>. </para>
 </sect1>
 
 <sect1 id="configuration">
-<title
->Configuration</title>
-<para
->At this point, there are no special configuration options or requirements. If &kstars; complains that there are missing data files, become <systemitem class="username"
->root</systemitem
-> and manually copy all files in <filename class="directory"
->kstars/data/</filename
-> to <filename class="directory"
->$(TDEDIR)/apps/kstars/</filename
-> (If you do not have <systemitem class="username"
->root</systemitem
-> privileges, copy them to <filename class="directory"
->~/.trinity/share/apps/kstars/.</filename
->) </para>
+<title>Configuration</title>
+<para>At this point, there are no special configuration options or requirements. If &kstars; complains that there are missing data files, become <systemitem class="username">root</systemitem> and manually copy all files in <filename class="directory">kstars/data/</filename> to <filename class="directory">$(TDEDIR)/apps/kstars/</filename> (If you do not have <systemitem class="username">root</systemitem> privileges, copy them to <filename class="directory">~/.trinity/share/apps/kstars/.</filename>) </para>
 </sect1>
 </appendix>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/jmoons.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/jmoons.docbook
index 63869ce059c..0b3be37e612 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/jmoons.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/jmoons.docbook
@@ -1,39 +1,20 @@
 <sect1 id="tool-jmoons">
-<title
->Jupiter Moons Tool</title>
-<indexterm
-><primary
->Tools</primary>
-<secondary
->Jupiter Moons Tool</secondary>
+<title>Jupiter Moons Tool</title>
+<indexterm><primary>Tools</primary>
+<secondary>Jupiter Moons Tool</secondary>
 </indexterm>
 
 <screenshot>
-<screeninfo
->The Jupiter Moons Tool </screeninfo>
+<screeninfo>The Jupiter Moons Tool </screeninfo>
 <mediaobject>
   <imageobject>
     <imagedata fileref="jmoons.png" format="PNG"/>
   </imageobject>
   <textobject>
-    <phrase
->Jupiter Moons Tool</phrase>
+    <phrase>Jupiter Moons Tool</phrase>
   </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->This tool displays the positions of Jupiter's four largest moons (Io, Europa, Ganymede, and Callisto) relative to Jupiter, as a function of time. Time is plotted vertically; the units are days and <quote
->time=0.0</quote
-> corresponds to the current simulation time. The horizontal axis displays the angular offset from Jupiter's position, in arcminutes. The offset is measured along the direction of Jupiter's equator. Each moon's position as a function of time traces a sinusoidal path in the plot, as the moon orbits around Jupiter. Each track is assigned a different colour to distinguish it from the others; the name labels at the top of the window indicate the colour used by each moon. </para
-><para
->The plot can be manipulated with the keyboard. The time axis can be expanded or compressed using the <keycap
->+</keycap
-> and <keycap
->-</keycap
-> keys. The time displayed at the center of the window can be changed with the <keycap
->[</keycap
-> and <keycap
->]</keycap
-> keys. </para>
+<para>This tool displays the positions of Jupiter's four largest moons (Io, Europa, Ganymede, and Callisto) relative to Jupiter, as a function of time. Time is plotted vertically; the units are days and <quote>time=0.0</quote> corresponds to the current simulation time. The horizontal axis displays the angular offset from Jupiter's position, in arcminutes. The offset is measured along the direction of Jupiter's equator. Each moon's position as a function of time traces a sinusoidal path in the plot, as the moon orbits around Jupiter. Each track is assigned a different colour to distinguish it from the others; the name labels at the top of the window indicate the colour used by each moon. </para><para>The plot can be manipulated with the keyboard. The time axis can be expanded or compressed using the <keycap>+</keycap> and <keycap>-</keycap> keys. The time displayed at the center of the window can be changed with the <keycap>[</keycap> and <keycap>]</keycap> keys. </para>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/julianday.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/julianday.docbook
index 06e2832eb59..6b5ac82a544 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/julianday.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/julianday.docbook
@@ -1,78 +1,9 @@
 <sect1 id="ai-julianday">
 <sect1info>
-<author
-><firstname
->John</firstname
-> <surname
->Cirillo</surname
-> </author>
+<author><firstname>John</firstname> <surname>Cirillo</surname> </author>
 </sect1info>
-<title
->Julian Day</title>
-<indexterm
-><primary
->Julian Day</primary>
+<title>Julian Day</title>
+<indexterm><primary>Julian Day</primary>
 </indexterm>
-<para
->Julian Days are a way of reckoning the current date by a simple count of the number of days that have passed since some remote, arbitrary date. This number of days is called the <firstterm
->Julian Day</firstterm
->, abbreviated as <abbrev
->JD</abbrev
->. The starting point, <abbrev
->JD=0</abbrev
->, is January 1, 4713 BC (or -4712 January 1, since there was no year '0'). Julian Days are very useful because they make it easy to determine the number of days between two events by simply subtracting their Julian Day numbers. Such a calculation is difficult for the standard (Gregorian) calendar, because days are grouped into months, which contain a variable number of days, and there is the added complication of <link linkend="ai-leapyear"
->Leap Years</link
->. </para
-><para
->Converting from the standard (Gregorian) calendar to Julian Days and vice versa is best left to a special program written to do this, such as the &kstars; <link linkend="tool-calculator"
->Astrocalculator</link
->. However, for those interested, here is a simple example of a Gregorian to Julian day converter: </para
-><para
-><abbrev
->JD</abbrev
-> = <abbrev
->D</abbrev
-> - 32075 + 1461*( <abbrev
->Y</abbrev
-> + 4800 + ( <abbrev
->M</abbrev
-> - 14 ) / 12 ) / 4 + 367*( <abbrev
->M</abbrev
-> - 2 - ( <abbrev
->M</abbrev
-> - 14 ) / 12 * 12 ) / 12 - 3*( ( <abbrev
->Y</abbrev
-> + 4900 + ( <abbrev
->M</abbrev
-> - 14 ) / 12 ) / 100 ) / 4 </para
-><para
->where <abbrev
->D</abbrev
-> is the day (1-31), <abbrev
->M</abbrev
-> is the Month (1-12), and <abbrev
->Y</abbrev
-> is the year (1801-2099). Note that this formula only works for dates between 1801 and 2099. More remote dates require a more complicated transformation. </para
-><para
->An example Julian Day is: <abbrev
->JD</abbrev
-> 2440588, which corresponds to 1 Jan, 1970. </para
-><para
->Julian Days can also be used to tell time; the time of day is expressed as a fraction of a full day, with 12:00 noon (not midnight) as the zero point. So, 3:00 pm on 1 Jan 1970 is <abbrev
->JD</abbrev
-> 2440588.125 (since 3:00 pm is 3 hours since noon, and 3/24 = 0.125 day). Note that the Julian Day is always determined from <link linkend="ai-utime"
->Universal Time</link
->, not Local Time. </para
-><para
->Astronomers use certain Julian Day values as important reference points, called <firstterm
->Epochs</firstterm
->. One widely-used epoch is called J2000; it is the Julian Day for 1 Jan, 2000 at 12:00 noon = <abbrev
->JD</abbrev
-> 2451545.0. </para
-><para
->Much more information on Julian Days is available on the internet. A good starting point is the <ulink url="http://aa.usno.navy.mil/faq/docs/JD_Formula.html"
->U.S. Naval Observatory</ulink
->. If that site is not available when you read this, try searching for <quote
->Julian Day</quote
-> with your favourite search engine. </para>
+<para>Julian Days are a way of reckoning the current date by a simple count of the number of days that have passed since some remote, arbitrary date. This number of days is called the <firstterm>Julian Day</firstterm>, abbreviated as <abbrev>JD</abbrev>. The starting point, <abbrev>JD=0</abbrev>, is January 1, 4713 BC (or -4712 January 1, since there was no year '0'). Julian Days are very useful because they make it easy to determine the number of days between two events by simply subtracting their Julian Day numbers. Such a calculation is difficult for the standard (Gregorian) calendar, because days are grouped into months, which contain a variable number of days, and there is the added complication of <link linkend="ai-leapyear">Leap Years</link>. </para><para>Converting from the standard (Gregorian) calendar to Julian Days and vice versa is best left to a special program written to do this, such as the &kstars; <link linkend="tool-calculator">Astrocalculator</link>. However, for those interested, here is a simple example of a Gregorian to Julian day converter: </para><para><abbrev>JD</abbrev> = <abbrev>D</abbrev> - 32075 + 1461*( <abbrev>Y</abbrev> + 4800 + ( <abbrev>M</abbrev> - 14 ) / 12 ) / 4 + 367*( <abbrev>M</abbrev> - 2 - ( <abbrev>M</abbrev> - 14 ) / 12 * 12 ) / 12 - 3*( ( <abbrev>Y</abbrev> + 4900 + ( <abbrev>M</abbrev> - 14 ) / 12 ) / 100 ) / 4 </para><para>where <abbrev>D</abbrev> is the day (1-31), <abbrev>M</abbrev> is the Month (1-12), and <abbrev>Y</abbrev> is the year (1801-2099). Note that this formula only works for dates between 1801 and 2099. More remote dates require a more complicated transformation. </para><para>An example Julian Day is: <abbrev>JD</abbrev> 2440588, which corresponds to 1 Jan, 1970. </para><para>Julian Days can also be used to tell time; the time of day is expressed as a fraction of a full day, with 12:00 noon (not midnight) as the zero point. So, 3:00 pm on 1 Jan 1970 is <abbrev>JD</abbrev> 2440588.125 (since 3:00 pm is 3 hours since noon, and 3/24 = 0.125 day). Note that the Julian Day is always determined from <link linkend="ai-utime">Universal Time</link>, not Local Time. </para><para>Astronomers use certain Julian Day values as important reference points, called <firstterm>Epochs</firstterm>. One widely-used epoch is called J2000; it is the Julian Day for 1 Jan, 2000 at 12:00 noon = <abbrev>JD</abbrev> 2451545.0. </para><para>Much more information on Julian Days is available on the internet. A good starting point is the <ulink url="http://aa.usno.navy.mil/faq/docs/JD_Formula.html">U.S. Naval Observatory</ulink>. If that site is not available when you read this, try searching for <quote>Julian Day</quote> with your favourite search engine. </para>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/leapyear.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/leapyear.docbook
index cf855c7534b..ff71d4bee17 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/leapyear.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/leapyear.docbook
@@ -1,58 +1,12 @@
 <sect1 id="ai-leapyear">
 <sect1info>
-<author
-><firstname
->Jason</firstname
-> <surname
->Harris</surname
-> </author>
+<author><firstname>Jason</firstname> <surname>Harris</surname> </author>
 </sect1info>
-<title
->Leap Years</title>
-<indexterm
-><primary
->Leap Years</primary>
+<title>Leap Years</title>
+<indexterm><primary>Leap Years</primary>
 </indexterm>
-<para
->The Earth has two major components of motion. First, it spins on its rotational axis; a full spin rotation takes one <firstterm
->Day</firstterm
-> to complete. Second, it orbits around the Sun; a full orbital rotation takes one <firstterm
->Year</firstterm
-> to complete. </para
-><para
->There are normally 365 days in one <emphasis
->calendar</emphasis
-> year, but it turns out that a <emphasis
->true</emphasis
-> year (&ie;, a full orbit of the Earth around the Sun; also called a <firstterm
->tropical year</firstterm
->) is a little bit longer than 365 days. In other words, in the time it takes the Earth to complete one orbital circuit, it completes 365.24219 spin rotations. Do not be too surprised by this; there is no reason to expect the spin and orbital motions of the Earth to be synchronised in any way. However, it does make marking calendar time a bit awkward.... </para
-><para
->What would happen if we simply ignored the extra 0.24219 rotation at the end of the year, and simply defined a calendar year to always be 365.0 days long? The calendar is basically a charting of the Earth's progress around the Sun. If we ignore the extra bit at the end of each year, then with every passing year, the calendar date lags a little more behind the true position of Earth around the Sun. In just a few decades, the dates of the solstices and equinoxes will have drifted noticeably. </para
-><para
->In fact, it used to be that all years <emphasis
->were</emphasis
-> defined to have 365.0 days, and the calendar <quote
->drifted</quote
-> away from the true seasons as a result. In the year 46 <abbrev
->BCE</abbrev
->, Julius Caeser established the <firstterm
->Julian Calendar</firstterm
->, which implemented the world's first <firstterm
->leap years</firstterm
->: He decreed that every 4th year would be 366 days long, so that a year was 365.25 days long, on average. This basically solved the calendar drift problem. </para
-><para
->However, the problem wasn't completely solved by the Julian calendar, because a tropical year isn't 365.25 days long; it's 365.24219 days long. You still have a calendar drift problem, it just takes many centuries to become noticeable. And so, in 1582, Pope Gregory XIII instituted the <firstterm
->Gregorian calendar</firstterm
->, which was largely the same as the Julian Calendar, with one more trick added for leap years: even Century years (those ending with the digits <quote
->00</quote
->) are only leap years if they are divisible by 400. So, the years 1700, 1800, and 1900 were not leap years (though they would have been under the Julian Calendar), whereas the year 2000 <emphasis
->was</emphasis
-> a leap year. This change makes the average length of a year 365.2425 days. So, there is still a tiny calendar drift, but it amounts to an error of only 3 days in 10,000 years. The Gregorian calendar is still used as a standard calendar throughout most of the world. </para>
+<para>The Earth has two major components of motion. First, it spins on its rotational axis; a full spin rotation takes one <firstterm>Day</firstterm> to complete. Second, it orbits around the Sun; a full orbital rotation takes one <firstterm>Year</firstterm> to complete. </para><para>There are normally 365 days in one <emphasis>calendar</emphasis> year, but it turns out that a <emphasis>true</emphasis> year (&ie;, a full orbit of the Earth around the Sun; also called a <firstterm>tropical year</firstterm>) is a little bit longer than 365 days. In other words, in the time it takes the Earth to complete one orbital circuit, it completes 365.24219 spin rotations. Do not be too surprised by this; there is no reason to expect the spin and orbital motions of the Earth to be synchronised in any way. However, it does make marking calendar time a bit awkward.... </para><para>What would happen if we simply ignored the extra 0.24219 rotation at the end of the year, and simply defined a calendar year to always be 365.0 days long? The calendar is basically a charting of the Earth's progress around the Sun. If we ignore the extra bit at the end of each year, then with every passing year, the calendar date lags a little more behind the true position of Earth around the Sun. In just a few decades, the dates of the solstices and equinoxes will have drifted noticeably. </para><para>In fact, it used to be that all years <emphasis>were</emphasis> defined to have 365.0 days, and the calendar <quote>drifted</quote> away from the true seasons as a result. In the year 46 <abbrev>BCE</abbrev>, Julius Caeser established the <firstterm>Julian Calendar</firstterm>, which implemented the world's first <firstterm>leap years</firstterm>: He decreed that every 4th year would be 366 days long, so that a year was 365.25 days long, on average. This basically solved the calendar drift problem. </para><para>However, the problem wasn't completely solved by the Julian calendar, because a tropical year isn't 365.25 days long; it's 365.24219 days long. You still have a calendar drift problem, it just takes many centuries to become noticeable. And so, in 1582, Pope Gregory XIII instituted the <firstterm>Gregorian calendar</firstterm>, which was largely the same as the Julian Calendar, with one more trick added for leap years: even Century years (those ending with the digits <quote>00</quote>) are only leap years if they are divisible by 400. So, the years 1700, 1800, and 1900 were not leap years (though they would have been under the Julian Calendar), whereas the year 2000 <emphasis>was</emphasis> a leap year. This change makes the average length of a year 365.2425 days. So, there is still a tiny calendar drift, but it amounts to an error of only 3 days in 10,000 years. The Gregorian calendar is still used as a standard calendar throughout most of the world. </para>
 <note>
-<para
->Fun Trivia: When Pope Gregory instituted the Gregorian Calendar, the Julian Calendar had been followed for over 1500 years, and so the calendar date had already drifted by over a week. Pope Gregory re-synchronised the calendar by simply <emphasis
->eliminating</emphasis
-> 10 days: in 1582, the day after October 4th was October 15th! </para>
+<para>Fun Trivia: When Pope Gregory instituted the Gregorian Calendar, the Julian Calendar had been followed for over 1500 years, and so the calendar date had already drifted by over a week. Pope Gregory re-synchronised the calendar by simply <emphasis>eliminating</emphasis> 10 days: in 1582, the day after October 4th was October 15th! </para>
 </note>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/lightcurves.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/lightcurves.docbook
index 19b1b5d7a4d..79a9f1474a5 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/lightcurves.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/lightcurves.docbook
@@ -1,222 +1,85 @@
 <sect1 id="tool-aavso">
 
 <sect1info>
-<author
-><firstname
->Aaron</firstname
-> <surname
->Price</surname
-> <affiliation
-><address
-> <email
->aavso@aavso.org</email>
-</address
-></affiliation>
+<author><firstname>Aaron</firstname> <surname>Price</surname> <affiliation><address> <email>aavso@aavso.org</email>
+</address></affiliation>
 </author>
 </sect1info>
 
-<title
->AAVSO Light Curves</title>
-<indexterm
-><primary
->Tools</primary>
-<secondary
->AAVSO Lightcurve Generator</secondary>
+<title>AAVSO Light Curves</title>
+<indexterm><primary>Tools</primary>
+<secondary>AAVSO Lightcurve Generator</secondary>
 </indexterm>
 
 <screenshot>
-<screeninfo
->The AAVSO Lightcurves Tool </screeninfo>
+<screeninfo>The AAVSO Lightcurves Tool </screeninfo>
 <mediaobject>
   <imageobject>
     <imagedata fileref="aavso.png" format="PNG"/>
   </imageobject>
   <textobject>
-    <phrase
->AAVSO Lightcurves</phrase>
+    <phrase>AAVSO Lightcurves</phrase>
   </textobject>
 </mediaobject>
 </screenshot>
 
 <sect2 id="aavso-intro">
-<title
->Introduction</title>
-<para
->&kstars; can display light curves for variable stars from the observing program of the <ulink url="http://www.aavso.org"
->American Association of Variable Star Observers</ulink
-> (<abbrev
->AAVSO</abbrev
->). This program monitors over 6,000 variable stars and consists of 10 million observations going back almost a century. &kstars; downloads the very latest data directly from the <abbrev
->AAVSO</abbrev
-> database via the Internet, so a network connection is required to use this tool. </para>
-<para
->To use the tool, select a variable star either by <firstterm
->designation</firstterm
-> or name in the left panel, and set the start and end dates to be plotted. In the right panel, select the type of data that should be plotted (see below). When you have made you selections, press the <guibutton
->Retrieve Curve</guibutton
-> button. &kstars; will automatically connect to the AAVSO server, which will generate the lightcurve plot and send it to your computer for display. A sample lightcurve plot is shown below: </para>
+<title>Introduction</title>
+<para>&kstars; can display light curves for variable stars from the observing program of the <ulink url="http://www.aavso.org">American Association of Variable Star Observers</ulink> (<abbrev>AAVSO</abbrev>). This program monitors over 6,000 variable stars and consists of 10 million observations going back almost a century. &kstars; downloads the very latest data directly from the <abbrev>AAVSO</abbrev> database via the Internet, so a network connection is required to use this tool. </para>
+<para>To use the tool, select a variable star either by <firstterm>designation</firstterm> or name in the left panel, and set the start and end dates to be plotted. In the right panel, select the type of data that should be plotted (see below). When you have made you selections, press the <guibutton>Retrieve Curve</guibutton> button. &kstars; will automatically connect to the AAVSO server, which will generate the lightcurve plot and send it to your computer for display. A sample lightcurve plot is shown below: </para>
 
 <screenshot>
-<screeninfo
->A Sample Lightcurve </screeninfo>
+<screeninfo>A Sample Lightcurve </screeninfo>
 <mediaobject>
   <imageobject>
     <imagedata fileref="lightcurve.png" format="PNG"/>
   </imageobject>
   <textobject>
-    <phrase
->Sample Lightcurve</phrase>
+    <phrase>Sample Lightcurve</phrase>
   </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->Please not these light curves should <emphasis
->NEVER</emphasis
-> be used in research, papers, presentations, publications, &etc;. They are only meant to be used as a source of info for &kstars;. They have not been validated and passed the <abbrev
->AAVSO</abbrev
->'s strict quality control measures. We will be glad to give you good raw data simply by requesting it at <ulink url="http://www.aavso.org/adata/onlinedata/"
->http://www.aavso.org/adata/onlinedata/</ulink
->. </para>
-<para
->Specific questions about the data in the light curves can be sent to <email
->aavso@aavso.org</email
->. </para>
+<para>Please not these light curves should <emphasis>NEVER</emphasis> be used in research, papers, presentations, publications, &etc;. They are only meant to be used as a source of info for &kstars;. They have not been validated and passed the <abbrev>AAVSO</abbrev>'s strict quality control measures. We will be glad to give you good raw data simply by requesting it at <ulink url="http://www.aavso.org/adata/onlinedata/">http://www.aavso.org/adata/onlinedata/</ulink>. </para>
+<para>Specific questions about the data in the light curves can be sent to <email>aavso@aavso.org</email>. </para>
 </sect2>
 
 <sect2 id="aavso-about">
-<title
->About Variable Stars</title>
-<para
-><firstterm
->Variable stars</firstterm
-> are stars that change in brightness. A <firstterm
->light curve</firstterm
-> is a plot of a variable star's brightness over time. By looking at a light curve you can see how the star has behaved in the past and try to predict how it will behave in the future. Astronomers also use this data to model astrophysical processes in the star. This important to help us understand how stars work. </para>
+<title>About Variable Stars</title>
+<para><firstterm>Variable stars</firstterm> are stars that change in brightness. A <firstterm>light curve</firstterm> is a plot of a variable star's brightness over time. By looking at a light curve you can see how the star has behaved in the past and try to predict how it will behave in the future. Astronomers also use this data to model astrophysical processes in the star. This important to help us understand how stars work. </para>
 </sect2>
 
 <sect2 id="aavso-data">
-<title
->The Data</title>
-
-<para
->Here is a summary of the various types of data available in the light curves: <itemizedlist
->  
-<listitem
-><para
-><firstterm
->Visual Observation</firstterm
->: This is an observation of a variable star by an observer with a regular telescope. It means that an observer saw the star at Y brightness on X date and time.</para
-></listitem>
-
-<listitem
-><para
-><firstterm
->Fainter than</firstterm
->: Sometimes the star is too faint to be seen by the observer. When that happens, the observer reports the faintest star seen in the field. These are called <quote
->fainter thans</quote
-> because the variable star was fainter than the brightness reported.</para
-></listitem>
-
-<listitem
-><para
-><firstterm
->Average</firstterm
->: This is a computed running average of all the data reported. The <firstterm
->bin</firstterm
-> number tells the computer how many days to use in each average calculation. This will need to be adjusted based on the frequency of observations. The error bars represent the 1 sigma standard deviation of error.</para
-></listitem>
-
-<listitem
-><para
-><firstterm
->CCDV</firstterm
->: These are observations reported using a <abbrev
->CCD</abbrev
-> with a Johnson <abbrev
->V</abbrev
-> filter. <abbrev
->CCDV</abbrev
-> observations tend to be more accurate than visual (but not always).</para
-></listitem>
-
-<listitem
-><para
-><firstterm
->CCDB</firstterm
->: <abbrev
->CCD</abbrev
-> observations with a Johnson <abbrev
->B</abbrev
-> filter.</para
-></listitem>
-
-<listitem
-><para
-><firstterm
->CCDI</firstterm
->: <abbrev
->CCD</abbrev
-> observations with a Cousins <abbrev
->Ic</abbrev
-> filter.</para
-></listitem>
-
-<listitem
-><para
-><firstterm
->CCDR</firstterm
->: <abbrev
->CCD</abbrev
-> observations with a Cousins <abbrev
->R</abbrev
-> filter.</para
-></listitem>
-
-<listitem
-><para
-><firstterm
->Discrepant Data</firstterm
->: This is data that has been flagged by an <abbrev
->AAVSO</abbrev
-> staff member as being discrepant following <abbrev
->HQ</abbrev
-> rules for data validation. Contact <email
->aavso@aavso.org</email
-> for more information.</para
-></listitem>
-
-<listitem
-><para
-><firstterm
->Dates</firstterm
->: The observational database the light curves are based on is updated every 10 minutes so you can get data in near real-time. Right now light curve data is only available back to 1961, but this will likely be expanded further back in time in the future.</para
-></listitem>
+<title>The Data</title>
+
+<para>Here is a summary of the various types of data available in the light curves: <itemizedlist>  
+<listitem><para><firstterm>Visual Observation</firstterm>: This is an observation of a variable star by an observer with a regular telescope. It means that an observer saw the star at Y brightness on X date and time.</para></listitem>
+
+<listitem><para><firstterm>Fainter than</firstterm>: Sometimes the star is too faint to be seen by the observer. When that happens, the observer reports the faintest star seen in the field. These are called <quote>fainter thans</quote> because the variable star was fainter than the brightness reported.</para></listitem>
+
+<listitem><para><firstterm>Average</firstterm>: This is a computed running average of all the data reported. The <firstterm>bin</firstterm> number tells the computer how many days to use in each average calculation. This will need to be adjusted based on the frequency of observations. The error bars represent the 1 sigma standard deviation of error.</para></listitem>
+
+<listitem><para><firstterm>CCDV</firstterm>: These are observations reported using a <abbrev>CCD</abbrev> with a Johnson <abbrev>V</abbrev> filter. <abbrev>CCDV</abbrev> observations tend to be more accurate than visual (but not always).</para></listitem>
+
+<listitem><para><firstterm>CCDB</firstterm>: <abbrev>CCD</abbrev> observations with a Johnson <abbrev>B</abbrev> filter.</para></listitem>
+
+<listitem><para><firstterm>CCDI</firstterm>: <abbrev>CCD</abbrev> observations with a Cousins <abbrev>Ic</abbrev> filter.</para></listitem>
+
+<listitem><para><firstterm>CCDR</firstterm>: <abbrev>CCD</abbrev> observations with a Cousins <abbrev>R</abbrev> filter.</para></listitem>
+
+<listitem><para><firstterm>Discrepant Data</firstterm>: This is data that has been flagged by an <abbrev>AAVSO</abbrev> staff member as being discrepant following <abbrev>HQ</abbrev> rules for data validation. Contact <email>aavso@aavso.org</email> for more information.</para></listitem>
+
+<listitem><para><firstterm>Dates</firstterm>: The observational database the light curves are based on is updated every 10 minutes so you can get data in near real-time. Right now light curve data is only available back to 1961, but this will likely be expanded further back in time in the future.</para></listitem>
 
 </itemizedlist>
 </para>
 </sect2>
 
 <sect2 id="aavso-update">
-<title
->Updating your local copy of Variable Stars</title>
-<para
->The <abbrev
->AAVSO</abbrev
-> publishes the <ulink url="http://www.aavso.org/valnam.txt"
->full list of variable stars</ulink
-> in their monitoring program. This file is updated monthly with newly discovered variable stars. To sync the list that &kstars; uses with the <abbrev
->AAVSO</abbrev
-> master list, click on the <guibutton
->Update List</guibutton
-> button in the <abbrev
->AAVSO</abbrev
-> dialogue. &kstars; will then attempt to connect to the <abbrev
->AAVSO</abbrev
-> database and download the latest list. </para>
+<title>Updating your local copy of Variable Stars</title>
+<para>The <abbrev>AAVSO</abbrev> publishes the <ulink url="http://www.aavso.org/valnam.txt">full list of variable stars</ulink> in their monitoring program. This file is updated monthly with newly discovered variable stars. To sync the list that &kstars; uses with the <abbrev>AAVSO</abbrev> master list, click on the <guibutton>Update List</guibutton> button in the <abbrev>AAVSO</abbrev> dialogue. &kstars; will then attempt to connect to the <abbrev>AAVSO</abbrev> database and download the latest list. </para>
 <note>
-<para
->The customised data stream provided by the AAVSO was implemented for &kstars; by Aaron Price. Thank you, Aaron! </para>
+<para>The customised data stream provided by the AAVSO was implemented for &kstars; by Aaron Price. Thank you, Aaron! </para>
 </note>
 </sect2>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/luminosity.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/luminosity.docbook
index fcb119a70ee..49d5a957955 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/luminosity.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/luminosity.docbook
@@ -2,43 +2,23 @@
 
 <sect1info>
 
-<author
-><firstname
->Jasem</firstname
-> <surname
->Mutlaq</surname
-> <affiliation
-><address
-> <email
->mutlaqja@ku.edu</email>
-</address
-></affiliation>
+<author><firstname>Jasem</firstname> <surname>Mutlaq</surname> <affiliation><address> <email>mutlaqja@ku.edu</email>
+</address></affiliation>
 </author>
 </sect1info>
 
-<title
->Luminosity</title>
-<indexterm
-><primary
->Luminosity</primary>
-<seealso
->Flux</seealso>
+<title>Luminosity</title>
+<indexterm><primary>Luminosity</primary>
+<seealso>Flux</seealso>
 </indexterm>
 
-<para
-><firstterm
->Luminosity</firstterm
-> is the amount of energy emitted by a star each second. </para>
+<para><firstterm>Luminosity</firstterm> is the amount of energy emitted by a star each second. </para>
 
-<para
->All stars radiate light over a broad range of frequencies in the electromagnetic spectrum from the low energy radio waves up to the highly energetic gamma rays. A star that emits predominately in the ultra-violet region of the spectrum produces a total amount of energy magnitudes larger than that produced in a star that emits principally in the infrared. Therefore, luminosity is a measure of energy emitted by a star over all wavelengths. The relationship between wavelength and energy was quantified by Einstein as E = h * v where v is the frequency, h is the Planck constant, and E is the photon energy in joules. That is, shorter wavelengths (and thus higher frequencies) correspond to higher energies. </para>
+<para>All stars radiate light over a broad range of frequencies in the electromagnetic spectrum from the low energy radio waves up to the highly energetic gamma rays. A star that emits predominately in the ultra-violet region of the spectrum produces a total amount of energy magnitudes larger than that produced in a star that emits principally in the infrared. Therefore, luminosity is a measure of energy emitted by a star over all wavelengths. The relationship between wavelength and energy was quantified by Einstein as E = h * v where v is the frequency, h is the Planck constant, and E is the photon energy in joules. That is, shorter wavelengths (and thus higher frequencies) correspond to higher energies. </para>
 
-<para
->For example, a wavelength of lambda = 10 meter lies in the radio region of the electromagnetic spectrum and has a frequency of f = c / lambda = 3 * 10^8 m/s / 10 = 30 MHz where c is the speed of light. The energy of this photon is E = h * v = 6.625 * 10^-34 J s * 30 Mhz = 1.988 * 10^-26 joules. On the other hand, visible light has much shorter wavelengths and higher frequencies. A photon that has a wavelength of lambda = 5 * 10^-9 meters (A greenish photon) has an energy E = 3.975 * 10^-17 joules which is over a billion times higher than the energy of a radio photon. Similarly, a photon of red light (wavelength lambda = 700 nm) has less energy than a photon of violet light (wavelength lambda = 400 nm). </para>
+<para>For example, a wavelength of lambda = 10 meter lies in the radio region of the electromagnetic spectrum and has a frequency of f = c / lambda = 3 * 10^8 m/s / 10 = 30 MHz where c is the speed of light. The energy of this photon is E = h * v = 6.625 * 10^-34 J s * 30 Mhz = 1.988 * 10^-26 joules. On the other hand, visible light has much shorter wavelengths and higher frequencies. A photon that has a wavelength of lambda = 5 * 10^-9 meters (A greenish photon) has an energy E = 3.975 * 10^-17 joules which is over a billion times higher than the energy of a radio photon. Similarly, a photon of red light (wavelength lambda = 700 nm) has less energy than a photon of violet light (wavelength lambda = 400 nm). </para>
 
-<para
->Luminosity depends both on temperature and surface area. This makes sense because a burning log radiates more energy than a match, even though both have the same temperature. Similarly, an iron rod heated to 2000 degrees emits more energy than when it is heated to only 200 degrees. </para>
+<para>Luminosity depends both on temperature and surface area. This makes sense because a burning log radiates more energy than a match, even though both have the same temperature. Similarly, an iron rod heated to 2000 degrees emits more energy than when it is heated to only 200 degrees. </para>
 
-<para
->Luminosity is a very fundamental quantity in Astronomy and Astrophysics. Much of what is learnt about celestial objects comes from analysing their light. This is because the physical processes that occur inside stars gets recorded and transmitted by light. Luminosity is measured in units of energy per second. Astronomers prefer to use Ergs, rather than Watts, when quantifying luminosity. </para>
+<para>Luminosity is a very fundamental quantity in Astronomy and Astrophysics. Much of what is learnt about celestial objects comes from analysing their light. This is because the physical processes that occur inside stars gets recorded and transmitted by light. Luminosity is measured in units of energy per second. Astronomers prefer to use Ergs, rather than Watts, when quantifying luminosity. </para>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/magnitude.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/magnitude.docbook
index 11c6ed98044..099f5b76913 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/magnitude.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/magnitude.docbook
@@ -1,60 +1,12 @@
 <sect1 id="ai-magnitude">
 <sect1info>
-<author
-><firstname
->Girish</firstname
-> <surname
->V</surname
-> </author>
+<author><firstname>Girish</firstname> <surname>V</surname> </author>
 </sect1info>
-<title
->Magnitude Scale</title>
-<indexterm
-><primary
->Magnitude Scale</primary>
-<seealso
->Flux</seealso
-> <seealso
->Star Colours and Temperatures</seealso
-> </indexterm>
-<para
->2500 years ago, the ancient Greek astronomer Hipparchus classified the brightnesses of visible stars in the sky on a scale from 1 to 6. He called the very brightest stars in the sky <quote
->first magnitude</quote
->, and the very faintest stars he could see <quote
->sixth magnitude</quote
->. Amazingly, two and a half millenia later, Hipparchus's classification scheme is still widely used by astronomers, although it has since been modernised and quantified.</para>
-<note
-><para
->The magnitude scale runs backwards to what you might expect: brighter stars have <emphasis
->smaller</emphasis
-> magnitudes than fainter stars). </para>
+<title>Magnitude Scale</title>
+<indexterm><primary>Magnitude Scale</primary>
+<seealso>Flux</seealso> <seealso>Star Colours and Temperatures</seealso> </indexterm>
+<para>2500 years ago, the ancient Greek astronomer Hipparchus classified the brightnesses of visible stars in the sky on a scale from 1 to 6. He called the very brightest stars in the sky <quote>first magnitude</quote>, and the very faintest stars he could see <quote>sixth magnitude</quote>. Amazingly, two and a half millenia later, Hipparchus's classification scheme is still widely used by astronomers, although it has since been modernised and quantified.</para>
+<note><para>The magnitude scale runs backwards to what you might expect: brighter stars have <emphasis>smaller</emphasis> magnitudes than fainter stars). </para>
 </note>
-<para
->The modern magnitude scale is a quantitative measurement of the <firstterm
->flux</firstterm
-> of light coming from a star, with a logarithmic scaling: </para
-><para
->m = m_0 - 2.5 log (F / F_0) </para
-><para
->If you do not understand the maths, this just says that the magnitude of a given star (m) is different from that of some standard star (m_0) by 2.5 times the logarithm of their flux ratio. The 2.5 *log factor means that if the flux ratio is 100, the difference in magnitudes is 5 mag. So, a 6th magnitude star is 100 times fainter than a 1st magnitude star. The reason Hipparchus's simple classification translates to a relatively complex function is that the human eye responds logarithmically to light. </para
-><para
->There are several different magnitude scales in use, each of which serves a different purpose. The most common is the apparent magnitude scale; this is just the measure of how bright stars (and other objects) look to the human eye. The apparent magnitude scale defines the star Vega to have magnitude 0.0, and assigns magnitudes to all other objects using the above equation, and a measure of the flux ratio of each object to Vega. </para
-><para
->It is difficult to understand stars using just the apparent magnitudes. Imagine two stars in the sky with the same apparent magnitude, so they appear to be equally bright. You cannot know just by looking if the two have the same <emphasis
->intrinsic</emphasis
-> brightness; it is possible that one star is intrinsically brighter, but further away. If we knew the distances to the stars (see the <link linkend="ai-parallax"
->parallax</link
-> article), we could account for their distances and assign <firstterm
->Absolute magnitudes</firstterm
-> which would reflect their true, intrinsic brightness. The absolute magnitude is defined as the apparent magnitude the star would have if observed from a distance of 10 parsecs (1 parsec is 3.26 light-years, or 3.1 x 10^18 cm). The absolute magnitude (M) can be determined from the apparent magnitude (m) and the distance in parsecs (d) using the formula: </para
-><para
->M = m + 5 - 5 * log(d) (note that M=m when d=10). </para
-><para
->The modern magnitude scale is no longer based on the human eye; it is based on photographic plates and photoelectric photometers. With telescopes, we can see objects much fainter than Hipparchus could see with his unaided eyes, so the magnitude scale has been extended beyond 6th magnitude. In fact, the Hubble Space Telescope can image stars nearly as faint as 30th magnitude, which is one <emphasis
->trillion</emphasis
-> times fainter than Vega. </para
-><para
->A final note: the magnitude is usually measured through a colour filter of some kind, and these magnitudes are denoted by a subscript describing the filter (&ie;, m_V is the magnitude through a <quote
->visual</quote
-> filter, which is greenish; m_B is the magnitude through a blue filter; m_pg is the photographic plate magnitude &etc;). </para>
+<para>The modern magnitude scale is a quantitative measurement of the <firstterm>flux</firstterm> of light coming from a star, with a logarithmic scaling: </para><para>m = m_0 - 2.5 log (F / F_0) </para><para>If you do not understand the maths, this just says that the magnitude of a given star (m) is different from that of some standard star (m_0) by 2.5 times the logarithm of their flux ratio. The 2.5 *log factor means that if the flux ratio is 100, the difference in magnitudes is 5 mag. So, a 6th magnitude star is 100 times fainter than a 1st magnitude star. The reason Hipparchus's simple classification translates to a relatively complex function is that the human eye responds logarithmically to light. </para><para>There are several different magnitude scales in use, each of which serves a different purpose. The most common is the apparent magnitude scale; this is just the measure of how bright stars (and other objects) look to the human eye. The apparent magnitude scale defines the star Vega to have magnitude 0.0, and assigns magnitudes to all other objects using the above equation, and a measure of the flux ratio of each object to Vega. </para><para>It is difficult to understand stars using just the apparent magnitudes. Imagine two stars in the sky with the same apparent magnitude, so they appear to be equally bright. You cannot know just by looking if the two have the same <emphasis>intrinsic</emphasis> brightness; it is possible that one star is intrinsically brighter, but further away. If we knew the distances to the stars (see the <link linkend="ai-parallax">parallax</link> article), we could account for their distances and assign <firstterm>Absolute magnitudes</firstterm> which would reflect their true, intrinsic brightness. The absolute magnitude is defined as the apparent magnitude the star would have if observed from a distance of 10 parsecs (1 parsec is 3.26 light-years, or 3.1 x 10^18 cm). The absolute magnitude (M) can be determined from the apparent magnitude (m) and the distance in parsecs (d) using the formula: </para><para>M = m + 5 - 5 * log(d) (note that M=m when d=10). </para><para>The modern magnitude scale is no longer based on the human eye; it is based on photographic plates and photoelectric photometers. With telescopes, we can see objects much fainter than Hipparchus could see with his unaided eyes, so the magnitude scale has been extended beyond 6th magnitude. In fact, the Hubble Space Telescope can image stars nearly as faint as 30th magnitude, which is one <emphasis>trillion</emphasis> times fainter than Vega. </para><para>A final note: the magnitude is usually measured through a colour filter of some kind, and these magnitudes are denoted by a subscript describing the filter (&ie;, m_V is the magnitude through a <quote>visual</quote> filter, which is greenish; m_B is the magnitude through a blue filter; m_pg is the photographic plate magnitude &etc;). </para>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/meridian.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/meridian.docbook
index 067464da584..17284fabcf8 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/meridian.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/meridian.docbook
@@ -1,41 +1,10 @@
 <sect1 id="ai-meridian">
 <sect1info>
-<author
-><firstname
->Jason</firstname
-> <surname
->Harris</surname
-> </author>
+<author><firstname>Jason</firstname> <surname>Harris</surname> </author>
 </sect1info>
-<title
->The Local Meridian</title>
-<indexterm
-><primary
->Local Meridian</primary>
-<seealso
->Hour Angle</seealso
-> <seealso
->Celestial Sphere</seealso
-> </indexterm>
-<para
->The Local Meridian is an imaginary <link linkend="ai-greatcircle"
->Great Circle</link
-> on the <link linkend="ai-csphere"
->Celestial Sphere</link
-> that is perpendicular to the local <link linkend="ai-horizon"
->Horizon</link
->. It passes through the North point on the Horizon, through the <link linkend="ai-cpoles"
->Celestial Pole</link
->, up to the <link linkend="ai-zenith"
->Zenith</link
->, and through the South point on the Horizon. </para
-><para
->Because it is fixed to the local Horizon, stars will appear to drift past the Local Meridian as the Earth spins. You can use an object's <link linkend="equatorial"
->Right Ascension</link
-> and the <link linkend="ai-sidereal"
->Local Sidereal Time</link
-> to determine when it will cross your Local Meridian (see <link linkend="ai-hourangle"
->Hour Angle</link
->). </para>
+<title>The Local Meridian</title>
+<indexterm><primary>Local Meridian</primary>
+<seealso>Hour Angle</seealso> <seealso>Celestial Sphere</seealso> </indexterm>
+<para>The Local Meridian is an imaginary <link linkend="ai-greatcircle">Great Circle</link> on the <link linkend="ai-csphere">Celestial Sphere</link> that is perpendicular to the local <link linkend="ai-horizon">Horizon</link>. It passes through the North point on the Horizon, through the <link linkend="ai-cpoles">Celestial Pole</link>, up to the <link linkend="ai-zenith">Zenith</link>, and through the South point on the Horizon. </para><para>Because it is fixed to the local Horizon, stars will appear to drift past the Local Meridian as the Earth spins. You can use an object's <link linkend="equatorial">Right Ascension</link> and the <link linkend="ai-sidereal">Local Sidereal Time</link> to determine when it will cross your Local Meridian (see <link linkend="ai-hourangle">Hour Angle</link>). </para>
 </sect1>
 
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/parallax.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/parallax.docbook
index ad19aa1c039..b88e8799308 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/parallax.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/parallax.docbook
@@ -1,62 +1,13 @@
 <sect1 id="ai-parallax">
 <sect1info>
-<author
-><firstname
->James</firstname
-> <surname
->Lindenschmidt</surname
-> </author>
+<author><firstname>James</firstname> <surname>Lindenschmidt</surname> </author>
 </sect1info>
-<title
->Parallax</title>
-<indexterm
-><primary
->Parallax</primary
-></indexterm>
-<indexterm
-><primary
->Astronomical Unit</primary
-><see
->Parallax</see
-></indexterm>
-<indexterm
-><primary
->Parsec</primary
-><see
->Parallax</see
-></indexterm>
- <para
-><firstterm
->Parallax</firstterm
-> is the apparent change of an observed object's position caused by a shift in the observer's position. As an example, hold your hand in front of you at arm's length, and observe an object on the other side of the room behind your hand. Now tilt your head to your right shoulder, and your hand will appear on the left side of the distant object. Tilt your head to your left shoulder, and your hand will appear to shift to the right side of the distant object. </para>
- <para
->Because the Earth is in orbit around the Sun, we observe the sky from a constantly moving position in space. Therefore, we should expect to see an <firstterm
->annual parallax</firstterm
-> effect, in which the positions of nearby objects appear to <quote
->wobble</quote
-> back and forth in response to our motion around the Sun. This does in fact happen, but the distances to even the nearest stars are so great that you need to make careful observations with a telescope to detect it<footnote
-><para
->The ancient Greek astronomers knew about parallax; because they could not observe an annual parallax in the positions of stars, they concluded that the Earth could not be in motion around the Sun. What they did not realise was that the stars are millions of times further away than the Sun, so the parallax effect is impossible to see with the unaided eye.</para
-></footnote
->. </para>
- <para
->Modern telescopes allow astronomers to use the annual parallax to measure the distance to nearby stars, using triangulation. The astronomer carefully measures the position of the star on two dates, spaced six months apart. The nearer the star is to the Sun, the larger the apparent shift in its position will be between the two dates. </para>
- <para
->Over the six-month period, the Earth has moved through half its orbit around the Sun; in this time its position has changed by 2 <firstterm
->Astronomical Units</firstterm
-> (abbreviated AU; 1 AU is the distance from the Earth to the Sun, or about 150 million kilometers). This sounds like a really long distance, but even the nearest star to the Sun (alpha Centauri) is about 40 <emphasis
->trillion</emphasis
-> kilometers away. Therefore, the annual parallax is very small, typically smaller than one <firstterm
->arcsecond</firstterm
->, which is only 1/3600 of one degree. A convenient distance unit for nearby stars is the <firstterm
->parsec</firstterm
->, which is short for "parallax arcsecond". One parsec is the distance a star would have if its observed parallax angle was one arcsecond. It is equal to 3.26 light-years, or 31 trillion kilometers<footnote
-><para
->Astronomers like this unit so much that they now use <quote
->kiloparsecs</quote
-> to measure galaxy-scale distances, and <quote
->Megaparsecs</quote
-> to measure intergalactic distances, even though these distances are much too large to have an actual, observable parallax. Other methods are required to determine these distances</para
-></footnote
->. </para>
+<title>Parallax</title>
+<indexterm><primary>Parallax</primary></indexterm>
+<indexterm><primary>Astronomical Unit</primary><see>Parallax</see></indexterm>
+<indexterm><primary>Parsec</primary><see>Parallax</see></indexterm>
+ <para><firstterm>Parallax</firstterm> is the apparent change of an observed object's position caused by a shift in the observer's position. As an example, hold your hand in front of you at arm's length, and observe an object on the other side of the room behind your hand. Now tilt your head to your right shoulder, and your hand will appear on the left side of the distant object. Tilt your head to your left shoulder, and your hand will appear to shift to the right side of the distant object. </para>
+ <para>Because the Earth is in orbit around the Sun, we observe the sky from a constantly moving position in space. Therefore, we should expect to see an <firstterm>annual parallax</firstterm> effect, in which the positions of nearby objects appear to <quote>wobble</quote> back and forth in response to our motion around the Sun. This does in fact happen, but the distances to even the nearest stars are so great that you need to make careful observations with a telescope to detect it<footnote><para>The ancient Greek astronomers knew about parallax; because they could not observe an annual parallax in the positions of stars, they concluded that the Earth could not be in motion around the Sun. What they did not realise was that the stars are millions of times further away than the Sun, so the parallax effect is impossible to see with the unaided eye.</para></footnote>. </para>
+ <para>Modern telescopes allow astronomers to use the annual parallax to measure the distance to nearby stars, using triangulation. The astronomer carefully measures the position of the star on two dates, spaced six months apart. The nearer the star is to the Sun, the larger the apparent shift in its position will be between the two dates. </para>
+ <para>Over the six-month period, the Earth has moved through half its orbit around the Sun; in this time its position has changed by 2 <firstterm>Astronomical Units</firstterm> (abbreviated AU; 1 AU is the distance from the Earth to the Sun, or about 150 million kilometers). This sounds like a really long distance, but even the nearest star to the Sun (alpha Centauri) is about 40 <emphasis>trillion</emphasis> kilometers away. Therefore, the annual parallax is very small, typically smaller than one <firstterm>arcsecond</firstterm>, which is only 1/3600 of one degree. A convenient distance unit for nearby stars is the <firstterm>parsec</firstterm>, which is short for "parallax arcsecond". One parsec is the distance a star would have if its observed parallax angle was one arcsecond. It is equal to 3.26 light-years, or 31 trillion kilometers<footnote><para>Astronomers like this unit so much that they now use <quote>kiloparsecs</quote> to measure galaxy-scale distances, and <quote>Megaparsecs</quote> to measure intergalactic distances, even though these distances are much too large to have an actual, observable parallax. Other methods are required to determine these distances</para></footnote>. </para>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/precession.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/precession.docbook
index 354fa09447b..efbd1d3a6f5 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/precession.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/precession.docbook
@@ -1,56 +1,13 @@
 <sect1 id="ai-precession">
 <sect1info>
-<author
-><firstname
->Jason</firstname
-> <surname
->Harris</surname
-> </author>
+<author><firstname>Jason</firstname> <surname>Harris</surname> </author>
 </sect1info>
-<title
->Precession</title>
-<indexterm
-><primary
->Precession</primary>
+<title>Precession</title>
+<indexterm><primary>Precession</primary>
 </indexterm>
-<para
-><firstterm
->Precession</firstterm
-> is the gradual change in the direction of the Earth's spin axis. The spin axis traces a cone, completing a full circuit in 26,000 years. If you have ever spun a top or a dreidel, the <quote
->wobbling</quote
-> rotation of the top as it spins is precession. </para
-><para
->Because the direction of the Earth's spin axis changes, so does the location of the <link linkend="ai-cpoles"
->Celestial Poles</link
->. </para
-><para
->The reason for the Earth's precession is complicated. The Earth is not a perfect sphere, it is a bit flattened, meaning the <link linkend="ai-greatcircle"
->Great Circle</link
-> of the equator is longer than a <quote
->meridonal</quote
-> great circle that passes through the poles. Also, the Moon and Sun lie outside the Earth's Equatorial plane. As a result, the gravitational pull of the Moon and Sun on the oblate Earth induces a slight <emphasis
->torque</emphasis
-> in addition to a linear force. This torque on the spinning body of the Earth leads to the precessional motion. </para>
+<para><firstterm>Precession</firstterm> is the gradual change in the direction of the Earth's spin axis. The spin axis traces a cone, completing a full circuit in 26,000 years. If you have ever spun a top or a dreidel, the <quote>wobbling</quote> rotation of the top as it spins is precession. </para><para>Because the direction of the Earth's spin axis changes, so does the location of the <link linkend="ai-cpoles">Celestial Poles</link>. </para><para>The reason for the Earth's precession is complicated. The Earth is not a perfect sphere, it is a bit flattened, meaning the <link linkend="ai-greatcircle">Great Circle</link> of the equator is longer than a <quote>meridonal</quote> great circle that passes through the poles. Also, the Moon and Sun lie outside the Earth's Equatorial plane. As a result, the gravitational pull of the Moon and Sun on the oblate Earth induces a slight <emphasis>torque</emphasis> in addition to a linear force. This torque on the spinning body of the Earth leads to the precessional motion. </para>
 <tip>
-<para
->Exercise:</para>
-<para
->Precession is easiest to see by observing the <link linkend="ai-cpoles"
->Celestial Pole</link
->. To find the pole, first switch to Equatorial Coordinates in the <guilabel
->Configure &kstars;</guilabel
-> window, and then hold down the <keycap
->Up arrow</keycap
-> key until the display stops scrolling. The declination displayed in the centre of the <guilabel
->Info Panel</guilabel
-> should be +90 degrees, and the bright star Polaris should be nearly at the centre of the screen. Try slewing with the left and right arrow keys. Notice that the sky appears to rotate around the Pole. </para
-><para
->We will now demonstrate Precession by changing the Date to a very remote year, and observing that the location of the Celestial Pole is no longer near Polaris. Open the <guilabel
->Set Time</guilabel
-> window (<keycombo action="simul"
->&Ctrl;<keycap
->S</keycap
-></keycombo
->), and set the date to the year 8000 (currently, &kstars; cannot handle dates much more remote than this, but this date is sufficient for our purposes). Notice that the sky display is now centred at a point between the constellations Cygnus and Cepheus. Verify that this is actually the pole by slewing left and right: the sky rotates about this point; in the year 8000, the North celestial pole will no longer be near Polaris. </para>
+<para>Exercise:</para>
+<para>Precession is easiest to see by observing the <link linkend="ai-cpoles">Celestial Pole</link>. To find the pole, first switch to Equatorial Coordinates in the <guilabel>Configure &kstars;</guilabel> window, and then hold down the <keycap>Up arrow</keycap> key until the display stops scrolling. The declination displayed in the centre of the <guilabel>Info Panel</guilabel> should be +90 degrees, and the bright star Polaris should be nearly at the centre of the screen. Try slewing with the left and right arrow keys. Notice that the sky appears to rotate around the Pole. </para><para>We will now demonstrate Precession by changing the Date to a very remote year, and observing that the location of the Celestial Pole is no longer near Polaris. Open the <guilabel>Set Time</guilabel> window (<keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo>), and set the date to the year 8000 (currently, &kstars; cannot handle dates much more remote than this, but this date is sufficient for our purposes). Notice that the sky display is now centred at a point between the constellations Cygnus and Cepheus. Verify that this is actually the pole by slewing left and right: the sky rotates about this point; in the year 8000, the North celestial pole will no longer be near Polaris. </para>
 </tip>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/quicktour.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/quicktour.docbook
index 229195bf066..c310571cabe 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/quicktour.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/quicktour.docbook
@@ -1,334 +1,141 @@
 <chapter id="using-kstars">
-<title
->A Quick Tour of &kstars;</title>
+<title>A Quick Tour of &kstars;</title>
 
-<para
->This chapter presents a guided tour of &kstars;, introducing many of its important features. </para>
+<para>This chapter presents a guided tour of &kstars;, introducing many of its important features. </para>
 
 <screenshot>
-<screeninfo
->Here is a screenshot of the &kstars; main window: </screeninfo>
+<screeninfo>Here is a screenshot of the &kstars; main window: </screeninfo>
 <mediaobject>
   <imageobject>
     <imagedata fileref="screen1.png" format="PNG"/>
   </imageobject>
   <textobject>
-    <phrase
->Main Window</phrase>
+    <phrase>Main Window</phrase>
   </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->The above screenshot shows a typical view of the KStars program. You can see the sky display centered on Betelgeuse, the brightest star in the constellation Orion. Orion has just risen above the eastern horizon. Stars are displayed with <link linkend="ai-colorandtemp"
->realistic colors</link
-> and relative brightnesses. M 42, the Orion Nebula, is visible on the right side of the screen, just above the horizon. If you look closely, you can also see the Sun and the planet Mercury in the upper left. In three corners of the sky display, there are on-screen text labels displaying data on the current time (<quote
->LT: 06:44:58 20 June 2004</quote
->), the current Geographic Location (<quote
->Tucson, Arizona, USA</quote
->), and the current object in the center of the display (<quote
->Focused on: Betelgeuse (alpha Orionis)</quote
->). Above the sky display, there are two toolbars. The main toolbar contains shortcuts for <link linkend="kstars-menus"
->menu functions</link
->, as well as a time-step widget which controls how fast the simulation clock runs. The view toolbar contains buttons that toggle the display of different kinds of objects in the sky. At the bottom of the window, there is a status bar which displays the name of any object you click on, and the <link linkend="ai-skycoords"
->sky coordinates</link
-> (both Right Ascension/Declination and Azimuth/Altitude) of the mouse cursor. </para>
+<para>The above screenshot shows a typical view of the KStars program. You can see the sky display centered on Betelgeuse, the brightest star in the constellation Orion. Orion has just risen above the eastern horizon. Stars are displayed with <link linkend="ai-colorandtemp">realistic colors</link> and relative brightnesses. M 42, the Orion Nebula, is visible on the right side of the screen, just above the horizon. If you look closely, you can also see the Sun and the planet Mercury in the upper left. In three corners of the sky display, there are on-screen text labels displaying data on the current time (<quote>LT: 06:44:58 20 June 2004</quote>), the current Geographic Location (<quote>Tucson, Arizona, USA</quote>), and the current object in the center of the display (<quote>Focused on: Betelgeuse (alpha Orionis)</quote>). Above the sky display, there are two toolbars. The main toolbar contains shortcuts for <link linkend="kstars-menus">menu functions</link>, as well as a time-step widget which controls how fast the simulation clock runs. The view toolbar contains buttons that toggle the display of different kinds of objects in the sky. At the bottom of the window, there is a status bar which displays the name of any object you click on, and the <link linkend="ai-skycoords">sky coordinates</link> (both Right Ascension/Declination and Azimuth/Altitude) of the mouse cursor. </para>
 
 <sect1 id="startwizard">
-<title
->The Setup Wizard</title>
+<title>The Setup Wizard</title>
 <para>
-<indexterm
-><primary
->Setup Wizard</primary
-></indexterm
-> The first time you run KStars, you will be presented with a Setup Wizard, which allows you to easily set your geographic location and download some extra data files. You can press the <guilabel
->Finish</guilabel
-> button at any time to exit the Setup Wizard. </para>
+<indexterm><primary>Setup Wizard</primary></indexterm> The first time you run KStars, you will be presented with a Setup Wizard, which allows you to easily set your geographic location and download some extra data files. You can press the <guilabel>Finish</guilabel> button at any time to exit the Setup Wizard. </para>
 
-<para
->The first page of the Setup Wizard allows you to choose the starting geographic location, by selecting from the list of the 2500+ known locations on the right side of the window. The list of locations can be filtered to match the text you enter in the <guilabel
->City</guilabel
->, <guilabel
->Province</guilabel
->, and <guilabel
->Country</guilabel
-> edit boxes. If your desired location is not present in the list, you can select a nearby city instead for now. Later on, you can add your precise location manually using the <link linkend="setgeo"
->Set Geographic Location tool</link
->. Once you have selected a starting location, press the <guilabel
->Next</guilabel
-> button. </para>
+<para>The first page of the Setup Wizard allows you to choose the starting geographic location, by selecting from the list of the 2500+ known locations on the right side of the window. The list of locations can be filtered to match the text you enter in the <guilabel>City</guilabel>, <guilabel>Province</guilabel>, and <guilabel>Country</guilabel> edit boxes. If your desired location is not present in the list, you can select a nearby city instead for now. Later on, you can add your precise location manually using the <link linkend="setgeo">Set Geographic Location tool</link>. Once you have selected a starting location, press the <guilabel>Next</guilabel> button. </para>
 
-<para
->The second page of the Setup Wizard allows you to download extra data that are not included with the standard distribution of &kstars;. Simply press the <guilabel
->Download Extra Data</guilabel
-> button to open the <guilabel
->Get New Stuff</guilabel
-> tool. When you are all done, press the <guilabel
->Finish</guilabel
-> button in the Setup Wizard to start exploring &kstars;. </para>
+<para>The second page of the Setup Wizard allows you to download extra data that are not included with the standard distribution of &kstars;. Simply press the <guilabel>Download Extra Data</guilabel> button to open the <guilabel>Get New Stuff</guilabel> tool. When you are all done, press the <guilabel>Finish</guilabel> button in the Setup Wizard to start exploring &kstars;. </para>
 
 <note>
-<para
->The Download Extra Data tool is only available if you have KDE 3.3.x installed. </para>
+<para>The Download Extra Data tool is only available if you have KDE 3.3.x installed. </para>
 </note>
 </sect1>
 
 <sect1 id="lookaround">
-<title
->Have a Look Around</title>
+<title>Have a Look Around</title>
 <para>
-<indexterm
-><primary
->Navigation Controls</primary>
-<secondary
->Basics</secondary
-></indexterm>
-Now that we have the time and location set, let us have a look around. You can pan the display using the arrow keys. If you hold down the &Shift; key before panning, the scrolling speed is doubled. The display can also be panned by clicking and dragging with the mouse. Note that while the display is scrolling, not all objects are displayed. This is done to cut down on the <acronym
->CPU</acronym
-> load of recomputing object positions, which makes the scrolling smoother (you can configure what gets hidden while scrolling in the <link linkend="config"
->Configure &kstars;</link
-> window). There are seven ways to change the magnification (or <firstterm
->Zoom level</firstterm
->) of the display:</para>
+<indexterm><primary>Navigation Controls</primary>
+<secondary>Basics</secondary></indexterm>
+Now that we have the time and location set, let us have a look around. You can pan the display using the arrow keys. If you hold down the &Shift; key before panning, the scrolling speed is doubled. The display can also be panned by clicking and dragging with the mouse. Note that while the display is scrolling, not all objects are displayed. This is done to cut down on the <acronym>CPU</acronym> load of recomputing object positions, which makes the scrolling smoother (you can configure what gets hidden while scrolling in the <link linkend="config">Configure &kstars;</link> window). There are seven ways to change the magnification (or <firstterm>Zoom level</firstterm>) of the display:</para>
 
 <orderedlist>
 <listitem>
-	<para
->Use the <keycap
->+</keycap
-> and <keycap
->-</keycap
-> keys</para>
+	<para>Use the <keycap>+</keycap> and <keycap>-</keycap> keys</para>
 </listitem>
 <listitem>
-	<para
->Press the Zoom In/Zoom Out buttons in the toolbar</para>
+	<para>Press the Zoom In/Zoom Out buttons in the toolbar</para>
 </listitem>
 <listitem>
-	<para
->Select <guimenuitem
->Zoom In</guimenuitem
->/<guimenuitem
->Zoom Out</guimenuitem
-> from the <guimenu
->View</guimenu
-> menu</para>
+	<para>Select <guimenuitem>Zoom In</guimenuitem>/<guimenuitem>Zoom Out</guimenuitem> from the <guimenu>View</guimenu> menu</para>
 </listitem>
 <listitem>
-	<para
->Select <guimenuitem
->Zoom to Angular Size...</guimenuitem
-> from the <guimenu
->View</guimenu
-> menu. This allows you to specify the the field-of-view angle for the display, in degrees.</para>
+	<para>Select <guimenuitem>Zoom to Angular Size...</guimenuitem> from the <guimenu>View</guimenu> menu. This allows you to specify the the field-of-view angle for the display, in degrees.</para>
 </listitem>
 <listitem>
-	<para
->Use the scroll wheel on your mouse</para>
+	<para>Use the scroll wheel on your mouse</para>
 </listitem>
 <listitem>
-	<para
->Drag the mouse up and down with the &MMB; pressed.</para>
+	<para>Drag the mouse up and down with the &MMB; pressed.</para>
 </listitem>
 <listitem>
-	<para
->Hold down &Ctrl; while dragging the mouse. This will allow you to define a rectangle in the map. When you release the mouse button, the display will zoom to match the rectangle.</para>
+	<para>Hold down &Ctrl; while dragging the mouse. This will allow you to define a rectangle in the map. When you release the mouse button, the display will zoom to match the rectangle.</para>
 </listitem>
 </orderedlist>
 
-<para
->Notice that as you zoom in, you can see fainter stars than at lower zoom settings.</para>
+<para>Notice that as you zoom in, you can see fainter stars than at lower zoom settings.</para>
 
-<para
->Zoom out until you can see a green curve; this represents your local <link linkend="ai-horizon"
->horizon</link
->. If you have not adjusted the default &kstars; configuration, the display will be solid green below the horizon, representing the solid ground of the Earth. There is also a white curve, which represents the <link linkend="ai-cequator"
->celestial equator</link
->, and a tan curve, which represents the <link linkend="ai-ecliptic"
->Ecliptic</link
->, the path that the Sun appears to follow across the sky over the course of a year. The Sun is always found somewhere along the Ecliptic, and the planets are never far from it. </para>
+<para>Zoom out until you can see a green curve; this represents your local <link linkend="ai-horizon">horizon</link>. If you have not adjusted the default &kstars; configuration, the display will be solid green below the horizon, representing the solid ground of the Earth. There is also a white curve, which represents the <link linkend="ai-cequator">celestial equator</link>, and a tan curve, which represents the <link linkend="ai-ecliptic">Ecliptic</link>, the path that the Sun appears to follow across the sky over the course of a year. The Sun is always found somewhere along the Ecliptic, and the planets are never far from it. </para>
 </sect1>
 
 <sect1 id="skyobjects">
-<title
->Objects in the Sky</title>
+<title>Objects in the Sky</title>
 <para>
-<indexterm
-><primary
->Objects in the Sky</primary>
-<secondary
->Overview</secondary
-></indexterm>
-&kstars; displays thousands of celestial objects: stars, planets, comets, asteroids, clusters, nebulae and galaxies. You can interact with displayed objects to perform actions on them or obtain more information about them. Clicking on an object will identify it in the status bar, and simply hovering the mouse cursor on an object will label it temporarily in the map. Double-clicking will re-centre the display on the object and begin tracking it (so that it will remain centred as time passes). <mousebutton
->Right</mousebutton
-> clicking an object opens the object's popup menu, which provides more options. </para>
+<indexterm><primary>Objects in the Sky</primary>
+<secondary>Overview</secondary></indexterm>
+&kstars; displays thousands of celestial objects: stars, planets, comets, asteroids, clusters, nebulae and galaxies. You can interact with displayed objects to perform actions on them or obtain more information about them. Clicking on an object will identify it in the status bar, and simply hovering the mouse cursor on an object will label it temporarily in the map. Double-clicking will re-centre the display on the object and begin tracking it (so that it will remain centred as time passes). <mousebutton>Right</mousebutton> clicking an object opens the object's popup menu, which provides more options. </para>
 
 <sect2 id="popupquick">
-<title
->The Popup Menu</title>
-<indexterm
-><primary
->Popup Menu</primary
-><secondary
->Example</secondary
-></indexterm>
+<title>The Popup Menu</title>
+<indexterm><primary>Popup Menu</primary><secondary>Example</secondary></indexterm>
 
-<para
->Here is an example of the <mousebutton
->right</mousebutton
-> click popup menu, for the Orion Nebula: </para>
+<para>Here is an example of the <mousebutton>right</mousebutton> click popup menu, for the Orion Nebula: </para>
 
 <screenshot>
-<screeninfo
->Popup Menu for M 42</screeninfo>
+<screeninfo>Popup Menu for M 42</screeninfo>
 <mediaobject>
   <imageobject>
     <imagedata fileref="popup.png" format="PNG"/>
   </imageobject>
   <textobject>
-    <phrase
->Popup Menu for M 42</phrase>
+    <phrase>Popup Menu for M 42</phrase>
   </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->The appearance of the popup menu depends somewhat on the kind of object you <mousebutton
->right</mousebutton
->-click on, but the basic structure is listed below. You can get <link linkend="popup-menu"
->more detailed information about the popup menu</link
->. </para>
+<para>The appearance of the popup menu depends somewhat on the kind of object you <mousebutton>right</mousebutton>-click on, but the basic structure is listed below. You can get <link linkend="popup-menu">more detailed information about the popup menu</link>. </para>
 
-<para
->The top section contains information labels (which are not selectable). The top one to three labels display the object's name(s) and object type. The next three labels show the object's rise, transit and set times. If the rise and set times say "circumpolar", it means that the object is always above the horizon for the present location. </para>
-<para
->The middle section contains items for performing actions on the object, such as <guimenuitem
->Center and Track</guimenuitem
->, <guimenuitem
->Angular Distance To...</guimenuitem
-> (which enters the Angular Distance Mode, allowing you to measure the angle between objects in the sky), <guimenuitem
->Details...</guimenuitem
-> (which opens the object's <link linkend="tool-details"
->Object Details window</link
->), <guimenuitem
->Attach Label</guimenuitem
-> and <guimenuitem
->Add/Remove Trail</guimenuitem
-> (only available for Solar System bodies). </para>
+<para>The top section contains information labels (which are not selectable). The top one to three labels display the object's name(s) and object type. The next three labels show the object's rise, transit and set times. If the rise and set times say "circumpolar", it means that the object is always above the horizon for the present location. </para>
+<para>The middle section contains items for performing actions on the object, such as <guimenuitem>Center and Track</guimenuitem>, <guimenuitem>Angular Distance To...</guimenuitem> (which enters the Angular Distance Mode, allowing you to measure the angle between objects in the sky), <guimenuitem>Details...</guimenuitem> (which opens the object's <link linkend="tool-details">Object Details window</link>), <guimenuitem>Attach Label</guimenuitem> and <guimenuitem>Add/Remove Trail</guimenuitem> (only available for Solar System bodies). </para>
 <para>
-<indexterm
-><primary
->Objects in the Sky</primary>
-<secondary
->Internet Links</secondary>
-<seealso
->Popup Menu</seealso
-></indexterm>
-The bottom section contains links to images and/or informative webpages about the selected object. If you know of an additional &URL; with information or an image of the object, you can add a custom link to the object's popup menu using the <guimenuitem
->Add Link...</guimenuitem
-> item. </para>
+<indexterm><primary>Objects in the Sky</primary>
+<secondary>Internet Links</secondary>
+<seealso>Popup Menu</seealso></indexterm>
+The bottom section contains links to images and/or informative webpages about the selected object. If you know of an additional &URL; with information or an image of the object, you can add a custom link to the object's popup menu using the <guimenuitem>Add Link...</guimenuitem> item. </para>
 </sect2>
 
 <sect2 id="findobjects">
-<title
->Finding Objects</title>
-<indexterm
-><primary
->Find Object Tool</primary
-></indexterm>
-<indexterm
-><primary
->Objects in the Sky</primary>
-<secondary
->Finding by Name</secondary
-></indexterm>
-<para
->You can search for named objects using the <guilabel
->Find Object</guilabel
-> tool, which can be opened by clicking on the <guiicon
->search</guiicon
-> icon in the toolbar, by selecting <guimenuitem
->Find Object...</guimenuitem
-> from the <guimenu
->Pointing</guimenu
-> menu, or by pressing <keycombo action="simul"
->&Ctrl;<keycap
->F</keycap
-></keycombo
->. The <guilabel
->Find Object</guilabel
-> window is shown below: <screenshot>
-<screeninfo
->Find Object Window</screeninfo>
+<title>Finding Objects</title>
+<indexterm><primary>Find Object Tool</primary></indexterm>
+<indexterm><primary>Objects in the Sky</primary>
+<secondary>Finding by Name</secondary></indexterm>
+<para>You can search for named objects using the <guilabel>Find Object</guilabel> tool, which can be opened by clicking on the <guiicon>search</guiicon> icon in the toolbar, by selecting <guimenuitem>Find Object...</guimenuitem> from the <guimenu>Pointing</guimenu> menu, or by pressing <keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo>. The <guilabel>Find Object</guilabel> window is shown below: <screenshot>
+<screeninfo>Find Object Window</screeninfo>
 <mediaobject>
   <imageobject>
     <imagedata fileref="find.png" format="PNG"/>
   </imageobject>
   <textobject>
-    <phrase
->Find Object Window</phrase>
+    <phrase>Find Object Window</phrase>
   </textobject>
 </mediaobject>
 </screenshot>
 </para>
 
-<para
->The window contains a list of all the named objects that &kstars; is aware of. Many of the objects only have a numeric catalogue name (for example, NGC 3077), but some objects have a common name as well (for example, Whirlpool Galaxy). You can filter the list by name and by object type. To filter by name, enter a string in the edit box at the top of the window; the list will then only contain names which start with that string. To filter by type, select a type from the combo box at the bottom of the window. </para
-><para
->To centre the display on an object, highlight the desired object in the list, and press <guibutton
->Ok</guibutton
->. Note that if the object is below the horizon, the program will warn you that you may not see anything except the ground (you can make the ground invisible in the <guilabel
->Display Options</guilabel
-> window, or by pressing the <guiicon
->Ground</guiicon
-> button in the View toolbar). </para>
+<para>The window contains a list of all the named objects that &kstars; is aware of. Many of the objects only have a numeric catalogue name (for example, NGC 3077), but some objects have a common name as well (for example, Whirlpool Galaxy). You can filter the list by name and by object type. To filter by name, enter a string in the edit box at the top of the window; the list will then only contain names which start with that string. To filter by type, select a type from the combo box at the bottom of the window. </para><para>To centre the display on an object, highlight the desired object in the list, and press <guibutton>Ok</guibutton>. Note that if the object is below the horizon, the program will warn you that you may not see anything except the ground (you can make the ground invisible in the <guilabel>Display Options</guilabel> window, or by pressing the <guiicon>Ground</guiicon> button in the View toolbar). </para>
 <para>
-<indexterm
-><primary
->Objects in the Sky</primary>
-<secondary
->Tracking</secondary
-></indexterm>
-&kstars; will automatically begin tracking on an object whenever one is centred in the display, either by using the <guilabel
->Find Object</guilabel
-> window, by double-clicking on it, or by selecting <guimenuitem
->Center and Track</guimenuitem
-> from its <mousebutton
->right</mousebutton
->-click popup menu. You can disengage tracking by panning the display, pressing the <guiicon
->Lock</guiicon
-> icon in the Main toolbar, or selecting <guimenuitem
->Track Object</guimenuitem
-> from the <guimenu
->Pointing</guimenu
-> menu. </para>
+<indexterm><primary>Objects in the Sky</primary>
+<secondary>Tracking</secondary></indexterm>
+&kstars; will automatically begin tracking on an object whenever one is centred in the display, either by using the <guilabel>Find Object</guilabel> window, by double-clicking on it, or by selecting <guimenuitem>Center and Track</guimenuitem> from its <mousebutton>right</mousebutton>-click popup menu. You can disengage tracking by panning the display, pressing the <guiicon>Lock</guiicon> icon in the Main toolbar, or selecting <guimenuitem>Track Object</guimenuitem> from the <guimenu>Pointing</guimenu> menu. </para>
 
 <note>
 <para>
-<indexterm
-><primary
->Orbit Trails</primary>
-<secondary
->Attached to centred object</secondary>
+<indexterm><primary>Orbit Trails</primary>
+<secondary>Attached to centred object</secondary>
 </indexterm>
-When tracking on a Solar System body, &kstars; will automatically attach an <quote
->orbit trail</quote
->, showing the path of the body across the sky. You will likely need to change the clock's timestep to a large value (such as <quote
->1 day</quote
->) to see the trail. </para>
+When tracking on a Solar System body, &kstars; will automatically attach an <quote>orbit trail</quote>, showing the path of the body across the sky. You will likely need to change the clock's timestep to a large value (such as <quote>1 day</quote>) to see the trail. </para>
 </note>
 
-<para
->This concludes the tour of &kstars;, although we have only scratched the surface of the available features. &kstars; includes many useful <link linkend="tools"
->astronomy tools</link
->, it can directly <link linkend="indi"
->control your telescope</link
->, and it offers a wide variety of <link linkend="config"
->configuration and customization</link
-> options. In addition, this Handbook includes the <link linkend="astroinfo"
->AstroInfo Project</link
->, a series of short, interlinked articles explaining some of the celestial and astrophysical concepts behind &kstars;. </para>
+<para>This concludes the tour of &kstars;, although we have only scratched the surface of the available features. &kstars; includes many useful <link linkend="tools">astronomy tools</link>, it can directly <link linkend="indi">control your telescope</link>, and it offers a wide variety of <link linkend="config">configuration and customization</link> options. In addition, this Handbook includes the <link linkend="astroinfo">AstroInfo Project</link>, a series of short, interlinked articles explaining some of the celestial and astrophysical concepts behind &kstars;. </para>
 
 </sect2>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/retrograde.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/retrograde.docbook
index b60374831cd..077356ad321 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/retrograde.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/retrograde.docbook
@@ -1,31 +1,10 @@
 <sect1 id="ai-retrograde">
 <sect1info>
-<author
-><firstname
->John</firstname
-> <surname
->Cirillo</surname
-> </author>
+<author><firstname>John</firstname> <surname>Cirillo</surname> </author>
 </sect1info>
-<title
->Retrograde Motion</title>
-<indexterm
-><primary
->Retrograde Motion</primary>
+<title>Retrograde Motion</title>
+<indexterm><primary>Retrograde Motion</primary>
 </indexterm>
 
-<para
-><firstterm
->Retrograde Motion</firstterm
-> is the orbital motion of a body in a direction opposite that which is normal to spatial bodies within a given system. </para
-><para
->When we observe the sky, we expect most objects to appear to move in a particular direction with the passing of time. The apparent motion of most bodies in the sky is from east to west. However it is possible to observe a body moving west to east, such as an artificial satellite or space shuttle that is orbiting eastward. This orbit is considered Retrograde Motion. </para
-><para
->Retrograde Motion is most often used in reference to the motion of the outer planets (Mars, Jupiter, Saturn, and so forth). Though these planets appear to move from east to west on a nightly basis in response to the spin of the Earth, they are actually drifting slowly eastward with respect to the stationary stars, which can be observed by noting the position of these planets for several nights in a row. This motion is normal for these planets, however, and not considered Retrograde Motion. However, since the Earth completes its orbit in a shorter period of time than these outer planets, we occasionally overtake an outer planet, like a faster car on a multiple-lane highway. When this occurs, the planet we are passing will first appear to stop its eastward drift, and it will then appear to drift back toward the west. This is Retrograde Motion, since it is in a direction opposite that which is typical for planets. Finally, as the Earth swings past the the planet in its orbit, they appear to resume their normal west-to-east drift on successive nights. </para
-><para
->This Retrograde Motion of the planets puzzled ancient Greek astronomers, and was one reason why they named these bodies <quote
->planets</quote
-> which in Greek means <quote
->wanderers</quote
->. </para>
+<para><firstterm>Retrograde Motion</firstterm> is the orbital motion of a body in a direction opposite that which is normal to spatial bodies within a given system. </para><para>When we observe the sky, we expect most objects to appear to move in a particular direction with the passing of time. The apparent motion of most bodies in the sky is from east to west. However it is possible to observe a body moving west to east, such as an artificial satellite or space shuttle that is orbiting eastward. This orbit is considered Retrograde Motion. </para><para>Retrograde Motion is most often used in reference to the motion of the outer planets (Mars, Jupiter, Saturn, and so forth). Though these planets appear to move from east to west on a nightly basis in response to the spin of the Earth, they are actually drifting slowly eastward with respect to the stationary stars, which can be observed by noting the position of these planets for several nights in a row. This motion is normal for these planets, however, and not considered Retrograde Motion. However, since the Earth completes its orbit in a shorter period of time than these outer planets, we occasionally overtake an outer planet, like a faster car on a multiple-lane highway. When this occurs, the planet we are passing will first appear to stop its eastward drift, and it will then appear to drift back toward the west. This is Retrograde Motion, since it is in a direction opposite that which is typical for planets. Finally, as the Earth swings past the the planet in its orbit, they appear to resume their normal west-to-east drift on successive nights. </para><para>This Retrograde Motion of the planets puzzled ancient Greek astronomers, and was one reason why they named these bodies <quote>planets</quote> which in Greek means <quote>wanderers</quote>. </para>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/scriptbuilder.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/scriptbuilder.docbook
index d98a71ba0ba..cd1bd230641 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/scriptbuilder.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/scriptbuilder.docbook
@@ -1,154 +1,35 @@
 <sect1 id="tool-scriptbuilder">
-<title
->The Script Builder Tool</title>
-<indexterm
-><primary
->Tools</primary>
-<secondary
->Script Builder</secondary>
+<title>The Script Builder Tool</title>
+<indexterm><primary>Tools</primary>
+<secondary>Script Builder</secondary>
 </indexterm>
 
-<para
->TDE applications can be controlled externally from another program, from a console prompt, or from a shell script using the Desktop COmmunication Protocol (<abbrev
->DCOP</abbrev
->). KStars takes advantage of this feature to allow rather complex behaviours to be scripted and played back at any time. This can be used, for example, to create a classroom demo to illustrate an astronomical concept. </para>
-<para
->The problem with DCOP scripts is, writing them is a bit like programming, and can seem a daunting task to those who do not have programming experience. The Script Builder Tool provides a <abbrev
->GUI</abbrev
-> point-and-click interface for constructing KStars DCOP scripts, making it very easy to create complex scripts. </para>
+<para>TDE applications can be controlled externally from another program, from a console prompt, or from a shell script using the Desktop COmmunication Protocol (<abbrev>DCOP</abbrev>). KStars takes advantage of this feature to allow rather complex behaviours to be scripted and played back at any time. This can be used, for example, to create a classroom demo to illustrate an astronomical concept. </para>
+<para>The problem with DCOP scripts is, writing them is a bit like programming, and can seem a daunting task to those who do not have programming experience. The Script Builder Tool provides a <abbrev>GUI</abbrev> point-and-click interface for constructing KStars DCOP scripts, making it very easy to create complex scripts. </para>
 
 <sect2 id="sb-intro">
-<title
->Introduction to the Script Builder</title>
+<title>Introduction to the Script Builder</title>
 
-<para
->Before explaining how to use the Script Builder, I provide a very brief introduction to all of the <abbrev
->GUI</abbrev
-> components; for more infomation, use the "What's This?" function. </para>
+<para>Before explaining how to use the Script Builder, I provide a very brief introduction to all of the <abbrev>GUI</abbrev> components; for more infomation, use the "What's This?" function. </para>
 
 <screenshot>
-<screeninfo
->The Script Builder Tool </screeninfo>
+<screeninfo>The Script Builder Tool </screeninfo>
 <mediaobject>
   <imageobject>
     <imagedata fileref="scriptbuilder.png" format="PNG"/>
   </imageobject>
   <textobject>
-    <phrase
->Script Builder Tool</phrase>
+    <phrase>Script Builder Tool</phrase>
   </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->The Script Builder is shown in the above screenshot. The box on the left is the <firstterm
->Current Script box</firstterm
->; it shows the list of commands that comprise the current working script. The box on the right is the <firstterm
->Function Browser</firstterm
->; it displays the list of all available script functions. Below the Function Browser, there is a small panel which will display short documentation about the script function highlighted in the Function Browser. The panel below the Current Script box is the <firstterm
->Function Arguments panel</firstterm
->; when a function is highlighted in the Current Script box, this panel will contain items for specifying values for any arguments that the highlighted function requires. </para
-><para
->Along the top of the window, there is a row of buttons which operate on the script as a whole. From left to right, they are: <guibutton
->New Script</guibutton
->, <guibutton
->Open Script</guibutton
->, <guibutton
->Save Script</guibutton
->, <guibutton
->Save Script As...</guibutton
->, and <guibutton
->Test Script</guibutton
->. The function of these buttons should be obvious, except perhaps the last button. Pressing <guibutton
->Test Script</guibutton
-> will attempt to run the current script in the main KStars window. You should move the Script Builder window out of the way before pressing this, so you can see the results. </para
-><para
->In the centre of the window, there is a column of buttons which operate on individual script functions. From top to bottom, they are: <guibutton
->Add Function</guibutton
->, <guibutton
->Remove Function</guibutton
->, <guibutton
->Copy Function</guibutton
->, <guibutton
->Move Up</guibutton
->, and <guibutton
->Move Down</guibutton
->. <guibutton
->Add Function</guibutton
-> adds the currently-highlighted function in the Function Browser to the Current Script box (you can also add a function by double-clicking on it). The rest of the buttons operate on the function highlighted in the Current Script box, either removing it, duplicating it, or changing its position in the current script. </para>
+<para>The Script Builder is shown in the above screenshot. The box on the left is the <firstterm>Current Script box</firstterm>; it shows the list of commands that comprise the current working script. The box on the right is the <firstterm>Function Browser</firstterm>; it displays the list of all available script functions. Below the Function Browser, there is a small panel which will display short documentation about the script function highlighted in the Function Browser. The panel below the Current Script box is the <firstterm>Function Arguments panel</firstterm>; when a function is highlighted in the Current Script box, this panel will contain items for specifying values for any arguments that the highlighted function requires. </para><para>Along the top of the window, there is a row of buttons which operate on the script as a whole. From left to right, they are: <guibutton>New Script</guibutton>, <guibutton>Open Script</guibutton>, <guibutton>Save Script</guibutton>, <guibutton>Save Script As...</guibutton>, and <guibutton>Test Script</guibutton>. The function of these buttons should be obvious, except perhaps the last button. Pressing <guibutton>Test Script</guibutton> will attempt to run the current script in the main KStars window. You should move the Script Builder window out of the way before pressing this, so you can see the results. </para><para>In the centre of the window, there is a column of buttons which operate on individual script functions. From top to bottom, they are: <guibutton>Add Function</guibutton>, <guibutton>Remove Function</guibutton>, <guibutton>Copy Function</guibutton>, <guibutton>Move Up</guibutton>, and <guibutton>Move Down</guibutton>. <guibutton>Add Function</guibutton> adds the currently-highlighted function in the Function Browser to the Current Script box (you can also add a function by double-clicking on it). The rest of the buttons operate on the function highlighted in the Current Script box, either removing it, duplicating it, or changing its position in the current script. </para>
 </sect2>
 
 <sect2 id="sb-using">
-<title
->Using the Script Builder</title>
-<para
->In order to illustrate using the Script Builder, we present a small tutorial example where we make a script that tracks the Moon while the clock runs at an accelerated rate. </para
-><para
->If we are going to track the Moon, we will need to point the display at it first. The <firstterm
->lookToward</firstterm
-> function is used to do this. Highlight this function in the Function Browser, and note the documentation displayed in the panel below the Browser. Press the <guibutton
->Add Function</guibutton
-> button to add this function to the Current Script box. The Function Arguments panel will now contain a combobox labelled <quote
->dir</quote
->, short for direction. This is the direction in which the display should be pointed. The combobox contains only the cardinal compass points, not the Moon or any other objects. You can either enter <quote
->Moon</quote
-> in the box manually, or press the <guibutton
->Object</guibutton
-> button to use the <guilabel
->Find Object</guilabel
-> window to select the Moon from the list of named objects. Note that, as usual, centring on an object automatically engages object-tracking mode, so there is no need to add the <firstterm
->setTracking</firstterm
-> function after lookToward. </para
-><para
->Now that we have taken care of pointing at the Moon, we next want to make time pass at an accelerated rate. Use the <firstterm
->setClockScale</firstterm
-> function for this. Add it to the script by double-clicking on it in the Function Browser. The Function Arguments panel contains a timestep spinbox for setting the desired time step for the simulation clock. Change the timestep to 3 hours. </para
-><para
->OK, we have pointed at the Moon and accelerated the clock. Now we just want the script to wait for several seconds while the display tracks on the Moon. Add the <firstterm
->waitFor</firstterm
-> function to the script, and use the Function Arguments panel to specify that it should wait for 20 seconds before continuing. </para
-><para
->To finish up, let us reset the clock's timestep to the normal value of 1 second. Add another instance of setClockScale, and set its value to 1 sec. </para
-><para
->Actually, we are not quite done yet. We should probably make sure that the display is using Equatorial coordinates before the script tracks the Moon with an accelerated time step. Otherwise, if the display is using Horizontal coordinates, it will rotate very quickly through large angles as the Moon rises and sets. This can be very confusing, and is avoided by setting the View Option <firstterm
->UseAltAz</firstterm
-> to <quote
->false</quote
->. To change any View Option, use the <firstterm
->changeViewOption</firstterm
-> function. Add this function to the script, and examine the Function Arguments panel. There is a combobox which contains the list of all options which can be adjusted by changeViewOption. Since we know we want the UseAltAz option, we could simply select it from the combobox. However, the list is quite long, and there is no explanation of what each item is for. It therefore may be easier to press the <guibutton
->Browse Tree</guibutton
-> button, which will open a window containing a tree view of the available options, organised by topic. In addition, each item has a short explanation of what the option does, and the data type of the option's value. We find UseAltAz under the <guilabel
->Skymap options</guilabel
-> category. Just highlight this item and press <guibutton
->OK</guibutton
->, and it will be selected in the combobox of the Function Arguments panel. Finally, make its value <quote
->false</quote
-> or <quote
->0</quote
->. </para
-><para
->One more step: changing UseAltAz at the end of the script does us no good; we need this to be changed before anything else happens. So, make sure this function is highlighted in the Current Script box, and press the <guibutton
->Move Up</guibutton
-> button until it is the first function. </para
-><para
->Now that we have finished the script, we should save it to disk. Press the <guibutton
->Save Script</guibutton
-> button. This will first open a window in which you can provide a name for the script, and fill in your name as the author. Enter <quote
->Tracking the Moon</quote
-> for a name, and your name as the author, and press <guibutton
->OK</guibutton
->. Next, you will see the standard &kde; Save File dialog. Specify a filename for the script and press <guibutton
->OK</guibutton
-> to save the script. Note that if your filename does not end with <quote
->.kstars</quote
->, this suffix will be automatically attached. If you are curious, you can examine the script file with any text editor. </para
-><para
->Now that we have a completed script, we can run it in a couple of ways. From a console prompt, you can simply execute the script as long as an instance of KStars is currently running. Alternatively, you can execute the script from within KStars using the <guimenuitem
->Run Script</guimenuitem
-> item in the <guimenu
->File</guimenu
-> menu. </para>
+<title>Using the Script Builder</title>
+<para>In order to illustrate using the Script Builder, we present a small tutorial example where we make a script that tracks the Moon while the clock runs at an accelerated rate. </para><para>If we are going to track the Moon, we will need to point the display at it first. The <firstterm>lookToward</firstterm> function is used to do this. Highlight this function in the Function Browser, and note the documentation displayed in the panel below the Browser. Press the <guibutton>Add Function</guibutton> button to add this function to the Current Script box. The Function Arguments panel will now contain a combobox labelled <quote>dir</quote>, short for direction. This is the direction in which the display should be pointed. The combobox contains only the cardinal compass points, not the Moon or any other objects. You can either enter <quote>Moon</quote> in the box manually, or press the <guibutton>Object</guibutton> button to use the <guilabel>Find Object</guilabel> window to select the Moon from the list of named objects. Note that, as usual, centring on an object automatically engages object-tracking mode, so there is no need to add the <firstterm>setTracking</firstterm> function after lookToward. </para><para>Now that we have taken care of pointing at the Moon, we next want to make time pass at an accelerated rate. Use the <firstterm>setClockScale</firstterm> function for this. Add it to the script by double-clicking on it in the Function Browser. The Function Arguments panel contains a timestep spinbox for setting the desired time step for the simulation clock. Change the timestep to 3 hours. </para><para>OK, we have pointed at the Moon and accelerated the clock. Now we just want the script to wait for several seconds while the display tracks on the Moon. Add the <firstterm>waitFor</firstterm> function to the script, and use the Function Arguments panel to specify that it should wait for 20 seconds before continuing. </para><para>To finish up, let us reset the clock's timestep to the normal value of 1 second. Add another instance of setClockScale, and set its value to 1 sec. </para><para>Actually, we are not quite done yet. We should probably make sure that the display is using Equatorial coordinates before the script tracks the Moon with an accelerated time step. Otherwise, if the display is using Horizontal coordinates, it will rotate very quickly through large angles as the Moon rises and sets. This can be very confusing, and is avoided by setting the View Option <firstterm>UseAltAz</firstterm> to <quote>false</quote>. To change any View Option, use the <firstterm>changeViewOption</firstterm> function. Add this function to the script, and examine the Function Arguments panel. There is a combobox which contains the list of all options which can be adjusted by changeViewOption. Since we know we want the UseAltAz option, we could simply select it from the combobox. However, the list is quite long, and there is no explanation of what each item is for. It therefore may be easier to press the <guibutton>Browse Tree</guibutton> button, which will open a window containing a tree view of the available options, organised by topic. In addition, each item has a short explanation of what the option does, and the data type of the option's value. We find UseAltAz under the <guilabel>Skymap options</guilabel> category. Just highlight this item and press <guibutton>OK</guibutton>, and it will be selected in the combobox of the Function Arguments panel. Finally, make its value <quote>false</quote> or <quote>0</quote>. </para><para>One more step: changing UseAltAz at the end of the script does us no good; we need this to be changed before anything else happens. So, make sure this function is highlighted in the Current Script box, and press the <guibutton>Move Up</guibutton> button until it is the first function. </para><para>Now that we have finished the script, we should save it to disk. Press the <guibutton>Save Script</guibutton> button. This will first open a window in which you can provide a name for the script, and fill in your name as the author. Enter <quote>Tracking the Moon</quote> for a name, and your name as the author, and press <guibutton>OK</guibutton>. Next, you will see the standard &kde; Save File dialog. Specify a filename for the script and press <guibutton>OK</guibutton> to save the script. Note that if your filename does not end with <quote>.kstars</quote>, this suffix will be automatically attached. If you are curious, you can examine the script file with any text editor. </para><para>Now that we have a completed script, we can run it in a couple of ways. From a console prompt, you can simply execute the script as long as an instance of KStars is currently running. Alternatively, you can execute the script from within KStars using the <guimenuitem>Run Script</guimenuitem> item in the <guimenu>File</guimenu> menu. </para>
 </sect2>
 
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/sidereal.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/sidereal.docbook
index a545518c5c6..a3f9f410488 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/sidereal.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/sidereal.docbook
@@ -1,87 +1,20 @@
 <sect1 id="ai-sidereal">
 <sect1info>
-<author
-><firstname
->Jason</firstname
-> <surname
->Harris</surname
-> </author>
+<author><firstname>Jason</firstname> <surname>Harris</surname> </author>
 </sect1info>
-<title
->Sidereal Time</title>
-<indexterm
-><primary
->Sidereal Time</primary>
-<seealso
->Hour Angle</seealso>
+<title>Sidereal Time</title>
+<indexterm><primary>Sidereal Time</primary>
+<seealso>Hour Angle</seealso>
 </indexterm>
-<para
-><firstterm
->Sidereal Time</firstterm
-> literally means <quote
->star time</quote
->. The time we are used to using in our everyday lives is Solar Time. The fundamental unit of Solar Time is a <firstterm
->Day</firstterm
->: the time it takes the Sun to travel 360 degrees around the sky, due to the rotation of the Earth. Smaller units of Solar Time are just divisions of a Day: </para
-><para>
+<para><firstterm>Sidereal Time</firstterm> literally means <quote>star time</quote>. The time we are used to using in our everyday lives is Solar Time. The fundamental unit of Solar Time is a <firstterm>Day</firstterm>: the time it takes the Sun to travel 360 degrees around the sky, due to the rotation of the Earth. Smaller units of Solar Time are just divisions of a Day: </para><para>
 <itemizedlist>
-<listitem
-><para
->1/24 Day = 1 Hour</para
-></listitem>
-<listitem
-><para
->1/60 Hour = 1 Minute</para
-></listitem>
-<listitem
-><para
->1/60 Minute = 1 Second</para
-></listitem>
+<listitem><para>1/24 Day = 1 Hour</para></listitem>
+<listitem><para>1/60 Hour = 1 Minute</para></listitem>
+<listitem><para>1/60 Minute = 1 Second</para></listitem>
 </itemizedlist>
-</para
-><para
->However, there is a problem with Solar Time. The Earth does not actually spin around 360 degrees in one Solar Day. The Earth is in orbit around the Sun, and over the course of one day, it moves about one Degree along its orbit (360 degrees/365.25 Days for a full orbit = about one Degree per Day). So, in 24 hours, the direction toward the Sun changes by about a Degree. Therefore, the Earth has to spin 361 degrees to make the Sun look like it has travelled 360 degrees around the Sky. </para
-><para
->In astronomy, we are concerned with how long it takes the Earth to spin with respect to the <quote
->fixed</quote
-> stars, not the Sun. So, we would like a timescale that removes the complication of Earth's orbit around the Sun, and just focuses on how long it takes the Earth to spin 360 degrees with respect to the stars. This rotational period is called a <firstterm
->Sidereal Day</firstterm
->. On average, it is 4 minutes shorter than a Solar Day, because of the extra 1 degree the Earth spins in a Solar Day. Rather than defining a Sidereal Day to be 23 hours, 56 minutes, we define Sidereal Hours, Minutes and Seconds that are the same fraction of a Day as their Solar counterparts. Therefore, one Solar Second = 1.00278 Sidereal Seconds. </para
-><para
->The Sidereal Time is useful for determining where the stars are at any given time. Sidereal Time divides one full spin of the Earth into 24 Sidereal Hours; similarly, the map of the sky is divided into 24 Hours of <firstterm
->Right Ascension</firstterm
->. This is no coincidence; Local Sidereal Time (<acronym
->LST</acronym
->) indicates the Right Ascension on the sky that is currently crossing the <link linkend="ai-meridian"
->Local Meridian</link
->. So, if a star has a Right Ascension of 05h 32m 24s, it will be on your meridian at LST=05:32:24. More generally, the difference between an object's <acronym
->RA</acronym
-> and the Local Sidereal Time tells you how far from the Meridian the object is. For example, the same object at LST=06:32:24 (one Sidereal Hour later), will be one Hour of Right Ascension west of your meridian, which is 15 degrees. This angular distance from the meridian is called the object's <link linkend="ai-hourangle"
->Hour Angle</link
->. </para>
+</para><para>However, there is a problem with Solar Time. The Earth does not actually spin around 360 degrees in one Solar Day. The Earth is in orbit around the Sun, and over the course of one day, it moves about one Degree along its orbit (360 degrees/365.25 Days for a full orbit = about one Degree per Day). So, in 24 hours, the direction toward the Sun changes by about a Degree. Therefore, the Earth has to spin 361 degrees to make the Sun look like it has travelled 360 degrees around the Sky. </para><para>In astronomy, we are concerned with how long it takes the Earth to spin with respect to the <quote>fixed</quote> stars, not the Sun. So, we would like a timescale that removes the complication of Earth's orbit around the Sun, and just focuses on how long it takes the Earth to spin 360 degrees with respect to the stars. This rotational period is called a <firstterm>Sidereal Day</firstterm>. On average, it is 4 minutes shorter than a Solar Day, because of the extra 1 degree the Earth spins in a Solar Day. Rather than defining a Sidereal Day to be 23 hours, 56 minutes, we define Sidereal Hours, Minutes and Seconds that are the same fraction of a Day as their Solar counterparts. Therefore, one Solar Second = 1.00278 Sidereal Seconds. </para><para>The Sidereal Time is useful for determining where the stars are at any given time. Sidereal Time divides one full spin of the Earth into 24 Sidereal Hours; similarly, the map of the sky is divided into 24 Hours of <firstterm>Right Ascension</firstterm>. This is no coincidence; Local Sidereal Time (<acronym>LST</acronym>) indicates the Right Ascension on the sky that is currently crossing the <link linkend="ai-meridian">Local Meridian</link>. So, if a star has a Right Ascension of 05h 32m 24s, it will be on your meridian at LST=05:32:24. More generally, the difference between an object's <acronym>RA</acronym> and the Local Sidereal Time tells you how far from the Meridian the object is. For example, the same object at LST=06:32:24 (one Sidereal Hour later), will be one Hour of Right Ascension west of your meridian, which is 15 degrees. This angular distance from the meridian is called the object's <link linkend="ai-hourangle">Hour Angle</link>. </para>
 <tip>
-<para
->The Local Sidereal Time is displayed by &kstars; in the <guilabel
->Time Info Box</guilabel
->, with the label <quote
->ST</quote
-> (you have to <quote
->unshade</quote
-> the box by double-clicking it in order to see the sidereal time). Note that the changing sidereal seconds are not synchronised with the changing Local Time and Universal Time seconds. In fact, if you watch the clocks for a while, you will notice that the Sidereal seconds really are slightly shorter than the LT and UT seconds. </para
-><para
->Point to the <link linkend="ai-zenith"
->Zenith</link
-> (press <keycap
->Z</keycap
-> or select <guimenuitem
->Zenith</guimenuitem
-> from the <guimenu
->Location</guimenu
-> menu). The Zenith is the point on the sky where you are looking <quote
->straight up</quote
-> from the ground, and it is a point on your <link linkend="ai-meridian"
->Local Meridian</link
->. Note the Right Ascension of the Zenith: it is exactly the same as your Local Sidereal Time. </para>
+<para>The Local Sidereal Time is displayed by &kstars; in the <guilabel>Time Info Box</guilabel>, with the label <quote>ST</quote> (you have to <quote>unshade</quote> the box by double-clicking it in order to see the sidereal time). Note that the changing sidereal seconds are not synchronised with the changing Local Time and Universal Time seconds. In fact, if you watch the clocks for a while, you will notice that the Sidereal seconds really are slightly shorter than the LT and UT seconds. </para><para>Point to the <link linkend="ai-zenith">Zenith</link> (press <keycap>Z</keycap> or select <guimenuitem>Zenith</guimenuitem> from the <guimenu>Location</guimenu> menu). The Zenith is the point on the sky where you are looking <quote>straight up</quote> from the ground, and it is a point on your <link linkend="ai-meridian">Local Meridian</link>. Note the Right Ascension of the Zenith: it is exactly the same as your Local Sidereal Time. </para>
 </tip>
 </sect1>
 
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/skycoords.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/skycoords.docbook
index fca764c8f3a..b5543b20946 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/skycoords.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/skycoords.docbook
@@ -1,192 +1,52 @@
 <sect1 id="ai-skycoords">
 <sect1info>
-<author
-><firstname
->Jason</firstname
-> <surname
->Harris</surname
-> </author>
+<author><firstname>Jason</firstname> <surname>Harris</surname> </author>
 </sect1info>
-<title
->Celestial Coordinate Systems</title>
+<title>Celestial Coordinate Systems</title>
 <para>
-<indexterm
-><primary
->Celestial Coordinate Systems</primary>
-<secondary
->Overview</secondary
-></indexterm>
-A basic requirement for studying the heavens is determining where in the sky things are. To specify sky positions, astronomers have developed several <firstterm
->coordinate systems</firstterm
->. Each uses a coordinate grid projected on the <link linkend="ai-csphere"
->Celestial Sphere</link
->, in analogy to the <link linkend="ai-geocoords"
->Geographic coordinate system</link
-> used on the surface of the Earth. The coordinate systems differ only in their choice of the <firstterm
->fundamental plane</firstterm
->, which divides the sky into two equal hemispheres along a <link linkend="ai-greatcircle"
->great circle</link
->. (the fundamental plane of the geographic system is the Earth's equator). Each coordinate system is named for its choice of fundamental plane. </para>
+<indexterm><primary>Celestial Coordinate Systems</primary>
+<secondary>Overview</secondary></indexterm>
+A basic requirement for studying the heavens is determining where in the sky things are. To specify sky positions, astronomers have developed several <firstterm>coordinate systems</firstterm>. Each uses a coordinate grid projected on the <link linkend="ai-csphere">Celestial Sphere</link>, in analogy to the <link linkend="ai-geocoords">Geographic coordinate system</link> used on the surface of the Earth. The coordinate systems differ only in their choice of the <firstterm>fundamental plane</firstterm>, which divides the sky into two equal hemispheres along a <link linkend="ai-greatcircle">great circle</link>. (the fundamental plane of the geographic system is the Earth's equator). Each coordinate system is named for its choice of fundamental plane. </para>
 
 <sect2 id="equatorial">
-<title
->The Equatorial Coordinate System</title>
-<indexterm
-><primary
->Celestial Coordinate Systems</primary>
-<secondary
->Equatorial Coordinates</secondary>
-<seealso
->Celestial Equator</seealso
-> <seealso
->Celestial Poles</seealso
-> <seealso
->Geographic Coordinate System</seealso
-> </indexterm>
-<indexterm
-><primary
->Right Ascension</primary
-><see
->Equatorial Coordinates</see
-></indexterm>
-<indexterm
-><primary
->Declination</primary
-><see
->Equatorial Coordinates</see
-></indexterm>
-
-<para
->The <firstterm
->Equatorial coordinate system</firstterm
-> is probably the most widely used celestial coordinate system. It is also the most closely related to the <link linkend="ai-geocoords"
->Geographic coordinate system</link
->, because they use the same fundamental plane, and the same poles. The projection of the Earth's equator onto the celestial sphere is called the <link linkend="ai-cequator"
->Celestial Equator</link
->. Similarly, projecting the geographic Poles onto the celestial sphere defines the North and South <link linkend="ai-cpoles"
->Celestial Poles</link
->. </para
-><para
->However, there is an important difference between the equatorial and geographic coordinate systems: the geographic system is fixed to the Earth; it rotates as the Earth does. The Equatorial system is fixed to the stars<footnote id="fn-precess"
-><para
->actually, the equatorial coordinates are not quite fixed to the stars. See <link linkend="ai-precession"
->precession</link
->. Also, if <link linkend="ai-hourangle"
->Hour Angle</link
-> is used in place of Right Ascension, then the Equatorial system is fixed to the Earth, not to the stars.</para
-></footnote
->, so it appears to rotate across the sky with the stars, but of course it is really the Earth rotating under the fixed sky. </para
-><para
->The <firstterm
->latitudinal</firstterm
-> (latitude-like) angle of the Equatorial system is called <firstterm
->Declination</firstterm
-> (Dec for short). It measures the angle of an object above or below the Celestial Equator. The <firstterm
->longitudinal</firstterm
-> angle is called the <firstterm
->Right Ascension</firstterm
-> (<acronym
->RA</acronym
-> for short). It measures the angle of an object East of the <link linkend="ai-equinox"
->Vernal Equinox</link
->. Unlike longitude, Right Ascension is usually measured in hours instead of degrees, because the apparent rotation of the Equatorial coordinate system is closely related to <link linkend="ai-sidereal"
->Sidereal Time</link
-> and <link linkend="ai-hourangle"
->Hour Angle</link
->. Since a full rotation of the sky takes 24 hours to complete, there are (360 degrees / 24 hours) = 15 degrees in one Hour of Right Ascension. </para>
+<title>The Equatorial Coordinate System</title>
+<indexterm><primary>Celestial Coordinate Systems</primary>
+<secondary>Equatorial Coordinates</secondary>
+<seealso>Celestial Equator</seealso> <seealso>Celestial Poles</seealso> <seealso>Geographic Coordinate System</seealso> </indexterm>
+<indexterm><primary>Right Ascension</primary><see>Equatorial Coordinates</see></indexterm>
+<indexterm><primary>Declination</primary><see>Equatorial Coordinates</see></indexterm>
+
+<para>The <firstterm>Equatorial coordinate system</firstterm> is probably the most widely used celestial coordinate system. It is also the most closely related to the <link linkend="ai-geocoords">Geographic coordinate system</link>, because they use the same fundamental plane, and the same poles. The projection of the Earth's equator onto the celestial sphere is called the <link linkend="ai-cequator">Celestial Equator</link>. Similarly, projecting the geographic Poles onto the celestial sphere defines the North and South <link linkend="ai-cpoles">Celestial Poles</link>. </para><para>However, there is an important difference between the equatorial and geographic coordinate systems: the geographic system is fixed to the Earth; it rotates as the Earth does. The Equatorial system is fixed to the stars<footnote id="fn-precess"><para>actually, the equatorial coordinates are not quite fixed to the stars. See <link linkend="ai-precession">precession</link>. Also, if <link linkend="ai-hourangle">Hour Angle</link> is used in place of Right Ascension, then the Equatorial system is fixed to the Earth, not to the stars.</para></footnote>, so it appears to rotate across the sky with the stars, but of course it is really the Earth rotating under the fixed sky. </para><para>The <firstterm>latitudinal</firstterm> (latitude-like) angle of the Equatorial system is called <firstterm>Declination</firstterm> (Dec for short). It measures the angle of an object above or below the Celestial Equator. The <firstterm>longitudinal</firstterm> angle is called the <firstterm>Right Ascension</firstterm> (<acronym>RA</acronym> for short). It measures the angle of an object East of the <link linkend="ai-equinox">Vernal Equinox</link>. Unlike longitude, Right Ascension is usually measured in hours instead of degrees, because the apparent rotation of the Equatorial coordinate system is closely related to <link linkend="ai-sidereal">Sidereal Time</link> and <link linkend="ai-hourangle">Hour Angle</link>. Since a full rotation of the sky takes 24 hours to complete, there are (360 degrees / 24 hours) = 15 degrees in one Hour of Right Ascension. </para>
 </sect2>
 
 <sect2 id="horizontal">
-<title
->The Horizontal Coordinate System</title>
-
-<indexterm
-><primary
->Celestial Coordinate Systems</primary>
-<secondary
->Horizontal Coordinates</secondary>
-<seealso
->Horizon</seealso
-> <seealso
->Zenith</seealso
-> </indexterm>
-<indexterm
-><primary
->Azimuth</primary
-><see
->Horizontal Coordinates</see
-></indexterm>
-<indexterm
-><primary
->Altitude</primary
-><see
->Horizontal Coordinates</see
-></indexterm>
-<para
->The Horizontal coordinate system uses the observer's local <link linkend="ai-horizon"
->horizon</link
-> as the Fundamental Plane. This conveniently divides the sky into the upper hemisphere that you can see, and the lower hemisphere that you can't (because the Earth is in the way). The pole of the upper hemisphere is called the <link linkend="ai-zenith"
->Zenith</link
->. The pole of the lower hemisphere is called the <firstterm
->nadir</firstterm
->. The angle of an object above or below the horizon is called the <firstterm
->Altitude</firstterm
-> (Alt for short). The angle of an object around the horizon (measured from the North point, toward the East) is called the <firstterm
->Azimuth</firstterm
->. The Horizontal Coordinate System is sometimes also called the Alt/Az Coordinate System. </para
-><para
->The Horizontal Coordinate System is fixed to the Earth, not the Stars. Therefore, the Altitude and Azimuth of an object changes with time, as the object appears to drift across the sky. In addition, because the Horizontal system is defined by your local horizon, the same object viewed from different locations on Earth at the same time will have different values of Altitude and Azimuth. </para
-><para
->Horizontal coordinates are very useful for determining the Rise and Set times of an object in the sky. When an object has Altitude=0 degrees, it is either Rising (if its Azimuth is &lt; 180 degrees) or Setting (if its Azimuth is &gt; 180 degrees). </para>
+<title>The Horizontal Coordinate System</title>
+
+<indexterm><primary>Celestial Coordinate Systems</primary>
+<secondary>Horizontal Coordinates</secondary>
+<seealso>Horizon</seealso> <seealso>Zenith</seealso> </indexterm>
+<indexterm><primary>Azimuth</primary><see>Horizontal Coordinates</see></indexterm>
+<indexterm><primary>Altitude</primary><see>Horizontal Coordinates</see></indexterm>
+<para>The Horizontal coordinate system uses the observer's local <link linkend="ai-horizon">horizon</link> as the Fundamental Plane. This conveniently divides the sky into the upper hemisphere that you can see, and the lower hemisphere that you can't (because the Earth is in the way). The pole of the upper hemisphere is called the <link linkend="ai-zenith">Zenith</link>. The pole of the lower hemisphere is called the <firstterm>nadir</firstterm>. The angle of an object above or below the horizon is called the <firstterm>Altitude</firstterm> (Alt for short). The angle of an object around the horizon (measured from the North point, toward the East) is called the <firstterm>Azimuth</firstterm>. The Horizontal Coordinate System is sometimes also called the Alt/Az Coordinate System. </para><para>The Horizontal Coordinate System is fixed to the Earth, not the Stars. Therefore, the Altitude and Azimuth of an object changes with time, as the object appears to drift across the sky. In addition, because the Horizontal system is defined by your local horizon, the same object viewed from different locations on Earth at the same time will have different values of Altitude and Azimuth. </para><para>Horizontal coordinates are very useful for determining the Rise and Set times of an object in the sky. When an object has Altitude=0 degrees, it is either Rising (if its Azimuth is &lt; 180 degrees) or Setting (if its Azimuth is &gt; 180 degrees). </para>
 </sect2>
 
 <sect2 id="ecliptic">
-<title
->The Ecliptic Coordinate System</title>
+<title>The Ecliptic Coordinate System</title>
 
-<indexterm
-><primary
->Celestial Coordinate Systems</primary>
-<secondary
->Ecliptic Coordinates</secondary>
-<seealso
->Ecliptic</seealso>
+<indexterm><primary>Celestial Coordinate Systems</primary>
+<secondary>Ecliptic Coordinates</secondary>
+<seealso>Ecliptic</seealso>
 </indexterm>
-<para
->The Ecliptic coordinate system uses the <link linkend="ai-ecliptic"
->Ecliptic</link
-> for its Fundamental Plane. The Ecliptic is the path that the Sun appears to follow across the sky over the course of a year. It is also the projection of the Earth's orbital plane onto the Celestial Sphere. The latitudinal angle is called the <firstterm
->Ecliptic Latitude</firstterm
->, and the longitudinal angle is called the <firstterm
->Ecliptic Longitude</firstterm
->. Like Right Ascension in the Equatorial system, the zeropoint of the Ecliptic Longitude is the <link linkend="ai-equinox"
->Vernal Equinox</link
->. </para
-><para
->What do you think such a coordinate system would be useful for? If you guessed charting solar system objects, you are right! Each of the planets (except Pluto) orbits the Sun in roughly the same plane, so they always appear to be somewhere near the Ecliptic (&ie;, they always have small ecliptic latitudes). </para>
+<para>The Ecliptic coordinate system uses the <link linkend="ai-ecliptic">Ecliptic</link> for its Fundamental Plane. The Ecliptic is the path that the Sun appears to follow across the sky over the course of a year. It is also the projection of the Earth's orbital plane onto the Celestial Sphere. The latitudinal angle is called the <firstterm>Ecliptic Latitude</firstterm>, and the longitudinal angle is called the <firstterm>Ecliptic Longitude</firstterm>. Like Right Ascension in the Equatorial system, the zeropoint of the Ecliptic Longitude is the <link linkend="ai-equinox">Vernal Equinox</link>. </para><para>What do you think such a coordinate system would be useful for? If you guessed charting solar system objects, you are right! Each of the planets (except Pluto) orbits the Sun in roughly the same plane, so they always appear to be somewhere near the Ecliptic (&ie;, they always have small ecliptic latitudes). </para>
 </sect2>
 
 <sect2 id="galactic">
-<title
->The Galactic Coordinate System</title>
+<title>The Galactic Coordinate System</title>
 
-<indexterm
-><primary
->Celestial Coordinate Systems</primary>
-<secondary
->Galactic Coordinates</secondary>
+<indexterm><primary>Celestial Coordinate Systems</primary>
+<secondary>Galactic Coordinates</secondary>
 </indexterm>
 <para>
-<indexterm
-><primary
->Milky Way</primary
-></indexterm
-> The Galactic coordinate system uses the <firstterm
->Milky Way</firstterm
-> as its Fundamental Plane. The latitudinal angle is called the <firstterm
->Galactic Latitude</firstterm
->, and the longitudinal angle is called the <firstterm
->Galactic Longitude</firstterm
->. This coordinate system is useful for studying the Galaxy itself. For example, you might want to know how the density of stars changes as a function of Galactic Latitude, to how much the disk of the Milky Way is flattened. </para>
+<indexterm><primary>Milky Way</primary></indexterm> The Galactic coordinate system uses the <firstterm>Milky Way</firstterm> as its Fundamental Plane. The latitudinal angle is called the <firstterm>Galactic Latitude</firstterm>, and the longitudinal angle is called the <firstterm>Galactic Longitude</firstterm>. This coordinate system is useful for studying the Galaxy itself. For example, you might want to know how the density of stars changes as a function of Galactic Latitude, to how much the disk of the Milky Way is flattened. </para>
 </sect2>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/solarsys.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/solarsys.docbook
index 9acaf75e8ba..22cfef1e704 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/solarsys.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/solarsys.docbook
@@ -1,35 +1,23 @@
 <sect1 id="tool-solarsys">
-<title
->Solar System Viewer</title>
-<indexterm
-><primary
->Tools</primary>
-<secondary
->Solar System Viewer</secondary>
+<title>Solar System Viewer</title>
+<indexterm><primary>Tools</primary>
+<secondary>Solar System Viewer</secondary>
 </indexterm>
 
 <screenshot>
-<screeninfo
->The Solar System Viewer </screeninfo>
+<screeninfo>The Solar System Viewer </screeninfo>
 <mediaobject>
   <imageobject>
     <imagedata fileref="solarsystem.png" format="PNG"/>
   </imageobject>
   <textobject>
-    <phrase
->Solar System Viewer</phrase>
+    <phrase>Solar System Viewer</phrase>
   </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->This tool displays a model of our solar system as seen from above, for the current date and time in the main window. The Sun is drawn as a yellow dot in the centre of the plot, and the orbits of the planets are drawn as circles with correct relative diameters, centred on the Sun. The current position of each planet along its orbit is drawn as a coloured dot along with a name label. The display can be zoomed in and out with the <keycap
->+</keycap
-> and <keycap
->-</keycap
-> keys. </para>
+<para>This tool displays a model of our solar system as seen from above, for the current date and time in the main window. The Sun is drawn as a yellow dot in the centre of the plot, and the orbits of the planets are drawn as circles with correct relative diameters, centred on the Sun. The current position of each planet along its orbit is drawn as a coloured dot along with a name label. The display can be zoomed in and out with the <keycap>+</keycap> and <keycap>-</keycap> keys. </para>
 <note>
-<para
->The current version of this tool shows a very simplified model of the solar system; we are planning on several improvements in future versions. For example, the orbits will be displayed as ellipses, not perfect circles. We will also make it possible to recenter the display at any location (currently, the centre is fixed at the Sun), and allow the date to be changed, including the ability to animate the display with a variable timestep. Finally, we would like to add comets and asteroids as well. </para>
+<para>The current version of this tool shows a very simplified model of the solar system; we are planning on several improvements in future versions. For example, the orbits will be displayed as ellipses, not perfect circles. We will also make it possible to recenter the display at any location (currently, the centre is fixed at the Sun), and allow the date to be changed, including the ability to animate the display with a variable timestep. Finally, we would like to add comets and asteroids as well. </para>
 </note>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/spiralgalaxies.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/spiralgalaxies.docbook
index 2f2b099a9f9..a05cc75e0ee 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/spiralgalaxies.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/spiralgalaxies.docbook
@@ -1,91 +1,26 @@
 <sect1 id="ai-spiralgal">
 
 <sect1info>
-<author
-><firstname
->Mike</firstname
-> <surname
->Choatie</surname
-> </author>
+<author><firstname>Mike</firstname> <surname>Choatie</surname> </author>
 </sect1info>
 
-<title
->Spiral Galaxies</title>
-<indexterm
-><primary
->Spiral Galaxies</primary>
+<title>Spiral Galaxies</title>
+<indexterm><primary>Spiral Galaxies</primary>
 </indexterm>
 
-<para
->Spiral galaxies are huge collections of billions of stars, most of which are flattened into a disk shape, with a bright, spherical bulge of stars at its centre. Within the disk, there are typically bright arms where the youngest, brightest stars are found. These arms wind out from the centre in a spiral pattern, giving the galaxies their name. Spiral galaxies look a bit like hurricanes, or like water flowing down a drain. They are some of the most beautiful objects in the sky. </para>
-<para
->Galaxies are classified using a <quote
->tuning fork diagram</quote
->. The end of the fork classifies <link linkend="ai-ellipgal"
->elliptical galaxies</link
-> on a scale from the roundest, which is an E0, to those that appear most flattened, which is rated as E7. The <quote
->tines</quote
-> of the tuning fork are where the two types of spiral galaxies are classified: normal spirals, and <quote
->barred</quote
-> spirals. A barred spiral is one whose nuclear bulge is stretched out into a line, so it literally looks like it has a <quote
->bar</quote
-> of stars in its centre. </para
-><para
->Both types of spiral galaxies are sub-classified according to the prominence of their central <quote
->bulge</quote
-> of stars, their overall surface brightness, and how tightly their spiral arms are wound. These characteristics are related, so that an Sa galaxy has a large central bulge, a high surface brightness, and tightly-wound spiral arms. An Sb galaxy has a smaller bulge, a dimmer disk, and looser arms than an Sa, and so on through Sc and Sd. Barred galaxies use the same classification scheme, indicated by types SBa, SBb, SBc, and SBd. </para
-><para
->There is another class of galaxy called S0, which is morphologically a transitional type between true spirals and ellipticals. Its spiral arms are so tightly wound as to be indistinguishable; S0 galaxies have disks with a uniform brightness. They also have an extremely dominant bulge. </para
-><para
->The Milky Way galaxy, which is home to earth and all of the stars in our sky, is a Spiral Galaxy, and is believed to be a barred spiral. The name <quote
->Milky Way</quote
-> refers to a band of very faint stars in the sky. This band is the result of looking in the plane of our galaxy's disk from our perspective inside it. </para
-><para
->Spiral galaxies are very dynamic entities. They are hotbeds of star formation, and contain many young stars in their disks. Their central bulges tend to be made of older stars, and their diffuse halos are made of the very oldest stars in the Universe. Star formation is active in the disks because that is where the gas and dust are most concentrated; gas and dust are the building blocks of star formation. </para
-><para
->Modern telescopes have revealed that many Spiral galaxies harbour supermassive black holes at their centres, with masses that can exceed that of a billion Suns. Both elliptical and spiral galaxies are known to contain these exotic objects; in fact many astronomers now believe that <emphasis
->all</emphasis
-> large galaxies contain a supermassive black hole in their nucleus. Our own Milky Way is known to harbour a black hole in its core with a mass millions of times bigger than a star's mass. </para>
+<para>Spiral galaxies are huge collections of billions of stars, most of which are flattened into a disk shape, with a bright, spherical bulge of stars at its centre. Within the disk, there are typically bright arms where the youngest, brightest stars are found. These arms wind out from the centre in a spiral pattern, giving the galaxies their name. Spiral galaxies look a bit like hurricanes, or like water flowing down a drain. They are some of the most beautiful objects in the sky. </para>
+<para>Galaxies are classified using a <quote>tuning fork diagram</quote>. The end of the fork classifies <link linkend="ai-ellipgal">elliptical galaxies</link> on a scale from the roundest, which is an E0, to those that appear most flattened, which is rated as E7. The <quote>tines</quote> of the tuning fork are where the two types of spiral galaxies are classified: normal spirals, and <quote>barred</quote> spirals. A barred spiral is one whose nuclear bulge is stretched out into a line, so it literally looks like it has a <quote>bar</quote> of stars in its centre. </para><para>Both types of spiral galaxies are sub-classified according to the prominence of their central <quote>bulge</quote> of stars, their overall surface brightness, and how tightly their spiral arms are wound. These characteristics are related, so that an Sa galaxy has a large central bulge, a high surface brightness, and tightly-wound spiral arms. An Sb galaxy has a smaller bulge, a dimmer disk, and looser arms than an Sa, and so on through Sc and Sd. Barred galaxies use the same classification scheme, indicated by types SBa, SBb, SBc, and SBd. </para><para>There is another class of galaxy called S0, which is morphologically a transitional type between true spirals and ellipticals. Its spiral arms are so tightly wound as to be indistinguishable; S0 galaxies have disks with a uniform brightness. They also have an extremely dominant bulge. </para><para>The Milky Way galaxy, which is home to earth and all of the stars in our sky, is a Spiral Galaxy, and is believed to be a barred spiral. The name <quote>Milky Way</quote> refers to a band of very faint stars in the sky. This band is the result of looking in the plane of our galaxy's disk from our perspective inside it. </para><para>Spiral galaxies are very dynamic entities. They are hotbeds of star formation, and contain many young stars in their disks. Their central bulges tend to be made of older stars, and their diffuse halos are made of the very oldest stars in the Universe. Star formation is active in the disks because that is where the gas and dust are most concentrated; gas and dust are the building blocks of star formation. </para><para>Modern telescopes have revealed that many Spiral galaxies harbour supermassive black holes at their centres, with masses that can exceed that of a billion Suns. Both elliptical and spiral galaxies are known to contain these exotic objects; in fact many astronomers now believe that <emphasis>all</emphasis> large galaxies contain a supermassive black hole in their nucleus. Our own Milky Way is known to harbour a black hole in its core with a mass millions of times bigger than a star's mass. </para>
 
 <tip>
-<para
->There are many fine examples of spiral galaxies to be found in &kstars;, and many have beautiful images available in their <link linkend="popup-menu"
->popup menu</link
->. You can find them by using the <link linkend="findobjects"
->Find Object</link
-> window. Here is a list of some spiral galaxies with nice images available: <itemizedlist>
-<listitem
-><para
->M 64, the Black-Eye Galaxy (type Sa)</para
-></listitem>
-<listitem
-><para
->M 31, the Andromeda Galaxy (type Sb)</para
-></listitem>
-<listitem
-><para
->M 81, Bode's Galaxy (type Sb)</para
-></listitem>
-<listitem
-><para
->M 51, the Whirlpool Galaxy (type Sc)</para
-></listitem>
-<listitem
-><para
->NGC 300 (type Sd) [use DSS image link]</para
-></listitem>
-<listitem
-><para
->M 83 (type SBa)</para
-></listitem>
-<listitem
-><para
->NGC 1530 (type SBb)</para
-></listitem>
-<listitem
-><para
->NGC 1073 (type SBc)</para
-></listitem>
+<para>There are many fine examples of spiral galaxies to be found in &kstars;, and many have beautiful images available in their <link linkend="popup-menu">popup menu</link>. You can find them by using the <link linkend="findobjects">Find Object</link> window. Here is a list of some spiral galaxies with nice images available: <itemizedlist>
+<listitem><para>M 64, the Black-Eye Galaxy (type Sa)</para></listitem>
+<listitem><para>M 31, the Andromeda Galaxy (type Sb)</para></listitem>
+<listitem><para>M 81, Bode's Galaxy (type Sb)</para></listitem>
+<listitem><para>M 51, the Whirlpool Galaxy (type Sc)</para></listitem>
+<listitem><para>NGC 300 (type Sd) [use DSS image link]</para></listitem>
+<listitem><para>M 83 (type SBa)</para></listitem>
+<listitem><para>NGC 1530 (type SBb)</para></listitem>
+<listitem><para>NGC 1073 (type SBc)</para></listitem>
 </itemizedlist>
 </para>
 </tip>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/stars.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/stars.docbook
index 914651780ab..c4730d40f09 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/stars.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/stars.docbook
@@ -1,109 +1,72 @@
 <sect1 id="ai-stars">
 <sect1info>
-<author
-><firstname
->Jason</firstname
-> <surname
->Harris</surname
-> </author>
+<author><firstname>Jason</firstname> <surname>Harris</surname> </author>
 </sect1info>
-<title
->Stars: An Introductory <acronym
->FAQ</acronym
-></title>
-<indexterm
-><primary
->Stars</primary
-></indexterm>
+<title>Stars: An Introductory <acronym>FAQ</acronym></title>
+<indexterm><primary>Stars</primary></indexterm>
 
 <qandaset id="stars-faq">
 
 <qandaentry>
 <question>
-<para
->What are the stars?</para>
+<para>What are the stars?</para>
 </question>
 <answer>
-<para
-><firstterm
->Stars</firstterm
-> are gigantic, self-gravitating spheres of (mostly) Hydrogen gas. Stars are also thermonuclear engines; nuclear fusion takes place deep in the cores of stars, where the density is extreme and the temperature reaches tens of millions of degrees Celsius. </para>
+<para><firstterm>Stars</firstterm> are gigantic, self-gravitating spheres of (mostly) Hydrogen gas. Stars are also thermonuclear engines; nuclear fusion takes place deep in the cores of stars, where the density is extreme and the temperature reaches tens of millions of degrees Celsius. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Is the Sun a star?</para>
+<para>Is the Sun a star?</para>
 </question>
 <answer>
-<para
->Yes, the Sun is a star. It is the dominant centrepiece of our solar system. Compared to other stars, our Sun is rather ordinary; it appears to be so much bigger and brighter to us because it is millions of times closer than any other star. </para>
+<para>Yes, the Sun is a star. It is the dominant centrepiece of our solar system. Compared to other stars, our Sun is rather ordinary; it appears to be so much bigger and brighter to us because it is millions of times closer than any other star. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Why do stars shine?</para>
+<para>Why do stars shine?</para>
 </question>
 <answer>
-<para
->The short answer is: star shine because they are very hot. It is really no more complicated than that. Any object heated to thousands of degrees will radiate light, just like stars do. </para>
+<para>The short answer is: star shine because they are very hot. It is really no more complicated than that. Any object heated to thousands of degrees will radiate light, just like stars do. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->The obvious next question is: why are stars so hot?</para>
+<para>The obvious next question is: why are stars so hot?</para>
 </question>
 <answer>
-<para
->This is a tougher question. The usual answer is that stars get their heat from the thermonuclear fusion reactions in their cores. However, this cannot be the ultimate cause for the stars' heat, because a star must be hot in the first place for nuclear fusion to be triggered. Fusion can only sustain the hot temperature; it cannot make a star hot. A more correct answer is that stars are hot because they have collapsed. Stars form from diffuse gaseous nebulae; as the nebulous gas condenses to form a star, the gravitational potential energy of the material is released, first as kinetic energy, and ultimately as heat as the density increases. </para>
+<para>This is a tougher question. The usual answer is that stars get their heat from the thermonuclear fusion reactions in their cores. However, this cannot be the ultimate cause for the stars' heat, because a star must be hot in the first place for nuclear fusion to be triggered. Fusion can only sustain the hot temperature; it cannot make a star hot. A more correct answer is that stars are hot because they have collapsed. Stars form from diffuse gaseous nebulae; as the nebulous gas condenses to form a star, the gravitational potential energy of the material is released, first as kinetic energy, and ultimately as heat as the density increases. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->Are stars all the same?</para>
+<para>Are stars all the same?</para>
 </question>
 <answer>
-<para
->Stars have many things in common: they are all collapsed spheres of hot, dense gas (mostly Hydrogen), and nuclear fusion reactions are occurring at or near the centres of every star in the sky. </para
-><para
->However, stars also show a great diversity in some properties. The brightest stars shine almost 100 million times as brightly as the faintest stars. Stars range in surface temperature from only a few thousand degrees to almost 50,000 degrees Celsius. These differences are largely due to differences in mass: massive stars are both hotter and brighter than lower-mass stars. The temperature and Luminosity also depend on the <emphasis
->evolutionary state</emphasis
-> of the star. </para>
+<para>Stars have many things in common: they are all collapsed spheres of hot, dense gas (mostly Hydrogen), and nuclear fusion reactions are occurring at or near the centres of every star in the sky. </para><para>However, stars also show a great diversity in some properties. The brightest stars shine almost 100 million times as brightly as the faintest stars. Stars range in surface temperature from only a few thousand degrees to almost 50,000 degrees Celsius. These differences are largely due to differences in mass: massive stars are both hotter and brighter than lower-mass stars. The temperature and Luminosity also depend on the <emphasis>evolutionary state</emphasis> of the star. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->What is the Main Sequence?</para>
+<para>What is the Main Sequence?</para>
 </question>
 <answer>
-<para
-><indexterm
-><primary
->Main sequence</primary
-></indexterm
-> The main sequence is the evolutionary state of a star when it is fusing Hydrogen in its core. This is the first (and longest) stage of a star's life (not including protostar phases). What happens to a star after it runs out of core Hydrogen is addressed in the stellar evolution article (coming soon). </para>
+<para><indexterm><primary>Main sequence</primary></indexterm> The main sequence is the evolutionary state of a star when it is fusing Hydrogen in its core. This is the first (and longest) stage of a star's life (not including protostar phases). What happens to a star after it runs out of core Hydrogen is addressed in the stellar evolution article (coming soon). </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->How long do stars last?</para>
+<para>How long do stars last?</para>
 </question>
 <answer>
-<para
->The lifetime of a star depends very much on its mass. More massive stars are hotter and shine much more brightly, causing them to consume their nuclear fuel much more rapidly. The largest stars (roughly 100 times as massive as the Sun), will run out of fuel in only a few million years; while the smallest stars (roughly ten percent the mass of the Sun), with their much more frugal consumption rate, will shine on (albeit dimly) for <emphasis
->trillions</emphasis
-> of years. Note that this is much longer than the Universe has yet been in existence. </para>
+<para>The lifetime of a star depends very much on its mass. More massive stars are hotter and shine much more brightly, causing them to consume their nuclear fuel much more rapidly. The largest stars (roughly 100 times as massive as the Sun), will run out of fuel in only a few million years; while the smallest stars (roughly ten percent the mass of the Sun), with their much more frugal consumption rate, will shine on (albeit dimly) for <emphasis>trillions</emphasis> of years. Note that this is much longer than the Universe has yet been in existence. </para>
 </answer>
 </qandaentry>
 
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/timezones.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/timezones.docbook
index f899dd74681..78e9d659d6c 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/timezones.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/timezones.docbook
@@ -1,32 +1,9 @@
 <sect1 id="ai-timezones">
 <sect1info>
-<author
-><firstname
->Jason</firstname
-> <surname
->Harris</surname
-> </author>
+<author><firstname>Jason</firstname> <surname>Harris</surname> </author>
 </sect1info>
-<title
->Time Zones</title>
-<indexterm
-><primary
->Time Zones</primary>
+<title>Time Zones</title>
+<indexterm><primary>Time Zones</primary>
 </indexterm>
-<para
->The Earth is round, and it is always half-illuminated by the Sun. However, because the Earth is spinning, the half that is illuminated is always changing. We experience this as the passing of days wherever we are on the Earth's surface. At any given instant, there are places on the Earth passing from the dark half into the illuminated half (which is seen as <emphasis
->dawn</emphasis
-> on the surface). At the same instant, on the opposite side of the Earth, points are passing from the illuminated half into darkness (which is seen as <emphasis
->dusk</emphasis
-> at those locations). So, at any given time, different places on Earth are experiencing different parts of the day. Thus, Solar time is defined locally, so that the clock time at any location describes the part of the day consistently. </para
-><para
->This localisation of time is accomplished by dividing the globe into 24 vertical slices called <firstterm
->Time Zones</firstterm
->. The Local Time is the same within any given zone, but the time in each zone is one Hour <emphasis
->earlier</emphasis
-> than the time in the neighboring Zone to the East. Actually, this is a idealised simplification; real Time Zone boundaries are not straight vertical lines, because they often follow national boundaries and other political considerations. </para
-><para
->Note that because the Local Time always increases by an hour when moving between Zones to the East, by the time you move through all 24 Time Zones, you are a full day ahead of where you started. We deal with this paradox by defining the <firstterm
->International Date Line</firstterm
->, which is a Time Zone boundary in the Pacific Ocean, between Asia and North America. Points just to the East of this line are 24 hours behind the points just to the West of the line. This leads to some interesting phenomena. A direct flight from Australia to California arrives before it departs. Also, the islands of Fiji straddle the International Date Line, so if you have a bad day on the West side of Fiji, you can go over to the East side of Fiji and have a chance to live the same day all over again. </para>
+<para>The Earth is round, and it is always half-illuminated by the Sun. However, because the Earth is spinning, the half that is illuminated is always changing. We experience this as the passing of days wherever we are on the Earth's surface. At any given instant, there are places on the Earth passing from the dark half into the illuminated half (which is seen as <emphasis>dawn</emphasis> on the surface). At the same instant, on the opposite side of the Earth, points are passing from the illuminated half into darkness (which is seen as <emphasis>dusk</emphasis> at those locations). So, at any given time, different places on Earth are experiencing different parts of the day. Thus, Solar time is defined locally, so that the clock time at any location describes the part of the day consistently. </para><para>This localisation of time is accomplished by dividing the globe into 24 vertical slices called <firstterm>Time Zones</firstterm>. The Local Time is the same within any given zone, but the time in each zone is one Hour <emphasis>earlier</emphasis> than the time in the neighboring Zone to the East. Actually, this is a idealised simplification; real Time Zone boundaries are not straight vertical lines, because they often follow national boundaries and other political considerations. </para><para>Note that because the Local Time always increases by an hour when moving between Zones to the East, by the time you move through all 24 Time Zones, you are a full day ahead of where you started. We deal with this paradox by defining the <firstterm>International Date Line</firstterm>, which is a Time Zone boundary in the Pacific Ocean, between Asia and North America. Points just to the East of this line are 24 hours behind the points just to the West of the line. This leads to some interesting phenomena. A direct flight from Australia to California arrives before it departs. Also, the islands of Fiji straddle the International Date Line, so if you have a bad day on the West side of Fiji, you can go over to the East side of Fiji and have a chance to live the same day all over again. </para>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/tools.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/tools.docbook
index 60bd3929c42..9876e65f079 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/tools.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/tools.docbook
@@ -1,61 +1,16 @@
 <chapter id="tools">
-<title
->KStars Tools</title>
+<title>KStars Tools</title>
 <para>
-<indexterm
-><primary
->Tools</primary
-></indexterm
-> &kstars; comes with a number of tools that allow you to explore some more advanced aspects of astronomy and the night sky. </para>
+<indexterm><primary>Tools</primary></indexterm> &kstars; comes with a number of tools that allow you to explore some more advanced aspects of astronomy and the night sky. </para>
 
 <itemizedlist>
-<listitem
-><para
-><link linkend="tool-details"
->Object Details</link
-></para
-></listitem>
-<listitem
-><para
-><link linkend="tool-calculator"
->Astrocalculator</link
-></para
-></listitem>
-<listitem
-><para
-><link linkend="tool-aavso"
->AAVSO Lightcurves</link
-></para
-></listitem>
-<listitem
-><para
-><link linkend="tool-altvstime"
->Altitude vs. Time Plotter</link
-></para
-></listitem>
-<listitem
-><para
-><link linkend="tool-whatsup"
->What's Up Tonight?</link
-></para
-></listitem>
-<listitem
-><para
-><link linkend="tool-scriptbuilder"
->Script Builder</link
-></para
-></listitem>
-<listitem
-><para
-><link linkend="tool-solarsys"
->Solar System Viewer</link
-></para
-></listitem>
-<listitem
-><para
-><link linkend="tool-jmoons"
->Jupiter Moons Tool</link
-></para
-></listitem>
+<listitem><para><link linkend="tool-details">Object Details</link></para></listitem>
+<listitem><para><link linkend="tool-calculator">Astrocalculator</link></para></listitem>
+<listitem><para><link linkend="tool-aavso">AAVSO Lightcurves</link></para></listitem>
+<listitem><para><link linkend="tool-altvstime">Altitude vs. Time Plotter</link></para></listitem>
+<listitem><para><link linkend="tool-whatsup">What's Up Tonight?</link></para></listitem>
+<listitem><para><link linkend="tool-scriptbuilder">Script Builder</link></para></listitem>
+<listitem><para><link linkend="tool-solarsys">Solar System Viewer</link></para></listitem>
+<listitem><para><link linkend="tool-jmoons">Jupiter Moons Tool</link></para></listitem>
 </itemizedlist>
 &tool-details; &tool-calculator; &tool-aavso; &tool-altvstime; &tool-whatsup; &tool-scriptbuilder; &tool-solarsys; &tool-jmoons; </chapter>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/utime.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/utime.docbook
index 7319b1cd1fe..73b6e4fac01 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/utime.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/utime.docbook
@@ -1,54 +1,14 @@
 <sect1 id="ai-utime">
 <sect1info>
-<author
-><firstname
->Jason</firstname
-> <surname
->Harris</surname
-> </author>
+<author><firstname>Jason</firstname> <surname>Harris</surname> </author>
 </sect1info>
-<title
->Universal Time</title>
-<indexterm
-><primary
->Universal Time</primary>
-<seealso
->Time Zones</seealso>
+<title>Universal Time</title>
+<indexterm><primary>Universal Time</primary>
+<seealso>Time Zones</seealso>
 </indexterm>
-<para
->The time on our clocks is essentially a measurement of the current position of the Sun in the sky, which is different for places at different Longitudes because the Earth is round (see <link linkend="ai-timezones"
->Time Zones</link
->). </para
-><para
->However, it is sometimes necessary to define a global time, one that is the same for all places on Earth. One way to do this is to pick a place on the Earth, and adopt the Local Time at that place as the <firstterm
->Universal Time</firstterm
->, abbreviated <abbrev
->UT</abbrev
->. (The name is a bit of a misnomer, since Universal Time has little to do with the Universe. It would perhaps be better to think of it as <emphasis
->global time</emphasis
->). </para
-><para
->The geographic location chosen to represent Universal Time is Greenwich, England. The choice is arbitrary and historical. Universal Time became an important concept when European ships began to sail the wide open seas, far from any known landmarks. A navigator could reckon the ship's longitude by comparing the Local Time (as measured from the Sun's position) to the time back at the home port (as kept by an accurate clock on board the ship). Greenwich was home to England's Royal Observatory, which was charged with keeping time very accurately, so that ships in port could re-calibrate their clocks before setting sail. </para>
+<para>The time on our clocks is essentially a measurement of the current position of the Sun in the sky, which is different for places at different Longitudes because the Earth is round (see <link linkend="ai-timezones">Time Zones</link>). </para><para>However, it is sometimes necessary to define a global time, one that is the same for all places on Earth. One way to do this is to pick a place on the Earth, and adopt the Local Time at that place as the <firstterm>Universal Time</firstterm>, abbreviated <abbrev>UT</abbrev>. (The name is a bit of a misnomer, since Universal Time has little to do with the Universe. It would perhaps be better to think of it as <emphasis>global time</emphasis>). </para><para>The geographic location chosen to represent Universal Time is Greenwich, England. The choice is arbitrary and historical. Universal Time became an important concept when European ships began to sail the wide open seas, far from any known landmarks. A navigator could reckon the ship's longitude by comparing the Local Time (as measured from the Sun's position) to the time back at the home port (as kept by an accurate clock on board the ship). Greenwich was home to England's Royal Observatory, which was charged with keeping time very accurately, so that ships in port could re-calibrate their clocks before setting sail. </para>
 <tip>
-<para
->Exercise:</para>
-<para
->Set the geographic location to <quote
->Greenwich, England</quote
-> using the <guilabel
->Set Location</guilabel
-> window (<keycombo action="simul"
->&Ctrl;<keycap
->G</keycap
-></keycombo
->). Note that the Local Time (<abbrev
->LT</abbrev
->)and the Universal Time (<abbrev
->UT</abbrev
->) are now the same. </para
-><para
->Further Reading: The history behind the construction of the first clock that was accurate and stable enough to be used on ships to keep Universal Time is a fascinating tale, and one told expertly in the book <quote
->Longitude</quote
->, by Dava Sobel. </para>
+<para>Exercise:</para>
+<para>Set the geographic location to <quote>Greenwich, England</quote> using the <guilabel>Set Location</guilabel> window (<keycombo action="simul">&Ctrl;<keycap>G</keycap></keycombo>). Note that the Local Time (<abbrev>LT</abbrev>)and the Universal Time (<abbrev>UT</abbrev>) are now the same. </para><para>Further Reading: The history behind the construction of the first clock that was accurate and stable enough to be used on ships to keep Universal Time is a fascinating tale, and one told expertly in the book <quote>Longitude</quote>, by Dava Sobel. </para>
 </tip>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/wut.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/wut.docbook
index 2e89188362a..888b76a8abe 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/wut.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/wut.docbook
@@ -1,56 +1,24 @@
 <sect1 id="tool-whatsup">
-<title
->What's Up Tonight? Tool</title>
-<indexterm
-><primary
->Tools</primary>
-<secondary
->What's Up Tonight? Tool</secondary>
+<title>What's Up Tonight? Tool</title>
+<indexterm><primary>Tools</primary>
+<secondary>What's Up Tonight? Tool</secondary>
 </indexterm>
 
 <screenshot>
-<screeninfo
->The What's Up Tonight Tool </screeninfo>
+<screeninfo>The What's Up Tonight Tool </screeninfo>
 <mediaobject>
   <imageobject>
     <imagedata fileref="wut.png" format="PNG"/>
   </imageobject>
   <textobject>
-    <phrase
->What's Up Tonight?</phrase>
+    <phrase>What's Up Tonight?</phrase>
   </textobject>
 </mediaobject>
 </screenshot>
 
-<para
->The <quote
->What's Up Tonight?</quote
-> (WUT) tool displays a list of objects that will be visible at night from any location, on any date. By default, the Date and Location are taken from the current settings in the main window, but you can change either value using the <guibutton
->Change Date</guibutton
-> and <guibutton
->Change Location</guibutton
-> buttons at the top of the WUT window. </para>
-<para
->The WUT tool also displays a short almanac of data for the selected date: the rise and set times for the Sun and moon, the duration of the night and the Moon's illumination fraction. </para>
-<para
->Below the almanac is where the object information is displayed. The objects are organised into type categories. Select an object type in the box labelled <guilabel
->Choose a Category</guilabel
->, and all objects of that type which are above the horizon on the selected night will be displayed in the box labelled <guilabel
->Matching Objects</guilabel
->. For example, in the screenshot, the <guilabel
->Planets</guilabel
-> category has been selected, and four planets which are up on the selected night are displayed (Mars, Neptune, Pluto, and Uranus). When an object in the list is selected, its rise, set and transit times are displayed in the lower-right panel. In addition, you can press the <guibutton
->Object Details...</guibutton
-> button to open the <link linkend="tool-details"
->Object Details window</link
-> for that object. </para>
-<para
->By default, the WUT will display objects which are above the horizon between sunset and midnight (i.e., <quote
->in the evening</quote
->). You can choose to show objects which are up between midnight and dawn (<quote
->in the morning</quote
->), or between dusk and dawn (<quote
->any time tonight</quote
->) using the combobox near the top of the window. </para>
+<para>The <quote>What's Up Tonight?</quote> (WUT) tool displays a list of objects that will be visible at night from any location, on any date. By default, the Date and Location are taken from the current settings in the main window, but you can change either value using the <guibutton>Change Date</guibutton> and <guibutton>Change Location</guibutton> buttons at the top of the WUT window. </para>
+<para>The WUT tool also displays a short almanac of data for the selected date: the rise and set times for the Sun and moon, the duration of the night and the Moon's illumination fraction. </para>
+<para>Below the almanac is where the object information is displayed. The objects are organised into type categories. Select an object type in the box labelled <guilabel>Choose a Category</guilabel>, and all objects of that type which are above the horizon on the selected night will be displayed in the box labelled <guilabel>Matching Objects</guilabel>. For example, in the screenshot, the <guilabel>Planets</guilabel> category has been selected, and four planets which are up on the selected night are displayed (Mars, Neptune, Pluto, and Uranus). When an object in the list is selected, its rise, set and transit times are displayed in the lower-right panel. In addition, you can press the <guibutton>Object Details...</guibutton> button to open the <link linkend="tool-details">Object Details window</link> for that object. </para>
+<para>By default, the WUT will display objects which are above the horizon between sunset and midnight (i.e., <quote>in the evening</quote>). You can choose to show objects which are up between midnight and dawn (<quote>in the morning</quote>), or between dusk and dawn (<quote>any time tonight</quote>) using the combobox near the top of the window. </para>
 </sect1>
 
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/zenith.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/zenith.docbook
index a466a29e333..ddc138071d4 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/zenith.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/zenith.docbook
@@ -1,44 +1,14 @@
 <sect1 id="ai-zenith">
 <sect1info>
-<author
-><firstname
->Jason</firstname
-> <surname
->Harris</surname
-> </author>
+<author><firstname>Jason</firstname> <surname>Harris</surname> </author>
 </sect1info>
-<title
->The Zenith</title>
-<indexterm
-><primary
->Zenith</primary>
-<seealso
->Horizontal Coordinates</seealso>
+<title>The Zenith</title>
+<indexterm><primary>Zenith</primary>
+<seealso>Horizontal Coordinates</seealso>
 </indexterm>
-<para
->The Zenith is the point in the sky where you are looking when you look <quote
->straight up</quote
-> from the ground. More precisely, it is the point on the sky with an <firstterm
->Altitude</firstterm
-> of +90 Degrees; it is the Pole of the <link linkend="horizontal"
->Horizontal Coordinate System</link
->. Geometrically, it is the point on the <link linkend="ai-csphere"
->Celestial Sphere</link
-> intersected by a line drawn from the centre of the Earth through your location on the Earth's surface. </para
-><para
->The Zenith is, by definition, a point along the <link linkend="ai-meridian"
->Local Meridian</link
->. </para>
+<para>The Zenith is the point in the sky where you are looking when you look <quote>straight up</quote> from the ground. More precisely, it is the point on the sky with an <firstterm>Altitude</firstterm> of +90 Degrees; it is the Pole of the <link linkend="horizontal">Horizontal Coordinate System</link>. Geometrically, it is the point on the <link linkend="ai-csphere">Celestial Sphere</link> intersected by a line drawn from the centre of the Earth through your location on the Earth's surface. </para><para>The Zenith is, by definition, a point along the <link linkend="ai-meridian">Local Meridian</link>. </para>
 <tip>
-<para
->Exercise:</para>
-<para
->You can point to the Zenith by pressing <keycap
->Z</keycap
-> or by selecting <guimenuitem
->Zenith</guimenuitem
-> from the <guimenu
->Location</guimenu
-> menu. </para>
+<para>Exercise:</para>
+<para>You can point to the Zenith by pressing <keycap>Z</keycap> or by selecting <guimenuitem>Zenith</guimenuitem> from the <guimenu>Location</guimenu> menu. </para>
 </tip>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kturtle/getting-started.docbook b/tde-i18n-en_GB/docs/tdeedu/kturtle/getting-started.docbook
index fb4e5045d03..7d907c42939 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kturtle/getting-started.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kturtle/getting-started.docbook
@@ -1,125 +1,47 @@
 <chapter id="getting-started">
-<title
->Getting Started</title>
-<para
->When you start &kturtle; you will see something like this: <screenshot
-> <screeninfo
->Here is a screenshot of &kturtle; when you start it for the first time</screeninfo
-> <mediaobject
-> <imageobject
-> <imagedata fileref="mainwindow.png" format="PNG"/> </imageobject
-> <textobject
-> <phrase
->&kturtle; Main window</phrase
-> </textobject
-> </mediaobject
-> </screenshot
-> In this Getting Started guide we assume that the language of the &logo; commands is English. You can change this language in <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure &kturtle;...</guimenuitem
-></menuchoice
-> in the <guilabel
->Language</guilabel
-> section. Be aware that the language you set here for &kturtle; is the one you use to type the &logo; commands.</para>
+<title>Getting Started</title>
+<para>When you start &kturtle; you will see something like this: <screenshot> <screeninfo>Here is a screenshot of &kturtle; when you start it for the first time</screeninfo> <mediaobject> <imageobject> <imagedata fileref="mainwindow.png" format="PNG"/> </imageobject> <textobject> <phrase>&kturtle; Main window</phrase> </textobject> </mediaobject> </screenshot> In this Getting Started guide we assume that the language of the &logo; commands is English. You can change this language in <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &kturtle;...</guimenuitem></menuchoice> in the <guilabel>Language</guilabel> section. Be aware that the language you set here for &kturtle; is the one you use to type the &logo; commands.</para>
 
 <sect1 id="first-steps">
-<title
->First steps with &logo;: meet the Turtle!</title>
-<para
->You must have noticed the turtle is in the middle of the canvas: you are just about to learn how to control it using commands in the code editor.</para>
+<title>First steps with &logo;: meet the Turtle!</title>
+<para>You must have noticed the turtle is in the middle of the canvas: you are just about to learn how to control it using commands in the code editor.</para>
 
 <sect2 id="the-turtle-moves">
-<title
->The Turtle Moves</title>
-<para
->Let us start by getting the turtle moving. Our turtle can do 3 types of moves, (1) it can go forwards and backwards, (2) it can turn left and right and (3) it can go directly to a position on the screen. Try this for example:</para>
+<title>The Turtle Moves</title>
+<para>Let us start by getting the turtle moving. Our turtle can do 3 types of moves, (1) it can go forwards and backwards, (2) it can turn left and right and (3) it can go directly to a position on the screen. Try this for example:</para>
 <para>
-<screen
->forward 90
+<screen>forward 90
 turnleft 90 
 </screen>
-Type or copy-paste the code to the code editor and execute it (using <link linkend="file-execute"
-><menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Execute Commands</guimenuitem
-></menuchoice
-></link
->) to see the result.</para>
+Type or copy-paste the code to the code editor and execute it (using <link linkend="file-execute"><menuchoice><guimenu>File</guimenu><guimenuitem>Execute Commands</guimenuitem></menuchoice></link>) to see the result.</para>
 
-<para
->When you typed and executed the commands like above in the code editor you might have noticed one or more of the following things:</para>
+<para>When you typed and executed the commands like above in the code editor you might have noticed one or more of the following things:</para>
 <orderedlist>
-<listitem
-><para
->That &mdash; after executing the commands &mdash; the turtle moves up, draws a line, and then turns a quarter turn to the left. This because you have used the <link linkend="forward"
-><userinput
->forward</userinput
-></link
-> and the <link linkend="turnleft"
-><userinput
->turnleft</userinput
-></link
-> commands.</para>
+<listitem><para>That &mdash; after executing the commands &mdash; the turtle moves up, draws a line, and then turns a quarter turn to the left. This because you have used the <link linkend="forward"><userinput>forward</userinput></link> and the <link linkend="turnleft"><userinput>turnleft</userinput></link> commands.</para>
 </listitem>
 <listitem>
-<para
->That the colour of the code changed while you where typing it: this feature is called <emphasis
->intuitive highlighting</emphasis
-> &mdash; different types of commands are highlighted differently. This makes reading large blocks of code more easy.</para>
+<para>That the colour of the code changed while you where typing it: this feature is called <emphasis>intuitive highlighting</emphasis> &mdash; different types of commands are highlighted differently. This makes reading large blocks of code more easy.</para>
 </listitem>
 <listitem>
-<para
->That the turtle draws a thin black line.</para>
+<para>That the turtle draws a thin black line.</para>
 </listitem>
 <listitem>
-<para
->Maybe you got an error message. This could simply mean two things: you could have made a mistake while copying the commands, or you should still set the correct language for the &logo; commands (you can do that by choosing <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure &kturtle;...</guimenuitem
-></menuchoice
->, in the <guilabel
->Language</guilabel
-> section).</para>
+<para>Maybe you got an error message. This could simply mean two things: you could have made a mistake while copying the commands, or you should still set the correct language for the &logo; commands (you can do that by choosing <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &kturtle;...</guimenuitem></menuchoice>, in the <guilabel>Language</guilabel> section).</para>
 </listitem>
 </orderedlist>
 
-<para
->You will likely understand that <userinput
->forward 90</userinput
-> commanded the turtle to move forward leaving a line, and that <userinput
->turnleft 90</userinput
-> commanded the turtle to turn 90 <glossterm linkend="degrees"
->degrees</glossterm
-> to the left.</para>
+<para>You will likely understand that <userinput>forward 90</userinput> commanded the turtle to move forward leaving a line, and that <userinput>turnleft 90</userinput> commanded the turtle to turn 90 <glossterm linkend="degrees">degrees</glossterm> to the left.</para>
 
-<para
->Please see the following links to the reference manual for a complete explanation of the new commands: <userinput
->forward</userinput
->, <userinput
->backward</userinput
->, <userinput
->turnleft</userinput
->, and <userinput
->turnright</userinput
->.</para>
+<para>Please see the following links to the reference manual for a complete explanation of the new commands: <userinput>forward</userinput>, <userinput>backward</userinput>, <userinput>turnleft</userinput>, and <userinput>turnright</userinput>.</para>
 </sect2>
 
 <sect2 id="more-examples">
-<title
->More examples</title>
-<para
->The first example was very simple, so let us go on!</para>
+<title>More examples</title>
+<para>The first example was very simple, so let us go on!</para>
 
 <para>
 <!--translators: if it's not already there, you can copy/paste the translated code below and save it in arrow.logo in your examples folder: tde-i18n/language-code/data/tdeedu/kturtle/ -->
-<screen
->canvassize 200,200
+<screen>canvassize 200,200
 canvascolour 0,0,0
 pencolour 255,0,0
 penwidth 5
@@ -139,110 +61,29 @@ turnleft 45
 
 go 40, 100
 </screen>
-Again you can type or copy-paste the code to the code editor or open the <filename
->arrow.logo</filename
-> file in the <guimenu
->Open examples</guimenu
-> folder and execute it (using <link linkend="file-execute"
-><menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Execute Commands</guimenuitem
-></menuchoice
-></link
->) to see the result. In the next examples you are expected to know the drill.</para>
+Again you can type or copy-paste the code to the code editor or open the <filename>arrow.logo</filename> file in the <guimenu>Open examples</guimenu> folder and execute it (using <link linkend="file-execute"><menuchoice><guimenu>File</guimenu><guimenuitem>Execute Commands</guimenuitem></menuchoice></link>) to see the result. In the next examples you are expected to know the drill.</para>
 
-<para
->You might have noticed that this second example uses a lot more code. You have also seen a couple of new commands. Here a short explanation of all the new commands:</para>
+<para>You might have noticed that this second example uses a lot more code. You have also seen a couple of new commands. Here a short explanation of all the new commands:</para>
 
-<para
-><userinput
->canvassize 200,200</userinput
-> sets the canvas width and height to 200 <glossterm linkend="pixels"
->pixels</glossterm
->. The width and the height are equal, so the canvas will be a square.</para>
+<para><userinput>canvassize 200,200</userinput> sets the canvas width and height to 200 <glossterm linkend="pixels">pixels</glossterm>. The width and the height are equal, so the canvas will be a square.</para>
 
-<para
-><userinput
->canvascolour 0,0,0</userinput
-> makes the canvas black. <userinput
->0,0,0</userinput
-> is an <glossterm linkend="rgb"
->RGB-combination</glossterm
-> where all values are set to <userinput
->0</userinput
->, which results in black.</para>
+<para><userinput>canvascolour 0,0,0</userinput> makes the canvas black. <userinput>0,0,0</userinput> is an <glossterm linkend="rgb">RGB-combination</glossterm> where all values are set to <userinput>0</userinput>, which results in black.</para>
 
-<para
-><userinput
->pencolor 255,0,0</userinput
-> sets the color of the pen to red. <userinput
->255,0,0</userinput
-> is an <glossterm linkend="rgb"
->RGB-combination</glossterm
-> where only the red value is set to <userinput
->255</userinput
-> (fully on) while the others (green and blue) are set to <userinput
->0</userinput
-> (fully off). This results in a bright shade of red.</para>
+<para><userinput>pencolor 255,0,0</userinput> sets the color of the pen to red. <userinput>255,0,0</userinput> is an <glossterm linkend="rgb">RGB-combination</glossterm> where only the red value is set to <userinput>255</userinput> (fully on) while the others (green and blue) are set to <userinput>0</userinput> (fully off). This results in a bright shade of red.</para>
 
-<para
-><userinput
->penwidth 5</userinput
-> sets the width (the size) of the pen to <userinput
->5</userinput
-> <glossterm linkend="pixels"
->pixels</glossterm
->. From now on every line the turtle draw will have a thickness of <userinput
->5</userinput
->, until we change the <userinput
->penwidth</userinput
-> to something else.</para>
+<para><userinput>penwidth 5</userinput> sets the width (the size) of the pen to <userinput>5</userinput> <glossterm linkend="pixels">pixels</glossterm>. From now on every line the turtle draw will have a thickness of <userinput>5</userinput>, until we change the <userinput>penwidth</userinput> to something else.</para>
 
-<para
-><userinput
->clear</userinput
-> clear the canvas, that is all it does.</para>
+<para><userinput>clear</userinput> clear the canvas, that is all it does.</para>
 
-<para
-><userinput
->go 20,20</userinput
-> commands the turtle to go to a certain place on the canvas. Counted from the upper left corner, this place is 20 <glossterm linkend="pixels"
->pixels</glossterm
-> across from the left, and 20 <glossterm linkend="pixels"
->pixels</glossterm
-> down from the top of the canvas. Note that using the <userinput
->go</userinput
-> command the turtle will not draw a line.</para>
+<para><userinput>go 20,20</userinput> commands the turtle to go to a certain place on the canvas. Counted from the upper left corner, this place is 20 <glossterm linkend="pixels">pixels</glossterm> across from the left, and 20 <glossterm linkend="pixels">pixels</glossterm> down from the top of the canvas. Note that using the <userinput>go</userinput> command the turtle will not draw a line.</para>
 
-<para
-><userinput
->direction 135</userinput
-> set the turtle's direction. The <userinput
->turnleft</userinput
-> and <userinput
->turnright</userinput
-> commands change the turtle's angle starting from its current direction. The <userinput
->direction</userinput
-> command changes the turtle's angle from zero, and thus is not relative to the turtle previous direction.</para>
+<para><userinput>direction 135</userinput> set the turtle's direction. The <userinput>turnleft</userinput> and <userinput>turnright</userinput> commands change the turtle's angle starting from its current direction. The <userinput>direction</userinput> command changes the turtle's angle from zero, and thus is not relative to the turtle previous direction.</para>
 
-<para
->After the <userinput
->direction</userinput
-> command a lot of <userinput
->forward</userinput
-> and <userinput
->turnleft</userinput
-> commands follow. These command do the actual drawing.</para>
+<para>After the <userinput>direction</userinput> command a lot of <userinput>forward</userinput> and <userinput>turnleft</userinput> commands follow. These command do the actual drawing.</para>
 
-<para
->At last another <userinput
->go</userinput
-> command is used to move the turtle aside.</para>
+<para>At last another <userinput>go</userinput> command is used to move the turtle aside.</para>
 
-<para
->Make sure you follow the links to the reference. The reference explains each command more thoroughly.</para>
+<para>Make sure you follow the links to the reference. The reference explains each command more thoroughly.</para>
 
 </sect2>
 </sect1>
@@ -252,41 +93,35 @@ Again you can type or copy-paste the code to the code editor or open the <filena
 <!--        EXTRA SECTIONS CAN BE ADDED TO THE "GETTING STARTED"
 
 <sect1 id="calculations">
-<title
->Simple Calculations</title>
+<title>Simple Calculations</title>
 <para>
 Not yet written
 </para>
 </sect1>
 <sect1 id="using_variables">
-<title
->Using Variables: creating 'number containers'</title>
+<title>Using Variables: creating 'number containers'</title>
 <para>
 Not yet written
 </para>
 </sect1>
 <sect1 id="using_strings">
-<title
->Using strings: creating 'text containers'</title>
+<title>Using strings: creating 'text containers'</title>
 <para>
 Not yet written
 </para>
 </sect1>
 <sect1 id="logic">
-<title
->Logic: asking the computer simple questions</title>
+<title>Logic: asking the computer simple questions</title>
 <para>
 Not yet written
 </para>
 </sect1>
 <sect1 id="recursion">
-<title
->Recursion: the Turtle is using itself</title>
+<title>Recursion: the Turtle is using itself</title>
 <para>
 Draw a maze for example
 </para>
-</sect1
->-->
+</sect1>-->
 
 
 </chapter>
\ No newline at end of file
diff --git a/tde-i18n-en_GB/docs/tdeedu/kturtle/glossary.docbook b/tde-i18n-en_GB/docs/tdeedu/kturtle/glossary.docbook
index 22af4ab935a..3a9af4e2a2e 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kturtle/glossary.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kturtle/glossary.docbook
@@ -1,404 +1,147 @@
 <chapter id="Glossary">
-<title
->Glossary</title>
+<title>Glossary</title>
 
-<para
->In this chapter you will find an explanation of most of the <quote
->uncommon</quote
-> words that are used in the handbook.</para>
+<para>In this chapter you will find an explanation of most of the <quote>uncommon</quote> words that are used in the handbook.</para>
 
 <glosslist>
 <glossentry id="degrees">
-<glossterm
->degrees</glossterm>
-<glossdef
-><para
->Degrees are units to measure angles or turns. A full turn is 360 degrees, a half turn 180 degrees and a quarter turn 90 degrees. The commands <userinput
->turnleft</userinput
->, <userinput
->turnright</userinput
-> and <userinput
->direction</userinput
-> need an input in degrees.</para
-></glossdef>
+<glossterm>degrees</glossterm>
+<glossdef><para>Degrees are units to measure angles or turns. A full turn is 360 degrees, a half turn 180 degrees and a quarter turn 90 degrees. The commands <userinput>turnleft</userinput>, <userinput>turnright</userinput> and <userinput>direction</userinput> need an input in degrees.</para></glossdef>
 </glossentry>
 
 <glossentry id="input-output">
-<glossterm
->input and output of commands</glossterm>
-<glossdef
-><para
->Some commands take input, some commands give output, some commands take input <emphasis
->and</emphasis
-> give output and some commands neither take input nor give output.</para>
-<para
->Some examples of commands that only take input are: <screen>
+<glossterm>input and output of commands</glossterm>
+<glossdef><para>Some commands take input, some commands give output, some commands take input <emphasis>and</emphasis> give output and some commands neither take input nor give output.</para>
+<para>Some examples of commands that only take input are: <screen>
 forward 50
 pencolour 255,0,0
 print "Hello!"
-</screen
-> The <userinput
->forward</userinput
-> command takes <userinput
->50</userinput
-> as input. <userinput
->forward</userinput
-> needs this input to know how many <glossterm linkend="pixels"
->pixels</glossterm
-> it should go forward. <userinput
->pencolor</userinput
-> takes a colour as input and <userinput
->print</userinput
-> takes a string (a piece of text) as input. Please note that the input can also be a container. The next example illustrates this: <screen
->x = 50
+</screen> The <userinput>forward</userinput> command takes <userinput>50</userinput> as input. <userinput>forward</userinput> needs this input to know how many <glossterm linkend="pixels">pixels</glossterm> it should go forward. <userinput>pencolor</userinput> takes a colour as input and <userinput>print</userinput> takes a string (a piece of text) as input. Please note that the input can also be a container. The next example illustrates this: <screen>x = 50
 print x
 str = "hello!"
 print str
-</screen
-></para>
+</screen></para>
 
-<para
->Now some examples of commands that give output: <screen>
+<para>Now some examples of commands that give output: <screen>
 x = inputwindow "Please type something and press OK... thanks!"
 r = random 1,100
-</screen
-> The <userinput
->inputwindow</userinput
-> command takes a string as input, and outputs the number or string that is entered. As you can see, the output of <userinput
->inputwindow</userinput
-> is stored in the container <userinput
->x</userinput
->. The <userinput
->random</userinput
-> command also gives output. In this case it outputs a number between 1 and 100. The output of the random is again stored in a container, named <userinput
->r</userinput
->. Note that the containers <userinput
->x</userinput
-> and <userinput
->r</userinput
-> are not used in the example code above.</para>
+</screen> The <userinput>inputwindow</userinput> command takes a string as input, and outputs the number or string that is entered. As you can see, the output of <userinput>inputwindow</userinput> is stored in the container <userinput>x</userinput>. The <userinput>random</userinput> command also gives output. In this case it outputs a number between 1 and 100. The output of the random is again stored in a container, named <userinput>r</userinput>. Note that the containers <userinput>x</userinput> and <userinput>r</userinput> are not used in the example code above.</para>
 
-<para
->There are also commands that neither need input nor give output. Here are some examples: <screen
->clear
+<para>There are also commands that neither need input nor give output. Here are some examples: <screen>clear
 penup
 wrapon
 hide
 </screen>
-</para
-></glossdef>
+</para></glossdef>
 </glossentry>
 
 <glossentry id="intuitive-highlighting">
-<glossterm
->intuitive highlighting</glossterm>
-<glossdef
-><para
->This is a feature of &kturtle; that makes coding even easier. With intuitive highlighting the code that you write gets a colour that indicates what type of code it is. In the next list you will find the different types of code and the colour they get in <link linkend="the-code-editor"
->the code editor</link
->. <table>
-<title
->Different types of code and their highlight colour</title>
+<glossterm>intuitive highlighting</glossterm>
+<glossdef><para>This is a feature of &kturtle; that makes coding even easier. With intuitive highlighting the code that you write gets a colour that indicates what type of code it is. In the next list you will find the different types of code and the colour they get in <link linkend="the-code-editor">the code editor</link>. <table>
+<title>Different types of code and their highlight colour</title>
 <tgroup cols="3">
 <tbody>
 <row>
-<entry
->regular commands</entry>
-<entry
->dark green</entry>
-<entry
->The regular commands are described <link linkend="commands"
->here</link
->.</entry>
+<entry>regular commands</entry>
+<entry>dark green</entry>
+<entry>The regular commands are described <link linkend="commands">here</link>.</entry>
 </row>
 <row>
-<entry
->execution controllers</entry>
-<entry
->black (bold)</entry>
-<entry
->The special commands control execution, read more on them <link linkend="controlling-execution"
->here</link
->.</entry>
+<entry>execution controllers</entry>
+<entry>black (bold)</entry>
+<entry>The special commands control execution, read more on them <link linkend="controlling-execution">here</link>.</entry>
 </row>
 <row>
-<entry
->comments</entry>
-<entry
->dark yellow</entry>
-<entry
->Lines that are commented start with a comment characters (#). These lines are ignored when the code is executed. Comments allow the programmer to explain a bit about his code or can be used to temporarily prevent a certain piece of code from executing.</entry>
+<entry>comments</entry>
+<entry>dark yellow</entry>
+<entry>Lines that are commented start with a comment characters (#). These lines are ignored when the code is executed. Comments allow the programmer to explain a bit about his code or can be used to temporarily prevent a certain piece of code from executing.</entry>
 </row>
 <row>
-<entry
->brackets [, ]</entry>
-<entry
->light green (bold)</entry>
-<entry
->Brackets are used to group portions of code. Brackets are often used together with <link linkend="controlling-execution"
->execution controllers</link
->.</entry>
+<entry>brackets [, ]</entry>
+<entry>light green (bold)</entry>
+<entry>Brackets are used to group portions of code. Brackets are often used together with <link linkend="controlling-execution">execution controllers</link>.</entry>
 </row>
 <row>
-<entry
->the <link linkend="learn"
->learn</link
-> command</entry>
-<entry
->light green (bold)</entry>
-<entry
->The <link linkend="learn"
->learn</link
-> command is used to create new commands.</entry>
+<entry>the <link linkend="learn">learn</link> command</entry>
+<entry>light green (bold)</entry>
+<entry>The <link linkend="learn">learn</link> command is used to create new commands.</entry>
 </row>
 <row>
-<entry
->numbers</entry>
-<entry
->blue</entry>
-<entry
->Numbers, well not much to say about them.</entry>
+<entry>numbers</entry>
+<entry>blue</entry>
+<entry>Numbers, well not much to say about them.</entry>
 </row>
 <row>
-<entry
->strings</entry>
-<entry
->dark red</entry>
-<entry
->Not much to say about (text) strings either, except that they always start and end with the double quotes (").</entry>
+<entry>strings</entry>
+<entry>dark red</entry>
+<entry>Not much to say about (text) strings either, except that they always start and end with the double quotes (").</entry>
 </row>
 <row>
-<entry
->mathematical characters</entry>
-<entry
->grey</entry>
-<entry
->These are the mathematical characters: +, -, *, /, (, and ). Read more about them <link linkend="math"
->here</link
->.</entry>
+<entry>mathematical characters</entry>
+<entry>grey</entry>
+<entry>These are the mathematical characters: +, -, *, /, (, and ). Read more about them <link linkend="math">here</link>.</entry>
 </row>
 <row>
-<entry
->questions characters</entry>
-<entry
->blue (bold)</entry>
-<entry
->Read more about questions <link linkend="questions"
->here</link
->.</entry>
+<entry>questions characters</entry>
+<entry>blue (bold)</entry>
+<entry>Read more about questions <link linkend="questions">here</link>.</entry>
 </row>
 <row>
-<entry
->question glue-words</entry>
-<entry
->pink</entry>
-<entry
->Read more about the question glue-words (and, or, not) <link linkend="question-glue"
->here</link
->.</entry>
+<entry>question glue-words</entry>
+<entry>pink</entry>
+<entry>Read more about the question glue-words (and, or, not) <link linkend="question-glue">here</link>.</entry>
 </row>
 <row>
-<entry
->regular text</entry>
-<entry
->black</entry>
-<entry
-></entry>
+<entry>regular text</entry>
+<entry>black</entry>
+<entry></entry>
 </row>
 </tbody>
 </tgroup>
 </table>
-</para
-></glossdef>
+</para></glossdef>
 </glossentry>
 
 <glossentry id="pixels">
-<glossterm
->pixels</glossterm>
-<glossdef
-><para
->A pixel is a dot on the screen. If you look very close you will see that the screen of your monitor uses pixels. All images on the screen are built with these pixels. A pixel is the smallest thing that can be drawn on the screen.</para>
-<para
->A lot of commands need a number of pixels as input. These commands are: <userinput
->forward</userinput
->, <userinput
->backward</userinput
->, <userinput
->go</userinput
->, <userinput
->gox</userinput
->, <userinput
->goy</userinput
->, <userinput
->canvassize</userinput
-> and <userinput
->penwidth</userinput
->.</para
-></glossdef>
+<glossterm>pixels</glossterm>
+<glossdef><para>A pixel is a dot on the screen. If you look very close you will see that the screen of your monitor uses pixels. All images on the screen are built with these pixels. A pixel is the smallest thing that can be drawn on the screen.</para>
+<para>A lot of commands need a number of pixels as input. These commands are: <userinput>forward</userinput>, <userinput>backward</userinput>, <userinput>go</userinput>, <userinput>gox</userinput>, <userinput>goy</userinput>, <userinput>canvassize</userinput> and <userinput>penwidth</userinput>.</para></glossdef>
 </glossentry>
 
 <glossentry id="rgb">
-<glossterm
->RGB combinations (colour codes)</glossterm>
-<glossdef
-><para
->RGB combinations are used to describe colours. The <quote
->R</quote
-> stand for <quote
->red</quote
->, the <quote
->G</quote
-> stands for <quote
->green</quote
-> and the <quote
->B</quote
-> stands for <quote
->blue</quote
->. An example of an RGB combination is <userinput
->255,0,0</userinput
->: the first value (<quote
->red</quote
->) is 255 and the others are 0, so this represents a bright shade of red. Each value of an RGB combination has to be in the range 0 to 255. Here a small list of some often used colours: <table frame="none">
-<title
->Often used RGB combinations</title>
+<glossterm>RGB combinations (colour codes)</glossterm>
+<glossdef><para>RGB combinations are used to describe colours. The <quote>R</quote> stand for <quote>red</quote>, the <quote>G</quote> stands for <quote>green</quote> and the <quote>B</quote> stands for <quote>blue</quote>. An example of an RGB combination is <userinput>255,0,0</userinput>: the first value (<quote>red</quote>) is 255 and the others are 0, so this represents a bright shade of red. Each value of an RGB combination has to be in the range 0 to 255. Here a small list of some often used colours: <table frame="none">
+<title>Often used RGB combinations</title>
 <tgroup cols="2" colsep="5" rowsep="1">
 <colspec colname="c1"/>
 <tbody>
-<row
-><entry
-><userinput
->0,0,0</userinput
-></entry
-><entry
->black</entry
-></row>
-<row
-><entry
-><userinput
->255,255,255</userinput
-></entry
-><entry
->white</entry
-></row>
-<row
-><entry
-><userinput
->255,0,0</userinput
-></entry
-><entry
->red</entry
-></row>
-<row
-><entry
-><userinput
->150,0,0</userinput
-></entry
-><entry
->dark red</entry
-></row>
-<row
-><entry
-><userinput
->0,255,0</userinput
-></entry
-><entry
->green</entry
-></row>
-<row
-><entry
-><userinput
->0,0,255</userinput
-></entry
-><entry
->blue</entry
-></row>
-<row
-><entry
-><userinput
->0,255,255</userinput
-></entry
-><entry
->light blue</entry
-></row>
-<row
-><entry
-><userinput
->255,0,255</userinput
-></entry
-><entry
->pink</entry
-></row>
-<row
-><entry
-><userinput
->255,255,0</userinput
-></entry
-><entry
->yellow</entry
-></row>
+<row><entry><userinput>0,0,0</userinput></entry><entry>black</entry></row>
+<row><entry><userinput>255,255,255</userinput></entry><entry>white</entry></row>
+<row><entry><userinput>255,0,0</userinput></entry><entry>red</entry></row>
+<row><entry><userinput>150,0,0</userinput></entry><entry>dark red</entry></row>
+<row><entry><userinput>0,255,0</userinput></entry><entry>green</entry></row>
+<row><entry><userinput>0,0,255</userinput></entry><entry>blue</entry></row>
+<row><entry><userinput>0,255,255</userinput></entry><entry>light blue</entry></row>
+<row><entry><userinput>255,0,255</userinput></entry><entry>pink</entry></row>
+<row><entry><userinput>255,255,0</userinput></entry><entry>yellow</entry></row>
 </tbody>
 </tgroup>
 </table>
 </para>
-<para
->To easily find the RGB combinations of a colour you should try the colour picker! You can open the colour picker using <link linkend="tools-color-picker"
-><menuchoice
-><guimenu
->Tools</guimenu
-><guimenuitem
->Colour Picker</guimenuitem
-></menuchoice
-></link
->.</para>
-<para
->Two commands need an RGB combination as input: these commands are <userinput
->canvascolour</userinput
-> and <userinput
->pencolour</userinput
->.</para
-></glossdef>
+<para>To easily find the RGB combinations of a colour you should try the colour picker! You can open the colour picker using <link linkend="tools-color-picker"><menuchoice><guimenu>Tools</guimenu><guimenuitem>Colour Picker</guimenuitem></menuchoice></link>.</para>
+<para>Two commands need an RGB combination as input: these commands are <userinput>canvascolour</userinput> and <userinput>pencolour</userinput>.</para></glossdef>
 </glossentry>
 
 <glossentry id="sprite">
-<glossterm
->sprite</glossterm>
-<glossdef
-><para
->A sprite is a small picture that can be moved around the screen. Our beloved turtle, for instance, is a sprite.</para>
-<para
->Note: with this version of &kturtle; the sprite cannot be changed from a turtle into something else. Future versions of &kturtle; will be able to do this.</para
-></glossdef>
+<glossterm>sprite</glossterm>
+<glossdef><para>A sprite is a small picture that can be moved around the screen. Our beloved turtle, for instance, is a sprite.</para>
+<para>Note: with this version of &kturtle; the sprite cannot be changed from a turtle into something else. Future versions of &kturtle; will be able to do this.</para></glossdef>
 </glossentry>
 
 <glossentry id="wrapping">
-<glossterm
->wrapping</glossterm>
-<glossdef
-><para
->Wrapping is what happens when the turtle draws something that is to big to fix in on the canvas and wrapping is set <quote
->on</quote
->. <screenshot
-> <screeninfo
->This is what happens when wrapping is <quote
->on</quote
-></screeninfo
-> <mediaobject
-> <imageobject
-> <imagedata fileref="wrapping.png" format="PNG"/> </imageobject
-> <textobject
-> <phrase
->An example of wrapping</phrase
-> </textobject
-> </mediaobject
-> </screenshot
-> When the turtle moves off a border of the canvas it is instantly taken to the opposite border so it can continue its move. This way the turtle will always stay on the screen while it moves. This happens when wrapping is on.</para>
-<para
->Wrapping can be turned on and off with the <userinput
->wrapon</userinput
-> and <userinput
->wrapoff</userinput
-> commands. When &kturtle; starts wrapping is turned on by default.</para
-></glossdef>
+<glossterm>wrapping</glossterm>
+<glossdef><para>Wrapping is what happens when the turtle draws something that is to big to fix in on the canvas and wrapping is set <quote>on</quote>. <screenshot> <screeninfo>This is what happens when wrapping is <quote>on</quote></screeninfo> <mediaobject> <imageobject> <imagedata fileref="wrapping.png" format="PNG"/> </imageobject> <textobject> <phrase>An example of wrapping</phrase> </textobject> </mediaobject> </screenshot> When the turtle moves off a border of the canvas it is instantly taken to the opposite border so it can continue its move. This way the turtle will always stay on the screen while it moves. This happens when wrapping is on.</para>
+<para>Wrapping can be turned on and off with the <userinput>wrapon</userinput> and <userinput>wrapoff</userinput> commands. When &kturtle; starts wrapping is turned on by default.</para></glossdef>
 </glossentry>
 
 </glosslist>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kturtle/index.docbook b/tde-i18n-en_GB/docs/tdeedu/kturtle/index.docbook
index 4a23baed449..39fc13e2258 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kturtle/index.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kturtle/index.docbook
@@ -1,14 +1,12 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY kturtle "KTurtle">
-  <!ENTITY kapp "&kturtle;"
-><!-- replace kturtle here -->
+  <!ENTITY kapp "&kturtle;"><!-- replace kturtle here -->
   <!ENTITY kappname "&kturtle;">
   <!ENTITY package "tdeedu">
   <!ENTITY logo "Logo">
   <!ENTITY % addindex "IGNORE">
-  <!ENTITY % British-English "INCLUDE"
-><!-- change language only here -->
+  <!ENTITY % British-English "INCLUDE"><!-- change language only here -->
   <!ENTITY using-kturtle SYSTEM "using-kturtle.docbook">
   <!ENTITY getting-started SYSTEM "getting-started.docbook">
   <!ENTITY programming-reference SYSTEM "programming-reference.docbook">
@@ -19,168 +17,73 @@
 <book lang="&language;">
 
 <bookinfo>
-<title
->The &kturtle; Handbook</title>
+<title>The &kturtle; Handbook</title>
 
 <authorgroup>
-<author
-><firstname
->Cies</firstname
-> <surname
->Breijs</surname
-> <affiliation
-> <address
-><email
->cies # showroommama ! nl</email
-></address>
+<author><firstname>Cies</firstname> <surname>Breijs</surname> <affiliation> <address><email>cies # showroommama ! nl</email></address>
 </affiliation>
 </author>
-<author
-><firstname
->Anne-Marie</firstname
-> <surname
->Mahfouf</surname
-> <affiliation
-> <address
-><email
->annma@kde.org</email
-></address>
+<author><firstname>Anne-Marie</firstname> <surname>Mahfouf</surname> <affiliation> <address><email>annma@kde.org</email></address>
 </affiliation>
 </author>
 </authorgroup>
 
-<othercredit role="translator"
-><firstname
->Andrew</firstname
-><surname
->Coles</surname
-><affiliation
-><address
-><email
->andrew_coles@yahoo.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Andrew</firstname><surname>Coles</surname><affiliation><address><email>andrew_coles@yahoo.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 
 <copyright>
-<year
->2004</year>
-<holder
->Cies Breijs</holder>
+<year>2004</year>
+<holder>Cies Breijs</holder>
 </copyright>
 
-<legalnotice
->&FDLNotice;</legalnotice>
+<legalnotice>&FDLNotice;</legalnotice>
 
-<date
->2004-10-5</date>
-<releaseinfo
->0.2.1</releaseinfo>
+<date>2004-10-5</date>
+<releaseinfo>0.2.1</releaseinfo>
 
 <abstract>
-<para
->&kturtle; is an educational programming environment using the &logo; programming language. </para>
+<para>&kturtle; is an educational programming environment using the &logo; programming language. </para>
 </abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->tdeedu</keyword>
-<keyword
->KTurtle</keyword>
-<keyword
->education</keyword>
-<keyword
->language</keyword>
-<keyword
->native</keyword>
-<keyword
->programming</keyword>
-<keyword
->code</keyword>
-<keyword
->Logo</keyword>
-<keyword
->instructions</keyword>
-<keyword
->turtle</keyword>
+<keyword>KDE</keyword>
+<keyword>tdeedu</keyword>
+<keyword>KTurtle</keyword>
+<keyword>education</keyword>
+<keyword>language</keyword>
+<keyword>native</keyword>
+<keyword>programming</keyword>
+<keyword>code</keyword>
+<keyword>Logo</keyword>
+<keyword>instructions</keyword>
+<keyword>turtle</keyword>
 </keywordset>
 
 </bookinfo>
 
 <chapter id="introduction">
-<title
->Introduction</title>
+<title>Introduction</title>
 
-<para
->&kturtle; is an educational programming environment using the &logo; programming language. It tries to make programming as easy and accessible as possible. This makes &kturtle; suitable for teaching kids the basics of maths, geometry and... programming. The commands used to program are in the style of the &logo; programming language. The unique feature of &logo; is that the commands are often translated into the speaking language of the programmer.</para>
+<para>&kturtle; is an educational programming environment using the &logo; programming language. It tries to make programming as easy and accessible as possible. This makes &kturtle; suitable for teaching kids the basics of maths, geometry and... programming. The commands used to program are in the style of the &logo; programming language. The unique feature of &logo; is that the commands are often translated into the speaking language of the programmer.</para>
 
-<para
->&kturtle; is named after <quote
->the turtle</quote
-> that plays a central role in the programming environment. The user programs the turtle, using the &logo; commands, to draw a picture on <link linkend="the-canvas"
->the canvas</link
->.</para>
+<para>&kturtle; is named after <quote>the turtle</quote> that plays a central role in the programming environment. The user programs the turtle, using the &logo; commands, to draw a picture on <link linkend="the-canvas">the canvas</link>.</para>
 
 <sect1 id="what-is-logo">
-<title
->What is &logo;?</title>
-<para
->The first version &logo; programming language was created by Seymour Papert of MIT Artificial Intelligence Laboratory in 1967 as an offshoot of the LISP programming language. From then many versions of &logo; have been released. By 1980 &logo; was gaining momentum, with versions for MSX, Commodore, Atari, Apple II and IBM PC systems. These versions were mainly for educational purposes. LCSI released <application
->MacLogo</application
-> in 1985 as a tool for professional programmers, but it never caught on. MIT is still maintaining a site on &logo; which can be found on <ulink url="http://el.media.mit.edu/logo-foundation/"
->http://el.media.mit.edu/logo-foundation/</ulink
->.</para>
-
-<para
->Today there are several versions of &logo; around which can easily be found on <ulink url="http://el.media.mit.edu/logo-foundation/"
->MIT's &logo; site</ulink
-> and by a simple <ulink url="http://www.google.com/search?q=logo+programming+kids"
->Google search</ulink
->. This version of &logo; (&kturtle;) is only focused on the educational qualities of the programming language and will not try to suit professional programmers' needs.</para>
+<title>What is &logo;?</title>
+<para>The first version &logo; programming language was created by Seymour Papert of MIT Artificial Intelligence Laboratory in 1967 as an offshoot of the LISP programming language. From then many versions of &logo; have been released. By 1980 &logo; was gaining momentum, with versions for MSX, Commodore, Atari, Apple II and IBM PC systems. These versions were mainly for educational purposes. LCSI released <application>MacLogo</application> in 1985 as a tool for professional programmers, but it never caught on. MIT is still maintaining a site on &logo; which can be found on <ulink url="http://el.media.mit.edu/logo-foundation/">http://el.media.mit.edu/logo-foundation/</ulink>.</para>
+
+<para>Today there are several versions of &logo; around which can easily be found on <ulink url="http://el.media.mit.edu/logo-foundation/">MIT's &logo; site</ulink> and by a simple <ulink url="http://www.google.com/search?q=logo+programming+kids">Google search</ulink>. This version of &logo; (&kturtle;) is only focused on the educational qualities of the programming language and will not try to suit professional programmers' needs.</para>
 </sect1>
 
 <sect1 id="features-of-kturtle">
-<title
->Features of &kturtle;</title>
-<para
->&kturtle; has some nice features that make starting to program a breeze. See here some of the highlights of &kturtle; feature set: <itemizedlist>
-<listitem
-><para
->An integrated &logo; interpreter, so no need to download any other program. </para
-></listitem>
-<listitem
-><para
->A powerful editor for the &logo; commands with intuitive syntax highlighting, line numbering and more. </para
-></listitem>
-<listitem
-><para
-><link linkend="the-canvas"
->The canvas</link
-> can be saved as an image or printed. </para
-></listitem>
-<listitem
-><para
->Context help for all &logo; commands: Just press <keysym
->F1</keysym
->. </para
-></listitem>
-<listitem
-><para
->The &logo; commands are fully translatable (currently only English, Dutch, French, German and Swedish are supported). </para
-></listitem>
-<listitem
-><para
->Full-screen mode. </para
-></listitem>
-<listitem
-><para
->Many integrated, internationalised example &logo; programs make it easy to get started. </para
-></listitem>
+<title>Features of &kturtle;</title>
+<para>&kturtle; has some nice features that make starting to program a breeze. See here some of the highlights of &kturtle; feature set: <itemizedlist>
+<listitem><para>An integrated &logo; interpreter, so no need to download any other program. </para></listitem>
+<listitem><para>A powerful editor for the &logo; commands with intuitive syntax highlighting, line numbering and more. </para></listitem>
+<listitem><para><link linkend="the-canvas">The canvas</link> can be saved as an image or printed. </para></listitem>
+<listitem><para>Context help for all &logo; commands: Just press <keysym>F1</keysym>. </para></listitem>
+<listitem><para>The &logo; commands are fully translatable (currently only English, Dutch, French, German and Swedish are supported). </para></listitem>
+<listitem><para>Full-screen mode. </para></listitem>
+<listitem><para>Many integrated, internationalised example &logo; programs make it easy to get started. </para></listitem>
 </itemizedlist>
 </para>
 </sect1>
@@ -198,96 +101,46 @@
 
 <chapter id="credits">
 
-<title
->Credits and Licence</title>
-
-<para
->&kturtle; </para>
-<para
->Program copyright 2003-2004 Cies Breijs <email
->cies # showroommama ! nl</email
-></para>
-<para
->Contributors: <itemizedlist>
-<listitem
-><para
->Coding help, editor part: Anne-Marie Mahfouf <email
->annma@kde.org</email
-></para>
+<title>Credits and Licence</title>
+
+<para>&kturtle; </para>
+<para>Program copyright 2003-2004 Cies Breijs <email>cies # showroommama ! nl</email></para>
+<para>Contributors: <itemizedlist>
+<listitem><para>Coding help, editor part: Anne-Marie Mahfouf <email>annma@kde.org</email></para>
 </listitem>
-<listitem
-><para
->Author of <application
->wsbasic</application
-> (<ulink url="http://wsbasic.sourceforge.net"
->http://wsbasic.sourceforge.net</ulink
->) which is the base for the interpreter of &kturtle;: Walter Schreppers <email
->Walter.Schreppers@ua.ac.be</email
-></para>
+<listitem><para>Author of <application>wsbasic</application> (<ulink url="http://wsbasic.sourceforge.net">http://wsbasic.sourceforge.net</ulink>) which is the base for the interpreter of &kturtle;: Walter Schreppers <email>Walter.Schreppers@ua.ac.be</email></para>
 </listitem>
-<listitem
-><para
->German Data Files: Matthias Me&szlig;mer <email
->bmlmessmer@web.de</email
-></para>
+<listitem><para>German Data Files: Matthias Me&szlig;mer <email>bmlmessmer@web.de</email></para>
 </listitem>
-<listitem
-><para
->Swedish Data Files: Stefan Asserh&#228;ll <email
->stefan.asserhal@telia.com</email
-></para>
+<listitem><para>Swedish Data Files: Stefan Asserh&#228;ll <email>stefan.asserhal@telia.com</email></para>
 </listitem>
 </itemizedlist>
 </para>
 
-<para
->Documentation copyright 2004 <itemizedlist>
-<listitem
-><para
->Cies Briej <email
->cies # showroommama ! nl</email
-> </para
-></listitem>
-<listitem
-><para
->Anne-Marie Mahfouf <email
->annma@kde.org</email
-> </para
-></listitem>
-<listitem
-><para
->Some proofreading changes by &Philip.Rodrigues; &Philip.Rodrigues.mail;</para>
+<para>Documentation copyright 2004 <itemizedlist>
+<listitem><para>Cies Briej <email>cies # showroommama ! nl</email> </para></listitem>
+<listitem><para>Anne-Marie Mahfouf <email>annma@kde.org</email> </para></listitem>
+<listitem><para>Some proofreading changes by &Philip.Rodrigues; &Philip.Rodrigues.mail;</para>
 </listitem>
-<listitem
-><para
->Updated translation how-to and some proofreading changes by Andrew Coles <email
->andrew_coles@yahoo.co.uk</email
-></para>
+<listitem><para>Updated translation how-to and some proofreading changes by Andrew Coles <email>andrew_coles@yahoo.co.uk</email></para>
 </listitem>
 
 </itemizedlist>
 </para>
-<para
->Andrew Coles<email
->andrew_coles@yahoo.co.uk</email
-></para
-> 
+<para>Andrew Coles<email>andrew_coles@yahoo.co.uk</email></para> 
 &underFDL; &underGPL; </chapter>
 
 
 
 <appendix id="installation">
-<title
->Installation</title>
+<title>Installation</title>
 
 <sect1 id="getting-kturtle">
-<title
->How to obtain &kturtle;</title>
+<title>How to obtain &kturtle;</title>
 &install.intro.documentation; </sect1>
 
 <sect1 id="compilation">
-<title
->Compilation and Installation</title>
+<title>Compilation and Installation</title>
 &install.compile.documentation; </sect1>
 
 </appendix>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kturtle/programming-reference.docbook b/tde-i18n-en_GB/docs/tdeedu/kturtle/programming-reference.docbook
index 5e459b562f1..85ac1908ab7 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kturtle/programming-reference.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kturtle/programming-reference.docbook
@@ -1,602 +1,269 @@
 <chapter id="reference">
-<title
->&kturtle;'s &logo; Programming Reference</title>
+<title>&kturtle;'s &logo; Programming Reference</title>
 
 <sect1 id="commands">
-<title
->Commands</title>
-<para
->Using commands you tell the turtle or &kturtle; to do something. Some commands need input, some give output. In this section we explain all the commands that can be used in &kturtle;.</para>
+<title>Commands</title>
+<para>Using commands you tell the turtle or &kturtle; to do something. Some commands need input, some give output. In this section we explain all the commands that can be used in &kturtle;.</para>
 
 <sect2 id="moving-the-turtle">
-<title
->Moving the turtle</title>
-<para
->There are several commands to move the turtle over the screen.</para>
+<title>Moving the turtle</title>
+<para>There are several commands to move the turtle over the screen.</para>
   
   <variablelist>
     <anchor id="forward"/>
     <varlistentry>
-      <term
->forward</term>
-      <listitem
-><para
-><screen
->forward X</screen>
-<userinput
->forward</userinput
-> moves the turtle forward by the amount of X pixels. When the pen is down the turtle will leave a trail. <userinput
->forward</userinput
-> can be abbreviated to <userinput
->fw</userinput
-></para
-></listitem>
+      <term>forward</term>
+      <listitem><para><screen>forward X</screen>
+<userinput>forward</userinput> moves the turtle forward by the amount of X pixels. When the pen is down the turtle will leave a trail. <userinput>forward</userinput> can be abbreviated to <userinput>fw</userinput></para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="backward"/>
     <varlistentry>
-      <term
->backward</term>
-      <listitem
-><para
-><screen
->backward X</screen>
-<userinput
->backward</userinput
-> moves the turtle backward by the amount of X pixels. When the pen is down the turtle will leave a trail. <userinput
->backward</userinput
-> can be abbreviated to <userinput
->bw</userinput
->.</para
-></listitem>
+      <term>backward</term>
+      <listitem><para><screen>backward X</screen>
+<userinput>backward</userinput> moves the turtle backward by the amount of X pixels. When the pen is down the turtle will leave a trail. <userinput>backward</userinput> can be abbreviated to <userinput>bw</userinput>.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="turnleft"/>
     <varlistentry>
-      <term
->turnleft</term>
-      <listitem
-><para
-><screen
->turnleft X</screen>
-<userinput
->turnleft</userinput
-> commands the turtle to turn an amount of X degrees to the left. <userinput
->turnleft</userinput
-> can be abbreviated to <userinput
->tl</userinput
->.</para
-></listitem>
+      <term>turnleft</term>
+      <listitem><para><screen>turnleft X</screen>
+<userinput>turnleft</userinput> commands the turtle to turn an amount of X degrees to the left. <userinput>turnleft</userinput> can be abbreviated to <userinput>tl</userinput>.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="turnright"/>
     <varlistentry>
-      <term
->turnright</term>
-      <listitem
-><para
-><screen
->turnright X</screen>
-<userinput
->turnright</userinput
->the turtle to turn an amount of X degrees to the right. <userinput
->turnright</userinput
-> can be abbreviated to <userinput
->tr</userinput
->.</para
-></listitem>
+      <term>turnright</term>
+      <listitem><para><screen>turnright X</screen>
+<userinput>turnright</userinput>the turtle to turn an amount of X degrees to the right. <userinput>turnright</userinput> can be abbreviated to <userinput>tr</userinput>.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="direction"/>
     <varlistentry>
-      <term
->direction</term>
-      <listitem
-><para
-><screen
->direction X</screen>
-<userinput
->direction</userinput
-> set the turtle's direction to an amount of X degrees counting from zero, and thus is not relative to the turtle's previous direction. <userinput
->direction</userinput
-> can be abbreviated to <userinput
->dir</userinput
->.</para
-></listitem>
+      <term>direction</term>
+      <listitem><para><screen>direction X</screen>
+<userinput>direction</userinput> set the turtle's direction to an amount of X degrees counting from zero, and thus is not relative to the turtle's previous direction. <userinput>direction</userinput> can be abbreviated to <userinput>dir</userinput>.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="center"/>
     <varlistentry>
-      <term
->centre</term>
-      <listitem
-><para
-><screen
->centre</screen>
-<userinput
->centre</userinput
-> moves the turtle to the centre on the canvas.</para
-></listitem>
+      <term>centre</term>
+      <listitem><para><screen>centre</screen>
+<userinput>centre</userinput> moves the turtle to the centre on the canvas.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="go"/>
     <varlistentry>
-      <term
->go</term>
-      <listitem
-><para
-><screen
->go X,Y</screen>
-<userinput
->go</userinput
-> commands the turtle to go to a certain place on the canvas. This place is X <glossterm linkend="pixels"
->pixels</glossterm
-> from the left of the canvas, and Y <glossterm linkend="pixels"
->pixels</glossterm
-> form the top of the canvas. Note that using the <userinput
->go</userinput
-> command the turtle will not draw a line.</para
-></listitem>
+      <term>go</term>
+      <listitem><para><screen>go X,Y</screen>
+<userinput>go</userinput> commands the turtle to go to a certain place on the canvas. This place is X <glossterm linkend="pixels">pixels</glossterm> from the left of the canvas, and Y <glossterm linkend="pixels">pixels</glossterm> form the top of the canvas. Note that using the <userinput>go</userinput> command the turtle will not draw a line.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="gox"/>
     <varlistentry>
-      <term
->gox</term>
-      <listitem
-><para
-><screen
->gox X</screen>
-<userinput
->gox</userinput
-> using this command the turtle will move to X <glossterm linkend="pixels"
->pixels</glossterm
-> from the left of the canvas whilst staying at the same height.</para
-></listitem>
+      <term>gox</term>
+      <listitem><para><screen>gox X</screen>
+<userinput>gox</userinput> using this command the turtle will move to X <glossterm linkend="pixels">pixels</glossterm> from the left of the canvas whilst staying at the same height.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="goy"/>
     <varlistentry>
-      <term
->goy</term>
-      <listitem
-><para
-><screen
->goy Y</screen>
-<userinput
->gox</userinput
-> using this command the turtle will move to Y <glossterm linkend="pixels"
->pixels</glossterm
-> from the top of the canvas whilst staying at the same distance from the left border of the canvas.</para
-></listitem>
+      <term>goy</term>
+      <listitem><para><screen>goy Y</screen>
+<userinput>gox</userinput> using this command the turtle will move to Y <glossterm linkend="pixels">pixels</glossterm> from the top of the canvas whilst staying at the same distance from the left border of the canvas.</para></listitem>
     </varlistentry>
   </variablelist>
 </sect2>
 
 <sect2 id="pen">
-<title
->The turtle has a pen</title>
-<para
->The turtle has a pen that draws a line when the turtle moves. There are a few commands to control the pen. In this section we explain these commands.</para>
+<title>The turtle has a pen</title>
+<para>The turtle has a pen that draws a line when the turtle moves. There are a few commands to control the pen. In this section we explain these commands.</para>
   <variablelist>
     <anchor id="penup"/>
     <varlistentry>
-      <term
->penup</term>
-      <listitem
-><para
-><screen
->penup</screen>
-<userinput
->penup</userinput
-> lifts the pen from the canvas. When the pen is <quote
->up</quote
-> no line will be drawn when the turtle moves. See also <userinput
->pendown</userinput
->. <userinput
->penup</userinput
-> can be abbreviated to <userinput
->pu</userinput
->.</para
-></listitem>
+      <term>penup</term>
+      <listitem><para><screen>penup</screen>
+<userinput>penup</userinput> lifts the pen from the canvas. When the pen is <quote>up</quote> no line will be drawn when the turtle moves. See also <userinput>pendown</userinput>. <userinput>penup</userinput> can be abbreviated to <userinput>pu</userinput>.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="pendown"/>
     <varlistentry>
-      <term
->pendown</term>
-      <listitem
-><para
-><screen
->pendown</screen>
-<userinput
->pendown</userinput
-> presses the pen down on the canvas. When the pen is press <quote
->down</quote
-> on the canvas a line will be drawn when the turtle moves. See also <userinput
->penup</userinput
->.<userinput
->pendown</userinput
-> can be abbreviated to <userinput
->pd</userinput
->.</para
-></listitem>
+      <term>pendown</term>
+      <listitem><para><screen>pendown</screen>
+<userinput>pendown</userinput> presses the pen down on the canvas. When the pen is press <quote>down</quote> on the canvas a line will be drawn when the turtle moves. See also <userinput>penup</userinput>.<userinput>pendown</userinput> can be abbreviated to <userinput>pd</userinput>.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="penwidth"/>
     <varlistentry>
-      <term
->penwidth</term>
-      <listitem
-><para
-><screen
->penwidth X</screen>
-<userinput
->penwidth</userinput
-> sets the width of the pen (the line width) to an amount of X <glossterm linkend="pixels"
->pixels</glossterm
->. <userinput
->penwidth</userinput
-> can be abbreviated to <userinput
->pw</userinput
->.</para
-></listitem>
+      <term>penwidth</term>
+      <listitem><para><screen>penwidth X</screen>
+<userinput>penwidth</userinput> sets the width of the pen (the line width) to an amount of X <glossterm linkend="pixels">pixels</glossterm>. <userinput>penwidth</userinput> can be abbreviated to <userinput>pw</userinput>.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="pencolor"/>
     <varlistentry>
-      <term
->pencolour</term>
-      <listitem
-><para
-><screen
->pencolour R,G,B</screen>
-<userinput
->pencolor</userinput
-> sets the color of the pen. <userinput
->pencolor</userinput
-> takes an <glossterm linkend="rgb"
->RGB combination</glossterm
-> as input. <userinput
->pencolor</userinput
-> can be abbreviated to <userinput
->pc</userinput
->.</para
-></listitem>
+      <term>pencolour</term>
+      <listitem><para><screen>pencolour R,G,B</screen>
+<userinput>pencolor</userinput> sets the color of the pen. <userinput>pencolor</userinput> takes an <glossterm linkend="rgb">RGB combination</glossterm> as input. <userinput>pencolor</userinput> can be abbreviated to <userinput>pc</userinput>.</para></listitem>
     </varlistentry>
   </variablelist>
 </sect2>
 
 <sect2 id="canvas">
-<title
->Commands to control the canvas</title>
-<para
->There are several commands to control the canvas.</para>
+<title>Commands to control the canvas</title>
+<para>There are several commands to control the canvas.</para>
   <variablelist>
     <anchor id="canvassize"/>
     <varlistentry>
-      <term
->canvassize</term>
-      <listitem
-><para
-><screen
->canvassize X,Y</screen>
-With the <userinput
->canvassize</userinput
-> command you can set the size of the canvas. It takes X and Y as input, where X is the new canvas width in <glossterm linkend="pixels"
->pixels</glossterm
->, and Y is the new height of the canvas in <glossterm linkend="pixels"
->pixels</glossterm
->. <userinput
->canvassize</userinput
-> can be abbreviated to <userinput
->cs</userinput
->.</para
-></listitem>
+      <term>canvassize</term>
+      <listitem><para><screen>canvassize X,Y</screen>
+With the <userinput>canvassize</userinput> command you can set the size of the canvas. It takes X and Y as input, where X is the new canvas width in <glossterm linkend="pixels">pixels</glossterm>, and Y is the new height of the canvas in <glossterm linkend="pixels">pixels</glossterm>. <userinput>canvassize</userinput> can be abbreviated to <userinput>cs</userinput>.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="canvascolor"/>
     <varlistentry>
-      <term
->canvascolour</term>
-      <listitem
-><para
-><screen
->canvascolour R,G,B</screen>
-<userinput
->canvascolor</userinput
-> set the color of the canvas. <userinput
->canvascolor</userinput
-> takes an <glossterm linkend="rgb"
->RGB combination</glossterm
-> as input. <userinput
->canvascolor</userinput
-> can be abbreviated to <userinput
->cc</userinput
->.</para
-></listitem>
+      <term>canvascolour</term>
+      <listitem><para><screen>canvascolour R,G,B</screen>
+<userinput>canvascolor</userinput> set the color of the canvas. <userinput>canvascolor</userinput> takes an <glossterm linkend="rgb">RGB combination</glossterm> as input. <userinput>canvascolor</userinput> can be abbreviated to <userinput>cc</userinput>.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="wrapon"/>
     <varlistentry>
-      <term
->wrapon</term>
-      <listitem
-><para
-><screen
->wrapon</screen>
-With the <userinput
->wrapon</userinput
-> command you can set <glossterm linkend="wrapping"
->wrapping</glossterm
-> <quote
->on</quote
-> for the canvas. Please see the glossary if you want to know what <glossterm linkend="wrapping"
->wrapping</glossterm
-> is.</para
-></listitem>
+      <term>wrapon</term>
+      <listitem><para><screen>wrapon</screen>
+With the <userinput>wrapon</userinput> command you can set <glossterm linkend="wrapping">wrapping</glossterm> <quote>on</quote> for the canvas. Please see the glossary if you want to know what <glossterm linkend="wrapping">wrapping</glossterm> is.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="wrapoff"/>
     <varlistentry>
-      <term
->wrapoff</term>
-      <listitem
-><para
-><screen
->wrapoff</screen>
-With the <userinput
->wrapoff</userinput
-> command you can set <glossterm linkend="wrapping"
->wrapping</glossterm
-> <quote
->off</quote
-> for the canvas: this means the turtle can move off the canvas and can get <quote
->lost</quote
->. Please see the glossary if you want to know what <glossterm linkend="wrapping"
->wrapping</glossterm
-> is.</para
-></listitem>
+      <term>wrapoff</term>
+      <listitem><para><screen>wrapoff</screen>
+With the <userinput>wrapoff</userinput> command you can set <glossterm linkend="wrapping">wrapping</glossterm> <quote>off</quote> for the canvas: this means the turtle can move off the canvas and can get <quote>lost</quote>. Please see the glossary if you want to know what <glossterm linkend="wrapping">wrapping</glossterm> is.</para></listitem>
     </varlistentry>
   </variablelist>
 </sect2>
 
 <sect2 id="clean">
-<title
->Commands to clean up</title>
-<para
->There are two commands to clean up the canvas after you have made a mess.</para>
+<title>Commands to clean up</title>
+<para>There are two commands to clean up the canvas after you have made a mess.</para>
   <variablelist>
     <anchor id="clear"/>
     <varlistentry>
-      <term
->clear</term>
-      <listitem
-><para
-><screen
->clear</screen>
-With <userinput
->clear</userinput
-> you can clean all drawings from the canvas. All other things remain: the position and angle of the turtle, the canvascolor, the visibility of the turtle, and the canvas size. <userinput
->clear</userinput
-> can be abbreviated to <userinput
->ccl</userinput
->.</para
-></listitem>
+      <term>clear</term>
+      <listitem><para><screen>clear</screen>
+With <userinput>clear</userinput> you can clean all drawings from the canvas. All other things remain: the position and angle of the turtle, the canvascolor, the visibility of the turtle, and the canvas size. <userinput>clear</userinput> can be abbreviated to <userinput>ccl</userinput>.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="reset"/>
     <varlistentry>
-      <term
->reset</term>
-      <listitem
-><para
-><screen
->reset</screen>
-<userinput
->reset</userinput
-> cleans much more thoroughly than the <userinput
->clear</userinput
-> command. After a <userinput
->reset</userinput
-> command everything is like is was when you had just started &kturtle;. The turtle is positioned at the middle of the screen, the canvas color is white, and the turtle draws a black line on the canvas.</para
-></listitem>
+      <term>reset</term>
+      <listitem><para><screen>reset</screen>
+<userinput>reset</userinput> cleans much more thoroughly than the <userinput>clear</userinput> command. After a <userinput>reset</userinput> command everything is like is was when you had just started &kturtle;. The turtle is positioned at the middle of the screen, the canvas color is white, and the turtle draws a black line on the canvas.</para></listitem>
     </varlistentry>
   </variablelist>
 </sect2>
 
 <sect2 id="sprites">
-<title
->The turtle is a sprite</title>
-<para
->Many people do not know what sprites are, so here a short explanation: sprites are small pictures that can be moved around the screen. (for more info see the glossary on <glossterm linkend="sprites"
->sprites</glossterm
->). So the turtle is a sprite.</para>
-<para
->Next you will find a full overview on all commands to work with sprites.</para>
-<para
->[The current version of &kturtle; does not yet support the use of sprites other than the turtle. With future versions you will be able to change the turtle into something of your own design]</para>
+<title>The turtle is a sprite</title>
+<para>Many people do not know what sprites are, so here a short explanation: sprites are small pictures that can be moved around the screen. (for more info see the glossary on <glossterm linkend="sprites">sprites</glossterm>). So the turtle is a sprite.</para>
+<para>Next you will find a full overview on all commands to work with sprites.</para>
+<para>[The current version of &kturtle; does not yet support the use of sprites other than the turtle. With future versions you will be able to change the turtle into something of your own design]</para>
   <variablelist>
     <anchor id="show"/>
     <varlistentry>
-      <term
->show</term>
-      <listitem
-><para
-><screen
->show</screen>
-<userinput
->show</userinput
-> makes the turtle visible again after it has been hidden.<userinput
->show</userinput
-> can be abbreviated to <userinput
->ss</userinput
->.</para
-></listitem>
+      <term>show</term>
+      <listitem><para><screen>show</screen>
+<userinput>show</userinput> makes the turtle visible again after it has been hidden.<userinput>show</userinput> can be abbreviated to <userinput>ss</userinput>.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="hide"/>
     <varlistentry>
-      <term
->hide</term>
-      <listitem
-><para
-><screen
->hide</screen>
-<userinput
->hide</userinput
-> hides the turtle. This can be used if the turtle does not fit in your drawing.<userinput
->hide</userinput
-> can be abbreviated to <userinput
->sh</userinput
->.</para
-></listitem>
+      <term>hide</term>
+      <listitem><para><screen>hide</screen>
+<userinput>hide</userinput> hides the turtle. This can be used if the turtle does not fit in your drawing.<userinput>hide</userinput> can be abbreviated to <userinput>sh</userinput>.</para></listitem>
     </varlistentry>
   </variablelist>
 </sect2>
 
 <sect2 id="writing">
-<title
->Can the turtles write text?</title>
-<para
->The answer is: <quote
->yes</quote
->. The turtle can write: it writes just about everything you command it to.</para>
+<title>Can the turtles write text?</title>
+<para>The answer is: <quote>yes</quote>. The turtle can write: it writes just about everything you command it to.</para>
   <variablelist>
     <anchor id="print"/>
     <varlistentry>
-      <term
->print</term>
-      <listitem
-><para
-><screen
->print X</screen>
-The <userinput
->print</userinput
-> command is used to command the turtle to write something on the canvas. <userinput
->print</userinput
-> takes numbers and strings as input. You can <userinput
->print</userinput
-> various numbers and strings using the <quote
->+</quote
-> symbol. See here a small example: <screen
->year = 2004
+      <term>print</term>
+      <listitem><para><screen>print X</screen>
+The <userinput>print</userinput> command is used to command the turtle to write something on the canvas. <userinput>print</userinput> takes numbers and strings as input. You can <userinput>print</userinput> various numbers and strings using the <quote>+</quote> symbol. See here a small example: <screen>year = 2004
 author = "Cies"
 print "KTurtle was made in " + year + " by " + author
 </screen>
-      </para
-></listitem>
+      </para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="fontsize"/>
     <varlistentry>
-      <term
->fontsize</term>
-      <listitem
-><para
-><screen
->fontsize X</screen>
-<userinput
->fontsize</userinput
-> sets the size of the font that is used by <userinput
->print</userinput
->. <userinput
->fontsize</userinput
-> takes one input which should be a number. The size is set in <glossterm linkend="pixels"
->pixels</glossterm
->.</para
-></listitem>
+      <term>fontsize</term>
+      <listitem><para><screen>fontsize X</screen>
+<userinput>fontsize</userinput> sets the size of the font that is used by <userinput>print</userinput>. <userinput>fontsize</userinput> takes one input which should be a number. The size is set in <glossterm linkend="pixels">pixels</glossterm>.</para></listitem>
     </varlistentry>
   </variablelist>
 </sect2>
 
 <sect2 id="dice">
-<title
->A command that rolls a dice for you</title>
-<para
->There is one command that rolls a dice for you</para>
+<title>A command that rolls a dice for you</title>
+<para>There is one command that rolls a dice for you</para>
   <variablelist>
     <anchor id="random"/>
     <varlistentry>
-      <term
->random</term>
-      <listitem
-><para
-><screen
->random X,Y</screen>
-<userinput
->random</userinput
-> is a command that takes input and gives output. As input are required two numbers, the first (X) sets the minimum output, the second (Y) sets the maximum. The output is a randomly chosen number that is equal or greater then the minimum and equal or smaller than the maximum. Here a small example: <screen>
+      <term>random</term>
+      <listitem><para><screen>random X,Y</screen>
+<userinput>random</userinput> is a command that takes input and gives output. As input are required two numbers, the first (X) sets the minimum output, the second (Y) sets the maximum. The output is a randomly chosen number that is equal or greater then the minimum and equal or smaller than the maximum. Here a small example: <screen>
 repeat 500 [
   x = random 1,20
   forward x
   turnleft 10 - x
 ]
-</screen
-> Using the <userinput
->random</userinput
-> command you can add a bit of chaos to your program.</para
-></listitem>
+</screen> Using the <userinput>random</userinput> command you can add a bit of chaos to your program.</para></listitem>
     </varlistentry>
   </variablelist>
 </sect2>
 </sect1>
 
 <sect1 id="containers">
-<title
->Containers</title>
-<para
->Containers are letters or words that can be used by the programmer to store a number or a text. Containers that contain a number are called <link linkend="variables"
->variables</link
->, containers that can contain text are called <link linkend="strings"
->strings</link
->.</para>
+<title>Containers</title>
+<para>Containers are letters or words that can be used by the programmer to store a number or a text. Containers that contain a number are called <link linkend="variables">variables</link>, containers that can contain text are called <link linkend="strings">strings</link>.</para>
 
-<para
->Containers that are not used yet are 0 by default. An example: <screen>
+<para>Containers that are not used yet are 0 by default. An example: <screen>
 print N
-</screen
-> This will print a 0. </para>
+</screen> This will print a 0. </para>
 
 <sect2 id="variables">
-<title
->Variables: number containers</title>
-<para
->Let us start with an example: <screen>
+<title>Variables: number containers</title>
+<para>Let us start with an example: <screen>
 x = 3
 print x
-</screen
-> In the first line the letter <userinput
->x</userinput
-> made into a variable (number container). As you see the value of the variable <userinput
->x</userinput
-> is set to 3. On the second line the value is printed.</para>
-<para
->Note that if we wanted to print an <quote
->x</quote
-> that we should have written <screen
->print "x"
+</screen> In the first line the letter <userinput>x</userinput> made into a variable (number container). As you see the value of the variable <userinput>x</userinput> is set to 3. On the second line the value is printed.</para>
+<para>Note that if we wanted to print an <quote>x</quote> that we should have written <screen>print "x"
 </screen>
 </para>
-<para
->That was easy, now a bit harder example: <screen>
+<para>That was easy, now a bit harder example: <screen>
 A = 2004
 B = 25
 AB = A + B
@@ -609,296 +276,105 @@ print "" +  A + " plus " + B
 backward 30
 # the next command prints "1979"
 print A - B
-</screen
-> In the first two lines the variables <userinput
->A</userinput
-> and <userinput
->B</userinput
-> are set to 2004 and 25. On the third line the variable <userinput
->AB</userinput
-> is set to <userinput
->A + B</userinput
->, which is 2029. The rest of the example consists of 3 <userinput
->print</userinput
-> commands with <userinput
->backward 30</userinput
-> in between. The <userinput
->backward 30</userinput
-> is there to make sure every output is on a new line. In this example you also see that variables can be used in <link linkend="math"
->mathematical calculations</link
->.</para>
+</screen> In the first two lines the variables <userinput>A</userinput> and <userinput>B</userinput> are set to 2004 and 25. On the third line the variable <userinput>AB</userinput> is set to <userinput>A + B</userinput>, which is 2029. The rest of the example consists of 3 <userinput>print</userinput> commands with <userinput>backward 30</userinput> in between. The <userinput>backward 30</userinput> is there to make sure every output is on a new line. In this example you also see that variables can be used in <link linkend="math">mathematical calculations</link>.</para>
 </sect2>
 
 <sect2 id="strings">
-<title
->Strings: text containers</title>
-<para
->Strings are a lot like variables. The biggest difference is that strings cannot be used in <link linkend="math"
->mathematical calculations</link
-> and <link linkend="questions"
->questions</link
->. An example of the use of strings: <screen>
+<title>Strings: text containers</title>
+<para>Strings are a lot like variables. The biggest difference is that strings cannot be used in <link linkend="math">mathematical calculations</link> and <link linkend="questions">questions</link>. An example of the use of strings: <screen>
 x = "Hello "
 name = inputwindow "Please enter your name..."
 print x + name + ", how are you?"
-</screen
-> On the first line the string <userinput
->x</userinput
-> is set to <quote
->Hello </quote
->. On the second line the string <userinput
->name</userinput
-> is set to the output of the <userinput
->inputwindow</userinput
-> command. On the third line the program prints a composition of three strings on the canvas.</para>
-<para
->This program ask you to enter your name. When you, for instance, enter the name <quote
->Paul</quote
->, the program prints <quote
->Hello Paul, how are you?</quote
->. Please note that the plus (+) is the only math symbol that you can use with strings.</para>
+</screen> On the first line the string <userinput>x</userinput> is set to <quote>Hello </quote>. On the second line the string <userinput>name</userinput> is set to the output of the <userinput>inputwindow</userinput> command. On the third line the program prints a composition of three strings on the canvas.</para>
+<para>This program ask you to enter your name. When you, for instance, enter the name <quote>Paul</quote>, the program prints <quote>Hello Paul, how are you?</quote>. Please note that the plus (+) is the only math symbol that you can use with strings.</para>
 </sect2>
 </sect1>
 
 <sect1 id="math">
-<title
->Can the Turtle do maths?</title>
-<para
->Yes, &kturtle; will do your math. You can add (+), substract (-), multiply (*), and divide (/). Here is an example in which we use all of them: <screen>
+<title>Can the Turtle do maths?</title>
+<para>Yes, &kturtle; will do your math. You can add (+), substract (-), multiply (*), and divide (/). Here is an example in which we use all of them: <screen>
 a = 20 - 5
 b = 15 * 2
 c = 30 / 30
 d = 1 + 1
 print "a: "+a+", b: "+b+", c: "+c+", d: "+d 
-</screen
-> Do you know what value a, b, c and d have?</para>
-<para
->If you just want a simple calculation to be done you can do something like this: <screen
->print 2004-12
-</screen
-></para>
-<para
->Now an example with brackets: <screen>
+</screen> Do you know what value a, b, c and d have?</para>
+<para>If you just want a simple calculation to be done you can do something like this: <screen>print 2004-12
+</screen></para>
+<para>Now an example with brackets: <screen>
 print ( ( 20 - 5 ) * 2 / 30 ) + 1
-</screen
-> The expressions inside brackets will be calculated first. In this example, 20-5 will be calculated, then multiplied by 2, divided by 30, and then 1 is added (giving 2).</para>
+</screen> The expressions inside brackets will be calculated first. In this example, 20-5 will be calculated, then multiplied by 2, divided by 30, and then 1 is added (giving 2).</para>
 </sect1>
 
 <sect1 id="questions">
-<title
->Asking questions, getting answers...</title>
-<para
-><link linkend="if"
-><userinput
->if</userinput
-></link
-> and <link linkend="while"
-><userinput
->while</userinput
-></link
-> are <link linkend="controlling-execution"
->execution controllers</link
-> that we will discuss in the next section. In this section we use the <userinput
->if</userinput
-> command to explain questions.</para>
-<para
->A simple example of questions: <screen>
+<title>Asking questions, getting answers...</title>
+<para><link linkend="if"><userinput>if</userinput></link> and <link linkend="while"><userinput>while</userinput></link> are <link linkend="controlling-execution">execution controllers</link> that we will discuss in the next section. In this section we use the <userinput>if</userinput> command to explain questions.</para>
+<para>A simple example of questions: <screen>
 x = 6
 if x &gt; 5 [
   print "hello"
 ]
-</screen
-> In this example the question is the <userinput
->x &gt; 5</userinput
-> part. If the answer to this question is <quote
->true</quote
-> the code between the brackets will be executed. Questions are an important part of programming and often used together with <link linkend="controlling-execution"
->execution controllers</link
->, like <link linkend="if"
-><userinput
->if</userinput
-></link
->. All numbers and <link linkend="variables"
->variables</link
-> (number containers) can be compared to each other with questions.</para>
-<para
->Here are all possible questions: <table>
-<title
->Types of questions</title>
+</screen> In this example the question is the <userinput>x &gt; 5</userinput> part. If the answer to this question is <quote>true</quote> the code between the brackets will be executed. Questions are an important part of programming and often used together with <link linkend="controlling-execution">execution controllers</link>, like <link linkend="if"><userinput>if</userinput></link>. All numbers and <link linkend="variables">variables</link> (number containers) can be compared to each other with questions.</para>
+<para>Here are all possible questions: <table>
+<title>Types of questions</title>
 <tgroup cols="3">
 <tbody>
 <row>
-<entry
-><userinput
->a == b</userinput
-></entry>
-<entry
->equals</entry>
-<entry
->answer is <quote
->true</quote
-> if <userinput
->a</userinput
-> equals <userinput
->b</userinput
-></entry>
+<entry><userinput>a == b</userinput></entry>
+<entry>equals</entry>
+<entry>answer is <quote>true</quote> if <userinput>a</userinput> equals <userinput>b</userinput></entry>
 </row>
 <row>
-<entry
-><userinput
->a != b</userinput
-></entry>
-<entry
->not-equal</entry>
-<entry
->answer is <quote
->true</quote
-> if <userinput
->a</userinput
-> does not equal <userinput
->b</userinput
-></entry>
+<entry><userinput>a != b</userinput></entry>
+<entry>not-equal</entry>
+<entry>answer is <quote>true</quote> if <userinput>a</userinput> does not equal <userinput>b</userinput></entry>
 </row>
 <row>
-<entry
-><userinput
->a &gt; b</userinput
-></entry>
-<entry
->greater than</entry>
-<entry
->answer is <quote
->true</quote
-> if <userinput
->a</userinput
-> is greater than <userinput
->b</userinput
-></entry>
+<entry><userinput>a &gt; b</userinput></entry>
+<entry>greater than</entry>
+<entry>answer is <quote>true</quote> if <userinput>a</userinput> is greater than <userinput>b</userinput></entry>
 </row>
 <row>
-<entry
-><userinput
->a &lt; b</userinput
-></entry>
-<entry
->smaller than</entry>
-<entry
->answer is <quote
->true</quote
-> if <userinput
->a</userinput
-> is smaller than <userinput
->b</userinput
-></entry>
+<entry><userinput>a &lt; b</userinput></entry>
+<entry>smaller than</entry>
+<entry>answer is <quote>true</quote> if <userinput>a</userinput> is smaller than <userinput>b</userinput></entry>
 </row>
 <row>
-<entry
-><userinput
->a &gt;= b</userinput
-></entry>
-<entry
->greater than or equals</entry>
-<entry
->answer is <quote
->true</quote
-> if <userinput
->a</userinput
-> is greater than or equals <userinput
->b</userinput
-></entry>
+<entry><userinput>a &gt;= b</userinput></entry>
+<entry>greater than or equals</entry>
+<entry>answer is <quote>true</quote> if <userinput>a</userinput> is greater than or equals <userinput>b</userinput></entry>
 </row>
 <row>
-<entry
-><userinput
->a &lt;= b</userinput
-></entry>
-<entry
->smaller than or equals</entry>
-<entry
->answer is <quote
->true</quote
-> if <userinput
->a</userinput
-> is smaller than or equals <userinput
->b</userinput
-></entry>
+<entry><userinput>a &lt;= b</userinput></entry>
+<entry>smaller than or equals</entry>
+<entry>answer is <quote>true</quote> if <userinput>a</userinput> is smaller than or equals <userinput>b</userinput></entry>
 </row>
 </tbody>
 </tgroup>
 </table>
 </para>
-<para
->Questions can also be glued to each other with <quote
->question glue</quote
->, this way a few questions can become one big question. <screen>
+<para>Questions can also be glued to each other with <quote>question glue</quote>, this way a few questions can become one big question. <screen>
 a = 1
 b = 5
 if a &lt; 5 and b == 5 [
   print "hello"
 ]
-</screen
-> <anchor id="question-glue"/>In this example the glue-word <userinput
->and</userinput
-> is used to glue 2 questions (<userinput
->a &lt; 5</userinput
->, <userinput
->b == 5</userinput
->) together. If one side of the <userinput
->and</userinput
-> would answer <quote
->false</quote
-> the whole question would answer <quote
->false</quote
->, because with the glue-word <userinput
->and</userinput
-> both sides need to be <quote
->true</quote
-> in order to answer <quote
->true</quote
->.</para>
-<para
-><userinput
->and</userinput
-> is not the only glue-word there are two others. They are all in the next table: <table>
-<title
->Question glue-words</title>
+</screen> <anchor id="question-glue"/>In this example the glue-word <userinput>and</userinput> is used to glue 2 questions (<userinput>a &lt; 5</userinput>, <userinput>b == 5</userinput>) together. If one side of the <userinput>and</userinput> would answer <quote>false</quote> the whole question would answer <quote>false</quote>, because with the glue-word <userinput>and</userinput> both sides need to be <quote>true</quote> in order to answer <quote>true</quote>.</para>
+<para><userinput>and</userinput> is not the only glue-word there are two others. They are all in the next table: <table>
+<title>Question glue-words</title>
 <tgroup cols="2">
 <tbody>
 <row>
-<entry
-><userinput
->and</userinput
-></entry>
-<entry
->both sides need to be <quote
->true</quote
-> in order to answer <quote
->true</quote
-></entry>
+<entry><userinput>and</userinput></entry>
+<entry>both sides need to be <quote>true</quote> in order to answer <quote>true</quote></entry>
 </row>
 <row>
-<entry
-><userinput
->or</userinput
-></entry>
-<entry
->if one of the sides is <quote
->true</quote
-> the answer is <quote
->true</quote
-></entry>
+<entry><userinput>or</userinput></entry>
+<entry>if one of the sides is <quote>true</quote> the answer is <quote>true</quote></entry>
 </row>
 <row>
-<entry
-><userinput
->not</userinput
-></entry>
-<entry
->only if both of the sides are <quote
->false</quote
-> the answer is <quote
->false</quote
-></entry>
+<entry><userinput>not</userinput></entry>
+<entry>only if both of the sides are <quote>false</quote> the answer is <quote>false</quote></entry>
 </row>
 </tbody>
 </tgroup>
@@ -907,232 +383,100 @@ if a &lt; 5 and b == 5 [
 </sect1>
 
 <sect1 id="controlling-execution">
-<title
->Controlling execution</title>
-<para
->The execution controllers enable you &mdash; as their name implies &mdash; to control execution.</para>
+<title>Controlling execution</title>
+<para>The execution controllers enable you &mdash; as their name implies &mdash; to control execution.</para>
 
 <sect2 id="easy">
-<title
->Have the turtle wait</title>
-<para
->If you have done some programming in &kturtle; you have might noticed that the turtle can be very quick at drawing. This command makes the turtle wait for a given amount of time.</para>
+<title>Have the turtle wait</title>
+<para>If you have done some programming in &kturtle; you have might noticed that the turtle can be very quick at drawing. This command makes the turtle wait for a given amount of time.</para>
   <variablelist>
     <anchor id="wait"/>
     <varlistentry>
-      <term
->wait</term>
-      <listitem
-><para
-><screen
->wait X</screen>
-<userinput
->wait</userinput
-> makes the turtle wait for X seconds. <screen>
+      <term>wait</term>
+      <listitem><para><screen>wait X</screen>
+<userinput>wait</userinput> makes the turtle wait for X seconds. <screen>
 repeat 36 [
   forward 5
   turnright 10
   wait 0.5
 ]
-</screen
-> This code draws a circle, but the turtle will wait half a second after each step. This gives the impression of a slow-moving turtle.</para
-></listitem>
+</screen> This code draws a circle, but the turtle will wait half a second after each step. This gives the impression of a slow-moving turtle.</para></listitem>
     </varlistentry>
   </variablelist>
 </sect2>
 
 <sect2 id="execute-if">
-<title
->Execute "if"</title>
-<para
-></para>
+<title>Execute "if"</title>
+<para></para>
   <variablelist>
     <anchor id="if"/>
     <varlistentry>
-      <term
->if</term>
-      <listitem
-><para
-><screen
->if <link linkend="questions"
->question</link
-> [ ... ]</screen>
-The code that is placed between the brackets will only be executed <userinput
->if</userinput
-> the answer to the <link linkend="questions"
->question</link
-> is <quote
->true</quote
->. Please read for more information on <link linkend="questions"
->questions</link
-> in the <link linkend="questions"
->question section</link
->. <screen>
+      <term>if</term>
+      <listitem><para><screen>if <link linkend="questions">question</link> [ ... ]</screen>
+The code that is placed between the brackets will only be executed <userinput>if</userinput> the answer to the <link linkend="questions">question</link> is <quote>true</quote>. Please read for more information on <link linkend="questions">questions</link> in the <link linkend="questions">question section</link>. <screen>
 x = 6
 if x &gt; 5 [
   print "x is greater than five!"
 ]
-</screen
-> On the first line <userinput
->x</userinput
-> is set to 6. On the second line the <link linkend="questions"
->question</link
-> <userinput
->x &gt; 5</userinput
-> is asked. Since the answer to this question is <quote
->true</quote
-> the execution controller <userinput
->if</userinput
-> will allow the code between the brackets to be executed</para
-></listitem>
+</screen> On the first line <userinput>x</userinput> is set to 6. On the second line the <link linkend="questions">question</link> <userinput>x &gt; 5</userinput> is asked. Since the answer to this question is <quote>true</quote> the execution controller <userinput>if</userinput> will allow the code between the brackets to be executed</para></listitem>
     </varlistentry>
   </variablelist>
 </sect2>
 
 <sect2 id="execute-while">
-<title
->Execute "while"</title>
-<para
-></para>
+<title>Execute "while"</title>
+<para></para>
   <variablelist>
     <anchor id="while"/>
     <varlistentry>
-      <term
->while</term>
-      <listitem
-><para
-><screen
->while <link linkend="questions"
->question</link
-> [ ... ]</screen>
-The execution controller <userinput
->while</userinput
-> is a lot like <link linkend="if"
-><userinput
->if</userinput
-></link
->. The difference is that <userinput
->while</userinput
-> keeps repeating the code between the brackets till the answer to the <link linkend="questions"
->question</link
-> is <quote
->false</quote
->. <screen>
+      <term>while</term>
+      <listitem><para><screen>while <link linkend="questions">question</link> [ ... ]</screen>
+The execution controller <userinput>while</userinput> is a lot like <link linkend="if"><userinput>if</userinput></link>. The difference is that <userinput>while</userinput> keeps repeating the code between the brackets till the answer to the <link linkend="questions">question</link> is <quote>false</quote>. <screen>
 x = 1
 while x &lt; 5 [
   forward 10
   wait 1
   x = x + 1
 ]
-</screen
-> On the first line <userinput
->x</userinput
-> is set to 1. On the second line the <link linkend="questions"
->question</link
-> <userinput
->x &lt; 5</userinput
-> is asked. Since the answer to this question is <quote
->true</quote
-> the execution controller <userinput
->while</userinput
-> starts executing the code between the brackets till the answer to the <link linkend="questions"
->question</link
-> is <quote
->false</quote
->. In this case the code between the brackets will be executed 4 times, because every time the fifth line is executed <userinput
->x</userinput
-> increases by 1..</para
-></listitem>
+</screen> On the first line <userinput>x</userinput> is set to 1. On the second line the <link linkend="questions">question</link> <userinput>x &lt; 5</userinput> is asked. Since the answer to this question is <quote>true</quote> the execution controller <userinput>while</userinput> starts executing the code between the brackets till the answer to the <link linkend="questions">question</link> is <quote>false</quote>. In this case the code between the brackets will be executed 4 times, because every time the fifth line is executed <userinput>x</userinput> increases by 1..</para></listitem>
     </varlistentry>
   </variablelist>
 </sect2>
 
 <sect2 id="if-else">
-<title
->If not, in other words: "else"</title>
-<para
-></para>
+<title>If not, in other words: "else"</title>
+<para></para>
   <variablelist>
     <anchor id="else"/>
     <varlistentry>
-      <term
->else</term>
-      <listitem
-><para
-><screen
->if question [ ... ] else [ ... ]</screen>
-<userinput
->else</userinput
-> can be used in addition to the execution controller <link linkend="if"
-><userinput
->if</userinput
-></link
->. The code between the brackets after <userinput
->else</userinput
-> is only executed if the answer to the <link linkend="questions"
->question</link
-> that is asked is <quote
->false</quote
->. <screen>
+      <term>else</term>
+      <listitem><para><screen>if question [ ... ] else [ ... ]</screen>
+<userinput>else</userinput> can be used in addition to the execution controller <link linkend="if"><userinput>if</userinput></link>. The code between the brackets after <userinput>else</userinput> is only executed if the answer to the <link linkend="questions">question</link> that is asked is <quote>false</quote>. <screen>
 x = 4
 if x &gt; 5 [
   print "x is greater than five!"
 ] else [
   print "x is smaller than six!"
 ]
-</screen
-> The <link linkend="questions"
->question</link
-> asks if <userinput
->x</userinput
-> is greater than 5. Since <userinput
->x</userinput
-> is set to 4 on the first line the answer to the question is <quote
->false</quote
->. This means the code between the brackets after <userinput
->else</userinput
-> gets executed.</para
-></listitem>
+</screen> The <link linkend="questions">question</link> asks if <userinput>x</userinput> is greater than 5. Since <userinput>x</userinput> is set to 4 on the first line the answer to the question is <quote>false</quote>. This means the code between the brackets after <userinput>else</userinput> gets executed.</para></listitem>
     </varlistentry>
   </variablelist>
 </sect2>
 
 <sect2 id="for-loop">
-<title
->The "for" loop</title>
-<para
-></para>
+<title>The "for" loop</title>
+<para></para>
   <variablelist>
     <anchor id="for"/>
     <varlistentry>
-      <term
->for</term>
-      <listitem
-><para
-><screen
->for <userinput
->start point</userinput
-> to <userinput
->end point</userinput
-> [ ... ]</screen>
-The <userinput
->for</userinput
-> loop is a <quote
->counting loop</quote
->, &ie; it keeps count for you. <screen>
+      <term>for</term>
+      <listitem><para><screen>for <userinput>start point</userinput> to <userinput>end point</userinput> [ ... ]</screen>
+The <userinput>for</userinput> loop is a <quote>counting loop</quote>, &ie; it keeps count for you. <screen>
 for x = 1 to 10 [
   print x * 7
   forward 15
 ]
-</screen
-> Every time the code between the brackets is executed the <userinput
->x</userinput
-> is increased by 1, till <userinput
->x</userinput
-> reaches the value of 10. The code between the brackets prints the <userinput
->x</userinput
-> multiplied by 7. After this program finishes its execution you will see the times table of 7 on the canvas.</para
-></listitem>
+</screen> Every time the code between the brackets is executed the <userinput>x</userinput> is increased by 1, till <userinput>x</userinput> reaches the value of 10. The code between the brackets prints the <userinput>x</userinput> multiplied by 7. After this program finishes its execution you will see the times table of 7 on the canvas.</para></listitem>
     </varlistentry>
   </variablelist>
 </sect2>
@@ -1141,37 +485,15 @@ for x = 1 to 10 [
 
 
 <sect1 id="learn">
-<title
->Create your own commands</title>
-<para
-><userinput
->learn</userinput
-> is a very special command, because it is used to create your own commands. The command you create can take <glossterm linkend="input-output"
->input</glossterm
-> and return <glossterm linkend="input-output"
->output</glossterm
->. Let us take a look at how a new command is created: <screen>
+<title>Create your own commands</title>
+<para><userinput>learn</userinput> is a very special command, because it is used to create your own commands. The command you create can take <glossterm linkend="input-output">input</glossterm> and return <glossterm linkend="input-output">output</glossterm>. Let us take a look at how a new command is created: <screen>
 learn circle (x) [
   repeat 36 [
     forward x
     turnleft 10
   ]
 ]
-</screen
-> The new command is called <userinput
->circle</userinput
->. <userinput
->circle</userinput
-> takes one <glossterm linkend="input-output"
->input</glossterm
->, a number, to set the size of the circle. <userinput
->circle</userinput
-> returns no <glossterm linkend="input-output"
->output</glossterm
->. The <userinput
->circle</userinput
-> command can now be used like a normal command in the rest of the code. See this example: <screen
->learn circle (x) [ 
+</screen> The new command is called <userinput>circle</userinput>. <userinput>circle</userinput> takes one <glossterm linkend="input-output">input</glossterm>, a number, to set the size of the circle. <userinput>circle</userinput> returns no <glossterm linkend="input-output">output</glossterm>. The <userinput>circle</userinput> command can now be used like a normal command in the rest of the code. See this example: <screen>learn circle (x) [ 
    repeat 36 [ 
      forward x 
      turnleft 10 
@@ -1185,8 +507,7 @@ learn circle (x) [
  circle(50) 
 </screen>
 </para>
-<para
->In the next example a command with a return value is created. <screen>
+<para>In the next example a command with a return value is created. <screen>
 reset
 
 learn multiplyBySelf (n) [
@@ -1196,14 +517,7 @@ learn multiplyBySelf (n) [
 ]
 i = inputwindow "Please enter a number and press OK"
 print i + " multiplied by itself is: " + multiplyBySelf (i)
-</screen
-> In this example a new command called <userinput
->multiplyBySelf</userinput
-> is created. The input of this command is multiplied by it self and then returned, using the <anchor id="return"/><userinput
->return</userinput
-> command. The <userinput
->return</userinput
-> command is the way to output a value from a function you have created. </para>
+</screen> In this example a new command called <userinput>multiplyBySelf</userinput> is created. The input of this command is multiplied by it self and then returned, using the <anchor id="return"/><userinput>return</userinput> command. The <userinput>return</userinput> command is the way to output a value from a function you have created. </para>
 </sect1>
 
 </chapter>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kturtle/translator-guide.docbook b/tde-i18n-en_GB/docs/tdeedu/kturtle/translator-guide.docbook
index 3676f91bfc3..f7ea5e5cb12 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kturtle/translator-guide.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kturtle/translator-guide.docbook
@@ -1,221 +1,60 @@
 <chapter id="translators">
-<title
->Translator's Guide to &kturtle;</title>
-<para
->As you know, one of the great features of &logo; is that the &logo; commands can be translated in your own language. This makes it easier for a child to understand the commands. For a new language, there are 3 files to translate: first the keywords file (or commands) then the logo-highlight-style file and finally the examples. </para>
+<title>Translator's Guide to &kturtle;</title>
+<para>As you know, one of the great features of &logo; is that the &logo; commands can be translated in your own language. This makes it easier for a child to understand the commands. For a new language, there are 3 files to translate: first the keywords file (or commands) then the logo-highlight-style file and finally the examples. </para>
 <sect1 id="make_directory">
-<title
->Creating a Directory to hold the Translated Files</title>
-<para
->First, you need to create a directory to store the translated files. Create a directory called <filename class="directory"
->tde-i18n/<replaceable
->code</replaceable
->/data/tdeedu/kturtle/</filename
-> in your KDE CVS directory, where <replaceable
->code</replaceable
-> is your country code (the 2- or 4- letter <acronym
->ISO</acronym
-> code). </para>
-<para
->Copy the <filename
->Makefile.am</filename
-> file from <filename class="directory"
->tdeedu/kturtle/data/</filename
-> into this directory. Open it using your favorite text editor, replace all instances of <quote
->en_US</quote
-> in the file with your country code (the one used above), and save the file. </para>
+<title>Creating a Directory to hold the Translated Files</title>
+<para>First, you need to create a directory to store the translated files. Create a directory called <filename class="directory">tde-i18n/<replaceable>code</replaceable>/data/tdeedu/kturtle/</filename> in your KDE CVS directory, where <replaceable>code</replaceable> is your country code (the 2- or 4- letter <acronym>ISO</acronym> code). </para>
+<para>Copy the <filename>Makefile.am</filename> file from <filename class="directory">tdeedu/kturtle/data/</filename> into this directory. Open it using your favorite text editor, replace all instances of <quote>en_US</quote> in the file with your country code (the one used above), and save the file. </para>
 </sect1>
 <sect1 id="commands_trans">
-<title
->How To Translate the &logo; Keywords (commands)</title>
+<title>How To Translate the &logo; Keywords (commands)</title>
 <para>
 <itemizedlist>
-<listitem
-><para
->Copy the <filename
->logokeywords.en_US.xml</filename
-> file from <filename class="directory"
->tdeedu/kturtle/data/</filename
-> to the directory you have just created, and rename it to <filename
->logokeywords.<replaceable
->code</replaceable
->.xml</filename
-> where <replaceable
->code</replaceable
-> is your country code (the 2- or 4- letter <acronym
->ISO</acronym
-> code). </para>
+<listitem><para>Copy the <filename>logokeywords.en_US.xml</filename> file from <filename class="directory">tdeedu/kturtle/data/</filename> to the directory you have just created, and rename it to <filename>logokeywords.<replaceable>code</replaceable>.xml</filename> where <replaceable>code</replaceable> is your country code (the 2- or 4- letter <acronym>ISO</acronym> code). </para>
 </listitem>
-<listitem
-><para
->Translate the contents of the <sgmltag class="starttag"
->keyword</sgmltag
-> tag (&ie; the information between <sgmltag class="starttag"
->keyword</sgmltag
-> and <sgmltag class="endtag"
->keyword</sgmltag
->) into your own language wherever possible. Also, translate the contents of the <sgmltag class="starttag"
->alias</sgmltag
-> tag, (&ie; the information between the <sgmltag class="starttag"
->alias</sgmltag
-> and <sgmltag class="endtag"
->alias</sgmltag
->): these are used as shortcuts for the keyword.</para>
-<para
->For example, translate <quote
->while</quote
-> in: <sgmltag class="starttag"
->keyword</sgmltag
->while<sgmltag class="endtag"
->keyword</sgmltag
-> </para>
-<para
->Please do not translate anything else and do not translate the English words in <sgmltag class="starttag"
->command name="english_word"</sgmltag
->: these must stay in English. </para>
+<listitem><para>Translate the contents of the <sgmltag class="starttag">keyword</sgmltag> tag (&ie; the information between <sgmltag class="starttag">keyword</sgmltag> and <sgmltag class="endtag">keyword</sgmltag>) into your own language wherever possible. Also, translate the contents of the <sgmltag class="starttag">alias</sgmltag> tag, (&ie; the information between the <sgmltag class="starttag">alias</sgmltag> and <sgmltag class="endtag">alias</sgmltag>): these are used as shortcuts for the keyword.</para>
+<para>For example, translate <quote>while</quote> in: <sgmltag class="starttag">keyword</sgmltag>while<sgmltag class="endtag">keyword</sgmltag> </para>
+<para>Please do not translate anything else and do not translate the English words in <sgmltag class="starttag">command name="english_word"</sgmltag>: these must stay in English. </para>
 </listitem>
-<listitem
-><para
->Save your file as <acronym
->UTF-8</acronym
-> (in &kate;, use <guimenuitem
->Save As...</guimenuitem
-> and change to <guilabel
->utf8</guilabel
-> in the box on the right of the file name). </para>
+<listitem><para>Save your file as <acronym>UTF-8</acronym> (in &kate;, use <guimenuitem>Save As...</guimenuitem> and change to <guilabel>utf8</guilabel> in the box on the right of the file name). </para>
 </listitem>
-<listitem
-><para
->Commit your file (add your filename in the <filename
->Makefile.am</filename
->) or send it to Anne-Marie. </para>
+<listitem><para>Commit your file (add your filename in the <filename>Makefile.am</filename>) or send it to Anne-Marie. </para>
 </listitem>
-<listitem
-><para
->In case of any doubt, please contact Anne-Marie Mahfouf <email
->annemarie.mahfouf@free.fr</email
-> for more information.</para>
+<listitem><para>In case of any doubt, please contact Anne-Marie Mahfouf <email>annemarie.mahfouf@free.fr</email> for more information.</para>
 </listitem>
 </itemizedlist>
 </para>
 </sect1>
 
 <sect1 id="examples_syntax">
-<title
->How To Translate the Syntax Highlighting Files</title>
+<title>How To Translate the Syntax Highlighting Files</title>
 <para>
 <itemizedlist>
-<listitem
-><para
->Copy the <filename
->logohighlightstyle.en_US.xml</filename
-> file from <filename class="directory"
->tdeedu/kturtle/data/</filename
-> to the directory you created to store the translated keywords file, and rename it to <filename
->logohighlightstyle.<replaceable
->code</replaceable
->.xml</filename
-> where <replaceable
->code</replaceable
-> is your country code (the 2- or 4- letter <acronym
->ISO</acronym
-> code). </para>
+<listitem><para>Copy the <filename>logohighlightstyle.en_US.xml</filename> file from <filename class="directory">tdeedu/kturtle/data/</filename> to the directory you created to store the translated keywords file, and rename it to <filename>logohighlightstyle.<replaceable>code</replaceable>.xml</filename> where <replaceable>code</replaceable> is your country code (the 2- or 4- letter <acronym>ISO</acronym> code). </para>
 </listitem>
-<listitem
-><para
->In line 4 of the file, there is <sgmltag class="starttag"
->language name="en_US"</sgmltag
->...: here you change <quote
->en_US</quote
-> to your language's <acronym
->ISO</acronym
-> code (2 or 4 letters). </para
-></listitem>
-<listitem
-><para
->Translate into your own language the content of the <sgmltag class="starttag"
->item</sgmltag
-> tag (&ie; the information between <sgmltag class="starttag"
->item</sgmltag
-> and <sgmltag class="endtag"
->item</sgmltag
->). This content must match the <filename
->logokeyword</filename
-> file. For example, translate <quote
->while</quote
-> in: <sgmltag class="starttag"
->item</sgmltag
-> while <sgmltag class="endtag"
->item</sgmltag
-> and leave the spaces as they are (one at the beginning and one at the end). Please do not translate anything else. </para
-></listitem>
-<listitem
-><para
->Save your file as <acronym
->UTF-8</acronym
-> (in &kate;, use <guimenuitem
->Save As...</guimenuitem
-> and change to <guilabel
->utf8</guilabel
-> in the box on the right of the file name). </para
-></listitem>
-<listitem
-><para
->Commit your file (add your filename in the <filename
->Makefile.am</filename
->) or send it to Anne-Marie. </para
-></listitem>
-<listitem
-><para
->In case of any doubt, please contact Anne-Marie Mahfouf <email
->annemarie.mahfouf@free.fr</email
-> for more information. </para
-></listitem>
+<listitem><para>In line 4 of the file, there is <sgmltag class="starttag">language name="en_US"</sgmltag>...: here you change <quote>en_US</quote> to your language's <acronym>ISO</acronym> code (2 or 4 letters). </para></listitem>
+<listitem><para>Translate into your own language the content of the <sgmltag class="starttag">item</sgmltag> tag (&ie; the information between <sgmltag class="starttag">item</sgmltag> and <sgmltag class="endtag">item</sgmltag>). This content must match the <filename>logokeyword</filename> file. For example, translate <quote>while</quote> in: <sgmltag class="starttag">item</sgmltag> while <sgmltag class="endtag">item</sgmltag> and leave the spaces as they are (one at the beginning and one at the end). Please do not translate anything else. </para></listitem>
+<listitem><para>Save your file as <acronym>UTF-8</acronym> (in &kate;, use <guimenuitem>Save As...</guimenuitem> and change to <guilabel>utf8</guilabel> in the box on the right of the file name). </para></listitem>
+<listitem><para>Commit your file (add your filename in the <filename>Makefile.am</filename>) or send it to Anne-Marie. </para></listitem>
+<listitem><para>In case of any doubt, please contact Anne-Marie Mahfouf <email>annemarie.mahfouf@free.fr</email> for more information. </para></listitem>
 </itemizedlist>
 </para>
 </sect1>
 
 <sect1 id="examples_trans">
-<title
->How To Translate the Examples</title>
+<title>How To Translate the Examples</title>
 <itemizedlist>
-<listitem
-><para
->Copy the English example files from <filename class="directory"
->tdeedu/kturtle/data/</filename
-> to the directory used to store the translated keyword and hilighting files. Translate the filenames of the examples in your directory: this will allow users to easily and quickly understand what the example is about.</para>
+<listitem><para>Copy the English example files from <filename class="directory">tdeedu/kturtle/data/</filename> to the directory used to store the translated keyword and hilighting files. Translate the filenames of the examples in your directory: this will allow users to easily and quickly understand what the example is about.</para>
 </listitem>
-<listitem
-><para
->Translate the keywords in the examples, using those in the <filename
->logokeywords.xml</filename
-> for your language. The keywords file file must be done, first, before translating the examples.</para>
+<listitem><para>Translate the keywords in the examples, using those in the <filename>logokeywords.xml</filename> for your language. The keywords file file must be done, first, before translating the examples.</para>
 </listitem>
-<listitem
-><para
->Save your file as <acronym
->UTF-8</acronym
-> (in &kate;, use <guimenuitem
->Save As...</guimenuitem
-> and change to <guilabel
->utf8</guilabel
-> in the box on the right of the file name)</para>
+<listitem><para>Save your file as <acronym>UTF-8</acronym> (in &kate;, use <guimenuitem>Save As...</guimenuitem> and change to <guilabel>utf8</guilabel> in the box on the right of the file name)</para>
 </listitem>
-<listitem
-><para
->Commit your folder (add a <filename
->Makefile.am</filename
-> inside) or send it to Anne-Marie.</para>
+<listitem><para>Commit your folder (add a <filename>Makefile.am</filename> inside) or send it to Anne-Marie.</para>
 </listitem>
-<listitem
-><para
->In case of any doubt, please contact Anne-Marie Mahfouf, <email
->annemarie.mahfouf@free.fr</email
-> for more information.</para>
+<listitem><para>In case of any doubt, please contact Anne-Marie Mahfouf, <email>annemarie.mahfouf@free.fr</email> for more information.</para>
 </listitem>
-<listitem
-><para
->Finally, if you want, you can add your own examples in this folder.</para>
+<listitem><para>Finally, if you want, you can add your own examples in this folder.</para>
 </listitem>
 </itemizedlist>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeedu/kturtle/using-kturtle.docbook b/tde-i18n-en_GB/docs/tdeedu/kturtle/using-kturtle.docbook
index e250da7f1ba..3e83de66110 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kturtle/using-kturtle.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kturtle/using-kturtle.docbook
@@ -1,993 +1,318 @@
 <chapter id="using-kturtle">
-<title
->Using &kturtle;</title>
+<title>Using &kturtle;</title>
 
 <screenshot>
-  <screeninfo
->Here is a screenshot of &kturtle; in action</screeninfo>
+  <screeninfo>Here is a screenshot of &kturtle; in action</screeninfo>
   <mediaobject>
     <imageobject>
       <imagedata fileref="mainwindow_flower_nrs.png" format="PNG"/>
     </imageobject>
     <textobject>
-      <phrase
->&kturtle; Main Window</phrase>
+      <phrase>&kturtle; Main Window</phrase>
     </textobject>
   </mediaobject>
 </screenshot>
 
-<para
->The main window of &kturtle; has two main parts: <link linkend="the-code-editor"
->the code editor</link
-> (3) on the left where you type the &logo; commands, and <link linkend="the-canvas"
->the canvas</link
-> (4) on the right where the instructions are visualized. <link linkend="the-canvas"
->The canvas</link
-> is the turtle's playground: it is on the canvas that the turtle actually moves and draws. The three other places on the main window are: <link linkend="the-menubar"
->the menu bar</link
-> (1) from where all the actions can be reached, <link linkend="the-toolbar"
->the toolbar</link
-> (4) that allows you to quickly select the most used actions, and <link linkend="the-statusbar"
->the statusbar</link
-> (5) where you will find feedback on the state of &kturtle;.</para>
+<para>The main window of &kturtle; has two main parts: <link linkend="the-code-editor">the code editor</link> (3) on the left where you type the &logo; commands, and <link linkend="the-canvas">the canvas</link> (4) on the right where the instructions are visualized. <link linkend="the-canvas">The canvas</link> is the turtle's playground: it is on the canvas that the turtle actually moves and draws. The three other places on the main window are: <link linkend="the-menubar">the menu bar</link> (1) from where all the actions can be reached, <link linkend="the-toolbar">the toolbar</link> (4) that allows you to quickly select the most used actions, and <link linkend="the-statusbar">the statusbar</link> (5) where you will find feedback on the state of &kturtle;.</para>
 
 <sect1 id="the-code-editor">
-<title
->The Code Editor</title>
-<para
->In the code editor you type the &logo; commands. It has all of the features you would expect from a modern editor. Most of its features are found in the <link linkend="the-edit-menu"
->Edit</link
-> and the <link linkend="the-tools-menu"
->Tools</link
-> menus. The code editor can be docked on each border of the main window or it can be detached and placed anywhere on your desktop.</para>
-<para
->You have several ways to get some code in the editor. The easiest way is to use an already-made example: choose <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Open Examples</guimenuitem
-> </menuchoice
-> in the <link linkend="the-file-menu"
->File menu</link
-> and click on a file. The filename will tell you what the example is about (&eg; <filename
->square.logo</filename
-> will draw a square). The file you choose will be opened in the <link linkend="the-code-editor"
->the code editor</link
->, you can then use <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Execute Commands</guimenuitem
-> </menuchoice
-> to run the code if you like.</para>
-<para
->You can open &logo; files by choosing <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Open...</guimenuitem
-> </menuchoice
->.</para>
-<para
->The third way is to directly type your own code in the editor or to copy/paste some code from this user guide. </para>
-<para
->The cursor position is indicated in <link linkend="the-statusbar"
->the statusbar</link
->, on the right with the Line number and Column number. </para>
+<title>The Code Editor</title>
+<para>In the code editor you type the &logo; commands. It has all of the features you would expect from a modern editor. Most of its features are found in the <link linkend="the-edit-menu">Edit</link> and the <link linkend="the-tools-menu">Tools</link> menus. The code editor can be docked on each border of the main window or it can be detached and placed anywhere on your desktop.</para>
+<para>You have several ways to get some code in the editor. The easiest way is to use an already-made example: choose <menuchoice><guimenu>File</guimenu><guimenuitem>Open Examples</guimenuitem> </menuchoice> in the <link linkend="the-file-menu">File menu</link> and click on a file. The filename will tell you what the example is about (&eg; <filename>square.logo</filename> will draw a square). The file you choose will be opened in the <link linkend="the-code-editor">the code editor</link>, you can then use <menuchoice><guimenu>File</guimenu><guimenuitem>Execute Commands</guimenuitem> </menuchoice> to run the code if you like.</para>
+<para>You can open &logo; files by choosing <menuchoice><guimenu>File</guimenu><guimenuitem>Open...</guimenuitem> </menuchoice>.</para>
+<para>The third way is to directly type your own code in the editor or to copy/paste some code from this user guide. </para>
+<para>The cursor position is indicated in <link linkend="the-statusbar">the statusbar</link>, on the right with the Line number and Column number. </para>
 </sect1>
 
 <sect1 id="the-canvas">
-<title
->The Canvas</title>
-<para
->The canvas is the area where the commands are visualized, where the commands <quote
->draw</quote
-> a picture. In other words, it is the turtle's playground. After getting some code in the <link linkend="the-code-editor"
->the code editor</link
->, and executing it using <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Execute Commands</guimenuitem
-> </menuchoice
->, two things can happen: either the code executes fine, and will you most likely see something change on the canvas; or you have made an error in your code and there will be a message telling you what error you made.</para>
-<para
->This message should help you to resolve the error.</para>
-<para
->The picture that is drawn can be saved as an image (using <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Save Canvas</guimenuitem
-> </menuchoice
->) or printed (using <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Print...</guimenuitem
-> </menuchoice
->).</para>
+<title>The Canvas</title>
+<para>The canvas is the area where the commands are visualized, where the commands <quote>draw</quote> a picture. In other words, it is the turtle's playground. After getting some code in the <link linkend="the-code-editor">the code editor</link>, and executing it using <menuchoice><guimenu>File</guimenu><guimenuitem>Execute Commands</guimenuitem> </menuchoice>, two things can happen: either the code executes fine, and will you most likely see something change on the canvas; or you have made an error in your code and there will be a message telling you what error you made.</para>
+<para>This message should help you to resolve the error.</para>
+<para>The picture that is drawn can be saved as an image (using <menuchoice><guimenu>File</guimenu><guimenuitem>Save Canvas</guimenuitem> </menuchoice>) or printed (using <menuchoice><guimenu>File</guimenu><guimenuitem>Print...</guimenuitem> </menuchoice>).</para>
 </sect1>
 
 <sect1 id="the-menubar">
-<title
->The Menubar</title>
-<para
->In the menu bar you find all the actions of &kturtle;. They are in the following groups: <guimenu
->File</guimenu
->, <guimenu
->Edit</guimenu
->, <guimenu
->View</guimenu
->, <guimenu
->Tools</guimenu
->, <guimenu
->Settings</guimenu
->, and <guimenu
->Help</guimenu
->. This section describes them all.</para>
+<title>The Menubar</title>
+<para>In the menu bar you find all the actions of &kturtle;. They are in the following groups: <guimenu>File</guimenu>, <guimenu>Edit</guimenu>, <guimenu>View</guimenu>, <guimenu>Tools</guimenu>, <guimenu>Settings</guimenu>, and <guimenu>Help</guimenu>. This section describes them all.</para>
 
 <sect2 id="the-file-menu">
-<title
->The <guimenu
->File</guimenu
-> Menu</title>
+<title>The <guimenu>File</guimenu> Menu</title>
   <variablelist>
     <varlistentry>
-      <term
-><menuchoice
-><shortcut
-> <keycombo
->&Ctrl;<keycap
->N</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->New</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->Creates a new, empty &logo; file.</para
-></listitem>
+      <term><menuchoice><shortcut> <keycombo>&Ctrl;<keycap>N</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>New</guimenuitem> </menuchoice></term>
+      <listitem><para>Creates a new, empty &logo; file.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <varlistentry>
-      <term
-><menuchoice
-><shortcut
-> <keycombo
->&Ctrl;<keycap
->O</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Open...</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->Opens a &logo; file.</para
-></listitem>
+      <term><menuchoice><shortcut> <keycombo>&Ctrl;<keycap>O</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Open...</guimenuitem> </menuchoice></term>
+      <listitem><para>Opens a &logo; file.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <varlistentry>
-      <term
-><menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Open Recent</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->Opens a &logo; file that has been opened recently.</para
-></listitem>
+      <term><menuchoice><guimenu>File</guimenu> <guimenuitem>Open Recent</guimenuitem> </menuchoice></term>
+      <listitem><para>Opens a &logo; file that has been opened recently.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <varlistentry>
-      <term
-><menuchoice
-><shortcut
-> <keycombo
->&Ctrl;<keycap
->E</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Open Examples</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->Show the folder with examples &logo; programs. The examples should be in your favorite language that you can choose in <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure &kturtle;...</guimenuitem
-> </menuchoice
->.</para
-></listitem>
+      <term><menuchoice><shortcut> <keycombo>&Ctrl;<keycap>E</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Open Examples</guimenuitem> </menuchoice></term>
+      <listitem><para>Show the folder with examples &logo; programs. The examples should be in your favorite language that you can choose in <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &kturtle;...</guimenuitem> </menuchoice>.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="file-execute"/>
     <varlistentry>
-      <term
-><menuchoice
-><shortcut
-> <keycombo
->&Alt;<keysym
->Return</keysym
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Execute Commands</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->Starts the execution of the commands in the code editor.</para
-></listitem>
+      <term><menuchoice><shortcut> <keycombo>&Alt;<keysym>Return</keysym></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Execute Commands</guimenuitem> </menuchoice></term>
+      <listitem><para>Starts the execution of the commands in the code editor.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="file-stop"/>
     <varlistentry>
-      <term
-><menuchoice
-><shortcut
-> <keycombo
-><keysym
->Escape</keysym
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Stop Execution</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->Stops the execution. This action is only enabled when the commands are actually executing.</para
-></listitem>
+      <term><menuchoice><shortcut> <keycombo><keysym>Escape</keysym></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Stop Execution</guimenuitem> </menuchoice></term>
+      <listitem><para>Stops the execution. This action is only enabled when the commands are actually executing.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="file-save"/>
     <varlistentry>
-      <term
-><menuchoice
-><shortcut
-> <keycombo
->&Ctrl;<keycap
->S</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Save</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->Saves the currently opened &logo; file.</para
-></listitem>
+      <term><menuchoice><shortcut> <keycombo>&Ctrl;<keycap>S</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Save</guimenuitem> </menuchoice></term>
+      <listitem><para>Saves the currently opened &logo; file.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="file-save-as"/>
     <varlistentry>
-      <term
-><menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Save As...</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->Saves the currently opened &logo; file on a specified location.</para
-></listitem>
+      <term><menuchoice><guimenu>File</guimenu> <guimenuitem>Save As...</guimenuitem> </menuchoice></term>
+      <listitem><para>Saves the currently opened &logo; file on a specified location.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="file-save-canvas"/>
     <varlistentry>
-      <term
-><menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Save Canvas</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->Saves the current drawing on canvas into an image.</para
-></listitem>
+      <term><menuchoice><guimenu>File</guimenu> <guimenuitem>Save Canvas</guimenuitem> </menuchoice></term>
+      <listitem><para>Saves the current drawing on canvas into an image.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="file-print"/>
     <varlistentry>
-      <term
-><menuchoice
-><shortcut
-> <keycombo
->&Ctrl;<keycap
->P</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Print...</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->Prints either the current code in the editor or the current drawing on the canvas.</para
-></listitem>
+      <term><menuchoice><shortcut> <keycombo>&Ctrl;<keycap>P</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Print...</guimenuitem> </menuchoice></term>
+      <listitem><para>Prints either the current code in the editor or the current drawing on the canvas.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="file-quit"/>
     <varlistentry>
-      <term
-><menuchoice
-><shortcut
-> <keycombo
->&Ctrl;<keycap
->Q</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Quit</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->Quits &kturtle;.</para
-></listitem>
+      <term><menuchoice><shortcut> <keycombo>&Ctrl;<keycap>Q</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Quit</guimenuitem> </menuchoice></term>
+      <listitem><para>Quits &kturtle;.</para></listitem>
     </varlistentry>
   </variablelist>
 </sect2>
 
 <sect2 id="the-edit-menu">
-  <title
->The <guimenu
->Edit</guimenu
-> Menu</title>
+  <title>The <guimenu>Edit</guimenu> Menu</title>
   <variablelist>
     <anchor id="edit-undo"/>
     <varlistentry>
-      <term
-><menuchoice
-><shortcut
-> <keycombo
->&Ctrl;<keycap
->Z</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Undo</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->Undoes the last change to code. &kturtle; has unlimited undos.</para
-></listitem>
+      <term><menuchoice><shortcut> <keycombo>&Ctrl;<keycap>Z</keycap></keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Undo</guimenuitem> </menuchoice></term>
+      <listitem><para>Undoes the last change to code. &kturtle; has unlimited undos.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="edit-redo"/>
     <varlistentry>
-      <term
-><menuchoice
-><shortcut
-> <keycombo
->&Ctrl;&Shift;<keycap
->Z</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Redo</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->Redoes an undone change to the code.</para
-></listitem>
+      <term><menuchoice><shortcut> <keycombo>&Ctrl;&Shift;<keycap>Z</keycap></keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Redo</guimenuitem> </menuchoice></term>
+      <listitem><para>Redoes an undone change to the code.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="edit-cut"/>
     <varlistentry>
-      <term
-><menuchoice
-><shortcut
-> <keycombo
->&Ctrl;<keycap
->X</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Cut</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->Cuts the selected text from the code editor to the clipboard.</para
-></listitem>
+      <term><menuchoice><shortcut> <keycombo>&Ctrl;<keycap>X</keycap></keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Cut</guimenuitem> </menuchoice></term>
+      <listitem><para>Cuts the selected text from the code editor to the clipboard.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="edit-copy"/>
     <varlistentry>
-      <term
-><menuchoice
-><shortcut
-> <keycombo
->&Ctrl;<keycap
->C</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Copy</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->Copies the selected text from the code editor to the clipboard.</para
-></listitem>
+      <term><menuchoice><shortcut> <keycombo>&Ctrl;<keycap>C</keycap></keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Copy</guimenuitem> </menuchoice></term>
+      <listitem><para>Copies the selected text from the code editor to the clipboard.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="edit-paste"/>
     <varlistentry>
-      <term
-><menuchoice
-><shortcut
-> <keycombo
->&Ctrl;<keycap
->V</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Paste</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->Pastes the text from the clipboard to the editor.</para
-></listitem>
+      <term><menuchoice><shortcut> <keycombo>&Ctrl;<keycap>V</keycap></keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Paste</guimenuitem> </menuchoice></term>
+      <listitem><para>Pastes the text from the clipboard to the editor.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="edit-find"/>
     <varlistentry>
-      <term
-><menuchoice
-><shortcut
-> <keycombo
->&Ctrl;<keycap
->F</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Find...</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->With this action you can find phrases in the code.</para
-></listitem>
+      <term><menuchoice><shortcut> <keycombo>&Ctrl;<keycap>F</keycap></keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Find...</guimenuitem> </menuchoice></term>
+      <listitem><para>With this action you can find phrases in the code.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="edit-find-next"/>
     <varlistentry>
-      <term
-><menuchoice
-><shortcut
-> <keycombo
-><keysym
->F3</keysym
-></keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Find Next</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->Use this to find the next occurrence of the phrase.</para
-></listitem>
+      <term><menuchoice><shortcut> <keycombo><keysym>F3</keysym></keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Find Next</guimenuitem> </menuchoice></term>
+      <listitem><para>Use this to find the next occurrence of the phrase.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="edit-replace"/>
     <varlistentry>
-      <term
-><menuchoice
-><shortcut
-> <keycombo
->&Ctrl;<keycap
->R</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Replace...</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->With this action you can replace phrases in the code.</para
-></listitem>
+      <term><menuchoice><shortcut> <keycombo>&Ctrl;<keycap>R</keycap></keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Replace...</guimenuitem> </menuchoice></term>
+      <listitem><para>With this action you can replace phrases in the code.</para></listitem>
     </varlistentry>
   </variablelist>
 </sect2>
 
 <sect2 id="the-view-menu">
-  <title
->The <guimenu
->View</guimenu
-> Menu</title>
+  <title>The <guimenu>View</guimenu> Menu</title>
   <variablelist>
     <anchor id="view-fullscreen"/>
     <varlistentry>
-      <term
-><menuchoice
-><shortcut
-> <keycombo
->&Ctrl;&Shift;<keycap
->F</keycap
-></keycombo
-> </shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Full Screen Mode</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->With this action you toggle the full screen mode.</para>
-                <para
->Note: When code is executed while in full screen mode everything but the canvas is hidden. This makes it possible to write <quote
->full screen</quote
-> programs in &kturtle;.</para
-></listitem>
+      <term><menuchoice><shortcut> <keycombo>&Ctrl;&Shift;<keycap>F</keycap></keycombo> </shortcut> <guimenu>View</guimenu> <guimenuitem>Full Screen Mode</guimenuitem> </menuchoice></term>
+      <listitem><para>With this action you toggle the full screen mode.</para>
+                <para>Note: When code is executed while in full screen mode everything but the canvas is hidden. This makes it possible to write <quote>full screen</quote> programs in &kturtle;.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="view-linenumbers"/>
     <varlistentry>
-      <term
-><menuchoice
-><shortcut
-> <keycombo
-><keysym
->F11</keysym
-></keycombo
-> </shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Show Line Numbers</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->With this action you can show the line numbers in the code editor. This can be handy for finding errors.</para
-></listitem>
+      <term><menuchoice><shortcut> <keycombo><keysym>F11</keysym></keycombo> </shortcut> <guimenu>View</guimenu> <guimenuitem>Show Line Numbers</guimenuitem> </menuchoice></term>
+      <listitem><para>With this action you can show the line numbers in the code editor. This can be handy for finding errors.</para></listitem>
     </varlistentry>
   </variablelist>
 </sect2>
 
 <sect2 id="the-tools-menu">
-  <title
->The <guimenu
->Tools</guimenu
-> Menu</title>
+  <title>The <guimenu>Tools</guimenu> Menu</title>
   <variablelist>
     <anchor id="tools-color-picker"/>
     <varlistentry>
-      <term
-><menuchoice
-><shortcut
-> <keycombo
->&Alt;<keycap
->C</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Tools</guimenu
-> <guimenuitem
->Colour Picker</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->This action opens the colour picker. Using the colour picker you can easily select a <glossterm linkend="rgb"
->colour code</glossterm
-> and insert it in <link linkend="the-code-editor"
->the code editor</link
->.</para
-></listitem>
+      <term><menuchoice><shortcut> <keycombo>&Alt;<keycap>C</keycap></keycombo> </shortcut> <guimenu>Tools</guimenu> <guimenuitem>Colour Picker</guimenuitem> </menuchoice></term>
+      <listitem><para>This action opens the colour picker. Using the colour picker you can easily select a <glossterm linkend="rgb">colour code</glossterm> and insert it in <link linkend="the-code-editor">the code editor</link>.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="tools-indent"/>
     <varlistentry>
-      <term
-><menuchoice
-><shortcut
-> <keycombo
->&Ctrl;<keycap
->I</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Tools</guimenu
-> <guimenuitem
->Indent</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->This action <quote
->indents</quote
-> (adds white space at the beginning of) the lines that are selected. When <quote
->indentation</quote
-> is used properly this can make code much easier to read. All examples use indentation, please check them out.</para
-></listitem>
+      <term><menuchoice><shortcut> <keycombo>&Ctrl;<keycap>I</keycap></keycombo> </shortcut> <guimenu>Tools</guimenu> <guimenuitem>Indent</guimenuitem> </menuchoice></term>
+      <listitem><para>This action <quote>indents</quote> (adds white space at the beginning of) the lines that are selected. When <quote>indentation</quote> is used properly this can make code much easier to read. All examples use indentation, please check them out.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="tools-unindent"/>
     <varlistentry>
-      <term
-><menuchoice
-><shortcut
-> <keycombo
->&Ctrl;&Shift;<keycap
->I</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Tools</guimenu
-> <guimenuitem
->Unindent</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->This action <quote
->unindents</quote
-> (removes the white space at the beginning of) the lines that are selected.</para
-></listitem>
+      <term><menuchoice><shortcut> <keycombo>&Ctrl;&Shift;<keycap>I</keycap></keycombo> </shortcut> <guimenu>Tools</guimenu> <guimenuitem>Unindent</guimenuitem> </menuchoice></term>
+      <listitem><para>This action <quote>unindents</quote> (removes the white space at the beginning of) the lines that are selected.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="tools-clean-indent"/>
     <varlistentry>
-      <term
-><menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Clean Indentation</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->This action cleans <quote
->indentation</quote
-> (removes all the white space at the beginning of) the lines that are selected.</para
-></listitem>
+      <term><menuchoice><guimenu>Tools</guimenu> <guimenuitem>Clean Indentation</guimenuitem> </menuchoice></term>
+      <listitem><para>This action cleans <quote>indentation</quote> (removes all the white space at the beginning of) the lines that are selected.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="tools-comment"/>
     <varlistentry>
-      <term
-><menuchoice
-><shortcut
-> <keycombo
->&Ctrl;<keycap
->D</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Tools</guimenu
-> <guimenuitem
->Comment</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->This action add comment characters (#) in from of the lines that are selected. Lines that start with a comment character are ignored when the code is executed. Comments allow the programmer to explain a bit about his code or they can be used to temporarily prevent a certain piece of code from being executed.</para
-></listitem>
+      <term><menuchoice><shortcut> <keycombo>&Ctrl;<keycap>D</keycap></keycombo> </shortcut> <guimenu>Tools</guimenu> <guimenuitem>Comment</guimenuitem> </menuchoice></term>
+      <listitem><para>This action add comment characters (#) in from of the lines that are selected. Lines that start with a comment character are ignored when the code is executed. Comments allow the programmer to explain a bit about his code or they can be used to temporarily prevent a certain piece of code from being executed.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="tools-uncomment"/>
     <varlistentry>
-      <term
-><menuchoice
-><shortcut
-> <keycombo
->&Ctrl;&Shift;<keycap
->D</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Tools</guimenu
-> <guimenuitem
->Uncomment</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->This action removes the comment characters from the selected lines.</para
-></listitem>
+      <term><menuchoice><shortcut> <keycombo>&Ctrl;&Shift;<keycap>D</keycap></keycombo> </shortcut> <guimenu>Tools</guimenu> <guimenuitem>Uncomment</guimenuitem> </menuchoice></term>
+      <listitem><para>This action removes the comment characters from the selected lines.</para></listitem>
     </varlistentry>
   </variablelist>
 </sect2>
 
 <sect2 id="the-setting-menu">
-  <title
->The <guimenu
->Settings</guimenu
-> Menu</title>
+  <title>The <guimenu>Settings</guimenu> Menu</title>
     <variablelist>
     <anchor id="toggle-toolbar"/>
     <varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show/Hide Toolbar</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
->Toggle</action
-> the Main Toolbar</para
-></listitem>
+<term><menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show/Hide Toolbar</guimenuitem> </menuchoice></term>
+<listitem><para><action>Toggle</action> the Main Toolbar</para></listitem>
 </varlistentry>
-  </variablelist
->  
+  </variablelist>  
   <variablelist>
       <anchor id="toggle-statusbar"/>
    <varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show/Hide Statusbar</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
->Toggle</action
-> the Statusbar</para
-></listitem>
+<term><menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show/Hide Statusbar</guimenuitem> </menuchoice></term>
+<listitem><para><action>Toggle</action> the Statusbar</para></listitem>
 </varlistentry>
   </variablelist>
     <variablelist>
     <anchor id="tools-advanced"/>
     <varlistentry>
-      <term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guisubmenu
->Advanced Settings</guisubmenu
-> </menuchoice
-></term>
-      <listitem
-><para
->Here you can change things you normally do not need to change. The <guisubmenu
->Advanced Settings</guisubmenu
-> submenu has three items: <guimenuitem
->Configure Editor...</guimenuitem
-> (the standard &kate; editor settings dialog), <guimenuitem
->Configure Shortcuts...</guimenuitem
-> (the standard &kde; shortcut settings dialog), and <guimenuitem
->Configure Toolbars...</guimenuitem
-> (the standard &kde; toolbars setting dialog).</para
-></listitem>
+      <term><menuchoice><guimenu>Settings</guimenu> <guisubmenu>Advanced Settings</guisubmenu> </menuchoice></term>
+      <listitem><para>Here you can change things you normally do not need to change. The <guisubmenu>Advanced Settings</guisubmenu> submenu has three items: <guimenuitem>Configure Editor...</guimenuitem> (the standard &kate; editor settings dialog), <guimenuitem>Configure Shortcuts...</guimenuitem> (the standard &kde; shortcut settings dialog), and <guimenuitem>Configure Toolbars...</guimenuitem> (the standard &kde; toolbars setting dialog).</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="settings-configure"/>
     <varlistentry>
-      <term
-><menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure &kturtle;...</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->This is used to configure &kturtle;. Here you can change the language of the &logo; commands or set a new initial canvas size.</para
-></listitem>
+      <term><menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure &kturtle;...</guimenuitem> </menuchoice></term>
+      <listitem><para>This is used to configure &kturtle;. Here you can change the language of the &logo; commands or set a new initial canvas size.</para></listitem>
     </varlistentry>
   </variablelist>
 
 </sect2>
 
 <sect2 id="the-help-menu">
-  <title
->The <guimenu
->Help</guimenu
-> Menu</title>
+  <title>The <guimenu>Help</guimenu> Menu</title>
   <variablelist>
     <anchor id="help-handbook"/>
     <varlistentry>
-      <term
-><menuchoice
-><guimenu
->Help</guimenu
-> <guimenuitem
->&kturtle; Handbook</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->This action shows the handbook that you are currently reading.</para
-></listitem>
+      <term><menuchoice><guimenu>Help</guimenu> <guimenuitem>&kturtle; Handbook</guimenuitem> </menuchoice></term>
+      <listitem><para>This action shows the handbook that you are currently reading.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="help-whats-this"/>
     <varlistentry>
-      <term
-><menuchoice
-><shortcut
-> <keycombo
->&Shift;<keysym
->F1</keysym
-></keycombo
-> </shortcut
-> <guimenu
->Help</guimenu
-> <guimenuitem
->What's This?</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->After activating this action the mouse arrow will be changed into a <quote
->question mark arrow</quote
->. When this arrow is used to click on parts of &kturtle; main window, a description of the particular part pops-up.</para
-></listitem>
+      <term><menuchoice><shortcut> <keycombo>&Shift;<keysym>F1</keysym></keycombo> </shortcut> <guimenu>Help</guimenu> <guimenuitem>What's This?</guimenuitem> </menuchoice></term>
+      <listitem><para>After activating this action the mouse arrow will be changed into a <quote>question mark arrow</quote>. When this arrow is used to click on parts of &kturtle; main window, a description of the particular part pops-up.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="help-context-help"/>
     <varlistentry>
-      <term
-><menuchoice
-><shortcut
-> <keycombo
-><keysym
->F1</keysym
-></keycombo
-> </shortcut
-> <guimenu
->Help</guimenu
-> <guimenuitem
->Help on: ...</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->This is a very useful function: it provides help on the code where the cursor in the code editor is at. So, &eg;, you have used the <userinput
->print</userinput
-> command in your code, and you want to read and to know what the handbook says on this command. You just move your cursor so it is in the <userinput
->print</userinput
-> command and you press <keysym
->F1</keysym
->. The handbook will then show all info on the <userinput
->print</userinput
-> command.</para>
-      <para
->This function is very important while learning programming.</para
-></listitem>
+      <term><menuchoice><shortcut> <keycombo><keysym>F1</keysym></keycombo> </shortcut> <guimenu>Help</guimenu> <guimenuitem>Help on: ...</guimenuitem> </menuchoice></term>
+      <listitem><para>This is a very useful function: it provides help on the code where the cursor in the code editor is at. So, &eg;, you have used the <userinput>print</userinput> command in your code, and you want to read and to know what the handbook says on this command. You just move your cursor so it is in the <userinput>print</userinput> command and you press <keysym>F1</keysym>. The handbook will then show all info on the <userinput>print</userinput> command.</para>
+      <para>This function is very important while learning programming.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="help-report-bug"/>
     <varlistentry>
-      <term
-><menuchoice
-><guimenu
->Help</guimenu
-> <guimenuitem
->Report Bug...</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->Use this to report a problem with &kturtle; to the developers. These reports can be used to make future versions of &kturtle; even better.</para
-></listitem>
+      <term><menuchoice><guimenu>Help</guimenu> <guimenuitem>Report Bug...</guimenuitem> </menuchoice></term>
+      <listitem><para>Use this to report a problem with &kturtle; to the developers. These reports can be used to make future versions of &kturtle; even better.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="help-about-kturtle"/>
     <varlistentry>
-      <term
-><menuchoice
-><guimenu
->Help</guimenu
-> <guimenuitem
->About &kturtle;</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->Here you find information on &kturtle;, like the authors and the license it comes with.</para
-></listitem>
+      <term><menuchoice><guimenu>Help</guimenu> <guimenuitem>About &kturtle;</guimenuitem> </menuchoice></term>
+      <listitem><para>Here you find information on &kturtle;, like the authors and the license it comes with.</para></listitem>
     </varlistentry>
   </variablelist>
   <variablelist>
     <anchor id="help-about-kde"/>
     <varlistentry>
-      <term
-><menuchoice
-><guimenu
->Help</guimenu
-> <guimenuitem
->About &kde;</guimenuitem
-> </menuchoice
-></term>
-      <listitem
-><para
->Here you can find information on &kde;. If you do not know yet what &kde; is, this is a place you should not miss.</para
-></listitem>
+      <term><menuchoice><guimenu>Help</guimenu> <guimenuitem>About &kde;</guimenuitem> </menuchoice></term>
+      <listitem><para>Here you can find information on &kde;. If you do not know yet what &kde; is, this is a place you should not miss.</para></listitem>
     </varlistentry>
   </variablelist>
 </sect2>
@@ -995,31 +320,14 @@
 </sect1>
 
 <sect1 id="the-toolbar">
-<title
->The Toolbar</title>
-<para
->Here you can quickly reach the most used actions. By default, you will find here all main useful commands ending with the <guiicon
->Execute Commands</guiicon
-> and <guiicon
->Stop Execution</guiicon
-> icons.</para>
-<para
->You can configure the toolbar using <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Advanced Settings</guimenuitem
-><guimenuitem
->Configure Toolbar...</guimenuitem
-></menuchoice
-></para>
+<title>The Toolbar</title>
+<para>Here you can quickly reach the most used actions. By default, you will find here all main useful commands ending with the <guiicon>Execute Commands</guiicon> and <guiicon>Stop Execution</guiicon> icons.</para>
+<para>You can configure the toolbar using <menuchoice><guimenu>Settings</guimenu><guimenuitem>Advanced Settings</guimenuitem><guimenuitem>Configure Toolbar...</guimenuitem></menuchoice></para>
 </sect1>
 
 <sect1 id="the-statusbar">
-<title
->The Statusbar</title>
-<para
->On the statusbar you get feedback of the state of &kturtle;. On the left side it shows the feedback on the last action. On the right side you find the current location of the cursor (line and column numbers). In the middle of the Statusbar is indicated the current language used for the commands.</para>
+<title>The Statusbar</title>
+<para>On the statusbar you get feedback of the state of &kturtle;. On the left side it shows the feedback on the last action. On the right side you find the current location of the cursor (line and column numbers). In the middle of the Statusbar is indicated the current language used for the commands.</para>
 </sect1>
 
 </chapter>
diff --git a/tde-i18n-en_GB/docs/tdelibs/tdespell/index.docbook b/tde-i18n-en_GB/docs/tdelibs/tdespell/index.docbook
index f02bbc27985..397aa4b754f 100644
--- a/tde-i18n-en_GB/docs/tdelibs/tdespell/index.docbook
+++ b/tde-i18n-en_GB/docs/tdelibs/tdespell/index.docbook
@@ -1,238 +1,123 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY kappname "&tdespell;">
-  <!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+  <!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
   <!ENTITY % addindex "IGNORE">
 ]>
 
 <book lang="&language;">
 
 <bookinfo>
-<title
->The &tdespell; Handbook</title>
+<title>The &tdespell; Handbook</title>
 <authorgroup>
-<author
->&David.Sweet; &David.Sweet.mail;</author>
-
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&David.Sweet; &David.Sweet.mail;</author>
+
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 
 </authorgroup>
 
-<date
->2003-02-24</date>
-<releaseinfo
->1.00.00</releaseinfo>
+<date>2003-02-24</date>
+<releaseinfo>1.00.00</releaseinfo>
 <abstract>
-<para
->&tdespell; is the spelling checker used by &kde; applications such as &kate;, &kmail;, and &kword;. It is a <acronym
->GUI</acronym
-> frontend to <application
->International ISpell</application
-> and <application
->ASpell</application
->.</para>
+<para>&tdespell; is the spelling checker used by &kde; applications such as &kate;, &kmail;, and &kword;. It is a <acronym>GUI</acronym> frontend to <application>International ISpell</application> and <application>ASpell</application>.</para>
 
 </abstract>
 <keywordset>
-<keyword
->spell</keyword>
-<keyword
->spelling</keyword>
-<keyword
->tdespell</keyword>
-<keyword
->ispell</keyword>
-<keyword
->aspell</keyword>
-<keyword
->check</keyword>
-<keyword
->checker</keyword>
-<keyword
->KDE</keyword>
+<keyword>spell</keyword>
+<keyword>spelling</keyword>
+<keyword>tdespell</keyword>
+<keyword>ispell</keyword>
+<keyword>aspell</keyword>
+<keyword>check</keyword>
+<keyword>checker</keyword>
+<keyword>KDE</keyword>
 </keywordset>
 </bookinfo>
 
 <chapter id="misspelled-word-dialog">
-<title
->Misspelled Word Dialogue</title>
+<title>Misspelled Word Dialogue</title>
 
 <!-- This one might need a paragraph of its own) --> 
-<para
->(If you do not have <application
->Ispell</application
-> installed you can obtain it from the <ulink url="http://fmg-www.cs.ucla.edu/geoff/ispell.html"
->International ISpell home page</ulink
->. ASpell is available from the <ulink url="http://aspell.sourceforge.net/"
->ASpell home page</ulink
->.) </para>
+<para>(If you do not have <application>Ispell</application> installed you can obtain it from the <ulink url="http://fmg-www.cs.ucla.edu/geoff/ispell.html">International ISpell home page</ulink>. ASpell is available from the <ulink url="http://aspell.sourceforge.net/">ASpell home page</ulink>.) </para>
 
 <sect1 id="general-use">
-<title
->General Use</title>
-
-<para
-><anchor id="spelldlg"/> The top line in the dialogue displays a possibly misspelled word which was found in your document. &tdespell; attempts to find an appropriate replacement word. One or several may be found. The best guess is shown to the right of <guilabel
->Replacement:</guilabel
->. To accept this replacement, click on <guibutton
->Replace</guibutton
->. You may also select a word from the list of <guilabel
->Suggestions</guilabel
-> and then click <guibutton
->Replace</guibutton
-> to replace the misspelled word with the selected word.</para>
-
-<para
->To keep your original spelling, click on <guilabel
->Ignore</guilabel
->.</para>
-
-<para
->To stop the spell checking -- keeping the changes you've already made -- click on <guibutton
->Stop</guibutton
->.</para>
-
-<para
->To stop the spell checking and cancel the changes you've already made, click on <guibutton
->Cancel</guibutton
->.</para>
-
-<para
->Clicking on <guibutton
->Replace All</guibutton
-> will initially perform the same function as clicking on <guibutton
->Replace</guibutton
->, but will automatically replace the misspelled word with the chosen replacement word, if it appears again (at a later point) in your document.</para>
-
-<para
->The <guibutton
->Ignore All</guibutton
-> button ignores this and all future occurrences of the misspelled word.</para>
-
-<para
->Clicking on <guibutton
->Add</guibutton
-> will add the misspelled word to your personal dictionary (this is distinct from the original system dictionary, so the additions you make will not be seen by other users).</para>
+<title>General Use</title>
+
+<para><anchor id="spelldlg"/> The top line in the dialogue displays a possibly misspelled word which was found in your document. &tdespell; attempts to find an appropriate replacement word. One or several may be found. The best guess is shown to the right of <guilabel>Replacement:</guilabel>. To accept this replacement, click on <guibutton>Replace</guibutton>. You may also select a word from the list of <guilabel>Suggestions</guilabel> and then click <guibutton>Replace</guibutton> to replace the misspelled word with the selected word.</para>
+
+<para>To keep your original spelling, click on <guilabel>Ignore</guilabel>.</para>
+
+<para>To stop the spell checking -- keeping the changes you've already made -- click on <guibutton>Stop</guibutton>.</para>
+
+<para>To stop the spell checking and cancel the changes you've already made, click on <guibutton>Cancel</guibutton>.</para>
+
+<para>Clicking on <guibutton>Replace All</guibutton> will initially perform the same function as clicking on <guibutton>Replace</guibutton>, but will automatically replace the misspelled word with the chosen replacement word, if it appears again (at a later point) in your document.</para>
+
+<para>The <guibutton>Ignore All</guibutton> button ignores this and all future occurrences of the misspelled word.</para>
+
+<para>Clicking on <guibutton>Add</guibutton> will add the misspelled word to your personal dictionary (this is distinct from the original system dictionary, so the additions you make will not be seen by other users).</para>
 </sect1>
 </chapter>
 
 <chapter id="configuration-dialog">
-<title
->Configuration Dialogue </title>
+<title>Configuration Dialogue </title>
 <anchor id="configuration"/>
 
 <sect1 id="dictionaries">
-<title
->Dictionaries</title>
+<title>Dictionaries</title>
 
-<para
->You can choose the dictionary to use for spell checking from the list of installed dictionaries.</para>
+<para>You can choose the dictionary to use for spell checking from the list of installed dictionaries.</para>
 </sect1>
 
 <sect1 id="encodings">
-<title
->Encodings</title>
+<title>Encodings</title>
 
-<para
->The most commonly used character encodings are: <variablelist>
+<para>The most commonly used character encodings are: <variablelist>
 <varlistentry>
-<term
->US-ASCII</term>
+<term>US-ASCII</term>
 <listitem>
-<para
->This is the character set used for English text.</para>
+<para>This is the character set used for English text.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->ISO-8859-1</term>
+<term>ISO-8859-1</term>
 <listitem>
-<para
->This is used for Western European languages.</para>
+<para>This is used for Western European languages.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->UTF-8</term>
+<term>UTF-8</term>
 <listitem>
-<para
->This is a Unicode encoding that can be used for almost any language, if your system has the necessary fonts.</para>
+<para>This is a Unicode encoding that can be used for almost any language, if your system has the necessary fonts.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 </para>
 
-<para
->You should select the one that matches the character set you are using. In some cases, dictionaries will support more than one encoding. A dictionary might, for example, accept accented characters when <guilabel
->ISO-8859-1</guilabel
-> is selected, but accept email-style character combinations (like <literal
->'a</literal
-> for an accented <literal
->a</literal
->) when <guilabel
->US-ASCII</guilabel
-> is selected. Please see your dictionary's distribution for more information.</para>
+<para>You should select the one that matches the character set you are using. In some cases, dictionaries will support more than one encoding. A dictionary might, for example, accept accented characters when <guilabel>ISO-8859-1</guilabel> is selected, but accept email-style character combinations (like <literal>'a</literal> for an accented <literal>a</literal>) when <guilabel>US-ASCII</guilabel> is selected. Please see your dictionary's distribution for more information.</para>
 </sect1>
 
 <sect1 id="spell-checking-client">
-<title
->Spell-checking client</title>
-
-<para
->You may choose to use <application
->Ispell</application
-> or <application
->Aspell</application
-> as the spell-checking backend for &tdespell;. <application
->Ispell</application
-> is more widely available and may have better international support, but <application
->Aspell</application
-> is gaining popularity as it claims to give better suggestions for word replacements.</para>
+<title>Spell-checking client</title>
+
+<para>You may choose to use <application>Ispell</application> or <application>Aspell</application> as the spell-checking backend for &tdespell;. <application>Ispell</application> is more widely available and may have better international support, but <application>Aspell</application> is gaining popularity as it claims to give better suggestions for word replacements.</para>
 </sect1>
 
 <sect1 id="other">
-<title
->Other</title>
+<title>Other</title>
 
-<para
->It is recommend that you do not change the first two options unless you have read the International <application
->ISpell</application
-> man page.</para>
+<para>It is recommend that you do not change the first two options unless you have read the International <application>ISpell</application> man page.</para>
 </sect1>
 </chapter>
 
 <chapter id="contact-information">
-<title
->Contact Information</title>
-
-<para
->For more information about &tdespell;, visit the <ulink url="http://www.chaos.umd.edu/~dsweet/KDE/KSpell"
->&tdespell; Home Page</ulink
->. In particular, you will find information about programming the &tdespell; C++ class.</para>
-
-<para
->You may email the author/maintainer with questions and/or comments at &David.Sweet.mail;.</para>
-
-<para
->Conversion to British English: Malcolm Hunter <email
->malcolm.hunter@gmx.co.uk</email
-></para
-> 
+<title>Contact Information</title>
+
+<para>For more information about &tdespell;, visit the <ulink url="http://www.chaos.umd.edu/~dsweet/KDE/KSpell">&tdespell; Home Page</ulink>. In particular, you will find information about programming the &tdespell; C++ class.</para>
+
+<para>You may email the author/maintainer with questions and/or comments at &David.Sweet.mail;.</para>
+
+<para>Conversion to British English: Malcolm Hunter <email>malcolm.hunter@gmx.co.uk</email></para> 
 
 </chapter>
 &documentation.index; 
diff --git a/tde-i18n-en_GB/docs/tdemultimedia/kcontrol/kmixcfg/index.docbook b/tde-i18n-en_GB/docs/tdemultimedia/kcontrol/kmixcfg/index.docbook
index 22428b6bde2..a3e7579e5f5 100644
--- a/tde-i18n-en_GB/docs/tdemultimedia/kcontrol/kmixcfg/index.docbook
+++ b/tde-i18n-en_GB/docs/tdemultimedia/kcontrol/kmixcfg/index.docbook
@@ -2,94 +2,48 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
-><firstname
->Mike</firstname
-> <surname
->McBride</surname
-> </author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author><firstname>Mike</firstname> <surname>McBride</surname> </author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-02-12</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-02-12</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->mixer</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>mixer</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="mixer">
 
-<title
->Mixer</title>
+<title>Mixer</title>
 
-<para
->This module can be used to configure some of the more basic options of &kmix; (the &kde; Mixer).</para>
+<para>This module can be used to configure some of the more basic options of &kmix; (the &kde; Mixer).</para>
 
-<para
->The first section, relates to default volumes. With this section, you can save the current volume levels as the default. You can also load the default volume levels (thereby restoring them to the default status).</para>
+<para>The first section, relates to default volumes. With this section, you can save the current volume levels as the default. You can also load the default volume levels (thereby restoring them to the default status).</para>
 
-<para
->By selecting the <guilabel
->Load volumes on login</guilabel
->, you can instruct &kde; to automatically load the default volume levels whenever &kde; is started.</para>
+<para>By selecting the <guilabel>Load volumes on login</guilabel>, you can instruct &kde; to automatically load the default volume levels whenever &kde; is started.</para>
 
-<para
->The next section, lets you specify what hardware &kmix; should look for.</para>
+<para>The next section, lets you specify what hardware &kmix; should look for.</para>
 
-<para
->The slider labelled <guilabel
->Maximum number of probed mixers</guilabel
-> determines when &kmix; stops looking for soundcards. If you have one soundcard in your computer, you should set this to one. Using a higher number, means &kmix; will continue to search for a second sound card, which will delay the startup of &kmix;.</para>
+<para>The slider labelled <guilabel>Maximum number of probed mixers</guilabel> determines when &kmix; stops looking for soundcards. If you have one soundcard in your computer, you should set this to one. Using a higher number, means &kmix; will continue to search for a second sound card, which will delay the startup of &kmix;.</para>
 
-<para
->The slider labelled <guilabel
->Maximum number of probed devices per mixer</guilabel
-> determines how many devices &kmix; tries to detect on each soundcard. If there are more devices on your soundcard than &kmix; shows on startup, you should increase this number.</para>
+<para>The slider labelled <guilabel>Maximum number of probed devices per mixer</guilabel> determines how many devices &kmix; tries to detect on each soundcard. If there are more devices on your soundcard than &kmix; shows on startup, you should increase this number.</para>
 
 <sect2 id="mixer-author">
-<title
->Section Author</title>
-
-<para
->This section written by Mike McBride <email
->mpmcbride7@yahoo.com</email
-> </para>
-<para
->Conversion to British English: Malcolm Hunter <email
->malcolm.hunter@gmx.co.uk</email
-></para
-> 
+<title>Section Author</title>
+
+<para>This section written by Mike McBride <email>mpmcbride7@yahoo.com</email> </para>
+<para>Conversion to British English: Malcolm Hunter <email>malcolm.hunter@gmx.co.uk</email></para> 
 
 </sect2>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdenetwork/kcontrol/kcmktalkd/index.docbook b/tde-i18n-en_GB/docs/tdenetwork/kcontrol/kcmktalkd/index.docbook
index 8a66791212a..9c603dea855 100644
--- a/tde-i18n-en_GB/docs/tdenetwork/kcontrol/kcmktalkd/index.docbook
+++ b/tde-i18n-en_GB/docs/tdenetwork/kcontrol/kcmktalkd/index.docbook
@@ -2,91 +2,47 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 
 <article lang="&language;">
-<title
->Talk</title>
+<title>Talk</title>
 <articleinfo>
 
 <authorgroup>
-<author
-><firstname
->Lauri</firstname
-> <surname
->Watts</surname
-> </author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author><firstname>Lauri</firstname> <surname>Watts</surname> </author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<date
->2002-10-08</date>
-<releaseinfo
->3.01.00</releaseinfo>
+<date>2002-10-08</date>
+<releaseinfo>3.01.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->talk</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>talk</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="talk">
 
-<title
->Talk Configuration</title>
+<title>Talk Configuration</title>
 
 <!-- FIXME: This module is installed with tdenetwork.. should it be
 documented in the kcontrol manual, or should this information be added
 to the ktalkd manual -->
 
-<sect2 id="talk-intro"
-> 
-<title
->Introduction</title
-> 
+<sect2 id="talk-intro"> 
+<title>Introduction</title> 
 
-<para
->Please see the &ktalkd; manual for more information (you can read it by entering <userinput
->help:/ktalkd/</userinput
-> in a &konqueror; window.)</para
-> </sect2
-> 
+<para>Please see the &ktalkd; manual for more information (you can read it by entering <userinput>help:/ktalkd/</userinput> in a &konqueror; window.)</para> </sect2> 
 
-<sect2 id="talk-author"
-> 
-<title
->Section Author</title
-> 
-<para
->This section written by: </para
-> 
+<sect2 id="talk-author"> 
+<title>Section Author</title> 
+<para>This section written by: </para> 
 
-<para
->Conversion to British English: Malcolm Hunter <email
->malcolm.hunter@gmx.co.uk</email
-></para
-> 
+<para>Conversion to British English: Malcolm Hunter <email>malcolm.hunter@gmx.co.uk</email></para> 
 
 </sect2>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdepim/kaddressbook/index.docbook b/tde-i18n-en_GB/docs/tdepim/kaddressbook/index.docbook
index 31d5bef87aa..66c581edc83 100644
--- a/tde-i18n-en_GB/docs/tdepim/kaddressbook/index.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/kaddressbook/index.docbook
@@ -3,148 +3,96 @@
 "dtd/kdex.dtd" [
  <!ENTITY kappname "&kaddressbook;">
  <!ENTITY % addindex "IGNORE">
- <!ENTITY % British-English "INCLUDE" 
-> <!-- change language only here -->  
+ <!ENTITY % British-English "INCLUDE" > <!-- change language only here -->  
 ]>
 
 <book lang="&language;">
 <bookinfo>
-<title
->The &kaddressbook; Handbook</title>
+<title>The &kaddressbook; Handbook</title>
 <authorgroup>
-<author
-> <firstname
->Don</firstname
-> <surname
->Sanders</surname
-> <affiliation
-> <address
-><email
->dsanders@kde.org</email
-></address
-> </affiliation
-> </author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->KDE British Conversion</contrib
-></othercredit>
+<author> <firstname>Don</firstname> <surname>Sanders</surname> <affiliation> <address><email>dsanders@kde.org</email></address> </affiliation> </author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>KDE British Conversion</contrib></othercredit>
 </authorgroup>
 
-<date
->2001-06-01</date>
-<releaseinfo
->0.01.00</releaseinfo>
+<date>2001-06-01</date>
+<releaseinfo>0.01.00</releaseinfo>
 
 <legalnotice>
 &FDLNotice;
 </legalnotice>
 
 <abstract>
-<para
->&kaddressbook; is the &kde; address book.</para>
+<para>&kaddressbook; is the &kde; address book.</para>
 </abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->kaddressbook</keyword>
+<keyword>KDE</keyword>
+<keyword>kaddressbook</keyword>
 
 </keywordset>
 </bookinfo>
 
 <chapter id="introduction">
-<title
->Introduction</title>
+<title>Introduction</title>
 
 <sect1 id="features">
-<title
->Features</title>
+<title>Features</title>
 
-<para
-> The documentation for &kaddressbook; was not complete at the time you installed this application. If you have any questions, please direct them to the appropriate &kde; mailing list. </para>
+<para> The documentation for &kaddressbook; was not complete at the time you installed this application. If you have any questions, please direct them to the appropriate &kde; mailing list. </para>
 
-<para
-> For &kaddressbook; this is probably </para>
+<para> For &kaddressbook; this is probably </para>
 
 </sect1>
 </chapter>
 
 <chapter id="using-pab">
-<title
->Using &kaddressbook;</title>
+<title>Using &kaddressbook;</title>
 
-<para
-></para>
+<para></para>
 
 </chapter>
 
 <chapter id="questions-answers-and-tips">
-<title
->Questions, Answers, and Tips</title>
+<title>Questions, Answers, and Tips</title>
 
 <sect1 id="question-1">
-<title
->Question 1</title>
+<title>Question 1</title>
 
-<para
->The answer</para>
+<para>The answer</para>
 
 </sect1>
 
 </chapter>
 
 <appendix id="installation">
-<title
->Installation</title>
+<title>Installation</title>
 
-<para
-> </para>
+<para> </para>
 
 <sect1 id="how-to-obtain-pab">
-<title
->How to obtain &kaddressbook;</title>
+<title>How to obtain &kaddressbook;</title>
 
-<para
-> </para>
+<para> </para>
 
 </sect1>
 
 <sect1 id="requirements">
-<title
->Requirements</title>
+<title>Requirements</title>
 
-<para
-> </para>
+<para> </para>
 
 </sect1>
 
 <sect1 id="compilation-and-installation">
-<title
->Compilation and Installation</title>
+<title>Compilation and Installation</title>
 
-<para
->Compiling &kaddressbook; is very easy. The following should do it: <screen>
+<para>Compiling &kaddressbook; is very easy. The following should do it: <screen>
 &percnt; ./configure
 &percnt; make
 &percnt; make install
-</screen
-> </para>
+</screen> </para>
 
-<para
->That should do it! Should you run into any problems, please report them to the author at <email
->dsanders@kde.org</email
-></para>
+<para>That should do it! Should you run into any problems, please report them to the author at <email>dsanders@kde.org</email></para>
 
 &underFDL;
 
diff --git a/tde-i18n-en_GB/docs/tdepim/kcontrol/kalarmd/index.docbook b/tde-i18n-en_GB/docs/tdepim/kcontrol/kalarmd/index.docbook
index 4b75e497a2f..e9f9a2d6976 100644
--- a/tde-i18n-en_GB/docs/tdepim/kcontrol/kalarmd/index.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/kcontrol/kalarmd/index.docbook
@@ -2,114 +2,63 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
-><firstname
->Lauri</firstname
-> <surname
->Watts</surname
-> <affiliation
-><address
-><email
->lauri@kde.org</email
-></address
-></affiliation>
+<author><firstname>Lauri</firstname> <surname>Watts</surname> <affiliation><address><email>lauri@kde.org</email></address></affiliation>
 </author>
 
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 
 </authorgroup>
 
-<date
->2002-02-11</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-02-11</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->alarm</keyword>
-<keyword
->schedule</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>alarm</keyword>
+<keyword>schedule</keyword>
 </keywordset>
 
 </articleinfo>
 
 <sect1 id="alarmd">
-<title
->Alarm Daemon</title>
+<title>Alarm Daemon</title>
 
-<para
->This module allows you to configure &kalarmd;, the alarm daemon from the tdepim package. It will not be available if you have not installed this package.</para>
+<para>This module allows you to configure &kalarmd;, the alarm daemon from the tdepim package. It will not be available if you have not installed this package.</para>
 
-<para
->There are only two options for this module:</para>
+<para>There are only two options for this module:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Start alarm daemon automatically at login</guilabel
-></term>
+<term><guilabel>Start alarm daemon automatically at login</guilabel></term>
 <listitem>
-<para
->Check this to start the alarm daemon whenever you start a &kde; session.</para>
+<para>Check this to start the alarm daemon whenever you start a &kde; session.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Check interval [minutes]</guilabel
-></term>
+<term><guilabel>Check interval [minutes]</guilabel></term>
 <listitem>
-<para
->How long (in minutes) the alarm daemon should wait between checks for alarms coming due.</para>
+<para>How long (in minutes) the alarm daemon should wait between checks for alarms coming due.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->These settings apply to every application which uses the alarm daemon. Currently, the applications which use it include &korganizer; and &kalarm;. For more information, see their respective handbooks.</para>
+<para>These settings apply to every application which uses the alarm daemon. Currently, the applications which use it include &korganizer; and &kalarm;. For more information, see their respective handbooks.</para>
 
 <sect2>
-<title
->Section Author</title>
-
-<para
->Lauri Watts <email
->lauri@kde.org</email
-></para>
-
-<para
->Conversion to British English: Malcolm Hunter <email
->malcolm.hunter@gmx.co.uk</email
-></para
-> 
+<title>Section Author</title>
+
+<para>Lauri Watts <email>lauri@kde.org</email></para>
+
+<para>Conversion to British English: Malcolm Hunter <email>malcolm.hunter@gmx.co.uk</email></para> 
 
 </sect2>
 
diff --git a/tde-i18n-en_GB/docs/tdepim/kleopatra/index.docbook b/tde-i18n-en_GB/docs/tdepim/kleopatra/index.docbook
index 939dcac0fbf..07d86b3f851 100644
--- a/tde-i18n-en_GB/docs/tdepim/kleopatra/index.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/kleopatra/index.docbook
@@ -1,798 +1,319 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kleopatra "<application
->Kleopatra</application
->">
-  <!ENTITY kwatchgnupg "<application
->KWatchGnuPG</application
->">
-  <!ENTITY gpgsm "<application
->GpgSM</application
->">
-  <!ENTITY gpg "<application
->GPG</application
->">
-  <!ENTITY gpgconf "<application
->GpgConf</application
->">
+  <!ENTITY kleopatra "<application>Kleopatra</application>">
+  <!ENTITY kwatchgnupg "<application>KWatchGnuPG</application>">
+  <!ENTITY gpgsm "<application>GpgSM</application>">
+  <!ENTITY gpg "<application>GPG</application>">
+  <!ENTITY gpgconf "<application>GpgConf</application>">
   <!ENTITY kappname "&kleopatra;">
   <!ENTITY package "tdepim">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % British-English "INCLUDE">
 
-  <!ENTITY dn "<acronym
->DN</acronym
->">
-  <!ENTITY ca "<acronym
->CA</acronym
->">
+  <!ENTITY dn "<acronym>DN</acronym>">
+  <!ENTITY ca "<acronym>CA</acronym>">
 
   <!-- FILE menu -->
-  <!ENTITY file-new-key-pair "<menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->New Key Pair...</guimenuitem
-></menuchoice
->">
-  <!ENTITY file-export-certificates "<menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Export Certificates...</guimenuitem
-></menuchoice
->">
-  <!ENTITY file-export-secret-key "<menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Export Secret key...</guimenuitem
-></menuchoice
->">
-  <!ENTITY file-import-certificates "<menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Import Certificates...</guimenuitem
-></menuchoice
->">
-  <!ENTITY file-import-crls "<menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Import CRLs...</guimenuitem
-></menuchoice
->">
-  <!ENTITY file-quit "<menuchoice
-><shortcut
-><keycombo action='simul'
->&Ctrl;<keycap
->Q</keycap
-></keycombo
-></shortcut
-><guimenu
->File</guimenu
-><guimenuitem
->Quit</guimenuitem
-></menuchoice
->">
+  <!ENTITY file-new-key-pair "<menuchoice><guimenu>File</guimenu><guimenuitem>New Key Pair...</guimenuitem></menuchoice>">
+  <!ENTITY file-export-certificates "<menuchoice><guimenu>File</guimenu><guimenuitem>Export Certificates...</guimenuitem></menuchoice>">
+  <!ENTITY file-export-secret-key "<menuchoice><guimenu>File</guimenu><guimenuitem>Export Secret key...</guimenuitem></menuchoice>">
+  <!ENTITY file-import-certificates "<menuchoice><guimenu>File</guimenu><guimenuitem>Import Certificates...</guimenuitem></menuchoice>">
+  <!ENTITY file-import-crls "<menuchoice><guimenu>File</guimenu><guimenuitem>Import CRLs...</guimenuitem></menuchoice>">
+  <!ENTITY file-quit "<menuchoice><shortcut><keycombo action='simul'>&Ctrl;<keycap>Q</keycap></keycombo></shortcut><guimenu>File</guimenu><guimenuitem>Quit</guimenuitem></menuchoice>">
 
   <!-- VIEW menu -->
-  <!ENTITY view-redisplay "<menuchoice
-><shortcut
-><keycombo action='simul'
-><keycap
->F5</keycap
-></keycombo
-></shortcut
-><guimenu
->View</guimenu
-><guimenuitem
->Redisplay</guimenuitem
-></menuchoice
->">
-  <!ENTITY view-stop-operation "<menuchoice
-><shortcut
-><keycombo action='simul'
-><keycap
->Esc</keycap
-></keycombo
-></shortcut
-><guimenu
->View</guimenu
-><guimenuitem
->Stop Operation</guimenuitem
-></menuchoice
->">
-  <!ENTITY view-certificate-details "<menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Certificate Details...</guimenuitem
-></menuchoice
->">
-  <!ENTITY view-hierarchical-key-list "<menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Hierarchical Key List</guimenuitem
-></menuchoice
->">
-  <!ENTITY view-expand-all "<menuchoice
-><shortcut
-><keycombo action='simul'
->&Ctrl;<keycap
->.</keycap
-></keycombo
-></shortcut
-><guimenu
->View</guimenu
-><guimenuitem
->Expand All</guimenuitem
-></menuchoice
->">
-  <!ENTITY view-collapse-all "<menuchoice
-><shortcut
-><keycombo action='simul'
->&Ctrl;<keycap
->,</keycap
-></keycombo
-></shortcut
-><guimenu
->View</guimenu
-><guimenuitem
->Collapse All</guimenuitem
-></menuchoice
->">
+  <!ENTITY view-redisplay "<menuchoice><shortcut><keycombo action='simul'><keycap>F5</keycap></keycombo></shortcut><guimenu>View</guimenu><guimenuitem>Redisplay</guimenuitem></menuchoice>">
+  <!ENTITY view-stop-operation "<menuchoice><shortcut><keycombo action='simul'><keycap>Esc</keycap></keycombo></shortcut><guimenu>View</guimenu><guimenuitem>Stop Operation</guimenuitem></menuchoice>">
+  <!ENTITY view-certificate-details "<menuchoice><guimenu>View</guimenu><guimenuitem>Certificate Details...</guimenuitem></menuchoice>">
+  <!ENTITY view-hierarchical-key-list "<menuchoice><guimenu>View</guimenu><guimenuitem>Hierarchical Key List</guimenuitem></menuchoice>">
+  <!ENTITY view-expand-all "<menuchoice><shortcut><keycombo action='simul'>&Ctrl;<keycap>.</keycap></keycombo></shortcut><guimenu>View</guimenu><guimenuitem>Expand All</guimenuitem></menuchoice>">
+  <!ENTITY view-collapse-all "<menuchoice><shortcut><keycombo action='simul'>&Ctrl;<keycap>,</keycap></keycombo></shortcut><guimenu>View</guimenu><guimenuitem>Collapse All</guimenuitem></menuchoice>">
 
   <!-- CERTIFICATES menu -->
- <!ENTITY certificates-validate "<menuchoice
-><shortcut
-><keycombo action='simul'
->&Shift;<keycap
->F5</keycap
-></keycombo
-></shortcut
-><guimenu
->Certificates</guimenu
-><guimenuitem
->Validate</guimenuitem
-></menuchoice
->">
-  <!ENTITY certificates-refresh-crls "<menuchoice
-><guimenu
->Certificates</guimenu
-><guimenuitem
->Refresh CRLs</guimenuitem
-></menuchoice
->">
-  <!ENTITY certificates-delete "<menuchoice
-><shortcut
-><keycombo action='simul'
-><keycap
->Delete</keycap
-></keycombo
-></shortcut
-><guimenu
->Certificates</guimenu
-><guimenuitem
->Delete</guimenuitem
-></menuchoice
->">
-  <!ENTITY certificates-download "<menuchoice
-><guimenu
->Certificates</guimenu
-><guimenuitem
->Download</guimenuitem
-></menuchoice
->">
+ <!ENTITY certificates-validate "<menuchoice><shortcut><keycombo action='simul'>&Shift;<keycap>F5</keycap></keycombo></shortcut><guimenu>Certificates</guimenu><guimenuitem>Validate</guimenuitem></menuchoice>">
+  <!ENTITY certificates-refresh-crls "<menuchoice><guimenu>Certificates</guimenu><guimenuitem>Refresh CRLs</guimenuitem></menuchoice>">
+  <!ENTITY certificates-delete "<menuchoice><shortcut><keycombo action='simul'><keycap>Delete</keycap></keycombo></shortcut><guimenu>Certificates</guimenu><guimenuitem>Delete</guimenuitem></menuchoice>">
+  <!ENTITY certificates-download "<menuchoice><guimenu>Certificates</guimenu><guimenuitem>Download</guimenuitem></menuchoice>">
 
   <!-- CRLS menu -->
-  <!ENTITY crls-clear-crl-cache "<menuchoice
-><guimenu
->CRLs</guimenu
-><guimenuitem
->Clear CRL Cache...</guimenuitem
-></menuchoice
->">
-  <!ENTITY crls-dump-crl-cache "<menuchoice
-><guimenu
->CRLs</guimenu
-><guimenuitem
->Dump CRL Cache...</guimenuitem
-></menuchoice
->">
+  <!ENTITY crls-clear-crl-cache "<menuchoice><guimenu>CRLs</guimenu><guimenuitem>Clear CRL Cache...</guimenuitem></menuchoice>">
+  <!ENTITY crls-dump-crl-cache "<menuchoice><guimenu>CRLs</guimenu><guimenuitem>Dump CRL Cache...</guimenuitem></menuchoice>">
 
   <!-- TOOLS menu -->
-  <!ENTITY tools-gnupg-log-viewer "<menuchoice
-><guimenu
->Tools</guimenu
-><guimenuitem
->GnuPG Log Viewer...</guimenuitem
-></menuchoice
->">
+  <!ENTITY tools-gnupg-log-viewer "<menuchoice><guimenu>Tools</guimenu><guimenuitem>GnuPG Log Viewer...</guimenuitem></menuchoice>">
 
   <!-- SETTINGS menu -->
-  <!ENTITY settings-show-statusbar "<menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Show Statusbar</guimenuitem
-></menuchoice
->">
-  <!ENTITY settings-configure-shortcuts "<menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Shortcuts...</guimenuitem
-></menuchoice
->">
-  <!ENTITY settings-configure-kleopatra "<menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure &kleopatra;...</guimenuitem
-></menuchoice
->">
-  <!ENTITY settings-configure-gpgme-backend "<menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure GpgME Backend...</guimenuitem
-></menuchoice
->">
+  <!ENTITY settings-show-statusbar "<menuchoice><guimenu>Settings</guimenu><guimenuitem>Show Statusbar</guimenuitem></menuchoice>">
+  <!ENTITY settings-configure-shortcuts "<menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Shortcuts...</guimenuitem></menuchoice>">
+  <!ENTITY settings-configure-kleopatra "<menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &kleopatra;...</guimenuitem></menuchoice>">
+  <!ENTITY settings-configure-gpgme-backend "<menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure GpgME Backend...</guimenuitem></menuchoice>">
 
   <!-- Command line options -->
-  <!ENTITY commandline-option-external "<option
->--external</option
->">
-  <!ENTITY commandline-option-query "<option
->--query</option
->">
-  <!ENTITY commandline-option-import-certificate "<option
->--import-certificate</option
->">
+  <!ENTITY commandline-option-external "<option>--external</option>">
+  <!ENTITY commandline-option-query "<option>--query</option>">
+  <!ENTITY commandline-option-import-certificate "<option>--import-certificate</option>">
 ]>
 
 <book lang="&language;">
 
 <bookinfo>
-<title
->The &kleopatra; Handbook</title>
+<title>The &kleopatra; Handbook</title>
 
 <authorgroup>
-<author
-><firstname
->Marc</firstname
-> <surname
->Mutz</surname
-> <affiliation
-> <address
-><email
->marc@klaralvdalens-datakonsult.se</email
-></address>
+<author><firstname>Marc</firstname> <surname>Mutz</surname> <affiliation> <address><email>marc@klaralvdalens-datakonsult.se</email></address>
 </affiliation>
 </author>
 
-<othercredit role="developer"
-><firstname
->David</firstname
-> <surname
->Faure</surname
-> <contrib
->Developer</contrib>
+<othercredit role="developer"><firstname>David</firstname> <surname>Faure</surname> <contrib>Developer</contrib>
 </othercredit>
 
-<othercredit role="developer"
-><firstname
->Steffen</firstname
-> <othername
-></othername
-> <surname
->Hansen</surname
-> <affiliation
-> <address
-><email
->steffen@klaralvdalens-datakonsult.se</email
-></address>
+<othercredit role="developer"><firstname>Steffen</firstname> <othername></othername> <surname>Hansen</surname> <affiliation> <address><email>steffen@klaralvdalens-datakonsult.se</email></address>
 </affiliation>
-<contrib
->Developer</contrib>
+<contrib>Developer</contrib>
 </othercredit>
 
-<othercredit role="developer"
-><firstname
->Matthias Kalle</firstname
-> <surname
->Dalheimer</surname
-> <contrib
->Developer</contrib>
+<othercredit role="developer"><firstname>Matthias Kalle</firstname> <surname>Dalheimer</surname> <contrib>Developer</contrib>
 </othercredit>
 
-<othercredit role="developer"
-><firstname
->Jesper</firstname
-> <surname
->Pedersen</surname
-> <affiliation
-> <address
-><email
->blackie@kde.org</email
-></address>
+<othercredit role="developer"><firstname>Jesper</firstname> <surname>Pedersen</surname> <affiliation> <address><email>blackie@kde.org</email></address>
 </affiliation>
-<contrib
->Developer</contrib>
+<contrib>Developer</contrib>
 </othercredit>
-<othercredit role="developer"
-><firstname
->Daniel</firstname
-> <surname
->Molkentin</surname
-> <affiliation
-> <address
-><email
->molkentin@kde.org</email
-></address>
+<othercredit role="developer"><firstname>Daniel</firstname> <surname>Molkentin</surname> <affiliation> <address><email>molkentin@kde.org</email></address>
 </affiliation>
-<contrib
->Developer</contrib>
+<contrib>Developer</contrib>
 </othercredit>
 
-<othercredit role="translator"
-><firstname
->Andrew</firstname
-><surname
->Coles</surname
-><affiliation
-><address
-><email
->andrew_coles@yahoo.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Andrew</firstname><surname>Coles</surname><affiliation><address><email>andrew_coles@yahoo.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<legalnotice
->&GPLNotice;</legalnotice>
+<legalnotice>&GPLNotice;</legalnotice>
 
-<date
->2004-06-11</date>
-<releaseinfo
->0.31</releaseinfo>
+<date>2004-06-11</date>
+<releaseinfo>0.31</releaseinfo>
 
 <abstract>
-<para
->&kleopatra; is a tool for managing X.509 certificates. </para>
+<para>&kleopatra; is a tool for managing X.509 certificates. </para>
 </abstract>
 
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->Kapp</keyword>
-<keyword
->X509</keyword>
-<keyword
->LDAP</keyword>
-<keyword
->gpg</keyword>
-<keyword
->gpgsm</keyword>
+<keyword>KDE</keyword>
+<keyword>Kapp</keyword>
+<keyword>X509</keyword>
+<keyword>LDAP</keyword>
+<keyword>gpg</keyword>
+<keyword>gpgsm</keyword>
 </keywordset>
 
 </bookinfo>
 
-<chapter id="introduction"
-> <title
->Introduction</title
-> 
-
-<para
->&kleopatra; is the &kde; tool for managing X.509 certificates in the &gpgsm; keybox and for retrieving certificates from <acronym
->LDAP</acronym
-> servers.</para>
-
-<para
->&kleopatra; can be started from KMail's <guimenu
->Tools</guimenu
-> menu, as well as from the command line. The &kleopatra; executable is named <userinput
-><command
->kleopatra</command
-></userinput
->.</para>
-
-<note
-><para
->This program is named after Cleopatra, a famous female Egyptian pharaoh that lived at the time of Julius Caesar, whom she is said to have had an intimate relationship with.</para>
-
-<para
->The name was chosen since this program originates from the <ulink url="http://www.gnupg.org/aegypten2/"
->&Auml;gypten Projects</ulink
-> (&Auml;gypten is German for Egypt). Kleopatra is the German spelling of Cleopatra.</para
-></note>
+<chapter id="introduction"> <title>Introduction</title> 
+
+<para>&kleopatra; is the &kde; tool for managing X.509 certificates in the &gpgsm; keybox and for retrieving certificates from <acronym>LDAP</acronym> servers.</para>
+
+<para>&kleopatra; can be started from KMail's <guimenu>Tools</guimenu> menu, as well as from the command line. The &kleopatra; executable is named <userinput><command>kleopatra</command></userinput>.</para>
+
+<note><para>This program is named after Cleopatra, a famous female Egyptian pharaoh that lived at the time of Julius Caesar, whom she is said to have had an intimate relationship with.</para>
+
+<para>The name was chosen since this program originates from the <ulink url="http://www.gnupg.org/aegypten2/">&Auml;gypten Projects</ulink> (&Auml;gypten is German for Egypt). Kleopatra is the German spelling of Cleopatra.</para></note>
 
 </chapter>
 
-<chapter id="functions"
-><title
->Main Functions</title>
+<chapter id="functions"><title>Main Functions</title>
 
-<sect1 id="functions-view"
-><title
->Viewing the Local Keybox</title>
+<sect1 id="functions-view"><title>Viewing the Local Keybox</title>
 
 <!-- Viewing and Refreshing, also Validation -->
 
-<para
->&kleopatra;'s main function is to display and edit the contents of the local keybox, which is similar to &gpg;'s concept of keyrings, albeit one should not stretch this analogy too much.</para>
-
-<para
->The main window is divided into the large key listing area, the menubar and the <link linkend="functions-search"
->search bar</link
-> on top, and a statusbar at the bottom.</para>
-
-<para
->Each line in the key list corresponds to one certificate, identified by the so-called <guilabel
->Subject &dn;</guilabel
->. &dn; is an acronym for <quote
->Distinguished Name</quote
->, a hierarchical identifier, much like a filesystem path with an unusual syntax, that is supposed to globally uniquely identify a given certificate.</para>
-
-<para
->To be valid, and thus usable, (public) keys need to be signed by a &ca; (Certification Authority). These signatures are called certificates, but usually the terms <quote
->certificate</quote
-> and <quote
->(public) key</quote
-> are used interchangeably, and we will not distinguish between them in this manual either, except when explicitly noted. The name of the &ca; which issued the certificate (its &dn;) is shown in the <guilabel
->Issuer DN</guilabel
-> column.</para>
-
-<para
->&ca;s must in turn be signed by other &ca;s to be valid. Of course, this must end somewhere, so the top-level &ca; (root-&ca;) signs its key with itself (this is called a self-signature). Root certificates thus need to be assigned validity (commonly called trust) manually, &eg; after comparing the fingerprint with the one on the website of the &ca;. This is typically done by the system administrator or the vendor of a product using certificates, but can be done by the user via &gpgsm;'s command line interface.</para>
-
-<para
->To see which of the certificates are root certificates, you can either compare <guilabel
->Subject &dn;</guilabel
-> and <guilabel
->Issuer &dn;</guilabel
->, or you switch to hierarchical keylist mode with <xref linkend="view-hierarchical-key-list"/>.</para>
-
-<para
->You can see the details of any certificate by double-clicking it or using <xref linkend="view-certificate-details"/>. This opens a dialog that shows the most common properties of the certificate, its certificate chain (&ie; the chain of issuers up to the root-&ca;), and a dump of all information the backend is able to extract from the certificate.</para>
-
-<para
->If you change the keybox without using &kleopatra; (&eg; using &gpgsm;'s command line interface), you can refresh the view with <xref linkend="view-redisplay"/>.</para>
-
-<para
->Since validating a key may take some time (&eg; CRLs might need to be fetched), the normal keylisting does not attempt to check the validity of keys. For this, <xref linkend="certificates-validate"/>, a special variant of <xref linkend="view-redisplay"/>, is provided. It either checks the selected certificates, or all keys if none are selected.</para>
+<para>&kleopatra;'s main function is to display and edit the contents of the local keybox, which is similar to &gpg;'s concept of keyrings, albeit one should not stretch this analogy too much.</para>
+
+<para>The main window is divided into the large key listing area, the menubar and the <link linkend="functions-search">search bar</link> on top, and a statusbar at the bottom.</para>
+
+<para>Each line in the key list corresponds to one certificate, identified by the so-called <guilabel>Subject &dn;</guilabel>. &dn; is an acronym for <quote>Distinguished Name</quote>, a hierarchical identifier, much like a filesystem path with an unusual syntax, that is supposed to globally uniquely identify a given certificate.</para>
+
+<para>To be valid, and thus usable, (public) keys need to be signed by a &ca; (Certification Authority). These signatures are called certificates, but usually the terms <quote>certificate</quote> and <quote>(public) key</quote> are used interchangeably, and we will not distinguish between them in this manual either, except when explicitly noted. The name of the &ca; which issued the certificate (its &dn;) is shown in the <guilabel>Issuer DN</guilabel> column.</para>
+
+<para>&ca;s must in turn be signed by other &ca;s to be valid. Of course, this must end somewhere, so the top-level &ca; (root-&ca;) signs its key with itself (this is called a self-signature). Root certificates thus need to be assigned validity (commonly called trust) manually, &eg; after comparing the fingerprint with the one on the website of the &ca;. This is typically done by the system administrator or the vendor of a product using certificates, but can be done by the user via &gpgsm;'s command line interface.</para>
+
+<para>To see which of the certificates are root certificates, you can either compare <guilabel>Subject &dn;</guilabel> and <guilabel>Issuer &dn;</guilabel>, or you switch to hierarchical keylist mode with <xref linkend="view-hierarchical-key-list"/>.</para>
+
+<para>You can see the details of any certificate by double-clicking it or using <xref linkend="view-certificate-details"/>. This opens a dialog that shows the most common properties of the certificate, its certificate chain (&ie; the chain of issuers up to the root-&ca;), and a dump of all information the backend is able to extract from the certificate.</para>
+
+<para>If you change the keybox without using &kleopatra; (&eg; using &gpgsm;'s command line interface), you can refresh the view with <xref linkend="view-redisplay"/>.</para>
+
+<para>Since validating a key may take some time (&eg; CRLs might need to be fetched), the normal keylisting does not attempt to check the validity of keys. For this, <xref linkend="certificates-validate"/>, a special variant of <xref linkend="view-redisplay"/>, is provided. It either checks the selected certificates, or all keys if none are selected.</para>
 
 </sect1>
 
-<sect1 id="functions-search"
-><title
->Searching and Importing Certificates</title>
-
-<para
->Most of the time, you will acquire new certificates by verifying signatures in emails, since certificates are embedded in the signatures made using them most of the time. However, if you need to send a mail to someone you have not yet had contact with, you need to fetch the certificate from an LDAP directory (although &gpgsm; can do this automatically), or from a file. You also need to import your own certificate after receiving the &ca; answer to your certification request.</para>
-
-<para
->To search for a certificate in an LDAP directory, switch the dropdown menu of the search bar from <guilabel
->in Local Certificates</guilabel
-> to <guilabel
->in External Certificates</guilabel
->, enter some text (&eg; the name of the person you want the certificate for) into the line edit, and click on the <guilabel
->Find</guilabel
-> icon. The results will be displayed in the key list below the search bar, where you can select certificates to either look at them with <xref linkend="view-certificate-details"/> or download them with <xref linkend="certificates-download"/> into the local keybox. Note that you can also download the certificate from the details dialogue, using the <guilabel
->Import to Local</guilabel
-> button.</para>
-
-<para
->You can configure the list of LDAP servers to search in the <link linkend="configuration-directory-services"
-><guilabel
->Directory Services</guilabel
-></link
-> page of &kleopatra;'s <link linkend="configuration"
->configure dialogue</link
->.</para>
-
-<para
->If you received the certificate as a file, try <xref linkend="file-import-certificates"/>. &gpgsm; needs to understand the format of the certificate file; please refer to &gpgsm;'s manual for a list of supported file formats.</para>
-
-<para
->If you did not <link linkend="functions-newkey"
->create your keypair with &gpgsm;</link
->, you also need to manually import the public key (as well as the secret key) from the PKCS#12 file you got from the &ca;. You can do this on the command line with <link linkend="commandline-option-import-certificate"
-><userinput
-><command
->kleopatra &commandline-option-import-certificate; <filename
->filename</filename
-></command
-></userinput
-></link
-> or from within &kleopatra; with <xref linkend="file-import-certificates"/>, just as you would to for <quote
->normal</quote
-> certificates.</para>
+<sect1 id="functions-search"><title>Searching and Importing Certificates</title>
+
+<para>Most of the time, you will acquire new certificates by verifying signatures in emails, since certificates are embedded in the signatures made using them most of the time. However, if you need to send a mail to someone you have not yet had contact with, you need to fetch the certificate from an LDAP directory (although &gpgsm; can do this automatically), or from a file. You also need to import your own certificate after receiving the &ca; answer to your certification request.</para>
+
+<para>To search for a certificate in an LDAP directory, switch the dropdown menu of the search bar from <guilabel>in Local Certificates</guilabel> to <guilabel>in External Certificates</guilabel>, enter some text (&eg; the name of the person you want the certificate for) into the line edit, and click on the <guilabel>Find</guilabel> icon. The results will be displayed in the key list below the search bar, where you can select certificates to either look at them with <xref linkend="view-certificate-details"/> or download them with <xref linkend="certificates-download"/> into the local keybox. Note that you can also download the certificate from the details dialogue, using the <guilabel>Import to Local</guilabel> button.</para>
+
+<para>You can configure the list of LDAP servers to search in the <link linkend="configuration-directory-services"><guilabel>Directory Services</guilabel></link> page of &kleopatra;'s <link linkend="configuration">configure dialogue</link>.</para>
+
+<para>If you received the certificate as a file, try <xref linkend="file-import-certificates"/>. &gpgsm; needs to understand the format of the certificate file; please refer to &gpgsm;'s manual for a list of supported file formats.</para>
+
+<para>If you did not <link linkend="functions-newkey">create your keypair with &gpgsm;</link>, you also need to manually import the public key (as well as the secret key) from the PKCS#12 file you got from the &ca;. You can do this on the command line with <link linkend="commandline-option-import-certificate"><userinput><command>kleopatra &commandline-option-import-certificate; <filename>filename</filename></command></userinput></link> or from within &kleopatra; with <xref linkend="file-import-certificates"/>, just as you would to for <quote>normal</quote> certificates.</para>
 
 </sect1>
 
-<sect1 id="functions-newkey"
-><title
->Creating New Key Pairs</title>
-
-<para
->The menu item <xref linkend="file-new-key-pair"/> starts the certificate-request-creating wizard which will guide you through a number of steps to create a certificate request; this request can, on the last page of the wizard, either be sent to a certificate authority (CA) to be signed or saved to a file (for example to a floppy, so it can be shipped to the CA).</para
-> <para
->Whenever you are done with a step in the wizard, press <guibutton
->Next</guibutton
-> to go to the next step (or <guibutton
->Back</guibutton
-> to review steps that are already completed). The certificate request creation can be cancelled at any time by pressing the <guibutton
->Cancel</guibutton
-> button. </para>
-<para
->The first step in the wizard is to type in your personal data for the certificate. The fields to fill out are: <itemizedlist>
+<sect1 id="functions-newkey"><title>Creating New Key Pairs</title>
+
+<para>The menu item <xref linkend="file-new-key-pair"/> starts the certificate-request-creating wizard which will guide you through a number of steps to create a certificate request; this request can, on the last page of the wizard, either be sent to a certificate authority (CA) to be signed or saved to a file (for example to a floppy, so it can be shipped to the CA).</para> <para>Whenever you are done with a step in the wizard, press <guibutton>Next</guibutton> to go to the next step (or <guibutton>Back</guibutton> to review steps that are already completed). The certificate request creation can be cancelled at any time by pressing the <guibutton>Cancel</guibutton> button. </para>
+<para>The first step in the wizard is to type in your personal data for the certificate. The fields to fill out are: <itemizedlist>
 <listitem>
-<para
-><guilabel
->Name:</guilabel
-> Your name;</para>
+<para><guilabel>Name:</guilabel> Your name;</para>
 </listitem>
 <listitem>
-<para
-><guilabel
->Location:</guilabel
->The town or city in which you live;</para>
+<para><guilabel>Location:</guilabel>The town or city in which you live;</para>
 </listitem>
 <listitem>
-<para
-><guilabel
->Organisation:</guilabel
->The organisation you represent (for example, the company you work for);</para>
+<para><guilabel>Organisation:</guilabel>The organisation you represent (for example, the company you work for);</para>
 </listitem>
 <listitem>
-<para
-><guilabel
->Department:</guilabel
->The organisational unit you are in (for example, "Logistics");</para
-> 
+<para><guilabel>Department:</guilabel>The organisational unit you are in (for example, "Logistics");</para> 
 </listitem>
 <listitem>
-<para
-><guilabel
->Country code:</guilabel
->The two letter code for the country in which you are living (for example, "UK");</para>
+<para><guilabel>Country code:</guilabel>The two letter code for the country in which you are living (for example, "UK");</para>
 </listitem>
 <listitem>
-<para
-><guilabel
->Email address:</guilabel
->Your email address; be sure to type this in correctly&mdash;this will be the address people will be sending mail to when they use your certificate.</para>
+<para><guilabel>Email address:</guilabel>Your email address; be sure to type this in correctly&mdash;this will be the address people will be sending mail to when they use your certificate.</para>
 </listitem>
 </itemizedlist>
-</para
-><para
->The next step in the wizard is to select whether to store the certificate in a file or send it directly to a CA. You will have to specify the filename or email address to send the certificate request to. </para
-></sect1>
+</para><para>The next step in the wizard is to select whether to store the certificate in a file or send it directly to a CA. You will have to specify the filename or email address to send the certificate request to. </para></sect1>
 
 
-<sect1 id="functions-keybox-management"
-><title
->Keybox Management</title>
+<sect1 id="functions-keybox-management"><title>Keybox Management</title>
 
-<para
->In addition to <link linkend="functions-view"
->list and validate</link
->, <link linkend="functions-search"
->search and import</link
-> certificates and <link linkend="functions-newkey"
->creating new ones</link
->, &kleopatra; also has some less often used functions that help you manage your local keybox.</para>
+<para>In addition to <link linkend="functions-view">list and validate</link>, <link linkend="functions-search">search and import</link> certificates and <link linkend="functions-newkey">creating new ones</link>, &kleopatra; also has some less often used functions that help you manage your local keybox.</para>
 
-<para
->These functions include deleting certificates from the local keybox with <xref linkend="certificates-delete"/>, as well as manual handling of CRLs (<xref linkend="certificates-refresh-crls"/>, <xref linkend="crls-clear-crl-cache"/>, <xref linkend="crls-dump-crl-cache"/>).</para>
+<para>These functions include deleting certificates from the local keybox with <xref linkend="certificates-delete"/>, as well as manual handling of CRLs (<xref linkend="certificates-refresh-crls"/>, <xref linkend="crls-clear-crl-cache"/>, <xref linkend="crls-dump-crl-cache"/>).</para>
 
 </sect1>
 
 </chapter>
 
-<chapter id="menu"
-><title
->Menu Reference</title>
+<chapter id="menu"><title>Menu Reference</title>
 
-<sect1 id="menufile"
-><title
->File Menu</title>
+<sect1 id="menufile"><title>File Menu</title>
 
 <variablelist>
 
 <varlistentry id="file-new-key-pair">
-<term
->&file-new-key-pair;</term>
+<term>&file-new-key-pair;</term>
 
 <listitem>
-<para
-><action
->Creates a new key pair (public and private)</action
-> and allows to send the public part to a certification authority (<acronym
->CA</acronym
->) for signing. The resulting certificate is then sent back to you, or stored in an LDAP server for you to download into your local keybox, where you can use it to sign and decrypt mails.</para>
-
-<para
->This mode of operation is called <quote
->decentralised key generation</quote
->, since all keys are created locally. &kleopatra; (and &gpgsm;) do not support <quote
->centralised key generation</quote
-> directly, but you can import the public/secret key bundle that you receive from the CA in PKCS#12 format via &file-import-certificates;.</para>
+<para><action>Creates a new key pair (public and private)</action> and allows to send the public part to a certification authority (<acronym>CA</acronym>) for signing. The resulting certificate is then sent back to you, or stored in an LDAP server for you to download into your local keybox, where you can use it to sign and decrypt mails.</para>
+
+<para>This mode of operation is called <quote>decentralised key generation</quote>, since all keys are created locally. &kleopatra; (and &gpgsm;) do not support <quote>centralised key generation</quote> directly, but you can import the public/secret key bundle that you receive from the CA in PKCS#12 format via &file-import-certificates;.</para>
 </listitem>
 </varlistentry>
 
 
 <varlistentry id="file-export-certificates">
-<term
->&file-export-certificates;</term>
+<term>&file-export-certificates;</term>
 
 <listitem>
-<para
-><action
->Exports the selected certificates</action
-> into a file.</para>
-
-<note
-><para
->This exports only the public keys, even if the secret key is available. Use &file-export-secret-key; to export both public and secret keys into a file, but note that this is almost always a bad idea.</para
-></note>
+<para><action>Exports the selected certificates</action> into a file.</para>
+
+<note><para>This exports only the public keys, even if the secret key is available. Use &file-export-secret-key; to export both public and secret keys into a file, but note that this is almost always a bad idea.</para></note>
 </listitem>
 </varlistentry>
 
 
 <varlistentry id="file-export-secret-key">
-<term
->&file-export-secret-key;</term>
+<term>&file-export-secret-key;</term>
 
 <listitem>
-<para
-><action
->Exports both the public and the secret key to a (PKCS#12) file.</action
-></para>
-
-<warning
-><para
->It should rarely be necessary to use this function, and if it is, it should be carefully planned. Planning the migration of a secret key involves choice of transport media and secure deletion of the key data on the old machine, as well as the transport medium, among other things.</para
-></warning>
+<para><action>Exports both the public and the secret key to a (PKCS#12) file.</action></para>
+
+<warning><para>It should rarely be necessary to use this function, and if it is, it should be carefully planned. Planning the migration of a secret key involves choice of transport media and secure deletion of the key data on the old machine, as well as the transport medium, among other things.</para></warning>
 </listitem>
 </varlistentry>
 
 
 <varlistentry id="file-import-certificates">
-<term
->&file-import-certificates;</term>
+<term>&file-import-certificates;</term>
 
 <listitem>
-<para
-><action
->Imports certificates and/or secret keys from files into the local keybox.</action
-></para>
+<para><action>Imports certificates and/or secret keys from files into the local keybox.</action></para>
 
-<para
->The format of the certificate file must be supported by &gpgsm;. Please refer to the &gpgsm; manual for a list of supported formats.</para>
+<para>The format of the certificate file must be supported by &gpgsm;. Please refer to the &gpgsm; manual for a list of supported formats.</para>
 </listitem>
 </varlistentry>
 
 
 <varlistentry id="file-import-crls">
-<term
->&file-import-crls;</term>
+<term>&file-import-crls;</term>
 
 <listitem>
-<para
-><action
->Lets you manually import CRLs from files.</action
-></para>
-
-<para
->Normally, Certificate Revocation Lists (CRLs) are handled transparently by the backend, but it can sometimes be useful to import a CRL manually into the local CRL cache.</para>
-
-<note
-><para
->For CRL import to work, the <application
->dirmngr</application
-> tool must be in the search <varname
->PATH</varname
->. If this menu item is disabled, you should contact the system administrator and ask them to install <application
->dirmngr</application
->.</para
-></note>
-
-<para
->You can view the contents of the local CRL cache from the menu item &crls-dump-crl-cache;. This will display a dialogue with information about the CRLs in the cache and the fingerprints of the certificates in each CRL. </para>
+<para><action>Lets you manually import CRLs from files.</action></para>
+
+<para>Normally, Certificate Revocation Lists (CRLs) are handled transparently by the backend, but it can sometimes be useful to import a CRL manually into the local CRL cache.</para>
+
+<note><para>For CRL import to work, the <application>dirmngr</application> tool must be in the search <varname>PATH</varname>. If this menu item is disabled, you should contact the system administrator and ask them to install <application>dirmngr</application>.</para></note>
+
+<para>You can view the contents of the local CRL cache from the menu item &crls-dump-crl-cache;. This will display a dialogue with information about the CRLs in the cache and the fingerprints of the certificates in each CRL. </para>
 </listitem>
 </varlistentry>
 
 
 <varlistentry id="file-quit">
-<term
->&file-quit;</term>
+<term>&file-quit;</term>
 
 <listitem>
-<para
-><action
->Terminates &kleopatra;.</action
-></para>
+<para><action>Terminates &kleopatra;.</action></para>
 </listitem>
 </varlistentry>
 
 </variablelist>
 
-</sect1
-> <!-- File Menu -->
+</sect1> <!-- File Menu -->
 
 
 
-<sect1 id="menuview"
-><title
->View Menu</title>
+<sect1 id="menuview"><title>View Menu</title>
 
 <variablelist>
 
 <varlistentry id="view-redisplay">
-<term
->&view-redisplay;</term>
+<term>&view-redisplay;</term>
 
 <listitem>
-<para
-><action
->Redisplays the selected certificates or refreshes the certificate list.</action
-></para>
+<para><action>Redisplays the selected certificates or refreshes the certificate list.</action></para>
 
-<para
->If there are selected certificates, the refresh operation is restricted to those selected entries.</para>
+<para>If there are selected certificates, the refresh operation is restricted to those selected entries.</para>
 
-<para
->If a query result (either remote or local) is currently displayed, the query is re-issued and the new results are displayed in place of the old ones.</para>
+<para>If a query result (either remote or local) is currently displayed, the query is re-issued and the new results are displayed in place of the old ones.</para>
 
-<para
->If no query has been performed, the whole keybox contents is re-fetched and re-displayed.</para>
+<para>If no query has been performed, the whole keybox contents is re-fetched and re-displayed.</para>
 
-<para
->You can use this if you have changed the contents of the keybox by other means than &kleopatra; (&eg; by using &gpgsm;'s command line interface).</para>
+<para>You can use this if you have changed the contents of the keybox by other means than &kleopatra; (&eg; by using &gpgsm;'s command line interface).</para>
 </listitem>
 </varlistentry>
 
 
 <varlistentry id="view-stop-operation">
-<term
->&view-stop-operation;</term>
+<term>&view-stop-operation;</term>
 
 <listitem>
-<para
-><action
->Stops (cancels) all pending operations,</action
-> &eg; a search or a download.</para>
-
-<note
-><para
->Depending on the server used, cancelling a remote search can block &kleopatra; for a few seconds while waiting for the backend to complete the procedure. This is normal and expected behaviour.</para
-></note>
+<para><action>Stops (cancels) all pending operations,</action> &eg; a search or a download.</para>
+
+<note><para>Depending on the server used, cancelling a remote search can block &kleopatra; for a few seconds while waiting for the backend to complete the procedure. This is normal and expected behaviour.</para></note>
 </listitem>
 </varlistentry>
 
 
 <varlistentry id="view-certificate-details">
-<term
->&view-certificate-details;</term>
+<term>&view-certificate-details;</term>
 
 <listitem>
-<para
-><action
->Shows the details of the currently selected certificate.</action
-></para>
+<para><action>Shows the details of the currently selected certificate.</action></para>
 
-<para
->This function is also available by double-clicking the corresponding item in the list view directly.</para>
+<para>This function is also available by double-clicking the corresponding item in the list view directly.</para>
 
 <!--FIXME: link to the dialog's help, but where do we put _that_?-->
 </listitem>
@@ -800,64 +321,43 @@
 
 
 <varlistentry id="view-hierarchical-key-list">
-<term
->&view-hierarchical-key-list;</term>
+<term>&view-hierarchical-key-list;</term>
 
 <listitem>
-<para
-><action
->Toggles between hierarchical and flat keylist mode. </action
-></para>
-
-<para
->In hierarchical mode, certificates are arranged in issuer/subject relation, so it is easy to see to which certification hierarchy a given certificate belongs, but a given certificate is harder to find initially (though you can of course use the <link linkend="functions-search"
->search bar</link
->).</para>
-
-<para
->In flat mode, all certificates are displayed in a flat list, sorted alphabetically. In this mode, a given certificate is easy to find, but it is not directly clear which root certificate it belongs to.</para>
+<para><action>Toggles between hierarchical and flat keylist mode. </action></para>
+
+<para>In hierarchical mode, certificates are arranged in issuer/subject relation, so it is easy to see to which certification hierarchy a given certificate belongs, but a given certificate is harder to find initially (though you can of course use the <link linkend="functions-search">search bar</link>).</para>
+
+<para>In flat mode, all certificates are displayed in a flat list, sorted alphabetically. In this mode, a given certificate is easy to find, but it is not directly clear which root certificate it belongs to.</para>
 </listitem>
 </varlistentry>
 
 
 <varlistentry id="view-expand-all">
-<term
->&view-expand-all;</term>
+<term>&view-expand-all;</term>
 
 <listitem>
-<para
->(This function is only available when <xref linkend="view-hierarchical-key-list"/> is on.)</para>
+<para>(This function is only available when <xref linkend="view-hierarchical-key-list"/> is on.)</para>
 
-<para
-><action
->Expands all list items in the certificate list view,</action
-> &ie; makes all items visible.</para>
+<para><action>Expands all list items in the certificate list view,</action> &ie; makes all items visible.</para>
 
-<para
->This is the default when entering hierarchical keylist mode.</para>
+<para>This is the default when entering hierarchical keylist mode.</para>
 
-<para
->You can still expand and collapse each individual item by itself, of course.</para>
+<para>You can still expand and collapse each individual item by itself, of course.</para>
 </listitem>
 </varlistentry>
 
 
 
 <varlistentry id="view-collapse-all">
-<term
->&view-collapse-all;</term>
+<term>&view-collapse-all;</term>
 
 <listitem>
-<para
->(This function is only available when <xref linkend="view-hierarchical-key-list"/> is on.)</para>
+<para>(This function is only available when <xref linkend="view-hierarchical-key-list"/> is on.)</para>
 
-<para
-><action
->Collapses all list items in the certificate list view,</action
-> &ie; hides all but the top-level items.</para>
+<para><action>Collapses all list items in the certificate list view,</action> &ie; hides all but the top-level items.</para>
 
-<para
->You can still expand and collapse each individual item by itself, of course.</para>
+<para>You can still expand and collapse each individual item by itself, of course.</para>
 </listitem>
 </varlistentry>
 
@@ -865,98 +365,59 @@
 
 </sect1>
 
-<sect1 id="menucertificates"
-><title
->Certificates Menu</title>
+<sect1 id="menucertificates"><title>Certificates Menu</title>
 
 <variablelist>
 
 <varlistentry id="certificates-validate">
-<term
->&certificates-validate;</term>
+<term>&certificates-validate;</term>
 
 <listitem>
-<para
-><action
->Validates selected (or all) keys.</action
-></para>
-
-<para
->This is similar to <xref linkend="view-redisplay"/>, but performs a validation of the (selected) keys. Validation here means that all relevant CRLs are fetched, and the certificate chain is checked for correctness. As a result, invalid or expired keys will be marked according to your colour and font preferences set in the <link linkend="configuration-appearance"
-><guilabel
->Appearance</guilabel
-> page</link
-> of &kleopatra;'s <link linkend="configuration"
->configure dialogue</link
->.</para>
-
-<warning
-><para
->You can only rely on information from validated keys, and, since any of them may be revoked at any time, even validation is only ever a snapshot of the current state of the local keyring. This is why the backend normally performs such checks whenever the keys are used (&eg; for signing, signature verification, encryption or decryption).</para
-></warning>
+<para><action>Validates selected (or all) keys.</action></para>
+
+<para>This is similar to <xref linkend="view-redisplay"/>, but performs a validation of the (selected) keys. Validation here means that all relevant CRLs are fetched, and the certificate chain is checked for correctness. As a result, invalid or expired keys will be marked according to your colour and font preferences set in the <link linkend="configuration-appearance"><guilabel>Appearance</guilabel> page</link> of &kleopatra;'s <link linkend="configuration">configure dialogue</link>.</para>
+
+<warning><para>You can only rely on information from validated keys, and, since any of them may be revoked at any time, even validation is only ever a snapshot of the current state of the local keyring. This is why the backend normally performs such checks whenever the keys are used (&eg; for signing, signature verification, encryption or decryption).</para></warning>
 </listitem>
 </varlistentry>
 
 
 
 <varlistentry id="certificates-refresh-crls">
-<term
->&certificates-refresh-crls;</term>
+<term>&certificates-refresh-crls;</term>
 
 <listitem>
-<para
-><action
->Fetches the current CRLs for all selected keys,</action
-> even though they would normally not be fetched when using the key.</para>
-
-<para
->This function only has an effect on certificates which define a CRL distribution point. Depending on the backend used, certificates configured to perform checks using OCSP will not be updated.</para>
-
-<para
->You may use this &eg; if you have sideband knowledge that a key has been revoked, and you want the backend to reflect this <emphasis
->now</emphasis
-> instead of relying on this to automatically happen at the next scheduled CRL update.</para>
-
-<warning
-><para
->Excessive use of this function might put a high load on your provider's or company's network, since CRLs of large organisations can be surprisingly big (several megabytes are not uncommon).</para>
-
-<para
->Use this function scarcely.</para
-></warning>
+<para><action>Fetches the current CRLs for all selected keys,</action> even though they would normally not be fetched when using the key.</para>
+
+<para>This function only has an effect on certificates which define a CRL distribution point. Depending on the backend used, certificates configured to perform checks using OCSP will not be updated.</para>
+
+<para>You may use this &eg; if you have sideband knowledge that a key has been revoked, and you want the backend to reflect this <emphasis>now</emphasis> instead of relying on this to automatically happen at the next scheduled CRL update.</para>
+
+<warning><para>Excessive use of this function might put a high load on your provider's or company's network, since CRLs of large organisations can be surprisingly big (several megabytes are not uncommon).</para>
+
+<para>Use this function scarcely.</para></warning>
 </listitem>
 </varlistentry>
 
 
 
 <varlistentry id="certificates-delete">
-<term
->&certificates-delete;</term>
+<term>&certificates-delete;</term>
 
 <listitem>
-<para
-><action
->Deletes selected certificate(s)</action
-> from the local keyring.</para>
-
-<para
->Use this function to remove unused keys from your local keybox. However, since certificates are typically attached to signed emails, verifying an email might result in the key just removed to pop back into the local keybox. So it is probably best to avoid using this function as much as possible. When you are lost, use the <link linkend="functions-search"
->search bar</link
-> or the <xref linkend="view-hierarchical-key-list"/> function to regain control over the lot of certificates.</para>
+<para><action>Deletes selected certificate(s)</action> from the local keyring.</para>
+
+<para>Use this function to remove unused keys from your local keybox. However, since certificates are typically attached to signed emails, verifying an email might result in the key just removed to pop back into the local keybox. So it is probably best to avoid using this function as much as possible. When you are lost, use the <link linkend="functions-search">search bar</link> or the <xref linkend="view-hierarchical-key-list"/> function to regain control over the lot of certificates.</para>
 </listitem>
 </varlistentry>
 
 
 
 <varlistentry id="certificates-download">
-<term
->&certificates-download;</term>
+<term>&certificates-download;</term>
 
 <listitem>
-<para
-><action
->Downloads the selected certificate(s) from the LDAP to the local keybox.</action
-></para>
+<para><action>Downloads the selected certificate(s) from the LDAP to the local keybox.</action></para>
 </listitem>
 </varlistentry>
 
@@ -966,36 +427,25 @@
 
 
 
-<sect1 id="menucrls"
-><title
->CRLs Menu</title>
+<sect1 id="menucrls"><title>CRLs Menu</title>
 
 <variablelist>
 
 <varlistentry id="crls-clear-crl-cache">
-<term
->&crls-clear-crl-cache;</term>
+<term>&crls-clear-crl-cache;</term>
 
 <listitem>
-<para
-><action
->Clears the &gpgsm; CRL cache.</action
-></para>
+<para><action>Clears the &gpgsm; CRL cache.</action></para>
 
-<para
->You probably never need this. You can force a refresh of the CRL cache by selecting all certificates and using <xref linkend="certificates-refresh-crls"/> instead.</para>
+<para>You probably never need this. You can force a refresh of the CRL cache by selecting all certificates and using <xref linkend="certificates-refresh-crls"/> instead.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry id="crls-dump-crl-cache">
-<term
->&crls-dump-crl-cache;</term>
+<term>&crls-dump-crl-cache;</term>
 
 <listitem>
-<para
-><action
->Shows the detailed contents of the &gpgsm; CRL cache.</action
-></para>
+<para><action>Shows the detailed contents of the &gpgsm; CRL cache.</action></para>
 </listitem>
 </varlistentry>
 
@@ -1003,23 +453,15 @@
 
 </sect1>
 
-<sect1 id="menutools"
-><title
->Tools Menu</title>
+<sect1 id="menutools"><title>Tools Menu</title>
 
 <variablelist>
 
 <varlistentry id="tools-gnupg-log-viewer">
-<term
->&tools-gnupg-log-viewer;</term>
+<term>&tools-gnupg-log-viewer;</term>
 
 <listitem>
-<para
-><action
->Starts <ulink url="help:/kwatchgnupg/index.html"
->&kwatchgnupg;</ulink
-></action
-></para>
+<para><action>Starts <ulink url="help:/kwatchgnupg/index.html">&kwatchgnupg;</ulink></action></para>
 </listitem>
 </varlistentry>
 
@@ -1027,63 +469,43 @@
 
 </sect1>
 
-<sect1 id="menusettings"
-><title
->Settings Menu</title>
+<sect1 id="menusettings"><title>Settings Menu</title>
 
 <variablelist>
 
 <varlistentry id="settings-show-statusbar">
-<term
->&settings-show-statusbar;</term>
+<term>&settings-show-statusbar;</term>
 
 <listitem>
-<para
-><action
->Toggles the visibility of the bottom status bar.</action
-></para>
+<para><action>Toggles the visibility of the bottom status bar.</action></para>
 </listitem>
 </varlistentry>
 
 <varlistentry id="settings-configure-shortcuts">
-<term
->&settings-configure-shortcuts;</term>
+<term>&settings-configure-shortcuts;</term>
 
 <listitem>
-<para
-><action
->Opens the standard &kde; shortcut configuration dialogue, where you can assign and re-assign keyboard shortcuts for all menu items.</action
-></para>
+<para><action>Opens the standard &kde; shortcut configuration dialogue, where you can assign and re-assign keyboard shortcuts for all menu items.</action></para>
 </listitem>
 </varlistentry>
 
 <varlistentry id="settings-configure-kleopatra">
-<term
->&settings-configure-kleopatra;</term>
+<term>&settings-configure-kleopatra;</term>
 
 <listitem>
-<para
-><action
->Opens &kleopatra;'s configure dialogue.</action
-></para>
+<para><action>Opens &kleopatra;'s configure dialogue.</action></para>
 
-<para
->See <xref linkend="configuration"/> for more details.</para>
+<para>See <xref linkend="configuration"/> for more details.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry id="settings-configure-gpgme-backend">
-<term
->&settings-configure-gpgme-backend;</term>
+<term>&settings-configure-gpgme-backend;</term>
 
 <listitem>
-<para
-><action
->Opens a dialogue that allows you to configure every aspect of &gpgsm; and other backend modules.</action
-></para>
+<para><action>Opens a dialogue that allows you to configure every aspect of &gpgsm; and other backend modules.</action></para>
 
-<para
->This dialogue is dynamically built from the output of the &gpgconf; utility and may thus change when backend modules are updated.</para>
+<para>This dialogue is dynamically built from the output of the &gpgconf; utility and may thus change when backend modules are updated.</para>
 </listitem>
 </varlistentry>
 
@@ -1091,70 +513,43 @@
 
 </sect1>
 
-<sect1 id="menuhelp"
-><title
->Help Menu</title>
+<sect1 id="menuhelp"><title>Help Menu</title>
 
 
-<para
->The <guimenu
->Help</guimenu
-> menu contains the standard &kde; help menu.</para>
+<para>The <guimenu>Help</guimenu> menu contains the standard &kde; help menu.</para>
 &help.menu.documentation; </sect1>
 
 </chapter>
 
-<chapter id="commandline-options"
-><title
->Command Line Options Reference</title>
+<chapter id="commandline-options"><title>Command Line Options Reference</title>
 
-<para
->Only the options specific to &kleopatra; are listed here. As with all &kde; applications, you can get a complete list of options by issuing the command <userinput
-><command
->kleopatra <option
->--help</option
-></command
-></userinput
->.</para>
+<para>Only the options specific to &kleopatra; are listed here. As with all &kde; applications, you can get a complete list of options by issuing the command <userinput><command>kleopatra <option>--help</option></command></userinput>.</para>
 
 <variablelist>
 
 <varlistentry id="commandline-option-external">
-<term
->&commandline-option-external;</term>
+<term>&commandline-option-external;</term>
 
 <listitem>
-<para
-><action
->Specifies that &commandline-option-query; shall search remotely instead of in the local keybox.</action
-></para>
+<para><action>Specifies that &commandline-option-query; shall search remotely instead of in the local keybox.</action></para>
 </listitem>
 </varlistentry>
 
 <varlistentry id="commandline-option-query">
-<term
->&commandline-option-query;</term>
+<term>&commandline-option-query;</term>
 
 <listitem>
-<para
-><action
->Specifies that &kleopatra; shall start with the given query string instead of listing the complete local keybox.</action
-></para>
+<para><action>Specifies that &kleopatra; shall start with the given query string instead of listing the complete local keybox.</action></para>
 </listitem>
 </varlistentry>
 
 <varlistentry id="commandline-option-import-certificate">
-<term
->&commandline-option-import-certificate;</term>
+<term>&commandline-option-import-certificate;</term>
 
 <listitem>
-<para
-><action
->Specifies a file or URL from which to import certificates (or secret keys) from.</action
-></para>
+<para><action>Specifies a file or URL from which to import certificates (or secret keys) from.</action></para>
 
-<para
->This is the command line equivalent of <xref linkend="file-import-certificates"/>.</para>
+<para>This is the command line equivalent of <xref linkend="file-import-certificates"/>.</para>
 </listitem>
 </varlistentry>
 
@@ -1162,304 +557,111 @@
 
 </chapter>
 
-<chapter id="configuration"
-><title
->Configuring &kleopatra;</title>
-
-<para
->&kleopatra;'s configure dialogue can be accessed via <xref linkend="settings-configure-kleopatra"/>.</para>
-
-<para
->Each of its pages is described in the sections below.</para>
-
-<sect1 id="configuration-directory-services"
-><title
->Configuring Directory Services</title>
-
-<para
->On this page, you can configure which LDAP servers to use for certificate searches. You can also configure their order, as well as some selected LDAP-related settings from the dynamic backend configuration dialogue, available via <xref linkend="settings-configure-gpgme-backend"/>.</para>
-
-<para
->To add a new server, click on the <guilabel
->Add Service...</guilabel
-> button. In the dialogue that appears, you can set the <guilabel
->Server name</guilabel
->, the <guilabel
->Port</guilabel
-> (preset to the default LDAP port), the <guilabel
->Base DN</guilabel
-> (sometimes referred to as the search root or search base), and the usual <guilabel
->User name</guilabel
-> and <guilabel
->Password</guilabel
->, both of which are only needed if the server requires authentication. Clicking <guilabel
->OK</guilabel
-> adds the server details to the list of servers, while <guilabel
->Cancel</guilabel
-> dismisses the input.</para>
-
-<para
->To remove a server from the search list, select it in the list, then press the <guilabel
->Remove Service</guilabel
-> button.</para>
-
-<para
->To change the relative search order of servers, select one of them and move it up or down with the arrow buttons right next to the list.</para>
-
-<para
->To set the LDAP timeout, &ie; the maximum time the backend will wait for a server to respond, simply use the corresponding input field labelled <guilabel
->LDAP timeout</guilabel
->.</para>
-
-<para
->If one of your servers has a large database, so that even reasonable searches like <userinput
->Smith</userinput
-> hit the <guilabel
->maximum number of items returned by query</guilabel
->, you might want to increase this limit. You can find out easily if you hit the limit during a search, since a dialogue box will pop up in that case, telling you that the results have been truncated.</para>
-
-<note
-><para
->Some servers may impose their own limits on the number of items returned from a query. In this case, increasing the limit here will not result in more returned items.</para
-></note>
+<chapter id="configuration"><title>Configuring &kleopatra;</title>
+
+<para>&kleopatra;'s configure dialogue can be accessed via <xref linkend="settings-configure-kleopatra"/>.</para>
+
+<para>Each of its pages is described in the sections below.</para>
+
+<sect1 id="configuration-directory-services"><title>Configuring Directory Services</title>
+
+<para>On this page, you can configure which LDAP servers to use for certificate searches. You can also configure their order, as well as some selected LDAP-related settings from the dynamic backend configuration dialogue, available via <xref linkend="settings-configure-gpgme-backend"/>.</para>
+
+<para>To add a new server, click on the <guilabel>Add Service...</guilabel> button. In the dialogue that appears, you can set the <guilabel>Server name</guilabel>, the <guilabel>Port</guilabel> (preset to the default LDAP port), the <guilabel>Base DN</guilabel> (sometimes referred to as the search root or search base), and the usual <guilabel>User name</guilabel> and <guilabel>Password</guilabel>, both of which are only needed if the server requires authentication. Clicking <guilabel>OK</guilabel> adds the server details to the list of servers, while <guilabel>Cancel</guilabel> dismisses the input.</para>
+
+<para>To remove a server from the search list, select it in the list, then press the <guilabel>Remove Service</guilabel> button.</para>
+
+<para>To change the relative search order of servers, select one of them and move it up or down with the arrow buttons right next to the list.</para>
+
+<para>To set the LDAP timeout, &ie; the maximum time the backend will wait for a server to respond, simply use the corresponding input field labelled <guilabel>LDAP timeout</guilabel>.</para>
+
+<para>If one of your servers has a large database, so that even reasonable searches like <userinput>Smith</userinput> hit the <guilabel>maximum number of items returned by query</guilabel>, you might want to increase this limit. You can find out easily if you hit the limit during a search, since a dialogue box will pop up in that case, telling you that the results have been truncated.</para>
+
+<note><para>Some servers may impose their own limits on the number of items returned from a query. In this case, increasing the limit here will not result in more returned items.</para></note>
 
 </sect1>
 
-<sect1 id="configuration-appearance"
-><title
->Configuring Visual Appearance</title>
+<sect1 id="configuration-appearance"><title>Configuring Visual Appearance</title>
 
-<para
->&kleopatra; allows you to customise the appearance of (validated) keys in the list view. This includes the foreground (text) and background colours, as well as the font.</para>
+<para>&kleopatra; allows you to customise the appearance of (validated) keys in the list view. This includes the foreground (text) and background colours, as well as the font.</para>
 
-<para
->Each <guilabel
->Key Category</guilabel
-> on the left is assigned a set of colours and a font in which keys belonging to that category are displayed. The category list also acts as a preview of the settings. Categories can be freely defined by the administrator or the power user, see <xref linkend="admin-key-filters"/> in <xref linkend="admin"/>.</para>
+<para>Each <guilabel>Key Category</guilabel> on the left is assigned a set of colours and a font in which keys belonging to that category are displayed. The category list also acts as a preview of the settings. Categories can be freely defined by the administrator or the power user, see <xref linkend="admin-key-filters"/> in <xref linkend="admin"/>.</para>
 
-<para
->To change the text (foreground) colour of a category, select it in the list, and press the <guilabel
->Set Text Colour...</guilabel
-> button. The standard &kde; colour selection dialogue will appear where you can select or create a new colour.</para>
+<para>To change the text (foreground) colour of a category, select it in the list, and press the <guilabel>Set Text Colour...</guilabel> button. The standard &kde; colour selection dialogue will appear where you can select or create a new colour.</para>
 
-<para
->Changing the background colour is done in the same way, just press <guilabel
->Set Background Colour...</guilabel
-> instead.</para>
+<para>Changing the background colour is done in the same way, just press <guilabel>Set Background Colour...</guilabel> instead.</para>
 
-<para
->To change the font, you basically have two options:</para>
+<para>To change the font, you basically have two options:</para>
 
 <orderedlist>
-<listitem
-><para
->Modify the standard font, used for all list views in &kde;</para
-></listitem>
-<listitem
-><para
->Use a custom font.</para
-></listitem>
+<listitem><para>Modify the standard font, used for all list views in &kde;</para></listitem>
+<listitem><para>Use a custom font.</para></listitem>
 </orderedlist>
 
-<para
->The first option has the advantage that the font will follow whichever style you choose &kde;-wide, whereas the latter gives you full control over the font to use. The choice is yours.</para>
+<para>The first option has the advantage that the font will follow whichever style you choose &kde;-wide, whereas the latter gives you full control over the font to use. The choice is yours.</para>
 
-<para
->To use the modified standard font, select the category in the list, and tick or un-tick the font modifiers <guilabel
->Italic</guilabel
->, <guilabel
->Bold</guilabel
->, and/or <guilabel
->Strikeout</guilabel
->. You can immediately see the effect on the font in the category list.</para>
+<para>To use the modified standard font, select the category in the list, and tick or un-tick the font modifiers <guilabel>Italic</guilabel>, <guilabel>Bold</guilabel>, and/or <guilabel>Strikeout</guilabel>. You can immediately see the effect on the font in the category list.</para>
 
-<para
->To use a custom font, press the <guilabel
->Set Font...</guilabel
-> button. The standard &kde; font selection dialogue will appear where you can select the new font. Note that you can still use the font modifiers to change the custom font, just as for modifying the standard font.</para>
+<para>To use a custom font, press the <guilabel>Set Font...</guilabel> button. The standard &kde; font selection dialogue will appear where you can select the new font. Note that you can still use the font modifiers to change the custom font, just as for modifying the standard font.</para>
 
-<para
->To switch back to the standard font, you need to press the <guilabel
->Default Appearance</guilabel
-> button.</para>
+<para>To switch back to the standard font, you need to press the <guilabel>Default Appearance</guilabel> button.</para>
 
 </sect1>
 
-<sect1 id="configuration-dn-order"
-><title
->Configuring the Order DN Attributes are Shown</title>
-
-<para
->Although &dn;s are hierarchical, the order of the individual components (called relative &dn;s (RDNs), or &dn; attributes) is not defined. The order in which the attributes are shown is thus a matter of personal taste or company policy, which is why it is configurable in &kleopatra;.</para>
-
-<note
-><para
->This setting does not only apply to &kleopatra;, but to all applications using &kleopatra; Technology. At the time of this writing, these include KMail, KAddressBook, as well as &kleopatra; itself, of course.</para
-></note>
-
-<para
->This configuration page basically consists of two lists, one for the known attributes (<guilabel
->Available attributes</guilabel
->), and one describing the <guilabel
->Current attribute order</guilabel
->.</para>
-
-<para
->Both lists contain entries described by the short from of the attribute (&eg; <guilabel
->CN</guilabel
->) as well as the spelled-out form (<guilabel
->Common Name</guilabel
->).</para>
-
-<para
->The <guilabel
->Available attributes</guilabel
-> list is always sorted alphabetically, while the <guilabel
->Current attribute order</guilabel
-> list's order reflects the configured &dn; attribute order: the first attribute in the list is also the one displayed first.</para>
-
-<para
->Only attributes explicitly listed in the <guilabel
->Current attribute order</guilabel
-> list are displayed at all. The rest is hidden by default.</para>
-
-<para
->However, if the placeholder entry <guilabel
->_X_</guilabel
-> (<guilabel
->All others</guilabel
->) is in the <quote
->current</quote
-> list, all unlisted attributes (whether known or not), are inserted at the point of <guilabel
->_X_</guilabel
->, in their original relative order.</para>
-
-<para
->A small example will help to make this more clear:</para>
+<sect1 id="configuration-dn-order"><title>Configuring the Order DN Attributes are Shown</title>
+
+<para>Although &dn;s are hierarchical, the order of the individual components (called relative &dn;s (RDNs), or &dn; attributes) is not defined. The order in which the attributes are shown is thus a matter of personal taste or company policy, which is why it is configurable in &kleopatra;.</para>
+
+<note><para>This setting does not only apply to &kleopatra;, but to all applications using &kleopatra; Technology. At the time of this writing, these include KMail, KAddressBook, as well as &kleopatra; itself, of course.</para></note>
+
+<para>This configuration page basically consists of two lists, one for the known attributes (<guilabel>Available attributes</guilabel>), and one describing the <guilabel>Current attribute order</guilabel>.</para>
+
+<para>Both lists contain entries described by the short from of the attribute (&eg; <guilabel>CN</guilabel>) as well as the spelled-out form (<guilabel>Common Name</guilabel>).</para>
+
+<para>The <guilabel>Available attributes</guilabel> list is always sorted alphabetically, while the <guilabel>Current attribute order</guilabel> list's order reflects the configured &dn; attribute order: the first attribute in the list is also the one displayed first.</para>
+
+<para>Only attributes explicitly listed in the <guilabel>Current attribute order</guilabel> list are displayed at all. The rest is hidden by default.</para>
+
+<para>However, if the placeholder entry <guilabel>_X_</guilabel> (<guilabel>All others</guilabel>) is in the <quote>current</quote> list, all unlisted attributes (whether known or not), are inserted at the point of <guilabel>_X_</guilabel>, in their original relative order.</para>
+
+<para>A small example will help to make this more clear:</para>
 
 <informalexample>
-<para
->Given the &dn;</para>
-<blockquote
-> <para
-> O=KDE, C=US, CN=Dave Devel, X-BAR=foo, OU=Kleopatra, X-FOO=bar, </para
-> </blockquote
-> <para
->the default attribute order of <quote
->CN, L, _X_, OU, O, C</quote
-> will produce the following formatted &dn;:</para
-> <blockquote
-> <para
-> CN=Dave Devel, X-BAR=foo, X-FOO=bar, OU=Kleopatra, O=KDE, C=US </para
-> </blockquote
-> <para
->while <quote
->CN, L, OU, O, C</quote
-> will produce</para
-> <blockquote
-> <para
-> CN=Dave Devel, OU=Kleopatra, O=KDE, C=US </para
-> </blockquote
-> </informalexample>
-
-<para
->To add an attribute to the display order list, select it in the <guilabel
->Available attributes</guilabel
-> list, and press the <guilabel
->Add to current attribute order</guilabel
-> button.</para>
-
-<para
->To remove an attribute from the display order list, select it in the <guilabel
->Current attribute order</guilabel
-> list, and press the <guilabel
->Remove from current attribute order</guilabel
-> button.</para>
-
-<para
->To move an attribute to the beginning (end), select it in the <guilabel
->Current attribute order</guilabel
-> list, and press the <guilabel
->Move to top</guilabel
-> (<guilabel
->Move to bottom</guilabel
->) button.</para>
-
-<para
->To move an attribute up (down) one slot only, select it in the <guilabel
->Current attribute order</guilabel
-> list, and press the <guilabel
->Move one up</guilabel
-> (<guilabel
->Move one down</guilabel
->) button.</para>
+<para>Given the &dn;</para>
+<blockquote> <para> O=KDE, C=US, CN=Dave Devel, X-BAR=foo, OU=Kleopatra, X-FOO=bar, </para> </blockquote> <para>the default attribute order of <quote>CN, L, _X_, OU, O, C</quote> will produce the following formatted &dn;:</para> <blockquote> <para> CN=Dave Devel, X-BAR=foo, X-FOO=bar, OU=Kleopatra, O=KDE, C=US </para> </blockquote> <para>while <quote>CN, L, OU, O, C</quote> will produce</para> <blockquote> <para> CN=Dave Devel, OU=Kleopatra, O=KDE, C=US </para> </blockquote> </informalexample>
+
+<para>To add an attribute to the display order list, select it in the <guilabel>Available attributes</guilabel> list, and press the <guilabel>Add to current attribute order</guilabel> button.</para>
+
+<para>To remove an attribute from the display order list, select it in the <guilabel>Current attribute order</guilabel> list, and press the <guilabel>Remove from current attribute order</guilabel> button.</para>
+
+<para>To move an attribute to the beginning (end), select it in the <guilabel>Current attribute order</guilabel> list, and press the <guilabel>Move to top</guilabel> (<guilabel>Move to bottom</guilabel>) button.</para>
+
+<para>To move an attribute up (down) one slot only, select it in the <guilabel>Current attribute order</guilabel> list, and press the <guilabel>Move one up</guilabel> (<guilabel>Move one down</guilabel>) button.</para>
 
 </sect1>
 
 </chapter>
 
-<chapter id="admin"
-><title
->Administrator's Guide</title>
-
-<para
->This Administrator's Guide describes ways to customise &kleopatra; that are not accessible via the GUI, but only via config files.</para>
-
-<para
->It is assumed that the reader is familiar with the technology used for &kde; application configuration, including layout, filesystem location and cascading of &kde; config files, as well as the KIOSK framework.</para>
-
-<sect1 id="admin-certificate-request-wizard"
-><title
->Customisation of the Certificate-Creation Wizard</title>
-
-<para
->&kleopatra; allows you to customise the fields that the user is allowed to enter in order to create their certificate.</para>
-
-<para
->Create a group called <literal
->CertificateCreationWizard</literal
-> in the system-wide <filename
->kleopatrarc</filename
->. If you want a custom order of attributes or if you only want certain items to appear, create a key called <varname
->DNAttributeOrder</varname
->. The argument is one or more of <varname
->CN,SN,GN,L,T,OU,O,PC,C,SP,DC,BC,EMAIL</varname
-> If you want to initialise fields with a certain value, write something like Attribute=value. If you want the attribute to be treated as a required one, append an exclamation mark (e.g. <varname
->CN!,L,OU,O!,C!,EMAIL!</varname
->, which happens to be the default configuration).</para>
-
-<para
->Using the <acronym
->KIOSK</acronym
-> mode modifier <varname
->$e</varname
-> allows to retrieve the values from environment variables or from an evaluated script or binary. If you want to disallow editing of the respective field in addition, use the modifier <varname
->$i</varname
->. If you want to disallow the use <guibutton
->Insert My Address</guibutton
-> button, set <varname
->ShowSetWhoAmI</varname
-> to false.</para>
-
-<tip
-><para
->Due to the nature of the &kde; <acronym
->KIOSK</acronym
-> framework, using the immutable flag (<varname
->$i</varname
->) makes it impossible for the user to override the flag. This is intended behaviour. <varname
->$i</varname
-> and <varname
->$e</varname
-> can be used with all other config keys in &kde; applications as well.</para
-></tip>
-
-<para
->The following example outlines possible customisations:</para>
+<chapter id="admin"><title>Administrator's Guide</title>
+
+<para>This Administrator's Guide describes ways to customise &kleopatra; that are not accessible via the GUI, but only via config files.</para>
+
+<para>It is assumed that the reader is familiar with the technology used for &kde; application configuration, including layout, filesystem location and cascading of &kde; config files, as well as the KIOSK framework.</para>
+
+<sect1 id="admin-certificate-request-wizard"><title>Customisation of the Certificate-Creation Wizard</title>
+
+<para>&kleopatra; allows you to customise the fields that the user is allowed to enter in order to create their certificate.</para>
+
+<para>Create a group called <literal>CertificateCreationWizard</literal> in the system-wide <filename>kleopatrarc</filename>. If you want a custom order of attributes or if you only want certain items to appear, create a key called <varname>DNAttributeOrder</varname>. The argument is one or more of <varname>CN,SN,GN,L,T,OU,O,PC,C,SP,DC,BC,EMAIL</varname> If you want to initialise fields with a certain value, write something like Attribute=value. If you want the attribute to be treated as a required one, append an exclamation mark (e.g. <varname>CN!,L,OU,O!,C!,EMAIL!</varname>, which happens to be the default configuration).</para>
+
+<para>Using the <acronym>KIOSK</acronym> mode modifier <varname>$e</varname> allows to retrieve the values from environment variables or from an evaluated script or binary. If you want to disallow editing of the respective field in addition, use the modifier <varname>$i</varname>. If you want to disallow the use <guibutton>Insert My Address</guibutton> button, set <varname>ShowSetWhoAmI</varname> to false.</para>
+
+<tip><para>Due to the nature of the &kde; <acronym>KIOSK</acronym> framework, using the immutable flag (<varname>$i</varname>) makes it impossible for the user to override the flag. This is intended behaviour. <varname>$i</varname> and <varname>$e</varname> can be used with all other config keys in &kde; applications as well.</para></tip>
+
+<para>The following example outlines possible customisations:</para>
 
 <para>
-<programlisting
->[CertificateCreationWizard] 
+<programlisting>[CertificateCreationWizard] 
 ;Disallow to copy personal data from the addressbook, do not allow local override
 ShowSetWhoAmI[$i]=false
 
@@ -1481,394 +683,175 @@ C=DE
 
     <sect1 id="admin-key-filters">
 
-      <title
->Creating and Editing Key Categories </title>
-
-      <para
->&kleopatra; allows the user to configure the <link linkend="configuration-appearance"
->visual appearance</link
-> of keys based on a concept called <guilabel
->Key Categories</guilabel
->. This section describes how you can edit the available categories and add new ones. </para>
-
-      <para
->When trying to find the category a key belongs to, &kleopatra; tries to match the key to a sequence of key filters, configured in the <filename
->libkleopatrarc</filename
->. The first one to match defines the category. </para>
-
-      <para
->Each key filter is defined in a config group named <literal
->Key Filter #<replaceable
->n</replaceable
-></literal
->, where <replaceable
->n</replaceable
-> is a number, starting from <literal
->0</literal
->. </para>
-
-      <para
->The only mandatory key in a <literal
->Key Filter #<replaceable
->n</replaceable
-></literal
-> group is <varname
->Name</varname
->, containing the name of the category as displayed in the <link linkend="configuration-appearance"
->config dialogue</link
->. </para>
-
-      <para
-><xref linkend="table-key-filters-appearance"/> lists all keys that define the display properties of keys belonging to that category (&ie; those keys that can be adjusted in the <link linkend="configuration-appearance"
->config dialogue</link
->), whereas <xref linkend="table-key-filters-criteria"/> lists all keys that define the criteria the filter matches keys against. </para>
+      <title>Creating and Editing Key Categories </title>
+
+      <para>&kleopatra; allows the user to configure the <link linkend="configuration-appearance">visual appearance</link> of keys based on a concept called <guilabel>Key Categories</guilabel>. This section describes how you can edit the available categories and add new ones. </para>
+
+      <para>When trying to find the category a key belongs to, &kleopatra; tries to match the key to a sequence of key filters, configured in the <filename>libkleopatrarc</filename>. The first one to match defines the category. </para>
+
+      <para>Each key filter is defined in a config group named <literal>Key Filter #<replaceable>n</replaceable></literal>, where <replaceable>n</replaceable> is a number, starting from <literal>0</literal>. </para>
+
+      <para>The only mandatory key in a <literal>Key Filter #<replaceable>n</replaceable></literal> group is <varname>Name</varname>, containing the name of the category as displayed in the <link linkend="configuration-appearance">config dialogue</link>. </para>
+
+      <para><xref linkend="table-key-filters-appearance"/> lists all keys that define the display properties of keys belonging to that category (&ie; those keys that can be adjusted in the <link linkend="configuration-appearance">config dialogue</link>), whereas <xref linkend="table-key-filters-criteria"/> lists all keys that define the criteria the filter matches keys against. </para>
 
       <table id="table-key-filters-appearance">
-	<title
->Key-Filter Configuration Keys Defining Display Properties</title>
+	<title>Key-Filter Configuration Keys Defining Display Properties</title>
 	<tgroup cols="3">
 	  <colspec colnum="2" align="center"/>
 	  <thead>
 	    <row>
-	      <entry
->Config Key</entry>
-	      <entry
->Type</entry>
-	      <entry
->Description</entry>
+	      <entry>Config Key</entry>
+	      <entry>Type</entry>
+	      <entry>Description</entry>
 	    </row>
 	  </thead>
 	  <!--tfoot/-->
 	  <tbody>
 	    <row>
-	      <entry
-><varname
->background-color</varname
-></entry>
-	      <entry
->color</entry>
-	      <entry
->The background colour to use. If missing, defaults to whichever background colour is defined globally for list views. </entry>
+	      <entry><varname>background-color</varname></entry>
+	      <entry>color</entry>
+	      <entry>The background colour to use. If missing, defaults to whichever background colour is defined globally for list views. </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->foreground-color</varname
-></entry>
-	      <entry
->color</entry>
-	      <entry
->The foreground colour to use. If missing, defaults to whichever foreground colour is defined globally for list views. </entry>
+	      <entry><varname>foreground-color</varname></entry>
+	      <entry>color</entry>
+	      <entry>The foreground colour to use. If missing, defaults to whichever foreground colour is defined globally for list views. </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->font</varname
-></entry>
-	      <entry
->font</entry>
-	      <entry
->The custom font to use. The font will be scaled to the size configured for list views, and any font attributes (see below) will be applied. </entry>
+	      <entry><varname>font</varname></entry>
+	      <entry>font</entry>
+	      <entry>The custom font to use. The font will be scaled to the size configured for list views, and any font attributes (see below) will be applied. </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->font-bold</varname
-></entry>
-	      <entry
->boolean</entry>
-	      <entry
->If set to <literal
->true</literal
-> and <varname
->font</varname
-> is not set, uses the default list view font with bold font style added (if available). Ignored if <varname
->font</varname
-> is also present. </entry>
+	      <entry><varname>font-bold</varname></entry>
+	      <entry>boolean</entry>
+	      <entry>If set to <literal>true</literal> and <varname>font</varname> is not set, uses the default list view font with bold font style added (if available). Ignored if <varname>font</varname> is also present. </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->font-italic</varname
-></entry>
-	      <entry
->boolean</entry>
-	      <entry
->Analogous to <varname
->font-bold</varname
->, but for italic font style instead of bold. </entry>
+	      <entry><varname>font-italic</varname></entry>
+	      <entry>boolean</entry>
+	      <entry>Analogous to <varname>font-bold</varname>, but for italic font style instead of bold. </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->font-strikeout</varname
-></entry>
-	      <entry
->boolean</entry>
-	      <entry
->If <literal
->true</literal
->, draws a centred line over the font. Applied even if <varname
->font</varname
-> is set. </entry>
+	      <entry><varname>font-strikeout</varname></entry>
+	      <entry>boolean</entry>
+	      <entry>If <literal>true</literal>, draws a centred line over the font. Applied even if <varname>font</varname> is set. </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->icon</varname
-></entry>
-	      <entry
->text</entry>
-	      <entry
->The name of an icon to show in the first column. Not yet implemented. </entry>
+	      <entry><varname>icon</varname></entry>
+	      <entry>text</entry>
+	      <entry>The name of an icon to show in the first column. Not yet implemented. </entry>
 	    </row>
 	  </tbody>
 	</tgroup>
       </table>
 
       <table id="table-key-filters-criteria">
-	<title
->Key-Filter Configuration Keys Defining Filter Criteria</title>
+	<title>Key-Filter Configuration Keys Defining Filter Criteria</title>
 	<tgroup cols="3">
 	  <colspec colnum="2" align="center"/>
 	  <thead>
 	    <row>
-	      <entry
->Config Key</entry>
-	      <entry
->Type</entry>
-	      <entry
->If specified, filter matches when...</entry>
+	      <entry>Config Key</entry>
+	      <entry>Type</entry>
+	      <entry>If specified, filter matches when...</entry>
 	    </row>
 	  </thead>
 	  <!--tfoot/-->
 	  <tbody>
 	    <row>
-	      <entry
-><varname
->is-revoked</varname
-></entry>
-	      <entry
->boolean</entry>
-	      <entry
->the key has been revoked.</entry>
+	      <entry><varname>is-revoked</varname></entry>
+	      <entry>boolean</entry>
+	      <entry>the key has been revoked.</entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->is-expired</varname
-></entry>
-	      <entry
->boolean</entry>
-	      <entry
->the key is expired.</entry>
+	      <entry><varname>is-expired</varname></entry>
+	      <entry>boolean</entry>
+	      <entry>the key is expired.</entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->is-disabled</varname
-></entry>
-	      <entry
->boolean</entry>
-	      <entry
->the key has been disabled (marked for not using) by the user. Ignored for S/MIME keys. </entry>
+	      <entry><varname>is-disabled</varname></entry>
+	      <entry>boolean</entry>
+	      <entry>the key has been disabled (marked for not using) by the user. Ignored for S/MIME keys. </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->is-root-certificate</varname
-></entry>
-	      <entry
->boolean</entry>
-	      <entry
->the key is a root certificate. Ignored for OpenPGP keys. </entry>
+	      <entry><varname>is-root-certificate</varname></entry>
+	      <entry>boolean</entry>
+	      <entry>the key is a root certificate. Ignored for OpenPGP keys. </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->can-encrypt</varname
-></entry>
-	      <entry
->boolean</entry>
-	      <entry
->the key can be used for encryption. </entry>
+	      <entry><varname>can-encrypt</varname></entry>
+	      <entry>boolean</entry>
+	      <entry>the key can be used for encryption. </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->can-sign</varname
-></entry>
-	      <entry
->boolean</entry>
-	      <entry
->the key can be used for signing. </entry>
+	      <entry><varname>can-sign</varname></entry>
+	      <entry>boolean</entry>
+	      <entry>the key can be used for signing. </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->can-certify</varname
-></entry>
-	      <entry
->boolean</entry>
-	      <entry
->the key can be used for signing (certifying) other keys. </entry>
+	      <entry><varname>can-certify</varname></entry>
+	      <entry>boolean</entry>
+	      <entry>the key can be used for signing (certifying) other keys. </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->can-authenticate</varname
-></entry>
-	      <entry
->boolean</entry>
-	      <entry
->the key can be used for authentication (&eg; as an <acronym
->TLS</acronym
-> client certificate). </entry>
+	      <entry><varname>can-authenticate</varname></entry>
+	      <entry>boolean</entry>
+	      <entry>the key can be used for authentication (&eg; as an <acronym>TLS</acronym> client certificate). </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->has-secret-key</varname
-></entry>
-	      <entry
->boolean</entry>
-	      <entry
->the secret key for this key pair is available. </entry>
+	      <entry><varname>has-secret-key</varname></entry>
+	      <entry>boolean</entry>
+	      <entry>the secret key for this key pair is available. </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->is-openpgp-key</varname
-></entry>
-	      <entry
->boolean</entry>
-	      <entry
->the key is an OpenPGP key (<literal
->true</literal
->), or an S/MIME key (<literal
->false</literal
->). </entry>
+	      <entry><varname>is-openpgp-key</varname></entry>
+	      <entry>boolean</entry>
+	      <entry>the key is an OpenPGP key (<literal>true</literal>), or an S/MIME key (<literal>false</literal>). </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->was-validated</varname
-></entry>
-	      <entry
->boolean</entry>
-	      <entry
->the key has been validated (see <xref linkend="certificates-validate"/>). </entry>
+	      <entry><varname>was-validated</varname></entry>
+	      <entry>boolean</entry>
+	      <entry>the key has been validated (see <xref linkend="certificates-validate"/>). </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
-><replaceable
->prefix</replaceable
->-ownertrust</varname
-></entry>
-	      <entry
->validity<footnote
-> <para
->Validity is an (ordered) enumeration with the following allowed values: <literal
->unknown</literal
->, <literal
->undefined</literal
->, <literal
->never</literal
->, <literal
->marginal</literal
->, <literal
->full</literal
->, <literal
->ultimate</literal
->. See the &gpg; and &gpgsm; manuals for a detailed explanation. </para>
+	      <entry><varname><replaceable>prefix</replaceable>-ownertrust</varname></entry>
+	      <entry>validity<footnote> <para>Validity is an (ordered) enumeration with the following allowed values: <literal>unknown</literal>, <literal>undefined</literal>, <literal>never</literal>, <literal>marginal</literal>, <literal>full</literal>, <literal>ultimate</literal>. See the &gpg; and &gpgsm; manuals for a detailed explanation. </para>
 		</footnote>
 	      </entry>
-	      <entry
->the key has exactly (<replaceable
->prefix</replaceable
->&nbsp;=&nbsp;<literal
->is</literal
->), has anything but (<replaceable
->prefix</replaceable
->&nbsp;=&nbsp;<literal
->is-not</literal
->), has at least (<replaceable
->prefix</replaceable
->&nbsp;=&nbsp;<literal
->is-at-least</literal
->), or has at most (<replaceable
->prefix</replaceable
->&nbsp;=&nbsp;<literal
->is-at-most</literal
->) the ownertrust given as the value of the config key. If more than one <varname
-><replaceable
->prefix</replaceable
->-ownertrust</varname
-> keys (with different <replaceable
->prefix</replaceable
-> values) are present in a single group, the behaviour is undefined. </entry>
+	      <entry>the key has exactly (<replaceable>prefix</replaceable>&nbsp;=&nbsp;<literal>is</literal>), has anything but (<replaceable>prefix</replaceable>&nbsp;=&nbsp;<literal>is-not</literal>), has at least (<replaceable>prefix</replaceable>&nbsp;=&nbsp;<literal>is-at-least</literal>), or has at most (<replaceable>prefix</replaceable>&nbsp;=&nbsp;<literal>is-at-most</literal>) the ownertrust given as the value of the config key. If more than one <varname><replaceable>prefix</replaceable>-ownertrust</varname> keys (with different <replaceable>prefix</replaceable> values) are present in a single group, the behaviour is undefined. </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
-><replaceable
->prefix</replaceable
->-validity</varname
-></entry>
-	      <entry
->validity</entry>
-	      <entry
->Analogous to <varname
-><replaceable
->prefix</replaceable
->-ownertrust</varname
->, but for key validity instead of ownertrust. </entry>
+	      <entry><varname><replaceable>prefix</replaceable>-validity</varname></entry>
+	      <entry>validity</entry>
+	      <entry>Analogous to <varname><replaceable>prefix</replaceable>-ownertrust</varname>, but for key validity instead of ownertrust. </entry>
 	    </row>
 	  </tbody>
 	</tgroup>
       </table>
 
       <note>
-	<para
->Some of the more interesting criteria, such as <varname
->is-revoked</varname
-> or <varname
->is-expired</varname
-> will only work on <emphasis
->validated</emphasis
-> keys, which is why, by default, only validated keys are checked for revocation and expiration, although you are free to remove these extra checks. </para>
+	<para>Some of the more interesting criteria, such as <varname>is-revoked</varname> or <varname>is-expired</varname> will only work on <emphasis>validated</emphasis> keys, which is why, by default, only validated keys are checked for revocation and expiration, although you are free to remove these extra checks. </para>
       </note>
 
-      <para
->In general, criteria not specified (&ie; the config entry is not set) are not checked for. If a criterion is given, it is checked for and must match for the filter as a whole to match, &ie; the criteria are AND'ed together. </para>
+      <para>In general, criteria not specified (&ie; the config entry is not set) are not checked for. If a criterion is given, it is checked for and must match for the filter as a whole to match, &ie; the criteria are AND'ed together. </para>
 
       <example>
-	<title
->Examples of key filters </title>
-	<para
->To check for all expired, but non-revoked root certificates, you would use a key filter defined as follows: </para>
+	<title>Examples of key filters </title>
+	<para>To check for all expired, but non-revoked root certificates, you would use a key filter defined as follows: </para>
 <!-- isn't there a better way to not indent this in the output??? -->
-	<screen
-><!--
--->[Key Filter #<replaceable
->n</replaceable
->]
+	<screen><!--
+-->[Key Filter #<replaceable>n</replaceable>]
 Name=expired, but not revoked
 was-validated=true
 is-expired=true
 is-revoked=false
 is-root-certificate=true<!--
      --></screen>
-	<para
->To check for all disabled OpenPGP keys (not yet supported by &kleopatra;) with ownertrust of at least <quote
->marginal</quote
->, you would use: </para>
-	<screen
-><!--
--->[Key Filter #<replaceable
->n</replaceable
->]
+	<para>To check for all disabled OpenPGP keys (not yet supported by &kleopatra;) with ownertrust of at least <quote>marginal</quote>, you would use: </para>
+	<screen><!--
+-->[Key Filter #<replaceable>n</replaceable>]
 Name=disabled OpenPGP keys with marginal or better ownertrust
 is-openpgp=true
 is-disabled=true
@@ -1878,57 +861,34 @@ is-at-least-ownertrust=marginal<!--
 
     </sect1>
 
-  </chapter
-> <!-- Administrator's Guide -->
+  </chapter> <!-- Administrator's Guide -->
 
 <chapter id="credits-and-license">
-<title
->Credits and Licence</title>
+<title>Credits and Licence</title>
 
-<para
->&kleopatra; copyright 2002 Steffen Hansen, Matthias Kalle Dalheimer and Jesper Pedersen., copyright 2004 Daniel Molkentin, copyright 2004 Klar&auml;lvdalens Datakonsult AB</para>
+<para>&kleopatra; copyright 2002 Steffen Hansen, Matthias Kalle Dalheimer and Jesper Pedersen., copyright 2004 Daniel Molkentin, copyright 2004 Klar&auml;lvdalens Datakonsult AB</para>
 
-<para
->Documentation copyright 2002 Steffen Hansen, copyright 2004 Daniel Molkentin, copyright 2004 Klar&auml;lvdalens Datakonsult AB</para>
+<para>Documentation copyright 2002 Steffen Hansen, copyright 2004 Daniel Molkentin, copyright 2004 Klar&auml;lvdalens Datakonsult AB</para>
 
 <itemizedlist>
-<title
->Contributors</title>
+<title>Contributors</title>
 <listitem>
-<para
->Marc Mutz <email
->mutz@kde.org</email
-></para>
+<para>Marc Mutz <email>mutz@kde.org</email></para>
 </listitem>
 <listitem>
-<para
->David Faure <email
->faure@kde.org</email
-></para>
+<para>David Faure <email>faure@kde.org</email></para>
 </listitem>
 <listitem>
-<para
->Steffen Hansen <email
->hansen@kde.org</email
-></para>
+<para>Steffen Hansen <email>hansen@kde.org</email></para>
 </listitem>
 <listitem>
-<para
->Matthias Kalle Dalheimer <email
->kalle@kde.org</email
-></para>
+<para>Matthias Kalle Dalheimer <email>kalle@kde.org</email></para>
 </listitem>
 <listitem>
-<para
->Jesper Pedersen <email
->blackie@kde.org</email
-></para>
+<para>Jesper Pedersen <email>blackie@kde.org</email></para>
 </listitem>
 <listitem>
-<para
->Daniel Molkentin <email
->molkentin@kde.org</email
-></para>
+<para>Daniel Molkentin <email>molkentin@kde.org</email></para>
 </listitem>
 </itemizedlist>
 &underGPL; &underFDL; </chapter>
diff --git a/tde-i18n-en_GB/docs/tdepim/kmail/configure.docbook b/tde-i18n-en_GB/docs/tdepim/kmail/configure.docbook
index eb9333ab2ea..920b5cbfbe2 100644
--- a/tde-i18n-en_GB/docs/tdepim/kmail/configure.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/kmail/configure.docbook
@@ -2,261 +2,103 @@
 
 <chapterinfo>
 <authorgroup>
-<author
-><firstname
->Daniel</firstname
-> <surname
->Naber</surname
-> <affiliation
-><address
-> <email
->daniel.naber@t-online.de</email>
-</address
-></affiliation>
+<author><firstname>Daniel</firstname> <surname>Naber</surname> <affiliation><address> <email>daniel.naber@t-online.de</email>
+</address></affiliation>
 </author>
-<author
-><firstname
->David</firstname
-> <surname
->Rugge</surname
-> <affiliation
-><address
-> <email
->davidrugge@mediaone.net</email>
-</address
-></affiliation>
+<author><firstname>David</firstname> <surname>Rugge</surname> <affiliation><address> <email>davidrugge@mediaone.net</email>
+</address></affiliation>
 </author>
-<author
-><firstname
->Marc</firstname
-> <surname
->Mutz</surname
-> <affiliation
-><orgname
->Klar&auml;lvdalens Datakonsult AB</orgname
-> <address
-> <email
->mutz@kde.org</email
-> </address
-> </affiliation>
+<author><firstname>Marc</firstname> <surname>Mutz</surname> <affiliation><orgname>Klar&auml;lvdalens Datakonsult AB</orgname> <address> <email>mutz@kde.org</email> </address> </affiliation>
 </author>
-<author
-><firstname
->Michel</firstname
-> <surname
->Boyer de la Giroday</surname
-> <affiliation
-><address
-> <email
->michel@klaralvdalens-datakonsult.se</email>
-</address
-></affiliation>
+<author><firstname>Michel</firstname> <surname>Boyer de la Giroday</surname> <affiliation><address> <email>michel@klaralvdalens-datakonsult.se</email>
+</address></affiliation>
 </author>
-<othercredit role="translator"
-><firstname
->Andrew</firstname
-><surname
->Coles</surname
-><affiliation
-><address
-><email
->andrew_coles@yahoo.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Andrew</firstname><surname>Coles</surname><affiliation><address><email>andrew_coles@yahoo.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
-<date
->2004-07-13</date
-> <releaseinfo
->1.7</releaseinfo
-> </chapterinfo>
+<date>2004-07-13</date> <releaseinfo>1.7</releaseinfo> </chapterinfo>
 
-<title
->Configure &kmail;</title>
+<title>Configure &kmail;</title>
 
 <sect1 id="configure-generalinfo">
-<title
->General Information</title>
+<title>General Information</title>
 
-<para
->&kmail;'s configuration window enables you to configure &kmail; in many ways. You can reach it via <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure &kmail;...</guimenuitem
-></menuchoice
->.</para>
+<para>&kmail;'s configuration window enables you to configure &kmail; in many ways. You can reach it via <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &kmail;...</guimenuitem></menuchoice>.</para>
 
-<para
->It is divided into six pages, each of them represented by one of the icons in the list on the left hand side of the dialogue. Below the pages will be described in detail.</para>
+<para>It is divided into six pages, each of them represented by one of the icons in the list on the left hand side of the dialogue. Below the pages will be described in detail.</para>
 
-<para
->The dialogue has several buttons:</para>
+<para>The dialogue has several buttons:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guibutton
->Help</guibutton
-></term>
-<listitem
-><para
->This will open this manual at the appropriate page.</para
-></listitem>
+<term><guibutton>Help</guibutton></term>
+<listitem><para>This will open this manual at the appropriate page.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guibutton
->Defaults</guibutton
-></term>
-<listitem
-><para
->This will reset the configuration options on the current page back to the default values.</para
-></listitem>
+<term><guibutton>Defaults</guibutton></term>
+<listitem><para>This will reset the configuration options on the current page back to the default values.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guibutton
->Load Profile...</guibutton
-></term>
-<listitem
-><para
->This will open a dialogue which offers several configuration profiles. You can use these as starting points for your own configuration.</para
-></listitem>
+<term><guibutton>Load Profile...</guibutton></term>
+<listitem><para>This will open a dialogue which offers several configuration profiles. You can use these as starting points for your own configuration.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guibutton
->Reset</guibutton
-></term>
-<listitem
-><para
->This resets all changes you have made since you last saved the settings.</para
-></listitem>
+<term><guibutton>Reset</guibutton></term>
+<listitem><para>This resets all changes you have made since you last saved the settings.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guibutton
->OK</guibutton
-></term>
-<listitem
-><para
->This saves the settings and closes the configuration dialogue.</para
-></listitem>
+<term><guibutton>OK</guibutton></term>
+<listitem><para>This saves the settings and closes the configuration dialogue.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guibutton
->Apply</guibutton
-></term>
-<listitem
-><para
->This saves the settings without closing the configuration dialogue.</para
-></listitem>
+<term><guibutton>Apply</guibutton></term>
+<listitem><para>This saves the settings without closing the configuration dialogue.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guibutton
->Cancel</guibutton
-></term>
-<listitem
-><para
->This closes the configuration dialogue without saving the changes you have made.</para
-></listitem>
+<term><guibutton>Cancel</guibutton></term>
+<listitem><para>This closes the configuration dialogue without saving the changes you have made.</para></listitem>
 </varlistentry>
 </variablelist>
 
 </sect1>
 
 <sect1 id="configure-identity">
-<title
->Identities Page</title>
-
-<para
->You can find a quick introduction to the <guilabel
->Identities</guilabel
-> page in the <link linkend="getting-started"
->Getting Started</link
-> section.</para>
-
-<para
->This page allows you to create one or more <emphasis
->Identities</emphasis
->, &ie; combinations of name, email address and other settings. For example, you can create one identity for business communication and one for personal communication. If you have more than one email address, you can create one identity per address. You will then be able to select an identity on a per-message basis.</para>
-
-<para
->The page consists of a list of identities and buttons to manage them. The identities list will always show at least one identity, which is then the <guilabel
->Default</guilabel
-> identity.</para>
-
-<para
->To add a new identity to the identity list, click on the <guibutton
->New...</guibutton
-> button. The <link linkend="configure-identity-newidentitydialog"
->New identity</link
-> dialogue will then appear.</para>
+<title>Identities Page</title>
+
+<para>You can find a quick introduction to the <guilabel>Identities</guilabel> page in the <link linkend="getting-started">Getting Started</link> section.</para>
+
+<para>This page allows you to create one or more <emphasis>Identities</emphasis>, &ie; combinations of name, email address and other settings. For example, you can create one identity for business communication and one for personal communication. If you have more than one email address, you can create one identity per address. You will then be able to select an identity on a per-message basis.</para>
+
+<para>The page consists of a list of identities and buttons to manage them. The identities list will always show at least one identity, which is then the <guilabel>Default</guilabel> identity.</para>
+
+<para>To add a new identity to the identity list, click on the <guibutton>New...</guibutton> button. The <link linkend="configure-identity-newidentitydialog">New identity</link> dialogue will then appear.</para>
 
 <sect2 id="configure-identity-newidentitydialog">
-<title
->The <guilabel
->New Identity</guilabel
-> Dialogue</title>
+<title>The <guilabel>New Identity</guilabel> Dialogue</title>
 
-<para
->You have to enter the name of the new identity into the <guilabel
->New Identity</guilabel
-> edit field. This will be the name shown in the identity list.</para>
+<para>You have to enter the name of the new identity into the <guilabel>New Identity</guilabel> edit field. This will be the name shown in the identity list.</para>
 
-<para
->You can choose how the new identity should be initialised by checking one of the three radio buttons in the middle of the dialogue:</para>
+<para>You can choose how the new identity should be initialised by checking one of the three radio buttons in the middle of the dialogue:</para>
 
 <variablelist>
 
 <varlistentry>
-<term
-><guilabel
->With empty fields</guilabel
-></term>
+<term><guilabel>With empty fields</guilabel></term>
 <listitem>
-<para
->All fields of the new identity are cleared or preset with standard values.</para>
+<para>All fields of the new identity are cleared or preset with standard values.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Use Control Centre settings</guilabel
-></term>
+<term><guilabel>Use Control Centre settings</guilabel></term>
 <listitem>
-<para
->Uses the settings of the <application
->Control Centre</application
->'s default email profile (you can edit that one under <menuchoice
-><guimenu
->Internet &amp; Network</guimenu
-> <guimenuitem
->Email</guimenuitem
-></menuchoice
-> in the <application
->Control Centre</application
->).</para>
+<para>Uses the settings of the <application>Control Centre</application>'s default email profile (you can edit that one under <menuchoice><guimenu>Internet &amp; Network</guimenu> <guimenuitem>Email</guimenuitem></menuchoice> in the <application>Control Centre</application>).</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Duplicate existing identity</guilabel
-></term>
+<term><guilabel>Duplicate existing identity</guilabel></term>
 <listitem>
-<para
->Copies all fields from an existing identity. You can choose which identity to copy from by selecting the corresponding entry in the <guilabel
->Existing identities</guilabel
-> popup.</para>
+<para>Copies all fields from an existing identity. You can choose which identity to copy from by selecting the corresponding entry in the <guilabel>Existing identities</guilabel> popup.</para>
 </listitem>
 </varlistentry>
 
@@ -265,167 +107,96 @@
 </sect2>
 
 <sect2 id="configure-identity-general">
-<title
->General</title>
+<title>General</title>
 
-<para
->The <guilabel
->General</guilabel
-> tab allows you to specify some basic settings for the currently selected identity.</para>
+<para>The <guilabel>General</guilabel> tab allows you to specify some basic settings for the currently selected identity.</para>
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Your name</guilabel
-></term>
+<term><guilabel>Your name</guilabel></term>
 <listitem>
-<para
->Enter your full name here (sometimes also called <emphasis
->display name</emphasis
->). Although this field is not strictly mandatory, it is recommended to enter the correct value here.</para>
+<para>Enter your full name here (sometimes also called <emphasis>display name</emphasis>). Although this field is not strictly mandatory, it is recommended to enter the correct value here.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Organisation</guilabel
-></term>
+<term><guilabel>Organisation</guilabel></term>
 <listitem>
-<para
->Enter your organisation here. This field is optional.</para>
+<para>Enter your organisation here. This field is optional.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Email address</guilabel
-></term>
+<term><guilabel>Email address</guilabel></term>
 <listitem>
-<para
->Enter your email address here, &ie; something like <userinput
->joe@example.com</userinput
->.</para>
+<para>Enter your email address here, &ie; something like <userinput>joe@example.com</userinput>.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 <example>
-<title
->Example</title>
-<para
->So if your address is <replaceable
->Joe User &lt;joe@example.com&gt;</replaceable
->, you should enter <userinput
->Joe User</userinput
-> into the <guilabel
->Your name</guilabel
-> field and <userinput
->joe@example.com</userinput
-> into the <guilabel
->Email address</guilabel
-> field.</para
-></example>
+<title>Example</title>
+<para>So if your address is <replaceable>Joe User &lt;joe@example.com&gt;</replaceable>, you should enter <userinput>Joe User</userinput> into the <guilabel>Your name</guilabel> field and <userinput>joe@example.com</userinput> into the <guilabel>Email address</guilabel> field.</para></example>
 </sect2>
 
     <sect2 id="configure-identity-cryptography">
-      <title
->Cryptography </title>
+      <title>Cryptography </title>
 
-      <para
->The <guilabel
->Cryptography</guilabel
-> tab allows you to specify &openpgp; and &smime; keys associated with this identity, as well as choosing the preferred (cryptographic) message format to use. </para>
+      <para>The <guilabel>Cryptography</guilabel> tab allows you to specify &openpgp; and &smime; keys associated with this identity, as well as choosing the preferred (cryptographic) message format to use. </para>
 
       <variablelist>
 
 	<varlistentry id="configure-identity-cryptography-openpgp-sign">
 	  <term>
-	    <guilabel
->OpenPGP signing key</guilabel>
+	    <guilabel>OpenPGP signing key</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->Here you can select the key to be used when &openpgp;-signing messages written with this identity in effect. </para>
-	    <para
->For brevity, only the short key id of selected keys is shown. Hovering with the mouse over the key list will show more information in a tooltip. </para>
-	    <para
->To clear the label press the <guibutton
->Clear</guibutton
-> button. </para>
-	    <para
->To change the selected key, press the <guibutton
->Change...</guibutton
-> button. A dialogue listing all secret &openpgp; keys will be shown allowing you to select the one to use. </para>
+	    <para>Here you can select the key to be used when &openpgp;-signing messages written with this identity in effect. </para>
+	    <para>For brevity, only the short key id of selected keys is shown. Hovering with the mouse over the key list will show more information in a tooltip. </para>
+	    <para>To clear the label press the <guibutton>Clear</guibutton> button. </para>
+	    <para>To change the selected key, press the <guibutton>Change...</guibutton> button. A dialogue listing all secret &openpgp; keys will be shown allowing you to select the one to use. </para>
 	  </listitem>
 	</varlistentry>
 
 	
 	<varlistentry id="configure-identity-cryptography-openpgp-encrypt">
 	  <term>
-	    <guilabel
->OpenPGP encryption key</guilabel>
+	    <guilabel>OpenPGP encryption key</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->Here you can select the key to &openpgp;-encrypt messages to when this identity and <xref linkend="configure-security-composing-encrypt-to-self"/> are in effect. This key is also used for the <xref linkend="composer-attach-attach-my-public-key"/> function of the <link linkend="the-composer-window"
->Composer</link
->. </para>
-	    <para
->To change the selected key, press the <guibutton
->Change...</guibutton
-> button. A dialogue listing all &openpgp; keys found in your keyring will be shown allowing you to select the one to use. </para>
-	    <para
->You can clear the list of keys and get more information about them in the same way as described for <xref linkend="configure-identity-cryptography-openpgp-sign"/>. </para>
+	    <para>Here you can select the key to &openpgp;-encrypt messages to when this identity and <xref linkend="configure-security-composing-encrypt-to-self"/> are in effect. This key is also used for the <xref linkend="composer-attach-attach-my-public-key"/> function of the <link linkend="the-composer-window">Composer</link>. </para>
+	    <para>To change the selected key, press the <guibutton>Change...</guibutton> button. A dialogue listing all &openpgp; keys found in your keyring will be shown allowing you to select the one to use. </para>
+	    <para>You can clear the list of keys and get more information about them in the same way as described for <xref linkend="configure-identity-cryptography-openpgp-sign"/>. </para>
 	  </listitem>
 	</varlistentry>
 
 	
 	<varlistentry id="configure-identity-cryptography-smime-sign">
 	  <term>
-	    <guilabel
->S/MIME signing certificate</guilabel>
+	    <guilabel>S/MIME signing certificate</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->Here you can select the certificate to be used when &smime;-signing messages written with this identity in effect. </para>
-	    <para
->To change the selected certificate, press the <guibutton
->Change...</guibutton
-> button. A dialogue listing all secret &smime; signing certificates will be shown allowing you to select the one to use. </para>
-	    <para
->You can clear the list of certificates and get more information about them in the same way as described for <xref linkend="configure-identity-cryptography-openpgp-sign"/>. </para>
+	    <para>Here you can select the certificate to be used when &smime;-signing messages written with this identity in effect. </para>
+	    <para>To change the selected certificate, press the <guibutton>Change...</guibutton> button. A dialogue listing all secret &smime; signing certificates will be shown allowing you to select the one to use. </para>
+	    <para>You can clear the list of certificates and get more information about them in the same way as described for <xref linkend="configure-identity-cryptography-openpgp-sign"/>. </para>
 	  </listitem>
 	</varlistentry>
 
 	
 	<varlistentry id="configure-identity-cryptography-smime-encrypt">
 	  <term>
-	    <guilabel
->S/MIME encryption certificate</guilabel>
+	    <guilabel>S/MIME encryption certificate</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->Here you can select the certificate to &smime;-encrypt messages to when this identity and <xref linkend="configure-security-composing-encrypt-to-self"/> are in effect. </para>
-	    <para
->To change the selected certificate, press the <guibutton
->Change...</guibutton
-> button. A dialogue listing all &smime; encryption certificates found in your local keybox will be shown allowing you to select the one to use. </para>
-	    <para
->You can clear the list of certificates and get more information about them in the same way as described for <xref linkend="configure-identity-cryptography-openpgp-sign"/>. </para>
+	    <para>Here you can select the certificate to &smime;-encrypt messages to when this identity and <xref linkend="configure-security-composing-encrypt-to-self"/> are in effect. </para>
+	    <para>To change the selected certificate, press the <guibutton>Change...</guibutton> button. A dialogue listing all &smime; encryption certificates found in your local keybox will be shown allowing you to select the one to use. </para>
+	    <para>You can clear the list of certificates and get more information about them in the same way as described for <xref linkend="configure-identity-cryptography-openpgp-sign"/>. </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry id="configure-identity-cryptography-preferred-format">
 	  <term>
-	    <guilabel
->Preferred crypto message format</guilabel>
+	    <guilabel>Preferred crypto message format</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->Here you can choose which cryptographic message format to use by default with this identity. </para>
-	    <para
->You can either select any of the four formats supported by &kmail; or leave the option at the recommended default setting of <guilabel
->Any</guilabel
->, which will choose a suitable format based on the recipients of the message, or might even go so far as to create two copies of the message, one &smime; signed and/or encrypted, the other &openpgp; signed and/or encrypted. </para>
+	    <para>Here you can choose which cryptographic message format to use by default with this identity. </para>
+	    <para>You can either select any of the four formats supported by &kmail; or leave the option at the recommended default setting of <guilabel>Any</guilabel>, which will choose a suitable format based on the recipients of the message, or might even go so far as to create two copies of the message, one &smime; signed and/or encrypted, the other &openpgp; signed and/or encrypted. </para>
 	  </listitem>
 	</varlistentry>
 
@@ -434,118 +205,49 @@
     </sect2>
 
 <sect2 id="configure-identity-advanced">
-<title
->Advanced</title>
+<title>Advanced</title>
 
-<para
->The <guilabel
->Advanced</guilabel
-> tab allows you to specify some rarely used or otherwise specialised settings for the currently selected identity.</para>
+<para>The <guilabel>Advanced</guilabel> tab allows you to specify some rarely used or otherwise specialised settings for the currently selected identity.</para>
 <variablelist>
 
 <varlistentry>
-<term
-><guilabel
->Reply-To address</guilabel
-></term>
+<term><guilabel>Reply-To address</guilabel></term>
 <listitem>
-<para
->Enter the address to which replies to your messages should be sent. Only fill out this field if it is different from your normal address (specified using the <guilabel
->Name</guilabel
-> and <guilabel
->Email Address</guilabel
-> on the <link linkend="configure-identity-general"
-><guilabel
->General</guilabel
-> tab</link
->), since replies default to the sender's address anyway.</para>
-<note
-><para
->This field is only useful if you want replies to your mail to go somewhere else than your regular email address, &eg; if you are using this identity to send messages from an email address that cannot receive messages. Note that some mailing lists overwrite this header field with their post address to make sure that replies go to the list instead of individuals. So the usefulness of this field is very limited and it should only be used in rare cases.</para
-></note>
+<para>Enter the address to which replies to your messages should be sent. Only fill out this field if it is different from your normal address (specified using the <guilabel>Name</guilabel> and <guilabel>Email Address</guilabel> on the <link linkend="configure-identity-general"><guilabel>General</guilabel> tab</link>), since replies default to the sender's address anyway.</para>
+<note><para>This field is only useful if you want replies to your mail to go somewhere else than your regular email address, &eg; if you are using this identity to send messages from an email address that cannot receive messages. Note that some mailing lists overwrite this header field with their post address to make sure that replies go to the list instead of individuals. So the usefulness of this field is very limited and it should only be used in rare cases.</para></note>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->BCC address</guilabel
-></term>
+<term><guilabel>BCC address</guilabel></term>
 <listitem>
-<para
->Optionally enter an address to which blind copies of your messages should be sent to. Note that a BCC is only send to this address, when <menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->BCC</guimenuitem
-></menuchoice
-> is activated while composing a message. If you want to send a BCC regardless of this setting, you should look at the <guilabel
->Headers</guilabel
-> tab of the <guilabel
->Composer</guilabel
-> page.</para>
+<para>Optionally enter an address to which blind copies of your messages should be sent to. Note that a BCC is only send to this address, when <menuchoice><guimenu>View</guimenu><guimenuitem>BCC</guimenuitem></menuchoice> is activated while composing a message. If you want to send a BCC regardless of this setting, you should look at the <guilabel>Headers</guilabel> tab of the <guilabel>Composer</guilabel> page.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Sent-mail folder</guilabel
-></term>
+<term><guilabel>Sent-mail folder</guilabel></term>
 <listitem>
-<para
->Select the folder into which messages should be filed after sending when using this identity. <acronym
->IMAP</acronym
-> users should consider changing this to an <acronym
->IMAP</acronym
-> folder, so their sent-mail is stored on a server instead of being stored in a local folder. This way they can access these messages at a different location.</para>
-
-<tip
-><para
->You can exercise more fine-grained control over where to file sent messages by creating a corresponding <link linkend="filters"
->message filter</link
-> that is applied to outgoing messages.</para
-></tip>
+<para>Select the folder into which messages should be filed after sending when using this identity. <acronym>IMAP</acronym> users should consider changing this to an <acronym>IMAP</acronym> folder, so their sent-mail is stored on a server instead of being stored in a local folder. This way they can access these messages at a different location.</para>
+
+<tip><para>You can exercise more fine-grained control over where to file sent messages by creating a corresponding <link linkend="filters">message filter</link> that is applied to outgoing messages.</para></tip>
 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Drafts folder</guilabel
-></term>
+<term><guilabel>Drafts folder</guilabel></term>
 <listitem>
-<para
->Select the folder into which drafts should be filed when using this identity. <acronym
->IMAP</acronym
-> users should consider changing this to an <acronym
->IMAP</acronym
-> folder, so their drafts are stored on a server instead of being stored in a local folder. This way they can easily continue to work on their drafts at a different location.</para>
+<para>Select the folder into which drafts should be filed when using this identity. <acronym>IMAP</acronym> users should consider changing this to an <acronym>IMAP</acronym> folder, so their drafts are stored on a server instead of being stored in a local folder. This way they can easily continue to work on their drafts at a different location.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Special transport</guilabel
-></term>
+<term><guilabel>Special transport</guilabel></term>
 <listitem>
-<para
->Select or enter an alternative SMTP server to be used when sending messages using this identity.</para>
-
-<note
-><para
->You need to configure outgoing mail servers first, before you can choose them from the list. You can do this on the <link linkend="configure-accounts-sending"
-><guilabel
->Sending</guilabel
-> tab</link
-> of the <link linkend="configure-accounts"
-> <guilabel
->Accounts</guilabel
-> page</link
->.</para
-></note>
+<para>Select or enter an alternative SMTP server to be used when sending messages using this identity.</para>
+
+<note><para>You need to configure outgoing mail servers first, before you can choose them from the list. You can do this on the <link linkend="configure-accounts-sending"><guilabel>Sending</guilabel> tab</link> of the <link linkend="configure-accounts"> <guilabel>Accounts</guilabel> page</link>.</para></note>
 </listitem>
 </varlistentry>
 
@@ -553,74 +255,26 @@
 </sect2>
 
 <sect2 id="configure-identity-signature">
-<title
->Signature</title>
-
-<para
->This tab allows you to specify a signature (sometimes called <quote
->footer</quote
-> or <quote
->disclaimer</quote
->) to be appended to each message sent using this identity.</para>
-
-<note
-><para
->This type of signature has nothing to do with the (digital) signatures for which you can select the keys to use on the <link linkend="configure-identity-cryptography"
->Cryptography</link
-> tab. It is just bad wording to call this a signature, but since the term is already used everywhere else, we keep this notation. Just keep in mind that these signatures and digital signatures are two completely different things.</para
-></note>
-
-<para
->Check the <guilabel
->Enable signature</guilabel
-> option if you want to be able to append the signature when using this identity. To <emphasis
->automatically</emphasis
-> append it to every new message you also have to select <guilabel
->Automatically append signature</guilabel
-> in the <guilabel
->Composer</guilabel
-> configuration page.</para>
-
-<para
->&kmail; can obtain the signature text from various sources. The traditional way on Unix is to read the text from a file called <filename
->.signature</filename
-> in your home folder. This file can be shared between several programs, so you get the same signature in each mail program you use.</para>
-
-<para
->To read the text from a text file you select <guilabel
->Obtain signature text from file</guilabel
->. Enter the filename in the <guilabel
->Specify file</guilabel
-> edit field or hit the button to the right of it to browse your filesystem. If you want to edit the file, hit the <guilabel
->Edit File</guilabel
-> button.</para>
-
-<para
->&kmail; can also read the signature text from the output of a command. Thus, you can use programs such as <command
->fortune</command
-> to create a new signature text for every message. Everything the program prints onto <acronym
->stdout</acronym
-> is caught and used as the signature text.</para>
-
-<para
->To read the text from the output of a command you select <guilabel
->Obtain signature text from Output of Command</guilabel
->. Enter the command (preferably with full path) in the <guilabel
->Specify command</guilabel
-> edit field.</para>
-
-<para
->As a third option, you can enter the signature text directly in &kmail;'s configuration dialogue. To do this, select <guilabel
->Obtain signature text from input field below</guilabel
-> and enter the text into the appearing text box.</para>
-
-<note
-><para
->On the Internet, signatures are by convention separated from the body of the message by a line containing only the three character <quote
->-- </quote
-> (dash, dash, space). &kmail; will automatically prepend the signature text with this line if it is not already present in the signature text.</para>
-<para
->If you do not wish the separator to be prepended automatically by &kmail;, simply add it to the signature text yourself.</para>
+<title>Signature</title>
+
+<para>This tab allows you to specify a signature (sometimes called <quote>footer</quote> or <quote>disclaimer</quote>) to be appended to each message sent using this identity.</para>
+
+<note><para>This type of signature has nothing to do with the (digital) signatures for which you can select the keys to use on the <link linkend="configure-identity-cryptography">Cryptography</link> tab. It is just bad wording to call this a signature, but since the term is already used everywhere else, we keep this notation. Just keep in mind that these signatures and digital signatures are two completely different things.</para></note>
+
+<para>Check the <guilabel>Enable signature</guilabel> option if you want to be able to append the signature when using this identity. To <emphasis>automatically</emphasis> append it to every new message you also have to select <guilabel>Automatically append signature</guilabel> in the <guilabel>Composer</guilabel> configuration page.</para>
+
+<para>&kmail; can obtain the signature text from various sources. The traditional way on Unix is to read the text from a file called <filename>.signature</filename> in your home folder. This file can be shared between several programs, so you get the same signature in each mail program you use.</para>
+
+<para>To read the text from a text file you select <guilabel>Obtain signature text from file</guilabel>. Enter the filename in the <guilabel>Specify file</guilabel> edit field or hit the button to the right of it to browse your filesystem. If you want to edit the file, hit the <guilabel>Edit File</guilabel> button.</para>
+
+<para>&kmail; can also read the signature text from the output of a command. Thus, you can use programs such as <command>fortune</command> to create a new signature text for every message. Everything the program prints onto <acronym>stdout</acronym> is caught and used as the signature text.</para>
+
+<para>To read the text from the output of a command you select <guilabel>Obtain signature text from Output of Command</guilabel>. Enter the command (preferably with full path) in the <guilabel>Specify command</guilabel> edit field.</para>
+
+<para>As a third option, you can enter the signature text directly in &kmail;'s configuration dialogue. To do this, select <guilabel>Obtain signature text from input field below</guilabel> and enter the text into the appearing text box.</para>
+
+<note><para>On the Internet, signatures are by convention separated from the body of the message by a line containing only the three character <quote>-- </quote> (dash, dash, space). &kmail; will automatically prepend the signature text with this line if it is not already present in the signature text.</para>
+<para>If you do not wish the separator to be prepended automatically by &kmail;, simply add it to the signature text yourself.</para>
 </note>
 
 </sect2>
@@ -628,357 +282,111 @@
 </sect1>
 
 <sect1 id="configure-accounts">
-<title
->Accounts Page</title>
-
-<para
->You can find a quick introduction to the <guilabel
->Accounts</guilabel
-> page in the <link linkend="setting-up-your-account"
->Setting up your Account</link
-> section.</para>
-
-<para
->This page allows you to create one or more (incoming and outgoing) <emphasis
->accounts</emphasis
->, &ie; combinations of mail servers, login information and other settings. Typically, you will create one outgoing (used for sending messages) and one incoming (used to retrieve messages) account. You can create as many accounts as you want, though, and assign each one to different <link linkend="configure-identity"
->identities</link
-> or decide on a per-message basis.</para>
+<title>Accounts Page</title>
+
+<para>You can find a quick introduction to the <guilabel>Accounts</guilabel> page in the <link linkend="setting-up-your-account">Setting up your Account</link> section.</para>
+
+<para>This page allows you to create one or more (incoming and outgoing) <emphasis>accounts</emphasis>, &ie; combinations of mail servers, login information and other settings. Typically, you will create one outgoing (used for sending messages) and one incoming (used to retrieve messages) account. You can create as many accounts as you want, though, and assign each one to different <link linkend="configure-identity">identities</link> or decide on a per-message basis.</para>
 
 <sect2 id="configure-accounts-sending">
-<title
->Sending</title>
-
-<para
->The <guilabel
->Sending</guilabel
-> tab allows you to define new outgoing mail servers and set some common options.</para>
-
-<para
->For basic information, see <link linkend="sending-mail"
->Setting up your Account: Sending</link
->.</para>
-
-<para
->When you click <guibutton
->Add...</guibutton
-> or <guibutton
->Modify...</guibutton
-> the <guilabel
->Add transport</guilabel
-> or <guilabel
->Modify transport</guilabel
-> dialogues will open respectively. For sending via <application
->sendmail</application
-> or similar programs you can specify a name and the location of the <command
->sendmail</command
-> program. For <acronym
->SMTP</acronym
-> you can specify <guilabel
->Name</guilabel
->, <guilabel
->Host</guilabel
-> and <guilabel
->Port</guilabel
-> of the server. <guilabel
->Server requires authentication</guilabel
-> will enable the <guilabel
->Login</guilabel
-> and <guilabel
->Password</guilabel
-> fields and the <guilabel
->Authentication method</guilabel
-> buttons on the <guilabel
->Security</guilabel
-> tab. If you are not sure about the security settings you can make &kmail; test for the best settings by using <guibutton
->Check What the Server Supports</guibutton
->.</para>
-
-<para
-><guilabel
->Confirm before send</guilabel
-> will pop up a confirmation box every time you send a message.</para>
-
-<para
-><guilabel
->Send messages in outbox folder</guilabel
-> lets you specify when queued messages, &ie; messages in the outbox folder pending to be sent, should be sent. You can choose between:</para>
+<title>Sending</title>
+
+<para>The <guilabel>Sending</guilabel> tab allows you to define new outgoing mail servers and set some common options.</para>
+
+<para>For basic information, see <link linkend="sending-mail">Setting up your Account: Sending</link>.</para>
+
+<para>When you click <guibutton>Add...</guibutton> or <guibutton>Modify...</guibutton> the <guilabel>Add transport</guilabel> or <guilabel>Modify transport</guilabel> dialogues will open respectively. For sending via <application>sendmail</application> or similar programs you can specify a name and the location of the <command>sendmail</command> program. For <acronym>SMTP</acronym> you can specify <guilabel>Name</guilabel>, <guilabel>Host</guilabel> and <guilabel>Port</guilabel> of the server. <guilabel>Server requires authentication</guilabel> will enable the <guilabel>Login</guilabel> and <guilabel>Password</guilabel> fields and the <guilabel>Authentication method</guilabel> buttons on the <guilabel>Security</guilabel> tab. If you are not sure about the security settings you can make &kmail; test for the best settings by using <guibutton>Check What the Server Supports</guibutton>.</para>
+
+<para><guilabel>Confirm before send</guilabel> will pop up a confirmation box every time you send a message.</para>
+
+<para><guilabel>Send messages in outbox folder</guilabel> lets you specify when queued messages, &ie; messages in the outbox folder pending to be sent, should be sent. You can choose between:</para>
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Never Automatically</guilabel
-></term>
-<listitem
-><para
->Queued messages will only be sent if you select <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Send queued messages</guimenuitem
-></menuchoice
->.</para
-></listitem>
+<term><guilabel>Never Automatically</guilabel></term>
+<listitem><para>Queued messages will only be sent if you select <menuchoice><guimenu>File</guimenu><guimenuitem>Send queued messages</guimenuitem></menuchoice>.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->On Manual Mail Checks</guilabel
-></term>
-<listitem
-><para
->Queued messages will be sent after you have manually checked for new mail, &eg; with <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Check Mail</guimenuitem
-></menuchoice
->. Of course, you can also manually send the queued messages with <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Send queued messages</guimenuitem
-></menuchoice
->.</para
-></listitem>
+<term><guilabel>On Manual Mail Checks</guilabel></term>
+<listitem><para>Queued messages will be sent after you have manually checked for new mail, &eg; with <menuchoice><guimenu>File</guimenu><guimenuitem>Check Mail</guimenuitem></menuchoice>. Of course, you can also manually send the queued messages with <menuchoice><guimenu>File</guimenu><guimenuitem>Send queued messages</guimenuitem></menuchoice>.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->On All Mail Checks</guilabel
-></term>
-<listitem
-><para
->Queued messages will be sent after all checks for new mail, &ie; after automatic mail checks as well as after manual mail checks. Of course, you can also manually send the queued messages with <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Send queued messages</guimenuitem
-></menuchoice
->.</para
-></listitem>
+<term><guilabel>On All Mail Checks</guilabel></term>
+<listitem><para>Queued messages will be sent after all checks for new mail, &ie; after automatic mail checks as well as after manual mail checks. Of course, you can also manually send the queued messages with <menuchoice><guimenu>File</guimenu><guimenuitem>Send queued messages</guimenuitem></menuchoice>.</para></listitem>
 </varlistentry>
 </variablelist>
 
-<para
-><guilabel
->Default send method</guilabel
-> lets you define what happens when a message is sent. If <guilabel
->Send now</guilabel
-> is selected, the message is sent to the mail server immediately, while if <guilabel
->Send later</guilabel
-> is selected, the message is queued in the outbox to be sent later with the <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Send Queued Messages</guimenuitem
-></menuchoice
-> command or automatically when you check your mail, depending on the setting of <guilabel
->Send messages in outbox folder</guilabel
-> above.</para>
-
-<para
-><guilabel
->Message property</guilabel
-> lets you select how your message will be encoded when it is sent. <guilabel
->Allow 8-bit</guilabel
-> means that &kmail; will send your message in 8-bit <acronym
->ASCII</acronym
->, which means that all special characters such as accented letters will be sent as-is. If <guilabel
->MIME Compliant (Quoted Printable)</guilabel
-> is selected, special characters will be encoded using standard &MIME; encodings, which may be more portable to mailing systems other than 8-bit <acronym
->ASCII</acronym
->. We recommend to use <guilabel
->MIME Compliant</guilabel
->.</para>
-
-<note
-><para
->Even with <guilabel
->Allow 8-bit</guilabel
-> selected &kmail; will use <guilabel
->MIME Compliant</guilabel
-> encoding in some situations, for example for sending cryptographically signed messages.</para
-></note>
-
-<para
-><guilabel
->Default domain</guilabel
-> lets you specify which domain name should be used to complete email addresses that only consist of the recipient's user name. For example when you set the default domain to <replaceable
->kde.org</replaceable
-> then messages you send to <replaceable
->joebloggs</replaceable
-> will be sent to <replaceable
->joebloggs@kde.org</replaceable
->.</para>
+<para><guilabel>Default send method</guilabel> lets you define what happens when a message is sent. If <guilabel>Send now</guilabel> is selected, the message is sent to the mail server immediately, while if <guilabel>Send later</guilabel> is selected, the message is queued in the outbox to be sent later with the <menuchoice><guimenu>File</guimenu><guimenuitem>Send Queued Messages</guimenuitem></menuchoice> command or automatically when you check your mail, depending on the setting of <guilabel>Send messages in outbox folder</guilabel> above.</para>
+
+<para><guilabel>Message property</guilabel> lets you select how your message will be encoded when it is sent. <guilabel>Allow 8-bit</guilabel> means that &kmail; will send your message in 8-bit <acronym>ASCII</acronym>, which means that all special characters such as accented letters will be sent as-is. If <guilabel>MIME Compliant (Quoted Printable)</guilabel> is selected, special characters will be encoded using standard &MIME; encodings, which may be more portable to mailing systems other than 8-bit <acronym>ASCII</acronym>. We recommend to use <guilabel>MIME Compliant</guilabel>.</para>
+
+<note><para>Even with <guilabel>Allow 8-bit</guilabel> selected &kmail; will use <guilabel>MIME Compliant</guilabel> encoding in some situations, for example for sending cryptographically signed messages.</para></note>
+
+<para><guilabel>Default domain</guilabel> lets you specify which domain name should be used to complete email addresses that only consist of the recipient's user name. For example when you set the default domain to <replaceable>kde.org</replaceable> then messages you send to <replaceable>joebloggs</replaceable> will be sent to <replaceable>joebloggs@kde.org</replaceable>.</para>
 
 </sect2>
 
 <sect2 id="configure-accounts-receiving">
-<title
->Receiving</title>
-
-<para
->For basic information, see <link linkend="receiving-mail"
->Setting up your Account: Receiving</link
->.</para>
-
-<para
-><guilabel
->Check mail on startup</guilabel
-> lets you specify whether KMail should check for new mail immediately after it has been started.</para>
-
-<para
->With <guilabel
->New Mail Notification</guilabel
-> you can set how &kmail; will notify you if new messages have arrived: <guilabel
->Beep</guilabel
-> will play a short beep sound; if <guilabel
->Detailed new mail notification</guilabel
-> is enabled then &kmail; will show the number of new messages for each folder provided you have chosen to be notified with a dialogue. More advanced notification options, like showing a dialogue or running a certain command, are available via the <guibutton
->Other Actions</guibutton
-> button.</para>
+<title>Receiving</title>
+
+<para>For basic information, see <link linkend="receiving-mail">Setting up your Account: Receiving</link>.</para>
+
+<para><guilabel>Check mail on startup</guilabel> lets you specify whether KMail should check for new mail immediately after it has been started.</para>
+
+<para>With <guilabel>New Mail Notification</guilabel> you can set how &kmail; will notify you if new messages have arrived: <guilabel>Beep</guilabel> will play a short beep sound; if <guilabel>Detailed new mail notification</guilabel> is enabled then &kmail; will show the number of new messages for each folder provided you have chosen to be notified with a dialogue. More advanced notification options, like showing a dialogue or running a certain command, are available via the <guibutton>Other Actions</guibutton> button.</para>
 
 </sect2>
 
 </sect1>
 
 <sect1 id="configure-appearance">
-<title
->Appearance Page</title>
+<title>Appearance Page</title>
 
 <sect2 id="configure-appearance-fonts">
-<title
->Fonts</title>
-
-<para
->This section allows you to change the type, size and character set of the display fonts. <guilabel
->Message Body</guilabel
-> sets the font for the reader pane, <guilabel
->Composer</guilabel
-> sets the font for writing messages in the composer window. There is a separate entry for <guilabel
->Message List - Date Field</guilabel
-> so you can choose a monospaced font for the date field for better readability.</para>
+<title>Fonts</title>
+
+<para>This section allows you to change the type, size and character set of the display fonts. <guilabel>Message Body</guilabel> sets the font for the reader pane, <guilabel>Composer</guilabel> sets the font for writing messages in the composer window. There is a separate entry for <guilabel>Message List - Date Field</guilabel> so you can choose a monospaced font for the date field for better readability.</para>
 
 </sect2>
 
 <sect2 id="configure-appearance-colors">
-<title
->Colours</title>
+<title>Colours</title>
 
-<para
->This section allows you to change the colour of the text. <guilabel
->Recycle colours on deep quoting</guilabel
-> means that even text that is quoted more than three times will appear in colour. Note that the <guilabel
->Quoted text</guilabel
-> colours only work in the message reader, not in the composer. </para>
+<para>This section allows you to change the colour of the text. <guilabel>Recycle colours on deep quoting</guilabel> means that even text that is quoted more than three times will appear in colour. Note that the <guilabel>Quoted text</guilabel> colours only work in the message reader, not in the composer. </para>
 
 </sect2>
 
 <sect2 id="configure-appearance-layout">
-<title
->Layout</title>
-
-<para
-><guilabel
->Show HTML status bar</guilabel
-> activates a bar at the left side of the reader pane that tells you if a message is &html; or not. This is important because &html; messages might imitate the look of a signed and encrypted message, so you should be aware of the fact that you are reading a &html; message. The &html; status bar itself cannot be influenced by the &html; code of the message.</para>
-
-<para
->The <guilabel
->Window Layout</guilabel
-> section lets you choose the layout of the main window. You can choose where you want the <guilabel
->Message Preview Pane</guilabel
-> or choose not to have it at all.</para>
-
-<para
->The <guilabel
->Message Structure Viewer</guilabel
-> option lets you choose when the structure viewer will be shown: the structure viewer is a part of the main window that lets you access all parts of a message. <guilabel
->Show never</guilabel
-> will disable the structure viewer (note that you can still access attachments as icons), <guilabel
->Show always</guilabel
-> will show the structure viewer even if there is only one plaintext part. <guilabel
->Show only for non-plaintext messages</guilabel
-> will display the structure viewer only if it makes sense, &ie; if the current message has attachments or has &html; parts.</para>
+<title>Layout</title>
+
+<para><guilabel>Show HTML status bar</guilabel> activates a bar at the left side of the reader pane that tells you if a message is &html; or not. This is important because &html; messages might imitate the look of a signed and encrypted message, so you should be aware of the fact that you are reading a &html; message. The &html; status bar itself cannot be influenced by the &html; code of the message.</para>
+
+<para>The <guilabel>Window Layout</guilabel> section lets you choose the layout of the main window. You can choose where you want the <guilabel>Message Preview Pane</guilabel> or choose not to have it at all.</para>
+
+<para>The <guilabel>Message Structure Viewer</guilabel> option lets you choose when the structure viewer will be shown: the structure viewer is a part of the main window that lets you access all parts of a message. <guilabel>Show never</guilabel> will disable the structure viewer (note that you can still access attachments as icons), <guilabel>Show always</guilabel> will show the structure viewer even if there is only one plaintext part. <guilabel>Show only for non-plaintext messages</guilabel> will display the structure viewer only if it makes sense, &ie; if the current message has attachments or has &html; parts.</para>
 
 </sect2>
 
 <sect2 id="configure-appearance-headers">
-<title
->Headers</title>
-
-<para
->With <guilabel
->Display message sizes</guilabel
-> selected there will be another column in the header pane that shows the messages' size.</para>
-
-<para
-><guilabel
->Show crypto icons</guilabel
-> will add more status information to the <guilabel
->Subject</guilabel
-> columns in the header pane: every message that has been signed will have a small <guiicon
->Signed</guiicon
-> icon in front of the subject, every message that has been encrypted will have a small <guiicon
->Encrypted</guiicon
-> icon in front of the subject. Note that you have to select a message once before these icons will appear, until then only question marks will be displayed.</para>
-
-<para
-><guilabel
->Thread list of message headers</guilabel
-> will put all the messages in the header pane in a kind of tree list, so that the replies to a message are directly below that message.</para>
-
-<para
->With <guilabel
->Message header threading options</guilabel
-> you can select whether threads should appear expanded (<guilabel
->open</guilabel
->) by default or whether they should be collapsed (<guilabel
->closed</guilabel
->). You can of course still open/close threads using the <guilabel
->+</guilabel
->/<guilabel
->-</guilabel
-> buttons.</para
-> 
-
-<para
->With <guilabel
->Date Display</guilabel
-> you can choose between several date formats. The <guilabel
->Localised Format</guilabel
-> is the one you can specify under <guilabel
->Country &amp; Language</guilabel
-> in &kcontrol;. For the <guilabel
->Custom</guilabel
-> format you can get a description of the possible values by pressing <keycombo action="simul"
->&Shift;<keycap
->F1</keycap
-></keycombo
-> and then clicking on <guilabel
->Custom</guilabel
-> option.</para>
+<title>Headers</title>
+
+<para>With <guilabel>Display message sizes</guilabel> selected there will be another column in the header pane that shows the messages' size.</para>
+
+<para><guilabel>Show crypto icons</guilabel> will add more status information to the <guilabel>Subject</guilabel> columns in the header pane: every message that has been signed will have a small <guiicon>Signed</guiicon> icon in front of the subject, every message that has been encrypted will have a small <guiicon>Encrypted</guiicon> icon in front of the subject. Note that you have to select a message once before these icons will appear, until then only question marks will be displayed.</para>
+
+<para><guilabel>Thread list of message headers</guilabel> will put all the messages in the header pane in a kind of tree list, so that the replies to a message are directly below that message.</para>
+
+<para>With <guilabel>Message header threading options</guilabel> you can select whether threads should appear expanded (<guilabel>open</guilabel>) by default or whether they should be collapsed (<guilabel>closed</guilabel>). You can of course still open/close threads using the <guilabel>+</guilabel>/<guilabel>-</guilabel> buttons.</para> 
+
+<para>With <guilabel>Date Display</guilabel> you can choose between several date formats. The <guilabel>Localised Format</guilabel> is the one you can specify under <guilabel>Country &amp; Language</guilabel> in &kcontrol;. For the <guilabel>Custom</guilabel> format you can get a description of the possible values by pressing <keycombo action="simul">&Shift;<keycap>F1</keycap></keycombo> and then clicking on <guilabel>Custom</guilabel> option.</para>
 
 </sect2>
 
 <sect2 id="configure-appearance-systemtray">
-<title
->System Tray</title>
-
-<para
->If you enable the system tray icon then a small &kmail; icon with the number of unread messages will be shown in the system tray. You can enable &kmail;'s system tray icon with <guilabel
->Enable system tray icon</guilabel
->, and with <guilabel
->System Tray Mode</guilabel
-> you can specify whether the tray icon should always be shown or only if you have unread messages.</para>
-
-<para
->If the icon is visible then you can hide &kmail;'s main window by clicking on the icon or by clicking on the window close button. By clicking on the icon you can make &kmail;'s main window visible again. If you click on the icon with the <mousebutton
->right</mousebutton
-> mousebutton then you get a menu with a few useful commands. You can check for new mail, create a new message or quit &kmail;. Additionally, there is the entry <guilabel
->New Messages In</guilabel
-> which lists all folders containing unread messages. If you choose one of those folders then this folder will be selected in &kmail;'s main window. </para>
+<title>System Tray</title>
+
+<para>If you enable the system tray icon then a small &kmail; icon with the number of unread messages will be shown in the system tray. You can enable &kmail;'s system tray icon with <guilabel>Enable system tray icon</guilabel>, and with <guilabel>System Tray Mode</guilabel> you can specify whether the tray icon should always be shown or only if you have unread messages.</para>
+
+<para>If the icon is visible then you can hide &kmail;'s main window by clicking on the icon or by clicking on the window close button. By clicking on the icon you can make &kmail;'s main window visible again. If you click on the icon with the <mousebutton>right</mousebutton> mousebutton then you get a menu with a few useful commands. You can check for new mail, create a new message or quit &kmail;. Additionally, there is the entry <guilabel>New Messages In</guilabel> which lists all folders containing unread messages. If you choose one of those folders then this folder will be selected in &kmail;'s main window. </para>
 
 </sect2>
 
@@ -988,92 +396,58 @@
 </sect1>
 
   <sect1 id="configure-composer">
-    <title
->Composer Page </title>
+    <title>Composer Page </title>
 
     <sect2 id="configure-composer-general">
-      <title
->General </title>
+      <title>General </title>
 
       <variablelist>
 	<varlistentry id="configure-composer-general-append-signature">
 	  <term>
-	    <guilabel
->Automatically append signature</guilabel>
+	    <guilabel>Automatically append signature</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->If checked, your signature as defined in the <link linkend="configure-identity-signature"
->identity page</link
-> is automatically included at the end of all messages you create (&ie; new messages, replies &etc;). </para>
+	    <para>If checked, your signature as defined in the <link linkend="configure-identity-signature">identity page</link> is automatically included at the end of all messages you create (&ie; new messages, replies &etc;). </para>
 	  </listitem>
 	</varlistentry>
 	<varlistentry id="configure-composer-general-smart-quoting">
 	  <term>
-	    <guilabel
->Use smart quoting</guilabel>
+	    <guilabel>Use smart quoting</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->If checked, &kmail; will break long lines but will try to keep the correct quoting (&eg; the <quote
->&gt; </quote
-> will always be at the start of the line). </para>
+	    <para>If checked, &kmail; will break long lines but will try to keep the correct quoting (&eg; the <quote>&gt; </quote> will always be at the start of the line). </para>
 	  </listitem>
 	</varlistentry>
 	<varlistentry id="configure-composer-general-auto-request-mdns">
 	  <term>
-	    <guilabel
->Automatically request message disposition notifications</guilabel>
+	    <guilabel>Automatically request message disposition notifications</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->If checked, <xref linkend="composer-options-request-mdn"/> will default to <emphasis
->on</emphasis
->. Check this option only if you know what you are doing. &mdn;s are considered a nuisance (or are simply ignored) by a lot of people. It is better to decide to request them on a message-by-message basis. </para>
+	    <para>If checked, <xref linkend="composer-options-request-mdn"/> will default to <emphasis>on</emphasis>. Check this option only if you know what you are doing. &mdn;s are considered a nuisance (or are simply ignored) by a lot of people. It is better to decide to request them on a message-by-message basis. </para>
 	  </listitem>
 	</varlistentry>
 	<varlistentry id="configure-composer-general-word-wrap">
 	  <term>
-	    <guilabel
->Word wrap at column</guilabel>
+	    <guilabel>Word wrap at column</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->Lets you turn word wrapping on and off in the composer window and lets you set the column at which words will be wrapped (you probably should not need to change the default value, which is <literal
->78</literal
->). </para>
+	    <para>Lets you turn word wrapping on and off in the composer window and lets you set the column at which words will be wrapped (you probably should not need to change the default value, which is <literal>78</literal>). </para>
 	  </listitem>
 	</varlistentry>
 	<varlistentry id="configure-composer-general-autosave-interval">
 	  <term>
-	    <guilabel
->Autosave interval</guilabel>
+	    <guilabel>Autosave interval</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->A backup copy of the text in the composer window can be created regularly. This option lets you specify the interval used to create the backup. You can disable autosaving by setting it to the value <literal
->0</literal
->. </para>
+	    <para>A backup copy of the text in the composer window can be created regularly. This option lets you specify the interval used to create the backup. You can disable autosaving by setting it to the value <literal>0</literal>. </para>
 	  </listitem>
 	</varlistentry>
 	<varlistentry id="configure-composer-general-external-editor">
 	  <term>
-	    <guilabel
->External Editor</guilabel>
+	    <guilabel>External Editor</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->If you do not like the Composer you can use a different editor. Note that the composer window will still open and the external editor will open as soon as you type just one character in the body of the message. If you are done, save the text and exit the editor. The text will now appear in the composer window, where you can send it. Note that your editor may not return immediately, you have to use &eg; <userinput
-> <command
-> gvim <option
->-f</option
-> <varname
->%f</varname
-> </command
-> </userinput
-> for <application
->gvim</application
->. </para>
+	    <para>If you do not like the Composer you can use a different editor. Note that the composer window will still open and the external editor will open as soon as you type just one character in the body of the message. If you are done, save the text and exit the editor. The text will now appear in the composer window, where you can send it. Note that your editor may not return immediately, you have to use &eg; <userinput> <command> gvim <option>-f</option> <varname>%f</varname> </command> </userinput> for <application>gvim</application>. </para>
 	  </listitem>
 	</varlistentry>
       </variablelist>
@@ -1082,281 +456,167 @@
 
 
 <sect2 id="configure-composer-phrases">
-<title
->Phrases</title>
-
-<para
->The <guilabel
->Phrases</guilabel
-> tab lets you define the automatically generated lines that are added to message replies, forwarded messages, and the character that is added in front of quoted text. There are special &percnt;-denoted characters that will insert certain values, which are also displayed at the top of the <guilabel
->Phrases</guilabel
-> section. You can add reply phrases in languages other than your default &kde; language using the <guibutton
->Add...</guibutton
-> button. You can then choose between different languages with the <guilabel
->Language</guilabel
-> drop down box. This will only work for languages whose i18n package you have installed.</para>
+<title>Phrases</title>
+
+<para>The <guilabel>Phrases</guilabel> tab lets you define the automatically generated lines that are added to message replies, forwarded messages, and the character that is added in front of quoted text. There are special &percnt;-denoted characters that will insert certain values, which are also displayed at the top of the <guilabel>Phrases</guilabel> section. You can add reply phrases in languages other than your default &kde; language using the <guibutton>Add...</guibutton> button. You can then choose between different languages with the <guilabel>Language</guilabel> drop down box. This will only work for languages whose i18n package you have installed.</para>
 
 </sect2>
 
 <sect2 id="configure-composer-subject">
-<title
->Subject</title>
-
-<para
->This section contains a list of prefixes for <quote
->Reply</quote
-> and <quote
->Forward</quote
->. If you receive messages that use prefixes different to the standard ones, you can add them here so &kmail; will recognise them. This way &kmail; can ignore them for sorting messages and when setting the subject of a reply or a forwarded messages, and optionally replace them with <quote
->Re:</quote
-> or <quote
->Fwd:</quote
-> respectively.</para>
+<title>Subject</title>
+
+<para>This section contains a list of prefixes for <quote>Reply</quote> and <quote>Forward</quote>. If you receive messages that use prefixes different to the standard ones, you can add them here so &kmail; will recognise them. This way &kmail; can ignore them for sorting messages and when setting the subject of a reply or a forwarded messages, and optionally replace them with <quote>Re:</quote> or <quote>Fwd:</quote> respectively.</para>
 
 </sect2>
 
 <sect2 id="configure-composer-charset">
-<title
->Charset</title>
-
-<para
->Here you can manage the default charsets used for your own messages. Every message you send will be checked if it is written in one of the listed charsets, starting at the top of the list. If it is, this charset will be used. If it is not, a dialogue will show up and tell you that you manually have to choose a charset using <menuchoice
-><guimenu
->Options</guimenu
-><guisubmenu
->Set Encoding</guisubmenu
-></menuchoice
->. </para>
-
-<para
->If you select <guilabel
->Keep original charset when replying or forwarding (if possible)</guilabel
->, the original message's charset will be kept, unless there are now characters that cannot be represented using that charset.</para>
+<title>Charset</title>
+
+<para>Here you can manage the default charsets used for your own messages. Every message you send will be checked if it is written in one of the listed charsets, starting at the top of the list. If it is, this charset will be used. If it is not, a dialogue will show up and tell you that you manually have to choose a charset using <menuchoice><guimenu>Options</guimenu><guisubmenu>Set Encoding</guisubmenu></menuchoice>. </para>
+
+<para>If you select <guilabel>Keep original charset when replying or forwarding (if possible)</guilabel>, the original message's charset will be kept, unless there are now characters that cannot be represented using that charset.</para>
 
 </sect2>
 
 <sect2 id="configure-composer-headers">
-<title
->Headers</title>
-
-<para
->Check the <guilabel
->Use custom message-id suffix</guilabel
-> checkbox if you want &kmail; to generate Message-Id's with a custom suffix. Enter the desired suffix in the <guilabel
->Custom message-id suffix</guilabel
-> field. Please make sure that the suffix that you specify is world-wide unique. The best thing is to use the name of a domain which you are the owner of. If you do not check <guilabel
->Use custom Message-Id suffix</guilabel
-> then &kmail; will automatically generate the complete Message-Id. If you do not know what this is all about do not check this option.</para>
-
-<para
->The <guilabel
->Define custom mime header fields</guilabel
-> list sets the headers that &kmail; will use for its outgoing messages. You can both invent new fields and overwrite existing ones. This feature is only useful for advanced users.</para>
+<title>Headers</title>
+
+<para>Check the <guilabel>Use custom message-id suffix</guilabel> checkbox if you want &kmail; to generate Message-Id's with a custom suffix. Enter the desired suffix in the <guilabel>Custom message-id suffix</guilabel> field. Please make sure that the suffix that you specify is world-wide unique. The best thing is to use the name of a domain which you are the owner of. If you do not check <guilabel>Use custom Message-Id suffix</guilabel> then &kmail; will automatically generate the complete Message-Id. If you do not know what this is all about do not check this option.</para>
+
+<para>The <guilabel>Define custom mime header fields</guilabel> list sets the headers that &kmail; will use for its outgoing messages. You can both invent new fields and overwrite existing ones. This feature is only useful for advanced users.</para>
 
 </sect2>
 
 <sect2 id="configure-composer-attachments">
-<title
->Attachments</title>
+<title>Attachments</title>
 
-<para
->If you have to send attachments with filenames containing non-English characters to users of Outlook(TM) or Outlook Express(TM) then you might want to check the <guilabel
->Outlook-compatible attachment naming</guilabel
-> option. &kmail; will then encode the attachment names in a non-standard way that is understood by Outlook(TM).</para>
-<para
->Note that &kmail; will create non-standard compliant messages, and consequently it is possible that your messages will not be understood by standard-compliant mail clients. So, unless you have no other choice, you should not enable this option.</para>
+<para>If you have to send attachments with filenames containing non-English characters to users of Outlook(TM) or Outlook Express(TM) then you might want to check the <guilabel>Outlook-compatible attachment naming</guilabel> option. &kmail; will then encode the attachment names in a non-standard way that is understood by Outlook(TM).</para>
+<para>Note that &kmail; will create non-standard compliant messages, and consequently it is possible that your messages will not be understood by standard-compliant mail clients. So, unless you have no other choice, you should not enable this option.</para>
 
-<para
->Check the <guilabel
->Enable detection of missing attachments</guilabel
-> checkbox if you want &kmail; to warn you whenever you are about to send a message without attachments although the message text contains certain words which indicate that you wanted to include an attachment. The list of key words can be modified.</para>
+<para>Check the <guilabel>Enable detection of missing attachments</guilabel> checkbox if you want &kmail; to warn you whenever you are about to send a message without attachments although the message text contains certain words which indicate that you wanted to include an attachment. The list of key words can be modified.</para>
 
 </sect2>
 
 </sect1>
 
   <sect1 id="configure-security">
-    <title
->Security Page </title>
+    <title>Security Page </title>
 
     <sect2 id="configure-security-reading">
-      <title
->Reading </title>
+      <title>Reading </title>
 
-      <para
->On this tab you can configure security-relevant options for reading messages. </para>
+      <para>On this tab you can configure security-relevant options for reading messages. </para>
 
       <variablelist>
 
 	<varlistentry id="configure-security-reading-prefer-html">
 	  <term>
-	    <guilabel
->Prefer HTML to plain text</guilabel>
+	    <guilabel>Prefer HTML to plain text</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->If checked, &kmail; will show &html; messages with their &html; formatting and layout. We strongly recommend to leave this option off, as security problems with &html; might show up. When this option is off, you can still read &html; messages, but only as plain text. </para>
+	    <para>If checked, &kmail; will show &html; messages with their &html; formatting and layout. We strongly recommend to leave this option off, as security problems with &html; might show up. When this option is off, you can still read &html; messages, but only as plain text. </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry id="configure-security-reading-external-references">
 	  <term>
-	    <guilabel
->Allow messages to load external references from the Internet</guilabel>
+	    <guilabel>Allow messages to load external references from the Internet</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->If checked, &kmail; can load external images, style sheets &etc; from the Internet when you look at an &html; message. We strongly recommend to leave this option off (although it has no effect if you only view plain text messages). By adding external references to their messages, people sending spam can detect that and when you have looked at their message. Note that this option has no effect on &Java;, JavaScript and Plugins - these are disabled anyway and cannot be enabled at all. </para>
+	    <para>If checked, &kmail; can load external images, style sheets &etc; from the Internet when you look at an &html; message. We strongly recommend to leave this option off (although it has no effect if you only view plain text messages). By adding external references to their messages, people sending spam can detect that and when you have looked at their message. Note that this option has no effect on &Java;, JavaScript and Plugins - these are disabled anyway and cannot be enabled at all. </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry id="configure-security-reading-mdns">
 	  <term>
-	    <guilabel
->Message Disposition Notifications</guilabel>
+	    <guilabel>Message Disposition Notifications</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->&mdn;s are a generalisation of what is commonly called a <quote
->read receipt</quote
->. The message author requests a disposition notification to be sent and the receiver's mail program generates a reply from which the author can learn what happened to his message. Common disposition types include <quote
->displayed</quote
-> (&ie; read), <quote
->deleted</quote
-> and <quote
->dispatched</quote
-> (&eg; forwarded). </para>
-	    <para
->The following options (listed as <guilabel
->Send policy</guilabel
->) are available to control <emphasis
->when</emphasis
-> &kmail; sends &mdn;s: </para>
+	    <para>&mdn;s are a generalisation of what is commonly called a <quote>read receipt</quote>. The message author requests a disposition notification to be sent and the receiver's mail program generates a reply from which the author can learn what happened to his message. Common disposition types include <quote>displayed</quote> (&ie; read), <quote>deleted</quote> and <quote>dispatched</quote> (&eg; forwarded). </para>
+	    <para>The following options (listed as <guilabel>Send policy</guilabel>) are available to control <emphasis>when</emphasis> &kmail; sends &mdn;s: </para>
 	    <variablelist>
 	      <varlistentry>
-		<term
-><guilabel
->Ignore</guilabel
-> (recommended) </term>
+		<term><guilabel>Ignore</guilabel> (recommended) </term>
 		<listitem>
-		  <para
->Ignores any request for disposition notifications. No &mdn; will ever be sent automatically. </para>
+		  <para>Ignores any request for disposition notifications. No &mdn; will ever be sent automatically. </para>
 		</listitem>
 	      </varlistentry>
 	      <varlistentry>
 		<term>
-		  <guilabel
->Ask</guilabel>
+		  <guilabel>Ask</guilabel>
 		</term>
 		<listitem>
-		  <para
->Answers requests only after asking the user for permission. This way, you can send &mdn;s for selected messages while denying or ignoring them for others. </para>
+		  <para>Answers requests only after asking the user for permission. This way, you can send &mdn;s for selected messages while denying or ignoring them for others. </para>
 		</listitem>
 	      </varlistentry>
 	      <varlistentry>
 		<term>
-		  <guilabel
->Deny</guilabel>
+		  <guilabel>Deny</guilabel>
 		</term>
 		<listitem>
-		  <para
->Always sends a <quote
->denied</quote
-> notification. This is only <emphasis
->slightly</emphasis
-> better than always sending &mdn;s. The author will still know that the messages has been acted upon, he just cannot tell whether it was deleted or read &etc; </para>
+		  <para>Always sends a <quote>denied</quote> notification. This is only <emphasis>slightly</emphasis> better than always sending &mdn;s. The author will still know that the messages has been acted upon, he just cannot tell whether it was deleted or read &etc; </para>
 		</listitem>
 	      </varlistentry>
 	      <varlistentry>
 		<term>
-		  <guilabel
->Always send</guilabel>
+		  <guilabel>Always send</guilabel>
 		</term>
 		<listitem>
-		  <para
->Always sends the requested disposition notification. That means that the author of the message gets to know when the message was acted upon and, in addition, what happened to it (displayed, deleted &etc;). This option is strongly discouraged, but since it makes sense where privacy is not a concern, &eg; in customer relationship management, it has been made available. </para>
+		  <para>Always sends the requested disposition notification. That means that the author of the message gets to know when the message was acted upon and, in addition, what happened to it (displayed, deleted &etc;). This option is strongly discouraged, but since it makes sense where privacy is not a concern, &eg; in customer relationship management, it has been made available. </para>
 		</listitem>
 	      </varlistentry>
 	    </variablelist>
-	    <para
->If you are unsure, experiment a while with <guilabel
->Ask</guilabel
-> and if you find &kmail;s questions annoying, switch to <guilabel
->Ignore</guilabel
->. </para>
-	    <para
->The following options (listed as <guilabel
->Quote original message</guilabel
->) are available to control <emphasis
->how much</emphasis
-> of the original message &kmail; sends back in &mdn;s. </para>
+	    <para>If you are unsure, experiment a while with <guilabel>Ask</guilabel> and if you find &kmail;s questions annoying, switch to <guilabel>Ignore</guilabel>. </para>
+	    <para>The following options (listed as <guilabel>Quote original message</guilabel>) are available to control <emphasis>how much</emphasis> of the original message &kmail; sends back in &mdn;s. </para>
 	    <variablelist>
 	      <varlistentry>
 		<term>
-		  <guilabel
->Nothing</guilabel>
+		  <guilabel>Nothing</guilabel>
 		</term>
 		<listitem>
-		  <para
->No parts of the message other than the mandatory message-id and the original recipient is included in the &mdn; reply. This preserves enough information for the sender to find the message in his sent messages for which this &mdn; was generated. </para>
+		  <para>No parts of the message other than the mandatory message-id and the original recipient is included in the &mdn; reply. This preserves enough information for the sender to find the message in his sent messages for which this &mdn; was generated. </para>
 		</listitem>
 	      </varlistentry>
 	      <varlistentry>
 		<term>
-		  <guilabel
->Full message</guilabel>
+		  <guilabel>Full message</guilabel>
 		</term>
 		<listitem>
-		  <para
->Attaches the complete message to the disposition notification. Usually, this is overkill. It does not add any valuable information that cannot be deduced from the message headers alone, but people sometimes insist on this, since it is much easier for humans to correlate the content of the message than just the headers to what they sent earlier. </para>
+		  <para>Attaches the complete message to the disposition notification. Usually, this is overkill. It does not add any valuable information that cannot be deduced from the message headers alone, but people sometimes insist on this, since it is much easier for humans to correlate the content of the message than just the headers to what they sent earlier. </para>
 		</listitem>
 	      </varlistentry>
 	      <varlistentry>
 		<term>
-		  <guilabel
->Only headers</guilabel>
+		  <guilabel>Only headers</guilabel>
 		</term>
 		<listitem>
-		  <para
->Attaches only the headers to the disposition notification. This is usually enough to enable both humans (by subject) and computers (by message-id) to easily correlate &mdn; and original message. </para>
+		  <para>Attaches only the headers to the disposition notification. This is usually enough to enable both humans (by subject) and computers (by message-id) to easily correlate &mdn; and original message. </para>
 		</listitem>
 	      </varlistentry>
 	    </variablelist>
-	    <para
->If unsure, leave the option at the default. </para>
+	    <para>If unsure, leave the option at the default. </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term>
-	    <guilabel
->Do not send MDNs in response to encrypted messages</guilabel>
+	    <guilabel>Do not send MDNs in response to encrypted messages</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->This option suppresses the sending of &mdn;s if the message is encrypted (partially or in whole). This thwarts attempts to use &kmail;'s &mdn; feature as an <emphasis
->oracle</emphasis
-> to deduce whether you were able to decrypt the message or not. </para>
-	    <para
->Strictly speaking, this option is not needed, since &kmail; sends &mdn;s regardless of whether the message could be successfully decrypted or not (the disposition notification request resides in the unencrypted part of the message), but it gives the security-conscious user the choice to either send them always if requested (option unchecked), or never (option checked). </para>
-	    <para
->If unsure, leave the option checked. </para>
+	    <para>This option suppresses the sending of &mdn;s if the message is encrypted (partially or in whole). This thwarts attempts to use &kmail;'s &mdn; feature as an <emphasis>oracle</emphasis> to deduce whether you were able to decrypt the message or not. </para>
+	    <para>Strictly speaking, this option is not needed, since &kmail; sends &mdn;s regardless of whether the message could be successfully decrypted or not (the disposition notification request resides in the unencrypted part of the message), but it gives the security-conscious user the choice to either send them always if requested (option unchecked), or never (option checked). </para>
+	    <para>If unsure, leave the option checked. </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term>
-	    <guilabel
->Automatically import keys and certificates</guilabel>
+	    <guilabel>Automatically import keys and certificates</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->If checked, &kmail; automatically imports any attachments containing &openpgp; keys into your local keyring, and any attachments containing &smime; keys into your local key box. </para>
+	    <para>If checked, &kmail; automatically imports any attachments containing &openpgp; keys into your local keyring, and any attachments containing &smime; keys into your local key box. </para>
 	    <note>
-	      <para
->Verifying &smime; signatures always involves importing the contained certificates. This option thus does not affect this. It is also unrelated to &gpg;'s <option
->auto-key-retrieve</option
-> feature, where &gpg; will try to import unknown keys from a key server. </para>
+	      <para>Verifying &smime; signatures always involves importing the contained certificates. This option thus does not affect this. It is also unrelated to &gpg;'s <option>auto-key-retrieve</option> feature, where &gpg; will try to import unknown keys from a key server. </para>
 	    </note>
 	  </listitem>
 	</varlistentry>
@@ -1364,120 +624,73 @@
     </sect2>
 
     <sect2 id="configure-security-composing">
-      <title
->Composing </title>
+      <title>Composing </title>
 
-      <para
->On this tab you can configure security-relevant options for composing messages. </para>
+      <para>On this tab you can configure security-relevant options for composing messages. </para>
 
       <variablelist>
 
 	<varlistentry id="configure-security-composing-automatically-sign">
 	  <term>
-	    <guilabel
->Automatically sign messages</guilabel>
+	    <guilabel>Automatically sign messages</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->If checked, the <xref linkend="composer-options-sign-message"/> option in the composer will default to <emphasis
->on</emphasis
->. </para>
-	    <para
->However, you can still switch it on and off on a per-message basis. </para>
+	    <para>If checked, the <xref linkend="composer-options-sign-message"/> option in the composer will default to <emphasis>on</emphasis>. </para>
+	    <para>However, you can still switch it on and off on a per-message basis. </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry id="configure-security-composing-encrypt-to-self">
 	  <term>
-	    <guilabel
->Always encrypt to self</guilabel>
+	    <guilabel>Always encrypt to self</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->If checked, any message that is encrypted to the recipients will additionally be encrypted to yourself. </para>
+	    <para>If checked, any message that is encrypted to the recipients will additionally be encrypted to yourself. </para>
 	    <warning>
-	      <para
->If you uncheck this option, you may not be able to decrypt the messages written by yourself and encrypted to other people anymore. </para>
+	      <para>If you uncheck this option, you may not be able to decrypt the messages written by yourself and encrypted to other people anymore. </para>
 	    </warning>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry id="configure-security-composing-store-sent-encrypted">
 	  <term>
-	    <guilabel
->Store sent messages encrypted</guilabel
-><!--
+	    <guilabel>Store sent messages encrypted</guilabel><!--
 	    --><footnote>
-	      <para
->This options enables a mode of using mail encryption that is sometimes (misleadingly) called <quote
->transport-only</quote
-> encryption. In this mode of operation, the message encryption is stripped off as soon as the message has reached its destination. The encryption lasts only while the message is on its way. </para>
-	      <para
->&kmail; supports this mode half-heartedly, since such functionality should better placed at the mail <emphasis
->server</emphasis
-> (<acronym
->MTA</acronym
->) than at the mail <emphasis
->client</emphasis
-> (<acronym
->MUA</acronym
->) level. Thus, future versions of &kmail; may drop support for this option. </para>
+	      <para>This options enables a mode of using mail encryption that is sometimes (misleadingly) called <quote>transport-only</quote> encryption. In this mode of operation, the message encryption is stripped off as soon as the message has reached its destination. The encryption lasts only while the message is on its way. </para>
+	      <para>&kmail; supports this mode half-heartedly, since such functionality should better placed at the mail <emphasis>server</emphasis> (<acronym>MTA</acronym>) than at the mail <emphasis>client</emphasis> (<acronym>MUA</acronym>) level. Thus, future versions of &kmail; may drop support for this option. </para>
 	    </footnote>
 	  </term>
 	  <listitem>
-	    <para
->If checked, messages are stored in your <guilabel
->sent-mail</guilabel
-> folder just as you sent them (&ie; if they were encrypted, they are also stored that way). </para>
-	    <para
->If unchecked, messages will <emphasis
->always</emphasis
-> be stored unencrypted in your <guilabel
->sent-mail</guilabel
-> folder, even if they are sent encrypted. </para>
+	    <para>If checked, messages are stored in your <guilabel>sent-mail</guilabel> folder just as you sent them (&ie; if they were encrypted, they are also stored that way). </para>
+	    <para>If unchecked, messages will <emphasis>always</emphasis> be stored unencrypted in your <guilabel>sent-mail</guilabel> folder, even if they are sent encrypted. </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry id="configure-security-composing-show-encryption-key">
 	  <term>
-	    <guilabel
->Always show the encryption keys for approval</guilabel>
+	    <guilabel>Always show the encryption keys for approval</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->If checked, everytime you encrypt a message, a dialogue will appear that presents you with the encryption keys that will be used for each recipient. You can then review the choice of keys, change them, and approve or cancel the encryption operation. We recommend to keep this option checked, since it makes the encryption process more transparent. </para>
+	    <para>If checked, everytime you encrypt a message, a dialogue will appear that presents you with the encryption keys that will be used for each recipient. You can then review the choice of keys, change them, and approve or cancel the encryption operation. We recommend to keep this option checked, since it makes the encryption process more transparent. </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry id="configure-security-composing-opportunistic-encryption">
 	  <term>
-	    <guilabel
->Automatically encrypt messages whenever possible</guilabel>
+	    <guilabel>Automatically encrypt messages whenever possible</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->Also called <quote
->opportunistic encryption</quote
->. If checked, &kmail; will try to match recipients to (&openpgp; or &smime;) keys even when you did <emphasis
->not</emphasis
-> specifically request encryption. If usable keys are found for all recipients, &kmail; will ask whether or not you want to encrypt the message. </para>
-	    <para
->It is highly recommended to turn this on, as it makes encrypting messages really easy to use. </para>
+	    <para>Also called <quote>opportunistic encryption</quote>. If checked, &kmail; will try to match recipients to (&openpgp; or &smime;) keys even when you did <emphasis>not</emphasis> specifically request encryption. If usable keys are found for all recipients, &kmail; will ask whether or not you want to encrypt the message. </para>
+	    <para>It is highly recommended to turn this on, as it makes encrypting messages really easy to use. </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry id="configure-security-composing-never-sign-encrypt-drafts">
 	  <term>
-	    <guilabel
->Never sign/encrypt when saving as draft</guilabel>
+	    <guilabel>Never sign/encrypt when saving as draft</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->If checked, &kmail; will not attempt to sign and/or encrypt messages that are merely saved to the <guilabel
->drafts</guilabel
-> folder. This is more convenient, and does not result in a gross loss of security, provided the drafts folder is safe. &imap; users might want this options turned off, if their <guilabel
->drafts</guilabel
-> folder is on the server. </para>
+	    <para>If checked, &kmail; will not attempt to sign and/or encrypt messages that are merely saved to the <guilabel>drafts</guilabel> folder. This is more convenient, and does not result in a gross loss of security, provided the drafts folder is safe. &imap; users might want this options turned off, if their <guilabel>drafts</guilabel> folder is on the server. </para>
 	  </listitem>
 	</varlistentry>
 
@@ -1486,84 +699,59 @@
     </sect2>
 
     <sect2 id="configure-security-warnings">
-      <title
->Warnings </title>
+      <title>Warnings </title>
 
-      <para
->On this tab you can switch security-relavant warnings on and off. </para>
+      <para>On this tab you can switch security-relavant warnings on and off. </para>
 
       <variablelist>
 
 	<varlistentry id="configure-security-warnings-warn-send-unsigned">
 	  <term>
-	    <guilabel
->Warn when trying to send unsigned messages</guilabel>
+	    <guilabel>Warn when trying to send unsigned messages</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->If checked, &kmail; will show a warning if for whatever reason a message would be sent without being digitally signed. </para>
+	    <para>If checked, &kmail; will show a warning if for whatever reason a message would be sent without being digitally signed. </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry id="configure-security-warnings-warn-send-unencrypted">
 	  <term>
-	    <guilabel
->Warn when trying to send unencrypted messages</guilabel>
+	    <guilabel>Warn when trying to send unencrypted messages</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->If checked, &kmail; will show a warning if for whatever reason a message would be sent without being encrypted. </para>
+	    <para>If checked, &kmail; will show a warning if for whatever reason a message would be sent without being encrypted. </para>
 	    <note>
-	      <para
->While it is common to sign all outgoing messages, encrypting them is not. So unless your company has a policy of never sending any unencrypted messages, it might be a good idea to keep this option switched off and rely on <link linkend="configure-security-composing-opportunistic-encryption"
->opportunistic encryption</link
-> to alert you if you <emphasis
->could</emphasis
-> send encrypted messages, but did not request it. </para>
+	      <para>While it is common to sign all outgoing messages, encrypting them is not. So unless your company has a policy of never sending any unencrypted messages, it might be a good idea to keep this option switched off and rely on <link linkend="configure-security-composing-opportunistic-encryption">opportunistic encryption</link> to alert you if you <emphasis>could</emphasis> send encrypted messages, but did not request it. </para>
 	    </note>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry id="configure-security-warnings-warn-receiver-email-not-in-cert">
 	  <term>
-	    <guilabel
->Warn if receiver's email address is not in certificate</guilabel>
+	    <guilabel>Warn if receiver's email address is not in certificate</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->If checked, &kmail; will emit a warning if an &smime; certifciate or &openpgp; key will be used for a recipient whose email address is not listed in the email addresses stored in the certificate. </para>
-	    <para
->Situations in which this warning will trigger include when configuring your per-identity &openpgp; keys or &smime; certificates, when encrypting, and when verifying signatures, if the signature was made with a certificate that does not include the email address of the sender. </para>
+	    <para>If checked, &kmail; will emit a warning if an &smime; certifciate or &openpgp; key will be used for a recipient whose email address is not listed in the email addresses stored in the certificate. </para>
+	    <para>Situations in which this warning will trigger include when configuring your per-identity &openpgp; keys or &smime; certificates, when encrypting, and when verifying signatures, if the signature was made with a certificate that does not include the email address of the sender. </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry id="configure-security-warnings-warn-near-expire">
 	  <term>
-	    <guilabel
->Warn if certificates/keys expire soon</guilabel>
+	    <guilabel>Warn if certificates/keys expire soon</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->If checked, &kmail; will warn when an &smime; certificate or &openpgp; key is used which will expire soon. </para>
-	    <para
->The period in which to warn before key/certificate expiration can then be configured separately for signing and encryption keys, as well as (in the case of &smime;), for end-user certificates, intermediate <acronym
->CA</acronym
-> certificates and root certificates. </para>
+	    <para>If checked, &kmail; will warn when an &smime; certificate or &openpgp; key is used which will expire soon. </para>
+	    <para>The period in which to warn before key/certificate expiration can then be configured separately for signing and encryption keys, as well as (in the case of &smime;), for end-user certificates, intermediate <acronym>CA</acronym> certificates and root certificates. </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry id="configure-security-warnings-reenable-all-warnings">
 	  <term>
-	    <guilabel
->Re-Enable All &quot;Don&apos;t Ask Again&quot; Warnings</guilabel>
+	    <guilabel>Re-Enable All &quot;Don&apos;t Ask Again&quot; Warnings</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->Apart from the main warnings described above, there are more warning and information messages, which contain an option to not show them again. If you would like to re-enable them after choosing not to show them again, you can achieve this by pressing this button. <footnote
-> <para
->This will re-enable <emphasis
->all</emphasis
-> such warnings for &kmail;. It does not make much sense to allow more fine-grained selection of which warnings to show since you can just check the option to suppress them again when they next show up. </para>
+	    <para>Apart from the main warnings described above, there are more warning and information messages, which contain an option to not show them again. If you would like to re-enable them after choosing not to show them again, you can achieve this by pressing this button. <footnote> <para>This will re-enable <emphasis>all</emphasis> such warnings for &kmail;. It does not make much sense to allow more fine-grained selection of which warnings to show since you can just check the option to suppress them again when they next show up. </para>
 	      </footnote>
 	    </para>
 	  </listitem>
@@ -1574,192 +762,96 @@
     </sect2>
 
     <sect2 id="configure-security-smime-validation">
-      <title
->&smime; Validation </title>
+      <title>&smime; Validation </title>
 
-      <para
->This tab contains selected entries from &gpgsm;'s <link linkend="configure-security-crypto-backends-configure"
->dynamic backend configuration dialogue</link
->. Please refer to the &gpgsm; manual for a description of these options. </para>
+      <para>This tab contains selected entries from &gpgsm;'s <link linkend="configure-security-crypto-backends-configure">dynamic backend configuration dialogue</link>. Please refer to the &gpgsm; manual for a description of these options. </para>
     </sect2>
 
     <sect2 id="configure-security-crypto-backends">
-      <title
->Crypto Backends </title>
+      <title>Crypto Backends </title>
 
-      <para
->On this tab you can configure which crypto backends are to be used for &openpgp; and &smime; cryptographic operations (such as signing and encrypting). </para>
+      <para>On this tab you can configure which crypto backends are to be used for &openpgp; and &smime; cryptographic operations (such as signing and encrypting). </para>
 
-      <para
->On the right-hand side, you see a list of available backends. Below each backend entry, you can see what protocols (&openpgp; and/or &smime;) the backend supports. If a protocol is not listed, the backend does not support it. If it is listed, but greyed out, the backend supports the protocol, but some required programs were not found, or other errors occurred during initialisation. If you press <guibutton
->Rescan</guibutton
->, a dialogue box will appear that lists reasons for the initialisation failure. </para>
+      <para>On the right-hand side, you see a list of available backends. Below each backend entry, you can see what protocols (&openpgp; and/or &smime;) the backend supports. If a protocol is not listed, the backend does not support it. If it is listed, but greyed out, the backend supports the protocol, but some required programs were not found, or other errors occurred during initialisation. If you press <guibutton>Rescan</guibutton>, a dialogue box will appear that lists reasons for the initialisation failure. </para>
 
-      <para id="configure-security-crypto-backends-configure"
->To configure a backend, select it in the list of available backends and press <guibutton
->Configure...</guibutton
->. The per-backend configuration dialogue is dynamically created from the information returned by the backend. It may therefore change if you update the backend applications, although &kmail; itself is unchanged. If the <guibutton
->Configure...</guibutton
-> button is disabled, the backend does not support a backend configuration dialogue. </para>
+      <para id="configure-security-crypto-backends-configure">To configure a backend, select it in the list of available backends and press <guibutton>Configure...</guibutton>. The per-backend configuration dialogue is dynamically created from the information returned by the backend. It may therefore change if you update the backend applications, although &kmail; itself is unchanged. If the <guibutton>Configure...</guibutton> button is disabled, the backend does not support a backend configuration dialogue. </para>
 
-      <para
->Please refer to the manuals of the applications underlying each backend for a description of the options presented in the backend configuration dialogues. </para>
+      <para>Please refer to the manuals of the applications underlying each backend for a description of the options presented in the backend configuration dialogues. </para>
 
-      <para
->In front of each backend's protocol entries, you can see a checkbox, with which you select which backend is to be used for a given protocol. These checkboxes are exclusive per protocol, meaning that if you select a backend to perform &openpgp; operations, any previously selected &openpgp; implementation will be unselected, but the &smime; backend selection will be unchanged. If no backend is selected for a given protocol, that protocol is effectively disabled for use in &kmail;. </para>
+      <para>In front of each backend's protocol entries, you can see a checkbox, with which you select which backend is to be used for a given protocol. These checkboxes are exclusive per protocol, meaning that if you select a backend to perform &openpgp; operations, any previously selected &openpgp; implementation will be unselected, but the &smime; backend selection will be unchanged. If no backend is selected for a given protocol, that protocol is effectively disabled for use in &kmail;. </para>
 
     </sect2>
 
-  </sect1
-> <!-- configure-security -->
+  </sect1> <!-- configure-security -->
 
 <sect1 id="configure-misc">
-<title
->Misc Page</title>
+<title>Misc Page</title>
 
 <sect2 id="configure-misc-folders">
-<title
->Folders</title>
+<title>Folders</title>
 
 <variablelist>
 
 <varlistentry>
-<term
-><guilabel
->Ask for confirmation before moving all messages to the wastebin</guilabel
-></term>
+<term><guilabel>Ask for confirmation before moving all messages to the wastebin</guilabel></term>
 <listitem>
-<para
->Enable this option if you want to be asked for confirmation whenever you use <menuchoice
-><guimenu
->Folder</guimenu
-><guimenuitem
->Move All Messages to Wastebin</guimenuitem
-></menuchoice
->.</para>
+<para>Enable this option if you want to be asked for confirmation whenever you use <menuchoice><guimenu>Folder</guimenu><guimenuitem>Move All Messages to Wastebin</guimenuitem></menuchoice>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Exclude important messages from expiry</guilabel
-></term>
+<term><guilabel>Exclude important messages from expiry</guilabel></term>
 <listitem>
-<para
->Enable this option if important messages should never be deleted during message expiration, &ie; during automatic deletion of old messages.</para>
+<para>Enable this option if important messages should never be deleted during message expiration, &ie; during automatic deletion of old messages.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry id="configure-misc-folders-go-unread">
-<term
-><guilabel
->When trying to find unread messages</guilabel
-></term>
+<term><guilabel>When trying to find unread messages</guilabel></term>
 <listitem>
-<para
->This option controls what happens if you press one of the shortcuts to go to the next or previous unread message (&eg; <keycap
->Space</keycap
->). If you ask &kmail; to go to the next unread message although there is no unread message below the currently selected message then the following happens: <itemizedlist
-> <listitem
-> <para
->If <guilabel
->Do not Loop</guilabel
-> is selected then nothing will happen. </para
-> </listitem
-> <listitem
-> <para
->If <guilabel
->Loop in Current Folder</guilabel
-> is selected then &kmail; will search from the beginning of the current folder for an unread message. If none is found then nothing happens.</para
-> </listitem
-> <listitem
-> <para
->If <guilabel
->Loop in All Folders</guilabel
-> is selected then &kmail; will first search in the current folder for another unread message. If none is found then &kmail; will search the next folder containing unread messages. </para
-> </listitem
-> </itemizedlist
-> Correspondingly, if you ask &kmail; to go to the previous unread message. </para>
+<para>This option controls what happens if you press one of the shortcuts to go to the next or previous unread message (&eg; <keycap>Space</keycap>). If you ask &kmail; to go to the next unread message although there is no unread message below the currently selected message then the following happens: <itemizedlist> <listitem> <para>If <guilabel>Do not Loop</guilabel> is selected then nothing will happen. </para> </listitem> <listitem> <para>If <guilabel>Loop in Current Folder</guilabel> is selected then &kmail; will search from the beginning of the current folder for an unread message. If none is found then nothing happens.</para> </listitem> <listitem> <para>If <guilabel>Loop in All Folders</guilabel> is selected then &kmail; will first search in the current folder for another unread message. If none is found then &kmail; will search the next folder containing unread messages. </para> </listitem> </itemizedlist> Correspondingly, if you ask &kmail; to go to the previous unread message. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Jump to first unread message when entering a folder</guilabel
-></term>
+<term><guilabel>Jump to first unread message when entering a folder</guilabel></term>
 <listitem>
-<para
->If this option is enabled &kmail; will go to the first unread message when you enter a folder; if it is not enabled, &kmail; will go to first new message or, if there is no new message, to the message that was selected when you last left the folder.</para>
+<para>If this option is enabled &kmail; will go to the first unread message when you enter a folder; if it is not enabled, &kmail; will go to first new message or, if there is no new message, to the message that was selected when you last left the folder.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Mark selected message as read after...</guilabel
-></term>
+<term><guilabel>Mark selected message as read after...</guilabel></term>
 <listitem>
-<para
->When you select a <guilabel
->new</guilabel
-> or <guilabel
->unread</guilabel
-> message, &kmail; will change the message's status to <guilabel
->read</guilabel
-> after the number of seconds entered here. If you disable this option, messages will keep their <guilabel
->new</guilabel
-> or <guilabel
->unread</guilabel
-> status.</para>
+<para>When you select a <guilabel>new</guilabel> or <guilabel>unread</guilabel> message, &kmail; will change the message's status to <guilabel>read</guilabel> after the number of seconds entered here. If you disable this option, messages will keep their <guilabel>new</guilabel> or <guilabel>unread</guilabel> status.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Ask for action after dragging messages to another folder</guilabel
-></term>
+<term><guilabel>Ask for action after dragging messages to another folder</guilabel></term>
 <listitem>
-<para
->When you drag a message to a different folder, a small popup will ask you if you want to move or copy the message. If you disable this option, the message will be moved immediately, without a popup.</para>
+<para>When you drag a message to a different folder, a small popup will ask you if you want to move or copy the message. If you disable this option, the message will be moved immediately, without a popup.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->By default, message folders on disk are...</guilabel
-></term>
+<term><guilabel>By default, message folders on disk are...</guilabel></term>
 <listitem>
-<para
->Here you can set the default <link linkend="folders-format"
->folder format</link
-> that is used when you create a new folder.</para>
+<para>Here you can set the default <link linkend="folders-format">folder format</link> that is used when you create a new folder.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Open this folder on startup</guilabel
-></term>
+<term><guilabel>Open this folder on startup</guilabel></term>
 <listitem>
-<para
->Here you can set the folder that should be selected by default if you start &kmail;. If you use only &imap; folders then you might want to set this to your &imap; inbox folder.</para>
+<para>Here you can set the folder that should be selected by default if you start &kmail;. If you use only &imap; folders then you might want to set this to your &imap; inbox folder.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Empty wastebin on program exit</guilabel
-></term>
+<term><guilabel>Empty wastebin on program exit</guilabel></term>
 <listitem>
-<para
->The wastebin folder is cleared of messages when you quit &kmail; if this option is selected.</para
-> 
+<para>The wastebin folder is cleared of messages when you quit &kmail; if this option is selected.</para> 
 </listitem>
 </varlistentry>
 
@@ -1768,118 +860,58 @@
 </sect2>
 
 <sect2 id="configure-misc-groupware">
-<title
->Groupware</title>
+<title>Groupware</title>
 
 <variablelist>
 
 <varlistentry>
-<term
-><guilabel
->Enable IMAP resource functionality</guilabel
-></term>
+<term><guilabel>Enable IMAP resource functionality</guilabel></term>
 <listitem>
-<para
->Makes it possible to store the entries from the Kontact applications (KOrganizer, KAddressBook and KNotes). This option has to be set whenever you are configuring Kontact as a <guilabel
->TDE Kolab client</guilabel
->. This option being enabled you will also need to add the appropriate resources from the <guilabel
->TDE Control Center</guilabel
-> (kcontrol) in the <guilabel
->TDE Resources Configuration</guilabel
-> section. <guilabel
->Kolab</guilabel
-> resources have to be added in case the resource functionality applies to a <guilabel
->TDE Kolab client</guilabel
-> set-up.</para>
+<para>Makes it possible to store the entries from the Kontact applications (KOrganizer, KAddressBook and KNotes). This option has to be set whenever you are configuring Kontact as a <guilabel>TDE Kolab client</guilabel>. This option being enabled you will also need to add the appropriate resources from the <guilabel>TDE Control Center</guilabel> (kcontrol) in the <guilabel>TDE Resources Configuration</guilabel> section. <guilabel>Kolab</guilabel> resources have to be added in case the resource functionality applies to a <guilabel>TDE Kolab client</guilabel> set-up.</para>
 </listitem>
 </varlistentry>
 <varlistentry id="configure-misc-format-groupware-folders">
-<term
-><guilabel
->Format used for the groupware folders</guilabel
-></term>
+<term><guilabel>Format used for the groupware folders</guilabel></term>
 <listitem>
-<para
->Choose the storage format for the groupware folders</para>
+<para>Choose the storage format for the groupware folders</para>
 <itemizedlist>
 <listitem>
-<para
->Default format is <guilabel
->Standard (Ical/Vcard)</guilabel
-> for calendar folders (Ical) and addressbook folders (Vcard). This makes all Kontact features available.</para>
+<para>Default format is <guilabel>Standard (Ical/Vcard)</guilabel> for calendar folders (Ical) and addressbook folders (Vcard). This makes all Kontact features available.</para>
 </listitem>
 <listitem>
-<para
-><guilabel
->Kolab</guilabel
-> users should choose <guilabel
->Kolab XML</guilabel
->. This format uses a custom model that matches more closely to the one used in Microsoft Outlook(tm) and gives better compatibility.</para>
+<para><guilabel>Kolab</guilabel> users should choose <guilabel>Kolab XML</guilabel>. This format uses a custom model that matches more closely to the one used in Microsoft Outlook(tm) and gives better compatibility.</para>
 </listitem>
 </itemizedlist>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Language of the groupware folders</guilabel
-></term>
+<term><guilabel>Language of the groupware folders</guilabel></term>
 <listitem>
-<para
->Choose between the available languages to set the folder names of the <guilabel
->IMAP</guilabel
-> storage to your local language. Note that this option is only aimed for compatibility with Microsoft Outlook(tm). It is not recommended to change its default unless you have to, since it makes changing languages impossible.</para>
+<para>Choose between the available languages to set the folder names of the <guilabel>IMAP</guilabel> storage to your local language. Note that this option is only aimed for compatibility with Microsoft Outlook(tm). It is not recommended to change its default unless you have to, since it makes changing languages impossible.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Resource folders are in account</guilabel
-></term>
+<term><guilabel>Resource folders are in account</guilabel></term>
 <listitem>
-<para
->Select the parent of the <guilabel
->IMAP</guilabel
-> resource folders. You should select the name of your <guilabel
->IMAP/DIMAP</guilabel
-> account. By default the <guilabel
->Kolab</guilabel
-> server sets the <guilabel
->IMAP</guilabel
-> inbox to be the parent.</para>
+<para>Select the parent of the <guilabel>IMAP</guilabel> resource folders. You should select the name of your <guilabel>IMAP/DIMAP</guilabel> account. By default the <guilabel>Kolab</guilabel> server sets the <guilabel>IMAP</guilabel> inbox to be the parent.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Hide groupware folders</guilabel
-></term>
+<term><guilabel>Hide groupware folders</guilabel></term>
 <listitem>
-<para
->You should not need to see the folders that hold the <guilabel
->IMAP</guilabel
-> resources. However if you want to see them, you can set that by enabling this option.</para>
+<para>You should not need to see the folders that hold the <guilabel>IMAP</guilabel> resources. However if you want to see them, you can set that by enabling this option.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Mangle From:/To: headers in replies to invitations</guilabel
-></term>
+<term><guilabel>Mangle From:/To: headers in replies to invitations</guilabel></term>
 <listitem>
-<para
->Enable this option to make Microsoft Outlook(tm) understand your answers to invitations replies.</para>
+<para>Enable this option to make Microsoft Outlook(tm) understand your answers to invitations replies.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Send invitations in the mail body</guilabel
-></term>
+<term><guilabel>Send invitations in the mail body</guilabel></term>
 <listitem>
-<para
->Invitations use to be send as attachments to a mail. By enabling this option, you let the invitation mails to be sent in the text of the mail, which is necessary to send invitations and replies to Microsoft Outlook(tm).</para
-> 
+<para>Invitations use to be send as attachments to a mail. By enabling this option, you let the invitation mails to be sent in the text of the mail, which is necessary to send invitations and replies to Microsoft Outlook(tm).</para> 
 </listitem>
 </varlistentry>
 </variablelist>
diff --git a/tde-i18n-en_GB/docs/tdepim/kmail/credits-and-licenses.docbook b/tde-i18n-en_GB/docs/tdepim/kmail/credits-and-licenses.docbook
index 1f8878ab685..119a0f422e6 100644
--- a/tde-i18n-en_GB/docs/tdepim/kmail/credits-and-licenses.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/kmail/credits-and-licenses.docbook
@@ -2,394 +2,114 @@
 
 <chapterinfo>
 <authorgroup>
-<author
-><firstname
->Daniel</firstname
-> <surname
->Naber</surname
-> <affiliation
-><address
-> <email
->daniel.naber@t-online.de</email>
-</address
-></affiliation>
+<author><firstname>Daniel</firstname> <surname>Naber</surname> <affiliation><address> <email>daniel.naber@t-online.de</email>
+</address></affiliation>
 </author>
-<author
-><firstname
->David</firstname
-> <surname
->Rugge</surname
-> <affiliation
-><address
-> <email
->davidrugge@mediaone.net</email>
-</address
-></affiliation>
+<author><firstname>David</firstname> <surname>Rugge</surname> <affiliation><address> <email>davidrugge@mediaone.net</email>
+</address></affiliation>
 </author>
-<othercredit role="translator"
-><firstname
->Andrew</firstname
-><surname
->Coles</surname
-><affiliation
-><address
-><email
->andrew_coles@yahoo.co.uk</email
-></address
-></affiliation
-><contrib
->British English English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Andrew</firstname><surname>Coles</surname><affiliation><address><email>andrew_coles@yahoo.co.uk</email></address></affiliation><contrib>British English English</contrib></othercredit> 
 </authorgroup>
-<date
->2004-07-13</date
-> <releaseinfo
->1.7</releaseinfo
-> </chapterinfo>
+<date>2004-07-13</date> <releaseinfo>1.7</releaseinfo> </chapterinfo>
 
-<title
->Credits and Licences</title>
+<title>Credits and Licences</title>
 
-<para
->&kmail;: Copyright the &kmail; developers, 1997-2004</para>
+<para>&kmail;: Copyright the &kmail; developers, 1997-2004</para>
 &underGPL; &underFDL; <sect1 id="team">
-<title
->Development Team</title>
+<title>Development Team</title>
 <!-- please keep in sync with the authors list on the webpage -->
 
 <!-- don't modify manually, this list is generated: -->
 <itemizedlist>
-<listitem
-><para
->Ingo Kl&ouml;cker (kloecker at kde org): Maintainer</para
-></listitem>
-<listitem
-><para
->Don Sanders (sanders at kde org): Adopter and co-maintainer</para
-></listitem>
-<listitem
-><para
->Stefan Taferner (taferner at kde org): Original author</para
-></listitem>
-<listitem
-><para
->Michael H&auml;ckel (haeckel at kde org): Former maintainer</para
-></listitem>
-<listitem
-><para
->Till Adam (till at adam-lilienthal de): Core developer</para
-></listitem>
-<listitem
-><para
->Carsten Burghardt (burghardt at kde org): Core developer</para
-></listitem>
-<listitem
-><para
->Marc Mutz (mutz at kde org): Core developer</para
-></listitem>
-<listitem
-><para
->Daniel Naber (daniel naber at t-online de): Documentation</para
-></listitem>
-<listitem
-><para
->Zack Rusin (zack at kde org): Core developer</para
-></listitem>
-<listitem
-><para
->Toyohiro Asukai (toyohiro at ksmplus com)</para
-></listitem>
-<listitem
-><para
->Waldo Bastian (bastian at kde org)</para
-></listitem>
-<listitem
-><para
->Ryan Breen (ryan at ryanbreen com): system tray notification</para
-></listitem>
-<listitem
-><para
->Steven Brown (swbrown at ucsd edu)</para
-></listitem>
-<listitem
-><para
->Matthias Kalle Dalheimer (kalle at kde org)</para
-></listitem>
-<listitem
-><para
->Cristi Dumitrescu (cristid at chip ro)</para
-></listitem>
-<listitem
-><para
->David Faure (faure at kde org)</para
-></listitem>
-<listitem
-><para
->Philippe Fremy (pfremy at chez com)</para
-></listitem>
-<listitem
-><para
->Kurt Granroth (granroth at kde org)</para
-></listitem>
-<listitem
-><para
->Andreas Gungl (a gungl at gmx de): PGP 6 support and further enhancements of the encryption support</para
-></listitem>
-<listitem
-><para
->Steffen Hansen (hansen at kde org)</para
-></listitem>
-<listitem
-><para
->Igor Janssen (rm at linux ru net)</para
-></listitem>
-<listitem
-><para
->Matt Johnston (matt at caifex org)</para
-></listitem>
-<listitem
-><para
->Christer Kaivo-oja (whizkid at telia com)</para
-></listitem>
-<listitem
-><para
->Lars Knoll (knoll at kde org): Original encryption support, PGP 2 and PGP 5 support</para
-></listitem>
-<listitem
-><para
->J. Nick Koston (bdraco at darkorb net): GnuPG support</para
-></listitem>
-<listitem
-><para
->Stephan Kulow (coolo at kde org)</para
-></listitem>
-<listitem
-><para
->Guillaume Laurent (glaurent at telegraph-road org)</para
-></listitem>
-<listitem
-><para
->Sam Magnuson (sam at trolltech com)</para
-></listitem>
-<listitem
-><para
->Laurent Montel (lmontel at mandrakesoft com)</para
-></listitem>
-<listitem
-><para
->Matt Newell (newellm at proaxis com)</para
-></listitem>
-<listitem
-><para
->Denis Perchine (dyp at perchine com)</para
-></listitem>
-<listitem
-><para
->Samuel Penn (sam at bifrost demon co uk)</para
-></listitem>
-<listitem
-><para
->Carsten Pfeiffer (pfeiffer at kde org)</para
-></listitem>
-<listitem
-><para
->Sven Radej (radej at kde org)</para
-></listitem>
-<listitem
-><para
->Mark Roberts (mark at taurine demon co uk)</para
-></listitem>
-<listitem
-><para
->Wolfgang Rohdewald (wrohdewald at dplanet ch)</para
-></listitem>
-<listitem
-><para
->Espen Sand (espen at kde org)</para
-></listitem>
-<listitem
-><para
->Aaron J. Seigo (aseigo at olympusproject org)</para
-></listitem>
-<listitem
-><para
->George Staikos (staikos at kde org)</para
-></listitem>
-<listitem
-><para
->Jason Stephenson (panda at mis net)</para
-></listitem>
-<listitem
-><para
->Jacek Stolarczyk (jacek at mer chemia polsl gliwice pl)</para
-></listitem>
-<listitem
-><para
->Roberto S. Teixeira (maragato at kde org)</para
-></listitem>
-<listitem
-><para
->Bo Thorsen (bo at sonofthor dk)</para
-></listitem>
-<listitem
-><para
->Ronen Tzur (rtzur at shani net)</para
-></listitem>
-<listitem
-><para
->Mario Weilguni (mweilguni at sime com)</para
-></listitem>
-<listitem
-><para
->Wynn Wilkes (wynnw at calderasystems com)</para
-></listitem>
-<listitem
-><para
->Robert D. Williams (rwilliams at kde org)</para
-></listitem>
-<listitem
-><para
->Markus W&uuml;bben (markus wuebben at kde org)</para
-></listitem>
-<listitem
-><para
->Karl-Heinz Zimmer (khz at kde org)</para
-></listitem>
+<listitem><para>Ingo Kl&ouml;cker (kloecker at kde org): Maintainer</para></listitem>
+<listitem><para>Don Sanders (sanders at kde org): Adopter and co-maintainer</para></listitem>
+<listitem><para>Stefan Taferner (taferner at kde org): Original author</para></listitem>
+<listitem><para>Michael H&auml;ckel (haeckel at kde org): Former maintainer</para></listitem>
+<listitem><para>Till Adam (till at adam-lilienthal de): Core developer</para></listitem>
+<listitem><para>Carsten Burghardt (burghardt at kde org): Core developer</para></listitem>
+<listitem><para>Marc Mutz (mutz at kde org): Core developer</para></listitem>
+<listitem><para>Daniel Naber (daniel naber at t-online de): Documentation</para></listitem>
+<listitem><para>Zack Rusin (zack at kde org): Core developer</para></listitem>
+<listitem><para>Toyohiro Asukai (toyohiro at ksmplus com)</para></listitem>
+<listitem><para>Waldo Bastian (bastian at kde org)</para></listitem>
+<listitem><para>Ryan Breen (ryan at ryanbreen com): system tray notification</para></listitem>
+<listitem><para>Steven Brown (swbrown at ucsd edu)</para></listitem>
+<listitem><para>Matthias Kalle Dalheimer (kalle at kde org)</para></listitem>
+<listitem><para>Cristi Dumitrescu (cristid at chip ro)</para></listitem>
+<listitem><para>David Faure (faure at kde org)</para></listitem>
+<listitem><para>Philippe Fremy (pfremy at chez com)</para></listitem>
+<listitem><para>Kurt Granroth (granroth at kde org)</para></listitem>
+<listitem><para>Andreas Gungl (a gungl at gmx de): PGP 6 support and further enhancements of the encryption support</para></listitem>
+<listitem><para>Steffen Hansen (hansen at kde org)</para></listitem>
+<listitem><para>Igor Janssen (rm at linux ru net)</para></listitem>
+<listitem><para>Matt Johnston (matt at caifex org)</para></listitem>
+<listitem><para>Christer Kaivo-oja (whizkid at telia com)</para></listitem>
+<listitem><para>Lars Knoll (knoll at kde org): Original encryption support, PGP 2 and PGP 5 support</para></listitem>
+<listitem><para>J. Nick Koston (bdraco at darkorb net): GnuPG support</para></listitem>
+<listitem><para>Stephan Kulow (coolo at kde org)</para></listitem>
+<listitem><para>Guillaume Laurent (glaurent at telegraph-road org)</para></listitem>
+<listitem><para>Sam Magnuson (sam at trolltech com)</para></listitem>
+<listitem><para>Laurent Montel (lmontel at mandrakesoft com)</para></listitem>
+<listitem><para>Matt Newell (newellm at proaxis com)</para></listitem>
+<listitem><para>Denis Perchine (dyp at perchine com)</para></listitem>
+<listitem><para>Samuel Penn (sam at bifrost demon co uk)</para></listitem>
+<listitem><para>Carsten Pfeiffer (pfeiffer at kde org)</para></listitem>
+<listitem><para>Sven Radej (radej at kde org)</para></listitem>
+<listitem><para>Mark Roberts (mark at taurine demon co uk)</para></listitem>
+<listitem><para>Wolfgang Rohdewald (wrohdewald at dplanet ch)</para></listitem>
+<listitem><para>Espen Sand (espen at kde org)</para></listitem>
+<listitem><para>Aaron J. Seigo (aseigo at olympusproject org)</para></listitem>
+<listitem><para>George Staikos (staikos at kde org)</para></listitem>
+<listitem><para>Jason Stephenson (panda at mis net)</para></listitem>
+<listitem><para>Jacek Stolarczyk (jacek at mer chemia polsl gliwice pl)</para></listitem>
+<listitem><para>Roberto S. Teixeira (maragato at kde org)</para></listitem>
+<listitem><para>Bo Thorsen (bo at sonofthor dk)</para></listitem>
+<listitem><para>Ronen Tzur (rtzur at shani net)</para></listitem>
+<listitem><para>Mario Weilguni (mweilguni at sime com)</para></listitem>
+<listitem><para>Wynn Wilkes (wynnw at calderasystems com)</para></listitem>
+<listitem><para>Robert D. Williams (rwilliams at kde org)</para></listitem>
+<listitem><para>Markus W&uuml;bben (markus wuebben at kde org)</para></listitem>
+<listitem><para>Karl-Heinz Zimmer (khz at kde org)</para></listitem>
 </itemizedlist>
 
 </sect1>
 
 <sect1 id="credits">
-<title
->Credits</title>
+<title>Credits</title>
 
 <itemizedlist>
-<listitem
-><para
->Heiko Hund (heiko at ist eigentlich net): POP filters</para
-></listitem>
-<listitem
-><para
->Bernhard Reiter (bernhard at intevation de): &Auml;gypten and Kroupware project management</para
-></listitem>
-<listitem
-><para
->Jan Simonson (jan at simonson pp se): beta testing of PGP 6 support</para
-></listitem>
-<listitem
-><para
->Patrick S. Vogt (patrick vogt at unibas ch): timestamp for 'Transmission completed' status messages</para
-></listitem>
-<listitem
-><para
->Jan-Oliver Wagner (jan at intevation de): &Auml;gypten and Kroupware project management</para
-></listitem>
-<listitem
-><para
->Wolfgang Westphal (wolfgang westphal at gmx de): multiple encryption keys per address</para
-></listitem>
-<listitem
-><para
->Thorsten Zachmann (t zachmann at zagge de): POP filters</para
-></listitem>
+<listitem><para>Heiko Hund (heiko at ist eigentlich net): POP filters</para></listitem>
+<listitem><para>Bernhard Reiter (bernhard at intevation de): &Auml;gypten and Kroupware project management</para></listitem>
+<listitem><para>Jan Simonson (jan at simonson pp se): beta testing of PGP 6 support</para></listitem>
+<listitem><para>Patrick S. Vogt (patrick vogt at unibas ch): timestamp for 'Transmission completed' status messages</para></listitem>
+<listitem><para>Jan-Oliver Wagner (jan at intevation de): &Auml;gypten and Kroupware project management</para></listitem>
+<listitem><para>Wolfgang Westphal (wolfgang westphal at gmx de): multiple encryption keys per address</para></listitem>
+<listitem><para>Thorsten Zachmann (t zachmann at zagge de): POP filters</para></listitem>
 </itemizedlist>
 
 </sect1>
 
 <sect1 id="documentation">
-<title
->Documentation</title>
+<title>Documentation</title>
 
-<para
->Update for &kmail; 1.7 by Ingo Kl&ouml;cker <email
->kloecker@kde.de</email
-> and Marc Mutz <email
->mutz@kde.org</email
->, Anti-Spam Wizard chapter by Andreas Gungl <email
->a.gungl@gmx.de</email
->, section about filter log by Andreas Gungl <email
->a.gungl@gmx.de</email
-> and Brad Hards <email
->bradh@frogmouth.net</email
->, additional changes by Daniel Naber <email
->daniel.naber@t-online.de</email
->.</para>
+<para>Update for &kmail; 1.7 by Ingo Kl&ouml;cker <email>kloecker@kde.de</email> and Marc Mutz <email>mutz@kde.org</email>, Anti-Spam Wizard chapter by Andreas Gungl <email>a.gungl@gmx.de</email>, section about filter log by Andreas Gungl <email>a.gungl@gmx.de</email> and Brad Hards <email>bradh@frogmouth.net</email>, additional changes by Daniel Naber <email>daniel.naber@t-online.de</email>.</para>
 
-<para
->Update for &kmail; 1.2 to 1.5 by Daniel Naber <email
->daniel.naber@t-online.de</email
->, <application
->OpenPGP</application
-> chapter by Andreas Gungl <email
->a.gungl@gmx.de</email
-> and Ingo Kl&ouml;cker <email
->kloecker@kde.de</email
->, message filter chapter by Marc Mutz <email
->mutz@kde.org</email
->, download filter chapter by Thorsten Zachmann <email
->T.Zachmann@zagge.de</email
->. Other parts have been contributed by various &kmail; developers.</para>
+<para>Update for &kmail; 1.2 to 1.5 by Daniel Naber <email>daniel.naber@t-online.de</email>, <application>OpenPGP</application> chapter by Andreas Gungl <email>a.gungl@gmx.de</email> and Ingo Kl&ouml;cker <email>kloecker@kde.de</email>, message filter chapter by Marc Mutz <email>mutz@kde.org</email>, download filter chapter by Thorsten Zachmann <email>T.Zachmann@zagge.de</email>. Other parts have been contributed by various &kmail; developers.</para>
 
-<para
->&kmail; 1.0 documentation by David Rugge <email
->davidrugge@mediaone.net</email
->. Original documentation by Markus Wuebben <email
->markus.wuebben@kde.org</email
->, Robert Williams <email
->rwilliams@kde.org</email
-> (Editor).</para>
+<para>&kmail; 1.0 documentation by David Rugge <email>davidrugge@mediaone.net</email>. Original documentation by Markus Wuebben <email>markus.wuebben@kde.org</email>, Robert Williams <email>rwilliams@kde.org</email> (Editor).</para>
 
-<para
->Thanks to Michael Elkins <email
->me@cs.hmc.edu</email
-> for his excellent description of the different &UNIX; mail formats in the <application
->Mutt</application
-> documentation.</para>
+<para>Thanks to Michael Elkins <email>me@cs.hmc.edu</email> for his excellent description of the different &UNIX; mail formats in the <application>Mutt</application> documentation.</para>
 
-<para
->Thanks to the following people for providing directions on using other email client mailboxes with &kmail;:</para>
+<para>Thanks to the following people for providing directions on using other email client mailboxes with &kmail;:</para>
 
 <itemizedlist>
-<listitem
-><para
->Nik Gaffney <email
->nik@f0.am</email
-> (<application
->Mailsmith</application
->)</para
-></listitem>
-<listitem
-><para
->David McMillen <email
->mcmillen@math.bu.edu</email
-> and Mendel Mobach <email
->mendel@mobach.nl</email
-> (&Netscape; mail)</para
-></listitem>
-<listitem
-><para
->Ed Shapard <email
->shapard@bigfoot.com</email
-> (<application
->Pegasus</application
-> Mail)</para
-></listitem>
-<listitem
-><para
->Ray Muir <email
->rjmuir@ibm.net</email
-> (Forte <application
->Agent</application
->)</para
-></listitem>
+<listitem><para>Nik Gaffney <email>nik@f0.am</email> (<application>Mailsmith</application>)</para></listitem>
+<listitem><para>David McMillen <email>mcmillen@math.bu.edu</email> and Mendel Mobach <email>mendel@mobach.nl</email> (&Netscape; mail)</para></listitem>
+<listitem><para>Ed Shapard <email>shapard@bigfoot.com</email> (<application>Pegasus</application> Mail)</para></listitem>
+<listitem><para>Ray Muir <email>rjmuir@ibm.net</email> (Forte <application>Agent</application>)</para></listitem>
 </itemizedlist>
 
-<para
->Andrew Coles<email
->andrew_coles@yahoo.co.uk</email
-></para
-> 
+<para>Andrew Coles<email>andrew_coles@yahoo.co.uk</email></para> 
 
 </sect1>
 </chapter>
diff --git a/tde-i18n-en_GB/docs/tdepim/kmail/faq.docbook b/tde-i18n-en_GB/docs/tdepim/kmail/faq.docbook
index e1f1455aba3..2f59836d914 100644
--- a/tde-i18n-en_GB/docs/tdepim/kmail/faq.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/kmail/faq.docbook
@@ -2,56 +2,18 @@
 
 <chapterinfo>
 <authorgroup>
-<author
-><firstname
->Daniel</firstname
-> <surname
->Naber</surname
-> <affiliation
-><address
-> <email
->daniel.naber@t-online.de</email>
-</address
-></affiliation>
+<author><firstname>Daniel</firstname> <surname>Naber</surname> <affiliation><address> <email>daniel.naber@t-online.de</email>
+</address></affiliation>
 </author>
-<author
-><firstname
->David</firstname
-> <surname
->Rugge</surname
-> <affiliation
-><address
-> <email
->davidrugge@mediaone.net</email>
-</address
-></affiliation>
+<author><firstname>David</firstname> <surname>Rugge</surname> <affiliation><address> <email>davidrugge@mediaone.net</email>
+</address></affiliation>
 </author>
-<othercredit role="translator"
-><firstname
->Andrew</firstname
-><surname
->Coles</surname
-><affiliation
-><address
-><email
->andrew_coles@yahoo.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Andrew</firstname><surname>Coles</surname><affiliation><address><email>andrew_coles@yahoo.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
-<date
->2004-07-14</date
-> <releaseinfo
->1.7</releaseinfo
-> </chapterinfo>
+<date>2004-07-14</date> <releaseinfo>1.7</releaseinfo> </chapterinfo>
 
-<title
->Frequently Asked Questions (&FAQ;)</title>
-<!-- TODO: split into categories? unfortunately this will produce several files, eg. with <section
-> -->
+<title>Frequently Asked Questions (&FAQ;)</title>
+<!-- TODO: split into categories? unfortunately this will produce several files, eg. with <section> -->
 
 <qandaset id="faq-set">
 
@@ -59,605 +21,218 @@
 ~/Mail (incl. hidden ones) to the new ~/Mail folder -->
 
 <qandaentry>
-<question
-><para
->Why are my filters not applied to incoming messages of IMAP accounts?</para
-></question>
+<question><para>Why are my filters not applied to incoming messages of IMAP accounts?</para></question>
 <answer>
-<para
->Normal IMAP mode does not support filtering, but the new disconnected IMAP account type does. You could try to use server-side filtering (ask your admin for how to install filters on the server and in which format), since IMAP is all about managing your email <emphasis
->on the server</emphasis
->. Unfortunately, although there exists a mail filter language (Sieve, defined in RFC3028), there is no standardised access protocol for installing or editing server-side Sieve scripts. If such a protocol becomes available in the future, &kmail; will most probably include support for it.</para>
+<para>Normal IMAP mode does not support filtering, but the new disconnected IMAP account type does. You could try to use server-side filtering (ask your admin for how to install filters on the server and in which format), since IMAP is all about managing your email <emphasis>on the server</emphasis>. Unfortunately, although there exists a mail filter language (Sieve, defined in RFC3028), there is no standardised access protocol for installing or editing server-side Sieve scripts. If such a protocol becomes available in the future, &kmail; will most probably include support for it.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->Using <application
->PGP</application
-> or <application
->GnuPG</application
-> is very slow or it blocks &kmail;.</para
-></question>
+<question><para>Using <application>PGP</application> or <application>GnuPG</application> is very slow or it blocks &kmail;.</para></question>
 <answer>
-<para
->&kmail; accesses <application
->PGP</application
->/<application
->GnuPG</application
-> synchronously, &ie; it blocks while <application
->PGP</application
->/<application
->GnuPG</application
-> works. This means that you might want to disable automatic retrieval of unknown keys from a keyserver to make &kmail; look more responsive. If you are using <application
->GnuPG</application
-> 1.0.7 (or better) or upgraded from an earlier version, then make sure to run <command
->gpg <option
->--rebuild-keydb-caches</option
-></command
-> once and <command
->gpg <option
->--check-trustdb</option
-></command
-> after every import or refresh. Both will speed up <application
->GnuPG</application
-> immensely.</para>
+<para>&kmail; accesses <application>PGP</application>/<application>GnuPG</application> synchronously, &ie; it blocks while <application>PGP</application>/<application>GnuPG</application> works. This means that you might want to disable automatic retrieval of unknown keys from a keyserver to make &kmail; look more responsive. If you are using <application>GnuPG</application> 1.0.7 (or better) or upgraded from an earlier version, then make sure to run <command>gpg <option>--rebuild-keydb-caches</option></command> once and <command>gpg <option>--check-trustdb</option></command> after every import or refresh. Both will speed up <application>GnuPG</application> immensely.</para>
 </answer>
 </qandaentry>
 
 <qandaentry id="pgp-faq">
-<question
-><para
->What should I know if I want to use <application
->PGP</application
->/<application
->GnuPG</application
-> with &kmail;?</para
-></question>
-
-<answer
-><para
->&kmail; provides a simple and easy-to-use interface for the basic functions of these programs; still you should understand how these programs work and what might make their use insecure. Some important issues:</para>
+<question><para>What should I know if I want to use <application>PGP</application>/<application>GnuPG</application> with &kmail;?</para></question>
+
+<answer><para>&kmail; provides a simple and easy-to-use interface for the basic functions of these programs; still you should understand how these programs work and what might make their use insecure. Some important issues:</para>
 
 <itemizedlist>
 <listitem>
-<para
->You <emphasis
->really</emphasis
-> should test if encryption works before you use it. &kmail; partly relies on <application
->PGP</application
->/<application
->GnuPG</application
->'s error strings, which often change between different versions.</para>
+<para>You <emphasis>really</emphasis> should test if encryption works before you use it. &kmail; partly relies on <application>PGP</application>/<application>GnuPG</application>'s error strings, which often change between different versions.</para>
 </listitem>
 <listitem>
-<para
->&kmail; will not encrypt messages with an untrusted (unsigned) public key: if you want to encrypt to such a key you should check the identity of the key owner and only then sign the key with your secret key; if you do not want to or cannot check the identity of the key owner but nevertheless want to encrypt the message then please sign the key locally with <userinput
-><command
->gpg</command
-> <option
->--lsign</option
-> <replaceable
->keyID</replaceable
-></userinput
->.</para>
+<para>&kmail; will not encrypt messages with an untrusted (unsigned) public key: if you want to encrypt to such a key you should check the identity of the key owner and only then sign the key with your secret key; if you do not want to or cannot check the identity of the key owner but nevertheless want to encrypt the message then please sign the key locally with <userinput><command>gpg</command> <option>--lsign</option> <replaceable>keyID</replaceable></userinput>.</para>
 </listitem>
 <listitem>
-<para
->Trusting a foreign public key without checking it is not a good idea.</para>
+<para>Trusting a foreign public key without checking it is not a good idea.</para>
 </listitem>
 <listitem>
-<para
->&kmail; cannot encrypt and sign attachments if you are using the built-in OpenPGP support. For encrypted and signed attachments you need to have <link linkend="configure-security-crypto-backends"
->crypto plugins</link
-> installed and configured.</para>
+<para>&kmail; cannot encrypt and sign attachments if you are using the built-in OpenPGP support. For encrypted and signed attachments you need to have <link linkend="configure-security-crypto-backends">crypto plugins</link> installed and configured.</para>
 </listitem>
 <listitem>
-<para
->Starting with GnuPG 1.0.7 you have to set your own key to ultimate ownertrust: it is no longer implicitly done for you.</para>
+<para>Starting with GnuPG 1.0.7 you have to set your own key to ultimate ownertrust: it is no longer implicitly done for you.</para>
 </listitem>
 </itemizedlist>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->Where does &kmail; save my settings and my mail?</para
-></question>
+<question><para>Where does &kmail; save my settings and my mail?</para></question>
 <answer>
-<para
->Most &kmail; settings are stored in <filename
->$<envar
->TDEHOME</envar
->/share/config/kmailrc</filename
->, where $<envar
->TDEHOME</envar
-> is typically <filename class="directory"
->~/.trinity</filename
->; the identities are stored in <filename
->$<envar
->TDEHOME</envar
->/share/config/emailidentities</filename
-> and your mail is saved in <filename class="directory"
->~/Mail</filename
->. Note that some of the files are hidden: remember to also copy those if you want to backup or archive your mails.</para>
+<para>Most &kmail; settings are stored in <filename>$<envar>TDEHOME</envar>/share/config/kmailrc</filename>, where $<envar>TDEHOME</envar> is typically <filename class="directory">~/.trinity</filename>; the identities are stored in <filename>$<envar>TDEHOME</envar>/share/config/emailidentities</filename> and your mail is saved in <filename class="directory">~/Mail</filename>. Note that some of the files are hidden: remember to also copy those if you want to backup or archive your mails.</para>
 </answer>
 </qandaentry>
 
 <qandaentry id="faq-index-regeneration">
-<question
-><para
->Why did &kmail; regenerate the index of a folder?</para
-></question>
+<question><para>Why did &kmail; regenerate the index of a folder?</para></question>
 <answer>
-<para
->&kmail; regenerates the index of a folder whenever the index appears to be out of date, &ie; whenever the contents of a folder are newer than the index. &kmail; regenerates the index in this case in order to prevent the loss or corruption of messages. Unfortunately, currently-deleted messages might reappear and message flags (like important, etc.) might be lost when the index is regenerated.</para>
-<para
->An outdated index can have several causes; the two most important causes are: <itemizedlist>
-<listitem
-><para
->Some other program modified the contents of the folder: if you want to use &kmail; together with procmail then please read <link linkend="faq-procmail"
->this &FAQ;</link
->. If you want to use &kmail; together with another email client then please read <link linkend="faq-other-muas"
->this &FAQ;</link
->.</para
-></listitem>
-<listitem
-><para
->If your mail folder (usually <filename class="directory"
->~/Mail</filename
->) is on a volume which is mounted via NFS and if the clock of the NFS server is ahead of the clock of your computer then the NFS server sometimes reports a wrong file date for the index file. In this case &kmail; assumes that the index is outdated although in reality it is not. To fix this problem you (or your system administrator) have to make sure that the clock of the NFS server and the clock of your computer are always in sync. One way to achieve this is the use of the ntp daemon.</para
-></listitem>
+<para>&kmail; regenerates the index of a folder whenever the index appears to be out of date, &ie; whenever the contents of a folder are newer than the index. &kmail; regenerates the index in this case in order to prevent the loss or corruption of messages. Unfortunately, currently-deleted messages might reappear and message flags (like important, etc.) might be lost when the index is regenerated.</para>
+<para>An outdated index can have several causes; the two most important causes are: <itemizedlist>
+<listitem><para>Some other program modified the contents of the folder: if you want to use &kmail; together with procmail then please read <link linkend="faq-procmail">this &FAQ;</link>. If you want to use &kmail; together with another email client then please read <link linkend="faq-other-muas">this &FAQ;</link>.</para></listitem>
+<listitem><para>If your mail folder (usually <filename class="directory">~/Mail</filename>) is on a volume which is mounted via NFS and if the clock of the NFS server is ahead of the clock of your computer then the NFS server sometimes reports a wrong file date for the index file. In this case &kmail; assumes that the index is outdated although in reality it is not. To fix this problem you (or your system administrator) have to make sure that the clock of the NFS server and the clock of your computer are always in sync. One way to achieve this is the use of the ntp daemon.</para></listitem>
 </itemizedlist>
 </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->I cannot add addresses to my address book after upgrading to KDE 3.x.</para
-></question>
+<question><para>I cannot add addresses to my address book after upgrading to KDE 3.x.</para></question>
 <answer>
-<para
->You probably copied your old <filename
->kmailrc</filename
-> file manually. That is not necessary, there is a script that will do such things when you run KDE 3.x for the first time. To fix the problem, remove the complete <quote
->[AddressBook]</quote
-> group and the addressbook option in group <quote
->[General]</quote
-> in your <filename
->kmailrc</filename
-> file; however, chances are you will also encounter other problems that the config update script would have solved.</para>
+<para>You probably copied your old <filename>kmailrc</filename> file manually. That is not necessary, there is a script that will do such things when you run KDE 3.x for the first time. To fix the problem, remove the complete <quote>[AddressBook]</quote> group and the addressbook option in group <quote>[General]</quote> in your <filename>kmailrc</filename> file; however, chances are you will also encounter other problems that the config update script would have solved.</para>
 </answer>
 </qandaentry>
 
 <qandaentry id="faq-other-muas">
-<question
-><para
->Can I use &kmail; together with a different email client, &eg; <application
->mutt</application
->?</para
-></question>
+<question><para>Can I use &kmail; together with a different email client, &eg; <application>mutt</application>?</para></question>
 <answer>
-<para
->If you're using the mbox format for your folders it is not possible to use a different email client while &kmail; is running. With <application
->mutt</application
-> there may also be problems even if both programs are not running at the same time. We recommend to use the maildir format in this case, this should solve all problems.</para>
+<para>If you're using the mbox format for your folders it is not possible to use a different email client while &kmail; is running. With <application>mutt</application> there may also be problems even if both programs are not running at the same time. We recommend to use the maildir format in this case, this should solve all problems.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->How can I convert my mailboxes from mbox to maildir?</para
-></question>
+<question><para>How can I convert my mailboxes from mbox to maildir?</para></question>
 <answer>
-<para
->There is no automatic way to do that. You will have to create a new folder in maildir format and copy the messages from the mbox folder into this new folder. Remember to adapt any filter rules connected with the old folder before you delete it.</para>
+<para>There is no automatic way to do that. You will have to create a new folder in maildir format and copy the messages from the mbox folder into this new folder. Remember to adapt any filter rules connected with the old folder before you delete it.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->How can I use a browser other than &konqueror; to open links in messages?</para
-></question>
+<question><para>How can I use a browser other than &konqueror; to open links in messages?</para></question>
 <answer>
-<para
->Change the <guilabel
->File Associations</guilabel
-> for HTML files using &kcontrol;.</para>
+<para>Change the <guilabel>File Associations</guilabel> for HTML files using &kcontrol;.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->How can I remove attachments from messages without removing the message itself?</para
-></question>
+<question><para>How can I remove attachments from messages without removing the message itself?</para></question>
 <answer>
-<para
->This is currently not supported. As a workaround, move the message to the drafts folder, double click on it in order to open it in the composer, remove the attachments, save the message again to the drafts folder, move it back to its folder. The disadvantage of this workaround is that the date will be changed to the current date. Some other headers might also be changed.</para>
+<para>This is currently not supported. As a workaround, move the message to the drafts folder, double click on it in order to open it in the composer, remove the attachments, save the message again to the drafts folder, move it back to its folder. The disadvantage of this workaround is that the date will be changed to the current date. Some other headers might also be changed.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->How can I make &kmail; check for new messages at startup?</para
-></question>
+<question><para>How can I make &kmail; check for new messages at startup?</para></question>
 <answer>
-<para
->If &kmail; should always check for new messages at startup then enable <guilabel
->Check mail on startup</guilabel
-> on the <link linkend="configure-accounts-receiving"
->Accounts configuration page</link
->. Otherwise start &kmail; with <command
->kmail <option
->--check</option
-></command
->.</para>
+<para>If &kmail; should always check for new messages at startup then enable <guilabel>Check mail on startup</guilabel> on the <link linkend="configure-accounts-receiving">Accounts configuration page</link>. Otherwise start &kmail; with <command>kmail <option>--check</option></command>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->Why does &kmail; get slow / stop working when I try to send big attachments?</para
-></question>
+<question><para>Why does &kmail; get slow / stop working when I try to send big attachments?</para></question>
 <answer>
 <!-- fixme: update for 3.2 -->
-<para
->&kmail; is known to have problems with large attachments. We are working on a solution for this problem for &kde; 3.2 but currently it temporarily consumes virtual memory of about 10-15 times the size of the attachment. That means that if you attach a 2MB file &kmail; might temporarily need about 20-30 MB of virtual memory (= RAM + swap space). If you do not have enough virtual memory this will lead to problems.</para>
+<para>&kmail; is known to have problems with large attachments. We are working on a solution for this problem for &kde; 3.2 but currently it temporarily consumes virtual memory of about 10-15 times the size of the attachment. That means that if you attach a 2MB file &kmail; might temporarily need about 20-30 MB of virtual memory (= RAM + swap space). If you do not have enough virtual memory this will lead to problems.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->Where can I get a list of changes between the versions of &kmail;?</para
-></question>
+<question><para>Where can I get a list of changes between the versions of &kmail;?</para></question>
 <answer>
-<para
->The welcome screen lists all important changes for your version. It is displayed when you select <menuchoice
-><guimenu
->Help</guimenu
-><guimenuitem
->&kmail; Introduction</guimenuitem
-></menuchoice
->.</para>
+<para>The welcome screen lists all important changes for your version. It is displayed when you select <menuchoice><guimenu>Help</guimenu><guimenuitem>&kmail; Introduction</guimenuitem></menuchoice>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->Can I configure the location of my mail folder?</para
-></question>
+<question><para>Can I configure the location of my mail folder?</para></question>
 <answer>
-<para
->Exit &kmail;, make a backup of <filename
->~/.trinity/share/config/kmailrc</filename
->, then open it with an editor and add &eg; <userinput
->folders=/home/username/.mail</userinput
-> to the <quote
->[General]</quote
-> section. Then move all your existing folders (including the hidden index files) to the new location. The next time you start &kmail; will use <filename class="directory"
->/home/username/.mail</filename
-> instead of <filename class="directory"
->/home/username/Mail</filename
->. Note that &kmail; will lose its filters if you change the mail folder's location but forget to move your existing folders.</para>
+<para>Exit &kmail;, make a backup of <filename>~/.trinity/share/config/kmailrc</filename>, then open it with an editor and add &eg; <userinput>folders=/home/username/.mail</userinput> to the <quote>[General]</quote> section. Then move all your existing folders (including the hidden index files) to the new location. The next time you start &kmail; will use <filename class="directory">/home/username/.mail</filename> instead of <filename class="directory">/home/username/Mail</filename>. Note that &kmail; will lose its filters if you change the mail folder's location but forget to move your existing folders.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->How can I use mail folders that are not in <filename class="directory"
->~/Mail/</filename
->?</para
-></question>
-
-<answer
-><para
->To add a whole mbox mail folder use <userinput
-><command
->ln</command
-> <option
->-s</option
-> <filename
->/somewhere/Mail/.remotedir.directory</filename
-> <filename class="symlink"
->~/Mail/.mymailboxfile.directory</filename
-></userinput
->. Note that it is not possible to use links to files, only links that point to folders will work.</para
-></answer>
+<question><para>How can I use mail folders that are not in <filename class="directory">~/Mail/</filename>?</para></question>
+
+<answer><para>To add a whole mbox mail folder use <userinput><command>ln</command> <option>-s</option> <filename>/somewhere/Mail/.remotedir.directory</filename> <filename class="symlink">~/Mail/.mymailboxfile.directory</filename></userinput>. Note that it is not possible to use links to files, only links that point to folders will work.</para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->I'm one of those people whose mails consist of 100 quoted lines and one line written by myself. For some reason this annoys other people. Can &kmail; help me and make everyone's life better?</para
-></question>
-<answer
-><para
->Sure. Just select a short relevant part of the original mail with the mouse before you reply. Only this part will then be quoted in your reply.</para
-></answer>
+<question><para>I'm one of those people whose mails consist of 100 quoted lines and one line written by myself. For some reason this annoys other people. Can &kmail; help me and make everyone's life better?</para></question>
+<answer><para>Sure. Just select a short relevant part of the original mail with the mouse before you reply. Only this part will then be quoted in your reply.</para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->For some messages the value in the <guilabel
->Date</guilabel
-> field is <guilabel
->unknown</guilabel
-> or it is not correct.</para
-></question>
-<answer
-><para
->Probably the <quote
->Date:</quote
-> header of these messages is broken and &kmail; cannot interpret it. That is not a bug in &kmail; but in the software that sent the mail.</para
-></answer>
+<question><para>For some messages the value in the <guilabel>Date</guilabel> field is <guilabel>unknown</guilabel> or it is not correct.</para></question>
+<answer><para>Probably the <quote>Date:</quote> header of these messages is broken and &kmail; cannot interpret it. That is not a bug in &kmail; but in the software that sent the mail.</para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->My signature has two dashes above it. What's up?</para
-></question>
+<question><para>My signature has two dashes above it. What's up?</para></question>
 <answer>
-<para
->Separating the signature from the message body with two dashes and a space on a single line is common usage. These symbols permit mail clients who recognise them to trim the signatures from a reply. If your signature does not already have this separator, &kmail; will automatically add it.</para>
+<para>Separating the signature from the message body with two dashes and a space on a single line is common usage. These symbols permit mail clients who recognise them to trim the signatures from a reply. If your signature does not already have this separator, &kmail; will automatically add it.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->&kmail; fetches the same messages over and over again.</para
-></question>
-<answer
-><para
->This happens if you have enabled <guilabel
->Leave fetched messages on the server</guilabel
-> and your POP3 server does not support the UIDL command. There is currently no workaround besides disabling <guilabel
->Leave fetched messages on the server</guilabel
->. A more detailed explanation can be found <ulink url="http://lists.kde.org/?l=kmail&amp;m=99220697415300&amp;w=2"
->in this mailing list post</ulink
->.</para
-></answer>
+<question><para>&kmail; fetches the same messages over and over again.</para></question>
+<answer><para>This happens if you have enabled <guilabel>Leave fetched messages on the server</guilabel> and your POP3 server does not support the UIDL command. There is currently no workaround besides disabling <guilabel>Leave fetched messages on the server</guilabel>. A more detailed explanation can be found <ulink url="http://lists.kde.org/?l=kmail&amp;m=99220697415300&amp;w=2">in this mailing list post</ulink>.</para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->Are there any known bugs in &kmail;?</para
-></question>
+<question><para>Are there any known bugs in &kmail;?</para></question>
 <answer>
-<para
->A list of submitted bugs is linked at <ulink url="http://kmail.kde.org/"
->the &kmail; homepage</ulink
->. Note that not all these bugs are valid. All in all we think that &kmail; is a very robust piece of software.</para>
-<para
-><warning
-><para
->However, you should not run &kmail; while another email client is already accessing the files in <filename class="directory"
->~/Mail</filename
->; if you try to do so, you might lose messages. Note that you should make backups of your messages anyway.</para
-></warning
-></para>
+<para>A list of submitted bugs is linked at <ulink url="http://kmail.kde.org/">the &kmail; homepage</ulink>. Note that not all these bugs are valid. All in all we think that &kmail; is a very robust piece of software.</para>
+<para><warning><para>However, you should not run &kmail; while another email client is already accessing the files in <filename class="directory">~/Mail</filename>; if you try to do so, you might lose messages. Note that you should make backups of your messages anyway.</para></warning></para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->&kmail; does not display <acronym
->HTML</acronym
-> mail properly.</para
-></question>
-<answer
-><para
->References to external content like images, are disabled by default, as they can be used to track whether and when you read a message. Loading external references can be activated in the <guilabel
->Security</guilabel
-> tab in &kmail;'s configuration dialogue; also Plugins (like <trademark class="registered"
->Macromedia</trademark
-> <application
->Flash</application
->), &Java; and JavaScript will not be displayed in &kmail; for security reasons and there is no way to activate them.</para
-></answer>
+<question><para>&kmail; does not display <acronym>HTML</acronym> mail properly.</para></question>
+<answer><para>References to external content like images, are disabled by default, as they can be used to track whether and when you read a message. Loading external references can be activated in the <guilabel>Security</guilabel> tab in &kmail;'s configuration dialogue; also Plugins (like <trademark class="registered">Macromedia</trademark> <application>Flash</application>), &Java; and JavaScript will not be displayed in &kmail; for security reasons and there is no way to activate them.</para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->Can I use two different versions of &kmail; at the same time? Can I go back from a current version of &kmail; to an older one?</para
-></question>
-<answer
-><para
->You can only run one instance of &kmail; at once. We also recommend to stick to a certain version and not switch back and forth between different versions. Downgrading to an older version will probably cause problems, &eg; because the index file formats might have changed. Upgrading should never be a problem.</para
-></answer>
+<question><para>Can I use two different versions of &kmail; at the same time? Can I go back from a current version of &kmail; to an older one?</para></question>
+<answer><para>You can only run one instance of &kmail; at once. We also recommend to stick to a certain version and not switch back and forth between different versions. Downgrading to an older version will probably cause problems, &eg; because the index file formats might have changed. Upgrading should never be a problem.</para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->Does &kmail; support uuencoded files?</para
-></question>
-<answer
-><para
->Uuencoded attachments are supported, but inline uuencoded files are not.</para
-></answer>
+<question><para>Does &kmail; support uuencoded files?</para></question>
+<answer><para>Uuencoded attachments are supported, but inline uuencoded files are not.</para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->&kmail; crashed while I was writing a mail; is that mail is lost now?</para
-></question>
-<answer
-><para
->&kmail; tries to save your mail to <filename
->~/dead.letter</filename
-> in case of a crash. The next time you start &kmail; the mail composer should appear with your mail again; If it does not, try to open <filename
->~/dead.letter</filename
-> with an editor. If it does not exist then the crash was so bad that &kmail; could not save your mail.</para
-></answer>
+<question><para>&kmail; crashed while I was writing a mail; is that mail is lost now?</para></question>
+<answer><para>&kmail; tries to save your mail to <filename>~/dead.letter</filename> in case of a crash. The next time you start &kmail; the mail composer should appear with your mail again; If it does not, try to open <filename>~/dead.letter</filename> with an editor. If it does not exist then the crash was so bad that &kmail; could not save your mail.</para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->When I try to set a folder to be mailing list-aware, it does not do anything when receiving an email from the list.</para
-></question>
-<answer
-><para
->Associating a folder with a mailing list has nothing to do with filtering the mailing list messages &mdash; you have to add a new filter rule manually; however, once you associated a folder with a mailing list you can use <menuchoice
-> <guimenu
->Message</guimenu
-><guimenuitem
->Reply to Mailing-List...</guimenuitem
-></menuchoice
-> or <menuchoice
-><guimenu
->Message</guimenu
-><guimenuitem
->New Message to Mailing-List...</guimenuitem
-></menuchoice
-> and the mailing list address will be set in the <guilabel
->To:</guilabel
-> field. </para
-></answer>
+<question><para>When I try to set a folder to be mailing list-aware, it does not do anything when receiving an email from the list.</para></question>
+<answer><para>Associating a folder with a mailing list has nothing to do with filtering the mailing list messages &mdash; you have to add a new filter rule manually; however, once you associated a folder with a mailing list you can use <menuchoice> <guimenu>Message</guimenu><guimenuitem>Reply to Mailing-List...</guimenuitem></menuchoice> or <menuchoice><guimenu>Message</guimenu><guimenuitem>New Message to Mailing-List...</guimenuitem></menuchoice> and the mailing list address will be set in the <guilabel>To:</guilabel> field. </para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->My SMTP server requires authentication; Does &kmail; support this?</para
-></question>
-<answer
-><para
->There are two common techniques used for <acronym
->SMTP</acronym
-> authentication: <quote
->SMTP after POP3</quote
-> and <quote
->SMTP Auth</quote
->. <quote
->SMTP Auth</quote
-> can be set in the <guilabel
->General</guilabel
-> tab of the SMTP configuration dialogue. To use <quote
->SMTP after POP3</quote
-> you have to collect all your messages in the <guilabel
->outbox</guilabel
-> and send them just after you have fetched new mail. You can make &kmail; send the queued messages automatically with the <guilabel
->Send messages in outbox folder</guilabel
-> option on the <link linkend="configure-accounts-sending"
->Accounts configuration page</link
->. </para
-></answer>
+<question><para>My SMTP server requires authentication; Does &kmail; support this?</para></question>
+<answer><para>There are two common techniques used for <acronym>SMTP</acronym> authentication: <quote>SMTP after POP3</quote> and <quote>SMTP Auth</quote>. <quote>SMTP Auth</quote> can be set in the <guilabel>General</guilabel> tab of the SMTP configuration dialogue. To use <quote>SMTP after POP3</quote> you have to collect all your messages in the <guilabel>outbox</guilabel> and send them just after you have fetched new mail. You can make &kmail; send the queued messages automatically with the <guilabel>Send messages in outbox folder</guilabel> option on the <link linkend="configure-accounts-sending">Accounts configuration page</link>. </para></answer>
 </qandaentry>
 
 <qandaentry id="faq-procmail">
-<question
-><para
->Can I use &kmail; and <application
->procmail</application
->?</para
-></question>
-<answer
-><para
->Yes, but it is important to do it the right way or you might lose mail. In order to use <application
->procmail</application
-> and &kmail; you need to set up &kmail; so that it will fetch new mail from the spoolfiles in which <application
->procmail</application
-> drops your mail. Do <emphasis
->not</emphasis
-> set up procmail to deliver mail in a &kmail; folder, this cannot work.</para>
+<question><para>Can I use &kmail; and <application>procmail</application>?</para></question>
+<answer><para>Yes, but it is important to do it the right way or you might lose mail. In order to use <application>procmail</application> and &kmail; you need to set up &kmail; so that it will fetch new mail from the spoolfiles in which <application>procmail</application> drops your mail. Do <emphasis>not</emphasis> set up procmail to deliver mail in a &kmail; folder, this cannot work.</para>
           
-<para
->For each procmail spoolfile you then need to create an account from which &kmail; will fetch new mail; you also need to make sure you specify the right lockfile name for this account. When setting up an account, &kmail; will do some minimal parsing on your <filename
->.procmail</filename
-> file, and will try to list every spoolfile it has found, and also the lockfiles next to the <guilabel
->procmail lockfile</guilabel
-> item. procmail lets the user specify lockfiles in three different ways, so there is no way to establish a correspondence between the spoolfiles and lockfiles; so it's really up to you to make sure you specify the right lockfile for each spoolfile.</para>
+<para>For each procmail spoolfile you then need to create an account from which &kmail; will fetch new mail; you also need to make sure you specify the right lockfile name for this account. When setting up an account, &kmail; will do some minimal parsing on your <filename>.procmail</filename> file, and will try to list every spoolfile it has found, and also the lockfiles next to the <guilabel>procmail lockfile</guilabel> item. procmail lets the user specify lockfiles in three different ways, so there is no way to establish a correspondence between the spoolfiles and lockfiles; so it's really up to you to make sure you specify the right lockfile for each spoolfile.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->Spellchecking does not recognize non-English characters.</para
-></question>
-<answer
-><para
->Before you can use spellchecking the first time, you have to configure it. You can do so in the composer window's menu under <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Spellchecker...</guimenuitem
-></menuchoice
->. You can set the dictionary and the encoding there.</para
-></answer>
+<question><para>Spellchecking does not recognize non-English characters.</para></question>
+<answer><para>Before you can use spellchecking the first time, you have to configure it. You can do so in the composer window's menu under <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Spellchecker...</guimenuitem></menuchoice>. You can set the dictionary and the encoding there.</para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->How do I use my <application
->Eudora</application
->/&Netscape;/<application
->Outlook</application
->/... mail folders in &kmail;?</para
-></question
-> 
-<answer
-><para
->See the section <link linkend="importing"
->Using other Mailbox files With &kmail;</link
->.</para
-></answer>
+<question><para>How do I use my <application>Eudora</application>/&Netscape;/<application>Outlook</application>/... mail folders in &kmail;?</para></question> 
+<answer><para>See the section <link linkend="importing">Using other Mailbox files With &kmail;</link>.</para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->Can I use encryption with my normal (non-<acronym
->SSL</acronym
->) POP3 account?</para
-></question>
-<answer
-><para
->If your POP3 server runs an <application
->ssh</application
-> daemon, you can use ssh to tunnel your POP3 connection using the following command:</para>
-
-<para
-><userinput
-><command
->ssh</command
-> <option
->-L 11000:127.0.0.1:110 user@host</option
-></userinput
-></para>
-
-<para
->Modify your &kmail; configuration to fetch the mail via POP3 from <userinput
->localhost</userinput
-> and ssh will tunnel the connection for you. <note
-><para
->If non-encrypted messages have already been sent via Internet, the only advantage of using <application
->ssh</application
-> is that your <emphasis
->password</emphasis
-> will be sent encrypted to the POP3 server.</para
-></note>
+<question><para>Can I use encryption with my normal (non-<acronym>SSL</acronym>) POP3 account?</para></question>
+<answer><para>If your POP3 server runs an <application>ssh</application> daemon, you can use ssh to tunnel your POP3 connection using the following command:</para>
+
+<para><userinput><command>ssh</command> <option>-L 11000:127.0.0.1:110 user@host</option></userinput></para>
+
+<para>Modify your &kmail; configuration to fetch the mail via POP3 from <userinput>localhost</userinput> and ssh will tunnel the connection for you. <note><para>If non-encrypted messages have already been sent via Internet, the only advantage of using <application>ssh</application> is that your <emphasis>password</emphasis> will be sent encrypted to the POP3 server.</para></note>
 
 <!-- fixme: add link to http://www.linuxdoc.org/HOWTO/mini/Secure-POP+SSH.html -->
 
@@ -666,215 +241,59 @@
 </qandaentry>
 
 <qandaentry id="faq-file-locking">
-<question
-><para
->Does &kmail; lock the folders it uses?</para
-></question>
-<answer
-><para
->&kmail; does not lock the files in <filename class="directory"
->~/Mail</filename
->.</para>
-<para
->To avoid the risk of losing mail <emphasis
->if using a local account</emphasis
-> it is necessary to ensure that &kmail; uses the same type of locking as your mail delivery agent.</para>
-
-<para
->There are five different locking options you can use:</para>
+<question><para>Does &kmail; lock the folders it uses?</para></question>
+<answer><para>&kmail; does not lock the files in <filename class="directory">~/Mail</filename>.</para>
+<para>To avoid the risk of losing mail <emphasis>if using a local account</emphasis> it is necessary to ensure that &kmail; uses the same type of locking as your mail delivery agent.</para>
+
+<para>There are five different locking options you can use:</para>
 
 <itemizedlist>
-<listitem
-><para
-><guilabel
->Procmail lockfile</guilabel
-></para
-></listitem>
-<listitem
-><para
-><guilabel
->Mutt dotlock</guilabel
-></para
-></listitem>
-<listitem
-><para
-><guilabel
->Mutt dotlock privileged</guilabel
-></para
-></listitem>
-<listitem
-><para
-><guilabel
->FCNTL</guilabel
-> (default)</para
-></listitem>
-<listitem
-><para
-><guilabel
->none (use with care)</guilabel
-></para
-></listitem>
+<listitem><para><guilabel>Procmail lockfile</guilabel></para></listitem>
+<listitem><para><guilabel>Mutt dotlock</guilabel></para></listitem>
+<listitem><para><guilabel>Mutt dotlock privileged</guilabel></para></listitem>
+<listitem><para><guilabel>FCNTL</guilabel> (default)</para></listitem>
+<listitem><para><guilabel>none (use with care)</guilabel></para></listitem>
 </itemizedlist>
 
-<para
-><guilabel
->Procmail lockfile</guilabel
-> will use a small utility that comes with <application
->procmail</application
-> called <command
->lockfile</command
->. You can use this if your mail folder is in a folder where you have write permission. This will not work on your <filename class="directory"
->/var/spool/mail/user</filename
-> file in most cases. It will create <filename
->.lock</filename
-> files on your account when &kmail; is checking for new mail. Please note that this will only work if <application
->procmail</application
-> is installed on your system.</para>
-
-<para
-><guilabel
->Mutt dotlock</guilabel
-> and <guilabel
->Mutt dotlock privileged</guilabel
-> will both use a small utility that comes with <application
->mutt</application
-> called <command
->mutt_dotlock</command
->. <guilabel
->Mutt dotlock</guilabel
-> can be used in the same way as the <guilabel
->Procmail lockfile</guilabel
-> option, with the same limitation with regards to the <filename class="directory"
->/var/spool/mail/</filename
-> folders. However, the <guilabel
->Mutt dotlock privileged</guilabel
-> option can create lock files in the <filename class="directory"
->/var/spool/mail</filename
-> folder. <command
->mutt_dotlock</command
-> is a setgid program and this option will run it in setgid mode. Please note that these options will only work if <application
->mutt</application
-> is installed on your system.</para>
-
-<para
-><guilabel
->FCNTL</guilabel
-> will use the <function
->fcntl()</function
-> system call.</para>
-
-<warning
-><para
->Usage of FCNTL locking might cause system lockups when the mail spool file is on an NFS mounted device.</para
-></warning>
-
-<para
->If you do not want to use any locking, the <guilabel
->none</guilabel
-> option is what you want. However, there are risks of losing mail when no locking is used.</para>
+<para><guilabel>Procmail lockfile</guilabel> will use a small utility that comes with <application>procmail</application> called <command>lockfile</command>. You can use this if your mail folder is in a folder where you have write permission. This will not work on your <filename class="directory">/var/spool/mail/user</filename> file in most cases. It will create <filename>.lock</filename> files on your account when &kmail; is checking for new mail. Please note that this will only work if <application>procmail</application> is installed on your system.</para>
+
+<para><guilabel>Mutt dotlock</guilabel> and <guilabel>Mutt dotlock privileged</guilabel> will both use a small utility that comes with <application>mutt</application> called <command>mutt_dotlock</command>. <guilabel>Mutt dotlock</guilabel> can be used in the same way as the <guilabel>Procmail lockfile</guilabel> option, with the same limitation with regards to the <filename class="directory">/var/spool/mail/</filename> folders. However, the <guilabel>Mutt dotlock privileged</guilabel> option can create lock files in the <filename class="directory">/var/spool/mail</filename> folder. <command>mutt_dotlock</command> is a setgid program and this option will run it in setgid mode. Please note that these options will only work if <application>mutt</application> is installed on your system.</para>
+
+<para><guilabel>FCNTL</guilabel> will use the <function>fcntl()</function> system call.</para>
+
+<warning><para>Usage of FCNTL locking might cause system lockups when the mail spool file is on an NFS mounted device.</para></warning>
+
+<para>If you do not want to use any locking, the <guilabel>none</guilabel> option is what you want. However, there are risks of losing mail when no locking is used.</para>
 
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->How do I leave messages on the server?</para
-></question>
-<answer
-><para
->See the <link linkend="popfilters"
->Download filters</link
-> chapter. If you want to leave all messages on the server: open up the <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure &kmail;...</guimenuitem
-> </menuchoice
-> window. Click on the <guilabel
->Network</guilabel
-> page. Select your account from the account list and click the <guibutton
->Modify...</guibutton
-> button. This dialogue contains the <guilabel
->Leave fetched messages on the server</guilabel
-> setting which you must enable.</para
-></answer>
+<question><para>How do I leave messages on the server?</para></question>
+<answer><para>See the <link linkend="popfilters">Download filters</link> chapter. If you want to leave all messages on the server: open up the <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &kmail;...</guimenuitem> </menuchoice> window. Click on the <guilabel>Network</guilabel> page. Select your account from the account list and click the <guibutton>Modify...</guibutton> button. This dialogue contains the <guilabel>Leave fetched messages on the server</guilabel> setting which you must enable.</para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->How do I automatically insert a text footer within my messages?</para
-></question>
-<answer
-><para
->The text footer is also called a signature (not to be confused with a cryptographic signature). Select <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure &kmail;...</guimenuitem
-></menuchoice
-> Look in the <guilabel
->Identity</guilabel
-> page for the <guilabel
->Signature</guilabel
-> tab and add your signature there. Then go to the <guilabel
->General</guilabel
-> tab on the <guilabel
->Composer</guilabel
-> page and enable <xref linkend="configure-composer-general-append-signature"/></para
-></answer
-> 
+<question><para>How do I automatically insert a text footer within my messages?</para></question>
+<answer><para>The text footer is also called a signature (not to be confused with a cryptographic signature). Select <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure &kmail;...</guimenuitem></menuchoice> Look in the <guilabel>Identity</guilabel> page for the <guilabel>Signature</guilabel> tab and add your signature there. Then go to the <guilabel>General</guilabel> tab on the <guilabel>Composer</guilabel> page and enable <xref linkend="configure-composer-general-append-signature"/></para></answer> 
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->How do I set up &Sendmail; to work with &kmail; if I have a dial-up connection?</para
-></question
-> 
+<question><para>How do I set up &Sendmail; to work with &kmail; if I have a dial-up connection?</para></question> 
 
-<answer
-><para
->First you should check if your distribution can do this for you. It probably has already been set up during installation.</para>
+<answer><para>First you should check if your distribution can do this for you. It probably has already been set up during installation.</para>
 
-<para
->If that is not the case, you may want to have a look at <ulink url="http://en.tldp.org/HOWTO/mini/Mail-Queue.html"
->the Mail Queue HOWTO</ulink
->.</para
-></answer>
+<para>If that is not the case, you may want to have a look at <ulink url="http://en.tldp.org/HOWTO/mini/Mail-Queue.html">the Mail Queue HOWTO</ulink>.</para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->I've seen demonstrations of remote control behavior with &kmail;. Is there any documentation on the available interfaces?</para
-></question>
-<answer
-><para
->You can get a list of functions by using this command in a shell: <userinput
-><command
->dcop</command
-> <option
->kmail KMailIface</option
-></userinput
->. Some documentation is also available in <filename
->tdenetwork/kmail/kmailIface.h</filename
-> and <filename
->tdenetwork/kmail/mailcomposerIface.h</filename
->.</para
-></answer>
+<question><para>I've seen demonstrations of remote control behavior with &kmail;. Is there any documentation on the available interfaces?</para></question>
+<answer><para>You can get a list of functions by using this command in a shell: <userinput><command>dcop</command> <option>kmail KMailIface</option></userinput>. Some documentation is also available in <filename>tdenetwork/kmail/kmailIface.h</filename> and <filename>tdenetwork/kmail/mailcomposerIface.h</filename>.</para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->When I reply to a message, only a part of the message is quoted. How come?</para
-></question>
-<answer
-><para
->This can happen when the message contains two dashes and a space on a single line. This is seen as the start of the signature. The remaining part of the message will not be quoted, because when you reply to a message KMail strips the signature.</para
-></answer>
+<question><para>When I reply to a message, only a part of the message is quoted. How come?</para></question>
+<answer><para>This can happen when the message contains two dashes and a space on a single line. This is seen as the start of the signature. The remaining part of the message will not be quoted, because when you reply to a message KMail strips the signature.</para></answer>
 </qandaentry>
 
 </qandaset>
diff --git a/tde-i18n-en_GB/docs/tdepim/kmail/getting-started.docbook b/tde-i18n-en_GB/docs/tdepim/kmail/getting-started.docbook
index 7ce32399782..4d5d512e6d1 100644
--- a/tde-i18n-en_GB/docs/tdepim/kmail/getting-started.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/kmail/getting-started.docbook
@@ -2,581 +2,132 @@
 
 <chapterinfo>
 <authorgroup>
-<author
-><firstname
->Daniel</firstname
-> <surname
->Naber</surname
-> <affiliation
-><address
-> <email
->daniel.naber@t-online.de</email>
-</address
-></affiliation>
+<author><firstname>Daniel</firstname> <surname>Naber</surname> <affiliation><address> <email>daniel.naber@t-online.de</email>
+</address></affiliation>
 </author>
-<author
-><firstname
->David</firstname
-> <surname
->Rugge</surname
-> <affiliation
-><address
-> <email
->davidrugge@mediaone.net</email>
-</address
-></affiliation>
+<author><firstname>David</firstname> <surname>Rugge</surname> <affiliation><address> <email>davidrugge@mediaone.net</email>
+</address></affiliation>
 </author>
-<author
-><firstname
->Michel</firstname
-> <surname
->Boyer de la Giroday</surname
-> <affiliation
-><address
-> <email
->michel@klaralvdalens-datakonsult.se</email>
-</address
-></affiliation>
+<author><firstname>Michel</firstname> <surname>Boyer de la Giroday</surname> <affiliation><address> <email>michel@klaralvdalens-datakonsult.se</email>
+</address></affiliation>
 </author>
-<othercredit role="translator"
-><firstname
->Andrew</firstname
-><surname
->Coles</surname
-><affiliation
-><address
-><email
->andrew_coles@yahoo.co.uk</email
-></address
-></affiliation
-><contrib
->British English English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Andrew</firstname><surname>Coles</surname><affiliation><address><email>andrew_coles@yahoo.co.uk</email></address></affiliation><contrib>British English English</contrib></othercredit> 
 </authorgroup>
-<date
->2004-07-13</date
-> <releaseinfo
->1.7</releaseinfo
-> </chapterinfo>
-
-<title
->Getting Started</title>
-
-<para
->This is a short introduction to &kmail; and its usage so you can start working with it right away. For more in-depth information see the <link linkend="using-kmail"
->Using &kmail;</link
-> section. Note that &kmail;'s installation is described in <link linkend="installation"
->the appendix</link
->.</para>
-
-<para
->Invoking &kmail; for the first time creates a folder called <filename class="directory"
->Mail</filename
-> in your home folder. This folder contains the initial folders (<filename class="directory"
->inbox</filename
->, <filename class="directory"
->outbox</filename
->, <filename class="directory"
->sent-mail</filename
->, <filename class="directory"
->wastebin</filename
-> and <filename class="directory"
->drafts</filename
->). Use <menuchoice
-> <guimenu
->Settings</guimenu
-> <guimenuitem
->Configure &kmail;...</guimenuitem
-> </menuchoice
-> to enter some initial information so &kmail; will be able to properly retrieve and send your messages.</para>
-
-<para
->The Configure window consists of six sections: <guilabel
->Identities</guilabel
->, <guilabel
->Network</guilabel
->, <guilabel
->Appearance</guilabel
->, <guilabel
->Composer</guilabel
->, <guilabel
->Security</guilabel
-> and <guilabel
->Misc</guilabel
->.</para>
-
-<para
->To begin sending and receiving messages you will only have to change some settings in the <guilabel
->Identities</guilabel
-> and <guilabel
->Network</guilabel
-> pages.</para>
+<date>2004-07-13</date> <releaseinfo>1.7</releaseinfo> </chapterinfo>
+
+<title>Getting Started</title>
+
+<para>This is a short introduction to &kmail; and its usage so you can start working with it right away. For more in-depth information see the <link linkend="using-kmail">Using &kmail;</link> section. Note that &kmail;'s installation is described in <link linkend="installation">the appendix</link>.</para>
+
+<para>Invoking &kmail; for the first time creates a folder called <filename class="directory">Mail</filename> in your home folder. This folder contains the initial folders (<filename class="directory">inbox</filename>, <filename class="directory">outbox</filename>, <filename class="directory">sent-mail</filename>, <filename class="directory">wastebin</filename> and <filename class="directory">drafts</filename>). Use <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Configure &kmail;...</guimenuitem> </menuchoice> to enter some initial information so &kmail; will be able to properly retrieve and send your messages.</para>
+
+<para>The Configure window consists of six sections: <guilabel>Identities</guilabel>, <guilabel>Network</guilabel>, <guilabel>Appearance</guilabel>, <guilabel>Composer</guilabel>, <guilabel>Security</guilabel> and <guilabel>Misc</guilabel>.</para>
+
+<para>To begin sending and receiving messages you will only have to change some settings in the <guilabel>Identities</guilabel> and <guilabel>Network</guilabel> pages.</para>
 
   <sect1 id="setting-your-identity">
-    <title
->Setting your Identity </title>
-
-    <para
->The settings in the <guilabel
->Identities</guilabel
-> page are fairly straightforward. Select your default identity and click <guibutton
->Modify</guibutton
->. Fill in the <guilabel
->Your name</guilabel
-> field with your full name (&eg; <userinput
->John Doe</userinput
->) and the <guilabel
->Organisation</guilabel
-> field (optional) with the appropriate information. </para>
-    <para
->Next, fill in the <guilabel
->Email address</guilabel
-> field with your email address (&eg; <userinput
->john@example.net</userinput
->). </para>
-    <para
->If you are using <application
->PGP</application
-> or <application
->GnuPG</application
-> you can set your &openpgp; keys and/or &smime; certificates in the <link linkend="configure-identity-cryptography"
-><guilabel
->Cryptography</guilabel
-></link
-> tab. </para>
-    <para
->Optionally, go to the <guilabel
->Signature</guilabel
-> tab and enter your signature. This is a short text that will be automatically appended to all your messages. It has nothing to do with <emphasis
->digital signatures</emphasis
->. </para>
+    <title>Setting your Identity </title>
+
+    <para>The settings in the <guilabel>Identities</guilabel> page are fairly straightforward. Select your default identity and click <guibutton>Modify</guibutton>. Fill in the <guilabel>Your name</guilabel> field with your full name (&eg; <userinput>John Doe</userinput>) and the <guilabel>Organisation</guilabel> field (optional) with the appropriate information. </para>
+    <para>Next, fill in the <guilabel>Email address</guilabel> field with your email address (&eg; <userinput>john@example.net</userinput>). </para>
+    <para>If you are using <application>PGP</application> or <application>GnuPG</application> you can set your &openpgp; keys and/or &smime; certificates in the <link linkend="configure-identity-cryptography"><guilabel>Cryptography</guilabel></link> tab. </para>
+    <para>Optionally, go to the <guilabel>Signature</guilabel> tab and enter your signature. This is a short text that will be automatically appended to all your messages. It has nothing to do with <emphasis>digital signatures</emphasis>. </para>
 
   </sect1>
 
 <sect1 id="setting-up-your-account">
-<title
->Setting up your Account</title>
+<title>Setting up your Account</title>
 
-<para
->The <guilabel
->Network</guilabel
-> page contains the settings that tell &kmail; how to send and receive your email messages. Many of these settings can vary greatly depending on the setup of your system and on the kind of network that your mail server is located in. If you do not know what setting to choose or what to put in a field, consult your Internet Service Provider (<acronym
->ISP</acronym
->) or system administrator.</para>
+<para>The <guilabel>Network</guilabel> page contains the settings that tell &kmail; how to send and receive your email messages. Many of these settings can vary greatly depending on the setup of your system and on the kind of network that your mail server is located in. If you do not know what setting to choose or what to put in a field, consult your Internet Service Provider (<acronym>ISP</acronym>) or system administrator.</para>
 
 <sect2 id="sending-mail">
-<title
->Sending Messages</title>
-
-<para
->The <guilabel
->Sending</guilabel
-> tab provides a list of ways to send messages. The first item in the list is the default way to send messages. Using the <guibutton
->Add...</guibutton
-> button you can choose between two different ways of sending messages: <guilabel
->SMTP</guilabel
-> and <guilabel
->Sendmail</guilabel
->. &Sendmail; here means a local software installation -- this has a reputation of being difficult to set up, so if you do not already have a working &Sendmail; configuration, choose <guilabel
->SMTP</guilabel
-> and fill in the <guilabel
->Name</guilabel
-> field with a descriptive name (&eg; <userinput
->My Mail Account</userinput
->) and the <guilabel
->Host</guilabel
-> field with the name and domain of your mail server (&eg; <userinput
->smtp.provider.com</userinput
->). You will probably not need to change the <guilabel
->Port</guilabel
-> setting (the default is <userinput
->25</userinput
->).</para>
+<title>Sending Messages</title>
+
+<para>The <guilabel>Sending</guilabel> tab provides a list of ways to send messages. The first item in the list is the default way to send messages. Using the <guibutton>Add...</guibutton> button you can choose between two different ways of sending messages: <guilabel>SMTP</guilabel> and <guilabel>Sendmail</guilabel>. &Sendmail; here means a local software installation -- this has a reputation of being difficult to set up, so if you do not already have a working &Sendmail; configuration, choose <guilabel>SMTP</guilabel> and fill in the <guilabel>Name</guilabel> field with a descriptive name (&eg; <userinput>My Mail Account</userinput>) and the <guilabel>Host</guilabel> field with the name and domain of your mail server (&eg; <userinput>smtp.provider.com</userinput>). You will probably not need to change the <guilabel>Port</guilabel> setting (the default is <userinput>25</userinput>).</para>
 
 <!-- TODO: more specific link -->
-<para
->If you do want to use &Sendmail; and you are using a dial-up connection, follow the instructions for setting up sendmail for a dial-up connection in the <link linkend="faq"
->&FAQ;</link
-> section.</para>
-
-<para
->The way of sending messages configured here will be used for your default identity and for all other identities that have no own way of sending messages. You can use different ways of sending messages for different identities by selecting the <guilabel
->Special transport</guilabel
-> checkbox in the <guilabel
->Advanced</guilabel
-> tab of the <guilabel
->Identities</guilabel
-> section.</para>
-
-<para
->A description of the other options can be found in the <link linkend="configure-accounts-sending"
->Configuration</link
-> chapter.</para>
+<para>If you do want to use &Sendmail; and you are using a dial-up connection, follow the instructions for setting up sendmail for a dial-up connection in the <link linkend="faq">&FAQ;</link> section.</para>
+
+<para>The way of sending messages configured here will be used for your default identity and for all other identities that have no own way of sending messages. You can use different ways of sending messages for different identities by selecting the <guilabel>Special transport</guilabel> checkbox in the <guilabel>Advanced</guilabel> tab of the <guilabel>Identities</guilabel> section.</para>
+
+<para>A description of the other options can be found in the <link linkend="configure-accounts-sending">Configuration</link> chapter.</para>
 
 
 <sect3 id="sending-mail-kolab">
-<title
->Options relevant to <acronym
->Kolab</acronym
-> server</title>
-
-<para
->When configuring a <guilabel
->SMTP</guilabel
-> account with a <guilabel
->Kolab</guilabel
-> server Host, you need to check the <guilabel
->Server requires authentification</guilabel
-> option and to fill in your <guilabel
->Kolab</guilabel
-> user's email address and password in the <guilabel
->Login</guilabel
-> and <guilabel
->Password</guilabel
-> fields. Select then the <guilabel
->Security</guilabel
-> tab and click on the <guibutton
->Check What the Server Supports</guibutton
-> for automated setup of your <guilabel
->Security</guilabel
-> configuration. The default should be <guilabel
->TLS/PLAIN</guilabel
->. The <guilabel
->Kolab</guilabel
-> server supports <guilabel
->SSL/PLAIN</guilabel
-> as well. Those settings may of course be configured manually.</para>
+<title>Options relevant to <acronym>Kolab</acronym> server</title>
+
+<para>When configuring a <guilabel>SMTP</guilabel> account with a <guilabel>Kolab</guilabel> server Host, you need to check the <guilabel>Server requires authentification</guilabel> option and to fill in your <guilabel>Kolab</guilabel> user's email address and password in the <guilabel>Login</guilabel> and <guilabel>Password</guilabel> fields. Select then the <guilabel>Security</guilabel> tab and click on the <guibutton>Check What the Server Supports</guibutton> for automated setup of your <guilabel>Security</guilabel> configuration. The default should be <guilabel>TLS/PLAIN</guilabel>. The <guilabel>Kolab</guilabel> server supports <guilabel>SSL/PLAIN</guilabel> as well. Those settings may of course be configured manually.</para>
 </sect3>
 </sect2>
 
 <sect2 id="receiving-mail">
-<title
->Receiving Messages</title>
-
-<para
->To set up an account so you can receive mail, press the <guibutton
->Add...</guibutton
-> button in the <guilabel
->Receiving</guilabel
-> tab. You will then be prompted for the type of your email account. Most users should select <guilabel
->POP3</guilabel
-> or <guilabel
->IMAP</guilabel
->. If you want to use a local mailbox file, please see the <link linkend="faq-file-locking"
->FAQ about file locking</link
->.</para>
+<title>Receiving Messages</title>
+
+<para>To set up an account so you can receive mail, press the <guibutton>Add...</guibutton> button in the <guilabel>Receiving</guilabel> tab. You will then be prompted for the type of your email account. Most users should select <guilabel>POP3</guilabel> or <guilabel>IMAP</guilabel>. If you want to use a local mailbox file, please see the <link linkend="faq-file-locking">FAQ about file locking</link>.</para>
         
-<para
->You will then be presented with the <guilabel
->Add account</guilabel
-> window. First, fill in the <guilabel
->Name</guilabel
-> field to name your account. You can choose any name you like. <guilabel
->Login</guilabel
->, <guilabel
->Password</guilabel
->, and <guilabel
->Host</guilabel
-> should be filled in with the appropriate information from your <acronym
->ISP</acronym
-> or system administrator. You should not need to change the <guilabel
->Port</guilabel
-> setting (the default for POP3 is <userinput
->110</userinput
->, the default for <acronym
->IMAP</acronym
-> is <userinput
->143</userinput
->).</para>
+<para>You will then be presented with the <guilabel>Add account</guilabel> window. First, fill in the <guilabel>Name</guilabel> field to name your account. You can choose any name you like. <guilabel>Login</guilabel>, <guilabel>Password</guilabel>, and <guilabel>Host</guilabel> should be filled in with the appropriate information from your <acronym>ISP</acronym> or system administrator. You should not need to change the <guilabel>Port</guilabel> setting (the default for POP3 is <userinput>110</userinput>, the default for <acronym>IMAP</acronym> is <userinput>143</userinput>).</para>
 
 <sect3 id="receiving-mail-kolab">
-<title
->Options relevant to <acronym
->Kolab</acronym
-> server</title>
-<para
->select <guilabel
->Disconnected IMAP</guilabel
-> when choosing your <guilabel
->Account Type</guilabel
->. Fill in the <guilabel
->Login</guilabel
-> and <guilabel
->Password</guilabel
-> fields with respectively your user email address and password on the <guilabel
->Kolab</guilabel
-> server. In the <guilabel
->Security</guilabel
-> section click on the <guilabel
->Check What the Server Support</guilabel
-> button for automated set-up of your <guilabel
->Security</guilabel
-> configuration. The default should be <guilabel
->TLS/PLAIN</guilabel
->. The <guilabel
->Kolab</guilabel
-> server supports <guilabel
->SSL/PLAIN</guilabel
-> as well. Those settings may of course be configured manually.</para>
-<para
->If you want to use the <guilabel
->"Out of Office" Replies</guilabel
-> functionality of the <guilabel
->Kolab</guilabel
-> server, set-up the <guilabel
->Filtering</guilabel
-> section of you <guilabel
->DIMAP</guilabel
-> account by checking the <guilabel
->Server supports Sieve</guilabel
-> option as well as <guilabel
->Reuse host and login configuration</guilabel
->, <guilabel
->Managesieve port</guilabel
-> should be set to 2000 as default. </para>
+<title>Options relevant to <acronym>Kolab</acronym> server</title>
+<para>select <guilabel>Disconnected IMAP</guilabel> when choosing your <guilabel>Account Type</guilabel>. Fill in the <guilabel>Login</guilabel> and <guilabel>Password</guilabel> fields with respectively your user email address and password on the <guilabel>Kolab</guilabel> server. In the <guilabel>Security</guilabel> section click on the <guilabel>Check What the Server Support</guilabel> button for automated set-up of your <guilabel>Security</guilabel> configuration. The default should be <guilabel>TLS/PLAIN</guilabel>. The <guilabel>Kolab</guilabel> server supports <guilabel>SSL/PLAIN</guilabel> as well. Those settings may of course be configured manually.</para>
+<para>If you want to use the <guilabel>"Out of Office" Replies</guilabel> functionality of the <guilabel>Kolab</guilabel> server, set-up the <guilabel>Filtering</guilabel> section of you <guilabel>DIMAP</guilabel> account by checking the <guilabel>Server supports Sieve</guilabel> option as well as <guilabel>Reuse host and login configuration</guilabel>, <guilabel>Managesieve port</guilabel> should be set to 2000 as default. </para>
 </sect3>
 
 <sect3 id="receiving-mail-dimap-misc">
-<title
->Options only relevant to DIMAP (<acronym
->Kolab</acronym
-> server)</title>
-<para
->After having configured your <guilabel
->Disconnect IMAP</guilabel
-> account, you need to activate the <guilabel
->Groupware</guilabel
-> functionalities and set-up the <guilabel
->Misc</guilabel
-> page for <guilabel
->KMail</guilabel
->. </para>
-<para
->In the <guilabel
->Misc</guilabel
-> page, of the <guilabel
->Configure</guilabel
-> dialogue, choose the <guilabel
->Groupware</guilabel
-> tab. Check the <guilabel
->Enable IMAP resource functionality</guilabel
-> option and select <guilabel
->Kolab (XML)</guilabel
-> as <guilabel
->Format used for the groupware folders</guilabel
->. The <guilabel
->Resource folders are in account</guilabel
-> combo-box should be set on the <guilabel
->Receiving</guilabel
-> (kolab user) account of your choice (if you happen to have several accounts).You may if you wish hide the groupware folder by checking this option. It is recommended to check both <guilabel
->Groupware Compatibility and Legacy Options</guilabel
-> for compatibility with an eventual <guilabel
->Kolab</guilabel
-> Microsoft Outlook client for sending invitations and replies from a <guilabel
->Kolab</guilabel
-> KDE client. </para>
+<title>Options only relevant to DIMAP (<acronym>Kolab</acronym> server)</title>
+<para>After having configured your <guilabel>Disconnect IMAP</guilabel> account, you need to activate the <guilabel>Groupware</guilabel> functionalities and set-up the <guilabel>Misc</guilabel> page for <guilabel>KMail</guilabel>. </para>
+<para>In the <guilabel>Misc</guilabel> page, of the <guilabel>Configure</guilabel> dialogue, choose the <guilabel>Groupware</guilabel> tab. Check the <guilabel>Enable IMAP resource functionality</guilabel> option and select <guilabel>Kolab (XML)</guilabel> as <guilabel>Format used for the groupware folders</guilabel>. The <guilabel>Resource folders are in account</guilabel> combo-box should be set on the <guilabel>Receiving</guilabel> (kolab user) account of your choice (if you happen to have several accounts).You may if you wish hide the groupware folder by checking this option. It is recommended to check both <guilabel>Groupware Compatibility and Legacy Options</guilabel> for compatibility with an eventual <guilabel>Kolab</guilabel> Microsoft Outlook client for sending invitations and replies from a <guilabel>Kolab</guilabel> KDE client. </para>
 </sect3>
         
 <sect3 id="receiving-mail-imap">
-<title
->Options only relevant to <acronym
->IMAP</acronym
-></title>
-<para
->If you are using <acronym
->IMAP</acronym
->, you can optionally specify a path in the <guilabel
->Prefix to folders</guilabel
-> field. This tells &kmail; where it can find your folders on the server. If you also have a shell account on the server and the messages are stored in your home folder it might be useful to store the messages in a subfolder <filename class="directory"
->Mail</filename
->. Use this as a value in the <guilabel
->Prefix to folders</guilabel
-> field so that &kmail; does not mix up mailbox files and other files. If you are not interested in this feature, simple leave the field blank.</para>
-
-<para
->If you check <guilabel
->Automatically compact folders</guilabel
-> &kmail; removes the messages you deleted from the server as soon as you leave a folder. Otherwise the messages are only marked as deleted and it is up to you to compact the folders manually by using the menu item <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Compact All Folders</guimenuitem
-></menuchoice
->.</para>
-<para
->If you check <guilabel
->Show hidden folders</guilabel
->, folders whose name starts with a dot are also displayed.</para>
+<title>Options only relevant to <acronym>IMAP</acronym></title>
+<para>If you are using <acronym>IMAP</acronym>, you can optionally specify a path in the <guilabel>Prefix to folders</guilabel> field. This tells &kmail; where it can find your folders on the server. If you also have a shell account on the server and the messages are stored in your home folder it might be useful to store the messages in a subfolder <filename class="directory">Mail</filename>. Use this as a value in the <guilabel>Prefix to folders</guilabel> field so that &kmail; does not mix up mailbox files and other files. If you are not interested in this feature, simple leave the field blank.</para>
+
+<para>If you check <guilabel>Automatically compact folders</guilabel> &kmail; removes the messages you deleted from the server as soon as you leave a folder. Otherwise the messages are only marked as deleted and it is up to you to compact the folders manually by using the menu item <menuchoice><guimenu>File</guimenu><guimenuitem>Compact All Folders</guimenuitem></menuchoice>.</para>
+<para>If you check <guilabel>Show hidden folders</guilabel>, folders whose name starts with a dot are also displayed.</para>
 </sect3>
 
 
 <sect3 id="receiving-mail-pop3">
-<title
->Options only relevant to POP3</title>
-
-<para
->Select <guilabel
->Leave fetched messages on the server</guilabel
-> if you want to leave your messages on the server after you downloaded them.</para>
-
-<para
->Select <guilabel
->Exclude from &quot;Check Mail&quot;</guilabel
-> if you do not want to check this account whenever you use <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Check Mail</guimenuitem
-></menuchoice
->. You can still check for new messages on this account with <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Check Mail In</guimenuitem
-></menuchoice
->.</para>
-
-<para
->Select <guilabel
->Enable interval mail checking</guilabel
-> if you want &kmail; to check for new messages automatically. The interval can be specified below under <guilabel
->Check interval</guilabel
->.</para>
-
-<para
-><guilabel
->inbox</guilabel
-> is the default folder for incoming messages. If you want to change that for some reason, you can do so with <guilabel
->Destination folder</guilabel
->. But what you probably want is a <link linkend="filters"
->filter</link
->, which has nothing to do with this option.</para>
-
-<para
->With <guilabel
->Precommand</guilabel
-> you can specify any program that &kmail; will execute just before fetching mail. Please specify the full path (do not use <quote
->~</quote
->) and note that &kmail; will not continue until the program returns.</para>
-
-<para
->On the <guilabel
->Extras</guilabel
-> tab you can select <guilabel
->Use pipelining for faster mail download</guilabel
-> if this is supported by your server. You should carefully test this to make sure it works safely.</para>
+<title>Options only relevant to POP3</title>
+
+<para>Select <guilabel>Leave fetched messages on the server</guilabel> if you want to leave your messages on the server after you downloaded them.</para>
+
+<para>Select <guilabel>Exclude from &quot;Check Mail&quot;</guilabel> if you do not want to check this account whenever you use <menuchoice><guimenu>File</guimenu><guimenuitem>Check Mail</guimenuitem></menuchoice>. You can still check for new messages on this account with <menuchoice><guimenu>File</guimenu><guimenuitem>Check Mail In</guimenuitem></menuchoice>.</para>
+
+<para>Select <guilabel>Enable interval mail checking</guilabel> if you want &kmail; to check for new messages automatically. The interval can be specified below under <guilabel>Check interval</guilabel>.</para>
+
+<para><guilabel>inbox</guilabel> is the default folder for incoming messages. If you want to change that for some reason, you can do so with <guilabel>Destination folder</guilabel>. But what you probably want is a <link linkend="filters">filter</link>, which has nothing to do with this option.</para>
+
+<para>With <guilabel>Precommand</guilabel> you can specify any program that &kmail; will execute just before fetching mail. Please specify the full path (do not use <quote>~</quote>) and note that &kmail; will not continue until the program returns.</para>
+
+<para>On the <guilabel>Extras</guilabel> tab you can select <guilabel>Use pipelining for faster mail download</guilabel> if this is supported by your server. You should carefully test this to make sure it works safely.</para>
 </sect3>
 
 <sect3 id="receiving-mail-imap-pop3">
-<title
->Options for both <acronym
->IMAP</acronym
-> and POP3</title>
+<title>Options for both <acronym>IMAP</acronym> and POP3</title>
 
 <!-- TODO: move all this, this isn't important for beginners?! -->
-<para
->If you select <guilabel
->Store POP password in configuration file</guilabel
-> or <guilabel
->Store IMAP password in configuration file</guilabel
-> &kmail; will remember your password so you will not have to type it every time you start &kmail; and fetch new mail.</para>
-
-<warning
-><para
->Be warned that &kmail; cannot really encrypt your password, so people who can access your configuration files (&eg; system administrators) can easily get your password if you select this option.</para
-></warning>
-
-<para
->&kmail; supports encryption via <guilabel
->SSL</guilabel
-> and <guilabel
->TLS</guilabel
-> (<guilabel
->TLS</guilabel
-> should be preferred if it is available).</para>
-
-<para
->For POP3 &kmail; supports:</para>
+<para>If you select <guilabel>Store POP password in configuration file</guilabel> or <guilabel>Store IMAP password in configuration file</guilabel> &kmail; will remember your password so you will not have to type it every time you start &kmail; and fetch new mail.</para>
+
+<warning><para>Be warned that &kmail; cannot really encrypt your password, so people who can access your configuration files (&eg; system administrators) can easily get your password if you select this option.</para></warning>
+
+<para>&kmail; supports encryption via <guilabel>SSL</guilabel> and <guilabel>TLS</guilabel> (<guilabel>TLS</guilabel> should be preferred if it is available).</para>
+
+<para>For POP3 &kmail; supports:</para>
 
 <itemizedlist>
-<listitem
-><para
-><guilabel
->Clear text</guilabel
->, </para
-></listitem>
-<listitem
-><para
-><guilabel
->PLAIN</guilabel
->, </para
-></listitem>
-<listitem
-><para
-><guilabel
->LOGIN</guilabel
->, </para
-></listitem>
-<listitem
-><para
-><guilabel
->CRAM-MD5</guilabel
-> (recommended if <guilabel
->DIGEST-MD5</guilabel
-> is not available),</para
-></listitem>
-<listitem
-><para
-><guilabel
->DIGEST-MD5</guilabel
-> (recommended) and</para
-></listitem>
-<listitem
-><para
-><guilabel
->APOP</guilabel
-> authentication.</para
-></listitem>
+<listitem><para><guilabel>Clear text</guilabel>, </para></listitem>
+<listitem><para><guilabel>PLAIN</guilabel>, </para></listitem>
+<listitem><para><guilabel>LOGIN</guilabel>, </para></listitem>
+<listitem><para><guilabel>CRAM-MD5</guilabel> (recommended if <guilabel>DIGEST-MD5</guilabel> is not available),</para></listitem>
+<listitem><para><guilabel>DIGEST-MD5</guilabel> (recommended) and</para></listitem>
+<listitem><para><guilabel>APOP</guilabel> authentication.</para></listitem>
 </itemizedlist>
 
-<para
-><guilabel
->DIGEST-MD5</guilabel
->, <guilabel
->CRAM-MD5</guilabel
-> and <guilabel
->APOP</guilabel
-> are secure on their own, the other options are only secure when used together with <guilabel
->SSL</guilabel
-> or <guilabel
->TLS</guilabel
->. You should only use <guilabel
->Clear text</guilabel
-> if your server does not support any of the other authentication methods. Additionally, for <acronym
->IMAP</acronym
-> <guilabel
->Anonymous</guilabel
-> is supported, but <guilabel
->APOP</guilabel
-> is not. Use the <guibutton
->Check what the server supports</guibutton
-> button on the <guilabel
->Extras</guilabel
-> or <guilabel
->Security</guilabel
-> tab to automatically select the most secure settings supported by your server.</para>
-
-<para
->You are now ready to send and receive mail. For <acronym
->IMAP</acronym
->, just open your folders in the folder tree in &kmail;'s main window. &kmail; then connects to your server and displays the messages it finds. For POP3 use <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Check Mail</guimenuitem
-></menuchoice
->.</para>
+<para><guilabel>DIGEST-MD5</guilabel>, <guilabel>CRAM-MD5</guilabel> and <guilabel>APOP</guilabel> are secure on their own, the other options are only secure when used together with <guilabel>SSL</guilabel> or <guilabel>TLS</guilabel>. You should only use <guilabel>Clear text</guilabel> if your server does not support any of the other authentication methods. Additionally, for <acronym>IMAP</acronym> <guilabel>Anonymous</guilabel> is supported, but <guilabel>APOP</guilabel> is not. Use the <guibutton>Check what the server supports</guibutton> button on the <guilabel>Extras</guilabel> or <guilabel>Security</guilabel> tab to automatically select the most secure settings supported by your server.</para>
+
+<para>You are now ready to send and receive mail. For <acronym>IMAP</acronym>, just open your folders in the folder tree in &kmail;'s main window. &kmail; then connects to your server and displays the messages it finds. For POP3 use <menuchoice><guimenu>File</guimenu><guimenuitem>Check Mail</guimenuitem></menuchoice>.</para>
 
 </sect3>
 
@@ -585,50 +136,11 @@
 </sect1>
 
 <sect1 id="testing-your-setup">
-<title
->Testing your Setup</title>
-
-<para
->First, you should send yourself a message to test your configuration. To send a message, either hit <keycombo action="simul"
->&Ctrl;<keycap
->N</keycap
-></keycombo
->, select the <guiicon
->New Message</guiicon
-> icon or select the <menuchoice
-><guimenu
->Message</guimenu
-><guimenuitem
->New Message...</guimenuitem
-></menuchoice
-> menu item. The <link linkend="the-composer-window"
->composer window</link
-> will appear. Fill in the <guilabel
->To:</guilabel
-> field with your email address and type something in the <guilabel
->Subject</guilabel
-> field. Send the message by selecting <menuchoice
-><guimenu
->Message</guimenu
-> <guimenuitem
->Send</guimenuitem
-> </menuchoice
->.</para>
+<title>Testing your Setup</title>
+
+<para>First, you should send yourself a message to test your configuration. To send a message, either hit <keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo>, select the <guiicon>New Message</guiicon> icon or select the <menuchoice><guimenu>Message</guimenu><guimenuitem>New Message...</guimenuitem></menuchoice> menu item. The <link linkend="the-composer-window">composer window</link> will appear. Fill in the <guilabel>To:</guilabel> field with your email address and type something in the <guilabel>Subject</guilabel> field. Send the message by selecting <menuchoice><guimenu>Message</guimenu> <guimenuitem>Send</guimenuitem> </menuchoice>.</para>
       
-<para
->To check your email, select <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Check Mail</guimenuitem
-></menuchoice
->. In the lower right corner of the main window, a progress bar will indicate how many messages are being downloaded. If you receive the message you just sent, then congratulations! If, however, you receive any error messages while testing your setup, make sure that your network connection is working and recheck your settings at <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure &kmail;...</guimenuitem
-></menuchoice
->.</para>
+<para>To check your email, select <menuchoice><guimenu>File</guimenu><guimenuitem>Check Mail</guimenuitem></menuchoice>. In the lower right corner of the main window, a progress bar will indicate how many messages are being downloaded. If you receive the message you just sent, then congratulations! If, however, you receive any error messages while testing your setup, make sure that your network connection is working and recheck your settings at <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure &kmail;...</guimenuitem></menuchoice>.</para>
 
 </sect1>
 
diff --git a/tde-i18n-en_GB/docs/tdepim/kmail/importing.docbook b/tde-i18n-en_GB/docs/tdepim/kmail/importing.docbook
index 3f0e0fc5f18..5cf77a7bbef 100644
--- a/tde-i18n-en_GB/docs/tdepim/kmail/importing.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/kmail/importing.docbook
@@ -2,376 +2,127 @@
 
 <chapterinfo>
 <authorgroup>
-<author
-><firstname
->Daniel</firstname
-> <surname
->Naber</surname
-> <affiliation
-><address
-> <email
->daniel.naber@t-online.de</email>
-</address
-></affiliation>
+<author><firstname>Daniel</firstname> <surname>Naber</surname> <affiliation><address> <email>daniel.naber@t-online.de</email>
+</address></affiliation>
 </author>
-<author
-><firstname
->David</firstname
-> <surname
->Rugge</surname
-> <affiliation
-><address
-> <email
->davidrugge@mediaone.net</email>
-</address
-></affiliation>
+<author><firstname>David</firstname> <surname>Rugge</surname> <affiliation><address> <email>davidrugge@mediaone.net</email>
+</address></affiliation>
 </author>
-<othercredit role="translator"
-><firstname
->Andrew</firstname
-><surname
->Coles</surname
-><affiliation
-><address
-><email
->andrew_coles@yahoo.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Andrew</firstname><surname>Coles</surname><affiliation><address><email>andrew_coles@yahoo.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
-<date
->2002-10-03</date
-> <releaseinfo
->1.5</releaseinfo
-> </chapterinfo>
+<date>2002-10-03</date> <releaseinfo>1.5</releaseinfo> </chapterinfo>
 
-<title
->Using other Mailbox Files with &kmail;</title>
+<title>Using other Mailbox Files with &kmail;</title>
 
-<para
->&kmail; offers an import tool for the messages and address books of some other email clients. You can access it using <menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Import...</guimenuitem
-></menuchoice
->. Please make sure that you compact your folders in the other email client, no matter if you are going to use the import utility or if you are going to copy files manually. You only need to read this chapter if this tool does not work for you.</para>
+<para>&kmail; offers an import tool for the messages and address books of some other email clients. You can access it using <menuchoice><guimenu>Tools</guimenu> <guimenuitem>Import...</guimenuitem></menuchoice>. Please make sure that you compact your folders in the other email client, no matter if you are going to use the import utility or if you are going to copy files manually. You only need to read this chapter if this tool does not work for you.</para>
 
-<para
->This section is for all of the users who need to move email messages from their previous email client over to &kmail;. &kmail; can store its messages using <quote
->mbox</quote
-> or <quote
->maildir</quote
-> formats, which are the most widely-used mailbox formats on &UNIX; systems. Mbox mailboxes store messages in one file, identifying where messages start and end with a <literal
->From</literal
-> line (do not mix this up with the <literal
->From:</literal
-> header that contains the message's sender); Maildir uses one file per message. For many &UNIX; email clients, all you must do is move your mailboxes to <filename class="directory"
->~/Mail</filename
-> (or make <filename class="symlink"
->Mail</filename
-> a symbolic link to the folder containing your mailboxes), make sure they are writable by your user, and launch &kmail;. The mailboxes should now show up correctly in &kmail;.</para>
+<para>This section is for all of the users who need to move email messages from their previous email client over to &kmail;. &kmail; can store its messages using <quote>mbox</quote> or <quote>maildir</quote> formats, which are the most widely-used mailbox formats on &UNIX; systems. Mbox mailboxes store messages in one file, identifying where messages start and end with a <literal>From</literal> line (do not mix this up with the <literal>From:</literal> header that contains the message's sender); Maildir uses one file per message. For many &UNIX; email clients, all you must do is move your mailboxes to <filename class="directory">~/Mail</filename> (or make <filename class="symlink">Mail</filename> a symbolic link to the folder containing your mailboxes), make sure they are writable by your user, and launch &kmail;. The mailboxes should now show up correctly in &kmail;.</para>
 
-<para
->Please have a look at the <ulink url="http://kmail.kde.org/tools.html"
->Tools section of &kmail;'s homepage</ulink
-> first, to see if there is a tool that imports your mailbox and maybe even address book.</para>
+<para>Please have a look at the <ulink url="http://kmail.kde.org/tools.html">Tools section of &kmail;'s homepage</ulink> first, to see if there is a tool that imports your mailbox and maybe even address book.</para>
 
-<warning
-><para
->Do not use a second email client that accesses the files in <filename class="directory"
->~/Mail</filename
-> while &kmail; is running or you might lose messages. This section only explains how to import mailboxes to &kmail; once; it is not useful to you if you're planning to use several email clients for your mailboxes in the future.</para
-></warning>
+<warning><para>Do not use a second email client that accesses the files in <filename class="directory">~/Mail</filename> while &kmail; is running or you might lose messages. This section only explains how to import mailboxes to &kmail; once; it is not useful to you if you're planning to use several email clients for your mailboxes in the future.</para></warning>
 
 <variablelist>
 
 <varlistentry>
-<term
-><application
->Eudora Lite</application
->/<application
->Eudora Pro</application
-></term>
+<term><application>Eudora Lite</application>/<application>Eudora Pro</application></term>
 <listitem>
-<para
-><application
->Eudora</application
-> uses the mbox format in its mail files. To use them with &kmail;, make sure that your <application
->Eudora</application
-> mailboxes have been compacted, then copy the <literal role="extension"
->.mbx</literal
-> files (&Windows; <application
->Eudora</application
->) or <application
->Eudora</application
-> mailbox files (&Mac; <application
->Eudora</application
->) to your <filename class="directory"
->~/Mail</filename
-> folder. You do not need to copy the <filename
->index</filename
-> files. Once you start &kmail;, the mailboxes should appear in the Folders pane and the messages should be accessible in the Headers pane.</para>
-<para
->If messages do not appear in the Headers pane, your mailbox files may still contain &Windows; or &Mac; line-feed characters. Use your favourite text editor, the <application
->recode</application
-> command or a scripting language to change the &Windows; or &Mac; line feeds to &UNIX; line feeds.</para>
+<para><application>Eudora</application> uses the mbox format in its mail files. To use them with &kmail;, make sure that your <application>Eudora</application> mailboxes have been compacted, then copy the <literal role="extension">.mbx</literal> files (&Windows; <application>Eudora</application>) or <application>Eudora</application> mailbox files (&Mac; <application>Eudora</application>) to your <filename class="directory">~/Mail</filename> folder. You do not need to copy the <filename>index</filename> files. Once you start &kmail;, the mailboxes should appear in the Folders pane and the messages should be accessible in the Headers pane.</para>
+<para>If messages do not appear in the Headers pane, your mailbox files may still contain &Windows; or &Mac; line-feed characters. Use your favourite text editor, the <application>recode</application> command or a scripting language to change the &Windows; or &Mac; line feeds to &UNIX; line feeds.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><application
->Mailsmith</application
-></term>
+<term><application>Mailsmith</application></term>
 <listitem>
-<para
-><application
->Mailsmith</application
-> runs on &Mac; and uses its own database format; however it is possible to export mail into mbox format using <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Export Mail</guimenuitem
-></menuchoice
-> on a selected mailbox or on selected messages. Once the messages have been exported, translate the &Mac; line breaks to &UNIX; line breaks using your favourite editor, or using the following command under &Linux;:</para>
+<para><application>Mailsmith</application> runs on &Mac; and uses its own database format; however it is possible to export mail into mbox format using <menuchoice><guimenu>File</guimenu><guimenuitem>Export Mail</guimenuitem></menuchoice> on a selected mailbox or on selected messages. Once the messages have been exported, translate the &Mac; line breaks to &UNIX; line breaks using your favourite editor, or using the following command under &Linux;:</para>
 
-<para
-><userinput
-><command
->cat</command
-> <option
->mail-mac.txt</option
-> | perl -e 'while (&lt;STDIN&gt;) { s/\r/\n/gi; print $_ ;}' &gt; mail-unix.txt</userinput
-></para>
+<para><userinput><command>cat</command> <option>mail-mac.txt</option> | perl -e 'while (&lt;STDIN&gt;) { s/\r/\n/gi; print $_ ;}' &gt; mail-unix.txt</userinput></para>
 
-<para
->&kmail; will only recognise mboxes placed directly in the <filename class="directory"
->~/Mail/</filename
-> folder. This means that a folder hierarchy cannot be preserved by simply moving files into the <filename class="directory"
->~/Mail/</filename
-> folder, but will need to be reconstructed within &kmail; manually.</para>
+<para>&kmail; will only recognise mboxes placed directly in the <filename class="directory">~/Mail/</filename> folder. This means that a folder hierarchy cannot be preserved by simply moving files into the <filename class="directory">~/Mail/</filename> folder, but will need to be reconstructed within &kmail; manually.</para>
 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->MMDF</term>
+<term>MMDF</term>
 <listitem>
-<para
->This format is close enough to the mailbox format that &kmail; should be able to use these mailboxes if you just copy them to your <filename class="directory"
->~/Mail</filename
-> folder; however, MMDF mailboxes have not been tested with &kmail;, so your results may vary. If you can get this format to work with &kmail;, please let us know so we can include more specific directions in the next documentation release.</para>
+<para>This format is close enough to the mailbox format that &kmail; should be able to use these mailboxes if you just copy them to your <filename class="directory">~/Mail</filename> folder; however, MMDF mailboxes have not been tested with &kmail;, so your results may vary. If you can get this format to work with &kmail;, please let us know so we can include more specific directions in the next documentation release.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->MH mailboxes</term>
+<term>MH mailboxes</term>
 <listitem>
-<para
->MH mailboxes are directories containing files that correspond to each message in that mailbox. A shell script to convert MH mailboxes to mbox mailboxes, <command
->mh2kmail</command
->, is included at least in the source releases of &kmail;, but maybe not in the packaged releases. Running this script on a MH folder will convert it to an mbox file. We strongly suggest that you back up your MH mail folders before you use this script.</para>
+<para>MH mailboxes are directories containing files that correspond to each message in that mailbox. A shell script to convert MH mailboxes to mbox mailboxes, <command>mh2kmail</command>, is included at least in the source releases of &kmail;, but maybe not in the packaged releases. Running this script on a MH folder will convert it to an mbox file. We strongly suggest that you back up your MH mail folders before you use this script.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Forte <application
->Agent</application
-></term>
+<term>Forte <application>Agent</application></term>
 <listitem>
-<para
->In <application
->Agent</application
->:</para>
+<para>In <application>Agent</application>:</para>
 <procedure>
 <step>
-<para
->Select the messages to export</para>
+<para>Select the messages to export</para>
 </step>
 <step>
-<para
->Select <menuchoice
-><guimenu
->FILE</guimenu
-><guimenuitem
->SAVE MESSAGES AS</guimenuitem
-></menuchoice
-></para>
+<para>Select <menuchoice><guimenu>FILE</guimenu><guimenuitem>SAVE MESSAGES AS</guimenuitem></menuchoice></para>
 </step>
 <step>
-<para
->Mark the <guilabel
->UNIX FORMAT</guilabel
-> and <guilabel
->SAVE RAW</guilabel
-> boxes</para>
+<para>Mark the <guilabel>UNIX FORMAT</guilabel> and <guilabel>SAVE RAW</guilabel> boxes</para>
 </step>
 <step>
-<para
->Give File a <literal role="extension"
->.txt</literal
-> extension and save.</para>
+<para>Give File a <literal role="extension">.txt</literal> extension and save.</para>
 </step>
 </procedure>
 
-<para
->In &kde;:</para>
+<para>In &kde;:</para>
 
 <procedure>
 <step>
-<para
->Move the previously-saved file to the correct <filename class="directory"
->~/Mail</filename
-> folder</para>
+<para>Move the previously-saved file to the correct <filename class="directory">~/Mail</filename> folder</para>
 </step>
 <step>
-<para
->Rename file without <literal role="extension"
->.txt</literal
-> extension</para>
+<para>Rename file without <literal role="extension">.txt</literal> extension</para>
 </step>
 </procedure>
-<para
->When you open &kmail; the new folder with appropriate messages will be there.</para>
+<para>When you open &kmail; the new folder with appropriate messages will be there.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->&Netscape; Mail</term>
+<term>&Netscape; Mail</term>
 <listitem>
 
-<para
->If you are using &Netscape; 4.x, the mail files should be found in <filename class="directory"
->~/nsmail</filename
->; if you are using &Netscape; 6.x, they're buried in a folder deep in the <filename class="directory"
->~/.mozilla</filename
-> subfolder, something like: <filename class="directory"
->/home/user_name/.mozilla/user_name/2ts1ixha.slt/Mail/Mail/server_name</filename
-> (the <filename class="directory"
->2ts1ixha.slt</filename
-> string will probably vary, so check it on your own system.) The <filename class="directory"
->[...]/Mail/Mail</filename
-> folder contains one subfolder for each account from which you receive mail through Netscape (&eg; <filename class="directory"
->[...]/Mail/Mail/math.university.edu</filename
->); you will need to copy files from each of them if you want everything to be accessible under &kmail;.</para>
+<para>If you are using &Netscape; 4.x, the mail files should be found in <filename class="directory">~/nsmail</filename>; if you are using &Netscape; 6.x, they're buried in a folder deep in the <filename class="directory">~/.mozilla</filename> subfolder, something like: <filename class="directory">/home/user_name/.mozilla/user_name/2ts1ixha.slt/Mail/Mail/server_name</filename> (the <filename class="directory">2ts1ixha.slt</filename> string will probably vary, so check it on your own system.) The <filename class="directory">[...]/Mail/Mail</filename> folder contains one subfolder for each account from which you receive mail through Netscape (&eg; <filename class="directory">[...]/Mail/Mail/math.university.edu</filename>); you will need to copy files from each of them if you want everything to be accessible under &kmail;.</para>
 
-<para
->If you have no subfolders, just copy all of the &Netscape; files to <filename class="directory"
->~/Mail</filename
->, make sure that they are writable (only by your user, of course) and restart &kmail;: all of the messages will now appear in &kmail; folders. (Note that if you use a command like <command
->cp <parameter
->*</parameter
-> <parameter
->~/Mail</parameter
-></command
->, you should follow it with <command
->rm <option
->-f</option
-> <parameter
->~/Mail/*.msf</parameter
-></command
->; every &Netscape; 6 folder has a corresponding <filename
->.msf</filename
-> file, and if you do not get rid of them you will have a bunch of spurious empty folders).</para>
+<para>If you have no subfolders, just copy all of the &Netscape; files to <filename class="directory">~/Mail</filename>, make sure that they are writable (only by your user, of course) and restart &kmail;: all of the messages will now appear in &kmail; folders. (Note that if you use a command like <command>cp <parameter>*</parameter> <parameter>~/Mail</parameter></command>, you should follow it with <command>rm <option>-f</option> <parameter>~/Mail/*.msf</parameter></command>; every &Netscape; 6 folder has a corresponding <filename>.msf</filename> file, and if you do not get rid of them you will have a bunch of spurious empty folders).</para>
 
-<para
->If you were using subfolders under &Netscape; (&eg; a main folder called <replaceable
->Work</replaceable
-> with subfolders called <replaceable
->Jim</replaceable
-> and <replaceable
->Nancy</replaceable
->), there are additional steps required. First, create the main folder (<replaceable
->Work</replaceable
->) in &kmail; and create a temporary child folder under it (by right-clicking on the folder name and selecting <guilabel
->Create child folder</guilabel
->); it does not matter what you call this folder -- <replaceable
->dummy</replaceable
-> or the default <replaceable
->unnamed</replaceable
->, for example. Once a child folder has been requested, &kmail; creates a hidden folder in <filename class="directory"
->~/Mail</filename
-> called (in this example) <filename class="directory"
->.Work.directory</filename
->. You can then copy your &Netscape; subfolder files (<replaceable
->Jim</replaceable
-> and <replaceable
->Nancy</replaceable
->) into <filename class="directory"
->~/Mail/.Work.directory</filename
->, and restart &kmail;; the child folders will appear under the main folder <replaceable
->Work</replaceable
->. Of course, this procedure may be extended for sub-subfolders, to any depth. (You can remove the temporary child folders afterwards, unless it amuses you to have a <replaceable
->Work</replaceable
-> subfolder called <replaceable
->dummy</replaceable
->).</para>
+<para>If you were using subfolders under &Netscape; (&eg; a main folder called <replaceable>Work</replaceable> with subfolders called <replaceable>Jim</replaceable> and <replaceable>Nancy</replaceable>), there are additional steps required. First, create the main folder (<replaceable>Work</replaceable>) in &kmail; and create a temporary child folder under it (by right-clicking on the folder name and selecting <guilabel>Create child folder</guilabel>); it does not matter what you call this folder -- <replaceable>dummy</replaceable> or the default <replaceable>unnamed</replaceable>, for example. Once a child folder has been requested, &kmail; creates a hidden folder in <filename class="directory">~/Mail</filename> called (in this example) <filename class="directory">.Work.directory</filename>. You can then copy your &Netscape; subfolder files (<replaceable>Jim</replaceable> and <replaceable>Nancy</replaceable>) into <filename class="directory">~/Mail/.Work.directory</filename>, and restart &kmail;; the child folders will appear under the main folder <replaceable>Work</replaceable>. Of course, this procedure may be extended for sub-subfolders, to any depth. (You can remove the temporary child folders afterwards, unless it amuses you to have a <replaceable>Work</replaceable> subfolder called <replaceable>dummy</replaceable>).</para>
 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><application
->Pegasus Mail</application
-></term>
+<term><application>Pegasus Mail</application></term>
 <listitem>
-<para
-><application
->Pegasus</application
-> for win32 uses single files for Mail folders similar to &kmail;. <application
->Pegasus mail</application
-> folder files have the extension <literal role="extension"
->.pmm</literal
-> but they are the same format as mbox except the messages do not start with the <literal
->From</literal
-> header, but with a control character. To work around this, replace each instance of the control character with <literal
->From aaa@aaa Mon Jan 01 00:00:00 1997</literal
->. This <literal
->From</literal
-> line should be the first line of every message, before the <literal
->Received:</literal
-> and other headers. Make sure to use a text editor that lets you save the files in &UNIX; format or create new folders in <application
->Pegasus</application
-> that are in &UNIX; format and copy your messages there.</para>
+<para><application>Pegasus</application> for win32 uses single files for Mail folders similar to &kmail;. <application>Pegasus mail</application> folder files have the extension <literal role="extension">.pmm</literal> but they are the same format as mbox except the messages do not start with the <literal>From</literal> header, but with a control character. To work around this, replace each instance of the control character with <literal>From aaa@aaa Mon Jan 01 00:00:00 1997</literal>. This <literal>From</literal> line should be the first line of every message, before the <literal>Received:</literal> and other headers. Make sure to use a text editor that lets you save the files in &UNIX; format or create new folders in <application>Pegasus</application> that are in &UNIX; format and copy your messages there.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Maildir / Outlook Express / xfmail</term>
+<term>Maildir / Outlook Express / xfmail</term>
 <listitem>
-<para
->Tools to convert these formats are available at the <ulink url="http://kmail.kde.org/tools.html"
->Tools section of &kmail;'s homepage</ulink
->.</para>
+<para>Tools to convert these formats are available at the <ulink url="http://kmail.kde.org/tools.html">Tools section of &kmail;'s homepage</ulink>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Lotus <application
->Notes</application
->, BeOS Mail files, <application
->cc: Mail</application
->, &etc;...</term>
+<term>Lotus <application>Notes</application>, BeOS Mail files, <application>cc: Mail</application>, &etc;...</term>
 <listitem>
-<para
->First you should have a look at <ulink url="http://kmail.kde.org/tools.html"
->Tools section of &kmail;'s homepage</ulink
-> if there are tools to convert your messages.</para>
-<para
->Mail programs not listed here or on the homepage probably do not work with &kmail; as they use proprietary mail formats that &kmail; cannot understand. However, there is no harm in trying! If the mailbox file looks similar to the mbox format, try copying the mailbox file (remember, the index file is not needed) to your <filename class="directory"
->~/Mail</filename
-> folder and see what happens if you start &kmail;. If you get mailboxes from your favorite email client to work in &kmail;, please tell us how you did it so that we can include directions in a future revision of this documentation. </para>
+<para>First you should have a look at <ulink url="http://kmail.kde.org/tools.html">Tools section of &kmail;'s homepage</ulink> if there are tools to convert your messages.</para>
+<para>Mail programs not listed here or on the homepage probably do not work with &kmail; as they use proprietary mail formats that &kmail; cannot understand. However, there is no harm in trying! If the mailbox file looks similar to the mbox format, try copying the mailbox file (remember, the index file is not needed) to your <filename class="directory">~/Mail</filename> folder and see what happens if you start &kmail;. If you get mailboxes from your favorite email client to work in &kmail;, please tell us how you did it so that we can include directions in a future revision of this documentation. </para>
 </listitem>
 </varlistentry>
 
diff --git a/tde-i18n-en_GB/docs/tdepim/kmail/index.docbook b/tde-i18n-en_GB/docs/tdepim/kmail/index.docbook
index 112a6cfc795..d5825eb2da6 100644
--- a/tde-i18n-en_GB/docs/tdepim/kmail/index.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/kmail/index.docbook
@@ -11,50 +11,27 @@
   <!ENTITY kmail-importing SYSTEM "importing.docbook">
   <!ENTITY kmail-credits-and-licenses SYSTEM "credits-and-licenses.docbook">
   <!ENTITY % addindex "IGNORE">
-  <!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
-  <!ENTITY html "<acronym
->HTML</acronym
->">
-  <!ENTITY gpg "<application
->GPG</application
->">
-  <!ENTITY gpgsm "<application
->GpgSM</application
->">
-  <!ENTITY mdn "<acronym
->MDN</acronym
->">
-  <!ENTITY acl "<acronym
->ACL</acronym
->">
-  <!ENTITY imap "<acronym
->IMAP</acronym
->">
-  <!ENTITY nntp "<acronym
->NNTP</acronym
->">
-  <!ENTITY openpgp "<acronym
->OpenPGP</acronym
->">
-  <!ENTITY smime "<acronym
->S/MIME</acronym
->">
-  <!ENTITY kolab "<acronym
->Kolab</acronym
->">
+  <!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
+  <!ENTITY html "<acronym>HTML</acronym>">
+  <!ENTITY gpg "<application>GPG</application>">
+  <!ENTITY gpgsm "<application>GpgSM</application>">
+  <!ENTITY mdn "<acronym>MDN</acronym>">
+  <!ENTITY acl "<acronym>ACL</acronym>">
+  <!ENTITY imap "<acronym>IMAP</acronym>">
+  <!ENTITY nntp "<acronym>NNTP</acronym>">
+  <!ENTITY openpgp "<acronym>OpenPGP</acronym>">
+  <!ENTITY smime "<acronym>S/MIME</acronym>">
+  <!ENTITY kolab "<acronym>Kolab</acronym>">
 ]>
 <book lang="&language;">
 <bookinfo>
-<title
->The &kmail; Handbook</title>
+<title>The &kmail; Handbook</title>
 
  <!-- Note:
 * please do not mix up the formatting more than necessary so that
   "cvs diff" makes useful output
 * no short forms
-* use <warning
-> instead of <caution>
+* use <warning> instead of <caution>
 -->
 
 <!-- TODO:
@@ -71,12 +48,8 @@
 * fix my adverb vs. adjective mistakes
 
 * coherent wording for section / tab / ...
-* <menuchoice
-><guimenu
->xxx , or is <guimenu
->xxx enough?
-* <guiicon
-> vs. <guibutton>
+* <menuchoice><guimenu>xxx , or is <guimenu>xxx enough?
+* <guiicon> vs. <guibutton>
 * spelling:  popup vs pop up, frontend vs front end
 
 * message vs. mail vs. email -> using "message" everywhere
@@ -86,110 +59,55 @@
 -->
 
 <authorgroup>
-<author
-><firstname
->Daniel</firstname
-> <surname
->Naber</surname
-> <affiliation
-><address
-> <email
->daniel.naber@t-online.de</email>
-</address
-></affiliation>
+<author><firstname>Daniel</firstname> <surname>Naber</surname> <affiliation><address> <email>daniel.naber@t-online.de</email>
+</address></affiliation>
 </author>
 
-<author
-><firstname
->David</firstname
-> <surname
->Rugge</surname
-> <affiliation
-><address
-> <email
->davidrugge@mediaone.net</email>
-</address
-></affiliation>
+<author><firstname>David</firstname> <surname>Rugge</surname> <affiliation><address> <email>davidrugge@mediaone.net</email>
+</address></affiliation>
 </author>
 
-<othercredit role="translator"
-><firstname
->Andrew</firstname
-><surname
->Coles</surname
-><affiliation
-><address
-><email
->andrew_coles@yahoo.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
->   
+<othercredit role="translator"><firstname>Andrew</firstname><surname>Coles</surname><affiliation><address><email>andrew_coles@yahoo.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit>   
 
 </authorgroup>
 
-<date
->2004-07-13</date>
-<releaseinfo
->1.7</releaseinfo>
+<date>2004-07-13</date>
+<releaseinfo>1.7</releaseinfo>
 
 <copyright>
-<year
->1999</year>
-<year
->2000</year>
-<year
->2001</year>
-<year
->2002</year>
-<holder
->David Rugge</holder>
+<year>1999</year>
+<year>2000</year>
+<year>2001</year>
+<year>2002</year>
+<holder>David Rugge</holder>
 </copyright>
 <copyright>
-<year
->2003</year>
-<holder
->Daniel Naber</holder>
+<year>2003</year>
+<holder>Daniel Naber</holder>
 </copyright>
 <copyright>
-<year
->2004</year>
-<holder
->Daniel Naber</holder>
-<holder
->Ingo Kl&ouml;cker</holder>
+<year>2004</year>
+<holder>Daniel Naber</holder>
+<holder>Ingo Kl&ouml;cker</holder>
 </copyright>
 
 <abstract>
 	
-<para
->&kmail; is &kde;'s powerful and user friendly email client.</para>
+<para>&kmail; is &kde;'s powerful and user friendly email client.</para>
 
 </abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->Mail</keyword>
-<keyword
->email</keyword>
-<keyword
->Client</keyword>
-<keyword
->POP3</keyword>
-<keyword
->IMAP</keyword>
-<keyword
->PGP</keyword>
-<keyword
->GnuPG</keyword>
-<keyword
->GPG</keyword>
-<keyword
->Kolab</keyword>
+<keyword>KDE</keyword>
+<keyword>Mail</keyword>
+<keyword>email</keyword>
+<keyword>Client</keyword>
+<keyword>POP3</keyword>
+<keyword>IMAP</keyword>
+<keyword>PGP</keyword>
+<keyword>GnuPG</keyword>
+<keyword>GPG</keyword>
+<keyword>Kolab</keyword>
 </keywordset>
 </bookinfo>
 
@@ -203,17 +121,14 @@
 &kmail-credits-and-licenses;
 
 <appendix id="installation">
-<title
->Installation</title>
+<title>Installation</title>
 
 <sect1 id="getting-kmail">
-<title
->How to obtain &kmail;</title>
+<title>How to obtain &kmail;</title>
 &install.intro.documentation; </sect1>
 
 <sect1 id="compilation">
-<title
->Compilation and Installation</title>
+<title>Compilation and Installation</title>
 &install.compile.documentation; </sect1>
 
 </appendix>
diff --git a/tde-i18n-en_GB/docs/tdepim/kmail/intro.docbook b/tde-i18n-en_GB/docs/tdepim/kmail/intro.docbook
index 73a9047757d..5432fa12a5a 100644
--- a/tde-i18n-en_GB/docs/tdepim/kmail/intro.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/kmail/intro.docbook
@@ -2,83 +2,34 @@
 
 <chapterinfo>
 <authorgroup>
-<author
-><firstname
->Daniel</firstname
-> <surname
->Naber</surname
-> <affiliation
-><address
-> <email
->daniel.naber@t-online.de</email>
-</address
-></affiliation>
+<author><firstname>Daniel</firstname> <surname>Naber</surname> <affiliation><address> <email>daniel.naber@t-online.de</email>
+</address></affiliation>
 </author>
-<othercredit role="translator"
-><firstname
->Andrew</firstname
-><surname
->Coles</surname
-><affiliation
-><address
-><email
->andrew_coles@yahoo.co.uk</email
-></address
-></affiliation
-><contrib
->British English English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Andrew</firstname><surname>Coles</surname><affiliation><address><email>andrew_coles@yahoo.co.uk</email></address></affiliation><contrib>British English English</contrib></othercredit> 
 </authorgroup>
-<date
->2004-07-13</date
-> <releaseinfo
->1.7</releaseinfo
-> </chapterinfo>
+<date>2004-07-13</date> <releaseinfo>1.7</releaseinfo> </chapterinfo>
 
-<title
->Introduction</title>
+<title>Introduction</title>
 
-<para
->The &kmail; Team welcomes you to &kmail;, a user-friendly email client for the K Desktop Environment. Our goal is to make &kmail; a program that is beautiful and intuitive without sacrificing power. </para>
+<para>The &kmail; Team welcomes you to &kmail;, a user-friendly email client for the K Desktop Environment. Our goal is to make &kmail; a program that is beautiful and intuitive without sacrificing power. </para>
 
-<para
->If you have never set up an email client on a &UNIX; system before, we suggest that you read through the <link linkend="getting-started"
->Getting Started</link
-> section first so that your setup goes smoothly.</para>
+<para>If you have never set up an email client on a &UNIX; system before, we suggest that you read through the <link linkend="getting-started">Getting Started</link> section first so that your setup goes smoothly.</para>
 
-<para
->Since most people do not read documentation anyway, here is a collection of the most helpful tips:</para>
+<para>Since most people do not read documentation anyway, here is a collection of the most helpful tips:</para>
 
 <itemizedlist>
 <listitem>
-<para
->You do not have to use your mouse to use &kmail;. Everything can be done by using <link linkend="keyboard-shortcuts"
->Keyboard Shortcuts</link
->.</para>
+<para>You do not have to use your mouse to use &kmail;. Everything can be done by using <link linkend="keyboard-shortcuts">Keyboard Shortcuts</link>.</para>
 </listitem>
 <listitem>
-<para
->Although &kmail; can be considered reliable you should keep backups of your messages, &ie; just copy the files and folders in <filename class="directory"
->~/Mail</filename
-> (including the hidden ones that start with a dot) to a safe place.</para>
+<para>Although &kmail; can be considered reliable you should keep backups of your messages, &ie; just copy the files and folders in <filename class="directory">~/Mail</filename> (including the hidden ones that start with a dot) to a safe place.</para>
 </listitem>
 <!-- TODO: add other tips for "invisible" features here -->
 
 </itemizedlist>
 
-<para
->&kmail;'s homepage can be found at <ulink url="http://kmail.kde.org"
->http://kmail.kde.org</ulink
->. There you will find useful links, &eg; to the user and developer mailing lists. Please report bugs in &kmail; using <menuchoice
-><guimenu
->Help</guimenu
-><guimenuitem
->Report Bug...</guimenuitem
-></menuchoice
->.</para>
+<para>&kmail;'s homepage can be found at <ulink url="http://kmail.kde.org">http://kmail.kde.org</ulink>. There you will find useful links, &eg; to the user and developer mailing lists. Please report bugs in &kmail; using <menuchoice><guimenu>Help</guimenu><guimenuitem>Report Bug...</guimenuitem></menuchoice>.</para>
 
-<para
->We hope you will enjoy &kmail;!</para>
+<para>We hope you will enjoy &kmail;!</para>
 
 </chapter>
diff --git a/tde-i18n-en_GB/docs/tdepim/kmail/menus.docbook b/tde-i18n-en_GB/docs/tdepim/kmail/menus.docbook
index 1157641c3f5..870f7489c06 100644
--- a/tde-i18n-en_GB/docs/tdepim/kmail/menus.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/kmail/menus.docbook
@@ -2,292 +2,129 @@
 
 <chapterinfo>
 <authorgroup>
-<author
-><firstname
->Daniel</firstname
-> <surname
->Naber</surname
-> <affiliation
-><address
-> <email
->daniel.naber@t-online.de</email>
-</address
-></affiliation>
+<author><firstname>Daniel</firstname> <surname>Naber</surname> <affiliation><address> <email>daniel.naber@t-online.de</email>
+</address></affiliation>
 </author>
-<author
-><firstname
->David</firstname
-> <surname
->Rugge</surname
-> <affiliation
-><address
-> <email
->davidrugge@mediaone.net</email>
-</address
-></affiliation>
+<author><firstname>David</firstname> <surname>Rugge</surname> <affiliation><address> <email>davidrugge@mediaone.net</email>
+</address></affiliation>
 </author>
-<author
-><firstname
->Michel</firstname
-> <surname
->Boyer de la Giroday</surname
-> <affiliation
-><address
-> <email
->michel@klaralvdalens-datakonsult.se</email>
-</address
-></affiliation>
+<author><firstname>Michel</firstname> <surname>Boyer de la Giroday</surname> <affiliation><address> <email>michel@klaralvdalens-datakonsult.se</email>
+</address></affiliation>
 </author>
-<othercredit role="translator"
-><firstname
->Andrew</firstname
-><surname
->Coles</surname
-><affiliation
-><address
-><email
->andrew_coles@yahoo.co.uk</email
-></address
-></affiliation
-><contrib
->British English English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Andrew</firstname><surname>Coles</surname><affiliation><address><email>andrew_coles@yahoo.co.uk</email></address></affiliation><contrib>British English English</contrib></othercredit> 
 </authorgroup>
-<date
->2004-07-11</date
-> <releaseinfo
->1.7</releaseinfo
-> </chapterinfo>
+<date>2004-07-11</date> <releaseinfo>1.7</releaseinfo> </chapterinfo>
 
-<title
->Menu Entries</title>
+<title>Menu Entries</title>
 
-<para
->Each menu item is discussed below. When there is a keyboard shortcut that performs a menu item function, the default shortcut is listed with the menu item.</para>
+<para>Each menu item is discussed below. When there is a keyboard shortcut that performs a menu item function, the default shortcut is listed with the menu item.</para>
 
 <sect1 id="main-mail-reader-window">
-<title
->The Main Window</title>
+<title>The Main Window</title>
 
 <sect2 id="reader-file-menu">
-<title
-><guimenu
->File</guimenu
-> Menu</title>
+<title><guimenu>File</guimenu> Menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->New Window</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>File</guimenu> <guimenuitem>New Window</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Creates a new main window.</para>
+<para>Creates a new main window.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->O</keycap
-></keycombo
-></shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Open...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>O</keycap></keycombo></shortcut> <guimenu>File</guimenu> <guimenuitem>Open...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Allows you to open files which contain email messages.</para>
+<para>Allows you to open files which contain email messages.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->S</keycap
-></keycombo
-></shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Save As...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo></shortcut> <guimenu>File</guimenu> <guimenuitem>Save As...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Saves the currently displayed message to a text file, including all the headers and attachments.</para>
+<para>Saves the currently displayed message to a text file, including all the headers and attachments.</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
->Display a dialogue that lets you prints the currently displayed message.</para>
+<para>Display a dialogue that lets you prints the currently displayed message.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Compact All Folders</guimenuitem
-> </menuchoice
-></term>
+<menuchoice><guimenu>File</guimenu> <guimenuitem>Compact All Folders</guimenuitem> </menuchoice></term>
 <listitem>
-<para
->Will compact all folders, &ie; it will really move and delete the messages on disk according to how you have moved and deleted them in &kmail;.</para>
+<para>Will compact all folders, &ie; it will really move and delete the messages on disk according to how you have moved and deleted them in &kmail;.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Expire All Folders</guimenuitem
-> </menuchoice
-></term>
+<menuchoice><guimenu>File</guimenu> <guimenuitem>Expire All Folders</guimenuitem> </menuchoice></term>
 <listitem>
-<para
->Delete old messages from all folders, according to the rules in each folder's <link linkend="folders-properties-window"
->Properties dialogue</link
-> (the default is not to delete old messages at all).</para>
+<para>Delete old messages from all folders, according to the rules in each folder's <link linkend="folders-properties-window">Properties dialogue</link> (the default is not to delete old messages at all).</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Refresh Local &imap; Cache</guimenuitem
-> </menuchoice
-></term>
+<menuchoice><guimenu>File</guimenu> <guimenuitem>Refresh Local &imap; Cache</guimenuitem> </menuchoice></term>
 <listitem>
-<para
->This will remove all changes that you have done locally to your IMAP folders and re-download everything from the server. Use this if the local cache was corrupted.</para>
+<para>This will remove all changes that you have done locally to your IMAP folders and re-download everything from the server. Use this if the local cache was corrupted.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Empty All Wastebin Folders</guimenuitem
-> </menuchoice
-></term>
+<menuchoice><guimenu>File</guimenu> <guimenuitem>Empty All Wastebin Folders</guimenuitem> </menuchoice></term>
 <listitem>
-<para
->Use this to empty all wastebin folders, &ie; the local wastebin folder and all wastebin folders that you might have on &imap; servers.</para>
+<para>Use this to empty all wastebin folders, &ie; the local wastebin folder and all wastebin folders that you might have on &imap; servers.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->L</keycap
-></keycombo
-></shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Check Mail</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>L</keycap></keycombo></shortcut> <guimenu>File</guimenu> <guimenuitem>Check Mail</guimenuitem> </menuchoice>
 </term>
-<listitem
-><para
->Checks for new messages in all your accounts, except those that have <guilabel
->Exclude from &quot;Check Mail&quot;</guilabel
-> enabled.</para>
+<listitem><para>Checks for new messages in all your accounts, except those that have <guilabel>Exclude from &quot;Check Mail&quot;</guilabel> enabled.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->File</guimenu
-> <guisubmenu
->Check Mail In</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>File</guimenu> <guisubmenu>Check Mail In</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Submenu that lets you check for new messages from a particular account.</para>
+<para>Submenu that lets you check for new messages from a particular account.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Send Queued Messages</guimenuitem
-> </menuchoice
-></term>
+<menuchoice><guimenu>File</guimenu> <guimenuitem>Send Queued Messages</guimenuitem> </menuchoice></term>
 <listitem>
-<para
->Sends the messages that are in your outbox.</para>
+<para>Sends the messages that are in your outbox.</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
->Closes the current main window or exits &kmail; if there is only this one window.</para>
+<para>Closes the current main window or exits &kmail; if there is only this one window.</para>
 </listitem>
 </varlistentry>
 
@@ -297,178 +134,79 @@
 
 
 <sect2 id="reader-edit-menu">
-<title
-><guimenu
->Edit</guimenu
-> Menu</title>
+<title><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>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>Z</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Undo</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Revokes your last move or delete action. Note that you cannot undo a deletion from the wastebin.</para>
+<para>Revokes your last move or delete action. Note that you cannot undo a deletion from the wastebin.</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>C</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Copy</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Copies selected text to the clipboard.</para>
+<para>Copies selected text to the clipboard.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->T</keycap
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Edit Message</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>T</keycap></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Edit Message</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Edits the selected message if it is editable. Only messages in the <guilabel
->outbox</guilabel
-> and <guilabel
->drafts</guilabel
-> folder can be edited.</para>
+<para>Edits the selected message if it is editable. Only messages in the <guilabel>outbox</guilabel> and <guilabel>drafts</guilabel> folder can be edited.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->D</keycap
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Move to Wastebin</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>D</keycap></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Move to Wastebin</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Moves the selected messages to the wastebin folder. If the selected messages are already in the wastebin folder, they will really be deleted.</para>
+<para>Moves the selected messages to the wastebin folder. If the selected messages are already in the wastebin folder, they will really be deleted.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Shift;<keycap
->Delete</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Delete</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Shift;<keycap>Delete</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Delete</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Deletes the selected messages. There is no way to recover the messages once they are deleted with this command.</para>
+<para>Deletes the selected messages. There is no way to recover the messages once they are deleted with this command.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->F</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Find in Message...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Find in Message...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Lets you search for a string in the currently displayed message.</para>
+<para>Lets you search for a string in the currently displayed message.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->A</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Select All Messages</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>A</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Select All Messages</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Selects all messages in the current folder.</para>
+<para>Selects all messages in the current folder.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;&Shift;<keycap
->A</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Select Message Text</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>A</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Select Message Text</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Selects the text of the currently displayed message.</para>
+<para>Selects the text of the currently displayed message.</para>
 </listitem>
 </varlistentry>
 
@@ -478,237 +216,106 @@
 
 
 <sect2 id="reader-view-menu">
-<title
-><guimenu
->View</guimenu
-> Menu</title>
+<title><guimenu>View</guimenu> Menu</title>
 
 <variablelist>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Headers</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guimenuitem>Headers</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Changes the format of the message header in the <guilabel
->Message pane</guilabel
->.</para>
+<para>Changes the format of the message header in the <guilabel>Message pane</guilabel>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Attachments</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guimenuitem>Attachments</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Changes the way attachments appear in the <guilabel
->Message pane</guilabel
-> (independent of the MIME Tree). With <guimenuitem
->Icons</guimenuitem
-> all attachments appear as icons at the bottom of the message. <guimenuitem
->Smart</guimenuitem
-> will show attachments as icons, unless the message suggests that they should be displayed inline. You can suggest that certain attachments should be shown inline in your own messages when you select <guilabel
->Suggest automatic display</guilabel
-> in the attachment's properties dialogue. <guimenuitem
->Inline</guimenuitem
-> shows the contents of the attachments at the bottom of the message. Attachments that cannot be displayed, &eg; compressed files, will still be shown as an icon. <guimenuitem
->Hide</guimenuitem
-> will not show attachments. </para>
+<para>Changes the way attachments appear in the <guilabel>Message pane</guilabel> (independent of the MIME Tree). With <guimenuitem>Icons</guimenuitem> all attachments appear as icons at the bottom of the message. <guimenuitem>Smart</guimenuitem> will show attachments as icons, unless the message suggests that they should be displayed inline. You can suggest that certain attachments should be shown inline in your own messages when you select <guilabel>Suggest automatic display</guilabel> in the attachment's properties dialogue. <guimenuitem>Inline</guimenuitem> shows the contents of the attachments at the bottom of the message. Attachments that cannot be displayed, &eg; compressed files, will still be shown as an icon. <guimenuitem>Hide</guimenuitem> will not show attachments. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Unread Column</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guimenuitem>Unread Column</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Allows you to specify whether the number of unread messages should be shown in brackets next to the folder name (<guilabel
->View After Folder Name</guilabel
->) or in a separate column (<guilabel
->View in Separate Column</guilabel
->)</para>
+<para>Allows you to specify whether the number of unread messages should be shown in brackets next to the folder name (<guilabel>View After Folder Name</guilabel>) or in a separate column (<guilabel>View in Separate Column</guilabel>)</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Total Column</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guimenuitem>Total Column</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Display a column in the list of folders which shows the number of messages per folder.</para>
+<para>Display a column in the list of folders which shows the number of messages per folder.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->.</keycap
-></shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Expand Thread</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>.</keycap></shortcut> <guimenu>View</guimenu> <guimenuitem>Expand Thread</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->If <menuchoice
-><guimenu
->Folder</guimenu
-><guimenuitem
->Thread Messages</guimenuitem
-> </menuchoice
-> is activated, this will display the thread of the current message, &ie; all messages that are replies to the current message.</para>
+<para>If <menuchoice><guimenu>Folder</guimenu><guimenuitem>Thread Messages</guimenuitem> </menuchoice> is activated, this will display the thread of the current message, &ie; all messages that are replies to the current message.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->,</keycap
-></shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Collapse Thread</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>,</keycap></shortcut> <guimenu>View</guimenu> <guimenuitem>Collapse Thread</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->If <menuchoice
-><guimenu
->Folder</guimenu
-><guimenuitem
->Thread Messages</guimenuitem
-> </menuchoice
-> is activated, this will hide the thread of the current message, &ie; it will hide all messages that are replies to the current message.</para>
+<para>If <menuchoice><guimenu>Folder</guimenu><guimenuitem>Thread Messages</guimenuitem> </menuchoice> is activated, this will hide the thread of the current message, &ie; it will hide all messages that are replies to the current message.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->.</keycap
-></keycombo
-></shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Expand All Threads</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>.</keycap></keycombo></shortcut> <guimenu>View</guimenu> <guimenuitem>Expand All Threads</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Expands all threads in the current folder.</para>
+<para>Expands all threads in the current folder.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->,</keycap
-></keycombo
-></shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Collapse All Threads</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>,</keycap></keycombo></shortcut> <guimenu>View</guimenu> <guimenuitem>Collapse All Threads</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Collapses all threads in the current folder.</para>
+<para>Collapses all threads in the current folder.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->V</keycap
-></shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->View Source</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>V</keycap></shortcut> <guimenu>View</guimenu> <guimenuitem>View Source</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Shows the message and its complete headers in plain text format in a new window. This can be useful to find out the origin of a mail. You should know that it is easy to fake the <literal
->From:</literal
-> header of a mail, but one can still find out which mail servers have been used to send the message by looking at the <literal
->Received:</literal
-> lines in the header.</para>
+<para>Shows the message and its complete headers in plain text format in a new window. This can be useful to find out the origin of a mail. You should know that it is easy to fake the <literal>From:</literal> header of a mail, but one can still find out which mail servers have been used to send the message by looking at the <literal>Received:</literal> lines in the header.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Use Fixed Font</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guimenuitem>Use Fixed Font</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Uses a fixed width (monospaced) font to display the messages in the current folder. The font to be used can be configured in the <guilabel
->Appearance</guilabel
-> section of &kmail;'s configuration dialogue.</para>
+<para>Uses a fixed width (monospaced) font to display the messages in the current folder. The font to be used can be configured in the <guilabel>Appearance</guilabel> section of &kmail;'s configuration dialogue.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Message</guimenu
-> <guisubmenu
->Set Encoding</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Message</guimenu> <guisubmenu>Set Encoding</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Lets you choose the character encoding to be used in the Message Pane. The default, <guilabel
->Auto</guilabel
->, should work in almost all cases.</para>
+<para>Lets you choose the character encoding to be used in the Message Pane. The default, <guilabel>Auto</guilabel>, should work in almost all cases.</para>
 </listitem>
 </varlistentry>
 
@@ -718,149 +325,70 @@
 
 
 <sect2 id="reader-go-menu">
-<title
-><guimenu
->Go</guimenu
-> Menu</title>
+<title><guimenu>Go</guimenu> Menu</title>
 
 <variablelist>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->N</keycap
-></shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Next Message</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>N</keycap></shortcut> <guimenu>Go</guimenu> <guimenuitem>Next Message</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Selects the next message in the message list. The keyboard shortcut <keycap
->Right Arrow</keycap
-> also performs this action.</para>
+<para>Selects the next message in the message list. The keyboard shortcut <keycap>Right Arrow</keycap> also performs this action.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->+</keycap
-></shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Next Unread Message</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>+</keycap></shortcut> <guimenu>Go</guimenu> <guimenuitem>Next Unread Message</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Selects the next unread message in the message list. If there is no unread message below the currently selected message then the behaviour depends on the value of the <xref linkend="configure-misc-folders-go-unread"/> option.</para>
+<para>Selects the next unread message in the message list. If there is no unread message below the currently selected message then the behaviour depends on the value of the <xref linkend="configure-misc-folders-go-unread"/> option.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->P</keycap
-></shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Previous Message</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>P</keycap></shortcut> <guimenu>Go</guimenu> <guimenuitem>Previous Message</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Selects the previous message in the message list.</para>
+<para>Selects the previous message in the message list.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->-</keycap
-></shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Previous Unread Message</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>-</keycap></shortcut> <guimenu>Go</guimenu> <guimenuitem>Previous Unread Message</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Selects the previous unread message in the message list. If there is no unread message above the currently selected message then the behaviour depends on the value of the <xref linkend="configure-misc-folders-go-unread"/> option.</para>
+<para>Selects the previous unread message in the message list. If there is no unread message above the currently selected message then the behaviour depends on the value of the <xref linkend="configure-misc-folders-go-unread"/> option.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->+</keycap
-></keycombo
-></shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Next Unread Folder</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>+</keycap></keycombo></shortcut> <guimenu>Go</guimenu> <guimenuitem>Next Unread Folder</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Jumps to the the next folder with unread messages.</para>
+<para>Jumps to the the next folder with unread messages.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->-</keycap
-></keycombo
-></shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Previous Unread Folder</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>-</keycap></keycombo></shortcut> <guimenu>Go</guimenu> <guimenuitem>Previous Unread Folder</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Jumps to the the previous folder with unread messages.</para>
+<para>Jumps to the the previous folder with unread messages.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->Space</keycap
-></shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Next Unread Text</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>Space</keycap></shortcut> <guimenu>Go</guimenu> <guimenuitem>Next Unread Text</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Scrolls down if you are not yet at the bottom of a message, otherwise jumps to the next unread message.</para>
+<para>Scrolls down if you are not yet at the bottom of a message, otherwise jumps to the next unread message.</para>
 </listitem>
 </varlistentry>
 
@@ -870,228 +398,125 @@
 
 
 <sect2 id="reader-folder-menu">
-<title
-><guimenu
->Folder</guimenu
-> Menu</title>
+<title><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
->Opens the <link linkend="folders-properties-window"
->Folder Properties</link
-> dialogue that lets you create a new folder.</para>
+<para>Opens the <link linkend="folders-properties-window">Folder Properties</link> dialogue that lets you create a new folder.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Mark All Messages as Read</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Mark All Messages as Read</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Sets the status of all new and unread messages in the current folder to read.</para
-> 
+<para>Sets the status of all new and unread messages in the current folder to read.</para> 
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Compact</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Compact</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Compacts the folder file to reduce its disk space usage. Usually &kmail; compacts all folders automatically, but under certain circumstances you might want to compact a folder manually.</para>
+<para>Compacts the folder file to reduce its disk space usage. Usually &kmail; compacts all folders automatically, but under certain circumstances you might want to compact a folder manually.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Expire</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Expire</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Deletes old messages from the current folder or moves them to another folder, according to the rules in the folder's <guilabel
->Properties</guilabel
-> dialogue (the default is not to delete or move old messages). Usually &kmail; does this automatically, but under certain circumstances you might want to expire a folder manually..</para>
+<para>Deletes old messages from the current folder or moves them to another folder, according to the rules in the folder's <guilabel>Properties</guilabel> dialogue (the default is not to delete or move old messages). Usually &kmail; does this automatically, but under certain circumstances you might want to expire a folder manually..</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->*</keycap
-></keycombo
-></shortcut
-> <guimenu
->Folder</guimenu
-> <guimenuitem
->Remove Duplicate Messages</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>*</keycap></keycombo></shortcut> <guimenu>Folder</guimenu> <guimenuitem>Remove Duplicate Messages</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Searches the folder for duplicate messages and deletes the duplicates.</para>
+<para>Searches the folder for duplicate messages and deletes the duplicates.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->F5</keycap
-></shortcut
-> <guimenu
->Folder</guimenu
-> <guimenuitem
->Check Mail in This Folder</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>F5</keycap></shortcut> <guimenu>Folder</guimenu> <guimenuitem>Check Mail in This Folder</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Checks whether new mail arrived in the currently selected folder. This is only available for &imap; folders.</para>
+<para>Checks whether new mail arrived in the currently selected folder. This is only available for &imap; folders.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Move All Messages to the Wastebin</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Move All Messages to the Wastebin</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Moves all of the messages in the selected folder into the wastebin folder. This is only available if the currently selected folder is not a wastebin folder.</para>
+<para>Moves all of the messages in the selected folder into the wastebin folder. This is only available if the currently selected folder is not a wastebin folder.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Empty Wastebin</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Empty Wastebin</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Permanently deletes all messages. This is only available if the currently selected folder is a wastebin folder.</para>
+<para>Permanently deletes all messages. This is only available if the currently selected folder is a wastebin folder.</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
->Removes the selected folder and all its contents, including subfolders.</para>
-<warning
-><para
->Note that there is no way to access the contents of a folder after it has been removed.</para
-></warning>
+<para>Removes the selected folder and all its contents, including subfolders.</para>
+<warning><para>Note that there is no way to access the contents of a folder after it has been removed.</para></warning>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Prefer HTML to Plain Text</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Prefer HTML to Plain Text</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->If enabled then &html; messages in this folders will be shown using &html; rendering. For security reasons, we recommend to only activate this for folders which only contain trusted messages.</para
-> 
+<para>If enabled then &html; messages in this folders will be shown using &html; rendering. For security reasons, we recommend to only activate this for folders which only contain trusted messages.</para> 
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Thread Messages</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Thread Messages</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->If enabled then the messages in the message list are shown in a tree-like list, with replies showing up directly under the message they reply to.</para>
+<para>If enabled then the messages in the message list are shown in a tree-like list, with replies showing up directly under the message they reply to.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Thread Messages also by Subject</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Thread Messages also by Subject</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->If enabled then the messages are not only grouped according to special information included in the messages but also according to their subject, &ie; messages with the same subject are considered as being related. If many messages are threaded below unrelated messages then you might want to disable this option. </para>
+<para>If enabled then the messages are not only grouped according to special information included in the messages but also according to their subject, &ie; messages with the same subject are considered as being related. If many messages are threaded below unrelated messages then you might want to disable this option. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Properties</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Properties</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens up the <link linkend="folders-properties-window"
->Properties dialogue</link
-> which lets you change the settings for the selected folder.</para
-> 
+<para>Opens up the <link linkend="folders-properties-window">Properties dialogue</link> which lets you change the settings for the selected folder.</para> 
 </listitem>
 </varlistentry>
 
@@ -1100,402 +525,183 @@
 </sect2>
 
 <sect2 id="reader-message-menu">
-<title
-><guimenu
->Message</guimenu
-> Menu</title>
+<title><guimenu>Message</guimenu> Menu</title>
 
 <variablelist>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->N</keycap
-></keycombo
-></shortcut
-> <guimenu
->Message</guimenu
-> <guimenuitem
->New Message...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo></shortcut> <guimenu>Message</guimenu> <guimenuitem>New Message...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens the <link linkend="the-composer-window"
->composer window</link
-> so you can write a new message.</para>
+<para>Opens the <link linkend="the-composer-window">composer window</link> so you can write a new message.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Message</guimenu
-> <guimenuitem
->New Message to Mailing-List...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Message</guimenu> <guimenuitem>New Message to Mailing-List...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens the composer window so you can write a new mail. If the current folder holds a mailing list and has a posting address defined, this address will be the default <guilabel
->To:</guilabel
-> address.</para>
+<para>Opens the composer window so you can write a new mail. If the current folder holds a mailing list and has a posting address defined, this address will be the default <guilabel>To:</guilabel> address.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->R</keycap
-></shortcut
-> <guimenu
->Message</guimenu
-> <guimenuitem
->Reply...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>R</keycap></shortcut> <guimenu>Message</guimenu> <guimenuitem>Reply...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens up the composer window, inserts the quoted text of the currently selected message and presets the <guilabel
->To:</guilabel
-> field either with the mailing-list address (if you reply to a mailing-list message) or with the preferred reply address of the sender. If you want to control which address the <guilabel
->To:</guilabel
-> field is preset with then you should either use <menuchoice
-><guimenu
->Message</guimenu
-><guimenuitem
->Reply to Author...</guimenuitem
-></menuchoice
-> or <menuchoice
-><guimenu
->Message</guimenu
-><guimenuitem
->Reply to Mailing-List...</guimenuitem
-></menuchoice
->. Your identity will automatically be set to the one which this message was sent to.</para>
+<para>Opens up the composer window, inserts the quoted text of the currently selected message and presets the <guilabel>To:</guilabel> field either with the mailing-list address (if you reply to a mailing-list message) or with the preferred reply address of the sender. If you want to control which address the <guilabel>To:</guilabel> field is preset with then you should either use <menuchoice><guimenu>Message</guimenu><guimenuitem>Reply to Author...</guimenuitem></menuchoice> or <menuchoice><guimenu>Message</guimenu><guimenuitem>Reply to Mailing-List...</guimenuitem></menuchoice>. Your identity will automatically be set to the one which this message was sent to.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->A</keycap
-></shortcut
-> <guimenu
->Message</guimenu
-> <guimenuitem
->Reply to All...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>A</keycap></shortcut> <guimenu>Message</guimenu> <guimenuitem>Reply to All...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens up the composer window, inserts the quoted text of the currently selected message and presets the <guilabel
->To:</guilabel
-> field either with the mailing-list address (if you reply to a mailing-list message) or with the preferred reply address of the sender. The <guilabel
->Copy to (CC):</guilabel
-> field is preset with the addresses of all other recipients of the currently selected message excluding your own addresses. Your identity will automatically be set to the one which this message was sent to.</para>
+<para>Opens up the composer window, inserts the quoted text of the currently selected message and presets the <guilabel>To:</guilabel> field either with the mailing-list address (if you reply to a mailing-list message) or with the preferred reply address of the sender. The <guilabel>Copy to (CC):</guilabel> field is preset with the addresses of all other recipients of the currently selected message excluding your own addresses. Your identity will automatically be set to the one which this message was sent to.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Shift;<keycap
->A</keycap
-></keycombo
-></shortcut
-> <guimenu
->Message</guimenu
-> <guimenuitem
->Reply to Author...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Shift;<keycap>A</keycap></keycombo></shortcut> <guimenu>Message</guimenu> <guimenuitem>Reply to Author...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens up the composer window, inserts the quoted text of the currently selected message and presets the <guilabel
->To:</guilabel
-> field with the preferred reply address of the sender. Your identity will automatically be set to the one which this message was sent to.</para>
+<para>Opens up the composer window, inserts the quoted text of the currently selected message and presets the <guilabel>To:</guilabel> field with the preferred reply address of the sender. Your identity will automatically be set to the one which this message was sent to.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->L</keycap
-></shortcut
-> <guimenu
->Message</guimenu
-> <guimenuitem
->Reply to Mailing-List...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>L</keycap></shortcut> <guimenu>Message</guimenu> <guimenuitem>Reply to Mailing-List...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens up the composer window, inserts the quoted text of the currently selected message and presets the <guilabel
->To:</guilabel
-> field with the mailing-list address. If you did not specify a mailing-list address for the currently selected folder and &kmail; cannot determine the posting address from the currently selected message then the <guilabel
->To:</guilabel
-> field will be empty. Your identity will automatically be set to the one which this message was sent to.</para>
+<para>Opens up the composer window, inserts the quoted text of the currently selected message and presets the <guilabel>To:</guilabel> field with the mailing-list address. If you did not specify a mailing-list address for the currently selected folder and &kmail; cannot determine the posting address from the currently selected message then the <guilabel>To:</guilabel> field will be empty. Your identity will automatically be set to the one which this message was sent to.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Shift;<keycap
->R</keycap
-></keycombo
-></shortcut
-> <guimenu
->Message</guimenu
-> <guimenuitem
->Reply Without Quote...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Shift;<keycap>R</keycap></keycombo></shortcut> <guimenu>Message</guimenu> <guimenuitem>Reply Without Quote...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Works just like <guimenuitem
->Reply...</guimenuitem
-> except that the text of the currently selected message is not quoted.</para>
+<para>Works just like <guimenuitem>Reply...</guimenuitem> except that the text of the currently selected message is not quoted.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Message</guimenu
-> <guimenuitem
->Forward</guimenuitem
-> </menuchoice>
+<term><menuchoice><guimenu>Message</guimenu> <guimenuitem>Forward</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Forwards the message to a new recipient. Using <guimenuitem
->Inline</guimenuitem
->, the message's text and some important header fields will be copied to the body of the new message with a text marking the forwarded part. Attachments will be forwarded as attachments of the new message. Using <guimenuitem
->As Attachment</guimenuitem
-> the message and its attachments will become an attachment of the new message. The original message headers will be included in the forwarded message, too. <guimenuitem
->Redirect</guimenuitem
-> works like forward, except that the message stays the same (even the <guilabel
->From:</guilabel
-> field). The user who redirected the message is added in special header fields (<literal
->Redirect-From</literal
->, <literal
->Redirect-Date</literal
->, <literal
->Redirect-To</literal
->, &etc;).</para
-> 
+<para>Forwards the message to a new recipient. Using <guimenuitem>Inline</guimenuitem>, the message's text and some important header fields will be copied to the body of the new message with a text marking the forwarded part. Attachments will be forwarded as attachments of the new message. Using <guimenuitem>As Attachment</guimenuitem> the message and its attachments will become an attachment of the new message. The original message headers will be included in the forwarded message, too. <guimenuitem>Redirect</guimenuitem> works like forward, except that the message stays the same (even the <guilabel>From:</guilabel> field). The user who redirected the message is added in special header fields (<literal>Redirect-From</literal>, <literal>Redirect-Date</literal>, <literal>Redirect-To</literal>, &etc;).</para> 
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Message</guimenu
-> <guimenuitem
->Bounce...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Message</guimenu> <guimenuitem>Bounce...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Sends the message back to the sender with a notice that it cannot be delivered. This is nearly exactly the message you get from a mail relay if the user does not exist. This option was originally added to reply to spam, but as spam today comes almost only from faked email addresses, it should not be used on spam. The same is true for messages that contain a virus: some <acronym
->ISP</acronym
->s check if an outgoing message contains a virus. Bouncing messages containing a virus is a very bad idea, you could end up disconnected by your <acronym
->ISP</acronym
->.</para
-> 
+<para>Sends the message back to the sender with a notice that it cannot be delivered. This is nearly exactly the message you get from a mail relay if the user does not exist. This option was originally added to reply to spam, but as spam today comes almost only from faked email addresses, it should not be used on spam. The same is true for messages that contain a virus: some <acronym>ISP</acronym>s check if an outgoing message contains a virus. Bouncing messages containing a virus is a very bad idea, you could end up disconnected by your <acronym>ISP</acronym>.</para> 
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Message</guimenu
-> <guimenuitem
->Send Again...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Message</guimenu> <guimenuitem>Send Again...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens a composer window with the currently selected message so it can be sent again. This is only available for messages which you have sent or, more precisely, for messages which have the <guilabel
->sent</guilabel
-> status.</para>
+<para>Opens a composer window with the currently selected message so it can be sent again. This is only available for messages which you have sent or, more precisely, for messages which have the <guilabel>sent</guilabel> status.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Message</guimenu
-> <guisubmenu
->Copy To</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Message</guimenu> <guisubmenu>Copy To</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Copies the selected messages to a certain folder.</para>
+<para>Copies the selected messages to a certain folder.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Message</guimenu
-> <guisubmenu
->Move To</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Message</guimenu> <guisubmenu>Move To</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Moves the selected messages to a certain folder.</para>
+<para>Moves the selected messages to a certain folder.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Message</guimenu
-> <guisubmenu
->Mark Message</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Message</guimenu> <guisubmenu>Mark Message</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Allows you to change the status of the selected message to one of the following states:</para>
+<para>Allows you to change the status of the selected message to one of the following states:</para>
 <!-- TODO: I think it is worth adding inline images here, at some point. LW. -->
 <informaltable>
 <tgroup cols="2">
 <thead>
 <row>
-<entry
->Status</entry>
-<entry
->Symbol</entry>
-<entry
->Meaning</entry>
+<entry>Status</entry>
+<entry>Symbol</entry>
+<entry>Meaning</entry>
 </row>
 </thead>
 <tbody>
 <row>
-<entry
-><guimenuitem
->Read</guimenuitem
-></entry>
-<entry
->Sheet of paper before an envelope</entry>
-<entry
->The message has been read.</entry>
+<entry><guimenuitem>Read</guimenuitem></entry>
+<entry>Sheet of paper before an envelope</entry>
+<entry>The message has been read.</entry>
 </row>
 <row>
-<entry
-><guimenuitem
->New</guimenuitem
-></entry>
-<entry
->Closed envelope with a star</entry>
-<entry
->The message is new to &kmail; and you.</entry>
+<entry><guimenuitem>New</guimenuitem></entry>
+<entry>Closed envelope with a star</entry>
+<entry>The message is new to &kmail; and you.</entry>
 </row>
 <row>
-<entry
-><guimenuitem
->Unread</guimenuitem
-></entry>
-<entry
->Close envelope</entry>
-<entry
->The message is not new to &kmail; but has not been read yet.</entry>
+<entry><guimenuitem>Unread</guimenuitem></entry>
+<entry>Close envelope</entry>
+<entry>The message is not new to &kmail; but has not been read yet.</entry>
 </row>
 <row>
-<entry
-><guimenuitem
->Important</guimenuitem
-></entry>
-<entry
->Flag</entry>
-<entry
->This status will not automatically be set by &kmail;. You can use it freely to mark messages that are in some way important to you.</entry>
+<entry><guimenuitem>Important</guimenuitem></entry>
+<entry>Flag</entry>
+<entry>This status will not automatically be set by &kmail;. You can use it freely to mark messages that are in some way important to you.</entry>
 </row>
 <row>
-<entry
-><guimenuitem
->Replied</guimenuitem
-></entry>
-<entry
->Blue u-turn arrow</entry>
-<entry
->A reply to this message has been sent.</entry>
+<entry><guimenuitem>Replied</guimenuitem></entry>
+<entry>Blue u-turn arrow</entry>
+<entry>A reply to this message has been sent.</entry>
 </row>
 <row>
-<entry
-><guimenuitem
->Forwarded</guimenuitem
-></entry>
-<entry
->Blue arrow</entry>
-<entry
->The message has been forwarded to someone else.</entry>
+<entry><guimenuitem>Forwarded</guimenuitem></entry>
+<entry>Blue arrow</entry>
+<entry>The message has been forwarded to someone else.</entry>
 </row>
 <row>
-<entry
-><guimenuitem
->Queued</guimenuitem
-></entry>
-<entry
->Envelope</entry>
-<entry
->The message has been queued in the outbox to be sent later.</entry>
+<entry><guimenuitem>Queued</guimenuitem></entry>
+<entry>Envelope</entry>
+<entry>The message has been queued in the outbox to be sent later.</entry>
 </row>
 <row>
-<entry
-><guimenuitem
->Sent</guimenuitem
-></entry>
-<entry
->Angled envelope</entry>
-<entry
->The message has been sent.</entry>
+<entry><guimenuitem>Sent</guimenuitem></entry>
+<entry>Angled envelope</entry>
+<entry>The message has been sent.</entry>
 </row>
 <row>
-<entry
-><guimenuitem
->Spam</guimenuitem
-></entry>
-<entry
->Round recycle symbol</entry>
-<entry
->This status will not be set automatically by &kmail;. You can use it to mark spam messages.</entry>
+<entry><guimenuitem>Spam</guimenuitem></entry>
+<entry>Round recycle symbol</entry>
+<entry>This status will not be set automatically by &kmail;. You can use it to mark spam messages.</entry>
 </row>
 <row>
-<entry
-><guimenuitem
->Ham</guimenuitem
-></entry>
-<entry
->Green check mark</entry>
-<entry
->This status will not be set automatically by &kmail;. You can use it to mark messages which are not spam.</entry>
+<entry><guimenuitem>Ham</guimenuitem></entry>
+<entry>Green check mark</entry>
+<entry>This status will not be set automatically by &kmail;. You can use it to mark messages which are not spam.</entry>
 </row>
 </tbody>
 </tgroup>
@@ -1506,90 +712,46 @@
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Message</guimenu
-> <guisubmenu
->Mark Thread</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Message</guimenu> <guisubmenu>Mark Thread</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Allows you to change the status of all messages in a thread. The possible states are the same as for <menuchoice
-><guimenu
->Message</guimenu
-> <guimenuitem
->Mark Message</guimenuitem
-></menuchoice
->.</para>
+<para>Allows you to change the status of all messages in a thread. The possible states are the same as for <menuchoice><guimenu>Message</guimenu> <guimenuitem>Mark Message</guimenuitem></menuchoice>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Message</guimenu
-> <guisubmenu
->Watch Thread</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Message</guimenu> <guisubmenu>Watch Thread</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Use this to mark threads which you want to keep an eye on for further contributions to the discussion.</para>
+<para>Use this to mark threads which you want to keep an eye on for further contributions to the discussion.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Message</guimenu
-> <guisubmenu
->Ignore Thread</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Message</guimenu> <guisubmenu>Ignore Thread</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Use this to mark threads you are not interested in. New contributions to this thread will automatically be marked as read.</para>
+<para>Use this to mark threads you are not interested in. New contributions to this thread will automatically be marked as read.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->J</keycap
-></keycombo
-></shortcut
-> <guimenu
->Message</guimenu
-> <guimenuitem
->Apply Filters</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>J</keycap></keycombo></shortcut> <guimenu>Message</guimenu> <guimenuitem>Apply Filters</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Applies your filters to the selected messages.</para>
+<para>Applies your filters to the selected messages.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Message</guimenu
-> <guimenuitem
->Apply Filter</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Message</guimenu> <guimenuitem>Apply Filter</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Allows you to apply an individual filter to the selected messages. Only filters for which you enabled the <guilabel
->Add this filter to the Apply Filter menu</guilabel
-> option will be available.</para>
+<para>Allows you to apply an individual filter to the selected messages. Only filters for which you enabled the <guilabel>Add this filter to the Apply Filter menu</guilabel> option will be available.</para>
 </listitem>
 </varlistentry>
 
@@ -1599,132 +761,62 @@
 
 
 <sect2 id="reader-tools-menu">
-<title
-><guimenu
->Tools</guimenu
-> Menu</title>
+<title><guimenu>Tools</guimenu> Menu</title>
 
 <variablelist>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->S</keycap
-></shortcut
-> <guimenu
->Tools</guimenu
-> <guimenuitem
->Find Messages...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>S</keycap></shortcut> <guimenu>Tools</guimenu> <guimenuitem>Find Messages...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens up a search window that lets you search for messages with certain characteristics, &eg; a certain subject. Start the search by entering some values and press <guibutton
->Search</guibutton
->. Click on one of the resulting messages and it will appear in the <guilabel
->Message pane</guilabel
->.</para>
+<para>Opens up a search window that lets you search for messages with certain characteristics, &eg; a certain subject. Start the search by entering some values and press <guibutton>Search</guibutton>. Click on one of the resulting messages and it will appear in the <guilabel>Message pane</guilabel>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Address Book</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Tools</guimenu> <guimenuitem>Address Book</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Starts up <ulink url="/kaddressbook/"
->&kaddressbook;</ulink
->, the &kde; address book.</para>
+<para>Starts up <ulink url="/kaddressbook/">&kaddressbook;</ulink>, the &kde; address book.</para>
 </listitem>
 </varlistentry>
 
 	<varlistentry id="reader-tools-certificate-manager">
 	  <term>
-	    <menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Certificate Manager...</guimenuitem
-> </menuchoice>
+	    <menuchoice><guimenu>Tools</guimenu> <guimenuitem>Certificate Manager...</guimenuitem> </menuchoice>
 	  </term>
 	  <listitem>
-	    <para
->Starts <ulink url="/kleopatra"
-><application
->Kleopatra</application
-></ulink
->, the &kde; certificate manager. </para>
+	    <para>Starts <ulink url="/kleopatra"><application>Kleopatra</application></ulink>, the &kde; certificate manager. </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry id="reader-tools-gnupg-log-viewer">
 	  <term>
-	    <menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->GnuPG Log Viewer</guimenuitem
-> </menuchoice>
+	    <menuchoice><guimenu>Tools</guimenu> <guimenuitem>GnuPG Log Viewer</guimenuitem> </menuchoice>
 	  </term>
 	  <listitem>
-	    <para
->Starts <ulink url="/kwatchgnupg"
-><application
->KWatchGnuPG</application
-></ulink
->, a tool to present the debug output of <application
->GnuPG</application
-> application. If signing, encryption, or verification mysteriously stop working, you might find out why by looking at the log. </para>
+	    <para>Starts <ulink url="/kwatchgnupg"><application>KWatchGnuPG</application></ulink>, a tool to present the debug output of <application>GnuPG</application> application. If signing, encryption, or verification mysteriously stop working, you might find out why by looking at the log. </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry id="reader-tools-import-messages">
 	  <term>
-	    <menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Import Messages...</guimenuitem
-> </menuchoice>
+	    <menuchoice><guimenu>Tools</guimenu> <guimenuitem>Import Messages...</guimenuitem> </menuchoice>
 	  </term>
 	  <listitem>
-	    <para
->Starts up <application
->kmailcvt</application
-> (which is part of tdepim). This application lets you import messages from several email clients &kmail;. </para>
+	    <para>Starts up <application>kmailcvt</application> (which is part of tdepim). This application lets you import messages from several email clients &kmail;. </para>
 	  </listitem>
 	</varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Tools</guimenu
-> <guisubmenu
->Edit "Out of Office" Replies...</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Tools</guimenu> <guisubmenu>Edit "Out of Office" Replies...</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Launch the <guilabel
->Configure "Out of Office" Replies</guilabel
-> dialogue, which allow you to set-up vacation notifications.</para>
+<para>Launch the <guilabel>Configure "Out of Office" Replies</guilabel> dialogue, which allow you to set-up vacation notifications.</para>
 <note>
-<para
-><guilabel
->Out of Office reply</guilabel
-> functionality relies on server-side filtering. To be able to use it you need to configure the <link linkend="receiving-mail"
->Filtering tab</link
-> (see option relevant to kolab server) of your <guilabel
->IMAP</guilabel
-> account set-up. </para>
+<para><guilabel>Out of Office reply</guilabel> functionality relies on server-side filtering. To be able to use it you need to configure the <link linkend="receiving-mail">Filtering tab</link> (see option relevant to kolab server) of your <guilabel>IMAP</guilabel> account set-up. </para>
 </note>
 </listitem>
 </varlistentry>
@@ -1732,50 +824,28 @@
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Tools</guimenu
-> <guisubmenu
->Create Filter</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Tools</guimenu> <guisubmenu>Create Filter</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Opens up the <link linkend="filter-dialog-id"
->Filter dialogue</link
-> with a new filter added. This new filter is based on fields of the current mail, depending on which sub menu item you select.</para>
+<para>Opens up the <link linkend="filter-dialog-id">Filter dialogue</link> with a new filter added. This new filter is based on fields of the current mail, depending on which sub menu item you select.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Tools</guimenu
-> <guisubmenu
->Filter Log Viewer...</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Tools</guimenu> <guisubmenu>Filter Log Viewer...</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Opens up the viewer window for the filter log; there you find some options to control the logging of the filtering process. In the log you will find valuable information about what filter rules were used, what was the result of the evaluation of those rules and which filter actions were applied to a message.</para>
+<para>Opens up the viewer window for the filter log; there you find some options to control the logging of the filtering process. In the log you will find valuable information about what filter rules were used, what was the result of the evaluation of those rules and which filter actions were applied to a message.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Anti-Spam Wizard...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Tools</guimenu> <guimenuitem>Anti-Spam Wizard...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->It starts a <link linkend="the-anti-spam-wizard"
->wizard</link
-> which can help you to set up spam filtering.</para>
+<para>It starts a <link linkend="the-anti-spam-wizard">wizard</link> which can help you to set up spam filtering.</para>
 </listitem>
 </varlistentry>
 
@@ -1783,17 +853,12 @@
 <varlistentry>
 <term>
 <menuchoice>
-<guimenu
->Tools</guimenu>
-<guimenuitem
->Anti-Virus Wizard...</guimenuitem>
+<guimenu>Tools</guimenu>
+<guimenuitem>Anti-Virus Wizard...</guimenuitem>
 </menuchoice>
 </term>
 <listitem>
-<para
->It starts a <link linkend="the-anti-virus-wizard"
->wizard</link
-> which can help 
+<para>It starts a <link linkend="the-anti-virus-wizard">wizard</link> which can help 
 you to set up scanning messages for virusses.</para>
 </listitem>
 </varlistentry>
@@ -1805,136 +870,79 @@ you to set up scanning messages for virusses.</para>
 
 
 <sect2 id="reader-settings-menu">
-<title
-><guimenu
->Settings</guimenu
-> Menu</title>
+<title><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
->If enabled, the Toolbar is visible (the Toolbar is the one with the icon to compose a new message &etc;).</para>
+<para>If enabled, the Toolbar is visible (the Toolbar is the one with the icon to compose a new message &etc;).</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show Quick Search</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Quick Search</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->If enabled, the Quick Search bar which allows you to quickly search for messages matching a search text is visible.</para>
+<para>If enabled, the Quick Search bar which allows you to quickly search for messages matching a search text is visible.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Filters...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Filters...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens the <link linkend="filters"
->Message Filters</link
-> window.</para>
+<para>Opens the <link linkend="filters">Message Filters</link> window.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure POP Filters...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure POP Filters...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens the <link linkend="popfilters"
->Configure Pop Filters</link
-> window.</para>
+<para>Opens the <link linkend="popfilters">Configure Pop Filters</link> window.</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
->Opens a window that lets you configure the keyboard shortcuts for many menu commands.</para>
+<para>Opens a window that lets you configure the keyboard shortcuts for many menu commands.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Notifications...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Notifications...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens a window that lets you configure what happens when new mail arrives, like playing a sound.</para>
+<para>Opens a window that lets you configure what happens when new mail arrives, like playing a sound.</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
->Opens a window that lets you choose which icons are visible in the toolbar.</para>
+<para>Opens a window that lets you choose which icons are visible in the toolbar.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure &kmail;...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure &kmail;...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens the <link linkend="configure"
->Configure</link
-> window.</para>
+<para>Opens the <link linkend="configure">Configure</link> window.</para>
 </listitem>
 </varlistentry>
 
@@ -1943,47 +951,28 @@ you to set up scanning messages for virusses.</para>
 </sect2>
 
 <sect2 id="reader-help-menu">
-<title
-><guimenu
->Help</guimenu
-> Menu</title>
-
-<para
->These are the &kde; standard items for the <guimenu
->Help</guimenu
-> menu:</para>
-&help.menu.documentation; <para
->Additionally &kmail; offers these items:</para>
+<title><guimenu>Help</guimenu> Menu</title>
+
+<para>These are the &kde; standard items for the <guimenu>Help</guimenu> menu:</para>
+&help.menu.documentation; <para>Additionally &kmail; offers these items:</para>
 
 <variablelist>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Help</guimenu
-> <guimenuitem
->&kmail; Introduction</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Help</guimenu> <guimenuitem>&kmail; Introduction</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->This displays the welcome screen, which lists the most important differences between your version of &kmail; and the previous one.</para>
+<para>This displays the welcome screen, which lists the most important differences between your version of &kmail; and the previous one.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Help</guimenu
-> <guimenuitem
->Tip of the Day</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Help</guimenu> <guimenuitem>Tip of the Day</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->This displays a dialogue with useful hints for using &kmail;.</para>
+<para>This displays a dialogue with useful hints for using &kmail;.</para>
 </listitem>
 </varlistentry>
 
@@ -1993,172 +982,82 @@ you to set up scanning messages for virusses.</para>
 </sect1>
 
 <sect1 id="composer-window-menus">
-<title
->The Composer Window</title>
+<title>The Composer Window</title>
 
 <sect2 id="composer-file-menu">
-<title
-><guimenu
->Message</guimenu
-> Menu</title>
+<title><guimenu>Message</guimenu> Menu</title>
 
 <variablelist>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->N</keycap
-></keycombo
-></shortcut
-> <guimenu
->Message</guimenu
-> <guimenuitem
->New Composer</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo></shortcut> <guimenu>Message</guimenu> <guimenuitem>New Composer</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens up a new composer window.</para>
+<para>Opens up a new composer window.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Message</guimenu
-> <guimenuitem
->New Main Window</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Message</guimenu> <guimenuitem>New Main Window</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Creates a new main window.</para>
+<para>Creates a new main window.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->Return</keycap
-></keycombo
-></shortcut
-> <guimenu
->Message</guimenu
-> <guimenuitem
->Send</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>Return</keycap></keycombo></shortcut> <guimenu>Message</guimenu> <guimenuitem>Send</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Sends the message immediately. If you use SMTP to send your messages and the SMTP server is not reachable, the message will be put into the outbox and you will get an error message. You can then later send the messages in the outbox using <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Send Queued</guimenuitem
-></menuchoice
->.</para>
+<para>Sends the message immediately. If you use SMTP to send your messages and the SMTP server is not reachable, the message will be put into the outbox and you will get an error message. You can then later send the messages in the outbox using <menuchoice><guimenu>File</guimenu><guimenuitem>Send Queued</guimenuitem></menuchoice>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Message</guimenu
-> <guimenuitem
->Queue</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Message</guimenu> <guimenuitem>Queue</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Queues the message in the outbox for sending it later using <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Send Queued</guimenuitem
-></menuchoice
->. </para>
+<para>Queues the message in the outbox for sending it later using <menuchoice><guimenu>File</guimenu><guimenuitem>Send Queued</guimenuitem></menuchoice>. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Message</guimenu
-> <guimenuitem
->Save in Drafts Folder</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Message</guimenu> <guimenuitem>Save in Drafts Folder</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Save the message in the <guilabel
->drafts</guilabel
-> folder so you can later edit and send it.</para>
+<para>Save the message in the <guilabel>drafts</guilabel> folder so you can later edit and send it.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Messages</guimenu
-> <guimenuitem
->Insert File...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Messages</guimenu> <guimenuitem>Insert File...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Inserts a text file into the message text, starting at the cursor position.</para>
+<para>Inserts a text file into the message text, starting at the cursor position.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->P</keycap
-></keycombo
-></shortcut
-> <guimenu
->Message</guimenu
-> <guimenuitem
->Print...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>P</keycap></keycombo></shortcut> <guimenu>Message</guimenu> <guimenuitem>Print...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Prints the current text.</para>
+<para>Prints the current text.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->W</keycap
-></keycombo
-></shortcut
-> <guimenu
->Message</guimenu
-> <guimenuitem
->Close</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>W</keycap></keycombo></shortcut> <guimenu>Message</guimenu> <guimenuitem>Close</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Closes this composer window.</para>
+<para>Closes this composer window.</para>
 </listitem>
 </varlistentry>
 
@@ -2168,259 +1067,124 @@ you to set up scanning messages for virusses.</para>
 
 
 <sect2 id="composer-edit-menu">
-<title
-><guimenu
->Edit</guimenu
-> Menu</title>
+<title><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>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>Z</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Undo</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Undo your steps in editing the current message.</para>
+<para>Undo your steps in editing the current message.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;&Shift;<keycap
->Z</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Redo</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>Z</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Redo</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Redo your steps in editing the current message.</para>
+<para>Redo your steps in editing the current message.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->X</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Cut</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>X</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Cut</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Cutting text works as with most editors: the selected text is removed and put into the clipboard. Note that you can also select text and drag it to a new position.</para>
+<para>Cutting text works as with most editors: the selected text is removed and put into the clipboard. Note that you can also select text and drag it to a new position.</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>C</keycap></keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Copy</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Copying text works as with most editors: the selected text is copied to the clipboard. Note that you can also select text while holding the &Ctrl; key and drag it to a new position to copy it.</para>
+<para>Copying text works as with most editors: the selected text is copied to the clipboard. Note that you can also select text while holding the &Ctrl; key and drag it to a new position to copy it.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->V</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Paste</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>V</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Paste</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Pasting works the same as with most editors: the text from the clipboard is pasted at the current cursor position.</para>
+<para>Pasting works the same as with most editors: the text from the clipboard is pasted at the current cursor position.</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
->Selects all of the text in your message.</para>
+<para>Selects all of the text in your message.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->F</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Find...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Find...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens a dialogue to search for strings in the current message.</para>
+<para>Opens a dialogue to search for strings in the current message.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->F</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Find Next</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Find Next</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Goes to the next occurrence of the previously searched string.</para>
+<para>Goes to the next occurrence of the previously searched string.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->R</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Replace...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Replace...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens a dialogue that lets you replace strings in your message with other strings.</para>
+<para>Opens a dialogue that lets you replace strings in your message with other strings.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Clean Spaces</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Edit</guimenu> <guimenuitem>Clean Spaces</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->This replaces multiple line breaks or spaces with single line breaks or spaces. It works on the current selection or on the complete message if there is no selection.</para>
+<para>This replaces multiple line breaks or spaces with single line breaks or spaces. It works on the current selection or on the complete message if there is no selection.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Paste as Quotation</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Edit</guimenu> <guimenuitem>Paste as Quotation</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Pastes the text from the clipboard marked as quotation.</para>
+<para>Pastes the text from the clipboard marked as quotation.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Add Quote Characters</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Edit</guimenu> <guimenuitem>Add Quote Characters</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Prepends the selected text with quotation marks.</para>
+<para>Prepends the selected text with quotation marks.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Remove Quote Characters</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Edit</guimenu> <guimenuitem>Remove Quote Characters</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Removes the left-most quotation marks from the selected text.</para>
+<para>Removes the left-most quotation marks from the selected text.</para>
 </listitem>
 </varlistentry>
 
@@ -2429,104 +1193,57 @@ you to set up scanning messages for virusses.</para>
 </sect2>
 
 <sect2 id="composer-view-menu">
-<title
-><guimenu
->View</guimenu
-> Menu</title>
+<title><guimenu>View</guimenu> Menu</title>
 
-<para
->This menu lets you toggle the display of the header fields and other options in this composer window.</para>
+<para>This menu lets you toggle the display of the header fields and other options in this composer window.</para>
 
-<para
->Options available are:</para>
+<para>Options available are:</para>
 
 <itemizedlist>
 <listitem>
-<para
-><guimenuitem
->All Fields</guimenuitem
-></para>
+<para><guimenuitem>All Fields</guimenuitem></para>
 </listitem>
 <listitem>
-<para
-><guimenuitem
->Identity</guimenuitem
-></para>
+<para><guimenuitem>Identity</guimenuitem></para>
 </listitem>
 <listitem>
-<para
-><guimenuitem
->Dictionary</guimenuitem
-></para>
+<para><guimenuitem>Dictionary</guimenuitem></para>
 </listitem>
 <listitem>
-<para
-><guimenuitem
->Sent-Mail folder</guimenuitem
-></para>
+<para><guimenuitem>Sent-Mail folder</guimenuitem></para>
 </listitem>
 <listitem>
-<para
-><guimenuitem
->Mail Transport</guimenuitem
-></para>
+<para><guimenuitem>Mail Transport</guimenuitem></para>
 </listitem>
 <listitem>
-<para
-><guimenuitem
->From</guimenuitem
-></para>
+<para><guimenuitem>From</guimenuitem></para>
 </listitem>
 <listitem>
-<para
-><guimenuitem
->Reply To</guimenuitem
-></para>
+<para><guimenuitem>Reply To</guimenuitem></para>
 </listitem>
 <listitem>
-<para
-><guimenuitem
->To</guimenuitem
-></para>
+<para><guimenuitem>To</guimenuitem></para>
 </listitem>
 <listitem>
-<para
-><guimenuitem
->CC</guimenuitem
-></para>
+<para><guimenuitem>CC</guimenuitem></para>
 </listitem>
 <listitem>
-<para
-><guimenuitem
->BCC</guimenuitem
-></para>
+<para><guimenuitem>BCC</guimenuitem></para>
 </listitem>
 <listitem>
-<para
-><guimenuitem
->Subject</guimenuitem
-></para>
+<para><guimenuitem>Subject</guimenuitem></para>
 </listitem>
 </itemizedlist>
 
-<para
->Currently visible items have a checkmark shown next to their name in the menu.</para>
+<para>Currently visible items have a checkmark shown next to their name in the menu.</para>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Use Fixed Font</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guimenuitem>Use Fixed Font</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Uses a fixed width (monospaced) font to display the currently edited message. The font to be used can be configured in the <guilabel
->Appearance</guilabel
-> section of &kmail;'s configuration dialogue.</para>
+<para>Uses a fixed width (monospaced) font to display the currently edited message. The font to be used can be configured in the <guilabel>Appearance</guilabel> section of &kmail;'s configuration dialogue.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -2534,159 +1251,89 @@ you to set up scanning messages for virusses.</para>
 </sect2>
 
 <sect2 id="composer-options-menu">
-<title
-><guimenu
->Options</guimenu
-> Menu</title>
+<title><guimenu>Options</guimenu> Menu</title>
 
 <variablelist>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Options</guimenu
-> <guimenuitem
->Urgent</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Options</guimenu> <guimenuitem>Urgent</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Sets the priority of the message to Urgent. The receiver's email client has to support this or it will have no effect. &kmail; itself does not support priorities for incoming messages.</para>
+<para>Sets the priority of the message to Urgent. The receiver's email client has to support this or it will have no effect. &kmail; itself does not support priorities for incoming messages.</para>
 </listitem>
 </varlistentry>
 
 	<varlistentry id="composer-options-request-mdn">
 	  <term>
-	    <menuchoice
-><guimenu
->Options</guimenu
-> <guimenuitem
->Request Disposition Notification</guimenuitem
-> </menuchoice>
+	    <menuchoice><guimenu>Options</guimenu> <guimenuitem>Request Disposition Notification</guimenuitem> </menuchoice>
 	  </term>
 	  <listitem>
-	    <para
->If you choose this option, you request a confirmation email once your message is downloaded and read by its recipient. This has to be supported and enabled by the receiver's email client in order to work. </para>
-	    <para
->See <xref linkend="configure-security-reading-mdns"/> for background information and ways to customise the read receipts that &kmail; itself sends. </para>
+	    <para>If you choose this option, you request a confirmation email once your message is downloaded and read by its recipient. This has to be supported and enabled by the receiver's email client in order to work. </para>
+	    <para>See <xref linkend="configure-security-reading-mdns"/> for background information and ways to customise the read receipts that &kmail; itself sends. </para>
 	  </listitem>
 	</varlistentry>
 
 <varlistentry id="composer-options-sign-message">
 <term>
-<menuchoice
-><guimenu
->Options</guimenu
-> <guisubmenu
->Sign Message</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Options</guimenu> <guisubmenu>Sign Message</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Digitally sign the message using <application
->OpenPGP</application
->. You can learn more about this in the <link linkend="pgp"
->chapter on OpenPGP</link
->.</para>
+<para>Digitally sign the message using <application>OpenPGP</application>. You can learn more about this in the <link linkend="pgp">chapter on OpenPGP</link>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry id="composer-options-encrypt-message">
 <term>
-<menuchoice
-><guimenu
->Options</guimenu
-> <guisubmenu
->Encrypt Message</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Options</guimenu> <guisubmenu>Encrypt Message</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Encrypt the message using <application
->OpenPGP</application
->. You can learn more about this in the <link linkend="pgp"
->chapter on OpenPGP</link
->.</para>
+<para>Encrypt the message using <application>OpenPGP</application>. You can learn more about this in the <link linkend="pgp">chapter on OpenPGP</link>.</para>
 </listitem>
 </varlistentry>
 
 	<varlistentry id="composer-options-select-crypto-message-format">
 	  <term>
-	    <menuchoice
-><guimenu
->Options</guimenu
-> <guisubmenu
->Select Cryptographic Message Format</guisubmenu
-> </menuchoice>
+	    <menuchoice><guimenu>Options</guimenu> <guisubmenu>Select Cryptographic Message Format</guisubmenu> </menuchoice>
 	  </term>
 	  <listitem>
-	    <para
->Choose the cryptographic message format to use to digitally sign and/or encrypt the message in. See <link linkend="cryptographic-message-formats"
->the previous description of each option</link
-> for more information. </para>
+	    <para>Choose the cryptographic message format to use to digitally sign and/or encrypt the message in. See <link linkend="cryptographic-message-formats">the previous description of each option</link> for more information. </para>
 	  </listitem>
 	</varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Options</guimenu
-> <guisubmenu
->Formatting (HTML)</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Options</guimenu> <guisubmenu>Formatting (HTML)</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Enables &html; editing.</para>
+<para>Enables &html; editing.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Options</guimenu
-> <guisubmenu
->Set Encoding</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Options</guimenu> <guisubmenu>Set Encoding</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Set the charset encoding of this message. The chosen encoding will appear in the header of the outgoing mail. You can use <guilabel
->Auto</guilabel
-> for almost all cases, &kmail; will tell you if you need to select a different encoding manually.</para>
+<para>Set the charset encoding of this message. The chosen encoding will appear in the header of the outgoing mail. You can use <guilabel>Auto</guilabel> for almost all cases, &kmail; will tell you if you need to select a different encoding manually.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Options</guimenu
-> <guimenuitem
->Wordwrap</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Options</guimenu> <guimenuitem>Wordwrap</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Toggles the automatic wordwrap. It may be useful to turn it off if you want to paste long lines that should not wrap.</para>
+<para>Toggles the automatic wordwrap. It may be useful to turn it off if you want to paste long lines that should not wrap.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Options</guimenu
-> <guimenuitem
->Automatic Spellchecking</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Options</guimenu> <guimenuitem>Automatic Spellchecking</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Toggles automatic spellchecking. Note that in &html;-editing mode automatic spellchecking is not available.</para>
+<para>Toggles automatic spellchecking. Note that in &html;-editing mode automatic spellchecking is not available.</para>
 </listitem>
 </varlistentry>
 
@@ -2696,131 +1343,73 @@ you to set up scanning messages for virusses.</para>
 
 
 <sect2 id="composer-attach-menu">
-<title
-><guimenu
->Attach</guimenu
-> Menu</title>
+<title><guimenu>Attach</guimenu> Menu</title>
 
-<para
->This menu lets you select attachment options.</para>
+<para>This menu lets you select attachment options.</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
->Appends your signature (<quote
->footer</quote
->) to the end of the message. </para>
+<para>Appends your signature (<quote>footer</quote>) to the end of the message. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Attach</guimenu
-> <guimenuitem
->Attach Public Key...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Attach</guimenu> <guimenuitem>Attach Public Key...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Attaches the corresponding <application
->PGP</application
->/<application
->GnuPG</application
-> key to your message.</para>
+<para>Attaches the corresponding <application>PGP</application>/<application>GnuPG</application> key to your message.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry id="composer-attach-attach-my-public-key">
 <term>
-<menuchoice
-><guimenu
->Attach</guimenu
-> <guimenuitem
->Attach My Public Key</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Attach</guimenu> <guimenuitem>Attach My Public Key</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Attaches your <application
->PGP</application
->/<application
->GnuPG</application
-> public key to your message.</para>
+<para>Attaches your <application>PGP</application>/<application>GnuPG</application> public key to your message.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Attach</guimenu
-> <guimenuitem
->Attach File...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Attach</guimenu> <guimenuitem>Attach File...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Attaches one or more files to the current message.</para>
+<para>Attaches one or more files to the current message.</para>
 <!-- fixme: not encrypted unless... -->
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Attach</guimenu
-> <guimenuitem
->Remove Attachment</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Attach</guimenu> <guimenuitem>Remove Attachment</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Removes the attachment that is selected in the attachment part of the composer.</para>
+<para>Removes the attachment that is selected in the attachment part of the composer.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Attach</guimenu
-> <guimenuitem
->Save Attachment As...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Attach</guimenu> <guimenuitem>Save Attachment As...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Saves the attachment that is selected in the attachment window to a file.</para>
+<para>Saves the attachment that is selected in the attachment window to a file.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Attach</guimenu
-> <guimenuitem
->Attachment Properties</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Attach</guimenu> <guimenuitem>Attachment Properties</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Displays the <link linkend="attachments"
->properties of the attachment</link
-> that is selected in the attachment window.</para>
+<para>Displays the <link linkend="attachments">properties of the attachment</link> that is selected in the attachment window.</para>
 </listitem>
 </varlistentry>
 
@@ -2829,50 +1418,25 @@ you to set up scanning messages for virusses.</para>
 </sect2>
 
 <sect2 id="composer-tools-menu">
-<title
-><guimenu
->Tools</guimenu
-> Menu</title>
+<title><guimenu>Tools</guimenu> Menu</title>
 
 <variablelist>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Spelling...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Tools</guimenu> <guimenuitem>Spelling...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Uses <ulink url="/tdespell/"
->&tdespell;</ulink
-> to check the spelling in the body of your message. Note that you have to configure &tdespell; with <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Spellchecker...</guimenuitem
-></menuchoice
-> if you use it for the first time.</para>
+<para>Uses <ulink url="/tdespell/">&tdespell;</ulink> to check the spelling in the body of your message. Note that you have to configure &tdespell; with <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Spellchecker...</guimenuitem></menuchoice> if you use it for the first time.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Addressbook...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Tools</guimenu> <guimenuitem>Addressbook...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens up <ulink url="/kaddressbook/"
->&kaddressbook;</ulink
->.</para>
+<para>Opens up <ulink url="/kaddressbook/">&kaddressbook;</ulink>.</para>
 </listitem>
 </varlistentry>
 
@@ -2881,104 +1445,61 @@ you to set up scanning messages for virusses.</para>
 </sect2>
 
 <sect2 id="composer-settings-menu">
-<title
-><guimenu
->Settings</guimenu
-> Menu</title>
+<title><guimenu>Settings</guimenu> Menu</title>
 
 <variablelist>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show Main Toolbar</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Main Toolbar</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->If enabled, the Main Toolbar is visible, &ie; the one with the icon to send the message &etc;.</para>
+<para>If enabled, the Main Toolbar is visible, &ie; the one with the icon to send the message &etc;.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show HTML Toolbar</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show HTML Toolbar</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->If enabled, the &html; Toolbar is visible, &ie; the one which with the tools to change certain properties of the composed text.</para>
+<para>If enabled, the &html; Toolbar is visible, &ie; the one which with the tools to change certain properties of the composed text.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Spellchecker...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Spellchecker...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Allows you to configure <ulink url="/tdespell/"
->&tdespell;</ulink
->, &kde;'s spellchecker.</para>
+<para>Allows you to configure <ulink url="/tdespell/">&tdespell;</ulink>, &kde;'s spellchecker.</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
->Opens a window that lets you configure the keyboard shortcuts for many menu commands.</para>
+<para>Opens a window that lets you configure the keyboard shortcuts for many menu commands.</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
->Opens a window that allows you to decide which icons appear in the toolbar.</para>
+<para>Opens a window that allows you to decide which icons appear in the toolbar.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure &kmail;...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure &kmail;...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens &kmail;'s <link linkend="configure"
->configuration dialogue</link
->.</para>
+<para>Opens &kmail;'s <link linkend="configure">configuration dialogue</link>.</para>
 </listitem>
 </varlistentry>
 
@@ -2987,15 +1508,9 @@ you to set up scanning messages for virusses.</para>
 
 
 <sect2 id="composer-help-menu">
-<title
-><guimenu
->Help</guimenu
-> Menu</title>
-
-<para
->The entries in this menu have the same meaning as <link linkend="reader-help-menu"
->the entries in the main window's help menu</link
->.</para>
+<title><guimenu>Help</guimenu> Menu</title>
+
+<para>The entries in this menu have the same meaning as <link linkend="reader-help-menu">the entries in the main window's help menu</link>.</para>
 
 </sect2>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdepim/kmail/using-kmail.docbook b/tde-i18n-en_GB/docs/tdepim/kmail/using-kmail.docbook
index 9bbf43f48a7..12f1fcd3e67 100644
--- a/tde-i18n-en_GB/docs/tdepim/kmail/using-kmail.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/kmail/using-kmail.docbook
@@ -2,113 +2,37 @@
 
 <chapterinfo>
 <authorgroup>
-<author
-><firstname
->Daniel</firstname
-> <surname
->Naber</surname
-> <affiliation
-><address
-> <email
->daniel.naber@t-online.de</email>
-</address
-></affiliation>
+<author><firstname>Daniel</firstname> <surname>Naber</surname> <affiliation><address> <email>daniel.naber@t-online.de</email>
+</address></affiliation>
 </author>
-<othercredit role="translator"
-><firstname
->Andrew</firstname
-><surname
->Coles</surname
-><affiliation
-><address
-><email
->andrew_coles@yahoo.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Andrew</firstname><surname>Coles</surname><affiliation><address><email>andrew_coles@yahoo.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
-<date
->2004-09-24</date
-> <releaseinfo
->1.7.50</releaseinfo
-> </chapterinfo>
+<date>2004-09-24</date> <releaseinfo>1.7.50</releaseinfo> </chapterinfo>
 
-<title
->Using &kmail;</title>
+<title>Using &kmail;</title>
 
 <sect1 id="the-mail-reader-window">
-<title
->The Main Window</title>
+<title>The Main Window</title>
 
-<para
->The main window is the window that appears when &kmail; is started. It is by default divided into three panes:</para>
+<para>The main window is the window that appears when &kmail; is started. It is by default divided into three panes:</para>
 
 <variablelist>
 <varlistentry>
-<term
->Folder list (on the left)</term>
+<term>Folder list (on the left)</term>
 <listitem>
-<para
->This pane contains the list of your message folders (other email programs may call them mailboxes). To select a folder, simply click on it. The messages contained in the folder will now appear in the Headers pane. The folder list can be displayed in both a short view, which takes up only a small portion of the left side of the screen, and a long view, which takes up the entire left side of the screen but is able to show more mailboxes. You can toggle between these two views under <guilabel
->Appearance</guilabel
->/<guilabel
->Layout</guilabel
-> in the <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure &kmail;...</guimenuitem
-></menuchoice
-> dialogue. Also see the <link linkend="folders"
->Folders Section</link
-> for more information about how to use folders.</para>
+<para>This pane contains the list of your message folders (other email programs may call them mailboxes). To select a folder, simply click on it. The messages contained in the folder will now appear in the Headers pane. The folder list can be displayed in both a short view, which takes up only a small portion of the left side of the screen, and a long view, which takes up the entire left side of the screen but is able to show more mailboxes. You can toggle between these two views under <guilabel>Appearance</guilabel>/<guilabel>Layout</guilabel> in the <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &kmail;...</guimenuitem></menuchoice> dialogue. Also see the <link linkend="folders">Folders Section</link> for more information about how to use folders.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->Message list (in the upper right by default)</term>
+<term>Message list (in the upper right by default)</term>
 <listitem>
-<para
->This pane lists header information (message Status Flags, Sender, Subject, Date, and other optional columns like Size, Attachment Flag, Important Flag etc.) for the messages in the currently selected folder. Clicking on a header will select that message and display it in the Message pane; you can also select more than one message by holding down the &Ctrl; key when clicking on messages. You may sort the messages by clicking on the column that you wish to sort; if you click on the same column more than once, sort order will toggle between ascending/descending and some alternative sorting criteria will become available (like sorting by Status when you click on the header of the Subject column). Clicking the <mousebutton
->right</mousebutton
-> mousebutton on the list header shows a popup menu, which allows to show or hide several columns in the list. </para>
+<para>This pane lists header information (message Status Flags, Sender, Subject, Date, and other optional columns like Size, Attachment Flag, Important Flag etc.) for the messages in the currently selected folder. Clicking on a header will select that message and display it in the Message pane; you can also select more than one message by holding down the &Ctrl; key when clicking on messages. You may sort the messages by clicking on the column that you wish to sort; if you click on the same column more than once, sort order will toggle between ascending/descending and some alternative sorting criteria will become available (like sorting by Status when you click on the header of the Subject column). Clicking the <mousebutton>right</mousebutton> mousebutton on the list header shows a popup menu, which allows to show or hide several columns in the list. </para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->Message preview pane (in the lower right by default)</term>
+<term>Message preview pane (in the lower right by default)</term>
 <listitem>
-<para
->This pane displays the currently selected message. Attachments appear at the bottom of the message, either as icons or embedded in the message, depending on <menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Attachments</guimenuitem
-></menuchoice
->. For complex messages the structure of the message is shown in the message structure viewer below the preview pane. The placement of the preview pane as well as the placement of the structure viewer can be changed under <guilabel
->Appearance</guilabel
->/<guilabel
->Layout</guilabel
-> in the <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure &kmail;...</guimenuitem
-></menuchoice
-> dialogue. Moreover, you can disable the preview pane and you can choose when the message structure viewer should be shown. You can scroll through the message page-by-page using the <keycap
->Page Up</keycap
-> and <keycap
->Page down</keycap
-> keys, or line-by-line using the <keycap
->up arrow</keycap
-> and <keycap
->down arrow</keycap
-> keys; you can also use <link linkend="keyboard-shortcuts"
->key shortcuts</link
-> to skip through your messages without having to use the mouse.</para>
+<para>This pane displays the currently selected message. Attachments appear at the bottom of the message, either as icons or embedded in the message, depending on <menuchoice><guimenu>View</guimenu> <guimenuitem>Attachments</guimenuitem></menuchoice>. For complex messages the structure of the message is shown in the message structure viewer below the preview pane. The placement of the preview pane as well as the placement of the structure viewer can be changed under <guilabel>Appearance</guilabel>/<guilabel>Layout</guilabel> in the <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &kmail;...</guimenuitem></menuchoice> dialogue. Moreover, you can disable the preview pane and you can choose when the message structure viewer should be shown. You can scroll through the message page-by-page using the <keycap>Page Up</keycap> and <keycap>Page down</keycap> keys, or line-by-line using the <keycap>up arrow</keycap> and <keycap>down arrow</keycap> keys; you can also use <link linkend="keyboard-shortcuts">key shortcuts</link> to skip through your messages without having to use the mouse.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -116,1043 +40,486 @@
 </sect1>
 
 <sect1 id="keyboard-shortcuts">
-<title
->Keyboard Shortcuts</title>
+<title>Keyboard Shortcuts</title>
 
-<para
->The following keyboard shortcuts are supported in the main window:</para>
+<para>The following keyboard shortcuts are supported in the main window:</para>
 
 <informaltable>
 <tgroup cols="2">
 <thead>
 <row>
-<entry
->Keyboard Shortcut</entry>
-<entry
->Action</entry>
+<entry>Keyboard Shortcut</entry>
+<entry>Action</entry>
 </row>
 </thead>
 <tbody>
 <row>
-<entry
-><keycap
->Space</keycap
-></entry>
-<entry
->Scroll down in the current message or go to the next unread message if you are already at the bottom.</entry>
+<entry><keycap>Space</keycap></entry>
+<entry>Scroll down in the current message or go to the next unread message if you are already at the bottom.</entry>
 </row>
 <row>
-<entry
-><keycap
->Right Arrow</keycap
-> or <keycap
->N</keycap
-></entry>
-<entry
->Go to the next message in the current folder.</entry>
+<entry><keycap>Right Arrow</keycap> or <keycap>N</keycap></entry>
+<entry>Go to the next message in the current folder.</entry>
 </row>
 <row>
-<entry
-><keycap
->Left Arrow</keycap
-> key or <keycap
->P</keycap
-></entry>
-<entry
->Go to the previous message in the current folder.</entry>
+<entry><keycap>Left Arrow</keycap> key or <keycap>P</keycap></entry>
+<entry>Go to the previous message in the current folder.</entry>
 </row>
 <row>
-<entry
-><keycap
->+</keycap
-></entry>
-<entry
->Go to the next unread message in the current folder.</entry>
+<entry><keycap>+</keycap></entry>
+<entry>Go to the next unread message in the current folder.</entry>
 </row>
 <row>
-<entry
-><keycap
->-</keycap
-></entry>
-<entry
->Go to the previous unread message in the current folder.</entry>
+<entry><keycap>-</keycap></entry>
+<entry>Go to the previous unread message in the current folder.</entry>
 </row>
 <row>
-<entry
-><keycombo action="simul"
->&Ctrl;<keycap
->+</keycap
-></keycombo
-></entry>
-<entry
->Go to the next folder with unread messages.</entry>
+<entry><keycombo action="simul">&Ctrl;<keycap>+</keycap></keycombo></entry>
+<entry>Go to the next folder with unread messages.</entry>
 </row>
 <row>
-<entry
-><keycombo action="simul"
->&Ctrl;<keycap
->-</keycap
-></keycombo
-></entry>
-<entry
->Go to the previous folder with unread messages.</entry>
+<entry><keycombo action="simul">&Ctrl;<keycap>-</keycap></keycombo></entry>
+<entry>Go to the previous folder with unread messages.</entry>
 </row>
 <row>
-<entry
-><keycombo action="simul"
->&Ctrl;<keycap
->Up Arrow</keycap
-></keycombo
-></entry>
-<entry
->Go to the next folder in the folder list (if the folder list has focus).</entry>
+<entry><keycombo action="simul">&Ctrl;<keycap>Up Arrow</keycap></keycombo></entry>
+<entry>Go to the next folder in the folder list (if the folder list has focus).</entry>
 </row>
 <row>
-<entry
-><keycombo action="simul"
->&Ctrl;<keycap
->Down Arrow</keycap
-></keycombo
-></entry>
-<entry
->Go to the previous folder in the folder list (if the folder list has focus).</entry>
+<entry><keycombo action="simul">&Ctrl;<keycap>Down Arrow</keycap></keycombo></entry>
+<entry>Go to the previous folder in the folder list (if the folder list has focus).</entry>
 </row>
 <row>
-<entry
-><keycombo action="simul"
->&Ctrl;<keycap
->Left Arrow</keycap
-></keycombo
-></entry>
-<entry
->Walk upwards in the list of folders. Use <keycombo action="simul"
->&Ctrl;<keycap
->Space</keycap
-></keycombo
-> to actually enter the folder.</entry>
+<entry><keycombo action="simul">&Ctrl;<keycap>Left Arrow</keycap></keycombo></entry>
+<entry>Walk upwards in the list of folders. Use <keycombo action="simul">&Ctrl;<keycap>Space</keycap></keycombo> to actually enter the folder.</entry>
 <!-- TODO: or wait for timeout so the folder is selected? -->
 </row>
 <row>
-<entry
-><keycombo action="simul"
->&Ctrl;<keycap
->Right Arrow</keycap
-></keycombo
-></entry>
-<entry
->Walk downwards in the list of folders. Use <keycombo action="simul"
->&Ctrl;<keycap
->Space</keycap
-></keycombo
-> to actually enter the folder.</entry>
+<entry><keycombo action="simul">&Ctrl;<keycap>Right Arrow</keycap></keycombo></entry>
+<entry>Walk downwards in the list of folders. Use <keycombo action="simul">&Ctrl;<keycap>Space</keycap></keycombo> to actually enter the folder.</entry>
 </row>
 <row>
-<entry
-><keycombo action="simul"
->&Ctrl;<keycap
->Space</keycap
-></keycombo
-></entry>
-<entry
->Enter the folder that has focus, &ie; the folder that you navigated to using <keycombo action="simul"
->&Ctrl;<keycap
->Left Arrow</keycap
-></keycombo
-> or <keycombo action="simul"
->&Ctrl;<keycap
->Right Arrow</keycap
-></keycombo
->.</entry>
+<entry><keycombo action="simul">&Ctrl;<keycap>Space</keycap></keycombo></entry>
+<entry>Enter the folder that has focus, &ie; the folder that you navigated to using <keycombo action="simul">&Ctrl;<keycap>Left Arrow</keycap></keycombo> or <keycombo action="simul">&Ctrl;<keycap>Right Arrow</keycap></keycombo>.</entry>
 </row>
 <row>
-<entry
-><keycombo action="simul"
->&Shift;<keycap
->Left Arrow</keycap
-></keycombo
-> and <keycombo action="simul"
->&Shift;<keycap
->Right Arrow</keycap
-></keycombo
-></entry>
-<entry
->Select messages in the header pane, starting with the current message.</entry>
+<entry><keycombo action="simul">&Shift;<keycap>Left Arrow</keycap></keycombo> and <keycombo action="simul">&Shift;<keycap>Right Arrow</keycap></keycombo></entry>
+<entry>Select messages in the header pane, starting with the current message.</entry>
 </row>
 </tbody>
 </tgroup>
 </informaltable>
 
-<para
->For more keyboard shortcuts have a look at the <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Shortcuts...</guimenuitem
-></menuchoice
-> dialogue.</para>
+<para>For more keyboard shortcuts have a look at the <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Shortcuts...</guimenuitem></menuchoice> dialogue.</para>
 
 </sect1>
 
 <sect1 id="the-composer-window">
-<title
->The Composer Window</title>
-
-<para
->The composer window is used to write new messages; it can be invoked via <menuchoice
-><guimenu
->Message</guimenu
-> <guimenuitem
->New Message...</guimenuitem
-></menuchoice
-> menu or from the <guiicon
->New Message</guiicon
-> icon on the main window.</para>
+<title>The Composer Window</title>
+
+<para>The composer window is used to write new messages; it can be invoked via <menuchoice><guimenu>Message</guimenu> <guimenuitem>New Message...</guimenuitem></menuchoice> menu or from the <guiicon>New Message</guiicon> icon on the main window.</para>
 
 <sect2 id="composing-a-message">
-<title
->Composing a Message</title>
-
-<para
->To write your message, fill in the appropriate fields in the composer window. Use the <guimenu
->View</guimenu
-> menu to select which header fields are displayed. The <guimenuitem
->Identity</guimenuitem
-> field offers a <guibutton
->Sticky</guibutton
-> option; if it is checked, the current identity will become the default identity when you open a new composer next time.</para>
-
-<para
->There are a variety of shortcuts to help you with writing your messages. The <guibutton
->...</guibutton
-> buttons next to the <guilabel
->To:</guilabel
->, <guilabel
->CC:</guilabel
-> and <guilabel
->BCC:</guilabel
-> fields will call up the address book so that you can select addresses from there.</para>
-
-<para
->When you start typing an address in the <guilabel
->To:</guilabel
->/<guilabel
->CC:</guilabel
->/<guilabel
->BCC:</guilabel
-> fields, a popup will appear that offers matching addresses that have been used recently and matching addresses from your address book; if you do not like the automatic popup you can disable it by clicking with the &RMB; on the field and choosing a different completion mode.</para>
-
-<para
->Whenever you want to add more than one recipient in one of the fields, use a comma to separate each address from the next one. You may need to specify fully qualified addresses (&ie; <userinput
->user@domain.com</userinput
->) even for local users, depending on your system configuration.</para>
-
-<para
->When you are finished with your message, click the <guiicon
->Send</guiicon
-> icon (the envelope) to send the message now, or click the <guiicon
->Queue</guiicon
-> icon to put the message in the outbox. If your message is not finished yet, select <menuchoice
-><guimenu
->Message</guimenu
-><guimenuitem
->Save in Drafts Folder</guimenuitem
-></menuchoice
->. </para
-></sect2>
+<title>Composing a Message</title>
+
+<para>To write your message, fill in the appropriate fields in the composer window. Use the <guimenu>View</guimenu> menu to select which header fields are displayed. The <guimenuitem>Identity</guimenuitem> field offers a <guibutton>Sticky</guibutton> option; if it is checked, the current identity will become the default identity when you open a new composer next time.</para>
+
+<para>There are a variety of shortcuts to help you with writing your messages. The <guibutton>...</guibutton> buttons next to the <guilabel>To:</guilabel>, <guilabel>CC:</guilabel> and <guilabel>BCC:</guilabel> fields will call up the address book so that you can select addresses from there.</para>
+
+<para>When you start typing an address in the <guilabel>To:</guilabel>/<guilabel>CC:</guilabel>/<guilabel>BCC:</guilabel> fields, a popup will appear that offers matching addresses that have been used recently and matching addresses from your address book; if you do not like the automatic popup you can disable it by clicking with the &RMB; on the field and choosing a different completion mode.</para>
+
+<para>Whenever you want to add more than one recipient in one of the fields, use a comma to separate each address from the next one. You may need to specify fully qualified addresses (&ie; <userinput>user@domain.com</userinput>) even for local users, depending on your system configuration.</para>
+
+<para>When you are finished with your message, click the <guiicon>Send</guiicon> icon (the envelope) to send the message now, or click the <guiicon>Queue</guiicon> icon to put the message in the outbox. If your message is not finished yet, select <menuchoice><guimenu>Message</guimenu><guimenuitem>Save in Drafts Folder</guimenuitem></menuchoice>. </para></sect2>
 
 <sect2 id="encrypt-sign">
-<title
->Signing and Encrypting Messages</title>
-
-<para
->If you want to send an <link linkend="pgp-encrypt-your-messages"
->encrypted</link
-> or <link linkend="pgp-sign-your-messages"
->digitally signed</link
-> message, select the <guiicon
->Sign Message</guiicon
-> or <guiicon
->Encrypt Message</guiicon
-> icons in the toolbar. Moreover you can select the format that should be used to sign and/or encrypt the message. Depending on the installed encryption programs you can choose between: </para>
+<title>Signing and Encrypting Messages</title>
+
+<para>If you want to send an <link linkend="pgp-encrypt-your-messages">encrypted</link> or <link linkend="pgp-sign-your-messages">digitally signed</link> message, select the <guiicon>Sign Message</guiicon> or <guiicon>Encrypt Message</guiicon> icons in the toolbar. Moreover you can select the format that should be used to sign and/or encrypt the message. Depending on the installed encryption programs you can choose between: </para>
 
 <variablelist id="cryptographic-message-formats">
 <varlistentry>
-<term
-><guilabel
->Any</guilabel
-></term>
+<term><guilabel>Any</guilabel></term>
 <listitem>
-<para
->KMail will use a format which is understood by all recipients of the message. The preferred format of the recipients can be specified in the KDE Address Book.</para
-></listitem>
+<para>KMail will use a format which is understood by all recipients of the message. The preferred format of the recipients can be specified in the KDE Address Book.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Inline OpenPGP (deprecated)</guilabel
-></term>
+<term><guilabel>Inline OpenPGP (deprecated)</guilabel></term>
 <listitem>
-<para
->This format is outdated. If you use this format then only the message text will be signed and/or encrypted. <emphasis
->Attachments will neither be signed nor encrypted.</emphasis
-> HTML messages cannot be signed with this format. You should only use this format if necessary, &ie; if you send messages to users of email clients that cannot handle the more advanced formats.</para
-></listitem>
+<para>This format is outdated. If you use this format then only the message text will be signed and/or encrypted. <emphasis>Attachments will neither be signed nor encrypted.</emphasis> HTML messages cannot be signed with this format. You should only use this format if necessary, &ie; if you send messages to users of email clients that cannot handle the more advanced formats.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->PGP/MIME</guilabel
-></term>
+<term><guilabel>PGP/MIME</guilabel></term>
 <listitem>
-<para
->This format is the successor of the inline OpenPGP format. If you use this format then the message text and all attachments will be signed and/or encrypted (at least by default). This is the recommended format if you use OpenPGP.</para
-></listitem>
+<para>This format is the successor of the inline OpenPGP format. If you use this format then the message text and all attachments will be signed and/or encrypted (at least by default). This is the recommended format if you use OpenPGP.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->S/MIME</guilabel
-></term>
+<term><guilabel>S/MIME</guilabel></term>
 <listitem>
-<para
->This format is an alternative format to PGP/MIME. If you use this format then the message text and all attachments will be signed and/or encrypted (at least by default). This format is mostly used by corporations.</para
-></listitem>
+<para>This format is an alternative format to PGP/MIME. If you use this format then the message text and all attachments will be signed and/or encrypted (at least by default). This format is mostly used by corporations.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->S/MIME opaque</guilabel
-></term>
+<term><guilabel>S/MIME opaque</guilabel></term>
 <listitem>
-<para
->This format is a variant of the S/MIME format. It should only be used if necessary.</para
-></listitem>
+<para>This format is a variant of the S/MIME format. It should only be used if necessary.</para></listitem>
 </varlistentry>
 </variablelist>
 
 </sect2>
 
 <sect2 id="html-mails">
-<title
->Creating HTML Messages</title>
+<title>Creating HTML Messages</title>
 
-<para
->Note that HTML messages are often regarded as an annoyance; therefore, you should avoid sending HTML messages if possible. Particularly, you should never send HTML messages to a mailing list unless HTML messages are explicitly allowed.</para>
+<para>Note that HTML messages are often regarded as an annoyance; therefore, you should avoid sending HTML messages if possible. Particularly, you should never send HTML messages to a mailing list unless HTML messages are explicitly allowed.</para>
 
-<para
->In order to be able to create HTML messages you first have to enable the markup tools. To do this enable <guimenuitem
->Formatting (HTML)</guimenuitem
-> in the <menuchoice
-><guimenu
->Options</guimenu
-></menuchoice
-> menu. A toolbar with several tools to format the message will appear. Via the drop down box you can select between standard text and six different types of lists (three bulleted lists with different symbols and three numbered lists with different numbering). Moreover, you can select the font family, the font size, the font style (bold, italic, underlined) and the text colour. Last but not least, you can select the alignment of the text (left aligned, centred, right aligned).</para>
+<para>In order to be able to create HTML messages you first have to enable the markup tools. To do this enable <guimenuitem>Formatting (HTML)</guimenuitem> in the <menuchoice><guimenu>Options</guimenu></menuchoice> menu. A toolbar with several tools to format the message will appear. Via the drop down box you can select between standard text and six different types of lists (three bulleted lists with different symbols and three numbered lists with different numbering). Moreover, you can select the font family, the font size, the font style (bold, italic, underlined) and the text colour. Last but not least, you can select the alignment of the text (left aligned, centred, right aligned).</para>
 
-<para
->Creating tables and embedding images is currently not possible.</para>
+<para>Creating tables and embedding images is currently not possible.</para>
 
 </sect2>
 
 <sect2 id="attachments">
-<title
->Adding Attachments</title>
+<title>Adding Attachments</title>
 
-<para
->You can attach files to your message by using one of the methods below:</para>
+<para>You can attach files to your message by using one of the methods below:</para>
 
 <itemizedlist>
 <listitem>
-<para
->Click the <guiicon
->Attach File</guiicon
-> (paper clip) icon and select the file you wish to attach;</para>
+<para>Click the <guiicon>Attach File</guiicon> (paper clip) icon and select the file you wish to attach;</para>
 </listitem>
 <listitem>
-<para
->Drag a file from the desktop or another folder into the composer window;</para
-> 
+<para>Drag a file from the desktop or another folder into the composer window;</para> 
 </listitem>
 <listitem>
-<para
->Drag a message from &kmail;'s message list into the composer window -- that message will then be attached;</para>
+<para>Drag a message from &kmail;'s message list into the composer window -- that message will then be attached;</para>
 </listitem>
 <listitem>
-<para
->Select one of the options in the <menuchoice
-><guimenu
->Attach</guimenu
-></menuchoice
-> menu.</para>
+<para>Select one of the options in the <menuchoice><guimenu>Attach</guimenu></menuchoice> menu.</para>
 </listitem>
 </itemizedlist>
 
-<para
->Once a file is attached to your message, it appears in the attachments pane at the bottom of the composer window. You can use the &RMB; on each attachment to <guimenuitem
->View</guimenuitem
->, <guimenuitem
->Save</guimenuitem
-> or <guimenuitem
->Remove</guimenuitem
-> the attachment.</para>
-
-<para
->Use the <guimenuitem
->Properties</guimenuitem
-> item to open the <guilabel
->Message Part Properties</guilabel
-> dialogue. The first field contains the attachment's &MIME; type. Just like the <guilabel
->Name</guilabel
-> field, it should be automatically filled with an appropriate value. Sometimes the &MIME; type value may be wrong. You can then type in any &MIME; type or choose from the list of common &MIME; types. You can also select an encoding method for your file from the list of encoding options (normally, the default value works fine). Check the <guilabel
->Suggest automatic display</guilabel
-> option if you want to suggest to the recipient the automatic (inline) display of this attachment. Whether this works or not depends on the recipient's email client and on his settings.</para>
-
-<para
->You can also attach public keys to the message by using the appropriate options in the <menuchoice
-><guimenu
->Attach</guimenu
-></menuchoice
-> menu. <application
->PGP</application
-> key attachments are handled like file attachments.</para>
+<para>Once a file is attached to your message, it appears in the attachments pane at the bottom of the composer window. You can use the &RMB; on each attachment to <guimenuitem>View</guimenuitem>, <guimenuitem>Save</guimenuitem> or <guimenuitem>Remove</guimenuitem> the attachment.</para>
+
+<para>Use the <guimenuitem>Properties</guimenuitem> item to open the <guilabel>Message Part Properties</guilabel> dialogue. The first field contains the attachment's &MIME; type. Just like the <guilabel>Name</guilabel> field, it should be automatically filled with an appropriate value. Sometimes the &MIME; type value may be wrong. You can then type in any &MIME; type or choose from the list of common &MIME; types. You can also select an encoding method for your file from the list of encoding options (normally, the default value works fine). Check the <guilabel>Suggest automatic display</guilabel> option if you want to suggest to the recipient the automatic (inline) display of this attachment. Whether this works or not depends on the recipient's email client and on his settings.</para>
+
+<para>You can also attach public keys to the message by using the appropriate options in the <menuchoice><guimenu>Attach</guimenu></menuchoice> menu. <application>PGP</application> key attachments are handled like file attachments.</para>
 
 </sect2>
 
 <sect2 id="checking-the-spelling-of-your-message">
-<title
->Checking the Spelling of your Message</title>
-
-<para
->&kmail; will automatically check the spelling of your message (in HTML mode this currently does not work) and display unknown words using red colour. If there are too many unknown words &kmail; will disable its checking. To select the language used for checking, select <menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Dictionary</guimenuitem
-></menuchoice
->. You can disable automatic spellchecking in the <menuchoice
-><guimenu
->Options</guimenu
-></menuchoice
-> menu.</para>
-
-<para
->To check the spelling of your message using a dialogue, select <menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Spelling...</guimenuitem
-></menuchoice
->. &kmail; uses <ulink url="/tdespell/"
->&tdespell;</ulink
-> to check spelling, which is the &kde; frontend to the <application
->ispell</application
-> or <application
->aspell</application
-> spelling checker. Note that you may first need to configure the spellchecker using <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Spellchecker...</guimenuitem
-></menuchoice
->.</para>
+<title>Checking the Spelling of your Message</title>
+
+<para>&kmail; will automatically check the spelling of your message (in HTML mode this currently does not work) and display unknown words using red colour. If there are too many unknown words &kmail; will disable its checking. To select the language used for checking, select <menuchoice><guimenu>View</guimenu> <guimenuitem>Dictionary</guimenuitem></menuchoice>. You can disable automatic spellchecking in the <menuchoice><guimenu>Options</guimenu></menuchoice> menu.</para>
+
+<para>To check the spelling of your message using a dialogue, select <menuchoice><guimenu>Tools</guimenu> <guimenuitem>Spelling...</guimenuitem></menuchoice>. &kmail; uses <ulink url="/tdespell/">&tdespell;</ulink> to check spelling, which is the &kde; frontend to the <application>ispell</application> or <application>aspell</application> spelling checker. Note that you may first need to configure the spellchecker using <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Spellchecker...</guimenuitem></menuchoice>.</para>
 
 </sect2>
 
 </sect1>
 
 <sect1 id="folders">
-<title
->Message Folders</title>
-
-<para
->Message Folders are used to organise your email messages. By default, all message folders are stored in the folder <filename class="directory"
->Mail</filename
->, which is created in your home folder. When you first start &kmail; the <guilabel
->inbox</guilabel
->, <guilabel
->outbox</guilabel
->, <guilabel
->sent-mail</guilabel
->, <guilabel
->wastebin</guilabel
-> and <guilabel
->drafts</guilabel
-> folders are created. These folders each have special functions:</para>
+<title>Message Folders</title>
+
+<para>Message Folders are used to organise your email messages. By default, all message folders are stored in the folder <filename class="directory">Mail</filename>, which is created in your home folder. When you first start &kmail; the <guilabel>inbox</guilabel>, <guilabel>outbox</guilabel>, <guilabel>sent-mail</guilabel>, <guilabel>wastebin</guilabel> and <guilabel>drafts</guilabel> folders are created. These folders each have special functions:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->inbox:</guilabel
-></term>
+<term><guilabel>inbox:</guilabel></term>
 <listitem>
-<para
->Where &kmail; by default puts your new messages when you ask it to check your mail. </para>
+<para>Where &kmail; by default puts your new messages when you ask it to check your mail. </para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->outbox:</guilabel
-></term>
+<term><guilabel>outbox:</guilabel></term>
 <listitem>
-<para
->Where messages are put while they are waiting to be delivered. Note that you should not drag and drop messages here to send them, use the <guiicon
->Send</guiicon
-> icon in the composer window instead. </para>
+<para>Where messages are put while they are waiting to be delivered. Note that you should not drag and drop messages here to send them, use the <guiicon>Send</guiicon> icon in the composer window instead. </para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->sent-mail:</guilabel
-></term>
+<term><guilabel>sent-mail:</guilabel></term>
 <listitem>
-<para
->By default copies of all messages that you have sent are put into this folder.</para>
+<para>By default copies of all messages that you have sent are put into this folder.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->wastebin:</guilabel
-></term>
+<term><guilabel>wastebin:</guilabel></term>
 <listitem>
-<para
->By default all messages that you have moved to the wastebin are moved into this folder.</para>
+<para>By default all messages that you have moved to the wastebin are moved into this folder.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->drafts:</guilabel
-></term>
+<term><guilabel>drafts:</guilabel></term>
 <listitem>
-<para
->Contains messages you started to edit but then saved to this folder instead of sending them.</para>
+<para>Contains messages you started to edit but then saved to this folder instead of sending them.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->You may find that the standard folders are fine for your needs; eventually, though, you will probably need folders to help you organise your messages. To create a new folder, select <menuchoice
-><guimenu
->Folder</guimenu
-><guimenuitem
->New Folder...</guimenuitem
-></menuchoice
->: the <link linkend="folders-properties-window"
->folder properties</link
-> dialogue will then prompt you for the necessary information. If you ever need to change the settings for a folder, select the folder you wish to modify in the Folders pane and select <menuchoice
-><guimenu
->Folder</guimenu
-><guimenuitem
->Properties</guimenuitem
-> </menuchoice
->.</para>
-
-<para
->To move messages from one folder into another, select the message(s) you want to move and press the <keycap
->M</keycap
-> key or select <menuchoice
-><guimenu
->Message</guimenu
-><guimenuitem
->Move To</guimenuitem
-></menuchoice
->. A list of folders will appear; select the folder from the list that you want to move the messages to. Messages can also be moved by dragging them from the Message list to a folder in the Folder list.</para>
-
-<para
->If you want to clear all of the messages out of a folder choose <menuchoice
-><guimenu
->Folder</guimenu
-><guimenuitem
->Move All Messages to the Wastebin</guimenuitem
-></menuchoice
->. You can use <menuchoice
-><guimenu
->Folder</guimenu
-><guimenuitem
->Delete Folder</guimenuitem
-></menuchoice
-> to remove a folder and all its messages and subfolders.</para>
+<para>You may find that the standard folders are fine for your needs; eventually, though, you will probably need folders to help you organise your messages. To create a new folder, select <menuchoice><guimenu>Folder</guimenu><guimenuitem>New Folder...</guimenuitem></menuchoice>: the <link linkend="folders-properties-window">folder properties</link> dialogue will then prompt you for the necessary information. If you ever need to change the settings for a folder, select the folder you wish to modify in the Folders pane and select <menuchoice><guimenu>Folder</guimenu><guimenuitem>Properties</guimenuitem> </menuchoice>.</para>
+
+<para>To move messages from one folder into another, select the message(s) you want to move and press the <keycap>M</keycap> key or select <menuchoice><guimenu>Message</guimenu><guimenuitem>Move To</guimenuitem></menuchoice>. A list of folders will appear; select the folder from the list that you want to move the messages to. Messages can also be moved by dragging them from the Message list to a folder in the Folder list.</para>
+
+<para>If you want to clear all of the messages out of a folder choose <menuchoice><guimenu>Folder</guimenu><guimenuitem>Move All Messages to the Wastebin</guimenuitem></menuchoice>. You can use <menuchoice><guimenu>Folder</guimenu><guimenuitem>Delete Folder</guimenuitem></menuchoice> to remove a folder and all its messages and subfolders.</para>
 
 <sect2 id="folders-properties-window">
-<title
->Folder Properties</title>
+<title>Folder Properties</title>
 
-<para
->The folder's <guilabel
->Properties</guilabel
-> dialogue lets you rename and move a folder and specify all of its properties. Note that most properties are only available for your own folders and not for default folder like <guilabel
->inbox</guilabel
-> &etc;. Default folders also cannot be moved or renamed.</para>
+<para>The folder's <guilabel>Properties</guilabel> dialogue lets you rename and move a folder and specify all of its properties. Note that most properties are only available for your own folders and not for default folder like <guilabel>inbox</guilabel> &etc;. Default folders also cannot be moved or renamed.</para>
 
 <sect3 id="folders-properties-general">
-<title
->General</title>
-
-<para
->Rename a folder by changing the entry in the <guilabel
->Name:</guilabel
-> field.</para>
-
-<para
->You can make a folder a subfolder of another folder by choosing a new parent folder using the <guilabel
->Belongs to</guilabel
-> selection. </para>
-
-<para
->The <guilabel
->Folder Icons</guilabel
-> section lets you choose icons that are different from the default ones in the folder list.</para>
-
-<para
->See the <link linkend="folders-format"
->Folder Format</link
-> section for information about the <guilabel
->Mailbox format.</guilabel
-></para>
-
-<para
->With the <guilabel
->Identity</guilabel
-> section you can set the default identity that should be used for new messages if this folder is selected. Replies to messages that were sent directly to you will still default to the message's <quote
->To</quote
-> address if an according identity is found.</para>
-
-<para
->With <guilabel
->Show Sender/Receiver</guilabel
-> you can set the visible columns in the header pane. This is useful if you use a folder to save your own sent messages.</para>
-
-<para
->Check <guilabel
->Ignore new mail in this folder</guilabel
-> if you do not want to be informed about new mail that arrives in this folder. This is for example useful for the folder where you move all detected spam messages to.</para>
-
-<para
->Check <guilabel
->Keep replies in this folder</guilabel
-> if you want replies to messages in this folder to be filed also into this folder rather than into a special sent-mail folder.</para>
+<title>General</title>
+
+<para>Rename a folder by changing the entry in the <guilabel>Name:</guilabel> field.</para>
+
+<para>You can make a folder a subfolder of another folder by choosing a new parent folder using the <guilabel>Belongs to</guilabel> selection. </para>
+
+<para>The <guilabel>Folder Icons</guilabel> section lets you choose icons that are different from the default ones in the folder list.</para>
+
+<para>See the <link linkend="folders-format">Folder Format</link> section for information about the <guilabel>Mailbox format.</guilabel></para>
+
+<para>With the <guilabel>Identity</guilabel> section you can set the default identity that should be used for new messages if this folder is selected. Replies to messages that were sent directly to you will still default to the message's <quote>To</quote> address if an according identity is found.</para>
+
+<para>With <guilabel>Show Sender/Receiver</guilabel> you can set the visible columns in the header pane. This is useful if you use a folder to save your own sent messages.</para>
+
+<para>Check <guilabel>Ignore new mail in this folder</guilabel> if you do not want to be informed about new mail that arrives in this folder. This is for example useful for the folder where you move all detected spam messages to.</para>
+
+<para>Check <guilabel>Keep replies in this folder</guilabel> if you want replies to messages in this folder to be filed also into this folder rather than into a special sent-mail folder.</para>
 
 </sect3>
 
 <sect3 id="folders-properties-expiry">
-<title
->Old Message Expiry</title>
-
-<para
->Here you can select what should happen with old messages in this folder. If you enable <guilabel
->Expire old messages in this folder</guilabel
-> then KMail will regularly, depending on your choice, either delete old messages or move old messages to another folder. You can also start expiration of old messages manually via <menuchoice
-><guimenu
->Folder</guimenu
-><guisubmenu
->Expire</guisubmenu
-></menuchoice
-> and via <menuchoice
-><guimenu
->File</guimenu
-><guisubmenu
->Expire All Folders</guisubmenu
-></menuchoice
-></para>
-
-<warning
-><para
->Messages that are deleted during expiration of old messages cannot be restored, so be careful with this setting.</para
-></warning>
+<title>Old Message Expiry</title>
+
+<para>Here you can select what should happen with old messages in this folder. If you enable <guilabel>Expire old messages in this folder</guilabel> then KMail will regularly, depending on your choice, either delete old messages or move old messages to another folder. You can also start expiration of old messages manually via <menuchoice><guimenu>Folder</guimenu><guisubmenu>Expire</guisubmenu></menuchoice> and via <menuchoice><guimenu>File</guimenu><guisubmenu>Expire All Folders</guisubmenu></menuchoice></para>
+
+<warning><para>Messages that are deleted during expiration of old messages cannot be restored, so be careful with this setting.</para></warning>
 
 </sect3>
 
 <sect3 id="folders-properties-mailinglist">
-<title
->Mailing List</title>
-
-<para
->If you are going to use the folder for a mailing list then you should check <guilabel
->Folder holds a mailing list</guilabel
-> to associate this folder with the mailing list. Next you should click on <guilabel
->Detect Automatically</guilabel
->. KMail will then try to guess some information about the mailing list from the currently selected message. If KMail could not determine some addresses then you can add the missing information manually. To do this first select the <guilabel
->Address type</guilabel
-> for which you want to add an address. You can choose between:</para>
+<title>Mailing List</title>
+
+<para>If you are going to use the folder for a mailing list then you should check <guilabel>Folder holds a mailing list</guilabel> to associate this folder with the mailing list. Next you should click on <guilabel>Detect Automatically</guilabel>. KMail will then try to guess some information about the mailing list from the currently selected message. If KMail could not determine some addresses then you can add the missing information manually. To do this first select the <guilabel>Address type</guilabel> for which you want to add an address. You can choose between:</para>
 
 	<variablelist>
 	  <varlistentry id="folders-properties-mailinglist-post">
 	    <term>
-	      <guilabel
->Post to List</guilabel>
+	      <guilabel>Post to List</guilabel>
 	    </term>
 	    <listitem>
-	      <para
->This address is used for sending messages to the mailing list. This is usually an email address. </para>
+	      <para>This address is used for sending messages to the mailing list. This is usually an email address. </para>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry id="folders-properties-mailinglist-subscribe">
 	    <term>
-	      <guilabel
->Subscribe to List</guilabel>
+	      <guilabel>Subscribe to List</guilabel>
 	    </term>
 	    <listitem>
-	      <para
->This address is used for subscribing to the mailing list. This can be an email address or the address of a webpage. </para>
+	      <para>This address is used for subscribing to the mailing list. This can be an email address or the address of a webpage. </para>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry id="folders-properties-mailinglist-unsubscribe">
 	    <term>
-	      <guilabel
->Unsubscribe from List</guilabel>
+	      <guilabel>Unsubscribe from List</guilabel>
 	    </term>
 	    <listitem>
-	      <para
->This address is used for unsubscribing from the mailing list. This can be an email address or the address of a webpage. </para>
+	      <para>This address is used for unsubscribing from the mailing list. This can be an email address or the address of a webpage. </para>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry id="folders-properties-mailinglist-archive">
 	    <term>
-	      <guilabel
->List Archives</guilabel>
+	      <guilabel>List Archives</guilabel>
 	    </term>
 	    <listitem>
-	      <para
->This is the address of the archive of the mailing list. This is usually the address of a webpage. </para>
+	      <para>This is the address of the archive of the mailing list. This is usually the address of a webpage. </para>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry id="folders-properties-mailinglist-help">
 	    <term>
-	      <guilabel
->List Help</guilabel>
+	      <guilabel>List Help</guilabel>
 	    </term>
 	    <listitem>
-	      <para
->This address is used for requesting help for this mailing list. This is usually an email address. </para>
+	      <para>This address is used for requesting help for this mailing list. This is usually an email address. </para>
 	    </listitem>
 	  </varlistentry>
 	</variablelist>
 
-<para
->After selecting the appropriate <guilabel
->Address type</guilabel
-> you enter the email address or the address of the webpage and then click on <guilabel
->Add</guilabel
->. With <guilabel
->Remove</guilabel
-> you can remove addresses.</para>
-
-<para
->If all addresses have been added then you can execute an action, &eg; go to the list archives, by selecting the appropriate <guilabel
->Address type</guilabel
-> and then clicking on <guilabel
->Invoke Handler</guilabel
->. If there is an email address and an address of a webpage for the desired action then you will have to select the <guilabel
->Preferred handler</guilabel
-> prior to clicking on <guilabel
->Invoke Handler</guilabel
->. Select <guilabel
->KMail</guilabel
-> if you want to send a message to the email address and select <guilabel
->Browser</guilabel
-> if you want to go to the webpage.</para>
-
-<para
->Alternatively to invoking the handler for <guilabel
->Post to List</guilabel
-> you can send a new message to the mailing list via <menuchoice
-><guimenu
->Message</guimenu
-><guimenuitem
->New Message to Mailing-List...</guimenuitem
-></menuchoice
-> or by clicking with the <mousebutton
->middle</mousebutton
-> mousebutton on the folder in the folder list.</para>
+<para>After selecting the appropriate <guilabel>Address type</guilabel> you enter the email address or the address of the webpage and then click on <guilabel>Add</guilabel>. With <guilabel>Remove</guilabel> you can remove addresses.</para>
+
+<para>If all addresses have been added then you can execute an action, &eg; go to the list archives, by selecting the appropriate <guilabel>Address type</guilabel> and then clicking on <guilabel>Invoke Handler</guilabel>. If there is an email address and an address of a webpage for the desired action then you will have to select the <guilabel>Preferred handler</guilabel> prior to clicking on <guilabel>Invoke Handler</guilabel>. Select <guilabel>KMail</guilabel> if you want to send a message to the email address and select <guilabel>Browser</guilabel> if you want to go to the webpage.</para>
+
+<para>Alternatively to invoking the handler for <guilabel>Post to List</guilabel> you can send a new message to the mailing list via <menuchoice><guimenu>Message</guimenu><guimenuitem>New Message to Mailing-List...</guimenuitem></menuchoice> or by clicking with the <mousebutton>middle</mousebutton> mousebutton on the folder in the folder list.</para>
 
 </sect3>
 
       <sect3 id="folders-properties-acl">
-	<title
->Access Control tab (&imap; only)</title>
-
-	<para
->Here you can manage the access control lists (&acl;s) of &imap; folders. </para>
-
-	<para
->The currently active &acl; is shown in the list. It consists of pairs of <guilabel
->User Id</guilabel
->s and the <guilabel
->Permissions</guilabel
-> granted to users identified by that <guilabel
->User Id</guilabel
->. <footnote
-> <para
-> Note that a single <guilabel
->User Id</guilabel
-> might refer to more than one user. Depending on the &imap; server and its configuration, there may be User Ids that correspond to groups of users, anonymous users, or any user. Consult the manual of your specific &imap; server implementation for more information. </para
-> </footnote
-> &acl;s are settable per-folder. </para>
+	<title>Access Control tab (&imap; only)</title>
+
+	<para>Here you can manage the access control lists (&acl;s) of &imap; folders. </para>
+
+	<para>The currently active &acl; is shown in the list. It consists of pairs of <guilabel>User Id</guilabel>s and the <guilabel>Permissions</guilabel> granted to users identified by that <guilabel>User Id</guilabel>. <footnote> <para> Note that a single <guilabel>User Id</guilabel> might refer to more than one user. Depending on the &imap; server and its configuration, there may be User Ids that correspond to groups of users, anonymous users, or any user. Consult the manual of your specific &imap; server implementation for more information. </para> </footnote> &acl;s are settable per-folder. </para>
 
 	<note>
-	  <para
->As with everything else when using <emphasis
->disconnected &imap;</emphasis
->, you need to sync with the server for the changes to be transferred to the server. </para>
+	  <para>As with everything else when using <emphasis>disconnected &imap;</emphasis>, you need to sync with the server for the changes to be transferred to the server. </para>
 	</note>
 
-	<para
->&imap; &acl;s define a lot of fine-grained permissions that you can grant or deny other users. For the sake of clarity, &kmail; will present them as the following five categories that you can choose from (see <xref linkend="table-acl-summary"/> for the details if you already know &imap; &acl;s). </para>
+	<para>&imap; &acl;s define a lot of fine-grained permissions that you can grant or deny other users. For the sake of clarity, &kmail; will present them as the following five categories that you can choose from (see <xref linkend="table-acl-summary"/> for the details if you already know &imap; &acl;s). </para>
 
 	<variablelist>
 
 	  <varlistentry id="folders-properties-acl-none">
 	    <term>
-	      <guilabel
->None</guilabel>
+	      <guilabel>None</guilabel>
 	      </term>
 	    <listitem>
-	      <para
->Grants the users identified by <guilabel
->User Id</guilabel
-> no rights at all. This is also the default for users not explicitly (or implicitly, as a group) listed in the &acl;. These users will not see this folder in the list of &imap; folders presented to them by their mail clients. </para>
+	      <para>Grants the users identified by <guilabel>User Id</guilabel> no rights at all. This is also the default for users not explicitly (or implicitly, as a group) listed in the &acl;. These users will not see this folder in the list of &imap; folders presented to them by their mail clients. </para>
 	    </listitem>
 	  </varlistentry>
 
 	  <varlistentry id="folders-properties-acl-read">
 	    <term>
-	      <guilabel
->Read</guilabel>
+	      <guilabel>Read</guilabel>
 	    </term>
 	    <listitem>
-	      <para
->Grants the users identified by <guilabel
->User Id</guilabel
-> reading rights for this folder. This also includes the ability for their mail clients to mark mails as read and store this information on the server. <footnote
-> <para
->Every user has its own list of read mail, so none of your unread mails will suddenly be marked as read just because someone else has already read them. </para>
+	      <para>Grants the users identified by <guilabel>User Id</guilabel> reading rights for this folder. This also includes the ability for their mail clients to mark mails as read and store this information on the server. <footnote> <para>Every user has its own list of read mail, so none of your unread mails will suddenly be marked as read just because someone else has already read them. </para>
 		</footnote>
 	      </para>
-	      <para
->These users will see this folder in the list of &imap; folders presented to them by their mail clients. </para>
-	      <para
->Use this to create a shared folder that others can read, but not modify. </para>
+	      <para>These users will see this folder in the list of &imap; folders presented to them by their mail clients. </para>
+	      <para>Use this to create a shared folder that others can read, but not modify. </para>
 	      <informalexample>
-		<para
->If you were the editor of a company's news letter, you could create a folder for the purpose of distributing the news letter, grant everyone reading rights, and save the letter to this folder instead of sending it out by email to a catch-all address. </para>
+		<para>If you were the editor of a company's news letter, you could create a folder for the purpose of distributing the news letter, grant everyone reading rights, and save the letter to this folder instead of sending it out by email to a catch-all address. </para>
 	      </informalexample>
 	    </listitem>
 	  </varlistentry>
 
 	  <varlistentry id="folders-properties-acl-append">
 	    <term>
-	      <guilabel
->Append</guilabel>
+	      <guilabel>Append</guilabel>
 	    </term>
 	    <listitem>
-	      <para
->(also known as <guilabel
->Post</guilabel
->) </para>
-	      <para
->Grants the users identified by <guilabel
->User Id</guilabel
-> reading (see above) and posting rights for this folder. </para>
-	      <para
->Use this to create a shared folder that others can read and post messages to, but can not otherwise modify. </para>
+	      <para>(also known as <guilabel>Post</guilabel>) </para>
+	      <para>Grants the users identified by <guilabel>User Id</guilabel> reading (see above) and posting rights for this folder. </para>
+	      <para>Use this to create a shared folder that others can read and post messages to, but can not otherwise modify. </para>
 	      <informalexample>
-		<para
->If you wanted to create a company-wide discussion forum, instead of using a web-based form or a separate company-private usenet server, you could create a bunch of folders (one per topic), and grant everyone reading and posting rights. Instead of posting to an &nntp; server or writing their messages into a web form, people would just write emails and store them in the folder suiting the topic of the message. </para>
+		<para>If you wanted to create a company-wide discussion forum, instead of using a web-based form or a separate company-private usenet server, you could create a bunch of folders (one per topic), and grant everyone reading and posting rights. Instead of posting to an &nntp; server or writing their messages into a web form, people would just write emails and store them in the folder suiting the topic of the message. </para>
 	      </informalexample>
 	    </listitem>
 	  </varlistentry>
 
 	  <varlistentry id="folders-properties-acl-write">
 	    <term>
-	      <guilabel
->Write</guilabel>
+	      <guilabel>Write</guilabel>
 	    </term>
 	    <listitem>
-	      <para
->Grants the users identified by <guilabel
->User Id</guilabel
-> reading, posting (see above), and writing rights for this folder. </para>
-	      <para
->The right to write to a folder includes deleting of messages, creating subfolders, and storing other attributes than read/unread on the server (&eg; answered). </para>
-	      <para
->Use this to create a shared folder that everyone has (almost, see <xref linkend="folders-properties-acl-all"/>) the same rights for. </para>
+	      <para>Grants the users identified by <guilabel>User Id</guilabel> reading, posting (see above), and writing rights for this folder. </para>
+	      <para>The right to write to a folder includes deleting of messages, creating subfolders, and storing other attributes than read/unread on the server (&eg; answered). </para>
+	      <para>Use this to create a shared folder that everyone has (almost, see <xref linkend="folders-properties-acl-all"/>) the same rights for. </para>
 	      <informalexample>
-		<para
->In the <xref linkend="folders-properties-acl-append"/> example, you could assign write rights to a group of people acting as moderators, which would then be able to remove off-topic posts and create sub-topic-folders for high-traffic folders. </para>
+		<para>In the <xref linkend="folders-properties-acl-append"/> example, you could assign write rights to a group of people acting as moderators, which would then be able to remove off-topic posts and create sub-topic-folders for high-traffic folders. </para>
 	      </informalexample>
 	    </listitem>
 	  </varlistentry>
 
 	  <varlistentry id="folders-properties-acl-all">
 	    <term>
-	      <guilabel
->All</guilabel>
+	      <guilabel>All</guilabel>
 	    </term>
 	    <listitem>
-	      <para
->Grants the users identified by <guilabel
->User Id</guilabel
-> reading, posting, writing (see above), as well as administration rights, &ie; the right to modify the &acl; of this folder. </para>
-	      <para
->This is the default set of rights for the owner of a folder. </para>
+	      <para>Grants the users identified by <guilabel>User Id</guilabel> reading, posting, writing (see above), as well as administration rights, &ie; the right to modify the &acl; of this folder. </para>
+	      <para>This is the default set of rights for the owner of a folder. </para>
 	    </listitem>
 	  </varlistentry>
 
 	</variablelist>
 
-	<para
-><xref linkend="table-acl-summary"/> summarises the &imap; &acl; rights associated with each permission level. </para>
+	<para><xref linkend="table-acl-summary"/> summarises the &imap; &acl; rights associated with each permission level. </para>
 
 	<table id="table-acl-summary">
-	  <title
->&acl; Rights Summary </title>
+	  <title>&acl; Rights Summary </title>
 	  <tgroup cols="6">
 	    <thead>
 	      <row>
-		<entry
->&acl; right</entry>
-		<entry
-><xref linkend="folders-properties-acl-none"/></entry>
-		<entry
-><xref linkend="folders-properties-acl-read"/></entry>
-		<entry
-><xref linkend="folders-properties-acl-append"/></entry>
-		<entry
-><xref linkend="folders-properties-acl-write"/></entry>
-		<entry
-><xref linkend="folders-properties-acl-all"/></entry>
+		<entry>&acl; right</entry>
+		<entry><xref linkend="folders-properties-acl-none"/></entry>
+		<entry><xref linkend="folders-properties-acl-read"/></entry>
+		<entry><xref linkend="folders-properties-acl-append"/></entry>
+		<entry><xref linkend="folders-properties-acl-write"/></entry>
+		<entry><xref linkend="folders-properties-acl-all"/></entry>
 	      </row>
 	    </thead>
 	    <!--tfoot/-->
 	    <tbody>
 	      <row>
-		<entry
->Lookup</entry>
-		<entry
-></entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
+		<entry>Lookup</entry>
+		<entry></entry>
+		<entry>x</entry>
+		<entry>x</entry>
+		<entry>x</entry>
+		<entry>x</entry>
 	      </row>
 	      <row>
-		<entry
->Read</entry>
-		<entry
-></entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
+		<entry>Read</entry>
+		<entry></entry>
+		<entry>x</entry>
+		<entry>x</entry>
+		<entry>x</entry>
+		<entry>x</entry>
 	      </row>
 	      <row>
-		<entry
->Store Seen</entry>
-		<entry
-></entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
+		<entry>Store Seen</entry>
+		<entry></entry>
+		<entry>x</entry>
+		<entry>x</entry>
+		<entry>x</entry>
+		<entry>x</entry>
 	      </row>
 	      <row>
-		<entry
->Insert</entry>
-		<entry
-></entry>
-		<entry
-></entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
+		<entry>Insert</entry>
+		<entry></entry>
+		<entry></entry>
+		<entry>x</entry>
+		<entry>x</entry>
+		<entry>x</entry>
 	      </row>
 	      <row>
-		<entry
->Post</entry>
-		<entry
-></entry>
-		<entry
-></entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
+		<entry>Post</entry>
+		<entry></entry>
+		<entry></entry>
+		<entry>x</entry>
+		<entry>x</entry>
+		<entry>x</entry>
 	      </row>
 	      <row>
-		<entry
->Write Flags</entry>
-		<entry
-></entry>
-		<entry
-></entry>
-		<entry
-></entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
+		<entry>Write Flags</entry>
+		<entry></entry>
+		<entry></entry>
+		<entry></entry>
+		<entry>x</entry>
+		<entry>x</entry>
 	      </row>
 	      <row>
-		<entry
->Create</entry>
-		<entry
-></entry>
-		<entry
-></entry>
-		<entry
-></entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
+		<entry>Create</entry>
+		<entry></entry>
+		<entry></entry>
+		<entry></entry>
+		<entry>x</entry>
+		<entry>x</entry>
 	      </row>
 	      <row>
-		<entry
->Delete</entry>
-		<entry
-></entry>
-		<entry
-></entry>
-		<entry
-></entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
+		<entry>Delete</entry>
+		<entry></entry>
+		<entry></entry>
+		<entry></entry>
+		<entry>x</entry>
+		<entry>x</entry>
 	      </row>
 	      <row>
-		<entry
->Administer</entry>
-		<entry
-></entry>
-		<entry
-></entry>
-		<entry
-></entry>
-		<entry
-></entry>
-		<entry
->x</entry>
+		<entry>Administer</entry>
+		<entry></entry>
+		<entry></entry>
+		<entry></entry>
+		<entry></entry>
+		<entry>x</entry>
 	      </row>
 	    </tbody>
 	  </tgroup>
@@ -1163,528 +530,223 @@
 </sect2>
 
 <sect2 id="folders-format">
-<title
->Folder Format</title>
-
-<para
->A message folder can be either in <guilabel
->mbox</guilabel
-> or in <guilabel
->maildir</guilabel
-> format. <guilabel
->mbox</guilabel
-> saves all messages of a folder to one file, whereas <guilabel
->maildir</guilabel
-> saves each message to its own file. <guilabel
->maildir</guilabel
->, which is the default format, can be considered more robust, but it can be slower on some file systems. If you are unsure, choose <guilabel
->maildir</guilabel
->.</para>
-
-<para
->Note that there is currently no feature in &kmail; that allows you to convert between both formats automatically, but you can just move all messages from an old <guilabel
->mbox</guilabel
-> folder to a new <guilabel
->maildir</guilabel
-> folder or vice-versa.</para>
+<title>Folder Format</title>
+
+<para>A message folder can be either in <guilabel>mbox</guilabel> or in <guilabel>maildir</guilabel> format. <guilabel>mbox</guilabel> saves all messages of a folder to one file, whereas <guilabel>maildir</guilabel> saves each message to its own file. <guilabel>maildir</guilabel>, which is the default format, can be considered more robust, but it can be slower on some file systems. If you are unsure, choose <guilabel>maildir</guilabel>.</para>
+
+<para>Note that there is currently no feature in &kmail; that allows you to convert between both formats automatically, but you can just move all messages from an old <guilabel>mbox</guilabel> folder to a new <guilabel>maildir</guilabel> folder or vice-versa.</para>
 
 </sect2>
 
 </sect1>
 
 <sect1 id="filters">
-<title
->Message Filters</title>
+<title>Message Filters</title>
 <anchor id="filters-id"/>
 
-<para
->After using &kmail; for a while, you may find that you have trouble sorting out the new messages in your inbox when they arrive. Filters allow you to automatically perform certain actions on incoming messages and to manually perform actions on selected messages in a folder.</para>
-
-<para
->Please note that the filters described in this section are applied <emphasis
->after</emphasis
-> the messages have been downloaded from your account -- if you want to filter messages on the server, see <link linkend="popfilters"
->Download Filters</link
->.</para>
-
-<para
->Filters consist of: filter criteria, whose rules are used as criteria to determine whether this filter should be applied to a given message; and a list of filter actions, which describe what is to be done with, or to, the message if the search pattern matches. Read more about filter criteria and filter actions in the following subsections.</para>
-
-<note
-><para
->Filters are considered one after the other, starting with the first filter in the list. The first one whose pattern matches the given message gets executed; you can request that the remaining filters also be applied, but the default is to stop processing at the first matching filter. </para
-></note>
-
-<para
->Usually, filters are used on incoming messages, but they can also be applied to sent messages or to an arbitrary message or group of messages. To selectively filter messages, select the messages you want to filter in the message list and either type <keycombo action="simul"
->&Ctrl;<keycap
->J</keycap
-> </keycombo
-> or select <menuchoice
-><guimenu
->Message</guimenu
-> <guimenuitem
->Apply Filters</guimenuitem
-></menuchoice
->: this will apply all filters that have been marked for manual filtering in the <link linkend="filter-dialog"
->filter dialogue</link
-> to those messages.</para>
+<para>After using &kmail; for a while, you may find that you have trouble sorting out the new messages in your inbox when they arrive. Filters allow you to automatically perform certain actions on incoming messages and to manually perform actions on selected messages in a folder.</para>
+
+<para>Please note that the filters described in this section are applied <emphasis>after</emphasis> the messages have been downloaded from your account -- if you want to filter messages on the server, see <link linkend="popfilters">Download Filters</link>.</para>
+
+<para>Filters consist of: filter criteria, whose rules are used as criteria to determine whether this filter should be applied to a given message; and a list of filter actions, which describe what is to be done with, or to, the message if the search pattern matches. Read more about filter criteria and filter actions in the following subsections.</para>
+
+<note><para>Filters are considered one after the other, starting with the first filter in the list. The first one whose pattern matches the given message gets executed; you can request that the remaining filters also be applied, but the default is to stop processing at the first matching filter. </para></note>
+
+<para>Usually, filters are used on incoming messages, but they can also be applied to sent messages or to an arbitrary message or group of messages. To selectively filter messages, select the messages you want to filter in the message list and either type <keycombo action="simul">&Ctrl;<keycap>J</keycap> </keycombo> or select <menuchoice><guimenu>Message</guimenu> <guimenuitem>Apply Filters</guimenuitem></menuchoice>: this will apply all filters that have been marked for manual filtering in the <link linkend="filter-dialog">filter dialogue</link> to those messages.</para>
 
 <sect2 id="filter-quick">
-<title
->Fast Filter Creation</title>
-
-<para
->There are two methods for creating a filter; the quick method is to use <menuchoice
-><guimenu
->Tools</guimenu
-><guimenuitem
->Create Filter...</guimenuitem
-></menuchoice
->: this will call the filter dialogue and present you with a new filter which has the first rule of the search pattern and the first action (as <guilabel
->file into folder</guilabel
->) preset. In most cases, all you have to do is select the folder where the message should be moved to; but you can, of course, edit the filter as you like.</para>
-
-<para
->When creating a filter on mailing list messages this method will try really hard to find a criterion that uniquely identifies messages from that list; If it succeeds, the guessed name of the list is presented in the <menuchoice
-><guimenu
->Tools</guimenu
-><guisubmenu
->Create Filter</guisubmenu
-><guimenuitem
->Filter on Mailing-List...</guimenuitem
-></menuchoice
-> menu entry.</para>
-
-<para
->The second method is to manually construct a filter from scratch by calling the filter dialogue through <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Filters...</guimenuitem
-></menuchoice
->. The filter dialogue is described in detail in the following subsection.</para>
+<title>Fast Filter Creation</title>
+
+<para>There are two methods for creating a filter; the quick method is to use <menuchoice><guimenu>Tools</guimenu><guimenuitem>Create Filter...</guimenuitem></menuchoice>: this will call the filter dialogue and present you with a new filter which has the first rule of the search pattern and the first action (as <guilabel>file into folder</guilabel>) preset. In most cases, all you have to do is select the folder where the message should be moved to; but you can, of course, edit the filter as you like.</para>
+
+<para>When creating a filter on mailing list messages this method will try really hard to find a criterion that uniquely identifies messages from that list; If it succeeds, the guessed name of the list is presented in the <menuchoice><guimenu>Tools</guimenu><guisubmenu>Create Filter</guisubmenu><guimenuitem>Filter on Mailing-List...</guimenuitem></menuchoice> menu entry.</para>
+
+<para>The second method is to manually construct a filter from scratch by calling the filter dialogue through <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Filters...</guimenuitem></menuchoice>. The filter dialogue is described in detail in the following subsection.</para>
 </sect2>
 
 <sect2 id="filter-dialog">
-<title
->The Filter Dialogue</title>
+<title>The Filter Dialogue</title>
 <anchor id="filter-dialog-id"/>
 
-<para
->This dialogue allows you to manage and edit your list of filters.</para>
-
-<para
->You can reach it either via <menuchoice
-><guimenu
->Tools</guimenu
-><guisubmenu
->Create Filter...</guisubmenu
-></menuchoice
-> or <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Filters...</guimenuitem
-></menuchoice
->.</para>
-
-<para
->The dialogue is divided into four main sections:</para>
+<para>This dialogue allows you to manage and edit your list of filters.</para>
+
+<para>You can reach it either via <menuchoice><guimenu>Tools</guimenu><guisubmenu>Create Filter...</guisubmenu></menuchoice> or <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Filters...</guimenuitem></menuchoice>.</para>
+
+<para>The dialogue is divided into four main sections:</para>
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Available Filters</guilabel
-></term>
-<listitem
-><para
->This group contains the list of filters and some action buttons to modify the filters, namely: to create new filters; to move them up or down the list; to delete them; or to rename them. If you select a filter from the list, its properties are shown in the right-hand half of the dialogue.</para
-></listitem>
+<term><guilabel>Available Filters</guilabel></term>
+<listitem><para>This group contains the list of filters and some action buttons to modify the filters, namely: to create new filters; to move them up or down the list; to delete them; or to rename them. If you select a filter from the list, its properties are shown in the right-hand half of the dialogue.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Filter Criteria</guilabel
-></term
-> <listitem
-><para
->In this group you can edit the pattern that messages must match for the filter to be applied to them. You can select here whether all of the defined rules must match or whether it suffices that any one of them matches. See <link linkend="filter-criteria"
->Search Patterns</link
-> below for a detailed description of each search rule type.</para>
-
-<para
->You can click on <guibutton
->More</guibutton
-> to get an additional (initially empty) rule if you want to define more-complex patterns and on <guibutton
->Fewer</guibutton
-> to remove the last rule. <guibutton
->Clear</guibutton
-> clears the pattern, &ie; it removes all but two rules from screen and resets those two.</para>
-<para
->Invalid or empty rules are not evaluated.</para>
+<term><guilabel>Filter Criteria</guilabel></term> <listitem><para>In this group you can edit the pattern that messages must match for the filter to be applied to them. You can select here whether all of the defined rules must match or whether it suffices that any one of them matches. See <link linkend="filter-criteria">Search Patterns</link> below for a detailed description of each search rule type.</para>
+
+<para>You can click on <guibutton>More</guibutton> to get an additional (initially empty) rule if you want to define more-complex patterns and on <guibutton>Fewer</guibutton> to remove the last rule. <guibutton>Clear</guibutton> clears the pattern, &ie; it removes all but two rules from screen and resets those two.</para>
+<para>Invalid or empty rules are not evaluated.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Filter Actions</guilabel
-></term
-> <listitem
-><para
->In this group you can edit the list of actions that are applied to all messages that match the defined filter criteria. See <link linkend="filter-action"
->Filter Actions</link
-> below for a detailed description of each action type.</para>
-
-<para
->You can click on <guibutton
->More</guibutton
-> to get a new, empty action (if you want to define more than one action) and on <guibutton
->Fewer</guibutton
-> to remove the last action. <guibutton
->Clear</guibutton
-> clears the list, &ie; it removes all but one action and resets that one.</para>
-<para
->Invalid or empty actions are not executed.</para>
+<term><guilabel>Filter Actions</guilabel></term> <listitem><para>In this group you can edit the list of actions that are applied to all messages that match the defined filter criteria. See <link linkend="filter-action">Filter Actions</link> below for a detailed description of each action type.</para>
+
+<para>You can click on <guibutton>More</guibutton> to get a new, empty action (if you want to define more than one action) and on <guibutton>Fewer</guibutton> to remove the last action. <guibutton>Clear</guibutton> clears the list, &ie; it removes all but one action and resets that one.</para>
+<para>Invalid or empty actions are not executed.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Advanced Options</guilabel
-></term>
+<term><guilabel>Advanced Options</guilabel></term>
 
 <listitem>
 
-<para
->In this group you can define a few advanced options for filters that allow you to refine your filtering.</para>
-
-<para
->Using the first row of check boxes, you can toggle when the filter is applied: the <guilabel
->to incoming messages</guilabel
-> option means that the filter is applied to messages when you receive them (&ie; on <guiicon
->Check Mail</guiicon
->); the <guilabel
->to sent messages</guilabel
-> options means that the filter is applied to messages when you send them and the <guilabel
->on manual filtering</guilabel
-> option controls whether to apply this filter when filtering is specifically selected (&ie; via <menuchoice
-><guimenu
->Message</guimenu
-> <guimenuitem
->Apply Filters</guimenuitem
-></menuchoice
->.)</para>
-
-<para
->The <guilabel
->If this filter matches, stop processing here</guilabel
-> check box in the second row controls whether or not the filters after the current filter will be applied, if the current filter matches.</para>
-
-<para
->If the <guilabel
->Add this filter to the Apply Filter menu</guilabel
-> check box in the third row is selected, this filter will be inserted in the <menuchoice
-><guimenu
->Message</guimenu
-> <guimenuitem
->Apply Filter</guimenuitem
-></menuchoice
-> submenu. You can then apply this filter to a message. Another way of applying filters is to use <menuchoice
-><guimenu
->Message</guimenu
-> <guimenuitem
->Apply Filters</guimenuitem
-></menuchoice
-> menu option, which applies <emphasis
->all</emphasis
-> the filters - one after another until they are all used or one of the filters that matches has the <guilabel
->If the filters matches, stop processing here</guilabel
->.</para>
+<para>In this group you can define a few advanced options for filters that allow you to refine your filtering.</para>
+
+<para>Using the first row of check boxes, you can toggle when the filter is applied: the <guilabel>to incoming messages</guilabel> option means that the filter is applied to messages when you receive them (&ie; on <guiicon>Check Mail</guiicon>); the <guilabel>to sent messages</guilabel> options means that the filter is applied to messages when you send them and the <guilabel>on manual filtering</guilabel> option controls whether to apply this filter when filtering is specifically selected (&ie; via <menuchoice><guimenu>Message</guimenu> <guimenuitem>Apply Filters</guimenuitem></menuchoice>.)</para>
+
+<para>The <guilabel>If this filter matches, stop processing here</guilabel> check box in the second row controls whether or not the filters after the current filter will be applied, if the current filter matches.</para>
+
+<para>If the <guilabel>Add this filter to the Apply Filter menu</guilabel> check box in the third row is selected, this filter will be inserted in the <menuchoice><guimenu>Message</guimenu> <guimenuitem>Apply Filter</guimenuitem></menuchoice> submenu. You can then apply this filter to a message. Another way of applying filters is to use <menuchoice><guimenu>Message</guimenu> <guimenuitem>Apply Filters</guimenuitem></menuchoice> menu option, which applies <emphasis>all</emphasis> the filters - one after another until they are all used or one of the filters that matches has the <guilabel>If the filters matches, stop processing here</guilabel>.</para>
 
 </listitem>
 </varlistentry>
 </variablelist>
 
-<note
-><para
->Filters are automatically named unless you explicitly rename them using the <guibutton
->Rename...</guibutton
-> button. The dialogue assumes that it should continue auto-naming the filter as long as the filter name starts with <quote
->&lt;</quote
->. </para
-></note>
+<note><para>Filters are automatically named unless you explicitly rename them using the <guibutton>Rename...</guibutton> button. The dialogue assumes that it should continue auto-naming the filter as long as the filter name starts with <quote>&lt;</quote>. </para></note>
 
 <note>
-<para
->If you apply filter changes, via <guibutton
->OK</guibutton
-> or <guibutton
->Apply</guibutton
->, only valid filters are actually copied to the internal filter manager.</para>
-
-<para
->Similarly, empty rules and actions are removed from the pattern and action list respectively, before the filter is saved.</para>
+<para>If you apply filter changes, via <guibutton>OK</guibutton> or <guibutton>Apply</guibutton>, only valid filters are actually copied to the internal filter manager.</para>
+
+<para>Similarly, empty rules and actions are removed from the pattern and action list respectively, before the filter is saved.</para>
 </note>
 
 </sect2>
 
 <sect2 id="filter-criteria">
-<title
->Search Patterns</title>
+<title>Search Patterns</title>
 
-<para
->The most common use of filters is to filter on the sender of messages; this can be done by choosing <guilabel
->From</guilabel
->. A good bet for a mailing list would be <guilabel
->&lt;recipients&gt;</guilabel
->, but there are other criteria a filter can search for (note that all patterns are interpreted case-insensitively):</para>
+<para>The most common use of filters is to filter on the sender of messages; this can be done by choosing <guilabel>From</guilabel>. A good bet for a mailing list would be <guilabel>&lt;recipients&gt;</guilabel>, but there are other criteria a filter can search for (note that all patterns are interpreted case-insensitively):</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->&lt;message&gt;</guilabel
-></term>
+<term><guilabel>&lt;message&gt;</guilabel></term>
 <listitem>
-<para
->Searches the whole message (&ie; headers, body and attachments, if any);</para>
+<para>Searches the whole message (&ie; headers, body and attachments, if any);</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->&lt;body&gt;</guilabel
-></term>
+<term><guilabel>&lt;body&gt;</guilabel></term>
 <listitem>
-<para
->Searches the body of the message (&ie; the whole message except the headers);</para>
+<para>Searches the body of the message (&ie; the whole message except the headers);</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->&lt;any header&gt;</guilabel
-></term>
+<term><guilabel>&lt;any header&gt;</guilabel></term>
 <listitem>
-<para
->Searches the headers of the message;</para>
+<para>Searches the headers of the message;</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->&lt;recipients&gt;</guilabel
-></term>
+<term><guilabel>&lt;recipients&gt;</guilabel></term>
 <listitem>
-<para
->Searches the <quote
->To</quote
-> and <quote
->CC</quote
-> header fields of the message;</para>
+<para>Searches the <quote>To</quote> and <quote>CC</quote> header fields of the message;</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->&lt;size in bytes&gt;</guilabel
-></term>
+<term><guilabel>&lt;size in bytes&gt;</guilabel></term>
 <listitem>
-<para
->Sets upper or lower bounds on the message size;</para>
+<para>Sets upper or lower bounds on the message size;</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->&lt;age in days&gt;</guilabel
-></term>
+<term><guilabel>&lt;age in days&gt;</guilabel></term>
 <listitem>
-<para
->Sets upper or lower bounds on the message age;</para>
+<para>Sets upper or lower bounds on the message age;</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->&lt;status&gt;</guilabel
-></term>
+<term><guilabel>&lt;status&gt;</guilabel></term>
 <listitem>
-<para
->Sets restrictions on the status of the message;</para>
+<para>Sets restrictions on the status of the message;</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->Any other name</term>
+<term>Any other name</term>
 <listitem>
-<para
->Searches the header field that is given by that name.</para>
+<para>Searches the header field that is given by that name.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->The list of possible rules depends on what you selected in the first drop down box. The available rules are:</para>
+<para>The list of possible rules depends on what you selected in the first drop down box. The available rules are:</para>
 
 <informaltable>
 <tgroup cols="3">
 <thead>
 <row>
-<entry
->Rule</entry>
-<entry
->Available for</entry>
-<entry
->Description</entry>
+<entry>Rule</entry>
+<entry>Available for</entry>
+<entry>Description</entry>
 </row>
 </thead>
 <tbody>
 <row>
-<entry
-><guilabel
->contains</guilabel
->/<guilabel
->does not contain</guilabel
-></entry>
-<entry
->all textual search items</entry>
-<entry
->Matches if the searched item contains (or does not contain) the given text.</entry>
+<entry><guilabel>contains</guilabel>/<guilabel>does not contain</guilabel></entry>
+<entry>all textual search items</entry>
+<entry>Matches if the searched item contains (or does not contain) the given text.</entry>
 </row>
 <row>
-<entry
-><guilabel
->equals</guilabel
->/<guilabel
->does not equal</guilabel
-></entry>
-<entry
->most textual search items</entry>
-<entry
->Matches if the searched item is equal to (or not equal to) the given text.</entry>
+<entry><guilabel>equals</guilabel>/<guilabel>does not equal</guilabel></entry>
+<entry>most textual search items</entry>
+<entry>Matches if the searched item is equal to (or not equal to) the given text.</entry>
 </row>
 <row>
-<entry
-><guilabel
->matches regular expr.</guilabel
->/<guilabel
->does not match reg. expr.</guilabel
-></entry>
-<entry
->all textual search items</entry>
-<entry
->Matches if a part of the searched item matches the given regular expression (or does not match it). If the regular expression editor is installed then you can edit the regular expression by clicking on the <guilabel
->Edit...</guilabel
-> button.</entry>
+<entry><guilabel>matches regular expr.</guilabel>/<guilabel>does not match reg. expr.</guilabel></entry>
+<entry>all textual search items</entry>
+<entry>Matches if a part of the searched item matches the given regular expression (or does not match it). If the regular expression editor is installed then you can edit the regular expression by clicking on the <guilabel>Edit...</guilabel> button.</entry>
 </row>
 <row>
-<entry
-><guilabel
->has an attachment</guilabel
->/<guilabel
->has no attachment</guilabel
-></entry>
-<entry
-><guilabel
->&lt;message&gt;</guilabel
-></entry>
-<entry
->Matches if the message has an attachment (or does not have an attachment).</entry>
+<entry><guilabel>has an attachment</guilabel>/<guilabel>has no attachment</guilabel></entry>
+<entry><guilabel>&lt;message&gt;</guilabel></entry>
+<entry>Matches if the message has an attachment (or does not have an attachment).</entry>
 </row>
 <row>
-<entry
-><guilabel
->is in address book</guilabel
->/<guilabel
->is not in address book</guilabel
-></entry>
-<entry
->most textual search items</entry>
-<entry
->Matches if the searched item contains an address that is in your address book (or if the searched items contains only unknown addresses). Of course, this rule makes only sense for address fields like From or <guilabel
->&lt;recipients&gt;</guilabel
-></entry>
+<entry><guilabel>is in address book</guilabel>/<guilabel>is not in address book</guilabel></entry>
+<entry>most textual search items</entry>
+<entry>Matches if the searched item contains an address that is in your address book (or if the searched items contains only unknown addresses). Of course, this rule makes only sense for address fields like From or <guilabel>&lt;recipients&gt;</guilabel></entry>
 </row>
 <row>
-<entry
-><guilabel
->is in category</guilabel
->/<guilabel
->is not in category</guilabel
-></entry>
-<entry
->most textual search items</entry>
-<entry
->Matches if the searched item contains an address that is in the specified category in your address book (or if the searched item contains no address that is in the specified category). Again, this rule makes only sense for address fields.</entry>
+<entry><guilabel>is in category</guilabel>/<guilabel>is not in category</guilabel></entry>
+<entry>most textual search items</entry>
+<entry>Matches if the searched item contains an address that is in the specified category in your address book (or if the searched item contains no address that is in the specified category). Again, this rule makes only sense for address fields.</entry>
 </row>
 <row>
-<entry
-><guilabel
->is equal to</guilabel
->/<guilabel
->is not equal to</guilabel
-></entry>
-<entry
->numerical search items</entry>
-<entry
->Matches if the value of the search item is equal to (or not equal to) the specified value.</entry>
+<entry><guilabel>is equal to</guilabel>/<guilabel>is not equal to</guilabel></entry>
+<entry>numerical search items</entry>
+<entry>Matches if the value of the search item is equal to (or not equal to) the specified value.</entry>
 </row>
 <row>
-<entry
-><guilabel
->is less than</guilabel
-></entry>
-<entry
->numerical search items</entry>
-<entry
->Matches if the value of the search item is less than the specified value.</entry>
+<entry><guilabel>is less than</guilabel></entry>
+<entry>numerical search items</entry>
+<entry>Matches if the value of the search item is less than the specified value.</entry>
 </row>
 <row>
-<entry
-><guilabel
->is greater than</guilabel
-></entry>
-<entry
->numerical search items</entry>
-<entry
->Matches if the value of the search item is greater than the specified value.</entry>
+<entry><guilabel>is greater than</guilabel></entry>
+<entry>numerical search items</entry>
+<entry>Matches if the value of the search item is greater than the specified value.</entry>
 </row>
 <row>
-<entry
-><guilabel
->is less than or equal to</guilabel
-></entry>
-<entry
->numerical search items</entry>
-<entry
->Matches if the value of the search item is less than or equal to the specified value.</entry>
+<entry><guilabel>is less than or equal to</guilabel></entry>
+<entry>numerical search items</entry>
+<entry>Matches if the value of the search item is less than or equal to the specified value.</entry>
 </row>
 <row>
-<entry
-><guilabel
->is greater than or equal to</guilabel
-></entry>
-<entry
->numerical search items</entry>
-<entry
->Matches if the value of the search item is greater than or equal to the specified value.</entry>
+<entry><guilabel>is greater than or equal to</guilabel></entry>
+<entry>numerical search items</entry>
+<entry>Matches if the value of the search item is greater than or equal to the specified value.</entry>
 </row>
 <row>
-<entry
-><guilabel
->is</guilabel
->/<guilabel
->is not</guilabel
-></entry>
-<entry
-><guilabel
->&lt;status&gt;</guilabel
-></entry>
-<entry
->Matches if the message has (or does not have) the specified status.</entry>
+<entry><guilabel>is</guilabel>/<guilabel>is not</guilabel></entry>
+<entry><guilabel>&lt;status&gt;</guilabel></entry>
+<entry>Matches if the message has (or does not have) the specified status.</entry>
 </row>
 </tbody>
 </tgroup>
@@ -1693,288 +755,119 @@
 </sect2>
 
 <sect2 id="filter-action">
-<title
->Filter Action</title>
+<title>Filter Action</title>
 
-<para
->The most common use of filters is to sort incoming messages to certain folders; this can be done by choosing <guilabel
->file into folder</guilabel
->. Here is a list of all possible actions:</para>
+<para>The most common use of filters is to sort incoming messages to certain folders; this can be done by choosing <guilabel>file into folder</guilabel>. Here is a list of all possible actions:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->file into folder</guilabel
-></term>
+<term><guilabel>file into folder</guilabel></term>
 <listitem>
-<para
->This will file the message into another folder, removing it from its current folder if necessary; you cannot, currently use &imap; folders as a target.</para>
+<para>This will file the message into another folder, removing it from its current folder if necessary; you cannot, currently use &imap; folders as a target.</para>
 <!-- fixme: still correct? -->
 </listitem>
 </varlistentry>
 <!-- TODO: does not exist yet
 <varlistentry>
-<term
-><guilabel
->copy to folder</guilabel
-></term>
+<term><guilabel>copy to folder</guilabel></term>
 <listitem>
-<para
->This will copy the message to another folder.</para>
-<note
-><para
->You currently cannot use &imap;
-folders as a target.</para
-></note>
+<para>This will copy the message to another folder.</para>
+<note><para>You currently cannot use &imap;
+folders as a target.</para></note>
 </listitem>
 </varlistentry>
 -->
 <varlistentry>
-<term
-><guilabel
->set identity to</guilabel
-></term>
+<term><guilabel>set identity to</guilabel></term>
 <listitem>
-<para
->This will set the identity that will be used if you reply to this message.</para>
+<para>This will set the identity that will be used if you reply to this message.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->mark as</guilabel
-></term>
+<term><guilabel>mark as</guilabel></term>
 <listitem>
-<para
->This allows you to mark the message as read or important (flagged), but also as forwarded, replied &etc;</para>
+<para>This allows you to mark the message as read or important (flagged), but also as forwarded, replied &etc;</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->send fake MDN</guilabel
-></term>
+<term><guilabel>send fake MDN</guilabel></term>
 <listitem>
-<para
->This will send a faked message disposition notification (&ie; a read receipt) to the sender of the message.</para>
+<para>This will send a faked message disposition notification (&ie; a read receipt) to the sender of the message.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->set transport to</guilabel
-></term>
+<term><guilabel>set transport to</guilabel></term>
 <listitem>
-<para
->This will set the method of transport (&eg; <acronym
->SMTP</acronym
->) that will be used if you reply to the message.</para>
+<para>This will set the method of transport (&eg; <acronym>SMTP</acronym>) that will be used if you reply to the message.</para>
 </listitem>
-</varlistentry
-> 
+</varlistentry> 
 <varlistentry>
-<term
-><guilabel
->set Reply-To to</guilabel
-></term>
-<listitem
-><para
->This will modify the <guilabel
->Reply-To</guilabel
-> field of this message. This can be useful for mailing lists that automatically set a Reply-To which you do not like.</para>
+<term><guilabel>set Reply-To to</guilabel></term>
+<listitem><para>This will modify the <guilabel>Reply-To</guilabel> field of this message. This can be useful for mailing lists that automatically set a Reply-To which you do not like.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->forward to</guilabel
-></term>
-<listitem
-><para
->This will forward the message inline (&ie; as if you selected <menuchoice
-><guimenu
->Message</guimenu
-><guimenuitem
->Forward</guimenuitem
-><guimenuitem
->Inline...</guimenuitem
-></menuchoice
->) to another email address.</para>
+<term><guilabel>forward to</guilabel></term>
+<listitem><para>This will forward the message inline (&ie; as if you selected <menuchoice><guimenu>Message</guimenu><guimenuitem>Forward</guimenuitem><guimenuitem>Inline...</guimenuitem></menuchoice>) to another email address.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->redirect to</guilabel
-></term>
-<listitem
-><para
->This will redirect the message as-is to another email address.</para>
+<term><guilabel>redirect to</guilabel></term>
+<listitem><para>This will redirect the message as-is to another email address.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->bounce</guilabel
-></term>
-<listitem
-><para
->Will try to return the message to the sender as undeliverable.</para>
-<warning
-><para
->This will only work if the sender's email address is valid, which is <emphasis
->not</emphasis
-> the case for most spam messages.</para
-></warning>
+<term><guilabel>bounce</guilabel></term>
+<listitem><para>Will try to return the message to the sender as undeliverable.</para>
+<warning><para>This will only work if the sender's email address is valid, which is <emphasis>not</emphasis> the case for most spam messages.</para></warning>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->confirm delivery</guilabel
-></term>
-<listitem
-><para
->Will try to return a message to the sender that indicates successful delivery of their message, if the sender requested that.</para
-> <para
->This action allows you to select who will get delivery receipts from you. Though you can globally enable the sending of delivery confirmations in the <guilabel
->Configure &kmail;...</guilabel
-> dialogue (<link linkend="configure-security"
-><guilabel
->Security</guilabel
-> page</link
->) we recommended not to send them to everyone, since this makes tracking of spam messages, for example, very easy for the sender.</para>
+<term><guilabel>confirm delivery</guilabel></term>
+<listitem><para>Will try to return a message to the sender that indicates successful delivery of their message, if the sender requested that.</para> <para>This action allows you to select who will get delivery receipts from you. Though you can globally enable the sending of delivery confirmations in the <guilabel>Configure &kmail;...</guilabel> dialogue (<link linkend="configure-security"><guilabel>Security</guilabel> page</link>) we recommended not to send them to everyone, since this makes tracking of spam messages, for example, very easy for the sender.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->execute command</guilabel
-></term>
+<term><guilabel>execute command</guilabel></term>
 <listitem>
-<para
->This will execute a program, but will not modify the message. Specify the full path to the program you want to execute; &kmail; will then block until the program returns. If you do not want &kmail; to block then append '&amp;' to the command. You can feed the program with the parts of the mail: <symbol
->&percnt;0</symbol
->, <symbol
->&percnt;1</symbol
->, &etc; stand for files representing the message parts; for common messages <symbol
->&percnt;0</symbol
-> is the text, <symbol
->&percnt;1</symbol
-> the first attachment and so on. Additionally, the whole message is fed into the program's <acronym
->stdin</acronym
->; and every occurrence of <symbol
->&percnt;{foo}</symbol
-> is replaced by the content of the foo header.</para>
+<para>This will execute a program, but will not modify the message. Specify the full path to the program you want to execute; &kmail; will then block until the program returns. If you do not want &kmail; to block then append '&amp;' to the command. You can feed the program with the parts of the mail: <symbol>&percnt;0</symbol>, <symbol>&percnt;1</symbol>, &etc; stand for files representing the message parts; for common messages <symbol>&percnt;0</symbol> is the text, <symbol>&percnt;1</symbol> the first attachment and so on. Additionally, the whole message is fed into the program's <acronym>stdin</acronym>; and every occurrence of <symbol>&percnt;{foo}</symbol> is replaced by the content of the foo header.</para>
 
 <!-- fixme: still correct? -->
-<warning
-><para
->This currently only works if the message has <emphasis
->at least one</emphasis
-> attachment. No, not even <symbol
->&percnt;0</symbol
-> will work in the general case!</para
-></warning>
-
-<tip
-><para
->You can enter arbitrarily-complex shell commands here, since &kmail; uses a sub shell to execute the command line; therefore, even this command will work (within its limits): <userinput
-><command
->uudecode</command
-> <option
->-o</option
-> <parameter
->$(mktemp kmail-uudecoded.XXXXXX)</parameter
-> &amp;&amp; <command
->echo</command
-> <parameter
->$'\a'</parameter
-></userinput
-></para
-></tip>
+<warning><para>This currently only works if the message has <emphasis>at least one</emphasis> attachment. No, not even <symbol>&percnt;0</symbol> will work in the general case!</para></warning>
+
+<tip><para>You can enter arbitrarily-complex shell commands here, since &kmail; uses a sub shell to execute the command line; therefore, even this command will work (within its limits): <userinput><command>uudecode</command> <option>-o</option> <parameter>$(mktemp kmail-uudecoded.XXXXXX)</parameter> &amp;&amp; <command>echo</command> <parameter>$'\a'</parameter></userinput></para></tip>
 <!-- fixme: is this uudecode tip useless now?? -->
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->pipe through</guilabel
-></term>
+<term><guilabel>pipe through</guilabel></term>
 <listitem>
-<para
->This will feed the message to a program: if the program returns output, the entire message (including the headers) will be replaced with this output; if the program does not return output or exits with a return code other than 0 (indicating an error occurred), the message will not change. Specify the full path to the program. The same substitutions (<symbol
->&percnt;n</symbol
->, <symbol
->&percnt;{foo}</symbol
-> as with <guilabel
->execute command</guilabel
-> are performed on the command line.</para>
-<warning
-><para
->Be cautious with this action, as it will easily mess up your messages if the filter program returns garbage or extra lines.</para
-></warning>
+<para>This will feed the message to a program: if the program returns output, the entire message (including the headers) will be replaced with this output; if the program does not return output or exits with a return code other than 0 (indicating an error occurred), the message will not change. Specify the full path to the program. The same substitutions (<symbol>&percnt;n</symbol>, <symbol>&percnt;{foo}</symbol> as with <guilabel>execute command</guilabel> are performed on the command line.</para>
+<warning><para>Be cautious with this action, as it will easily mess up your messages if the filter program returns garbage or extra lines.</para></warning>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->remove header</guilabel
-></term>
+<term><guilabel>remove header</guilabel></term>
 <listitem>
-<para
->Will remove all header fields with the given name from the message. This is useful mainly for removing bogus <quote
->Reply-To:</quote
-> headers.</para>
+<para>Will remove all header fields with the given name from the message. This is useful mainly for removing bogus <quote>Reply-To:</quote> headers.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->add header</guilabel
-></term>
+<term><guilabel>add header</guilabel></term>
 <listitem>
-<para
->If no such field is already present this will add a new header field with the given name and value to the message; if there already is a header field with that name, it is overwritten with the given value; if there are already multiple headers with the given name (&eg; <quote
->Received:</quote
-> headers), an arbitrary one of them is overwritten and the others are left unchanged -- this is a known limitation. You may want to combine this filter with the <guilabel
->remove header</guilabel
-> filter above to make sure that there are no other headers with that name in the message.</para>
+<para>If no such field is already present this will add a new header field with the given name and value to the message; if there already is a header field with that name, it is overwritten with the given value; if there are already multiple headers with the given name (&eg; <quote>Received:</quote> headers), an arbitrary one of them is overwritten and the others are left unchanged -- this is a known limitation. You may want to combine this filter with the <guilabel>remove header</guilabel> filter above to make sure that there are no other headers with that name in the message.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->rewrite header</guilabel
-></term>
+<term><guilabel>rewrite header</guilabel></term>
 <listitem>
-<para
->Will scan the given header field, modify its contents and write it back. The search string is always interpreted as a case-sensitive regular expression. The replacement string is inserted literally except for occurrences of <userinput
->\n</userinput
->, <userinput
->$n</userinput
-> and <userinput
->${nn}</userinput
->, where <userinput
->n</userinput
-> is a positive (single-digit, except for the third form) number or <userinput
->0</userinput
->. These constructs are interpreted as back references to substrings captured with brackets in the search string.</para
-><para
->Analogous restrictions as in the <guilabel
->add header</guilabel
-> action apply here, too.</para>
+<para>Will scan the given header field, modify its contents and write it back. The search string is always interpreted as a case-sensitive regular expression. The replacement string is inserted literally except for occurrences of <userinput>\n</userinput>, <userinput>$n</userinput> and <userinput>${nn}</userinput>, where <userinput>n</userinput> is a positive (single-digit, except for the third form) number or <userinput>0</userinput>. These constructs are interpreted as back references to substrings captured with brackets in the search string.</para><para>Analogous restrictions as in the <guilabel>add header</guilabel> action apply here, too.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->play sound</guilabel
-></term>
+<term><guilabel>play sound</guilabel></term>
 <listitem>
-<para
->Will play the specified sound.</para>
+<para>Will play the specified sound.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -1982,917 +875,390 @@ folders as a target.</para
 </sect2>
 
 <sect2 id="filter-examples">
-<title
->Filter Examples</title>
+<title>Filter Examples</title>
 
-<para
->If I am subscribed to the (general) &kde; List, I could create a folder for the list (I will call it <replaceable
->KDE-General</replaceable
->) and use a filter to automatically transfer new messages from my inbox to my <replaceable
->KDE-General</replaceable
-> folder if they are from the &kde; List. Here is how to create this filter:</para>
+<para>If I am subscribed to the (general) &kde; List, I could create a folder for the list (I will call it <replaceable>KDE-General</replaceable>) and use a filter to automatically transfer new messages from my inbox to my <replaceable>KDE-General</replaceable> folder if they are from the &kde; List. Here is how to create this filter:</para>
 
 <procedure>
-<title
->Filtering a mailing list</title>
+<title>Filtering a mailing list</title>
 <step>
-<para
->Try if <menuchoice
-><guimenu
->Tools</guimenu
-><guisubmenu
->Create filter</guisubmenu
-><guimenuitem
->Filter on Mailing-List...</guimenuitem
-></menuchoice
-> can identify the mailing list (the name of the list should then appear in the menu item); in this case, this works and I am presented a filter that has <quote
->List-Id<guilabel
->contains</guilabel
-> &lt;kde.mail.kde.org&gt;</quote
-> preset. You select the desired destination folder from the folder pull-down menu in the <guilabel
->Filter Action</guilabel
-> group and that is it.</para>
-
-<para
->If that does not work, think of a unique way of identifying the messages you want to filter. The (almost) unique property of my &kde; List messages is that they always contain <quote
->kde@mail.kde.org</quote
-> in the <guilabel
->To:</guilabel
-> or <guilabel
->CC:</guilabel
-> field. It is only almost unique, because this fails for cross-posted messages.</para>
+<para>Try if <menuchoice><guimenu>Tools</guimenu><guisubmenu>Create filter</guisubmenu><guimenuitem>Filter on Mailing-List...</guimenuitem></menuchoice> can identify the mailing list (the name of the list should then appear in the menu item); in this case, this works and I am presented a filter that has <quote>List-Id<guilabel>contains</guilabel> &lt;kde.mail.kde.org&gt;</quote> preset. You select the desired destination folder from the folder pull-down menu in the <guilabel>Filter Action</guilabel> group and that is it.</para>
+
+<para>If that does not work, think of a unique way of identifying the messages you want to filter. The (almost) unique property of my &kde; List messages is that they always contain <quote>kde@mail.kde.org</quote> in the <guilabel>To:</guilabel> or <guilabel>CC:</guilabel> field. It is only almost unique, because this fails for cross-posted messages.</para>
 </step>
 <step>
-<para
->Select <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Filters...</guimenuitem
-></menuchoice
->.</para>
+<para>Select <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Filters...</guimenuitem></menuchoice>.</para>
 </step>
 <step>
-<para
->Press the <guibutton
->New</guibutton
-> button to create an empty filter. It will appear as <guilabel
->&lt;unknown&gt;</guilabel
->.</para>
+<para>Press the <guibutton>New</guibutton> button to create an empty filter. It will appear as <guilabel>&lt;unknown&gt;</guilabel>.</para>
 </step>
 <step>
-<para
->In the <guilabel
-> Filter Criteria</guilabel
-> area, select <guilabel
->&lt;recipients&gt;</guilabel
-> from the first drop-down box, <guilabel
->contains</guilabel
-> from the second drop-down box, and type <userinput
->kde@mail.kde.org</userinput
-> in the text field.</para>
+<para>In the <guilabel> Filter Criteria</guilabel> area, select <guilabel>&lt;recipients&gt;</guilabel> from the first drop-down box, <guilabel>contains</guilabel> from the second drop-down box, and type <userinput>kde@mail.kde.org</userinput> in the text field.</para>
 </step>
 <step>
-<para
->Skip down to the <guilabel
->Filter Actions</guilabel
-> section. Select <guilabel
->file into folder</guilabel
-> from the first drop-down box. A new drop-down box containing a list of folders will appear. Select the folder that you want the filtered messages to be transferred to. For this example, you would select <guilabel
->KDE-General</guilabel
-> from the drop-down box.</para>
+<para>Skip down to the <guilabel>Filter Actions</guilabel> section. Select <guilabel>file into folder</guilabel> from the first drop-down box. A new drop-down box containing a list of folders will appear. Select the folder that you want the filtered messages to be transferred to. For this example, you would select <guilabel>KDE-General</guilabel> from the drop-down box.</para>
 </step>
 </procedure>
 
-<para
->You may find that you need to use more powerful criteria to properly filter your messages; for example, you may only want to filter the &kde; List messages that are written by your friend <replaceable
->Fred Johnson &lt;fj@anywhere.com&gt;</replaceable
->. This is where the rest of the matching criteria section comes into play:</para>
+<para>You may find that you need to use more powerful criteria to properly filter your messages; for example, you may only want to filter the &kde; List messages that are written by your friend <replaceable>Fred Johnson &lt;fj@anywhere.com&gt;</replaceable>. This is where the rest of the matching criteria section comes into play:</para>
 
 <procedure>
-<title
->Extending the filter</title>
+<title>Extending the filter</title>
 <step>
-<para
->Open up the <guilabel
->Configure Filters...</guilabel
-> window and select the filter you just created.</para>
+<para>Open up the <guilabel>Configure Filters...</guilabel> window and select the filter you just created.</para>
 </step>
 <step>
-<para
->Since you want to filter all messages that have <replaceable
->kde@mail.kde.org</replaceable
-> in the <guilabel
->To:</guilabel
-> or <guilabel
->CC:</guilabel
-> field <emphasis
->and</emphasis
-> that are from Fred, check the <guibutton
->Match all of the following</guibutton
-> radio button.</para>
+<para>Since you want to filter all messages that have <replaceable>kde@mail.kde.org</replaceable> in the <guilabel>To:</guilabel> or <guilabel>CC:</guilabel> field <emphasis>and</emphasis> that are from Fred, check the <guibutton>Match all of the following</guibutton> radio button.</para>
 </step>
 <step>
-<para
->Now, go to the second search rule and select the following from the pull-down menus: <guilabel
->From</guilabel
->, <guilabel
->contains</guilabel
->. Now, type <userinput
->fj@anywhere.com</userinput
-> in the text field.</para>
+<para>Now, go to the second search rule and select the following from the pull-down menus: <guilabel>From</guilabel>, <guilabel>contains</guilabel>. Now, type <userinput>fj@anywhere.com</userinput> in the text field.</para>
 </step>
 </procedure>
 
-<para
->You now have a filter that transfers all &kde; List messages that are from <userinput
->fj@anywhere.com</userinput
->.</para>
+<para>You now have a filter that transfers all &kde; List messages that are from <userinput>fj@anywhere.com</userinput>.</para>
 <!-- fixme: trigger with ctrl-j or whenever new mail arrives (unless
-<guilabel
->Advanced Options</guilabel
-> are changed. -->
+<guilabel>Advanced Options</guilabel> are changed. -->
 </sect2>
 
 <sect2 id="filter-optimization">
-<title
->Filter Optimisation</title>
+<title>Filter Optimisation</title>
 
-<para
->It is important to know that, for example, the order of the filters has an impact on the speed of the filter process. Here are some ideas which can help you to improve the filtering: </para>
+<para>It is important to know that, for example, the order of the filters has an impact on the speed of the filter process. Here are some ideas which can help you to improve the filtering: </para>
 
 <variablelist>
 <varlistentry>
-<term
->Stop filter processing as early as possible:</term>
+<term>Stop filter processing as early as possible:</term>
 <listitem>
-<para
->If you know that a filter finally processes a certain class of messages, please make sure to check the option <guilabel
->If this filter matches, stop processing here</guilabel
-> for the filter. This will avoid the evaluation of the filter rules of all subsequent filters. (See the advanced options in the <link linkend="filter-dialog-id"
-> Filter Dialogue</link
->).</para>
-<para
->An example is filtering messages from mailing lists via List-Id header into separate folders. Having found out that a message came from list A means that you can avoid checking the next filter for messages from list B. </para>
+<para>If you know that a filter finally processes a certain class of messages, please make sure to check the option <guilabel>If this filter matches, stop processing here</guilabel> for the filter. This will avoid the evaluation of the filter rules of all subsequent filters. (See the advanced options in the <link linkend="filter-dialog-id"> Filter Dialogue</link>).</para>
+<para>An example is filtering messages from mailing lists via List-Id header into separate folders. Having found out that a message came from list A means that you can avoid checking the next filter for messages from list B. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Consider the costs of the evaluation of filter rules:</term>
+<term>Consider the costs of the evaluation of filter rules:</term>
 <listitem>
-<para
->The time required to evaluate a filter rule depends on the way the rule is constructed. In particular, scanning for a substring using the <guilabel
->contains</guilabel
-> operation is faster than a pattern matching using the <guilabel
->matches regular expr.</guilabel
-> operation. </para>
-<para
->Another dependency is on the amount of data which is used for the evaluation of a filter rule. If the rule is based on a message header, its evaluation should normally be much faster than the evaluation of a rule based on the complete message. </para>
-<para
->You should try to keep the filter rules as simple as possible. </para>
+<para>The time required to evaluate a filter rule depends on the way the rule is constructed. In particular, scanning for a substring using the <guilabel>contains</guilabel> operation is faster than a pattern matching using the <guilabel>matches regular expr.</guilabel> operation. </para>
+<para>Another dependency is on the amount of data which is used for the evaluation of a filter rule. If the rule is based on a message header, its evaluation should normally be much faster than the evaluation of a rule based on the complete message. </para>
+<para>You should try to keep the filter rules as simple as possible. </para>
 </listitem>
 </varlistentry>
 
 
 <varlistentry>
-<term
->Check the order of your filters:</term>
+<term>Check the order of your filters:</term>
 <listitem>
-<para
->All the different filter actions have a different complexity. The most expensive filter actions are <guilabel
->pipe through</guilabel
-> and <guilabel
->execute command</guilabel
->, because both need external programs to be run. Placing filters containing these filter actions behind other filters that can reduce the number of times these complex actions are required is useful, if the filter logic does allow this.</para
-> 
-<para
->An example is filtering messages from a mailing list and detecting spam messages. For the spam detection you will usually use an external tool via a <guilabel
->pipe through</guilabel
-> action. Filtering the messages for the mailing list is done via the List-Id header. If you do not want to check the messages from the mailing list for spam too, it is better to use the filter for the mailing list messages before the filter for the spam detection. This way you avoid the expensive and slow spam check for all messages which were identified as mailing list messages. </para>
+<para>All the different filter actions have a different complexity. The most expensive filter actions are <guilabel>pipe through</guilabel> and <guilabel>execute command</guilabel>, because both need external programs to be run. Placing filters containing these filter actions behind other filters that can reduce the number of times these complex actions are required is useful, if the filter logic does allow this.</para> 
+<para>An example is filtering messages from a mailing list and detecting spam messages. For the spam detection you will usually use an external tool via a <guilabel>pipe through</guilabel> action. Filtering the messages for the mailing list is done via the List-Id header. If you do not want to check the messages from the mailing list for spam too, it is better to use the filter for the mailing list messages before the filter for the spam detection. This way you avoid the expensive and slow spam check for all messages which were identified as mailing list messages. </para>
 </listitem>
 </varlistentry>
 </variablelist>
 </sect2>
 
 <sect2 id="filter-logging">
-<title
->Filter Log</title>
-<para
->If you want to verify that your filters work as intended, you can open a viewer for the filter log via <menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Filter Log Viewer...</guimenuitem
-></menuchoice
->. </para>
-<para
->In the viewer, there you can configure the logging of the filter processing. You can control the detail level of the log, clear the log or save the log into a file. The log can provide valuable information if you need to debug your filtering process. </para>
+<title>Filter Log</title>
+<para>If you want to verify that your filters work as intended, you can open a viewer for the filter log via <menuchoice><guimenu>Tools</guimenu> <guimenuitem>Filter Log Viewer...</guimenuitem></menuchoice>. </para>
+<para>In the viewer, there you can configure the logging of the filter processing. You can control the detail level of the log, clear the log or save the log into a file. The log can provide valuable information if you need to debug your filtering process. </para>
 </sect2>
 </sect1>
 
 <!-- dnaber update 2004-02-22 -->
 <sect1 id="popfilters">
-<title
->Download Filters</title>
-
-<para
->Download Filters can be used to filter mail from a POP server, <emphasis
->before</emphasis
-> they are completely downloaded; you can use them to prevent &kmail; from downloading huge messages and save time this way.</para>
-
-<para
->In the configuration dialogue of the POP account you can enable download filtering by checking the <guilabel
->Filter messages if they are greater than</guilabel
-> box; once you have done that, you can specify a size which is used as a threshold: messages exceeding this size will be checked against the filter rules you defined -- if no filter rule matches, they will be shown in a confirmation dialogue and you can decide what to do with them. The default size for filtering is 50,000 Bytes; this is a good value as the overhead is kept to a minimum -- every message that is looked at by the filter causes additional traffic because the header of the message is downloaded twice. The default action is <guilabel
->Download mail</guilabel
-> to prevent the loss of messages.</para>
-
-<warning
-><para
->Be careful with the <guilabel
->Delete mail from server</guilabel
-> option since once a mail is deleted on the server there is no way to get it back.</para
-></warning>
-
-<para
->With a really good set of filter rules, it is possible that all messages that exceed the threshold size are automatically tagged (&ie; downloaded, kept on the server or deleted) and you would never be bugged by the confirmation dialogue. Be careful though, since once a message is matched by a filter rule, you have no guarantee that you can change the action before it is executed: the confirmation dialogue will be displayed <emphasis
->only</emphasis
-> if there is a message left that was not matched by a filter rule.</para>
+<title>Download Filters</title>
+
+<para>Download Filters can be used to filter mail from a POP server, <emphasis>before</emphasis> they are completely downloaded; you can use them to prevent &kmail; from downloading huge messages and save time this way.</para>
+
+<para>In the configuration dialogue of the POP account you can enable download filtering by checking the <guilabel>Filter messages if they are greater than</guilabel> box; once you have done that, you can specify a size which is used as a threshold: messages exceeding this size will be checked against the filter rules you defined -- if no filter rule matches, they will be shown in a confirmation dialogue and you can decide what to do with them. The default size for filtering is 50,000 Bytes; this is a good value as the overhead is kept to a minimum -- every message that is looked at by the filter causes additional traffic because the header of the message is downloaded twice. The default action is <guilabel>Download mail</guilabel> to prevent the loss of messages.</para>
+
+<warning><para>Be careful with the <guilabel>Delete mail from server</guilabel> option since once a mail is deleted on the server there is no way to get it back.</para></warning>
+
+<para>With a really good set of filter rules, it is possible that all messages that exceed the threshold size are automatically tagged (&ie; downloaded, kept on the server or deleted) and you would never be bugged by the confirmation dialogue. Be careful though, since once a message is matched by a filter rule, you have no guarantee that you can change the action before it is executed: the confirmation dialogue will be displayed <emphasis>only</emphasis> if there is a message left that was not matched by a filter rule.</para>
 
 <sect2 id="popfilters-dialog">
-<title
->The <guilabel
->Configure Pop Filter</guilabel
-> Dialogue</title>
-
-<para
->Adding filter rules works similar as for <link linkend="filters"
->message filters</link
->. On the left hand side you can manage the existing filters. Use the <guiicon
->New</guiicon
-> button to add a filter. On the right hand side you can configure under which conditions the current filter should match. Using <guilabel
->Filter Action</guilabel
-> you specify what will happen to a message that is matched by this rule. The available options are:</para>
+<title>The <guilabel>Configure Pop Filter</guilabel> Dialogue</title>
+
+<para>Adding filter rules works similar as for <link linkend="filters">message filters</link>. On the left hand side you can manage the existing filters. Use the <guiicon>New</guiicon> button to add a filter. On the right hand side you can configure under which conditions the current filter should match. Using <guilabel>Filter Action</guilabel> you specify what will happen to a message that is matched by this rule. The available options are:</para>
 
 <variablelist>
 
 <varlistentry>
-<term
-><guilabel
->Download mail</guilabel
-></term>
+<term><guilabel>Download mail</guilabel></term>
 <listitem>
-<para
->Will download the messages matched by the filter, just as any other message that does not exceed the threshold size.</para>
+<para>Will download the messages matched by the filter, just as any other message that does not exceed the threshold size.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Download mail later</guilabel
-></term>
+<term><guilabel>Download mail later</guilabel></term>
 <listitem>
-<para
->Will tag the messages for later download. This means the messages matched will stay on the POP server until you choose to download them by changing the action manually.</para
-></listitem>
+<para>Will tag the messages for later download. This means the messages matched will stay on the POP server until you choose to download them by changing the action manually.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Delete mail from server</guilabel
-></term>
+<term><guilabel>Delete mail from server</guilabel></term>
 <listitem>
-<para
->Will delete the message from the server and does not download it. Once you deleted a message from the server, there is <emphasis
->no</emphasis
-> way you can undo this. Be careful, as rules could match messages you actually want, too.</para
-></listitem>
+<para>Will delete the message from the server and does not download it. Once you deleted a message from the server, there is <emphasis>no</emphasis> way you can undo this. Be careful, as rules could match messages you actually want, too.</para></listitem>
 </varlistentry>
 
 </variablelist>
 
-<para
->The option <guilabel
->Always show matched 'Download Later' messages in confirmation dialogue</guilabel
-> will cause the confirmation dialogue to show up during mailbox check if at least one message was tagged for <guilabel
->Download Later</guilabel
-> - even if all messages exceeding the threshold size were matched by a rule. This option is useful in the case you have messages matched by a rule and tagged for <guilabel
->Download Later</guilabel
->, but you do not get any message exceeding the size limit for a very long time. Without this option, the confirmation dialogue would never show up and you would never have a chance to get the queued message by changing the action manually.</para>
+<para>The option <guilabel>Always show matched 'Download Later' messages in confirmation dialogue</guilabel> will cause the confirmation dialogue to show up during mailbox check if at least one message was tagged for <guilabel>Download Later</guilabel> - even if all messages exceeding the threshold size were matched by a rule. This option is useful in the case you have messages matched by a rule and tagged for <guilabel>Download Later</guilabel>, but you do not get any message exceeding the size limit for a very long time. Without this option, the confirmation dialogue would never show up and you would never have a chance to get the queued message by changing the action manually.</para>
 
 </sect2>
 
 <sect2 id="popfilters-confirmation">
-<title
->The Confirmation Dialogue</title>
-
-<para
->This dialogue shows up whenever you have POP filtering switched on and messages were found on the server that exceed the threshold size you defined for the POP account. Now you have the chance to decide what you want to do with that message. The options are <guilabel
->Download</guilabel
-> (green), <guilabel
->Download later</guilabel
-> (yellow with egg watch) and <guilabel
->Delete from server</guilabel
-> (red <quote
->X</quote
->). Be cautious with the delete option, since once you deleted a mail from the server, there is no way to undelete it again.</para>
-
-<para
->In the <guilabel
->Filtered Messages</guilabel
-> section you can check the box if you receive messages that were automatically tagged for a certain action (download, download later, delete) by a filter rule. The checkbox is only enabled if you receive some messages that were matched by a filter rule; once you check it, a list similar to the one for the not-automatically-tagged messages will be displayed and you can change the action for every single message.</para>
-
-<para
->Please note that if there is a message exceeding the size limit, but all messages are matched by a filter rule the dialogue will not be displayed. One exception occurs if you have checked <guilabel
->Always show matched 'Download Later' messages</guilabel
-> in the <guilabel
->Global Options</guilabel
-> section of the POP filter configuration dialogue; then, the dialogue will also be displayed if you only have matched messages, but at least one message was tagged for <guilabel
->Download later</guilabel
->.</para>
+<title>The Confirmation Dialogue</title>
+
+<para>This dialogue shows up whenever you have POP filtering switched on and messages were found on the server that exceed the threshold size you defined for the POP account. Now you have the chance to decide what you want to do with that message. The options are <guilabel>Download</guilabel> (green), <guilabel>Download later</guilabel> (yellow with egg watch) and <guilabel>Delete from server</guilabel> (red <quote>X</quote>). Be cautious with the delete option, since once you deleted a mail from the server, there is no way to undelete it again.</para>
+
+<para>In the <guilabel>Filtered Messages</guilabel> section you can check the box if you receive messages that were automatically tagged for a certain action (download, download later, delete) by a filter rule. The checkbox is only enabled if you receive some messages that were matched by a filter rule; once you check it, a list similar to the one for the not-automatically-tagged messages will be displayed and you can change the action for every single message.</para>
+
+<para>Please note that if there is a message exceeding the size limit, but all messages are matched by a filter rule the dialogue will not be displayed. One exception occurs if you have checked <guilabel>Always show matched 'Download Later' messages</guilabel> in the <guilabel>Global Options</guilabel> section of the POP filter configuration dialogue; then, the dialogue will also be displayed if you only have matched messages, but at least one message was tagged for <guilabel>Download later</guilabel>.</para>
 
 </sect2>
 
 </sect1>
 
 <sect1 id="multiple-accounts">
-<title
->Using Multiple Accounts</title>
-
-<para
->Multiple accounts are used to check for messages from more than one email address and/or mail server. Select <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure &kmail;...</guimenuitem
-></menuchoice
-> and click on the <guilabel
->Network</guilabel
-> page to add or change your account settings. See the <link linkend="getting-started"
->Getting started</link
-> section for more information on the settings in the <guilabel
->Network</guilabel
-> page.</para>
-
-<para
->To check for messages from a particular account, use the <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Check Mail In</guimenuitem
-></menuchoice
-> submenu to select the account to check for mail. You can also press the mouse button on the <guiicon
->Check Mail</guiicon
-> icon for some time to get a list of accounts.</para>
+<title>Using Multiple Accounts</title>
+
+<para>Multiple accounts are used to check for messages from more than one email address and/or mail server. Select <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure &kmail;...</guimenuitem></menuchoice> and click on the <guilabel>Network</guilabel> page to add or change your account settings. See the <link linkend="getting-started">Getting started</link> section for more information on the settings in the <guilabel>Network</guilabel> page.</para>
+
+<para>To check for messages from a particular account, use the <menuchoice><guimenu>File</guimenu><guimenuitem>Check Mail In</guimenuitem></menuchoice> submenu to select the account to check for mail. You can also press the mouse button on the <guiicon>Check Mail</guiicon> icon for some time to get a list of accounts.</para>
 
 </sect1>
 
 <sect1 id="pgp">
 <!-- This section is from Andreas Gungl, 2000-05-21, updated 2002-10-06 by Ingo Kloecker -->
-<title
->Signing and Encrypting Messages with <application
->PGP</application
-> or <application
->GnuPG</application
-></title>
-
-<note
-><para
->There have been major changes in the way &kmail; handles signing/encryption. The following introduction applies to the previous version of &kmail;. You can still read the introduction to get an overview about how to sign/encrypt messages, but the details, especially those of the configuration, will differ.</para
-></note>
-
-<para
->This is a short introduction on how to setup &kmail;'s <application
->PGP</application
-> (<application
->Pretty Good Privacy</application
->) support; it gives some hints on the use of <application
->PGP</application
-> too. It is written for people who are beginners in this area; if you are familiar with the use of <application
->PGP</application
->, you can skip most of the steps. This documentation, and the &kmail; user interface, generally talk only about <quote
->PGP</quote
->, but it applies to both <application
->PGP</application
-> and <application
->GnuPG</application
-> (<application
->GNU Privacy Guard</application
->), (although some <application
->GnuPG</application
-> command-line parameters may be different.)</para>
-
-<para
->Please also check out the <link linkend="pgp-faq"
->&FAQ; item about <application
->PGP</application
-></link
->.</para>
-
-<warning
-><para
->Attachments will not be signed/encrypted if you are using inline OpenPGP: to sign/encrypt attachments, you have to install GnuPG and some necessary libraries; then, you can decide for each attachment whether it should be signed/encrypted or not. </para
-></warning>
-
-<warning
-><para
->&kmail; has to rely on <application
->PGP</application
->'s output; this output is often different between different versions of <application
->PGP</application
->, so it is important that you test if encryption really works with your setup before you start using it seriously. &kmail; might <emphasis
->not</emphasis
-> warn you if something fails -- enable <guilabel
->Show signed/encrypted text after composing</guilabel
->. </para
-></warning>
-
-<para
->To setup and use <application
->PGP</application
-> support in &kmail; it is necessary to have <application
->PGP</application
-> installed and set up properly; of course, we cannot give you a full introduction of <application
->PGP</application
-> here. We will only mention the steps you have to do to get <application
->PGP</application
-> going. For details you should have a look at the excellent <application
->PGP</application
-> documentation or <ulink url="http://www.gnupg.org/docs.html#guides"
->The GNU Privacy Handbook</ulink
->.</para
-> 
-
-<para
->It is certainly a good idea to study this documentation as well as an introduction into public key cryptography (&eg; out of the <application
->PGP</application
-> 6.5.x package): there you can learn a lot about the basic concepts, which will help you to understand what is going on; also, many security related issues you should know about are discussed there.</para>
-
-<para
->Now, let us start.</para>
+<title>Signing and Encrypting Messages with <application>PGP</application> or <application>GnuPG</application></title>
+
+<note><para>There have been major changes in the way &kmail; handles signing/encryption. The following introduction applies to the previous version of &kmail;. You can still read the introduction to get an overview about how to sign/encrypt messages, but the details, especially those of the configuration, will differ.</para></note>
+
+<para>This is a short introduction on how to setup &kmail;'s <application>PGP</application> (<application>Pretty Good Privacy</application>) support; it gives some hints on the use of <application>PGP</application> too. It is written for people who are beginners in this area; if you are familiar with the use of <application>PGP</application>, you can skip most of the steps. This documentation, and the &kmail; user interface, generally talk only about <quote>PGP</quote>, but it applies to both <application>PGP</application> and <application>GnuPG</application> (<application>GNU Privacy Guard</application>), (although some <application>GnuPG</application> command-line parameters may be different.)</para>
+
+<para>Please also check out the <link linkend="pgp-faq">&FAQ; item about <application>PGP</application></link>.</para>
+
+<warning><para>Attachments will not be signed/encrypted if you are using inline OpenPGP: to sign/encrypt attachments, you have to install GnuPG and some necessary libraries; then, you can decide for each attachment whether it should be signed/encrypted or not. </para></warning>
+
+<warning><para>&kmail; has to rely on <application>PGP</application>'s output; this output is often different between different versions of <application>PGP</application>, so it is important that you test if encryption really works with your setup before you start using it seriously. &kmail; might <emphasis>not</emphasis> warn you if something fails -- enable <guilabel>Show signed/encrypted text after composing</guilabel>. </para></warning>
+
+<para>To setup and use <application>PGP</application> support in &kmail; it is necessary to have <application>PGP</application> installed and set up properly; of course, we cannot give you a full introduction of <application>PGP</application> here. We will only mention the steps you have to do to get <application>PGP</application> going. For details you should have a look at the excellent <application>PGP</application> documentation or <ulink url="http://www.gnupg.org/docs.html#guides">The GNU Privacy Handbook</ulink>.</para> 
+
+<para>It is certainly a good idea to study this documentation as well as an introduction into public key cryptography (&eg; out of the <application>PGP</application> 6.5.x package): there you can learn a lot about the basic concepts, which will help you to understand what is going on; also, many security related issues you should know about are discussed there.</para>
+
+<para>Now, let us start.</para>
 
 <sect2 id="pgp-preconditions">
-<title
->Preconditions</title>
-
-<para
->&kmail; expects that your <application
->PGP</application
-> binary is called <command
->pgp</command
->; in the case of <application
->GnuPG</application
->, it expects the binary to be called <command
->gpg</command
->. If this is not the case for you, just make a symlink.</para>
-
-<para
->If you have not done so, you have to generate a key pair (secret and public key) for your identity. You must do this at the command line: use <userinput
-><command
->pgp</command
-> <option
->-kg</option
-></userinput
-> or <userinput
-><command
->gpg</command
-> <option
->--gen-key</option
-></userinput
->: &kmail; has no internal support for <application
->pgp</application
->'s key generation at this time. The identity (normally your name followed by your email address within brackets, such as <userinput
->John Smith &lt;john@example.com&gt;</userinput
->) and your passphrase are important for the co-operation between &kmail; and <application
->PGP</application
->.</para>
+<title>Preconditions</title>
+
+<para>&kmail; expects that your <application>PGP</application> binary is called <command>pgp</command>; in the case of <application>GnuPG</application>, it expects the binary to be called <command>gpg</command>. If this is not the case for you, just make a symlink.</para>
+
+<para>If you have not done so, you have to generate a key pair (secret and public key) for your identity. You must do this at the command line: use <userinput><command>pgp</command> <option>-kg</option></userinput> or <userinput><command>gpg</command> <option>--gen-key</option></userinput>: &kmail; has no internal support for <application>pgp</application>'s key generation at this time. The identity (normally your name followed by your email address within brackets, such as <userinput>John Smith &lt;john@example.com&gt;</userinput>) and your passphrase are important for the co-operation between &kmail; and <application>PGP</application>.</para>
 
 </sect2>
 
 <sect2 id="pgp-settings">
-<title
-><application
->PGP</application
->-Related Settings in &kmail;</title>
-
-<para
->Select the <guilabel
->OpenPGP</guilabel
-> tab on the <guilabel
->Security</guilabel
-> settings page; there you will find the following options:</para>
+<title><application>PGP</application>-Related Settings in &kmail;</title>
+
+<para>Select the <guilabel>OpenPGP</guilabel> tab on the <guilabel>Security</guilabel> settings page; there you will find the following options:</para>
 
 <variablelist>
 
 <varlistentry>
-<term
-><guilabel
->Encryption tool</guilabel
-></term>
+<term><guilabel>Encryption tool</guilabel></term>
 <listitem>
-<para
->Here you can choose if you want to use <application
->PGP</application
->, <application
->GnuPG</application
-> or no encryption software at all; of course, the program you select has to be installed on your system (it is also important to select the correct version).</para>
+<para>Here you can choose if you want to use <application>PGP</application>, <application>GnuPG</application> or no encryption software at all; of course, the program you select has to be installed on your system (it is also important to select the correct version).</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Keep passphrase in memory</guilabel
-></term>
+<term><guilabel>Keep passphrase in memory</guilabel></term>
 <listitem>
-<para
->When this option is off, &kmail; will ask for your passphrase each time you sign a message (before sending) or select an encrypted message; if you turn this option on, &kmail; will remember your passphrase from after your first successful input until you finish your &kmail; session. The passphrase is stored in memory and not written to the hard disk. If you use one of the Crypto-Plugins or if you use <application
->GnuPG</application
-> with the gpg-agent then an external program will ask for your passphrase and optionally remember it for some time.</para>
+<para>When this option is off, &kmail; will ask for your passphrase each time you sign a message (before sending) or select an encrypted message; if you turn this option on, &kmail; will remember your passphrase from after your first successful input until you finish your &kmail; session. The passphrase is stored in memory and not written to the hard disk. If you use one of the Crypto-Plugins or if you use <application>GnuPG</application> with the gpg-agent then an external program will ask for your passphrase and optionally remember it for some time.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Always encrypt to self</guilabel
-></term>
+<term><guilabel>Always encrypt to self</guilabel></term>
 <listitem>
-<para
->If this option is off and you want to send an encrypted message to somebody, then you cannot read this message any longer after you have composed and encrypted it. Turn this option on to keep sent encrypted messages readable for you too.</para>
+<para>If this option is off and you want to send an encrypted message to somebody, then you cannot read this message any longer after you have composed and encrypted it. Turn this option on to keep sent encrypted messages readable for you too.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Show signed/encrypted text after composing</guilabel
-></term>
+<term><guilabel>Show signed/encrypted text after composing</guilabel></term>
 <listitem>
-<para
->This will show you the result of encrypting and signing before the message gets sent; this way, you can still cancel sending if encrypting failed. It is strongly recommended to use this option.</para
-> 
+<para>This will show you the result of encrypting and signing before the message gets sent; this way, you can still cancel sending if encrypting failed. It is strongly recommended to use this option.</para> 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Always show the encryption keys for approval</guilabel
-></term>
+<term><guilabel>Always show the encryption keys for approval</guilabel></term>
 <listitem>
-<para
->This will always open a dialogue that lets you choose the keys used for each recipient when you are sending an encrypted message; if this option is off, &kmail; will show this dialogue only when it cannot find a key for a recipient or when there are conflicting or unset encryption preferences.</para
-> 
+<para>This will always open a dialogue that lets you choose the keys used for each recipient when you are sending an encrypted message; if this option is off, &kmail; will show this dialogue only when it cannot find a key for a recipient or when there are conflicting or unset encryption preferences.</para> 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Automatically sign messages using OpenPGP</guilabel
-></term>
-<listitem
-><para
->This lets you toggle whether to automatically sign your messages by default; of course, it is still possible to send unsigned messages by deselecting the icon in the composer window.</para
-> 
+<term><guilabel>Automatically sign messages using OpenPGP</guilabel></term>
+<listitem><para>This lets you toggle whether to automatically sign your messages by default; of course, it is still possible to send unsigned messages by deselecting the icon in the composer window.</para> 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Automatically encrypt messages whenever possible</guilabel
-></term>
-<listitem
-><para
->If this option is on, &kmail; will automatically encrypt messages with the built-in OpenPGP support or the PGP/MIME-Plugin provided that, for every recipient, a trusted PGP key is found in your keyring and you did not tell &kmail; not to encrypt messages sent to certain recipients. If in doubt, &kmail; will ask whether the message should be encrypted or not.</para
-></listitem>
+<term><guilabel>Automatically encrypt messages whenever possible</guilabel></term>
+<listitem><para>If this option is on, &kmail; will automatically encrypt messages with the built-in OpenPGP support or the PGP/MIME-Plugin provided that, for every recipient, a trusted PGP key is found in your keyring and you did not tell &kmail; not to encrypt messages sent to certain recipients. If in doubt, &kmail; will ask whether the message should be encrypted or not.</para></listitem>
 </varlistentry>
 
 </variablelist>
 
-<para
->Now that you have setup the encryption tool you have tell &kmail; which OpenPGP key you want to use for signing and for encrypting messages; to do this go to the <link linkend="configure-identity"
->Identities configuration</link
-> and set the key that should be used on the <guilabel
->Advanced</guilabel
-> tab of the identity configuration.</para>
-
-<para
->Now you are able to sign outgoing messages; to let people send you encrypted messages and to let them verify your signature you must send them your public key or upload your public key to a public <application
->PGP</application
-> key server so that they can fetch your key from there. To send encrypted messages to other people or to verify their signed messages you will need their public keys; you can store your public key(s) on a public <application
->PGP</application
-> key server such as <ulink url="http://www.cam.ac.uk.pgp.net/pgpnet/"
->http://www.cam.ac.uk.pgp.net/pgpnet/</ulink
->.</para>
+<para>Now that you have setup the encryption tool you have tell &kmail; which OpenPGP key you want to use for signing and for encrypting messages; to do this go to the <link linkend="configure-identity">Identities configuration</link> and set the key that should be used on the <guilabel>Advanced</guilabel> tab of the identity configuration.</para>
+
+<para>Now you are able to sign outgoing messages; to let people send you encrypted messages and to let them verify your signature you must send them your public key or upload your public key to a public <application>PGP</application> key server so that they can fetch your key from there. To send encrypted messages to other people or to verify their signed messages you will need their public keys; you can store your public key(s) on a public <application>PGP</application> key server such as <ulink url="http://www.cam.ac.uk.pgp.net/pgpnet/">http://www.cam.ac.uk.pgp.net/pgpnet/</ulink>.</para>
 
 </sect2>
 
 <sect2 id="pgp-sign-your-messages">
-<title
->Sign your Messages</title>
-
-<para
->You can compose your message as usual in the composer window of &kmail;. Before you send the message, check the <guiicon
->Sign Message</guiicon
-> icon on the toolbar of the composer window; then, you can send the message. The identity you are using to write the current message needs to be connected to an <guilabel
->OpenPGP Key</guilabel
-> in the <guilabel
->Identity</guilabel
-> section of the <guilabel
->Configure</guilabel
-> dialogue. To sign the message, &kmail; needs to know your <application
->PGP</application
-> passphrase: if you did not select <guilabel
->Keep passphrase in memory</guilabel
-> in the <guilabel
->Security</guilabel
-> section, &kmail; will ask you for it; otherwise, if you have already given the phrase to &kmail;, it will sign the message without any further prompt.</para>
+<title>Sign your Messages</title>
+
+<para>You can compose your message as usual in the composer window of &kmail;. Before you send the message, check the <guiicon>Sign Message</guiicon> icon on the toolbar of the composer window; then, you can send the message. The identity you are using to write the current message needs to be connected to an <guilabel>OpenPGP Key</guilabel> in the <guilabel>Identity</guilabel> section of the <guilabel>Configure</guilabel> dialogue. To sign the message, &kmail; needs to know your <application>PGP</application> passphrase: if you did not select <guilabel>Keep passphrase in memory</guilabel> in the <guilabel>Security</guilabel> section, &kmail; will ask you for it; otherwise, if you have already given the phrase to &kmail;, it will sign the message without any further prompt.</para>
 
 </sect2>
 
 <sect2 id="pgp-encrypt-your-messages">
-<title
->Encrypt your Messages</title>
-
-<para
->To send an encrypted message to somebody of whom you have a public key, you simply create the message in the composer window. Before you send the message, check the <guibutton
->Encrypt Message</guibutton
-> button in the toolbar of the composer window; note that you might not have to check the button if <guilabel
->Automatically encrypt messages whenever possible</guilabel
-> is selected in &kmail;'s configuration (see <link linkend="pgp-sign-your-messages"
->above</link
->). Then send the message.</para>
-
-<para
->If you checked the <guilabel
->Encrypt Message</guilabel
-> button and &kmail; cannot find a matching key for a recipient, it will display a list containing all available keys in the <guilabel
->Encryption Key Selection</guilabel
-> dialogue; if &kmail; finds more than one trusted key for a recipient, it will display a list containing all matching keys for this recipient. In both cases you can select the key(s) which should be used for encrypting this message for the recipient in question. Using the <guilabel
->Remember choice</guilabel
-> checkbox you can save your selection for future messages.</para>
-
-<para
->If you are using a key for the first time, there are conflicting Encryption Preferences, or if <guilabel
->Always show the encryption keys for approval</guilabel
-> is selected in the <guilabel
->Security</guilabel
-> section of &kmail;'s configuration dialogue the <guilabel
->Encryption Key Approval</guilabel
-> dialogue will appear; here, you can select different keys for the recipients and can set the <guilabel
->Encryption Preference</guilabel
-> for each recipient. The default option, <guilabel
->Encrypt whenever encryption is possible</guilabel
->, will automatically encrypt your message if there is a trusted key for each recipient.</para>
-
-<para
->As mentioned above, you will not be able to read your own encrypted sent messages if you do not check <guilabel
->Always encrypt to self</guilabel
-> in the settings' <guilabel
->Security</guilabel
-> page.</para>
+<title>Encrypt your Messages</title>
+
+<para>To send an encrypted message to somebody of whom you have a public key, you simply create the message in the composer window. Before you send the message, check the <guibutton>Encrypt Message</guibutton> button in the toolbar of the composer window; note that you might not have to check the button if <guilabel>Automatically encrypt messages whenever possible</guilabel> is selected in &kmail;'s configuration (see <link linkend="pgp-sign-your-messages">above</link>). Then send the message.</para>
+
+<para>If you checked the <guilabel>Encrypt Message</guilabel> button and &kmail; cannot find a matching key for a recipient, it will display a list containing all available keys in the <guilabel>Encryption Key Selection</guilabel> dialogue; if &kmail; finds more than one trusted key for a recipient, it will display a list containing all matching keys for this recipient. In both cases you can select the key(s) which should be used for encrypting this message for the recipient in question. Using the <guilabel>Remember choice</guilabel> checkbox you can save your selection for future messages.</para>
+
+<para>If you are using a key for the first time, there are conflicting Encryption Preferences, or if <guilabel>Always show the encryption keys for approval</guilabel> is selected in the <guilabel>Security</guilabel> section of &kmail;'s configuration dialogue the <guilabel>Encryption Key Approval</guilabel> dialogue will appear; here, you can select different keys for the recipients and can set the <guilabel>Encryption Preference</guilabel> for each recipient. The default option, <guilabel>Encrypt whenever encryption is possible</guilabel>, will automatically encrypt your message if there is a trusted key for each recipient.</para>
+
+<para>As mentioned above, you will not be able to read your own encrypted sent messages if you do not check <guilabel>Always encrypt to self</guilabel> in the settings' <guilabel>Security</guilabel> page.</para>
 
 </sect2>
 
 <sect2 id="pgp-send-your-public-key">
-<title
->Send your Public Key</title>
-
-<para
->Prepare a message to the person to whom you want to send your public key; then, choose, in the composer window's menu, <menuchoice
-><guimenu
->Attach</guimenu
-><guimenuitem
->Attach My Public Key</guimenuitem
-></menuchoice
->: this will attach the public key you defined for the current identity to the message. Now you can send the message.</para>
-
-<para
->Remember that it is not safe at all if you sign the message to make sure that the receiver will get the correct key: there can be a man-in-the-middle attack, as somebody can change the key and sign the message with that other key. That is why the recipient should verify the attached key by checking the key's fingerprint against the one he received in a secure way from you; have a look at the <application
->PGP</application
-> documentation for further details.</para>
+<title>Send your Public Key</title>
+
+<para>Prepare a message to the person to whom you want to send your public key; then, choose, in the composer window's menu, <menuchoice><guimenu>Attach</guimenu><guimenuitem>Attach My Public Key</guimenuitem></menuchoice>: this will attach the public key you defined for the current identity to the message. Now you can send the message.</para>
+
+<para>Remember that it is not safe at all if you sign the message to make sure that the receiver will get the correct key: there can be a man-in-the-middle attack, as somebody can change the key and sign the message with that other key. That is why the recipient should verify the attached key by checking the key's fingerprint against the one he received in a secure way from you; have a look at the <application>PGP</application> documentation for further details.</para>
 
 </sect2>
 
 <sect2 id="pgp-you-received-an-encrypted-message">
-<title
->You received an encrypted Message</title>
+<title>You received an encrypted Message</title>
 
-<para
->All you have to do is to select the message in &kmail;. You will be prompted for your passphrase; then, &kmail; will try to decrypt the message and show you the plain text if the message had been encrypted with your public key: if not, then you will not be able to read it. &kmail; stores the messages encrypted, so nobody can read these messages without knowing your passphrase.</para>
+<para>All you have to do is to select the message in &kmail;. You will be prompted for your passphrase; then, &kmail; will try to decrypt the message and show you the plain text if the message had been encrypted with your public key: if not, then you will not be able to read it. &kmail; stores the messages encrypted, so nobody can read these messages without knowing your passphrase.</para>
 
 </sect2>
 
 <sect2 id="pgp-receiving-a-public-key">
-<title
->Receiving a Public Key</title>
-
-<para
->You can receive a public key as an attachment or via http, ftp or a floppy. Before you can use this key to encrypt a message to the owner of the key, you should verify the key (check its fingerprint or look for trusted signatures); then, you can add this key to your public keyring by typing <userinput
-><command
->pgp</command
-> <option
->-ka</option
-> <replaceable
->filename</replaceable
-></userinput
-> at the command line (if you are using <application
->PGP</application
->) or by typing <userinput
-><command
->gpg</command
-> <option
->--import</option
-> <replaceable
->filename</replaceable
-></userinput
-> at the command line (if you are using <application
->GnuPG</application
->). If the key is not certified with a trusted signature you cannot use it to encrypt messages unless you have signed the key with your key. </para>
+<title>Receiving a Public Key</title>
+
+<para>You can receive a public key as an attachment or via http, ftp or a floppy. Before you can use this key to encrypt a message to the owner of the key, you should verify the key (check its fingerprint or look for trusted signatures); then, you can add this key to your public keyring by typing <userinput><command>pgp</command> <option>-ka</option> <replaceable>filename</replaceable></userinput> at the command line (if you are using <application>PGP</application>) or by typing <userinput><command>gpg</command> <option>--import</option> <replaceable>filename</replaceable></userinput> at the command line (if you are using <application>GnuPG</application>). If the key is not certified with a trusted signature you cannot use it to encrypt messages unless you have signed the key with your key. </para>
 
 </sect2>
 
 </sect1>
 
 <sect1 id="the-anti-spam-wizard">
-<title
->The Anti-Spam Wizard</title>
+<title>The Anti-Spam Wizard</title>
 
 <sect2 id="spam-wizard-basics">
-<title
->Basics</title>
+<title>Basics</title>
 
-<para
->&kmail; does not have a built-in spam detection solution: the developers believe using external, but specialised, tools is the better approach. &kmail; uses these tools through its flexible filter architecture. The Anti-Spam Wizard helps you with the initial filter setup. </para>
+<para>&kmail; does not have a built-in spam detection solution: the developers believe using external, but specialised, tools is the better approach. &kmail; uses these tools through its flexible filter architecture. The Anti-Spam Wizard helps you with the initial filter setup. </para>
 
 <variablelist>
 <varlistentry>
-<term
->What can the wizard do to help you?</term>
+<term>What can the wizard do to help you?</term>
 <listitem>
-<para
->It will give you some choices about how you want the spam filtering to be set up. Afterwards it will automatically create the appropriate filter rules. </para>
+<para>It will give you some choices about how you want the spam filtering to be set up. Afterwards it will automatically create the appropriate filter rules. </para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->What are the limitations of the wizard?</term>
+<term>What are the limitations of the wizard?</term>
 <listitem>
-<para
->It can only initially set up the filters for you; and it will provide a standard setup. Modifying existing filters is not yet possible. </para>
+<para>It can only initially set up the filters for you; and it will provide a standard setup. Modifying existing filters is not yet possible. </para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->You can activate the wizard via <menuchoice
-><guimenu
->Tools</guimenu
-> <guisubmenu
->Anti-Spam Wizard...</guisubmenu
-></menuchoice
->.</para>
+<para>You can activate the wizard via <menuchoice><guimenu>Tools</guimenu> <guisubmenu>Anti-Spam Wizard...</guisubmenu></menuchoice>.</para>
 
 </sect2>
 
 <sect2 id="spam-wizard-advanced">
-<title
->Advanced</title>
-
-<para
->Here are the details of how the wizard works: &kmail; can use several external tools to detect spam messages; it will try to automatically find out which of those tools are installed on your box and will show you the result of the search for each tool. You can mark the tools which you want to be used by &kmail; to detect spam; marking tools which were not found is not possible because the appropriate checkboxes are disabled. Of course, you can close the wizard, install a tool, and restart the wizard again. </para>
-
-<para
->If you have marked at least one tool you will be able to select some actions to be done in &kmail; with regard to spam messages: to let &kmail; detect spam messages you definitely should mark the <guilabel
->Classify messages using the anti-spam tools</guilabel
-> option; if you want messages detected as spam to be moved into a certain folder, please select the appropriate folder and mark the <guilabel
->Move detected spam messages to the selected folder</guilabel
-> option; if messages detected as spam should additionally be marked as read, then mark the <guilabel
->Additionally, mark detected spam messages as read</guilabel
-> option. </para>
-
-<para
->If you want to be able to manually mark messages as spam or non-spam (ham) you should check the <guilabel
->Classify messages manually as spam</guilabel
-> option: note that you can seemingly achieve the same result when you only change the status of the appropriate messages; but, if any of the tools you selected support Bayesian filtering (&ie; a method to detect spam based on statistical analysis of the messages) then these messages are not only marked but additionally transfered to the tools to let them learn so they can improve their detection rate. </para>
-
-<para
->Having checked at least one of these last options will allow you to let the wizard finish the filter setup. The wizard will not take any existing filter rules into consideration but will append new rules in any case; you may want to inspect the result of this process in the <link linkend="filter-dialog"
->Filter Dialogue</link
->. If you have checked the <guilabel
->Classify messages manually as spam / not spam</guilabel
-> option the wizard will create toolbar buttons for marking messages as spam or as ham; keep in mind that classifying messages as spam will also move those messages to the folder you had specified for spam messages. </para>
+<title>Advanced</title>
+
+<para>Here are the details of how the wizard works: &kmail; can use several external tools to detect spam messages; it will try to automatically find out which of those tools are installed on your box and will show you the result of the search for each tool. You can mark the tools which you want to be used by &kmail; to detect spam; marking tools which were not found is not possible because the appropriate checkboxes are disabled. Of course, you can close the wizard, install a tool, and restart the wizard again. </para>
+
+<para>If you have marked at least one tool you will be able to select some actions to be done in &kmail; with regard to spam messages: to let &kmail; detect spam messages you definitely should mark the <guilabel>Classify messages using the anti-spam tools</guilabel> option; if you want messages detected as spam to be moved into a certain folder, please select the appropriate folder and mark the <guilabel>Move detected spam messages to the selected folder</guilabel> option; if messages detected as spam should additionally be marked as read, then mark the <guilabel>Additionally, mark detected spam messages as read</guilabel> option. </para>
+
+<para>If you want to be able to manually mark messages as spam or non-spam (ham) you should check the <guilabel>Classify messages manually as spam</guilabel> option: note that you can seemingly achieve the same result when you only change the status of the appropriate messages; but, if any of the tools you selected support Bayesian filtering (&ie; a method to detect spam based on statistical analysis of the messages) then these messages are not only marked but additionally transfered to the tools to let them learn so they can improve their detection rate. </para>
+
+<para>Having checked at least one of these last options will allow you to let the wizard finish the filter setup. The wizard will not take any existing filter rules into consideration but will append new rules in any case; you may want to inspect the result of this process in the <link linkend="filter-dialog">Filter Dialogue</link>. If you have checked the <guilabel>Classify messages manually as spam / not spam</guilabel> option the wizard will create toolbar buttons for marking messages as spam or as ham; keep in mind that classifying messages as spam will also move those messages to the folder you had specified for spam messages. </para>
 
 </sect2>
 
 <sect2 id="spam-wizard-details">
-<title
->Details</title>
+<title>Details</title>
 
-<para
->The wizard uses information stored in a special configuration file named <filename
->kmail.antispamrc</filename
-> (stored in the global or local KDE config directory). It will first check the global config file and then the local config file: if the local config file contains entries with higher (newer) version numbers per-tool the configuration data from the local file for that tool is used; that way, both administrators and users can update the wizard configuration. </para>
+<para>The wizard uses information stored in a special configuration file named <filename>kmail.antispamrc</filename> (stored in the global or local KDE config directory). It will first check the global config file and then the local config file: if the local config file contains entries with higher (newer) version numbers per-tool the configuration data from the local file for that tool is used; that way, both administrators and users can update the wizard configuration. </para>
 
-<para
->The detection of spam messages is achieved by creating <guilabel
->pipe through</guilabel
-> actions per-tool within a special filter. Another filter contains rules to check for detected spam messages and actions to mark them and (optionally, depending on the choice in the wizard) to move them into a folder. Both filters are configured to be applied on incoming messages and on manual filtering. </para>
+<para>The detection of spam messages is achieved by creating <guilabel>pipe through</guilabel> actions per-tool within a special filter. Another filter contains rules to check for detected spam messages and actions to mark them and (optionally, depending on the choice in the wizard) to move them into a folder. Both filters are configured to be applied on incoming messages and on manual filtering. </para>
 
-<para
->Two filters are needed for the classification of ham and spam. They contain actions to mark the messages appropriately. As mentioned above, the filter for classification as spam has another action to move the message into a predefined folder. If the selected tools support Bayesian filtering, the wizard will create additional filter actions to pass the messages to the tools (<guilabel
->execute command</guilabel
-> actions) in the appropriate learn mode. </para>
+<para>Two filters are needed for the classification of ham and spam. They contain actions to mark the messages appropriately. As mentioned above, the filter for classification as spam has another action to move the message into a predefined folder. If the selected tools support Bayesian filtering, the wizard will create additional filter actions to pass the messages to the tools (<guilabel>execute command</guilabel> actions) in the appropriate learn mode. </para>
 
 </sect2>
 
 </sect1>
 
 <sect1 id="the-anti-virus-wizard">
-<title
->The Anti-Virus Wizard</title>
+<title>The Anti-Virus Wizard</title>
 
 <sect2 id="virus-wizard-basics">
-<title
->Basics</title>
+<title>Basics</title>
 
-<para
->&kmail; does not have a built-in virus detection solution: the developers believe using external, but specialised, tools is the better approach. &kmail; uses these tools through its flexible filter architecture. The Anti-Virus Wizard helps you with the initial filter setup. </para>
+<para>&kmail; does not have a built-in virus detection solution: the developers believe using external, but specialised, tools is the better approach. &kmail; uses these tools through its flexible filter architecture. The Anti-Virus Wizard helps you with the initial filter setup. </para>
 
 <variablelist>
 <varlistentry>
-<term
->What can the wizard do to help you?</term>
+<term>What can the wizard do to help you?</term>
 <listitem>
-<para
->It will give you some choices about how you want virus filtering to be set up. Afterwards it will automatically create the appropriate filter rules. </para>
+<para>It will give you some choices about how you want virus filtering to be set up. Afterwards it will automatically create the appropriate filter rules. </para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->What are the limitations of the wizard?</term>
+<term>What are the limitations of the wizard?</term>
 <listitem>
-<para
->It can only initially set up the filters for you; and it will provide a standard setup. Modifying existing filters is not yet possible. </para>
+<para>It can only initially set up the filters for you; and it will provide a standard setup. Modifying existing filters is not yet possible. </para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->You can activate the wizard via <menuchoice
-><guimenu
->Tools</guimenu
-> <guisubmenu
->Anti-Virus Wizard...</guisubmenu
-></menuchoice
->.</para>
+<para>You can activate the wizard via <menuchoice><guimenu>Tools</guimenu> <guisubmenu>Anti-Virus Wizard...</guisubmenu></menuchoice>.</para>
 
 </sect2>
 
 <sect2 id="virus-wizard-advanced">
-<title
->Advanced</title>
-
-<para
->The Anti-Virus Wizard basically works exactly as the <link linkend="the-anti-spam-wizard"
->Anti-Spam Wizard</link
->. Here are the details of how the wizard works: &kmail; can use several external tools to detect messages containing viruses; it will try to automatically find out which of those tools are installed on your box and will show you the result of the search for each tool. You can mark the tools which you want to be used by &kmail; to detect viruses; marking tools which were not found is not possible because the appropriate checkboxes are disabled. Of course, you can close the wizard, install a tool, and restart the wizard again. </para>
-
-<para
->If you have marked at least one tool you will be able to select some actions to be done in &kmail; with regard to messages containing viruses: to let &kmail; detect messages containing viruses you definitely should mark the <guilabel
->Check messages using the anti-virus tools</guilabel
-> option; if you want messages detected as virus-infected to be moved into a certain folder, please select the appropriate folder and mark the <guilabel
->Move detected viral messages to the selected folder</guilabel
-> option; if messages detected as virus-infected should additionally be marked as read, then mark the <guilabel
->Additionally, mark detected viral messages as read</guilabel
-> option. </para>
-
-<para
->Having checked at least one of these last options will allow you to let the wizard finish the filter setup. The wizard will not take any existing filter rules into consideration but will append new rules in any case; you may want to inspect the result of this process in the <link linkend="filter-dialog"
->Filter Dialogue</link
->. </para>
+<title>Advanced</title>
+
+<para>The Anti-Virus Wizard basically works exactly as the <link linkend="the-anti-spam-wizard">Anti-Spam Wizard</link>. Here are the details of how the wizard works: &kmail; can use several external tools to detect messages containing viruses; it will try to automatically find out which of those tools are installed on your box and will show you the result of the search for each tool. You can mark the tools which you want to be used by &kmail; to detect viruses; marking tools which were not found is not possible because the appropriate checkboxes are disabled. Of course, you can close the wizard, install a tool, and restart the wizard again. </para>
+
+<para>If you have marked at least one tool you will be able to select some actions to be done in &kmail; with regard to messages containing viruses: to let &kmail; detect messages containing viruses you definitely should mark the <guilabel>Check messages using the anti-virus tools</guilabel> option; if you want messages detected as virus-infected to be moved into a certain folder, please select the appropriate folder and mark the <guilabel>Move detected viral messages to the selected folder</guilabel> option; if messages detected as virus-infected should additionally be marked as read, then mark the <guilabel>Additionally, mark detected viral messages as read</guilabel> option. </para>
+
+<para>Having checked at least one of these last options will allow you to let the wizard finish the filter setup. The wizard will not take any existing filter rules into consideration but will append new rules in any case; you may want to inspect the result of this process in the <link linkend="filter-dialog">Filter Dialogue</link>. </para>
 
 </sect2>
 
 <sect2 id="virus-wizard-details">
-<title
->Details</title>
-
-<para
->The wizard uses information stored in a special configuration file named <filename
->kmail.antivirusrc</filename
-> (stored in the global or local KDE config directory). It will first check the global config file and then the local config file: if the local config file contains entries with higher (newer) version numbers per-tool the configuration data from the local file for that tool is used; that way, both administrators and users can update the wizard configuration. </para>
-
-<para
->The detection of messages containing viruses is achieved by creating <guilabel
->pipe through</guilabel
-> actions per-tool within a special filter. Another filter contains rules to check for detected viral messages and actions to mark them and (optionally, depending on the choice in the wizard) to move them into a folder. Both filters are configured to be applied on incoming messages and on manual filtering. </para>
+<title>Details</title>
+
+<para>The wizard uses information stored in a special configuration file named <filename>kmail.antivirusrc</filename> (stored in the global or local KDE config directory). It will first check the global config file and then the local config file: if the local config file contains entries with higher (newer) version numbers per-tool the configuration data from the local file for that tool is used; that way, both administrators and users can update the wizard configuration. </para>
+
+<para>The detection of messages containing viruses is achieved by creating <guilabel>pipe through</guilabel> actions per-tool within a special filter. Another filter contains rules to check for detected viral messages and actions to mark them and (optionally, depending on the choice in the wizard) to move them into a folder. Both filters are configured to be applied on incoming messages and on manual filtering. </para>
 
 </sect2>
 
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>
diff --git a/tde-i18n-en_GB/docs/tdepim/knode/credits.docbook b/tde-i18n-en_GB/docs/tdepim/knode/credits.docbook
index 9fb4a7b579b..03a5d158f74 100644
--- a/tde-i18n-en_GB/docs/tdepim/knode/credits.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knode/credits.docbook
@@ -1,86 +1,43 @@
 <chapter id="credits">
-<title
->Credits and Licence</title>
+<title>Credits and Licence</title>
 
-<para
->&knode;</para>
+<para>&knode;</para>
 
-<para
->Program Copyright 1999,2000,2001,2002 KNode developers</para>
+<para>Program Copyright 1999,2000,2001,2002 KNode developers</para>
 
-<itemizedlist
-> 
-<title
->Developers</title>
-<listitem
-> 
-<para
->Christian Gebauer <email
->gebauer@kde.org</email
-></para
-> 
+<itemizedlist> 
+<title>Developers</title>
+<listitem> 
+<para>Christian Gebauer <email>gebauer@kde.org</email></para> 
 </listitem>
-<listitem
-> 
-<para
->Christian Thurner <email
->cthurner@web.de</email
-></para>
-</listitem
-> 
+<listitem> 
+<para>Christian Thurner <email>cthurner@web.de</email></para>
+</listitem> 
 <listitem>
-<para
->Dirk Mueller <email
->mueller@kde.org</email
-></para
-> 
+<para>Dirk Mueller <email>mueller@kde.org</email></para> 
 </listitem>
 <listitem>
-<para
->Mark Mutz <email
->mutz@kde.org</email
-></para
-> 
+<para>Mark Mutz <email>mutz@kde.org</email></para> 
 </listitem>
 <listitem>
-<para
->Roberto Teixeira <email
->roberto@kde.org</email
-></para
-> 
+<para>Roberto Teixeira <email>roberto@kde.org</email></para> 
 </listitem>
 <listitem>
-<para
->Mathias Waack <email
->mathias@atoll-net.de</email
-></para>
+<para>Mathias Waack <email>mathias@atoll-net.de</email></para>
 </listitem>
 </itemizedlist>
 
 <itemizedlist>
-<title
->Documentation</title>
+<title>Documentation</title>
 <listitem>
-<para
->Copyright 2000,2001 Stephan Johach<email
->lucardus@onlinehome.de</email
-></para>
+<para>Copyright 2000,2001 Stephan Johach<email>lucardus@onlinehome.de</email></para>
 </listitem>
 <listitem>
-<para
->Copyright 2001,2002 Thomas Schütz <email
-> Thomas.Schuetz@gmx.li</email
-></para>
+<para>Copyright 2001,2002 Thomas Schütz <email> Thomas.Schuetz@gmx.li</email></para>
 </listitem>
 </itemizedlist>
 
-<para
->Andrew Coles<email
->andrew_coles@yahoo.co.uk</email
-></para
-> 
+<para>Andrew Coles<email>andrew_coles@yahoo.co.uk</email></para> 
 
-<para
->Thanks go to the &knode; developers who answered all my stupid questions with patience. Then Thomas Diehl and Matthias Kiefer who always were competent contacts regards to translation. Many Thanks to Malcolm Hunter who checked this english translation. Not to forget Michael McBride, always there to help me out with documentation-related and general stuff, and everybody else in the &kde; Team who contributed to the creation of this document.</para>
-&underFDL; &underGPL; </chapter
-> 
+<para>Thanks go to the &knode; developers who answered all my stupid questions with patience. Then Thomas Diehl and Matthias Kiefer who always were competent contacts regards to translation. Many Thanks to Malcolm Hunter who checked this english translation. Not to forget Michael McBride, always there to help me out with documentation-related and general stuff, and everybody else in the &kde; Team who contributed to the creation of this document.</para>
+&underFDL; &underGPL; </chapter> 
diff --git a/tde-i18n-en_GB/docs/tdepim/knode/faq.docbook b/tde-i18n-en_GB/docs/tdepim/knode/faq.docbook
index 072bedafba0..76c8d45153c 100644
--- a/tde-i18n-en_GB/docs/tdepim/knode/faq.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knode/faq.docbook
@@ -2,290 +2,131 @@
 <!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd">
 -->
 <chapter id="faq">
-<title
->Questions and Answers</title>
+<title>Questions and Answers</title>
 
 <qandaset>
 <qandaentry>
 <question>
-<para
->I have installed &kde; 3, but &knode; does not exist in the <guimenu
->K</guimenu
-> Menu.</para>
- </question
-> 
-<answer
-> 
-<para
->Does the <guisubmenu
->Internet</guisubmenu
->entry exist? If not, maybe the tdenetwork package isn't installed (perhaps because your distribution possibly doesn't do this for you); if the entry is there, but you do not have a <guimenuitem
->KNode</guimenuitem
-> item in it, you should try to open a &konsole; and run &knode; from there. Type</para>
-
-<screen
-><prompt
->%</prompt
-> <userinput
-><command
->knode &amp;</command
-></userinput
->
-</screen
-> 
-
-<para
->If an error message appears that tells you that &knode; could not be started or found please check whether the file <filename
->knode</filename
-> exists in <filename class="directory"
->$<envar
->TDEDIR</envar
->/bin</filename
-> and that its permissions are correctly set.</para>
-</answer
-> 
-</qandaentry
-> 
-
-<qandaentry
-> 
-<question
-> 
-<para
->When I start &knode;, a message appears in the task bar but suddenly disappears without &knode; being started.</para
-> 
-</question
-> 
+<para>I have installed &kde; 3, but &knode; does not exist in the <guimenu>K</guimenu> Menu.</para>
+ </question> 
+<answer> 
+<para>Does the <guisubmenu>Internet</guisubmenu>entry exist? If not, maybe the tdenetwork package isn't installed (perhaps because your distribution possibly doesn't do this for you); if the entry is there, but you do not have a <guimenuitem>KNode</guimenuitem> item in it, you should try to open a &konsole; and run &knode; from there. Type</para>
+
+<screen><prompt>%</prompt> <userinput><command>knode &amp;</command></userinput>
+</screen> 
+
+<para>If an error message appears that tells you that &knode; could not be started or found please check whether the file <filename>knode</filename> exists in <filename class="directory">$<envar>TDEDIR</envar>/bin</filename> and that its permissions are correctly set.</para>
+</answer> 
+</qandaentry> 
+
+<qandaentry> 
+<question> 
+<para>When I start &knode;, a message appears in the task bar but suddenly disappears without &knode; being started.</para> 
+</question> 
 <answer>
-<para
->Try to start &knode; from the &konsole; (see previous question) and keep attention for the messages displayed there: if they do not make sense to you mark them with your mouse and copy it to the clipboard; then, ask for help on one of the &kde; mailing lists or &kde; news groups.</para>
-</answer
-> 
-</qandaentry
-> 
-
-<qandaentry
-> 
-<question
-> 
-<para
->I need an important article, but &knode; doesn't have it any more; where can I find this article?</para>
-</question
-> 
-<answer
-> 
-<para
->You can find some extensive usenet archives at <ulink url="http://groups.google.com/usenet/"
->groups.google.com</ulink
-> or <ulink url="http://av.com"
->AltaVista</ulink
->; they even contain articles that are several years old.</para
-> 
-</answer
-> 
-</qandaentry
-> 
-
-<qandaentry
-> 
-<question
-> 
-<para
->How do I open and read several articles at the same time?</para
-> 
-</question
-> 
-<answer
-> 
-<para
->Open the article with <guimenuitem
->Open in own window</guimenuitem
->.</para
-> 
-</answer
-> 
-</qandaentry
-> 
-
-<qandaentry
-> 
-<question
-> 
-<para
->My articles do not appear in the newsgroup.</para>
-</question
-> 
-<answer
-> 
-<para
->When you publish an article it may be some time until your news server has it; wait several hours before you send the article again.</para
-> 
-</answer
-> 
-</qandaentry
-> 
-
-<qandaentry
-> 
-<question
-> 
-<para
->I want to keep an article; how do I archive it?</para
-> 
-</question
-> 
-<answer
-> 
-<para
->Choose the article in the article view and then use <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Save</guimenuitem
-></menuchoice
-> to open a file dialogue; you can then save the article to a file. Another possibility is to copy the article to a folder.</para>
-</answer
-> 
-</qandaentry
-> 
-
-<qandaentry
-> 
-<question
-> 
-<para
->Some set headers do not appear for several articles in the article window; am I doing something wrong?</para
-> 
-</question
-> 
-<answer
-> 
-<para
->This is not unusual because many headers are optional and often not contained in articles; in this case &knode; does not show those header lines.</para
-> 
-</answer
-> 
-</qandaentry
-> 
-
-<qandaentry
-> 
-<question
-> 
-<para
->Sometimes I see an article which refers to other articles but &knode; does not show any references; why is that?</para
-> 
-</question
-> 
-<answer
-> 
-<para
->This happens when somebody posted an article in another news group and checked the option <guilabel
->Followup To</guilabel
->; the article in question is then sent to your news group, but the referring article is absent. In many cases the poster tells the reason for his choice to set a followup.</para>
-</answer
-> 
-</qandaentry
-> 
-
-<qandaentry
-> 
-<question
-> 
-<para
->When I want to answer an article an error message appears telling me that the external editor could not be started, but the editor is correctly set.</para>
-</question
-> 
-<answer
-> 
-<para
->Have a look whether you entered the place-holder for a filename after the editor command; if not, enter it. If you want, for example, to use &kedit; enter <userinput
-><command
->kedit</command
-><token
-> %f</token
-></userinput
-></para>
-<para
->If the <token
->%f</token
-> is absent, your editor cannot be run.</para>
+<para>Try to start &knode; from the &konsole; (see previous question) and keep attention for the messages displayed there: if they do not make sense to you mark them with your mouse and copy it to the clipboard; then, ask for help on one of the &kde; mailing lists or &kde; news groups.</para>
+</answer> 
+</qandaentry> 
+
+<qandaentry> 
+<question> 
+<para>I need an important article, but &knode; doesn't have it any more; where can I find this article?</para>
+</question> 
+<answer> 
+<para>You can find some extensive usenet archives at <ulink url="http://groups.google.com/usenet/">groups.google.com</ulink> or <ulink url="http://av.com">AltaVista</ulink>; they even contain articles that are several years old.</para> 
+</answer> 
+</qandaentry> 
+
+<qandaentry> 
+<question> 
+<para>How do I open and read several articles at the same time?</para> 
+</question> 
+<answer> 
+<para>Open the article with <guimenuitem>Open in own window</guimenuitem>.</para> 
+</answer> 
+</qandaentry> 
+
+<qandaentry> 
+<question> 
+<para>My articles do not appear in the newsgroup.</para>
+</question> 
+<answer> 
+<para>When you publish an article it may be some time until your news server has it; wait several hours before you send the article again.</para> 
+</answer> 
+</qandaentry> 
+
+<qandaentry> 
+<question> 
+<para>I want to keep an article; how do I archive it?</para> 
+</question> 
+<answer> 
+<para>Choose the article in the article view and then use <menuchoice><guimenu>File</guimenu><guimenuitem>Save</guimenuitem></menuchoice> to open a file dialogue; you can then save the article to a file. Another possibility is to copy the article to a folder.</para>
+</answer> 
+</qandaentry> 
+
+<qandaentry> 
+<question> 
+<para>Some set headers do not appear for several articles in the article window; am I doing something wrong?</para> 
+</question> 
+<answer> 
+<para>This is not unusual because many headers are optional and often not contained in articles; in this case &knode; does not show those header lines.</para> 
+</answer> 
+</qandaentry> 
+
+<qandaentry> 
+<question> 
+<para>Sometimes I see an article which refers to other articles but &knode; does not show any references; why is that?</para> 
+</question> 
+<answer> 
+<para>This happens when somebody posted an article in another news group and checked the option <guilabel>Followup To</guilabel>; the article in question is then sent to your news group, but the referring article is absent. In many cases the poster tells the reason for his choice to set a followup.</para>
+</answer> 
+</qandaentry> 
+
+<qandaentry> 
+<question> 
+<para>When I want to answer an article an error message appears telling me that the external editor could not be started, but the editor is correctly set.</para>
+</question> 
+<answer> 
+<para>Have a look whether you entered the place-holder for a filename after the editor command; if not, enter it. If you want, for example, to use &kedit; enter <userinput><command>kedit</command><token> %f</token></userinput></para>
+<para>If the <token>%f</token> is absent, your editor cannot be run.</para>
 </answer>
 </qandaentry>
 
-<qandaentry
-> 
+<qandaentry> 
 <question>
-<para
->Why can I not receive data from my local news server?</para>
-</question
-> 
-<answer
-> 
-<para
->If you use &knode; together with with a local news server, you must make sure that this server is correctly set up and started; for further details, please consult the documentation of your local news server.</para>
-<tip
-> 
-<para
->The availability of the local news server can easily be verified with the <command
->telnet</command
-> program: open a console and type:</para
-> 
+<para>Why can I not receive data from my local news server?</para>
+</question> 
+<answer> 
+<para>If you use &knode; together with with a local news server, you must make sure that this server is correctly set up and started; for further details, please consult the documentation of your local news server.</para>
+<tip> 
+<para>The availability of the local news server can easily be verified with the <command>telnet</command> program: open a console and type:</para> 
  
-<screen
-><prompt
->%</prompt
-> <userinput
-><command
->telnet</command
-> <parameter
->localhost nntp</parameter
-></userinput
->
+<screen><prompt>%</prompt> <userinput><command>telnet</command> <parameter>localhost nntp</parameter></userinput>
 </screen>
 
-<para
->Followed by that, the news server should respond with:</para>
+<para>Followed by that, the news server should respond with:</para>
 
-<screen
-><computeroutput>
+<screen><computeroutput>
 Trying 127.0.0.1...
 Connected to localhost.
 Escape character is '^]'.
 200 Leafnode NNTP Daemon, version 1.9.16 running at konqi.org
-</computeroutput
->
+</computeroutput>
 </screen>
 
-<para
->You can quit the <command
->telnet</command
-> session with:</para>
+<para>You can quit the <command>telnet</command> session with:</para>
 
-<screen
-><prompt
->%</prompt
-> <userinput
->quit</userinput
->
+<screen><prompt>%</prompt> <userinput>quit</userinput>
 </screen>
 
-<para
->If that does not work there is either no local news server set up or the server was not started; in this case, please consult the documentation of your local news server.</para>
+<para>If that does not work there is either no local news server set up or the server was not started; in this case, please consult the documentation of your local news server.</para>
 </tip>
 
-<para
->If you are trying to connect to a news server on the Internet you need, of course, an open (dial-in) connection and to have set up &knode; to use your <acronym
->ISP</acronym
->'s news server; your <acronym
->ISP</acronym
-> should be able to give you information about which news servers you can use.</para>
+<para>If you are trying to connect to a news server on the Internet you need, of course, an open (dial-in) connection and to have set up &knode; to use your <acronym>ISP</acronym>'s news server; your <acronym>ISP</acronym> should be able to give you information about which news servers you can use.</para>
 </answer>
 </qandaentry>
 
-</qandaset
-> 
+</qandaset> 
 
 
-</chapter
-> 
+</chapter> 
diff --git a/tde-i18n-en_GB/docs/tdepim/knode/gloss.docbook b/tde-i18n-en_GB/docs/tdepim/knode/gloss.docbook
index 32628779b1f..ced5789ab35 100644
--- a/tde-i18n-en_GB/docs/tdepim/knode/gloss.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knode/gloss.docbook
@@ -1,425 +1,205 @@
 <glossary id="glossary">
-<title
->Glossary</title>
+<title>Glossary</title>
 
 <glossdiv>
-<title
->A</title
-> 
-<glossentry id="gloss-article"
-> 
-<glossterm
->Article</glossterm
-> 
-<glossdef
-> 
-<para
->An <glossterm
->article</glossterm
-> in the sense of newspapers: special <glossterm
->articles</glossterm
-> are, for example, followups; replies are not <glossterm
->articles</glossterm
-> but Email.</para>
-</glossdef
-> 
-</glossentry
-> 
+<title>A</title> 
+<glossentry id="gloss-article"> 
+<glossterm>Article</glossterm> 
+<glossdef> 
+<para>An <glossterm>article</glossterm> in the sense of newspapers: special <glossterm>articles</glossterm> are, for example, followups; replies are not <glossterm>articles</glossterm> but Email.</para>
+</glossdef> 
+</glossentry> 
 </glossdiv>
 
-<glossdiv
-> 
-<title
->C</title
-> 
+<glossdiv> 
+<title>C</title> 
 
 <glossentry id="gloss-cancel">
-<glossterm
->Cancelling</glossterm>
+<glossterm>Cancelling</glossterm>
 <glossdef>
-<para
->To delete one of your articles from the newsserver: the newsreader generates a special control message to tell the server to delete this article.</para>
+<para>To delete one of your articles from the newsserver: the newsreader generates a special control message to tell the server to delete this article.</para>
 </glossdef>
 </glossentry>
 
 <glossentry id="gloss-crossposting">
-<glossterm
->Crossposting</glossterm
-> 
+<glossterm>Crossposting</glossterm> 
 <glossdef>
-<para
->The posting of an article in several newsgroups; this is very often disliked, because it disturbs the topic-oriented association of the newsgroups.</para>
-</glossdef
-> 
-</glossentry
-> 
-</glossdiv
-> 
-
-<glossdiv
-> 
-<title
->E</title>
+<para>The posting of an article in several newsgroups; this is very often disliked, because it disturbs the topic-oriented association of the newsgroups.</para>
+</glossdef> 
+</glossentry> 
+</glossdiv> 
+
+<glossdiv> 
+<title>E</title>
 
 <glossentry id="gloss-expire">
-<glossterm
->Expire</glossterm
-> 
-<glossdef
-> 
-<para
-><glossterm
->Articles</glossterm
-> can not be held for eternity because of harddisk limits. Because of this there is usually a program called <application
->expire</application
-> on most computer systems; this program deletes all articles which are older than a configured number of days. &knode; includes this functionality on its own.</para>
-</glossdef
-> 
-</glossentry
-> 
-</glossdiv
-> 
-
-<glossdiv
-> 
-<title
->F</title
-> 
+<glossterm>Expire</glossterm> 
+<glossdef> 
+<para><glossterm>Articles</glossterm> can not be held for eternity because of harddisk limits. Because of this there is usually a program called <application>expire</application> on most computer systems; this program deletes all articles which are older than a configured number of days. &knode; includes this functionality on its own.</para>
+</glossdef> 
+</glossentry> 
+</glossdiv> 
+
+<glossdiv> 
+<title>F</title> 
 <glossentry id="gloss-faq">
-<glossterm
-><acronym
->FAQ</acronym
-></glossterm
-> 
+<glossterm><acronym>FAQ</acronym></glossterm> 
 <glossdef>
-<para
-><acronym
->FAQ</acronym
-> is the acronym for <quote
->Frequently Asked Questions</quote
->.</para>
-</glossdef
-> 
-</glossentry
-> 
+<para><acronym>FAQ</acronym> is the acronym for <quote>Frequently Asked Questions</quote>.</para>
+</glossdef> 
+</glossentry> 
 
 <glossentry id="gloss-follow-up">
-<glossterm
->Followup</glossterm>
-<glossdef
-> 
-<para
->An <glossterm
->article</glossterm
-> which is written as an answer to another <glossterm
->article</glossterm
->.</para>
-</glossdef
-> 
-</glossentry
-> 
-</glossdiv
-> 
-
-<glossdiv
-> 
-<title
->G</title
-> 
+<glossterm>Followup</glossterm>
+<glossdef> 
+<para>An <glossterm>article</glossterm> which is written as an answer to another <glossterm>article</glossterm>.</para>
+</glossdef> 
+</glossentry> 
+</glossdiv> 
+
+<glossdiv> 
+<title>G</title> 
 <glossentry id="gloss-gknsa">
-<glossterm
-><acronym
->GNKSA</acronym
-></glossterm>
+<glossterm><acronym>GNKSA</acronym></glossterm>
 <glossdef>
-<para
-><acronym
->GNKSA</acronym
-> is a kind of seal-of-approval for newsreaders; you can get more information at <ulink url="http://www.gnksa.org"
->http://www.gnksa.org</ulink
->.</para>
-</glossdef
-> 
-</glossentry
-> 
+<para><acronym>GNKSA</acronym> is a kind of seal-of-approval for newsreaders; you can get more information at <ulink url="http://www.gnksa.org">http://www.gnksa.org</ulink>.</para>
+</glossdef> 
+</glossentry> 
 </glossdiv>
 
-<glossdiv
-> 
-<title
->H</title
-> 
+<glossdiv> 
+<title>H</title> 
 <glossentry id="gloss-header">
-<glossterm
->Header</glossterm>
+<glossterm>Header</glossterm>
 <glossdef>
-<para
->The Header of an <glossterm
->article</glossterm
-> contains information about the sender, the subject, and the newsgroup of the article.</para>
-</glossdef
-> 
-</glossentry
-> 
-</glossdiv
-> 
-
-<glossdiv
-> 
-<title
->K</title
-> 
+<para>The Header of an <glossterm>article</glossterm> contains information about the sender, the subject, and the newsgroup of the article.</para>
+</glossdef> 
+</glossentry> 
+</glossdiv> 
+
+<glossdiv> 
+<title>K</title> 
 <glossentry id="gloss-killfile">
-<glossterm
->Killfile</glossterm
-> 
-<glossdef
-> 
-<para
->This is a functionality of a newsreader to hide <glossterm
->articles</glossterm
-> of a determined sender or with certain contents.</para>
-</glossdef
-> 
-</glossentry
-> 
-</glossdiv
-> 
-
-<glossdiv
-> 
-<title
->M</title
-> 
+<glossterm>Killfile</glossterm> 
+<glossdef> 
+<para>This is a functionality of a newsreader to hide <glossterm>articles</glossterm> of a determined sender or with certain contents.</para>
+</glossdef> 
+</glossentry> 
+</glossdiv> 
+
+<glossdiv> 
+<title>M</title> 
 <glossentry id="gloss-message-id">
-<glossterm
->Message-ID</glossterm
-> 
-<glossdef
-> 
-
-<para
->The <glossterm
->Message-ID</glossterm
-> of an article is a clear mark for the newsserver to identify the article. A <glossterm
->Message-ID</glossterm
-> should not be used twice in the whole usenet for about 2 years; wrong or double <glossterm
->Message-IDs</glossterm
-> could cause problems when forwarding them and could overwrite other articles.</para>
-</glossdef
-> 
+<glossterm>Message-ID</glossterm> 
+<glossdef> 
+
+<para>The <glossterm>Message-ID</glossterm> of an article is a clear mark for the newsserver to identify the article. A <glossterm>Message-ID</glossterm> should not be used twice in the whole usenet for about 2 years; wrong or double <glossterm>Message-IDs</glossterm> could cause problems when forwarding them and could overwrite other articles.</para>
+</glossdef> 
 </glossentry>
-</glossdiv
-> 
-
-<glossdiv
-> 
-<title
->N</title
-> 
+</glossdiv> 
+
+<glossdiv> 
+<title>N</title> 
 <glossentry id="gloss-newbie">
-<glossterm
->Newbie</glossterm
-> 
-<glossdef
-> 
-<para
->Somebody who is new somewhere, in relationship to usenet: somebody who is new to the newsgroup, or new to usenet in general.</para>
-</glossdef
-> 
-</glossentry
-> 
+<glossterm>Newbie</glossterm> 
+<glossdef> 
+<para>Somebody who is new somewhere, in relationship to usenet: somebody who is new to the newsgroup, or new to usenet in general.</para>
+</glossdef> 
+</glossentry> 
 
 <glossentry id="gloss-newsgroup">
-<glossterm
->Newsgroup</glossterm
-> 
-<glossdef
-> 
-<para
->A kind-of bulletin board in the usenet about a special topic or a group of topics. This is where you post your <glossterm
->articles</glossterm
->.</para>
-</glossdef
-> 
-</glossentry
-> 
-
-<glossentry id="gloss-newsreader"
-> 
-<glossterm
->Newsreader</glossterm
-> 
-<glossdef
-> 
-<para
->A program for reading and writing <glossterm
->news</glossterm
->.</para
-> 
-</glossdef
-> 
-</glossentry
-> 
-
-<glossentry id="gloss-nntp"
-> <glossterm>
-<acronym
-><acronym
->NNTP</acronym
-></acronym
-> 
-</glossterm
-> 
+<glossterm>Newsgroup</glossterm> 
+<glossdef> 
+<para>A kind-of bulletin board in the usenet about a special topic or a group of topics. This is where you post your <glossterm>articles</glossterm>.</para>
+</glossdef> 
+</glossentry> 
+
+<glossentry id="gloss-newsreader"> 
+<glossterm>Newsreader</glossterm> 
+<glossdef> 
+<para>A program for reading and writing <glossterm>news</glossterm>.</para> 
+</glossdef> 
+</glossentry> 
+
+<glossentry id="gloss-nntp"> <glossterm>
+<acronym><acronym>NNTP</acronym></acronym> 
+</glossterm> 
 <glossdef>
-<para
->Network News Transport Protocol; this is the protocol which defines how the articles in the usenet are spread.</para>
-</glossdef
-> 
-</glossentry
-> 
-</glossdiv
-> 
-
-<glossdiv
-> 
-<title
->P</title
-> 
+<para>Network News Transport Protocol; this is the protocol which defines how the articles in the usenet are spread.</para>
+</glossdef> 
+</glossentry> 
+</glossdiv> 
+
+<glossdiv> 
+<title>P</title> 
 
 <glossentry id="gloss-port">
-<glossterm
->Port</glossterm>
-<glossdef
-> 
-<para
->A kind-of address for the application to listen for data on and for connecting to another computer; the standard-port for the connection between the newsreader and the newsserver is 119.</para>
-</glossdef
-> 
-</glossentry
-> 
+<glossterm>Port</glossterm>
+<glossdef> 
+<para>A kind-of address for the application to listen for data on and for connecting to another computer; the standard-port for the connection between the newsreader and the newsserver is 119.</para>
+</glossdef> 
+</glossentry> 
 
 <glossentry id="gloss-pgp-signature">
-<glossterm
->PGP-Signature</glossterm
-> 
+<glossterm>PGP-Signature</glossterm> 
 <glossdef>
-<para
->A digital signature; you can use it to determine whether the document has been changed since it was signed or if it is the original text from the author.</para>
-</glossdef
-> 
-</glossentry
-> 
+<para>A digital signature; you can use it to determine whether the document has been changed since it was signed or if it is the original text from the author.</para>
+</glossdef> 
+</glossentry> 
 
 <glossentry id="gloss-posting">
-<glossterm
->Posting</glossterm
-> 
-<glossdef
-> 
-<para
->Either an <glossterm
->article</glossterm
-> which is sent to usenet or the act of sending itself; you are <quote
->posting</quote
-> an <glossterm
->article</glossterm
-> into a newsgroup.</para>
-</glossdef
-> 
-</glossentry
-> 
-</glossdiv
-> 
-
-<glossdiv
-> 
-<title
->Q</title
-> 
+<glossterm>Posting</glossterm> 
+<glossdef> 
+<para>Either an <glossterm>article</glossterm> which is sent to usenet or the act of sending itself; you are <quote>posting</quote> an <glossterm>article</glossterm> into a newsgroup.</para>
+</glossdef> 
+</glossentry> 
+</glossdiv> 
+
+<glossdiv> 
+<title>Q</title> 
 
 <glossentry id="gloss-quoting">
-<glossterm
->Quoting</glossterm
-> 
-<glossdef
-> 
-<para
->This is the act of citing of an article to which you are answering: you quote the original <glossterm
->article</glossterm
-> to make clear which passages of text your answer refers to.</para>
-</glossdef
-> 
-</glossentry
-> 
-</glossdiv
-> 
-
-<glossdiv
-> 
-<title
->R</title
-> 
+<glossterm>Quoting</glossterm> 
+<glossdef> 
+<para>This is the act of citing of an article to which you are answering: you quote the original <glossterm>article</glossterm> to make clear which passages of text your answer refers to.</para>
+</glossdef> 
+</glossentry> 
+</glossdiv> 
+
+<glossdiv> 
+<title>R</title> 
 <glossentry id="gloss-reply">
 
-<glossterm
->Reply</glossterm
-> 
-<glossdef
-> 
-<para
->A <glossterm
->reply</glossterm
-> is an answer to the author of an article by e-mail.</para>
-</glossdef
-> 
-</glossentry
-> 
-</glossdiv
-> 
-
-<glossdiv
-> 
-<title
->S</title
-> 
+<glossterm>Reply</glossterm> 
+<glossdef> 
+<para>A <glossterm>reply</glossterm> is an answer to the author of an article by e-mail.</para>
+</glossdef> 
+</glossentry> 
+</glossdiv> 
+
+<glossdiv> 
+<title>S</title> 
 
 <glossentry id="gloss-scoring">
-<glossterm
->Scoring</glossterm>
+<glossterm>Scoring</glossterm>
 <glossdef>
 
-<para
->This is the valuation of an article or a thread.</para>
+<para>This is the valuation of an article or a thread.</para>
 </glossdef>
 </glossentry>
 
 <glossentry id="gloss-signature">
-<glossterm
->Signature</glossterm>
+<glossterm>Signature</glossterm>
 <glossdef>
-<para
->A <glossterm
->signature</glossterm
-> is a personal sign of the author which is attached at the end of the normal contents of the article; it is like a visiting card &mdash; very often there are e-mail addresses, a homepage <acronym
->URL</acronym
-> or other personal data. The <glossterm
->signature</glossterm
-> should not be longer than 4 lines. Note that the <glossterm
->signature</glossterm
-> should not be mixed up with the <glossterm
->PGP-signature</glossterm
->.</para>
+<para>A <glossterm>signature</glossterm> is a personal sign of the author which is attached at the end of the normal contents of the article; it is like a visiting card &mdash; very often there are e-mail addresses, a homepage <acronym>URL</acronym> or other personal data. The <glossterm>signature</glossterm> should not be longer than 4 lines. Note that the <glossterm>signature</glossterm> should not be mixed up with the <glossterm>PGP-signature</glossterm>.</para>
 </glossdef>
 </glossentry>
 
 <glossentry id="gloss-supersede">
-<glossterm
->Supersede</glossterm>
+<glossterm>Supersede</glossterm>
 <glossdef>
 
-<para
->This is the overwriting of an existing article: the newsreader generates a special article with a control message in the header which tells the newsserver to overwrite the existing article with this one.</para>
+<para>This is the overwriting of an existing article: the newsreader generates a special article with a control message in the header which tells the newsserver to overwrite the existing article with this one.</para>
 
 </glossdef>
 </glossentry>
diff --git a/tde-i18n-en_GB/docs/tdepim/knode/index.docbook b/tde-i18n-en_GB/docs/tdepim/knode/index.docbook
index b633badab40..f0db65fc294 100644
--- a/tde-i18n-en_GB/docs/tdepim/knode/index.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knode/index.docbook
@@ -1,8 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
  <!ENTITY kappname "&knode;">
- <!ENTITY package "tdepim"
-> 
+ <!ENTITY package "tdepim"> 
  <!ENTITY introduction SYSTEM "introduction.docbook">
  <!ENTITY commands SYSTEM "commands.docbook">
  <!ENTITY faq SYSTEM "faq.docbook">
@@ -20,168 +19,68 @@
 
 <!--TODO: PGP-Option for encoding?
     Exchange german links (find "(german" )
-    Maybe complete the <accels
-> of the menus
+    Maybe complete the <accels> of the menus
     After that set version to 0.7.1 -->
 <book lang="&language;">
 
 <bookinfo>
-<title
->The &knode; manual</title>
+<title>The &knode; manual</title>
 
 <authorgroup>
-<author
-><firstname
->Stephan</firstname
-><surname
->Johach</surname
-> <affiliation
-><address
-><email
->lucardus@onlinehome.de</email
-></address>
+<author><firstname>Stephan</firstname><surname>Johach</surname> <affiliation><address><email>lucardus@onlinehome.de</email></address>
 </affiliation>
 </author>
 
-<author
-><firstname
-> Thomas</firstname
-> <surname
->Schûtz</surname
-> <affiliation
-> <address
-> <email
->Thomas.Schuetz@gmx.li</email
-> </address>
+<author><firstname> Thomas</firstname> <surname>Schûtz</surname> <affiliation> <address> <email>Thomas.Schuetz@gmx.li</email> </address>
 </affiliation>
 </author>
 
-<othercredit role="developer"
-><firstname
-> Christian</firstname
-> <surname
-> Gebauer</surname
-> <contrib
->Developer and maintainer</contrib>
-<affiliation
-> <address
-> <email
->gebauer@kde.org</email
-> </address
-> </affiliation>
+<othercredit role="developer"><firstname> Christian</firstname> <surname> Gebauer</surname> <contrib>Developer and maintainer</contrib>
+<affiliation> <address> <email>gebauer@kde.org</email> </address> </affiliation>
 </othercredit>
 
-<othercredit role="developer"
-><firstname
-> Christian</firstname
-> <surname
-> Thurner</surname
-> <contrib
->Developer</contrib>
-<affiliation
-> <address
-> <email
->cthurner@web.de</email
-> </address
-> </affiliation>
+<othercredit role="developer"><firstname> Christian</firstname> <surname> Thurner</surname> <contrib>Developer</contrib>
+<affiliation> <address> <email>cthurner@web.de</email> </address> </affiliation>
 </othercredit>
 
-<othercredit role="developer"
-><firstname
-> Dirk</firstname
-> <surname
-> Mueller</surname
-> <contrib
->Developer</contrib>
-<affiliation
-> <address
-> <email
->mueller@kde.org</email
-> </address
-> </affiliation>
+<othercredit role="developer"><firstname> Dirk</firstname> <surname> Mueller</surname> <contrib>Developer</contrib>
+<affiliation> <address> <email>mueller@kde.org</email> </address> </affiliation>
 </othercredit>
 
-<othercredit role="developer"
-><firstname
-> Mark</firstname
-> <surname
-> Mutz</surname
-> <contrib
->Developer</contrib>
-<affiliation
-> <address
-> <email
->mutz@kde.org</email
-> </address
-> </affiliation>
+<othercredit role="developer"><firstname> Mark</firstname> <surname> Mutz</surname> <contrib>Developer</contrib>
+<affiliation> <address> <email>mutz@kde.org</email> </address> </affiliation>
 </othercredit>
 
-<othercredit role="developer"
-><firstname
-> Roberto</firstname
-> <surname
-> Teixeira</surname
-> <contrib
->Developer</contrib>
-<affiliation
-> <address
-> <email
->roberto@kde.org</email
-> </address
-> </affiliation>
+<othercredit role="developer"><firstname> Roberto</firstname> <surname> Teixeira</surname> <contrib>Developer</contrib>
+<affiliation> <address> <email>roberto@kde.org</email> </address> </affiliation>
 </othercredit>
 
-<othercredit role="developer"
-><firstname
-> Mathias</firstname
-> <surname
-> Waack</surname
-> <contrib
->Developer</contrib>
-<affiliation
-> <address
-> <email
->mathias@atoll-net.de</email
-> </address
-> </affiliation>
+<othercredit role="developer"><firstname> Mathias</firstname> <surname> Waack</surname> <contrib>Developer</contrib>
+<affiliation> <address> <email>mathias@atoll-net.de</email> </address> </affiliation>
 </othercredit>
 
 </authorgroup>
 
 <copyright>
-<year
-> 2000</year
-><year
->2001</year
-><year
->2002</year>
-<holder
->Stephan Johach</holder>
-<holder
->Thomas Schütz</holder>
+<year> 2000</year><year>2001</year><year>2002</year>
+<holder>Stephan Johach</holder>
+<holder>Thomas Schütz</holder>
 </copyright>
 
-<date
->2002-04-13</date>
-<releaseinfo
->0.07.00</releaseinfo>
+<date>2002-04-13</date>
+<releaseinfo>0.07.00</releaseinfo>
 
 <!-- Abstract about this handbook -->
 
 <abstract>
-<para
->&knode; is an easy-to-use newsreader.</para>
+<para>&knode; is an easy-to-use newsreader.</para>
 </abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KNode</keyword>
-<keyword
->tdenetwork</keyword>
-<keyword
->newsreader</keyword>
+<keyword>KDE</keyword>
+<keyword>KNode</keyword>
+<keyword>tdenetwork</keyword>
+<keyword>newsreader</keyword>
 </keywordset>
 </bookinfo>
 
@@ -189,11 +88,8 @@
 
 <!-- Using chapter is too big to put in one of it's own, so breaking down to sect1 level -->
 
-<chapter id="using-knode"
-> 
-<title
->Working with &knode;</title
-> &using-firststart; &using-subscribing; &using-morefeatures; </chapter>
+<chapter id="using-knode"> 
+<title>Working with &knode;</title> &using-firststart; &using-subscribing; &using-morefeatures; </chapter>
 
 &commands;
 
diff --git a/tde-i18n-en_GB/docs/tdepim/knode/install.docbook b/tde-i18n-en_GB/docs/tdepim/knode/install.docbook
index cf090ca7246..b8ffb1d4fb2 100644
--- a/tde-i18n-en_GB/docs/tdepim/knode/install.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knode/install.docbook
@@ -1,59 +1,34 @@
-<appendix id="installation"
-> 
-<title
->Installation</title
-> 
-
-<sect1 id="getting-knode"
-> 
-<title
->Where do I get &knode;?</title
-> &install.intro.documentation; </sect1
-> 
-
-<sect1 id="requirements"
-> 
-<title
->Requirements</title
-> 
+<appendix id="installation"> 
+<title>Installation</title> 
+
+<sect1 id="getting-knode"> 
+<title>Where do I get &knode;?</title> &install.intro.documentation; </sect1> 
+
+<sect1 id="requirements"> 
+<title>Requirements</title> 
 <anchor id="anc-requirements"/> 
 
-<para
->If you want to successfully install &knode;, you need &kde; 3.x; if, in addition, you want to use &knode; as an offline newsreader, you need a local news server, &eg; <ulink url="http://www.leafnode.org"
-><application
->leafnode</application
-></ulink
->.</para>
-</sect1
-> 
+<para>If you want to successfully install &knode;, you need &kde; 3.x; if, in addition, you want to use &knode; as an offline newsreader, you need a local news server, &eg; <ulink url="http://www.leafnode.org"><application>leafnode</application></ulink>.</para>
+</sect1> 
 
 <sect1 id="compilation">
-<title
->Compile and install</title>
+<title>Compile and install</title>
 
-<para
->&knode; is part of the tdenetwork package of &kde; 3.x and is installed together with it, provided you have chosen to install the tdenetwork package; so, in general, there is no need for a user to compile the sources of &knode;.</para>
+<para>&knode; is part of the tdenetwork package of &kde; 3.x and is installed together with it, provided you have chosen to install the tdenetwork package; so, in general, there is no need for a user to compile the sources of &knode;.</para>
 &install.compile.documentation; </sect1>
 
 <sect1 id="update-installation">
-<title
->Notes about updating an older version of &knode;</title>
+<title>Notes about updating an older version of &knode;</title>
 
-<para
->This section contains notes about what to take care of when installing a newer version of &knode; with an older version already installed.</para>
+<para>This section contains notes about what to take care of when installing a newer version of &knode; with an older version already installed.</para>
 
 <sect2 id="update-file-changes">
-<title
->Changes in configuration files and folders</title>
+<title>Changes in configuration files and folders</title>
 
-<para
->Since version 0.2 the format of the configuration files and the saved articles has changed, so unfortunately, your old configuration files cannot be imported.</para>
+<para>Since version 0.2 the format of the configuration files and the saved articles has changed, so unfortunately, your old configuration files cannot be imported.</para>
 
-<para
->If you update from a version 
->= 0.4 the local folders will automatically be converted into the new format; you will then be unable to use the data with an older version of &knode; any more.</para>
+<para>If you update from a version >= 0.4 the local folders will automatically be converted into the new format; you will then be unable to use the data with an older version of &knode; any more.</para>
 </sect2>
 
 </sect1>
-</appendix
-> 
\ No newline at end of file
+</appendix> 
\ No newline at end of file
diff --git a/tde-i18n-en_GB/docs/tdepim/knode/introduction.docbook b/tde-i18n-en_GB/docs/tdepim/knode/introduction.docbook
index 5314b187e1d..36d662df074 100644
--- a/tde-i18n-en_GB/docs/tdepim/knode/introduction.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knode/introduction.docbook
@@ -1,61 +1,31 @@
 <!-- <?xml version="1.0" ?> 
-<!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd"
-> -->
-<chapter id="introduction"
-> 
-<title
->Introduction</title
-> 
+<!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd"> -->
+<chapter id="introduction"> 
+<title>Introduction</title> 
 <anchor id="anc-introduction"/> 
 
-<para
->&knode; is an easy-to-use, convenient newsreader; it is intended to allow even newbies to use a newsreader under &kde;, but it also offers advanced features appealing to experienced users. &knode; is a online-reader but could work together with a newsserver like <application
->leafnode</application
-> as an offline-reader.</para>
+<para>&knode; is an easy-to-use, convenient newsreader; it is intended to allow even newbies to use a newsreader under &kde;, but it also offers advanced features appealing to experienced users. &knode; is a online-reader but could work together with a newsserver like <application>leafnode</application> as an offline-reader.</para>
 
-<para
->As of version 0.4 &knode; complies with all the requirements of the <glossterm
->GNKSA</glossterm
->.</para>
+<para>As of version 0.4 &knode; complies with all the requirements of the <glossterm>GNKSA</glossterm>.</para>
 
-<para
->If you have problems or questions about this program, please contact the mailing list for &kde; users (for subscription, see<ulink url="http://www.kde.org/contact.html"
->Homepage of the &kde; mailing lists</ulink
-> ) or one of the &kde; newsgroups:</para>
+<para>If you have problems or questions about this program, please contact the mailing list for &kde; users (for subscription, see<ulink url="http://www.kde.org/contact.html">Homepage of the &kde; mailing lists</ulink> ) or one of the &kde; newsgroups:</para>
 
 <simplelist>
-<member
->comp.windows.x.kde</member>
-<member
->de.comp.os.unix.apps.kde (german)</member>
+<member>comp.windows.x.kde</member>
+<member>de.comp.os.unix.apps.kde (german)</member>
 </simplelist>
 
-<para
->If you have found a bug or have suggestions regarding the functionality of &knode; please report them via the <menuchoice
-><guimenu
->Help</guimenu
-><guimenuitem
->Report bug...</guimenuitem
-></menuchoice
-> menu.</para>
-
-<para
->Please make sure when asking questions in the newsgroups and mailing lists mentioned above that the question you are asking is not answered in this manual.</para>
-
-<para
->For those new to reading news and posting articles, the <link linkend="knode-journey"
->A journey through Usenet</link
-> chapter is recommended; it is not so much about &knode; as how to move about in the Usenet with its help. In general, it is not sufficient to just master a news reader for writing news articles: imagine a car driver who masters his car perfectly but does not know about the traffic rules or signs; do you want to encounter such a driver when out in traffic? So please take your time to learn at least a little about the <quote
->traffic rules</quote
-> of the Usenet; the other participants will thank you.</para>
+<para>If you have found a bug or have suggestions regarding the functionality of &knode; please report them via the <menuchoice><guimenu>Help</guimenu><guimenuitem>Report bug...</guimenuitem></menuchoice> menu.</para>
+
+<para>Please make sure when asking questions in the newsgroups and mailing lists mentioned above that the question you are asking is not answered in this manual.</para>
+
+<para>For those new to reading news and posting articles, the <link linkend="knode-journey">A journey through Usenet</link> chapter is recommended; it is not so much about &knode; as how to move about in the Usenet with its help. In general, it is not sufficient to just master a news reader for writing news articles: imagine a car driver who masters his car perfectly but does not know about the traffic rules or signs; do you want to encounter such a driver when out in traffic? So please take your time to learn at least a little about the <quote>traffic rules</quote> of the Usenet; the other participants will thank you.</para>
 
 <tip>
-<para
->&knode; supports you in many cases with hints and warnings: if you do not simply ignore them you will avoid many beginners' mistakes; but, do not exclusively depend on them either.</para>
+<para>&knode; supports you in many cases with hints and warnings: if you do not simply ignore them you will avoid many beginners' mistakes; but, do not exclusively depend on them either.</para>
 </tip>
 
-<para
->Please address suggestions and criticisms at the author or at the responsible translator for your language.</para>
+<para>Please address suggestions and criticisms at the author or at the responsible translator for your language.</para>
 
 </chapter>
 
diff --git a/tde-i18n-en_GB/docs/tdepim/knode/journey.docbook b/tde-i18n-en_GB/docs/tdepim/knode/journey.docbook
index e1141d9136c..5b6d3b6223f 100644
--- a/tde-i18n-en_GB/docs/tdepim/knode/journey.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knode/journey.docbook
@@ -1,574 +1,376 @@
 <!-- <?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="knode-journey"
-> 
-<title
->A journey in the World of Newsgroups</title
-> 
+<chapter id="knode-journey"> 
+<title>A journey in the World of Newsgroups</title> 
 
 <anchor id="anc-knode-journey"/> 
 
-<para
->This chapter is supposed to be glance over the World of Newsgroups and their <quote
->inhabitants</quote
->; someone who has never dared to go there before will encounter some strange customs, which may give you a feeling of being a lonely alien without backup; but stay calm, it is not like this. The Usenet is a meeting place for all kinds of normal and not-so-normal folks; it is here where they are distributing a lot of information but also gossip and other stuff.</para>
-
-<tip
-> 
-<para
->References to more detailed and qualified essays on the Usenet can be found at <link linkend="knode-more-info"
->More Resources</link
-></para>
-</tip
-> 
-
-<sect1 id="about-news"
-> 
-<title
->What are ...</title
-> 
+<para>This chapter is supposed to be glance over the World of Newsgroups and their <quote>inhabitants</quote>; someone who has never dared to go there before will encounter some strange customs, which may give you a feeling of being a lonely alien without backup; but stay calm, it is not like this. The Usenet is a meeting place for all kinds of normal and not-so-normal folks; it is here where they are distributing a lot of information but also gossip and other stuff.</para>
+
+<tip> 
+<para>References to more detailed and qualified essays on the Usenet can be found at <link linkend="knode-more-info">More Resources</link></para>
+</tip> 
+
+<sect1 id="about-news"> 
+<title>What are ...</title> 
 <anchor id="anc-about-news"/>
 
-<sect2
-> 
-<title
->... online-readers?</title
-> 
+<sect2> 
+<title>... online-readers?</title> 
 
-<para
->An online-reader connects to a newsserver and gives you access to its content. &knode; is an online-reader: you are reading your News and publishing your own <glossterm
->articles</glossterm
-> while the online-reader stays connected.</para>
+<para>An online-reader connects to a newsserver and gives you access to its content. &knode; is an online-reader: you are reading your News and publishing your own <glossterm>articles</glossterm> while the online-reader stays connected.</para>
 
-</sect2
-> 
+</sect2> 
 
-<sect2
-> 
-<title
->... offline-readers?</title
-> 
+<sect2> 
+<title>... offline-readers?</title> 
 
-<para
->An offline-reader connects to the Server and fetches only the headers of new articles; then, the connection is closed and you can mark (offline) the articles you are really interested in. When you connect next time the offline-reader fetches the articles you marked and sends the articles you have written whilst offline.</para>
+<para>An offline-reader connects to the Server and fetches only the headers of new articles; then, the connection is closed and you can mark (offline) the articles you are really interested in. When you connect next time the offline-reader fetches the articles you marked and sends the articles you have written whilst offline.</para>
 
-<para
->There is no connection while you are reading or writing articles.</para>
+<para>There is no connection while you are reading or writing articles.</para>
 
-</sect2
-> 
+</sect2> 
 
-<sect2
-> 
-<title
->... newsgroups?</title
-> 
+<sect2> 
+<title>... newsgroups?</title> 
 
-<para
->You can look at newsgroups as public bulletin boards and forums, where everybody is allowed to participate. Articles you have published in a newsgroup can be read by everybody subscribed to this newsgroup and, normally, everybody is allowed to publish their articles in a newsgroup.</para>
+<para>You can look at newsgroups as public bulletin boards and forums, where everybody is allowed to participate. Articles you have published in a newsgroup can be read by everybody subscribed to this newsgroup and, normally, everybody is allowed to publish their articles in a newsgroup.</para>
 
-</sect2
-> 
+</sect2> 
 
 <sect2>
-<title
->... news?</title
-> 
+<title>... news?</title> 
 
-<para
->News is the collective term for articles published in a newsgroup.</para
-> 
+<para>News is the collective term for articles published in a newsgroup.</para> 
 
-</sect2
-> 
+</sect2> 
 
-<sect2
-> 
-<title
->... threads?</title
-> 
+<sect2> 
+<title>... threads?</title> 
 
-<para
->A thread is a topic of discussion in a newsgroup.</para>
+<para>A thread is a topic of discussion in a newsgroup.</para>
 
-</sect2
-> 
-</sect1
-> 
+</sect2> 
+</sect1> 
 
-<sect1 id="nettiquette"
-> 
-<title
->Online Manners</title
-> 
+<sect1 id="nettiquette"> 
+<title>Online Manners</title> 
 
 <anchor id="anc-nettiquette"/> 
 
-<para
->There are lot of different people meeting and talking in newsgroups; it is seen as some kind of courtesy to obey some rules of manner, the basics of which are listed here.</para>
-
-<orderedlist
-> 
-<listitem
-> 
-<para
->Before you ask questions be sure you have read the newsgroup's <acronym
->FAQ</acronym
-> (Frequently Asked Questions) and didn't find the answer.</para>
-</listitem
-> 
-<listitem
-> 
-<para
->If you take part in a discussion be aware of the fact that everybody can read the answer: do not say anything that you would not say to the others if you were facing them; avoid insults.</para>
-</listitem
-> 
-<listitem
-> 
-<para
->Try to avoid crossposting: do not ask a question in more than one newsgroup when you do not know which is the right one. Ask in one newsgroup; if it is wrong, you will be told which is right one.</para>
-</listitem
-> 
-<listitem
-> 
-<para
->Formulate your articles accurately; nobody likes to read an article with lots of typos, even with content worth a Pulitzer. Think of your articles as letters: your letter speaks for you; it represents you; somebody reading your article will draw conclusions about you from it, wrong or right.</para>
-</listitem
-> 
-<listitem
-> 
-<para
->Remember, nobody sees your grin when you are writing an ironic sentence: it may be funny for you, but it can be very serious for the person reading it. It is very difficult to include emotions in an article.</para>
-</listitem
-> 
-<listitem
-> 
-<para
->The most important rule: use your common sense when you are answering or publishing an article.</para>
-</listitem
-> 
-</orderedlist
-> 
-
-</sect1
-> 
-
-<sect1 id="usenet-slang"
-> 
-<title
->The Usenet language</title
-> 
+<para>There are lot of different people meeting and talking in newsgroups; it is seen as some kind of courtesy to obey some rules of manner, the basics of which are listed here.</para>
+
+<orderedlist> 
+<listitem> 
+<para>Before you ask questions be sure you have read the newsgroup's <acronym>FAQ</acronym> (Frequently Asked Questions) and didn't find the answer.</para>
+</listitem> 
+<listitem> 
+<para>If you take part in a discussion be aware of the fact that everybody can read the answer: do not say anything that you would not say to the others if you were facing them; avoid insults.</para>
+</listitem> 
+<listitem> 
+<para>Try to avoid crossposting: do not ask a question in more than one newsgroup when you do not know which is the right one. Ask in one newsgroup; if it is wrong, you will be told which is right one.</para>
+</listitem> 
+<listitem> 
+<para>Formulate your articles accurately; nobody likes to read an article with lots of typos, even with content worth a Pulitzer. Think of your articles as letters: your letter speaks for you; it represents you; somebody reading your article will draw conclusions about you from it, wrong or right.</para>
+</listitem> 
+<listitem> 
+<para>Remember, nobody sees your grin when you are writing an ironic sentence: it may be funny for you, but it can be very serious for the person reading it. It is very difficult to include emotions in an article.</para>
+</listitem> 
+<listitem> 
+<para>The most important rule: use your common sense when you are answering or publishing an article.</para>
+</listitem> 
+</orderedlist> 
+
+</sect1> 
+
+<sect1 id="usenet-slang"> 
+<title>The Usenet language</title> 
 <anchor id="anc-usenet-slang"/> 
 
-<para
->You will not be surprised about English being the main language on the Usenet; however, there are special trees for German (de.*), French (fr.*) and many other languages. If you are unable to determine the main language of a newsgroup the only possibility is careful listening or a possible explanation in the description of the group in the grouplist.</para>
+<para>You will not be surprised about English being the main language on the Usenet; however, there are special trees for German (de.*), French (fr.*) and many other languages. If you are unable to determine the main language of a newsgroup the only possibility is careful listening or a possible explanation in the description of the group in the grouplist.</para>
 
-<para
->In addition, over the time the Usenet has developed its own language but it is easy to learn.</para>
+<para>In addition, over the time the Usenet has developed its own language but it is easy to learn.</para>
 
-<sect2
-> 
-<title
-><acronym
->RTFM</acronym
-> and other typos</title
-> 
+<sect2> 
+<title><acronym>RTFM</acronym> and other typos</title> 
 
-<para
->When you read news, after some time you will read some strange combinations of letters; for example, you can get a reply like:</para>
+<para>When you read news, after some time you will read some strange combinations of letters; for example, you can get a reply like:</para>
 
-<para
->RTFM</para
-> 
+<para>RTFM</para> 
 
-<para
->Nothing else. Strange, but absolutely intended; to solve the riddle: those, most of the time, are shortcuts, acronyms. It is easier to drop some letters than to write the same sentence over and over again.</para>
+<para>Nothing else. Strange, but absolutely intended; to solve the riddle: those, most of the time, are shortcuts, acronyms. It is easier to drop some letters than to write the same sentence over and over again.</para>
 
-<para
->But what is the meaning of <acronym
->RTFM</acronym
->? The writer is asking you to read the manual, documentation or <acronym
->FAQ</acronym
-> before asking questions in the newsgroup. It stands for: (R)ead (T)he (F)...ing (M)anual; <acronym
->BTW</acronym
-> this is advice you should adopt.</para>
+<para>But what is the meaning of <acronym>RTFM</acronym>? The writer is asking you to read the manual, documentation or <acronym>FAQ</acronym> before asking questions in the newsgroup. It stands for: (R)ead (T)he (F)...ing (M)anual; <acronym>BTW</acronym> this is advice you should adopt.</para>
 
-<para
->Wait, what is <acronym
->BTW</acronym
-> now? Another often-seen acronym which means (B)y (T)he (W)ay. It is easy when you know it; to avoid you having to continuously speculate over the meaning of acronyms there is table at he end of this section containing the most-often-used acronyms.</para>
+<para>Wait, what is <acronym>BTW</acronym> now? Another often-seen acronym which means (B)y (T)he (W)ay. It is easy when you know it; to avoid you having to continuously speculate over the meaning of acronyms there is table at he end of this section containing the most-often-used acronyms.</para>
 
-<para
->This table does not try to be complete and is based on a list by Martin Imlau.</para>
+<para>This table does not try to be complete and is based on a list by Martin Imlau.</para>
 
 <table>
-<title
->Acronyms on Usenet</title>
+<title>Acronyms on Usenet</title>
 <tgroup cols="2">
 <thead>
 <row>
-<entry
->Acronym</entry>
-<entry
->Meaning</entry>
+<entry>Acronym</entry>
+<entry>Meaning</entry>
 </row>
 </thead>
 <!--TRANSLATORS: Write the translation in the second column in brackets! -->
 <tbody>
 <row>
-<entry
->&lt;g&gt;</entry>
-<entry
->grins</entry>
+<entry>&lt;g&gt;</entry>
+<entry>grins</entry>
 </row>
 <row>
 <entry>
-<acronym
->AAMOF</acronym>
+<acronym>AAMOF</acronym>
 </entry>
-<entry
->As a matter of fact</entry>
+<entry>As a matter of fact</entry>
 </row>
 <row>
 <entry>
-<acronym
->ACK</acronym>
+<acronym>ACK</acronym>
 </entry>
-<entry
->Acknowledge</entry>
+<entry>Acknowledge</entry>
 </row>
 <row>
 <entry>
-<acronym
->AFAIK</acronym>
+<acronym>AFAIK</acronym>
 </entry>
-<entry
->As far as I know</entry>
+<entry>As far as I know</entry>
 </row>
 <row>
 <entry>
-<acronym
->AFAIR</acronym>
+<acronym>AFAIR</acronym>
 </entry>
-<entry
->As far as I remember</entry>
+<entry>As far as I remember</entry>
 </row>
 <row>
 <entry>
-<acronym
->AWGTHTGTTA</acronym>
+<acronym>AWGTHTGTTA</acronym>
 </entry>
-<entry
->Are we going to have to go through this again?</entry>
+<entry>Are we going to have to go through this again?</entry>
 </row>
 <row>
 <entry>
-<acronym
->ASAP</acronym>
+<acronym>ASAP</acronym>
 </entry>
-<entry
->As soon as possible</entry>
+<entry>As soon as possible</entry>
 </row>
 <row>
 <entry>
-<acronym
->BFN</acronym>
+<acronym>BFN</acronym>
 </entry>
-<entry
->Bye for now!</entry>
+<entry>Bye for now!</entry>
 </row>
 <row>
 <entry>
-<acronym
->BTW</acronym>
+<acronym>BTW</acronym>
 </entry>
-<entry
->By the way</entry>
+<entry>By the way</entry>
 </row>
 <row>
 <entry>
-<acronym
->BYKT</acronym>
+<acronym>BYKT</acronym>
 </entry>
-<entry
->But you knew that</entry>
+<entry>But you knew that</entry>
 </row>
 <row>
 <entry>
-<acronym
->CMIIW</acronym>
+<acronym>CMIIW</acronym>
 </entry>
-<entry
->Correct me if I'm wrong</entry>
+<entry>Correct me if I'm wrong</entry>
 </row>
 <row>
 <entry>
-<acronym
->CU</acronym>
+<acronym>CU</acronym>
 </entry>
-<entry
->See you!</entry>
+<entry>See you!</entry>
 </row>
 <row>
 <entry>
-<acronym
->CU2</acronym>
+<acronym>CU2</acronym>
 </entry>
-<entry
->See you too!</entry>
+<entry>See you too!</entry>
 </row>
 <row>
 <entry>
-<acronym
->CYL</acronym>
+<acronym>CYL</acronym>
 </entry>
-<entry
->See you later!</entry>
+<entry>See you later!</entry>
 </row>
 <row>
 <entry>
-<acronym
->DAU</acronym>
+<acronym>DAU</acronym>
 </entry>
-<entry
->German abbreviation for the silliest user you can imagine (DÃ¼mmster anzunehmender User)</entry>
+<entry>German abbreviation for the silliest user you can imagine (DÃ¼mmster anzunehmender User)</entry>
 </row>
 <row>
 <entry>
-<acronym
->EOD</acronym>
+<acronym>EOD</acronym>
 </entry>
-<entry
->End of discussion</entry>
+<entry>End of discussion</entry>
 </row>
 <row>
 <entry>
-<acronym
->ESOSL</acronym>
+<acronym>ESOSL</acronym>
 </entry>
-<entry
->Endless snorts of stupid laughter</entry>
+<entry>Endless snorts of stupid laughter</entry>
 </row>
 <row>
 <entry>
-<acronym
->FYI</acronym>
+<acronym>FYI</acronym>
 </entry>
-<entry
->For your information</entry>
+<entry>For your information</entry>
 </row>
 <row>
 <entry>
-<acronym
->GOK</acronym>
+<acronym>GOK</acronym>
 </entry>
-<entry
->God only knows</entry>
+<entry>God only knows</entry>
 </row>
 <row>
 <entry>
-<acronym
->HAND</acronym>
+<acronym>HAND</acronym>
 </entry>
-<entry
->Have a nice day!</entry>
+<entry>Have a nice day!</entry>
 </row>
 <row>
 <entry>
-<acronym
->HTH</acronym>
+<acronym>HTH</acronym>
 </entry>
-<entry
->Hope that helps</entry>
+<entry>Hope that helps</entry>
 </row>
 <row>
 <entry>
-<acronym
->HSIK</acronym>
+<acronym>HSIK</acronym>
 </entry>
-<entry
->How should I know?</entry>
+<entry>How should I know?</entry>
 </row>
 <row>
 <entry>
-<acronym
->IAE</acronym>
+<acronym>IAE</acronym>
 </entry>
-<entry
->In any event</entry>
+<entry>In any event</entry>
 </row>
 <row>
 <entry>
-<acronym
->IANAL</acronym>
+<acronym>IANAL</acronym>
 </entry>
-<entry
->I am not a lawyer</entry>
+<entry>I am not a lawyer</entry>
 </row>
 <row>
 <entry>
-<acronym
->IIRC</acronym>
+<acronym>IIRC</acronym>
 </entry>
-<entry
->If I remember correctly</entry>
+<entry>If I remember correctly</entry>
 </row>
 <row>
 <entry>
-<acronym
->IMCO</acronym>
+<acronym>IMCO</acronym>
 </entry>
-<entry
->In my considered opinion</entry>
+<entry>In my considered opinion</entry>
 </row>
 <row>
 <entry>
-<acronym
->IMHO</acronym>
+<acronym>IMHO</acronym>
 </entry>
-<entry
->In my humble opinion</entry>
+<entry>In my humble opinion</entry>
 </row>
 <row>
 <entry>
-<acronym
->IMNSHO</acronym>
+<acronym>IMNSHO</acronym>
 </entry>
-<entry
->In my not so humble opinion</entry>
+<entry>In my not so humble opinion</entry>
 </row>
 <row>
 <entry>
-<acronym
->INPO</acronym>
+<acronym>INPO</acronym>
 </entry>
-<entry
->In no particular order</entry>
+<entry>In no particular order</entry>
 </row>
 <row>
 <entry>
-<acronym
->IOW</acronym>
+<acronym>IOW</acronym>
 </entry>
-<entry
->In other words</entry>
+<entry>In other words</entry>
 </row>
 <row>
 <entry>
-<acronym
->LMAO</acronym>
+<acronym>LMAO</acronym>
 </entry>
-<entry
->Laughing my ass off</entry>
+<entry>Laughing my ass off</entry>
 </row>
 <row>
 <entry>
-<acronym
->LOL</acronym>
+<acronym>LOL</acronym>
 </entry>
-<entry
->Laughing out loudly</entry>
+<entry>Laughing out loudly</entry>
 </row>
 <row>
 <entry>
-<acronym
->NAK</acronym>
+<acronym>NAK</acronym>
 </entry>
-<entry
->Not acknowledged</entry>
+<entry>Not acknowledged</entry>
 </row>
 <row>
 <entry>
-<acronym
->NBD</acronym>
+<acronym>NBD</acronym>
 </entry>
-<entry
->No big deal</entry>
+<entry>No big deal</entry>
 </row>
 <row>
 <entry>
-<acronym
->NFW</acronym>
+<acronym>NFW</acronym>
 </entry>
-<entry
->No f...ing way</entry>
+<entry>No f...ing way</entry>
 </row>
 <row>
 <entry>
-<acronym
->ROTFL</acronym>
+<acronym>ROTFL</acronym>
 </entry>
-<entry
->Rolling on the floor, laughing</entry>
+<entry>Rolling on the floor, laughing</entry>
 </row>
 <row>
 <entry>
-<acronym
->RTFM</acronym>
+<acronym>RTFM</acronym>
 </entry>
-<entry
->Read the f...ing manual</entry>
+<entry>Read the f...ing manual</entry>
 </row>
 <row>
 <entry>
-<acronym
->SCNR</acronym>
+<acronym>SCNR</acronym>
 </entry>
-<entry
->Sorry, could not resist</entry>
+<entry>Sorry, could not resist</entry>
 </row>
 <row>
 <entry>
-<acronym
->TIA</acronym>
+<acronym>TIA</acronym>
 </entry>
-<entry
->Thanks in advance</entry>
-</row
-> 
-</tbody
-> 
-</tgroup
-> 
-</table
-> 
-</sect2
-> 
+<entry>Thanks in advance</entry>
+</row> 
+</tbody> 
+</tgroup> 
+</table> 
+</sect2> 
 
-<sect2
-> 
-<title
->Smile!</title
-> 
+<sect2> 
+<title>Smile!</title> 
 
-<para
->Again, such a strange thing. What is this ;-) meant to be? Turn your head so the left side of your screen is on top; got it? It's a smile with a wink? This is a so-called emoticon; emoticons are an often-used possibility to express emotions, one thing missing in conversation on the Usenet (but there is a substitute, remember? ;-)</para>
+<para>Again, such a strange thing. What is this ;-) meant to be? Turn your head so the left side of your screen is on top; got it? It's a smile with a wink? This is a so-called emoticon; emoticons are an often-used possibility to express emotions, one thing missing in conversation on the Usenet (but there is a substitute, remember? ;-)</para>
 
-<para
->It is very difficult to express emotions in email or news; your joking comment appear to be very serious to the recipient and can lead to unmeant reactions or conflicts (flames); so use emoticons to express your intention.</para>
+<para>It is very difficult to express emotions in email or news; your joking comment appear to be very serious to the recipient and can lead to unmeant reactions or conflicts (flames); so use emoticons to express your intention.</para>
 
-<para
->There are a lots of emoticons, which express a great variety of emotions; the interpretation is easy if you turn your head and think of a face.</para>
+<para>There are a lots of emoticons, which express a great variety of emotions; the interpretation is easy if you turn your head and think of a face.</para>
 
-</sect2
-> 
+</sect2> 
 
-<sect2
-> 
-<title
->PLONK!</title
-> 
+<sect2> 
+<title>PLONK!</title> 
 
-<para
->This PLONK! looks like some comic-sound, does it not? And that is exactly what it is used for. The one who reads it knows he was just added to the killfile of a newsreader; normally this means the recipient of the PLONK! annoyed the sender. The PLONK! is meant to play back the sound of the recipients name hitting the ground in the <glossterm
->killfile</glossterm
->.</para>
-</sect2
-> 
-</sect1
-> 
+<para>This PLONK! looks like some comic-sound, does it not? And that is exactly what it is used for. The one who reads it knows he was just added to the killfile of a newsreader; normally this means the recipient of the PLONK! annoyed the sender. The PLONK! is meant to play back the sound of the recipients name hitting the ground in the <glossterm>killfile</glossterm>.</para>
+</sect2> 
+</sect1> 
 
-</chapter
-> 
+</chapter> 
diff --git a/tde-i18n-en_GB/docs/tdepim/knode/more.docbook b/tde-i18n-en_GB/docs/tdepim/knode/more.docbook
index 42f158404df..64b6a2c9bab 100644
--- a/tde-i18n-en_GB/docs/tdepim/knode/more.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knode/more.docbook
@@ -1,230 +1,84 @@
 <!-- <?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="knode-more-info"
-> 
-<title
->Further Information</title
-> 
+<chapter id="knode-more-info"> 
+<title>Further Information</title> 
 <anchor id="anc-knode-more-info"/> 
 <!-- TRANSLATORS! Please modify this chapter for your language specific needs --> 
 
-<para
->In this section we will detail some additional information resources which could be useful to you. Many of the articles listed below (for which <acronym
->URL</acronym
->s are given) are posted to news groups regularly; some of those groups are also listed here.</para>
+<para>In this section we will detail some additional information resources which could be useful to you. Many of the articles listed below (for which <acronym>URL</acronym>s are given) are posted to news groups regularly; some of those groups are also listed here.</para>
  
-<sect1 id="infos-newsgroups"
-> 
-<title
->Informative Newsgroups</title
-> 
+<sect1 id="infos-newsgroups"> 
+<title>Informative Newsgroups</title> 
 
 <anchor id="anc-infos-newsgroups"/> 
-<simplelist
-> 
-<member
->news.answers</member
-> 
-<member
->news.newusers.questions</member
-> 
-<member
->de.newsusers.infos (German)</member
-> 
-<member
->de.answers (German)</member
-> 
-<member
->de.comp.os.unix.linux.infos (German)</member
-> 
-<member
->de.newusers.answers (German)</member
-> 
-<member
->de.newusers.questions (German)</member
-> 
-</simplelist
-> 
-
-<para
->For beginners it is especially recommended to read these articles at least partially: informed users have strong advantages in news groups. There are some more-specialized news groups where <acronym
->FAQ</acronym
->s and introductory <glossterm
->articles</glossterm
-> are posted frequently, &eg; the <glossterm
->newsgroup</glossterm
-> de.comp.os.unix.linux.infos (German), which contains a lot of useful articles about the &Linux; operating system. Just have a look on the group list of your newsserver for it.</para>
-
-</sect1
-> 
-
-<sect1 id="infos-testgroups"
-> 
-<title
->Test Groups</title
-> 
+<simplelist> 
+<member>news.answers</member> 
+<member>news.newusers.questions</member> 
+<member>de.newsusers.infos (German)</member> 
+<member>de.answers (German)</member> 
+<member>de.comp.os.unix.linux.infos (German)</member> 
+<member>de.newusers.answers (German)</member> 
+<member>de.newusers.questions (German)</member> 
+</simplelist> 
+
+<para>For beginners it is especially recommended to read these articles at least partially: informed users have strong advantages in news groups. There are some more-specialized news groups where <acronym>FAQ</acronym>s and introductory <glossterm>articles</glossterm> are posted frequently, &eg; the <glossterm>newsgroup</glossterm> de.comp.os.unix.linux.infos (German), which contains a lot of useful articles about the &Linux; operating system. Just have a look on the group list of your newsserver for it.</para>
+
+</sect1> 
+
+<sect1 id="infos-testgroups"> 
+<title>Test Groups</title> 
 
 <anchor id="anc-infos-testgroups"/> 
 
-<para
->The following groups were created especially for testing, &ie; after successfully configuring &knode; you should post some articles to those groups to test your settings.</para>
-
-<para
->Some groups support automatic replies through email to enable you to test whether your entered identity is correct and mail-replies actually arrive in your mailbox.</para>
-
-<para
->In addition, some scripts are offered which check your articles for erroneous settings and generate a followup with useful hints.</para
-> 
-
-<simplelist
-> 
-<member
->de.test (German test newsgroup)</member
-> 
-<member
->misc.test</member
-> 
-<member
->alt.test</member
-> 
-<member
->alt.test.ignore</member
-> 
-</simplelist
-> 
-</sect1
-> 
-
-<sect1 id="infos-urls"
-> 
-<title
->Informative technical articles in the world wide web</title
-> 
+<para>The following groups were created especially for testing, &ie; after successfully configuring &knode; you should post some articles to those groups to test your settings.</para>
+
+<para>Some groups support automatic replies through email to enable you to test whether your entered identity is correct and mail-replies actually arrive in your mailbox.</para>
+
+<para>In addition, some scripts are offered which check your articles for erroneous settings and generate a followup with useful hints.</para> 
+
+<simplelist> 
+<member>de.test (German test newsgroup)</member> 
+<member>misc.test</member> 
+<member>alt.test</member> 
+<member>alt.test.ignore</member> 
+</simplelist> 
+</sect1> 
+
+<sect1 id="infos-urls"> 
+<title>Informative technical articles in the world wide web</title> 
 
 <anchor id="anc-infos-urls"/> 
 
-<para
->These <acronym
->URL</acronym
->s are from the corresponding article in the <glossterm
->newsgroup</glossterm
-> <emphasis
->de.newusers.infos</emphasis
-> and have the same contents as the articles posted there.</para>
-
-<simplelist
-> 
-<member
->Introduction for de.newusers.infos: <ulink url="http://www.kirchwitz.de/~amk/dni/einleitung"
->http://www.kirchwitz.de/~amk/dni/einleitung</ulink
-> (German)</member
-> 
-<member
->The newsgroups of the de.alt hierarchy: <ulink url="http://www.kirchwitz.de/~amk/dni/de-alt-newsgruppen"
-> http://www.kirchwitz.de/~amk/dni/de-alt-newsgruppen</ulink
-> (German)</member
-> 
-<member
->The newsgroups of the de-hierarchy: <ulink url="http://www.kirchwitz.de/~amk/dni/de-newsgruppen"
->http://www.kirchwitz.de/~amk/dni/de-newsgruppen</ulink
-> (German)</member
-> 
-<member
->First read, then post: <ulink url="http://www.kirchwitz.de/~amk/dni/erst-lesen-dann-schreiben"
->http://www.kirchwitz.de/~amk/dni/erst-lesen-dann-schreiben</ulink
-> (German)</member
-> 
-<member
->First steps in the usenet: <ulink url="http://www.kirchwitz.de/~amk/dni/erste-schritte"
->http://www.kirchwitz.de/~amk/dni/erste-schritte</ulink
-> (German)</member>
-<member
->Questions and answers from de.newusers.questions: <ulink url="http://www.kirchwitz.de/~amk/dni/faq"
->http://www.kirchwitz.de/~amk/dni/faq</ulink
-> (German)</member
-> 
-<member
->Seven theses about behaviour in the internet: <ulink url="http://www.kirchwitz.de/~amk/dni/hoeflichkeit"
->http://www.kirchwitz.de/~amk/dni/hoeflichkeit</ulink
-> (German)</member
-> 
-<member
->Introduction to the usenet: <ulink url="http://www.kirchwitz.de/~amk/dni/usenet-einfuehrung"
->http://www.kirchwitz.de/~amk/dni/usenet-einfuehrung</ulink
-> (German)</member
-> 
-<member
->Why should I take the rules seriously? <ulink url="http://www.kirchwitz.de/~amk/dni/warum-regel"
->http://www.kirchwitz.de/~amk/dni/warum-regel</ulink
-> (German)</member
-> 
-<member
->The newsreader <acronym
->FAQ</acronym
->: <ulink url="http://www.crosswinds.net/~cgarbers/faq/newsreaderFAQ.htm"
->http://www.crosswinds.net/~cgarbers/faq/newsreaderFAQ.htm</ulink
-></member
-> 
-<member
->The correct quoting: <ulink url="http://www.afaik.de/usenet/faq/zitieren"
->http://www.afaik.de/usenet/faq/zitieren</ulink
-> (German)</member
-> 
-<member
->The German umlauts <acronym
->FAQ</acronym
->: <ulink url="http://www.westfalen.de/paefken/de.newusers/umlaute-faq.txt"
-> http://www.westfalen.de/paefken/de.newusers/umlaute-faq.txt</ulink
-> (German)</member
-> 
-</simplelist
-> 
-</sect1
-> 
-
-<sect1 id="infos-technical"
-> 
-<title
->Informative technical articles</title
-> 
+<para>These <acronym>URL</acronym>s are from the corresponding article in the <glossterm>newsgroup</glossterm> <emphasis>de.newusers.infos</emphasis> and have the same contents as the articles posted there.</para>
+
+<simplelist> 
+<member>Introduction for de.newusers.infos: <ulink url="http://www.kirchwitz.de/~amk/dni/einleitung">http://www.kirchwitz.de/~amk/dni/einleitung</ulink> (German)</member> 
+<member>The newsgroups of the de.alt hierarchy: <ulink url="http://www.kirchwitz.de/~amk/dni/de-alt-newsgruppen"> http://www.kirchwitz.de/~amk/dni/de-alt-newsgruppen</ulink> (German)</member> 
+<member>The newsgroups of the de-hierarchy: <ulink url="http://www.kirchwitz.de/~amk/dni/de-newsgruppen">http://www.kirchwitz.de/~amk/dni/de-newsgruppen</ulink> (German)</member> 
+<member>First read, then post: <ulink url="http://www.kirchwitz.de/~amk/dni/erst-lesen-dann-schreiben">http://www.kirchwitz.de/~amk/dni/erst-lesen-dann-schreiben</ulink> (German)</member> 
+<member>First steps in the usenet: <ulink url="http://www.kirchwitz.de/~amk/dni/erste-schritte">http://www.kirchwitz.de/~amk/dni/erste-schritte</ulink> (German)</member>
+<member>Questions and answers from de.newusers.questions: <ulink url="http://www.kirchwitz.de/~amk/dni/faq">http://www.kirchwitz.de/~amk/dni/faq</ulink> (German)</member> 
+<member>Seven theses about behaviour in the internet: <ulink url="http://www.kirchwitz.de/~amk/dni/hoeflichkeit">http://www.kirchwitz.de/~amk/dni/hoeflichkeit</ulink> (German)</member> 
+<member>Introduction to the usenet: <ulink url="http://www.kirchwitz.de/~amk/dni/usenet-einfuehrung">http://www.kirchwitz.de/~amk/dni/usenet-einfuehrung</ulink> (German)</member> 
+<member>Why should I take the rules seriously? <ulink url="http://www.kirchwitz.de/~amk/dni/warum-regel">http://www.kirchwitz.de/~amk/dni/warum-regel</ulink> (German)</member> 
+<member>The newsreader <acronym>FAQ</acronym>: <ulink url="http://www.crosswinds.net/~cgarbers/faq/newsreaderFAQ.htm">http://www.crosswinds.net/~cgarbers/faq/newsreaderFAQ.htm</ulink></member> 
+<member>The correct quoting: <ulink url="http://www.afaik.de/usenet/faq/zitieren">http://www.afaik.de/usenet/faq/zitieren</ulink> (German)</member> 
+<member>The German umlauts <acronym>FAQ</acronym>: <ulink url="http://www.westfalen.de/paefken/de.newusers/umlaute-faq.txt"> http://www.westfalen.de/paefken/de.newusers/umlaute-faq.txt</ulink> (German)</member> 
+</simplelist> 
+</sect1> 
+
+<sect1 id="infos-technical"> 
+<title>Informative technical articles</title> 
 <anchor id="anc-infos-technical"/> 
 
-<para
->If you are interested in further technical information in connection to news, you should not miss the following <acronym
->URL</acronym
->s.</para>
-
-<simplelist
-> 
-<member
->Header entries: <ulink url="http://www.kirchwitz.de/~amk/dni/headerzeilen"
-> http://www.kirchwitz.de/~amk/dni/headerzeilen</ulink
-> (German)</member
-> 
-<member
->A very useful message-ID <acronym
->FAQ</acronym
->: <ulink url="http://www.qad.org/faq/faq-messageid.html"
-> http://www.qad.org/faq/faq-messageid.html</ulink
-></member
-> 
-<member
->A lot of links about newsreaders and related topics: <ulink url="http://www.leafnode.org/links"
->http://www.leafnode.org/links</ulink
-></member
-> 
-<member
-><acronym
->RFC</acronym
->s, Drafts and documents for the technical interested: <ulink url="http://www.landfield.com/usefor/"
-> http://www.landfield.com/usefor/</ulink
-></member
-> 
-</simplelist
-> 
-</sect1
-> 
-</chapter
-> 
+<para>If you are interested in further technical information in connection to news, you should not miss the following <acronym>URL</acronym>s.</para>
+
+<simplelist> 
+<member>Header entries: <ulink url="http://www.kirchwitz.de/~amk/dni/headerzeilen"> http://www.kirchwitz.de/~amk/dni/headerzeilen</ulink> (German)</member> 
+<member>A very useful message-ID <acronym>FAQ</acronym>: <ulink url="http://www.qad.org/faq/faq-messageid.html"> http://www.qad.org/faq/faq-messageid.html</ulink></member> 
+<member>A lot of links about newsreaders and related topics: <ulink url="http://www.leafnode.org/links">http://www.leafnode.org/links</ulink></member> 
+<member><acronym>RFC</acronym>s, Drafts and documents for the technical interested: <ulink url="http://www.landfield.com/usefor/"> http://www.landfield.com/usefor/</ulink></member> 
+</simplelist> 
+</sect1> 
+</chapter> 
diff --git a/tde-i18n-en_GB/docs/tdepim/knode/using-firststart.docbook b/tde-i18n-en_GB/docs/tdepim/knode/using-firststart.docbook
index 5d38dd1469a..66a76574dd5 100644
--- a/tde-i18n-en_GB/docs/tdepim/knode/using-firststart.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knode/using-firststart.docbook
@@ -1,2706 +1,1242 @@
 <!-- <?xml version="1.0" ?>
-<!DOCTYPE sect1 PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd"
-> -->
-<sect1 id="first-start"
-> 
-<title
->The first start</title
-> 
-
-<para
->You can find &knode; in the <guimenu
->K</guimenu
-> Menu under the <guisubmenu
->Internet</guisubmenu
-> entry: the menu entry <guimenuitem
->KNode</guimenuitem
-> launches the program.</para>
-
-<tip
-> 
-<para
->If the entry for &knode; can not be found or if &knode; does not appear after clicking on the menu entry, read <link linkend="faq"
->Questions and Answers</link
->.</para
-> 
+<!DOCTYPE sect1 PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd"> -->
+<sect1 id="first-start"> 
+<title>The first start</title> 
+
+<para>You can find &knode; in the <guimenu>K</guimenu> Menu under the <guisubmenu>Internet</guisubmenu> entry: the menu entry <guimenuitem>KNode</guimenuitem> launches the program.</para>
+
+<tip> 
+<para>If the entry for &knode; can not be found or if &knode; does not appear after clicking on the menu entry, read <link linkend="faq">Questions and Answers</link>.</para> 
 </tip>
 
-<para
->The main window of &knode; should now be displayed on your desktop as shown; on the first start, the settings dialogue will be invoked.</para>
+<para>The main window of &knode; should now be displayed on your desktop as shown; on the first start, the settings dialogue will be invoked.</para>
 
 <screenshot>
-<screeninfo
->Setting up &knode;</screeninfo>
+<screeninfo>Setting up &knode;</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="knode-start.png" format="PNG"/> </imageobject>
 <textobject>
-<phrase
->&knode; after first start</phrase>
+<phrase>&knode; after first start</phrase>
 </textobject>
 <caption>
-<para
->&knode; after first start</para>
+<para>&knode; after first start</para>
 </caption>
 </mediaobject>
 </screenshot>
 
-<para
->The windows shows the menu bar, the toolbar below and the status pane at the buttom. The area between the toolbar and the status pane is occupied by a three-part window.</para>
+<para>The windows shows the menu bar, the toolbar below and the status pane at the buttom. The area between the toolbar and the status pane is occupied by a three-part window.</para>
 
-<para
->There is a folder view, which currently contains only three entries:</para>
+<para>There is a folder view, which currently contains only three entries:</para>
 
 <simplelist>
-<member
->The folder <guilabel
->Outbox</guilabel
-></member>
-<member
->The folder <guilabel
->Drafts</guilabel
-></member>
-<member
->The folder <guilabel
->Sent</guilabel
-></member>
+<member>The folder <guilabel>Outbox</guilabel></member>
+<member>The folder <guilabel>Drafts</guilabel></member>
+<member>The folder <guilabel>Sent</guilabel></member>
 </simplelist>
 
-<para
->When &knode; is completely and correctly configured, the news servers and the subscribed news groups will appear there.</para>
+<para>When &knode; is completely and correctly configured, the news servers and the subscribed news groups will appear there.</para>
 
-<para
->In the upper section is the article view; it is currently empty and does not show any articles. Directly below the article view is the article window; the body of the currently-selected article appears there. These windows are also blank at the moment, as there are no articles, of course. You should not be concerned, though, as before reading and publishing news some things have to be configured; this will be covered by the following section.</para>
+<para>In the upper section is the article view; it is currently empty and does not show any articles. Directly below the article view is the article window; the body of the currently-selected article appears there. These windows are also blank at the moment, as there are no articles, of course. You should not be concerned, though, as before reading and publishing news some things have to be configured; this will be covered by the following section.</para>
 
-<para
->We are now beginning the setting up of &knode;. Most settings are not important for daily use, but you should know what settings are possible and what they are for. Some may skip the <quote
->Quickstart</quote
-> chapter but those who prefer a quick start will just glance over the manual anyway. For others, especially those who have not any or much experience with a news reader, this chapter offers the chance to fully perform the configuration, although some things may become clear only later on.</para>
+<para>We are now beginning the setting up of &knode;. Most settings are not important for daily use, but you should know what settings are possible and what they are for. Some may skip the <quote>Quickstart</quote> chapter but those who prefer a quick start will just glance over the manual anyway. For others, especially those who have not any or much experience with a news reader, this chapter offers the chance to fully perform the configuration, although some things may become clear only later on.</para>
 
-<sect2 id="setting-your-identity"
-> 
-<title
->Personal settings</title>
+<sect2 id="setting-your-identity"> 
+<title>Personal settings</title>
 
 <anchor id="anc-setting-your-identity"/>
 
-<para
->Via <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-></menuchoice
-> you will enter the preferences dialogue of &knode;. The figure shows the dialogue.</para>
-
-<screenshot
-> 
-<screeninfo
->Dialogue for entering personal information</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-identity.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->Entering personal information</phrase
-> 
-</textobject
-> 
-<caption
-> 
-<para
->Entering personal information</para
-></caption
-> 
-</mediaobject
-> 
-</screenshot
-> 
-
-<para
->The dialogue is divided into two parts: in one part there is a treeview, in which the top entry <guilabel
->Identity</guilabel
-> is already highlighted; in the other part is the corresponding input dialogue -- these settings relate to the identity with which you navigate through the newsgroups.</para>
+<para>Via <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem></menuchoice> you will enter the preferences dialogue of &knode;. The figure shows the dialogue.</para>
+
+<screenshot> 
+<screeninfo>Dialogue for entering personal information</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-identity.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>Entering personal information</phrase> 
+</textobject> 
+<caption> 
+<para>Entering personal information</para></caption> 
+</mediaobject> 
+</screenshot> 
+
+<para>The dialogue is divided into two parts: in one part there is a treeview, in which the top entry <guilabel>Identity</guilabel> is already highlighted; in the other part is the corresponding input dialogue -- these settings relate to the identity with which you navigate through the newsgroups.</para>
 
 <tip>
-<para
->If you have already configured your personal settings in the &kcontrolcenter; before the first start of &knode;, they will be adopted.</para
-> </tip>
-
-<sect3
-> 
-<title
-><guilabel
->Name</guilabel
-></title
-> 
-
-<para
->In the field <guilabel
->Name</guilabel
-> you enter your name, &eg; <replaceable
->Joe Miller</replaceable
-> or <replaceable
->Mary Gordon</replaceable
->. This name will later appear in the newsgroups as sender, and can be seen by anyone.</para>
-
-<para
->Filling out the field <guilabel
->Name</guilabel
-> is mandatory.</para>
+<para>If you have already configured your personal settings in the &kcontrolcenter; before the first start of &knode;, they will be adopted.</para> </tip>
+
+<sect3> 
+<title><guilabel>Name</guilabel></title> 
+
+<para>In the field <guilabel>Name</guilabel> you enter your name, &eg; <replaceable>Joe Miller</replaceable> or <replaceable>Mary Gordon</replaceable>. This name will later appear in the newsgroups as sender, and can be seen by anyone.</para>
+
+<para>Filling out the field <guilabel>Name</guilabel> is mandatory.</para>
 
 <caution>
-<para
->In most newsgroups, it is considered polite and appropriate to appear with one's real name; other newsgroups are less strict about this. But, there are also cases when one would not want to appear with one's real name, &eg; in newsgroups where one would like to (and can) talk about very personal matters without being exposed; these groups mostly do tell you in their Charter that the anonymity of their members is explicitly approved.</para>
-</caution
-> 
-
-<tip
-> 
-<para
->For those special cases, &knode; offers settings that can be adjusted to each newsgroup individually; further information can be found under <link linkend="group-identity"
->Group local Identities</link
->.</para>
-</tip
-> 
-</sect3
-> 
+<para>In most newsgroups, it is considered polite and appropriate to appear with one's real name; other newsgroups are less strict about this. But, there are also cases when one would not want to appear with one's real name, &eg; in newsgroups where one would like to (and can) talk about very personal matters without being exposed; these groups mostly do tell you in their Charter that the anonymity of their members is explicitly approved.</para>
+</caution> 
+
+<tip> 
+<para>For those special cases, &knode; offers settings that can be adjusted to each newsgroup individually; further information can be found under <link linkend="group-identity">Group local Identities</link>.</para>
+</tip> 
+</sect3> 
 
 <sect3>
-<title
-><guilabel
->Organisation</guilabel
-></title
-> 
-
-<para
->The input field <guilabel
->Organisation</guilabel
-> is optional and does not have to be filled out. You can enter, &eg;, the name of your company or your university if you use &knode; there; if you leave this field blank, it will often be filled out later by your Internet service provider.</para>
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Email address</guilabel
-></title>
-
-<para
->The email address you enter here will be used as sender in news articles, &ie; as actual address of the author, in conjunction with the real name (set in the field <guilabel
->Name</guilabel
->).</para>
-
-<para
->The field <guilabel
->Email Address</guilabel
-> shows up when someone wants to reply to you by email: the email will be sent to the address entered here. Many newsreaders display the sender address together with the name in the Header of the article.</para>
-
-<para
->Filling out the <guilabel
->Email Address</guilabel
-> field is mandatory.</para>
+<title><guilabel>Organisation</guilabel></title> 
+
+<para>The input field <guilabel>Organisation</guilabel> is optional and does not have to be filled out. You can enter, &eg;, the name of your company or your university if you use &knode; there; if you leave this field blank, it will often be filled out later by your Internet service provider.</para>
+</sect3> 
+
+<sect3> 
+<title><guilabel>Email address</guilabel></title>
+
+<para>The email address you enter here will be used as sender in news articles, &ie; as actual address of the author, in conjunction with the real name (set in the field <guilabel>Name</guilabel>).</para>
+
+<para>The field <guilabel>Email Address</guilabel> shows up when someone wants to reply to you by email: the email will be sent to the address entered here. Many newsreaders display the sender address together with the name in the Header of the article.</para>
+
+<para>Filling out the <guilabel>Email Address</guilabel> field is mandatory.</para>
 <tip>
-<para
->Note that the e-mail address will only be used for replies to you if the field <guilabel
->Reply-to Address</guilabel
-> is not filled out; in this case, the field <guilabel
->Email</guilabel
-> will be ignored for replies and the address given under <guilabel
->Reply-to Address</guilabel
-> will be used.</para
-> 
-</tip
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Reply-to Address</guilabel
-></title
-> 
-
-<para
-><guilabel
->Reply-to Address</guilabel
-> offers you the possibility to enter a different address than your sender e-mail address: if someone replies to you by email this address will be displayed as target address in the reply. An example for using <guilabel
->Reply-to Address</guilabel
-> would be that you write the article at the office during the day but want to receive the answer in your home inbox, because your boss co-reads your mail.</para>
-
-<para
->Only enter an e-mail address in that field if it actually differs from the field <guilabel
->Email Address</guilabel
->.</para>
+<para>Note that the e-mail address will only be used for replies to you if the field <guilabel>Reply-to Address</guilabel> is not filled out; in this case, the field <guilabel>Email</guilabel> will be ignored for replies and the address given under <guilabel>Reply-to Address</guilabel> will be used.</para> 
+</tip> 
+</sect3> 
+
+<sect3> 
+<title><guilabel>Reply-to Address</guilabel></title> 
+
+<para><guilabel>Reply-to Address</guilabel> offers you the possibility to enter a different address than your sender e-mail address: if someone replies to you by email this address will be displayed as target address in the reply. An example for using <guilabel>Reply-to Address</guilabel> would be that you write the article at the office during the day but want to receive the answer in your home inbox, because your boss co-reads your mail.</para>
+
+<para>Only enter an e-mail address in that field if it actually differs from the field <guilabel>Email Address</guilabel>.</para>
 
 <warning>
-<para
->Some news readers deliberately set this to an invalid e-mail address in order to prevent spam mails from being received; what could happen, though, is that a reader sends an e-mail to this invalid address which you will therefore never receive. You should drop a note about this in the signature.</para>
+<para>Some news readers deliberately set this to an invalid e-mail address in order to prevent spam mails from being received; what could happen, though, is that a reader sends an e-mail to this invalid address which you will therefore never receive. You should drop a note about this in the signature.</para>
 </warning>
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Mail-Copies-To</guilabel
-></title>
+<title><guilabel>Mail-Copies-To</guilabel></title>
 
-<para
->If you enter an email address here every article will be sent to the usenet and to this email address.</para>
+<para>If you enter an email address here every article will be sent to the usenet and to this email address.</para>
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Signing Key</guilabel
-></title>
-
-<para
->If you have configured the use of <acronym
->PGP</acronym
-> or GnuPG you can chose your signing key with <guibutton
->Change...</guibutton
->. </para>
+<title><guilabel>Signing Key</guilabel></title>
+
+<para>If you have configured the use of <acronym>PGP</acronym> or GnuPG you can chose your signing key with <guibutton>Change...</guibutton>. </para>
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Use a signature from file</guilabel
-></title>
-
-<para
->If this option is selected, the file specified under <guilabel
->Signature File</guilabel
-> will be used as Signature.</para>
+<title><guilabel>Use a signature from file</guilabel></title>
+
+<para>If this option is selected, the file specified under <guilabel>Signature File</guilabel> will be used as Signature.</para>
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Signature File</guilabel
-></title>
-
-<para
->The field <guilabel
->Signature File</guilabel
-> determines the file, the content of which is appended to each of your articles. The field is only enabled if the option <guilabel
->Use a signature from file</guilabel
-> is selected.</para>
-
-<para
->The signature file is a simple text file, which should not contain more than four lines; it can, for example, contain a reference to your homepage with the corresponding link, your postal address with your telephone number (which would then be of course visible to the whole world with every article) or just a cool quote. The signature is your brand, so to speak, which will mark all your articles; therefore, your signature should not be designed sloppily or in the long run annoying to others: an old joke that one would have to read over and over again does not foster sympathy or the interest of the other newsgroup subscribers.</para
-> 
-
-<para
->You can directly enter the file name of the signature file but it is more convenient to use the button <guibutton
->Choose...</guibutton
->. This opens a file open dialogue and you can conveniently choose the signature file with the mouse. The button <guibutton
->Edit File</guibutton
-> enables you, after choosing the file, to edit the signature.</para>
-
-<tip
-> 
-<para
->It is not necessary to include a separation line in the signature file as &knode; inserts it automatically.</para
-> 
-</tip
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->The file is a program</guilabel
-></title
-> 
-
-<para
->If this option is activated, the signature file is not handled as a text file, but as a program. The signature file will be started as a program and the output will be used as a signature. Through that you'll be able to chose a signature by accident or to use fortune to generate a cool slogan every time.</para>
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Specify signature below</guilabel
-></title
-> 
-
-<para
->If this option is selected you can enter the text of the signature directly in the input field below.</para
-> 
-
-<tip
-> 
-<para
->Please make sure that in this case also your <glossterm
->signature</glossterm
-> should not contain more than 4 lines. A separation line is not necessary as &knode; inserts it automatically.</para>
-</tip
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
->General notes</title
-> 
-
-<para
->You can later adapt the identity individually for each of the subscribed groups via the <guilabel
->Preferences</guilabel
-> dialogue, &eg; you can specify an English signature for English groups and a German one for German groups. Apart from the language it is also possible to have context-sensitive signatures, &eg; your favourite recipe in a cooking group or the names of your twelve cats in a cat owner group.</para>
-
-<para
->You find more in the section <link linkend="group-identity"
->Group local identities</link
->.</para>
-
-<para
->The next step in the configuration covers the news account.</para>
+<title><guilabel>Signature File</guilabel></title>
+
+<para>The field <guilabel>Signature File</guilabel> determines the file, the content of which is appended to each of your articles. The field is only enabled if the option <guilabel>Use a signature from file</guilabel> is selected.</para>
+
+<para>The signature file is a simple text file, which should not contain more than four lines; it can, for example, contain a reference to your homepage with the corresponding link, your postal address with your telephone number (which would then be of course visible to the whole world with every article) or just a cool quote. The signature is your brand, so to speak, which will mark all your articles; therefore, your signature should not be designed sloppily or in the long run annoying to others: an old joke that one would have to read over and over again does not foster sympathy or the interest of the other newsgroup subscribers.</para> 
+
+<para>You can directly enter the file name of the signature file but it is more convenient to use the button <guibutton>Choose...</guibutton>. This opens a file open dialogue and you can conveniently choose the signature file with the mouse. The button <guibutton>Edit File</guibutton> enables you, after choosing the file, to edit the signature.</para>
+
+<tip> 
+<para>It is not necessary to include a separation line in the signature file as &knode; inserts it automatically.</para> 
+</tip> 
+</sect3> 
+
+<sect3> 
+<title><guilabel>The file is a program</guilabel></title> 
+
+<para>If this option is activated, the signature file is not handled as a text file, but as a program. The signature file will be started as a program and the output will be used as a signature. Through that you'll be able to chose a signature by accident or to use fortune to generate a cool slogan every time.</para>
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Specify signature below</guilabel></title> 
+
+<para>If this option is selected you can enter the text of the signature directly in the input field below.</para> 
+
+<tip> 
+<para>Please make sure that in this case also your <glossterm>signature</glossterm> should not contain more than 4 lines. A separation line is not necessary as &knode; inserts it automatically.</para>
+</tip> 
+</sect3> 
+
+<sect3> 
+<title>General notes</title> 
+
+<para>You can later adapt the identity individually for each of the subscribed groups via the <guilabel>Preferences</guilabel> dialogue, &eg; you can specify an English signature for English groups and a German one for German groups. Apart from the language it is also possible to have context-sensitive signatures, &eg; your favourite recipe in a cooking group or the names of your twelve cats in a cat owner group.</para>
+
+<para>You find more in the section <link linkend="group-identity">Group local identities</link>.</para>
+
+<para>The next step in the configuration covers the news account.</para>
 
 </sect3>
 </sect2>
 
 <sect2 id="setting-the-news-account">
-<title
->Configuring the news account</title>
+<title>Configuring the news account</title>
 <anchor id="anc-setting-the-news-account"/>
 
-<para
->Now we must tell &knode; about where we get the news from or where to send the articles to later on. In the tree view on the right, there is an <guilabel
->Accounts</guilabel
-> entry; click on it with the mouse; then, two sub entries will be opened out. Choose the <guilabel
->News</guilabel
-> entry, because we first want to configure the news account: the list of accounts is still empty.</para>
+<para>Now we must tell &knode; about where we get the news from or where to send the articles to later on. In the tree view on the right, there is an <guilabel>Accounts</guilabel> entry; click on it with the mouse; then, two sub entries will be opened out. Choose the <guilabel>News</guilabel> entry, because we first want to configure the news account: the list of accounts is still empty.</para>
 
-<para
->To create a new account click on <guibutton
->New...</guibutton
->. The following dialogue appears:</para>
+<para>To create a new account click on <guibutton>New...</guibutton>. The following dialogue appears:</para>
 
 <screenshot>
-<screeninfo
->The <guilabel
->New Account</guilabel
-> dialogue</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-news-account.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->The <guilabel
->New Account</guilabel
-> dialogue</phrase
-> 
-</textobject
-> 
+<screeninfo>The <guilabel>New Account</guilabel> dialogue</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-news-account.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>The <guilabel>New Account</guilabel> dialogue</phrase> 
+</textobject> 
 <caption>
-<para
->The <guilabel
->New Account</guilabel
-> dialogue</para
-> 
-</caption
-> 
-</mediaobject
-> 
-</screenshot
-> 
+<para>The <guilabel>New Account</guilabel> dialogue</para> 
+</caption> 
+</mediaobject> 
+</screenshot> 
 
 <sect3>
-<title
-><guilabel
->Name</guilabel
-></title
-> 
-
-<para
->The <guilabel
->Name</guilabel
-> field can be filled in as you like; the text you enter will later be visible in the folder view. You could, for example, enter the name of your Internet Provider; for our example we enter the name <userinput
->My News Account</userinput
->.</para>
+<title><guilabel>Name</guilabel></title> 
+
+<para>The <guilabel>Name</guilabel> field can be filled in as you like; the text you enter will later be visible in the folder view. You could, for example, enter the name of your Internet Provider; for our example we enter the name <userinput>My News Account</userinput>.</para>
 
 </sect3>
 
-<sect3
-> 
-<title
-><guilabel
->Server</guilabel
-></title
-> 
-
-<para
->The next field is labelled <guilabel
->Server</guilabel
->. Unlike the field <guilabel
->Name</guilabel
->, what you enter here is important. The name of the news server is fixed and you should be able to get it from your Internet service provider; if you do not know the name of the news server, you should get it now: without this information you can not read any news. If your Internet service provider doesn't own a news server you can use a public one (universities often provide public news servers.)</para>
-
-<para
->For our example configuration we enter the name <userinput
-><systemitem class="systemname"
->news.server.com</systemitem
-></userinput
->; you will, of course, enter the real name of your news server.</para>
+<sect3> 
+<title><guilabel>Server</guilabel></title> 
+
+<para>The next field is labelled <guilabel>Server</guilabel>. Unlike the field <guilabel>Name</guilabel>, what you enter here is important. The name of the news server is fixed and you should be able to get it from your Internet service provider; if you do not know the name of the news server, you should get it now: without this information you can not read any news. If your Internet service provider doesn't own a news server you can use a public one (universities often provide public news servers.)</para>
+
+<para>For our example configuration we enter the name <userinput><systemitem class="systemname">news.server.com</systemitem></userinput>; you will, of course, enter the real name of your news server.</para>
 
 <tip>
-<para
->If you want to use &knode; with a local news server, enter the name <userinput
-><systemitem class="systemname"
->localhost</systemitem
-></userinput
-> here.</para>
+<para>If you want to use &knode; with a local news server, enter the name <userinput><systemitem class="systemname">localhost</systemitem></userinput> here.</para>
 </tip>
 </sect3>
 
-<sect3
-> 
-<title
-><guilabel
->Port</guilabel
-></title
-> 
-
-<para
-><guilabel
->Port</guilabel
->, the next field, has already a default value. The Port designates, roughly speaking, a data channel on which the server listens for whether someone wants to retrieve news: it defaults to the value 119, which is applicable in most cases; therefore, we do not change this default for our example.</para>
+<sect3> 
+<title><guilabel>Port</guilabel></title> 
+
+<para><guilabel>Port</guilabel>, the next field, has already a default value. The Port designates, roughly speaking, a data channel on which the server listens for whether someone wants to retrieve news: it defaults to the value 119, which is applicable in most cases; therefore, we do not change this default for our example.</para>
 </sect3>
 
-<sect3
-> 
-<title
-><guilabel
->Hold connection for</guilabel
-></title
-> 
-
-<para
->The time value you enter here is used if you have established a connection to the news server and if, for whatever reason, no data is received from or transmitted to the news server: after the specified time has elapsed &knode; will automatically disconnect. This, amongst other things, relieves the server of unnecessary connections which would otherwise reduce its availability for other subscribers; it also makes sure that an automatically-established Internet connection is not held unnecessarily even if no data is being sent or received.</para>
-
-<tip
-> 
-<para
->This settings mainly makes sense if one receives and reads news online; for local news servers it is of almost no importance. If this waiting time is set too low, there can be waiting periods if you read a longer article and do not do <quote
->anything</quote
-> for some time: &knode; will have cancelled the connection to the server by then (after the time period has elapsed) and has to reestablish it, causing a delay.</para
-> 
-<para
->If the waiting time is set too high you might waste online time whilst doing nothing (perhaps increasing your phone bill).</para
-> </tip>
+<sect3> 
+<title><guilabel>Hold connection for</guilabel></title> 
+
+<para>The time value you enter here is used if you have established a connection to the news server and if, for whatever reason, no data is received from or transmitted to the news server: after the specified time has elapsed &knode; will automatically disconnect. This, amongst other things, relieves the server of unnecessary connections which would otherwise reduce its availability for other subscribers; it also makes sure that an automatically-established Internet connection is not held unnecessarily even if no data is being sent or received.</para>
+
+<tip> 
+<para>This settings mainly makes sense if one receives and reads news online; for local news servers it is of almost no importance. If this waiting time is set too low, there can be waiting periods if you read a longer article and do not do <quote>anything</quote> for some time: &knode; will have cancelled the connection to the server by then (after the time period has elapsed) and has to reestablish it, causing a delay.</para> 
+<para>If the waiting time is set too high you might waste online time whilst doing nothing (perhaps increasing your phone bill).</para> </tip>
 </sect3>
 
-<sect3
-> 
-<title
-><guilabel
->Timeout</guilabel
-></title
-> 
+<sect3> 
+<title><guilabel>Timeout</guilabel></title> 
 
-<para
->If &knode; connects to the news server it waits no longer than the time specified here for an answer; if the period is exceeded &knode; cancels the connection attempt and you will get an error message stating that the server is not responding.</para>
+<para>If &knode; connects to the news server it waits no longer than the time specified here for an answer; if the period is exceeded &knode; cancels the connection attempt and you will get an error message stating that the server is not responding.</para>
 
 <tip>
-<para
->Depending on the quality of your Internet account and the news server's current load there can be busy periods where &knode; cancels the connection; if this happens frequently, you should set this setting to a higher value.</para>
+<para>Depending on the quality of your Internet account and the news server's current load there can be busy periods where &knode; cancels the connection; if this happens frequently, you should set this setting to a higher value.</para>
 </tip>
-</sect3
-> 
-
-<sect3
-> 
-<title
-> 
-<guilabel
->Fetch group descriptions</guilabel
-></title
-> 
-
-<para
->If this setting is selected, &knode; additionally requests the available group descriptions; they will be displayed in the <guilabel
->Subscribe to Newsgroups</guilabel
-> dialogue.</para>
-
-<tip
-> 
-<para
->There is not a group description for every group, so it is not an error if no group description is shown when subscribing to a group later on.</para
-> 
-</tip
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Server requires authentication</guilabel
-></title
-> 
-
-<para
->The option <guilabel
->Server requires authentication</guilabel
-> needs only to be selected if your news server requires a user name and a password when retrieving articles; you can find out if this is the case from your Internet service provider or the server's maintainer.</para>
-
-<tip
-> 
-<para
->If you do not know if this setting is necessary forget about selecting it for now: if you encounter an error later on, you can try selecting it then. Otherwise, select this option and enter your user name under <guilabel
->User</guilabel
-> and the associated password under <guilabel
->Password</guilabel
->.</para>
-</tip
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
->General notes</title
-> 
-
-<para
->By now you have completed the setup of your news account. You can confirm and save your settings by clicking on the <guibutton
->OK</guibutton
-> button: as soon as you have done that, the account will appear in the list by the name that you entered in <guilabel
->Name</guilabel
-> earlier; and, if you have a close look, you will see that the account also appears in the folder view.</para>
-
-<para
->Using the <guibutton
->Subscribe</guibutton
-> button you could get directly to the dialogue for subscribing to news groups; but, we still have more to do so we'll ignore it for now: there are several ways that lead to the goal.</para>
-
-<para
->In the <link linkend="multiple-news-accounts"
-> Managing multiple news accounts</link
-> chapter you can learn how to work with multiple news accounts, but first we will stay with this one; in most cases, one account is sufficient.</para>
-
-<caution
-> 
-<para
->Please note that some Internet providers only allow retrieving news from their news server if you are connected to the Internet through them.</para
-> 
-</caution
-> 
-
-<para
->We will now move on to configuring the email account; in order to do that, click on the <guilabel
->Mail</guilabel
-> entry in the tree view on the left.</para>
-
-</sect3
-> 
-</sect2
-> 
-
-<sect2 id="setting-the-mail-account"
-> 
-<title
->Setting up the mail account</title
-> 
-
-<para
->After selecting <guilabel
->Mail</guilabel
-> in the tree view, the following Dialogue Box appears.</para
-> 
-
-<screenshot
-> 
-<screeninfo
->Dialogue Box for setting up the mail account</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-mail-account.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->Setting up the mail account</phrase
-> 
-</textobject
-> 
-<caption
-> 
-<para
->Setting up the mail account</para
-> 
-</caption
-> 
-</mediaobject
-> 
-</screenshot
-> 
-
-<para
->You will notice this Dialogue Box is very similar to the news account settings Dialogue Box; but why do we need an email account in a newsreader?</para>
-
-<para
->Sometimes you need to answer to the author of an article directly, without posting to the newsgroup; for example, when you want to make a very personal comment or want to correct an error. Sometimes an email is more appropriate than a public remark.</para>
-
-<para
->That's why &knode; provides the possibility to reply by email; if you want to use this feature you must tell &knode; how to send emails: you just need to insert the mail server's address. If you have already configured an email account, &eg; with &kmail;, you can reuse the settings used there.</para>
-
-<sect3
-> 
-<title
-><guilabel
->Use external mail program</guilabel
-></title
-> 
-
-<para
->If this option is active &knode; will use the mail program which is configured in the control centre; the other options in this dialogue will then be disabled.</para>
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Server</guilabel
-></title
-> 
-
-<para
->The name (address) of your mail server as provided by your Internet service provider or system administrator; all you have to do here is enter the mail server's name in the <guilabel
->Server</guilabel
-> field.</para>
-
-<para
->In our example we enter<userinput
-><systemitem class="systemname"
->mail.server.de</systemitem
-></userinput
-></para>
+</sect3> 
+
+<sect3> 
+<title> 
+<guilabel>Fetch group descriptions</guilabel></title> 
+
+<para>If this setting is selected, &knode; additionally requests the available group descriptions; they will be displayed in the <guilabel>Subscribe to Newsgroups</guilabel> dialogue.</para>
+
+<tip> 
+<para>There is not a group description for every group, so it is not an error if no group description is shown when subscribing to a group later on.</para> 
+</tip> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Server requires authentication</guilabel></title> 
+
+<para>The option <guilabel>Server requires authentication</guilabel> needs only to be selected if your news server requires a user name and a password when retrieving articles; you can find out if this is the case from your Internet service provider or the server's maintainer.</para>
+
+<tip> 
+<para>If you do not know if this setting is necessary forget about selecting it for now: if you encounter an error later on, you can try selecting it then. Otherwise, select this option and enter your user name under <guilabel>User</guilabel> and the associated password under <guilabel>Password</guilabel>.</para>
+</tip> 
+</sect3> 
+
+<sect3> 
+<title>General notes</title> 
+
+<para>By now you have completed the setup of your news account. You can confirm and save your settings by clicking on the <guibutton>OK</guibutton> button: as soon as you have done that, the account will appear in the list by the name that you entered in <guilabel>Name</guilabel> earlier; and, if you have a close look, you will see that the account also appears in the folder view.</para>
+
+<para>Using the <guibutton>Subscribe</guibutton> button you could get directly to the dialogue for subscribing to news groups; but, we still have more to do so we'll ignore it for now: there are several ways that lead to the goal.</para>
+
+<para>In the <link linkend="multiple-news-accounts"> Managing multiple news accounts</link> chapter you can learn how to work with multiple news accounts, but first we will stay with this one; in most cases, one account is sufficient.</para>
+
+<caution> 
+<para>Please note that some Internet providers only allow retrieving news from their news server if you are connected to the Internet through them.</para> 
+</caution> 
+
+<para>We will now move on to configuring the email account; in order to do that, click on the <guilabel>Mail</guilabel> entry in the tree view on the left.</para>
+
+</sect3> 
+</sect2> 
+
+<sect2 id="setting-the-mail-account"> 
+<title>Setting up the mail account</title> 
+
+<para>After selecting <guilabel>Mail</guilabel> in the tree view, the following Dialogue Box appears.</para> 
+
+<screenshot> 
+<screeninfo>Dialogue Box for setting up the mail account</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-mail-account.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>Setting up the mail account</phrase> 
+</textobject> 
+<caption> 
+<para>Setting up the mail account</para> 
+</caption> 
+</mediaobject> 
+</screenshot> 
+
+<para>You will notice this Dialogue Box is very similar to the news account settings Dialogue Box; but why do we need an email account in a newsreader?</para>
+
+<para>Sometimes you need to answer to the author of an article directly, without posting to the newsgroup; for example, when you want to make a very personal comment or want to correct an error. Sometimes an email is more appropriate than a public remark.</para>
+
+<para>That's why &knode; provides the possibility to reply by email; if you want to use this feature you must tell &knode; how to send emails: you just need to insert the mail server's address. If you have already configured an email account, &eg; with &kmail;, you can reuse the settings used there.</para>
+
+<sect3> 
+<title><guilabel>Use external mail program</guilabel></title> 
+
+<para>If this option is active &knode; will use the mail program which is configured in the control centre; the other options in this dialogue will then be disabled.</para>
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Server</guilabel></title> 
+
+<para>The name (address) of your mail server as provided by your Internet service provider or system administrator; all you have to do here is enter the mail server's name in the <guilabel>Server</guilabel> field.</para>
+
+<para>In our example we enter<userinput><systemitem class="systemname">mail.server.de</systemitem></userinput></para>
 
 <tip>
-<para
->If you have one you can send your mail via a local mail server; if this is the case local mail server enter <systemitem class="systemname"
->localhost</systemitem
-> in the <guilabel
->Server</guilabel
-> field.</para>
-</tip
-> 
+<para>If you have one you can send your mail via a local mail server; if this is the case local mail server enter <systemitem class="systemname">localhost</systemitem> in the <guilabel>Server</guilabel> field.</para>
+</tip> 
 </sect3>
 
-<sect3
-> 
-<title
-><guilabel
->Port</guilabel
-></title
-> 
-
-<para
->Again, the <guilabel
->Port</guilabel
-> field has a default value; in this case it's port 25. You should not need to change this, unless your <acronym
->ISP</acronym
-> has a very exotic configuration and tells you to do so. We do not change this for the example.</para>
+<sect3> 
+<title><guilabel>Port</guilabel></title> 
+
+<para>Again, the <guilabel>Port</guilabel> field has a default value; in this case it's port 25. You should not need to change this, unless your <acronym>ISP</acronym> has a very exotic configuration and tells you to do so. We do not change this for the example.</para>
 
 </sect3>
 
-<sect3
-> 
-<title
->Hold connection for</title
-> 
-
-<para
->This value is important: if you have established a connection with your mail server and there is no data transfer occurring &knode; cancels the connection to your mailserver after the specified amount of time has elapsed.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Timeout</guilabel
-></title
-> 
-
-<para
->When &knode; tries to connect to the mail server it will wait this long for a reply from the server; if this time is exceeded, you will get a error message.</para
-> 
-
-<tip
-> 
-<para
->Depending on the quality of your connection and the actual load of your mail server you might get long reply times; if &knode; cancels the connection due to this, you should increase the timeout.</para
-> 
-</tip
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
->General notes</title>
-
-<caution
-> 
-<para
->Some <acronym
->ISP</acronym
->s only allow you to send email using their mail server after you have checked your mailbox for new mail: this reduces spamming.</para
-> 
-
-<para
->For the same reasons, some <acronym
->ISP</acronym
->s will only allow you to send mail using their mailservers if you are online with them or if you are logged in at the mailserver; for example, this is the normal configuration at GMX and isn't supported by &knode; or &kmail; yet.</para>
+<sect3> 
+<title>Hold connection for</title> 
+
+<para>This value is important: if you have established a connection with your mail server and there is no data transfer occurring &knode; cancels the connection to your mailserver after the specified amount of time has elapsed.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Timeout</guilabel></title> 
+
+<para>When &knode; tries to connect to the mail server it will wait this long for a reply from the server; if this time is exceeded, you will get a error message.</para> 
+
+<tip> 
+<para>Depending on the quality of your connection and the actual load of your mail server you might get long reply times; if &knode; cancels the connection due to this, you should increase the timeout.</para> 
+</tip> 
+</sect3> 
+
+<sect3> 
+<title>General notes</title>
+
+<caution> 
+<para>Some <acronym>ISP</acronym>s only allow you to send email using their mail server after you have checked your mailbox for new mail: this reduces spamming.</para> 
+
+<para>For the same reasons, some <acronym>ISP</acronym>s will only allow you to send mail using their mailservers if you are online with them or if you are logged in at the mailserver; for example, this is the normal configuration at GMX and isn't supported by &knode; or &kmail; yet.</para>
 </caution>
 
 </sect3>
 </sect2>
 
 <sect2 id="knode-appearance">
-<title
->Defining the appearance</title>
+<title>Defining the appearance</title>
 
-<para
->With the <guilabel
->Appearance</guilabel
-> dialogue you are given the ability to set the colours, the character code and the font size of the text in the article window; the picture below shows the dialogue.</para>
+<para>With the <guilabel>Appearance</guilabel> dialogue you are given the ability to set the colours, the character code and the font size of the text in the article window; the picture below shows the dialogue.</para>
 
 <screenshot>
-<screeninfo
->Setting up the Appearance dialogue</screeninfo>
+<screeninfo>Setting up the Appearance dialogue</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="knode-colors-fonts.png" format="PNG"/> </imageobject>
 <textobject>
-<phrase
->Setting up the Appearance dialogue</phrase>
+<phrase>Setting up the Appearance dialogue</phrase>
 </textobject>
 <caption>
-<para
->Setting up the Appearance dialogue</para>
+<para>Setting up the Appearance dialogue</para>
 </caption>
 </mediaobject>
 </screenshot>
 
 <sect3>
-<title
-><guilabel
->Use custom colours</guilabel
-></title>
+<title><guilabel>Use custom colours</guilabel></title>
 
-<para
->If you select this option you can adjust the colour settings of &knode; in the list field below; to change a colour setting do a double-click with the &LMB; on the list entry to open the &kde; colour-selection dialogue.</para>
+<para>If you select this option you can adjust the colour settings of &knode; in the list field below; to change a colour setting do a double-click with the &LMB; on the list entry to open the &kde; colour-selection dialogue.</para>
 
-<para
->The colour selection can only be configured after the checkbox has been checked; otherwise, a double-click on the list entries won't do anything.</para>
+<para>The colour selection can only be configured after the checkbox has been checked; otherwise, a double-click on the list entries won't do anything.</para>
 
 <caution>
-<para
->If the <guilabel
->Use custom colours</guilabel
-> setting is selected &knode; won't use colours which have been changed later globally for &kde; but will only use the colours defined here instead.</para>
+<para>If the <guilabel>Use custom colours</guilabel> setting is selected &knode; won't use colours which have been changed later globally for &kde; but will only use the colours defined here instead.</para>
 </caution>
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Use custom fonts</guilabel
-></title>
-
-<para
->If you select this setting you can adjust the fonts which &knode; uses for the display in the list field below; to choose a font do a double-click with the &LMB; on the list entry to open the &kde; font-selection dialogue.</para>
-
-<para
->The font can only be configured after the checkbox has been checked; otherwise, a double click on the list entries won't do anything.</para>
-
-<caution
-> 
-<para
->If the setting <guilabel
->Use custom fonts</guilabel
-> is selected &knode; won't use later changes to the global font settings for &kde; but will use the fonts defined here instead.</para
-> 
-</caution
-> 
-</sect3
-> 
-
-</sect2
-> 
-
-<sect2 id="setting-news-general"
-> 
-<title
->General News Settings</title
-> 
-
-<para
->Now click on <guibutton
->Reading news</guibutton
-> and then on the <guibutton
->General</guibutton
-> sub-entry; the figure below shows the dialogue containing the preferences you can configure there.</para
-> 
-
-<screenshot
-> 
-<screeninfo
-><guilabel
->General Preferences</guilabel
-> Dialogue</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-read-news-settings.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->The <guilabel
->General Preferences</guilabel
-> dialogue</phrase
-> 
-</textobject
-> 
-<caption
-> 
-<para
->The <guilabel
->General Preferences</guilabel
-> dialogue</para>
+<title><guilabel>Use custom fonts</guilabel></title>
+
+<para>If you select this setting you can adjust the fonts which &knode; uses for the display in the list field below; to choose a font do a double-click with the &LMB; on the list entry to open the &kde; font-selection dialogue.</para>
+
+<para>The font can only be configured after the checkbox has been checked; otherwise, a double click on the list entries won't do anything.</para>
+
+<caution> 
+<para>If the setting <guilabel>Use custom fonts</guilabel> is selected &knode; won't use later changes to the global font settings for &kde; but will use the fonts defined here instead.</para> 
+</caution> 
+</sect3> 
+
+</sect2> 
+
+<sect2 id="setting-news-general"> 
+<title>General News Settings</title> 
+
+<para>Now click on <guibutton>Reading news</guibutton> and then on the <guibutton>General</guibutton> sub-entry; the figure below shows the dialogue containing the preferences you can configure there.</para> 
+
+<screenshot> 
+<screeninfo><guilabel>General Preferences</guilabel> Dialogue</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-read-news-settings.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>The <guilabel>General Preferences</guilabel> dialogue</phrase> 
+</textobject> 
+<caption> 
+<para>The <guilabel>General Preferences</guilabel> dialogue</para>
 </caption>
 </mediaobject>
 </screenshot>
 
-<para
->You don't need to change most of these settings, but we will discuss them step-by-step to give you an overview of the possibilities of &knode;.</para>
+<para>You don't need to change most of these settings, but we will discuss them step-by-step to give you an overview of the possibilities of &knode;.</para>
 
-<sect3
-> 
-<title
-><guilabel
->Check for new articles automatically</guilabel
-></title
-> 
+<sect3> 
+<title><guilabel>Check for new articles automatically</guilabel></title> 
 
-<para
->If this box is checked &knode; tries to request new articles from the server when selecting a newsgroup. These settings especially make sense when you use &knode; together with a local news server: downloading the messages obviously only works when the server is reachable; for a server which is only reachable via an Internet connection, this setting rarely makes sense and should stay deactivated.</para>
+<para>If this box is checked &knode; tries to request new articles from the server when selecting a newsgroup. These settings especially make sense when you use &knode; together with a local news server: downloading the messages obviously only works when the server is reachable; for a server which is only reachable via an Internet connection, this setting rarely makes sense and should stay deactivated.</para>
 
-<para
->If your system isn't set up to establish an Internet connection if necessary, you will get an error message each time you select a newsgroup.</para>
+<para>If your system isn't set up to establish an Internet connection if necessary, you will get an error message each time you select a newsgroup.</para>
 
-<para
->If you want to keep control over when a connection to the server is established, the <menuchoice
-><guimenu
->Group</guimenu
-><guimenuitem
->Get new articles</guimenuitem
-></menuchoice
-> menu option is appropriate.</para>
+<para>If you want to keep control over when a connection to the server is established, the <menuchoice><guimenu>Group</guimenu><guimenuitem>Get new articles</guimenuitem></menuchoice> menu option is appropriate.</para>
 
 </sect3>
 
-<sect3
-> 
-<title
-><guilabel
->Maximal number of articles to fetch</guilabel
-></title
-> 
-
-<para
->This sets a restriction on the number articles which are requested from the server while downloading. The value configured here is for each newsgroup separately. If this is set, for instance, to 300 only the 300 newest articles of the newsgroup are requested; other articles will be discarded.</para
-> 
-
-<warning
-> 
-<para
->For newsgroups with relatively high traffic you might lose articles if this value is too low; this especially occurs when you've just subscribed to a newsgroup or only occasionally download articles and the traffic for this reason rises above the value specified here.</para>
-</warning
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Mark article as read after</guilabel
-></title
-> 
-
-<para
->Articles you have opened in the article window are marked as read after the number of seconds specified here. If you set this value to be relatively high you avoid articles you have just glanced at being marked as read; on the other hand, it can be annoying for relatively short articles, for which you need less time to read than specified: if you browsed too quickly through the articles they would stay unread even though you have read them. Therefore, you should adjust this value to your personal preferences.</para>
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Mark crossposted articles as read</guilabel
-></title>
-
-<para
->Sometimes an <glossterm
->article</glossterm
-> will be posted to more than one group; this is known as crossposting. If you activate this option, those crossposted articles will be marked as read in all the newsgroups to which they were posted if you read it in one newsgroup.</para>
+<sect3> 
+<title><guilabel>Maximal number of articles to fetch</guilabel></title> 
+
+<para>This sets a restriction on the number articles which are requested from the server while downloading. The value configured here is for each newsgroup separately. If this is set, for instance, to 300 only the 300 newest articles of the newsgroup are requested; other articles will be discarded.</para> 
+
+<warning> 
+<para>For newsgroups with relatively high traffic you might lose articles if this value is too low; this especially occurs when you've just subscribed to a newsgroup or only occasionally download articles and the traffic for this reason rises above the value specified here.</para>
+</warning> 
+</sect3> 
+
+<sect3> 
+<title><guilabel>Mark article as read after</guilabel></title> 
+
+<para>Articles you have opened in the article window are marked as read after the number of seconds specified here. If you set this value to be relatively high you avoid articles you have just glanced at being marked as read; on the other hand, it can be annoying for relatively short articles, for which you need less time to read than specified: if you browsed too quickly through the articles they would stay unread even though you have read them. Therefore, you should adjust this value to your personal preferences.</para>
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Mark crossposted articles as read</guilabel></title>
+
+<para>Sometimes an <glossterm>article</glossterm> will be posted to more than one group; this is known as crossposting. If you activate this option, those crossposted articles will be marked as read in all the newsgroups to which they were posted if you read it in one newsgroup.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Smart scrolling</guilabel
-></title
-> 
+<title><guilabel>Smart scrolling</guilabel></title> 
 
-<para
->If this option is selected the lines in the article list are scrolled smoothly instead of jerkily. </para
->  <!-- LW: FIXME could be explained a tiny bit better -->
+<para>If this option is selected the lines in the article list are scrolled smoothly instead of jerkily. </para>  <!-- LW: FIXME could be explained a tiny bit better -->
 
-</sect3
-> 
+</sect3> 
 
 <sect3>
-<title
-><guilabel
->Show whole thread on expanding</guilabel
-></title>
+<title><guilabel>Show whole thread on expanding</guilabel></title>
 
-<para
->This setting lets a discussion be displayed completely (over multiple answer levels) if you click on the plus in front of the discussion; if this setting isn't checked, only the immediate answers to the current article are displayed.</para>
+<para>This setting lets a discussion be displayed completely (over multiple answer levels) if you click on the plus in front of the discussion; if this setting isn't checked, only the immediate answers to the current article are displayed.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Default to expanded threads</guilabel
-></title>
+<title><guilabel>Default to expanded threads</guilabel></title>
 
-<para
->Here you can toggle whether the threads are expanded by default or not.</para>
+<para>Here you can toggle whether the threads are expanded by default or not.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Show article score</guilabel
-></title
-> 
-
-<para
->Here you can toggle whether the scoring column should be shown in the article view.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Show line count</guilabel
-></title
-> 
-
-<para
->Here you can toggle whether the column with the number of lines should be shown in the article view.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Cache size for headers</guilabel
-></title>
-
-<para
->Here you can configure how much memory &knode; should use for the caching of the headers.</para>
+<title><guilabel>Show article score</guilabel></title> 
+
+<para>Here you can toggle whether the scoring column should be shown in the article view.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Show line count</guilabel></title> 
+
+<para>Here you can toggle whether the column with the number of lines should be shown in the article view.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Cache size for headers</guilabel></title>
+
+<para>Here you can configure how much memory &knode; should use for the caching of the headers.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Cache size for articles</guilabel
-></title>
+<title><guilabel>Cache size for articles</guilabel></title>
 
-<para
->Here you can configure, how much memory &knode; should use for the caching of the articles.</para>
+<para>Here you can configure, how much memory &knode; should use for the caching of the articles.</para>
 
 </sect3>
 </sect2>
 
 <sect2>
-<title
-><guilabel
->Navigation</guilabel
-></title>
+<title><guilabel>Navigation</guilabel></title>
 
-<para
->Here you can change some navigation properties of &knode;. Normally everything here is switched off, but if you don't like this kind of navigation you can change it.</para>
+<para>Here you can change some navigation properties of &knode;. Normally everything here is switched off, but if you don't like this kind of navigation you can change it.</para>
 
 <sect3>
-<title
-><guilabel
->General</guilabel
-></title>
+<title><guilabel>General</guilabel></title>
 
-<para
->The keyboard behaviour between &knode; and &kmail; is a bit different; with the <guilabel
->Emulate the keyboard behaviour of KMail</guilabel
-> switch you can activate the same keyboard behaviour as in &kmail; for &knode;.</para>
+<para>The keyboard behaviour between &knode; and &kmail; is a bit different; with the <guilabel>Emulate the keyboard behaviour of KMail</guilabel> switch you can activate the same keyboard behaviour as in &kmail; for &knode;.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Mark All as Read</guilabel
-></title>
-
-<para
->If the box <guilabel
->Switch to next group</guilabel
-> is checked, &knode; automatically switches to the next group if you mark all articles as read.</para>
+<title><guilabel>Mark All as Read</guilabel></title>
+
+<para>If the box <guilabel>Switch to next group</guilabel> is checked, &knode; automatically switches to the next group if you mark all articles as read.</para>
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Mark Thread as Read</guilabel
-></title>
+<title><guilabel>Mark Thread as Read</guilabel></title>
 
-<para
->If <guilabel
->Close the current thread</guilabel
-> is checked, &knode; automatically closes a thread if you mark it as read.</para>
+<para>If <guilabel>Close the current thread</guilabel> is checked, &knode; automatically closes a thread if you mark it as read.</para>
 
-<para
->If <guilabel
->Go to next unread thread</guilabel
-> is checked, &knode; automatically shows the next thread if you mark the the previous thread as read.</para>
+<para>If <guilabel>Go to next unread thread</guilabel> is checked, &knode; automatically shows the next thread if you mark the the previous thread as read.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Ignore Thread</guilabel
-></title>
+<title><guilabel>Ignore Thread</guilabel></title>
 
-<para
->If <guilabel
->Close the current thread</guilabel
->is checked, &knode; automatically closes a thread if you choose to ignore it.</para>
+<para>If <guilabel>Close the current thread</guilabel>is checked, &knode; automatically closes a thread if you choose to ignore it.</para>
 
-<para
->If <guilabel
->Go to next unread thread</guilabel
-> is checked, &knode; automatically shows the next thread if you choose to ignore the previous one.</para>
+<para>If <guilabel>Go to next unread thread</guilabel> is checked, &knode; automatically shows the next thread if you choose to ignore the previous one.</para>
 
 </sect3>
 </sect2>
 
 <sect2 id="knode-scoring-settings">
-<title
->Scoring rules</title>
-
-<para
->To sort the articles you have the possibility to score them. The standard score is 0: a higher score means that the <glossterm
->article</glossterm
-> is interesting; a lower score means it is less interesting.</para>
-
-<para
->In the middle of the window you see a big, white area; here you can see your scoring rules. Scoring rules are used by &knode; to score the incoming articles automatically; if, for example, a person always posts nonsense you can automatically score the articles of that person down and hide them.</para>
-
-<para
->With the buttons below the list of scoring-rules you can <guibutton
->edit</guibutton
->, <guibutton
->add</guibutton
->, <guibutton
->remove</guibutton
-> and <guibutton
->copy</guibutton
-> a rule. We will skip this feature for now, because it is not essential for the setup of &knode;.</para>
-
-<para
->You can learn more about scoring; in the chapter <link linkend="anc-score-watch-ignore"
->Scoring, watching and ignoring</link
->.</para>
+<title>Scoring rules</title>
+
+<para>To sort the articles you have the possibility to score them. The standard score is 0: a higher score means that the <glossterm>article</glossterm> is interesting; a lower score means it is less interesting.</para>
+
+<para>In the middle of the window you see a big, white area; here you can see your scoring rules. Scoring rules are used by &knode; to score the incoming articles automatically; if, for example, a person always posts nonsense you can automatically score the articles of that person down and hide them.</para>
+
+<para>With the buttons below the list of scoring-rules you can <guibutton>edit</guibutton>, <guibutton>add</guibutton>, <guibutton>remove</guibutton> and <guibutton>copy</guibutton> a rule. We will skip this feature for now, because it is not essential for the setup of &knode;.</para>
+
+<para>You can learn more about scoring; in the chapter <link linkend="anc-score-watch-ignore">Scoring, watching and ignoring</link>.</para>
 
 <sect3>
-<title
-><guilabel
->Default score for ignored threads</guilabel
-></title
-> 
-
-<para
->Normally you only need the functions ignore and watch; this simply shows if a thread is interesting or not. Here you can configure a default score for the ignored threads; choosing the <menuchoice
-><guimenu
->Scoring</guimenu
-><guimenuitem
->Ignore Thread</guimenuitem
-></menuchoice
-> menu item will give this score to all the posts in that thread, and will apply that score also to future posts that follow up the thread.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Default score for watched threads</guilabel
-></title
-> 
-
-<para
->If an article is interesting, it will get a score above 0. Here you can enter the default score for those articles; choosing the <menuchoice
-><guimenu
->Scoring</guimenu
-><guimenuitem
->Watch Thread</guimenuitem
-></menuchoice
-> menu item will give this score to all the posts in that thread, and will apply that score also to future posts that follow up the thread.</para>
+<title><guilabel>Default score for ignored threads</guilabel></title> 
+
+<para>Normally you only need the functions ignore and watch; this simply shows if a thread is interesting or not. Here you can configure a default score for the ignored threads; choosing the <menuchoice><guimenu>Scoring</guimenu><guimenuitem>Ignore Thread</guimenuitem></menuchoice> menu item will give this score to all the posts in that thread, and will apply that score also to future posts that follow up the thread.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Default score for watched threads</guilabel></title> 
+
+<para>If an article is interesting, it will get a score above 0. Here you can enter the default score for those articles; choosing the <menuchoice><guimenu>Scoring</guimenu><guimenuitem>Watch Thread</guimenuitem></menuchoice> menu item will give this score to all the posts in that thread, and will apply that score also to future posts that follow up the thread.</para>
 
 <tip>
-<para
->You can use the <keycap
->W</keycap
-> key to watch a thread or the <keycap
->I</keycap
-> key to ignore it.</para
-> 
-</tip
-> 
-</sect3
-> 
-</sect2
-> 
+<para>You can use the <keycap>W</keycap> key to watch a thread or the <keycap>I</keycap> key to ignore it.</para> 
+</tip> 
+</sect3> 
+</sect2> 
 
 <sect2 id="knode-filter-settings">
-<title
->Filter settings</title>
-
-<para
->This screenshot shows the filter settings.</para
-> 
-
-<screenshot
-> 
-<screeninfo
->The filter settings</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-filters.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->The filter settings</phrase
-> 
-</textobject
-> 
-<caption
-> 
-<para
->The filter settings</para
-> 
-</caption
-> 
-</mediaobject
-> 
-</screenshot
-> 
-
-<para
->This dialogue shows two lists. The upper list, labelled <guilabel
-> Filters</guilabel
->, shows all defined filters; when you use &knode; for the first time, you will only see the predefined filters.</para
-> 
-
-<para
->With the buttons <guibutton
->Add</guibutton
->, <guibutton
->Delete</guibutton
->, <guibutton
->Edit</guibutton
-> and <guibutton
->Copy</guibutton
-> you can add new filters or delete filters which are no longer needed; we will skip this feature for now, because it is not essential for the setup of &knode;.</para
-> 
-
-<para
->You can find more-detailed information about filters in <link linkend="using-filters"
->Defining and using filters</link
->.</para>
-
-<para
->The lower list, labelled <guilabel
->Menu</guilabel
->, shows the appearance of the <menuchoice
-><guimenu
->View</guimenu
-> <guisubmenu
->Filter</guisubmenu
-></menuchoice
-> menu, which you can reach from the menu bar; the order of the filters in the this menu can be configured in this list.</para>
-
-<para
->The <guibutton
->Up</guibutton
-> button shifts the selected filter one position up. Try it: select the second filter and press <guibutton
->Up</guibutton
->; this entry will then go up one position.</para
-> 
-
-<para
->The <guibutton
->Down</guibutton
-> button does the opposite action: select the filter you just shifted one up and press<guibutton
->Down</guibutton
-> until it reaches its old position.</para>
-
-<para
->With the two buttons <guibutton
->Add Separator</guibutton
-> and <guibutton
->Remove Separator</guibutton
-> you can visually group the filters on the menu. The separators are shown as <literal
->====</literal
-> in the list; in the Menu they show up as some more-appealing horizontal lines. Try adding separator; then, select the separator and remove it by pressing <guibutton
->Remove separator</guibutton
->.</para
-> 
-
-<para
->Any changes you make here, you can see in <menuchoice
-><guimenu
->View</guimenu
-><guisubmenu
->Filter</guisubmenu
-></menuchoice
-> after closing this dialogue.</para
-> 
-
-</sect2
-> 
-
-<sect2 id="knode-headers"
-> 
-<title
-><guilabel
->Customise displayed article headers</guilabel
-></title
-> 
+<title>Filter settings</title>
+
+<para>This screenshot shows the filter settings.</para> 
+
+<screenshot> 
+<screeninfo>The filter settings</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-filters.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>The filter settings</phrase> 
+</textobject> 
+<caption> 
+<para>The filter settings</para> 
+</caption> 
+</mediaobject> 
+</screenshot> 
+
+<para>This dialogue shows two lists. The upper list, labelled <guilabel> Filters</guilabel>, shows all defined filters; when you use &knode; for the first time, you will only see the predefined filters.</para> 
+
+<para>With the buttons <guibutton>Add</guibutton>, <guibutton>Delete</guibutton>, <guibutton>Edit</guibutton> and <guibutton>Copy</guibutton> you can add new filters or delete filters which are no longer needed; we will skip this feature for now, because it is not essential for the setup of &knode;.</para> 
+
+<para>You can find more-detailed information about filters in <link linkend="using-filters">Defining and using filters</link>.</para>
+
+<para>The lower list, labelled <guilabel>Menu</guilabel>, shows the appearance of the <menuchoice><guimenu>View</guimenu> <guisubmenu>Filter</guisubmenu></menuchoice> menu, which you can reach from the menu bar; the order of the filters in the this menu can be configured in this list.</para>
+
+<para>The <guibutton>Up</guibutton> button shifts the selected filter one position up. Try it: select the second filter and press <guibutton>Up</guibutton>; this entry will then go up one position.</para> 
+
+<para>The <guibutton>Down</guibutton> button does the opposite action: select the filter you just shifted one up and press<guibutton>Down</guibutton> until it reaches its old position.</para>
+
+<para>With the two buttons <guibutton>Add Separator</guibutton> and <guibutton>Remove Separator</guibutton> you can visually group the filters on the menu. The separators are shown as <literal>====</literal> in the list; in the Menu they show up as some more-appealing horizontal lines. Try adding separator; then, select the separator and remove it by pressing <guibutton>Remove separator</guibutton>.</para> 
+
+<para>Any changes you make here, you can see in <menuchoice><guimenu>View</guimenu><guisubmenu>Filter</guisubmenu></menuchoice> after closing this dialogue.</para> 
+
+</sect2> 
+
+<sect2 id="knode-headers"> 
+<title><guilabel>Customise displayed article headers</guilabel></title> 
 
 <anchor id="anc-knode-headers"/> 
 
-<para
->In this dialogue you can set how the single header lines are displayed in the article window.</para
-> 
-
-<screenshot
-> 
-<screeninfo
->The <guilabel
->Customise displayed article headers</guilabel
-> Dialogue</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-header-settings.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->The <guilabel
->Customise displayed article headers</guilabel
-> dialogue</phrase
-> 
-</textobject
-> 
+<para>In this dialogue you can set how the single header lines are displayed in the article window.</para> 
+
+<screenshot> 
+<screeninfo>The <guilabel>Customise displayed article headers</guilabel> Dialogue</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-header-settings.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>The <guilabel>Customise displayed article headers</guilabel> dialogue</phrase> 
+</textobject> 
 <caption>
-<para
->The <guilabel
->Customise displayed article headers</guilabel
-> dialogue</para>
+<para>The <guilabel>Customise displayed article headers</guilabel> dialogue</para>
 </caption>
 </mediaobject>
 </screenshot>
 
-<para
->This list shows all the header lines which are to be display in the article window. The identifiers at the left will be displayed alongside the header lines in &lt; &gt; to their right; the header lines are taken from each message, &eg; for <guilabel
->From</guilabel
-> the From header line will be used (indicating who send the message).</para>
-
-<para
->Using <guibutton
->Edit</guibutton
-> you can alter the shown identifiers, alter the header line shown by each identifier and change the font settings of the text used. To make things clearer, we'll now simply select the <guilabel
->From:&lt;From&gt;</guilabel
-> entry in the list and open the dialogue for editing the header display by clicking on <guibutton
->Edit</guibutton
->.</para
-> 
+<para>This list shows all the header lines which are to be display in the article window. The identifiers at the left will be displayed alongside the header lines in &lt; &gt; to their right; the header lines are taken from each message, &eg; for <guilabel>From</guilabel> the From header line will be used (indicating who send the message).</para>
+
+<para>Using <guibutton>Edit</guibutton> you can alter the shown identifiers, alter the header line shown by each identifier and change the font settings of the text used. To make things clearer, we'll now simply select the <guilabel>From:&lt;From&gt;</guilabel> entry in the list and open the dialogue for editing the header display by clicking on <guibutton>Edit</guibutton>.</para> 
 
 <screenshot>
-<screeninfo
->The Header Properties Dialogue</screeninfo>
+<screeninfo>The Header Properties Dialogue</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="knode-edit-header1.png" format="PNG"/> </imageobject>
 <textobject>
-<phrase
->The Header Properties dialogue</phrase>
+<phrase>The Header Properties dialogue</phrase>
 </textobject>
 <caption>
-<para
->The Header Properties dialogue</para>
+<para>The Header Properties dialogue</para>
 </caption>
-</mediaobject
-> 
-</screenshot
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Header</guilabel
-></title
-> 
-
-<para
->The <guilabel
->Header</guilabel
-> selection box shows the entry <guilabel
->From</guilabel
->: that is the name of the header line for the sender, as present in the article and evaluated by the newsreader. If you drop down the selection box &knode; shows a range of other identifiers, which stand all for a certain header lines in the article: for now, we'll leave the <guilabel
->From</guilabel
-> identifier configured; we'll work with this list later, when we add a header line to the display.</para
-> 
+</mediaobject> 
+</screenshot> 
+
+<sect3> 
+<title><guilabel>Header</guilabel></title> 
+
+<para>The <guilabel>Header</guilabel> selection box shows the entry <guilabel>From</guilabel>: that is the name of the header line for the sender, as present in the article and evaluated by the newsreader. If you drop down the selection box &knode; shows a range of other identifiers, which stand all for a certain header lines in the article: for now, we'll leave the <guilabel>From</guilabel> identifier configured; we'll work with this list later, when we add a header line to the display.</para> 
 </sect3>
 
-<sect3
-> 
-<title
-><guilabel
->Displayed Name</guilabel
-></title
-> 
-
-<para
->This field holds the name you'd like to be later shown in the article window as a label alongside the actual header line text; for example, for the <guilabel
->From</guilabel
-> header line the label <guilabel
->From</guilabel
-> is used. If you leave this field blank, only the content of the header line appears in the article window; this is, for example, the default setting for the <guilabel
->Subject</guilabel
-> header line. We won't change anything here either, for now.</para>
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Name</guilabel
-></title
-> 
-
-<para
->Here you can influence the way the 'Displayed Name' text is displayed; in our case, the <guilabel
->Bold</guilabel
-> attribute is selected for the name <guilabel
->From</guilabel
->, &ie; the text will be shown in bold letters in the article window. Of course, you can combine different attributes, for example <guilabel
->Bold</guilabel
-> and <guilabel
->Underlined</guilabel
->.</para>
-
-</sect3
-> 
-
-<sect3
-> 
-<title
->Value</title
-> 
-
-<para
->Here you can influence the way the header text is displayed in the article window; for example, if the <guilabel
->Italic</guilabel
-> entry is selected the sender, &eg; <quote
->John Doe &lt;johndoe@doubleguns.com&gt;</quote
-> will appears in an italic font.</para>
-
-</sect3
-> 
-
-<sect3
-> 
-<title
->Add and remove header lines to the display</title>
-
-<para
->To explain the possibilities of this dialogue to you we're going to add a new header line to the display.</para>
-
-<example
-> 
-<title
->Show the newsreader used for a post in the article window</title
-> 
-
-<para
->This pictures shows the dialogue with the header line <literal
->X-Newsreader</literal
->.</para
-> 
-<screenshot
-> 
-<screeninfo
->The Header Properties Dialogue</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-edit-header2.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->The Header Properties dialogue</phrase
-> 
-</textobject
-> 
-<caption
-> 
-<para
->The Header Properties dialogue</para
-> 
-</caption
-> 
-</mediaobject
-> 
+<sect3> 
+<title><guilabel>Displayed Name</guilabel></title> 
+
+<para>This field holds the name you'd like to be later shown in the article window as a label alongside the actual header line text; for example, for the <guilabel>From</guilabel> header line the label <guilabel>From</guilabel> is used. If you leave this field blank, only the content of the header line appears in the article window; this is, for example, the default setting for the <guilabel>Subject</guilabel> header line. We won't change anything here either, for now.</para>
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Name</guilabel></title> 
+
+<para>Here you can influence the way the 'Displayed Name' text is displayed; in our case, the <guilabel>Bold</guilabel> attribute is selected for the name <guilabel>From</guilabel>, &ie; the text will be shown in bold letters in the article window. Of course, you can combine different attributes, for example <guilabel>Bold</guilabel> and <guilabel>Underlined</guilabel>.</para>
+
+</sect3> 
+
+<sect3> 
+<title>Value</title> 
+
+<para>Here you can influence the way the header text is displayed in the article window; for example, if the <guilabel>Italic</guilabel> entry is selected the sender, &eg; <quote>John Doe &lt;johndoe@doubleguns.com&gt;</quote> will appears in an italic font.</para>
+
+</sect3> 
+
+<sect3> 
+<title>Add and remove header lines to the display</title>
+
+<para>To explain the possibilities of this dialogue to you we're going to add a new header line to the display.</para>
+
+<example> 
+<title>Show the newsreader used for a post in the article window</title> 
+
+<para>This pictures shows the dialogue with the header line <literal>X-Newsreader</literal>.</para> 
+<screenshot> 
+<screeninfo>The Header Properties Dialogue</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-edit-header2.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>The Header Properties dialogue</phrase> 
+</textobject> 
+<caption> 
+<para>The Header Properties dialogue</para> 
+</caption> 
+</mediaobject> 
 </screenshot>
 
-<para
->It would be nice if one could see which newsreader another subscriber uses in the article window; it is actually quite easy to do this because there is a (optional) header line which contains the necessary information.</para>
+<para>It would be nice if one could see which newsreader another subscriber uses in the article window; it is actually quite easy to do this because there is a (optional) header line which contains the necessary information.</para>
 
-<para
->Drop down the <guilabel
->Header</guilabel
-> selection field and select the <guilabel
->X-Newsreader</guilabel
-> entry from the list.</para>
+<para>Drop down the <guilabel>Header</guilabel> selection field and select the <guilabel>X-Newsreader</guilabel> entry from the list.</para>
 
-<para
->In the <guilabel
->Displayed name</guilabel
-> field, enter <userinput
->Newsreader</userinput
->.</para>
+<para>In the <guilabel>Displayed name</guilabel> field, enter <userinput>Newsreader</userinput>.</para>
 
-<para
->Now you can select any attribute for the display of the field and its content; next, acknowledge your input with the <guibutton
->OK</guibutton
->: the new header line appears now in the list and will later be shown in the article window.</para>
+<para>Now you can select any attribute for the display of the field and its content; next, acknowledge your input with the <guibutton>OK</guibutton>: the new header line appears now in the list and will later be shown in the article window.</para>
 
 </example>
 
-<para
->Use the <guibutton
->up</guibutton
-> and <guibutton
->Down</guibutton
-> buttons to arrange the order of the headers in the article window.</para
-> 
-
-<tip
-> 
-<para
->The statement that the new header line will be shown in the article window is actually pretty optimistic, because the entry X-Newsreader isn't required for Usenet articles; therefore, not all articles will contain that header line: if the line doesn't exist, the according entry simply won't be shown. You can get more information about headers at <ulink url="http://www.kirchwitz.de/~amk/dni/headerzeilen"
->http://www.kirchwitz.de/~amk/dni/headerzeilen</ulink
-> (german)</para
-> 
-</tip
-> 
-</sect3
-> 
-</sect2
-> 
+<para>Use the <guibutton>up</guibutton> and <guibutton>Down</guibutton> buttons to arrange the order of the headers in the article window.</para> 
+
+<tip> 
+<para>The statement that the new header line will be shown in the article window is actually pretty optimistic, because the entry X-Newsreader isn't required for Usenet articles; therefore, not all articles will contain that header line: if the line doesn't exist, the according entry simply won't be shown. You can get more information about headers at <ulink url="http://www.kirchwitz.de/~amk/dni/headerzeilen">http://www.kirchwitz.de/~amk/dni/headerzeilen</ulink> (german)</para> 
+</tip> 
+</sect3> 
+</sect2> 
 
 <sect2>
-<title
-><guilabel
->Viewer</guilabel
-></title
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Show fancy header decorations</guilabel
-></title>
-
-<para
->If this is active, the headers will be 'beautified' a bit; otherwise, only the plain text is shown.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Rewrap text when necessary</guilabel
-></title
-> 
-
-<para
->If this option is active, the text wrapping in the viewer will be automatically corrected.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Remove trailing empty lines</guilabel
-></title>
-
-<para
->If this is active empty lines at the end of the article will be automatically hidden.</para
-> 
+<title><guilabel>Viewer</guilabel></title> 
+
+<sect3> 
+<title><guilabel>Show fancy header decorations</guilabel></title>
+
+<para>If this is active, the headers will be 'beautified' a bit; otherwise, only the plain text is shown.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Rewrap text when necessary</guilabel></title> 
+
+<para>If this option is active, the text wrapping in the viewer will be automatically corrected.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Remove trailing empty lines</guilabel></title>
+
+<para>If this is active empty lines at the end of the article will be automatically hidden.</para> 
 
 </sect3>
 
-<sect3
-> 
-<title
-><guilabel
->Show signature</guilabel
-></title
-> 
-
-<para
->If this setting is activated, the <glossterm
->signature</glossterm
-> of the sender is displayed in the article window; if it isn't, the signature is suppressed.</para
-> 
-
-<caution
-> 
-<para
->Please notice that &knode; can display the signature correctly only if it can be separated correctly from the article content in the current article: there are newsreaders which do this separation incorrectly. Two <quote
->-</quote
-> characters followed by a <quote
->&nbsp;</quote
-> (space) is correct.</para>
-</caution
-> 
-
-<tip
-> 
-<para
->Many participants in the newsgroups give hints on their homepage or say that they have intentionally erroneously specified their Email addresses in the header fields: if you disable displaying the signature, you might lose this information; on the other hand, you might save yourself from reading strange quotes.</para
-> 
-</tip
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Interpret text-format tags</guilabel
-></title
-> 
-
-<para
->If this is active, all text format tags in the message like <literal
->*bold*</literal
->, <literal
->/italic/</literal
-> and <literal
->_underline_</literal
-> are shown directly in the viewer. These text-format tags are an unofficial standard.</para>
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Recognise quote characters</guilabel
-></title
-> 
-
-<para
->To display the quoted text in another size or colour, &knode; needs to recognise that it's quoted text. Quoted text is normally marked with a <quote
->&gt;</quote
-> at the beginning of the line, but sometimes there are other characters. In this field you can enter all characters that should mark quoted text.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Show attachments inline if possible</guilabel
-></title
-> 
-
-<para
->If this setting is marked, &knode; tries to display the contents of possible attachment directly in the window when opening an article; for instance, a picture would be displayed directly below the article text.</para
-> 
-
-<para
->Additionally, you have the possibility to save the attachment or open it with the application you have associated with the <acronym
->MIME</acronym
-> type of the attachment by using the context menu.</para>
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Open attachments on click</guilabel
-></title
-> 
-
-<para
->If this box is checked, attachments are opened with the external program which is configured for the <acronym
->MIME</acronym
-> type; if there is no such association, a dialogue for saving a file is opened and you can save the attachment to a separate file.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Show alternative contents as attachments</guilabel
-></title
-> 
-
-<para
->Articles which are sent as Multipart <acronym
->MIME</acronym
-> contain the text of the message in multiple formats, for example as raw text and <acronym
->HTML</acronym
->; the newsreader decides which part of the article is displayed. This setting makes it possible for the other formats to be opened as if they were attachments with a mouse click.</para>
-
-<para
->If this setting is disabled, alternative contents are not displayed.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Open links with</guilabel
-></title
-> 
-
-<para
->Here you can select which browser is used for displaying links you clicked on in a message. Currently, you can either select the <application
->Netscape Navigator</application
-> or the default, &konqueror;; the selected browser has to be installed, of course.</para>
-
-</sect3
-> 
-</sect2
-> 
-
-<sect2 id="knode-post-news-settings"
-> 
-<title
->Settings for publishing articles</title>
-
-<para
->When you post articles with &knode; the settings in the following dialogue box are used.</para
-> 
-
-<screenshot
-> 
-<screeninfo
->The Technical Settings dialogue</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-post-settings.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->The Technical Settings dialogue</phrase
-> 
-</textobject
-> 
-<caption
-> 
-<para
->The Technical Settings dialogue</para
-> 
-</caption
-> 
-</mediaobject
-> 
-</screenshot
-> 
-
-<caution
-> 
-<para
->If you choose the wrong settings here your articles could be unreadable or not sendable at all, so please be careful with these settings.</para
-> 
-</caution
-> 
+<sect3> 
+<title><guilabel>Show signature</guilabel></title> 
+
+<para>If this setting is activated, the <glossterm>signature</glossterm> of the sender is displayed in the article window; if it isn't, the signature is suppressed.</para> 
+
+<caution> 
+<para>Please notice that &knode; can display the signature correctly only if it can be separated correctly from the article content in the current article: there are newsreaders which do this separation incorrectly. Two <quote>-</quote> characters followed by a <quote>&nbsp;</quote> (space) is correct.</para>
+</caution> 
+
+<tip> 
+<para>Many participants in the newsgroups give hints on their homepage or say that they have intentionally erroneously specified their Email addresses in the header fields: if you disable displaying the signature, you might lose this information; on the other hand, you might save yourself from reading strange quotes.</para> 
+</tip> 
+</sect3> 
+
+<sect3> 
+<title><guilabel>Interpret text-format tags</guilabel></title> 
+
+<para>If this is active, all text format tags in the message like <literal>*bold*</literal>, <literal>/italic/</literal> and <literal>_underline_</literal> are shown directly in the viewer. These text-format tags are an unofficial standard.</para>
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Recognise quote characters</guilabel></title> 
+
+<para>To display the quoted text in another size or colour, &knode; needs to recognise that it's quoted text. Quoted text is normally marked with a <quote>&gt;</quote> at the beginning of the line, but sometimes there are other characters. In this field you can enter all characters that should mark quoted text.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Show attachments inline if possible</guilabel></title> 
+
+<para>If this setting is marked, &knode; tries to display the contents of possible attachment directly in the window when opening an article; for instance, a picture would be displayed directly below the article text.</para> 
+
+<para>Additionally, you have the possibility to save the attachment or open it with the application you have associated with the <acronym>MIME</acronym> type of the attachment by using the context menu.</para>
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Open attachments on click</guilabel></title> 
+
+<para>If this box is checked, attachments are opened with the external program which is configured for the <acronym>MIME</acronym> type; if there is no such association, a dialogue for saving a file is opened and you can save the attachment to a separate file.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Show alternative contents as attachments</guilabel></title> 
+
+<para>Articles which are sent as Multipart <acronym>MIME</acronym> contain the text of the message in multiple formats, for example as raw text and <acronym>HTML</acronym>; the newsreader decides which part of the article is displayed. This setting makes it possible for the other formats to be opened as if they were attachments with a mouse click.</para>
+
+<para>If this setting is disabled, alternative contents are not displayed.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Open links with</guilabel></title> 
+
+<para>Here you can select which browser is used for displaying links you clicked on in a message. Currently, you can either select the <application>Netscape Navigator</application> or the default, &konqueror;; the selected browser has to be installed, of course.</para>
+
+</sect3> 
+</sect2> 
+
+<sect2 id="knode-post-news-settings"> 
+<title>Settings for publishing articles</title>
+
+<para>When you post articles with &knode; the settings in the following dialogue box are used.</para> 
+
+<screenshot> 
+<screeninfo>The Technical Settings dialogue</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-post-settings.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>The Technical Settings dialogue</phrase> 
+</textobject> 
+<caption> 
+<para>The Technical Settings dialogue</para> 
+</caption> 
+</mediaobject> 
+</screenshot> 
+
+<caution> 
+<para>If you choose the wrong settings here your articles could be unreadable or not sendable at all, so please be careful with these settings.</para> 
+</caution> 
 
 <sect3>
-<title
-><guilabel
->Charset</guilabel
-></title>
+<title><guilabel>Charset</guilabel></title>
 
-<para
->Here you can choose the charset used for encoding your articles. Normally this is <acronym
->US-ASCII</acronym
-> for English speaking countries, but your charset may differ. The default is the charset used in your global &kde; settings, so you should not have to change this.</para>
+<para>Here you can choose the charset used for encoding your articles. Normally this is <acronym>US-ASCII</acronym> for English speaking countries, but your charset may differ. The default is the charset used in your global &kde; settings, so you should not have to change this.</para>
 
-<para
->When you want to post articles in newsgroups with other charsets (&eg; eastern European or Asian) you can set the required charset here.</para>
+<para>When you want to post articles in newsgroups with other charsets (&eg; eastern European or Asian) you can set the required charset here.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Encoding</guilabel
-></title
-> 
+<title><guilabel>Encoding</guilabel></title> 
 
-<para
->Here you set the encoding of the characters for the message transfer; you can choose between 8-bit and 7-bit (quoted-printable).</para>
+<para>Here you set the encoding of the characters for the message transfer; you can choose between 8-bit and 7-bit (quoted-printable).</para>
 
-<para
->If you choose 8-bit encoding most special characters are transfered correctly; this is, for example, the normal option for the German groups (de.*).</para
-> 
+<para>If you choose 8-bit encoding most special characters are transfered correctly; this is, for example, the normal option for the German groups (de.*).</para> 
 
-<para
->If you choose quoted-printable 8-bit characters (&eg; German umlauts or special characters) are send as encoded 7-bit characters.</para>
+<para>If you choose quoted-printable 8-bit characters (&eg; German umlauts or special characters) are send as encoded 7-bit characters.</para>
 
 <tip>
-<para
->In the English newsgroups 7-bit encoding is quite normal.</para>
-</tip
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Use own default charset when replying</guilabel
-></title
-> 
-
-<para
->If this option is active, &knode; uses your default charset for replying instead of the charset of the article you're answering on.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Generate Message-ID</guilabel
-></title
-> 
-
-<para
->When this is active, &knode; generates its own Message-IDs for all articles you post.</para
-> 
-
-<caution
-> 
-<para
->The Message-ID must be unique worldwide: there would otherwise be collisions between messages with the same Message-ID and the news server would reject the second article because it thinks this article has already been received.</para>
-
-<para
->A Message-ID consists of a valid <acronym
->FQDN</acronym
-> (Full Qualified Domain Name); this means it looks similar to an email address with an identification before the <literal
->@</literal
-> and the domain.</para>
-
-<para
->The identification is generated by &knode; automatically, but you must provide a valid domain name in <guilabel
->Hostname</guilabel
->; if you do not have your own domain, you should not activate this option &mdash; let the newsserver generate a Message-ID for you.</para
-> 
-
-<example
-> 
-<title
->Message-ID</title>
-
-<para
->An example for a valid domain would be: <literal
->kde.org</literal
->; a Message-ID generated with this domain would look like:</para
-> 
-
-<screen
->934lek9934@kde.org</screen
-> 
-</example
-> 
-
-<para
->An unique identification is only guaranteed if you have your own domain. Even when you do not use &knode; for generating your Message-IDs there may be collisions when you are using a local newsserver; for example, <application
->leafnode</application
-> generates a Message-ID which it derives from the local hostname.</para>
-
-</caution
-> 
-
-<tip
-> 
-<para
->You can get more information about this and how to own a free domain at <ulink url="http://www.qad.org/faq/faq-messageid.html"
->http://www.qad.org/faq/faq-messageid.html</ulink
->.</para
-> 
-</tip
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Hostname</guilabel
-></title
-> 
-
-<para
->Here you enter the Hostname of your computer; this is used to generate the Message-ID. If you do not have your own domain you should not activate this option &mdash; let the newsserver generate a Message-ID for you. Using the example above this would be: <userinput
->kde.org</userinput
->.</para>
+<para>In the English newsgroups 7-bit encoding is quite normal.</para>
+</tip> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Use own default charset when replying</guilabel></title> 
+
+<para>If this option is active, &knode; uses your default charset for replying instead of the charset of the article you're answering on.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Generate Message-ID</guilabel></title> 
+
+<para>When this is active, &knode; generates its own Message-IDs for all articles you post.</para> 
+
+<caution> 
+<para>The Message-ID must be unique worldwide: there would otherwise be collisions between messages with the same Message-ID and the news server would reject the second article because it thinks this article has already been received.</para>
+
+<para>A Message-ID consists of a valid <acronym>FQDN</acronym> (Full Qualified Domain Name); this means it looks similar to an email address with an identification before the <literal>@</literal> and the domain.</para>
+
+<para>The identification is generated by &knode; automatically, but you must provide a valid domain name in <guilabel>Hostname</guilabel>; if you do not have your own domain, you should not activate this option &mdash; let the newsserver generate a Message-ID for you.</para> 
+
+<example> 
+<title>Message-ID</title>
+
+<para>An example for a valid domain would be: <literal>kde.org</literal>; a Message-ID generated with this domain would look like:</para> 
+
+<screen>934lek9934@kde.org</screen> 
+</example> 
+
+<para>An unique identification is only guaranteed if you have your own domain. Even when you do not use &knode; for generating your Message-IDs there may be collisions when you are using a local newsserver; for example, <application>leafnode</application> generates a Message-ID which it derives from the local hostname.</para>
+
+</caution> 
+
+<tip> 
+<para>You can get more information about this and how to own a free domain at <ulink url="http://www.qad.org/faq/faq-messageid.html">http://www.qad.org/faq/faq-messageid.html</ulink>.</para> 
+</tip> 
+</sect3> 
+
+<sect3> 
+<title><guilabel>Hostname</guilabel></title> 
+
+<para>Here you enter the Hostname of your computer; this is used to generate the Message-ID. If you do not have your own domain you should not activate this option &mdash; let the newsserver generate a Message-ID for you. Using the example above this would be: <userinput>kde.org</userinput>.</para>
 
 </sect3>
 
-<sect3
-> 
-<title
-><guilabel
->X-Headers</guilabel
-></title
-> 
-
-<para
->Here you can enter X-Headers which are not provided by &knode;; for example, <userinput
->X-No-Archive: yes</userinput
->, which can be used to prevent your articles from being archived by archive services such as Google.</para>
-
-<para
->X-Headers are experimental headers, which are not included in the standard for Internet-Messages; they are, for example, used for extended information transfer. To prevent collisions with later standard headers, they have a <quote
->X-</quote
-> prefix.</para>
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Don't add the "User-Agent" identification header</guilabel
-></title
-> 
-
-<para
->When this option is checked &knode; does not include the corresponding line in the Header before posting.</para>
-
-<para
->This header is used for identification of the newsreader the article was written in; apart from statistical reasons, this allows non-standard newsreaders to be identified. You should not activate this option &mdash; &knode; has no need to hide.</para
-> </sect3
-> 
+<sect3> 
+<title><guilabel>X-Headers</guilabel></title> 
+
+<para>Here you can enter X-Headers which are not provided by &knode;; for example, <userinput>X-No-Archive: yes</userinput>, which can be used to prevent your articles from being archived by archive services such as Google.</para>
+
+<para>X-Headers are experimental headers, which are not included in the standard for Internet-Messages; they are, for example, used for extended information transfer. To prevent collisions with later standard headers, they have a <quote>X-</quote> prefix.</para>
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Don't add the "User-Agent" identification header</guilabel></title> 
+
+<para>When this option is checked &knode; does not include the corresponding line in the Header before posting.</para>
+
+<para>This header is used for identification of the newsreader the article was written in; apart from statistical reasons, this allows non-standard newsreaders to be identified. You should not activate this option &mdash; &knode; has no need to hide.</para> </sect3> 
 </sect2>
 
-<sect2 id="knode-composer-settings"
-> 
-<title
->The Composer Settings</title
-> 
-
-<screenshot
-> 
-<screeninfo
->The Composer Settings dialogue</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-composer-settings.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->The Composer Settings dialogue</phrase
-> 
-</textobject
-> 
-<caption
-> 
-<para
->The Composer Settings dialogue</para
-> 
-</caption
-> 
-</mediaobject
-> 
-</screenshot
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Word-wrap at column</guilabel
-></title
-> 
-
-<para
->Here you can set the column number at which &knode; wraps the line; also, you can deactivate the automatic word-wrapping completely.</para
-> 
-
-<tip
-> 
-<para
->It is recommended to use no more than 76 characters even if you are able to display more: many Usenet users use text-based newsreaders which can not display more than 80 characters and it is difficult to read your articles in such a newsreader if you increase this value &mdash; this would reduce the probability of your articles being read at all.</para
-> 
-</tip
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Append signature automatically</guilabel
-></title>
-
-<para
->When you write a new <glossterm
->article</glossterm
-> or a <glossterm
->followup</glossterm
->, your <glossterm
->signature</glossterm
-> is appended automatically if you have configured one in <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-><guilabel
->Identity</guilabel
-></menuchoice
->.</para>
+<sect2 id="knode-composer-settings"> 
+<title>The Composer Settings</title> 
+
+<screenshot> 
+<screeninfo>The Composer Settings dialogue</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-composer-settings.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>The Composer Settings dialogue</phrase> 
+</textobject> 
+<caption> 
+<para>The Composer Settings dialogue</para> 
+</caption> 
+</mediaobject> 
+</screenshot> 
+
+<sect3> 
+<title><guilabel>Word-wrap at column</guilabel></title> 
+
+<para>Here you can set the column number at which &knode; wraps the line; also, you can deactivate the automatic word-wrapping completely.</para> 
+
+<tip> 
+<para>It is recommended to use no more than 76 characters even if you are able to display more: many Usenet users use text-based newsreaders which can not display more than 80 characters and it is difficult to read your articles in such a newsreader if you increase this value &mdash; this would reduce the probability of your articles being read at all.</para> 
+</tip> 
+</sect3> 
+
+<sect3> 
+<title><guilabel>Append signature automatically</guilabel></title>
+
+<para>When you write a new <glossterm>article</glossterm> or a <glossterm>followup</glossterm>, your <glossterm>signature</glossterm> is appended automatically if you have configured one in <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem><guilabel>Identity</guilabel></menuchoice>.</para>
 
 </sect3>
 
-<sect3
-> 
-<title
-><guilabel
->Introduction Phrase:</guilabel
-></title
-> 
-
-<para
->When you write a followup, &knode; inserts an introduction phrase before the quoted original text. You can put arbitrary text here; you can also use the variables which &knode; extracts from the original article, &eg; the name of the author or the date the article was written.</para>
-
-<para
->The following variable are available:</para>
-
-<variablelist
-> 
-<varlistentry
-> 
-<term
-><varname
->%NAME</varname
-></term
-> 
-<listitem
-> 
-<para
->The name of the original author;</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
-><varname
->%DATE</varname
-></term
-> 
-<listitem
-> 
-<para
->The date on which the original article was written;</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
-><varname
->%EMAIL</varname
-></term
-> 
-<listitem
-> 
-<para
->The original author's email address;</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
-><varname
->%MSID</varname
-></term
-> 
-<listitem
-> 
-<para
->The Message-ID of the original article;</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
-><varname
->%GROUP</varname
-></term
-> 
-<listitem
-> 
-<para
->The name of the <glossterm
->newsgroup</glossterm
-> the article comes from.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-</variablelist
-> 
-
-<tip
-> 
-<para
->Keep this short, because this introductory line appears in every followup: a long introductory line can be as repelling as a long signature.</para
-> 
-</tip
-> 
-
-<example
-> 
-<title
->An example introductory line</title
-> 
-
-<screen
-><userinput
->On <varname
->%DATE</varname
-> <varname
->%NAME</varname
-> wrote in <varname
->%MSID</varname
-></userinput
-></screen
-> 
-
-<para
->Let us assume the original article was written by Konqui on Saturday the 17th of June at 17:42:32 - 0500. The article has the Message-ID &lt;8igdg5.3vvijgt.3@lizard.physos.com&gt;. &knode; will then insert the following introductionary line.</para
-> 
-
-<screen
-><computeroutput
->On Sat, 17 Jun 2000 17:42:32 +0200 Konqui wrote in
-&lt;8igdg5.3vvijgt.3@lizard.physos.com&gt;:</computeroutput
-></screen
-> 
-
-</example
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Rewrap quoted text automatically</guilabel
-></title
-> 
-
-<para
->When this is checked, the quoted text is wrapped at the correct border value; hence, every new line will be at the correct quoting level.</para
-> 
+<sect3> 
+<title><guilabel>Introduction Phrase:</guilabel></title> 
+
+<para>When you write a followup, &knode; inserts an introduction phrase before the quoted original text. You can put arbitrary text here; you can also use the variables which &knode; extracts from the original article, &eg; the name of the author or the date the article was written.</para>
+
+<para>The following variable are available:</para>
+
+<variablelist> 
+<varlistentry> 
+<term><varname>%NAME</varname></term> 
+<listitem> 
+<para>The name of the original author;</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term><varname>%DATE</varname></term> 
+<listitem> 
+<para>The date on which the original article was written;</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term><varname>%EMAIL</varname></term> 
+<listitem> 
+<para>The original author's email address;</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term><varname>%MSID</varname></term> 
+<listitem> 
+<para>The Message-ID of the original article;</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term><varname>%GROUP</varname></term> 
+<listitem> 
+<para>The name of the <glossterm>newsgroup</glossterm> the article comes from.</para> 
+</listitem> 
+</varlistentry> 
+</variablelist> 
+
+<tip> 
+<para>Keep this short, because this introductory line appears in every followup: a long introductory line can be as repelling as a long signature.</para> 
+</tip> 
+
+<example> 
+<title>An example introductory line</title> 
+
+<screen><userinput>On <varname>%DATE</varname> <varname>%NAME</varname> wrote in <varname>%MSID</varname></userinput></screen> 
+
+<para>Let us assume the original article was written by Konqui on Saturday the 17th of June at 17:42:32 - 0500. The article has the Message-ID &lt;8igdg5.3vvijgt.3@lizard.physos.com&gt;. &knode; will then insert the following introductionary line.</para> 
+
+<screen><computeroutput>On Sat, 17 Jun 2000 17:42:32 +0200 Konqui wrote in
+&lt;8igdg5.3vvijgt.3@lizard.physos.com&gt;:</computeroutput></screen> 
+
+</example> 
+</sect3> 
+
+<sect3> 
+<title><guilabel>Rewrap quoted text automatically</guilabel></title> 
+
+<para>When this is checked, the quoted text is wrapped at the correct border value; hence, every new line will be at the correct quoting level.</para> 
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Include the author's signature</guilabel
-></title>
+<title><guilabel>Include the author's signature</guilabel></title>
 
-<para
->When this is activated not only the text of the original message, but also the signature of the author, is quoted in a reply.</para>
+<para>When this is activated not only the text of the original message, but also the signature of the author, is quoted in a reply.</para>
 
 <tip>
-<para
->Quoting a signature is unnecessary and is often considered impolite.</para>
+<para>Quoting a signature is unnecessary and is often considered impolite.</para>
 </tip>
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Put the cursor below the introduction phrase</guilabel
-></title>
+<title><guilabel>Put the cursor below the introduction phrase</guilabel></title>
 
-<para
->Normally the cursor will appear below the whole message when answering; with this option turned on the cursor appears below the introduction phrase.</para>
+<para>Normally the cursor will appear below the whole message when answering; with this option turned on the cursor appears below the introduction phrase.</para>
 
 <tip>
-<para
->This is especially helpful if you quote an article and wish to write between the quoted lines from top to bottom.</para>
+<para>This is especially helpful if you quote an article and wish to write between the quoted lines from top to bottom.</para>
 </tip>
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Define external editor</guilabel
-></title>
-
-<para
->You can define an external editor here which is opened by selecting <menuchoice
-><guimenu
->Tools</guimenu
-><guimenuitem
->Start external editor</guimenuitem
-></menuchoice
-> in the Composer window.</para
-> 
-
-<para
->When <guilabel
->Start external editor automatically</guilabel
-> is checked the external editor is opened directly.</para>
+<title><guilabel>Define external editor</guilabel></title>
+
+<para>You can define an external editor here which is opened by selecting <menuchoice><guimenu>Tools</guimenu><guimenuitem>Start external editor</guimenuitem></menuchoice> in the Composer window.</para> 
+
+<para>When <guilabel>Start external editor automatically</guilabel> is checked the external editor is opened directly.</para>
 
 <caution>
-<para
->Notice the <varname
->%f</varname
-> after the name of the editor: this is a variable for the filename of the article you want to edit; do not delete this &mdash; you will get an error message when opening the external editor if you do.</para>
+<para>Notice the <varname>%f</varname> after the name of the editor: this is a variable for the filename of the article you want to edit; do not delete this &mdash; you will get an error message when opening the external editor if you do.</para>
 </caution>
 
 <tip>
-<para
->If you have problems with starting your external editor, the reason may be that the editor starting in "the background"; this is called forking: &knode; only notices the sub-process started and has finished, and thinks you have quit the editor. The editor <application
->gvim</application
-> is an example for this; you can disable the forking of <application
->gvim</application
-> with the commandline switch <option
->-f</option
->. It is recommended that you refer to the documentation of your editor you are experiencing this problem.</para>
-
-<para
->If you want to use <application
->gvim</application
-> in <guilabel
->Specify Editor</guilabel
-> enter the following:</para>
+<para>If you have problems with starting your external editor, the reason may be that the editor starting in "the background"; this is called forking: &knode; only notices the sub-process started and has finished, and thinks you have quit the editor. The editor <application>gvim</application> is an example for this; you can disable the forking of <application>gvim</application> with the commandline switch <option>-f</option>. It is recommended that you refer to the documentation of your editor you are experiencing this problem.</para>
+
+<para>If you want to use <application>gvim</application> in <guilabel>Specify Editor</guilabel> enter the following:</para>
 
 <para>
-<userinput
->gvim -f %f</userinput>
+<userinput>gvim -f %f</userinput>
 </para>
 </tip>
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Start external editor automatically</guilabel
-></title>
+<title><guilabel>Start external editor automatically</guilabel></title>
 
-<para
->If this option is active the external editor will be used for editing articles.</para>
+<para>If this option is active the external editor will be used for editing articles.</para>
 
 </sect3>
 </sect2>
 
 <sect2>
-<title
-><guilabel
->Spelling</guilabel
-></title>
+<title><guilabel>Spelling</guilabel></title>
 
-<para
->Here you can configure the behaviour of the spell checker.</para>
+<para>Here you can configure the behaviour of the spell checker.</para>
 
 <sect3>
-<title
-><guilabel
->Create root/affix not in dictionary</guilabel
-></title>
+<title><guilabel>Create root/affix not in dictionary</guilabel></title>
 
-<para
->If this is checked a known word-root with an unknown affix will be automatically accepted as a new word.</para>
+<para>If this is checked a known word-root with an unknown affix will be automatically accepted as a new word.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Consider run-together words as spelling errors</guilabel
-></title>
+<title><guilabel>Consider run-together words as spelling errors</guilabel></title>
 
-<para
->Here you can toggle if two known words that run together to form an unknown word should be treated as an error or not.)</para>
+<para>Here you can toggle if two known words that run together to form an unknown word should be treated as an error or not.)</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Dictionary</guilabel
-></title>
+<title><guilabel>Dictionary</guilabel></title>
 
-<para
->Here you chose the dictionary the spell-checker should use.</para>
+<para>Here you chose the dictionary the spell-checker should use.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Encoding</guilabel
-></title>
+<title><guilabel>Encoding</guilabel></title>
 
-<para
->Here you can tell &knode; which encoding should be used for spell checking; for English text this should normally be <acronym
->US-ASCII</acronym
->.</para>
+<para>Here you can tell &knode; which encoding should be used for spell checking; for English text this should normally be <acronym>US-ASCII</acronym>.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Client</guilabel
-></title>
-
-<para
->Here you can switch between the spell-checkers; you can use <application
->International Ispell</application
-> or <application
->Aspell</application
->.</para>
+<title><guilabel>Client</guilabel></title>
+
+<para>Here you can switch between the spell-checkers; you can use <application>International Ispell</application> or <application>Aspell</application>.</para>
 
 </sect3>
 
 </sect2>
 
 <sect2>
-<title
-><guilabel
->Signing and verifying</guilabel
-></title>
-
-<para
->Here you can configure &knode; for signing articles with <application
->GnuPG</application
-> or <application
->PGP</application
->. Your <application
->GnuPG</application
->/<application
->PGP</application
-> <acronym
->ID</acronym
-> will be built automatically from your configured name and email address; it is identical to the from line in the header of the <glossterm
->article</glossterm
->.</para>
+<title><guilabel>Signing and verifying</guilabel></title>
+
+<para>Here you can configure &knode; for signing articles with <application>GnuPG</application> or <application>PGP</application>. Your <application>GnuPG</application>/<application>PGP</application> <acronym>ID</acronym> will be built automatically from your configured name and email address; it is identical to the from line in the header of the <glossterm>article</glossterm>.</para>
 
 <sect3>
-<title
-><guilabel
->Encryption tool</guilabel
-></title>
+<title><guilabel>Encryption tool</guilabel></title>
 
-<para
->Here you can choose your encryption tool.</para>
+<para>Here you can choose your encryption tool.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Keep passphrase in memory</guilabel
-></title>
+<title><guilabel>Keep passphrase in memory</guilabel></title>
 
-<para
->If this option is active you only need to type the passphrase for your private key once; &knode; will remember your passphrase until you close &knode; again.</para>
+<para>If this option is active you only need to type the passphrase for your private key once; &knode; will remember your passphrase until you close &knode; again.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Show ciphered/signed text after composing</guilabel
-></title>
+<title><guilabel>Show ciphered/signed text after composing</guilabel></title>
 
-<para
->If this option is activated &knode; will show the signed message in an extra window for confirmation before changing it in the editor.</para>
+<para>If this option is activated &knode; will show the signed message in an extra window for confirmation before changing it in the editor.</para>
 
 </sect3>
 
 <sect3>
-<title
->Always show the encryption keys for approval</title>
+<title>Always show the encryption keys for approval</title>
 
-<para
->If you are using public newsgroups (on Usenet) you can safely ignore this option as it would not be useful to encrypt messages sent to Usenet; this option may, however, be useful in private newsgroups on private networks where encryption is desired.</para>
+<para>If you are using public newsgroups (on Usenet) you can safely ignore this option as it would not be useful to encrypt messages sent to Usenet; this option may, however, be useful in private newsgroups on private networks where encryption is desired.</para>
 <!-- FIXME: LW - I can see use for -->
 <!-- encryption, on private networks etc.  This needs a rewrite -->
 <!-- AndrewColes: is this revision any better? -->
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Check signatures automatically</guilabel
-></title
-> 
-
-<para
->If this is marked, the <application
->PGP</application
-> signature of the article is automatically checked when showing the article; if there's no mark, you can check the signature for correctness manually with the <menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Verify PGP-Signature</guimenuitem
-></menuchoice
-> menu entry.</para
-> 
-
-</sect3
-> 
-
-</sect2
-> 
-
-
-<sect2 id="knode-article-cleanup"
-> 
-<title
->The article-cleanup settings.</title
-> 
-
-<para
->The dialogue below shows the settings for the article cleanup; these settings are used to keep the number of articles on your local harddisk to a reasonable number. &knode; administrates the articles in memory so there can be some decrease in speed if you have to many articles lying around; most of the time it makes no sense to keep articles for a very long time. Services like Google and Altavista make archiving unnecessary.</para>
-
-<caution
-> 
-<para
->&knode; isn't an offline reader, so all of the configuration refers to the headers which are managed by &knode;; if you are running a local news server, such as <application
->leafnode</application
->, you should refer to its documentation to handle expiring the articles on the server &mdash; &knode; cannot do this for you.</para>
-</caution
-> 
-
-<screenshot
-> 
-<screeninfo
->The cleanup settings</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-cleanup.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->The cleanup settings</phrase
-> 
-</textobject
-> 
-<caption
-> 
-<para
->The cleanup settings</para
-> 
-</caption
-> 
-</mediaobject
-> 
-</screenshot
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Expire old articles automatically</guilabel
-></title
-> 
-
-<para
->When this option is active all subscribed groups are checked for old articles in the time interval set here; the old articles will then be deleted.</para>
+<title><guilabel>Check signatures automatically</guilabel></title> 
+
+<para>If this is marked, the <application>PGP</application> signature of the article is automatically checked when showing the article; if there's no mark, you can check the signature for correctness manually with the <menuchoice><guimenu>View</guimenu><guimenuitem>Verify PGP-Signature</guimenuitem></menuchoice> menu entry.</para> 
+
+</sect3> 
+
+</sect2> 
+
+
+<sect2 id="knode-article-cleanup"> 
+<title>The article-cleanup settings.</title> 
+
+<para>The dialogue below shows the settings for the article cleanup; these settings are used to keep the number of articles on your local harddisk to a reasonable number. &knode; administrates the articles in memory so there can be some decrease in speed if you have to many articles lying around; most of the time it makes no sense to keep articles for a very long time. Services like Google and Altavista make archiving unnecessary.</para>
+
+<caution> 
+<para>&knode; isn't an offline reader, so all of the configuration refers to the headers which are managed by &knode;; if you are running a local news server, such as <application>leafnode</application>, you should refer to its documentation to handle expiring the articles on the server &mdash; &knode; cannot do this for you.</para>
+</caution> 
+
+<screenshot> 
+<screeninfo>The cleanup settings</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-cleanup.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>The cleanup settings</phrase> 
+</textobject> 
+<caption> 
+<para>The cleanup settings</para> 
+</caption> 
+</mediaobject> 
+</screenshot> 
+
+<sect3> 
+<title><guilabel>Expire old articles automatically</guilabel></title> 
+
+<para>When this option is active all subscribed groups are checked for old articles in the time interval set here; the old articles will then be deleted.</para>
 
 
 <tip>
-<para
->You can force this check by selecting <menuchoice
-><guimenu
->Group</guimenu
-><guimenuitem
->Expire group</guimenuitem
-></menuchoice
-></para
-> 
-</tip
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Purge groups every</guilabel
-></title>
-
-<para
->Here you can configure how often subscribed groups should be checked for old <glossterm
->article</glossterm
->s and how often those articles should be deleted; this option only has an effect when <guilabel
->Expire old articles automatically</guilabel
-> is selected.</para>
+<para>You can force this check by selecting <menuchoice><guimenu>Group</guimenu><guimenuitem>Expire group</guimenuitem></menuchoice></para> 
+</tip> 
+</sect3> 
+
+<sect3> 
+<title><guilabel>Purge groups every</guilabel></title>
+
+<para>Here you can configure how often subscribed groups should be checked for old <glossterm>article</glossterm>s and how often those articles should be deleted; this option only has an effect when <guilabel>Expire old articles automatically</guilabel> is selected.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Keep read articles</guilabel
-></title>
+<title><guilabel>Keep read articles</guilabel></title>
 
-<para
->Read articles are deleted by the next cleanup if they are older than this value; &knode; uses the creation date for this.</para>
+<para>Read articles are deleted by the next cleanup if they are older than this value; &knode; uses the creation date for this.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Keep unread articles</guilabel
-></title>
+<title><guilabel>Keep unread articles</guilabel></title>
 
-<para
->Unread articles are deleted by the next cleanup if they are older than this value; &knode; uses the creation date for this.</para>
+<para>Unread articles are deleted by the next cleanup if they are older than this value; &knode; uses the creation date for this.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Remove articles that are not available on the server</guilabel
-></title>
+<title><guilabel>Remove articles that are not available on the server</guilabel></title>
 
-<para
->It may happen that you'll see a <glossterm
->header</glossterm
-> in &knode; but the article is not available on the server; if this option is set, those articles will automatically deleted in &knode;.</para>
+<para>It may happen that you'll see a <glossterm>header</glossterm> in &knode; but the article is not available on the server; if this option is set, those articles will automatically deleted in &knode;.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Preserve threads</guilabel
-></title
-> 
-
-<para
->This selection forces a thread to be deleted only if all articles contained in it fulfil the delete conditions; this means that a thread will not be deleted until the last article in the thread should be deleted.</para
-> 
-
-<para
->This prevents old articles in a long thread from vanishing before the discussion has ended.</para>
-
-<caution
-> 
-<para
->&knode; can not predict whether there will be a reply after the set conditions are fulfilled; you will have to find your own settings for this. Some newsgroups have days between replies; others only hours. Use your own judgement.</para
-> 
-</caution
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Compact folders automatically</guilabel
-></title
-> 
-
-<para
->This option refers to the memory behaviour of &knode;. If an <glossterm
->article</glossterm
-> in a folder is deleted it will be marked as deleted but still take up space on your hard disk; with this option you can tell &knode; to actually delete the articles and free the hard-disk space regularly.</para>
+<title><guilabel>Preserve threads</guilabel></title> 
+
+<para>This selection forces a thread to be deleted only if all articles contained in it fulfil the delete conditions; this means that a thread will not be deleted until the last article in the thread should be deleted.</para> 
+
+<para>This prevents old articles in a long thread from vanishing before the discussion has ended.</para>
+
+<caution> 
+<para>&knode; can not predict whether there will be a reply after the set conditions are fulfilled; you will have to find your own settings for this. Some newsgroups have days between replies; others only hours. Use your own judgement.</para> 
+</caution> 
+</sect3> 
+
+<sect3> 
+<title><guilabel>Compact folders automatically</guilabel></title> 
+
+<para>This option refers to the memory behaviour of &knode;. If an <glossterm>article</glossterm> in a folder is deleted it will be marked as deleted but still take up space on your hard disk; with this option you can tell &knode; to actually delete the articles and free the hard-disk space regularly.</para>
 
 <tip>
-<para
->You can force this check by selecting <menuchoice
-><guimenu
->Folder</guimenu
-><guimenuitem
->Compact folder</guimenuitem
-></menuchoice
-> or for all folders together with <menuchoice
-><guimenu
->Folder</guimenu
-><guimenuitem
->Compact all folders</guimenuitem
-></menuchoice
->.</para>
+<para>You can force this check by selecting <menuchoice><guimenu>Folder</guimenu><guimenuitem>Compact folder</guimenuitem></menuchoice> or for all folders together with <menuchoice><guimenu>Folder</guimenu><guimenuitem>Compact all folders</guimenuitem></menuchoice>.</para>
 </tip>
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Purge folders every</guilabel
-></title>
-
-<para
->Here you can configure how often the folder is checked for deleted articles; this option only has an effect if the <guilabel
->Compact folders automatically</guilabel
-> is set.</para>
+<title><guilabel>Purge folders every</guilabel></title>
+
+<para>Here you can configure how often the folder is checked for deleted articles; this option only has an effect if the <guilabel>Compact folders automatically</guilabel> is set.</para>
 </sect3>
 </sect2>
 
diff --git a/tde-i18n-en_GB/docs/tdepim/knode/using-morefeatures.docbook b/tde-i18n-en_GB/docs/tdepim/knode/using-morefeatures.docbook
index 925be293bb3..11789163099 100644
--- a/tde-i18n-en_GB/docs/tdepim/knode/using-morefeatures.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knode/using-morefeatures.docbook
@@ -1,1278 +1,485 @@
 <sect1 id="more-knode-features">
-<title
->The Advanced &knode; Features</title>
+<title>The Advanced &knode; Features</title>
 
 <sect2 id="using-filters">
-<title
->Defining and Using Filters</title>
+<title>Defining and Using Filters</title>
 
-<para
->You may already have read about using filters in the chapter explaining the configuration of &knode;; there, we were talking about the built-in filters provided by &knode; there. You can configure the built-in filters like all the others. The screenshot below shows the dialogue box for configuring the filters.</para>
+<para>You may already have read about using filters in the chapter explaining the configuration of &knode;; there, we were talking about the built-in filters provided by &knode; there. You can configure the built-in filters like all the others. The screenshot below shows the dialogue box for configuring the filters.</para>
 
-<tip
-><para
->While filters and scoring are very powerful and have many uses, one of the most common requirements is simply to add all posts written by someone you don't wish to read to a <quote
->killfile</quote
->. At the <link linkend="killfiles"
->end of this section</link
-> is a quick guide to using filters and scores to create such a killfile.</para
-></tip>
+<tip><para>While filters and scoring are very powerful and have many uses, one of the most common requirements is simply to add all posts written by someone you don't wish to read to a <quote>killfile</quote>. At the <link linkend="killfiles">end of this section</link> is a quick guide to using filters and scores to create such a killfile.</para></tip>
 
 <screenshot>
-<screeninfo
->The <guilabel
->New Filter</guilabel
-> dialogue</screeninfo>
+<screeninfo>The <guilabel>New Filter</guilabel> dialogue</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="knode-edit-filter.png" format="PNG"/> </imageobject>
 <textobject>
-<phrase
->The <guilabel
->New Filter</guilabel
-> dialogue</phrase>
+<phrase>The <guilabel>New Filter</guilabel> dialogue</phrase>
 </textobject>
 <caption>
-<para
->The <guilabel
->New Filter</guilabel
-> dialogue</para>
+<para>The <guilabel>New Filter</guilabel> dialogue</para>
 </caption>
 </mediaobject>
 </screenshot>
 
-<para
->First we will create a new filter. You may, at some point, want to find your own articles amongst all the others; or, you may not want to see the articles posted by a particular person at all: both cases can be solved by a simple filter on the Sender. Here are some examples:</para
-> 
-
-<procedure
-> 
-<title
->Do Not Show The Articles by a Particular Person</title
-> 
-<step performance="required"
-> 
-<para
-><menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-><guilabel
->Reading News</guilabel
-><guilabel
->Filters</guilabel
-></menuchoice
-></para
-> 
-</step
-> 
-<step performance="required"
-> 
-<para
->Select <guibutton
->New...</guibutton
-></para>
-</step
-> 
-<step performance="required"
-> 
-<para
->Insert <userinput
->Do not show idiot</userinput
-> in the Text Box <guilabel
->Name</guilabel
-></para
-> 
-</step
-> 
-<step performance="required"
-> 
-<para
->To make the filter appear on the menu, check <guilabel
->Show in menu</guilabel
->.</para>
-</step
-> 
-<step performance="required"
-> 
-<para
->Go to the <guilabel
->From</guilabel
-> area.</para
-> 
-</step
-> 
-<step performance="required"
-> 
-<para
->Choose <guilabel
->Does NOT contain</guilabel
-> from the drop-down box.</para
-> 
+<para>First we will create a new filter. You may, at some point, want to find your own articles amongst all the others; or, you may not want to see the articles posted by a particular person at all: both cases can be solved by a simple filter on the Sender. Here are some examples:</para> 
+
+<procedure> 
+<title>Do Not Show The Articles by a Particular Person</title> 
+<step performance="required"> 
+<para><menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem><guilabel>Reading News</guilabel><guilabel>Filters</guilabel></menuchoice></para> 
+</step> 
+<step performance="required"> 
+<para>Select <guibutton>New...</guibutton></para>
+</step> 
+<step performance="required"> 
+<para>Insert <userinput>Do not show idiot</userinput> in the Text Box <guilabel>Name</guilabel></para> 
+</step> 
+<step performance="required"> 
+<para>To make the filter appear on the menu, check <guilabel>Show in menu</guilabel>.</para>
+</step> 
+<step performance="required"> 
+<para>Go to the <guilabel>From</guilabel> area.</para> 
+</step> 
+<step performance="required"> 
+<para>Choose <guilabel>Does NOT contain</guilabel> from the drop-down box.</para> 
 </step>
-<step performance="required"
-> 
-<para
->Insert the name of the person you want to ignore in the now- active Text Box; for example, <userinput
->Idiot</userinput
->.</para>
-</step
-> 
-<step performance="required"
-> 
-<para
->Confirm the filter settings with <guibutton
->OK</guibutton
->.</para>
+<step performance="required"> 
+<para>Insert the name of the person you want to ignore in the now- active Text Box; for example, <userinput>Idiot</userinput>.</para>
+</step> 
+<step performance="required"> 
+<para>Confirm the filter settings with <guibutton>OK</guibutton>.</para>
 </step>
 </procedure>
 
-<para
->The filter now shows all articles, except the ones containing <quote
->Idiot</quote
-> in the From: line.</para>
+<para>The filter now shows all articles, except the ones containing <quote>Idiot</quote> in the From: line.</para>
 
-<para
->You can combine the settings of the 'Subject + From' tab with the settings on the other tabs. For example:</para>
+<para>You can combine the settings of the 'Subject + From' tab with the settings on the other tabs. For example:</para>
 
 <procedure>
-<title
->Show only discussion with unread follow-ups on own articles.</title>
+<title>Show only discussion with unread follow-ups on own articles.</title>
 <step>
-<para
-><menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-><guilabel
->Reading News</guilabel
-><guilabel
->Filters</guilabel
-></menuchoice
-></para>
+<para><menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem><guilabel>Reading News</guilabel><guilabel>Filters</guilabel></menuchoice></para>
 </step>
 <step>
-<para
->Select the predefined filter <guilabel
->threads with own articles</guilabel
-></para>
+<para>Select the predefined filter <guilabel>threads with own articles</guilabel></para>
 </step>
 <step>
-<para
->Select <guibutton
->Copy</guibutton
-></para>
+<para>Select <guibutton>Copy</guibutton></para>
 </step>
 <step>
-<para
->Insert <userinput
->My threads with unread</userinput
-> in the <guilabel
->Name</guilabel
-> field.</para>
+<para>Insert <userinput>My threads with unread</userinput> in the <guilabel>Name</guilabel> field.</para>
 </step>
 <step>
-<para
->Select the <guilabel
->Status</guilabel
-> tab</para>
+<para>Select the <guilabel>Status</guilabel> tab</para>
 </step>
 <step>
-<para
->Select <guilabel
->has new followups</guilabel
-></para>
+<para>Select <guilabel>has new followups</guilabel></para>
 </step>
 <step>
-<para
->Select <guilabel
->true</guilabel
-> in the drop-down box next to it.</para>
+<para>Select <guilabel>true</guilabel> in the drop-down box next to it.</para>
 </step>
 <step>
-<para
->Confirm the filter settings with <guibutton
->OK</guibutton
-></para>
-<para
->This filter shows all the threads your are participating in which have unread messages; also, you have seen the possibility of using existing filters as a base for new ones: this makes life easier for complex filters.</para>
+<para>Confirm the filter settings with <guibutton>OK</guibutton></para>
+<para>This filter shows all the threads your are participating in which have unread messages; also, you have seen the possibility of using existing filters as a base for new ones: this makes life easier for complex filters.</para>
 </step>
 </procedure>
 
 <procedure>
-<title
->Show all articles, no older than 3 days, containing KNode in the subject.</title>
-<step
-> 
-<para
-><menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-><guilabel
->Reading News</guilabel
-><guilabel
->Filters</guilabel
-></menuchoice
-></para>
+<title>Show all articles, no older than 3 days, containing KNode in the subject.</title>
+<step> 
+<para><menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem><guilabel>Reading News</guilabel><guilabel>Filters</guilabel></menuchoice></para>
 </step>
 <step>
-<para
->Select <guibutton
->Add</guibutton
-></para>
+<para>Select <guibutton>Add</guibutton></para>
 </step>
 <step>
-<para
->Insert <userinput
->Latest KNode threads</userinput
-> in the <guilabel
->Name</guilabel
-> field.</para>
+<para>Insert <userinput>Latest KNode threads</userinput> in the <guilabel>Name</guilabel> field.</para>
 </step>
 <step>
-<para
->To make the filter appear in the menu, check <guilabel
->show in menu</guilabel
->.</para
-> 
-</step
-> 
-<step
-> 
-<para
->From the <guilabel
->apply on</guilabel
-> drop-down box select <guilabel
->single articles</guilabel
-></para
-> 
-</step
-> 
-<step
-> 
-<para
->Go to the <guilabel
->Subject</guilabel
-> area and select <guilabel
->does contain</guilabel
-> in the drop-down box.</para
-> 
-</step
-> 
-<step
-> 
-<para
->Insert <userinput
->knode</userinput
-> in the text box.</para>
-</step
-> 
-<step
-> 
-<para
->Change to the <guilabel
->Additional</guilabel
-> tab</para
-> 
+<para>To make the filter appear in the menu, check <guilabel>show in menu</guilabel>.</para> 
+</step> 
+<step> 
+<para>From the <guilabel>apply on</guilabel> drop-down box select <guilabel>single articles</guilabel></para> 
+</step> 
+<step> 
+<para>Go to the <guilabel>Subject</guilabel> area and select <guilabel>does contain</guilabel> in the drop-down box.</para> 
+</step> 
+<step> 
+<para>Insert <userinput>knode</userinput> in the text box.</para>
+</step> 
+<step> 
+<para>Change to the <guilabel>Additional</guilabel> tab</para> 
 </step>
-<step
-> 
-<para
->Select the <guilabel
->Age</guilabel
-> check box</para
-> 
-</step
-> 
-<step
-> 
-<para
->Enter the following settings: <guilabel
->0 &lt; days &lt;= 3</guilabel
-></para
-> 
-</step
-> 
-<step
-> 
-<para
->Confirm the filter settings with <guibutton
->OK</guibutton
-></para>
-<para
->This filter, now, shows all articles, no older than 3 days, containing <emphasis
->knode</emphasis
-> in the subject.</para
-> 
-</step
-> 
-</procedure
-> 
+<step> 
+<para>Select the <guilabel>Age</guilabel> check box</para> 
+</step> 
+<step> 
+<para>Enter the following settings: <guilabel>0 &lt; days &lt;= 3</guilabel></para> 
+</step> 
+<step> 
+<para>Confirm the filter settings with <guibutton>OK</guibutton></para>
+<para>This filter, now, shows all articles, no older than 3 days, containing <emphasis>knode</emphasis> in the subject.</para> 
+</step> 
+</procedure> 
 
 <sect3 id="killfiles">
-<title
->Creating a Killfile</title>
+<title>Creating a Killfile</title>
 
-<para
->&knode; offers viewing filters (<guilabel
->all</guilabel
->, <guilabel
->unread only</guilabel
->, <guilabel
->my posts</guilabel
-> &etc;) and scoring filters (threads and articles start with a score of zero and can be adjusted according to author, thread &etc;).</para>
+<para>&knode; offers viewing filters (<guilabel>all</guilabel>, <guilabel>unread only</guilabel>, <guilabel>my posts</guilabel> &etc;) and scoring filters (threads and articles start with a score of zero and can be adjusted according to author, thread &etc;).</para>
 
-<para
->Using viewing filters you could hide articles according to poster, but this is not really suitable when you want to kill several posters universally.</para>
+<para>Using viewing filters you could hide articles according to poster, but this is not really suitable when you want to kill several posters universally.</para>
 
-<para
->Using the scoring gives lots of control but filters only at the thread level, i.e. you can watch and ignore threads; the disadvantage of this, however, is that you may lose otherwise-useful threads just because of one poster.</para>
+<para>Using the scoring gives lots of control but filters only at the thread level, i.e. you can watch and ignore threads; the disadvantage of this, however, is that you may lose otherwise-useful threads just because of one poster.</para>
 
-<para
->The solution is to use these in combination.</para>
+<para>The solution is to use these in combination.</para>
 
 <procedure>
-<title
->Creating a Killfile</title>
+<title>Creating a Killfile</title>
 <step>
-<para
->Go to <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode</guimenuitem
-><guilabel
->Reading News</guilabel
-><guilabel
->Filters</guilabel
-></menuchoice
->.</para>
+<para>Go to <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode</guimenuitem><guilabel>Reading News</guilabel><guilabel>Filters</guilabel></menuchoice>.</para>
 </step>
 
 <step>
-<para
->Create a new filter below <guilabel
->unread</guilabel
->, called <userinput
->killfile on</userinput
->. Be sure that <guilabel
->Apply to single articles</guilabel
-> is set and then click on the <guilabel
->Additional</guilabel
-> tab. Set score <quote
->equal to or less than zero</quote
-> (<guilabel
->&lt;=</guilabel
->); then click the <guibutton
->OK</guibutton
-> until you have exited the dialogue.</para>
+<para>Create a new filter below <guilabel>unread</guilabel>, called <userinput>killfile on</userinput>. Be sure that <guilabel>Apply to single articles</guilabel> is set and then click on the <guilabel>Additional</guilabel> tab. Set score <quote>equal to or less than zero</quote> (<guilabel>&lt;=</guilabel>); then click the <guibutton>OK</guibutton> until you have exited the dialogue.</para>
 </step>
 
 <step>
-<para
->Open an article whose author should be killed and just type <keycombo action="simul"
->&Ctrl;<keycap
->L</keycap
-></keycombo
->(or select, from the <guimenu
->Scoring</guimenu
-> menu, <guimenuitem
->Lower Score for Author</guimenuitem
->). This opens the Rule Editor (a part of scoring). You can optionally give the rule a name that matches the author (<userinput
->Kook</userinput
->, for example.) and then, if this is to be permanent, uncheck the <guilabel
->expire automatically</guilabel
-> box; you'll see that this rule will change the author's score to minus ten (or the score you entered); finally, click <guibutton
->OK</guibutton
->.</para>
+<para>Open an article whose author should be killed and just type <keycombo action="simul">&Ctrl;<keycap>L</keycap></keycombo>(or select, from the <guimenu>Scoring</guimenu> menu, <guimenuitem>Lower Score for Author</guimenuitem>). This opens the Rule Editor (a part of scoring). You can optionally give the rule a name that matches the author (<userinput>Kook</userinput>, for example.) and then, if this is to be permanent, uncheck the <guilabel>expire automatically</guilabel> box; you'll see that this rule will change the author's score to minus ten (or the score you entered); finally, click <guibutton>OK</guibutton>.</para>
 </step>
 
 <step>
-<para
->Go to the menu item <menuchoice
-><guimenu
->View</guimenu
-><guisubmenu
->Filter</guisubmenu
-><guimenuitem
->killfile on.</guimenuitem
-> </menuchoice
-></para>
+<para>Go to the menu item <menuchoice><guimenu>View</guimenu><guisubmenu>Filter</guisubmenu><guimenuitem>killfile on.</guimenuitem> </menuchoice></para>
 </step>
 </procedure>
 
-<para
->This will cause any articles with scores less than zero will disappear; to kill additional authors you only need repeat the <keycombo action="simul"
->&Ctrl;<keycap
->L</keycap
-></keycombo
-> part of these instructions.</para>
+<para>This will cause any articles with scores less than zero will disappear; to kill additional authors you only need repeat the <keycombo action="simul">&Ctrl;<keycap>L</keycap></keycombo> part of these instructions.</para>
 
 </sect3>
 
-</sect2
-> 
+</sect2> 
 
-<sect2 id="knode-editor-advanced"
-> 
-<title
->The Composer</title
-> 
+<sect2 id="knode-editor-advanced"> 
+<title>The Composer</title> 
 <anchor id="anc-knode-editor-advanced"/> 
 
-<para
->The &knode; composer provides many features, especially for posting and replying to articles.</para
-> 
-
-<sect3
-> 
-<title
->Publish Articles in Multiple Newsgroups</title>
-
-<para
->By selecting the Button <guilabel
->Browse</guilabel
-> you can choose additional newsgroups you want to publish your article in.</para
-> 
-
-<caution
-> 
-<para
->It is generally undesirable to post articles in multiple newsgroups: please think twice about it; if you are not sure where to post your article ask in one of the possible groups &mdash; somebody will tell you were to post.</para
-> 
-</caution
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
->Redirect Followups</title
-> 
-
-<para
->The main use of this feature is when a thread has gone off topic for the newsgroup in which it is posted; for example, a thread may start in a &kde; newsgroup discussing how to redirect a followup in &knode;, but may leads to a discussion about graphical and text based newsreaders.</para>
-
-<para
->Sometimes it happens that usenet users post an article into the wrong newsgroup; very often those articles are just ignored. If it looks like the author did this unintentionally, you might like to tell them politely and make the followup articles go into the right group.</para>
-
-<para
->Another reason for using <guilabel
->Followup-To:</guilabel
-> is a when dealing with articles cross-posted across in multiple newsgroups: you should take care that the replies are only posted in one single newsgroup.</para
-> 
-
-<para
->You can activate this by filling the text box <guilabel
->Followups - To:</guilabel
->; here you can enter the suitable group. If there are multiple newsgroups in the <guilabel
->Groups:</guilabel
-> field, they are shown in the drop-down list.</para
-> 
-
-<tip
-> 
-<para
->If you enter <userinput
->poster</userinput
-> here, instead of a newsgroup, the replies will go directly to the author, not to the newsgroup.</para
-> 
-
-<para
->Some people put an email address here, but this is not a valid entry: use <userinput
->poster</userinput
-> and correctly set your Reply-To address in the normal &knode; settings.</para>
-
-</tip
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
->Working With an External Editor</title
-> 
-
-<para
->Using <menuchoice
-><guimenu
->Tools</guimenu
-><guimenuitem
->Start External Editor</guimenuitem
-></menuchoice
-> you can start an editor of your choice for editing the reply; this way you can use your preferred Editor for writing articles and e-mails.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
->Spelling</title
-> 
-
-<para
->By selecting <menuchoice
-><guimenu
->Tools</guimenu
-><guimenuitem
->Spelling</guimenuitem
-></menuchoice
->, you can check the article in the composer for spelling errors.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
->Sending Attachments</title
-> 
-
-<para
->By selecting <menuchoice
-><guimenu
->Attach</guimenu
-><guimenuitem
->Attach File</guimenuitem
-></menuchoice
-> you can open the File Selection Dialogue Box; here you can choose the file you want to attach.</para
-> 
-
-<para
->Most of the time, &knode; determines the correct <acronym
->MIME</acronym
-> type for the attachment; if &knode; detects it incorrectly, you can correct the <acronym
->MIME</acronym
-> type manually.</para>
-
-<para
->This screenshot shows the Composer with 2 attachments: a text file and a PNG picture.</para
-> 
-
-<screenshot
-> 
-<screeninfo
->Sending Attachments</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-composer-attachments.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->Sending Attachments</phrase
-> 
-</textobject
-> 
-<caption
-> 
-<para
->Sending Attachments</para
-> 
-</caption
-> 
-</mediaobject
-> 
-</screenshot
-> 
-
-<caution
-> 
-<para
->Only do this if you know what you're doing! An incorrect <acronym
->MIME</acronym
-> type could cause the attachment to be sent incorrectly, or mean that the attachment will not be able to be rebuilt after sending.</para
-> 
-</caution
-> 
-
-<tip
-> 
-<para
->The English word attachment is used all over the world; you can use it in your language, too.</para
-> 
-</tip
-> 
-
-<important
-> 
-<para
->In most newsgroups, attachments are prohibited: do not send unsolicited attachments; if you are asked to send them, look who is asking for them &mdash; normally, the person will want you to send them by email.</para
-> 
-
-<para
->The news server will probably reject articles with attachments for most groups anyway; those that do accept attachments normally have the word <quote
->binaries</quote
-> in their name. Some news servers even stop carrying non-binaries newsgroups that continuously receive attachments.</para>
-</important
-> 
-</sect3
-> 
-</sect2
-> 
-
-<sect2
-> 
-<title
->Searching for Articles</title
-> 
-
-<para
->Sooner or later, you will want to search for one specific article; the &knode; search feature is an easy way to do this.</para
-> 
-
-<para
->You can reach the search function by selecting <menuchoice
-><guimenu
->Edit</guimenu
-><guimenuitem
->Search Articles...</guimenuitem
-></menuchoice
-> or the by pressing <keycap
->F4</keycap
->. The screenshot below shows the Search Dialogue Box.</para
-> 
-
-<screenshot
-> 
-<screeninfo
->The Search Dialogue Box</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-search.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->The Search Dialogue Box</phrase
-> 
-</textobject
-> 
-<caption
-> 
-<para
->The Search Dialogue Box</para
-> 
-</caption
-> 
-</mediaobject
-> 
-</screenshot
-> 
-
-<para
->The Search Dialogue Box has four tabs which allow several search criteria: the first tab contains the settings for the <guilabel
->Subject</guilabel
-> and <guilabel
->From</guilabel
-> criteria; the second tab contains the settings for the <guilabel
->message-IDs</guilabel
-> of an article and its references; the third tab contains the settings for the <guilabel
->Status</guilabel
-> of an article; the fourth tab, <guilabel
->Additional</guilabel
->, contains the remaining criteria.</para>
-
-<para
->You have probably already noticed the similarities between the Filter Dialogue Box and the Search Dialogue Box: the usage is the same and should not be too complicated if you have already defined your own filters.</para
-> 
-
-<para
->&knode; always searches in the currently-active newsgroup; a search in all newsgroups is not possible at the moment. After the Search has finished the articles found appear in the article view; when you close the Search Dialogue Box using <guibutton
->Close</guibutton
-> the search results are deleted, and the old view of the newsgroup appears again.</para
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Start Search</guilabel
-></title
-> 
-
-<para
->With this button you start the Search with the search criteria you defined; all articles in the selected newsgroup, fulfilling these criteria, appear in the article view.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->New Search</guilabel
-></title
-> 
-
-<para
->This button resets all search criteria.</para>
+<para>The &knode; composer provides many features, especially for posting and replying to articles.</para> 
+
+<sect3> 
+<title>Publish Articles in Multiple Newsgroups</title>
+
+<para>By selecting the Button <guilabel>Browse</guilabel> you can choose additional newsgroups you want to publish your article in.</para> 
+
+<caution> 
+<para>It is generally undesirable to post articles in multiple newsgroups: please think twice about it; if you are not sure where to post your article ask in one of the possible groups &mdash; somebody will tell you were to post.</para> 
+</caution> 
+</sect3> 
+
+<sect3> 
+<title>Redirect Followups</title> 
+
+<para>The main use of this feature is when a thread has gone off topic for the newsgroup in which it is posted; for example, a thread may start in a &kde; newsgroup discussing how to redirect a followup in &knode;, but may leads to a discussion about graphical and text based newsreaders.</para>
+
+<para>Sometimes it happens that usenet users post an article into the wrong newsgroup; very often those articles are just ignored. If it looks like the author did this unintentionally, you might like to tell them politely and make the followup articles go into the right group.</para>
+
+<para>Another reason for using <guilabel>Followup-To:</guilabel> is a when dealing with articles cross-posted across in multiple newsgroups: you should take care that the replies are only posted in one single newsgroup.</para> 
+
+<para>You can activate this by filling the text box <guilabel>Followups - To:</guilabel>; here you can enter the suitable group. If there are multiple newsgroups in the <guilabel>Groups:</guilabel> field, they are shown in the drop-down list.</para> 
+
+<tip> 
+<para>If you enter <userinput>poster</userinput> here, instead of a newsgroup, the replies will go directly to the author, not to the newsgroup.</para> 
+
+<para>Some people put an email address here, but this is not a valid entry: use <userinput>poster</userinput> and correctly set your Reply-To address in the normal &knode; settings.</para>
+
+</tip> 
+
+</sect3> 
+
+<sect3> 
+<title>Working With an External Editor</title> 
+
+<para>Using <menuchoice><guimenu>Tools</guimenu><guimenuitem>Start External Editor</guimenuitem></menuchoice> you can start an editor of your choice for editing the reply; this way you can use your preferred Editor for writing articles and e-mails.</para> 
+
+</sect3> 
+
+<sect3> 
+<title>Spelling</title> 
+
+<para>By selecting <menuchoice><guimenu>Tools</guimenu><guimenuitem>Spelling</guimenuitem></menuchoice>, you can check the article in the composer for spelling errors.</para> 
+
+</sect3> 
+
+<sect3> 
+<title>Sending Attachments</title> 
+
+<para>By selecting <menuchoice><guimenu>Attach</guimenu><guimenuitem>Attach File</guimenuitem></menuchoice> you can open the File Selection Dialogue Box; here you can choose the file you want to attach.</para> 
+
+<para>Most of the time, &knode; determines the correct <acronym>MIME</acronym> type for the attachment; if &knode; detects it incorrectly, you can correct the <acronym>MIME</acronym> type manually.</para>
+
+<para>This screenshot shows the Composer with 2 attachments: a text file and a PNG picture.</para> 
+
+<screenshot> 
+<screeninfo>Sending Attachments</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-composer-attachments.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>Sending Attachments</phrase> 
+</textobject> 
+<caption> 
+<para>Sending Attachments</para> 
+</caption> 
+</mediaobject> 
+</screenshot> 
+
+<caution> 
+<para>Only do this if you know what you're doing! An incorrect <acronym>MIME</acronym> type could cause the attachment to be sent incorrectly, or mean that the attachment will not be able to be rebuilt after sending.</para> 
+</caution> 
+
+<tip> 
+<para>The English word attachment is used all over the world; you can use it in your language, too.</para> 
+</tip> 
+
+<important> 
+<para>In most newsgroups, attachments are prohibited: do not send unsolicited attachments; if you are asked to send them, look who is asking for them &mdash; normally, the person will want you to send them by email.</para> 
+
+<para>The news server will probably reject articles with attachments for most groups anyway; those that do accept attachments normally have the word <quote>binaries</quote> in their name. Some news servers even stop carrying non-binaries newsgroups that continuously receive attachments.</para>
+</important> 
+</sect3> 
+</sect2> 
+
+<sect2> 
+<title>Searching for Articles</title> 
+
+<para>Sooner or later, you will want to search for one specific article; the &knode; search feature is an easy way to do this.</para> 
+
+<para>You can reach the search function by selecting <menuchoice><guimenu>Edit</guimenu><guimenuitem>Search Articles...</guimenuitem></menuchoice> or the by pressing <keycap>F4</keycap>. The screenshot below shows the Search Dialogue Box.</para> 
+
+<screenshot> 
+<screeninfo>The Search Dialogue Box</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-search.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>The Search Dialogue Box</phrase> 
+</textobject> 
+<caption> 
+<para>The Search Dialogue Box</para> 
+</caption> 
+</mediaobject> 
+</screenshot> 
+
+<para>The Search Dialogue Box has four tabs which allow several search criteria: the first tab contains the settings for the <guilabel>Subject</guilabel> and <guilabel>From</guilabel> criteria; the second tab contains the settings for the <guilabel>message-IDs</guilabel> of an article and its references; the third tab contains the settings for the <guilabel>Status</guilabel> of an article; the fourth tab, <guilabel>Additional</guilabel>, contains the remaining criteria.</para>
+
+<para>You have probably already noticed the similarities between the Filter Dialogue Box and the Search Dialogue Box: the usage is the same and should not be too complicated if you have already defined your own filters.</para> 
+
+<para>&knode; always searches in the currently-active newsgroup; a search in all newsgroups is not possible at the moment. After the Search has finished the articles found appear in the article view; when you close the Search Dialogue Box using <guibutton>Close</guibutton> the search results are deleted, and the old view of the newsgroup appears again.</para> 
+
+<sect3> 
+<title><guilabel>Start Search</guilabel></title> 
+
+<para>With this button you start the Search with the search criteria you defined; all articles in the selected newsgroup, fulfilling these criteria, appear in the article view.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>New Search</guilabel></title> 
+
+<para>This button resets all search criteria.</para>
  
-</sect3
-> 
-</sect2
-> 
-
-<sect2 id="supersede-and-cancel"
-> 
-<title
->Supersede and Cancel Articles</title
-> 
-
-<para
->This chapter deals with superseding and cancelling articles. You will not use these two features very often, but they do exist should you, one day, need them.</para
-> 
-
-<caution
-> 
-<para
->Both functions need a news server prepared to handle them; you should also remember that there is no guarantee that no one has already read your article before it is superseded or cancelled. </para>
-
-<para
->So first think, then post.</para
-> 
-</caution
-> 
-
-<sect3
-> 
-<title
->Cancel</title>
-
-<para
->Cancelling an article means deleting it from the newsgroup.</para
-> 
-
-<para
->Why should you want to cancel an article? Perhaps you flamed somebody in a rage and now you want to get this article out of the newsgroup because you regret what you wrote: a personal insult, read by everybody, doesn't look good, especially when you regret it; so, there is only one thing you can do &mdash; cancel the article.</para
-> 
-
-<para
->Select the article you want to cancel and choose <guimenuitem
->Cancel article</guimenuitem
-> from its context menu. If you are sure it is the right article, confirm &knode;s question with <guibutton
->Yes</guibutton
->. Now you will be asked if you want to send the Cancel message now or later; for this example we decide to send it <guibutton
->Later</guibutton
->. You will notice the new message in the folder <guilabel
->Outbox</guilabel
->.</para
-> 
-
-<para
->Now we want to look at the so-called cancel message. In the subject you will find something like:</para
-> 
-
-<screen
-><computeroutput
->cancel of &lt;n177m8.1m.ln@konqui.org&gt;</computeroutput
-> 
-</screen
-> 
-
-<para
->This strange letters between the brackets are the Message-ID of the article you want to cancel. This message tells the newsserver to delete your article: if you look at complete header of this message, by selecting <menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Show all headers</guimenuitem
-></menuchoice
->, you will notice a line with the name <emphasis
->control</emphasis
-> and the content <emphasis
->cancel &lt;xxxxx@ddddd.dd&gt;</emphasis
-> &mdash; this line tells the server that this message is a control message and, in our case, tells the server to cancel your article.</para
-> 
-
-<para
->You can still delete the control message from the <guilabel
->Outbox</guilabel
-> should you change your mind.</para
-> 
-
-<caution
-> 
-<para
->Keep in mind that articles can only be identified by their Message-IDs; you need this Message-ID if you want to cancel an article. Normally, your article gets a Message-ID when it arrives at the newsserver &mdash; that's why you can only cancel an article once it has been published. The articles in the <guilabel
->Sent</guilabel
-> folder have no Message-ID, so you cannot cancel them from there.</para
-> 
-
-<para
->There is one exception: if you have configured &knode; to generate a Message-ID you can cancel you articles in folder <guilabel
->Sent</guilabel
-> too.</para
-> 
-
-<para
->&knode; allows only to cancel your own articles: it refuses to cancel articles from other authors.</para
-> 
-</caution
-> 
+</sect3> 
+</sect2> 
+
+<sect2 id="supersede-and-cancel"> 
+<title>Supersede and Cancel Articles</title> 
+
+<para>This chapter deals with superseding and cancelling articles. You will not use these two features very often, but they do exist should you, one day, need them.</para> 
+
+<caution> 
+<para>Both functions need a news server prepared to handle them; you should also remember that there is no guarantee that no one has already read your article before it is superseded or cancelled. </para>
+
+<para>So first think, then post.</para> 
+</caution> 
+
+<sect3> 
+<title>Cancel</title>
+
+<para>Cancelling an article means deleting it from the newsgroup.</para> 
+
+<para>Why should you want to cancel an article? Perhaps you flamed somebody in a rage and now you want to get this article out of the newsgroup because you regret what you wrote: a personal insult, read by everybody, doesn't look good, especially when you regret it; so, there is only one thing you can do &mdash; cancel the article.</para> 
+
+<para>Select the article you want to cancel and choose <guimenuitem>Cancel article</guimenuitem> from its context menu. If you are sure it is the right article, confirm &knode;s question with <guibutton>Yes</guibutton>. Now you will be asked if you want to send the Cancel message now or later; for this example we decide to send it <guibutton>Later</guibutton>. You will notice the new message in the folder <guilabel>Outbox</guilabel>.</para> 
+
+<para>Now we want to look at the so-called cancel message. In the subject you will find something like:</para> 
+
+<screen><computeroutput>cancel of &lt;n177m8.1m.ln@konqui.org&gt;</computeroutput> 
+</screen> 
+
+<para>This strange letters between the brackets are the Message-ID of the article you want to cancel. This message tells the newsserver to delete your article: if you look at complete header of this message, by selecting <menuchoice><guimenu>View</guimenu><guimenuitem>Show all headers</guimenuitem></menuchoice>, you will notice a line with the name <emphasis>control</emphasis> and the content <emphasis>cancel &lt;xxxxx@ddddd.dd&gt;</emphasis> &mdash; this line tells the server that this message is a control message and, in our case, tells the server to cancel your article.</para> 
+
+<para>You can still delete the control message from the <guilabel>Outbox</guilabel> should you change your mind.</para> 
+
+<caution> 
+<para>Keep in mind that articles can only be identified by their Message-IDs; you need this Message-ID if you want to cancel an article. Normally, your article gets a Message-ID when it arrives at the newsserver &mdash; that's why you can only cancel an article once it has been published. The articles in the <guilabel>Sent</guilabel> folder have no Message-ID, so you cannot cancel them from there.</para> 
+
+<para>There is one exception: if you have configured &knode; to generate a Message-ID you can cancel you articles in folder <guilabel>Sent</guilabel> too.</para> 
+
+<para>&knode; allows only to cancel your own articles: it refuses to cancel articles from other authors.</para> 
+</caution> 
 
 <warning>
-<para
->Since the cancel feature is so easily fooled, by newsreaders that let you cancel any post, many news servers do not acknowledge cancel messages from posters; even if your own <acronym
->ISP</acronym
-> accepts the cancel and passes it on, many other servers will ignore it <emphasis
->and will not pass it on</emphasis
->.</para>
-
-<para
->You should consider any previously-sent article, cancelled or not, to be published and publicly available.</para>
+<para>Since the cancel feature is so easily fooled, by newsreaders that let you cancel any post, many news servers do not acknowledge cancel messages from posters; even if your own <acronym>ISP</acronym> accepts the cancel and passes it on, many other servers will ignore it <emphasis>and will not pass it on</emphasis>.</para>
+
+<para>You should consider any previously-sent article, cancelled or not, to be published and publicly available.</para>
 </warning>
 
-</sect3
-> 
-
-<sect3
-> 
-<title
->Supersede</title
-> 
-
-<para
->Supersede overwrites your article with a new version. One reason for doing this could be:</para
-> 
-
-<para
->You have written a long article and have already posted it; now, you have found an error in this article: you could cancel this article, and post a new, corrected, article; or, you can use Supersede.</para
-> 
-
-<para
->Select the article in the article view. From its context menu select <guimenuitem
->Supersede article...</guimenuitem
->. &knode; will ask you if you really want to overwrite this article; if you confirm with <guibutton
->Yes</guibutton
-> the Composer appears.</para
-> 
-
-<para
->In the Composer you can now make the desired corrections and changes. You can then publish this article in the same way as you post every other article; when the newsserver receives this article it reads some special lines in the header which tell the newsserver to supersede the older article. Select <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Send Later</guimenuitem
-></menuchoice
-> for now, because we want to look at the article's header in the <guilabel
->Outbox</guilabel
->.</para>
-
-<para
->Activate <menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Show all headers</guimenuitem
-></menuchoice
->, because we want to see all the headers the newsserver receives. You will notice a line like:</para
-> 
-
-<para
->Supersedes: &lt;oggcm8.4n5.ln@konqi.org&gt;</para
-> 
-
-<para
->This is the instruction for the newsserver for superseding the article with the Message-ID &lt;oggcm8.4n5.ln@konqi.org&gt; with the new article.</para
-> 
-
-<para
->Besides this, Supersede is used for periodical posted articles, &eg; an <acronym
->FAQ</acronym
->. The new article supersedes the old one and the newsgroups do not end up with lots of different versions.</para
-> 
-
-<caution
-> 
-<para
->Again, using this function is only possible if the article already has a Message-ID. Normally, articles get their Message-ID from the newsserver: this means that you can only supersede articles which have already been published.</para
-> 
-
-<para
->You can configure &knode; to generate this Message-ID, then you can supersede your articles in the folder <guilabel
->Sent</guilabel
->, too.</para
-> 
-
-<para
->&knode; allows you to only supersede your own articles.</para
-> 
-
-</caution
-> 
+</sect3> 
+
+<sect3> 
+<title>Supersede</title> 
+
+<para>Supersede overwrites your article with a new version. One reason for doing this could be:</para> 
+
+<para>You have written a long article and have already posted it; now, you have found an error in this article: you could cancel this article, and post a new, corrected, article; or, you can use Supersede.</para> 
+
+<para>Select the article in the article view. From its context menu select <guimenuitem>Supersede article...</guimenuitem>. &knode; will ask you if you really want to overwrite this article; if you confirm with <guibutton>Yes</guibutton> the Composer appears.</para> 
+
+<para>In the Composer you can now make the desired corrections and changes. You can then publish this article in the same way as you post every other article; when the newsserver receives this article it reads some special lines in the header which tell the newsserver to supersede the older article. Select <menuchoice><guimenu>File</guimenu><guimenuitem>Send Later</guimenuitem></menuchoice> for now, because we want to look at the article's header in the <guilabel>Outbox</guilabel>.</para>
+
+<para>Activate <menuchoice><guimenu>View</guimenu><guimenuitem>Show all headers</guimenuitem></menuchoice>, because we want to see all the headers the newsserver receives. You will notice a line like:</para> 
+
+<para>Supersedes: &lt;oggcm8.4n5.ln@konqi.org&gt;</para> 
+
+<para>This is the instruction for the newsserver for superseding the article with the Message-ID &lt;oggcm8.4n5.ln@konqi.org&gt; with the new article.</para> 
+
+<para>Besides this, Supersede is used for periodical posted articles, &eg; an <acronym>FAQ</acronym>. The new article supersedes the old one and the newsgroups do not end up with lots of different versions.</para> 
+
+<caution> 
+<para>Again, using this function is only possible if the article already has a Message-ID. Normally, articles get their Message-ID from the newsserver: this means that you can only supersede articles which have already been published.</para> 
+
+<para>You can configure &knode; to generate this Message-ID, then you can supersede your articles in the folder <guilabel>Sent</guilabel>, too.</para> 
+
+<para>&knode; allows you to only supersede your own articles.</para> 
+
+</caution> 
 
 <warning>
-<para
->As with cancels, supersede messages have been abused in the past, with, for example, certain parties sending hundreds or even thousands of them to overwrite legitimate posts with random computer generated junk; again, as with cancels, many news servers do not honour supersede messages, nor do they pass them on.</para>
+<para>As with cancels, supersede messages have been abused in the past, with, for example, certain parties sending hundreds or even thousands of them to overwrite legitimate posts with random computer generated junk; again, as with cancels, many news servers do not honour supersede messages, nor do they pass them on.</para>
 </warning>
 
-</sect3
-> 
-</sect2
-> 
+</sect3> 
+</sect2> 
 
-<sect2 id="score-watch-ignore"
-> 
-<title
->Score, watch, ignore</title>
+<sect2 id="score-watch-ignore"> 
+<title>Score, watch, ignore</title>
  
 <anchor id="anc-score-watch-ignore"/> 
-<para
->Score, Watch and Ignore are different names for the same feature.</para
-> 
-
-<para
->By scoring a thread, you determine its importance. &knode; allows scores between -100000 and 100000. A normal article will get a score of 0 if you do not change this; threads with a score below 0 are less important than average; threads with a score above 0 are more important than average.</para
-> 
-
-<para
->The score is an attribute of the thread and the articles in this thread, so you can use the score for filtering and searching articles; for example, you can define a filter to show only articles with a score &gt; 0, i.e. all articles in which you are specifically interested.</para
-> 
-
-<para
->The function <guilabel
->Watch</guilabel
-> sets the score of all article in a thread to 100; this way they get a high score and &knode; labels them with a special icon.</para>
-
-<para
->The function <guilabel
->Ignore</guilabel
-> does the opposite: it scores all articles in a thread with -100 so &knode; does not show these articles anymore.</para>
-
-<tip
-> 
-<para
->The English word <quote
->scoring</quote
-> is used in many other countries, too.</para>
-</tip
-> 
-
-<para
->You can score an article or a thread manually with the right mouse button or with the <guimenu
->Scoring</guimenu
-> menu &mdash; here you can score with <guilabel
->Watch Thread</guilabel
-> and <guilabel
->Ignore Thread</guilabel
-> directly. Apart from scoring manually you can let &knode; score the articles with scoring rules automatically; you can configure these rules at <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-><guimenuitem
->Reading News</guimenuitem
-><guimenuitem
->Scoring</guimenuitem
-></menuchoice
-> or at <menuchoice
-><guimenu
->Scoring</guimenu
-><guimenuitem
->Edit scoring rules...</guimenuitem
-></menuchoice
-> &mdash; the only difference between these dialogues is that the last one has the rule-list next to the rule configuration. In the following guide I'm using the editor that appears if <menuchoice
-><guimenu
->Scoring</guimenu
-><guimenuitem
->Edit scoring rules...</guimenuitem
-></menuchoice
-> is chosen.</para
-> 
-
-<screenshot
-> 
-<screeninfo
->The Rule Editor</screeninfo>
+<para>Score, Watch and Ignore are different names for the same feature.</para> 
+
+<para>By scoring a thread, you determine its importance. &knode; allows scores between -100000 and 100000. A normal article will get a score of 0 if you do not change this; threads with a score below 0 are less important than average; threads with a score above 0 are more important than average.</para> 
+
+<para>The score is an attribute of the thread and the articles in this thread, so you can use the score for filtering and searching articles; for example, you can define a filter to show only articles with a score &gt; 0, i.e. all articles in which you are specifically interested.</para> 
+
+<para>The function <guilabel>Watch</guilabel> sets the score of all article in a thread to 100; this way they get a high score and &knode; labels them with a special icon.</para>
+
+<para>The function <guilabel>Ignore</guilabel> does the opposite: it scores all articles in a thread with -100 so &knode; does not show these articles anymore.</para>
+
+<tip> 
+<para>The English word <quote>scoring</quote> is used in many other countries, too.</para>
+</tip> 
+
+<para>You can score an article or a thread manually with the right mouse button or with the <guimenu>Scoring</guimenu> menu &mdash; here you can score with <guilabel>Watch Thread</guilabel> and <guilabel>Ignore Thread</guilabel> directly. Apart from scoring manually you can let &knode; score the articles with scoring rules automatically; you can configure these rules at <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem><guimenuitem>Reading News</guimenuitem><guimenuitem>Scoring</guimenuitem></menuchoice> or at <menuchoice><guimenu>Scoring</guimenu><guimenuitem>Edit scoring rules...</guimenuitem></menuchoice> &mdash; the only difference between these dialogues is that the last one has the rule-list next to the rule configuration. In the following guide I'm using the editor that appears if <menuchoice><guimenu>Scoring</guimenu><guimenuitem>Edit scoring rules...</guimenuitem></menuchoice> is chosen.</para> 
+
+<screenshot> 
+<screeninfo>The Rule Editor</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="knode-rule-editor.png" format="PNG"/> </imageobject>
 <textobject>
-<phrase
->The Rule Editor</phrase>
+<phrase>The Rule Editor</phrase>
 </textobject>
 <caption>
-<para
->The Rule Editor</para
-> 
-</caption
-> 
-</mediaobject
-> 
-</screenshot
-> 
-
-<para
->The composer consists of 4 areas: on the left side is the list of the rules; with the buttons below the list you can add, delete or copy an existing rule; below that you have the possibility to limit the rules which are shown &mdash; you have the choice whether to show all rules or only the rules for a specific <glossterm
->newsgroup</glossterm
->.</para
-> 
-
-<para
->If you chose a rule-name in the list you the rule will be displayed on the right-hand side; now you can edit the rule. At the top you can change the name of the rule and set the newsgroups to which this rule applies. You can choose one or more than one group, note that group names must be separated by a semicolon. You can choose from the subscribed groups with the drop-down list and the <guibutton
->Add group</guibutton
-> button; or you can use regular expressions and wild cards, &eg; <quote
->.*</quote
-> for all groups. The <guilabel
->Expire rule automatically</guilabel
-> option makes it possible to delete the rule automatically after the configured number of days; this is useful if a specific person behaves badly and you do not want to read anything from this person for a few days.</para
-> 
-
-<para
->In the <guilabel
->Condition</guilabel
-> field you enter the condition on which this rule is activated. Normally, you can enter only one condition, but you can change this by pressing the <guibutton
->More</guibutton
-> and <guibutton
->Fewer</guibutton
-> buttons. If you have more than one condition, you must tell knode whether all conditions need to be fulfilled or only one of them; this can be done by choosing <guilabel
->Match all conditions</guilabel
-> or <guilabel
->Match any condition</guilabel
-> respectively. </para
-> 
-
-<para
->Each condition consists of 2 drop-down lists and a text field. In the first list you chose the part of the message which should be used for the condition &mdash; this part will be compared with the text field; the second drop-down list tells &knode; how it is to be compared, for example, whether the chosen header should be identical to the text entered in the text field, or if it just needs to match part of it. Regular expressions are allowed, too. If you check <guilabel
->Not</guilabel
-> then the conditions under which the condition is satisfied are reversed, and the condition will be satisfied if the opposite of its shown conditions is true.</para
-> 
-
-<para
->Now, let's have a look at some examples.</para>
-
-<itemizedlist
-> 
+<para>The Rule Editor</para> 
+</caption> 
+</mediaobject> 
+</screenshot> 
+
+<para>The composer consists of 4 areas: on the left side is the list of the rules; with the buttons below the list you can add, delete or copy an existing rule; below that you have the possibility to limit the rules which are shown &mdash; you have the choice whether to show all rules or only the rules for a specific <glossterm>newsgroup</glossterm>.</para> 
+
+<para>If you chose a rule-name in the list you the rule will be displayed on the right-hand side; now you can edit the rule. At the top you can change the name of the rule and set the newsgroups to which this rule applies. You can choose one or more than one group, note that group names must be separated by a semicolon. You can choose from the subscribed groups with the drop-down list and the <guibutton>Add group</guibutton> button; or you can use regular expressions and wild cards, &eg; <quote>.*</quote> for all groups. The <guilabel>Expire rule automatically</guilabel> option makes it possible to delete the rule automatically after the configured number of days; this is useful if a specific person behaves badly and you do not want to read anything from this person for a few days.</para> 
+
+<para>In the <guilabel>Condition</guilabel> field you enter the condition on which this rule is activated. Normally, you can enter only one condition, but you can change this by pressing the <guibutton>More</guibutton> and <guibutton>Fewer</guibutton> buttons. If you have more than one condition, you must tell knode whether all conditions need to be fulfilled or only one of them; this can be done by choosing <guilabel>Match all conditions</guilabel> or <guilabel>Match any condition</guilabel> respectively. </para> 
+
+<para>Each condition consists of 2 drop-down lists and a text field. In the first list you chose the part of the message which should be used for the condition &mdash; this part will be compared with the text field; the second drop-down list tells &knode; how it is to be compared, for example, whether the chosen header should be identical to the text entered in the text field, or if it just needs to match part of it. Regular expressions are allowed, too. If you check <guilabel>Not</guilabel> then the conditions under which the condition is satisfied are reversed, and the condition will be satisfied if the opposite of its shown conditions is true.</para> 
+
+<para>Now, let's have a look at some examples.</para>
+
+<itemizedlist> 
 <listitem>
-<para
->Maybe you want to filter away all the postings by Theodor Test; to do this choose the <guilabel
->From</guilabel
-> header line from the first drop-down list, choose <guilabel
->is exactly the same as</guilabel
-> from the second drop-down list, and enter his name in the text field. But, before doing this you should have a look at the <glossterm
->header</glossterm
-> of one of Theodor's articles and see what is in the <quote
->From</quote
-> line.</para>
-</listitem
-> 
+<para>Maybe you want to filter away all the postings by Theodor Test; to do this choose the <guilabel>From</guilabel> header line from the first drop-down list, choose <guilabel>is exactly the same as</guilabel> from the second drop-down list, and enter his name in the text field. But, before doing this you should have a look at the <glossterm>header</glossterm> of one of Theodor's articles and see what is in the <quote>From</quote> line.</para>
+</listitem> 
 <listitem>
-<para
->If you do not want to read articles with more than 100 lines, choose the header entry <guilabel
->Lines</guilabel
-> from the first drop-down list, choose <guilabel
->greater than</guilabel
-> from the second, and enter <userinput
->100</userinput
-> in the text field. You probably, then, want to score down the message.</para>
+<para>If you do not want to read articles with more than 100 lines, choose the header entry <guilabel>Lines</guilabel> from the first drop-down list, choose <guilabel>greater than</guilabel> from the second, and enter <userinput>100</userinput> in the text field. You probably, then, want to score down the message.</para>
 </listitem>
 <listitem>
-<para
->Last example: of course, you're very interested in every article that refers to &knode;. Choose the header entry <guilabel
->Subject</guilabel
->, then <guilabel
->contains substring</guilabel
-> and enter <userinput
->knode</userinput
-> in the text field. But what do you do if &knode; is not mentioned in the <guilabel
->Subject</guilabel
->? I suggest using a regular expression: change <guilabel
->contains substring</guilabel
-> to <guilabel
->matches regular expression</guilabel
-> and type <userinput
->knode|newsreader|usenet</userinput
-> into the text field to match either knode, newsreader or usenet &mdash; the <userinput
->|</userinput
-> symbol means OR. Alternatively, you can make 3 conditions &mdash; one that matches knode, one that matches newsreader and so on &mdash; and choose <guilabel
->Match any condition</guilabel
->; but, this needs a lot of space and it is not very elegant, is it?</para>
+<para>Last example: of course, you're very interested in every article that refers to &knode;. Choose the header entry <guilabel>Subject</guilabel>, then <guilabel>contains substring</guilabel> and enter <userinput>knode</userinput> in the text field. But what do you do if &knode; is not mentioned in the <guilabel>Subject</guilabel>? I suggest using a regular expression: change <guilabel>contains substring</guilabel> to <guilabel>matches regular expression</guilabel> and type <userinput>knode|newsreader|usenet</userinput> into the text field to match either knode, newsreader or usenet &mdash; the <userinput>|</userinput> symbol means OR. Alternatively, you can make 3 conditions &mdash; one that matches knode, one that matches newsreader and so on &mdash; and choose <guilabel>Match any condition</guilabel>; but, this needs a lot of space and it is not very elegant, is it?</para>
 </listitem>
  
-</itemizedlist
-> 
-
-<para
->Once your condition is ready you should set an action down in the <guilabel
->Actions</guilabel
-> section. The most important action is <guilabel
->adjust score</guilabel
->; if this action is chosen you can raise or lower the score, by the configured value, for articles to which this rule applies. &knode; can also show you a little message when finding such an article or colourise the header in the article list; for example, you could make interesting articles screaming pink so you would notice them very quickly.</para
-> 
-
-<para
->When leaving the editor, or when the <menuchoice
-><guimenu
->Scoring</guimenu
-><guimenuitem
->Recalculate scores</guimenuitem
-></menuchoice
-> menu item is chosen, the rules are executed; furthermore, the rules are automatically used for new <glossterm
->articles</glossterm
->. Scoring makes the most sense when used with filters: by scoring some articles down and filtering them away they won't appear in the article list.</para>
+</itemizedlist> 
+
+<para>Once your condition is ready you should set an action down in the <guilabel>Actions</guilabel> section. The most important action is <guilabel>adjust score</guilabel>; if this action is chosen you can raise or lower the score, by the configured value, for articles to which this rule applies. &knode; can also show you a little message when finding such an article or colourise the header in the article list; for example, you could make interesting articles screaming pink so you would notice them very quickly.</para> 
+
+<para>When leaving the editor, or when the <menuchoice><guimenu>Scoring</guimenu><guimenuitem>Recalculate scores</guimenuitem></menuchoice> menu item is chosen, the rules are executed; furthermore, the rules are automatically used for new <glossterm>articles</glossterm>. Scoring makes the most sense when used with filters: by scoring some articles down and filtering them away they won't appear in the article list.</para>
 
 </sect2>
 
-<sect2 id="group-identity"
-> 
-<title
->Group identities</title
-> 
-
-<para
->With &knode; you can use a different identity with every newsgroup to which you are subscribed; i.e. you can set a name, email address, reply-to address and signature to use with that group.</para>
-
-<para
->It is easy to set group identities. First, with the right mouse button, click on the name of the newsgroup in which to have a different identity in; then, select <guimenuitem
->Group Properties</guimenuitem
-> from the context menu that appears. In the dialogue that appears the second tab contains fields identical to the global identity settings; enter your settings here and click <guibutton
->OK</guibutton
-> to confirm the changes: then, your articles in this group will always posted with this newly-entered identity.</para
-> 
-
-<caution
-> 
-<para
->When you unsubscribe from a group you lose its identity settings for this group: if you re-subscribe to the group, you will need to re-enter its identity settings. For new newsgroups, the global identity is used.</para
-> 
-</caution
-> 
-
-</sect2
-> 
-
-<sect2 id="multiple-news-accounts"
-> 
-<title
->Managing Multiple News Accounts</title
-> 
-
-<para
->&knode; can handle an unlimited number of news server accounts in addition to your main news server; most users don't need this feature, but it can be very useful to if your main newsserver does not provide all groups you want to read. Typical cases of this are when support groups for commercial software are hosted on a special, private, server or binary newsgroups, which are only available from some servers.</para
-> 
-
-<para
->Another example of why you sometimes need more than one newsserver is that sometimes not all interesting newsgroups are on one server; in fact, there is very often only a selection of newsgroups. For example, many servers do not support binary groups with pictures or programs; if you want such a newsgroup and your newsserver provider does not want to serve it you can configure &knode; to get it from another server.</para>
-
-<para
->Or, perhaps you find you are just subscribed to too many newsgroups, and would like to organise them a little better; you could set up several accounts for the same server, perhaps one for groups you read every day, and one for groups you read less often, so that you do not have to search for your <quote
->everyday</quote
-> groups in a long list of subscribed groups.</para>
-
-<para
->In order to add an new account, open the preferences dialogue via <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-><guilabel
->Accounts</guilabel
-><guilabel
->News</guilabel
-> </menuchoice
->. The <guibutton
->New</guibutton
-> button creates a new account; you then have to enter the same data as for your first account, typically a name for the account, the host name, and a user name and password if the server requires authentication. When this is done the new server will appear both in the configuration dialogue and in the group view: you can now subscribe to newsgroups.</para>
-
-<para
->You can delete the currently-selected account by pressing the <guibutton
->Delete</guibutton
-> button.</para
-> 
+<sect2 id="group-identity"> 
+<title>Group identities</title> 
+
+<para>With &knode; you can use a different identity with every newsgroup to which you are subscribed; i.e. you can set a name, email address, reply-to address and signature to use with that group.</para>
+
+<para>It is easy to set group identities. First, with the right mouse button, click on the name of the newsgroup in which to have a different identity in; then, select <guimenuitem>Group Properties</guimenuitem> from the context menu that appears. In the dialogue that appears the second tab contains fields identical to the global identity settings; enter your settings here and click <guibutton>OK</guibutton> to confirm the changes: then, your articles in this group will always posted with this newly-entered identity.</para> 
+
+<caution> 
+<para>When you unsubscribe from a group you lose its identity settings for this group: if you re-subscribe to the group, you will need to re-enter its identity settings. For new newsgroups, the global identity is used.</para> 
+</caution> 
+
+</sect2> 
+
+<sect2 id="multiple-news-accounts"> 
+<title>Managing Multiple News Accounts</title> 
+
+<para>&knode; can handle an unlimited number of news server accounts in addition to your main news server; most users don't need this feature, but it can be very useful to if your main newsserver does not provide all groups you want to read. Typical cases of this are when support groups for commercial software are hosted on a special, private, server or binary newsgroups, which are only available from some servers.</para> 
+
+<para>Another example of why you sometimes need more than one newsserver is that sometimes not all interesting newsgroups are on one server; in fact, there is very often only a selection of newsgroups. For example, many servers do not support binary groups with pictures or programs; if you want such a newsgroup and your newsserver provider does not want to serve it you can configure &knode; to get it from another server.</para>
+
+<para>Or, perhaps you find you are just subscribed to too many newsgroups, and would like to organise them a little better; you could set up several accounts for the same server, perhaps one for groups you read every day, and one for groups you read less often, so that you do not have to search for your <quote>everyday</quote> groups in a long list of subscribed groups.</para>
+
+<para>In order to add an new account, open the preferences dialogue via <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem><guilabel>Accounts</guilabel><guilabel>News</guilabel> </menuchoice>. The <guibutton>New</guibutton> button creates a new account; you then have to enter the same data as for your first account, typically a name for the account, the host name, and a user name and password if the server requires authentication. When this is done the new server will appear both in the configuration dialogue and in the group view: you can now subscribe to newsgroups.</para>
+
+<para>You can delete the currently-selected account by pressing the <guibutton>Delete</guibutton> button.</para> 
 
 <tip>
-<para
->In the <guimenu
->Account properties</guimenu
-> dialogue (available from the context menu of the newsserver) you can setup an identity for use only on this newsserver.</para>
+<para>In the <guimenu>Account properties</guimenu> dialogue (available from the context menu of the newsserver) you can setup an identity for use only on this newsserver.</para>
 </tip>
 </sect2>
 
 <sect2 id="PGP-support">
-<title
->Sign and Verify Articles with <acronym
->PGP</acronym
-></title>
+<title>Sign and Verify Articles with <acronym>PGP</acronym></title>
 <anchor id="anc-PGP-support"/>
 
-<para
-><acronym
->PGP</acronym
-> is the most-widespread method used to encrypt or sign data. Using the <glossterm
->PGP-signature</glossterm
-> you can verify if an article is really from the original author or if it has been changed by others. You can find PGP-programs and guides at <ulink url="http://www.pgpi.org"
->http://www.pgpi.org</ulink
->.</para>
-
-<para
->With &knode; you can sign an article with <acronym
->PGP</acronym
-> and to verify <acronym
->PGP</acronym
->-signed article. After you have configured the <acronym
->PGP</acronym
-> support, at <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Knode...</guimenuitem
-><guilabel
->Signing/Verifying</guilabel
-></menuchoice
->, you can sign articles in the editor with the <menuchoice
-><guimenu
->Tools</guimenu
-><guimenuitem
->Sign article with PGP</guimenuitem
-></menuchoice
-> menu item &mdash; you will be asked for your passphrase and after that the article will be signed.</para>
-
-<caution
-> 
-<para
->Your <application
->GnuPG</application
->/<acronym
->PGP</acronym
-> <acronym
->ID</acronym
-> is automatically built from your name and your email address and is identical to the sender of the message (<quote
->From</quote
->-header).</para>
+<para><acronym>PGP</acronym> is the most-widespread method used to encrypt or sign data. Using the <glossterm>PGP-signature</glossterm> you can verify if an article is really from the original author or if it has been changed by others. You can find PGP-programs and guides at <ulink url="http://www.pgpi.org">http://www.pgpi.org</ulink>.</para>
+
+<para>With &knode; you can sign an article with <acronym>PGP</acronym> and to verify <acronym>PGP</acronym>-signed article. After you have configured the <acronym>PGP</acronym> support, at <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Knode...</guimenuitem><guilabel>Signing/Verifying</guilabel></menuchoice>, you can sign articles in the editor with the <menuchoice><guimenu>Tools</guimenu><guimenuitem>Sign article with PGP</guimenuitem></menuchoice> menu item &mdash; you will be asked for your passphrase and after that the article will be signed.</para>
+
+<caution> 
+<para>Your <application>GnuPG</application>/<acronym>PGP</acronym> <acronym>ID</acronym> is automatically built from your name and your email address and is identical to the sender of the message (<quote>From</quote>-header).</para>
 </caution>
 
-<para
->To verify a <glossterm
->PGP-signature</glossterm
-> you have to choose the menu item <menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Verify PGP-signature</guimenuitem
-></menuchoice
->.</para
-> 
+<para>To verify a <glossterm>PGP-signature</glossterm> you have to choose the menu item <menuchoice><guimenu>View</guimenu><guimenuitem>Verify PGP-signature</guimenuitem></menuchoice>.</para> 
 </sect2>
 
-</sect1
-> 
+</sect1> 
 <!--
 Local Variables:
 mode: sgml
diff --git a/tde-i18n-en_GB/docs/tdepim/knode/using-subscribing.docbook b/tde-i18n-en_GB/docs/tdepim/knode/using-subscribing.docbook
index 57d854be2cd..2f54372ec2f 100644
--- a/tde-i18n-en_GB/docs/tdepim/knode/using-subscribing.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knode/using-subscribing.docbook
@@ -2,2138 +2,795 @@
 <!DOCTYPE sect1 PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd">
 
 -->
-<sect1 id="subscribing"
-> 
-<title
->Working with newsgroups</title
-> 
+<sect1 id="subscribing"> 
+<title>Working with newsgroups</title> 
 
-<para
->After the configuration of &knode; we will now try to get your first news; to achieve this, you need to do some more steps of configuration, but you will not have to do this very often.</para>
+<para>After the configuration of &knode; we will now try to get your first news; to achieve this, you need to do some more steps of configuration, but you will not have to do this very often.</para>
 
 <sect2 id="fetch-group-list">
-<title
->Fetching the group-list from the news server</title
-> 
+<title>Fetching the group-list from the news server</title> 
 
 <anchor id="anc-fetch-group-list"/>
 
-<para
->If you want to read a newsgroup you first have to subscribe to it. &RMB;-click with your mouse on the entry of your newsserver in the folder-list; from the context menu that appears select the <guimenuitem
->Subscribe to Newsgroups</guimenuitem
-> entry. &knode;, at this moment, does not know which newsgroups are available from this server and will ask you if it should fetch a list of available newsgroups: confirm with <guibutton
->Yes</guibutton
->. Now you should see the following dialogue.</para>
-
-<screenshot
-> 
-<screeninfo
->The <guilabel
->Subscribe to Newsgroups</guilabel
-> Dialogue</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-subscribe.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->The <guilabel
->Subscribe to Newsgroups</guilabel
-> dialogue</phrase
-> 
-</textobject
-> 
-<caption
-> 
-<para
->The <guilabel
->Subscribe to Newsgroups</guilabel
-> dialogue</para
-> 
-</caption
-> 
-</mediaobject
-> 
-</screenshot
-> 
-
-<para
->After some time &knode; will has fetched the list of available newsgroups and will show them in the left window, <guilabel
->Groups on</guilabel
->, in a tree; this tree view shows the newsgroup hierarchy.</para>
+<para>If you want to read a newsgroup you first have to subscribe to it. &RMB;-click with your mouse on the entry of your newsserver in the folder-list; from the context menu that appears select the <guimenuitem>Subscribe to Newsgroups</guimenuitem> entry. &knode;, at this moment, does not know which newsgroups are available from this server and will ask you if it should fetch a list of available newsgroups: confirm with <guibutton>Yes</guibutton>. Now you should see the following dialogue.</para>
+
+<screenshot> 
+<screeninfo>The <guilabel>Subscribe to Newsgroups</guilabel> Dialogue</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-subscribe.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>The <guilabel>Subscribe to Newsgroups</guilabel> dialogue</phrase> 
+</textobject> 
+<caption> 
+<para>The <guilabel>Subscribe to Newsgroups</guilabel> dialogue</para> 
+</caption> 
+</mediaobject> 
+</screenshot> 
+
+<para>After some time &knode; will has fetched the list of available newsgroups and will show them in the left window, <guilabel>Groups on</guilabel>, in a tree; this tree view shows the newsgroup hierarchy.</para>
 
 <tip>
-<para
->You can find a short description about the structure of the usenet and the hierarchy of the single newsgroups at <ulink url="http://www.kirchwitz.de/~amk/dni/usenet-einfuehrung"
->http://www.kirchwitz.de/~amk/dni/usenet-einfuehrung</ulink
-> (German).</para>
+<para>You can find a short description about the structure of the usenet and the hierarchy of the single newsgroups at <ulink url="http://www.kirchwitz.de/~amk/dni/usenet-einfuehrung">http://www.kirchwitz.de/~amk/dni/usenet-einfuehrung</ulink> (German).</para>
 </tip>
 
 <sect3>
-<title
-><guilabel
->Search</guilabel
-></title>
-
-<para
->The simplest method to navigate in the tree is to use the <guilabel
->Search</guilabel
-> input field: &knode; will filter the groups displayed according to your input. If you are searching for a group about &kde;, but you do not know its exact position in the hierarchy, just type <userinput
->kde</userinput
-> in the <guilabel
->Search</guilabel
-> field.</para>
-
-<para
->When you enter the <userinput
->k</userinput
->, you will already see the list changing; the second letter, <userinput
->d</userinput
->, give you a significantly-reduced list of shown groups; and the final <userinput
->e</userinput
-> reduces the list to the groups with kde in their name. You will most likely end with just one group:</para>
-
-<simplelist
-> 
-<member
->comp.windows.x.kde</member
-> 
-</simplelist
-> 
-
-<para
->If your server carries the international groups, you might find your list is:</para>
-
-<simplelist
-> 
-<member
->comp.windows.x.kde</member
-> 
-<member
->de.comp.os.unix.apps.kde</member
-> 
-</simplelist
-> 
-
-<para
->This incremental search gives you the possibility to search for newsgroups without knowing their exact paths.</para
-> 
-
-<tip
-> 
-<para
->On a closer look, you will see &knode; showing the groups without a tree if there are only a few groups left; this is not a bug, it is a feature.</para
-> 
-</tip
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->disable tree view</guilabel
-></title
-> 
-
-<para
->Normally &knode; shows all the groups in a tree; if this option is activated, all newsgroups are listed amongst one another.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-> 
-<guilabel
->subscribed only</guilabel
-></title
-> 
-
-<para
->If <guilabel
->subscribed only</guilabel
-> is checked the tree-view <guilabel
->Groups on</guilabel
-> shows only the groups you are already subscribed to; this is very convenient if you want to unsubscribe from some groups: you then won't have to search the whole tree for these groups.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->new only</guilabel
-></title
-> 
-
-<para
->If <guilabel
->new only</guilabel
-> is checked the tree-view <guilabel
->Groups on</guilabel
-> shows only the groups which are new since you last fetched the group list; for this to be functional, you first have to fetch a new group list with <guibutton
->New List</guibutton
->.</para
-> 
-
-<para
->The <guibutton
->New Groups</guibutton
-> button give the possibility to show all the new groups since a specific date.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Groups on</guilabel
-></title
-> 
-
-<para
->This list shows all newsgroups on this server; if you check one of the checkboxes, <guilabel
->subscribed only</guilabel
-> or <guilabel
->new only</guilabel
->, you get the corresponding selection.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Current changes</guilabel
-></title
-> 
-
-<para
->The <guilabel
->Current changes</guilabel
-> window shows all changes you have made since you opened the dialogue.</para
-> 
-
-<para
->The <guilabel
->subscribe to</guilabel
-> list shows the newsgroups you have chosen to subscribe to.</para
-> 
-
-<para
->Below you can see the <guilabel
->unsubscribe from</guilabel
-> list, which shows all newsgroups from which you have chosen to unsubscribe. You cannot unsubscribe from groups you are not subscribed to.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->New Groups</guilabel
-></title
-> 
-
-<para
->This button opens a dialogue which allows you to configure the list of new groups; you can choose between showing all groups since the last refresh or all groups since a given date. With the date option, &knode; provides a more-flexible possibility to check for new groups; you can even check for new groups since before the last refresh of the group list.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guibutton
->New List</guibutton
-></title
-> 
-
-<para
->The <guibutton
->New List</guibutton
-> button tells &knode; to fetch a new group list from the news server.</para
-> 
-
-
-<para
->The newsgroup hierarchy is in a constant flux; all the time there are groups introduced, renamed or moved; some groups just disappear: they are no longer available and get deleted. To reflect this, &knode; gives you the possibility to refresh the the group list. This is, normally, only needed to see if your server now provides a group which was not there before.</para
-> 
+<title><guilabel>Search</guilabel></title>
+
+<para>The simplest method to navigate in the tree is to use the <guilabel>Search</guilabel> input field: &knode; will filter the groups displayed according to your input. If you are searching for a group about &kde;, but you do not know its exact position in the hierarchy, just type <userinput>kde</userinput> in the <guilabel>Search</guilabel> field.</para>
+
+<para>When you enter the <userinput>k</userinput>, you will already see the list changing; the second letter, <userinput>d</userinput>, give you a significantly-reduced list of shown groups; and the final <userinput>e</userinput> reduces the list to the groups with kde in their name. You will most likely end with just one group:</para>
+
+<simplelist> 
+<member>comp.windows.x.kde</member> 
+</simplelist> 
+
+<para>If your server carries the international groups, you might find your list is:</para>
+
+<simplelist> 
+<member>comp.windows.x.kde</member> 
+<member>de.comp.os.unix.apps.kde</member> 
+</simplelist> 
+
+<para>This incremental search gives you the possibility to search for newsgroups without knowing their exact paths.</para> 
+
+<tip> 
+<para>On a closer look, you will see &knode; showing the groups without a tree if there are only a few groups left; this is not a bug, it is a feature.</para> 
+</tip> 
+</sect3> 
+
+<sect3> 
+<title><guilabel>disable tree view</guilabel></title> 
+
+<para>Normally &knode; shows all the groups in a tree; if this option is activated, all newsgroups are listed amongst one another.</para> 
+
+</sect3> 
+
+<sect3> 
+<title> 
+<guilabel>subscribed only</guilabel></title> 
+
+<para>If <guilabel>subscribed only</guilabel> is checked the tree-view <guilabel>Groups on</guilabel> shows only the groups you are already subscribed to; this is very convenient if you want to unsubscribe from some groups: you then won't have to search the whole tree for these groups.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>new only</guilabel></title> 
+
+<para>If <guilabel>new only</guilabel> is checked the tree-view <guilabel>Groups on</guilabel> shows only the groups which are new since you last fetched the group list; for this to be functional, you first have to fetch a new group list with <guibutton>New List</guibutton>.</para> 
+
+<para>The <guibutton>New Groups</guibutton> button give the possibility to show all the new groups since a specific date.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Groups on</guilabel></title> 
+
+<para>This list shows all newsgroups on this server; if you check one of the checkboxes, <guilabel>subscribed only</guilabel> or <guilabel>new only</guilabel>, you get the corresponding selection.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Current changes</guilabel></title> 
+
+<para>The <guilabel>Current changes</guilabel> window shows all changes you have made since you opened the dialogue.</para> 
+
+<para>The <guilabel>subscribe to</guilabel> list shows the newsgroups you have chosen to subscribe to.</para> 
+
+<para>Below you can see the <guilabel>unsubscribe from</guilabel> list, which shows all newsgroups from which you have chosen to unsubscribe. You cannot unsubscribe from groups you are not subscribed to.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>New Groups</guilabel></title> 
+
+<para>This button opens a dialogue which allows you to configure the list of new groups; you can choose between showing all groups since the last refresh or all groups since a given date. With the date option, &knode; provides a more-flexible possibility to check for new groups; you can even check for new groups since before the last refresh of the group list.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guibutton>New List</guibutton></title> 
+
+<para>The <guibutton>New List</guibutton> button tells &knode; to fetch a new group list from the news server.</para> 
+
+
+<para>The newsgroup hierarchy is in a constant flux; all the time there are groups introduced, renamed or moved; some groups just disappear: they are no longer available and get deleted. To reflect this, &knode; gives you the possibility to refresh the the group list. This is, normally, only needed to see if your server now provides a group which was not there before.</para> 
 
 <tip>
-<para
->If you simply want to make sure you have seen every new group, it is more effective to use <guibutton
->New Groups</guibutton
->; fetching the complete list is much more time consuming, but you do make sure that any deleted groups vanish from the grouplist.</para
-> 
-</tip
-> 
-
-<para
->Unfortunately there is no guarantee that your newsserver is providing all available newsgroups: many newsserver refuse groups publishing binary attachments; other groups are only available from special servers. &knode; provides you the possibility to use more than one news-server if you want to access alternative servers providing these groups; you can read more about this in <xref linkend="multiple-news-accounts"/> .</para>
-
-</sect3
-> 
-
-<sect3
-> 
-<title
->Working with the dialogue</title
-> 
-
-<para
->We now want to subscribe to the &kde; group: mark the the box beside the name; you can now see the group in the list labelled <guilabel
->subscribe to</guilabel
->. Another possibility is to use the arrows between the two windows.</para
-> 
-
-<para
->If you picked the wrong newsgroup by mistake you can undo your selection by unchecking the checkbox next to the group's name in the <guilabel
->Groups on</guilabel
-> window; again, you could use the arrow (you probably noticed the arrow changing direction.)</para
-> 
-
-<para
->If you want to unsubscribe from a newsgroup it is as easy as subscribing to it: you just uncheck the box next to its name. The groups you wish to unsubscribe from are shown in the <guilabel
->unsubscribe from</guilabel
-> list. Again, the arrow is another way of doing things: to correct your actions you can use the arrow again; this works as long as the dialogue is not closed by clicking <guibutton
->OK</guibutton
->.</para>
-
-<para
->As a &kde; and &knode; user you will probably want to subscribe to the group, so make sure you checked the box and press <guibutton
->OK</guibutton
->. This group now appears in the tree view under the server entry it was chosen from; in our example this is <emphasis
->My News Account</emphasis
->. If you can not see the group, click on the cross next to the server entry or on the server entry itself; the list of subscribed newsgroups should appear.</para>
-
-<para
->Click on the newsgroup; now you see on the right in the article view an empty folder: &knode; has to fetch the articles for the new newsgroup. If you have, in <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode</guimenuitem
-><guimenuitem
->Reading news</guimenuitem
-><guimenuitem
->General</guimenuitem
-></menuchoice
->, the check box <guilabel
->Check for new article automatically</guilabel
-> checked &knode; tries to fetch the articles from the server when the newsgroup is first selected; if this is unchecked, you have to use <menuchoice
-><guimenu
->Account</guimenu
-><guimenuitem
->Get new articles</guimenuitem
-></menuchoice
->.</para>
-
-<important
-> 
-<para
->When you are using <application
->leafnode</application
-> as a server, there will be a single article in the group: <application
->leafnode</application
-> generates an article in every new subscribed group; this indicates that <application
->leafnode</application
-> will consider this group the next time it fetches articles. You can ignore an error message saying the article can not be found. If you select this article you tell <application
->leafnode</application
-> you are really interested in this group.</para
-> 
-
-<para
->You get the real articles when your local newsserver fetches them from the Internet and provides them to you; details about this can be found in the documentation of your local newsserver.</para
-> 
-</important
-> 
-
-<para
->When everything works the articles of the subscribed newsgroup appear in the upper right window &mdash; the article view.</para
-> 
-
-</sect3
-> 
+<para>If you simply want to make sure you have seen every new group, it is more effective to use <guibutton>New Groups</guibutton>; fetching the complete list is much more time consuming, but you do make sure that any deleted groups vanish from the grouplist.</para> 
+</tip> 
+
+<para>Unfortunately there is no guarantee that your newsserver is providing all available newsgroups: many newsserver refuse groups publishing binary attachments; other groups are only available from special servers. &knode; provides you the possibility to use more than one news-server if you want to access alternative servers providing these groups; you can read more about this in <xref linkend="multiple-news-accounts"/> .</para>
+
+</sect3> 
+
+<sect3> 
+<title>Working with the dialogue</title> 
+
+<para>We now want to subscribe to the &kde; group: mark the the box beside the name; you can now see the group in the list labelled <guilabel>subscribe to</guilabel>. Another possibility is to use the arrows between the two windows.</para> 
+
+<para>If you picked the wrong newsgroup by mistake you can undo your selection by unchecking the checkbox next to the group's name in the <guilabel>Groups on</guilabel> window; again, you could use the arrow (you probably noticed the arrow changing direction.)</para> 
+
+<para>If you want to unsubscribe from a newsgroup it is as easy as subscribing to it: you just uncheck the box next to its name. The groups you wish to unsubscribe from are shown in the <guilabel>unsubscribe from</guilabel> list. Again, the arrow is another way of doing things: to correct your actions you can use the arrow again; this works as long as the dialogue is not closed by clicking <guibutton>OK</guibutton>.</para>
+
+<para>As a &kde; and &knode; user you will probably want to subscribe to the group, so make sure you checked the box and press <guibutton>OK</guibutton>. This group now appears in the tree view under the server entry it was chosen from; in our example this is <emphasis>My News Account</emphasis>. If you can not see the group, click on the cross next to the server entry or on the server entry itself; the list of subscribed newsgroups should appear.</para>
+
+<para>Click on the newsgroup; now you see on the right in the article view an empty folder: &knode; has to fetch the articles for the new newsgroup. If you have, in <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode</guimenuitem><guimenuitem>Reading news</guimenuitem><guimenuitem>General</guimenuitem></menuchoice>, the check box <guilabel>Check for new article automatically</guilabel> checked &knode; tries to fetch the articles from the server when the newsgroup is first selected; if this is unchecked, you have to use <menuchoice><guimenu>Account</guimenu><guimenuitem>Get new articles</guimenuitem></menuchoice>.</para>
+
+<important> 
+<para>When you are using <application>leafnode</application> as a server, there will be a single article in the group: <application>leafnode</application> generates an article in every new subscribed group; this indicates that <application>leafnode</application> will consider this group the next time it fetches articles. You can ignore an error message saying the article can not be found. If you select this article you tell <application>leafnode</application> you are really interested in this group.</para> 
+
+<para>You get the real articles when your local newsserver fetches them from the Internet and provides them to you; details about this can be found in the documentation of your local newsserver.</para> 
+</important> 
+
+<para>When everything works the articles of the subscribed newsgroup appear in the upper right window &mdash; the article view.</para> 
+
+</sect3> 
 </sect2>
 
-<sect2 id="fetch-and-read-news"
-> 
-<title
->Fetching and reading Articles</title
-> 
-
-<para
->&knode; always shows three views: the folder view, the article view and the article window; you can change height and width of these views with the mouse. If you click in a window it gets the focus; this is important if you want to use &knode; with the keyboard. The <keycap
->Tab</keycap
-> key changes the focus between the views; the currently-active view is indicated by a small colored bar over the column headers.</para
-> 
-
-<para
->This picture shows &knode; with the subscribed &kde; newsgroup.</para>
-
-<screenshot
-> 
-<screeninfo
->The three views of &knode;</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-views.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->The three views of &knode;</phrase
-> 
-</textobject
-> 
-<caption
-> 
-<para
->The three views of &knode;</para
-> 
+<sect2 id="fetch-and-read-news"> 
+<title>Fetching and reading Articles</title> 
+
+<para>&knode; always shows three views: the folder view, the article view and the article window; you can change height and width of these views with the mouse. If you click in a window it gets the focus; this is important if you want to use &knode; with the keyboard. The <keycap>Tab</keycap> key changes the focus between the views; the currently-active view is indicated by a small colored bar over the column headers.</para> 
+
+<para>This picture shows &knode; with the subscribed &kde; newsgroup.</para>
+
+<screenshot> 
+<screeninfo>The three views of &knode;</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-views.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>The three views of &knode;</phrase> 
+</textobject> 
+<caption> 
+<para>The three views of &knode;</para> 
 </caption>
-</mediaobject
-> 
-</screenshot
-> 
+</mediaobject> 
+</screenshot> 
 
-<para
->It is possible to select more than one group or article. You can select an area by clicking on the first entry with the &LMB;, holding the &Shift; key and clicking on the last entry with the &LMB; again.</para
-> 
+<para>It is possible to select more than one group or article. You can select an area by clicking on the first entry with the &LMB;, holding the &Shift; key and clicking on the last entry with the &LMB; again.</para> 
 
-<para
->If you want to select more than one single entry, but they are not next to each other in the list, you have to select the first by clicking on it with the &LMB; and then select the other entries by holding down the &Ctrl; key and clicking on them with the &LMB;.</para>
+<para>If you want to select more than one single entry, but they are not next to each other in the list, you have to select the first by clicking on it with the &LMB; and then select the other entries by holding down the &Ctrl; key and clicking on them with the &LMB;.</para>
 
-<para
->In either case you can clear your selection by clicking on another entry with the &LMB;.</para>
+<para>In either case you can clear your selection by clicking on another entry with the &LMB;.</para>
 
 <caution>
-<para
->If you have selected more than one entry you have to activate the context menu with the &Shift; key pressed, otherwise you'll clear the selection.</para
-> 
-</caution
-> 
-
-<sect3
-> 
-<title
->The Folder View</title
-> 
-
-<para
->The folder views contains not only the accounts you configured &mdash; in our example this is <emphasis
->My News Account</emphasis
-> &mdash; but also three other folders. When you are subscribed to some newsgroups there will be plus next to the name of the account: clicking on the plus or the name of the account opens the tree to show the names of the newsgroups you have chosen to subscribe to using that account.</para>
-
-<tip
-> 
-<para
->Using the &RMB; you can get a context menu for the selected item (folders or newsgroups): if you select a newsgroup and choose Properties you can, amongst other things, specify your identity for this particular group; you can find more about this in the <link linkend="group-identity"
->Local Identities</link
-> chapter.</para>
+<para>If you have selected more than one entry you have to activate the context menu with the &Shift; key pressed, otherwise you'll clear the selection.</para> 
+</caution> 
+
+<sect3> 
+<title>The Folder View</title> 
+
+<para>The folder views contains not only the accounts you configured &mdash; in our example this is <emphasis>My News Account</emphasis> &mdash; but also three other folders. When you are subscribed to some newsgroups there will be plus next to the name of the account: clicking on the plus or the name of the account opens the tree to show the names of the newsgroups you have chosen to subscribe to using that account.</para>
+
+<tip> 
+<para>Using the &RMB; you can get a context menu for the selected item (folders or newsgroups): if you select a newsgroup and choose Properties you can, amongst other things, specify your identity for this particular group; you can find more about this in the <link linkend="group-identity">Local Identities</link> chapter.</para>
 </tip>
 
-<para
->When you select a newsgroup with your mouse a list of articles of this group appears in the upper-right window; if there are no articles in the upper-right window there are two possibilities &mdash; either there are no articles for this newsgroup on the newsserver or the newsserver did not fetch them yet. Select <menuchoice
-><guimenu
->Account</guimenu
-><guimenuitem
->Get new articles in all groups</guimenuitem
-></menuchoice
->: if there are still no articles appearing you either have some problems with your settings or there really are no articles for this group. Try another group: if there are no articles for this group you will probably have to work through the first chapters, about the configuration of &knode;, again; the <link linkend="faq"
->Frequently Asked Questions</link
-> chapter may help you, too.</para>
-
-<caution
-> 
-<para
->If you are using a local newsserver the articles only appear if the newsserver has already got them from the internet; if you are using <application
->leafnode</application
-> this is done by the <command
->fetchnews</command
-> program.</para>
-</caution
-> 
-
-<sect4
-> 
-<title
->The Newsgroup Folders</title
-> 
-
-<para
->The newsgroup folders appear with the name they are given by the hierarchy on the newsserver; in our example this is <guilabel
->comp.windows.x.kde</guilabel
->. You can change the name shown in this view: in the context menu (click with the &RMB; on the newsgroup's name) choose <menuchoice
-><guimenuitem
->Rename group</guimenuitem
-></menuchoice
->, then you can change the name in the input field. A good name for <guilabel
->comp.windows.x.kde</guilabel
-> would be, for example, <guilabel
->The KDE Newsgroup</guilabel
->.</para>
-
-<para
->If you don't change this, the hierarchical name will still be shown.</para>
-
-<para
->Besides the name of newsgroups the folder view shows more information by altering its appearance: if a newsgroup contains new articles its name is shown bold; the columns <guilabel
->Total</guilabel
-> and <guilabel
->Unread</guilabel
-> also tell you how many articles are in the corresponding group or folder and how many are marked as unread.</para
-> 
-
-</sect4
-> 
-
-<sect4
-> 
-<title
->The <guilabel
->Outbox</guilabel
-> folder</title
-> 
-
-<para
->The <guilabel
->Outbox</guilabel
-> folder contains all articles which are to be sent later, or which could not be sent because of an error. If you want to sent an article later choose <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Send Later</guimenuitem
-></menuchoice
-> in the editor: the article is then filed in the <guilabel
->Outbox</guilabel
-> folder; it is possible to edit, delete or send these articles later.</para
-> 
-
-<tip
-> 
-<para
->If an article was not sent because of an error, it is stored in this folder; you will not lose these articles.</para
-> 
-</tip
-> 
-</sect4
-> 
-
-<sect4
-> 
-<title
->The <guilabel
->Drafts</guilabel
-> folder</title
-> 
-
-<para
->This folder is used for storing drafts of your articles; for example, if you want to do some further work on them but you have no time for it right now. To store an article in this folder choose <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Save as Draft</guimenuitem
-></menuchoice
-> in the editor.</para
-> 
-
-<para
->You can edit, delete and send the articles in this folder.</para
-> 
-
-</sect4
-> 
-
-<sect4
-> 
-<title
->The <guilabel
->Sent</guilabel
-> Folder</title
-> 
-
-<para
->This folder contains copies of the articles that you have successfully sent, including your e-mail replies; you can delete the messages in this folder, but it will not un-send the messages already sent.</para
-> 
-
-<caution
-> 
-<para
->If your are using a local newsserver an article appearing in the folder <guilabel
->Sent</guilabel
-> only indicates the local newsserver received the article; it is possible this article will never appears in any newsgroup if the local newsserver was not able to send it for some reason. If you notice some articles not appearing in the according newsgroup first make sure it was sent by the local newsserver.</para
-> 
-</caution
-> 
-
-<tip
-> 
-<para
->If you are using <application
->leafnode</application
-> then articles leafnode was unable to send are normally found in <filename
->/var/spool/failed.postings</filename
->.</para
-> 
-</tip
-> 
-</sect4
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
->The Article View</title
-> 
-
-<para
->The article view gives you a list of all articles in the selected newsgroup or folder; you can change the appearance of this view using the <guimenu
->View</guimenu
-> menu. The uppermost row of the view contains the column headers.</para
-> 
-
-<variablelist
-> 
-<varlistentry
-> 
-<term
-><guilabel
->Subject</guilabel
-></term
-> 
-<listitem
-> 
-<para
->The <guilabel
->Subject</guilabel
-> column shows the subjects of an articles which, most of the time, give you a clue about the content of this article. The subject is chosen by the article author. You can find more about this in <link linkend="post-and-mail-news"
->How to post and reply to news</link
->.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
-><guilabel
->From</guilabel
-></term
-> 
-<listitem
-> 
-<para
->The <guilabel
->From</guilabel
-> column shows the author, or their e-mail address if the author didn't give a name. You can configure your settings in <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode</guimenuitem
-><guilabel
->Identity</guilabel
-></menuchoice
->; when you publish an article &knode; will show these settings in the <guilabel
->From</guilabel
-> column.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
-><guilabel
->Score</guilabel
-></term>
-<listitem
-> 
-<para
->The <guilabel
->Score</guilabel
-> column shows the scoring of an article as a number; the default is 0. Articles which are important to you can be scored up; articles you want to ignore can be scored down: the range is -100000 to +100000. You can read more about this in the <link linkend="score-watch-ignore"
->Scoring, Watching and Ignoring</link
-> chapter.</para
-> 
-<para
->The <guilabel
->Score</guilabel
-> column is only shown if <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-><guilabel
->Reading News</guilabel
-><guilabel
->General</guilabel
-><guilabel
->Show article score</guilabel
-></menuchoice
-> is activated.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
-><guilabel
->Date</guilabel
-></term
-> 
-<listitem
-> 
-<para
->The <guilabel
->Date</guilabel
-> column shows the date and time when the article was written.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
-><guilabel
->Lines</guilabel
-></term
-> 
-<listitem
-> 
-<para
->The <guilabel
->Lines</guilabel
-> column shows the number of lines of the <glossterm
->article</glossterm
->; this column is only shown if <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-><guilabel
->Reading News</guilabel
-><guilabel
->General</guilabel
-><guilabel
->Show line count</guilabel
-></menuchoice
-> is activated.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-</variablelist
-> 
-
-<sect4
-> 
-<title
->The Symbols and Highlighting Used</title>
-
-<para
->This is a short explanation of the different symbols for labelling articles.</para
-> 
-
-<itemizedlist
-> 
-<listitem
-> 
-<para
-><inlinemediaobject
-> 
-<imageobject
-> 
+<para>When you select a newsgroup with your mouse a list of articles of this group appears in the upper-right window; if there are no articles in the upper-right window there are two possibilities &mdash; either there are no articles for this newsgroup on the newsserver or the newsserver did not fetch them yet. Select <menuchoice><guimenu>Account</guimenu><guimenuitem>Get new articles in all groups</guimenuitem></menuchoice>: if there are still no articles appearing you either have some problems with your settings or there really are no articles for this group. Try another group: if there are no articles for this group you will probably have to work through the first chapters, about the configuration of &knode;, again; the <link linkend="faq">Frequently Asked Questions</link> chapter may help you, too.</para>
+
+<caution> 
+<para>If you are using a local newsserver the articles only appear if the newsserver has already got them from the internet; if you are using <application>leafnode</application> this is done by the <command>fetchnews</command> program.</para>
+</caution> 
+
+<sect4> 
+<title>The Newsgroup Folders</title> 
+
+<para>The newsgroup folders appear with the name they are given by the hierarchy on the newsserver; in our example this is <guilabel>comp.windows.x.kde</guilabel>. You can change the name shown in this view: in the context menu (click with the &RMB; on the newsgroup's name) choose <menuchoice><guimenuitem>Rename group</guimenuitem></menuchoice>, then you can change the name in the input field. A good name for <guilabel>comp.windows.x.kde</guilabel> would be, for example, <guilabel>The KDE Newsgroup</guilabel>.</para>
+
+<para>If you don't change this, the hierarchical name will still be shown.</para>
+
+<para>Besides the name of newsgroups the folder view shows more information by altering its appearance: if a newsgroup contains new articles its name is shown bold; the columns <guilabel>Total</guilabel> and <guilabel>Unread</guilabel> also tell you how many articles are in the corresponding group or folder and how many are marked as unread.</para> 
+
+</sect4> 
+
+<sect4> 
+<title>The <guilabel>Outbox</guilabel> folder</title> 
+
+<para>The <guilabel>Outbox</guilabel> folder contains all articles which are to be sent later, or which could not be sent because of an error. If you want to sent an article later choose <menuchoice><guimenu>File</guimenu><guimenuitem>Send Later</guimenuitem></menuchoice> in the editor: the article is then filed in the <guilabel>Outbox</guilabel> folder; it is possible to edit, delete or send these articles later.</para> 
+
+<tip> 
+<para>If an article was not sent because of an error, it is stored in this folder; you will not lose these articles.</para> 
+</tip> 
+</sect4> 
+
+<sect4> 
+<title>The <guilabel>Drafts</guilabel> folder</title> 
+
+<para>This folder is used for storing drafts of your articles; for example, if you want to do some further work on them but you have no time for it right now. To store an article in this folder choose <menuchoice><guimenu>File</guimenu><guimenuitem>Save as Draft</guimenuitem></menuchoice> in the editor.</para> 
+
+<para>You can edit, delete and send the articles in this folder.</para> 
+
+</sect4> 
+
+<sect4> 
+<title>The <guilabel>Sent</guilabel> Folder</title> 
+
+<para>This folder contains copies of the articles that you have successfully sent, including your e-mail replies; you can delete the messages in this folder, but it will not un-send the messages already sent.</para> 
+
+<caution> 
+<para>If your are using a local newsserver an article appearing in the folder <guilabel>Sent</guilabel> only indicates the local newsserver received the article; it is possible this article will never appears in any newsgroup if the local newsserver was not able to send it for some reason. If you notice some articles not appearing in the according newsgroup first make sure it was sent by the local newsserver.</para> 
+</caution> 
+
+<tip> 
+<para>If you are using <application>leafnode</application> then articles leafnode was unable to send are normally found in <filename>/var/spool/failed.postings</filename>.</para> 
+</tip> 
+</sect4> 
+</sect3> 
+
+<sect3> 
+<title>The Article View</title> 
+
+<para>The article view gives you a list of all articles in the selected newsgroup or folder; you can change the appearance of this view using the <guimenu>View</guimenu> menu. The uppermost row of the view contains the column headers.</para> 
+
+<variablelist> 
+<varlistentry> 
+<term><guilabel>Subject</guilabel></term> 
+<listitem> 
+<para>The <guilabel>Subject</guilabel> column shows the subjects of an articles which, most of the time, give you a clue about the content of this article. The subject is chosen by the article author. You can find more about this in <link linkend="post-and-mail-news">How to post and reply to news</link>.</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term><guilabel>From</guilabel></term> 
+<listitem> 
+<para>The <guilabel>From</guilabel> column shows the author, or their e-mail address if the author didn't give a name. You can configure your settings in <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode</guimenuitem><guilabel>Identity</guilabel></menuchoice>; when you publish an article &knode; will show these settings in the <guilabel>From</guilabel> column.</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term><guilabel>Score</guilabel></term>
+<listitem> 
+<para>The <guilabel>Score</guilabel> column shows the scoring of an article as a number; the default is 0. Articles which are important to you can be scored up; articles you want to ignore can be scored down: the range is -100000 to +100000. You can read more about this in the <link linkend="score-watch-ignore">Scoring, Watching and Ignoring</link> chapter.</para> 
+<para>The <guilabel>Score</guilabel> column is only shown if <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem><guilabel>Reading News</guilabel><guilabel>General</guilabel><guilabel>Show article score</guilabel></menuchoice> is activated.</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term><guilabel>Date</guilabel></term> 
+<listitem> 
+<para>The <guilabel>Date</guilabel> column shows the date and time when the article was written.</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term><guilabel>Lines</guilabel></term> 
+<listitem> 
+<para>The <guilabel>Lines</guilabel> column shows the number of lines of the <glossterm>article</glossterm>; this column is only shown if <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem><guilabel>Reading News</guilabel><guilabel>General</guilabel><guilabel>Show line count</guilabel></menuchoice> is activated.</para> 
+</listitem> 
+</varlistentry> 
+</variablelist> 
+
+<sect4> 
+<title>The Symbols and Highlighting Used</title>
+
+<para>This is a short explanation of the different symbols for labelling articles.</para> 
+
+<itemizedlist> 
+<listitem> 
+<para><inlinemediaobject> 
+<imageobject> 
 <imagedata fileref="greyball.png" format="PNG"/> </imageobject>
-</inlinemediaobject
-> Already-read articles are labelled with this symbol.</para
-> 
-</listitem
-> 
-<listitem
-> 
-<para
-> 
-<inlinemediaobject
-> 
-<imageobject
-> 
+</inlinemediaobject> Already-read articles are labelled with this symbol.</para> 
+</listitem> 
+<listitem> 
+<para> 
+<inlinemediaobject> 
+<imageobject> 
 <imagedata fileref="greyballchk.png" format="PNG"/> </imageobject>
-</inlinemediaobject
-> Articles labelled with this symbol are read and the body was fetched from the server.</para
-> 
-</listitem
-> 
-<listitem
-> 
-<para
-> 
-<inlinemediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="redball.png" format="PNG"/> </imageobject
-> </inlinemediaobject
-> Articles labelled with this symbol are unread and the body has not yet been fetched.</para
-> 
-</listitem
-> 
-<listitem
-> 
-<para
-> 
-<inlinemediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="redballchk.png" format="PNG"/> </imageobject
-> </inlinemediaobject
-> Articles labeled with this symbol are unread but the body has already been already fetched.</para
-> 
-</listitem
-> 
-<listitem
-> 
-<para
-> 
-<inlinemediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="newsubs.png" format="PNG"/> </imageobject
-> </inlinemediaobject
-> Articles labelled with this symbol are part of a thread with new and/or unread articles in it.</para
-> 
-</listitem
-> 
-<listitem
-> 
-<para
-> 
-<inlinemediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="eyes.png" format="PNG"/> </imageobject
-> </inlinemediaobject
-> Articles labelled with this symbol are parts of a guarded thread. This corresponds to a score of 100.</para
-> 
-</listitem
-> 
-</itemizedlist
-> 
-
-<para
->Besides different symbols, &knode; is using the following highlighting:</para>
-
-<variablelist
-> 
-<varlistentry
-> 
-<term
->Bold article subjects.</term
-> 
-<listitem
-> 
-<para
->The article is new in this group; it was fetched during the last connection with the server.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
->Article subjects printed in grey.</term
-> 
-<listitem
-> 
-<para
->There are no unread follow-up articles.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-</variablelist
-> 
-</sect4
-> 
-
-<sect4
-> 
-<title
->Navigation in the Article View.</title
-> 
-
-<para
->You can navigate in articles, display an article and open or close threads with your mouse or keyboard.</para
-> 
-
-<para
->When you select an article with your mouse its entry in the the article view gets colored; at the same time the header and body of this article appear in in the article window. If you want to read another article you can use the mouse to select it, or you can use the cursor keys. If you use the cursor keys you can move the dashed frame to the article you want to read and then press <keycap
->Enter</keycap
-> to mark and display the article.</para>
-
-<para
->There are many key commands to provide comfortable navigation within a news group and to switching between newsgroups. Here the most common key commands of the standard key configuration are listed; you can configure the key bindings in <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Shortcuts</guimenuitem
-></menuchoice
->.</para
-> 
-
-<variablelist
-> 
-<varlistentry
-> 
-<term
->Toggle Subthreads <keycap
->T</keycap
-> </term
-> 
-<listitem
-> 
-<para
->The replies to an article are either shown or hidden by multiply pressing this key; another way to open threads is to use the <keycap
->Right Arrow</keycap
-> key.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
->Filter <keycap
->F6</keycap
-></term
-> 
-<listitem
-> 
-<para
->A dialogue is shown where you can choose the filter for the articles.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
->Sort <keycap
->F7</keycap
-> </term
-> 
-<listitem
-> 
-<para
->A dialogue is shown where you can change the sorting of the articles; if you choose a column for a second time it will change the sorting direction.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
+</inlinemediaobject> Articles labelled with this symbol are read and the body was fetched from the server.</para> 
+</listitem> 
+<listitem> 
+<para> 
+<inlinemediaobject> 
+<imageobject> 
+<imagedata fileref="redball.png" format="PNG"/> </imageobject> </inlinemediaobject> Articles labelled with this symbol are unread and the body has not yet been fetched.</para> 
+</listitem> 
+<listitem> 
+<para> 
+<inlinemediaobject> 
+<imageobject> 
+<imagedata fileref="redballchk.png" format="PNG"/> </imageobject> </inlinemediaobject> Articles labeled with this symbol are unread but the body has already been already fetched.</para> 
+</listitem> 
+<listitem> 
+<para> 
+<inlinemediaobject> 
+<imageobject> 
+<imagedata fileref="newsubs.png" format="PNG"/> </imageobject> </inlinemediaobject> Articles labelled with this symbol are part of a thread with new and/or unread articles in it.</para> 
+</listitem> 
+<listitem> 
+<para> 
+<inlinemediaobject> 
+<imageobject> 
+<imagedata fileref="eyes.png" format="PNG"/> </imageobject> </inlinemediaobject> Articles labelled with this symbol are parts of a guarded thread. This corresponds to a score of 100.</para> 
+</listitem> 
+</itemizedlist> 
+
+<para>Besides different symbols, &knode; is using the following highlighting:</para>
+
+<variablelist> 
+<varlistentry> 
+<term>Bold article subjects.</term> 
+<listitem> 
+<para>The article is new in this group; it was fetched during the last connection with the server.</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term>Article subjects printed in grey.</term> 
+<listitem> 
+<para>There are no unread follow-up articles.</para> 
+</listitem> 
+</varlistentry> 
+</variablelist> 
+</sect4> 
+
+<sect4> 
+<title>Navigation in the Article View.</title> 
+
+<para>You can navigate in articles, display an article and open or close threads with your mouse or keyboard.</para> 
+
+<para>When you select an article with your mouse its entry in the the article view gets colored; at the same time the header and body of this article appear in in the article window. If you want to read another article you can use the mouse to select it, or you can use the cursor keys. If you use the cursor keys you can move the dashed frame to the article you want to read and then press <keycap>Enter</keycap> to mark and display the article.</para>
+
+<para>There are many key commands to provide comfortable navigation within a news group and to switching between newsgroups. Here the most common key commands of the standard key configuration are listed; you can configure the key bindings in <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Shortcuts</guimenuitem></menuchoice>.</para> 
+
+<variablelist> 
+<varlistentry> 
+<term>Toggle Subthreads <keycap>T</keycap> </term> 
+<listitem> 
+<para>The replies to an article are either shown or hidden by multiply pressing this key; another way to open threads is to use the <keycap>Right Arrow</keycap> key.</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term>Filter <keycap>F6</keycap></term> 
+<listitem> 
+<para>A dialogue is shown where you can choose the filter for the articles.</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term>Sort <keycap>F7</keycap> </term> 
+<listitem> 
+<para>A dialogue is shown where you can change the sorting of the articles; if you choose a column for a second time it will change the sorting direction.</para> 
+</listitem> 
+</varlistentry> 
 <varlistentry>
-<term
->Browsing articles <keycap
->Space</keycap
-></term>
+<term>Browsing articles <keycap>Space</keycap></term>
 <listitem>
-<para
->This key gives you a convenient possibility for browsing through the article view: by pressing this key the article in the article window is scrolled; when you reach the end of the article by repeatedly pressing <keycap
->Space</keycap
->, it takes you to the next article; when you have read all articles in one newsgroup, <keycap
->Space</keycap
-> takes you to the first article of the next newsgroup. By repeatedly pressing <keycap
->Space</keycap
-> you can browse through all subscribed newsgroups like this.</para>
+<para>This key gives you a convenient possibility for browsing through the article view: by pressing this key the article in the article window is scrolled; when you reach the end of the article by repeatedly pressing <keycap>Space</keycap>, it takes you to the next article; when you have read all articles in one newsgroup, <keycap>Space</keycap> takes you to the first article of the next newsgroup. By repeatedly pressing <keycap>Space</keycap> you can browse through all subscribed newsgroups like this.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->Next unread article <keycombo action="simul"
->&Alt;<keycap
->Space</keycap
-></keycombo
-> </term
-> 
-<listitem
-> 
-<para
->This key binding jumps to the next unread article. The sequence follows the order of articles in the article view; threads are opened if necessary.</para>
-</listitem
-> 
-</varlistentry
-> 
+<term>Next unread article <keycombo action="simul">&Alt;<keycap>Space</keycap></keycombo> </term> 
+<listitem> 
+<para>This key binding jumps to the next unread article. The sequence follows the order of articles in the article view; threads are opened if necessary.</para>
+</listitem> 
+</varlistentry> 
 <varlistentry>
-<term
->Next unread thread <keycombo action="simul"
->&Ctrl;<keycap
->Space</keycap
-></keycombo
-> </term
-> 
-<listitem
-> 
-<para
->This command jumps to the next thread containing unread articles: the first unread article is then selected and shown. The sequence follows the order of articles in the article view.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
->Next article <keycap
->N</keycap
-> </term
-> 
-<listitem
-> 
-<para
->This command jumps to the next article; the sequence follows the order of articles in the article view. Replies in closed threads are ignored.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
->Previous article <keycap
->B</keycap
-></term
-> 
-<listitem
-> 
-<para
->This command jumps to the previous article in the group; the sequence follows the order of articles in the article view. Replies in closed threads are ignored.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
->Next group <keycap
-> +</keycap
-> </term
-> 
-<listitem
-> 
-<para
->This command jumps to the next newsgroup; the sequence follows the order of newsgroups in the folder view.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
->Previous group <keycap
->-</keycap
-> </term
-> 
-<listitem
-> 
-<para
->This command jumps to the previous newsgroup; the sequence follows the order of newsgroups in the folder view.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-</variablelist
-> 
-</sect4
-> 
-
-<sect4
-> 
-<title
->Sorting and Filtering of Articles</title
-> 
-
-<para
->Some newsgroups are very crowded and contain lots of articles; perhaps only some of them are interesting to you. One possibility to keep track of the news you are interested in is to sort your articles with a certain criterion.</para>
-
-<para
->Sorting your articles, and choosing sorting criteria, is done with the column titles in the article view: clicking on a column title makes it the current sorting criterion; another click on the same column title changes the order of sorting.</para>
-
-<tip
-> 
-<para
->The current sorting criterion is indicated with an arrow next to the title; this gives you an easy sign which column is used for sorting, too. You have to make the column wide enough, though, so you can actually see the arrow; you can change the column width by moving the mouse pointer on the small area between two column titles: the pointer changes its appearance to two horizontal arrows; clicking and holding the &LMB; mouse button now allows you to change the width of the column to the left of the mouse pointer.</para>
+<term>Next unread thread <keycombo action="simul">&Ctrl;<keycap>Space</keycap></keycombo> </term> 
+<listitem> 
+<para>This command jumps to the next thread containing unread articles: the first unread article is then selected and shown. The sequence follows the order of articles in the article view.</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term>Next article <keycap>N</keycap> </term> 
+<listitem> 
+<para>This command jumps to the next article; the sequence follows the order of articles in the article view. Replies in closed threads are ignored.</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term>Previous article <keycap>B</keycap></term> 
+<listitem> 
+<para>This command jumps to the previous article in the group; the sequence follows the order of articles in the article view. Replies in closed threads are ignored.</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term>Next group <keycap> +</keycap> </term> 
+<listitem> 
+<para>This command jumps to the next newsgroup; the sequence follows the order of newsgroups in the folder view.</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term>Previous group <keycap>-</keycap> </term> 
+<listitem> 
+<para>This command jumps to the previous newsgroup; the sequence follows the order of newsgroups in the folder view.</para> 
+</listitem> 
+</varlistentry> 
+</variablelist> 
+</sect4> 
+
+<sect4> 
+<title>Sorting and Filtering of Articles</title> 
+
+<para>Some newsgroups are very crowded and contain lots of articles; perhaps only some of them are interesting to you. One possibility to keep track of the news you are interested in is to sort your articles with a certain criterion.</para>
+
+<para>Sorting your articles, and choosing sorting criteria, is done with the column titles in the article view: clicking on a column title makes it the current sorting criterion; another click on the same column title changes the order of sorting.</para>
+
+<tip> 
+<para>The current sorting criterion is indicated with an arrow next to the title; this gives you an easy sign which column is used for sorting, too. You have to make the column wide enough, though, so you can actually see the arrow; you can change the column width by moving the mouse pointer on the small area between two column titles: the pointer changes its appearance to two horizontal arrows; clicking and holding the &LMB; mouse button now allows you to change the width of the column to the left of the mouse pointer.</para>
 </tip>
 
-<para
->&knode; gives you the possibility to reduce the flood of articles: you can show only articles fitting specific criteria; &knode; uses filters for this task. In the following paragraphs we are just dealing with the predefined filters; for defining and using your own filters please refer to the <link linkend="using-filters"
->Defining and using Filters</link
-> chapter.</para>
-
-<para
->Normally you will read most articles only once, and then never again. &knode; labels the articles which are unread, but when there are more articles in a news group than can be shown by the article view you often have to search for unread articles: it would be much easier to see only the new fetched and unread articles; &knode; gives you this feature by the predefined filters.</para
-> 
-
-<para
->In the status line at the bottom border of your main window next to the word <guilabel
->Filter</guilabel
-> the actually-active filter is shown: if you do not change the filter configuration this is the filter <guilabel
->all</guilabel
->; this means all articles of a newsgroup are shown. <guilabel
->all</guilabel
-> is one of the predefined filters; there are eight of them in all, which are described in more detail here.</para
-> 
-
-<variablelist
-> 
-<varlistentry
-> 
-<term
-> 
-<guilabel
->All</guilabel
-> 
-</term
-> 
-<listitem
-> 
-<para
->This filter is the default setting; it shows all articles in a newsgroup. You can choose this filter by selecting <menuchoice
-><guimenu
->View</guimenu
-><guisubmenu
->Filter</guisubmenu
-><guimenuitem
->All</guimenuitem
-></menuchoice
-></para>
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
->Unread</term
-> 
-<listitem
-> 
-<para
->This filter shows only unread articles; you can choose this filter by selecting <menuchoice
-><guimenu
->View</guimenu
-><guisubmenu
->Filter</guisubmenu
-><guimenuitem
->Unread</guimenuitem
-></menuchoice
-></para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
->New</term
-> 
-<listitem
-> 
-<para
->This filter shows only articles fetched during the last connection; you can choose this filter by selecting <menuchoice
-><guimenu
->View</guimenu
-><guisubmenu
->Filter</guisubmenu
-><guimenuitem
->New</guimenuitem
-></menuchoice
-></para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
->Watched</term
-> 
-<listitem
-> 
-<para
->This shows only threads chosen as watched threads by you; you may be watching a thread because, for example, you are participating in it, or because you are particularly interested in the answers. You can choose this filter by selecting <menuchoice
-><guimenu
->View</guimenu
-><guisubmenu
->Filter</guisubmenu
-><guimenuitem
->Watched</guimenuitem
-></menuchoice
-></para
-> 
-
-<para
->This filter only shows something if have you selected one or more threads to watch; you can achieve this by selecting <menuchoice
-><guimenu
->Article</guimenu
-><guisubmenu
->Thread</guisubmenu
-><guimenuitem
->Watch</guimenuitem
-></menuchoice
->: next to the subject a symbol will appear, showing a pair of eyes.</para>
-
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
->Threads With Unread</term
-> 
-<listitem
-> 
-<para
->This filter shows only threads containing unread articles; you can choose this filter by selecting <menuchoice
-><guimenu
->View</guimenu
-><guisubmenu
->Filter</guisubmenu
-> <guimenuitem
->Threads With Unread</guimenuitem
-></menuchoice
-></para>
-
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
->Threads With New</term
-> 
-<listitem
-> 
-<para
->This filter shows only threads with newly-fetched articles; you can choose this filter by selecting <menuchoice
-><guimenu
->View</guimenu
-><guisubmenu
->Filter</guisubmenu
-><guimenuitem
->Threads With New</guimenuitem
-></menuchoice
-></para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
->Own articles</term
-> 
-<listitem
-> 
-<para
->This filter only articles you have published; you can choose this filter by selecting <menuchoice
-><guimenu
->View</guimenu
-><guisubmenu
->Filter</guisubmenu
-><guimenuitem
->Own Articles</guimenuitem
-></menuchoice
-></para
-> 
-
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
->Threads With Own Articles</term
-> 
-<listitem
-> 
-<para
->This filter only shows threads containing articles you have published; you can choose this filter by selecting <menuchoice
-><guimenu
->View</guimenu
-> <guisubmenu
->Filter</guisubmenu
-><guimenuitem
->Own Articles</guimenuitem
-></menuchoice
-></para>
+<para>&knode; gives you the possibility to reduce the flood of articles: you can show only articles fitting specific criteria; &knode; uses filters for this task. In the following paragraphs we are just dealing with the predefined filters; for defining and using your own filters please refer to the <link linkend="using-filters">Defining and using Filters</link> chapter.</para>
+
+<para>Normally you will read most articles only once, and then never again. &knode; labels the articles which are unread, but when there are more articles in a news group than can be shown by the article view you often have to search for unread articles: it would be much easier to see only the new fetched and unread articles; &knode; gives you this feature by the predefined filters.</para> 
+
+<para>In the status line at the bottom border of your main window next to the word <guilabel>Filter</guilabel> the actually-active filter is shown: if you do not change the filter configuration this is the filter <guilabel>all</guilabel>; this means all articles of a newsgroup are shown. <guilabel>all</guilabel> is one of the predefined filters; there are eight of them in all, which are described in more detail here.</para> 
+
+<variablelist> 
+<varlistentry> 
+<term> 
+<guilabel>All</guilabel> 
+</term> 
+<listitem> 
+<para>This filter is the default setting; it shows all articles in a newsgroup. You can choose this filter by selecting <menuchoice><guimenu>View</guimenu><guisubmenu>Filter</guisubmenu><guimenuitem>All</guimenuitem></menuchoice></para>
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term>Unread</term> 
+<listitem> 
+<para>This filter shows only unread articles; you can choose this filter by selecting <menuchoice><guimenu>View</guimenu><guisubmenu>Filter</guisubmenu><guimenuitem>Unread</guimenuitem></menuchoice></para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term>New</term> 
+<listitem> 
+<para>This filter shows only articles fetched during the last connection; you can choose this filter by selecting <menuchoice><guimenu>View</guimenu><guisubmenu>Filter</guisubmenu><guimenuitem>New</guimenuitem></menuchoice></para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term>Watched</term> 
+<listitem> 
+<para>This shows only threads chosen as watched threads by you; you may be watching a thread because, for example, you are participating in it, or because you are particularly interested in the answers. You can choose this filter by selecting <menuchoice><guimenu>View</guimenu><guisubmenu>Filter</guisubmenu><guimenuitem>Watched</guimenuitem></menuchoice></para> 
+
+<para>This filter only shows something if have you selected one or more threads to watch; you can achieve this by selecting <menuchoice><guimenu>Article</guimenu><guisubmenu>Thread</guisubmenu><guimenuitem>Watch</guimenuitem></menuchoice>: next to the subject a symbol will appear, showing a pair of eyes.</para>
+
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term>Threads With Unread</term> 
+<listitem> 
+<para>This filter shows only threads containing unread articles; you can choose this filter by selecting <menuchoice><guimenu>View</guimenu><guisubmenu>Filter</guisubmenu> <guimenuitem>Threads With Unread</guimenuitem></menuchoice></para>
+
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term>Threads With New</term> 
+<listitem> 
+<para>This filter shows only threads with newly-fetched articles; you can choose this filter by selecting <menuchoice><guimenu>View</guimenu><guisubmenu>Filter</guisubmenu><guimenuitem>Threads With New</guimenuitem></menuchoice></para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term>Own articles</term> 
+<listitem> 
+<para>This filter only articles you have published; you can choose this filter by selecting <menuchoice><guimenu>View</guimenu><guisubmenu>Filter</guisubmenu><guimenuitem>Own Articles</guimenuitem></menuchoice></para> 
+
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term>Threads With Own Articles</term> 
+<listitem> 
+<para>This filter only shows threads containing articles you have published; you can choose this filter by selecting <menuchoice><guimenu>View</guimenu> <guisubmenu>Filter</guisubmenu><guimenuitem>Own Articles</guimenuitem></menuchoice></para>
 </listitem>
  
-</varlistentry
-> 
-</variablelist
-> 
-
-<tip
-> 
-<para
->For everyday use the <guilabel
->unread</guilabel
-> filter is propably the most useful: it shows all unread articles, including the old ones. The other filters are very task-specific and are seldom used; in the end it is a matter of taste which filter to select.</para
-> 
-</tip
-> 
-</sect4
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
->The Article Window</title
-> 
-
-<para
->The article window shows the currently-selected article. You can scroll in it like in a normal text editor window; the difference is that you cannot change the article &mdash; it is for reading only.</para
-> 
-
-<para
->By pressing the &RMB; in the article viewer you can access the important functions in the context menu very quickly.</para
-> 
-
-<para
->The window itself is divided in three areas; they are explained in more detail now.</para
-> 
-
-<sect4
-> 
-<title
->The Header</title
-> 
-
-<para
->This part shows the header lines or a part of the header. You will recognize some information here from the article view; for example, the subject and the address or name where the article originated. When you click on the <guilabel
->From:</guilabel
-> address, &knode; opens an editor window where the email address of the author and the subject of the referring article are already filled in for you; this enables you to reply to the author directly from their article.</para
-> 
-
-<para
->The appearance and content of the header shown by default can be configured by choosing <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configuring KNode...</guimenuitem
-><guilabel
->Reading News</guilabel
-><guilabel
->Headers</guilabel
-></menuchoice
->; you can find a more-detailed view on this in <link linkend="anc-knode-headers"
->Configuring the Shown Headers</link
->.</para
-> 
-
-<para
->By selecting <menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Show all headers</guimenuitem
-></menuchoice
-> you force &knode; to show the whole header as is produced by the newsreader and newsservers; normally you do not need this view: it needs a lot of space in the article window.</para>
-
-<para
->The last lines of the header contain, if necessary, some references to other articles, shown as numbers in the range from 1 to n. These References are the articles to which the current article refers: the article labeled with 1 is the oldest article to which this article refers; the article with the highest number is the most-recent article to which the current article refers.</para>
-
-<para
->When you click on a reference the corresponding article is loaded and shown in the article view; if the article is no longer available you will be informed by &knode;. This will happen if the article has been deleted by the article management of &knode; due to its age, or your news server decided to delete it from the newsgroup; for details on how to get such an article, please refer to the <link linkend="faq"
->Frequently Asked Questions</link
->.</para
-> 
-
-<tip
-> 
-<para
->The first lines in an article, with the subject and author information and so on, are called <glossterm
->headers</glossterm
->.</para
-> 
-</tip
-> 
-</sect4
-> 
-
-<sect4
-> 
-<title
->The Body of the Article</title
-> 
-
-<para
->The body of the article follows straight after the header; it is the actual message the author published in the newsgroup. Be aware that some articles may contain quotes from other articles which are not recognisable as quotes; this depends on the news editor the author used and their article-formatting habits.</para
-> 
-
-<para
->&knode; provides some formatting which can be used by articles; at the moment the available options are:</para>
+</varlistentry> 
+</variablelist> 
+
+<tip> 
+<para>For everyday use the <guilabel>unread</guilabel> filter is propably the most useful: it shows all unread articles, including the old ones. The other filters are very task-specific and are seldom used; in the end it is a matter of taste which filter to select.</para> 
+</tip> 
+</sect4> 
+</sect3> 
+
+<sect3> 
+<title>The Article Window</title> 
+
+<para>The article window shows the currently-selected article. You can scroll in it like in a normal text editor window; the difference is that you cannot change the article &mdash; it is for reading only.</para> 
+
+<para>By pressing the &RMB; in the article viewer you can access the important functions in the context menu very quickly.</para> 
+
+<para>The window itself is divided in three areas; they are explained in more detail now.</para> 
+
+<sect4> 
+<title>The Header</title> 
+
+<para>This part shows the header lines or a part of the header. You will recognize some information here from the article view; for example, the subject and the address or name where the article originated. When you click on the <guilabel>From:</guilabel> address, &knode; opens an editor window where the email address of the author and the subject of the referring article are already filled in for you; this enables you to reply to the author directly from their article.</para> 
+
+<para>The appearance and content of the header shown by default can be configured by choosing <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configuring KNode...</guimenuitem><guilabel>Reading News</guilabel><guilabel>Headers</guilabel></menuchoice>; you can find a more-detailed view on this in <link linkend="anc-knode-headers">Configuring the Shown Headers</link>.</para> 
+
+<para>By selecting <menuchoice><guimenu>View</guimenu><guimenuitem>Show all headers</guimenuitem></menuchoice> you force &knode; to show the whole header as is produced by the newsreader and newsservers; normally you do not need this view: it needs a lot of space in the article window.</para>
+
+<para>The last lines of the header contain, if necessary, some references to other articles, shown as numbers in the range from 1 to n. These References are the articles to which the current article refers: the article labeled with 1 is the oldest article to which this article refers; the article with the highest number is the most-recent article to which the current article refers.</para>
+
+<para>When you click on a reference the corresponding article is loaded and shown in the article view; if the article is no longer available you will be informed by &knode;. This will happen if the article has been deleted by the article management of &knode; due to its age, or your news server decided to delete it from the newsgroup; for details on how to get such an article, please refer to the <link linkend="faq">Frequently Asked Questions</link>.</para> 
+
+<tip> 
+<para>The first lines in an article, with the subject and author information and so on, are called <glossterm>headers</glossterm>.</para> 
+</tip> 
+</sect4> 
+
+<sect4> 
+<title>The Body of the Article</title> 
+
+<para>The body of the article follows straight after the header; it is the actual message the author published in the newsgroup. Be aware that some articles may contain quotes from other articles which are not recognisable as quotes; this depends on the news editor the author used and their article-formatting habits.</para> 
+
+<para>&knode; provides some formatting which can be used by articles; at the moment the available options are:</para>
 
 <simplelist>
-<member
->/italic/</member
-> 
-<member
->*bold*</member
-> 
-<member
->_underlined_</member
-> 
-</simplelist
-> 
-
-<para
->Do not use the highlighting too often; the impact decreases the more it is used.</para
-> 
-
-<tip
-> 
-<para
->The main part of the message (the contents) is called the <glossterm
->body</glossterm
->.</para
-> 
-</tip
-> 
-
-<para
->Most of the time a quote is indicated by a prefixed &gt; on every line; however, there are other possible signs. If you can not directly recognize a quote the author did not obey the rules of proper quoting.</para
-> 
-
-<para
->Also, it is usual to start an answer with a introductionary line, something like:</para>
-
-<informalexample
-> 
-<para
->On 12/25/2000 Santa Claus wrote:</para
-> 
-</informalexample
-> 
-
-<tip
-> 
-<para
->Normally you do not have to concern yourself with these introductionary lines: &knode; does this automatically when you reply to an article; to find out how to customize this line see <link linkend="knode-composer-settings"
->The Composer Settings</link
-> documentation. </para
-> 
-</tip
-> 
-
-<para
->In <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-><guilabel
->Reading News</guilabel
-><guilabel
->Appearance</guilabel
-></menuchoice
-> you can choose how the articles are shown. In particular, &knode; provides the smart coloring of different reply levels; you can read more about this in the chapter <link linkend="knode-appearance"
->Configuring the appearance</link
->.</para
-> 
-
-<caution
-> 
-<para
->&knode; only supports the colouring of quotes if the quoting lines starts with special characters; you can configure these characters at <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-><guilabel
->Reading News</guilabel
-><guilabel
->Viewer</guilabel
-></menuchoice
->.</para>
-</caution
-> 
-
-<para
->When the body of an article contains links to internet addresses you can invoke an internet browser to display the web page it links to by clicking on the link; details about configuring this feature can be found in <link linkend="setting-news-general"
->General news settings</link
->.</para>
-
-</sect4
-> 
-
-<sect4
-> 
-<title
->The Signature</title
-> 
-
-<para
->Below the main text of an article you can find the signature of the author, provided you did not disable signatures in <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-><guilabel
->Reading News</guilabel
-><guilabel
->General</guilabel
-></menuchoice
->. The signature is divided from the text by thin horizontal line.</para
-> 
-</sect4
-> 
+<member>/italic/</member> 
+<member>*bold*</member> 
+<member>_underlined_</member> 
+</simplelist> 
+
+<para>Do not use the highlighting too often; the impact decreases the more it is used.</para> 
+
+<tip> 
+<para>The main part of the message (the contents) is called the <glossterm>body</glossterm>.</para> 
+</tip> 
+
+<para>Most of the time a quote is indicated by a prefixed &gt; on every line; however, there are other possible signs. If you can not directly recognize a quote the author did not obey the rules of proper quoting.</para> 
+
+<para>Also, it is usual to start an answer with a introductionary line, something like:</para>
+
+<informalexample> 
+<para>On 12/25/2000 Santa Claus wrote:</para> 
+</informalexample> 
+
+<tip> 
+<para>Normally you do not have to concern yourself with these introductionary lines: &knode; does this automatically when you reply to an article; to find out how to customize this line see <link linkend="knode-composer-settings">The Composer Settings</link> documentation. </para> 
+</tip> 
+
+<para>In <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem><guilabel>Reading News</guilabel><guilabel>Appearance</guilabel></menuchoice> you can choose how the articles are shown. In particular, &knode; provides the smart coloring of different reply levels; you can read more about this in the chapter <link linkend="knode-appearance">Configuring the appearance</link>.</para> 
+
+<caution> 
+<para>&knode; only supports the colouring of quotes if the quoting lines starts with special characters; you can configure these characters at <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem><guilabel>Reading News</guilabel><guilabel>Viewer</guilabel></menuchoice>.</para>
+</caution> 
+
+<para>When the body of an article contains links to internet addresses you can invoke an internet browser to display the web page it links to by clicking on the link; details about configuring this feature can be found in <link linkend="setting-news-general">General news settings</link>.</para>
+
+</sect4> 
+
+<sect4> 
+<title>The Signature</title> 
+
+<para>Below the main text of an article you can find the signature of the author, provided you did not disable signatures in <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem><guilabel>Reading News</guilabel><guilabel>General</guilabel></menuchoice>. The signature is divided from the text by thin horizontal line.</para> 
+</sect4> 
 
 
 <sect4>
-<title
->Attachments and Multipart <acronym
->MIME</acronym
-> messages</title
-> 
-
-<para
->If an article contains attachments they are shown below the signature in a table.</para
-> 
-
-<para
->The multipart <acronym
->MIME</acronym
-> format allows the body of an article to be sent in more than one format; for example, in plain-text and in <acronym
->HTML</acronym
->. It depends on the newsreader which format is used for reading the article.</para
-> 
-
-<para
->&knode; allows the different formats to be shown by selecting <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-><guilabel
->Reading News</guilabel
-><guilabel
->Viewer</guilabel
-><guilabel
->Show alternative contents as attachments</guilabel
-></menuchoice
->; when this option is checked all alternative formats are shown as attachments and can be opened and viewed.</para
-> 
-
-<para
->If this option is unchecked you will not be shown the different text formats and &knode; decides which one should be shown.</para>
-
-</sect4
-> 
-</sect3
-> 
-</sect2
-> 
-
-<sect2 id="post-and-mail-news"
-> 
-<title
->Writing and Replying to Articles</title
-> 
-
-<para
->Before you start writing articles or replying to other Usenet users be sure you understand the habits of the current newsgroup; again, reading <link linkend="knode-journey"
->A Journey Through Usenet</link
-> would be a good idea.</para>
-
-<para
->For testing the settings of &knode; please resist sending an article to a random newsgroup; it is not very friendly to bother people with test articles: what if you are subscribed to a newsgroup and half of its articles only contain the word <quote
->test</quote
->? It is like somebody calling you just to testing their phone.</para
-> 
-
-<para
->This is the reason for the special groups having <quote
->test</quote
-> in their name; for example, <emphasis
->alt.test</emphasis
->. In these groups you can test everything you want without bothering anybody; some groups even send you error messages back.</para
-> 
-
-<para
->Here you can easily identify obvious mistakes, like a missing or a wrong e-mail address or a wrongly-configured charset which doesn't show all special characters.</para
-> 
-
-<para
->You can find a selection of test groups in <link linkend="infos-testgroups"
->Test Groups</link
->.</para
-> 
-
-<para
->Subscribe to one of the test groups now; some news servers have their own test groups, which are probably less crowded.</para>
+<title>Attachments and Multipart <acronym>MIME</acronym> messages</title> 
+
+<para>If an article contains attachments they are shown below the signature in a table.</para> 
+
+<para>The multipart <acronym>MIME</acronym> format allows the body of an article to be sent in more than one format; for example, in plain-text and in <acronym>HTML</acronym>. It depends on the newsreader which format is used for reading the article.</para> 
+
+<para>&knode; allows the different formats to be shown by selecting <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem><guilabel>Reading News</guilabel><guilabel>Viewer</guilabel><guilabel>Show alternative contents as attachments</guilabel></menuchoice>; when this option is checked all alternative formats are shown as attachments and can be opened and viewed.</para> 
+
+<para>If this option is unchecked you will not be shown the different text formats and &knode; decides which one should be shown.</para>
+
+</sect4> 
+</sect3> 
+</sect2> 
+
+<sect2 id="post-and-mail-news"> 
+<title>Writing and Replying to Articles</title> 
+
+<para>Before you start writing articles or replying to other Usenet users be sure you understand the habits of the current newsgroup; again, reading <link linkend="knode-journey">A Journey Through Usenet</link> would be a good idea.</para>
+
+<para>For testing the settings of &knode; please resist sending an article to a random newsgroup; it is not very friendly to bother people with test articles: what if you are subscribed to a newsgroup and half of its articles only contain the word <quote>test</quote>? It is like somebody calling you just to testing their phone.</para> 
+
+<para>This is the reason for the special groups having <quote>test</quote> in their name; for example, <emphasis>alt.test</emphasis>. In these groups you can test everything you want without bothering anybody; some groups even send you error messages back.</para> 
+
+<para>Here you can easily identify obvious mistakes, like a missing or a wrong e-mail address or a wrongly-configured charset which doesn't show all special characters.</para> 
+
+<para>You can find a selection of test groups in <link linkend="infos-testgroups">Test Groups</link>.</para> 
+
+<para>Subscribe to one of the test groups now; some news servers have their own test groups, which are probably less crowded.</para>
  
-<tip
-> 
-<para
->Remember, you have to download the articles of the new subscribed group; this may take some time if there are many articles in the group. The only important articles are yours and the answers by the check handler; if you want to reduce the number of articles fetched during the test you can configure this in <menuchoice
-><guimenu
->Settings</guimenu
-><guilabel
->Configure KNode...</guilabel
-><guilabel
->Reading News</guilabel
-><guilabel
->General</guilabel
-><guilabel
->Maximal number of articles to fetch</guilabel
-></menuchoice
->: if you reduce this dramatically, you should not wait too long to fetch the new articles after sending your test article; however, if it set too low your article might not be fetched. A tolerably-fast news server should provide your article right after you sent it; you might, however, have to wait a while, at worst 1 or 2 days. Feel free to send another article if cannot see your initial one; this is what the test groups are for.</para
-> 
-</tip
-> 
+<tip> 
+<para>Remember, you have to download the articles of the new subscribed group; this may take some time if there are many articles in the group. The only important articles are yours and the answers by the check handler; if you want to reduce the number of articles fetched during the test you can configure this in <menuchoice><guimenu>Settings</guimenu><guilabel>Configure KNode...</guilabel><guilabel>Reading News</guilabel><guilabel>General</guilabel><guilabel>Maximal number of articles to fetch</guilabel></menuchoice>: if you reduce this dramatically, you should not wait too long to fetch the new articles after sending your test article; however, if it set too low your article might not be fetched. A tolerably-fast news server should provide your article right after you sent it; you might, however, have to wait a while, at worst 1 or 2 days. Feel free to send another article if cannot see your initial one; this is what the test groups are for.</para> 
+</tip> 
 
 <caution>
-<para
->When you are using a local news server the configuration of <guilabel
->Maximal number of articles to fetch</guilabel
-> in &knode; is probably unnecessary; you should consult the documentation of your news server instead.</para
-> 
+<para>When you are using a local news server the configuration of <guilabel>Maximal number of articles to fetch</guilabel> in &knode; is probably unnecessary; you should consult the documentation of your news server instead.</para> 
 </caution>
 
-<para
->If you did not encounter any errors unsubscribe from the test groups and set <guilabel
->Maximum number of articles to fetch</guilabel
-> back to normal (1000).</para
-> 
-
-<sect3
-> 
-<title
->Publishing Articles</title
-> 
-
-<para
->You have seen most of &knode; now, but have only used it passively so far, so let's publish a test article now. Select the new subscribed test group in the folder view; then, with <menuchoice
-><guimenu
->Article</guimenu
-><guimenuitem
->Post to newsgroup...</guimenuitem
-></menuchoice
->or the key <keycap
->P</keycap
->, the Editor will be opened.</para
-> 
-
-<para
->You can use the &knode; Editor like a normal Texteditor; there are some additional features for writing news articles though.</para
-> 
-
-<para
->In the editor window there are two input lines: one for the subject, which is empty at the moment; and another for the newsgroups this article is going to be posted to.</para
-> 
-
-<para
->Enter the text <userinput
->This is a test</userinput
-> in the subject field.</para
-> 
-
-<tip
-> 
-<para
->Normally, when you post an article, use a descriptive subject. Articles without a descriptive subject are often ignored. Avoid subjects like <quote
->Help, it doesn't work !!!!!</quote
-> This subject gives no information about the content of your article.</para
-> 
-</tip
-> 
-
-<para
->The <guilabel
->Groups:</guilabel
-> field already contains the test newsgroup you selected before; do not change this.</para
-> 
-
-<para
->Below the input field for the <glossterm
->newsgroup</glossterm
-> there is another inactive option field: this function is explained later in the chapter <link linkend="knode-editor-advanced"
->The editor</link
->; for now it is irrelevant.</para
-> 
-
-<para
->For simplicity reasons we will only use a simple sentence; type:</para>
+<para>If you did not encounter any errors unsubscribe from the test groups and set <guilabel>Maximum number of articles to fetch</guilabel> back to normal (1000).</para> 
+
+<sect3> 
+<title>Publishing Articles</title> 
+
+<para>You have seen most of &knode; now, but have only used it passively so far, so let's publish a test article now. Select the new subscribed test group in the folder view; then, with <menuchoice><guimenu>Article</guimenu><guimenuitem>Post to newsgroup...</guimenuitem></menuchoice>or the key <keycap>P</keycap>, the Editor will be opened.</para> 
+
+<para>You can use the &knode; Editor like a normal Texteditor; there are some additional features for writing news articles though.</para> 
+
+<para>In the editor window there are two input lines: one for the subject, which is empty at the moment; and another for the newsgroups this article is going to be posted to.</para> 
+
+<para>Enter the text <userinput>This is a test</userinput> in the subject field.</para> 
+
+<tip> 
+<para>Normally, when you post an article, use a descriptive subject. Articles without a descriptive subject are often ignored. Avoid subjects like <quote>Help, it doesn't work !!!!!</quote> This subject gives no information about the content of your article.</para> 
+</tip> 
+
+<para>The <guilabel>Groups:</guilabel> field already contains the test newsgroup you selected before; do not change this.</para> 
+
+<para>Below the input field for the <glossterm>newsgroup</glossterm> there is another inactive option field: this function is explained later in the chapter <link linkend="knode-editor-advanced">The editor</link>; for now it is irrelevant.</para> 
+
+<para>For simplicity reasons we will only use a simple sentence; type:</para>
  
-<screen
-><userinput
->This is the body of my test article. @ $ %</userinput
-> 
-</screen
-> 
-
-<para
->Then, enter an empty line, followed by:</para>
+<screen><userinput>This is the body of my test article. @ $ %</userinput> 
+</screen> 
+
+<para>Then, enter an empty line, followed by:</para>
  
-<screen
-><userinput
->Did it work?</userinput
-> 
-</screen
-> 
-
-<para
->This may look funny to you, but it does what it is supposed to do &mdash; test your configuration..</para
-> 
-
-<para
->Your article should now look like the screenshot below:</para
-> 
-
-<screenshot
-> 
-<screeninfo
->Your first article</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-new-article.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->Your first article</phrase
-> 
-</textobject
-> 
-<caption
-> 
-<para
->Your first article</para
-> 
-</caption
-> 
-</mediaobject
-> 
-</screenshot
-> 
-
-<para
->If you are using &knode; with a local newsserver choose <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Send Now</guimenuitem
-></menuchoice
-> in the Editor; if you do not have a connection to a newsserver at this point, you may want to send the article later &mdash; you can achieve this by using <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Send Later</guimenuitem
-></menuchoice
-> &mdash; &knode; then stores this article in the folder <guilabel
->Outbox</guilabel
->. You can start sending the articles in the <guilabel
->Outbox</guilabel
-> manually by selecting <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Send pending messages</guimenuitem
-></menuchoice
->.</para
-> 
-
-<para
->After sending the article you will notice &knode; stores a copy in the <guilabel
->Sent</guilabel
-> folder.</para
-> 
-
-<para
->Depending on how fast your article is published in the according newsgroup you can check the result after some time: mostly it is sufficient to check for new messages immediately after sending the article; be patient, though, it <emphasis
->may</emphasis
-> take the article some hours before reaching the newsgroup. If the article does not arrive after a number of hours it is likely that something went wrong: try again; then, if it is still not working, have a look at the <link linkend="faq"
->Frequently Asked Questions</link
->.</para
-> 
-
-<important
-> 
-<para
->Even when you are using a local news server, you have to check for new articles: the local news server just sends the article, it does not store it in the local newsgroup, so you have to synchronize with an external news server if you want to see if your test article has arrived.</para
-> 
-</important
-> 
-
-<para
->If the <glossterm
->article</glossterm
-> appears in the newsgroup you are successful; now you should check if there is the correct sender and if the article is readable. Have a look on your language-specific characters like the German umlauts; if they are not readable you have to change the coding at <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-><guilabel
->Posting News</guilabel
-><guilabel
->Technical</guilabel
-></menuchoice
->to <guilabel
->Allow 8-bit</guilabel
->. Change this and repeat your test.</para
-> 
-
-<para
->If everything is right you have successfully published your first article in usenet with &knode;.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
->Post Reply</title
-> 
-
-<para
->After successfully publishing an article we will now answer to your own article. You want to answer the question you asked, don't you?</para
-> 
-
-<para
->Select your article in the article view and press the &RMB;: a context menu will appear; choose <guimenuitem
->Followup to newsgroup</guimenuitem
->.</para
-> 
-
-<para
->&knode; opens the Editor again, but this time there is already a subject filled in for you. The subject line reads:</para>
+<screen><userinput>Did it work?</userinput> 
+</screen> 
+
+<para>This may look funny to you, but it does what it is supposed to do &mdash; test your configuration..</para> 
+
+<para>Your article should now look like the screenshot below:</para> 
+
+<screenshot> 
+<screeninfo>Your first article</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-new-article.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>Your first article</phrase> 
+</textobject> 
+<caption> 
+<para>Your first article</para> 
+</caption> 
+</mediaobject> 
+</screenshot> 
+
+<para>If you are using &knode; with a local newsserver choose <menuchoice><guimenu>File</guimenu><guimenuitem>Send Now</guimenuitem></menuchoice> in the Editor; if you do not have a connection to a newsserver at this point, you may want to send the article later &mdash; you can achieve this by using <menuchoice><guimenu>File</guimenu><guimenuitem>Send Later</guimenuitem></menuchoice> &mdash; &knode; then stores this article in the folder <guilabel>Outbox</guilabel>. You can start sending the articles in the <guilabel>Outbox</guilabel> manually by selecting <menuchoice><guimenu>File</guimenu><guimenuitem>Send pending messages</guimenuitem></menuchoice>.</para> 
+
+<para>After sending the article you will notice &knode; stores a copy in the <guilabel>Sent</guilabel> folder.</para> 
+
+<para>Depending on how fast your article is published in the according newsgroup you can check the result after some time: mostly it is sufficient to check for new messages immediately after sending the article; be patient, though, it <emphasis>may</emphasis> take the article some hours before reaching the newsgroup. If the article does not arrive after a number of hours it is likely that something went wrong: try again; then, if it is still not working, have a look at the <link linkend="faq">Frequently Asked Questions</link>.</para> 
+
+<important> 
+<para>Even when you are using a local news server, you have to check for new articles: the local news server just sends the article, it does not store it in the local newsgroup, so you have to synchronize with an external news server if you want to see if your test article has arrived.</para> 
+</important> 
+
+<para>If the <glossterm>article</glossterm> appears in the newsgroup you are successful; now you should check if there is the correct sender and if the article is readable. Have a look on your language-specific characters like the German umlauts; if they are not readable you have to change the coding at <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem><guilabel>Posting News</guilabel><guilabel>Technical</guilabel></menuchoice>to <guilabel>Allow 8-bit</guilabel>. Change this and repeat your test.</para> 
+
+<para>If everything is right you have successfully published your first article in usenet with &knode;.</para> 
+
+</sect3> 
+
+<sect3> 
+<title>Post Reply</title> 
+
+<para>After successfully publishing an article we will now answer to your own article. You want to answer the question you asked, don't you?</para> 
+
+<para>Select your article in the article view and press the &RMB;: a context menu will appear; choose <guimenuitem>Followup to newsgroup</guimenuitem>.</para> 
+
+<para>&knode; opens the Editor again, but this time there is already a subject filled in for you. The subject line reads:</para>
  
-<screen
-><computeroutput
->Re: This is a test</computeroutput
-> 
-</screen
-> 
-
-<para
-><emphasis
->Re:</emphasis
-> is a shortcut for the Latin <quote
->In re</quote
->, which translates to something along the lines of <quote
->relating to</quote
->. You should not change the subject and, above all, the <emphasis
->Re:</emphasis
->: most newsreaders sort threads by the subject.</para
-> 
-
-<tip
-> 
-<para
->If you want to change the subject for some reason put the new subject in front of the old and replace the Re: with a bracketed (Was: ... ); in our example this would look like </para>
-
-<informalexample
-> 
-<para
->A new subject! (Was: This is a test)</para
-> 
-</informalexample
-> 
-
-<para
->With this kind of subject you show the other readers there is a branch in the original discussion; this happens, for example, when a new topic occurs in the original discussion or the original subject has changed for some reason.</para
-> 
-
-<para
->If you answer to an article with such a subject, delete the bracketed part of the subject; the first part with a prefixed <emphasis
->Re:</emphasis
-> remains.</para>
+<screen><computeroutput>Re: This is a test</computeroutput> 
+</screen> 
+
+<para><emphasis>Re:</emphasis> is a shortcut for the Latin <quote>In re</quote>, which translates to something along the lines of <quote>relating to</quote>. You should not change the subject and, above all, the <emphasis>Re:</emphasis>: most newsreaders sort threads by the subject.</para> 
+
+<tip> 
+<para>If you want to change the subject for some reason put the new subject in front of the old and replace the Re: with a bracketed (Was: ... ); in our example this would look like </para>
+
+<informalexample> 
+<para>A new subject! (Was: This is a test)</para> 
+</informalexample> 
+
+<para>With this kind of subject you show the other readers there is a branch in the original discussion; this happens, for example, when a new topic occurs in the original discussion or the original subject has changed for some reason.</para> 
+
+<para>If you answer to an article with such a subject, delete the bracketed part of the subject; the first part with a prefixed <emphasis>Re:</emphasis> remains.</para>
 
 <informalexample>
-<para
->Re: A new subject!</para>
-</informalexample
-> 
-</tip
-> 
-
-<para
->Let us have look at the Editor now. The contents of the article to which we want to reply has already been copied to the Editor by &knode;; to indicate the text is a quote every line is prefixed with a <emphasis
->&gt;</emphasis
->.</para
-> 
-
-<para
->In front of the quoted text &knode; has put an introduction line: the content of this line refers to the original author; you can change the standard text of this line in <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-><guilabel
->Posting News</guilabel
-><guilabel
->Composer</guilabel
-><guilabel
->Introduction Phrase:</guilabel
-></menuchoice
->.</para
-> 
-
-<para
->The original article contains the question: <emphasis
->Did it work?</emphasis
-> We want to answer this question now.</para>
-
-<para
->Place the cursor below the quoted question and write in the next line:</para>
+<para>Re: A new subject!</para>
+</informalexample> 
+</tip> 
+
+<para>Let us have look at the Editor now. The contents of the article to which we want to reply has already been copied to the Editor by &knode;; to indicate the text is a quote every line is prefixed with a <emphasis>&gt;</emphasis>.</para> 
+
+<para>In front of the quoted text &knode; has put an introduction line: the content of this line refers to the original author; you can change the standard text of this line in <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem><guilabel>Posting News</guilabel><guilabel>Composer</guilabel><guilabel>Introduction Phrase:</guilabel></menuchoice>.</para> 
+
+<para>The original article contains the question: <emphasis>Did it work?</emphasis> We want to answer this question now.</para>
+
+<para>Place the cursor below the quoted question and write in the next line:</para>
  
-<screen
-><userinput
->Yes it worked, congratulations!</userinput
-> 
-</screen
-> 
-
-<para
->We are not finished yet: it is considered polite to begin with a greeting like <quote
->Hello</quote
-> in the first line; whether you call the author by their name or not depends on your habits, watch the newsgroup to get used to the habits there.</para
-> 
-
-<para
->Next we delete all non-mandatory parts of the quoted article; in our case, we delete all parts except the question.</para
-> 
-
-<para
->With such a short text this is unnecessary, but this just an example: if you have to read a message 100 lines long again just to find an <citation
->I agree</citation
-> at the end you will understand.... Aside from this, it makes articles smaller so they use less space on the server.</para
-> 
-
-<para
->At the end we say good bye.</para
-> 
-
-<para
->This screenshot shows our answer before sending it.</para>
-
-<screenshot
-> 
-<screeninfo
->Your answer to your article</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-followup.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->Your answer to your article</phrase
-> 
-</textobject
-> 
-<caption
-> 
-<para
->Your answer to your article</para
-> 
-</caption
-> 
-</mediaobject
-> 
-</screenshot
-> 
-
-<tip
-> 
-<para
->You can find a good guide for correct quoting at <ulink url="http://www.afaik.de/usenet/faq/zitieren"
->http://www.afaik.de/usenet/faq/zitieren</ulink
-> (German).</para
-> 
-</tip
-> 
-
-<para
->Now we still need to post our reply; like posting the original message choose <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Send now</guimenuitem
-></menuchoice
-> or the alternative <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Send later</guimenuitem
-></menuchoice
->, if you're not online at the moment and you're not using a local newsserver. If everything works you will see your article in the newsgroup after a while; easy, isn't it?</para>
+<screen><userinput>Yes it worked, congratulations!</userinput> 
+</screen> 
+
+<para>We are not finished yet: it is considered polite to begin with a greeting like <quote>Hello</quote> in the first line; whether you call the author by their name or not depends on your habits, watch the newsgroup to get used to the habits there.</para> 
+
+<para>Next we delete all non-mandatory parts of the quoted article; in our case, we delete all parts except the question.</para> 
+
+<para>With such a short text this is unnecessary, but this just an example: if you have to read a message 100 lines long again just to find an <citation>I agree</citation> at the end you will understand.... Aside from this, it makes articles smaller so they use less space on the server.</para> 
+
+<para>At the end we say good bye.</para> 
+
+<para>This screenshot shows our answer before sending it.</para>
+
+<screenshot> 
+<screeninfo>Your answer to your article</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-followup.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>Your answer to your article</phrase> 
+</textobject> 
+<caption> 
+<para>Your answer to your article</para> 
+</caption> 
+</mediaobject> 
+</screenshot> 
+
+<tip> 
+<para>You can find a good guide for correct quoting at <ulink url="http://www.afaik.de/usenet/faq/zitieren">http://www.afaik.de/usenet/faq/zitieren</ulink> (German).</para> 
+</tip> 
+
+<para>Now we still need to post our reply; like posting the original message choose <menuchoice><guimenu>File</guimenu><guimenuitem>Send now</guimenuitem></menuchoice> or the alternative <menuchoice><guimenu>File</guimenu><guimenuitem>Send later</guimenuitem></menuchoice>, if you're not online at the moment and you're not using a local newsserver. If everything works you will see your article in the newsgroup after a while; easy, isn't it?</para>
  
-<tip
-> 
-<para
->Using the <guimenu
->Options</guimenu
-> menu you can configure whether you want to send an email, a news article or both.</para>
-</tip
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
->Mail Reply</title
-> 
-
-<para
->The Mail Reply follows the same lines as posting a reply in a newsgroup; the only difference is that a mail reply is sent directly to the author and does not appear in any newsgroup.</para
-> 
-
-<para
->Sometimes it is better to use an emailed reply instead of posting a reply to newsgroup; they are used primarily for when you want to correct an error or misconduct by the author, without hurting their feelings by doing so publicly on the newsgroup.</para
-> 
-
-<para
->To answer with an e-mail select your article; again, open the context menu with the right mouse button; and choose <guimenuitem
->Reply by Email</guimenuitem
->: &knode; opens the Composer with the quoted article.</para
-> 
-
-<para
->Subject and body are identical as when posting an article but the <guilabel
->Groups:</guilabel
-> field is replaced by a <guilabel
->To:</guilabel
-> field; here the author's email address appears. In our example this should be your own email address, if &knode; is set up correctly.</para
-> 
-
-<para
->For emails the same rules for quoting and politeness apply as for posting an article in a newsgroup.</para
-> 
-
-<para
->After finishing your Reply, you can send it.</para
-> 
-
-<para
->The screenshot below shows the reply we distributed by email.</para
-> 
-
-<screenshot
-> 
-<screeninfo
->A Mail Reply</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-reply.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->A Mail Reply</phrase
-> 
-</textobject
-> 
-<caption
-> 
-<para
->A Mail Reply</para
-> 
+<tip> 
+<para>Using the <guimenu>Options</guimenu> menu you can configure whether you want to send an email, a news article or both.</para>
+</tip> 
+</sect3> 
+
+<sect3> 
+<title>Mail Reply</title> 
+
+<para>The Mail Reply follows the same lines as posting a reply in a newsgroup; the only difference is that a mail reply is sent directly to the author and does not appear in any newsgroup.</para> 
+
+<para>Sometimes it is better to use an emailed reply instead of posting a reply to newsgroup; they are used primarily for when you want to correct an error or misconduct by the author, without hurting their feelings by doing so publicly on the newsgroup.</para> 
+
+<para>To answer with an e-mail select your article; again, open the context menu with the right mouse button; and choose <guimenuitem>Reply by Email</guimenuitem>: &knode; opens the Composer with the quoted article.</para> 
+
+<para>Subject and body are identical as when posting an article but the <guilabel>Groups:</guilabel> field is replaced by a <guilabel>To:</guilabel> field; here the author's email address appears. In our example this should be your own email address, if &knode; is set up correctly.</para> 
+
+<para>For emails the same rules for quoting and politeness apply as for posting an article in a newsgroup.</para> 
+
+<para>After finishing your Reply, you can send it.</para> 
+
+<para>The screenshot below shows the reply we distributed by email.</para> 
+
+<screenshot> 
+<screeninfo>A Mail Reply</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-reply.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>A Mail Reply</phrase> 
+</textobject> 
+<caption> 
+<para>A Mail Reply</para> 
 </caption>
 </mediaobject>
 </screenshot>
 
 <important>
-<para
->The Mail Reply only works if you have used the correct settings in <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-><guilabel
->Accounts</guilabel
-><guilabel
->Mail</guilabel
-></menuchoice
->.</para>
+<para>The Mail Reply only works if you have used the correct settings in <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem><guilabel>Accounts</guilabel><guilabel>Mail</guilabel></menuchoice>.</para>
  
-<para
->Depending on the configuration of your computer, you will find the reply in your mailbox; you might have to connect to your <acronym
->ISP</acronym
-> and fetch your new mail first though.</para>
-</important
-> 
-
-<tip
-> 
-<para
->On the <guimenu
->Options</guimenu
-> menu you can configure whether you want to send an email, a news article or both.</para
-> 
-</tip
-> 
-</sect3
-> 
+<para>Depending on the configuration of your computer, you will find the reply in your mailbox; you might have to connect to your <acronym>ISP</acronym> and fetch your new mail first though.</para>
+</important> 
+
+<tip> 
+<para>On the <guimenu>Options</guimenu> menu you can configure whether you want to send an email, a news article or both.</para> 
+</tip> 
+</sect3> 
 </sect2>
-</sect1
-> 
+</sect1> 
 
diff --git a/tde-i18n-en_GB/docs/tdepim/knotes/index.docbook b/tde-i18n-en_GB/docs/tdepim/knotes/index.docbook
index f880fa26202..f0491e4ec0e 100644
--- a/tde-i18n-en_GB/docs/tdepim/knotes/index.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knotes/index.docbook
@@ -3,337 +3,164 @@
   <!ENTITY kappname "&knotes;">
   <!ENTITY package "tdepim">
   <!ENTITY % addindex "IGNORE">
-  <!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+  <!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <book lang="&language;">
 
 <bookinfo>
-<title
->The &knotes; Handbook</title>
+<title>The &knotes; Handbook</title>
 
 <authorgroup>
-<author
-><firstname
->Fabian</firstname
-> <surname
->Dal Santo</surname
-> <affiliation
-> <address
-><email
->linuxgnu@yahoo.com.au</email
-></address>
+<author><firstname>Fabian</firstname> <surname>Dal Santo</surname> <affiliation> <address><email>linuxgnu@yahoo.com.au</email></address>
 </affiliation>
 </author>
 
-<author
-><firstname
->Greg</firstname
-> <othername
->M.</othername
-> <surname
->Holmes</surname
-> </author>
-
-<othercredit role="reviewer"
-><firstname
->Lauri</firstname
-> <surname
->Watts</surname
-> <contrib
->Reviewer</contrib>
+<author><firstname>Greg</firstname> <othername>M.</othername> <surname>Holmes</surname> </author>
+
+<othercredit role="reviewer"><firstname>Lauri</firstname> <surname>Watts</surname> <contrib>Reviewer</contrib>
 </othercredit>
-<othercredit role="translator"
-><firstname
->Andrew</firstname
-><surname
->Coles</surname
-><affiliation
-><address
-><email
->andrew_coles@yahoo.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Andrew</firstname><surname>Coles</surname><affiliation><address><email>andrew_coles@yahoo.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 
 </authorgroup>
 
 <copyright>
-<year
->2000</year>
-<holder
->Greg M. Holmes</holder>
+<year>2000</year>
+<holder>Greg M. Holmes</holder>
 </copyright>
 <copyright>
-<year
->2001</year>
-<holder
->Fabian Del Santo</holder>
+<year>2001</year>
+<holder>Fabian Del Santo</holder>
 </copyright>
 
-<legalnotice
->&FDLNotice;</legalnotice>
+<legalnotice>&FDLNotice;</legalnotice>
 
-<date
->2003-09-18</date>
-<releaseinfo
->3.0</releaseinfo>
+<date>2003-09-18</date>
+<releaseinfo>3.0</releaseinfo>
 
-<abstract
-><para
->&knotes; is a sticky notes application for the desktop.</para
-></abstract>
+<abstract><para>&knotes; is a sticky notes application for the desktop.</para></abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->Knotes</keyword>
-<keyword
->tdeutils</keyword>
-<keyword
->notes</keyword>
-<keyword
->popup</keyword>
-<keyword
->pop-up</keyword>
-<keyword
->knotes</keyword>
+<keyword>KDE</keyword>
+<keyword>Knotes</keyword>
+<keyword>tdeutils</keyword>
+<keyword>notes</keyword>
+<keyword>popup</keyword>
+<keyword>pop-up</keyword>
+<keyword>knotes</keyword>
 
 </keywordset>
 
 </bookinfo>
 
 <chapter id="introduction">
-<title
->Introduction</title>
+<title>Introduction</title>
 
-<para
->&knotes; is a program that lets you write the computer equivalent of sticky notes. The notes are saved automatically when you exit the program and they display when you open the program. </para>
+<para>&knotes; is a program that lets you write the computer equivalent of sticky notes. The notes are saved automatically when you exit the program and they display when you open the program. </para>
 
-<para
->You may print and mail your notes if you configure &knotes; to use helper applications. </para>
+<para>You may print and mail your notes if you configure &knotes; to use helper applications. </para>
 
-<para
->Display features of notes such as colour and font may be customised for each note. You may also customise the defaults. </para>
+<para>Display features of notes such as colour and font may be customised for each note. You may also customise the defaults. </para>
 
 </chapter>
 
 <chapter id="using-knotes">
-<title
->Using &knotes;</title>
+<title>Using &knotes;</title>
 
 <variablelist>
 <varlistentry>
-<term
->Creating a new note:</term>
+<term>Creating a new note:</term>
 <listitem>
-<para
->To create a new note &RMB; click on the &knotes; panel icon and select <guimenuitem
->New Note</guimenuitem
-> or using the shortcut <keycombo action="simul"
->&Alt;&Shift;<keycap
->N</keycap
-></keycombo
->.</para>
-<para
->You can create a new note containing the contents of the clipboard by selecting <guimenuitem
->New Note From Clipboard</guimenuitem
-> or using the shortcut <keycombo action="simul"
->&Alt;&Shift;<keycap
->C</keycap
-></keycombo
->.</para>
+<para>To create a new note &RMB; click on the &knotes; panel icon and select <guimenuitem>New Note</guimenuitem> or using the shortcut <keycombo action="simul">&Alt;&Shift;<keycap>N</keycap></keycombo>.</para>
+<para>You can create a new note containing the contents of the clipboard by selecting <guimenuitem>New Note From Clipboard</guimenuitem> or using the shortcut <keycombo action="simul">&Alt;&Shift;<keycap>C</keycap></keycombo>.</para>
 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Writing your note:</term>
+<term>Writing your note:</term>
 <listitem>
-<para
->To write your note, simply type the note in the space provided. Normal keyboard and mouse editing functions are supported. <mousebutton
->Right</mousebutton
-> clicking in the editing space provides the following menu options:</para>
+<para>To write your note, simply type the note in the space provided. Normal keyboard and mouse editing functions are supported. <mousebutton>Right</mousebutton> clicking in the editing space provides the following menu options:</para>
 
 <itemizedlist>
-<listitem
-><para
-><guimenuitem
->Undo</guimenuitem
-></para
-></listitem>
-<listitem
-><para
-><guimenuitem
->Redo</guimenuitem
-></para
-></listitem>
-<listitem
-><para
-><guimenuitem
->Cut</guimenuitem
-></para
-></listitem>
-<listitem
-><para
-><guimenuitem
->Copy</guimenuitem
-></para
-></listitem>
-<listitem
-><para
-><guimenuitem
->Paste</guimenuitem
-></para
-></listitem>
-<listitem
-><para
-><guimenuitem
->Clear</guimenuitem
-></para
-></listitem>
-<listitem
-><para
-><guimenuitem
->Select All</guimenuitem
-></para
-></listitem>
+<listitem><para><guimenuitem>Undo</guimenuitem></para></listitem>
+<listitem><para><guimenuitem>Redo</guimenuitem></para></listitem>
+<listitem><para><guimenuitem>Cut</guimenuitem></para></listitem>
+<listitem><para><guimenuitem>Copy</guimenuitem></para></listitem>
+<listitem><para><guimenuitem>Paste</guimenuitem></para></listitem>
+<listitem><para><guimenuitem>Clear</guimenuitem></para></listitem>
+<listitem><para><guimenuitem>Select All</guimenuitem></para></listitem>
 </itemizedlist>
-<para
->Text may be selected by holding down the &LMB; and moving the mouse, or by holding down the &Shift; key and using the <keycap
->arrow</keycap
-> keys.</para>
+<para>Text may be selected by holding down the &LMB; and moving the mouse, or by holding down the &Shift; key and using the <keycap>arrow</keycap> keys.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Inserting the date:</term>
+<term>Inserting the date:</term>
 <listitem>
-<para
->To insert the current date in the Note &RMB; click on the title bar of the note and select <guimenuitem
->Insert Date</guimenuitem
->.</para>
-<para
->The current date and time will be inserted at the cursor position in the text of the note.</para>
+<para>To insert the current date in the Note &RMB; click on the title bar of the note and select <guimenuitem>Insert Date</guimenuitem>.</para>
+<para>The current date and time will be inserted at the cursor position in the text of the note.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Renaming a note:</term>
+<term>Renaming a note:</term>
 <listitem>
-<para
->To rename a note &RMB; click on the note title bar and select <guimenuitem
->Rename...</guimenuitem
->.</para>
-<para
->Type the new name of the note in the dialogue that appears. To accept the new name, press the <guibutton
->OK</guibutton
-> button. To exit the dialogue without renaming the note, press the <guibutton
->Cancel</guibutton
-> button. To clear what you have typed and start over, click the <guibutton
->Clear</guibutton
-> button.</para>
+<para>To rename a note &RMB; click on the note title bar and select <guimenuitem>Rename...</guimenuitem>.</para>
+<para>Type the new name of the note in the dialogue that appears. To accept the new name, press the <guibutton>OK</guibutton> button. To exit the dialogue without renaming the note, press the <guibutton>Cancel</guibutton> button. To clear what you have typed and start over, click the <guibutton>Clear</guibutton> button.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Mailing a note:</term>
+<term>Mailing a note:</term>
 <listitem>
-<para
->To mail a note &RMB; click on the note title bar and select <guimenuitem
->Mail...</guimenuitem
->.</para
-> 
-<para
->What happens next depends on how you configured the Mail action in the <guilabel
->Preferences...</guilabel
-> dialogue.</para>
+<para>To mail a note &RMB; click on the note title bar and select <guimenuitem>Mail...</guimenuitem>.</para> 
+<para>What happens next depends on how you configured the Mail action in the <guilabel>Preferences...</guilabel> dialogue.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Printing a note:</term>
+<term>Printing a note:</term>
 <listitem>
-<para
->To print a note &RMB; click on the note title bar and select <guimenuitem
->Print</guimenuitem
->.</para>
-<para
->A standard &kde; print dialogue will open.</para>
+<para>To print a note &RMB; click on the note title bar and select <guimenuitem>Print</guimenuitem>.</para>
+<para>A standard &kde; print dialogue will open.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Deleting a note:</term>
+<term>Deleting a note:</term>
 <listitem>
-<para
->To delete a note &RMB; click on the note title bar and select <guimenuitem
->Delete</guimenuitem
->.</para>
+<para>To delete a note &RMB; click on the note title bar and select <guimenuitem>Delete</guimenuitem>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Hiding a note:</term>
+<term>Hiding a note:</term>
 <listitem>
-<para
->To hide a note, click the <guiicon
->X</guiicon
-> in the upper right corner of the title bar of the note. The note will no longer be displayed on the screen. The note itself will not be deleted.</para>
+<para>To hide a note, click the <guiicon>X</guiicon> in the upper right corner of the title bar of the note. The note will no longer be displayed on the screen. The note itself will not be deleted.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Displaying notes:</term>
+<term>Displaying notes:</term>
 <listitem>
-<para
->When you start &knotes;, all notes will display on the screen. If you hide a note and later want to display it, &LMB; on the &knotes; panel icon and select the note you wish to display.</para>
+<para>When you start &knotes;, all notes will display on the screen. If you hide a note and later want to display it, &LMB; on the &knotes; panel icon and select the note you wish to display.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Desktop functions:</term>
+<term>Desktop functions:</term>
 <listitem>
-<para
->To send a note to a specific desktop, &RMB; click on the title bar of the note and select <guisubmenu
->To Desktop</guisubmenu
->. Choose the desktop desired, or alternatively, <guimenuitem
->All desktops</guimenuitem
-></para
-> 
-<para
->To make the note remain on top of other windows &RMB; click on the title bar of the note and select <guimenuitem
->Always On Top</guimenuitem
->.</para
-> 
-<para
->To return the note to more normal window behaviour, simply repeat this process.</para
-> 
+<para>To send a note to a specific desktop, &RMB; click on the title bar of the note and select <guisubmenu>To Desktop</guisubmenu>. Choose the desktop desired, or alternatively, <guimenuitem>All desktops</guimenuitem></para> 
+<para>To make the note remain on top of other windows &RMB; click on the title bar of the note and select <guimenuitem>Always On Top</guimenuitem>.</para> 
+<para>To return the note to more normal window behaviour, simply repeat this process.</para> 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Quitting &knotes;</term>
+<term>Quitting &knotes;</term>
 <listitem>
-<para
->To quit &knotes; &RMB; click on the panel icon and select <guimenuitem
->Quit</guimenuitem
->.</para>
+<para>To quit &knotes; &RMB; click on the panel icon and select <guimenuitem>Quit</guimenuitem>.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -341,165 +168,82 @@
 </chapter>
 
 <chapter id="configuration">
-<title
->Configuration</title>
+<title>Configuration</title>
 
 <sect1 id="defaults">
-<title
->Configuring &knotes; Default Settings</title>
+<title>Configuring &knotes; Default Settings</title>
 
-<para
->To configure &knotes; &RMB; click on the panel icon. Select <guimenuitem
->Configure KNotes...</guimenuitem
-> The &knotes; <guilabel
->KNotes Defaults</guilabel
-> dialogue will open.</para>
+<para>To configure &knotes; &RMB; click on the panel icon. Select <guimenuitem>Configure KNotes...</guimenuitem> The &knotes; <guilabel>KNotes Defaults</guilabel> dialogue will open.</para>
 
 <variablelist>
-<title
->The <guilabel
->Display</guilabel
-> Section</title>
+<title>The <guilabel>Display</guilabel> Section</title>
 <varlistentry>
-<term
-><guilabel
->Text colour:</guilabel
-></term>
-<listitem
-><para
->The colour square shows the current text colour. By clicking this colour square you open the standard &kde; colour selection dialogue.</para
-></listitem
-> 
+<term><guilabel>Text colour:</guilabel></term>
+<listitem><para>The colour square shows the current text colour. By clicking this colour square you open the standard &kde; colour selection dialogue.</para></listitem> 
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Background colour:</guilabel
-></term>
-<listitem
-><para
->The colour square shows the current background colour. By clicking this colour square you open the standard &kde; colour selection dialogue.</para
-></listitem>
+<term><guilabel>Background colour:</guilabel></term>
+<listitem><para>The colour square shows the current background colour. By clicking this colour square you open the standard &kde; colour selection dialogue.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Default width:</guilabel
-></term>
-<listitem
-><para
->The width of the note in pixels. Edit this number as desired.</para
-></listitem
-> 
+<term><guilabel>Default width:</guilabel></term>
+<listitem><para>The width of the note in pixels. Edit this number as desired.</para></listitem> 
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Default height:</guilabel
-></term>
-<listitem
-><para
->The height of the note in pixels. Edit this number as desired.</para
-></listitem>
+<term><guilabel>Default height:</guilabel></term>
+<listitem><para>The height of the note in pixels. Edit this number as desired.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Show note in taskbar</guilabel
-></term>
-<listitem
-><para
->By default, &knotes; notes do not show an entry in the taskbar for each note. If you prefer they do so, enable this option.</para>
+<term><guilabel>Show note in taskbar</guilabel></term>
+<listitem><para>By default, &knotes; notes do not show an entry in the taskbar for each note. If you prefer they do so, enable this option.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
 <variablelist>
-<title
->The <guilabel
->Editor</guilabel
-> Section</title>
+<title>The <guilabel>Editor</guilabel> Section</title>
 <varlistentry>
-<term
-><guilabel
->Tab Size</guilabel
-></term>
-<listitem
-><para
->This is the size of the indent produced by the &Tab; key in spaces. Edit this number as desired.</para
-></listitem>
+<term><guilabel>Tab Size</guilabel></term>
+<listitem><para>This is the size of the indent produced by the &Tab; key in spaces. Edit this number as desired.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Auto Indent</guilabel
-></term>
-<listitem
-><para
->This is a check box. If selected, auto-indenting is on.</para
-></listitem>
+<term><guilabel>Auto Indent</guilabel></term>
+<listitem><para>This is a check box. If selected, auto-indenting is on.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Rich Text</guilabel
-></term>
+<term><guilabel>Rich Text</guilabel></term>
 <listitem>
-<para
->Not yet implemented</para>
+<para>Not yet implemented</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Title Font: Click to Change</guilabel
-></term>
-<listitem
-><para
->You can change the font used for the title of your notes.</para>
-
-<para
->Click this button to open the standard &kde; font selection dialogue.</para>
+<term><guilabel>Title Font: Click to Change</guilabel></term>
+<listitem><para>You can change the font used for the title of your notes.</para>
+
+<para>Click this button to open the standard &kde; font selection dialogue.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Text Font: Click to Change</guilabel
-></term>
+<term><guilabel>Text Font: Click to Change</guilabel></term>
 <listitem>
-<para
->You can change the font used for the text of your notes.</para>
+<para>You can change the font used for the text of your notes.</para>
 
-<para
->Click this button to open the standard &kde; font selection dialogue.</para
-></listitem>
+<para>Click this button to open the standard &kde; font selection dialogue.</para></listitem>
 </varlistentry>
 </variablelist>
 
 <variablelist>
-<title
->The <guilabel
->Actions</guilabel
-> Section</title>
+<title>The <guilabel>Actions</guilabel> Section</title>
 <varlistentry>
-<term
-><guilabel
->Mail Action</guilabel
-></term>
-<listitem
-><para
->Type a mail command and any required command line switches in this box.</para>
-<para
->By using <token
->%f</token
-> in the command line you can pass the filename of the note body to the mail command.</para>
+<term><guilabel>Mail Action</guilabel></term>
+<listitem><para>Type a mail command and any required command line switches in this box.</para>
+<para>By using <token>%f</token> in the command line you can pass the filename of the note body to the mail command.</para>
 </listitem>
 </varlistentry>
 
@@ -508,66 +252,36 @@
 </sect1>
 
 <sect1 id="customizing-display">
-<title
->Customising a Single Note Display</title>
-
-<para
->You can customise each note independently of the global settings. The settings you can customise are identical to those described in the <link linkend="configuration"
->Configuration</link
-> section, but they will apply only to the note you are changing. Any other open notes, and any new notes you create, will use the default settings.</para>
-
-<para
->To customise a single note display &RMB; click on the note title bar and select <guimenuitem
->Preferences...</guimenuitem
->.</para>
-<para
->The <guilabel
->Local Settings</guilabel
-> dialogue will open, allowing you to configure the note.</para>
+<title>Customising a Single Note Display</title>
+
+<para>You can customise each note independently of the global settings. The settings you can customise are identical to those described in the <link linkend="configuration">Configuration</link> section, but they will apply only to the note you are changing. Any other open notes, and any new notes you create, will use the default settings.</para>
+
+<para>To customise a single note display &RMB; click on the note title bar and select <guimenuitem>Preferences...</guimenuitem>.</para>
+<para>The <guilabel>Local Settings</guilabel> dialogue will open, allowing you to configure the note.</para>
 </sect1>
 
 </chapter>
 
 <chapter id="credits">
 
-<title
->Credits and License</title>
+<title>Credits and License</title>
 
-<para
->&knotes;</para>
+<para>&knotes;</para>
 
-<para
->Program copyright 1997 Bernd Wuebben <email
->wuebben@kde.org</email
-></para>
+<para>Program copyright 1997 Bernd Wuebben <email>wuebben@kde.org</email></para>
 
-<para
->Contributors:</para>
+<para>Contributors:</para>
 <itemizedlist>
-<listitem
-><para
->Wynn Wilkes<email
->wynnw@calderasystems.com</email
-></para>
+<listitem><para>Wynn Wilkes<email>wynnw@calderasystems.com</email></para>
 </listitem>
 </itemizedlist>
 
-<para
->Documentation copyright 2000 Greg M. Holmes <email
->holmegm@earthlink.net</email
-></para>
+<para>Documentation copyright 2000 Greg M. Holmes <email>holmegm@earthlink.net</email></para>
 
-<para
->Documentation updated 2001 by Fabian Del Santo <email
->linuxgnu@yahoo.com.au</email
-> and 2003 by &Lauri.Watts; &Lauri.Watts.mail;.</para>
+<para>Documentation updated 2001 by Fabian Del Santo <email>linuxgnu@yahoo.com.au</email> and 2003 by &Lauri.Watts; &Lauri.Watts.mail;.</para>
 
 
-<para
->Andrew Coles<email
->andrew_coles@yahoo.co.uk</email
-></para
-> 
+<para>Andrew Coles<email>andrew_coles@yahoo.co.uk</email></para> 
 &underFDL; &underGPL; </chapter>
 
 &documentation.index; 
diff --git a/tde-i18n-en_GB/docs/tdesdk/cervisia/index.docbook b/tde-i18n-en_GB/docs/tdesdk/cervisia/index.docbook
index a769181ee18..890547a5b9f 100644
--- a/tde-i18n-en_GB/docs/tdesdk/cervisia/index.docbook
+++ b/tde-i18n-en_GB/docs/tdesdk/cervisia/index.docbook
@@ -2,418 +2,190 @@
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY kappname "&cervisia;">
   <!ENTITY package "tdesdk">
-  <!ENTITY ssh "<command
->ssh</command
->">
-  <!ENTITY rsh "<command
->rsh</command
->">
+  <!ENTITY ssh "<command>ssh</command>">
+  <!ENTITY rsh "<command>rsh</command>">
   <!ENTITY % addindex "IGNORE">
-  <!ENTITY % British-English "INCLUDE"
-> <!-- Change language only here -->
-  <!ENTITY CVS "<application
->CVS</application
->">
+  <!ENTITY % British-English "INCLUDE"> <!-- Change language only here -->
+  <!ENTITY CVS "<application>CVS</application>">
 ]>
 
 <book lang="&language;">
 
 <bookinfo>
-<title
->&cervisia; Manual</title>
+<title>&cervisia; Manual</title>
 <authorgroup>
-<author
-><firstname
->Bernd</firstname
-><surname
->Gehrmann</surname
-> <affiliation
-><address
-><email
->bernd@mail.berlios.de</email
-></address
-></affiliation>
-</author
-> 
-<author
-><firstname
->Carlos</firstname
-><surname
->Woelz</surname
-> <affiliation
-><address
-><email
->carloswoelz@imap-mail.com</email
-></address
-></affiliation>
-</author
-> 
-
-
-<othercredit role="translator"
-><firstname
->Alex</firstname
-><surname
->Walker</surname
-><affiliation
-><address
-><email
->alex@x3ja.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author><firstname>Bernd</firstname><surname>Gehrmann</surname> <affiliation><address><email>bernd@mail.berlios.de</email></address></affiliation>
+</author> 
+<author><firstname>Carlos</firstname><surname>Woelz</surname> <affiliation><address><email>carloswoelz@imap-mail.com</email></address></affiliation>
+</author> 
+
+
+<othercredit role="translator"><firstname>Alex</firstname><surname>Walker</surname><affiliation><address><email>alex@x3ja.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 
 </authorgroup>
 
 <copyright>
-<year
->1999</year>
-<year
->2000</year>
-<year
->2001</year>
-<year
->2002</year>
-<holder
->Bernd Gehrmann</holder>
+<year>1999</year>
+<year>2000</year>
+<year>2001</year>
+<year>2002</year>
+<holder>Bernd Gehrmann</holder>
 </copyright>
 
 <copyright>
-<year
->2004</year>
-<holder
->Carlos Woelz</holder>
+<year>2004</year>
+<holder>Carlos Woelz</holder>
 </copyright>
 
 
 <legalnotice>
  
-<para
->This program may be distributed under the terms of the Q Public License as defined by Trolltech AS of Norway and appearing in the file LICENSE.QPL included in the packaging of this file.</para>
+<para>This program may be distributed under the terms of the Q Public License as defined by Trolltech AS of Norway and appearing in the file LICENSE.QPL included in the packaging of this file.</para>
 
-<para
->This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</para>
+<para>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</para>
 </legalnotice>
 
-<legalnotice
->&FDLNotice;</legalnotice>
+<legalnotice>&FDLNotice;</legalnotice>
 
-<date
->2004-06-06</date>
-<releaseinfo
->2.01.90</releaseinfo>
+<date>2004-06-06</date>
+<releaseinfo>2.01.90</releaseinfo>
 
 <abstract>
-<para
->&cervisia; provides a graphical view of &CVS;.</para>
+<para>&cervisia; provides a graphical view of &CVS;.</para>
 </abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->tdesdk</keyword>
-<keyword
->Cervisia</keyword>
-<keyword
->CVS</keyword>
-<keyword
->version control</keyword>
-<keyword
->revision control</keyword>
+<keyword>KDE</keyword>
+<keyword>tdesdk</keyword>
+<keyword>Cervisia</keyword>
+<keyword>CVS</keyword>
+<keyword>version control</keyword>
+<keyword>revision control</keyword>
 </keywordset>
 
 </bookinfo>
 
 <chapter id="introduction">
-<title
->Introduction</title>
+<title>Introduction</title>
 
-<para
-><ulink url="http://www.kde.org/apps/cervisia/"
->&cervisia;</ulink
-> is a user friendly version control system front-end. The aim is to support &CVS; and other version control system programs in a unified interface, featuring conflict resolution, difference and history viewers, status for the working copy files and support for most version control functions. You can get &cervisia; by building the tdesdk module or installing the tdesdk package provided by your distribution. Currently, only &CVS; is supported, but other version control systems may be integrated in the future. </para>
+<para><ulink url="http://www.kde.org/apps/cervisia/">&cervisia;</ulink> is a user friendly version control system front-end. The aim is to support &CVS; and other version control system programs in a unified interface, featuring conflict resolution, difference and history viewers, status for the working copy files and support for most version control functions. You can get &cervisia; by building the tdesdk module or installing the tdesdk package provided by your distribution. Currently, only &CVS; is supported, but other version control systems may be integrated in the future. </para>
 
-<para
->A version control system is a tool to record, manage and distribute different versions of files. &CVS; is a version control system. It allows you to share your modifications easily, as each of the contributors can work on their local copy at the same time, without fear of overwriting each others' modifications. It allows the recovery of past versions (useful for tracking bugs), the creation of branches (for experimental development or for releases of code) and more. </para>
+<para>A version control system is a tool to record, manage and distribute different versions of files. &CVS; is a version control system. It allows you to share your modifications easily, as each of the contributors can work on their local copy at the same time, without fear of overwriting each others' modifications. It allows the recovery of past versions (useful for tracking bugs), the creation of branches (for experimental development or for releases of code) and more. </para>
 
-<para
->The main <firstterm
->repository</firstterm
-> usually holds a collaborative project (commercial or not), but you can take advantage of the nice revision control features offered by &CVS; even for a project developed exclusively by you. It is easy to set up a local repository, and you will gain the ability to track changes that caused bugs, revert changes, avoid accidental loss of information &etc;. </para>
+<para>The main <firstterm>repository</firstterm> usually holds a collaborative project (commercial or not), but you can take advantage of the nice revision control features offered by &CVS; even for a project developed exclusively by you. It is easy to set up a local repository, and you will gain the ability to track changes that caused bugs, revert changes, avoid accidental loss of information &etc;. </para>
 
-<para
->The repository holds the project files, and every contributor keeps their own local copy, named <firstterm
->working copy</firstterm
-> or <firstterm
->sandbox</firstterm
->; one can then add their modifications to the main repository (a process called &quot;committing&quot;) and/or update their own copy to reflect recent changes made by other contributors. </para>
+<para>The repository holds the project files, and every contributor keeps their own local copy, named <firstterm>working copy</firstterm> or <firstterm>sandbox</firstterm>; one can then add their modifications to the main repository (a process called &quot;committing&quot;) and/or update their own copy to reflect recent changes made by other contributors. </para>
 
 </chapter>
    
 <chapter id="getting-started">
-<title
->Getting Started</title>
+<title>Getting Started</title>
 
 <sect1 id="accessing-repository">
-<title
->Accessing The Repository</title>
+<title>Accessing The Repository</title>
     
-<para
->In this section, we show how to use the basic version control system functionality using &cervisia; to checkout modules from the repository and work with them. To do that, you must have access to the repository as a client, meaning that someone (probably the administrator of the &CVS; repository) gave you an account on the server machine. Alternatively, you can easily create a local repository for your own project. </para>
+<para>In this section, we show how to use the basic version control system functionality using &cervisia; to checkout modules from the repository and work with them. To do that, you must have access to the repository as a client, meaning that someone (probably the administrator of the &CVS; repository) gave you an account on the server machine. Alternatively, you can easily create a local repository for your own project. </para>
 
-<tip
-><para
->If you plan to develop a complex project, it is a good idea to use the &CVS; features, even if you are the only developer. You can make all changes in the working copy, and use &cervisia; (or any other &CVS; tool) to update and commit. This way, you will gain the ability to track changes that caused bugs, revert changes, avoid accidental loss of information &etc;. Using &cervisia;, it is simple to create a local repository. </para>
+<tip><para>If you plan to develop a complex project, it is a good idea to use the &CVS; features, even if you are the only developer. You can make all changes in the working copy, and use &cervisia; (or any other &CVS; tool) to update and commit. This way, you will gain the ability to track changes that caused bugs, revert changes, avoid accidental loss of information &etc;. Using &cervisia;, it is simple to create a local repository. </para>
 
 <procedure>
-<title
->Creating a Local Repository</title>
-
-<step
-><para
->Open the <guilabel
->Create New Repository (cvs init)</guilabel
-> dialogue by choosing <menuchoice
-><guimenu
->Repository</guimenu
-> <guimenuitem
->Create...</guimenuitem
-></menuchoice
->. </para
-></step>
-
-<step
-><para
->Press the <guilabel
->...</guilabel
-> button to select the folder where you want to create the repository, or enter its location in the edit box. For instance, if you want to place the repository in the <filename
->/home/user</filename
-> folder, and to name it <filename
->cvsroot</filename
->, you should type <filename
->/home/user/cvsroot</filename
-> in the edit box, or select the <filename
->/home/user</filename
-> folder using the file picker and add <filename
->cvsroot</filename
->. </para
-></step>
-
-<step
-><para
->Confirm by pressing the <guibutton
->OK</guibutton
-> button. &cervisia; will create and initialise the new repository folder. </para
-></step>
-
-<step
-><para
->Now you can import your current work to the repository, or simply create a folder in the repository to start a new module from scratch. </para
-></step>
+<title>Creating a Local Repository</title>
+
+<step><para>Open the <guilabel>Create New Repository (cvs init)</guilabel> dialogue by choosing <menuchoice><guimenu>Repository</guimenu> <guimenuitem>Create...</guimenuitem></menuchoice>. </para></step>
+
+<step><para>Press the <guilabel>...</guilabel> button to select the folder where you want to create the repository, or enter its location in the edit box. For instance, if you want to place the repository in the <filename>/home/user</filename> folder, and to name it <filename>cvsroot</filename>, you should type <filename>/home/user/cvsroot</filename> in the edit box, or select the <filename>/home/user</filename> folder using the file picker and add <filename>cvsroot</filename>. </para></step>
+
+<step><para>Confirm by pressing the <guibutton>OK</guibutton> button. &cervisia; will create and initialise the new repository folder. </para></step>
+
+<step><para>Now you can import your current work to the repository, or simply create a folder in the repository to start a new module from scratch. </para></step>
 
 </procedure>
 
 </tip>
 
 
-<para
->&cervisia; offers an integrated front-end to manage all your repository locations, the <guilabel
->Configure Access to Repositories</guilabel
-> dialogue. To display it, select the <menuchoice
-><guimenu
->Repository</guimenu
-> <guimenuitem
->Repositories...</guimenuitem
-></menuchoice
-> menu item. </para>
+<para>&cervisia; offers an integrated front-end to manage all your repository locations, the <guilabel>Configure Access to Repositories</guilabel> dialogue. To display it, select the <menuchoice><guimenu>Repository</guimenu> <guimenuitem>Repositories...</guimenuitem></menuchoice> menu item. </para>
 
 <figure id="screenshot-repositories" float="1">
-<title
->A screenshot of &cervisia;'s Configure Access to Repositories dialogue</title>
+<title>A screenshot of &cervisia;'s Configure Access to Repositories dialogue</title>
 <mediaobject>
-<imageobject
-><imagedata format="PNG" fileref="repositories.png"/></imageobject>
-<textobject
-><phrase
->A screenshot of &cervisia;'s Configure Access to Repositories dialogue</phrase
-></textobject>
+<imageobject><imagedata format="PNG" fileref="repositories.png"/></imageobject>
+<textobject><phrase>A screenshot of &cervisia;'s Configure Access to Repositories dialogue</phrase></textobject>
 </mediaobject>
 </figure>
 
-<para
->There are several methods to access a CVS repository. It may be reached via password authentication (:pserver:), secure shell (using :ext:), local repository (:local:) &etc;. The format for the repository location is (optional items appear between square brackets): </para>
+<para>There are several methods to access a CVS repository. It may be reached via password authentication (:pserver:), secure shell (using :ext:), local repository (:local:) &etc;. The format for the repository location is (optional items appear between square brackets): </para>
 
 <para>
-<filename
->[:method:][[user][:password]@]hostname[:[port]]/path/to/repository</filename>
+<filename>[:method:][[user][:password]@]hostname[:[port]]/path/to/repository</filename>
 </para>
 
-<para
->Not all these items (user, password, hostname, port) are always necessary to access the repository. The required information depends on the access method used, which can be categorised as follows: </para>
+<para>Not all these items (user, password, hostname, port) are always necessary to access the repository. The required information depends on the access method used, which can be categorised as follows: </para>
 
 <variablelist>
 
 <varlistentry>
-<term
->Local</term>
+<term>Local</term>
 
 <listitem>
-<para
->The local access method is the default method used by &CVS;. Therefore, it is optional to add the :local: method to the repository location: you can enter simply the path to the folder which stores the &CVS; repository, and is accessible from your computer, like <filename class="directory"
->/path/to/repository</filename
-> or to give a real life example, <filename class="directory"
->/home/cvs</filename
->.</para>
-
-<para
->It may physically be on a disk which is mounted via <acronym
->NFS</acronym
->, but this is an irrelevant detail. If you created a local repository, the location will be simple the path to it. </para>
+<para>The local access method is the default method used by &CVS;. Therefore, it is optional to add the :local: method to the repository location: you can enter simply the path to the folder which stores the &CVS; repository, and is accessible from your computer, like <filename class="directory">/path/to/repository</filename> or to give a real life example, <filename class="directory">/home/cvs</filename>.</para>
+
+<para>It may physically be on a disk which is mounted via <acronym>NFS</acronym>, but this is an irrelevant detail. If you created a local repository, the location will be simple the path to it. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry id="rsh">
-<term
->rsh</term>
+<term>rsh</term>
 
 <listitem>
-<para
->The repository location is something like <filename
->:ext:username@host.url.org:/path/to/repository</filename
->. </para>
-
-<para
->This method requires that you have a user account on the server machine (in this example, <systemitem class="systemname"
->host.url.org</systemitem
->) and use a remote shell for communication. By default, &CVS; uses &rsh; for this purpose; however, &rsh; has long considered to be insecure, and is widely replaced by &ssh;. </para>
-
-<para
->If you wish to use &ssh;, you must set the environment variable $<envar
->CVS_RSH</envar
-> to &ssh; when using the <command
->cvs</command
-> client. &cervisia; supports this easily. </para>
+<para>The repository location is something like <filename>:ext:username@host.url.org:/path/to/repository</filename>. </para>
+
+<para>This method requires that you have a user account on the server machine (in this example, <systemitem class="systemname">host.url.org</systemitem>) and use a remote shell for communication. By default, &CVS; uses &rsh; for this purpose; however, &rsh; has long considered to be insecure, and is widely replaced by &ssh;. </para>
+
+<para>If you wish to use &ssh;, you must set the environment variable $<envar>CVS_RSH</envar> to &ssh; when using the <command>cvs</command> client. &cervisia; supports this easily. </para>
 
 <!-- TODO: verify if the above still apply -->
 
-<para
->Note that &cervisia; cannot answer possible password requests from the server machine. You must make sure that a remote login works without requiring you to enter the password. With plain vanilla &rsh;, this can be achieved for example by creating a <filename
->.rhosts</filename
-> file in your home folder with a list of trusted hosts (see the &rsh; manpage). </para>
-
-<para
->With &ssh;, it can be achieved by copying your public key located in the file <filename
->identity.pub</filename
->, located in the <filename
->$<envar
->HOME</envar
->/.ssh/</filename
-> folder to the server. In this case, the key must not be encrypted with a passphrase see the &ssh; manpage and the &CVS;/<acronym
->SSH</acronym
-> <acronym
->FAQ</acronym
-> on SourceForge). If you are unsure about these issues, ask your system administrator. </para>
+<para>Note that &cervisia; cannot answer possible password requests from the server machine. You must make sure that a remote login works without requiring you to enter the password. With plain vanilla &rsh;, this can be achieved for example by creating a <filename>.rhosts</filename> file in your home folder with a list of trusted hosts (see the &rsh; manpage). </para>
+
+<para>With &ssh;, it can be achieved by copying your public key located in the file <filename>identity.pub</filename>, located in the <filename>$<envar>HOME</envar>/.ssh/</filename> folder to the server. In this case, the key must not be encrypted with a passphrase see the &ssh; manpage and the &CVS;/<acronym>SSH</acronym> <acronym>FAQ</acronym> on SourceForge). If you are unsure about these issues, ask your system administrator. </para>
 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->pserver</term>
+<term>pserver</term>
 
 <listitem>
-<para
->The repository location looks like <filename
->:pserver:username@host.url.org:/path/to/repository</filename
-> </para>
+<para>The repository location looks like <filename>:pserver:username@host.url.org:/path/to/repository</filename> </para>
 
-<para
->This method accesses the server via a special protocol with a relatively weak authentication (<literal
->pserver</literal
-> stands for password authentication). Before you can use such a server, you need a username and password given by the &CVS; server administrator, and you have to login. Note that your &CVS; password authentication username does not necessarily match the system's username. Before accessing the &CVS; server, you will need to login. </para>
+<para>This method accesses the server via a special protocol with a relatively weak authentication (<literal>pserver</literal> stands for password authentication). Before you can use such a server, you need a username and password given by the &CVS; server administrator, and you have to login. Note that your &CVS; password authentication username does not necessarily match the system's username. Before accessing the &CVS; server, you will need to login. </para>
 
-<para
->Open-source projects typically offer Anonymous CVS access to their sources. This means you can easily grab the latest sources, modify, and create patches (differences) against the repository without asking for a CVS account. As a general rule, Anonymous CVS uses password authentication (:pserver:), and is a read-only repository, not allowing you to upload your changes directly. </para>
+<para>Open-source projects typically offer Anonymous CVS access to their sources. This means you can easily grab the latest sources, modify, and create patches (differences) against the repository without asking for a CVS account. As a general rule, Anonymous CVS uses password authentication (:pserver:), and is a read-only repository, not allowing you to upload your changes directly. </para>
 
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->Knowing the access method and location to the repository, you can add it to &cervisia;'s repositories list: </para>
+<para>Knowing the access method and location to the repository, you can add it to &cervisia;'s repositories list: </para>
 
 <procedure>
-<title
->Adding a New Repository</title>
-
-<step
-><para
->Open the <guilabel
->Configure Access to Repositories</guilabel
-> dialogue by choosing the <menuchoice
-><guimenu
->Repository</guimenu
-> <guimenuitem
->Repositories...</guimenuitem
-> </menuchoice
->menu item. </para
-></step>
-
-<step
-><para
->Press the <guilabel
->Add...</guilabel
-> button to open the <guilabel
->Add Repository</guilabel
-> dialogue. </para
-></step>
-
-<step
-><para
->Enter the repository location in the <guilabel
->Repository:</guilabel
-> edit box. &cervisia; will automatically disable the areas of the dialogue that are not relevant to the access method you entered. </para
-></step>
-
-<step
-><para
->If you are using the ext method to access the repository, enter the remote shell you wish to use (&eg; &ssh;) in the <guilabel
->Use remote shell</guilabel
-> edit box. </para
-></step>
-
-<step
-><para
->Press <guibutton
->OK</guibutton
->. You will see the repository you just entered on the repositories list. </para
-></step>
-
-<step
-><para
->If the access method to the repository you just entered is password authentication (pserver), you will need to login before connecting the server. Click the repository on the list to select it, and press the <guilabel
->Login...</guilabel
-> button. Enter your password in the pop-up dialogue. </para>
-<para
->If you successfully enter your password, the <guilabel
->Status</guilabel
-> column entry of the pserver repository will change from <guilabel
->Not logged in</guilabel
-> to <guilabel
->Logged in</guilabel
->. </para
-></step>
-
-<step
-><para
->Press <guibutton
->OK</guibutton
-> to apply your modifications, or add another location to the list. &cervisia; will store as many locations as you like. </para
-></step>
+<title>Adding a New Repository</title>
+
+<step><para>Open the <guilabel>Configure Access to Repositories</guilabel> dialogue by choosing the <menuchoice><guimenu>Repository</guimenu> <guimenuitem>Repositories...</guimenuitem> </menuchoice>menu item. </para></step>
+
+<step><para>Press the <guilabel>Add...</guilabel> button to open the <guilabel>Add Repository</guilabel> dialogue. </para></step>
+
+<step><para>Enter the repository location in the <guilabel>Repository:</guilabel> edit box. &cervisia; will automatically disable the areas of the dialogue that are not relevant to the access method you entered. </para></step>
+
+<step><para>If you are using the ext method to access the repository, enter the remote shell you wish to use (&eg; &ssh;) in the <guilabel>Use remote shell</guilabel> edit box. </para></step>
+
+<step><para>Press <guibutton>OK</guibutton>. You will see the repository you just entered on the repositories list. </para></step>
+
+<step><para>If the access method to the repository you just entered is password authentication (pserver), you will need to login before connecting the server. Click the repository on the list to select it, and press the <guilabel>Login...</guilabel> button. Enter your password in the pop-up dialogue. </para>
+<para>If you successfully enter your password, the <guilabel>Status</guilabel> column entry of the pserver repository will change from <guilabel>Not logged in</guilabel> to <guilabel>Logged in</guilabel>. </para></step>
+
+<step><para>Press <guibutton>OK</guibutton> to apply your modifications, or add another location to the list. &cervisia; will store as many locations as you like. </para></step>
 
 </procedure>
 
@@ -421,376 +193,150 @@
 
 
 <sect1 id="importing">
-<title
->Importing a Module Into the Repository</title>
+<title>Importing a Module Into the Repository</title>
 
-<para
->In this section, we discuss how you can put a new project into the &CVS; repository. If you just want to work with an existing project which is already in a repository, you may skip this section. </para>
+<para>In this section, we discuss how you can put a new project into the &CVS; repository. If you just want to work with an existing project which is already in a repository, you may skip this section. </para>
 
-<para
->There are two ways to put a project into the &CVS;: </para>
+<para>There are two ways to put a project into the &CVS;: </para>
 
 <itemizedlist>
 
-<listitem
-><para
->Import the files and folders to a new <firstterm
->module</firstterm
->, using &cervisia;'s import dialogue. Modules are the top folders in the &CVS; repository folder tree, and are used to separate and organise the different software projects inside the repository. </para
-></listitem>
+<listitem><para>Import the files and folders to a new <firstterm>module</firstterm>, using &cervisia;'s import dialogue. Modules are the top folders in the &CVS; repository folder tree, and are used to separate and organise the different software projects inside the repository. </para></listitem>
 
-<listitem
-><para
->Create an empty module and add the new files and folders manually. You will have more control, but it will probably take a little more time. </para
-></listitem>
+<listitem><para>Create an empty module and add the new files and folders manually. You will have more control, but it will probably take a little more time. </para></listitem>
 
 </itemizedlist>
 
 <important>
-<para
->Keep in mind that &CVS; was initially designed to handle text files. Many features, like revision merging, creating differences in a readable form &etc; are only performed to text files. This does not mean you cannot use CVS to keep binary files, it just means you have to <emphasis
->explicitly tell CVS if it is a text or binary file</emphasis
->. If you declare the wrong file type, you will experience problems with the &CVS; functionality for these files, and they may get corrupted. </para>
+<para>Keep in mind that &CVS; was initially designed to handle text files. Many features, like revision merging, creating differences in a readable form &etc; are only performed to text files. This does not mean you cannot use CVS to keep binary files, it just means you have to <emphasis>explicitly tell CVS if it is a text or binary file</emphasis>. If you declare the wrong file type, you will experience problems with the &CVS; functionality for these files, and they may get corrupted. </para>
 </important>
 
 
-<para
->Importing a project (as a new module) has some advantages: you will import all files and folders recursively, and the module will automatically be created for you. This makes importing large existing projects to the repository easier. However, there are some disadvantages: you cannot use &cervisia;'s import dialogue to add files to existing modules, and you can either import the files as text or binary files. You can work around this limitation by creating a folder with files of only one of the types, or by informing the patterns of the files that should be ignored during the import process. </para>
+<para>Importing a project (as a new module) has some advantages: you will import all files and folders recursively, and the module will automatically be created for you. This makes importing large existing projects to the repository easier. However, there are some disadvantages: you cannot use &cervisia;'s import dialogue to add files to existing modules, and you can either import the files as text or binary files. You can work around this limitation by creating a folder with files of only one of the types, or by informing the patterns of the files that should be ignored during the import process. </para>
 
-<para
->For instance, suppose your project contains text files and some PNG images (binary files) only. You can tell &CVS; to ignore all files with the pattern <filename class="extension"
->*.png</filename
-> while importing the other files as text, or you can move the images to a separate folder, and then import the remaining files (as text files). Either way, you will have to <link linkend="checkingout"
->checkout</link
-> the newly imported module to a new working copy, copy the the missing files and folders to it, <link linkend="addingfiles"
->add</link
-> and <link linkend="committingfiles"
->commit</link
-> them to the repository to complete the import process. </para>
+<para>For instance, suppose your project contains text files and some PNG images (binary files) only. You can tell &CVS; to ignore all files with the pattern <filename class="extension">*.png</filename> while importing the other files as text, or you can move the images to a separate folder, and then import the remaining files (as text files). Either way, you will have to <link linkend="checkingout">checkout</link> the newly imported module to a new working copy, copy the the missing files and folders to it, <link linkend="addingfiles">add</link> and <link linkend="committingfiles">commit</link> them to the repository to complete the import process. </para>
 
-<para
->As an alternative, you can add the files and folders manually, creating an empty module for them. To add an empty module to a repository, just create a new folder in the &CVS; repository root folder. The name of this new folder will be the name of the module. <link linkend="checkingout"
->Checkout</link
-> the new empty module. Then copy the the files and folders to the working copy, <link linkend="addingfiles"
->add</link
-> and <link linkend="committingfiles"
->commit</link
-> to upload them to the &CVS; repository. </para>
+<para>As an alternative, you can add the files and folders manually, creating an empty module for them. To add an empty module to a repository, just create a new folder in the &CVS; repository root folder. The name of this new folder will be the name of the module. <link linkend="checkingout">Checkout</link> the new empty module. Then copy the the files and folders to the working copy, <link linkend="addingfiles">add</link> and <link linkend="committingfiles">commit</link> to upload them to the &CVS; repository. </para>
 
 
 <figure id="screenshot-import" float="1">
-<title
->A screenshot of &cervisia;'s import dialogue</title>
+<title>A screenshot of &cervisia;'s import dialogue</title>
 <mediaobject>
-<imageobject
-><imagedata format="PNG" fileref="import.png"/></imageobject>
-<textobject
-><phrase
->A screenshot of &cervisia;'s import dialogue</phrase
-></textobject>
+<imageobject><imagedata format="PNG" fileref="import.png"/></imageobject>
+<textobject><phrase>A screenshot of &cervisia;'s import dialogue</phrase></textobject>
 </mediaobject>
 </figure>
 
-<para
->In <xref linkend="screenshot-import"/> you can see the dialogue which helps you to <emphasis
->import</emphasis
-> a project as a module. To access &cervisia;'s import dialogue, choose the <menuchoice
-><guimenu
->Repository</guimenu
-> <guimenuitem
->Import...</guimenuitem
-></menuchoice
-> menu item. </para>
+<para>In <xref linkend="screenshot-import"/> you can see the dialogue which helps you to <emphasis>import</emphasis> a project as a module. To access &cervisia;'s import dialogue, choose the <menuchoice><guimenu>Repository</guimenu> <guimenuitem>Import...</guimenuitem></menuchoice> menu item. </para>
 
 <variablelist>
 
 <varlistentry>
-<term
-><guilabel
->Repository:</guilabel
-> <xref linkend="co-repository"/></term>
-<listitem
-><para
->Enter or select on the dropdown list the name of the &CVS; repository, also known as $<envar
->CVSROOT</envar
->. You must have write access to it, and the repository must be properly initialised. If the repository does not yet exist, you can create one choosing the <menuchoice
-> <guimenu
->Repository</guimenu
-> <guimenuitem
->Create...</guimenuitem
-> </menuchoice
-> menu item. </para>
-<para
->The drop down box shows a list of the repositories you previously entered using the <guilabel
->Configure Access to Repositories</guilabel
-> dialogue box. If the repository is remote, make sure that authentication works. See <xref linkend="accessing-repository"/> for more information. </para
-></listitem>
+<term><guilabel>Repository:</guilabel> <xref linkend="co-repository"/></term>
+<listitem><para>Enter or select on the dropdown list the name of the &CVS; repository, also known as $<envar>CVSROOT</envar>. You must have write access to it, and the repository must be properly initialised. If the repository does not yet exist, you can create one choosing the <menuchoice> <guimenu>Repository</guimenu> <guimenuitem>Create...</guimenuitem> </menuchoice> menu item. </para>
+<para>The drop down box shows a list of the repositories you previously entered using the <guilabel>Configure Access to Repositories</guilabel> dialogue box. If the repository is remote, make sure that authentication works. See <xref linkend="accessing-repository"/> for more information. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Module:</guilabel
-> <xref linkend="co-module"/></term>
-<listitem
-><para
->The name of the module under which the project will be stored. After the import, the project can be checked out under this name. See <xref linkend="checkingout"/> for more information. This is also the name of the corresponding folder in the repository. </para
-></listitem>
+<term><guilabel>Module:</guilabel> <xref linkend="co-module"/></term>
+<listitem><para>The name of the module under which the project will be stored. After the import, the project can be checked out under this name. See <xref linkend="checkingout"/> for more information. This is also the name of the corresponding folder in the repository. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Working Folder:</guilabel
-></term>
-<listitem
-><para
->The toplevel folder of the project you want to import. The import starts from this folder and goes down recursively. </para
-></listitem>
+<term><guilabel>Working Folder:</guilabel></term>
+<listitem><para>The toplevel folder of the project you want to import. The import starts from this folder and goes down recursively. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Vendor tag:</guilabel
-> <xref linkend="co-vendortag"/></term>
-<listitem
-><para
->The vendor tag is historically used for tracking third-party sources. Just use your user name if you have no better idea. It does not matter much what you enter here. </para
-></listitem>
+<term><guilabel>Vendor tag:</guilabel> <xref linkend="co-vendortag"/></term>
+<listitem><para>The vendor tag is historically used for tracking third-party sources. Just use your user name if you have no better idea. It does not matter much what you enter here. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Release tag:</guilabel
-> <xref linkend="co-releasetag"/></term>
-<listitem
-><para
->This tag is also historically used for importing different versions of third-party software. If you are not doing this, use the word <literal
->start</literal
-> or a string <literal
->FOO_1_0</literal
-> where <literal
->FOO</literal
-> is the name of your project and <literal
->1.0</literal
-> is the version number of the imported release. </para
-></listitem>
+<term><guilabel>Release tag:</guilabel> <xref linkend="co-releasetag"/></term>
+<listitem><para>This tag is also historically used for importing different versions of third-party software. If you are not doing this, use the word <literal>start</literal> or a string <literal>FOO_1_0</literal> where <literal>FOO</literal> is the name of your project and <literal>1.0</literal> is the version number of the imported release. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Ignore files:</guilabel
-></term>
-<listitem
-><para
->If you fill out this field, an additional <option
->-I <replaceable
->file names</replaceable
-></option
-> option is given go the <command
->cvs import</command
-> command. This entry is interpreted as a whitespace-separated list of file name patterns which are ignored. In general, a cleaner and less error-prone way to control which files go into the repository is to create a folder with only the files which you want to import and start from that. Nevertheless, this entry may be useful if the project contains files which are by default ignored by &CVS;, &eg; files with the name <filename
->core</filename
->. In such a case, simply enter the character <literal
->!</literal
-> in this field: this overrules &CVS;'s scheme of ignored files, see <xref linkend="ignoredfiles"/>. </para
-></listitem>
+<term><guilabel>Ignore files:</guilabel></term>
+<listitem><para>If you fill out this field, an additional <option>-I <replaceable>file names</replaceable></option> option is given go the <command>cvs import</command> command. This entry is interpreted as a whitespace-separated list of file name patterns which are ignored. In general, a cleaner and less error-prone way to control which files go into the repository is to create a folder with only the files which you want to import and start from that. Nevertheless, this entry may be useful if the project contains files which are by default ignored by &CVS;, &eg; files with the name <filename>core</filename>. In such a case, simply enter the character <literal>!</literal> in this field: this overrules &CVS;'s scheme of ignored files, see <xref linkend="ignoredfiles"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Comment:</guilabel
-> <xref linkend="co-comment"/></term>
-<listitem
-><para
->Use this field to record the comments you might have about the origin, use, development &etc; of the files you are importing. </para
-></listitem>
+<term><guilabel>Comment:</guilabel> <xref linkend="co-comment"/></term>
+<listitem><para>Use this field to record the comments you might have about the origin, use, development &etc; of the files you are importing. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Import as binaries</guilabel
-></term>
-<listitem
-><para
->If you check this box, all files are imported in binary mode, i.e. an argument <option
->-kb</option
-> is given to <command
->cvs import</command
->. </para
-></listitem>
+<term><guilabel>Import as binaries</guilabel></term>
+<listitem><para>If you check this box, all files are imported in binary mode, i.e. an argument <option>-kb</option> is given to <command>cvs import</command>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Use file's modification as time of import</guilabel
-></term>
-<listitem
-><para
->If you check this box, the time of import will be the file's modification time instead of the import time. </para
-></listitem>
+<term><guilabel>Use file's modification as time of import</guilabel></term>
+<listitem><para>If you check this box, the time of import will be the file's modification time instead of the import time. </para></listitem>
 </varlistentry>
 
 </variablelist>
 
 
-<para
->After you have filled out this form and confirmed by pressing <guibutton
->OK</guibutton
->, the following &CVS; command is used:</para>
-
-<screen
-><command
->cvs</command
-> -d <co id="co-repository"
-></co
-><replaceable
->repository</replaceable
-> import -m "<co id="co-comment"
-></co
->" <co id="co-module"
-></co
-><replaceable
->module</replaceable
-> <co id="co-vendortag"
-></co
-><replaceable
->vendortag</replaceable
-> <co id="co-releasetag"
-></co
-><replaceable
->releasetag</replaceable
-></screen>
+<para>After you have filled out this form and confirmed by pressing <guibutton>OK</guibutton>, the following &CVS; command is used:</para>
+
+<screen><command>cvs</command> -d <co id="co-repository"></co><replaceable>repository</replaceable> import -m "<co id="co-comment"></co>" <co id="co-module"></co><replaceable>module</replaceable> <co id="co-vendortag"></co><replaceable>vendortag</replaceable> <co id="co-releasetag"></co><replaceable>releasetag</replaceable></screen>
 
 </sect1>
 
 
 <sect1 id="checkingout">
-<title
->Checkout a Module From the Repository</title>
-<para
->Now that you successfully defined your repository location, and imported the initial files to the repository, it is time to retrieve the module from the &CVS; repository, creating your working copy. </para>
+<title>Checkout a Module From the Repository</title>
+<para>Now that you successfully defined your repository location, and imported the initial files to the repository, it is time to retrieve the module from the &CVS; repository, creating your working copy. </para>
 
-<para
->You should also know the name of the <firstterm
->branch</firstterm
-> or <firstterm
->tag</firstterm
-> you want to use. </para>
+<para>You should also know the name of the <firstterm>branch</firstterm> or <firstterm>tag</firstterm> you want to use. </para>
 
-<para
->Branches of a module are parallel versions of this module. A good real-life example of the use of this feature is the release of a software project. After a major release, there are bugs in the code that should be fixed, but people want to add new features to the application too. It is very hard to do both at the same time because new features usually introduce new bugs, making it hard to track down the old ones. To solve this dilemma, &CVS; lets you create a parallel version, that we will call the &quot;stable release branch&quot;, where you can only add bugfixes, leaving the main branch (HEAD) open for adding new features. </para>
+<para>Branches of a module are parallel versions of this module. A good real-life example of the use of this feature is the release of a software project. After a major release, there are bugs in the code that should be fixed, but people want to add new features to the application too. It is very hard to do both at the same time because new features usually introduce new bugs, making it hard to track down the old ones. To solve this dilemma, &CVS; lets you create a parallel version, that we will call the &quot;stable release branch&quot;, where you can only add bugfixes, leaving the main branch (HEAD) open for adding new features. </para>
 
-<para
->Tags are used to mark a version of a project. &CVS; stamps one version of each file with the tag, so when you checkout or update to a specific tag, you will get always the same file versions. Therefore, in opposition to branches, tags are not dynamic: you cannot develop a tag. Tags are useful to mark releases, big changes in the code &etc;. Using tags, you can easily return the project to a previous state, to reproduce and track bugs, generate the release code again &etc;. </para>
+<para>Tags are used to mark a version of a project. &CVS; stamps one version of each file with the tag, so when you checkout or update to a specific tag, you will get always the same file versions. Therefore, in opposition to branches, tags are not dynamic: you cannot develop a tag. Tags are useful to mark releases, big changes in the code &etc;. Using tags, you can easily return the project to a previous state, to reproduce and track bugs, generate the release code again &etc;. </para>
 
 <figure id="screenshot-checkout" float="1">
-<title
->A screenshot of &cervisia;'s checkout dialogue</title>
+<title>A screenshot of &cervisia;'s checkout dialogue</title>
 <mediaobject>
-<imageobject
-><imagedata format="PNG" fileref="checkout.png"/></imageobject>
-<textobject
-><phrase
->A screenshot of &cervisia;'s checkout dialogue</phrase
-></textobject>
+<imageobject><imagedata format="PNG" fileref="checkout.png"/></imageobject>
+<textobject><phrase>A screenshot of &cervisia;'s checkout dialogue</phrase></textobject>
 </mediaobject>
 </figure>
 
 <variablelist>
 
 <varlistentry>
-<term
-><guilabel
->Repository:</guilabel
-></term>
-<listitem
-><para
->The name of the &CVS; repository, also known as <filename
-><envar
->$CVSROOT</envar
-></filename
->. The drop-down box shows a list of the repositories you previously entered using the <guilabel
->Configure Access to Repositories</guilabel
-> dialogue box. If the repository is remote, make sure that authentication works. See <xref linkend="accessing-repository"/> for more information. </para
-></listitem>
+<term><guilabel>Repository:</guilabel></term>
+<listitem><para>The name of the &CVS; repository, also known as <filename><envar>$CVSROOT</envar></filename>. The drop-down box shows a list of the repositories you previously entered using the <guilabel>Configure Access to Repositories</guilabel> dialogue box. If the repository is remote, make sure that authentication works. See <xref linkend="accessing-repository"/> for more information. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Module:</guilabel
-></term>
-<listitem
-><para
->The name of the module to be checked out. If you are working with an existing repository, you can probably get this name from the system administrator; or, if it is an open-source repository, you can get the module names from the project web pages. If you want to create a new module from scratch using a local repository, just create a new folder in the local repository root folder. The name of the folder will be the same as the name of the empty module. </para>
-<para
->Alternatively, if the repository has a <filename
-><envar
->$CVSROOT</envar
->/modules</filename
-> file, you can retrieve a list of available modules by pressing the <guibutton
->Fetch list</guibutton
-> button. </para>
-<para
->Note that it is possible to checkout any existing subfolder of the module, without retrieving the rest of the module. Just enter the path to the subfolder as well. For instance, if you want to get only the <filename class="directory"
->doc/cervisia</filename
-> subfolder of the tdesdk module, enter <filename class="directory"
->tdesdk/doc/cervisia</filename
-> in this field. </para
-></listitem>
+<term><guilabel>Module:</guilabel></term>
+<listitem><para>The name of the module to be checked out. If you are working with an existing repository, you can probably get this name from the system administrator; or, if it is an open-source repository, you can get the module names from the project web pages. If you want to create a new module from scratch using a local repository, just create a new folder in the local repository root folder. The name of the folder will be the same as the name of the empty module. </para>
+<para>Alternatively, if the repository has a <filename><envar>$CVSROOT</envar>/modules</filename> file, you can retrieve a list of available modules by pressing the <guibutton>Fetch list</guibutton> button. </para>
+<para>Note that it is possible to checkout any existing subfolder of the module, without retrieving the rest of the module. Just enter the path to the subfolder as well. For instance, if you want to get only the <filename class="directory">doc/cervisia</filename> subfolder of the tdesdk module, enter <filename class="directory">tdesdk/doc/cervisia</filename> in this field. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Branch tag:</guilabel
-></term>
-<listitem
-><para
->The name of the branch or tag you want to check out. If you leave this field empty, &cervisia; will retrieve the main (HEAD) branch. </para
-></listitem>
+<term><guilabel>Branch tag:</guilabel></term>
+<listitem><para>The name of the branch or tag you want to check out. If you leave this field empty, &cervisia; will retrieve the main (HEAD) branch. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Working folder:</guilabel
-></term>
-<listitem
-><para
->The folder under which the module should be checked out. Note that the the working copy toplevel folder is named after the module you are retrieving, unless you give it an alternative name in the <guilabel
->Check out as:</guilabel
-> field. </para
-></listitem>
+<term><guilabel>Working folder:</guilabel></term>
+<listitem><para>The folder under which the module should be checked out. Note that the the working copy toplevel folder is named after the module you are retrieving, unless you give it an alternative name in the <guilabel>Check out as:</guilabel> field. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Check out as:</guilabel
-></term>
-<listitem
-><para
->This results in the working copy files being checked out to an alternative folder under the working folder rather than a folder named after the module. </para
-></listitem>
+<term><guilabel>Check out as:</guilabel></term>
+<listitem><para>This results in the working copy files being checked out to an alternative folder under the working folder rather than a folder named after the module. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Export only</guilabel
-></term>
-<listitem
-><para
->If you check this box, the files will be exported rather than checked out. Exporting obtains a copy of the source for the module without the CVS administrative folders. For example, export may be used to prepare the source code for a release. </para
-></listitem>
+<term><guilabel>Export only</guilabel></term>
+<listitem><para>If you check this box, the files will be exported rather than checked out. Exporting obtains a copy of the source for the module without the CVS administrative folders. For example, export may be used to prepare the source code for a release. </para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -799,242 +345,96 @@
 
 
 <sect1 id="mainscreen">
-<title
->The Main Screen, Viewing File Status and Updating</title>
-<para
->When you start &cervisia;, and open a working copy by choosing <menuchoice
-> <guimenu
->File</guimenu
-> <guimenuitem
->Open Sandbox...</guimenuitem
-> </menuchoice
->, you can see two main areas in &cervisia;'s main window: the top one is a hierarchical (tree) view of the current working copy; the bottom area is used to display the &CVS; commands &cervisia; issues to perform its tasks, as well as the output generated by these commands. </para>
-
-<para
->By default, &cervisia; does not display the files contained by the sub-folders, so you will have to click the folders you want to see. To display all files of the working copy, select <menuchoice
-> <guimenu
->View</guimenu
-> <guimenuitem
->Unfold File Tree</guimenuitem
-> </menuchoice
->. To close back all folders from the working copy, choose <menuchoice
-> <guimenu
->View</guimenu
-> <guimenuitem
->Fold File Tree</guimenuitem
-> </menuchoice
->. </para>
-
-<para
->According to the settings in your <filename
->.cvsignore</filename
-> files, the files you usually do not want to include into the repository - such as object files - are not shown in the tree view. For each file, you see its corresponding status. In the default setting, after opening the sandbox, this is "Unknown" because &cervisia; delays the fetching of information until you select the files and folders whose status you want to update or view and choose <menuchoice
-> <guimenu
->File</guimenu
-> <guimenuitem
->Update</guimenuitem
-> </menuchoice
-> or <menuchoice
-> <guimenu
->File</guimenu
-> <guimenuitem
->Status</guimenuitem
-> </menuchoice
->. With this approach, you have a minimal amount of functionality available even if you do not have a permanent connection to the &CVS; server. </para>
+<title>The Main Screen, Viewing File Status and Updating</title>
+<para>When you start &cervisia;, and open a working copy by choosing <menuchoice> <guimenu>File</guimenu> <guimenuitem>Open Sandbox...</guimenuitem> </menuchoice>, you can see two main areas in &cervisia;'s main window: the top one is a hierarchical (tree) view of the current working copy; the bottom area is used to display the &CVS; commands &cervisia; issues to perform its tasks, as well as the output generated by these commands. </para>
+
+<para>By default, &cervisia; does not display the files contained by the sub-folders, so you will have to click the folders you want to see. To display all files of the working copy, select <menuchoice> <guimenu>View</guimenu> <guimenuitem>Unfold File Tree</guimenuitem> </menuchoice>. To close back all folders from the working copy, choose <menuchoice> <guimenu>View</guimenu> <guimenuitem>Fold File Tree</guimenuitem> </menuchoice>. </para>
+
+<para>According to the settings in your <filename>.cvsignore</filename> files, the files you usually do not want to include into the repository - such as object files - are not shown in the tree view. For each file, you see its corresponding status. In the default setting, after opening the sandbox, this is "Unknown" because &cervisia; delays the fetching of information until you select the files and folders whose status you want to update or view and choose <menuchoice> <guimenu>File</guimenu> <guimenuitem>Update</guimenuitem> </menuchoice> or <menuchoice> <guimenu>File</guimenu> <guimenuitem>Status</guimenuitem> </menuchoice>. With this approach, you have a minimal amount of functionality available even if you do not have a permanent connection to the &CVS; server. </para>
 
 <figure id="screenshot-mainview" float="1">
-<title
->A screenshot of &cervisia;'s main view</title>
+<title>A screenshot of &cervisia;'s main view</title>
 <mediaobject>
-<imageobject
-><imagedata format="PNG" fileref="mainview.png"/></imageobject>
-<textobject
-><phrase
->A screenshot of &cervisia;'s main view</phrase
-></textobject>
+<imageobject><imagedata format="PNG" fileref="mainview.png"/></imageobject>
+<textobject><phrase>A screenshot of &cervisia;'s main view</phrase></textobject>
 </mediaobject>
 </figure>
 
-<para
->The commands in the File menu usually act only on the files which you have marked. You may also mark folders. Now choose <guimenuitem
->Status</guimenuitem
-> from the <guimenu
->File</guimenu
-> menu, press <keycap
->F5</keycap
-> or right click the marked files and choose the <menuchoice
-> <guisubmenu
->Status</guisubmenu
-> </menuchoice
-> menu item from the pop-up menu. &cervisia; issues a</para>
+<para>The commands in the File menu usually act only on the files which you have marked. You may also mark folders. Now choose <guimenuitem>Status</guimenuitem> from the <guimenu>File</guimenu> menu, press <keycap>F5</keycap> or right click the marked files and choose the <menuchoice> <guisubmenu>Status</guisubmenu> </menuchoice> menu item from the pop-up menu. &cervisia; issues a</para>
 
 <para>
-<screen
-><command
->cvs update -n <replaceable
->file names</replaceable
-></command
-></screen>
+<screen><command>cvs update -n <replaceable>file names</replaceable></command></screen>
 </para>
 
-<para
->command to get status information for the marked files. Note that &cervisia; goes recursively into subfolders only if you have the according option in the <guimenu
->Settings</guimenu
-> menu set. According to the respective file's status, you now see an entry in the <guilabel
->Status</guilabel
-> column: </para>
+<para>command to get status information for the marked files. Note that &cervisia; goes recursively into subfolders only if you have the according option in the <guimenu>Settings</guimenu> menu set. According to the respective file's status, you now see an entry in the <guilabel>Status</guilabel> column: </para>
 
 <variablelist>
 
 <varlistentry>
-<term
-><guilabel
->Locally Modified</guilabel
-></term>
-<listitem
-><para
->This means you have modified the file compared to the version in the repository. </para
-></listitem>
+<term><guilabel>Locally Modified</guilabel></term>
+<listitem><para>This means you have modified the file compared to the version in the repository. </para></listitem>
 </varlistentry>
 
 
 <varlistentry>
-<term
-><guilabel
->Locally Added</guilabel
-></term>
-<listitem
-><para
->This means the file does not exist in the repository, but in your working copy and you have scheduled it for addition. The actual insertion into the repository only happens after a commit. </para
-></listitem>
+<term><guilabel>Locally Added</guilabel></term>
+<listitem><para>This means the file does not exist in the repository, but in your working copy and you have scheduled it for addition. The actual insertion into the repository only happens after a commit. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Locally Removed</guilabel
-></term>
-<listitem
-><para
->This means you have scheduled the file for removal, but it still exists in the repository. The actual removal happens only after a commit. </para
-></listitem>
+<term><guilabel>Locally Removed</guilabel></term>
+<listitem><para>This means you have scheduled the file for removal, but it still exists in the repository. The actual removal happens only after a commit. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Needs Update</guilabel
-></term>
-<listitem
-><para
->This is shown if a newer version of the file exists in the repository, e.g. because someone committed a modification. Normally, you want to update this file so you have an up-to-date version in your folder. </para
-></listitem>
+<term><guilabel>Needs Update</guilabel></term>
+<listitem><para>This is shown if a newer version of the file exists in the repository, e.g. because someone committed a modification. Normally, you want to update this file so you have an up-to-date version in your folder. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Needs Patch</guilabel
-></term>
-<listitem
-><para
->This is essentially the same as before; the difference is that in case of an update, the &CVS; server transfers only a patch instead of the whole file to you. </para
-></listitem>
+<term><guilabel>Needs Patch</guilabel></term>
+<listitem><para>This is essentially the same as before; the difference is that in case of an update, the &CVS; server transfers only a patch instead of the whole file to you. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Needs Merge</guilabel
-></term>
-<listitem
-><para
->Indicates that a merge of the revision of this file in your working copy with the version in the repository is necessary. This typically happens if you have made modifications to the file while someone else has committed his modifications. If you choose to update, the modifications in the repository are merged into your file. In case of a conflict (i.e. if someone else has changed some of the same lines like you) the new status is then "Conflict". </para
-></listitem>
+<term><guilabel>Needs Merge</guilabel></term>
+<listitem><para>Indicates that a merge of the revision of this file in your working copy with the version in the repository is necessary. This typically happens if you have made modifications to the file while someone else has committed his modifications. If you choose to update, the modifications in the repository are merged into your file. In case of a conflict (i.e. if someone else has changed some of the same lines like you) the new status is then "Conflict". </para></listitem>
 </varlistentry>
        
 <varlistentry>
-<term
-><guilabel
->Up to Date</guilabel
-></term>
-<listitem
-><para
->Indicates that the file is identical with the version in the repository. </para
-></listitem>
+<term><guilabel>Up to Date</guilabel></term>
+<listitem><para>Indicates that the file is identical with the version in the repository. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Conflict</guilabel
-></term>
-<listitem
-><para
->This is shown if this file still has conflict markers in it. Maybe you have previously updated the file and not resolved the conflicts. </para
-></listitem>
+<term><guilabel>Conflict</guilabel></term>
+<listitem><para>This is shown if this file still has conflict markers in it. Maybe you have previously updated the file and not resolved the conflicts. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Not In CVS</guilabel
-></term>
-<listitem
-><para
->Indicates that the file is not registered in the &CVS; repository. If you want it to available for others, you should add it to the repository. If not, you may consider adding it to your <filename
->.cvsignore</filename
-> file. </para
-></listitem>
+<term><guilabel>Not In CVS</guilabel></term>
+<listitem><para>Indicates that the file is not registered in the &CVS; repository. If you want it to available for others, you should add it to the repository. If not, you may consider adding it to your <filename>.cvsignore</filename> file. </para></listitem>
 </varlistentry>
 
 </variablelist>
       
-<para
->Now that you have got an overview of the current status of the CVS, you may want to do an update. Mark some files (or the root of the folder tree which is equivalent to marking all files in this folder). Now choose <guimenuitem
->Update</guimenuitem
-> from the <guimenu
->File</guimenu
-> menu, or right-click the marked files and choose the <menuchoice
-> <guisubmenu
->Status</guisubmenu
-></menuchoice
-> menu item from the pop-up menu. (Of course, you could have chosen this at the beginning of the session). For some of the files the status may change now. Typically, files which had "Needs Patch" or "Needs Update" are updated. So the following new items are possible in the status column: </para>
+<para>Now that you have got an overview of the current status of the CVS, you may want to do an update. Mark some files (or the root of the folder tree which is equivalent to marking all files in this folder). Now choose <guimenuitem>Update</guimenuitem> from the <guimenu>File</guimenu> menu, or right-click the marked files and choose the <menuchoice> <guisubmenu>Status</guisubmenu></menuchoice> menu item from the pop-up menu. (Of course, you could have chosen this at the beginning of the session). For some of the files the status may change now. Typically, files which had "Needs Patch" or "Needs Update" are updated. So the following new items are possible in the status column: </para>
       
 <variablelist>
 
 <varlistentry>
-<term
-><guilabel
->Updated</guilabel
-></term>
-<listitem
-><para
->Shown if the file was updated from the repository. </para
-></listitem>
+<term><guilabel>Updated</guilabel></term>
+<listitem><para>Shown if the file was updated from the repository. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Patched</guilabel
-></term>
-<listitem
-><para
->Indicates that the &CVS; server has sent a patch for this file and the patch has been successfully applied. If the patch was not successful because there was a conflict between your modifications and those someone else committed to the repository, the status is now <guilabel
->Conflict</guilabel
->. </para
-></listitem>
+<term><guilabel>Patched</guilabel></term>
+<listitem><para>Indicates that the &CVS; server has sent a patch for this file and the patch has been successfully applied. If the patch was not successful because there was a conflict between your modifications and those someone else committed to the repository, the status is now <guilabel>Conflict</guilabel>. </para></listitem>
 </varlistentry>
 
 </variablelist>
       
-<para
->You may have noticed that according to the status of the file, its row has a different colour. The colours are chosen to somehow reflect the priority of the status. For example, a file with a conflict is marked red to show you that you have to resolve a conflict before you can continue working with the file. If your folder contains a high number of files, you may nevertheless lose the overview. To get more concise information about which files have an unusual status, simply click on the header of the <guilabel
->Status</guilabel
-> column. The file list is then sorted by priority, so you have all important information at the top of the list. To get back to the alphabetically sorted view, click on the header of the <guilabel
->File name</guilabel
-> column. </para>
+<para>You may have noticed that according to the status of the file, its row has a different colour. The colours are chosen to somehow reflect the priority of the status. For example, a file with a conflict is marked red to show you that you have to resolve a conflict before you can continue working with the file. If your folder contains a high number of files, you may nevertheless lose the overview. To get more concise information about which files have an unusual status, simply click on the header of the <guilabel>Status</guilabel> column. The file list is then sorted by priority, so you have all important information at the top of the list. To get back to the alphabetically sorted view, click on the header of the <guilabel>File name</guilabel> column. </para>
 
 </sect1>
 
@@ -1042,404 +442,156 @@
 
    
 <chapter id="workingwithfiles">
-<title
->Working With Files</title>
-
-<para
->All commonly used &CVS; functionality is directly available in &cervisia;'s main view. Commands usually act on several files at once, namely all which currently selected. If the selection includes folders, its interpretation depends on the settings made under the <guimenu
->Settings</guimenu
-> menu. For example, if <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Commit and Remove Recursively</guimenuitem
-></menuchoice
-> is checked and you choose <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Commit...</guimenuitem
-></menuchoice
-> while a folder is selected, then all files in the tree under that folder are committed. Otherwise, only the regular files in the folder itself are affected. </para>
+<title>Working With Files</title>
+
+<para>All commonly used &CVS; functionality is directly available in &cervisia;'s main view. Commands usually act on several files at once, namely all which currently selected. If the selection includes folders, its interpretation depends on the settings made under the <guimenu>Settings</guimenu> menu. For example, if <menuchoice><guimenu>Settings</guimenu><guimenuitem>Commit and Remove Recursively</guimenuitem></menuchoice> is checked and you choose <menuchoice><guimenu>File</guimenu><guimenuitem>Commit...</guimenuitem></menuchoice> while a folder is selected, then all files in the tree under that folder are committed. Otherwise, only the regular files in the folder itself are affected. </para>
 
 <figure id="screenshot-popup" float="1">
-<title
->A screenshot of &cervisia;'s pop-up menu</title>
+<title>A screenshot of &cervisia;'s pop-up menu</title>
 <mediaobject>
-<imageobject
-><imagedata format="PNG" fileref="popup.png"/></imageobject>
+<imageobject><imagedata format="PNG" fileref="popup.png"/></imageobject>
 </mediaobject>
 </figure>
 
-<para
->The most used actions are also available by right-clicking the files in the tree view, through the pop-up menu. <xref linkend="screenshot-popup"/> shows &cervisia;'s main window pop-up menu. </para>
+<para>The most used actions are also available by right-clicking the files in the tree view, through the pop-up menu. <xref linkend="screenshot-popup"/> shows &cervisia;'s main window pop-up menu. </para>
 
-<para
->You can simply edit a file by double-clicking on it or selecting it and pressing <keycap
->Return</keycap
->. This starts the default application that handles that file type (the default application for each file type is a KDE wide setting). If the default application is not the one you want to use, you can right click the file and choose the <menuchoice
-> <guisubmenu
->Edit With</guisubmenu
-> </menuchoice
-> submenu, and select one of the other applications that handle that file type. </para>
+<para>You can simply edit a file by double-clicking on it or selecting it and pressing <keycap>Return</keycap>. This starts the default application that handles that file type (the default application for each file type is a KDE wide setting). If the default application is not the one you want to use, you can right click the file and choose the <menuchoice> <guisubmenu>Edit With</guisubmenu> </menuchoice> submenu, and select one of the other applications that handle that file type. </para>
 
 <sect1 id="addingfiles">
-<title
->Adding Files</title>
-
-<para
->Adding files to a project requires two steps: first, the files must be registered with &CVS;, or in other words, <emphasis
->added to the repository</emphasis
->. This is necessary, but not sufficient. In order to actually put the files into the repository, you must <emphasis
->commit</emphasis
-> them. This procedure has an important advantage: you can commit the files together with modifications to other parts of the project. When doing this, one can easily see (&eg; in commit emails) that all these changes are part of a whole. </para>
-
-<para
->To this end, mark all files to be added in &cervisia;'s main view. Then, choose <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Add to Repository...</guimenuitem
-></menuchoice
->, or right click the marked files and choose <guimenuitem
->Add to Repository...</guimenuitem
->. The <guilabel
->CVS Add</guilabel
-> dialogue will appear, listing the files you marked, and asks for confirmation. Press <guibutton
->OK</guibutton
->. </para>
-
-<para
->&cervisia; issues a command</para>
+<title>Adding Files</title>
+
+<para>Adding files to a project requires two steps: first, the files must be registered with &CVS;, or in other words, <emphasis>added to the repository</emphasis>. This is necessary, but not sufficient. In order to actually put the files into the repository, you must <emphasis>commit</emphasis> them. This procedure has an important advantage: you can commit the files together with modifications to other parts of the project. When doing this, one can easily see (&eg; in commit emails) that all these changes are part of a whole. </para>
+
+<para>To this end, mark all files to be added in &cervisia;'s main view. Then, choose <menuchoice><guimenu>File</guimenu><guimenuitem>Add to Repository...</guimenuitem></menuchoice>, or right click the marked files and choose <guimenuitem>Add to Repository...</guimenuitem>. The <guilabel>CVS Add</guilabel> dialogue will appear, listing the files you marked, and asks for confirmation. Press <guibutton>OK</guibutton>. </para>
+
+<para>&cervisia; issues a command</para>
 
 <para>
-<screen
-><command
->cvs add <replaceable
->file names</replaceable
-></command
-></screen>
+<screen><command>cvs add <replaceable>file names</replaceable></command></screen>
 </para>
 
-<para
->If the operation was successful, the status column should have "Added to repository" for the added files. </para>
-
-<warning
-><para
->&CVS; is not designed to provide meaningful revision control for binary files. For example, merging binary files normally does not make sense. Furthermore, by default &CVS; performs keyword expansion (&eg; on the string <literal
->&dollar;Revision: 1.6 &dollar;</literal
->) when a file is committed. In binary files, such replacements may corrupt the file and make it completely unusable. </para
-></warning>
-
-<para
->In order to switch the above behaviour off, you should commit binary files (or other files, like Postscript or PNG images) by choosing <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Add Binary...</guimenuitem
-></menuchoice
->. The <guilabel
->CVS Add</guilabel
-> dialogue will appear, listing the binary files you marked, and asks for confirmation. Press <guibutton
->OK</guibutton
->. </para>
-
-<para
->&cervisia; issues a command </para>
+<para>If the operation was successful, the status column should have "Added to repository" for the added files. </para>
+
+<warning><para>&CVS; is not designed to provide meaningful revision control for binary files. For example, merging binary files normally does not make sense. Furthermore, by default &CVS; performs keyword expansion (&eg; on the string <literal>&dollar;Revision: 1.6 &dollar;</literal>) when a file is committed. In binary files, such replacements may corrupt the file and make it completely unusable. </para></warning>
+
+<para>In order to switch the above behaviour off, you should commit binary files (or other files, like Postscript or PNG images) by choosing <menuchoice><guimenu>File</guimenu><guimenuitem>Add Binary...</guimenuitem></menuchoice>. The <guilabel>CVS Add</guilabel> dialogue will appear, listing the binary files you marked, and asks for confirmation. Press <guibutton>OK</guibutton>. </para>
+
+<para>&cervisia; issues a command </para>
 
 <para>
-<screen
-><command
->cvs add -kb <replaceable
->file names</replaceable
-></command
-></screen>
+<screen><command>cvs add -kb <replaceable>file names</replaceable></command></screen>
 </para>
 
 </sect1>
 
 
 <sect1 id="removingfiles">
-<title
->Removing Files</title>
-
-<para
->Like adding files, removing files is done in two steps: First, the files have to be registered as removed by choosing <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Remove From Repository...</guimenuitem
-></menuchoice
-> or right clicking the marked files and choosing <guimenuitem
->Remove From Repository...</guimenuitem
-> from the pop-up menu. The <guilabel
->CVS Remove</guilabel
-> dialogue will appear, listing the files you marked, and asking for confirmation. Press <guibutton
->OK</guibutton
->. &cervisia; issues the command </para>
+<title>Removing Files</title>
+
+<para>Like adding files, removing files is done in two steps: First, the files have to be registered as removed by choosing <menuchoice><guimenu>File</guimenu><guimenuitem>Remove From Repository...</guimenuitem></menuchoice> or right clicking the marked files and choosing <guimenuitem>Remove From Repository...</guimenuitem> from the pop-up menu. The <guilabel>CVS Remove</guilabel> dialogue will appear, listing the files you marked, and asking for confirmation. Press <guibutton>OK</guibutton>. &cervisia; issues the command </para>
 <para>
-<screen
-><command
->cvs remove -f <replaceable
->file names</replaceable
-></command
-></screen>
+<screen><command>cvs remove -f <replaceable>file names</replaceable></command></screen>
 </para>
 
-<para
->After that, this modification to the sandbox has to be committed, possibly together with other modifications to the project. </para>
+<para>After that, this modification to the sandbox has to be committed, possibly together with other modifications to the project. </para>
 
-<note
-><para
->The above command only works if the file is up-to-date. Otherwise, you get an error message. This behaviour is sensible: If you have modified the file compared to the version in the repository, or if someone else has made any modifications, you will first want to check if you really want to discard them. </para
-></note>
+<note><para>The above command only works if the file is up-to-date. Otherwise, you get an error message. This behaviour is sensible: If you have modified the file compared to the version in the repository, or if someone else has made any modifications, you will first want to check if you really want to discard them. </para></note>
 
 </sect1>
    
    
 <sect1 id="addingremovingdirs">
-<title
->Adding and Removing Folders</title>
-
-<para
->Folders are handled fundamentally different from ordinary files by &CVS;. They are not under revision control, i.e. you cannot tell which folders existed in the project at a certain time. Furthermore, folders can never be explicitly removed (expect by removing them directly in the repository). </para>
-
-<para
->As a substitute, &CVS; follows the convention that a folder is "non-existent" in a version of the project if it is empty. This convention can be enforced by using the option <option
->-P</option
-> to <command
->cvs update</command
-> and <command
->cvs checkout</command
->. This option can be set in the menu <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Prune Empty Folders on Update</guimenuitem
-></menuchoice
->. </para>
-
-<para
->A folder can be added to the repository choosing <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Add to Repository...</guimenuitem
-></menuchoice
-> or right clicking the marked folder and choosing <guimenuitem
->Add to Repository...</guimenuitem
-> from the pop-up menu. Note that in contrast to adding files, adding folders does not require a commit afterwards. &cervisia; issues the command </para>
+<title>Adding and Removing Folders</title>
+
+<para>Folders are handled fundamentally different from ordinary files by &CVS;. They are not under revision control, i.e. you cannot tell which folders existed in the project at a certain time. Furthermore, folders can never be explicitly removed (expect by removing them directly in the repository). </para>
+
+<para>As a substitute, &CVS; follows the convention that a folder is "non-existent" in a version of the project if it is empty. This convention can be enforced by using the option <option>-P</option> to <command>cvs update</command> and <command>cvs checkout</command>. This option can be set in the menu <menuchoice><guimenu>Settings</guimenu><guimenuitem>Prune Empty Folders on Update</guimenuitem></menuchoice>. </para>
+
+<para>A folder can be added to the repository choosing <menuchoice><guimenu>File</guimenu><guimenuitem>Add to Repository...</guimenuitem></menuchoice> or right clicking the marked folder and choosing <guimenuitem>Add to Repository...</guimenuitem> from the pop-up menu. Note that in contrast to adding files, adding folders does not require a commit afterwards. &cervisia; issues the command </para>
 
 
 <para>
-<screen
-><command
->cvs add <replaceable
->dirname</replaceable
-></command
-></screen>
+<screen><command>cvs add <replaceable>dirname</replaceable></command></screen>
 </para>
 
 </sect1>
 
 
 <sect1 id="committingfiles">
-<title
->Committing Files</title>
-
-<para
->When you have made a certain number of changes to your working copy, and you want other developers to have access to them, you <emphasis
->commit</emphasis
-> them. With a commit, you place your versions of the modified files as new revisions into the repository. A subsequent update by another developer will bring your modifications into their working copy. </para>
-
-<para
->In order to commit a couple of files, select them in &cervisia;'s main view and choose <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Commit...</guimenuitem
-></menuchoice
-> or right click the marked files and choose <guimenuitem
->Commit...</guimenuitem
-> from the pop-up menu. </para>
+<title>Committing Files</title>
+
+<para>When you have made a certain number of changes to your working copy, and you want other developers to have access to them, you <emphasis>commit</emphasis> them. With a commit, you place your versions of the modified files as new revisions into the repository. A subsequent update by another developer will bring your modifications into their working copy. </para>
+
+<para>In order to commit a couple of files, select them in &cervisia;'s main view and choose <menuchoice><guimenu>File</guimenu><guimenuitem>Commit...</guimenuitem></menuchoice> or right click the marked files and choose <guimenuitem>Commit...</guimenuitem> from the pop-up menu. </para>
 
 <figure id="screenshot-commit" float="1">
-<title
->A screenshot of &cervisia;'s commit dialogue</title>
+<title>A screenshot of &cervisia;'s commit dialogue</title>
 <mediaobject>
-<imageobject
-><imagedata format="PNG" fileref="commit.png"/></imageobject>
+<imageobject><imagedata format="PNG" fileref="commit.png"/></imageobject>
 </mediaobject>
 </figure>
 
-<para
->You get a dialogue that shows you a list of the selected files on the top section and a log message for your changes below. &cervisia; helps you in several ways to find a meaningful log message: first, in the file list you can double-click a file or press <keycap
->Return</keycap
-> in order to see the changes you have made to the file. Second, it gives you a list of log messages you have previously used in a combo box. Third, this dialogue is integrated with &cervisia;'s changelog editor described below. When you have finished the dialogue, the command </para>
+<para>You get a dialogue that shows you a list of the selected files on the top section and a log message for your changes below. &cervisia; helps you in several ways to find a meaningful log message: first, in the file list you can double-click a file or press <keycap>Return</keycap> in order to see the changes you have made to the file. Second, it gives you a list of log messages you have previously used in a combo box. Third, this dialogue is integrated with &cervisia;'s changelog editor described below. When you have finished the dialogue, the command </para>
 
 <para>
-<screen
-><command
->cvs commit -m <replaceable
->message</replaceable
-> <replaceable
->file names</replaceable
-></command
-></screen>
+<screen><command>cvs commit -m <replaceable>message</replaceable> <replaceable>file names</replaceable></command></screen>
 </para>
 
-<para
->is used. </para>
+<para>is used. </para>
 
 
-<note
-><para
->A common error you may encounter when committing is <errorname
->Up-to-date check failed</errorname
->. This indicates that someone has committed changes to the repository since you last updated; or, more technically, that your <literal
->BASE</literal
-> revision is not the newest on its branch. In such a case, &CVS; refuses to merge your modifications into the repository. The solution is to update, resolve any conflicts and commit again. Of course, if you are working on a software project, it is normally good style to check if the program still works after you have updated - after all, there could be bad interactions between your modifications and the other modifications which break the code. </para
-></note>
+<note><para>A common error you may encounter when committing is <errorname>Up-to-date check failed</errorname>. This indicates that someone has committed changes to the repository since you last updated; or, more technically, that your <literal>BASE</literal> revision is not the newest on its branch. In such a case, &CVS; refuses to merge your modifications into the repository. The solution is to update, resolve any conflicts and commit again. Of course, if you are working on a software project, it is normally good style to check if the program still works after you have updated - after all, there could be bad interactions between your modifications and the other modifications which break the code. </para></note>
 
 <note>
-<para
->Another popular mistake results in the error message <errorname
->Sticky tag 'X' for file 'X' is not a branch</errorname
->. This happens if you try to commit a file which you have previously brought to a certain revision or tag with the command </para>
+<para>Another popular mistake results in the error message <errorname>Sticky tag 'X' for file 'X' is not a branch</errorname>. This happens if you try to commit a file which you have previously brought to a certain revision or tag with the command </para>
 <para>
-<screen
-><prompt
->%</prompt
-><userinput
->cvs update -r X</userinput
-></screen>
+<screen><prompt>%</prompt><userinput>cvs update -r X</userinput></screen>
 </para>
-<para
->(which is &eg; used by the menu item <menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Update to Tag/Date...</guimenuitem
-></menuchoice
->). In such a case, the tag on the file gets sticky, i.e. further updates do not bring you to the newest revision on the branch. If you want to commit further revisions to the branch, you have to update to the branch tag before you do further commits. </para>
+<para>(which is &eg; used by the menu item <menuchoice><guimenu>Advanced</guimenu><guimenuitem>Update to Tag/Date...</guimenuitem></menuchoice>). In such a case, the tag on the file gets sticky, i.e. further updates do not bring you to the newest revision on the branch. If you want to commit further revisions to the branch, you have to update to the branch tag before you do further commits. </para>
 </note>
 
-<para
->With &cervisia;, it is quite easy to maintain a ChangeLog file that is compliant with the format laid out in the GNU coding guidelines. To use it, choose <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Insert ChangeLog Entry...</guimenuitem
-></menuchoice
->. If a file with the name <filename
->ChangeLog</filename
-> exists in the toplevel folder of your sandbox, this file will be loaded and you have the possibility to edit it. To this end, at the top of the file, an entry with the current date and your user name (which can be configured as described in <xref linkend="customize-general"/>) is inserted. When you finish the dialogue this dialogue by clicking <guibutton
->OK</guibutton
->, the next commit dialogue you open will have the log message set to the message you last entered in the ChangeLog. </para>
+<para>With &cervisia;, it is quite easy to maintain a ChangeLog file that is compliant with the format laid out in the GNU coding guidelines. To use it, choose <menuchoice><guimenu>File</guimenu><guimenuitem>Insert ChangeLog Entry...</guimenuitem></menuchoice>. If a file with the name <filename>ChangeLog</filename> exists in the toplevel folder of your sandbox, this file will be loaded and you have the possibility to edit it. To this end, at the top of the file, an entry with the current date and your user name (which can be configured as described in <xref linkend="customize-general"/>) is inserted. When you finish the dialogue this dialogue by clicking <guibutton>OK</guibutton>, the next commit dialogue you open will have the log message set to the message you last entered in the ChangeLog. </para>
 
 </sect1>
 
 
 <sect1 id="resolvingconflicts">
-<title
->Resolving Conflicts</title>
+<title>Resolving Conflicts</title>
 
-<para
->Conflicts may occur whenever you have made changes to a file which was also modified by another developer. The conflict is detected by &CVS; when you update the modified file; &CVS; then tries to merge the modifications committed by the other developer into your working copy. The merge fails if both your and his modifications are in overlapping parts of the file, and the &CVS; server issues an error message. </para>
+<para>Conflicts may occur whenever you have made changes to a file which was also modified by another developer. The conflict is detected by &CVS; when you update the modified file; &CVS; then tries to merge the modifications committed by the other developer into your working copy. The merge fails if both your and his modifications are in overlapping parts of the file, and the &CVS; server issues an error message. </para>
 
-<para
->In &cervisia;'s main view, files with conflicts are indicated with "Conflict" in the status column and with a red colour. It is your job now to resolve these conflicts before you commit the file. &CVS; will refuse to commit any files with conflicts until they have been edited. From the main view, you can of course resolve conflicts the traditional way: just double-click the file in question and edit it with your favourite editor.</para>
+<para>In &cervisia;'s main view, files with conflicts are indicated with "Conflict" in the status column and with a red colour. It is your job now to resolve these conflicts before you commit the file. &CVS; will refuse to commit any files with conflicts until they have been edited. From the main view, you can of course resolve conflicts the traditional way: just double-click the file in question and edit it with your favourite editor.</para>
 
-<para
->&CVS; marks the conflicting changes by placing marks in the middle of the files, in the following manner:</para>
+<para>&CVS; marks the conflicting changes by placing marks in the middle of the files, in the following manner:</para>
 
-<screen
->&lt;&lt;&lt;&lt;&lt;&lt;&lt;
+<screen>&lt;&lt;&lt;&lt;&lt;&lt;&lt;
 Changes in your working copy
 =======
 Changes in the repository
 &gt;&gt;&gt;&gt;&gt;&gt;&gt; revision_number
 </screen>
 
-<para
->You should replace this whole block with the new merged version. Of course, you have a great amount of freedom when resolving a set of conflicts: you can for each conflict decide to take one of the two alternative versions. You can also decide that both approaches are are broken and rewrite a whole routine or the complete file from scratch. </para>
-
-<para
->Fortunately, &cervisia; offers a nicer interface for handling these conflicts. This does not mean that you will never need to manually edit the files, but at least can eliminate the need to do so for the trivial conflict resolution. To use &cervisia;'s <guilabel
->CVS Resolve</guilabel
-> dialogue choose <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Resolve...</guimenuitem
-></menuchoice
-> or right click the marked file and choose <guimenuitem
->Resolve...</guimenuitem
-> from the pop-up menu. </para>
+<para>You should replace this whole block with the new merged version. Of course, you have a great amount of freedom when resolving a set of conflicts: you can for each conflict decide to take one of the two alternative versions. You can also decide that both approaches are are broken and rewrite a whole routine or the complete file from scratch. </para>
+
+<para>Fortunately, &cervisia; offers a nicer interface for handling these conflicts. This does not mean that you will never need to manually edit the files, but at least can eliminate the need to do so for the trivial conflict resolution. To use &cervisia;'s <guilabel>CVS Resolve</guilabel> dialogue choose <menuchoice><guimenu>File</guimenu><guimenuitem>Resolve...</guimenuitem></menuchoice> or right click the marked file and choose <guimenuitem>Resolve...</guimenuitem> from the pop-up menu. </para>
 
 <figure id="screenshot-resolve" float="1">
-<title
->A screenshot of &cervisia;'s resolve dialogue</title>
+<title>A screenshot of &cervisia;'s resolve dialogue</title>
 <mediaobject>
-<imageobject
-><imagedata format="PNG" fileref="resolve.png"/></imageobject>
-<textobject
-><phrase
->A screenshot of &cervisia;'s resolve dialogue</phrase
-></textobject>
+<imageobject><imagedata format="PNG" fileref="resolve.png"/></imageobject>
+<textobject><phrase>A screenshot of &cervisia;'s resolve dialogue</phrase></textobject>
 </mediaobject>
 </figure>
 
-<para
->On the top of the dialogue, you see <guilabel
->Your version (A)</guilabel
-> of the file on the left hand side and the version in the repository, <guilabel
->Other version (B)</guilabel
->, on the right hand side. The differences between them are marked in red colour. Below these two versions, you can see the <guilabel
->Merged version</guilabel
->. The merged version reflects what that section will be in your working copy if you press the <guibutton
->Save</guibutton
-> button. </para>
-
-<para
->You can go back and forward between the conflicting sections by pressing <guibutton
->&lt;&lt;</guibutton
-> and <guibutton
->&gt;&gt;</guibutton
->. In the lower middle of the dialogue you can see which section is currently marked. For example, <literal
->2 of 3</literal
-> means that you are currently at the second differing section of 3 total. </para>
-
-<para
->Now can can decide section by section which version you want to have in the merged file. By pressing <guibutton
->A</guibutton
->, you take over the version you edited. By pressing <guibutton
->B</guibutton
->, you take over the version from the repository. By pressing <guibutton
->A+B</guibutton
->, both versions will be added, and your version will come first. <guibutton
->B+A</guibutton
-> yields the same result, but the order will be different: first the repository version, then yours. </para>
-
-<para
->If you are not happy with any of these versions, press <guibutton
->Edit</guibutton
-> to open a simple text editor where you can edit the section. When you are finished editing, press <guibutton
->OK</guibutton
-> to return to the <guilabel
->CVS Resolve</guilabel
-> dialogue and resume solving conflicts. You will see the section you just edited in the <guilabel
->Merged version</guilabel
->, with your modifications. </para>
-
-<para
->To save your modifications, overwriting the working copy version, press <guibutton
->Save</guibutton
->. Note that this will save the choices not only the section you are currently viewing, but all sections in the file. If you want to save it to another file, press <guibutton
->Save As...</guibutton
->. Press <guibutton
->Close</guibutton
-> to exit the dialogue. If you close the dialogue without saving, the changes you made will be lost. </para>
+<para>On the top of the dialogue, you see <guilabel>Your version (A)</guilabel> of the file on the left hand side and the version in the repository, <guilabel>Other version (B)</guilabel>, on the right hand side. The differences between them are marked in red colour. Below these two versions, you can see the <guilabel>Merged version</guilabel>. The merged version reflects what that section will be in your working copy if you press the <guibutton>Save</guibutton> button. </para>
+
+<para>You can go back and forward between the conflicting sections by pressing <guibutton>&lt;&lt;</guibutton> and <guibutton>&gt;&gt;</guibutton>. In the lower middle of the dialogue you can see which section is currently marked. For example, <literal>2 of 3</literal> means that you are currently at the second differing section of 3 total. </para>
+
+<para>Now can can decide section by section which version you want to have in the merged file. By pressing <guibutton>A</guibutton>, you take over the version you edited. By pressing <guibutton>B</guibutton>, you take over the version from the repository. By pressing <guibutton>A+B</guibutton>, both versions will be added, and your version will come first. <guibutton>B+A</guibutton> yields the same result, but the order will be different: first the repository version, then yours. </para>
+
+<para>If you are not happy with any of these versions, press <guibutton>Edit</guibutton> to open a simple text editor where you can edit the section. When you are finished editing, press <guibutton>OK</guibutton> to return to the <guilabel>CVS Resolve</guilabel> dialogue and resume solving conflicts. You will see the section you just edited in the <guilabel>Merged version</guilabel>, with your modifications. </para>
+
+<para>To save your modifications, overwriting the working copy version, press <guibutton>Save</guibutton>. Note that this will save the choices not only the section you are currently viewing, but all sections in the file. If you want to save it to another file, press <guibutton>Save As...</guibutton>. Press <guibutton>Close</guibutton> to exit the dialogue. If you close the dialogue without saving, the changes you made will be lost. </para>
 
 </sect1>
 
@@ -1447,638 +599,245 @@ Changes in the repository
 
 
 <chapter id="obtaininginformation">
-<title
->Obtaining Information About Files and Creating Patches</title>
+<title>Obtaining Information About Files and Creating Patches</title>
 
 <sect1 id="diff">
-<title
->Watching Differences Between Revisions</title>
+<title>Watching Differences Between Revisions</title>
 
-<para
->There are several places in &cervisia; where you can ask for a window showing the differences between revisions of a file: </para>
+<para>There are several places in &cervisia; where you can ask for a window showing the differences between revisions of a file: </para>
 
 <itemizedlist>
 
-<listitem
-><para
->In the main view, you can choose <menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Difference to Repository (BASE)...</guimenuitem
-></menuchoice
->. This is based on the command <command
->cvs diff</command
-> and shows you the differences between the version in your sandbox and the version to which you last updated (also known as <literal
->BASE</literal
->). This is in particular useful just before you commit a file, so you can find an appropriate log message. </para
-></listitem>
-
-<listitem
-><para
->You can view the differences between the version in your sandbox and the version in the main development branch (also called <literal
->HEAD</literal
->) by choosing <menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Difference to Repository (HEAD)...</guimenuitem
-></menuchoice
->. </para
-></listitem>
-
-<listitem
-><para
->You can view the differences between the last two revisions of the selected file choosing <menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Last Change...</guimenuitem
-></menuchoice
->. </para
-></listitem>
-
-<listitem
-><para
->You can access the <guimenuitem
->Difference to Repository (BASE)...</guimenuitem
->, <guimenuitem
->Difference to Repository (HEAD)...</guimenuitem
-> and <guimenuitem
->Last Change...</guimenuitem
-> menu items from the main view pop-up menu, by right-clicking the file you want to view. </para
-></listitem>
-
-<listitem
-><para
->In the dialogue that is shown when a you commit a set of files, you can request a difference window by selecting a file name in the selection list, either by double-clicking it or by pressing <keycap
->Return</keycap
->. This is quite similar to using <menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Difference to Repository (BASE)...</guimenuitem
-></menuchoice
-> with the respective file in the main view. </para
-></listitem>
-
-<listitem
-><para
->In the Browse Logs dialogue, you can mark two revisions of a file and request a dialogue showing the differences between them (see <xref linkend="browsinglogs"/>). </para
-></listitem>
+<listitem><para>In the main view, you can choose <menuchoice><guimenu>View</guimenu><guimenuitem>Difference to Repository (BASE)...</guimenuitem></menuchoice>. This is based on the command <command>cvs diff</command> and shows you the differences between the version in your sandbox and the version to which you last updated (also known as <literal>BASE</literal>). This is in particular useful just before you commit a file, so you can find an appropriate log message. </para></listitem>
+
+<listitem><para>You can view the differences between the version in your sandbox and the version in the main development branch (also called <literal>HEAD</literal>) by choosing <menuchoice><guimenu>View</guimenu> <guimenuitem>Difference to Repository (HEAD)...</guimenuitem></menuchoice>. </para></listitem>
+
+<listitem><para>You can view the differences between the last two revisions of the selected file choosing <menuchoice><guimenu>View</guimenu> <guimenuitem>Last Change...</guimenuitem></menuchoice>. </para></listitem>
+
+<listitem><para>You can access the <guimenuitem>Difference to Repository (BASE)...</guimenuitem>, <guimenuitem>Difference to Repository (HEAD)...</guimenuitem> and <guimenuitem>Last Change...</guimenuitem> menu items from the main view pop-up menu, by right-clicking the file you want to view. </para></listitem>
+
+<listitem><para>In the dialogue that is shown when a you commit a set of files, you can request a difference window by selecting a file name in the selection list, either by double-clicking it or by pressing <keycap>Return</keycap>. This is quite similar to using <menuchoice><guimenu>View</guimenu><guimenuitem>Difference to Repository (BASE)...</guimenuitem></menuchoice> with the respective file in the main view. </para></listitem>
+
+<listitem><para>In the Browse Logs dialogue, you can mark two revisions of a file and request a dialogue showing the differences between them (see <xref linkend="browsinglogs"/>). </para></listitem>
 
 </itemizedlist>
 
-<para
->As you may have expected, &cervisia; does not just dump the output of the <command
->diff</command
-> command into your terminal, but shows you a graphical view as seen in <xref linkend="screenshot-log"/>. </para>
+<para>As you may have expected, &cervisia; does not just dump the output of the <command>diff</command> command into your terminal, but shows you a graphical view as seen in <xref linkend="screenshot-log"/>. </para>
 
 <figure id="screenshot-log" float="1">
-<title
->A screenshot of &cervisia;'s diff dialogue</title>
+<title>A screenshot of &cervisia;'s diff dialogue</title>
 <mediaobject>
-<imageobject
-><imagedata format="PNG" fileref="diff.png"/></imageobject>
-<textobject
-><phrase
->A screenshot of &cervisia;'s diff dialogue</phrase
-></textobject>
+<imageobject><imagedata format="PNG" fileref="diff.png"/></imageobject>
+<textobject><phrase>A screenshot of &cervisia;'s diff dialogue</phrase></textobject>
 </mediaobject>
 </figure>
 
-<para
->The text in the dialogue is an improved variant of the text given by the diff command with the <option
->-u</option
-> option. You can see the differing versions in two windows, with lines arranged such that you can do a side-by-side comparison. That means, where text has been added or deleted, the respective window shows empty lines with the marker <literal
->+++++</literal
-> at the left hand side. Elsewhere, you can see the running number of each line in the left column. </para>
-
-<para
->In the second column in the right window, you can see which kind of change has been made. Possible types are <literal
->Add</literal
->, <literal
->Delete</literal
-> and <literal
->Change</literal
->. The respective lines are marked in blue, green and red colour. In the middle of the dialogue a compressed image of the colour markers is shown. In this way, you can get a quick overview of the overall changes to the file. You can also use the position of the coloured regions in the compressed image as an orientation when you using the scroll bars. </para>
-
-<para
->Normally, the scrollbars at the left and the right window are synchronised, i.e. if you scroll on the left hand side, the right hand side is scrolled by the same amount. You can change this by checking the box <guibutton
->Synchronise scroll bars</guibutton
->. </para>
-
-<para
->For information about how to customise the diff dialogue, see <xref linkend="customize-diff"/>. </para>
+<para>The text in the dialogue is an improved variant of the text given by the diff command with the <option>-u</option> option. You can see the differing versions in two windows, with lines arranged such that you can do a side-by-side comparison. That means, where text has been added or deleted, the respective window shows empty lines with the marker <literal>+++++</literal> at the left hand side. Elsewhere, you can see the running number of each line in the left column. </para>
+
+<para>In the second column in the right window, you can see which kind of change has been made. Possible types are <literal>Add</literal>, <literal>Delete</literal> and <literal>Change</literal>. The respective lines are marked in blue, green and red colour. In the middle of the dialogue a compressed image of the colour markers is shown. In this way, you can get a quick overview of the overall changes to the file. You can also use the position of the coloured regions in the compressed image as an orientation when you using the scroll bars. </para>
+
+<para>Normally, the scrollbars at the left and the right window are synchronised, i.e. if you scroll on the left hand side, the right hand side is scrolled by the same amount. You can change this by checking the box <guibutton>Synchronise scroll bars</guibutton>. </para>
+
+<para>For information about how to customise the diff dialogue, see <xref linkend="customize-diff"/>. </para>
 
 </sect1>
 
 <sect1 id="creatingpatches">
-<title
->Creating Patches</title>
-
-<para
->Sometimes you want to offer your modifications for review, before committing them, or you do not have write access to the repository (therefore you cannot commit). &CVS; offers standard formats to share the modifications in your working copy, so other people can review your changes, test them in their working copy and apply them to the &CVS; repository. A file containing these differences is called a <firstterm
->patch</firstterm
->, and is generated by the <command
->cvs diff</command
-> command, in the same way as the differences in <xref linkend="diff"/>. Sharing patches instead of sets of files requires less bandwidth, and patches are easier to handle, as you can send only one patch file containing all the differences from many source files. </para>
-
-<para
->&cervisia; gives you to access to this feature by choosing <menuchoice
-><guimenu
->Advanced</guimenu
-> <guimenuitem
->Create Patch Against Repository</guimenuitem
-></menuchoice
->. </para>
-
-<important
-><para
->The <guimenuitem
->Create Patch Against Repository</guimenuitem
-> action creates a patch with all modifications in all files in your working copy (sandbox) against the <literal
->BASE</literal
-> repository. Therefore, the selection of files in the main view does not affect the patch that will be generated. </para
-></important>
-
-<para
->Another possibility is to select one file in the main view and choose <guimenuitem
->Browse Log...</guimenuitem
-> from the <guimenu
->View</guimenu
-> menu or right click the marked file and choose <guimenuitem
->Browse Log...</guimenuitem
-> from the pop-up menu, in order to open the <link linkend="browsinglogs"
->Browse log dialogue</link
->. Now, select the version you want to create a patch against, as revision &quot;A&quot; and press the button <guilabel
->Create Patch...</guilabel
->. This will generate a patch with the differences between the <emphasis
->marked file</emphasis
-> in your working copy and the version selected as revision &quot;A&quot;. </para>
-
-<para
->Before generating the patch, &cervisia; displays a dialogue allowing you to configure the output format. </para>
+<title>Creating Patches</title>
+
+<para>Sometimes you want to offer your modifications for review, before committing them, or you do not have write access to the repository (therefore you cannot commit). &CVS; offers standard formats to share the modifications in your working copy, so other people can review your changes, test them in their working copy and apply them to the &CVS; repository. A file containing these differences is called a <firstterm>patch</firstterm>, and is generated by the <command>cvs diff</command> command, in the same way as the differences in <xref linkend="diff"/>. Sharing patches instead of sets of files requires less bandwidth, and patches are easier to handle, as you can send only one patch file containing all the differences from many source files. </para>
+
+<para>&cervisia; gives you to access to this feature by choosing <menuchoice><guimenu>Advanced</guimenu> <guimenuitem>Create Patch Against Repository</guimenuitem></menuchoice>. </para>
+
+<important><para>The <guimenuitem>Create Patch Against Repository</guimenuitem> action creates a patch with all modifications in all files in your working copy (sandbox) against the <literal>BASE</literal> repository. Therefore, the selection of files in the main view does not affect the patch that will be generated. </para></important>
+
+<para>Another possibility is to select one file in the main view and choose <guimenuitem>Browse Log...</guimenuitem> from the <guimenu>View</guimenu> menu or right click the marked file and choose <guimenuitem>Browse Log...</guimenuitem> from the pop-up menu, in order to open the <link linkend="browsinglogs">Browse log dialogue</link>. Now, select the version you want to create a patch against, as revision &quot;A&quot; and press the button <guilabel>Create Patch...</guilabel>. This will generate a patch with the differences between the <emphasis>marked file</emphasis> in your working copy and the version selected as revision &quot;A&quot;. </para>
+
+<para>Before generating the patch, &cervisia; displays a dialogue allowing you to configure the output format. </para>
 
 <figure id="screenshot-patch" float="1">
-<title
->A screenshot of &cervisia;'s patch dialogue</title>
+<title>A screenshot of &cervisia;'s patch dialogue</title>
 <mediaobject>
-<imageobject
-><imagedata format="PNG" fileref="patch.png"/></imageobject>
-<textobject
-><phrase
->A screenshot of &cervisia;'s patch dialogue</phrase
-></textobject>
+<imageobject><imagedata format="PNG" fileref="patch.png"/></imageobject>
+<textobject><phrase>A screenshot of &cervisia;'s patch dialogue</phrase></textobject>
 </mediaobject>
 </figure>
 
 <variablelist>
 
 <varlistentry>
-<term
-><guilabel
->Output Format</guilabel
-></term>
-<listitem
-><para
->There are three output formats available: </para>
-<para
-><guilabel
->Normal</guilabel
->: a format that can be used to cause the ed editor to automatically make another copy of the old file match the new file. In the normal output format, the characters &lt; and &gt; mark the changes, and there is no context information. </para>
-<para
-><guilabel
->Unified</guilabel
->: the most used format for exchanging patches. The unified format uses context lines in addition to line numbers to record the differences. This makes the process of applying patches more robust. This format displays the differences in a compact and readable form, with a header for each file involved, and separate sections (chunks) for each difference. The context lines available for each difference make reading the modifications easier. In the unified output format, the characters + and - mark the changes. </para>
-<para
-><guilabel
->Context</guilabel
->, which presents the same information as the unified format, but in a less compact way. In the context output format, the character ! marks the changes. </para
-></listitem>
+<term><guilabel>Output Format</guilabel></term>
+<listitem><para>There are three output formats available: </para>
+<para><guilabel>Normal</guilabel>: a format that can be used to cause the ed editor to automatically make another copy of the old file match the new file. In the normal output format, the characters &lt; and &gt; mark the changes, and there is no context information. </para>
+<para><guilabel>Unified</guilabel>: the most used format for exchanging patches. The unified format uses context lines in addition to line numbers to record the differences. This makes the process of applying patches more robust. This format displays the differences in a compact and readable form, with a header for each file involved, and separate sections (chunks) for each difference. The context lines available for each difference make reading the modifications easier. In the unified output format, the characters + and - mark the changes. </para>
+<para><guilabel>Context</guilabel>, which presents the same information as the unified format, but in a less compact way. In the context output format, the character ! marks the changes. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Number of context lines:</guilabel
-></term>
-<listitem
-><para
->Set here the number of context lines for the unified or context output formats. This option is not available for the normal output format, as in this format no context information is recorded. More context information makes reading the raw output easier, and applying the patch more precise, but increases the patch size. It is recommended to use at least two context lines for proper patch operation. </para
-></listitem>
+<term><guilabel>Number of context lines:</guilabel></term>
+<listitem><para>Set here the number of context lines for the unified or context output formats. This option is not available for the normal output format, as in this format no context information is recorded. More context information makes reading the raw output easier, and applying the patch more precise, but increases the patch size. It is recommended to use at least two context lines for proper patch operation. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Ignore Options</guilabel
-></term>
-<listitem
-><para
->Check here the changes that should not be considered as differences when generating the patch. </para
-></listitem>
+<term><guilabel>Ignore Options</guilabel></term>
+<listitem><para>Check here the changes that should not be considered as differences when generating the patch. </para></listitem>
 </varlistentry>
 
 </variablelist>
 
 
-<para
->After setting the output format, &cervisia; generates the patch and displays the <guilabel
->Save As</guilabel
-> dialogue. Enter in this dialogue the file name and location of the patch file. </para>
+<para>After setting the output format, &cervisia; generates the patch and displays the <guilabel>Save As</guilabel> dialogue. Enter in this dialogue the file name and location of the patch file. </para>
 
 
 </sect1>
 
 <sect1 id="annotate">
-<title
->Watching an Annotated View of a File</title>
-
-<para
->With the command <command
->cvs annotate</command
->, &CVS; offers the possibility to see - for each line in a file - who has modified a line the most recently. This view may be helpful in order to find out who has introduced a change in the behavior of a program or who should be asked about some change or bug in the code. </para>
-
-<para
->&cervisia; gives you to access to this feature, but it further enriches the information in an interactive way. You obtain an annotate view by choosing <menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Annotate...</guimenuitem
-></menuchoice
->. Another possibility is to press the button <guilabel
->Annotate</guilabel
-> in the <link linkend="browsinglogs"
->Browse log dialogue</link
->, in which you can select which version of the file you want to display. In <xref linkend="screenshot-annotate"/> you can see a screenshot of the dialogue. </para>
+<title>Watching an Annotated View of a File</title>
+
+<para>With the command <command>cvs annotate</command>, &CVS; offers the possibility to see - for each line in a file - who has modified a line the most recently. This view may be helpful in order to find out who has introduced a change in the behavior of a program or who should be asked about some change or bug in the code. </para>
+
+<para>&cervisia; gives you to access to this feature, but it further enriches the information in an interactive way. You obtain an annotate view by choosing <menuchoice><guimenu>View</guimenu><guimenuitem>Annotate...</guimenuitem></menuchoice>. Another possibility is to press the button <guilabel>Annotate</guilabel> in the <link linkend="browsinglogs">Browse log dialogue</link>, in which you can select which version of the file you want to display. In <xref linkend="screenshot-annotate"/> you can see a screenshot of the dialogue. </para>
 
 <figure id="screenshot-annotate" float="1">
-<title
->A screenshot of &cervisia;'s annotate dialogue</title>
+<title>A screenshot of &cervisia;'s annotate dialogue</title>
 <mediaobject>
-<imageobject
-><imagedata format="PNG" fileref="annotate.png"/></imageobject>
-<textobject
-><phrase
->A screenshot of &cervisia;'s annotate dialogue</phrase
-></textobject>
+<imageobject><imagedata format="PNG" fileref="annotate.png"/></imageobject>
+<textobject><phrase>A screenshot of &cervisia;'s annotate dialogue</phrase></textobject>
 </mediaobject>
 </figure>
 
-<para
->In the annotate dialogue, you see in a window the latest version of the selected file (or the revision &quot;A&quot; version, in case you launched the annotate dialogue from the the <link linkend="browsinglogs"
->Browse log dialogue</link
->). In the columns before the text, you get some information related to the latest change in each line. In the first column the line number is displayed. In the second column you see the name of the author and revision number. Finally, in the third column you see the actual content of that line. </para>
+<para>In the annotate dialogue, you see in a window the latest version of the selected file (or the revision &quot;A&quot; version, in case you launched the annotate dialogue from the the <link linkend="browsinglogs">Browse log dialogue</link>). In the columns before the text, you get some information related to the latest change in each line. In the first column the line number is displayed. In the second column you see the name of the author and revision number. Finally, in the third column you see the actual content of that line. </para>
 
-<para
->Consequently, when a certain line appears strange to you or you assume a bug there, you can immediately see who is responsible for that line. But not only that, you can also find out <emphasis
->why</emphasis
-> that line was changed. To this end, move the mouse cursor over the respective revision number. Then a tooltip appears that shows the log message and the date of the change. </para>
+<para>Consequently, when a certain line appears strange to you or you assume a bug there, you can immediately see who is responsible for that line. But not only that, you can also find out <emphasis>why</emphasis> that line was changed. To this end, move the mouse cursor over the respective revision number. Then a tooltip appears that shows the log message and the date of the change. </para>
 
 </sect1>
 
 
 <sect1 id="browsinglogs">
-<title
->Browsing &CVS; Logs</title>
-
-<para
->When you mark one file in the main view and choose <guimenuitem
->Browse Log...</guimenuitem
-> from the <guimenu
->View</guimenu
-> menu or right click the marked file and choose <guimenuitem
->Browse Log...</guimenuitem
-> from the pop-up menu, the <guilabel
->CVS Log</guilabel
-> dialogue is shown (if you mark more than one, nothing happens, as &cervisia; can only generate and parse the log for one file at a time). This dialogue offers functionality that is beyond viewing the file's history. Using it as a version browser you can: </para>
+<title>Browsing &CVS; Logs</title>
+
+<para>When you mark one file in the main view and choose <guimenuitem>Browse Log...</guimenuitem> from the <guimenu>View</guimenu> menu or right click the marked file and choose <guimenuitem>Browse Log...</guimenuitem> from the pop-up menu, the <guilabel>CVS Log</guilabel> dialogue is shown (if you mark more than one, nothing happens, as &cervisia; can only generate and parse the log for one file at a time). This dialogue offers functionality that is beyond viewing the file's history. Using it as a version browser you can: </para>
 
 <itemizedlist>
 
-<listitem
-><para
->View the revision, author, date, branch, commit message and tags for each version of the marked file. </para
-></listitem>
+<listitem><para>View the revision, author, date, branch, commit message and tags for each version of the marked file. </para></listitem>
 
-<listitem
-><para
->View a graphical tree representation showing the branching and tagging of the marked file. </para
-></listitem>
+<listitem><para>View a graphical tree representation showing the branching and tagging of the marked file. </para></listitem>
 
-<listitem
-><para
->View any version of the marked file (with the default application). </para
-></listitem>
+<listitem><para>View any version of the marked file (with the default application). </para></listitem>
 
-<listitem
-><para
->Watch an annotated view of any version of the marked file </para
-></listitem>
+<listitem><para>Watch an annotated view of any version of the marked file </para></listitem>
 
-<listitem
-><para
->View the differences between any pair of versions of the marked file, including pairs with the current working copy version of the marked file. </para
-></listitem>
+<listitem><para>View the differences between any pair of versions of the marked file, including pairs with the current working copy version of the marked file. </para></listitem>
 
-<listitem
-><para
->Create patches containing the differences between any pair of versions of the marked file, including pairs with the current working copy version of the marked file. </para
-></listitem>
+<listitem><para>Create patches containing the differences between any pair of versions of the marked file, including pairs with the current working copy version of the marked file. </para></listitem>
 
 </itemizedlist>
 
 <figure float="1">
-<title
->A screenshot of &cervisia;'s browse logs dialogue</title>
+<title>A screenshot of &cervisia;'s browse logs dialogue</title>
 <mediaobject>
-<imageobject
-><imagedata format="PNG" fileref="logtree.png"/></imageobject>
-<textobject
-><phrase
->A screenshot of &cervisia;'s browse logs dialogue</phrase
-></textobject>
+<imageobject><imagedata format="PNG" fileref="logtree.png"/></imageobject>
+<textobject><phrase>A screenshot of &cervisia;'s browse logs dialogue</phrase></textobject>
 </mediaobject>
 </figure>
 
-<para
->You can choose to see the history as provided by the <command
->cvs log</command
-> command (<guilabel
->CVS Output</guilabel
->), as a <guilabel
->Tree</guilabel
->, or in <guilabel
->List</guilabel
-> form. What you prefer is of course a matter of taste and it depends on what information you are interested in. The tree is an intuitive representation of what has been done on different branches by which authors. As tooltips, you can see the corresponding log messages. The list is by its nature linear and, therefore, does not give an immediate view of branches; on the other hand, it concentrates more otherwise relevant information on less screen estate, namely the time of each change of the file and the first part of the log message. The CVS output information is complete, but long, and difficult to read. To alleviate these problems, you have the ability to search the text of the CVS output, by pressing the <guibutton
->Find...</guibutton
-> button. </para>
-
-<para
->To obtain more information about a certain revision, you can click on it either in the list or the tree view. The fields in the middle of the dialogue are then filled with the complete information provided by <command
->cvs log</command
->. You can mark two revisions, called &quot;A&quot; and &quot;B&quot;, which are relevant if you make use of further features provided by the buttons. Revision &quot;A&quot; can be chosen with the left mouse button, revision &quot;B&quot; with the middle one. In the list view, you can also navigate with with your cursor keys. In order to mark revisions &quot;A&quot; and &quot;B&quot;, use the keybindings <keycombo
-><keycap
->Ctrl</keycap
-><keycap
->A</keycap
-></keycombo
->, <keycombo
-><keycap
->Ctrl</keycap
-><keycap
->B</keycap
-></keycombo
->, respectively. Using the <guilabel
->CVS Output</guilabel
-> view, you can click on the <guilabel
->Select for revision A</guilabel
-> and <guilabel
->Select for revision B</guilabel
-> to mark the revisions. </para>
-
-<para
->If you press the <guibutton
->Annotate</guibutton
-> button, you get a dialogue showing the text of file belonging to the revision marked as &quot;A&quot;. Every line is prefixed with the information about who edited this last time, and at which revision this happened. You can get more information about viewing annotated versions in <xref linkend="annotate"/>. </para>
-
-<para
->If you press the <guibutton
->Diff</guibutton
-> button, a <command
->cvs diff</command
-> call is issued and you get a dialogue in which all the modifications between the two marked revisions are shown. If you mark revision &quot;A&quot;, but not revision &quot;B&quot;, &cervisia; will generate the modifications between the file version marked as revision &quot;A&quot; and the working copy version of the file. This allows you to view the differences between your version of the file and any version available in &CVS;. To make it easy to see the changes, different colours are used to mark lines which have been added, removed or simply changed. You can get more information about viewing differences in <xref linkend="diff"/>. </para>
-
-<para
->If you press the <guibutton
->Create Patch...</guibutton
-> button, you get a dialogue in which you can set the format options for generating a file containing all the modifications between the two marked revisions which are shown. If you mark revision &quot;A&quot;, but not revision &quot;B&quot;, &cervisia; will generate the modifications between the file version marked as revision &quot;A&quot; and the working copy version of the file. This allows you to generate a patch, or difference file, between your version of the file and any version available in &CVS;. After configuring the format of the patch in the dialogue, and pressing <guibutton
->OK</guibutton
->, a <command
->cvs diff</command
-> command is issued to generate the difference file. A <guilabel
->Save As</guilabel
-> dialogue will pop up. Enter the file name and location of the patch file &cervisia; generated, in order to save it. You can get more information about creating patches, and the patch format options in <xref linkend="creatingpatches"/>. </para>
-
-<para
->If you press the <guibutton
->View</guibutton
-> button, &cervisia; will retrieve the revision marked as &quot;A&quot; and display it using the default application for its file type. </para>
-
-<para
->Press the <guibutton
->Close</guibutton
-> button to leave the dialogue and return to the main view. </para>
-
-
-<para
->To generate the log that is the base for the <guilabel
->CVS Log</guilabel
-> dialogue, &cervisia; issues the following command: </para>
+<para>You can choose to see the history as provided by the <command>cvs log</command> command (<guilabel>CVS Output</guilabel>), as a <guilabel>Tree</guilabel>, or in <guilabel>List</guilabel> form. What you prefer is of course a matter of taste and it depends on what information you are interested in. The tree is an intuitive representation of what has been done on different branches by which authors. As tooltips, you can see the corresponding log messages. The list is by its nature linear and, therefore, does not give an immediate view of branches; on the other hand, it concentrates more otherwise relevant information on less screen estate, namely the time of each change of the file and the first part of the log message. The CVS output information is complete, but long, and difficult to read. To alleviate these problems, you have the ability to search the text of the CVS output, by pressing the <guibutton>Find...</guibutton> button. </para>
+
+<para>To obtain more information about a certain revision, you can click on it either in the list or the tree view. The fields in the middle of the dialogue are then filled with the complete information provided by <command>cvs log</command>. You can mark two revisions, called &quot;A&quot; and &quot;B&quot;, which are relevant if you make use of further features provided by the buttons. Revision &quot;A&quot; can be chosen with the left mouse button, revision &quot;B&quot; with the middle one. In the list view, you can also navigate with with your cursor keys. In order to mark revisions &quot;A&quot; and &quot;B&quot;, use the keybindings <keycombo><keycap>Ctrl</keycap><keycap>A</keycap></keycombo>, <keycombo><keycap>Ctrl</keycap><keycap>B</keycap></keycombo>, respectively. Using the <guilabel>CVS Output</guilabel> view, you can click on the <guilabel>Select for revision A</guilabel> and <guilabel>Select for revision B</guilabel> to mark the revisions. </para>
+
+<para>If you press the <guibutton>Annotate</guibutton> button, you get a dialogue showing the text of file belonging to the revision marked as &quot;A&quot;. Every line is prefixed with the information about who edited this last time, and at which revision this happened. You can get more information about viewing annotated versions in <xref linkend="annotate"/>. </para>
+
+<para>If you press the <guibutton>Diff</guibutton> button, a <command>cvs diff</command> call is issued and you get a dialogue in which all the modifications between the two marked revisions are shown. If you mark revision &quot;A&quot;, but not revision &quot;B&quot;, &cervisia; will generate the modifications between the file version marked as revision &quot;A&quot; and the working copy version of the file. This allows you to view the differences between your version of the file and any version available in &CVS;. To make it easy to see the changes, different colours are used to mark lines which have been added, removed or simply changed. You can get more information about viewing differences in <xref linkend="diff"/>. </para>
+
+<para>If you press the <guibutton>Create Patch...</guibutton> button, you get a dialogue in which you can set the format options for generating a file containing all the modifications between the two marked revisions which are shown. If you mark revision &quot;A&quot;, but not revision &quot;B&quot;, &cervisia; will generate the modifications between the file version marked as revision &quot;A&quot; and the working copy version of the file. This allows you to generate a patch, or difference file, between your version of the file and any version available in &CVS;. After configuring the format of the patch in the dialogue, and pressing <guibutton>OK</guibutton>, a <command>cvs diff</command> command is issued to generate the difference file. A <guilabel>Save As</guilabel> dialogue will pop up. Enter the file name and location of the patch file &cervisia; generated, in order to save it. You can get more information about creating patches, and the patch format options in <xref linkend="creatingpatches"/>. </para>
+
+<para>If you press the <guibutton>View</guibutton> button, &cervisia; will retrieve the revision marked as &quot;A&quot; and display it using the default application for its file type. </para>
+
+<para>Press the <guibutton>Close</guibutton> button to leave the dialogue and return to the main view. </para>
+
+
+<para>To generate the log that is the base for the <guilabel>CVS Log</guilabel> dialogue, &cervisia; issues the following command: </para>
 
 
 <para>
-<screen
-><command
->cvs log <replaceable
->file name</replaceable
-></command
-></screen>
+<screen><command>cvs log <replaceable>file name</replaceable></command></screen>
 </para>
 
 </sect1>
 
 <sect1 id="browsinghistory">
-<title
->Browsing the History</title>
+<title>Browsing the History</title>
 
-<para
->If the used repository has logging enabled, &cervisia; can present you a history of certain events like checkouts, commits, rtags, updates and releases. Choose <guimenuitem
->History</guimenuitem
-> from the <guimenu
->View</guimenu
-> menu, and &cervisia; will issue the command </para>
+<para>If the used repository has logging enabled, &cervisia; can present you a history of certain events like checkouts, commits, rtags, updates and releases. Choose <guimenuitem>History</guimenuitem> from the <guimenu>View</guimenu> menu, and &cervisia; will issue the command </para>
 
 <para>
-<screen
-><command
->cvs history -e -a</command
-></screen>
+<screen><command>cvs history -e -a</command></screen>
 </para>
 
-<note
-><para
->This fetches the complete logging file from the server, i.e. a list of the events for all users and all modules. This can be a huge amount of data. </para
-></note>
+<note><para>This fetches the complete logging file from the server, i.e. a list of the events for all users and all modules. This can be a huge amount of data. </para></note>
 
-<para
->Now you can see the list of events, sorted by date. In the second column, the type of the event is shown: </para>
+<para>Now you can see the list of events, sorted by date. In the second column, the type of the event is shown: </para>
 
 <itemizedlist>
 
-<listitem
-><para
->Checkout - The user who is displayed in the 'Author' column has checked out a module </para
-></listitem>
-
-<listitem
-><para
->Tag - A user has used the command <command
->cvs rtag</command
->. Note that the usage of <command
->cvs tag</command
-> (as done by &cervisia;'s <menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Tag/Branch...</guimenuitem
-></menuchoice
-> command) is not recorded in the history database. This has historical reasons (see the &CVS; <acronym
->FAQ</acronym
->). </para
-></listitem>
-
-<listitem
-><para
->Release - A user has released a module. Actually, this command is rarely used and not of much value. </para
-></listitem>
-
-<listitem
-><para
->Update, Deleted - A user has made an update on a file which was deleted in the repository. As a consequence, the file was deleted in his working copy. </para
-></listitem>
-
-<listitem
-><para
->Update, Copied - A user has made an update on a file. A new version was copied into working copy. </para
-></listitem>
-
-<listitem
-><para
->Update, Merged - A user has made an update on a file. The modifications in the repository version on the file were merged into his working copy. </para
-></listitem>
-
-<listitem
-><para
->Update, Conflict - A user has made an update on a file, and a conflict with his own modifications was detected. </para
-></listitem>
-
-<listitem
-><para
->Commit, Modified - A user committed a modified file. </para
-></listitem>
-
-<listitem
-><para
->Commit, Added - A user added a file and committed it. </para
-></listitem>
-
-<listitem
-><para
->Commit, Removed - A user removed a file and committed it. </para
-></listitem>
+<listitem><para>Checkout - The user who is displayed in the 'Author' column has checked out a module </para></listitem>
+
+<listitem><para>Tag - A user has used the command <command>cvs rtag</command>. Note that the usage of <command>cvs tag</command> (as done by &cervisia;'s <menuchoice><guimenu>Advanced</guimenu><guimenuitem>Tag/Branch...</guimenuitem></menuchoice> command) is not recorded in the history database. This has historical reasons (see the &CVS; <acronym>FAQ</acronym>). </para></listitem>
+
+<listitem><para>Release - A user has released a module. Actually, this command is rarely used and not of much value. </para></listitem>
+
+<listitem><para>Update, Deleted - A user has made an update on a file which was deleted in the repository. As a consequence, the file was deleted in his working copy. </para></listitem>
+
+<listitem><para>Update, Copied - A user has made an update on a file. A new version was copied into working copy. </para></listitem>
+
+<listitem><para>Update, Merged - A user has made an update on a file. The modifications in the repository version on the file were merged into his working copy. </para></listitem>
+
+<listitem><para>Update, Conflict - A user has made an update on a file, and a conflict with his own modifications was detected. </para></listitem>
+
+<listitem><para>Commit, Modified - A user committed a modified file. </para></listitem>
+
+<listitem><para>Commit, Added - A user added a file and committed it. </para></listitem>
+
+<listitem><para>Commit, Removed - A user removed a file and committed it. </para></listitem>
 
 </itemizedlist>
 
 <figure id="screenshot-history" float="1">
-<title
->A screenshot of &cervisia;'s history dialogue</title>
+<title>A screenshot of &cervisia;'s history dialogue</title>
 <mediaobject>
-<imageobject
-><imagedata format="PNG" fileref="history.png"/></imageobject>
-<textobject
-><phrase
->A screenshot of &cervisia;'s history dialogue</phrase
-></textobject>
+<imageobject><imagedata format="PNG" fileref="history.png"/></imageobject>
+<textobject><phrase>A screenshot of &cervisia;'s history dialogue</phrase></textobject>
 </mediaobject>
 </figure>
 
-<para
->You can sort the list by other criteria simply by clicking on the respective column header. In order to sort out the history entries you are interested in, there are various filter options activated by check boxes: </para>
+<para>You can sort the list by other criteria simply by clicking on the respective column header. In order to sort out the history entries you are interested in, there are various filter options activated by check boxes: </para>
 
 <itemizedlist>
-<listitem
-><para
->Show commit events - shows commits</para
-></listitem>
-<listitem
-><para
->Show checkout events - shows checkouts</para
-></listitem>
-<listitem
-><para
->Show tag events - shows taggings</para
-></listitem>
-<listitem
-><para
->Show other events - shows events not included in the above</para
-></listitem>
-<listitem
-><para
->Only user - shows only events caused by a certain user</para
-></listitem>
-<listitem
-><para
->Only file names matching - filters file names by a regular expression</para
-></listitem>
-<listitem
-><para
->Only dirnames matching - filters folder names by a regular expression</para
-></listitem>
+<listitem><para>Show commit events - shows commits</para></listitem>
+<listitem><para>Show checkout events - shows checkouts</para></listitem>
+<listitem><para>Show tag events - shows taggings</para></listitem>
+<listitem><para>Show other events - shows events not included in the above</para></listitem>
+<listitem><para>Only user - shows only events caused by a certain user</para></listitem>
+<listitem><para>Only file names matching - filters file names by a regular expression</para></listitem>
+<listitem><para>Only dirnames matching - filters folder names by a regular expression</para></listitem>
 </itemizedlist>
 
-<para
->Special characters recognised by the regular expression matcher are: </para>
+<para>Special characters recognised by the regular expression matcher are: </para>
 
 <itemizedlist>
 
-<listitem
-><para
-><literal
->x*</literal
-> matches any number of occurrences of the character <literal
->x</literal
->. </para
-></listitem>
-
-<listitem
-><para
-><literal
->x+</literal
-> matches one or more of occurrences of the character <literal
->x</literal
->. </para
-></listitem>
-
-<listitem
-><para
-><literal
->x?</literal
-> matches zero or one occurrences of the character <literal
->x</literal
->. </para
-></listitem>
-
-<listitem
-><para
-><literal
->^</literal
-> matches the start of the string. </para
-></listitem>
-
-<listitem
-><para
-><literal
->$</literal
-> matches the end of the string. </para
-></listitem>
-
-<listitem
-><para
-><literal
->[a-cx-z]</literal
-> matches a set of characters, &eg; here the set consisting of a,b,c,x,y,z. </para
-></listitem>
+<listitem><para><literal>x*</literal> matches any number of occurrences of the character <literal>x</literal>. </para></listitem>
+
+<listitem><para><literal>x+</literal> matches one or more of occurrences of the character <literal>x</literal>. </para></listitem>
+
+<listitem><para><literal>x?</literal> matches zero or one occurrences of the character <literal>x</literal>. </para></listitem>
+
+<listitem><para><literal>^</literal> matches the start of the string. </para></listitem>
+
+<listitem><para><literal>$</literal> matches the end of the string. </para></listitem>
+
+<listitem><para><literal>[a-cx-z]</literal> matches a set of characters, &eg; here the set consisting of a,b,c,x,y,z. </para></listitem>
 
 </itemizedlist>
 
@@ -2088,477 +847,164 @@ Changes in the repository
 </chapter>
 
 <chapter id="advancedusage">
-<title
->Advanced Usage</title>
+<title>Advanced Usage</title>
 
 <sect1 id="updatingto">
-<title
->Updating to Tag, Branch or Date</title>
+<title>Updating to Tag, Branch or Date</title>
 
-<para
->Branches of a module are parallel versions of this module. A good real life example of the use of this feature is the release of a software project. After a major release, there are bugs in the code that should be fixed, but people want to add new features to the application too. It is very hard to do both at the same time because new features usually introduce new bugs, making it hard to track down the old ones. To solve this dilemma, &CVS; lets you create a parallel version, that we will call the &quot;stable release branch&quot;, where you can only add bugfixes, leaving the main branch (HEAD) open for adding new features. </para>
+<para>Branches of a module are parallel versions of this module. A good real life example of the use of this feature is the release of a software project. After a major release, there are bugs in the code that should be fixed, but people want to add new features to the application too. It is very hard to do both at the same time because new features usually introduce new bugs, making it hard to track down the old ones. To solve this dilemma, &CVS; lets you create a parallel version, that we will call the &quot;stable release branch&quot;, where you can only add bugfixes, leaving the main branch (HEAD) open for adding new features. </para>
 
-<para
->Tags are used to mark a version of a project. &CVS; stamps one version of each file with the tag, so when you checkout or update to a specific tag, you will get always the same file versions; therefore, as opposed to branches, tags are not dynamic: you cannot develop a tag. Tags are useful to mark releases, big changes in the code &etc; </para>
+<para>Tags are used to mark a version of a project. &CVS; stamps one version of each file with the tag, so when you checkout or update to a specific tag, you will get always the same file versions; therefore, as opposed to branches, tags are not dynamic: you cannot develop a tag. Tags are useful to mark releases, big changes in the code &etc; </para>
 
-<para
->When you are developing or following the development of a software project, you do not necessarily work with the main branch all the time. After a release, you may want to stay with the released branch for a while, to enjoy its relative stability, fix bugs, translate the sources &etc; To do all that, you have to update to the released branch. All your files will be updated to the latest version of the files in that branch. After updating, all your new commits will be uploaded to the new branch as well. </para>
+<para>When you are developing or following the development of a software project, you do not necessarily work with the main branch all the time. After a release, you may want to stay with the released branch for a while, to enjoy its relative stability, fix bugs, translate the sources &etc; To do all that, you have to update to the released branch. All your files will be updated to the latest version of the files in that branch. After updating, all your new commits will be uploaded to the new branch as well. </para>
 
-<para
->Also, if you want to track a bug that was reported against a past tagged release, &CVS; offers you the possibility to retrieve the software as it was released, by updating to that tag. Besides, if you want to fetch a past version of your project, you can update your working copy to a specific date. This may be useful if an error was introduced in the project between two releases, and you have an opinion on when that was. When you update to a date or tag, the versions of your files will be the same as the versions in that specific date or the versions stamped by that tag. </para>
+<para>Also, if you want to track a bug that was reported against a past tagged release, &CVS; offers you the possibility to retrieve the software as it was released, by updating to that tag. Besides, if you want to fetch a past version of your project, you can update your working copy to a specific date. This may be useful if an error was introduced in the project between two releases, and you have an opinion on when that was. When you update to a date or tag, the versions of your files will be the same as the versions in that specific date or the versions stamped by that tag. </para>
 
-<warning
-><para
->Before updating to a different branch or tag, make sure you committed all your changes to the branch you are working with. If your are not ready to commit your changes, but do not want to discard them, do not update to the new branch, as you may lose your changes. As an alternative, you can do a new <link linkend="checkingout"
->checkout</link
->, to work in parallel with both versions. </para
-></warning>
+<warning><para>Before updating to a different branch or tag, make sure you committed all your changes to the branch you are working with. If your are not ready to commit your changes, but do not want to discard them, do not update to the new branch, as you may lose your changes. As an alternative, you can do a new <link linkend="checkingout">checkout</link>, to work in parallel with both versions. </para></warning>
 
 <figure id="screenshot-updatetag" float="1">
-<title
->A screenshot of &cervisia;'s update to tag dialogue</title>
+<title>A screenshot of &cervisia;'s update to tag dialogue</title>
 <mediaobject>
-<imageobject
-><imagedata format="PNG" fileref="updatetag.png"/></imageobject>
-<textobject
-><phrase
->A screenshot of &cervisia;'s update to tag dialogue</phrase
-></textobject>
+<imageobject><imagedata format="PNG" fileref="updatetag.png"/></imageobject>
+<textobject><phrase>A screenshot of &cervisia;'s update to tag dialogue</phrase></textobject>
 </mediaobject>
 </figure>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Update to branch</guilabel
-></term>
-<listitem
-><para
->Select this option to update to a branch. Enter the name of the branch in the drop down edit box (or press the <guilabel
->Fetch List</guilabel
-> button to retrieve the list of branches from the &CVS; server, and select the one you want in the drop down list). </para
-></listitem>
+<term><guilabel>Update to branch</guilabel></term>
+<listitem><para>Select this option to update to a branch. Enter the name of the branch in the drop down edit box (or press the <guilabel>Fetch List</guilabel> button to retrieve the list of branches from the &CVS; server, and select the one you want in the drop down list). </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Update to tag</guilabel
-></term>
-<listitem
-><para
->Select this option to update to a tag. Enter the name of the tag in the drop down edit box (or press the <guilabel
->Fetch List</guilabel
-> button to retrieve the list of tags from the &CVS; server, and select the one you want in the drop down list). </para
-></listitem>
+<term><guilabel>Update to tag</guilabel></term>
+<listitem><para>Select this option to update to a tag. Enter the name of the tag in the drop down edit box (or press the <guilabel>Fetch List</guilabel> button to retrieve the list of tags from the &CVS; server, and select the one you want in the drop down list). </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Update to date</guilabel
-></term>
-<listitem
-><para
->Select this option to update to a date. In the field below, you can enter a wide variety of date formats. One possible format is <literal
->yyyy-mm-dd</literal
-> where <literal
->yyyy</literal
-> is the year, <literal
->mm</literal
-> is the month (numerically) and <literal
->dd</literal
-> is the day. Alternatives are some English phrases like <literal
->yesterday</literal
-> or <literal
->2 weeks ago</literal
->. </para
-></listitem>
+<term><guilabel>Update to date</guilabel></term>
+<listitem><para>Select this option to update to a date. In the field below, you can enter a wide variety of date formats. One possible format is <literal>yyyy-mm-dd</literal> where <literal>yyyy</literal> is the year, <literal>mm</literal> is the month (numerically) and <literal>dd</literal> is the day. Alternatives are some English phrases like <literal>yesterday</literal> or <literal>2 weeks ago</literal>. </para></listitem>
 </varlistentry>
 
 </variablelist>
 
-<note
-><para
->Updating to a tag or date make them 'sticky', &ie; you can not commit further modifications on that files (unless the tag is a branch tag). In order to get back to the main branch, use the menu item <menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Update to HEAD</guimenuitem
-></menuchoice
->. </para
-></note>
-
-<para
->The comand issued to update to a branch or tag is: <screen
-><command
->cvs update -r <replaceable
->tag</replaceable
-></command
-></screen>
+<note><para>Updating to a tag or date make them 'sticky', &ie; you can not commit further modifications on that files (unless the tag is a branch tag). In order to get back to the main branch, use the menu item <menuchoice><guimenu>Advanced</guimenu><guimenuitem>Update to HEAD</guimenuitem></menuchoice>. </para></note>
+
+<para>The comand issued to update to a branch or tag is: <screen><command>cvs update -r <replaceable>tag</replaceable></command></screen>
 </para>
 
-<para
->The command issued to update to a date is: <screen
-><command
->cvs update -D <replaceable
->date</replaceable
-></command
-></screen>
+<para>The command issued to update to a date is: <screen><command>cvs update -D <replaceable>date</replaceable></command></screen>
 </para>
 
-<para
->The command issued to update to the main branch (HEAD) is: <screen
-><command
->cvs update <option
->-A</option
-></command
-></screen>
+<para>The command issued to update to the main branch (HEAD) is: <screen><command>cvs update <option>-A</option></command></screen>
 </para>
 
 </sect1>
 
 
 <sect1 id="taggingbranching">
-<title
->Tagging and Branching</title>
-
-<para
->We discuss here only the technical aspects of tagging and branching. If you are only a <emphasis
->user</emphasis
->, not the administrator of the repository, you will probably not be confronted with the problem. If however you are your own administrator, you should first read about the non-technical problems that accompany branching, in order to get an impression of how time-consuming and error-prone maintaining different branches of a project can be. The appendix includes some references about this topic. </para>
-
-<para
->Simple tagging is something you usually do when a release is made, so that you can at any time easily get back to the project state at that time. Tags are usually given a name consisting of the project name and the version number. For example, &cervisia; 1.0 is available under the tag <literal
->CERVISIA_1_0</literal
->. &cervisia; enforces &CVS;'s strict rules about what constitutes valid tag name. It must begin with a letter and may contain letters, digits, hyphens and underscores. </para>
-
-<para
->Normally, you will want to tag the whole project (although &CVS; of course allows you to tag only a subset). To this end, mark the toplevel folder in the view and choose <menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Tag/Branch</guimenuitem
-></menuchoice
->. Now enter the name of the tag, press <keycap
->Return</keycap
-> and you are done. </para>
-
-<para
->Creating a branch is not significantly more difficult: In the tag dialogue, check the box <guibutton
->Create branch with this tag</guibutton
->. You can also delete an existing tag: Choose <menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Delete Tag</guimenuitem
-></menuchoice
-> in the main view. </para>
-
-<para
->Another aspect of branching is the merging of modifications from a branch to the current branch. If you are going to do this, choose <menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Merge...</guimenuitem
-></menuchoice
->. The dialogue that appears now gives you two options: </para>
-
-<para
->Either you may merge all modifications done on a branch to the current branch. In that case, check the box <guibutton
->Merge from branch</guibutton
-> and fill in the branch you want to merge from. &cervisia; will then execute the command </para>
+<title>Tagging and Branching</title>
+
+<para>We discuss here only the technical aspects of tagging and branching. If you are only a <emphasis>user</emphasis>, not the administrator of the repository, you will probably not be confronted with the problem. If however you are your own administrator, you should first read about the non-technical problems that accompany branching, in order to get an impression of how time-consuming and error-prone maintaining different branches of a project can be. The appendix includes some references about this topic. </para>
+
+<para>Simple tagging is something you usually do when a release is made, so that you can at any time easily get back to the project state at that time. Tags are usually given a name consisting of the project name and the version number. For example, &cervisia; 1.0 is available under the tag <literal>CERVISIA_1_0</literal>. &cervisia; enforces &CVS;'s strict rules about what constitutes valid tag name. It must begin with a letter and may contain letters, digits, hyphens and underscores. </para>
+
+<para>Normally, you will want to tag the whole project (although &CVS; of course allows you to tag only a subset). To this end, mark the toplevel folder in the view and choose <menuchoice><guimenu>Advanced</guimenu><guimenuitem>Tag/Branch</guimenuitem></menuchoice>. Now enter the name of the tag, press <keycap>Return</keycap> and you are done. </para>
+
+<para>Creating a branch is not significantly more difficult: In the tag dialogue, check the box <guibutton>Create branch with this tag</guibutton>. You can also delete an existing tag: Choose <menuchoice><guimenu>Advanced</guimenu><guimenuitem>Delete Tag</guimenuitem></menuchoice> in the main view. </para>
+
+<para>Another aspect of branching is the merging of modifications from a branch to the current branch. If you are going to do this, choose <menuchoice><guimenu>Advanced</guimenu><guimenuitem>Merge...</guimenuitem></menuchoice>. The dialogue that appears now gives you two options: </para>
+
+<para>Either you may merge all modifications done on a branch to the current branch. In that case, check the box <guibutton>Merge from branch</guibutton> and fill in the branch you want to merge from. &cervisia; will then execute the command </para>
 
 <para>
-<screen
-><command
->cvs update <option
->-j</option
-> <replaceable
->branchtag</replaceable
-></command
-></screen>
+<screen><command>cvs update <option>-j</option> <replaceable>branchtag</replaceable></command></screen>
 </para>
 
-<para
->The other possibility is that you want to merge only the modifications made between two tags on a branch. This usually happens when you merge from the same branch to the trunk several times. In that case, check the box <guibutton
->Merge modifications</guibutton
-> and enter (in the correct order) the two relevant tags. This will result in a command </para>
+<para>The other possibility is that you want to merge only the modifications made between two tags on a branch. This usually happens when you merge from the same branch to the trunk several times. In that case, check the box <guibutton>Merge modifications</guibutton> and enter (in the correct order) the two relevant tags. This will result in a command </para>
 
 <para>
-<screen
-><command
->cvs update <option
->-j</option
-> <replaceable
->branchtag1</replaceable
-> <option
->-j</option
-> <replaceable
->branchtag2</replaceable
-></command
-></screen>
+<screen><command>cvs update <option>-j</option> <replaceable>branchtag1</replaceable> <option>-j</option> <replaceable>branchtag2</replaceable></command></screen>
 </para>
 
 </sect1>
 
 
 <sect1 id="watches">
-<title
->Using Watches</title>
-
-<para
->A watch is the conventional name for &CVS;'s feature to notify users of the repository whenever a file has been changed or a developer has started editing a file. The usage of watches requires that the file <filename
-><envar
->$CVSROOT</envar
->/CVSROOT/notify</filename
-> has been set up properly. This is not discussed here; if you need further information on the setup from the administrator's point of view, read one of the books listed in the appendix. </para>
-
-<para
->&cervisia;'s main support of watches are six menu items. </para>
-
-<para
->In order to add a watch to one or several files, use <menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Add Watch...</guimenuitem
-></menuchoice
->. In the dialogue you get, you can choose to get notified for any of the types of events that &CVS; supports. For example, if you only want to get notified when a file is committed, check the boxes <guibutton
->Only</guibutton
-> and <guibutton
->Commits</guibutton
->. If you want to get notified about any event related to the marked files, check the box <guibutton
->All</guibutton
->. The command line used when you accept the dialogue is </para>
+<title>Using Watches</title>
+
+<para>A watch is the conventional name for &CVS;'s feature to notify users of the repository whenever a file has been changed or a developer has started editing a file. The usage of watches requires that the file <filename><envar>$CVSROOT</envar>/CVSROOT/notify</filename> has been set up properly. This is not discussed here; if you need further information on the setup from the administrator's point of view, read one of the books listed in the appendix. </para>
+
+<para>&cervisia;'s main support of watches are six menu items. </para>
+
+<para>In order to add a watch to one or several files, use <menuchoice><guimenu>Advanced</guimenu><guimenuitem>Add Watch...</guimenuitem></menuchoice>. In the dialogue you get, you can choose to get notified for any of the types of events that &CVS; supports. For example, if you only want to get notified when a file is committed, check the boxes <guibutton>Only</guibutton> and <guibutton>Commits</guibutton>. If you want to get notified about any event related to the marked files, check the box <guibutton>All</guibutton>. The command line used when you accept the dialogue is </para>
 
 <para>
-<screen
-><command
->cvs watch add -a commit <replaceable
->file names</replaceable
-></command
-></screen>
+<screen><command>cvs watch add -a commit <replaceable>file names</replaceable></command></screen>
 </para>
 
-<para
->or with a similar option, depending on the events you chose to watch. </para>
+<para>or with a similar option, depending on the events you chose to watch. </para>
 
-<para
->If you are not interested in some files anymore, you can remove your watches on them. To this end, use <menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Remove Watch...</guimenuitem
-></menuchoice
->. In the dialogue you get here, the same options are offered as in the form you filled out when adding the watch. When you confirm this dialogue, &cervisia; issues the command </para>
+<para>If you are not interested in some files anymore, you can remove your watches on them. To this end, use <menuchoice><guimenu>Advanced</guimenu><guimenuitem>Remove Watch...</guimenuitem></menuchoice>. In the dialogue you get here, the same options are offered as in the form you filled out when adding the watch. When you confirm this dialogue, &cervisia; issues the command </para>
 
 <para>
-<screen
-><command
->cvs watch remove <replaceable
->file names</replaceable
-></command
-></screen>
+<screen><command>cvs watch remove <replaceable>file names</replaceable></command></screen>
 </para>
 
-<para
->possibly with an option <option
->-a</option
-> for the chosen events. </para>
+<para>possibly with an option <option>-a</option> for the chosen events. </para>
 
-<para
->Finally, you can get a list of the people who are watching a couple of files. Choose <menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Show Watchers</guimenuitem
-></menuchoice
->. Using this menu item will result in a command </para>
+<para>Finally, you can get a list of the people who are watching a couple of files. Choose <menuchoice><guimenu>Advanced</guimenu><guimenuitem>Show Watchers</guimenuitem></menuchoice>. Using this menu item will result in a command </para>
 
 <para>
-<screen
-><command
->cvs watchers <replaceable
->file names</replaceable
-></command
-></screen>
+<screen><command>cvs watchers <replaceable>file names</replaceable></command></screen>
 </para>
 
-<para
->In the normal usage scenario of &CVS;, each developer works separately in his checked out sandbox. When he wants to modify some file, he can just open it in his editor and start working on it. Nobody else will know about this work until the file gets committed. </para>
+<para>In the normal usage scenario of &CVS;, each developer works separately in his checked out sandbox. When he wants to modify some file, he can just open it in his editor and start working on it. Nobody else will know about this work until the file gets committed. </para>
 
-<para
->For some developer groups, this is not the preferred model of cooperation. They want to get notified about someone working on a file <emphasis
->as soon as</emphasis
-> he starts with it. This can be achieved by some further &CVS; commands. Before you start editing a file, select it in &cervisia;'s main window and choose <menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Edit</guimenuitem
-></menuchoice
->. This will execute the command </para>
+<para>For some developer groups, this is not the preferred model of cooperation. They want to get notified about someone working on a file <emphasis>as soon as</emphasis> he starts with it. This can be achieved by some further &CVS; commands. Before you start editing a file, select it in &cervisia;'s main window and choose <menuchoice><guimenu>Advanced</guimenu><guimenuitem>Edit</guimenuitem></menuchoice>. This will execute the command </para>
 
 <para>
-<screen
-><command
->cvs edit <replaceable
->file names</replaceable
-></command
-></screen>
+<screen><command>cvs edit <replaceable>file names</replaceable></command></screen>
 </para>
 
-<para
->This will send out a notification to everyone who has set an <literal
->edit</literal
-> watch on this file. It will also register you as an <emphasis
->editor</emphasis
-> of the file. You can obtain a list of all editors of a certain file by using <menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Show Editors</guimenuitem
-></menuchoice
->. This is equivalent to typing on the command line </para>
+<para>This will send out a notification to everyone who has set an <literal>edit</literal> watch on this file. It will also register you as an <emphasis>editor</emphasis> of the file. You can obtain a list of all editors of a certain file by using <menuchoice><guimenu>Advanced</guimenu><guimenuitem>Show Editors</guimenuitem></menuchoice>. This is equivalent to typing on the command line </para>
 
 <para>
-<screen
-><command
->cvs editors <replaceable
->file names</replaceable
-></command
-></screen>
+<screen><command>cvs editors <replaceable>file names</replaceable></command></screen>
 </para>
 
-<para
->An editing session is automatically ended when you commit the affected file. At that moment, an <literal
->unedit</literal
-> notification gets sent out to all people who have registered a respective watch on the file. Of course, sometimes you may not want to commit the file, but abort the editing session and revert to the previous version of the file. This is done by using <menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Unedit</guimenuitem
-></menuchoice
->. Note that &cervisia; will not ask you for confirmation; that means if you use this menu item, all your work done since you used <menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Edit</guimenuitem
-></menuchoice
-> will be lost. Precisely, &cervisia; uses the command line </para>
+<para>An editing session is automatically ended when you commit the affected file. At that moment, an <literal>unedit</literal> notification gets sent out to all people who have registered a respective watch on the file. Of course, sometimes you may not want to commit the file, but abort the editing session and revert to the previous version of the file. This is done by using <menuchoice><guimenu>Advanced</guimenu><guimenuitem>Unedit</guimenuitem></menuchoice>. Note that &cervisia; will not ask you for confirmation; that means if you use this menu item, all your work done since you used <menuchoice><guimenu>Advanced</guimenu><guimenuitem>Edit</guimenuitem></menuchoice> will be lost. Precisely, &cervisia; uses the command line </para>
 
 <para>
-<screen
-><command
->echo y | cvs unedit <replaceable
->file names</replaceable
-></command
-></screen>
+<screen><command>echo y | cvs unedit <replaceable>file names</replaceable></command></screen>
 </para>
 
-<para
->So far, we have only the discussed the case where edits and unedits are used voluntarily be the developers. In addition &CVS; supports a model which <emphasis
->enforces</emphasis
-> the usage of these commands. The responsible command to switch to this model is <command
->cvs watch on</command
-> which we will not explain further because it is mostly used by the administrator of the repository. However, the important point from the developer's point of view is that when the project enforces edits, working copies are checked out <emphasis
->readonly</emphasis
->. That means you cannot edit a file by default (unless you use tricks like <command
->chmod</command
->). Only when you use <menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Edit</guimenuitem
-></menuchoice
->, the file becomes writable. It is made read-only again when you commit the file or use <menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Unedit</guimenuitem
-></menuchoice
->. </para>
-
-<para
->&cervisia;'s editor interface helps you with projects that enforce watches also in a different way. If you just started an editor with a readonly file by double-clicking on it or by using <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Edit</guimenuitem
-></menuchoice
->, you would not be able to save your modifications later. This has of course a reason: Whenever you want to change a file, you should run <command
->cvs edit</command
-> before, so that all people watching the file get a notification that you are working on it. </para>
-
-<para
->In such a case, it is advisable to check the option <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Do cvs edit Automatically When Necessary</guimenuitem
-></menuchoice
->. Now, whenever you edit a file by double-clicking it, &cervisia; will run <command
->cvs edit</command
-> before the editor is actually executed. Then you can edit your file as usual. When you have finished your work, commit your files, and the committed files are read-only again. </para>
+<para>So far, we have only the discussed the case where edits and unedits are used voluntarily be the developers. In addition &CVS; supports a model which <emphasis>enforces</emphasis> the usage of these commands. The responsible command to switch to this model is <command>cvs watch on</command> which we will not explain further because it is mostly used by the administrator of the repository. However, the important point from the developer's point of view is that when the project enforces edits, working copies are checked out <emphasis>readonly</emphasis>. That means you cannot edit a file by default (unless you use tricks like <command>chmod</command>). Only when you use <menuchoice><guimenu>Advanced</guimenu><guimenuitem>Edit</guimenuitem></menuchoice>, the file becomes writable. It is made read-only again when you commit the file or use <menuchoice><guimenu>Advanced</guimenu><guimenuitem>Unedit</guimenuitem></menuchoice>. </para>
+
+<para>&cervisia;'s editor interface helps you with projects that enforce watches also in a different way. If you just started an editor with a readonly file by double-clicking on it or by using <menuchoice><guimenu>File</guimenu><guimenuitem>Edit</guimenuitem></menuchoice>, you would not be able to save your modifications later. This has of course a reason: Whenever you want to change a file, you should run <command>cvs edit</command> before, so that all people watching the file get a notification that you are working on it. </para>
+
+<para>In such a case, it is advisable to check the option <menuchoice><guimenu>Settings</guimenu><guimenuitem>Do cvs edit Automatically When Necessary</guimenuitem></menuchoice>. Now, whenever you edit a file by double-clicking it, &cervisia; will run <command>cvs edit</command> before the editor is actually executed. Then you can edit your file as usual. When you have finished your work, commit your files, and the committed files are read-only again. </para>
 
 </sect1>
 
 
 <sect1 id="locking">
-<title
->Locking</title>
-
-<para
->The development model usually followed when &CVS; is used is called <emphasis
->unreserved checkouts</emphasis
->. Each developer has his own sandbox where he can edit files as he likes. If when the watch features - like <command
->cvs edit</command
-> - are used, multiple developers can work on files synchronously. Changes done by a different developer are merged into the local sandbox when an update is performed. </para>
-
-<para
->Other revision control systems - like <acronym
->RCS</acronym
-> and <application
->SourceSafe</application
-> use a different model. When a developer wants to a edit a file, he has to <emphasis
->lock</emphasis
-> it. Only one developer at a time can a lock a file. When he has finished editing, the lock is released. On the one hand, with this model, conflicts can never happen. On the other hand, two developers can not work on the same file at the same time, even when their changes do not affect each other. This can be a bottleneck. We are not going to discuss the organisational benefits of both approaches. Nevertheless we mention that although &CVS; has some support for locking, it is not the preferred way of working with &CVS;. You should not use these features unless you are sure that your project manager allows them. </para>
-
-<para
->With &cervisia;, you lock files as follows. Select the desired files in the main view. Then choose <menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Lock</guimenuitem
-></menuchoice
->. This runs the command </para>
+<title>Locking</title>
+
+<para>The development model usually followed when &CVS; is used is called <emphasis>unreserved checkouts</emphasis>. Each developer has his own sandbox where he can edit files as he likes. If when the watch features - like <command>cvs edit</command> - are used, multiple developers can work on files synchronously. Changes done by a different developer are merged into the local sandbox when an update is performed. </para>
+
+<para>Other revision control systems - like <acronym>RCS</acronym> and <application>SourceSafe</application> use a different model. When a developer wants to a edit a file, he has to <emphasis>lock</emphasis> it. Only one developer at a time can a lock a file. When he has finished editing, the lock is released. On the one hand, with this model, conflicts can never happen. On the other hand, two developers can not work on the same file at the same time, even when their changes do not affect each other. This can be a bottleneck. We are not going to discuss the organisational benefits of both approaches. Nevertheless we mention that although &CVS; has some support for locking, it is not the preferred way of working with &CVS;. You should not use these features unless you are sure that your project manager allows them. </para>
+
+<para>With &cervisia;, you lock files as follows. Select the desired files in the main view. Then choose <menuchoice><guimenu>Advanced</guimenu><guimenuitem>Lock</guimenuitem></menuchoice>. This runs the command </para>
 
 <para>
-<screen
-><command
->cvs admin -l <replaceable
->file names</replaceable
-></command
-></screen>
+<screen><command>cvs admin -l <replaceable>file names</replaceable></command></screen>
 </para>
 
-<para
->The reverse effect is achieved by using <menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Unlock</guimenuitem
-></menuchoice
->. This runs the command</para>
+<para>The reverse effect is achieved by using <menuchoice><guimenu>Advanced</guimenu><guimenuitem>Unlock</guimenuitem></menuchoice>. This runs the command</para>
 
 <para>
-<screen
-><command
->cvs admin -u <replaceable
->file names</replaceable
-></command
-></screen>
+<screen><command>cvs admin -u <replaceable>file names</replaceable></command></screen>
 </para>
 
 </sect1>
@@ -2567,57 +1013,24 @@ Changes in the repository
 
 
 <chapter id="customization">
-<title
->Customising &cervisia;</title>
+<title>Customising &cervisia;</title>
 
-<para
->&cervisia; can be customised in various ways to your needs and preferences. Some options which you may want to change regularly are directly available in the <guimenu
->Settings</guimenu
-> menu. Others are united in a common dialogue which is available via <menuchoice
-><guimenu
->Option</guimenu
-><guimenuitem
->Settings...</guimenuitem
-></menuchoice
->. </para>
+<para>&cervisia; can be customised in various ways to your needs and preferences. Some options which you may want to change regularly are directly available in the <guimenu>Settings</guimenu> menu. Others are united in a common dialogue which is available via <menuchoice><guimenu>Option</guimenu><guimenuitem>Settings...</guimenuitem></menuchoice>. </para>
 
 
 <sect1 id="customize-general">
-<title
->General</title>
+<title>General</title>
 
 <variablelist>
 
 <varlistentry id="customize-username">
-<term
-><guilabel
->User name for the ChangeLog editor:</guilabel
-></term>
-<listitem
-><para
->Whenever you use the menu item <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Insert ChangeLog Entry...</guimenuitem
-></menuchoice
->, a new ChangeLog entry is generated with the current date and your username. Normally, it is considered good style to insert your full name and your email address into each of your ChangeLog entries. &cervisia; add automatically the full name and email address entered here. </para
-></listitem>
+<term><guilabel>User name for the ChangeLog editor:</guilabel></term>
+<listitem><para>Whenever you use the menu item <menuchoice><guimenu>File</guimenu><guimenuitem>Insert ChangeLog Entry...</guimenuitem></menuchoice>, a new ChangeLog entry is generated with the current date and your username. Normally, it is considered good style to insert your full name and your email address into each of your ChangeLog entries. &cervisia; add automatically the full name and email address entered here. </para></listitem>
 </varlistentry>
 
 <varlistentry id="customize-cvspath">
-<term
-><guilabel
->Path to cvs executable, or 'cvs':</guilabel
-></term>
-<listitem
-><para
->Here you can set the name (or path) to the <command
->cvs</command
-> command line client. By default, the &CVS; executable found in your <envar
->$PATH</envar
-> is used by &cervisia;. </para
-></listitem>
+<term><guilabel>Path to cvs executable, or 'cvs':</guilabel></term>
+<listitem><para>Here you can set the name (or path) to the <command>cvs</command> command line client. By default, the &CVS; executable found in your <envar>$PATH</envar> is used by &cervisia;. </para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -2625,81 +1038,28 @@ Changes in the repository
 </sect1>
 
 <sect1 id="customize-diff">
-<title
->Diff Viewer</title>
+<title>Diff Viewer</title>
 
 <variablelist>
 
 <varlistentry id="customize-context">
-<term
-><guilabel
->Number of context lines in the diff dialogue:</guilabel
-></term>
-<listitem
-><para
->For the diff dialogue, &cervisia; uses the option <option
->-U</option
-> to <command
->diff</command
->. This lets <command
->diff</command
-> show only a limited number of lines around each difference region (context lines). Here you can set the argument to <option
->-U</option
->. </para
-></listitem>
+<term><guilabel>Number of context lines in the diff dialogue:</guilabel></term>
+<listitem><para>For the diff dialogue, &cervisia; uses the option <option>-U</option> to <command>diff</command>. This lets <command>diff</command> show only a limited number of lines around each difference region (context lines). Here you can set the argument to <option>-U</option>. </para></listitem>
 </varlistentry>
 
 <varlistentry id="customize-diffopt">
-<term
-><guilabel
->Additional options for cvs diff:</guilabel
-></term>
-<listitem
-><para
->Here you can add additional arguments to the <command
->diff</command
->. A popular example is <option
->-b</option
-> which lets <command
->diff</command
-> ignore changes in the amount of whitespace. </para
-></listitem>
+<term><guilabel>Additional options for cvs diff:</guilabel></term>
+<listitem><para>Here you can add additional arguments to the <command>diff</command>. A popular example is <option>-b</option> which lets <command>diff</command> ignore changes in the amount of whitespace. </para></listitem>
 </varlistentry>
 
 <varlistentry id="customize-tabwidth">
-<term
-><guilabel
->Tab width in diff dialogue:</guilabel
-></term>
-<listitem
-><para
->In the diff dialogue, tab characters present in your file or in the output of the <command
->diff</command
-> command are expanded into a fixed number of space characters. By default, each tab is replaced by eight spaces, but here you can setup a different number. </para
-></listitem>
+<term><guilabel>Tab width in diff dialogue:</guilabel></term>
+<listitem><para>In the diff dialogue, tab characters present in your file or in the output of the <command>diff</command> command are expanded into a fixed number of space characters. By default, each tab is replaced by eight spaces, but here you can setup a different number. </para></listitem>
 </varlistentry>
 
 <varlistentry id="customize-difffrontend">
-<term
-><guilabel
->External diff frontend:</guilabel
-></term>
-<listitem
-><para
->When you use any of the features which show the diff dialogue, like <menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Difference to Repository...</guimenuitem
-></menuchoice
->, &cervisia; invokes its internal diff frontend. If you prefer a different one, like <application
->Kompare</application
->, <application
->TkDiff</application
-> or <application
->xxdiff</application
->, enter its file name and path here. </para
-></listitem>
+<term><guilabel>External diff frontend:</guilabel></term>
+<listitem><para>When you use any of the features which show the diff dialogue, like <menuchoice><guimenu>View</guimenu><guimenuitem>Difference to Repository...</guimenuitem></menuchoice>, &cervisia; invokes its internal diff frontend. If you prefer a different one, like <application>Kompare</application>, <application>TkDiff</application> or <application>xxdiff</application>, enter its file name and path here. </para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -2707,43 +1067,18 @@ Changes in the repository
 </sect1>
 
 <sect1 id="customize-status">
-<title
->Status</title>
+<title>Status</title>
 
 <variablelist>
 
 <varlistentry id="customize-startstatus-remote">
-<term
-><guilabel
->When opening a sandbox from a remote repository, start a File-&gt;Status command automatically</guilabel
-></term>
-<listitem
-><para
->When you check this option, the <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Status</guimenuitem
-></menuchoice
-> command is started whenever you open a remote sandbox. This command may need some time and also needs a connection to the server for remote repositories (making it unusable for offline usage). </para
-></listitem>
+<term><guilabel>When opening a sandbox from a remote repository, start a File-&gt;Status command automatically</guilabel></term>
+<listitem><para>When you check this option, the <menuchoice><guimenu>File</guimenu><guimenuitem>Status</guimenuitem></menuchoice> command is started whenever you open a remote sandbox. This command may need some time and also needs a connection to the server for remote repositories (making it unusable for offline usage). </para></listitem>
 </varlistentry>
 
 <varlistentry id="customize-startstatus-local">
-<term
-><guilabel
->When opening a sandbox from a local repository, start a File-&gt;Status command automatically</guilabel
-></term>
-<listitem
-><para
->When you check this option, the <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Status</guimenuitem
-></menuchoice
-> command is started whenever you open a local sandbox. </para
-></listitem>
+<term><guilabel>When opening a sandbox from a local repository, start a File-&gt;Status command automatically</guilabel></term>
+<listitem><para>When you check this option, the <menuchoice><guimenu>File</guimenu><guimenuitem>Status</guimenuitem></menuchoice> command is started whenever you open a local sandbox. </para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -2751,62 +1086,23 @@ Changes in the repository
 </sect1>
 
 <sect1 id="customize-advanced">
-<title
->Advanced</title>
+<title>Advanced</title>
 
 <variablelist>
 
 <varlistentry id="customize-timeout">
-<term
-><guilabel
->Timeout after which a progress dialogue appears (in ms):</guilabel
-></term>
-<listitem
-><para
->Practically all &CVS; commands started in a sandbox which belongs to a remote repository need a connection to the &CVS; server. This is affected by delays from the network connection or a high load on the server. For this reason, for commands like <menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Difference to Repository...</guimenuitem
-></menuchoice
-> &cervisia; opens a dialogue which indicates that the command is still running and which allows you to abort it. Furthermore, this dialogue is used to show you error messages from &CVS;. As this dialogue may become annoying after some time, it is shown only after a certain timeout which is 4 seconds by default. Here you can change this value. </para
-></listitem>
+<term><guilabel>Timeout after which a progress dialogue appears (in ms):</guilabel></term>
+<listitem><para>Practically all &CVS; commands started in a sandbox which belongs to a remote repository need a connection to the &CVS; server. This is affected by delays from the network connection or a high load on the server. For this reason, for commands like <menuchoice><guimenu>View</guimenu><guimenuitem>Difference to Repository...</guimenuitem></menuchoice> &cervisia; opens a dialogue which indicates that the command is still running and which allows you to abort it. Furthermore, this dialogue is used to show you error messages from &CVS;. As this dialogue may become annoying after some time, it is shown only after a certain timeout which is 4 seconds by default. Here you can change this value. </para></listitem>
 </varlistentry>
 
 <varlistentry id="customize-compression">
-<term
-><guilabel
->Default compression level:</guilabel
-></term>
-<listitem
-><para
->The <command
->cvs</command
-> client compresses files and patches when they are transferred over a network. With the command line option <option
->-z</option
->, the compression level can be set. You can setup &cervisia; to use this option by configuring the level here. The value set here is used only as a default; additionally there is a per-repository setting available in <menuchoice
-><guimenu
->Repository</guimenu
-><guimenuitem
->Repositories...</guimenuitem
-></menuchoice
->. </para
-></listitem>
+<term><guilabel>Default compression level:</guilabel></term>
+<listitem><para>The <command>cvs</command> client compresses files and patches when they are transferred over a network. With the command line option <option>-z</option>, the compression level can be set. You can setup &cervisia; to use this option by configuring the level here. The value set here is used only as a default; additionally there is a per-repository setting available in <menuchoice><guimenu>Repository</guimenu><guimenuitem>Repositories...</guimenuitem></menuchoice>. </para></listitem>
 </varlistentry>
 
 <varlistentry id="customize-sshagent">
-<term
-><guilabel
->Utilise a running or start a new ssh-agent process</guilabel
-></term>
-<listitem
-><para
->Check this box if you use <link linkend="rsh"
->ext (rsh) repositories</link
->, the &ssh; remote shell to communicate with the repository and <application
->ssh-agent</application
-> to manage your keys. </para
-></listitem>
+<term><guilabel>Utilise a running or start a new ssh-agent process</guilabel></term>
+<listitem><para>Check this box if you use <link linkend="rsh">ext (rsh) repositories</link>, the &ssh; remote shell to communicate with the repository and <application>ssh-agent</application> to manage your keys. </para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -2815,90 +1111,33 @@ Changes in the repository
 
 
 <sect1 id="customize-look">
-<title
->Look'n'feel</title>
+<title>Look'n'feel</title>
 
 <variablelist>
 
 <varlistentry id="customize-protocolfont">
-<term
-><guilabel
->Font for protocol window...</guilabel
-></term>
-<listitem
-><para
->Press this button to open the <guilabel
->Set Font</guilabel
-> dialogue, to set the font used in the protocol window (this is the window showing the output of the <command
->cvs</command
-> client). </para
-></listitem>
+<term><guilabel>Font for protocol window...</guilabel></term>
+<listitem><para>Press this button to open the <guilabel>Set Font</guilabel> dialogue, to set the font used in the protocol window (this is the window showing the output of the <command>cvs</command> client). </para></listitem>
 </varlistentry>
 
 <varlistentry id="customize-annotatefont">
-<term
-><guilabel
->Font for annotate view...</guilabel
-></term>
-<listitem
-><para
->Press this button to open the <guilabel
->Set Font</guilabel
-> dialogue, to set the font used in the <link linkend="annotate"
->annotate view</link
->. </para
-></listitem>
+<term><guilabel>Font for annotate view...</guilabel></term>
+<listitem><para>Press this button to open the <guilabel>Set Font</guilabel> dialogue, to set the font used in the <link linkend="annotate">annotate view</link>. </para></listitem>
 </varlistentry>
 
 <varlistentry id="customize-difffont">
-<term
-><guilabel
->Font for diff view...</guilabel
-></term>
-<listitem
-><para
->Press this button to open the <guilabel
->Set Font</guilabel
-> dialogue, to set the font used in <link linkend="diff"
->diff dialogs</link
->. </para
-></listitem>
+<term><guilabel>Font for diff view...</guilabel></term>
+<listitem><para>Press this button to open the <guilabel>Set Font</guilabel> dialogue, to set the font used in <link linkend="diff">diff dialogs</link>. </para></listitem>
 </varlistentry>
 
 <varlistentry id="customize-colors">
-<term
-><guilabel
->Colours</guilabel
-></term>
-<listitem
-><para
->Press the coloured buttons to open the <guilabel
->Select Colour</guilabel
-> dialogue, to set the colour used for <guilabel
->Conflict</guilabel
->, <guilabel
->Local Change</guilabel
-> or <guilabel
->Remote Change</guilabel
->, in the main view or <guilabel
->Diff change</guilabel
->, <guilabel
->Diff insertion</guilabel
-> or <guilabel
->Diff deletion</guilabel
->, in &cervisia;'s built-in diff frontend. </para
-></listitem>
+<term><guilabel>Colours</guilabel></term>
+<listitem><para>Press the coloured buttons to open the <guilabel>Select Colour</guilabel> dialogue, to set the colour used for <guilabel>Conflict</guilabel>, <guilabel>Local Change</guilabel> or <guilabel>Remote Change</guilabel>, in the main view or <guilabel>Diff change</guilabel>, <guilabel>Diff insertion</guilabel> or <guilabel>Diff deletion</guilabel>, in &cervisia;'s built-in diff frontend. </para></listitem>
 </varlistentry>
 
 <varlistentry id="customize-splitter">
-<term
-><guilabel
->Split main window horizontally</guilabel
-></term>
-<listitem
-><para
->&cervisia;'s main window is normally split vertically into a window with the file tree above and one with the &CVS; output below; alternatively, you can arrange them horizontally. </para
-></listitem>
+<term><guilabel>Split main window horizontally</guilabel></term>
+<listitem><para>&cervisia;'s main window is normally split vertically into a window with the file tree above and one with the &CVS; output below; alternatively, you can arrange them horizontally. </para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -2908,123 +1147,44 @@ Changes in the repository
 
 
 <chapter id="appendix">
-<title
->Appendix</title>
+<title>Appendix</title>
 
 <sect1 id="ignoredfiles">
-<title
->Ignored Files</title>
+<title>Ignored Files</title>
 
-<para
->In its main file tree, &cervisia; does not display all files which are actually there. This is analogue to <command
->cvs</command
-> itself and helps to avoid clutter caused by uninteresting stuff like object files. &cervisia; tries to mimic <command
->cvs</command
->'s behavior as close as possible, i.e. it gets ignore lists from the following sources: </para>
+<para>In its main file tree, &cervisia; does not display all files which are actually there. This is analogue to <command>cvs</command> itself and helps to avoid clutter caused by uninteresting stuff like object files. &cervisia; tries to mimic <command>cvs</command>'s behavior as close as possible, i.e. it gets ignore lists from the following sources: </para>
 
 <itemizedlist>
 
-<listitem
-><para
->A static list of entries which includes things like <literal role="extension"
->*.o</literal
-> and <filename
->core</filename
->. For details, see the &CVS; documentation. </para
-></listitem>
-<listitem
-><para
->The file <filename
-><envar
->$HOME</envar
->/.cvsignore</filename
->. </para
-></listitem>
-
-<listitem
-><para
->The environment variable <envar
->$CVSIGNORE</envar
->. </para
-></listitem>
-<listitem
-><para
->The <filename
->.cvsignore</filename
-> file in the respective folder. </para
-></listitem>
+<listitem><para>A static list of entries which includes things like <literal role="extension">*.o</literal> and <filename>core</filename>. For details, see the &CVS; documentation. </para></listitem>
+<listitem><para>The file <filename><envar>$HOME</envar>/.cvsignore</filename>. </para></listitem>
+
+<listitem><para>The environment variable <envar>$CVSIGNORE</envar>. </para></listitem>
+<listitem><para>The <filename>.cvsignore</filename> file in the respective folder. </para></listitem>
 
 </itemizedlist>
 
-<para
-><command
->cvs</command
-> itself additionally looks up entries in <filename
-><envar
->$CVSROOT</envar
->/CVSROOT/cvsignore</filename
->, but this is a file on the server, and &cervisia; should be able to start up offline. If you are working with a group that prefers to use an ignore list on the server, it's probably a good idea to take a look which patterns are listed there and to put them into the <filename
->.cvsignore</filename
-> file in your home folder. </para>
+<para><command>cvs</command> itself additionally looks up entries in <filename><envar>$CVSROOT</envar>/CVSROOT/cvsignore</filename>, but this is a file on the server, and &cervisia; should be able to start up offline. If you are working with a group that prefers to use an ignore list on the server, it's probably a good idea to take a look which patterns are listed there and to put them into the <filename>.cvsignore</filename> file in your home folder. </para>
 
 </sect1>
    
 
 <sect1 id="information">
-<title
->Further Information and Support</title>
+<title>Further Information and Support</title>
 
 <itemizedlist>
 
-<listitem
-><para
->&CVS; comes with a complete set of documentation in the form of info pages, known as "The Cederqvist". If it is properly installed, you get browse it by typing in <userinput
->info:/cvs</userinput
-> into the locationbar of <application
->kdehelp</application
->, <application
->khelpcenter</application
-> resp. Alternative, you can just choose <menuchoice
-><guimenu
->Help</guimenu
-><guimenuitem
->CVS Info</guimenuitem
-></menuchoice
-> in &cervisia;. An on-line HTML version of the Cederqvist is available <ulink url="http://cvshome.org/docs/manual/cvs.html"
->on the web</ulink
->. </para>
-
-<para
->As this book is maintained together with &CVS;, it is normally the most up-to-date reference; nevertheless, considering other documentation for learning to use &CVS; is recommended, in particular the following. </para
-></listitem>
-
-<listitem
-><para
->Karl Fogel has written the excellent book <ulink url="http://cvsbook.red-bean.com/index.html"
->Open Source Development with CVS</ulink
->. About half of this book is about the development process of Open Source software. The other half is a technical documentation of &CVS;. Thankfully, the technical part of the book has been made freely redistributable under the GPL, so that you can download a HTML version of it. A list of errata is available on the webpage mentioned above. </para
-></listitem>
-
-<listitem
-><para
->&CVS; issues are discussed on a dedicated <ulink url="http://mail.gnu.org/mailman/listinfo/info-cvs"
->mailing list</ulink
->. </para
-></listitem>
-
-<listitem
-><para
->There is USENET group <literal
->comp.software.config-mgmt</literal
-> dedicated to configuration management in general. &CVS; is only marginally a topic in this group, but nevertheless it may be interesting for discussing merits of various revision control systems compared to &CVS;. </para
-></listitem>
-
-<listitem
-><para
->Last but not least, there is a (low traffic) <ulink url="http://lists.sourceforge.net/mailman/listinfo/cervisia-user"
->&cervisia; mailing list</ulink
->. </para
-></listitem>
+<listitem><para>&CVS; comes with a complete set of documentation in the form of info pages, known as "The Cederqvist". If it is properly installed, you get browse it by typing in <userinput>info:/cvs</userinput> into the locationbar of <application>kdehelp</application>, <application>khelpcenter</application> resp. Alternative, you can just choose <menuchoice><guimenu>Help</guimenu><guimenuitem>CVS Info</guimenuitem></menuchoice> in &cervisia;. An on-line HTML version of the Cederqvist is available <ulink url="http://cvshome.org/docs/manual/cvs.html">on the web</ulink>. </para>
+
+<para>As this book is maintained together with &CVS;, it is normally the most up-to-date reference; nevertheless, considering other documentation for learning to use &CVS; is recommended, in particular the following. </para></listitem>
+
+<listitem><para>Karl Fogel has written the excellent book <ulink url="http://cvsbook.red-bean.com/index.html">Open Source Development with CVS</ulink>. About half of this book is about the development process of Open Source software. The other half is a technical documentation of &CVS;. Thankfully, the technical part of the book has been made freely redistributable under the GPL, so that you can download a HTML version of it. A list of errata is available on the webpage mentioned above. </para></listitem>
+
+<listitem><para>&CVS; issues are discussed on a dedicated <ulink url="http://mail.gnu.org/mailman/listinfo/info-cvs">mailing list</ulink>. </para></listitem>
+
+<listitem><para>There is USENET group <literal>comp.software.config-mgmt</literal> dedicated to configuration management in general. &CVS; is only marginally a topic in this group, but nevertheless it may be interesting for discussing merits of various revision control systems compared to &CVS;. </para></listitem>
+
+<listitem><para>Last but not least, there is a (low traffic) <ulink url="http://lists.sourceforge.net/mailman/listinfo/cervisia-user">&cervisia; mailing list</ulink>. </para></listitem>
 
 </itemizedlist>
 
@@ -3032,252 +1192,80 @@ Changes in the repository
    
 
 <sect1 id="commandreference">
-<title
->Command Reference</title>
+<title>Command Reference</title>
       
 <!-- File Menu -->
 <sect2 id="menufile">
 
-<title
->The File Menu</title>
+<title>The File Menu</title>
 
 <variablelist>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Open Sandbox...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Opens a sandbox in the main window. See <xref linkend="mainscreen"/>. </para
-></listitem>
+<term><menuchoice><guimenu>File</guimenu><guimenuitem>Open Sandbox...</guimenuitem> </menuchoice></term>
+<listitem><para>Opens a sandbox in the main window. See <xref linkend="mainscreen"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Recent sandboxes</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Opens one of the sandboxes that were in use recently. </para
-></listitem>
+<term><menuchoice><guimenu>File</guimenu><guimenuitem>Recent sandboxes</guimenuitem> </menuchoice></term>
+<listitem><para>Opens one of the sandboxes that were in use recently. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Insert ChangeLog Entry...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Opens the ChangeLog editor, prepared such that you can add a new entry with the current date. See <xref linkend="committingfiles"/>. </para
-></listitem>
+<term><menuchoice><guimenu>File</guimenu><guimenuitem>Insert ChangeLog Entry...</guimenuitem> </menuchoice></term>
+<listitem><para>Opens the ChangeLog editor, prepared such that you can add a new entry with the current date. See <xref linkend="committingfiles"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-><keycombo
-><keycap
->&Ctrl;</keycap
-><keycap
->U</keycap
-></keycombo
-></shortcut
-> <guimenu
->File</guimenu
-><guimenuitem
->Update</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Runs 'cvs update' on selected files and changes the status and revision numbers in the listing accordingly. See <xref linkend="mainscreen"/>. </para
-></listitem>
+<term><menuchoice><shortcut><keycombo><keycap>&Ctrl;</keycap><keycap>U</keycap></keycombo></shortcut> <guimenu>File</guimenu><guimenuitem>Update</guimenuitem> </menuchoice></term>
+<listitem><para>Runs 'cvs update' on selected files and changes the status and revision numbers in the listing accordingly. See <xref linkend="mainscreen"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-><keycap
->F5</keycap
-></shortcut
-> <guimenu
->File</guimenu
-><guimenuitem
->Status</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Runs 'cvs -n update' on selected files and changes the status and revision numbers in the listing accordingly. See <xref linkend="mainscreen"/>. </para
-></listitem>
+<term><menuchoice><shortcut><keycap>F5</keycap></shortcut> <guimenu>File</guimenu><guimenuitem>Status</guimenuitem> </menuchoice></term>
+<listitem><para>Runs 'cvs -n update' on selected files and changes the status and revision numbers in the listing accordingly. See <xref linkend="mainscreen"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Edit</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Opens the selected file in KDE's default editor for the selected file's type. </para
-></listitem>
+<term><menuchoice><guimenu>File</guimenu><guimenuitem>Edit</guimenuitem> </menuchoice></term>
+<listitem><para>Opens the selected file in KDE's default editor for the selected file's type. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Resolve...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Opens a dialogue for the selected file which allows you to resolve merge conflicts in it. See <xref linkend="resolvingconflicts"/>. </para
-></listitem>
+<term><menuchoice><guimenu>File</guimenu><guimenuitem>Resolve...</guimenuitem> </menuchoice></term>
+<listitem><para>Opens a dialogue for the selected file which allows you to resolve merge conflicts in it. See <xref linkend="resolvingconflicts"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-><keycap
->#</keycap
-></shortcut
-> <guimenu
->File</guimenu
-><guimenuitem
->Commit...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Allows you to commit the selected files. See <xref linkend="committingfiles"/>. </para
-></listitem>
+<term><menuchoice><shortcut><keycap>#</keycap></shortcut> <guimenu>File</guimenu><guimenuitem>Commit...</guimenuitem> </menuchoice></term>
+<listitem><para>Allows you to commit the selected files. See <xref linkend="committingfiles"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-><keycap
->+</keycap
-></shortcut
-> <guimenu
->File</guimenu
-><guimenuitem
->Add to Repository...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Allows you to add the selected files to the repository. See <xref linkend="addingfiles"/>. </para
-></listitem>
+<term><menuchoice><shortcut><keycap>+</keycap></shortcut> <guimenu>File</guimenu><guimenuitem>Add to Repository...</guimenuitem> </menuchoice></term>
+<listitem><para>Allows you to add the selected files to the repository. See <xref linkend="addingfiles"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Add Binary...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Allows you to add the selected files to the repository as binaries (<command
->cvs add<option
->-kb</option
-></command
->). See <xref linkend="addingfiles"/>. </para
-></listitem>
+<term><menuchoice><guimenu>File</guimenu><guimenuitem>Add Binary...</guimenuitem> </menuchoice></term>
+<listitem><para>Allows you to add the selected files to the repository as binaries (<command>cvs add<option>-kb</option></command>). See <xref linkend="addingfiles"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-><keycap
->-</keycap
-></shortcut
-> <guimenu
->File</guimenu
-><guimenuitem
->Remove from Repository...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Allows you to remove the selected files from the repository. See <xref linkend="removingfiles"/>. </para
-></listitem>
+<term><menuchoice><shortcut><keycap>-</keycap></shortcut> <guimenu>File</guimenu><guimenuitem>Remove from Repository...</guimenuitem> </menuchoice></term>
+<listitem><para>Allows you to remove the selected files from the repository. See <xref linkend="removingfiles"/>. </para></listitem>
 </varlistentry>
 
 <!--TODO: add the revert action to the working with files chapter -->
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Revert</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Discards any local changes you have made to the selected files and reverts to the version in the repository (Option <option
->-C</option
-> to <command
->cvs update</command
->). </para
-></listitem>
+<term><menuchoice><guimenu>File</guimenu><guimenuitem>Revert</guimenuitem> </menuchoice></term>
+<listitem><para>Discards any local changes you have made to the selected files and reverts to the version in the repository (Option <option>-C</option> to <command>cvs update</command>). </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-><keycombo
-><keycap
->&Ctrl;</keycap
-><keycap
->Q</keycap
-></keycombo
-></shortcut
-> <guimenu
->File</guimenu
-><guimenuitem
->Exit</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Quits &cervisia;. </para
-></listitem>
+<term><menuchoice><shortcut><keycombo><keycap>&Ctrl;</keycap><keycap>Q</keycap></keycombo></shortcut> <guimenu>File</guimenu><guimenuitem>Exit</guimenuitem> </menuchoice></term>
+<listitem><para>Quits &cervisia;. </para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -3287,258 +1275,81 @@ Changes in the repository
 <!-- View Menu -->
 <sect2 id="menuview">
 
-<title
->The View Menu</title>
+<title>The View Menu</title>
 
 <variablelist>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-><keycap
->Escape</keycap
-></shortcut
-> <guimenu
->View</guimenu
-><guimenuitem
->Stop</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Aborts any running subprocesses. </para
-></listitem>
+<term><menuchoice><shortcut><keycap>Escape</keycap></shortcut> <guimenu>View</guimenu><guimenuitem>Stop</guimenuitem> </menuchoice></term>
+<listitem><para>Aborts any running subprocesses. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-><keycombo
-><keycap
->&Ctrl;</keycap
-><keycap
->L</keycap
-></keycombo
-></shortcut
-> <guimenu
->View</guimenu
-><guimenuitem
->Browse Log...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Shows the log browser of the selected file versions. See <xref linkend="browsinglogs"/>. </para
-></listitem>
+<term><menuchoice><shortcut><keycombo><keycap>&Ctrl;</keycap><keycap>L</keycap></keycombo></shortcut> <guimenu>View</guimenu><guimenuitem>Browse Log...</guimenuitem> </menuchoice></term>
+<listitem><para>Shows the log browser of the selected file versions. See <xref linkend="browsinglogs"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-><keycombo
-><keycap
->&Ctrl;</keycap
-><keycap
->A</keycap
-></keycombo
-></shortcut
-> <guimenu
->View</guimenu
-><guimenuitem
->Annotate...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Shows an annotated view of the selected file, i.e. a view where you can for each line see which author modified it last. See <xref linkend="annotate"/>. </para
-></listitem>
+<term><menuchoice><shortcut><keycombo><keycap>&Ctrl;</keycap><keycap>A</keycap></keycombo></shortcut> <guimenu>View</guimenu><guimenuitem>Annotate...</guimenuitem> </menuchoice></term>
+<listitem><para>Shows an annotated view of the selected file, i.e. a view where you can for each line see which author modified it last. See <xref linkend="annotate"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-><keycombo
-><keycap
->&Ctrl;</keycap
-><keycap
->D</keycap
-></keycombo
-></shortcut
-> <guimenu
->View</guimenu
-><guimenuitem
->Difference to Repository (BASE)...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Shows the differences between the selected file in the sandbox and the revision you last updated (BASE). See <xref linkend="diff"/>. </para
-></listitem>
+<term><menuchoice><shortcut><keycombo><keycap>&Ctrl;</keycap><keycap>D</keycap></keycombo></shortcut> <guimenu>View</guimenu><guimenuitem>Difference to Repository (BASE)...</guimenuitem> </menuchoice></term>
+<listitem><para>Shows the differences between the selected file in the sandbox and the revision you last updated (BASE). See <xref linkend="diff"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-><keycombo
-><keycap
->&Ctrl;</keycap
-><keycap
->H</keycap
-></keycombo
-></shortcut
-> <guimenu
->View</guimenu
-><guimenuitem
->Difference to Repository (HEAD)...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Shows the differences between the selected file in the sandbox and the revision you last updated (HEAD). See <xref linkend="diff"/>. </para
-></listitem>
+<term><menuchoice><shortcut><keycombo><keycap>&Ctrl;</keycap><keycap>H</keycap></keycombo></shortcut> <guimenu>View</guimenu><guimenuitem>Difference to Repository (HEAD)...</guimenuitem> </menuchoice></term>
+<listitem><para>Shows the differences between the selected file in the sandbox and the revision you last updated (HEAD). See <xref linkend="diff"/>. </para></listitem>
 </varlistentry>
 
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Last Change...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Shows the differences between the revision of the selected file you last updated (BASE) and the revision before. See <xref linkend="diff"/>. </para
-></listitem>
+<term><menuchoice><guimenu>View</guimenu><guimenuitem>Last Change...</guimenuitem> </menuchoice></term>
+<listitem><para>Shows the differences between the revision of the selected file you last updated (BASE) and the revision before. See <xref linkend="diff"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->History...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Shows the &CVS; history as reported by the server. See <xref linkend="browsinghistory"/>. </para
-></listitem>
+<term><menuchoice><guimenu>View</guimenu><guimenuitem>History...</guimenuitem> </menuchoice></term>
+<listitem><para>Shows the &CVS; history as reported by the server. See <xref linkend="browsinghistory"/>. </para></listitem>
 </varlistentry>
 
 <!--TODO: add hide menus to mainscreen section-->
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Hide All Files</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Determines whether only folders are shown in the main tree view. See <xref linkend="mainscreen"/>. </para
-></listitem>
+<term><menuchoice><guimenu>View</guimenu><guimenuitem>Hide All Files</guimenuitem> </menuchoice></term>
+<listitem><para>Determines whether only folders are shown in the main tree view. See <xref linkend="mainscreen"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Hide Unmodified Files</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Determines whether unknown and up to date files are hidden in the main tree view. See <xref linkend="mainscreen"/>. </para
-></listitem>
+<term><menuchoice><guimenu>View</guimenu><guimenuitem>Hide Unmodified Files</guimenuitem> </menuchoice></term>
+<listitem><para>Determines whether unknown and up to date files are hidden in the main tree view. See <xref linkend="mainscreen"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Hide Removed Files</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Determines whether removed files are hidden in the main tree view. See <xref linkend="mainscreen"/>. </para
-></listitem>
+<term><menuchoice><guimenu>View</guimenu><guimenuitem>Hide Removed Files</guimenuitem> </menuchoice></term>
+<listitem><para>Determines whether removed files are hidden in the main tree view. See <xref linkend="mainscreen"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Hide Non-CVS Files</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Determines whether files not in CVS are hidden in the main tree view. See <xref linkend="mainscreen"/>. </para
-></listitem>
+<term><menuchoice><guimenu>View</guimenu><guimenuitem>Hide Non-CVS Files</guimenuitem> </menuchoice></term>
+<listitem><para>Determines whether files not in CVS are hidden in the main tree view. See <xref linkend="mainscreen"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Hide Empty Folders</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Determines whether without visible entries are hidden in the main tree view. See <xref linkend="mainscreen"/>. </para
-></listitem>
+<term><menuchoice><guimenu>View</guimenu><guimenuitem>Hide Empty Folders</guimenuitem> </menuchoice></term>
+<listitem><para>Determines whether without visible entries are hidden in the main tree view. See <xref linkend="mainscreen"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Unfold File Tree</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Opens all branches in the file tree so that you can see all files and folders. See <xref linkend="mainscreen"/>. </para
-></listitem>
+<term><menuchoice><guimenu>View</guimenu><guimenuitem>Unfold File Tree</guimenuitem> </menuchoice></term>
+<listitem><para>Opens all branches in the file tree so that you can see all files and folders. See <xref linkend="mainscreen"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Fold File Tree</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Closes all branches in the file tree. See <xref linkend="mainscreen"/>. </para
-></listitem>
+<term><menuchoice><guimenu>View</guimenu><guimenuitem>Fold File Tree</guimenuitem> </menuchoice></term>
+<listitem><para>Closes all branches in the file tree. See <xref linkend="mainscreen"/>. </para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -3548,224 +1359,77 @@ Changes in the repository
 <!-- Advanced Menu -->
 <sect2 id="menuadvanced">
 
-<title
->The Advanced Menu</title>
+<title>The Advanced Menu</title>
 
 <variablelist>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Tag/Branch...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Tags or branches the selected files. See <xref linkend="taggingbranching"/>. </para
-></listitem>
+<term><menuchoice><guimenu>Advanced</guimenu><guimenuitem>Tag/Branch...</guimenuitem> </menuchoice></term>
+<listitem><para>Tags or branches the selected files. See <xref linkend="taggingbranching"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Delete Tag...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Removes a given tag from the selected files. See <xref linkend="taggingbranching"/>. </para
-></listitem>
+<term><menuchoice><guimenu>Advanced</guimenu><guimenuitem>Delete Tag...</guimenuitem> </menuchoice></term>
+<listitem><para>Removes a given tag from the selected files. See <xref linkend="taggingbranching"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Update to Tag/Date...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Brings the selected files to a given tag or date, making it sticky. See <xref linkend="updatingto"/>. </para
-></listitem>
+<term><menuchoice><guimenu>Advanced</guimenu><guimenuitem>Update to Tag/Date...</guimenuitem> </menuchoice></term>
+<listitem><para>Brings the selected files to a given tag or date, making it sticky. See <xref linkend="updatingto"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Update to HEAD...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Brings the selected files to the respective HEAD revision. See <xref linkend="updatingto"/>. </para
-></listitem>
+<term><menuchoice><guimenu>Advanced</guimenu><guimenuitem>Update to HEAD...</guimenuitem> </menuchoice></term>
+<listitem><para>Brings the selected files to the respective HEAD revision. See <xref linkend="updatingto"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Merge...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Merges either a given branch or the modifications between two tags into the selected files. See <xref linkend="taggingbranching"/>. </para
-></listitem>
+<term><menuchoice><guimenu>Advanced</guimenu><guimenuitem>Merge...</guimenuitem> </menuchoice></term>
+<listitem><para>Merges either a given branch or the modifications between two tags into the selected files. See <xref linkend="taggingbranching"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Add Watch...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Adds a watch for a set of events on the selected files. See <xref linkend="watches"/>. </para
-></listitem>
+<term><menuchoice><guimenu>Advanced</guimenu><guimenuitem>Add Watch...</guimenuitem> </menuchoice></term>
+<listitem><para>Adds a watch for a set of events on the selected files. See <xref linkend="watches"/>. </para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Remove Watch...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Removes a watch for a set of events from the selected files. See <xref linkend="watches"/>. </para
-></listitem>
+<term><menuchoice><guimenu>Advanced</guimenu><guimenuitem>Remove Watch...</guimenuitem> </menuchoice></term>
+<listitem><para>Removes a watch for a set of events from the selected files. See <xref linkend="watches"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Show Watchers</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Lists the watchers of the selected files. See <xref linkend="watches"/>. </para
-></listitem>
+<term><menuchoice><guimenu>Advanced</guimenu><guimenuitem>Show Watchers</guimenuitem> </menuchoice></term>
+<listitem><para>Lists the watchers of the selected files. See <xref linkend="watches"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Edit</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Runs <command
->cvs edit</command
-> on the selected files. See <xref linkend="watches"/>. </para
-></listitem>
+<term><menuchoice><guimenu>Advanced</guimenu><guimenuitem>Edit</guimenuitem> </menuchoice></term>
+<listitem><para>Runs <command>cvs edit</command> on the selected files. See <xref linkend="watches"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Unedit</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Runs <command
->cvs unedit</command
-> on the selected files. See <xref linkend="watches"/>. </para
-></listitem>
+<term><menuchoice><guimenu>Advanced</guimenu><guimenuitem>Unedit</guimenuitem> </menuchoice></term>
+<listitem><para>Runs <command>cvs unedit</command> on the selected files. See <xref linkend="watches"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Show Editors</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Runs <command
->cvs editors</command
-> on the selected files. See <xref linkend="watches"/>. </para
-></listitem>
+<term><menuchoice><guimenu>Advanced</guimenu><guimenuitem>Show Editors</guimenuitem> </menuchoice></term>
+<listitem><para>Runs <command>cvs editors</command> on the selected files. See <xref linkend="watches"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Lock</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Locks the selected files. See <xref linkend="locking"/>. </para
-></listitem>
+<term><menuchoice><guimenu>Advanced</guimenu><guimenuitem>Lock</guimenuitem> </menuchoice></term>
+<listitem><para>Locks the selected files. See <xref linkend="locking"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Unlock</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Unlocks the selected files. See <xref linkend="locking"/>. </para
-></listitem>
+<term><menuchoice><guimenu>Advanced</guimenu><guimenuitem>Unlock</guimenuitem> </menuchoice></term>
+<listitem><para>Unlocks the selected files. See <xref linkend="locking"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Advanced</guimenu
-><guimenuitem
->Create Patch Against Repository...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Creates a patch from the modifications in your sandbox. See <xref linkend="creatingpatches"/>. </para
-></listitem>
+<term><menuchoice><guimenu>Advanced</guimenu><guimenuitem>Create Patch Against Repository...</guimenuitem> </menuchoice></term>
+<listitem><para>Creates a patch from the modifications in your sandbox. See <xref linkend="creatingpatches"/>. </para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -3775,69 +1439,28 @@ Changes in the repository
 <!-- Repository Menu -->
 <sect2 id="menurepository">
 
-<title
->The Repository Menu</title>
+<title>The Repository Menu</title>
 
 <variablelist>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Repository</guimenu
-><guimenuitem
->Create...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Opens a dialogue which allows you to create a new local repository. See <xref linkend="accessing-repository"/>. </para
-></listitem>
+<term><menuchoice><guimenu>Repository</guimenu><guimenuitem>Create...</guimenuitem> </menuchoice></term>
+<listitem><para>Opens a dialogue which allows you to create a new local repository. See <xref linkend="accessing-repository"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Repository</guimenu
-><guimenuitem
->Checkout...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Opens a dialogue which allows you to checkout a module from a repository. See <xref linkend="checkingout"/>. </para
-></listitem>
+<term><menuchoice><guimenu>Repository</guimenu><guimenuitem>Checkout...</guimenuitem> </menuchoice></term>
+<listitem><para>Opens a dialogue which allows you to checkout a module from a repository. See <xref linkend="checkingout"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Repository</guimenu
-><guimenuitem
->Import...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Opens a dialogue which allows you to import a package into the repository. See <xref linkend="importing"/>. </para
-></listitem>
+<term><menuchoice><guimenu>Repository</guimenu><guimenuitem>Import...</guimenuitem> </menuchoice></term>
+<listitem><para>Opens a dialogue which allows you to import a package into the repository. See <xref linkend="importing"/>. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Repository</guimenu
-><guimenuitem
->Repositories...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Configures a list of repositories you often use and how to access them. See <xref linkend="accessing-repository"/>. </para
-></listitem>
+<term><menuchoice><guimenu>Repository</guimenu><guimenuitem>Repositories...</guimenuitem> </menuchoice></term>
+<listitem><para>Configures a list of repositories you often use and how to access them. See <xref linkend="accessing-repository"/>. </para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -3846,164 +1469,53 @@ Changes in the repository
 
 <!-- Settings Menu -->
 <sect2 id="menuoptions">
-<title
->The Settings Menu</title>
+<title>The Settings Menu</title>
 
 <variablelist>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Show Toolbar</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Determines whether the toolbar is displayed. </para
-></listitem>
+<term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Show Toolbar</guimenuitem> </menuchoice></term>
+<listitem><para>Determines whether the toolbar is displayed. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Create Folders on Update</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Determines whether updates create folders in the sandbox which were not there before (Option <option
->-d</option
-> to <command
->cvs update</command
->). </para
-></listitem>
+<term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Create Folders on Update</guimenuitem> </menuchoice></term>
+<listitem><para>Determines whether updates create folders in the sandbox which were not there before (Option <option>-d</option> to <command>cvs update</command>). </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Prune Empty Folders on Update</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Determines whether updates remove empty folders in the sandbox. (Option <option
->-P</option
-> to <command
->cvs update</command
->). </para
-></listitem>
+<term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Prune Empty Folders on Update</guimenuitem> </menuchoice></term>
+<listitem><para>Determines whether updates remove empty folders in the sandbox. (Option <option>-P</option> to <command>cvs update</command>). </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Update Recursively</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Determines whether updates are recursive (Option <option
->-r</option
-> to <command
->cvs update</command
->). </para
-></listitem>
+<term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Update Recursively</guimenuitem> </menuchoice></term>
+<listitem><para>Determines whether updates are recursive (Option <option>-r</option> to <command>cvs update</command>). </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Commit and Remove Recursively</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Determines whether commits and removes are recursive (Option <option
->-r</option
-> to <command
->cvs add</command
->, <command
->cvs remove</command
-> resp.). </para
-></listitem>
+<term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Commit and Remove Recursively</guimenuitem> </menuchoice></term>
+<listitem><para>Determines whether commits and removes are recursive (Option <option>-r</option> to <command>cvs add</command>, <command>cvs remove</command> resp.). </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Do cvs edit Automatically When Necessary</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Determines whether <command
->cvs edit</command
-> is executed automatically whenever you edit a file. </para
-></listitem>
+<term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Do cvs edit Automatically When Necessary</guimenuitem> </menuchoice></term>
+<listitem><para>Determines whether <command>cvs edit</command> is executed automatically whenever you edit a file. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Shortcuts...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Opens a dialogue for configuring keybindings. </para
-></listitem>
+<term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Shortcuts...</guimenuitem> </menuchoice></term>
+<listitem><para>Opens a dialogue for configuring keybindings. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Toolbars...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Opens a dialogue for configuring &cervisia;'s toolbars. </para
-></listitem>
+<term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Toolbars...</guimenuitem> </menuchoice></term>
+<listitem><para>Opens a dialogue for configuring &cervisia;'s toolbars. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Cervisia...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Opens a dialogue for customising &cervisia;. </para
-></listitem>
+<term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Cervisia...</guimenuitem> </menuchoice></term>
+<listitem><para>Opens a dialogue for customising &cervisia;. </para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -4012,88 +1524,33 @@ Changes in the repository
 
 <!-- Help -->
 <sect2 id="menuhelp">
-<title
->The Help Menu</title>
+<title>The Help Menu</title>
 
 <variablelist>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-><keycap
->F1</keycap
-></shortcut
-> <guimenu
->Help</guimenu
-><guimenuitem
->Handbook</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Invokes the KDE Help system starting at the &cervisia; help pages. (this document). </para
-></listitem>
+<term><menuchoice><shortcut><keycap>F1</keycap></shortcut> <guimenu>Help</guimenu><guimenuitem>Handbook</guimenuitem> </menuchoice></term>
+<listitem><para>Invokes the KDE Help system starting at the &cervisia; help pages. (this document). </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Help</guimenu
-><guimenuitem
->Report Bug...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Opens the Bug report dialogue. </para
-></listitem>
+<term><menuchoice><guimenu>Help</guimenu><guimenuitem>Report Bug...</guimenuitem> </menuchoice></term>
+<listitem><para>Opens the Bug report dialogue. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Help</guimenu
-> <guimenuitem
->About &cervisia;</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->This will display version and author information. </para
-></listitem>
+<term><menuchoice><guimenu>Help</guimenu> <guimenuitem>About &cervisia;</guimenuitem> </menuchoice></term>
+<listitem><para>This will display version and author information. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Help</guimenu
-><guimenuitem
->About KDE</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->This displays the KDE version and other basic information. </para
-></listitem>
+<term><menuchoice><guimenu>Help</guimenu><guimenuitem>About KDE</guimenuitem> </menuchoice></term>
+<listitem><para>This displays the KDE version and other basic information. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Help</guimenu
-><guimenuitem
->CVS Manual</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Opens the &CVS; info pages in the KDE help system. </para
-></listitem>
+<term><menuchoice><guimenu>Help</guimenu><guimenuitem>CVS Manual</guimenuitem> </menuchoice></term>
+<listitem><para>Opens the &CVS; info pages in the KDE help system. </para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -4106,7 +1563,6 @@ Changes in the repository
 
 
 <chapter id="credits-and-licenses">
-<title
->Credits And Licenses</title>
+<title>Credits And Licenses</title>
 &underFDL; </chapter>
 </book>
diff --git a/tde-i18n-en_GB/docs/tdesdk/kbabel/catman.docbook b/tde-i18n-en_GB/docs/tdesdk/kbabel/catman.docbook
index e0e16896d11..df408454d82 100644
--- a/tde-i18n-en_GB/docs/tdesdk/kbabel/catman.docbook
+++ b/tde-i18n-en_GB/docs/tdesdk/kbabel/catman.docbook
@@ -1,6 +1,5 @@
 <!-- <?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"> -->
 <!-- Uncomment the previous two lines to validate this document -->
 <!-- standalone.  Be sure to recomment them before attempting to -->
 <!-- process index.docbook -->
@@ -11,57 +10,27 @@
 <!-- Fill in this section if this document has a different author -->
 <authorgroup>
 <author>
-<personname
-><firstname
-></firstname
-><surname
-></surname
-></personname>
+<personname><firstname></firstname><surname></surname></personname>
 </author>
 </authorgroup>
 
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </chapterinfo>
 
-<title
->Using &cataloguemanager;</title>
+<title>Using &cataloguemanager;</title>
 <anchor id="catalogmanager"/>
 
 <screenshot>
-<screeninfo
->Screenshot of &cataloguemanager;</screeninfo>
+<screeninfo>Screenshot of &cataloguemanager;</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="snap_catalogmanager.png" format="PNG"/>
 </imageobject>
-<textobject
-><phrase
->Screenshot of &cataloguemanager;</phrase
-></textobject>
+<textobject><phrase>Screenshot of &cataloguemanager;</phrase></textobject>
 </mediaobject>
 </screenshot>
-<para
->The Catalogue Manager merges two folders into one tree and displays all the <acronym
->PO</acronym
-> and <acronym
->POT</acronym
-> files in these folders. The display allows you to easily see if a new template has been added or an old one has been removed. Some information is shown along with each file name: total number of entries, number of fuzzy entries, number of untranslated entries, the date of the last revision and the last translator of the file. </para>
-<para
->To make it easier for you to find files that need work or are missing the status of each file is also displayed using an icon: </para>
+<para>The Catalogue Manager merges two folders into one tree and displays all the <acronym>PO</acronym> and <acronym>POT</acronym> files in these folders. The display allows you to easily see if a new template has been added or an old one has been removed. Some information is shown along with each file name: total number of entries, number of fuzzy entries, number of untranslated entries, the date of the last revision and the last translator of the file. </para>
+<para>To make it easier for you to find files that need work or are missing the status of each file is also displayed using an icon: </para>
 
 <itemizedlist>
    <listitem>
@@ -70,8 +39,7 @@
 <imageobject>
 <imagedata fileref="catalogmanager_ok.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> All the messages in this file are translated.</para>
+</inlinemediaobject> All the messages in this file are translated.</para>
    </listitem>
    <listitem>
       <para>
@@ -79,8 +47,7 @@
 <imageobject>
 <imagedata fileref="catalogmanager_needwork.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> Some of the messages in this file are fuzzy or untranslated </para>
+</inlinemediaobject> Some of the messages in this file are fuzzy or untranslated </para>
    </listitem>
    <listitem>
       <para>
@@ -88,10 +55,7 @@
 <imageobject>
 <imagedata fileref="catalogmanager_missing.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> This file does not exist in the folder of the <acronym
->PO</acronym
-> files. </para>
+</inlinemediaobject> This file does not exist in the folder of the <acronym>PO</acronym> files. </para>
    </listitem>
    <listitem>
       <para>
@@ -99,8 +63,7 @@
 <imageobject>
 <imagedata fileref="catalogmanager_broken.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> This file contains syntax errors. </para>
+</inlinemediaobject> This file contains syntax errors. </para>
    </listitem>
    <listitem>
       <para>
@@ -108,106 +71,43 @@
 <imageobject>
 <imagedata fileref="catalogmanager_reload.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> Information about this file is being currently updated. When the update is finished, it will get one of the icons listed above to reflect its state. </para>
+</inlinemediaobject> Information about this file is being currently updated. When the update is finished, it will get one of the icons listed above to reflect its state. </para>
    </listitem>
 </itemizedlist>
 
-<para
->If an icon is marked with this icon <inlinemediaobject
-> <imageobject
-> <imagedata fileref="catalogmanager_nopot.png" format="PNG"/> </imageobject
-> </inlinemediaobject
->, like <inlinemediaobject
-> <imageobject
-> <imagedata fileref="catalogmanager_nopot_ok.png" format="PNG"/> </imageobject
-> </inlinemediaobject
->, it indicates that this file or folder does not exist in the folder of the <acronym
->POT</acronym
-> files.</para>
-
-<para
->You can mark or unmark a file by selecting <guimenuitem
->Toggle Marking</guimenuitem
-> in the context menu of a file.</para>
-
-<para
->If you want to toggle or remove all markings in a folder, press the right mouse button over the folder and select <guimenuitem
->Toggle Markings</guimenuitem
-> or <guimenuitem
->Remove Markings</guimenuitem
->. The markings are automatically saved when leaving &kbabel;.</para>
-
-<para
->To open a file either double-click on the file, select <menuchoice
-><guimenuitem
->Open</guimenuitem
-></menuchoice
-> from the context menu or press either <keycap
->Return</keycap
-> or <keycombo action="simul"
->&Ctrl;<keycap
->O</keycap
-> </keycombo
->.</para>
-
-<para
->You can configure the &cataloguemanager; by <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
-> Configure &cataloguemanager;...</guimenuitem
-></menuchoice
->. See section <link linkend="preferences-catalogmanager"
->Preferences</link
-> for more details.</para>
+<para>If an icon is marked with this icon <inlinemediaobject> <imageobject> <imagedata fileref="catalogmanager_nopot.png" format="PNG"/> </imageobject> </inlinemediaobject>, like <inlinemediaobject> <imageobject> <imagedata fileref="catalogmanager_nopot_ok.png" format="PNG"/> </imageobject> </inlinemediaobject>, it indicates that this file or folder does not exist in the folder of the <acronym>POT</acronym> files.</para>
+
+<para>You can mark or unmark a file by selecting <guimenuitem>Toggle Marking</guimenuitem> in the context menu of a file.</para>
+
+<para>If you want to toggle or remove all markings in a folder, press the right mouse button over the folder and select <guimenuitem>Toggle Markings</guimenuitem> or <guimenuitem>Remove Markings</guimenuitem>. The markings are automatically saved when leaving &kbabel;.</para>
+
+<para>To open a file either double-click on the file, select <menuchoice><guimenuitem>Open</guimenuitem></menuchoice> from the context menu or press either <keycap>Return</keycap> or <keycombo action="simul">&Ctrl;<keycap>O</keycap> </keycombo>.</para>
+
+<para>You can configure the &cataloguemanager; by <menuchoice><guimenu>Settings</guimenu><guimenuitem> Configure &cataloguemanager;...</guimenuitem></menuchoice>. See section <link linkend="preferences-catalogmanager">Preferences</link> for more details.</para>
 
 <sect1 id="catman-features">
-<title
->&cataloguemanager; Features</title>
-<para
->Besides the main feature for opening the files in &kbabel; &cataloguemanager; supports number of other features for maintaining a tree of <acronym
->PO</acronym
->-files. </para>
+<title>&cataloguemanager; Features</title>
+<para>Besides the main feature for opening the files in &kbabel; &cataloguemanager; supports number of other features for maintaining a tree of <acronym>PO</acronym>-files. </para>
 
 <sect2 id="catman-find">
-<title
->Find and replace in multiple files</title>
-<para
->One of the most requested features for &kbabel; was a possibility to search and replace in multiple files at once. &cataloguemanager; supports this feature with a tight integration with &kbabel; </para>
+<title>Find and replace in multiple files</title>
+<para>One of the most requested features for &kbabel; was a possibility to search and replace in multiple files at once. &cataloguemanager; supports this feature with a tight integration with &kbabel; </para>
 </sect2>
 
 <sect2 id="catman-statistics">
-<title
->Statistics</title>
-<para
->&cataloguemanager; can show you a number of statistics about a single file or about the whole folders. The statistics contain number of files, how many of the files have their templates, how many templates are missing. It also counts number of messages in the files and shows statistics about how large parts of the messages are translated, fuzzy-translated or untranslated. </para>
+<title>Statistics</title>
+<para>&cataloguemanager; can show you a number of statistics about a single file or about the whole folders. The statistics contain number of files, how many of the files have their templates, how many templates are missing. It also counts number of messages in the files and shows statistics about how large parts of the messages are translated, fuzzy-translated or untranslated. </para>
 </sect2>
 
 <sect2 id="catman-syntax">
-<title
->Checking the syntax</title>
-<para
->This allows you to check the syntax of multiple <acronym
->PO</acronym
->-files using <command
->msgfmt</command
->. If a file fails this check, it cannot be used for generating a <acronym
->MO</acronym
->-file for binary distribution. Such an incorrect file will typically result in failing compilation of the package the <acronym
->PO</acronym
->-file belongs to. </para>
+<title>Checking the syntax</title>
+<para>This allows you to check the syntax of multiple <acronym>PO</acronym>-files using <command>msgfmt</command>. If a file fails this check, it cannot be used for generating a <acronym>MO</acronym>-file for binary distribution. Such an incorrect file will typically result in failing compilation of the package the <acronym>PO</acronym>-file belongs to. </para>
 </sect2>
 
 <sect2 id="catman-commands">
-<title
->User-defined commands</title>
-<para
->Because &cataloguemanager; cannot provide any functionality you would like to use, you can extend it by defining your own commands. </para>
-<para
->There are two sets of commands. One for folders and one for single files. You can set them in <link linkend="preferences-catalogmanager"
->configuration dialogue </link
-> and access by pressing &RMB; on an entry in the file list.</para>
+<title>User-defined commands</title>
+<para>Because &cataloguemanager; cannot provide any functionality you would like to use, you can extend it by defining your own commands. </para>
+<para>There are two sets of commands. One for folders and one for single files. You can set them in <link linkend="preferences-catalogmanager">configuration dialogue </link> and access by pressing &RMB; on an entry in the file list.</para>
 </sect2>
 
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdesdk/kbabel/dictionaries.docbook b/tde-i18n-en_GB/docs/tdesdk/kbabel/dictionaries.docbook
index 261d6c6ecfa..f0e7fe01f25 100644
--- a/tde-i18n-en_GB/docs/tdesdk/kbabel/dictionaries.docbook
+++ b/tde-i18n-en_GB/docs/tdesdk/kbabel/dictionaries.docbook
@@ -1,6 +1,5 @@
 <!-- <?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"> -->
 <!-- Uncomment the previous two lines to validate this document -->
 <!-- standalone.  Be sure to recomment them before attempting to -->
 <!-- process index.docbook -->
@@ -11,615 +10,284 @@
 <!-- Fill in this section if this document has a different author -->
 <authorgroup>
 <author>
-<personname
-><firstname
-></firstname
-><surname
-></surname
-></personname>
+<personname><firstname></firstname><surname></surname></personname>
 </author>
 </authorgroup>
 
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </chapterinfo>
 
-<title
->Dictionaries</title>
+<title>Dictionaries</title>
 
-<para
->&kbabel; has 3 modes which can be used to search translated <acronym
->PO</acronym
-> message strings:</para>
+<para>&kbabel; has 3 modes which can be used to search translated <acronym>PO</acronym> message strings:</para>
 
 <itemizedlist>
      <listitem>
-       <para
->Searching translation, using a translation database </para>
+       <para>Searching translation, using a translation database </para>
      </listitem>
       <listitem>
-         <para
->Rough translation </para>
+         <para>Rough translation </para>
       </listitem>
       <listitem>
-         <para
->&kbabeldict; </para>
+         <para>&kbabeldict; </para>
       </listitem>
 </itemizedlist>
 
 <sect1 id="database">
 <!-- FIXME: settings -->
-<title
->Translation database</title>
+<title>Translation database</title>
 
-<para
->Translation database allows you to store translations in a database based on Berkeley Database II, &ie; it is stored in a binary file on your disk. The database guarantees fast searching in a large number of translations.</para>
+<para>Translation database allows you to store translations in a database based on Berkeley Database II, &ie; it is stored in a binary file on your disk. The database guarantees fast searching in a large number of translations.</para>
 
-<para
->This mode is the one best integrated with &kbabel;. Besides searching and rough translation it also supports the following features:</para>
+<para>This mode is the one best integrated with &kbabel;. Besides searching and rough translation it also supports the following features:</para>
 
 <itemizedlist>
 <listitem>
-<para
->Every new translation typed in the &kbabel; editor can be automatically stored in the database.</para>
+<para>Every new translation typed in the &kbabel; editor can be automatically stored in the database.</para>
 </listitem>
 <listitem>
-<para
->This database can be used for <quote
->diff</quote
->-ing <acronym
->msgid</acronym
->.</para>
+<para>This database can be used for <quote>diff</quote>-ing <acronym>msgid</acronym>.</para>
 </listitem>
 </itemizedlist>
 
-<para
->Of course, the more translations are stored in the database, the more productive you can be. To fill the database, you can use the <guilabel
->Database</guilabel
-> tab in the preferences dialogue or you can turn on automatic addition of every translated messages on the same tab.</para>
+<para>Of course, the more translations are stored in the database, the more productive you can be. To fill the database, you can use the <guilabel>Database</guilabel> tab in the preferences dialogue or you can turn on automatic addition of every translated messages on the same tab.</para>
 
 <sect2 id="database-settings">
-<title
->Settings</title>
-<para
->You can configure this searching mode and how it should be used by selecting <menuchoice
-> <guisubmenu
->Settings</guisubmenu
-> <guisubmenu
->Configure Dictionary</guisubmenu
-> <guimenuitem
->Translation Database</guimenuitem
-> </menuchoice
-> in &kbabel; menu. </para>
-<para
->The <guilabel
->Generic</guilabel
-> tab contains general settings for searching in the database. </para>
+<title>Settings</title>
+<para>You can configure this searching mode and how it should be used by selecting <menuchoice> <guisubmenu>Settings</guisubmenu> <guisubmenu>Configure Dictionary</guisubmenu> <guimenuitem>Translation Database</guimenuitem> </menuchoice> in &kbabel; menu. </para>
+<para>The <guilabel>Generic</guilabel> tab contains general settings for searching in the database. </para>
 <variablelist>
   <varlistentry>
-    <term
-><guilabel
->Search in whole database (slow)</guilabel
-></term>
+    <term><guilabel>Search in whole database (slow)</guilabel></term>
     <listitem>
-    <para
->Do not use <quote
->good keys</quote
->, search in the whole database. This is slow, but will return the most precise results. </para>
+    <para>Do not use <quote>good keys</quote>, search in the whole database. This is slow, but will return the most precise results. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term
-><guilabel
->Search in list of "good keys" (best)</guilabel
-></term>
+    <term><guilabel>Search in list of "good keys" (best)</guilabel></term>
     <listitem>
-    <para
->Use <quote
->good keys</quote
-> strategy. This option will give you the best tradeoff between speed and exact matching. </para>
+    <para>Use <quote>good keys</quote> strategy. This option will give you the best tradeoff between speed and exact matching. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term
-><guilabel
->Return the list of "good keys" (fast)</guilabel
-></term>
+    <term><guilabel>Return the list of "good keys" (fast)</guilabel></term>
     <listitem>
-    <para
->Just return <quote
->good keys</quote
->, do not try to eliminate any more texts. This is the fastest provided method, but can lead to a quite large number of imprecise matches. </para>
+    <para>Just return <quote>good keys</quote>, do not try to eliminate any more texts. This is the fastest provided method, but can lead to a quite large number of imprecise matches. </para>
     </listitem>
   </varlistentry>
 <varlistentry>
-    <term
-><guibutton
->Case sensitive</guibutton
-></term>
+    <term><guibutton>Case sensitive</guibutton></term>
     <listitem>
-    <para
->Distinguish case of letters when searching the text. </para>
+    <para>Distinguish case of letters when searching the text. </para>
     </listitem>
   </varlistentry>
 <varlistentry>
-    <term
-><guibutton
->Normalise white space</guibutton
-></term>
+    <term><guibutton>Normalise white space</guibutton></term>
     <listitem>
-    <para
->Skip unnecessary white space in the texts, so the searching will ignore small differences of white space, &eg; number of spaces in the text. </para>
+    <para>Skip unnecessary white space in the texts, so the searching will ignore small differences of white space, &eg; number of spaces in the text. </para>
     </listitem>
   </varlistentry>
 <varlistentry>
-    <term
-><guibutton
->Remove context comment</guibutton
-></term>
+    <term><guibutton>Remove context comment</guibutton></term>
     <listitem>
-    <para
->Do not include context comments in search. You will want this to be turned on. </para>
+    <para>Do not include context comments in search. You will want this to be turned on. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term
-><guilabel
->Character to be ignored</guilabel
-></term>
+    <term><guilabel>Character to be ignored</guilabel></term>
     <listitem>
-    <para
->Here you can enter characters, which should be ignored while searching. Typical example would be accelerator mark, &ie; &amp; for &kde; texts. </para>
+    <para>Here you can enter characters, which should be ignored while searching. Typical example would be accelerator mark, &ie; &amp; for &kde; texts. </para>
     </listitem>
   </varlistentry>
   </variablelist>
-<para
->The <guilabel
->Search</guilabel
-> tab contains finer specification for searching the text. You can define how to search and also allows to use another special way of searching called <emphasis
-><guilabel
->Word substitution</guilabel
-></emphasis
->. By substituting one or two words the approximate text can be found as well. For example, assume you are trying to find the text <userinput
->My name is Andrea</userinput
->. </para>
+<para>The <guilabel>Search</guilabel> tab contains finer specification for searching the text. You can define how to search and also allows to use another special way of searching called <emphasis><guilabel>Word substitution</guilabel></emphasis>. By substituting one or two words the approximate text can be found as well. For example, assume you are trying to find the text <userinput>My name is Andrea</userinput>. </para>
 <variablelist>
   <varlistentry>
-    <term
-><guilabel
->Equal</guilabel
-></term>
+    <term><guilabel>Equal</guilabel></term>
     <listitem>
-    <para
->Text from database matches if it is the same as the searched string. In our example it can be <emphasis
->My name is &amp;Andrea</emphasis
-> (if &amp; is set as ignored character in <guilabel
->Characters to be ignored</guilabel
-> on <guilabel
->Generic</guilabel
-> tab). </para>
+    <para>Text from database matches if it is the same as the searched string. In our example it can be <emphasis>My name is &amp;Andrea</emphasis> (if &amp; is set as ignored character in <guilabel>Characters to be ignored</guilabel> on <guilabel>Generic</guilabel> tab). </para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term
-><guilabel
->Query is contained</guilabel
-></term>
+    <term><guilabel>Query is contained</guilabel></term>
     <listitem>
-    <para
->Text from database matches if the searched string is contained in it. For our example it can be <emphasis
->My name is Andrea, you know?</emphasis
->. </para>
+    <para>Text from database matches if the searched string is contained in it. For our example it can be <emphasis>My name is Andrea, you know?</emphasis>. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term
-><guilabel
->Query contains</guilabel
-></term>
+    <term><guilabel>Query contains</guilabel></term>
     <listitem>
-    <para
->Text from database matches if the searched string contains it. For our example it can be <emphasis
->Andrea</emphasis
->. You can use this for enumerating the possibilities to be found. </para>
+    <para>Text from database matches if the searched string contains it. For our example it can be <emphasis>Andrea</emphasis>. You can use this for enumerating the possibilities to be found. </para>
     </listitem>
   </varlistentry>
 <varlistentry>
-    <term
-><guibutton
->Regular Expression</guibutton
-></term>
+    <term><guibutton>Regular Expression</guibutton></term>
     <listitem>
-    <para
->Consider searched text as a regular expression. This is mainly used for &kbabeldict;. You can hardly expect regular expressions in PO files. </para>
+    <para>Consider searched text as a regular expression. This is mainly used for &kbabeldict;. You can hardly expect regular expressions in PO files. </para>
     </listitem>
   </varlistentry>
 <varlistentry>
-    <term
-><guibutton
->Use one word substitution</guibutton
-></term>
+    <term><guibutton>Use one word substitution</guibutton></term>
     <listitem>
-    <para
->If the query text contains less words than specified below, it also tries to replace one of the words in the query. In our example it will find <emphasis
->Your name is Andrea</emphasis
-> as well. </para>
+    <para>If the query text contains less words than specified below, it also tries to replace one of the words in the query. In our example it will find <emphasis>Your name is Andrea</emphasis> as well. </para>
     </listitem>
   </varlistentry>
 <varlistentry>
-    <term
-><guibutton
->Max number of words in the query</guibutton
-></term>
+    <term><guibutton>Max number of words in the query</guibutton></term>
     <listitem>
-    <para
->Maximal number of words in a query to enable one word substitution. </para>
+    <para>Maximal number of words in a query to enable one word substitution. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term
-><guilabel
->Local characters for regular expressions</guilabel
-></term>
+    <term><guilabel>Local characters for regular expressions</guilabel></term>
     <listitem>
-    <para
->Characters to be considered part of regular expressions. </para>
+    <para>Characters to be considered part of regular expressions. </para>
     </listitem>
   </varlistentry>
   </variablelist>
 <note>
-<para
->Two-word substitution is not implemented yet. </para>
+<para>Two-word substitution is not implemented yet. </para>
 </note>
 </sect2>
 
 <sect2 id="database-fill">
-<title
->Filling the database</title>
-<para
->The <guilabel
->Database</guilabel
-> tab allows to define where is the database stored on disk (<guilabel
->Database folder</guilabel
->) and if it should be used for automatic storing of the new translations (<guibutton
->Auto add entry to database</guibutton
->). In this case you should specify the author of the new translation in <guilabel
->Auto added entry author</guilabel
->. </para>
-<para
->The rest of the tab allows you to fill the database from PO files that already exist. Use one of the buttons in the middle of the dialogue box. The progress of the file load will be shown by progress bars below the buttons. The <guilabel
->Repeated strings</guilabel
-> button should be used in the special case where one translated string is repeated many times, to prevent storing unnecessary copies. Here you can limit the stored strings. </para>
+<title>Filling the database</title>
+<para>The <guilabel>Database</guilabel> tab allows to define where is the database stored on disk (<guilabel>Database folder</guilabel>) and if it should be used for automatic storing of the new translations (<guibutton>Auto add entry to database</guibutton>). In this case you should specify the author of the new translation in <guilabel>Auto added entry author</guilabel>. </para>
+<para>The rest of the tab allows you to fill the database from PO files that already exist. Use one of the buttons in the middle of the dialogue box. The progress of the file load will be shown by progress bars below the buttons. The <guilabel>Repeated strings</guilabel> button should be used in the special case where one translated string is repeated many times, to prevent storing unnecessary copies. Here you can limit the stored strings. </para>
 <screenshot>
-<screeninfo
->Filling the database</screeninfo>
+<screeninfo>Filling the database</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="dbcan.png" format="PNG"/>
 </imageobject>
-<textobject
-><phrase
->Filling the database by existing PO-files</phrase
-></textobject>
+<textobject><phrase>Filling the database by existing PO-files</phrase></textobject>
 </mediaobject>
-</screenshot
-></sect2>
+</screenshot></sect2>
 
 <sect2 id="database-goodkeys">
-<title
->Defining good keys</title>
-<para
->On the <guilabel
->Good keys</guilabel
-> tab are the thresholds to specify how to fill the list of good keys. <guilabel
->Minimum number of query words in the key (%)</guilabel
-> specifies exactly that. Text will need to contain only this per cent of the words to qualify as good key. Opposite can be specified via <guilabel
->Minimum number of words of the key also in the query (%)</guilabel
->. The length of the words can be set by <guilabel
->Max length</guilabel
-> spinbox. </para>
-<para
->Searched text typically contains number of generic words, &eg; articles. You can eliminate the words based on the frequency. You can discard them by <guilabel
->Discard words more frequent than</guilabel
-> or consider as always present by <guilabel
->frequent words are considered as in every key</guilabel
->. This way the frequent words will be almost invisible for queries. </para>
+<title>Defining good keys</title>
+<para>On the <guilabel>Good keys</guilabel> tab are the thresholds to specify how to fill the list of good keys. <guilabel>Minimum number of query words in the key (%)</guilabel> specifies exactly that. Text will need to contain only this per cent of the words to qualify as good key. Opposite can be specified via <guilabel>Minimum number of words of the key also in the query (%)</guilabel>. The length of the words can be set by <guilabel>Max length</guilabel> spinbox. </para>
+<para>Searched text typically contains number of generic words, &eg; articles. You can eliminate the words based on the frequency. You can discard them by <guilabel>Discard words more frequent than</guilabel> or consider as always present by <guilabel>frequent words are considered as in every key</guilabel>. This way the frequent words will be almost invisible for queries. </para>
 </sect2>
 </sect1>
 
 
 <sect1 id="auxiliary">
-<title
->Auxiliary PO file</title>
-
-<para
->This searching mode is based on matching the same original English string (the msgid) translated in some other language in an auxillary <acronym
->PO</acronym
-> file. It is very common for romanic languages to have similar words, similarly for anglosaxon and slavonic ones.</para>
-
-<para
->For example, say I wanted to translate the word <quote
->on</quote
->, from <filename
->tdelibs.po</filename
->, into Romanian but have no idea. I look in the same file for French and find <quote
->actif</quote
->, and in the Spanish one find <quote
->activado</quote
->. So, I conclude that the best one in Romanian will be <quote
->active</quote
->. &kbabel; automates this task. Currently you can define only one auxiliary file to search.</para>
+<title>Auxiliary PO file</title>
+
+<para>This searching mode is based on matching the same original English string (the msgid) translated in some other language in an auxillary <acronym>PO</acronym> file. It is very common for romanic languages to have similar words, similarly for anglosaxon and slavonic ones.</para>
+
+<para>For example, say I wanted to translate the word <quote>on</quote>, from <filename>tdelibs.po</filename>, into Romanian but have no idea. I look in the same file for French and find <quote>actif</quote>, and in the Spanish one find <quote>activado</quote>. So, I conclude that the best one in Romanian will be <quote>active</quote>. &kbabel; automates this task. Currently you can define only one auxiliary file to search.</para>
 
 <sect2 id="auxiliary-settings">
-<title
->Settings</title>
-<para
->You can configure this searching mode by selecting <menuchoice
-> <guisubmenu
->Settings</guisubmenu
-> <guisubmenu
->Configure Dictionary</guisubmenu
-> <guimenuitem
->PO Auxiliary</guimenuitem
-> </menuchoice
-> from the &kbabel; menu.</para>
-
-<para
->In the <guilabel
->Configure Dictionary PO Auxiliary</guilabel
-> dialogue you can select the path to the auxiliary <acronym
->PO</acronym
-> file. To automate <acronym
->PO</acronym
->-file switching when you change current edited file there are many variables delimited by <literal
->@</literal
-> char that are replaced by appropriate values:</para>
+<title>Settings</title>
+<para>You can configure this searching mode by selecting <menuchoice> <guisubmenu>Settings</guisubmenu> <guisubmenu>Configure Dictionary</guisubmenu> <guimenuitem>PO Auxiliary</guimenuitem> </menuchoice> from the &kbabel; menu.</para>
+
+<para>In the <guilabel>Configure Dictionary PO Auxiliary</guilabel> dialogue you can select the path to the auxiliary <acronym>PO</acronym> file. To automate <acronym>PO</acronym>-file switching when you change current edited file there are many variables delimited by <literal>@</literal> char that are replaced by appropriate values:</para>
 
 <variablelist>
   <varlistentry>
-    <term
->@PACKAGE@</term>
-    <listitem
-><para
->The name of application or package currently being translated. For example, it can expand to kbabel, tdelibs, konqueror and so on. </para
-></listitem>
+    <term>@PACKAGE@</term>
+    <listitem><para>The name of application or package currently being translated. For example, it can expand to kbabel, tdelibs, konqueror and so on. </para></listitem>
   </varlistentry>
   <varlistentry>
-    <term
->@LANG@</term>
-    <listitem
-><para
->The language code. For example can expand to: en_GB, de, ro, fr etc. </para
-></listitem>
+    <term>@LANG@</term>
+    <listitem><para>The language code. For example can expand to: en_GB, de, ro, fr etc. </para></listitem>
   </varlistentry>
   <varlistentry>
-    <term
->@DIRn@</term>
-    <listitem
-><para
->where <quote
->n</quote
-> is a positive integer. This expands to the <quote
->n</quote
->-th folder counted from the filename (right to left). </para
-></listitem>
+    <term>@DIRn@</term>
+    <listitem><para>where <quote>n</quote> is a positive integer. This expands to the <quote>n</quote>-th folder counted from the filename (right to left). </para></listitem>
   </varlistentry>
 </variablelist>
 
-<para
->The edit line displays the actual path to the auxiliary <acronym
->PO</acronym
-> file. While it is best to use the provided variables in a path it is possible to choose an absolute, real path to an existing <acronym
->PO</acronym
-> file. Let's take an example.</para>
-
-<para
->I'm Romanian and I have some knowledge about French language and I work on &kde; translation.</para>
-
-<para
->First step is to download a very fresh <filename
->tde-i18n-fr.tar.bz2</filename
-> from the <ulink url="ftp://ftp.kde.org/pub/kde/snapshots/tde-i18n"
->&kde; &FTP; site</ulink
-> or to use the <acronym
->CVS</acronym
-> system to put on my hard-disk a French translation tree. I do this into <filename
->/home/clau/cvs-cvs.kde.org/tde-i18n/fr</filename
->.</para>
-
-<para
->My <acronym
->PO</acronym
-> sources folder is in <filename
->/home/clau/cvs-cvs.kde.org/tde-i18n/ro</filename
->. Don't forget to select <guilabel
->PO Auxiliary</guilabel
-> as the default dictionary and check <guilabel
->Automatically start search</guilabel
-> on the <guilabel
->Search</guilabel
-> tab from &kbabel;'s <guilabel
->Preferences</guilabel
-> dialogue.</para>
+<para>The edit line displays the actual path to the auxiliary <acronym>PO</acronym> file. While it is best to use the provided variables in a path it is possible to choose an absolute, real path to an existing <acronym>PO</acronym> file. Let's take an example.</para>
+
+<para>I'm Romanian and I have some knowledge about French language and I work on &kde; translation.</para>
+
+<para>First step is to download a very fresh <filename>tde-i18n-fr.tar.bz2</filename> from the <ulink url="ftp://ftp.kde.org/pub/kde/snapshots/tde-i18n">&kde; &FTP; site</ulink> or to use the <acronym>CVS</acronym> system to put on my hard-disk a French translation tree. I do this into <filename>/home/clau/cvs-cvs.kde.org/tde-i18n/fr</filename>.</para>
+
+<para>My <acronym>PO</acronym> sources folder is in <filename>/home/clau/cvs-cvs.kde.org/tde-i18n/ro</filename>. Don't forget to select <guilabel>PO Auxiliary</guilabel> as the default dictionary and check <guilabel>Automatically start search</guilabel> on the <guilabel>Search</guilabel> tab from &kbabel;'s <guilabel>Preferences</guilabel> dialogue.</para>
 
 </sect2>
 </sect1>
 
 <sect1 id="compendium">
 <!-- FIXME: examples -->
-<title
->PO compendium</title>
-
-<para
->A compendium is a file containing a collection of all translation messages (pairs of <acronym
->msgid</acronym
-> and <acronym
->msgstr</acronym
->) in a project, &eg; in &kde;. Typically, compendium for a given language is created by concatenating all <acronym
->PO</acronym
-> files of the project for the language. Compendium can contain translated, untranslated and fuzzy messages. Untranslated ones are ignored by this module. </para>
-
-<para
->Similarly to Auxiliary <acronym
->PO</acronym
->, this searching mode is based on matching the <quote
->same</quote
-> original string (<acronym
->msgid</acronym
->) in a compendium. Currently you can define only one compendium file to search. </para>
-
-<para
->This mode is very useful if you are not using the translation database and you want to achieve consistent translation with other translations. By the way, compendium files are much easier to share with other translators and even other translation projects because they can be generated for them as well. </para>
+<title>PO compendium</title>
+
+<para>A compendium is a file containing a collection of all translation messages (pairs of <acronym>msgid</acronym> and <acronym>msgstr</acronym>) in a project, &eg; in &kde;. Typically, compendium for a given language is created by concatenating all <acronym>PO</acronym> files of the project for the language. Compendium can contain translated, untranslated and fuzzy messages. Untranslated ones are ignored by this module. </para>
+
+<para>Similarly to Auxiliary <acronym>PO</acronym>, this searching mode is based on matching the <quote>same</quote> original string (<acronym>msgid</acronym>) in a compendium. Currently you can define only one compendium file to search. </para>
+
+<para>This mode is very useful if you are not using the translation database and you want to achieve consistent translation with other translations. By the way, compendium files are much easier to share with other translators and even other translation projects because they can be generated for them as well. </para>
 
 <sect2 id="compendium-settings">
-<title
->Settings</title>
-
-<para
->You can configure this searching mode by selecting <menuchoice
-> <guisubmenu
->Settings</guisubmenu
-> <guisubmenu
->Configure Dictionary</guisubmenu
-> <guimenuitem
->PO Compendium</guimenuitem
-> </menuchoice
-> in &kbabel;'s menu. </para>
-
-<para
->In <guilabel
->Configure Dictionary PO Compendium</guilabel
-> dialogue you can select the path to a compendium file. To automate compendium file switching when you change the translation language, there is a variable delimited by <literal
->@</literal
-> char which si replaced by appropriate value:</para>
+<title>Settings</title>
+
+<para>You can configure this searching mode by selecting <menuchoice> <guisubmenu>Settings</guisubmenu> <guisubmenu>Configure Dictionary</guisubmenu> <guimenuitem>PO Compendium</guimenuitem> </menuchoice> in &kbabel;'s menu. </para>
+
+<para>In <guilabel>Configure Dictionary PO Compendium</guilabel> dialogue you can select the path to a compendium file. To automate compendium file switching when you change the translation language, there is a variable delimited by <literal>@</literal> char which si replaced by appropriate value:</para>
 
 <variablelist>
   <varlistentry>
-    <term
->@LANG@</term>
-    <listitem
-><para
->The language code. For example can expand to: en_GB, de, ro, fr etc. </para
-></listitem>
+    <term>@LANG@</term>
+    <listitem><para>The language code. For example can expand to: en_GB, de, ro, fr etc. </para></listitem>
   </varlistentry>
 </variablelist>
 
-<para
->In the edit line is displayed the actual path to compendium <acronym
->PO</acronym
-> file. While you had best use provided variables in path, it's possible to choose an absolute, real path to an existing <acronym
->PO</acronym
-> file to be used as a compendium.</para>
+<para>In the edit line is displayed the actual path to compendium <acronym>PO</acronym> file. While you had best use provided variables in path, it's possible to choose an absolute, real path to an existing <acronym>PO</acronym> file to be used as a compendium.</para>
 
-<para
->A very fresh compendium for &kde; translation into &eg; French you can download <filename
->fr.messages.bz2</filename
-> from the <ulink url="ftp://ftp.kde.org/pub/kde/snapshots/tde-i18n"
->&kde; &FTP; site</ulink
->. </para>
+<para>A very fresh compendium for &kde; translation into &eg; French you can download <filename>fr.messages.bz2</filename> from the <ulink url="ftp://ftp.kde.org/pub/kde/snapshots/tde-i18n">&kde; &FTP; site</ulink>. </para>
 
-<para
->You can define how to search in the compendium using options below the path. They are divided into two groups: text-matching options, where you can specify how the text is compared and whether to ignore fuzzy translations, and message-matching options, which determine if the translation from compendium should be a substring of searching message or vice versa.</para>
+<para>You can define how to search in the compendium using options below the path. They are divided into two groups: text-matching options, where you can specify how the text is compared and whether to ignore fuzzy translations, and message-matching options, which determine if the translation from compendium should be a substring of searching message or vice versa.</para>
 
 <variablelist>
   <varlistentry>
-    <term
-><guilabel
->Case sensitive</guilabel
-></term>
+    <term><guilabel>Case sensitive</guilabel></term>
     <listitem>
-    <para
->If the matching of message in compendium should distinguish between uppercase and lowercase letters. </para>
+    <para>If the matching of message in compendium should distinguish between uppercase and lowercase letters. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term
-><guilabel
->Ignore fuzzy string</guilabel
-></term>
+    <term><guilabel>Ignore fuzzy string</guilabel></term>
     <listitem>
-    <para
->If the fuzzy messages in the compendium should be ignored for searching. The compendium can contain fuzzy messages, since it is typically created by concatenating the <acronym
->PO</acronym
-> files of the project which can include fuzzy messages. Untranslated ones are ignored always (You can't search for translation in untranslated messages, right?)</para>
+    <para>If the fuzzy messages in the compendium should be ignored for searching. The compendium can contain fuzzy messages, since it is typically created by concatenating the <acronym>PO</acronym> files of the project which can include fuzzy messages. Untranslated ones are ignored always (You can't search for translation in untranslated messages, right?)</para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term
-><guilabel
->Only whole words</guilabel
-></term>
+    <term><guilabel>Only whole words</guilabel></term>
     <listitem>
-    <para
->If the matching text should start and end at the boundaries of words. </para>
+    <para>If the matching text should start and end at the boundaries of words. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term
->A text matches if it <guilabel
->is equal to search text</guilabel
-></term
-> 
+    <term>A text matches if it <guilabel>is equal to search text</guilabel></term> 
     <listitem>
-    <para
->A text in compendium matches the search text only if it is exactly the same (of course using the options above). </para>
+    <para>A text in compendium matches the search text only if it is exactly the same (of course using the options above). </para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term
->A text matches if it <guilabel
->is similar to search text</guilabel
-></term>
+    <term>A text matches if it <guilabel>is similar to search text</guilabel></term>
     <listitem>
-    <para
->A text in compendium matches the search text only if it is <quote
->similar</quote
->. Both texts are compared by short chunks of letters (<quote
->3-grams</quote
->) and at least half of the chunks has to be same. </para>
+    <para>A text in compendium matches the search text only if it is <quote>similar</quote>. Both texts are compared by short chunks of letters (<quote>3-grams</quote>) and at least half of the chunks has to be same. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term
->A text matches if it <guilabel
->contains search text</guilabel
-></term>
+    <term>A text matches if it <guilabel>contains search text</guilabel></term>
     <listitem>
-    <para
->A text in compendium matches the search text if it contains the search text.</para>
+    <para>A text in compendium matches the search text if it contains the search text.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term
->A text matches if it <guilabel
->is contained in search text</guilabel
-></term>
+    <term>A text matches if it <guilabel>is contained in search text</guilabel></term>
     <listitem>
-    <para
->A text in compendium matches the search text if it is contained the search text. </para>
+    <para>A text in compendium matches the search text if it is contained the search text. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term
->A text matches if it <guilabel
->contains a word of search text</guilabel
-></term>
+    <term>A text matches if it <guilabel>contains a word of search text</guilabel></term>
     <listitem>
-    <para
->The texts are divided to words and a text in compendium matches the search text only if it contains some word from the search text. </para>
+    <para>The texts are divided to words and a text in compendium matches the search text only if it contains some word from the search text. </para>
     </listitem>
   </varlistentry>
 </variablelist>
diff --git a/tde-i18n-en_GB/docs/tdesdk/kbabel/faq.docbook b/tde-i18n-en_GB/docs/tdesdk/kbabel/faq.docbook
index 1109bb9abcb..7da2eeaa399 100644
--- a/tde-i18n-en_GB/docs/tdesdk/kbabel/faq.docbook
+++ b/tde-i18n-en_GB/docs/tdesdk/kbabel/faq.docbook
@@ -1,6 +1,5 @@
 <!-- <?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"> -->
 <!-- Uncomment the previous two lines to validate this document -->
 <!-- standalone.  Be sure to recomment them before attempting to -->
 <!-- process index.docbook -->
@@ -10,85 +9,31 @@
 <!-- Fill in this section if this document has a different author -->
 <authorgroup>
 <author>
-<personname
-><firstname
-></firstname
-><surname
-></surname
-></personname>
+<personname><firstname></firstname><surname></surname></personname>
 </author>
 </authorgroup>
 
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </chapterinfo>
 
-<title
->Questions and Answers</title>
+<title>Questions and Answers</title>
 <qandaset>
   <qandaentry>
     <question>
-      <para
->Why does &kbabel; show question marks when entering language specific characters? </para>
+      <para>Why does &kbabel; show question marks when entering language specific characters? </para>
     </question>
     <answer>
 
-      <para
->This is a problem with your locale settings. The following might help: Exit &kbabel;, in a shell set the environment variable <envar
->LANG</envar
-> to a locale, valid for your language. If you use <command
->bash</command
-> do <userinput
-><command
->export <envar
->LANG</envar
->=<replaceable
->change this</replaceable
-></command
-></userinput
->. For example, when you use german characters, do <userinput
-><command
->export <envar
->LANG</envar
->=de_DE.88591</command
-></userinput
->. Then start &kbabel; from this shell. If the problem is gone, insert this command in your <filename
->~/.profile</filename
->. </para>
+      <para>This is a problem with your locale settings. The following might help: Exit &kbabel;, in a shell set the environment variable <envar>LANG</envar> to a locale, valid for your language. If you use <command>bash</command> do <userinput><command>export <envar>LANG</envar>=<replaceable>change this</replaceable></command></userinput>. For example, when you use german characters, do <userinput><command>export <envar>LANG</envar>=de_DE.88591</command></userinput>. Then start &kbabel; from this shell. If the problem is gone, insert this command in your <filename>~/.profile</filename>. </para>
 
     </answer>
   </qandaentry>
   <qandaentry>
     <question>
-      <para
->Why does &kbabel; show question marks instead of language specific characters after loading a <acronym
->PO</acronym
-> file?</para>
+      <para>Why does &kbabel; show question marks instead of language specific characters after loading a <acronym>PO</acronym> file?</para>
     </question>
     <answer>
-      <para
->The text contains characters, which can not be displayed with your system font. If you are sure, that the text contains no such characters, the file might have been corrupted somehow. In this case, mark such a question mark and press <keycombo action="simul"
->&Ctrl;<keycap
->F</keycap
-></keycombo
-> to find all the corrupted characters and replace them.<note
-> <para
-> Do not search for real question marks, because these characters are only displayed as question marks, but internally they are different characters. </para
-> </note
-> Otherwise you might want to install an Unicode font, which contains all necessary characters. </para>
+      <para>The text contains characters, which can not be displayed with your system font. If you are sure, that the text contains no such characters, the file might have been corrupted somehow. In this case, mark such a question mark and press <keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo> to find all the corrupted characters and replace them.<note> <para> Do not search for real question marks, because these characters are only displayed as question marks, but internally they are different characters. </para> </note> Otherwise you might want to install an Unicode font, which contains all necessary characters. </para>
     </answer>
   </qandaentry>
 </qandaset>
diff --git a/tde-i18n-en_GB/docs/tdesdk/kbabel/glossary.docbook b/tde-i18n-en_GB/docs/tdesdk/kbabel/glossary.docbook
index 00a4beaa0b1..e264d9c884f 100644
--- a/tde-i18n-en_GB/docs/tdesdk/kbabel/glossary.docbook
+++ b/tde-i18n-en_GB/docs/tdesdk/kbabel/glossary.docbook
@@ -1,6 +1,5 @@
 <!-- <?xml version="1.0" ?>
-<!DOCTYPE glossary PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd"
-> -->
+<!DOCTYPE glossary PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd"> -->
 <!-- Uncomment the previous two lines to validate this document -->
 <!-- standalone.  Be sure to recomment them before attempting to -->
 <!-- process index.docbook -->
@@ -10,249 +9,83 @@
 <!-- Fill in this section if this document has a different author -->
 <authorgroup>
 <author>
-<personname
-><firstname
-></firstname
-><surname
-></surname
-></personname>
+<personname><firstname></firstname><surname></surname></personname>
 </author>
 </authorgroup>
 
-<othercredit role="translator"
-><firstname
->Alex</firstname
-><surname
->Walker</surname
-><affiliation
-><address
-><email
->alex@x3ja.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Alex</firstname><surname>Walker</surname><affiliation><address><email>alex@x3ja.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </glossaryinfo>
 
-<title
->Glossary</title>
+<title>Glossary</title>
 
-<glossdiv
-><title
->A</title>
+<glossdiv><title>A</title>
   <glossentry id="gloss-auxiliary">
-    <glossterm
->Auxiliary file</glossterm>
+    <glossterm>Auxiliary file</glossterm>
     <glossdef>
-	<para
->is a &kbabel; specific issue. It is an option for the user to set up one <acronym
->PO</acronym
-> file to search through for original messages. For example, if you're a member of French team and have some Spanish or Italian knowledge you can grab and set-up an auxiliary Spanish <acronym
->PO</acronym
-> file associated with the file currently being translated. </para>
+	<para>is a &kbabel; specific issue. It is an option for the user to set up one <acronym>PO</acronym> file to search through for original messages. For example, if you're a member of French team and have some Spanish or Italian knowledge you can grab and set-up an auxiliary Spanish <acronym>PO</acronym> file associated with the file currently being translated. </para>
     </glossdef>
   </glossentry>
 </glossdiv>
 
-<glossdiv
-><title
->C</title>
+<glossdiv><title>C</title>
   <glossentry id="gloss-compendium">
-    <glossterm
->Compendium file</glossterm>
+    <glossterm>Compendium file</glossterm>
     <glossdef>
-      <para
->is a collection of all translations for one language. This big <acronym
->PO</acronym
-> file is made by unique messages from all applications' <acronym
->PO</acronym
-> files. It can be used to fill in all already translated strings into a new yet untranslated or partially translated <acronym
->PO</acronym
-> file. &kbabel; uses such a file in the <quote
->PO Compendium</quote
-> search engine. </para>
+      <para>is a collection of all translations for one language. This big <acronym>PO</acronym> file is made by unique messages from all applications' <acronym>PO</acronym> files. It can be used to fill in all already translated strings into a new yet untranslated or partially translated <acronym>PO</acronym> file. &kbabel; uses such a file in the <quote>PO Compendium</quote> search engine. </para>
     </glossdef>
   </glossentry>
 </glossdiv>
 
-<glossdiv
-><title
->F</title>
+<glossdiv><title>F</title>
   <glossentry id="fuzzy">
-    <glossterm
->Fuzzy</glossterm>
+    <glossterm>Fuzzy</glossterm>
     <glossdef>
-      <para
->This is a flag generated, in general, by <command
->msgmerge</command
->. It shows that a <acronym
->msgstr</acronym
-> string might not be a correct translation. The translator must see and make modifications to the string if necessary and then remove the <quote
->fuzzy</quote
-> flag from the message's comment. </para>
+      <para>This is a flag generated, in general, by <command>msgmerge</command>. It shows that a <acronym>msgstr</acronym> string might not be a correct translation. The translator must see and make modifications to the string if necessary and then remove the <quote>fuzzy</quote> flag from the message's comment. </para>
     </glossdef>
   </glossentry>
 </glossdiv>
 
-<glossdiv
-><title
->I</title>
-  <glossentry id="i18n"
-><glossterm
->Internationalisation</glossterm
-> <acronym
->i18n</acronym
-> <glossdef>
-      <para
->is the operation by which an application is made aware and able to support multiple languages. The word <quote
->internationalisation</quote
-> has 20 characters so, to shorten it, people started to write only the first and last characters and between them write the number of intermediate characters (18) forming the common abbreviation <acronym
->i18n</acronym
->. </para>
-      <glossseealso otherterm="l10n"
-></glossseealso>
+<glossdiv><title>I</title>
+  <glossentry id="i18n"><glossterm>Internationalisation</glossterm> <acronym>i18n</acronym> <glossdef>
+      <para>is the operation by which an application is made aware and able to support multiple languages. The word <quote>internationalisation</quote> has 20 characters so, to shorten it, people started to write only the first and last characters and between them write the number of intermediate characters (18) forming the common abbreviation <acronym>i18n</acronym>. </para>
+      <glossseealso otherterm="l10n"></glossseealso>
     </glossdef>
   </glossentry>
 </glossdiv>
 
-<glossdiv
-><title
->L</title>
-  <glossentry id="l10n"
-><glossterm
->Localisation</glossterm
-> <acronym
->l10n</acronym
-> <glossdef>
-      <para
->is the operation by which an application already internationalised is made to process input and output in a fashion desired by some cultural and language habits. The word <quote
->localisation</quote
-> has 12 characters so, to shorten it, people started to write only the first and last characters and between them write the number of intermediate characters (10) forming the common abbreviation <acronym
->l10n</acronym
->. </para>
-      <glossseealso otherterm="i18n"
-></glossseealso>
+<glossdiv><title>L</title>
+  <glossentry id="l10n"><glossterm>Localisation</glossterm> <acronym>l10n</acronym> <glossdef>
+      <para>is the operation by which an application already internationalised is made to process input and output in a fashion desired by some cultural and language habits. The word <quote>localisation</quote> has 12 characters so, to shorten it, people started to write only the first and last characters and between them write the number of intermediate characters (10) forming the common abbreviation <acronym>l10n</acronym>. </para>
+      <glossseealso otherterm="i18n"></glossseealso>
     </glossdef>
   </glossentry>
 </glossdiv>
 
-<glossdiv
-><title
->M</title>
-  <glossentry id="mofile"
-><glossterm
->MO file</glossterm
-> <acronym
->MO</acronym
-> <glossdef>
-      <para
-><acronym
->MO</acronym
-> stands for <quote
->Machine Object</quote
->. A <acronym
->MO</acronym
-> file contains binary data suitable for reading by computers. The contents of a <acronym
->MO</acronym
-> file are organised as a database to minimise the lookup time for translated strings. <acronym
->MO</acronym
-> files are obtained by compiling <acronym
->PO</acronym
-> files using <command
->msgfmt</command
->. </para>
-<glossseealso otherterm="pofile"
-></glossseealso
-> <glossseealso otherterm="potfile"
-></glossseealso
-> </glossdef>
+<glossdiv><title>M</title>
+  <glossentry id="mofile"><glossterm>MO file</glossterm> <acronym>MO</acronym> <glossdef>
+      <para><acronym>MO</acronym> stands for <quote>Machine Object</quote>. A <acronym>MO</acronym> file contains binary data suitable for reading by computers. The contents of a <acronym>MO</acronym> file are organised as a database to minimise the lookup time for translated strings. <acronym>MO</acronym> files are obtained by compiling <acronym>PO</acronym> files using <command>msgfmt</command>. </para>
+<glossseealso otherterm="pofile"></glossseealso> <glossseealso otherterm="potfile"></glossseealso> </glossdef>
   </glossentry>
-  <glossentry id="msgid"
-><glossterm
->Message ID</glossterm
-> <acronym
->msgid</acronym
-> <glossdef>
-      <para
-><acronym
->msgid</acronym
-> is the keyword which introduces the original string in a <acronym
->PO</acronym
-> file. It is followed by a C-like string that spans one or more lines. </para>
-      <glossseealso otherterm="msgstr"
-></glossseealso>
+  <glossentry id="msgid"><glossterm>Message ID</glossterm> <acronym>msgid</acronym> <glossdef>
+      <para><acronym>msgid</acronym> is the keyword which introduces the original string in a <acronym>PO</acronym> file. It is followed by a C-like string that spans one or more lines. </para>
+      <glossseealso otherterm="msgstr"></glossseealso>
     </glossdef>
   </glossentry>
-  <glossentry id="msgstr"
-><glossterm
->Message String</glossterm
-> <acronym
->msgstr</acronym
-> <glossdef>
-      <para
-><acronym
->msgstr</acronym
-> is the keyword which introduces the translated string in <acronym
->PO</acronym
-> file. It is followed by C-like string that span on one or multiple lines. </para>
-      <glossseealso otherterm="msgid"
-></glossseealso>
+  <glossentry id="msgstr"><glossterm>Message String</glossterm> <acronym>msgstr</acronym> <glossdef>
+      <para><acronym>msgstr</acronym> is the keyword which introduces the translated string in <acronym>PO</acronym> file. It is followed by C-like string that span on one or multiple lines. </para>
+      <glossseealso otherterm="msgid"></glossseealso>
     </glossdef>
   </glossentry>
 </glossdiv>
 
-<glossdiv
-><title
->P</title>
-  <glossentry id="pofile"
-><glossterm
->PO file</glossterm
-> <acronym
->PO</acronym
-> <glossdef>
-      <para
-><acronym
->PO</acronym
-> stands for <quote
->Portable Object</quote
->. <acronym
->PO</acronym
-> files contain sets of strings which associate each translatable string with its translation in a particular language. A single <acronym
->PO</acronym
-> file relates to only one language. A <acronym
->PO</acronym
-> file is derived from a <acronym
->POT</acronym
-> file and is edited either by hand or using &kbabel;. </para>
-<glossseealso otherterm="potfile"
-></glossseealso
-> <glossseealso otherterm="mofile"
-></glossseealso
-> </glossdef>
+<glossdiv><title>P</title>
+  <glossentry id="pofile"><glossterm>PO file</glossterm> <acronym>PO</acronym> <glossdef>
+      <para><acronym>PO</acronym> stands for <quote>Portable Object</quote>. <acronym>PO</acronym> files contain sets of strings which associate each translatable string with its translation in a particular language. A single <acronym>PO</acronym> file relates to only one language. A <acronym>PO</acronym> file is derived from a <acronym>POT</acronym> file and is edited either by hand or using &kbabel;. </para>
+<glossseealso otherterm="potfile"></glossseealso> <glossseealso otherterm="mofile"></glossseealso> </glossdef>
   </glossentry>
-  <glossentry id="potfile"
-><glossterm
->POT file</glossterm
-> <acronym
->POT</acronym
-> <glossdef>
-      <para
-><acronym
->POT</acronym
-> stands for <quote
->Portable Object Template</quote
->. A <quote
->POT</quote
-> file is built by extracting all the translatable strings from application source files. A <quote
->POT</quote
-> file does not contain translations into any particular language&mdash; it is used by the translators as a template. </para>
-<glossseealso otherterm="pofile"
-></glossseealso
-> <glossseealso otherterm="mofile"
-></glossseealso
-> </glossdef>
+  <glossentry id="potfile"><glossterm>POT file</glossterm> <acronym>POT</acronym> <glossdef>
+      <para><acronym>POT</acronym> stands for <quote>Portable Object Template</quote>. A <quote>POT</quote> file is built by extracting all the translatable strings from application source files. A <quote>POT</quote> file does not contain translations into any particular language&mdash; it is used by the translators as a template. </para>
+<glossseealso otherterm="pofile"></glossseealso> <glossseealso otherterm="mofile"></glossseealso> </glossdef>
   </glossentry>
 </glossdiv>
 
diff --git a/tde-i18n-en_GB/docs/tdesdk/kbabel/index.docbook b/tde-i18n-en_GB/docs/tdesdk/kbabel/index.docbook
index 039381641ca..fa621352ec6 100644
--- a/tde-i18n-en_GB/docs/tdesdk/kbabel/index.docbook
+++ b/tde-i18n-en_GB/docs/tdesdk/kbabel/index.docbook
@@ -11,89 +11,47 @@
  <!ENTITY kappname "&kbabel;">
  <!ENTITY package "tdesdk">
  <!ENTITY % addindex "IGNORE">
- <!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+ <!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <book lang="&language;">
 
 <bookinfo>
-<title
->The &kbabel; Handbook</title>
+<title>The &kbabel; Handbook</title>
 
 <authorgroup>
-<author
->&Stanislav.Visnovsky; &Stanislav.Visnovsky.mail; </author>
-<author
->&Matthias.Kiefer; </author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<author>&Stanislav.Visnovsky; &Stanislav.Visnovsky.mail; </author>
+<author>&Matthias.Kiefer; </author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
 
-<date
->2003-09-18</date>
-<releaseinfo
->3.1.91</releaseinfo>
+<date>2003-09-18</date>
+<releaseinfo>3.1.91</releaseinfo>
 
 <abstract>
-<para
->&kbabel; is a suite of of an advanced and easy to use <acronym
->PO</acronym
-> file editor comprising &kbabel;, a multi functional &cataloguemanager; and a dictionary for translators &kbabeldict;. It supports many advanced features and it lets you customise many options. </para>
+<para>&kbabel; is a suite of of an advanced and easy to use <acronym>PO</acronym> file editor comprising &kbabel;, a multi functional &cataloguemanager; and a dictionary for translators &kbabeldict;. It supports many advanced features and it lets you customise many options. </para>
 </abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KBabel</keyword>
-<keyword
->catalogmanager</keyword>
-<keyword
->tdesdk</keyword>
-<keyword
->gettext</keyword>
-<keyword
->translation</keyword>
-<keyword
->i18n</keyword>
-<keyword
->l10n</keyword>
+<keyword>KDE</keyword>
+<keyword>KBabel</keyword>
+<keyword>catalogmanager</keyword>
+<keyword>tdesdk</keyword>
+<keyword>gettext</keyword>
+<keyword>translation</keyword>
+<keyword>i18n</keyword>
+<keyword>l10n</keyword>
 </keywordset>
 
 </bookinfo>
 
 <chapter id="introduction">
-<title
->Introduction</title>
-
-<para
->&kbabel; is an advanced and easy to use <acronym
->PO</acronym
-> file (&GNU; gettext message catalogues) editor. It has many features, that make it easy to edit and manage your <acronym
->PO</acronym
-> files. This includes full navigation capabilities, extensive editing functionality, search functions, syntax checking and statistics function. &cataloguemanager; is a file manager view, which helps you keep an overview over your <acronym
->PO</acronym
-> files. &kbabeldict; allows you to translate any text using &kbabel; capabilities for automated translation. The &kbabel; suite will help you to translate quickly and also to keep translations consistent. </para>
-
-<para
->With the &kde; project growing continuously, the number of <acronym
->PO</acronym
-> messages is over 47000 at the time of writing this documentation (plus another 20000 messages used for translating application documentation). There is a need to stay organised and consistent across all translations. </para>
+<title>Introduction</title>
+
+<para>&kbabel; is an advanced and easy to use <acronym>PO</acronym> file (&GNU; gettext message catalogues) editor. It has many features, that make it easy to edit and manage your <acronym>PO</acronym> files. This includes full navigation capabilities, extensive editing functionality, search functions, syntax checking and statistics function. &cataloguemanager; is a file manager view, which helps you keep an overview over your <acronym>PO</acronym> files. &kbabeldict; allows you to translate any text using &kbabel; capabilities for automated translation. The &kbabel; suite will help you to translate quickly and also to keep translations consistent. </para>
+
+<para>With the &kde; project growing continuously, the number of <acronym>PO</acronym> messages is over 47000 at the time of writing this documentation (plus another 20000 messages used for translating application documentation). There is a need to stay organised and consistent across all translations. </para>
 
 </chapter>
 
@@ -107,68 +65,47 @@
 
 
 <chapter id="credits">
-<title
->Credits and Licence</title>
-
-<para
->&kbabel; </para>
-<para
->Program Copyright &copy; 1999-2000 &Matthias.Kiefer; &Matthias.Kiefer.mail; </para>
-<para
->Contributors: <itemizedlist>
-<listitem
-><para
->&Thomas.Diehl; &Thomas.Diehl.mail;</para>
+<title>Credits and Licence</title>
+
+<para>&kbabel; </para>
+<para>Program Copyright &copy; 1999-2000 &Matthias.Kiefer; &Matthias.Kiefer.mail; </para>
+<para>Contributors: <itemizedlist>
+<listitem><para>&Thomas.Diehl; &Thomas.Diehl.mail;</para>
 </listitem>
-<listitem
-><para
->&Stephan.Kulow; &Stephan.Kulow.mail;</para>
+<listitem><para>&Stephan.Kulow; &Stephan.Kulow.mail;</para>
 </listitem>
 </itemizedlist>
 </para>
 
-<para
->Documentation Copyright &copy; 2000 &Claudiu.Costin; &Claudiu.Costin.mail; and &Matthias.Kiefer; &Matthias.Kiefer.mail;</para>
+<para>Documentation Copyright &copy; 2000 &Claudiu.Costin; &Claudiu.Costin.mail; and &Matthias.Kiefer; &Matthias.Kiefer.mail;</para>
 
-<para
->Update for &kde; 3.0 Copyright &copy; 2002 &Stanislav.Visnovsky; &Stanislav.Visnovsky.mail;</para>
+<para>Update for &kde; 3.0 Copyright &copy; 2002 &Stanislav.Visnovsky; &Stanislav.Visnovsky.mail;</para>
 
-<para
->Malcolm Hunter<email
->malcolm.hunter@gmx.co.uk</email
-></para
-> 
+<para>Malcolm Hunter<email>malcolm.hunter@gmx.co.uk</email></para> 
 &underFDL; &underGPL; </chapter>
 
 &glossary;
 
 <appendix id="installation">
-<title
->Installation</title>
+<title>Installation</title>
 
 <sect1 id="getting-kbabel">
-<title
->How to obtain &kbabel;</title>
+<title>How to obtain &kbabel;</title>
 &install.intro.documentation; </sect1>
 
 <sect1 id="requirements">
-<title
->Requirements</title>
+<title>Requirements</title>
 
-<para
->In order to successfully use &kbabel;, you need &kde; 3.x. </para>
+<para>In order to successfully use &kbabel;, you need &kde; 3.x. </para>
 
-<para
->All required libraries as well as &kbabel; itself can be found on &kde-ftp;. </para>
+<para>All required libraries as well as &kbabel; itself can be found on &kde-ftp;. </para>
 
-<para
->If you want to use the translation database, you need Berkeley Database II. </para>
+<para>If you want to use the translation database, you need Berkeley Database II. </para>
 
 </sect1>
 
 <sect1 id="compilation">
-<title
->Compilation and Installation</title>
+<title>Compilation and Installation</title>
 &install.compile.documentation; </sect1>
 
 </appendix>
diff --git a/tde-i18n-en_GB/docs/tdesdk/kbabel/kbabeldict.docbook b/tde-i18n-en_GB/docs/tdesdk/kbabel/kbabeldict.docbook
index 397d20ad65c..c56e9e54e68 100644
--- a/tde-i18n-en_GB/docs/tdesdk/kbabel/kbabeldict.docbook
+++ b/tde-i18n-en_GB/docs/tdesdk/kbabel/kbabeldict.docbook
@@ -1,6 +1,5 @@
 <!-- <?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"> -->
 <!-- Uncomment the previous two lines to validate this document -->
 <!-- standalone.  Be sure to recomment them before attempting to -->
 <!-- process index.docbook -->
@@ -10,82 +9,39 @@
 <!-- Fill in this section if this document has a different author -->
 <authorgroup>
 <author>
-<personname
-><firstname
-></firstname
-><surname
-></surname
-></personname>
+<personname><firstname></firstname><surname></surname></personname>
 </author>
 </authorgroup>
 
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </chapterinfo>
 
-<title
->Using &kbabeldict;</title>
+<title>Using &kbabeldict;</title>
 <anchor id="kbabeldict"/>
-<para
->&kbabeldict; is a simple interface for translation modules for &kbabel;. It allows you to search for translations. </para>
+<para>&kbabeldict; is a simple interface for translation modules for &kbabel;. It allows you to search for translations. </para>
 <screenshot>
-<screeninfo
->Screenshot of &kbabeldict;</screeninfo>
+<screeninfo>Screenshot of &kbabeldict;</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="snap_kbabeldict.png" format="PNG"/>
 </imageobject>
-<textobject
-><phrase
->Screenshot of &kbabeldict;</phrase
-></textobject>
+<textobject><phrase>Screenshot of &kbabeldict;</phrase></textobject>
 </mediaobject>
 </screenshot>
-<para
->The screenshot above does not contain settings for selected module. You can show them using <guibutton
->Show Settings</guibutton
->. Preferences widget for selected module will be shown on the right side of the window. The &kbabeldict; window then looks like this: </para>
+<para>The screenshot above does not contain settings for selected module. You can show them using <guibutton>Show Settings</guibutton>. Preferences widget for selected module will be shown on the right side of the window. The &kbabeldict; window then looks like this: </para>
 <screenshot>
-<screeninfo
->Screenshot of &kbabeldict;</screeninfo>
+<screeninfo>Screenshot of &kbabeldict;</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="snap_kbabeldict2.png" format="PNG"/>
 </imageobject>
-<textobject
-><phrase
->Screenshot of &kbabeldict; with shown settings</phrase
-></textobject>
+<textobject><phrase>Screenshot of &kbabeldict; with shown settings</phrase></textobject>
 </mediaobject>
 </screenshot>
-<para
->The usage is very simple. You select a module to in the <guilabel
->Search in module</guilabel
-> combo-box. Then you enter the phrase to lookup and press <guibutton
->Start Search</guibutton
->. All found messages are shown in the list below, which is the same as a tool in the &kbabel; main window. Searching can be stopped by pressing <guilabel
->Stop</guilabel
->. In case you want to search in translated text, not in original English message, you should use <guilabel
->Search in translations</guilabel
->. </para>
-<para
->Buttons on the bottom of the window can be used for closing &kbabeldict;, showing/hiding the module settings or displaying a dialogue with credits for &kbabeldict; and the modules themselves. </para>
+<para>The usage is very simple. You select a module to in the <guilabel>Search in module</guilabel> combo-box. Then you enter the phrase to lookup and press <guibutton>Start Search</guibutton>. All found messages are shown in the list below, which is the same as a tool in the &kbabel; main window. Searching can be stopped by pressing <guilabel>Stop</guilabel>. In case you want to search in translated text, not in original English message, you should use <guilabel>Search in translations</guilabel>. </para>
+<para>Buttons on the bottom of the window can be used for closing &kbabeldict;, showing/hiding the module settings or displaying a dialogue with credits for &kbabeldict; and the modules themselves. </para>
 <note>
-<para
->For description of the standard modules and their settings see <xref linkend="dictionaries"/>. </para>
+<para>For description of the standard modules and their settings see <xref linkend="dictionaries"/>. </para>
 </note>
 </chapter>
 <!--
diff --git a/tde-i18n-en_GB/docs/tdesdk/kbabel/menu.docbook b/tde-i18n-en_GB/docs/tdesdk/kbabel/menu.docbook
index b2cfe879f2d..e559271f14e 100644
--- a/tde-i18n-en_GB/docs/tdesdk/kbabel/menu.docbook
+++ b/tde-i18n-en_GB/docs/tdesdk/kbabel/menu.docbook
@@ -1,6 +1,5 @@
 <!-- <?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"> -->
 <!-- Uncomment the previous two lines to validate this document -->
 <!-- standalone.  Be sure to recomment them before attempting to -->
 <!-- process index.docbook -->
@@ -11,218 +10,116 @@
 <!-- Fill in this section if this document has a different author -->
 <authorgroup>
 <author>
-<personname
-><firstname
->Andrew</firstname
-><surname
->Coles</surname
-></personname>
+<personname><firstname>Andrew</firstname><surname>Coles</surname></personname>
 </author>
 </authorgroup>
 
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </chapterinfo>
 
-<title
->Command Reference</title>
+<title>Command Reference</title>
 
 <sect1 id="kbabel-menu">
-<title
->The &kbabel; menu</title>
+<title>The &kbabel; menu</title>
 
 <sect2>
-<title
->The File Menu</title>
+<title>The File Menu</title>
 <variablelist>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Ctrl;<keycap
->O</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Open</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul"> &Ctrl;<keycap>O</keycap> </keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Open</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Opens a PO file. If the current file is modified you will be prompted to save it first. </action>
+        <action>Opens a PO file. If the current file is modified you will be prompted to save it first. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Open Recent</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>File</guimenu> <guimenuitem>Open Recent</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Opens a recently edited PO file from the recently-used documents menu </action>
+        <action>Opens a recently edited PO file from the recently-used documents menu </action>
       </para>
     </listitem>
   </varlistentry>
   <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 current PO file. If it is not modified no action is taken. </action>
+        <action>Saves the current PO file. If it is not modified no action is taken. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Save As</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>File</guimenu> <guimenuitem>Save As</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Saves the current PO file under a new name </action>
+        <action>Saves the current PO file under a new name </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Save Special</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>File</guimenu> <guimenuitem>Save Special</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Displays the Save Settings dialogue and then saves the current PO file under a new name </action>
+        <action>Displays the Save Settings dialogue and then saves the current PO file under a new name </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Revert</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>File</guimenu> <guimenuitem>Revert</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Loads the last saved version of the current PO file </action>
+        <action>Loads the last saved version of the current PO file </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Mail</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>File</guimenu> <guimenuitem>Mail</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Prompts for an archive filename in which to store the current PO file then opens an email composer window with the archive as an attachment </action>
+        <action>Prompts for an archive filename in which to store the current PO file then opens an email composer window with the archive as an attachment </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->New View</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>File</guimenu> <guimenuitem>New View</guimenuitem> </menuchoice>
     </term>
     <listitem>
-      <para
-><action
-> Opens a new window with the currently loaded file. </action
-> Very useful if you have to translate large files and need to refer back to some strings. </para>
+      <para><action> Opens a new window with the currently loaded file. </action> Very useful if you have to translate large files and need to refer back to some strings. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->New Window</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>File</guimenu> <guimenuitem>New Window</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Opens a new empty window </action>
+        <action>Opens a new empty window </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 &kbabel; editor </action>
+        <action>Quits &kbabel; editor </action>
       </para>
     </listitem>
   </varlistentry>
@@ -230,345 +127,162 @@
 </sect2>
 
 <sect2>
-<title
->The Edit Menu</title>
+<title>The Edit Menu</title>
 <variablelist>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Ctrl;<keycap
->Z</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Undo</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul"> &Ctrl;<keycap>Z</keycap> </keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Undo</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Undoes the last edit action in the translation edit box </action>
+        <action>Undoes the last edit action in the translation edit box </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Ctrl;&Shift;<keycap
->Z</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Redo</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul"> &Ctrl;&Shift;<keycap>Z</keycap> </keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Redo</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Redoes the last undone edit action in the translation edit box </action>
+        <action>Redoes the last undone edit action in the translation edit box </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Ctrl;<keycap
->X</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Cut</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul"> &Ctrl;<keycap>X</keycap> </keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Cut</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Cuts the selected text and moves it to the clipboard </action>
+        <action>Cuts the selected text and moves it to the clipboard </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>C</keycap> </keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Copy</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Copies the selected text to the clipboard </action>
+        <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>
+      <menuchoice><shortcut> <keycombo action="simul"> &Ctrl;<keycap>V</keycap> </keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Paste</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Pastes the contents of the clipboard at the current cursor position in the translation edit box. </action>
+        <action>Pastes the contents of the clipboard at the current cursor position in the translation edit box. </action>
       </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 text in the translation edit box </action>
+        <action>Selects all text in the translation edit box </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Ctrl;<keycap
->F</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Find...</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul"> &Ctrl;<keycap>F</keycap> </keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Find...</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Opens a Find dialogue for searching for strings in the current PO file </action>
+        <action>Opens a Find dialogue for searching for strings in the current PO file </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycap
->F3</keycap
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Find Next</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycap>F3</keycap> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Find Next</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Finds the next occurrence of a string from the previous search action </action>
+        <action>Finds the next occurrence of a string from the previous search action </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Ctrl;<keycap
->R</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Replace...</guimenuitem
-> </menuchoice>
+      <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 to search for and replace strings in the current PO file </action>
+        <action>Opens the Replace dialogue to search for and replace strings in the current PO file </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Ctrl;<keycap
->Delete</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Clear</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul"> &Ctrl;<keycap>Delete</keycap> </keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Clear</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Clears the translation for the current msgid </action>
+        <action>Clears the translation for the current msgid </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Ctrl;<keycap
->Space</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Copy msgid to msgstr</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul"> &Ctrl;<keycap>Space</keycap> </keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Copy msgid to msgstr</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Copies the original English string into the translation edit box. This is useful when you do not need to make any changes (or only minor changes) to the original English text (msgstr). </action>
+        <action>Copies the original English string into the translation edit box. This is useful when you do not need to make any changes (or only minor changes) to the original English text (msgstr). </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Ctrl;&Alt;<keycap
->Space</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Copy search result to msgstr</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul"> &Ctrl;&Alt;<keycap>Space</keycap> </keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Copy search result to msgstr</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Copies a string found after a translation search into the msgstr edit box. This is very useful if you do not want to keep re-translating the same message again and again. </action>
+        <action>Copies a string found after a translation search into the msgstr edit box. This is very useful if you do not want to keep re-translating the same message again and again. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Ctrl;<keycap
->U</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Toggle Fuzzy Status</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul"> &Ctrl;<keycap>U</keycap> </keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Toggle Fuzzy Status</guimenuitem> </menuchoice>
     </term>
     <listitem>
-      <para
-><action
-> Toggles the fuzzy status for the current entry.</action
-> It can be useful to turn fuzzy on, &eg; to mark the translation for another review. </para>
+      <para><action> Toggles the fuzzy status for the current entry.</action> It can be useful to turn fuzzy on, &eg; to mark the translation for another review. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Ctrl;&Alt;<keycap
->N</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Insert Next Tag</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul"> &Ctrl;&Alt;<keycap>N</keycap> </keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Insert Next Tag</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Inserts the next tag found in the msgid into the translation, if the original English string contains markup tags </action>
+        <action>Inserts the next tag found in the msgid into the translation, if the original English string contains markup tags </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;&Alt;<keycap
->N</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guisubmenu
->Insert Tag</guisubmenu
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul">&Ctrl;&Alt;<keycap>N</keycap></keycombo> </shortcut> <guimenu>Edit</guimenu> <guisubmenu>Insert Tag</guisubmenu> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->This submenu contains all markup tags found in the original English string. By selecting one of them you can insert at the current position of cursor in translated text. translation. </action>
+        <action>This submenu contains all markup tags found in the original English string. By selecting one of them you can insert at the current position of cursor in translated text. translation. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Edit Header...</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Edit Header...</guimenuitem> </menuchoice>
     </term>
     <listitem>
-      <para
-><action
-> Edits the PO file header. </action
-> Actually there are many header lines, which keep the last translated date, translator name and email, language and translated text encoding &etc;. </para>
+      <para><action> Edits the PO file header. </action> Actually there are many header lines, which keep the last translated date, translator name and email, language and translated text encoding &etc;. </para>
     </listitem>
   </varlistentry>
 </variablelist>
@@ -576,318 +290,152 @@
 
 
 <sect2>
-<title
->The Go Menu</title>
+<title>The Go Menu</title>
 <variablelist>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycap
->Page Up</keycap
-> </shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Previous</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycap>Page Up</keycap> </shortcut> <guimenu>Go</guimenu> <guimenuitem>Previous</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Skips to the previous entry in the PO file. </action>
+        <action>Skips to the previous entry in the PO file. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycap
->Page Down</keycap
-> </shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Next</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycap>Page Down</keycap> </shortcut> <guimenu>Go</guimenu> <guimenuitem>Next</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Skips to the next entry in the PO file. </action
-> 
+        <action>Skips to the next entry in the PO file. </action> 
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Go</guimenu
-> <guimenuitem
->Go to...</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Go</guimenu> <guimenuitem>Go to...</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Opens a dialogue to jump to a specific entry number within the PO file. </action
-> 
+        <action>Opens a dialogue to jump to a specific entry number within the PO file. </action> 
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Go</guimenu
-> <guimenuitem
->First Entry</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Go</guimenu> <guimenuitem>First Entry</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Jumps to the first entry in the PO file. </action
-> 
+        <action>Jumps to the first entry in the PO file. </action> 
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Go</guimenu
-> <guimenuitem
->Last Entry</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Go</guimenu> <guimenuitem>Last Entry</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Jumps to the last entry in the PO file. </action>
+        <action>Jumps to the last entry in the PO file. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Ctrl;&Shift;<keycap
->Page Up</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Previous fuzzy or untranslated</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul"> &Ctrl;&Shift;<keycap>Page Up</keycap> </keycombo> </shortcut> <guimenu>Go</guimenu> <guimenuitem>Previous fuzzy or untranslated</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Jumps to the entry previous to the current one that is untranslated or marked as fuzzy. </action>
+        <action>Jumps to the entry previous to the current one that is untranslated or marked as fuzzy. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Ctrl;&Shift;<keycap
->Page Down</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Next fuzzy or untranslated</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul"> &Ctrl;&Shift;<keycap>Page Down</keycap> </keycombo> </shortcut> <guimenu>Go</guimenu> <guimenuitem>Next fuzzy or untranslated</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Jumps to the next entry after the current one which is untranslated or marked as fuzzy. </action>
+        <action>Jumps to the next entry after the current one which is untranslated or marked as fuzzy. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Ctrl;<keycap
->PgUp</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Previous fuzzy</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul"> &Ctrl;<keycap>PgUp</keycap> </keycombo> </shortcut> <guimenu>Go</guimenu> <guimenuitem>Previous fuzzy</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Jumps to the entry previous to the current one that is marked as fuzzy. </action>
+        <action>Jumps to the entry previous to the current one that is marked as fuzzy. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Ctrl;<keycap
->Page Down</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Next fuzzy</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul"> &Ctrl;<keycap>Page Down</keycap> </keycombo> </shortcut> <guimenu>Go</guimenu> <guimenuitem>Next fuzzy</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Jumps to the next entry after the current one that is marked as fuzzy. </action>
+        <action>Jumps to the next entry after the current one that is marked as fuzzy. </action>
       </para>
     </listitem>
   </varlistentry>
 <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Alt;<keycap
->Page Up</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Previous untranslated</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul"> &Alt;<keycap>Page Up</keycap> </keycombo> </shortcut> <guimenu>Go</guimenu> <guimenuitem>Previous untranslated</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Jumps to the entry previous to the current one that is untranslated. </action>
+        <action>Jumps to the entry previous to the current one that is untranslated. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Alt;<keycap
->Page Down</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Next untranslated</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul"> &Alt;<keycap>Page Down</keycap> </keycombo> </shortcut> <guimenu>Go</guimenu> <guimenuitem>Next untranslated</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Jumps to the next entry after the current one that is untranslated. </action>
+        <action>Jumps to the next entry after the current one that is untranslated. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Shift;<keycap
->Page Up</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Previous error</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul"> &Shift;<keycap>Page Up</keycap> </keycombo> </shortcut> <guimenu>Go</guimenu> <guimenuitem>Previous error</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Jumps to the previous entry that has an error. This is usually when double-quotes are not escaped or the original string ends with a "newline" (\n) character and the translated string does not (and vice versa). </action>
+        <action>Jumps to the previous entry that has an error. This is usually when double-quotes are not escaped or the original string ends with a "newline" (\n) character and the translated string does not (and vice versa). </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Shift;<keycap
->Page Down</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Next error</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul"> &Shift;<keycap>Page Down</keycap> </keycombo> </shortcut> <guimenu>Go</guimenu> <guimenuitem>Next error</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Jumps to the next entry with an error. </action>
+        <action>Jumps to the next entry with an error. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Alt;<keycap
->Left Arrow</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Back</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul"> &Alt;<keycap>Left Arrow</keycap> </keycombo> </shortcut> <guimenu>Go</guimenu> <guimenuitem>Back</guimenuitem> </menuchoice>
     </term>
     <listitem>
-      <para
-><action
-> Jump to last visited entry</action
-> in PO file. </para>
+      <para><action> Jump to last visited entry</action> in PO file. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Alt;<keycap
->Right Arrow</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Forward</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul"> &Alt;<keycap>Right Arrow</keycap> </keycombo> </shortcut> <guimenu>Go</guimenu> <guimenuitem>Forward</guimenuitem> </menuchoice>
     </term>
     <listitem>
-      <para
-><action
-> Jump to previous visited entry</action
-> in PO file. </para>
+      <para><action> Jump to previous visited entry</action> in PO file. </para>
     </listitem>
   </varlistentry>
 </variablelist>
@@ -895,138 +443,70 @@
 
 
 <sect2>
-<title
->The Dictionaries Menu</title>
-<para
->Note that this menu is dynamic: it depends on the installed dictionaries plugins. By default are three of them. </para>
+<title>The Dictionaries Menu</title>
+<para>Note that this menu is dynamic: it depends on the installed dictionaries plugins. By default are three of them. </para>
 
 <variablelist>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Dictionaries</guimenu
-> <guimenuitem
->Search Text</guimenuitem
-> <guimenuitem
->KDE Database Search Engine</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Dictionaries</guimenu> <guimenuitem>Search Text</guimenuitem> <guimenuitem>KDE Database Search Engine</guimenuitem> </menuchoice>
     </term>
     <listitem>
-      <para
-><action
-> Start searching translation for current original English message</action
-> using &kde; Database Search Engine. </para>
+      <para><action> Start searching translation for current original English message</action> using &kde; Database Search Engine. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Dictionaries</guimenu
-> <guimenuitem
->Search Text</guimenuitem
-> <guimenuitem
->PO Auxiliary</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Dictionaries</guimenu> <guimenuitem>Search Text</guimenuitem> <guimenuitem>PO Auxiliary</guimenuitem> </menuchoice>
     </term>
     <listitem>
-      <para
-><action
-> Start searching translation for current original English message</action
-> in <acronym
->PO</acronym
-> file defined by user. </para>
+      <para><action> Start searching translation for current original English message</action> in <acronym>PO</acronym> file defined by user. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Dictionaries</guimenu
-> <guimenuitem
->Search Text</guimenuitem
-> <guimenuitem
->PO Compendium</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Dictionaries</guimenu> <guimenuitem>Search Text</guimenuitem> <guimenuitem>PO Compendium</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Start searching translation for current original English message in compendium file (made by merging all translated messages for one language). </action>
+        <action>Start searching translation for current original English message in compendium file (made by merging all translated messages for one language). </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Dictionaries</guimenu
-> <guimenuitem
->Search Selected Text</guimenuitem
-> <guimenuitem
->KDE Database Search Engine</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Dictionaries</guimenu> <guimenuitem>Search Selected Text</guimenuitem> <guimenuitem>KDE Database Search Engine</guimenuitem> </menuchoice>
     </term>
     <listitem>
-      <para
-><action
-> Start searching selected text</action
-> using &kde; Database Search Engine. </para>
+      <para><action> Start searching selected text</action> using &kde; Database Search Engine. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Dictionaries</guimenu
-> <guimenuitem
->Search Selected Text</guimenuitem
-> <guimenuitem
->PO Auxiliary</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Dictionaries</guimenu> <guimenuitem>Search Selected Text</guimenuitem> <guimenuitem>PO Auxiliary</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Start searching selected text using file defined by user. </action>
+        <action>Start searching selected text using file defined by user. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Dictionaries</guimenu
-> <guimenuitem
->Search Selected Text</guimenuitem
-> <guimenuitem
->PO Compendium</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Dictionaries</guimenu> <guimenuitem>Search Selected Text</guimenuitem> <guimenuitem>PO Compendium</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Start searching selected text using compendium file with all language translated messages. </action>
+        <action>Start searching selected text using compendium file with all language translated messages. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Dictionaries</guimenu
-> <guimenuitem
->Edit Dictionary</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Dictionaries</guimenu> <guimenuitem>Edit Dictionary</guimenuitem> </menuchoice>
     </term>
     <listitem>
-      <para
-><action
-> Allow you to edit content of current dictionary. Useful if you found errors in dictionary and do not want errors to be reported when searching and replacing strings. </action
-> <emphasis
->(Not implemented yet)</emphasis
-> </para>
+      <para><action> Allow you to edit content of current dictionary. Useful if you found errors in dictionary and do not want errors to be reported when searching and replacing strings. </action> <emphasis>(Not implemented yet)</emphasis> </para>
     </listitem>
   </varlistentry>
 </variablelist>
@@ -1035,725 +515,352 @@
 
 
 <sect2>
-<title
->The Tools Menu</title>
+<title>The Tools Menu</title>
 <variablelist>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Spelling</guimenuitem
-> <guimenuitem
->Spell check...</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Tools</guimenu> <guimenuitem>Spelling</guimenuitem> <guimenuitem>Spell check...</guimenuitem> </menuchoice>
     </term>
     <listitem>
-      <para
-><action
-> Display the spell-check configuration dialogue.</action
-> After you have chosen the desired options, hit <guibutton
->OK</guibutton
-> and the normal spell-checking dialogue will appear. </para>
+      <para><action> Display the spell-check configuration dialogue.</action> After you have chosen the desired options, hit <guibutton>OK</guibutton> and the normal spell-checking dialogue will appear. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Spelling</guimenuitem
-> <guimenuitem
->Check All...</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Tools</guimenu> <guimenuitem>Spelling</guimenuitem> <guimenuitem>Check All...</guimenuitem> </menuchoice>
     </term>
     <listitem>
-      <para
-><action
-> Start spell-checking all words</action
-> for an opened <acronym
->PO</acronym
-> file. </para>
+      <para><action> Start spell-checking all words</action> for an opened <acronym>PO</acronym> file. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Spelling</guimenuitem
-> <guimenuitem
->Check From Cursor Position...</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Tools</guimenu> <guimenuitem>Spelling</guimenuitem> <guimenuitem>Check From Cursor Position...</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Start spell-checking from current cursor position. </action>
+        <action>Start spell-checking from current cursor position. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Spelling</guimenuitem
-> <guimenuitem
->Check Current...</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Tools</guimenu> <guimenuitem>Spelling</guimenuitem> <guimenuitem>Check Current...</guimenuitem> </menuchoice>
     </term>
     <listitem>
-      <para
-><action
-> Spell-check only current</action
-> entry from <acronym
->PO</acronym
-> file. </para>
+      <para><action> Spell-check only current</action> entry from <acronym>PO</acronym> file. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Spelling</guimenuitem
-> <guimenuitem
->Check Marked Text...</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Tools</guimenu> <guimenuitem>Spelling</guimenuitem> <guimenuitem>Check Marked Text...</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Spell-check only selected text in MsgStr editbox. </action>
+        <action>Spell-check only selected text in MsgStr editbox. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Ctrl;<keycap
->T</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Tools</guimenu
-> <guimenuitem
->Validation</guimenuitem
-> <guimenuitem
->Check Syntax</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul"> &Ctrl;<keycap>T</keycap> </keycombo> </shortcut> <guimenu>Tools</guimenu> <guimenuitem>Validation</guimenuitem> <guimenuitem>Check Syntax</guimenuitem> </menuchoice>
     </term>
     <listitem>
-      <para
-><action
-> Check syntax</action
-> for current <acronym
->PO</acronym
-> file. Errors may appear from <acronym
->CVS</acronym
-> merging or users' mistakes when the translating process is performed by hand. </para>
+      <para><action> Check syntax</action> for current <acronym>PO</acronym> file. Errors may appear from <acronym>CVS</acronym> merging or users' mistakes when the translating process is performed by hand. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Ctrl;<keycap
->D</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Tools</guimenu
-> <guimenuitem
->Validation</guimenuitem
-> <guimenuitem
->Check Arguments</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul"> &Ctrl;<keycap>D</keycap> </keycombo> </shortcut> <guimenu>Tools</guimenu> <guimenuitem>Validation</guimenuitem> <guimenuitem>Check Arguments</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->When this option is selected, C-format strings in the original message and the translation are checked to ensure the number of format sequences and the order are consistent. </action>
+        <action>When this option is selected, C-format strings in the original message and the translation are checked to ensure the number of format sequences and the order are consistent. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Ctrl;<keycap
->H</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Tools</guimenu
-> <guimenuitem
->Validation</guimenuitem
-> <guimenuitem
->Check Accelerators</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul"> &Ctrl;<keycap>H</keycap> </keycombo> </shortcut> <guimenu>Tools</guimenu> <guimenuitem>Validation</guimenuitem> <guimenuitem>Check Accelerators</guimenuitem> </menuchoice>
     </term>
     <listitem>
-      <para
->When this option is selected, &kbabel; <action
->checks if the number of accelerator characters is identical in both the original and the translated string.</action
-> Note that accelerator marker is &amp; in &kde; (but not in every programming toolkit). See the <link linkend="preferences-miscellaneous"
->Miscellaneous</link
-> section below to find out how to change a keyboard accelerator. </para>
+      <para>When this option is selected, &kbabel; <action>checks if the number of accelerator characters is identical in both the original and the translated string.</action> Note that accelerator marker is &amp; in &kde; (but not in every programming toolkit). See the <link linkend="preferences-miscellaneous">Miscellaneous</link> section below to find out how to change a keyboard accelerator. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Ctrl;<keycap
->K</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Tools</guimenu
-> <guimenuitem
->Validation</guimenuitem
-> <guimenuitem
->Look for Translated Context Info</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul"> &Ctrl;<keycap>K</keycap> </keycombo> </shortcut> <guimenu>Tools</guimenu> <guimenuitem>Validation</guimenuitem> <guimenuitem>Look for Translated Context Info</guimenuitem> </menuchoice>
     </term>
     <listitem>
-      <para
->Some original messages are marked with context information to mark them as being unique even if they represent same word. This is because many simple words, such as <quote
->Save</quote
->, are translated into many languages. Context information is marked with <literal
->_:</literal
->. Many unexperienced translators translate the context information and fill their <quote
->PO</quote
-> files with garbage. <action
->Check this box to make sure you will be warned about these errors in a file.</action
-> </para>
+      <para>Some original messages are marked with context information to mark them as being unique even if they represent same word. This is because many simple words, such as <quote>Save</quote>, are translated into many languages. Context information is marked with <literal>_:</literal>. Many unexperienced translators translate the context information and fill their <quote>PO</quote> files with garbage. <action>Check this box to make sure you will be warned about these errors in a file.</action> </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Validation</guimenuitem
-> <guimenuitem
->Check Plural Forms (KDE only)</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Tools</guimenu> <guimenuitem>Validation</guimenuitem> <guimenuitem>Check Plural Forms (KDE only)</guimenuitem> </menuchoice>
     </term>
     <listitem>
-      <para
->Check if the <acronym
->PO</acronym
-> file <action
->contains the correct number of translations</action
-> for each &kde;-specific plural form message. </para>
+      <para>Check if the <acronym>PO</acronym> file <action>contains the correct number of translations</action> for each &kde;-specific plural form message. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Ctrl;<keycap
->J</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Tools</guimenu
-> <guimenuitem
->Validation</guimenuitem
-> <guimenuitem
->Check Equations</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul"> &Ctrl;<keycap>J</keycap> </keycombo> </shortcut> <guimenu>Tools</guimenu> <guimenuitem>Validation</guimenuitem> <guimenuitem>Check Equations</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Check whether the left side of the translated string is the same as the left side of the original string. Sides are delimited by an equals-sign character. </action>
+        <action>Check whether the left side of the translated string is the same as the left side of the original string. Sides are delimited by an equals-sign character. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo
-> <keycap
->F5</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Tools</guimenu
-> <guimenuitem
->Diff</guimenuitem
-> <guimenuitem
->Show Diff</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo> <keycap>F5</keycap> </keycombo> </shortcut> <guimenu>Tools</guimenu> <guimenuitem>Diff</guimenuitem> <guimenuitem>Show Diff</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Show difference found to the original translated message. </action>
+        <action>Show difference found to the original translated message. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo
-> <keycap
->F6</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Tools</guimenu
-> <guimenuitem
->Diff</guimenuitem
-> <guimenuitem
->Show Original Text</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo> <keycap>F6</keycap> </keycombo> </shortcut> <guimenu>Tools</guimenu> <guimenuitem>Diff</guimenuitem> <guimenuitem>Show Original Text</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Hide difference markings and show msgid only. </action>
+        <action>Hide difference markings and show msgid only. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Diff</guimenuitem
-> <guimenuitem
->Open File for Diff</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Tools</guimenu> <guimenuitem>Diff</guimenuitem> <guimenuitem>Open File for Diff</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Open file to be used for difference lookup. </action>
+        <action>Open file to be used for difference lookup. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Diff</guimenuitem
-> <guimenuitem
->Diffmode</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Tools</guimenu> <guimenuitem>Diff</guimenuitem> <guimenuitem>Diffmode</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Toggle difference mode. </action>
+        <action>Toggle difference mode. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Rough Translation...</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Tools</guimenu> <guimenuitem>Rough Translation...</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Invoke rough-translation dialogue for automated translation. </action>
+        <action>Invoke rough-translation dialogue for automated translation. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Catalogue Manager...</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Tools</guimenu> <guimenuitem>Catalogue Manager...</guimenuitem> </menuchoice>
     </term>
     <listitem>
-      <para
->Open &catalogmanager;. Read <link linkend="using-catalogmanager"
->&catalogmanager;</link
-> section for more details. </para>
+      <para>Open &catalogmanager;. Read <link linkend="using-catalogmanager">&catalogmanager;</link> section for more details. </para>
     </listitem>
   </varlistentry>
 </variablelist>
 </sect2>
 
 <sect2>
-<title
->The Settings Menu</title>
+<title>The Settings 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
->When checked, the standard toolbar is displayed. </action>
+        <action>When checked, the standard toolbar is displayed. </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
->When checked, the bottom statusbar is displayed. </action>
+        <action>When checked, the bottom statusbar is displayed. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show Navigation Bar</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Navigation Bar</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->When checked, the navigation bar is displayed. </action>
+        <action>When checked, the navigation bar is displayed. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show Comments</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Comments</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->When checked, the upper-right part of main window, which contains current entry's comments, will be displayed. </action>
+        <action>When checked, the upper-right part of main window, which contains current entry's comments, will be displayed. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show Tools</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Tools</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->When checked, the bottom-right part of main window, which contain search results through the dictionary, will be displayed. </action>
+        <action>When checked, the bottom-right part of main window, which contain search results through the dictionary, will be displayed. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Key Bindings...</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Key Bindings...</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Opens a configure dialogue for binding keys to actions. This will let you to customise the default key bindings to suite your needs. </action>
+        <action>Opens a configure dialogue for binding keys to actions. This will let you to customise the default key bindings to suite your needs. </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
->Standard toolbar-configuration dialogue will open. You can choose which actions will go in which toolbars and what toolbar to customise. </action>
+        <action>Standard toolbar-configuration dialogue will open. You can choose which actions will go in which toolbars and what toolbar to customise. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Kbabel...</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Kbabel...</guimenuitem> </menuchoice>
     </term>
     <listitem>
-      <para
->All &kbabel;-specific settings go here. Please read the <link linkend="preferences-kbabel"
->Preferences</link
-> section for specific topics. </para>
+      <para>All &kbabel;-specific settings go here. Please read the <link linkend="preferences-kbabel">Preferences</link> section for specific topics. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Dictionary</guimenuitem
-> <guimenuitem
->KDE Database Search Engine</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Dictionary</guimenuitem> <guimenuitem>KDE Database Search Engine</guimenuitem> </menuchoice>
     </term>
     <listitem>
-      <para
->Open dialogue for &kde; Database Search Engine configuration. </para>
+      <para>Open dialogue for &kde; Database Search Engine configuration. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Dictionary</guimenuitem
-> <guimenuitem
->PO Auxiliary</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Dictionary</guimenuitem> <guimenuitem>PO Auxiliary</guimenuitem> </menuchoice>
     </term>
     <listitem>
-      <para
-><action
-> Open dialogue</action
-> for <acronym
->PO</acronym
-> auxiliary file configuration. </para>
+      <para><action> Open dialogue</action> for <acronym>PO</acronym> auxiliary file configuration. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Dictionary</guimenuitem
-> <guimenuitem
->PO Compendium</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Dictionary</guimenuitem> <guimenuitem>PO Compendium</guimenuitem> </menuchoice>
     </term>
     <listitem>
-      <para
-><action
-> Open dialogue</action
-> for <acronym
->PO</acronym
-> compendium file configuration. </para>
+      <para><action> Open dialogue</action> for <acronym>PO</acronym> compendium file configuration. </para>
     </listitem>
   </varlistentry>
 </variablelist>
 </sect2>
 
 <sect2>
-<title
->The Help Menu</title>
+<title>The Help Menu</title>
 
 <variablelist>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycap
->F1</keycap
-> </shortcut
-> <guimenu
->Help</guimenu
-> <guimenuitem
->Contents</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycap>F1</keycap> </shortcut> <guimenu>Help</guimenu> <guimenuitem>Contents</guimenuitem> </menuchoice>
     </term>
     <listitem>
-      <para
->Open the &kbabel; handbook. It is what you are reading now. </para>
+      <para>Open the &kbabel; handbook. It is what you are reading now. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo
-> &Shift;<keycap
->F1</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Help</guimenu
-> <guimenuitem
->What's This?</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo> &Shift;<keycap>F1</keycap> </keycombo> </shortcut> <guimenu>Help</guimenu> <guimenuitem>What's This?</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Cursor change to arrow with question mark and you can click with it on various elements on main window. A quick help window will open. </action>
+        <action>Cursor change to arrow with question mark and you can click with it on various elements on main window. A quick help window will open. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Help</guimenu
-> <guimenuitem
->Gettext Info</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Help</guimenu> <guimenuitem>Gettext Info</guimenuitem> </menuchoice>
     </term>
     <listitem>
-      <para
-><action
-> Open the gettext manual page</action
-> in the &kde; Help Centre. This package of tools helps the in process of handling <acronym
->POT</acronym
-> and <acronym
->PO</acronym
-> files. </para>
+      <para><action> Open the gettext manual page</action> in the &kde; Help Centre. This package of tools helps the in process of handling <acronym>POT</acronym> and <acronym>PO</acronym> files. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Help</guimenu
-> <guimenuitem
->Report Bug...</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Help</guimenu> <guimenuitem>Report Bug...</guimenuitem> </menuchoice>
     </term>
     <listitem>
-      <para
-><action
-> This will open a standard error-reporting dialogue </action
-> for &kde; It is useful if you experience abnormal behaviour of &kbabel;. &kbabel;'s developer will be glad to receive any comments, wishes, and bug reports. </para>
+      <para><action> This will open a standard error-reporting dialogue </action> for &kde; It is useful if you experience abnormal behaviour of &kbabel;. &kbabel;'s developer will be glad to receive any comments, wishes, and bug reports. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Help</guimenu
-> <guimenuitem
->About KBabel...</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Help</guimenu> <guimenuitem>About KBabel...</guimenuitem> </menuchoice>
     </term>
     <listitem>
-      <para
->Open a message box which inform you about &kbabel;'s version, developer name, and e-mail address. </para>
+      <para>Open a message box which inform you about &kbabel;'s version, developer name, and e-mail address. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Help</guimenu
-> <guimenuitem
->About KDE...</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Help</guimenu> <guimenuitem>About KDE...</guimenuitem> </menuchoice>
     </term>
     <listitem>
-      <para
->Open a message box which informs you about the &kde; project, contact information and how you can report bugs and wishes. </para>
+      <para>Open a message box which informs you about the &kde; project, contact information and how you can report bugs and wishes. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Help</guimenu
-> <guimenuitem
->About Dictionary</guimenuitem
-> <guimenuitem
->KDE Database Search Engine</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Help</guimenu> <guimenuitem>About Dictionary</guimenuitem> <guimenuitem>KDE Database Search Engine</guimenuitem> </menuchoice>
     </term>
     <listitem>
-      <para
->Display a message box with information about the people who made the &kde; Database Search Engine. </para>
+      <para>Display a message box with information about the people who made the &kde; Database Search Engine. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Help</guimenu
-> <guimenuitem
->About Dictionary</guimenuitem
-> <guimenuitem
->PO Auxiliary</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Help</guimenu> <guimenuitem>About Dictionary</guimenuitem> <guimenuitem>PO Auxiliary</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Display a message box with information about the people who made searching in auxiliary file possible. </action>
+        <action>Display a message box with information about the people who made searching in auxiliary file possible. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Help</guimenu
-> <guimenuitem
->About Dictionary</guimenuitem
-> <guimenuitem
->PO Compendium</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Help</guimenu> <guimenuitem>About Dictionary</guimenuitem> <guimenuitem>PO Compendium</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Display a message box with information about people who made searching in compendium file possible. </action>
+        <action>Display a message box with information about people who made searching in compendium file possible. </action>
       </para>
     </listitem>
   </varlistentry>
@@ -1762,12 +869,10 @@
 </sect1>
 
 <sect1 id="kbabel-toolbars">
-<title
->The &kbabel; toolbars</title>
+<title>The &kbabel; toolbars</title>
 
 <sect2 id="standard-toolbar">
-<title
->Standard Toolbar</title>
+<title>Standard Toolbar</title>
 <variablelist>
   <varlistentry>
     <term>
@@ -1775,13 +880,9 @@
 <imageobject>
 <imagedata fileref="fileopen.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> Open </term>
+</inlinemediaobject> Open </term>
     <listitem>
-    <para
->Load <acronym
->PO</acronym
-> file in &kbabel; for editing.</para>
+    <para>Load <acronym>PO</acronym> file in &kbabel; for editing.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
@@ -1790,13 +891,9 @@
 <imageobject>
 <imagedata fileref="filesave.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> Save </term>
+</inlinemediaobject> Save </term>
     <listitem>
-    <para
->Save current <acronym
->PO</acronym
-> file if it is modified.</para>
+    <para>Save current <acronym>PO</acronym> file if it is modified.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
@@ -1805,11 +902,9 @@
 <imageobject>
 <imagedata fileref="undo.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> Undo </term>
+</inlinemediaobject> Undo </term>
     <listitem>
-    <para
->Undo last operation.</para>
+    <para>Undo last operation.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
@@ -1818,11 +913,9 @@
 <imageobject>
 <imagedata fileref="redo.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> Redo </term>
+</inlinemediaobject> Redo </term>
     <listitem>
-    <para
->Redo last operation.</para>
+    <para>Redo last operation.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
@@ -1831,11 +924,9 @@
 <imageobject>
 <imagedata fileref="editcut.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> Cut </term>
+</inlinemediaobject> Cut </term>
     <listitem>
-    <para
->Cut selected text and move it to the clipboard.</para>
+    <para>Cut selected text and move it to the clipboard.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
@@ -1844,11 +935,9 @@
 <imageobject>
 <imagedata fileref="editcopy.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> Copy </term>
+</inlinemediaobject> Copy </term>
     <listitem>
-    <para
->Copy selected text to the clipboard.</para>
+    <para>Copy selected text to the clipboard.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
@@ -1857,11 +946,9 @@
 <imageobject>
 <imagedata fileref="editpaste.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> Paste </term>
+</inlinemediaobject> Paste </term>
     <listitem>
-    <para
->Paste text from clipboard at the current cursor position.</para>
+    <para>Paste text from clipboard at the current cursor position.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
@@ -1870,11 +957,9 @@
 <imageobject>
 <imagedata fileref="find.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> Find </term>
+</inlinemediaobject> Find </term>
     <listitem>
-    <para
->Find specified string in current PO-file.</para>
+    <para>Find specified string in current PO-file.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
@@ -1883,11 +968,9 @@
 <imageobject>
 <imagedata fileref="previous.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> Previous </term>
+</inlinemediaobject> Previous </term>
     <listitem>
-    <para
->Skip to previous entry in PO-file.</para>
+    <para>Skip to previous entry in PO-file.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
@@ -1896,13 +979,9 @@
 <imageobject>
 <imagedata fileref="next.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> Next </term>
+</inlinemediaobject> Next </term>
     <listitem>
-    <para
->Skip to next entry in <acronym
->PO</acronym
-> file.</para>
+    <para>Skip to next entry in <acronym>PO</acronym> file.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
@@ -1911,15 +990,9 @@
 <imageobject>
 <imagedata fileref="msgid2msgstr.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> Copy <acronym
->msgid</acronym
-> to <acronym
->msgstr</acronym
-> </term>
+</inlinemediaobject> Copy <acronym>msgid</acronym> to <acronym>msgstr</acronym> </term>
     <listitem>
-    <para
->Copy original string to translated string edit box.</para>
+    <para>Copy original string to translated string edit box.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
@@ -1928,15 +1001,9 @@
 <imageobject>
 <imagedata fileref="transsearch.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> Search Translations </term>
+</inlinemediaobject> Search Translations </term>
     <listitem>
-    <para
->Drop-down toolbar for searching selected text using: &kde; Database Search Engine, <acronym
->PO</acronym
-> auxiliary file, <acronym
->PO</acronym
-> compendium file and other dictionary plugins if available.</para>
+    <para>Drop-down toolbar for searching selected text using: &kde; Database Search Engine, <acronym>PO</acronym> auxiliary file, <acronym>PO</acronym> compendium file and other dictionary plugins if available.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
@@ -1945,11 +1012,9 @@
 <imageobject>
 <imagedata fileref="stop.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> Stop </term>
+</inlinemediaobject> Stop </term>
     <listitem>
-    <para
->Stop current search-in-progress.</para>
+    <para>Stop current search-in-progress.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
@@ -1958,19 +1023,16 @@
 <imageobject>
 <imagedata fileref="catalogmanager.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> Catalogue Manager </term>
+</inlinemediaobject> Catalogue Manager </term>
     <listitem>
-    <para
->Open Catalogue Manager window.</para>
+    <para>Open Catalogue Manager window.</para>
     </listitem>
   </varlistentry>
 </variablelist>
 </sect2>
 
 <sect2 id="navigation-toolbar">
-<title
->Navigation Toolbar</title>
+<title>Navigation Toolbar</title>
 <variablelist>
   <varlistentry>
     <term>
@@ -1978,13 +1040,9 @@
 <imageobject>
 <imagedata fileref="previous.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> Previous </term>
+</inlinemediaobject> Previous </term>
     <listitem>
-    <para
->Skip to previous entry in <acronym
->PO</acronym
-> file.</para>
+    <para>Skip to previous entry in <acronym>PO</acronym> file.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
@@ -1993,13 +1051,9 @@
 <imageobject>
 <imagedata fileref="next.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> Next </term>
+</inlinemediaobject> Next </term>
     <listitem>
-    <para
->Skip to next entry in <acronym
->PO</acronym
-> file.</para>
+    <para>Skip to next entry in <acronym>PO</acronym> file.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
@@ -2008,13 +1062,9 @@
 <imageobject>
 <imagedata fileref="top.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> First Entry </term>
+</inlinemediaobject> First Entry </term>
     <listitem>
-    <para
->Jump to first entry in <acronym
->PO</acronym
-> file.</para>
+    <para>Jump to first entry in <acronym>PO</acronym> file.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
@@ -2023,13 +1073,9 @@
 <imageobject>
 <imagedata fileref="bottom.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> Last Entry </term>
+</inlinemediaobject> Last Entry </term>
     <listitem>
-    <para
->Jump to last entry in <acronym
->PO</acronym
-> file.</para>
+    <para>Jump to last entry in <acronym>PO</acronym> file.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
@@ -2038,13 +1084,9 @@
 <imageobject>
 <imagedata fileref="prevfuzzyuntrans.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> Previous fuzzy or untranslated </term>
+</inlinemediaobject> Previous fuzzy or untranslated </term>
     <listitem>
-    <para
->Jump to previous fuzzy or untranslated entry in <acronym
->PO</acronym
-> file.</para>
+    <para>Jump to previous fuzzy or untranslated entry in <acronym>PO</acronym> file.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
@@ -2053,13 +1095,9 @@
 <imageobject>
 <imagedata fileref="nextfuzzyuntrans.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> Next fuzzy or untranslated </term>
+</inlinemediaobject> Next fuzzy or untranslated </term>
     <listitem>
-    <para
->Jump to next fuzzy or untranslated entry in <acronym
->PO</acronym
-> file.</para>
+    <para>Jump to next fuzzy or untranslated entry in <acronym>PO</acronym> file.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
@@ -2068,13 +1106,9 @@
 <imageobject>
 <imagedata fileref="prevfuzzy.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> Previous fuzzy </term>
+</inlinemediaobject> Previous fuzzy </term>
     <listitem>
-    <para
->Jump to previous fuzzy entry in <acronym
->PO</acronym
-> file.</para>
+    <para>Jump to previous fuzzy entry in <acronym>PO</acronym> file.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
@@ -2083,13 +1117,9 @@
 <imageobject>
 <imagedata fileref="nextfuzzy.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> Next fuzzy </term>
+</inlinemediaobject> Next fuzzy </term>
     <listitem>
-    <para
->Jump to next fuzzy entry in <acronym
->PO</acronym
-> file.</para>
+    <para>Jump to next fuzzy entry in <acronym>PO</acronym> file.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
@@ -2098,13 +1128,9 @@
 <imageobject>
 <imagedata fileref="prevuntranslated.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> Previous untranslated </term>
+</inlinemediaobject> Previous untranslated </term>
     <listitem>
-    <para
->Jump to previous untranslated entry in <acronym
->PO</acronym
-> file.</para>
+    <para>Jump to previous untranslated entry in <acronym>PO</acronym> file.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
@@ -2113,13 +1139,9 @@
 <imageobject>
 <imagedata fileref="nextuntranslated.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> Next untranslated </term>
+</inlinemediaobject> Next untranslated </term>
     <listitem>
-    <para
->Jump to next untranslated entry in <acronym
->PO</acronym
-> file.</para>
+    <para>Jump to next untranslated entry in <acronym>PO</acronym> file.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
@@ -2128,13 +1150,9 @@
 <imageobject>
 <imagedata fileref="preverror.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> Previous error </term>
+</inlinemediaobject> Previous error </term>
     <listitem>
-    <para
->Jump to previous error in <acronym
->PO</acronym
-> file.</para>
+    <para>Jump to previous error in <acronym>PO</acronym> file.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
@@ -2143,13 +1161,9 @@
 <imageobject>
 <imagedata fileref="nexterror.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> Next error </term>
+</inlinemediaobject> Next error </term>
     <listitem>
-    <para
->Jump to next error in <acronym
->PO</acronym
-> file.</para>
+    <para>Jump to next error in <acronym>PO</acronym> file.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
@@ -2158,13 +1172,9 @@
 <imageobject>
 <imagedata fileref="back.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> Back </term>
+</inlinemediaobject> Back </term>
     <listitem>
-    <para
->Jump to last visited entry in <acronym
->PO</acronym
-> file.</para>
+    <para>Jump to last visited entry in <acronym>PO</acronym> file.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
@@ -2173,80 +1183,57 @@
 <imageobject>
 <imagedata fileref="forward.png" format="PNG"/>
 </imageobject>
-</inlinemediaobject
-> Forward </term>
+</inlinemediaobject> Forward </term>
     <listitem>
-    <para
->Jump to previous visited entry in <acronym
->PO</acronym
-> file.</para>
+    <para>Jump to previous visited entry in <acronym>PO</acronym> file.</para>
     </listitem>
   </varlistentry>
 </variablelist>
 </sect2>
 
 <sect2 id="status-bar">
-<title
->Status Bar</title>
+<title>Status Bar</title>
 <variablelist>
   <varlistentry>
-    <term
->Current</term>
+    <term>Current</term>
     <listitem>
-    <para
->Current message in edited <acronym
->PO</acronym
-> file.</para>
+    <para>Current message in edited <acronym>PO</acronym> file.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term
->Total</term>
+    <term>Total</term>
     <listitem>
-    <para
->Total number of messages in <acronym
->PO</acronym
-> file.</para>
+    <para>Total number of messages in <acronym>PO</acronym> file.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term
->Fuzzy</term>
+    <term>Fuzzy</term>
     <listitem>
-    <para
->Number of messages marked as fuzzy. They should be revised and translated if needed.</para>
+    <para>Number of messages marked as fuzzy. They should be revised and translated if needed.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term
->Untranslated</term>
+    <term>Untranslated</term>
     <listitem>
-    <para
->Number of yet untranslated messages.</para>
+    <para>Number of yet untranslated messages.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term
->Editor status</term>
+    <term>Editor status</term>
     <listitem>
-    <para
->INS - insert, and OVR - overwrite. Same meaning like in every ordinary text editor. </para>
+    <para>INS - insert, and OVR - overwrite. Same meaning like in every ordinary text editor. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term
->PO-file status</term>
+    <term>PO-file status</term>
     <listitem>
-    <para
->RO - read-only file, RW - read-write access on file. When a file is read-only you cannot modify entries in editor. </para>
+    <para>RO - read-only file, RW - read-write access on file. When a file is read-only you cannot modify entries in editor. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term
->Progress bar</term>
+    <term>Progress bar</term>
     <listitem>
-    <para
->Usually, this bar is hidden; it is displayed only when saving is being done, or if you are searching for messages in a PO-file, compendium or elsewhere. </para>
+    <para>Usually, this bar is hidden; it is displayed only when saving is being done, or if you are searching for messages in a PO-file, compendium or elsewhere. </para>
     </listitem>
   </varlistentry>
 </variablelist>
@@ -2255,32 +1242,18 @@
 </sect1>
 
 <sect1 id="catalogmanager-menu">
-<title
->The &catalogmanager; menu</title>
+<title>The &catalogmanager; menu</title>
 
 <sect2>
-<title
->The File Menu</title>
+<title>The File Menu</title>
 <variablelist>
   <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 &catalogmanager;</action>
+        <action>Quits &catalogmanager;</action>
       </para>
     </listitem>
   </varlistentry>
@@ -2288,142 +1261,75 @@
 </sect2>
 
 <sect2>
-<title
->The Edit Menu</title>
+<title>The Edit Menu</title>
 <variablelist>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Ctrl;<keycap
->F</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Find in Files...</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul"> &Ctrl;<keycap>F</keycap> </keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Find in Files...</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Open Find dialogue for searching for strings in a set of PO files. </action>
+        <action>Open Find dialogue for searching for strings in a set of PO files. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Ctrl;<keycap
->R</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Replace in Files...</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul"> &Ctrl;<keycap>R</keycap> </keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Replace in Files...</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Open Replace dialogue for searching for and replacing strings in a set of PO files. </action>
+        <action>Open Replace dialogue for searching for and replacing strings in a set of PO files. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo
-> <keycap
->Escape</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Stop Searching</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo> <keycap>Escape</keycap> </keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Stop Searching</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Stop currently running find/replace operation. </action>
+        <action>Stop currently running find/replace operation. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Ctrl;<keycap
->M</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Toggle Marking</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul"> &Ctrl;<keycap>M</keycap> </keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Toggle Marking</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Toggle mark for the selected file. </action>
+        <action>Toggle mark for the selected file. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Remove Marking</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Remove Marking</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Removes mark for the selected file or folder. </action>
+        <action>Removes mark for the selected file or folder. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Toggle All Markings</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Toggle All Markings</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Toggles marks for the selected file or folder (recursively). </action>
+        <action>Toggles marks for the selected file or folder (recursively). </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Remove All Markings</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Remove All Markings</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Remove marks for the selected file or folder (recursively). </action>
+        <action>Remove marks for the selected file or folder (recursively). </action>
       </para>
     </listitem>
   </varlistentry>
@@ -2431,50 +1337,25 @@
 </sect2>
 
 <sect2>
-<title
->The Tools Menu</title>
+<title>The Tools Menu</title>
 <variablelist>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Ctrl;<keycap
->S</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Tools</guimenu
-> <guimenuitem
->Statistics</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul"> &Ctrl;<keycap>S</keycap> </keycombo> </shortcut> <guimenu>Tools</guimenu> <guimenuitem>Statistics</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Show statistics about number of translated/untranslated/fuzzy messages for the selected file or subtree. </action>
+        <action>Show statistics about number of translated/untranslated/fuzzy messages for the selected file or subtree. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><shortcut
-> <keycombo action="simul"
-> &Ctrl;<keycap
->Y</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Tools</guimenu
-> <guimenuitem
->Check Syntax</guimenuitem
-> </menuchoice>
+      <menuchoice><shortcut> <keycombo action="simul"> &Ctrl;<keycap>Y</keycap> </keycombo> </shortcut> <guimenu>Tools</guimenu> <guimenuitem>Check Syntax</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Check syntax for the selected file or subtree using msgfmt. </action>
+        <action>Check syntax for the selected file or subtree using msgfmt. </action>
       </para>
     </listitem>
   </varlistentry>
@@ -2482,101 +1363,64 @@
 </sect2>
 
 <sect2>
-<title
->The Settings Menu</title>
+<title>The Settings 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
->When checked, standard toolbar is displayed. </action>
+        <action>When checked, standard toolbar is displayed. </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
->When checked, bottom statusbar is displayed. </action>
+        <action>When checked, bottom statusbar is displayed. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Key Bindings...</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Key Bindings...</guimenuitem> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->Opens a configure dialogue for binding keys to actions. This will let you to customise the default key bindings to suite your needs. </action>
+        <action>Opens a configure dialogue for binding keys to actions. This will let you to customise the default key bindings to suite your needs. </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
->Standard toolbar-configuration dialogue will open. You can choose which actions will go in which toolbars and what toolbar to customise. </action>
+        <action>Standard toolbar-configuration dialogue will open. You can choose which actions will go in which toolbars and what toolbar to customise. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure KBabel - Catalogue Manager...</guimenuitem
-> </menuchoice>
+      <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure KBabel - Catalogue Manager...</guimenuitem> </menuchoice>
     </term>
     <listitem>
-      <para
-><action
-> All &catalogmanager; specific settings go here. </action
-> Please read <link linkend="preferences-catalogmanager"
->Preferences</link
-> section for specific topics. </para>
+      <para><action> All &catalogmanager; specific settings go here. </action> Please read <link linkend="preferences-catalogmanager">Preferences</link> section for specific topics. </para>
     </listitem>
   </varlistentry>
 </variablelist>
 </sect2>
 
 <sect2>
-<title
->The Help Menu</title>
+<title>The Help Menu</title>
 &help.menu.documentation; </sect2>
 
-</sect1
-></chapter>
+</sect1></chapter>
 <!--
 Local Variables:
 mode: xml
diff --git a/tde-i18n-en_GB/docs/tdesdk/kbabel/preferences.docbook b/tde-i18n-en_GB/docs/tdesdk/kbabel/preferences.docbook
index 1e92e0dc2b1..8bf0f0594da 100644
--- a/tde-i18n-en_GB/docs/tdesdk/kbabel/preferences.docbook
+++ b/tde-i18n-en_GB/docs/tdesdk/kbabel/preferences.docbook
@@ -1,6 +1,5 @@
 <!-- <?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"> -->
 <!-- Uncomment the previous two lines to validate this document -->
 <!-- standalone.  Be sure to recomment them before attempting to -->
 <!-- process index.docbook -->
@@ -11,95 +10,35 @@
 <!-- Fill in this section if this document has a different author -->
 <authorgroup>
 <author>
-<personname
-><firstname
-></firstname
-><surname
-></surname
-></personname>
+<personname><firstname></firstname><surname></surname></personname>
 </author>
 </authorgroup>
 
-<othercredit role="translator"
-><firstname
->Alex</firstname
-><surname
->Walker</surname
-><affiliation
-><address
-><email
->alex@x3ja.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Alex</firstname><surname>Walker</surname><affiliation><address><email>alex@x3ja.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </chapterinfo>
 
-<title
->Preferences</title>
+<title>Preferences</title>
 <sect1 id="preferences-kbabel">
-<title
->&kbabel; preferences</title>
-
-<para
->To show the Preferences dialogue choose <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure KBabel...</guimenuitem
-></menuchoice
-> from &kbabel;'s menu. It uses a structured configuration dialog which makes it very easy to find an option without having to perform an extensive search for it.</para>
-
-<para
->The left side of the preferences dialogue lists the categories of customisable items and the right side shows the corresponding tab for the selected category. &kbabel; keeps changes if you move between categories, so when you're finally happy click the <guibutton
->OK</guibutton
-> button. At any time you can use quick help&mdash;just click on the question mark on the title bar and, after the cursor has changed to an arrow with a question mark, click on a button, label, or preference entry to find out more about it.</para>
+<title>&kbabel; preferences</title>
+
+<para>To show the Preferences dialogue choose <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure KBabel...</guimenuitem></menuchoice> from &kbabel;'s menu. It uses a structured configuration dialog which makes it very easy to find an option without having to perform an extensive search for it.</para>
+
+<para>The left side of the preferences dialogue lists the categories of customisable items and the right side shows the corresponding tab for the selected category. &kbabel; keeps changes if you move between categories, so when you're finally happy click the <guibutton>OK</guibutton> button. At any time you can use quick help&mdash;just click on the question mark on the title bar and, after the cursor has changed to an arrow with a question mark, click on a button, label, or preference entry to find out more about it.</para>
 
 <sect2 id="preferences-identity">
-<title
->Identity</title>
-
-<para
->This section allows you to set standard fields for every translated <acronym
->PO</acronym
-> file. These are your name, email address, full language name, email address for your translation team mailing list. There is also a timezone field to track your <quote
->last modified</quote
-> time for <acronym
->PO</acronym
-> files. You can specify it as character sequence like <acronym
->EEST</acronym
-> or offset from <acronym
->GMT</acronym
-> time like +0200 (&ie; for Romania). This information is used when updating file headers. You can find the options that control what fields in the header should be updated in the <link linkend="preferences-save"
->Save</link
-> section of the Preferences dialogue.</para>
-
-<warning
-><para
->Character sequences for timezones are not standardised. So you should not use the string set here in time specification for saving in <link linkend="preferences-save"
->Save</link
-> tab. You should use <literal
->%z</literal
-> instead.</para
-></warning>
+<title>Identity</title>
+
+<para>This section allows you to set standard fields for every translated <acronym>PO</acronym> file. These are your name, email address, full language name, email address for your translation team mailing list. There is also a timezone field to track your <quote>last modified</quote> time for <acronym>PO</acronym> files. You can specify it as character sequence like <acronym>EEST</acronym> or offset from <acronym>GMT</acronym> time like +0200 (&ie; for Romania). This information is used when updating file headers. You can find the options that control what fields in the header should be updated in the <link linkend="preferences-save">Save</link> section of the Preferences dialogue.</para>
+
+<warning><para>Character sequences for timezones are not standardised. So you should not use the string set here in time specification for saving in <link linkend="preferences-save">Save</link> tab. You should use <literal>%z</literal> instead.</para></warning>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Number of singular/plural forms</guilabel
-></term>
+<term><guilabel>Number of singular/plural forms</guilabel></term>
 <listitem>
-<para
->Use this for setting number of plural forms for your language. For example, it is 2 for German (one for the singular and one for the plural form).</para>
-
-<note
-><para
->This feature is currently implemented only for plural forms format used in &kde;. It does not work with gettext plural forms.</para
-></note
-> 
+<para>Use this for setting number of plural forms for your language. For example, it is 2 for German (one for the singular and one for the plural form).</para>
+
+<note><para>This feature is currently implemented only for plural forms format used in &kde;. It does not work with gettext plural forms.</para></note> 
 </listitem>
 </varlistentry>
 </variablelist>
@@ -107,148 +46,61 @@
 </sect2>
 
 <sect2 id="preferences-editor">
-<title
->Editor</title>
-<para
->The editor preferences category is divided in 3 subwindows: <guilabel
->General</guilabel
->, <guilabel
->Appearance</guilabel
->, <guilabel
->Spell Check</guilabel
-> and <guilabel
->Fonts</guilabel
->. All these settings customize how the editor behaves and looks. </para>
+<title>Editor</title>
+<para>The editor preferences category is divided in 3 subwindows: <guilabel>General</guilabel>, <guilabel>Appearance</guilabel>, <guilabel>Spell Check</guilabel> and <guilabel>Fonts</guilabel>. All these settings customize how the editor behaves and looks. </para>
 
 <sect3 id="preferences-editor-general">
-<title
->General</title>
-
-<para
->This section contains a set of checkboxes.</para>
-
-<para
->The first checkbox in the upper side sets if the fuzzy status is reset automatically when a character is inputted into the MsgStr editor. When this option is disabled you have to manually choose <menuchoice
-><guimenu
->Edit</guimenu
-><guimenuitem
->Unset Fuzzy Status </guimenuitem
-></menuchoice
-> or use the <keycombo action="simul"
->&Ctrl;<keycap
->U</keycap
-></keycombo
-> shortcut. Note that this means the string <literal
->, fuzzy</literal
-> is removed from the entry's comment.</para>
-
-<para
->Next option allows you to enable <quote
->clever</quote
-> editing, where editor automatically inserts special characters escaped correctly, &eg; <literal
->\t</literal
-> after pressing <keycap
->Tab</keycap
-> and it allows special handling of <keycap
->Enter</keycap
->.</para>
-
-<para
->The lower checkboxes are very useful in assisting, not for the correctness of the translation, but if the translated string is a suitable replacement for the original. For example, many messages represent menu items with keyboard accelerator and C-like formatted strings whose structure must remain intact once translated.</para>
+<title>General</title>
+
+<para>This section contains a set of checkboxes.</para>
+
+<para>The first checkbox in the upper side sets if the fuzzy status is reset automatically when a character is inputted into the MsgStr editor. When this option is disabled you have to manually choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Unset Fuzzy Status </guimenuitem></menuchoice> or use the <keycombo action="simul">&Ctrl;<keycap>U</keycap></keycombo> shortcut. Note that this means the string <literal>, fuzzy</literal> is removed from the entry's comment.</para>
+
+<para>Next option allows you to enable <quote>clever</quote> editing, where editor automatically inserts special characters escaped correctly, &eg; <literal>\t</literal> after pressing <keycap>Tab</keycap> and it allows special handling of <keycap>Enter</keycap>.</para>
+
+<para>The lower checkboxes are very useful in assisting, not for the correctness of the translation, but if the translated string is a suitable replacement for the original. For example, many messages represent menu items with keyboard accelerator and C-like formatted strings whose structure must remain intact once translated.</para>
 
 <variablelist>
   <varlistentry>
-    <term
-><guilabel
->Check Arguments</guilabel
-></term>
+    <term><guilabel>Check Arguments</guilabel></term>
     <listitem>
-    <para
->When this option is selected, C-format strings in the original and the translation are checked to ensure the number of format sequences and the order are consistent. </para>
+    <para>When this option is selected, C-format strings in the original and the translation are checked to ensure the number of format sequences and the order are consistent. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term
-><guilabel
->Check Accelerator</guilabel
-></term>
+    <term><guilabel>Check Accelerator</guilabel></term>
     <listitem>
-<para
->When this option is selected, &kbabel; checks if the number accelerator characters is identical in both the original and the translated string. Note that the accelerator marker is &amp; (but not in every programming toolkit). See the <link linkend="preferences-miscellaneous"
->Miscellaneous</link
-> section below to find how to change a keyboard accelerator.</para>
+<para>When this option is selected, &kbabel; checks if the number accelerator characters is identical in both the original and the translated string. Note that the accelerator marker is &amp; (but not in every programming toolkit). See the <link linkend="preferences-miscellaneous">Miscellaneous</link> section below to find how to change a keyboard accelerator.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term
-><guilabel
->Check Equation</guilabel
-></term>
+    <term><guilabel>Check Equation</guilabel></term>
     <listitem>
-    <para
->This is a feature for the &kde; project development. <filename
->.desktop</filename
-> files are simply text files which store various parameters in <literal
->value=key</literal
-> format. Some of these <literal
->key</literal
->s are translatable. The only restriction is to maintain the left side of equality unchanged. Equation check allows you to spot many errors determined by the fuzzy <command
->msgmerge</command
-> algorithm. Note that there are situations where this function generates false errors on some <acronym
->PO</acronym
->-files. </para>
+    <para>This is a feature for the &kde; project development. <filename>.desktop</filename> files are simply text files which store various parameters in <literal>value=key</literal> format. Some of these <literal>key</literal>s are translatable. The only restriction is to maintain the left side of equality unchanged. Equation check allows you to spot many errors determined by the fuzzy <command>msgmerge</command> algorithm. Note that there are situations where this function generates false errors on some <acronym>PO</acronym>-files. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term
-><guilabel
->Look for Translated Context Info</guilabel
-></term>
+    <term><guilabel>Look for Translated Context Info</guilabel></term>
     <listitem>
-<para
->Some original messages are marked with context information to mark them as being unique even if they represent same word. This is because many simple words, such as <quote
->Save</quote
->, are translated into many languages. Context information is marked with <literal
->_:</literal
->. Many unexperienced translators translate the context information and fill their PO files with garbage. Check this box to make sure you will be warned about these errors in a file.</para>
+<para>Some original messages are marked with context information to mark them as being unique even if they represent same word. This is because many simple words, such as <quote>Save</quote>, are translated into many languages. Context information is marked with <literal>_:</literal>. Many unexperienced translators translate the context information and fill their PO files with garbage. Check this box to make sure you will be warned about these errors in a file.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term
-><guilabel
->Check Plural Forms</guilabel
-></term>
+    <term><guilabel>Check Plural Forms</guilabel></term>
     <listitem>
-    <para
->If you are translating &kde; project, it uses a special kind of syntax for specifying plural forms of messages. This check automatically counts the number of forms in <acronym
->msgstr</acronym
-> and compares it with the number specified in <link linkend="preferences-identity"
-><guilabel
->Identity</guilabel
-></link
-> tab. Incorrect number of plural forms can result in crash of an application. </para>
+    <para>If you are translating &kde; project, it uses a special kind of syntax for specifying plural forms of messages. This check automatically counts the number of forms in <acronym>msgstr</acronym> and compares it with the number specified in <link linkend="preferences-identity"><guilabel>Identity</guilabel></link> tab. Incorrect number of plural forms can result in crash of an application. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term
-><guilabel
->Beep on error</guilabel
-></term>
+    <term><guilabel>Beep on error</guilabel></term>
     <listitem>
-    <para
->Your system bell will beep when you switch on entries with errors like those described above. </para>
+    <para>Your system bell will beep when you switch on entries with errors like those described above. </para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term
-><guilabel
->Change text colour on error</guilabel
-></term>
+    <term><guilabel>Change text colour on error</guilabel></term>
     <listitem>
-    <para
->This is another type of warning about errors in current message. It is a good solution for those who are hearing impaired or dislike bell noise. See also the <link linkend="preferences-editor-appearance"
->Appearance</link
-> tab to find out how to change the text colour on errors. </para>
+    <para>This is another type of warning about errors in current message. It is a good solution for those who are hearing impaired or dislike bell noise. See also the <link linkend="preferences-editor-appearance">Appearance</link> tab to find out how to change the text colour on errors. </para>
     </listitem>
   </varlistentry>
 </variablelist>
@@ -256,724 +108,302 @@
 </sect3>
 
 <sect3 id="preferences-editor-appearance">
-<title
->Appearance</title>
+<title>Appearance</title>
 
-<para
->These options let you configure the appearance for the message editor. In upper part there are 4 checkboxes: </para>
+<para>These options let you configure the appearance for the message editor. In upper part there are 4 checkboxes: </para>
 
 <variablelist>
   <varlistentry>
-    <term
-><guibutton
->Highlight syntax</guibutton
-></term>
-    <listitem
-><para
->Setting this option will enable syntax highlighting for special characters, accelerators and text background in the msgid viewer and msgstr editor. If don't have a monochrome display or have a visual impairment, you should enable this option. </para
-></listitem>
+    <term><guibutton>Highlight syntax</guibutton></term>
+    <listitem><para>Setting this option will enable syntax highlighting for special characters, accelerators and text background in the msgid viewer and msgstr editor. If don't have a monochrome display or have a visual impairment, you should enable this option. </para></listitem>
   </varlistentry>
   <varlistentry>
-    <term
-><guibutton
->Highlight background</guibutton
-></term>
-    <listitem
-><para
->The background will be highlighted only for existing characters in the msgid and msgstr. This includes spaces. This is useful if you don't want to see the surrounding quotes (see below) for the <acronym
->PO</acronym
-> entry, and you will still be able to observe starting and ending spaces in a text line. </para
-></listitem>
+    <term><guibutton>Highlight background</guibutton></term>
+    <listitem><para>The background will be highlighted only for existing characters in the msgid and msgstr. This includes spaces. This is useful if you don't want to see the surrounding quotes (see below) for the <acronym>PO</acronym> entry, and you will still be able to observe starting and ending spaces in a text line. </para></listitem>
   </varlistentry>
   <varlistentry>
-    <term
-><guibutton
->Mark whitespaces with points</guibutton
-></term>
-    <listitem
-><para
->When you feel the need to count spaces and background highlighting is not your taste then you can check this option to have a point sign drawn in the middle of whitespace characters. Note that the point is a point sign in the center of a character box and is not a decimal point. </para
-></listitem>
+    <term><guibutton>Mark whitespaces with points</guibutton></term>
+    <listitem><para>When you feel the need to count spaces and background highlighting is not your taste then you can check this option to have a point sign drawn in the middle of whitespace characters. Note that the point is a point sign in the center of a character box and is not a decimal point. </para></listitem>
   </varlistentry>
   <varlistentry>
-    <term
-><guibutton
->Show surrounding quotes</guibutton
-></term>
-    <listitem
-><para
->If you think that viewing the terminal characters in msgstr or msgid's text line is better for you then check this option to view the surrounding quotes for every text line.</para>
-    <para
->If you are experienced editing <acronym
->PO</acronym
-> files with ordinary text editors you may feel safer if you can track starting and ending double quotes in <acronym
->PO</acronym
-> entry lines. </para
-></listitem>
+    <term><guibutton>Show surrounding quotes</guibutton></term>
+    <listitem><para>If you think that viewing the terminal characters in msgstr or msgid's text line is better for you then check this option to view the surrounding quotes for every text line.</para>
+    <para>If you are experienced editing <acronym>PO</acronym> files with ordinary text editors you may feel safer if you can track starting and ending double quotes in <acronym>PO</acronym> entry lines. </para></listitem>
   </varlistentry>
 </variablelist>
 
-<para
->For the different items in edited text there are different colour choices to make editing easy. Colours can be changed by clicking on colour-picker buttons. From the 'select color' dialogs you can choose from standard colours, custom colours or just pick a colour from any part of your screen. </para>
+<para>For the different items in edited text there are different colour choices to make editing easy. Colours can be changed by clicking on colour-picker buttons. From the 'select color' dialogs you can choose from standard colours, custom colours or just pick a colour from any part of your screen. </para>
 
 <variablelist>
   <varlistentry>
-    <term
-><guilabel
->Background colour</guilabel
-></term>
-    <listitem
-><para
->This sets the background colour for characters in the MsgID view and the MsgStr editor. To change the general background colour of edit boxes you must use the &kcontrolcenter;. </para
-></listitem>
+    <term><guilabel>Background colour</guilabel></term>
+    <listitem><para>This sets the background colour for characters in the MsgID view and the MsgStr editor. To change the general background colour of edit boxes you must use the &kcontrolcenter;. </para></listitem>
   </varlistentry>
   <varlistentry>
-    <term
-><guilabel
->Colour for quoted characters</guilabel
-></term>
-    <listitem
-><para
->Here you can adjust the colour for escaped characters like (<literal
->\&quot;</literal
->) double quotes or (<literal
->\n</literal
->) newline. </para
-></listitem>
+    <term><guilabel>Colour for quoted characters</guilabel></term>
+    <listitem><para>Here you can adjust the colour for escaped characters like (<literal>\&quot;</literal>) double quotes or (<literal>\n</literal>) newline. </para></listitem>
   </varlistentry>
   <varlistentry>
-    <term
-><guilabel
->Colour for syntax errors</guilabel
-></term>
-    <listitem
-><para
->This is the colour for the entire text entry if errors are detected when you try to save <acronym
->PO</acronym
-> file. Errors are triggered by not terminating identically both <acronym
->msgid</acronym
-> and <acronym
->msgstr</acronym
->, or escaping characters incorrectly. </para
-></listitem>
+    <term><guilabel>Colour for syntax errors</guilabel></term>
+    <listitem><para>This is the colour for the entire text entry if errors are detected when you try to save <acronym>PO</acronym> file. Errors are triggered by not terminating identically both <acronym>msgid</acronym> and <acronym>msgstr</acronym>, or escaping characters incorrectly. </para></listitem>
   </varlistentry>
   <varlistentry>
-    <term
-><guilabel
->Colour for c-format characters</guilabel
-></term>
-    <listitem
-><para
->This sets the colour for a characters sequence like in C language <function
->printf</function
-> or <function
->scanf</function
-> functions. In general these start with (<literal
->&percnt;</literal
->) percent char and are continued by one char. </para
-></listitem>
+    <term><guilabel>Colour for c-format characters</guilabel></term>
+    <listitem><para>This sets the colour for a characters sequence like in C language <function>printf</function> or <function>scanf</function> functions. In general these start with (<literal>&percnt;</literal>) percent char and are continued by one char. </para></listitem>
   </varlistentry>
   <varlistentry>
-    <term
-><guilabel
->Colour for keyboard accelerators</guilabel
-></term>
-    <listitem
-><para
->Keyboard accelerators start with (&amp;) <quote
->ampersand</quote
-> character in &kde; but if you are translating for other projects there might be an different character marking the accelerator key. See <link linkend="preferences-miscellaneous"
->Miscellaneous</link
-> section below to find how to change keyboard accelerator. </para
-></listitem>
+    <term><guilabel>Colour for keyboard accelerators</guilabel></term>
+    <listitem><para>Keyboard accelerators start with (&amp;) <quote>ampersand</quote> character in &kde; but if you are translating for other projects there might be an different character marking the accelerator key. See <link linkend="preferences-miscellaneous">Miscellaneous</link> section below to find how to change keyboard accelerator. </para></listitem>
   </varlistentry>
 </variablelist>
 
-<para
->The status for the current edited entry is marked by three <acronym
->LED</acronym
->s. For your convenience you can choose where to put these <acronym
->LED</acronym
->s&mdash;either on the statusbar or in the editor section (between the msgid and msgstr entry). If have difficulties viewing some colours or you want to be able to track <acronym
->LED</acronym
-> status changes easily without moving your eye you can select the preferred color using the colour button chooser. </para>
+<para>The status for the current edited entry is marked by three <acronym>LED</acronym>s. For your convenience you can choose where to put these <acronym>LED</acronym>s&mdash;either on the statusbar or in the editor section (between the msgid and msgstr entry). If have difficulties viewing some colours or you want to be able to track <acronym>LED</acronym> status changes easily without moving your eye you can select the preferred color using the colour button chooser. </para>
 
 </sect3>
 
 <sect3 id="preferences-editor-fonts">
-<title
->Fonts</title>
+<title>Fonts</title>
 
-<para
->This is a standard &kde; font chooser dialogue with a little addition. You can select to view only fixed fonts by checking the <guibutton
->Show only fixed fonts</guibutton
-> option. This is highly recommended for easy translating. The font dialogue lets you set font family, style, size and encoding. The bottom box shows a preview of the current font for user convenience. </para>
+<para>This is a standard &kde; font chooser dialogue with a little addition. You can select to view only fixed fonts by checking the <guibutton>Show only fixed fonts</guibutton> option. This is highly recommended for easy translating. The font dialogue lets you set font family, style, size and encoding. The bottom box shows a preview of the current font for user convenience. </para>
 </sect3>
 </sect2>
 
 <sect2 id="preferences-save">
-<title
->Save</title>
-<para
->This section allows you to edit the options for <acronym
->PO</acronym
-> file saving. The first group of checkboxes controls general behaviour for actions performed in <acronym
->PO</acronym
-> file saving. </para>
+<title>Save</title>
+<para>This section allows you to edit the options for <acronym>PO</acronym> file saving. The first group of checkboxes controls general behaviour for actions performed in <acronym>PO</acronym> file saving. </para>
 
 <variablelist>
   <varlistentry>
-    <term
-><guibutton
->Update header when saving</guibutton
-></term>
-    <listitem
-><para
->Check this button to update the header information of the file every time it is saved. The header normally keeps information about the date and time the file was last updated; the last translator etc. You can choose which information you want to update from the <guilabel
->Fields to update</guilabel
-> checkboxes area below. Fields that do not exist are added to the header. If you want to add additional fields to the header you can edit the header manually by choosing <menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Edit Header</guimenuitem
-></menuchoice
-> in the editor window. </para
-></listitem>
+    <term><guibutton>Update header when saving</guibutton></term>
+    <listitem><para>Check this button to update the header information of the file every time it is saved. The header normally keeps information about the date and time the file was last updated; the last translator etc. You can choose which information you want to update from the <guilabel>Fields to update</guilabel> checkboxes area below. Fields that do not exist are added to the header. If you want to add additional fields to the header you can edit the header manually by choosing <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Edit Header</guimenuitem></menuchoice> in the editor window. </para></listitem>
   </varlistentry>
   <varlistentry>
-    <term
-><guibutton
->Check syntax of file when saving</guibutton
-></term>
-    <listitem
-><para
->Check this to automatically check syntax of file with <userinput
-><command
->msgfmt</command
-> --statistics</userinput
-> when saving a file. You will only get a message if an error occurred. You should keep this validation enabled unless you know what you're doing. </para
-></listitem>
+    <term><guibutton>Check syntax of file when saving</guibutton></term>
+    <listitem><para>Check this to automatically check syntax of file with <userinput><command>msgfmt</command> --statistics</userinput> when saving a file. You will only get a message if an error occurred. You should keep this validation enabled unless you know what you're doing. </para></listitem>
   </varlistentry>
 </variablelist>
 
-<para
->If you don't want to touch some fields in a <acronym
->PO</acronym
-> file header or want to force updating of specific fields, there are five checkboxes which control this: revision date, <acronym
->PO</acronym
-> file language, text encoding, last translator name, charset. If a field does not exist, it is appended to the header. If you want to add other information to the header, you have to edit the header manually by choosing <menuchoice
-><guimenu
->Edit</guimenu
-><guimenuitem
->Edit Header</guimenuitem
-></menuchoice
-> in the editor window. Deactivate <guibutton
->Update header when saving</guibutton
-> above if you don't want to have the header updated.</para>
-
-<para
->For date and time of the header field <emphasis
->PO-Revision-Date</emphasis
-> you can choose one from bellow formats:</para>
+<para>If you don't want to touch some fields in a <acronym>PO</acronym> file header or want to force updating of specific fields, there are five checkboxes which control this: revision date, <acronym>PO</acronym> file language, text encoding, last translator name, charset. If a field does not exist, it is appended to the header. If you want to add other information to the header, you have to edit the header manually by choosing <menuchoice><guimenu>Edit</guimenu><guimenuitem>Edit Header</guimenuitem></menuchoice> in the editor window. Deactivate <guibutton>Update header when saving</guibutton> above if you don't want to have the header updated.</para>
+
+<para>For date and time of the header field <emphasis>PO-Revision-Date</emphasis> you can choose one from bellow formats:</para>
 
 <itemizedlist>
-  <listitem
-><para
-><guilabel
->Default</guilabel
-> is the format normally used in <acronym
->PO</acronym
-> files. </para
-></listitem>
-  <listitem
-><para
-><guilabel
->Local</guilabel
-> is the format specific to your country. </para
-></listitem>
-  <listitem
-><para
-><guilabel
->Custom</guilabel
-> lets you define your own format, where you can use the following C-like format strings: <table>
-      <title
->Year</title>
+  <listitem><para><guilabel>Default</guilabel> is the format normally used in <acronym>PO</acronym> files. </para></listitem>
+  <listitem><para><guilabel>Local</guilabel> is the format specific to your country. </para></listitem>
+  <listitem><para><guilabel>Custom</guilabel> lets you define your own format, where you can use the following C-like format strings: <table>
+      <title>Year</title>
       <tgroup cols="3">
         <thead>
           <row>
-            <entry
->Format</entry
-><entry
->Meaning</entry
-><entry
->Range</entry>
+            <entry>Format</entry><entry>Meaning</entry><entry>Range</entry>
           </row>
         </thead>
         <tbody>
           <row>
-            <entry
->%y</entry
-><entry
->year</entry
-><entry
->00 to 99</entry>
+            <entry>%y</entry><entry>year</entry><entry>00 to 99</entry>
           </row>
           <row>
-            <entry
->%Y</entry
-><entry
->year</entry
-><entry
->0001 to 9999</entry>
+            <entry>%Y</entry><entry>year</entry><entry>0001 to 9999</entry>
           </row>
         </tbody>
       </tgroup>
     </table>
     <table>
-      <title
->Month</title>
+      <title>Month</title>
       <tgroup cols="3">
         <thead>
           <row>
-            <entry
->Format</entry
-><entry
->Meaning</entry
-><entry
->Range</entry>
+            <entry>Format</entry><entry>Meaning</entry><entry>Range</entry>
           </row>
         </thead>
         <tbody>
           <row>
-            <entry
->%m</entry
-><entry
->month of year</entry
-><entry
->01 to 12</entry>
+            <entry>%m</entry><entry>month of year</entry><entry>01 to 12</entry>
           </row>
           <row>
-            <entry
->%f</entry
-><entry
->month of year</entry
-><entry
->1 to 12</entry>
+            <entry>%f</entry><entry>month of year</entry><entry>1 to 12</entry>
           </row>
           <row>
-            <entry
->%b,%h</entry
-><entry
->month abbreviation</entry
-><entry
->Jan to Dec</entry>
+            <entry>%b,%h</entry><entry>month abbreviation</entry><entry>Jan to Dec</entry>
           </row>
         </tbody>
       </tgroup>
     </table>
     <table>
-      <title
->Day</title>
+      <title>Day</title>
       <tgroup cols="3">
         <thead>
           <row>
-            <entry
->Format</entry
-><entry
->Meaning</entry
-><entry
->Range</entry>
+            <entry>Format</entry><entry>Meaning</entry><entry>Range</entry>
           </row>
         </thead>
         <tbody>
           <row>
-            <entry
->%j</entry
-><entry
->day of the year</entry
-><entry
->001 to 366</entry>
+            <entry>%j</entry><entry>day of the year</entry><entry>001 to 366</entry>
           </row>
           <row>
-            <entry
->%d</entry
-><entry
->day of month</entry
-><entry
->01 to 31</entry>
+            <entry>%d</entry><entry>day of month</entry><entry>01 to 31</entry>
           </row>
           <row>
-            <entry
->%e</entry
-><entry
->day of month</entry
-><entry
->1 to 31</entry>
+            <entry>%e</entry><entry>day of month</entry><entry>1 to 31</entry>
           </row>
           <row>
-            <entry
->%a</entry
-><entry
->weekday abbreviation</entry
-><entry
->Sun to Sat</entry>
+            <entry>%a</entry><entry>weekday abbreviation</entry><entry>Sun to Sat</entry>
           </row>
         </tbody>
       </tgroup>
     </table>
     <table>
-      <title
->Hour</title>
+      <title>Hour</title>
       <tgroup cols="3">
         <thead>
           <row>
-            <entry
->Format</entry
-><entry
->Meaning</entry
-><entry
->Range</entry>
+            <entry>Format</entry><entry>Meaning</entry><entry>Range</entry>
           </row>
         </thead>
         <tbody>
           <row>
-            <entry
->%H</entry
-><entry
->hour</entry
-><entry
->00 to 23</entry>
+            <entry>%H</entry><entry>hour</entry><entry>00 to 23</entry>
           </row>
           <row>
-            <entry
->%k</entry
-><entry
->hour</entry
-><entry
->0 to 23</entry>
+            <entry>%k</entry><entry>hour</entry><entry>0 to 23</entry>
           </row>
           <row>
-            <entry
->%i</entry
-><entry
->hour</entry
-><entry
->1 to 12</entry>
+            <entry>%i</entry><entry>hour</entry><entry>1 to 12</entry>
           </row>
           <row>
-            <entry
->%I</entry
-><entry
->hour</entry
-><entry
->01 to 12</entry>
+            <entry>%I</entry><entry>hour</entry><entry>01 to 12</entry>
           </row>
           <row>
-            <entry
->%p</entry
-><entry
-></entry
-><entry
->AM or PM</entry>
+            <entry>%p</entry><entry></entry><entry>AM or PM</entry>
           </row>
         </tbody>
       </tgroup>
     </table>
     <table>
-      <title
->Minute, Second, Timezone</title>
+      <title>Minute, Second, Timezone</title>
       <tgroup cols="3">
         <thead>
           <row>
-            <entry
->Format</entry
-><entry
->Meaning</entry
-><entry
->Range</entry>
+            <entry>Format</entry><entry>Meaning</entry><entry>Range</entry>
           </row>
         </thead>
         <tbody>
           <row>
-            <entry
->%M</entry
-><entry
->minute</entry
-><entry
->00 to 59</entry>
+            <entry>%M</entry><entry>minute</entry><entry>00 to 59</entry>
           </row>
           <row>
-            <entry
->%S</entry
-><entry
->second</entry
-><entry
->00 to 59</entry>
+            <entry>%S</entry><entry>second</entry><entry>00 to 59</entry>
           </row>
           <row>
-            <entry
->%Z</entry
-><entry
->timezone</entry
-><entry
->(given in identity settings)</entry>
+            <entry>%Z</entry><entry>timezone</entry><entry>(given in identity settings)</entry>
           </row>
           <row>
-            <entry
->%z</entry
-><entry
->timezone</entry
-><entry
->(numeric offset as specified by system settings)</entry>
+            <entry>%z</entry><entry>timezone</entry><entry>(numeric offset as specified by system settings)</entry>
           </row>
         </tbody>
       </tgroup>
     </table>
-  </para
-></listitem>
+  </para></listitem>
 </itemizedlist>
 
-<para
->The lower group covers encoding options for <acronym
->PO</acronym
-> files when saving. If you work on the &kde; project you should be aware that at least <filename
->desktop.po</filename
-> file <emphasis
->must</emphasis
-> be UTF-8 encoded. The drop-down list lets you select message encoding. You must at least have your language code and UTF-8 encoding set. If, for some reason, you don't want to accidentally change the current PO file encoding, turn on <guibutton
->Keep the encoding of the file</guibutton
->.</para>
+<para>The lower group covers encoding options for <acronym>PO</acronym> files when saving. If you work on the &kde; project you should be aware that at least <filename>desktop.po</filename> file <emphasis>must</emphasis> be UTF-8 encoded. The drop-down list lets you select message encoding. You must at least have your language code and UTF-8 encoding set. If, for some reason, you don't want to accidentally change the current PO file encoding, turn on <guibutton>Keep the encoding of the file</guibutton>.</para>
 
 </sect2>
 
 <sect2 id="preferences-spellcheck">
-<title
->Spell Check</title>
+<title>Spell Check</title>
 
-<para
->Here you can set your spell checking preferences. This is of interest if you have a dictionary file for the language you are translating to. Below are the items to consider setting:</para>
+<para>Here you can set your spell checking preferences. This is of interest if you have a dictionary file for the language you are translating to. Below are the items to consider setting:</para>
 
 <variablelist>
   <varlistentry>
-    <term
-><guibutton
->Create root/affix combinations not in dictionary</guibutton
-></term>
-    <listitem
-><para
->For new words added to the personal dictionary, the spell checker will create root/affix combinations to match more than one word (variations). </para
-></listitem>
+    <term><guibutton>Create root/affix combinations not in dictionary</guibutton></term>
+    <listitem><para>For new words added to the personal dictionary, the spell checker will create root/affix combinations to match more than one word (variations). </para></listitem>
   </varlistentry>
   <varlistentry>
-    <term
-><guibutton
->Consider run-together words as spelling errors</guibutton
-></term>
-    <listitem
-><para
->If this is turned on, joined words will be treated as errors. However, such words are very common in the German language, which have a very large number of compound words, so it should be left turned off in that case. </para
-></listitem>
+    <term><guibutton>Consider run-together words as spelling errors</guibutton></term>
+    <listitem><para>If this is turned on, joined words will be treated as errors. However, such words are very common in the German language, which have a very large number of compound words, so it should be left turned off in that case. </para></listitem>
   </varlistentry>
   <varlistentry>
-    <term
-><guilabel
->Dictionary</guilabel
-></term>
-    <listitem
-><para
->From the popup list you can choose which dictionary to use. Note that you must install an appropriate dictionary for your language. Check your ispell or aspell distribution to find out if you have one. </para
-></listitem>
+    <term><guilabel>Dictionary</guilabel></term>
+    <listitem><para>From the popup list you can choose which dictionary to use. Note that you must install an appropriate dictionary for your language. Check your ispell or aspell distribution to find out if you have one. </para></listitem>
   </varlistentry>
   <varlistentry>
-    <term
-><guilabel
->Encoding</guilabel
-></term>
-    <listitem
-><para
->Here you choose the encoding for your text. This option is passed to the spellchecker, and is used as the encoding for your words dictionary. See the <ulink url="help:/tdespell"
->tdespell</ulink
-> documentation for more details. </para
-></listitem>
+    <term><guilabel>Encoding</guilabel></term>
+    <listitem><para>Here you choose the encoding for your text. This option is passed to the spellchecker, and is used as the encoding for your words dictionary. See the <ulink url="help:/tdespell">tdespell</ulink> documentation for more details. </para></listitem>
   </varlistentry>
   <varlistentry>
-    <term
-><guilabel
->Client</guilabel
-></term>
-    <listitem
-><para
->Backend program to use for spell checking. Currently either <command
->ispell</command
-> (International Ispell) or aspell. </para
-></listitem>
+    <term><guilabel>Client</guilabel></term>
+    <listitem><para>Backend program to use for spell checking. Currently either <command>ispell</command> (International Ispell) or aspell. </para></listitem>
   </varlistentry>
   <varlistentry>
-    <term
-><guibutton
->Remember ignored words</guibutton
-></term>
-    <listitem
-><para
->Keep track of user-ignored words when spell-checking <acronym
->PO</acronym
-> files. It is very convenient to ignore the abbreviations or strange letter combinations you meet in &GUI; interfaces. </para
-></listitem>
+    <term><guibutton>Remember ignored words</guibutton></term>
+    <listitem><para>Keep track of user-ignored words when spell-checking <acronym>PO</acronym> files. It is very convenient to ignore the abbreviations or strange letter combinations you meet in &GUI; interfaces. </para></listitem>
   </varlistentry>
   <varlistentry>
-    <term
-><guilabel
->File to store ignored words</guilabel
-></term>
-    <listitem
-><para
->Here you can set location of the file for ignored words. Click on the folder icon to the right of the edit box. The default is <filename
->$(HOME)/.trinity/share/apps/kbabel/spellignores</filename
->, where <filename
->$(HOME)</filename
-> is your home folder. </para
-></listitem>
+    <term><guilabel>File to store ignored words</guilabel></term>
+    <listitem><para>Here you can set location of the file for ignored words. Click on the folder icon to the right of the edit box. The default is <filename>$(HOME)/.trinity/share/apps/kbabel/spellignores</filename>, where <filename>$(HOME)</filename> is your home folder. </para></listitem>
   </varlistentry>
 </variablelist>
 </sect2>
 
 <sect2 id="preferences-search">
-<title
->Search</title>
-<para
->The search section allows you to customise various settings for searching in previously translated strings. </para>
+<title>Search</title>
+<para>The search section allows you to customise various settings for searching in previously translated strings. </para>
 
 <sect3 id="preferences-search-general">
-<title
->General</title>
-
-<para
->General settings are common for all search types. If you check the <guibutton
->Automatically start search</guibutton
-> option then the search is automatically started whenever you switch to another entry in the editor. Currently, there are three possibilities you can choose from, but since &kbabel; can use dictionary plugins the available dictionaries depend on those installed. Using <menuchoice
-><guimenuitem
->Settings</guimenuitem
-> <guimenuitem
->Configure Dictionary</guimenuitem
-> <guimenuitem
->...</guimenuitem
-></menuchoice
-> you can configure every search plugin.</para>
-
-<para
->The dictionary plugins installed by default are:</para>
+<title>General</title>
+
+<para>General settings are common for all search types. If you check the <guibutton>Automatically start search</guibutton> option then the search is automatically started whenever you switch to another entry in the editor. Currently, there are three possibilities you can choose from, but since &kbabel; can use dictionary plugins the available dictionaries depend on those installed. Using <menuchoice><guimenuitem>Settings</guimenuitem> <guimenuitem>Configure Dictionary</guimenuitem> <guimenuitem>...</guimenuitem></menuchoice> you can configure every search plugin.</para>
+
+<para>The dictionary plugins installed by default are:</para>
 
 <variablelist>
 <varlistentry>
-<term
->&kde; Database Search Engine</term>
+<term>&kde; Database Search Engine</term>
 <listitem>
-<para
->This new method is still in alpha stage of development and is based on &kbabeldict; which accompanies &kbabel;. See &kbabeldict; documentation for further info on configuring the search engine. </para
-></listitem>
+<para>This new method is still in alpha stage of development and is based on &kbabeldict; which accompanies &kbabel;. See &kbabeldict; documentation for further info on configuring the search engine. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->PO Compendium</term>
-<listitem
-><para
->The compendium is a normal <acronym
->PO</acronym
-> file, which should contain a list of standard translations from your translation team. If you don't have one, you can also use a file that contains all the translations from your team (&eg; the <filename
->$lang.messages</filename
-> file in the &kde; Project, that can be found at <ulink url="http://i18n.kde.org/po_overview/"
->i18n.kde.org</ulink
->). </para
-></listitem>
+<term>PO Compendium</term>
+<listitem><para>The compendium is a normal <acronym>PO</acronym> file, which should contain a list of standard translations from your translation team. If you don't have one, you can also use a file that contains all the translations from your team (&eg; the <filename>$lang.messages</filename> file in the &kde; Project, that can be found at <ulink url="http://i18n.kde.org/po_overview/">i18n.kde.org</ulink>). </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->PO Auxiliary</term>
-<listitem
-><para
->The auxiliary should help you find the context of a translation by looking up the same message in a message catalog of the same package but translated to another language. This way you can have a look how this message is translated in another language. </para
-></listitem>
+<term>PO Auxiliary</term>
+<listitem><para>The auxiliary should help you find the context of a translation by looking up the same message in a message catalog of the same package but translated to another language. This way you can have a look how this message is translated in another language. </para></listitem>
 </varlistentry>
 </variablelist>
 
-<para
->You can also start searching manually by choosing an entry in the popup menu that appears, either by clicking <menuchoice
-> <guimenu
->Dictionaries</guimenu
-><guimenuitem
->Search Text</guimenuitem
-> <guimenuitem
->PO Compendium</guimenuitem
-></menuchoice
-> or by keeping the search button on the toolbar pressed down for a while. </para>
+<para>You can also start searching manually by choosing an entry in the popup menu that appears, either by clicking <menuchoice> <guimenu>Dictionaries</guimenu><guimenuitem>Search Text</guimenuitem> <guimenuitem>PO Compendium</guimenuitem></menuchoice> or by keeping the search button on the toolbar pressed down for a while. </para>
 </sect3>
 
 </sect2>
 
 <sect2 id="preferences-diffmode">
-<title
->Diff</title>
-
-<para
->The <guilabel
->Diff</guilabel
-> section holds settings how to display differences in msgids. </para>
-
-<para
->Every difference can be displayed by two added parts and by characters removed from the text. For both you can specify the method of display and the color to be used. <guilabel
->Highlighted</guilabel
-> means that the background of the corresponding characters will be shown in the selected colour, while <guilabel
->Underlined</guilabel
->(for added characters) or <guilabel
->Stroked Out</guilabel
-> (for removed characters) will denote the changed parts by coloured lines. </para>
-<para
->Diff mode needs to find the original <acronym
->msgid</acronym
-> to compare with. For this purpose, &kbabel; can use the <link linkend="database"
->translation database</link
-> if you turn in on by enabling <guilabel
->Use messages from Translation Database</guilabel
->. A second possibility is to use a tree of original PO files and specifying the root of the tree in <guilabel
->Base folder for diff files</guilabel
->. </para>
+<title>Diff</title>
+
+<para>The <guilabel>Diff</guilabel> section holds settings how to display differences in msgids. </para>
+
+<para>Every difference can be displayed by two added parts and by characters removed from the text. For both you can specify the method of display and the color to be used. <guilabel>Highlighted</guilabel> means that the background of the corresponding characters will be shown in the selected colour, while <guilabel>Underlined</guilabel>(for added characters) or <guilabel>Stroked Out</guilabel> (for removed characters) will denote the changed parts by coloured lines. </para>
+<para>Diff mode needs to find the original <acronym>msgid</acronym> to compare with. For this purpose, &kbabel; can use the <link linkend="database">translation database</link> if you turn in on by enabling <guilabel>Use messages from Translation Database</guilabel>. A second possibility is to use a tree of original PO files and specifying the root of the tree in <guilabel>Base folder for diff files</guilabel>. </para>
 </sect2>
 
 
 <sect2 id="preferences-miscellaneous">
-<title
->Miscellaneous</title>
-<para
-><guilabel
->Miscellaneous</guilabel
-> section holds settings which don't fit anywhere else. Currently there are two: </para>
+<title>Miscellaneous</title>
+<para><guilabel>Miscellaneous</guilabel> section holds settings which don't fit anywhere else. Currently there are two: </para>
 
 <variablelist>
   <varlistentry>
-  <term
-><guilabel
->Marker for keyboard accelerator</guilabel
-></term>
-  <listitem
-><para
->Here you can select your own character to serve as the keyboard accelerator indicator in a &GUI;. By default it is &amp; (ampersand), but in some programming toolkits it may vary. For example, in Gnome/GTK translations the underscore character <quote
->_</quote
-> is the marker for the keyboard accelerator. </para
-></listitem>
+  <term><guilabel>Marker for keyboard accelerator</guilabel></term>
+  <listitem><para>Here you can select your own character to serve as the keyboard accelerator indicator in a &GUI;. By default it is &amp; (ampersand), but in some programming toolkits it may vary. For example, in Gnome/GTK translations the underscore character <quote>_</quote> is the marker for the keyboard accelerator. </para></listitem>
   </varlistentry>
   <varlistentry>
-  <term
-><guilabel
->Regular expression for context information</guilabel
-></term>
-  <listitem
-><para
->For inexperienced users "regular expression" may sound strange. So you are advised to change the default value only if you know what you are doing. Some &GUI; programming toolkits provide their own context information description methods. Consult an experienced developer if you translate <acronym
->PO</acronym
-> files other than standard &kde; files. For the sake of completeness I will "translate" for you what the default regular expression means: "the text matches if it starts with _: and is followed by one or more characters and ends with a newline". </para
-></listitem>
+  <term><guilabel>Regular expression for context information</guilabel></term>
+  <listitem><para>For inexperienced users "regular expression" may sound strange. So you are advised to change the default value only if you know what you are doing. Some &GUI; programming toolkits provide their own context information description methods. Consult an experienced developer if you translate <acronym>PO</acronym> files other than standard &kde; files. For the sake of completeness I will "translate" for you what the default regular expression means: "the text matches if it starts with _: and is followed by one or more characters and ends with a newline". </para></listitem>
   </varlistentry>
 </variablelist>
 </sect2>
@@ -982,233 +412,61 @@
 </sect1>
 
 <sect1 id="preferences-catalogmanager">
-<title
->&cataloguemanager; preferences</title>
+<title>&cataloguemanager; preferences</title>
 
-<para
->This dialogue allows you to edit the options for the Catalogue Manager. </para>
+<para>This dialogue allows you to edit the options for the Catalogue Manager. </para>
 
 <sect2 id="preferences-catalogmanager-general">
-<title
->General</title>
-<para
->Here are two edit lines with <guibutton
->Browse...</guibutton
-> buttons. Type in the folders which contains all your <acronym
->PO</acronym
->- and respectively <acronym
->POT</acronym
->-files. The files and the folders in these folders will then be merged into one tree in Catalogue Manager window. </para>
-
-<para
->Below you can turn on and off if: </para>
+<title>General</title>
+<para>Here are two edit lines with <guibutton>Browse...</guibutton> buttons. Type in the folders which contains all your <acronym>PO</acronym>- and respectively <acronym>POT</acronym>-files. The files and the folders in these folders will then be merged into one tree in Catalogue Manager window. </para>
+
+<para>Below you can turn on and off if: </para>
 
 <variablelist>
   <varlistentry>
-    <term
-><guibutton
->Open files in new window</guibutton
-></term>
-    <listitem
-><para
->If this is activated all files that are opened from the Catalogue Manager are opened in a new window. </para
-></listitem>
+    <term><guibutton>Open files in new window</guibutton></term>
+    <listitem><para>If this is activated all files that are opened from the Catalogue Manager are opened in a new window. </para></listitem>
   </varlistentry>
   <varlistentry>
-    <term
-><guibutton
->Kill processes on exit</guibutton
-></term>
-    <listitem
-><para
->If you check this, &kbabel; tries to kill the processes that are not exited already when the program closes by sending a kill signal to them. <note
-><para
->It's not guaranteed that the processes are killed. </para
-></note>
-    </para
-></listitem>
+    <term><guibutton>Kill processes on exit</guibutton></term>
+    <listitem><para>If you check this, &kbabel; tries to kill the processes that are not exited already when the program closes by sending a kill signal to them. <note><para>It's not guaranteed that the processes are killed. </para></note>
+    </para></listitem>
   </varlistentry>
 <varlistentry>
-    <term
-><guibutton
->Create index for file contents</guibutton
-></term>
-    <listitem
-><para
->If you check this, &kbabel; will create an index of contents for every file in the tree. This index is then used in find/replace operations. <warning
-><para
->There is a large speed trade-off. If you enable <guibutton
->Create index for file contents</guibutton
->, the updating of file information will be much slower. On the other hand, it speeds up find/replace operations considerably.</para
-></warning>
-    </para
-></listitem>
+    <term><guibutton>Create index for file contents</guibutton></term>
+    <listitem><para>If you check this, &kbabel; will create an index of contents for every file in the tree. This index is then used in find/replace operations. <warning><para>There is a large speed trade-off. If you enable <guibutton>Create index for file contents</guibutton>, the updating of file information will be much slower. On the other hand, it speeds up find/replace operations considerably.</para></warning>
+    </para></listitem>
   </varlistentry>
 </variablelist>
 </sect2>
 
 <sect2 id="preferences-catalogmanager-folders">
-<title
->Folder Commands</title>
-<para
->Here you can insert commands you want to execute in folders from the Catalogue Manager. The commands are then shown in the submenu <menuchoice
-><guimenuitem
->Commands</guimenuitem
-></menuchoice
-> in the Catalogue Manager's context menu. </para
-><para
->Insert in the <guilabel
->Name</guilabel
-> field the name of the command. The name can be chosen freely and is only used to be displayed in the menu. In the <guilabel
->Command</guilabel
-> field insert the command you want to have executed when selecting the corresponding menu item. Then press the <guibutton
->Add</guibutton
-> button to add the command to your available commands. To edit a command, select it, press the <guibutton
->Edit</guibutton
-> button and press <guibutton
->Add</guibutton
-> after you have finished. To remove a command, select it from the list and press the <guibutton
->Remove</guibutton
-> button. If you want a different order in the contextual submenu, you can use the up and down buttons. </para
-><para
->The command is executed through your default shell, so you can execute multiple commands at once by separating them with a semicolon, and you can set environment variables if you need to. The commands are executed in the (<acronym
->PO</acronym
-> file) folder you have selected in the Catalogue Manager. </para
-><para
->The following strings will be replaced in a command: </para>
+<title>Folder Commands</title>
+<para>Here you can insert commands you want to execute in folders from the Catalogue Manager. The commands are then shown in the submenu <menuchoice><guimenuitem>Commands</guimenuitem></menuchoice> in the Catalogue Manager's context menu. </para><para>Insert in the <guilabel>Name</guilabel> field the name of the command. The name can be chosen freely and is only used to be displayed in the menu. In the <guilabel>Command</guilabel> field insert the command you want to have executed when selecting the corresponding menu item. Then press the <guibutton>Add</guibutton> button to add the command to your available commands. To edit a command, select it, press the <guibutton>Edit</guibutton> button and press <guibutton>Add</guibutton> after you have finished. To remove a command, select it from the list and press the <guibutton>Remove</guibutton> button. If you want a different order in the contextual submenu, you can use the up and down buttons. </para><para>The command is executed through your default shell, so you can execute multiple commands at once by separating them with a semicolon, and you can set environment variables if you need to. The commands are executed in the (<acronym>PO</acronym> file) folder you have selected in the Catalogue Manager. </para><para>The following strings will be replaced in a command: </para>
 
 <itemizedlist>
-  <listitem
-><para
-><userinput
->@PACKAGE@</userinput
->: The name of the folder without path </para
-></listitem>
-  <listitem
-><para
-><userinput
->@PODIR@</userinput
->: The name of the <acronym
->PO</acronym
->-folder with path </para
-></listitem>
-  <listitem
-><para
-><userinput
->@POTDIR@</userinput
->: The name of the template folder with path </para
-></listitem>
+  <listitem><para><userinput>@PACKAGE@</userinput>: The name of the folder without path </para></listitem>
+  <listitem><para><userinput>@PODIR@</userinput>: The name of the <acronym>PO</acronym>-folder with path </para></listitem>
+  <listitem><para><userinput>@POTDIR@</userinput>: The name of the template folder with path </para></listitem>
 </itemizedlist>
 
-<para
->E.g.: If you want to execute <command
->make</command
-> and then <command
->make install</command
-> you could insert in <userinput
->Make install</userinput
-> in the <guilabel
->Name</guilabel
-> field, and <userinput
->make; make install</userinput
-> in the <guilabel
->Command</guilabel
-> field. If you then select <menuchoice
-><guimenuitem
->Commands</guimenuitem
-> <guimenuitem
->Make install</guimenuitem
-></menuchoice
-> from the context menu of a folder, the commands listed above will be executed in that folder. </para>
+<para>E.g.: If you want to execute <command>make</command> and then <command>make install</command> you could insert in <userinput>Make install</userinput> in the <guilabel>Name</guilabel> field, and <userinput>make; make install</userinput> in the <guilabel>Command</guilabel> field. If you then select <menuchoice><guimenuitem>Commands</guimenuitem> <guimenuitem>Make install</guimenuitem></menuchoice> from the context menu of a folder, the commands listed above will be executed in that folder. </para>
 </sect2>
 
 <sect2>
-<title
->File Commands</title>
-<para
->Here you can insert the commands you want to execute on files from the Catalogue Manager. The commands are then shown in the submenu <menuchoice
-><guimenuitem
->Commands</guimenuitem
-></menuchoice
-> in the Catalogue Manager's context menu. </para>
-
-<para
->Insert in the <guilabel
->Name</guilabel
-> field the name of the command. The name can be chosen freely and is only used to be displayed in the menu. In the <guilabel
->Command</guilabel
-> field insert the command you want to have executed when selecting the corresponding menu item. Then press the <guibutton
->Add</guibutton
-> button to add the command to your available commands. To edit a command, select it, press the <guibutton
->Edit</guibutton
-> button and press the <guibutton
->Add</guibutton
-> button after you have finished. To remove a command, select it from the list and press the <guibutton
->Remove</guibutton
-> button. If you want a different order in the contextual submenu, you can use the up and down buttons. </para
-><para
->The command is executed through your default shell, so you can execute multiple commands at once by separating them with a semicolon, and you can set environment variables, if you need. The commands are executed in the (<acronym
->PO</acronym
-> file) folder, in which the file, you have selected in the Catalogue Manager, is. </para
-><para
->The following strings will be replaced in a command: </para>
+<title>File Commands</title>
+<para>Here you can insert the commands you want to execute on files from the Catalogue Manager. The commands are then shown in the submenu <menuchoice><guimenuitem>Commands</guimenuitem></menuchoice> in the Catalogue Manager's context menu. </para>
+
+<para>Insert in the <guilabel>Name</guilabel> field the name of the command. The name can be chosen freely and is only used to be displayed in the menu. In the <guilabel>Command</guilabel> field insert the command you want to have executed when selecting the corresponding menu item. Then press the <guibutton>Add</guibutton> button to add the command to your available commands. To edit a command, select it, press the <guibutton>Edit</guibutton> button and press the <guibutton>Add</guibutton> button after you have finished. To remove a command, select it from the list and press the <guibutton>Remove</guibutton> button. If you want a different order in the contextual submenu, you can use the up and down buttons. </para><para>The command is executed through your default shell, so you can execute multiple commands at once by separating them with a semicolon, and you can set environment variables, if you need. The commands are executed in the (<acronym>PO</acronym> file) folder, in which the file, you have selected in the Catalogue Manager, is. </para><para>The following strings will be replaced in a command: </para>
 
 <itemizedlist>
-  <listitem
-><para
-><userinput
->@PACKAGE@</userinput
->: The name of the file without path and extension </para
-></listitem>
-  <listitem
-><para
-><userinput
->@POFILE@</userinput
->: The name of the <acronym
->PO</acronym
-> file with path and extension </para
-></listitem>
-  <listitem
-><para
-><userinput
->@POTFILE@</userinput
->: The name of the corresponding template file with path and extension </para
-></listitem>
-  <listitem
-><para
-><userinput
->@PODIR@</userinput
->: The name of the folder the <acronym
->PO</acronym
-> file is in, with path </para
-></listitem>
-  <listitem
-><para
-><userinput
->@POTDIR@</userinput
->: The name of the folder the template file is in, with path </para
-></listitem>
+  <listitem><para><userinput>@PACKAGE@</userinput>: The name of the file without path and extension </para></listitem>
+  <listitem><para><userinput>@POFILE@</userinput>: The name of the <acronym>PO</acronym> file with path and extension </para></listitem>
+  <listitem><para><userinput>@POTFILE@</userinput>: The name of the corresponding template file with path and extension </para></listitem>
+  <listitem><para><userinput>@PODIR@</userinput>: The name of the folder the <acronym>PO</acronym> file is in, with path </para></listitem>
+  <listitem><para><userinput>@POTDIR@</userinput>: The name of the folder the template file is in, with path </para></listitem>
 </itemizedlist>
-<para
->For example, if you want to merge the template file into your <acronym
->PO</acronym
-> file you could insert <userinput
->Merge</userinput
-> in the <guilabel
->Name</guilabel
-> field and <userinput
->msgmerge @POFILE@ @POTFILE@ &gt; @PACKAGE@.new &amp;&amp; mv @PACKAGE@.new "@PACKAGE@.po</userinput
-> in the <guilabel
->Command</guilabel
-> field. If you then select <menuchoice
-><guimenuitem
->Commands</guimenuitem
-><guimenuitem
->Merge</guimenuitem
-></menuchoice
-> from a file's context menu, the <acronym
->PO</acronym
-> file will be merged with its template file. </para>
+<para>For example, if you want to merge the template file into your <acronym>PO</acronym> file you could insert <userinput>Merge</userinput> in the <guilabel>Name</guilabel> field and <userinput>msgmerge @POFILE@ @POTFILE@ &gt; @PACKAGE@.new &amp;&amp; mv @PACKAGE@.new "@PACKAGE@.po</userinput> in the <guilabel>Command</guilabel> field. If you then select <menuchoice><guimenuitem>Commands</guimenuitem><guimenuitem>Merge</guimenuitem></menuchoice> from a file's context menu, the <acronym>PO</acronym> file will be merged with its template file. </para>
 </sect2>
 </sect1>
 </chapter>
diff --git a/tde-i18n-en_GB/docs/tdesdk/kbabel/using.docbook b/tde-i18n-en_GB/docs/tdesdk/kbabel/using.docbook
index 9741d7ba9a6..656e8052fa3 100644
--- a/tde-i18n-en_GB/docs/tdesdk/kbabel/using.docbook
+++ b/tde-i18n-en_GB/docs/tdesdk/kbabel/using.docbook
@@ -1,6 +1,5 @@
 <!-- <?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"> -->
 <!-- Uncomment the previous two lines to validate this document -->
 <!-- standalone.  Be sure to recomment them before attempting to -->
 <!-- process index.docbook -->
@@ -10,413 +9,157 @@
 <!-- Fill in this section if this document has a different author -->
 <authorgroup>
 <author>
-<personname
-><firstname
-></firstname
-><surname
-></surname
-></personname>
+<personname><firstname></firstname><surname></surname></personname>
 </author>
 </authorgroup>
 
-<othercredit role="translator"
-><firstname
->Alex</firstname
-><surname
->Walker</surname
-><affiliation
-><address
-><email
->alex@x3ja.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Alex</firstname><surname>Walker</surname><affiliation><address><email>alex@x3ja.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </chapterinfo>
 
 
-<title
->Using &kbabel;</title>
+<title>Using &kbabel;</title>
 
 <sect1 id="using-introduction">
-<title
->Introduction</title>
-
-<para
->Usually program messages and documentation are written in English. Using a framework made of a set of tools and libraries, it is possible to have your favourite applications speak your native non-English language. This process of adapting an application to a specific language is known as localisation. The localisation process includes translating the program's interfaces and documentation to the various languages users need and, in some countries or regions, making the inputs and outputs conform to particular conventions. &kbabel; is a tool which will assist you in the internationalisation process to make an application's interface speak many languages.</para>
-
-<para
->Every internationalisation-aware program makes available for translation one or more message-catalogue files. The extension of these files is <literal role="extension"
->.pot</literal
->. <acronym
->POT</acronym
-> is an acronym for <quote
->Portable Object Template</quote
->.</para>
-
-
-<para
->Every translator takes a <acronym
->POT</acronym
-> file copy and begins translating messages. This file will became a <acronym
->PO</acronym
-> file - Portable Object and represents only one language.</para>
-
-<para
->Each translator takes a copy of one of these POT templates and begins filling in the blanks: each message is translated into the language desired. The file containing the translated text is referred to as a <acronym
->PO</acronym
-> (Portable Object) file. </para>
-
-<para
->Once all the messages have been translated, the <acronym
->PO</acronym
-> file is compiled into a machine-readable binary format, known as a <acronym
->MO</acronym
-> (Machine Object) file. These files, which will be stored with a <literal role="extension"
->.mo</literal
-> extension, act as a database to minimise the time taken by the applications to look up each translated message. </para>
-
-<para
->This suggests a question: do I need to know what is inside a <acronym
->PO</acronym
-> file even though I have &kbabel;? The answer is, undoubtedly, yes. There are situations when a message catalogue can become corrupted and needs to be manually fixed. Most of these problems are the so-hated <acronym
->CVS</acronym
-> conflicts which occur when a translating process is coordinated by a concurrent version system (see the <ulink url="info:/cvs"
->CVS</ulink
-> documentation). &kbabel; can't help you very much if a problem like this arises so a text editor and some knowledge of <acronym
->PO</acronym
->-files are needed. Let's see how a <acronym
->PO</acronym
-> file is made.</para>
-
-<para
-><acronym
->PO</acronym
-> files consist of pairs of messages&mdash;a <emphasis
->msgid</emphasis
-> and a <emphasis
->msgstr</emphasis
->. The msgid is the text in English and the msgstr is the text translated into the appropriate language. The text that accompanies each msgid and msgstr is enclosed within C-like double quotes. An example, taken from a <acronym
->PO</acronym
-> file for &noatun;, is <literal
->msgid &quot;Open a Playlist&quot;</literal
-> </para>
-
-<para
->Empty lines and those starting with <literal
->#</literal
-> are ignored. Lines starting with a # represent comments and are a useful means of providing a note detailing which file this message is going to be used in and, in the case of the application writers, to provide additional comments to aide translation. &kbabel; displays these comment lines for every message.</para>
-
-<para
->In many cases the first msgid-msgstr pair in <acronym
->PO</acronym
-> file is a fake entry (acting as <acronym
->PO</acronym
-> file header) that contains various information about the translated <acronym
->PO</acronym
-> file, such as the application name, translating date, translator name and so on.</para>
-
-<para
->Recent versions of <application
->&GNU; gettext</application
-> added another useful i18n feature called <emphasis
->plural forms</emphasis
->. English uses only singular and one plural form of nouns, &eg; <quote
->1 file </quote
-> and <quote
->10 files</quote
->. This leads many developers to an idea that the world is that simple and they can use messages like <quote
->Do you want to delete %1 file(s)?</quote
->, where <literal
->%1</literal
-> denotes a number of files to be deleted. But this is fundamentally wrong. For Slovak translation you need 3 different forms of the message. This number is different for different languages and even when it is the same, &eg; Czech uses 3 forms as well, the rule to decide which form to use can be very different. </para>
-<para
->Plural forms in <acronym
->PO</acronym
-> files are here to help. Unfortunately, &kde; developers do not like the plural forms implementation in <application
->&GNU; gettext</application
-> and they have introduced their own format and handling for them. </para>
+<title>Introduction</title>
+
+<para>Usually program messages and documentation are written in English. Using a framework made of a set of tools and libraries, it is possible to have your favourite applications speak your native non-English language. This process of adapting an application to a specific language is known as localisation. The localisation process includes translating the program's interfaces and documentation to the various languages users need and, in some countries or regions, making the inputs and outputs conform to particular conventions. &kbabel; is a tool which will assist you in the internationalisation process to make an application's interface speak many languages.</para>
+
+<para>Every internationalisation-aware program makes available for translation one or more message-catalogue files. The extension of these files is <literal role="extension">.pot</literal>. <acronym>POT</acronym> is an acronym for <quote>Portable Object Template</quote>.</para>
+
+
+<para>Every translator takes a <acronym>POT</acronym> file copy and begins translating messages. This file will became a <acronym>PO</acronym> file - Portable Object and represents only one language.</para>
+
+<para>Each translator takes a copy of one of these POT templates and begins filling in the blanks: each message is translated into the language desired. The file containing the translated text is referred to as a <acronym>PO</acronym> (Portable Object) file. </para>
+
+<para>Once all the messages have been translated, the <acronym>PO</acronym> file is compiled into a machine-readable binary format, known as a <acronym>MO</acronym> (Machine Object) file. These files, which will be stored with a <literal role="extension">.mo</literal> extension, act as a database to minimise the time taken by the applications to look up each translated message. </para>
+
+<para>This suggests a question: do I need to know what is inside a <acronym>PO</acronym> file even though I have &kbabel;? The answer is, undoubtedly, yes. There are situations when a message catalogue can become corrupted and needs to be manually fixed. Most of these problems are the so-hated <acronym>CVS</acronym> conflicts which occur when a translating process is coordinated by a concurrent version system (see the <ulink url="info:/cvs">CVS</ulink> documentation). &kbabel; can't help you very much if a problem like this arises so a text editor and some knowledge of <acronym>PO</acronym>-files are needed. Let's see how a <acronym>PO</acronym> file is made.</para>
+
+<para><acronym>PO</acronym> files consist of pairs of messages&mdash;a <emphasis>msgid</emphasis> and a <emphasis>msgstr</emphasis>. The msgid is the text in English and the msgstr is the text translated into the appropriate language. The text that accompanies each msgid and msgstr is enclosed within C-like double quotes. An example, taken from a <acronym>PO</acronym> file for &noatun;, is <literal>msgid &quot;Open a Playlist&quot;</literal> </para>
+
+<para>Empty lines and those starting with <literal>#</literal> are ignored. Lines starting with a # represent comments and are a useful means of providing a note detailing which file this message is going to be used in and, in the case of the application writers, to provide additional comments to aide translation. &kbabel; displays these comment lines for every message.</para>
+
+<para>In many cases the first msgid-msgstr pair in <acronym>PO</acronym> file is a fake entry (acting as <acronym>PO</acronym> file header) that contains various information about the translated <acronym>PO</acronym> file, such as the application name, translating date, translator name and so on.</para>
+
+<para>Recent versions of <application>&GNU; gettext</application> added another useful i18n feature called <emphasis>plural forms</emphasis>. English uses only singular and one plural form of nouns, &eg; <quote>1 file </quote> and <quote>10 files</quote>. This leads many developers to an idea that the world is that simple and they can use messages like <quote>Do you want to delete %1 file(s)?</quote>, where <literal>%1</literal> denotes a number of files to be deleted. But this is fundamentally wrong. For Slovak translation you need 3 different forms of the message. This number is different for different languages and even when it is the same, &eg; Czech uses 3 forms as well, the rule to decide which form to use can be very different. </para>
+<para>Plural forms in <acronym>PO</acronym> files are here to help. Unfortunately, &kde; developers do not like the plural forms implementation in <application>&GNU; gettext</application> and they have introduced their own format and handling for them. </para>
 </sect1>
 
 <sect1 id="using-editor">
-<title
->Editor</title>
+<title>Editor</title>
 
-<para
->Here is a screenshot of &kbabel;. For convenience &kbabel; has toolbars to speed up many operations and, for busy users, there are many keyboard shortcuts. The main window is divided into four parts.</para>
+<para>Here is a screenshot of &kbabel;. For convenience &kbabel; has toolbars to speed up many operations and, for busy users, there are many keyboard shortcuts. The main window is divided into four parts.</para>
 
-<para
->The <emphasis
->upper-left</emphasis
-> edit box is read-only and contains the current msgid field from the opened PO-file and its English text.</para>
+<para>The <emphasis>upper-left</emphasis> edit box is read-only and contains the current msgid field from the opened PO-file and its English text.</para>
 
-<para
->The <emphasis
->bottom-left</emphasis
-> edit box contains the msgstr field related to the msgid shown and here you can edit the translated text.</para>
+<para>The <emphasis>bottom-left</emphasis> edit box contains the msgstr field related to the msgid shown and here you can edit the translated text.</para>
 
-<para
->The <emphasis
->top-right</emphasis
-> part of the window is a comments panel where you can view the comments added for entry currently being edited.</para>
+<para>The <emphasis>top-right</emphasis> part of the window is a comments panel where you can view the comments added for entry currently being edited.</para>
 
-<para
->It can be used:</para>
+<para>It can be used:</para>
 
 <itemizedlist>
-<listitem
-><para
->to find out how the current message is treated by the application (c-formatted or simple) </para
-></listitem>
-<listitem
-><para
->in some cases, to read helpful comments added by the application's developer to assist the translators in their work&mdash;for example, there may be technical hints (used to great effect in the <application
->LyX</application
-> project) </para
-></listitem>
-<listitem
-><para
->when you need to know which file a message is from because you want to report a spelling mistake in the original English string. </para
-></listitem>
+<listitem><para>to find out how the current message is treated by the application (c-formatted or simple) </para></listitem>
+<listitem><para>in some cases, to read helpful comments added by the application's developer to assist the translators in their work&mdash;for example, there may be technical hints (used to great effect in the <application>LyX</application> project) </para></listitem>
+<listitem><para>when you need to know which file a message is from because you want to report a spelling mistake in the original English string. </para></listitem>
 </itemizedlist>
 
 <screenshot>
-<screeninfo
->Screenshot of &kbabel;</screeninfo>
+<screeninfo>Screenshot of &kbabel;</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="snap1.png" format="PNG"/>
 </imageobject>
-<textobject
-><phrase
->Screenshot of &kbabel;</phrase
-></textobject>
+<textobject><phrase>Screenshot of &kbabel;</phrase></textobject>
 </mediaobject>
 </screenshot>
 
-<para
->The editor window (in the bottom right) is the most sophisticated part of &kbabel;'s main window. Its size can be adjusted using the splitter line between it and the comment panel (the panel in the top right). The editor window has two tabbed panels&mdash;one storing search information, the other context information. The context information tab contain a scrolled view which shows the previous and next 4 entries associated with the current entry&mdash;essentially it's a small 'snapshot' of the PO file. While translating, it is very common for message strings to be related to subsequent and previous messages, so the context panel is useful for looking at the nearby messages to get a hint as to how the current message can best be translated. Dialogue interface translation is a good example, or widgets with their associated text and "what's this" message. </para>
+<para>The editor window (in the bottom right) is the most sophisticated part of &kbabel;'s main window. Its size can be adjusted using the splitter line between it and the comment panel (the panel in the top right). The editor window has two tabbed panels&mdash;one storing search information, the other context information. The context information tab contain a scrolled view which shows the previous and next 4 entries associated with the current entry&mdash;essentially it's a small 'snapshot' of the PO file. While translating, it is very common for message strings to be related to subsequent and previous messages, so the context panel is useful for looking at the nearby messages to get a hint as to how the current message can best be translated. Dialogue interface translation is a good example, or widgets with their associated text and "what's this" message. </para>
 
 <sect2 id="more-kbabel-features">
-<title
->More &kbabel; Features</title>
+<title>More &kbabel; Features</title>
 
-<para
->Each msgid entry can be in three states: </para>
+<para>Each msgid entry can be in three states: </para>
 
 <variablelist>
    <varlistentry>
-     <term
->untranslated</term>
+     <term>untranslated</term>
      <listitem>
-       <para
->there is no translated text currently associated with the msgstr </para>
+       <para>there is no translated text currently associated with the msgstr </para>
      </listitem>
    </varlistentry>
    <varlistentry>
-      <term
->fuzzy</term>
+      <term>fuzzy</term>
       <listitem>
-         <para
-><command
->msgmerge</command
-> has tried to match a translated string by looking in rest of PO-file entries. This does not work perfectly and you must edit the translated text to fit the current English text. </para>
+         <para><command>msgmerge</command> has tried to match a translated string by looking in rest of PO-file entries. This does not work perfectly and you must edit the translated text to fit the current English text. </para>
       </listitem>
    </varlistentry>
    <varlistentry>
-      <term
->translated</term>
+      <term>translated</term>
       <listitem>
-         <para
->the msgid is the completed translated form of the msgstr </para>
+         <para>the msgid is the completed translated form of the msgstr </para>
       </listitem>
    </varlistentry>
 </variablelist>
 
-<para
->The state of the current entry is indicated by two <acronym
->LED</acronym
->s. Depending on your configuration these can either be in the status bar or above the <guilabel
->translated string</guilabel
-> edit box. Both have a customisable colour (to reflect your visual requirements or taste). Please read the <link linkend="preferences"
->Preferences</link
-> section to see how you can adjust these settings.</para>
+<para>The state of the current entry is indicated by two <acronym>LED</acronym>s. Depending on your configuration these can either be in the status bar or above the <guilabel>translated string</guilabel> edit box. Both have a customisable colour (to reflect your visual requirements or taste). Please read the <link linkend="preferences">Preferences</link> section to see how you can adjust these settings.</para>
 
 </sect2>
 
 </sect1>
 
 <sect1 id="kbabel-features">
-<title
->Advanced Translation</title>
+<title>Advanced Translation</title>
 
-<para
->Now you have an idea how to translate a PO-file. In this section we will follow the standard way of translating a new PO-file using the advanced features of &kbabel;. We assume you have already opened a template POT-file and saved it as a PO file. </para>
+<para>Now you have an idea how to translate a PO-file. In this section we will follow the standard way of translating a new PO-file using the advanced features of &kbabel;. We assume you have already opened a template POT-file and saved it as a PO file. </para>
 
 <sect2 id="kbabel-navigation">
-<title
->Navigation in PO-file</title>
-<para
->&kbabel; allows you to easily navigate through the file according to the state of their translation. The untranslated/fuzzy status was introduced already. A message can be marked as erroneous as a result of <link linkend="kbabel-validation"
->validation checking</link
-> or validation done by <command
->msgfmt</command
->. And, of course, &kbabel; supports browsing the history of visited messages with <guilabel
->Forward</guilabel
->/<guilabel
->Back</guilabel
->, like in &konqueror;.</para>
-<para
->All commands for navigation are in <menuchoice
-><guimenu
->Go</guimenu
-></menuchoice
-> menu. </para>
+<title>Navigation in PO-file</title>
+<para>&kbabel; allows you to easily navigate through the file according to the state of their translation. The untranslated/fuzzy status was introduced already. A message can be marked as erroneous as a result of <link linkend="kbabel-validation">validation checking</link> or validation done by <command>msgfmt</command>. And, of course, &kbabel; supports browsing the history of visited messages with <guilabel>Forward</guilabel>/<guilabel>Back</guilabel>, like in &konqueror;.</para>
+<para>All commands for navigation are in <menuchoice><guimenu>Go</guimenu></menuchoice> menu. </para>
 <informaltable>
 <tgroup cols="2">
 <tbody>
 
 <row>
-<entry
-><para
-><keycombo action="simul"
-><keycap
->Page Up</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Move to the previous message </para
-></entry>
+<entry><para><keycombo action="simul"><keycap>Page Up</keycap></keycombo></para></entry>
+<entry><para>Move to the previous message </para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo action="simul"
-><keycap
->Page Down</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Move to the next message</para
-></entry>
+<entry><para><keycombo action="simul"><keycap>Page Down</keycap></keycombo></para></entry>
+<entry><para>Move to the next message</para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo action="simul"
->&Ctrl;<keycap
->Page Up</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Move to the previous fuzzy message</para
-></entry>
+<entry><para><keycombo action="simul">&Ctrl;<keycap>Page Up</keycap></keycombo></para></entry>
+<entry><para>Move to the previous fuzzy message</para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo action="simul"
->&Ctrl;<keycap
->Page Down</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Move to the next fuzzy message</para
-></entry>
+<entry><para><keycombo action="simul">&Ctrl;<keycap>Page Down</keycap></keycombo></para></entry>
+<entry><para>Move to the next fuzzy message</para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo action="simul"
->&Alt;<keycap
->Page Up</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Move to the previous untranslated message</para
-></entry>
+<entry><para><keycombo action="simul">&Alt;<keycap>Page Up</keycap></keycombo></para></entry>
+<entry><para>Move to the previous untranslated message</para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo action="simul"
->&Alt;<keycap
->Page Down</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Move to the next untranslated message</para
-></entry>
+<entry><para><keycombo action="simul">&Alt;<keycap>Page Down</keycap></keycombo></para></entry>
+<entry><para>Move to the next untranslated message</para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo action="simul"
->&Shift;<keycap
->Page Up</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Move to the previous error message</para
-></entry>
+<entry><para><keycombo action="simul">&Shift;<keycap>Page Up</keycap></keycombo></para></entry>
+<entry><para>Move to the previous error message</para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo action="simul"
->&Shift;<keycap
->Page Down</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Move to the next error message</para
-></entry>
+<entry><para><keycombo action="simul">&Shift;<keycap>Page Down</keycap></keycombo></para></entry>
+<entry><para>Move to the next error message</para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo action="simul"
->&Ctrl;&Shift;<keycap
->Page Up</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Move to the previous fuzzy or untranslated message</para
-></entry>
+<entry><para><keycombo action="simul">&Ctrl;&Shift;<keycap>Page Up</keycap></keycombo></para></entry>
+<entry><para>Move to the previous fuzzy or untranslated message</para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo action="simul"
->&Ctrl;&Shift;<keycap
->Page Down</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Move to the next fuzzy or untranslated message</para
-></entry>
+<entry><para><keycombo action="simul">&Ctrl;&Shift;<keycap>Page Down</keycap></keycombo></para></entry>
+<entry><para>Move to the next fuzzy or untranslated message</para></entry>
 </row>
 </tbody>
 </tgroup>
@@ -424,138 +167,47 @@
 </sect2>
 
 <sect2 id="kbabel-cleveredit">
-<title
->Clever editing</title>
-<para
-><emphasis
->Clever editing</emphasis
-> means that the editor will help you easily edit the translation while taking into account specials of the PO format. It will correctly <quote
->escape</quote
-> as necessary.</para>
-<para
->It also supports more than one mode for inserting end of the line. This is very useful because of the way gettext handles end of the lines. It simply ignores them. (You can imagine that all the text in <acronym
->msgstr</acronym
-> is a single line.) If you want insert a <quote
->real</quote
-> end of the line, you need to insert <userinput
->\n</userinput
->. But most of translators do not realize, that a new line in <acronym
->msgstr</acronym
-> does not add any space between the lines. This can be easily solved by adding a space at the end of every line. But you can easily forget, so clever editing does this automatically for you. </para>
-<para
->The table below summarises clever editing features. </para>
+<title>Clever editing</title>
+<para><emphasis>Clever editing</emphasis> means that the editor will help you easily edit the translation while taking into account specials of the PO format. It will correctly <quote>escape</quote> as necessary.</para>
+<para>It also supports more than one mode for inserting end of the line. This is very useful because of the way gettext handles end of the lines. It simply ignores them. (You can imagine that all the text in <acronym>msgstr</acronym> is a single line.) If you want insert a <quote>real</quote> end of the line, you need to insert <userinput>\n</userinput>. But most of translators do not realize, that a new line in <acronym>msgstr</acronym> does not add any space between the lines. This can be easily solved by adding a space at the end of every line. But you can easily forget, so clever editing does this automatically for you. </para>
+<para>The table below summarises clever editing features. </para>
 
 <informaltable>
 <tgroup cols="2">
 <tbody>
 <row>
-<entry
-><para
-><keycombo action="simul"
-><keycap
->Tab</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Insert <emphasis
->\t</emphasis
-></para
-></entry>
+<entry><para><keycombo action="simul"><keycap>Tab</keycap></keycombo></para></entry>
+<entry><para>Insert <emphasis>\t</emphasis></para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo action="simul"
-><keycap
->"</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Insert <emphasis
->\"</emphasis
-></para
-></entry>
+<entry><para><keycombo action="simul"><keycap>"</keycap></keycombo></para></entry>
+<entry><para>Insert <emphasis>\"</emphasis></para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo action="simul"
-><keycap
->Enter</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->If the last character before cursor is not a space, insert one space. Then start a new line.</para
-></entry>
-</row
-><row>
-<entry
-><para
-><keycombo action="simul"
->&Ctrl;<keycap
->Enter</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Start a new line without any additional logic</para
-></entry>
+<entry><para><keycombo action="simul"><keycap>Enter</keycap></keycombo></para></entry>
+<entry><para>If the last character before cursor is not a space, insert one space. Then start a new line.</para></entry>
+</row><row>
+<entry><para><keycombo action="simul">&Ctrl;<keycap>Enter</keycap></keycombo></para></entry>
+<entry><para>Start a new line without any additional logic</para></entry>
 </row>
 <row>
-<entry
-><para
-><keycombo action="simul"
->&Shift;<keycap
->Enter</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Insert <emphasis
->\n</emphasis
-> and start a new line</para
-></entry>
+<entry><para><keycombo action="simul">&Shift;<keycap>Enter</keycap></keycombo></para></entry>
+<entry><para>Insert <emphasis>\n</emphasis> and start a new line</para></entry>
 </row>
 </tbody>
 </tgroup>
 </informaltable>
 <note>
-<para
->If you want to see where are spaces, you can turn on <guibutton
->Highlight background</guibutton
-> and/or <guibutton
->Mark whitespaces with points</guibutton
-> in preferences dialogue on tab <guilabel
->Edit</guilabel
-> <guilabel
->Appearance</guilabel
->. </para>
+<para>If you want to see where are spaces, you can turn on <guibutton>Highlight background</guibutton> and/or <guibutton>Mark whitespaces with points</guibutton> in preferences dialogue on tab <guilabel>Edit</guilabel> <guilabel>Appearance</guilabel>. </para>
 </note>
 </sect2>
 
 <sect2 id="kbabel-roughtranslation">
-<title
->Automatic translation</title>
-<para
->As the first step when starting a new translation, &kbabel; provides a function for automatic filling of the messages translations by the older translations. Choose <menuchoice
-><guimenu
->Tools</guimenu
-><guimenuitem
->Rough Translation</guimenuitem
-> </menuchoice
-> and &kbabel; will present the following dialogue: </para>
+<title>Automatic translation</title>
+<para>As the first step when starting a new translation, &kbabel; provides a function for automatic filling of the messages translations by the older translations. Choose <menuchoice><guimenu>Tools</guimenu><guimenuitem>Rough Translation</guimenuitem> </menuchoice> and &kbabel; will present the following dialogue: </para>
 <para>
 <screenshot>
-<screeninfo
->Rough translation dialogue</screeninfo>
+<screeninfo>Rough translation dialogue</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="roughtranslation.png" format="PNG"/>
@@ -563,298 +215,122 @@
 </mediaobject>
 </screenshot>
 </para>
-<para
->In the dialogue, you should specify what to translate and choose the sources for the old translations. </para>
-<para
->At the top of the <guilabel
->What to translate</guilabel
-> frame are three checkboxes (<guilabel
->Untranslated entries</guilabel
->, <guilabel
->Fuzzy entries </guilabel
->, <guilabel
->Translated entries</guilabel
->) for specifying the kind of messages you want to translate. Untranslated and fuzzy entries are natural choices for automatic translation, but you can change already translated messages as well. </para>
-<para
->The exact matching for <acronym
->msgid</acronym
->s will always be used for rough translation. However, you can add more strategies, &ie; <guilabel
->Allow fuzzy translation (slow)</guilabel
-> and <guilabel
->Allow single word translation</guilabel
->. Both of these additional strategies must be supported by the sources used (see below). There is no specification, what does <quote
->fuzzy translation</quote
-> mean, but the purpose is quite obvious. <quote
->Single word translation</quote
-> is suitable for only some of the languages. &kbabel; will try to translate each word in <acronym
->msgid</acronym
-> separately and then put the translated words (or phrases) in the same order in <acronym
->msgstr </acronym
->. </para>
-<para
->As a source for rough translation, any dictionary module available can be used. There is a list of <guilabel
->Don't use</guilabel
-> modules and <guilabel
->Use</guilabel
-> modules. Modules are used in the order in the <guilabel
->Use</guilabel
-> list. First module is asked for translation. If it is not found, next module in the list is asked and so on. You can use the buttons with arrows for moving modules between the lists. Don't forget to change the order to suit your needs by <guibutton
->Move Up </guibutton
-> and <guibutton
->Move Down</guibutton
-> buttons. </para>
-<para
->Normally &kbabel; will mark every roughly translated message as fuzzy, because it assumes that any automatic translation needs to be reviewed by a translator. If you are 100% sure that the automatic translation will be correct, or you will review all the translation anyway. <guilabel
->Mark changed entries as fuzzy</guilabel
-> allows you to turn off this automatic fuzzy marking, but you will need to confirm this. </para>
-<para
->If you have set all the options to suit your needs, push <guibutton
->Start </guibutton
-> to automatically translate messages. You can follow the progress bar and in case, there is always the <guibutton
->Stop</guibutton
-> button. </para>
+<para>In the dialogue, you should specify what to translate and choose the sources for the old translations. </para>
+<para>At the top of the <guilabel>What to translate</guilabel> frame are three checkboxes (<guilabel>Untranslated entries</guilabel>, <guilabel>Fuzzy entries </guilabel>, <guilabel>Translated entries</guilabel>) for specifying the kind of messages you want to translate. Untranslated and fuzzy entries are natural choices for automatic translation, but you can change already translated messages as well. </para>
+<para>The exact matching for <acronym>msgid</acronym>s will always be used for rough translation. However, you can add more strategies, &ie; <guilabel>Allow fuzzy translation (slow)</guilabel> and <guilabel>Allow single word translation</guilabel>. Both of these additional strategies must be supported by the sources used (see below). There is no specification, what does <quote>fuzzy translation</quote> mean, but the purpose is quite obvious. <quote>Single word translation</quote> is suitable for only some of the languages. &kbabel; will try to translate each word in <acronym>msgid</acronym> separately and then put the translated words (or phrases) in the same order in <acronym>msgstr </acronym>. </para>
+<para>As a source for rough translation, any dictionary module available can be used. There is a list of <guilabel>Don't use</guilabel> modules and <guilabel>Use</guilabel> modules. Modules are used in the order in the <guilabel>Use</guilabel> list. First module is asked for translation. If it is not found, next module in the list is asked and so on. You can use the buttons with arrows for moving modules between the lists. Don't forget to change the order to suit your needs by <guibutton>Move Up </guibutton> and <guibutton>Move Down</guibutton> buttons. </para>
+<para>Normally &kbabel; will mark every roughly translated message as fuzzy, because it assumes that any automatic translation needs to be reviewed by a translator. If you are 100% sure that the automatic translation will be correct, or you will review all the translation anyway. <guilabel>Mark changed entries as fuzzy</guilabel> allows you to turn off this automatic fuzzy marking, but you will need to confirm this. </para>
+<para>If you have set all the options to suit your needs, push <guibutton>Start </guibutton> to automatically translate messages. You can follow the progress bar and in case, there is always the <guibutton>Stop</guibutton> button. </para>
 </sect2>
 
 <sect2 id="kbabel-validation">
-<title
->Validate your translation</title>
-<para
->Everyone makes mistakes. So &kbabel; supports a number of checks for typical problems in translations. These checks (not syntax check) can be basically performed in two ways.</para>
-<para
->Checks can be done at each change of the translated text. These are called <emphasis
->automatic</emphasis
-> checks and they can be turned on in <link linkend="preferences-editor"
->the &kbabel; configuration dialogue</link
->. Automatic checking of syntax is possible at each saving of the file. </para>
-<para
->The automatic checks can slow down &kbabel;. If you have a slower computer, you can turn off the automatic checks and use only the second possibility. You can invoke every kind of check from the <menuchoice
-><guimenu
->Tools</guimenu
-><guisubmenu
-> Validation</guisubmenu
-></menuchoice
->. Then the check is performed for all messages in the file and faulty ones are marked as errors. </para>
+<title>Validate your translation</title>
+<para>Everyone makes mistakes. So &kbabel; supports a number of checks for typical problems in translations. These checks (not syntax check) can be basically performed in two ways.</para>
+<para>Checks can be done at each change of the translated text. These are called <emphasis>automatic</emphasis> checks and they can be turned on in <link linkend="preferences-editor">the &kbabel; configuration dialogue</link>. Automatic checking of syntax is possible at each saving of the file. </para>
+<para>The automatic checks can slow down &kbabel;. If you have a slower computer, you can turn off the automatic checks and use only the second possibility. You can invoke every kind of check from the <menuchoice><guimenu>Tools</guimenu><guisubmenu> Validation</guisubmenu></menuchoice>. Then the check is performed for all messages in the file and faulty ones are marked as errors. </para>
 <variablelist>
    <varlistentry>
-     <term
-><guimenuitem
->Check Syntax</guimenuitem
-></term>
+     <term><guimenuitem>Check Syntax</guimenuitem></term>
      <listitem>
-       <para
->This invokes <command
->msgfmt</command
-> to check validity of the PO file as seen by gettext package. It will show the result of the command and mark error <acronym
->msgstr</acronym
->s. </para>
+       <para>This invokes <command>msgfmt</command> to check validity of the PO file as seen by gettext package. It will show the result of the command and mark error <acronym>msgstr</acronym>s. </para>
      </listitem>
    </varlistentry>
    <varlistentry>
-     <term
-><guimenuitem
->Check Arguments</guimenuitem
-></term>
+     <term><guimenuitem>Check Arguments</guimenuitem></term>
      <listitem>
-       <para
->Incorrect translations can crash the application. The most dangerous parts of translation are arguments, &eg; for printf-like functions. This check compares the number and types of the arguments in <acronym
->msgid</acronym
-> and <acronym
->msgstr</acronym
->. They must match. </para>
+       <para>Incorrect translations can crash the application. The most dangerous parts of translation are arguments, &eg; for printf-like functions. This check compares the number and types of the arguments in <acronym>msgid</acronym> and <acronym>msgstr</acronym>. They must match. </para>
      </listitem>
    </varlistentry>
    <varlistentry>
-     <term
-><guimenuitem
->Check Accelerators</guimenuitem
-></term>
+     <term><guimenuitem>Check Accelerators</guimenuitem></term>
      <listitem>
-     <para
->&GUI; text commonly contain accelerators, &ie; letters which can be used for fast access to &GUI; elements by keyboard. They are denoted by special character, &eg; &amp; in &kde;. Typical requirement of the translation is that translated text should contain accelerator as well. This check will notice this problem for you. The accelerator character can be specified in <guilabel
->Preferences</guilabel
-> on <guilabel
->Misc</guilabel
-> tab. </para>
+     <para>&GUI; text commonly contain accelerators, &ie; letters which can be used for fast access to &GUI; elements by keyboard. They are denoted by special character, &eg; &amp; in &kde;. Typical requirement of the translation is that translated text should contain accelerator as well. This check will notice this problem for you. The accelerator character can be specified in <guilabel>Preferences</guilabel> on <guilabel>Misc</guilabel> tab. </para>
      </listitem>
    </varlistentry>
    <varlistentry>
-     <term
-><guimenuitem
->Look for Translated Context Info</guimenuitem
-></term>
+     <term><guimenuitem>Look for Translated Context Info</guimenuitem></term>
      <listitem>
-     <para
->You will probably need this only for &kde; translation. Some of the text are too common and they need to be translated differently in different contexts. In &kde; the context is described at the beginning of <acronym
->msgid</acronym
-> after the special sequence <userinput
->:_</userinput
->. But if some translators are not aware of this convention and they try to translate context information as well. This check will try to find these. If the check founds translated context information, you should remove it. </para>
+     <para>You will probably need this only for &kde; translation. Some of the text are too common and they need to be translated differently in different contexts. In &kde; the context is described at the beginning of <acronym>msgid</acronym> after the special sequence <userinput>:_</userinput>. But if some translators are not aware of this convention and they try to translate context information as well. This check will try to find these. If the check founds translated context information, you should remove it. </para>
      </listitem>
    </varlistentry>
    <varlistentry>
-     <term
-><guimenuitem
->Check Plural Forms</guimenuitem
-></term>
+     <term><guimenuitem>Check Plural Forms</guimenuitem></term>
      <listitem>
-       <para
->If the <acronym
->msgid</acronym
-> is specified as a <quote
->plural form</quote
->, the translation has to contain the correct number of translations separated by <userinput
->\n</userinput
->. The correct number depends on the language of translation and is specified on <guilabel
->Identity</guilabel
-> tab in <guilabel
-> Preferences</guilabel
-> dialogue. This is implemented only for &kde; at the moment. </para>
+       <para>If the <acronym>msgid</acronym> is specified as a <quote>plural form</quote>, the translation has to contain the correct number of translations separated by <userinput>\n</userinput>. The correct number depends on the language of translation and is specified on <guilabel>Identity</guilabel> tab in <guilabel> Preferences</guilabel> dialogue. This is implemented only for &kde; at the moment. </para>
      </listitem>
    </varlistentry>
    <varlistentry>
-     <term
-><guimenuitem
->Check Equations</guimenuitem
-></term>
+     <term><guimenuitem>Check Equations</guimenuitem></term>
      <listitem>
-       <para
->Equations are special format of <acronym
->msgid</acronym
-> typically used in .desktop files. And because your translations will be merged back to these files, <acronym
->msgstr</acronym
-> must use this special format as well. This means that the translation must start (up to the first occurrence of <literal
->=</literal
-> with the same text as the original message, &eg; <userinput
->Name=</userinput
->. </para>
+       <para>Equations are special format of <acronym>msgid</acronym> typically used in .desktop files. And because your translations will be merged back to these files, <acronym>msgstr</acronym> must use this special format as well. This means that the translation must start (up to the first occurrence of <literal>=</literal> with the same text as the original message, &eg; <userinput>Name=</userinput>. </para>
      </listitem>
    </varlistentry>
 </variablelist>
 </sect2>
 
 <sect2 id="kbabel-spellcheck">
-<title
->Spellchecking the translation</title>
-<para
->As always, it is very important to spell-check your translation before using your result. This way you can find typos and other problems in your translation. &kbabel; uses the standard &kde; library for spellchecking and its standard settings can be found in <link linkend="preferences-spellcheck"
->the &kbabel; configuration dialogue</link
->. Spell checking itself can be found in <menuchoice
-><guimenu
->Tools</guimenu
-><guisubmenu
->Spelling</guisubmenu
-> </menuchoice
-> submenu. You can use a number of modes for spell checking: </para>
+<title>Spellchecking the translation</title>
+<para>As always, it is very important to spell-check your translation before using your result. This way you can find typos and other problems in your translation. &kbabel; uses the standard &kde; library for spellchecking and its standard settings can be found in <link linkend="preferences-spellcheck">the &kbabel; configuration dialogue</link>. Spell checking itself can be found in <menuchoice><guimenu>Tools</guimenu><guisubmenu>Spelling</guisubmenu> </menuchoice> submenu. You can use a number of modes for spell checking: </para>
 <variablelist>
    <varlistentry>
-     <term
-><guimenuitem
->Spell check...</guimenuitem
-></term>
+     <term><guimenuitem>Spell check...</guimenuitem></term>
      <listitem>
-       <para
->This is a generic invocation of a dialogue where you can choose the spellchecking mode and set the default mode. This is invoked by pressing <keycombo action="simul"
->&Ctrl;<keycap
->I</keycap
-> </keycombo
->. </para>
+       <para>This is a generic invocation of a dialogue where you can choose the spellchecking mode and set the default mode. This is invoked by pressing <keycombo action="simul">&Ctrl;<keycap>I</keycap> </keycombo>. </para>
      </listitem>
    </varlistentry>
    <varlistentry>
-     <term
-><guimenuitem
->Check All...</guimenuitem
-></term>
+     <term><guimenuitem>Check All...</guimenuitem></term>
      <listitem>
-       <para
->Spellcheck all messages in the file. </para>
+       <para>Spellcheck all messages in the file. </para>
      </listitem>
    </varlistentry>
    <varlistentry>
-     <term
-><guimenuitem
->Check from Cursor Position...</guimenuitem
-></term>
+     <term><guimenuitem>Check from Cursor Position...</guimenuitem></term>
      <listitem>
-       <para
->Start spellchecking at the position in the current message and progress towards the end of the file. </para>
+       <para>Start spellchecking at the position in the current message and progress towards the end of the file. </para>
      </listitem>
    </varlistentry>
    <varlistentry>
-     <term
-><guimenuitem
->Check Current...</guimenuitem
-></term>
+     <term><guimenuitem>Check Current...</guimenuitem></term>
      <listitem>
-       <para
->Spellcheck the current message only. </para>
+       <para>Spellcheck the current message only. </para>
      </listitem>
    </varlistentry>
    <varlistentry>
-     <term
-><guimenuitem
->Check Selected Text...</guimenuitem
-></term>
+     <term><guimenuitem>Check Selected Text...</guimenuitem></term>
      <listitem>
-       <para
->If there is a selected text in <acronym
->msgstr</acronym
-> editor, this option is available and will spellcheck this text only. </para>
+       <para>If there is a selected text in <acronym>msgstr</acronym> editor, this option is available and will spellcheck this text only. </para>
      </listitem>
    </varlistentry>
 </variablelist>
 </sect2>
 
 <sect2 id="kbabel-tags">
-<title
->Translating &XML;, <acronym
->HTML</acronym
->, ...</title>
-<para
->Markup languages are used more and more in &GUI;. &kde; project also uses <acronym
->PO</acronym
->-files for translating DocBook documentation files (which is also a markup language). &kbabel; contains quite a lot of functionality to support this trend. </para>
+<title>Translating &XML;, <acronym>HTML</acronym>, ...</title>
+<para>Markup languages are used more and more in &GUI;. &kde; project also uses <acronym>PO</acronym>-files for translating DocBook documentation files (which is also a markup language). &kbabel; contains quite a lot of functionality to support this trend. </para>
 <note>
-<para
->Here, we will describe only functions related to tags used for markup itself. The other problem introduced by using markup languages is translation of longer texts. This issue is addressed by the <emphasis
->diff</emphasis
-> feature described in <link linkend="kbabel-diff"
->the following section</link
->. </para>
+<para>Here, we will describe only functions related to tags used for markup itself. The other problem introduced by using markup languages is translation of longer texts. This issue is addressed by the <emphasis>diff</emphasis> feature described in <link linkend="kbabel-diff">the following section</link>. </para>
 </note>
-<para
->The current version of &kbabel; is capable to find out which tags are used in <acronym
->msgid</acronym
-> and provide an easy access to them using following actions from the <guimenu
->Edit</guimenu
->: </para>
+<para>The current version of &kbabel; is capable to find out which tags are used in <acronym>msgid</acronym> and provide an easy access to them using following actions from the <guimenu>Edit</guimenu>: </para>
 
 <variablelist>
 <varlistentry>
     <term>
-        <guimenuitem
->Insert Next Tag</guimenuitem>
+        <guimenuitem>Insert Next Tag</guimenuitem>
     </term>
     <listitem>
       <para>
-        <action
->This inserts next tag found in msgid to the translation. &kbabel; finds the tag to be inserted by counting the number of tags from the beginning of the translation. </action>
+        <action>This inserts next tag found in msgid to the translation. &kbabel; finds the tag to be inserted by counting the number of tags from the beginning of the translation. </action>
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
     <term>
-      <menuchoice
-><guimenu
->Edit</guimenu
-> <guisubmenu
->Insert Tag</guisubmenu
-> </menuchoice>
+      <menuchoice><guimenu>Edit</guimenu> <guisubmenu>Insert Tag</guisubmenu> </menuchoice>
     </term>
     <listitem>
       <para>
-        <action
->This submenu contains all different markup tags found in original english string. By selecting a tag you can insert it at the current position of cursor in translated text. translation. </action>
+        <action>This submenu contains all different markup tags found in original english string. By selecting a tag you can insert it at the current position of cursor in translated text. translation. </action>
       </para>
     </listitem>
   </varlistentry>
@@ -862,142 +338,50 @@
 </sect2>
 
 <sect2 id="kbabel-diff">
-<title
->Showing the difference</title>
-<para
->As explained already, current applications, trying to be user friendly, contain a lot of longer descriptive texts, including markup. If a developer changes a part of the text, the &GNU; gettext system will, in the best case, retain the old translation and mark it as fuzzy. (In the worst case you will lose the translation completely, depending on the size of the text changes). This works OK, if a <acronym
->msgid</acronym
-> is short, because then you can find the changes quickly. But if the text is long enough, you will struggle to find out what has been changed (For example, it can be only an article change by proof-reading team.) </para>
-<para
->To help, &kbabel; can be asked to lookup the original <acronym
->msgid</acronym
-> and to show the difference. The changes are graphically displayed in the <guilabel
->Original String</guilabel
-> window. The exact method can be set in the <link linkend="preferences-editor-appearance"
->&kbabel; configuration dialogue</link
->. <menuchoice
-><guimenu
->Tools</guimenu
-> <guisubmenu
->Diff</guisubmenu
-> <guimenuitem
->Show Diff</guimenuitem
-> </menuchoice
-> will show the differences found. To see the current text without the mixture of original text and differences, use <menuchoice
-><guimenu
->Tools</guimenu
-> <guisubmenu
->Diff</guisubmenu
-> <guimenuitem
->Show Original Text</guimenuitem
-> </menuchoice
->. </para>
-<para
->You can turn automatic lookup of difference on and off by choosing <menuchoice
-><guimenu
->Tools</guimenu
-> <guisubmenu
->Diff</guisubmenu
-> <guimenuitem
->Diff Mode</guimenuitem
-> </menuchoice
->. When the diff mode is on, difference searching starts when you go to another message. </para>
-<para
->As always, you can use different sources for finding the old version of the text, all being set in in <link linkend="preferences-diffmode"
->&kbabel; configuration dialogue</link
->: </para>
+<title>Showing the difference</title>
+<para>As explained already, current applications, trying to be user friendly, contain a lot of longer descriptive texts, including markup. If a developer changes a part of the text, the &GNU; gettext system will, in the best case, retain the old translation and mark it as fuzzy. (In the worst case you will lose the translation completely, depending on the size of the text changes). This works OK, if a <acronym>msgid</acronym> is short, because then you can find the changes quickly. But if the text is long enough, you will struggle to find out what has been changed (For example, it can be only an article change by proof-reading team.) </para>
+<para>To help, &kbabel; can be asked to lookup the original <acronym>msgid</acronym> and to show the difference. The changes are graphically displayed in the <guilabel>Original String</guilabel> window. The exact method can be set in the <link linkend="preferences-editor-appearance">&kbabel; configuration dialogue</link>. <menuchoice><guimenu>Tools</guimenu> <guisubmenu>Diff</guisubmenu> <guimenuitem>Show Diff</guimenuitem> </menuchoice> will show the differences found. To see the current text without the mixture of original text and differences, use <menuchoice><guimenu>Tools</guimenu> <guisubmenu>Diff</guisubmenu> <guimenuitem>Show Original Text</guimenuitem> </menuchoice>. </para>
+<para>You can turn automatic lookup of difference on and off by choosing <menuchoice><guimenu>Tools</guimenu> <guisubmenu>Diff</guisubmenu> <guimenuitem>Diff Mode</guimenuitem> </menuchoice>. When the diff mode is on, difference searching starts when you go to another message. </para>
+<para>As always, you can use different sources for finding the old version of the text, all being set in in <link linkend="preferences-diffmode">&kbabel; configuration dialogue</link>: </para>
 <variablelist>
    <varlistentry>
-     <term
->Translation Database</term>
+     <term>Translation Database</term>
      <listitem>
-       <para
->You can use Translation Database for difference lookup. We strongly recommend to turn on the automatic storing of the newly translated messages into Translation Database in <link linkend="database-fill"
-> Translation Database configuration dialogue</link
->. This mode can be turned on by <guilabel
->Use messages from Translation Database</guilabel
->. </para>
+       <para>You can use Translation Database for difference lookup. We strongly recommend to turn on the automatic storing of the newly translated messages into Translation Database in <link linkend="database-fill"> Translation Database configuration dialogue</link>. This mode can be turned on by <guilabel>Use messages from Translation Database</guilabel>. </para>
      </listitem>
    </varlistentry>
    <varlistentry>
-     <term
->Tree of the old files</term>
+     <term>Tree of the old files</term>
      <listitem>
-       <para
->This will be used only if searching in Translation Database is turned off. By setting <guilabel
->Base folder for diff files</guilabel
-> you can navigate &kbabel;, which file to use for difference. It takes the relative path of the opened file and uses this relative path in the folder specified here. If there is a corresponding file, it will be used. To use this mode, you should make a copy of old files before each update. </para>
+       <para>This will be used only if searching in Translation Database is turned off. By setting <guilabel>Base folder for diff files</guilabel> you can navigate &kbabel;, which file to use for difference. It takes the relative path of the opened file and uses this relative path in the folder specified here. If there is a corresponding file, it will be used. To use this mode, you should make a copy of old files before each update. </para>
      </listitem>
    </varlistentry>
    <varlistentry>
-     <term
->Manually chosen file</term>
+     <term>Manually chosen file</term>
      <listitem>
-       <para
->If the previous possibility does not work, correctly, you can always set the difference file manually by choosing <menuchoice
-> <guimenu
->Tools</guimenu
-><guisubmenu
->Diff</guisubmenu
-> <guimenuitem
->Open File for Diff</guimenuitem
-></menuchoice
->. </para>
+       <para>If the previous possibility does not work, correctly, you can always set the difference file manually by choosing <menuchoice> <guimenu>Tools</guimenu><guisubmenu>Diff</guisubmenu> <guimenuitem>Open File for Diff</guimenuitem></menuchoice>. </para>
      </listitem>
    </varlistentry>
 </variablelist>
 <note>
-<para
->The difference lookup is not always accurate, because the <acronym
->PO</acronym
->-file does not contain any reference to the original message. </para>
+<para>The difference lookup is not always accurate, because the <acronym>PO</acronym>-file does not contain any reference to the original message. </para>
 </note>
 </sect2>
 
 </sect1>
 
 <sect1 id="kbabel-pluralforms">
-<title
->Plural Forms</title>
-<para
->Because plural forms are quite a complicated issue, we devote a special section for their suport in &kbabel;. </para>
-<para
->&kbabel; can read the &GNU; plural forms only, but cannot edit them. It only supports the &kde; version of plural forms at the moment. </para>
-<para
->Every language to which &kde; is translated must have set a correct number of plural forms. This is done by translating an entry in <filename
->tdelibs.po</filename
->. The number is set by selecting the name of a language, which uses the same number and <emphasis
->rules</emphasis
-> for finding the right plural form. The up-to-date list of possible values can be found in the tdelibs source code, in the file <filename
->tdecore/tdelocale.cpp</filename
->. </para>
-<para
->&kde; plural forms are denoted by comment <userinput
->_:</userinput
-> containing the <literal
->%n</literal
-> argument. This argument is then used in the message itself and it controls which plural form of your language should be used depending on the rules for your language. </para>
-<para
->The translation of a plural form message has to have a special format. It must contain the correct number of translations (one for each plural form) separated by an end of the line <literal
->\n</literal
->. For example, <quote
->Selected %n files</quote
-> translated to Slovak would be: </para>
-<programlisting
->Vybraný %n súbor\n
+<title>Plural Forms</title>
+<para>Because plural forms are quite a complicated issue, we devote a special section for their suport in &kbabel;. </para>
+<para>&kbabel; can read the &GNU; plural forms only, but cannot edit them. It only supports the &kde; version of plural forms at the moment. </para>
+<para>Every language to which &kde; is translated must have set a correct number of plural forms. This is done by translating an entry in <filename>tdelibs.po</filename>. The number is set by selecting the name of a language, which uses the same number and <emphasis>rules</emphasis> for finding the right plural form. The up-to-date list of possible values can be found in the tdelibs source code, in the file <filename>tdecore/tdelocale.cpp</filename>. </para>
+<para>&kde; plural forms are denoted by comment <userinput>_:</userinput> containing the <literal>%n</literal> argument. This argument is then used in the message itself and it controls which plural form of your language should be used depending on the rules for your language. </para>
+<para>The translation of a plural form message has to have a special format. It must contain the correct number of translations (one for each plural form) separated by an end of the line <literal>\n</literal>. For example, <quote>Selected %n files</quote> translated to Slovak would be: </para>
+<programlisting>Vybraný %n súbor\n
 Vybrané %n súbory\n
 Vybraných %n súborov
 </programlisting>
-<para
->To check if your translation contains the correct number of plural forms, use the <menuchoice
-><guimenu
->Tools</guimenu
-> <guisubmenu
->Validation </guisubmenu
-> <guimenuitem
->Check Plural Forms (KDE only)</guimenuitem
-> </menuchoice
-> menu. </para>
+<para>To check if your translation contains the correct number of plural forms, use the <menuchoice><guimenu>Tools</guimenu> <guisubmenu>Validation </guisubmenu> <guimenuitem>Check Plural Forms (KDE only)</guimenuitem> </menuchoice> menu. </para>
 </sect1>
 </chapter>
 
diff --git a/tde-i18n-en_GB/docs/tdesdk/kbugbuster/index.docbook b/tde-i18n-en_GB/docs/tdesdk/kbugbuster/index.docbook
index 1b59451fa02..937becd8f11 100644
--- a/tde-i18n-en_GB/docs/tdesdk/kbugbuster/index.docbook
+++ b/tde-i18n-en_GB/docs/tdesdk/kbugbuster/index.docbook
@@ -9,43 +9,16 @@
 <book lang="&language;">
 
 <bookinfo>
-<title
->The &kbugbuster; Handbook</title>
+<title>The &kbugbuster; Handbook</title>
 
 <authorgroup>
-<author
-><firstname
-></firstname
-> <othername
-></othername
-> <surname
-></surname
-> <affiliation
-> <address
-><email
-></email
-></address>
+<author><firstname></firstname> <othername></othername> <surname></surname> <affiliation> <address><email></email></address>
 </affiliation>
 </author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<legalnotice
->&FDLNotice;</legalnotice>
+<legalnotice>&FDLNotice;</legalnotice>
 
 <!-- Date and version information of the documentation
 Don't forget to include this last date and this last revision number, we
@@ -53,44 +26,24 @@ need them for translation coordination !
 Please respect the format of the date (DD/MM/YYYY) and of the version
 (Major.minor.lesser), it could be used by automation scripts -->
 
-<date
->2002-03-31</date>
-<releaseinfo
->0.00.00</releaseinfo>
+<date>2002-03-31</date>
+<releaseinfo>0.00.00</releaseinfo>
 
 <!-- Abstract about this handbook -->
 
 <abstract>
-<para
->&kbugbuster; is part of the tdesdk package. </para>
+<para>&kbugbuster; is part of the tdesdk package. </para>
 </abstract>
 
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->kbugbuster</keyword>
+<keyword>KDE</keyword>
+<keyword>kbugbuster</keyword>
 </keywordset>
 
 </bookinfo>
 
-<chapter id="introduction"
-> <title
->Introduction</title
-> <para
->The documentation for &kappname; was not finished when &kde; was installed on this computer.</para
-> <para
->If you need help, please check <ulink url="http://www.kde.org"
->The &kde; Website</ulink
-> for updates, or by submitting your question to <ulink url="mailto:kde-user@kde.org"
->The &kde; User Mailing list</ulink
->.</para
-> <para
-><emphasis
->The &kde; Team</emphasis
-></para
-> &underFDL; </chapter>
+<chapter id="introduction"> <title>Introduction</title> <para>The documentation for &kappname; was not finished when &kde; was installed on this computer.</para> <para>If you need help, please check <ulink url="http://www.kde.org">The &kde; Website</ulink> for updates, or by submitting your question to <ulink url="mailto:kde-user@kde.org">The &kde; User Mailing list</ulink>.</para> <para><emphasis>The &kde; Team</emphasis></para> &underFDL; </chapter>
 
 &documentation.index; 
 </book>
diff --git a/tde-i18n-en_GB/docs/tdesdk/kompare/index.docbook b/tde-i18n-en_GB/docs/tdesdk/kompare/index.docbook
index b44f14de61f..c8845c138a5 100644
--- a/tde-i18n-en_GB/docs/tdesdk/kompare/index.docbook
+++ b/tde-i18n-en_GB/docs/tdesdk/kompare/index.docbook
@@ -9,43 +9,16 @@
 <book lang="&language;">
 
 <bookinfo>
-<title
->The &kompare; Handbook</title>
+<title>The &kompare; Handbook</title>
 
 <authorgroup>
-<author
-><firstname
-></firstname
-> <othername
-></othername
-> <surname
-></surname
-> <affiliation
-> <address
-><email
-></email
-></address>
+<author><firstname></firstname> <othername></othername> <surname></surname> <affiliation> <address><email></email></address>
 </affiliation>
 </author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<legalnotice
->&FDLNotice;</legalnotice>
+<legalnotice>&FDLNotice;</legalnotice>
 
 <!-- Date and version information of the documentation
 Don't forget to include this last date and this last revision number, we
@@ -53,44 +26,24 @@ need them for translation coordination !
 Please respect the format of the date (DD/MM/YYYY) and of the version
 (Major.minor.lesser), it could be used by automation scripts -->
 
-<date
->2002-12-16</date>
-<releaseinfo
->0.00.00</releaseinfo>
+<date>2002-12-16</date>
+<releaseinfo>0.00.00</releaseinfo>
 
 <!-- Abstract about this handbook -->
 
 <abstract>
-<para
->&kompare; is a program to view the differences between files. </para>
+<para>&kompare; is a program to view the differences between files. </para>
 </abstract>
 
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->Kompare</keyword>
+<keyword>KDE</keyword>
+<keyword>Kompare</keyword>
 </keywordset>
 
 </bookinfo>
 
-<chapter id="introduction"
-> <title
->Introduction</title
-> <para
->The documentation for &kappname; was not finished when &kde; was installed on this computer.</para
-> <para
->If you need help, please check <ulink url="http://www.kde.org"
->The &kde; Website</ulink
-> for updates, or by submitting your question to <ulink url="mailto:kde-user@kde.org"
->The &kde; User Mailing list</ulink
->.</para
-> <para
-><emphasis
->The &kde; Team</emphasis
-></para
-> &underFDL; </chapter>
+<chapter id="introduction"> <title>Introduction</title> <para>The documentation for &kappname; was not finished when &kde; was installed on this computer.</para> <para>If you need help, please check <ulink url="http://www.kde.org">The &kde; Website</ulink> for updates, or by submitting your question to <ulink url="mailto:kde-user@kde.org">The &kde; User Mailing list</ulink>.</para> <para><emphasis>The &kde; Team</emphasis></para> &underFDL; </chapter>
 
 &documentation.index; 
 </book>
diff --git a/tde-i18n-en_GB/docs/tdesdk/tdecachegrind/index.docbook b/tde-i18n-en_GB/docs/tdesdk/tdecachegrind/index.docbook
index 443be3d40cd..10f44686ac9 100644
--- a/tde-i18n-en_GB/docs/tdesdk/tdecachegrind/index.docbook
+++ b/tde-i18n-en_GB/docs/tdesdk/tdecachegrind/index.docbook
@@ -1,23 +1,11 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY tdecachegrind '<application
->KCachegrind</application
->'>
-  <!ENTITY cachegrind "<application
->Cachegrind</application
->">
-  <!ENTITY calltree "<application
->Calltree</application
->">
-  <!ENTITY callgrind "<application
->Callgrind</application
->">
-  <!ENTITY valgrind "<application
->Valgrind</application
->">
-  <!ENTITY oprofile "<application
->OProfile</application
->">
+  <!ENTITY tdecachegrind '<application>KCachegrind</application>'>
+  <!ENTITY cachegrind "<application>Cachegrind</application>">
+  <!ENTITY calltree "<application>Calltree</application>">
+  <!ENTITY callgrind "<application>Callgrind</application>">
+  <!ENTITY valgrind "<application>Valgrind</application>">
+  <!ENTITY oprofile "<application>OProfile</application>">
   <!ENTITY kappname "&tdecachegrind;">
   <!ENTITY package "tdesdk">
   <!ENTITY % addindex "IGNORE">
@@ -29,167 +17,96 @@
 <book lang="&language;">
 
 <bookinfo>
-<title
->The &tdecachegrind; Handbook</title>
+<title>The &tdecachegrind; Handbook</title>
 
 <authorgroup>
-<author
-><firstname
->Josef</firstname
-> <surname
->Weidendorfer</surname
-> <affiliation
-> <address
-><email
->Josef.Weidendorfer@gmx.de</email
-></address>
+<author><firstname>Josef</firstname> <surname>Weidendorfer</surname> <affiliation> <address><email>Josef.Weidendorfer@gmx.de</email></address>
 </affiliation>
 </author>
 
-<othercredit role="translator"
-><firstname
->Andrew</firstname
-><surname
->Coles</surname
-><affiliation
-><address
-><email
->andrew_coles@yahoo.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Andrew</firstname><surname>Coles</surname><affiliation><address><email>andrew_coles@yahoo.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 
 </authorgroup>
 
 <copyright>
-<year
->2002-2004</year>
-<holder
->Josef Weidendorfer</holder>
+<year>2002-2004</year>
+<holder>Josef Weidendorfer</holder>
 </copyright>
-<legalnotice
->&FDLNotice;</legalnotice>
+<legalnotice>&FDLNotice;</legalnotice>
 
-<date
->2004-07-27</date>
-<releaseinfo
->0.4.6</releaseinfo>
+<date>2004-07-27</date>
+<releaseinfo>0.4.6</releaseinfo>
 
 <abstract>
-<para
->&tdecachegrind; is a profile data visualisation tool, written using the &kde; environment. </para>
+<para>&tdecachegrind; is a profile data visualisation tool, written using the &kde; environment. </para>
 </abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->tdesdk</keyword>
-<keyword
->Cachegrind</keyword>
-<keyword
->Callgrind</keyword>
-<keyword
->Valgrind</keyword>
-<keyword
->Profiling</keyword>
+<keyword>KDE</keyword>
+<keyword>tdesdk</keyword>
+<keyword>Cachegrind</keyword>
+<keyword>Callgrind</keyword>
+<keyword>Valgrind</keyword>
+<keyword>Profiling</keyword>
 </keywordset>
 
 </bookinfo>
 
 
 <chapter id="introduction">
-<title
->Introduction</title>
+<title>Introduction</title>
 
-<para
->&kappname; is a browser for data produced by profiling tools. This chapter explains what profiling is for, how it is done, and gives some examples of profiling tools available. </para>
+<para>&kappname; is a browser for data produced by profiling tools. This chapter explains what profiling is for, how it is done, and gives some examples of profiling tools available. </para>
 
 <sect1 id="introduction-profiling">
-<title
->Profiling</title>
+<title>Profiling</title>
 
-<para
->When developing a program, one of the last steps often involves performance optimisations. As it makes no sense to optimise functions rarely used, because that would be a waste of time, one needs to know in which part of a program most of the time is spent. </para>
+<para>When developing a program, one of the last steps often involves performance optimisations. As it makes no sense to optimise functions rarely used, because that would be a waste of time, one needs to know in which part of a program most of the time is spent. </para>
 
-<para
->For sequential code, collecting statistical data of the programs runtime characteristic like time numbers spent in functions and code lines usually is enough. This is called Profiling. The program is run under control of a profiling tool, which gives the summary of an execution run at the end. In contrast, for parallel code, performance problems typically are caused when one processor is waiting for data from another. As this waiting time usually can not easily attributed, here it is better to generate timestamped event traces. KCachegrind can not visualise this kind of data. </para>
+<para>For sequential code, collecting statistical data of the programs runtime characteristic like time numbers spent in functions and code lines usually is enough. This is called Profiling. The program is run under control of a profiling tool, which gives the summary of an execution run at the end. In contrast, for parallel code, performance problems typically are caused when one processor is waiting for data from another. As this waiting time usually can not easily attributed, here it is better to generate timestamped event traces. KCachegrind can not visualise this kind of data. </para>
 
-<para
->After analysing the produced profile data, it should be easy to see the hot spots and bottlenecks of the code: for example, assumptions about call counts can be checked, and identified code regions can be optimised. Afterwards, the success of the optimisation should be verified with another profile run. </para>
+<para>After analysing the produced profile data, it should be easy to see the hot spots and bottlenecks of the code: for example, assumptions about call counts can be checked, and identified code regions can be optimised. Afterwards, the success of the optimisation should be verified with another profile run. </para>
 </sect1>
 
 <sect1 id="introduction-methods">
-<title
->Profiling Methods</title>
+<title>Profiling Methods</title>
 
-<para
->To exactly measure the time passed or record the events happening during the execution of a code region (e.g. a function), additional measurement code needs to be inserted before and after the given region. This code reads the time, or a global event count, and calculates differences. Thus, the original code has to be changed before execution. This is called instrumentation. Instrumentation can be done by the programmer itself, the compiler, or by the runtime system. As interesting regions usually are nested, the overhead of measurement always influences the measurement itself. Thus, instrumentation should be done selectively and results have to be interpreted with care. Of course, this makes performance analysis by exact measurement a very complex process.</para>
+<para>To exactly measure the time passed or record the events happening during the execution of a code region (e.g. a function), additional measurement code needs to be inserted before and after the given region. This code reads the time, or a global event count, and calculates differences. Thus, the original code has to be changed before execution. This is called instrumentation. Instrumentation can be done by the programmer itself, the compiler, or by the runtime system. As interesting regions usually are nested, the overhead of measurement always influences the measurement itself. Thus, instrumentation should be done selectively and results have to be interpreted with care. Of course, this makes performance analysis by exact measurement a very complex process.</para>
 
-<para
->Exact measurement is possible because of hardware counters (including counters incrementing on a time tick) provided in modern processors, which are incremented whenever an event is happening. As we want to attribute events to code regions, without the counters, we would have to handle every event by incrementing a counter for the current code region ourself. Doing this in software is, of course, not possible; but, on the assumption that the event distribution over source code is similar when looking only at every n-th event instead of every event, a measurement method whose overhead is tunable has been developed: it is called Sampling. Time Based Sampling (TBS) uses a timer to regularly look at the program counter to create a histogram over the program code. Event Based Sampling (EBS) exploits the hardware counters of modern processors, and uses a mode where an interrupt handler is called on counter underflow to generate a histogram of the corresponding event distribution: in the handler, the event counter is always reinitialised to the 'n' of the sampling method. The advantage of sampling is that the code does not have to be changed, but it is still a compromise: the above assumption will be more correct if n is small, but the smaller the n, the higher the overhead of the interrupt handler.</para>
+<para>Exact measurement is possible because of hardware counters (including counters incrementing on a time tick) provided in modern processors, which are incremented whenever an event is happening. As we want to attribute events to code regions, without the counters, we would have to handle every event by incrementing a counter for the current code region ourself. Doing this in software is, of course, not possible; but, on the assumption that the event distribution over source code is similar when looking only at every n-th event instead of every event, a measurement method whose overhead is tunable has been developed: it is called Sampling. Time Based Sampling (TBS) uses a timer to regularly look at the program counter to create a histogram over the program code. Event Based Sampling (EBS) exploits the hardware counters of modern processors, and uses a mode where an interrupt handler is called on counter underflow to generate a histogram of the corresponding event distribution: in the handler, the event counter is always reinitialised to the 'n' of the sampling method. The advantage of sampling is that the code does not have to be changed, but it is still a compromise: the above assumption will be more correct if n is small, but the smaller the n, the higher the overhead of the interrupt handler.</para>
 
-<para
->Another measurement method is to simulate things happening in the computer system when executing a given code, i.e. execution driven simulation. The simulation is always derived from a more or less accurate machine model; however, with very detailed machine models, giving very close approximations to reality, the simulation time can be unacceptably high in practise. The advantage of simulation is that arbitrarily complex measurement/simulation code can be inserted in a given code without perturbing results. Doing this directly before execution (called runtime instrumentation), using the original binary, is very comfortable for the user: no re-compilation is necessary. Simulation becomes usable when simulating only parts of a machine with a simple model; another advantage is that the results produced by simple models are often easier to understand: often, the problem with real hardware is that results include overlapping effects from different parts of the machine.</para>
+<para>Another measurement method is to simulate things happening in the computer system when executing a given code, i.e. execution driven simulation. The simulation is always derived from a more or less accurate machine model; however, with very detailed machine models, giving very close approximations to reality, the simulation time can be unacceptably high in practise. The advantage of simulation is that arbitrarily complex measurement/simulation code can be inserted in a given code without perturbing results. Doing this directly before execution (called runtime instrumentation), using the original binary, is very comfortable for the user: no re-compilation is necessary. Simulation becomes usable when simulating only parts of a machine with a simple model; another advantage is that the results produced by simple models are often easier to understand: often, the problem with real hardware is that results include overlapping effects from different parts of the machine.</para>
 </sect1>
 
 <sect1 id="introduction-tools">
-<title
->Profiling Tools</title>
-
-<para
->Most known is the GCC profiling tool <application
->gprof</application
->: One needs to compile the program with option <option
->-pg</option
->; running the program generates a file <filename
->gmon.out</filename
->, which can be transformed into human-readable form with <command
->gprof</command
->. One disadvantage is the needed re-compilation step to prepare the executable, which has to be statically linked. The method used here is compiler-generated instrumention - which measures call arcs happening among functions and corresponding call counts - in conjunction with TBS - which gives a histogram of time distribution over the code. Using both pieces of information, it is possible to heuristically calculate inclusive time of functions, i.e. time spent in a function together with all functions called from it. </para>
-
-<para
->For exact measurement of events happening, libraries exist with functions able to read out hardware performance counters. Most known here is the PerfCtr patch for Linux, and the architecture independent libraries PAPI and PCL. Still, exact measurement needs instrumentation of code, as stated above. Either one uses the libraries itself or uses automatic instrumentation systems like ADAPTOR (for FORTRAN source instrumentation) or DynaProf (code injection via DynInst).</para>
-
-<para
->&oprofile; is a system-wide profiling tool for Linux using Sampling.</para>
-
-<para
->In many aspects, a comfortable way of Profiling is using Cachegrind or Callgrind, which are simulators using the runtime instrumentation framework &valgrind;. Because there is no need to access hardware counters (often difficult with today's Linux installations), and binaries to be profiled can be left unmodified, it is a good alternative to other profiling tools. The disadvantage of simulation - slowdown - can be reduced by doing the simulation on only the interesting program parts, and perhaps only on a few iterations of a loop. Without measurement/simulation instrumentation, Valgrind's usage only has a slowdown factor in the range of 3 to 5. Also, when only the call graph and call counts are of interest, the cache simulator can be switched off. </para>
-
-<para
->Cache simulation is the first step in approximating real times; as ,on modern systems, runtime is very sensitive to the exploitation of so called caches (small and fast buffers which accelerate repeated accesses to the same main memory cells.) &cachegrind; does cache simulation by catching memory accesses. The data produced includes the number of instruction/data memory accesses and 1st/2nd level cache misses, and relates it to source lines and functions of the run program. By combining these miss counts, using miss latencies from typical processors, an estimation of spent time can be given. </para>
-
-<para
->Callgrind is an extension of &cachegrind; that builds up the call graph of a program on-the-fly, &ie; how the functions call each other and how many events happen while running a function. Also, the profile data to be collected can separated by threads and call chain contexts. It can provide profiling data on an instruction level to allow for annotation of disassembled code. </para>
+<title>Profiling Tools</title>
+
+<para>Most known is the GCC profiling tool <application>gprof</application>: One needs to compile the program with option <option>-pg</option>; running the program generates a file <filename>gmon.out</filename>, which can be transformed into human-readable form with <command>gprof</command>. One disadvantage is the needed re-compilation step to prepare the executable, which has to be statically linked. The method used here is compiler-generated instrumention - which measures call arcs happening among functions and corresponding call counts - in conjunction with TBS - which gives a histogram of time distribution over the code. Using both pieces of information, it is possible to heuristically calculate inclusive time of functions, i.e. time spent in a function together with all functions called from it. </para>
+
+<para>For exact measurement of events happening, libraries exist with functions able to read out hardware performance counters. Most known here is the PerfCtr patch for Linux, and the architecture independent libraries PAPI and PCL. Still, exact measurement needs instrumentation of code, as stated above. Either one uses the libraries itself or uses automatic instrumentation systems like ADAPTOR (for FORTRAN source instrumentation) or DynaProf (code injection via DynInst).</para>
+
+<para>&oprofile; is a system-wide profiling tool for Linux using Sampling.</para>
+
+<para>In many aspects, a comfortable way of Profiling is using Cachegrind or Callgrind, which are simulators using the runtime instrumentation framework &valgrind;. Because there is no need to access hardware counters (often difficult with today's Linux installations), and binaries to be profiled can be left unmodified, it is a good alternative to other profiling tools. The disadvantage of simulation - slowdown - can be reduced by doing the simulation on only the interesting program parts, and perhaps only on a few iterations of a loop. Without measurement/simulation instrumentation, Valgrind's usage only has a slowdown factor in the range of 3 to 5. Also, when only the call graph and call counts are of interest, the cache simulator can be switched off. </para>
+
+<para>Cache simulation is the first step in approximating real times; as ,on modern systems, runtime is very sensitive to the exploitation of so called caches (small and fast buffers which accelerate repeated accesses to the same main memory cells.) &cachegrind; does cache simulation by catching memory accesses. The data produced includes the number of instruction/data memory accesses and 1st/2nd level cache misses, and relates it to source lines and functions of the run program. By combining these miss counts, using miss latencies from typical processors, an estimation of spent time can be given. </para>
+
+<para>Callgrind is an extension of &cachegrind; that builds up the call graph of a program on-the-fly, &ie; how the functions call each other and how many events happen while running a function. Also, the profile data to be collected can separated by threads and call chain contexts. It can provide profiling data on an instruction level to allow for annotation of disassembled code. </para>
 </sect1>
 
 <sect1 id="introduction-visualization">
-<title
->Visualisation</title>
+<title>Visualisation</title>
 
-<para
->Profiling tools typically produce a large amount of data. The wish to easily browse down and up the call graph, together with fast switching of the sorting mode of functions and display of different event types, motivates a GUI application to accomplish this task. </para>
+<para>Profiling tools typically produce a large amount of data. The wish to easily browse down and up the call graph, together with fast switching of the sorting mode of functions and display of different event types, motivates a GUI application to accomplish this task. </para>
 
-<para
->&kappname; is an visualisation for profile data fulfilling these wishes. Despite being programmed first with browsing the data from &cachegrind; and &calltree; in mind, there are converters available to be able to display profile data produced by other tools. In the appendix, a description of the Cachegrind/Callgrind file format is given. </para>
+<para>&kappname; is an visualisation for profile data fulfilling these wishes. Despite being programmed first with browsing the data from &cachegrind; and &calltree; in mind, there are converters available to be able to display profile data produced by other tools. In the appendix, a description of the Cachegrind/Callgrind file format is given. </para>
 
-<para
->Besides a list of functions sorted according exclusive or inclusive cost metrics, and optionally grouped by source file, shared library or C++ class, &kappname; features various visualisation views for a selected function, namely <itemizedlist>
-<listitem
-><para
->a call-graph view, which shows a section of the call graph around the selected function,</para>
+<para>Besides a list of functions sorted according exclusive or inclusive cost metrics, and optionally grouped by source file, shared library or C++ class, &kappname; features various visualisation views for a selected function, namely <itemizedlist>
+<listitem><para>a call-graph view, which shows a section of the call graph around the selected function,</para>
 </listitem>
-<listitem
-><para
->a tree-map view, which allows nested-call relations to be visualised, together with inclusive cost metric for fast visual detection of problematic functions,</para>
+<listitem><para>a tree-map view, which allows nested-call relations to be visualised, together with inclusive cost metric for fast visual detection of problematic functions,</para>
 </listitem>
-<listitem
-><para
->source code and disassembler annotation views, allowing to see details of cost related to source lines and assembler instructions.</para>
+<listitem><para>source code and disassembler annotation views, allowing to see details of cost related to source lines and assembler instructions.</para>
 </listitem>
 </itemizedlist>
 
@@ -198,409 +115,193 @@
 </chapter>
 
 <chapter id="using-tdecachegrind">
-<title
->Using &tdecachegrind;</title>
+<title>Using &tdecachegrind;</title>
 
 <sect1 id="using-profile">
-<title
->Generate Data to Visualise</title>
+<title>Generate Data to Visualise</title>
 
-<para
->First, one wants to generate performance data by measuring aspects of the runtime characteristics of an application, using a profiling tool. &tdecachegrind; itself does not include any profiling tool, but is good in being used together with &callgrind;, and by using a converter, also can be used to visualise data produced with &oprofile;. Although the scope of this manual is not to document profiling with these tools, the next section provides short quickstart tutorials to get you started. </para>
+<para>First, one wants to generate performance data by measuring aspects of the runtime characteristics of an application, using a profiling tool. &tdecachegrind; itself does not include any profiling tool, but is good in being used together with &callgrind;, and by using a converter, also can be used to visualise data produced with &oprofile;. Although the scope of this manual is not to document profiling with these tools, the next section provides short quickstart tutorials to get you started. </para>
 
 <sect2>
-<title
->&callgrind;</title>
-
-<para
->&callgrind; is available from <ulink url="http://tdecachegrind.sf.net"
-> http://tdecachegrind.sf.net</ulink
->. Note that it previously was called &calltree;, but that name was misleading. </para>
-
-<para
->Most common use is to prefix the command line to start your application with <application
->callgrind</application
->, like in <blockquote
-><para
-><command
->callgrind myprogram myargs</command
-></para
-></blockquote
-> At program termination, a file <filename
->callgrind.out.pid</filename
-> will be generated which can be loaded into &tdecachegrind;. </para>
-
-<para
->More advanced use is to dump out profile data whenever a given function of your application is called. E.g. for <command
->konqueror</command
->, to see profile data only for rendering a web page, you could decide to dump the data whenever you select the menu item View/Reload. This corresponds to a call to <symbol
->KonqMainWindow::slotReload</symbol
->. Use <blockquote
-><para
-><command
-> callgrind --dump-before=KonqMainWindow::slotReload konqueror </command
-></para
-></blockquote
-> This will produce multiple profile data files with an additional sequential number at the end of the filename. A file without such an number at the end (only ending in the process PID) will also be produced; by loading this file into &tdecachegrind;, all others are loaded too, and can be seen in the Parts Overview and Parts list. </para>
+<title>&callgrind;</title>
+
+<para>&callgrind; is available from <ulink url="http://tdecachegrind.sf.net"> http://tdecachegrind.sf.net</ulink>. Note that it previously was called &calltree;, but that name was misleading. </para>
+
+<para>Most common use is to prefix the command line to start your application with <application>callgrind</application>, like in <blockquote><para><command>callgrind myprogram myargs</command></para></blockquote> At program termination, a file <filename>callgrind.out.pid</filename> will be generated which can be loaded into &tdecachegrind;. </para>
+
+<para>More advanced use is to dump out profile data whenever a given function of your application is called. E.g. for <command>konqueror</command>, to see profile data only for rendering a web page, you could decide to dump the data whenever you select the menu item View/Reload. This corresponds to a call to <symbol>KonqMainWindow::slotReload</symbol>. Use <blockquote><para><command> callgrind --dump-before=KonqMainWindow::slotReload konqueror </command></para></blockquote> This will produce multiple profile data files with an additional sequential number at the end of the filename. A file without such an number at the end (only ending in the process PID) will also be produced; by loading this file into &tdecachegrind;, all others are loaded too, and can be seen in the Parts Overview and Parts list. </para>
 
 </sect2>
 
 <sect2>
-<title
->&oprofile;</title>
-
-<para
->&oprofile; is available from <ulink url="http://oprofile.sf.net"
-> http://oprofile.sf.net</ulink
->. Follow the installation instructions on the web site; but, before you do, check if your distribution does not already provide it as package (like SuSE). </para>
-
-<para
->System-wide profiling is only permitted to the root user, as all actions on the system can be observed; therefore, the following has to be done as root. First, configure the profiling process, using the GUI <command
->oprof_start</command
-> or the command-line tool opcontrol. Standard configuration should be timer mode (TBS, see introduction). To start the measurement, run <command
->opcontrol -s</command
->. Then run the application you are interested in and, afterwards, do a <command
->opcontrol -d</command
->. This will write out the measurement results into files under directory <filename
->/var/lib/oprofile/samples/</filename
->. To be able to visualise the data in &tdecachegrind;, do in an empty directory: <blockquote
-><para
-><command
-> opreport -gdf | op2callgrind </command
-></para
-></blockquote
-> This will produce a lot of files, one for every program which was running on the system. Each one can be loaded into &tdecachegrind; on its own. </para>
+<title>&oprofile;</title>
+
+<para>&oprofile; is available from <ulink url="http://oprofile.sf.net"> http://oprofile.sf.net</ulink>. Follow the installation instructions on the web site; but, before you do, check if your distribution does not already provide it as package (like SuSE). </para>
+
+<para>System-wide profiling is only permitted to the root user, as all actions on the system can be observed; therefore, the following has to be done as root. First, configure the profiling process, using the GUI <command>oprof_start</command> or the command-line tool opcontrol. Standard configuration should be timer mode (TBS, see introduction). To start the measurement, run <command>opcontrol -s</command>. Then run the application you are interested in and, afterwards, do a <command>opcontrol -d</command>. This will write out the measurement results into files under directory <filename>/var/lib/oprofile/samples/</filename>. To be able to visualise the data in &tdecachegrind;, do in an empty directory: <blockquote><para><command> opreport -gdf | op2callgrind </command></para></blockquote> This will produce a lot of files, one for every program which was running on the system. Each one can be loaded into &tdecachegrind; on its own. </para>
 
 </sect2>
 </sect1>
 
 <sect1 id="using-basics">
-<title
->User Interface Basics</title>
-
-<para
->When starting &tdecachegrind; with a profile data file as argument, or after loading one with File/Open, you will see a sidebar containing the function list at the left; and, on the right the main part, an area with visualisations for a selected function. This visualisation area can be arbitrarily configured to show multiple visualisations at once. </para>
-
-<para
->At first start, this area will be divided into a top and a bottom part, each with different visualisations selectable by tabs. To move visualisation views, use the context menu of the tabs, and adjust the splitters between visualisations. To quickly switch between different visualisation layouts, use View/Layouts/Duplicate, change the layout and switch between layouts with View/Layout/Next (or, even better, use the corresponding keyboard shortcuts). </para>
-
-<para
->The active event type is important for visualisation: for &callgrind;, this is, for example, Cache Misses or Cycle Estimation; for &oprofile;, this is "Timer" in the simplest case. You can change the event type via a combobox in the toolbar or in the Event Type view. A first overview of the runtime characteristics should be given when you select function <symbol
->main</symbol
-> in the left list, and look at the call graph visualisation; there, you see calls happening in your program. Note that the call graph view only shows functions with high event count. By double-clicking a function in the graph, it will change to show the called functions around the selected one. </para>
-
-<para
->To explore the GUI further, in addition to this manual, also have a look at the documentation section on the web site <ulink url="http://tdecachegrind.sf.net"
-> http://tdecachegrind.sf.net</ulink
->. Also, every widget in &tdecachegrind; has <quote
->What's this</quote
-> help. </para>
+<title>User Interface Basics</title>
+
+<para>When starting &tdecachegrind; with a profile data file as argument, or after loading one with File/Open, you will see a sidebar containing the function list at the left; and, on the right the main part, an area with visualisations for a selected function. This visualisation area can be arbitrarily configured to show multiple visualisations at once. </para>
+
+<para>At first start, this area will be divided into a top and a bottom part, each with different visualisations selectable by tabs. To move visualisation views, use the context menu of the tabs, and adjust the splitters between visualisations. To quickly switch between different visualisation layouts, use View/Layouts/Duplicate, change the layout and switch between layouts with View/Layout/Next (or, even better, use the corresponding keyboard shortcuts). </para>
+
+<para>The active event type is important for visualisation: for &callgrind;, this is, for example, Cache Misses or Cycle Estimation; for &oprofile;, this is "Timer" in the simplest case. You can change the event type via a combobox in the toolbar or in the Event Type view. A first overview of the runtime characteristics should be given when you select function <symbol>main</symbol> in the left list, and look at the call graph visualisation; there, you see calls happening in your program. Note that the call graph view only shows functions with high event count. By double-clicking a function in the graph, it will change to show the called functions around the selected one. </para>
+
+<para>To explore the GUI further, in addition to this manual, also have a look at the documentation section on the web site <ulink url="http://tdecachegrind.sf.net"> http://tdecachegrind.sf.net</ulink>. Also, every widget in &tdecachegrind; has <quote>What's this</quote> help. </para>
 </sect1>
 
 </chapter>
 
 
 <chapter id="tdecachegrind-concepts">
-<title
->Basic Concepts</title>
+<title>Basic Concepts</title>
 
-<para
->This chapter explains some concepts of the &tdecachegrind;, and introduces terms used in the interface. </para>
+<para>This chapter explains some concepts of the &tdecachegrind;, and introduces terms used in the interface. </para>
 
 <sect1 id="concepts-model">
-<title
->The Data Model for Profile Data</title>
+<title>The Data Model for Profile Data</title>
 
 <sect2>
-<title
->Cost Entities</title>
-
-<para
->Cost counts of event types (like L2 Misses) are attributed to cost entities, which are items with relationship to source code or data structures of a given program. Cost entities not only can be simple code or data positions, but also position tuples. For example, a call has a source and a target, or a data address can have a data type and an code position where its allocation happened. </para>
-
-<para
->The cost entities known to KCachegrind are given in the following. Simple Positions: <itemizedlist
-> <listitem
-><para
-> Instruction. An assembler instruction at a specified address. </para
-></listitem
-> <listitem
-><para
-> Source Line of a Function. All instructions that the compiler (via debug information) maps to a given source line specified by source file name and line number, and which are executed in the context of some function. The latter is needed because a source line inside of an inlined function can appear in the context of multiple functions. Instructions without any mapping to an actual source line are mapped to line number 0 in file "???". </para
-></listitem
-> <listitem
-><para
-> Function. All source lines of a given function make up the function itself. A function is specified by its name and its location in some binary object if available. The latter is needed because binary objects of a single program each can hold functions with the same name (these can be accessed e.g. with dlopen/dlsym; the runtime linker resolves functions in a given search order of binary objects used). If a profiling tool can not detect the symbol name of a function, e.g. because debug information is not available, either the address of the first executed instruction typically is used, or "???". </para
-></listitem
-> <listitem
-><para
-> Binary Object. All functions whose code is inside the range of a given binary object, either the main executable or a shared library. </para
-></listitem
-> <listitem
-><para
-> Source File. All functions whose first instruction is mapped to a line of the given source file. </para
-></listitem
-> <listitem
-><para
-> Class. Symbol names of functions typically are hierarchically ordered in name spaces, e.g. C++ namespaces, or classes of object oriented languages; thus, a class can hold functions of the class or embedded classes itself. </para
-></listitem
-> <listitem
-><para
-> Profile Part. Some time section of a profile run, with a given thread ID, process ID, and command line executed. </para
-></listitem
-> </itemizedlist
-> As can be seen from the list, a set of cost entities often defines another cost entity; thus, there is a inclusion hierarchy of cost entities which should be obvious from the description above. </para>
-
-<para
->Positions tuples: <itemizedlist
-> <listitem
-><para
-> Call from instruction address to target function. </para
-></listitem
-> <listitem
-><para
-> Call from source line to target function. </para
-></listitem
-> <listitem
-><para
-> Call from source function to target function. </para
-></listitem
-> <listitem
-><para
-> (Un)conditional Jump from source to target instruction. </para
-></listitem
-> <listitem
-><para
-> (Un)conditional Jump from source to target line. </para
-></listitem
-> </itemizedlist
-> Jumps between functions are not allowed, as this makes no sense in a call graph; thus, constructs like exception handling and long jumps in C have to be translated to popping the call stack as needed. </para>
+<title>Cost Entities</title>
+
+<para>Cost counts of event types (like L2 Misses) are attributed to cost entities, which are items with relationship to source code or data structures of a given program. Cost entities not only can be simple code or data positions, but also position tuples. For example, a call has a source and a target, or a data address can have a data type and an code position where its allocation happened. </para>
+
+<para>The cost entities known to KCachegrind are given in the following. Simple Positions: <itemizedlist> <listitem><para> Instruction. An assembler instruction at a specified address. </para></listitem> <listitem><para> Source Line of a Function. All instructions that the compiler (via debug information) maps to a given source line specified by source file name and line number, and which are executed in the context of some function. The latter is needed because a source line inside of an inlined function can appear in the context of multiple functions. Instructions without any mapping to an actual source line are mapped to line number 0 in file "???". </para></listitem> <listitem><para> Function. All source lines of a given function make up the function itself. A function is specified by its name and its location in some binary object if available. The latter is needed because binary objects of a single program each can hold functions with the same name (these can be accessed e.g. with dlopen/dlsym; the runtime linker resolves functions in a given search order of binary objects used). If a profiling tool can not detect the symbol name of a function, e.g. because debug information is not available, either the address of the first executed instruction typically is used, or "???". </para></listitem> <listitem><para> Binary Object. All functions whose code is inside the range of a given binary object, either the main executable or a shared library. </para></listitem> <listitem><para> Source File. All functions whose first instruction is mapped to a line of the given source file. </para></listitem> <listitem><para> Class. Symbol names of functions typically are hierarchically ordered in name spaces, e.g. C++ namespaces, or classes of object oriented languages; thus, a class can hold functions of the class or embedded classes itself. </para></listitem> <listitem><para> Profile Part. Some time section of a profile run, with a given thread ID, process ID, and command line executed. </para></listitem> </itemizedlist> As can be seen from the list, a set of cost entities often defines another cost entity; thus, there is a inclusion hierarchy of cost entities which should be obvious from the description above. </para>
+
+<para>Positions tuples: <itemizedlist> <listitem><para> Call from instruction address to target function. </para></listitem> <listitem><para> Call from source line to target function. </para></listitem> <listitem><para> Call from source function to target function. </para></listitem> <listitem><para> (Un)conditional Jump from source to target instruction. </para></listitem> <listitem><para> (Un)conditional Jump from source to target line. </para></listitem> </itemizedlist> Jumps between functions are not allowed, as this makes no sense in a call graph; thus, constructs like exception handling and long jumps in C have to be translated to popping the call stack as needed. </para>
 
 </sect2>
 
 
 
 <sect2>
-<title
->Event Types</title>
+<title>Event Types</title>
 
-<para
->Arbitrary event types can be specified in the profile data by giving them a name. Their cost related to a cost entity is a 64-bit integer. </para>
-<para
->Event types whose costs are specified in a profile data file are called real events. Additionally, one can specify formulae for event types calculated from real events, which are called inherited events. </para>
+<para>Arbitrary event types can be specified in the profile data by giving them a name. Their cost related to a cost entity is a 64-bit integer. </para>
+<para>Event types whose costs are specified in a profile data file are called real events. Additionally, one can specify formulae for event types calculated from real events, which are called inherited events. </para>
 </sect2>
 
 </sect1>
 
 <sect1 id="concepts-state">
-<title
->Visualisation State</title>
-
-<para
->The Visualisation state of a KCachegrind window includes: <itemizedlist
-> <listitem
-><para
-> the primary and secondary event type chosen for display, </para
-></listitem
-> <listitem
-><para
-> the function grouping (used in the Function Profile list and entity colouring), </para
-></listitem
-> <listitem
-><para
-> the profile parts whose costs are to be included in visualisation, </para
-></listitem
-> <listitem
-><para
-> an active cost entity (e.g. a function selected from the function profile dockable), </para
-></listitem
-> <listitem
-><para
-> a selected cost entity. </para
-></listitem
-> </itemizedlist
-> This state influences visualisations. </para>
-<para
->Visualisations always are shown for one, the active, cost entity. When a given visualisation is not appropriate for a cost entity, it is disabled (e.g. when selecting an ELF object in the group list by double-clicking, source annotation for an ELF object make no sense). </para>
-<para
->For example, for an active function, the callee list shows all the functions called from the active one: one can select one of these functions without making it active; also, if the call-graph is shown nearside, it will automatically select the same function. </para>
+<title>Visualisation State</title>
+
+<para>The Visualisation state of a KCachegrind window includes: <itemizedlist> <listitem><para> the primary and secondary event type chosen for display, </para></listitem> <listitem><para> the function grouping (used in the Function Profile list and entity colouring), </para></listitem> <listitem><para> the profile parts whose costs are to be included in visualisation, </para></listitem> <listitem><para> an active cost entity (e.g. a function selected from the function profile dockable), </para></listitem> <listitem><para> a selected cost entity. </para></listitem> </itemizedlist> This state influences visualisations. </para>
+<para>Visualisations always are shown for one, the active, cost entity. When a given visualisation is not appropriate for a cost entity, it is disabled (e.g. when selecting an ELF object in the group list by double-clicking, source annotation for an ELF object make no sense). </para>
+<para>For example, for an active function, the callee list shows all the functions called from the active one: one can select one of these functions without making it active; also, if the call-graph is shown nearside, it will automatically select the same function. </para>
 
 </sect1>
 
 <sect1 id="concepts-guiparts">
-<title
->Parts of the GUI</title>
+<title>Parts of the GUI</title>
 
 <sect2>
-<title
->Sidedocks</title>
-<para
->Sidedocks (Dockables) are side windows which can be placed at any border of an KCachegrind window. They always contain a list of cost entities sorted in some manner. <itemizedlist>
-<listitem
-><para
->Function Profile. The Function Profile is a list of functions showing inclusive and exclusive cost, call count, name and position of functions. </para
-></listitem>
-<listitem
-><para
->Parts Overview </para
-></listitem>
-<listitem
-><para
->Call Stack </para
-></listitem>
+<title>Sidedocks</title>
+<para>Sidedocks (Dockables) are side windows which can be placed at any border of an KCachegrind window. They always contain a list of cost entities sorted in some manner. <itemizedlist>
+<listitem><para>Function Profile. The Function Profile is a list of functions showing inclusive and exclusive cost, call count, name and position of functions. </para></listitem>
+<listitem><para>Parts Overview </para></listitem>
+<listitem><para>Call Stack </para></listitem>
 </itemizedlist>
 </para>
 </sect2>
 
 <sect2>
-<title
->Visualisation Area</title>
-<para
->The visualisation area, typically the right part of a KCachegrind main window, is made up of one (default) or more Tab Views, either lined up horizontally or vertically. Each tab view holds different visualisation views of only one cost entity at a time. The name of this entity is given at the top of the tab view. If there are multiple tab views, only one is active. The entity name in the active tab view is shown in bold and determines the active cost entity of the KCachegrind window. </para>
+<title>Visualisation Area</title>
+<para>The visualisation area, typically the right part of a KCachegrind main window, is made up of one (default) or more Tab Views, either lined up horizontally or vertically. Each tab view holds different visualisation views of only one cost entity at a time. The name of this entity is given at the top of the tab view. If there are multiple tab views, only one is active. The entity name in the active tab view is shown in bold and determines the active cost entity of the KCachegrind window. </para>
 </sect2>
 
 <sect2>
-<title
->Areas of a Tab View</title>
-<para
->Each tab view can hold up to four view areas, namely Top, Right, Left, and Bottom. Each area can hold multiple stacked visualisation views. The visible view of an area is selected by a tab bar. The tab bars of the top and right area are at the top; the tab bars of the left and bottom area are at the bottom. You can specify which kind of visualisation should go into which area by using the context menus of the tabs. </para>
+<title>Areas of a Tab View</title>
+<para>Each tab view can hold up to four view areas, namely Top, Right, Left, and Bottom. Each area can hold multiple stacked visualisation views. The visible view of an area is selected by a tab bar. The tab bars of the top and right area are at the top; the tab bars of the left and bottom area are at the bottom. You can specify which kind of visualisation should go into which area by using the context menus of the tabs. </para>
 </sect2>
 
 <sect2>
-<title
->Synchronised Visualisation via Selected Entity in a Tab View</title>
-<para
->Besides an active entity, each tab view has an selected entity. As most visualisation types show multiple entities with the active one somehow centred, you can change the selected item by navigating inside a visualisation (by clicking with the mouse or using the keyboard). Typically, selected items are shown in an highlighted state. By changing the selected entity in one of the visualisations of a tab view, all other visualisations in the tab view accordingly highlight the new selected entity. </para>
+<title>Synchronised Visualisation via Selected Entity in a Tab View</title>
+<para>Besides an active entity, each tab view has an selected entity. As most visualisation types show multiple entities with the active one somehow centred, you can change the selected item by navigating inside a visualisation (by clicking with the mouse or using the keyboard). Typically, selected items are shown in an highlighted state. By changing the selected entity in one of the visualisations of a tab view, all other visualisations in the tab view accordingly highlight the new selected entity. </para>
 </sect2>
 
 <sect2>
-<title
->Synchronisation between Tab Views</title>
-<para
->If there are multiple tab views, a selection change in one tab view leads to an activation change in the next (to right/to bottom) tab view. This kind of linkage should, for example, allow for fast browsing in call graphs. </para>
+<title>Synchronisation between Tab Views</title>
+<para>If there are multiple tab views, a selection change in one tab view leads to an activation change in the next (to right/to bottom) tab view. This kind of linkage should, for example, allow for fast browsing in call graphs. </para>
 </sect2>
 
 <sect2>
-<title
->Layouts</title>
-<para
->The layout of all the tab views of a window can be saved (see menu item View/Layout). After duplicating the current layout (Ctrl+Plus or menu) and changing some sizes or moving a visualisation view to another area of an tab view, you can quickly switch between the old and the new layout via Ctrl+Left/Right. The set of layouts will be stored between KCachegrind sessions of the same profiled command. You can make the current set of layouts as the default one for new KCachegrind sessions, or restore to the default layout set. </para>
+<title>Layouts</title>
+<para>The layout of all the tab views of a window can be saved (see menu item View/Layout). After duplicating the current layout (Ctrl+Plus or menu) and changing some sizes or moving a visualisation view to another area of an tab view, you can quickly switch between the old and the new layout via Ctrl+Left/Right. The set of layouts will be stored between KCachegrind sessions of the same profiled command. You can make the current set of layouts as the default one for new KCachegrind sessions, or restore to the default layout set. </para>
 </sect2>
 </sect1>
 
 <sect1 id="concepts-sidedocks">
-<title
->Sidedocks</title>
+<title>Sidedocks</title>
 
 <sect2>
-<title
->Flat Profile</title>
-<para
->The flat profile contains a group list and a function list. The group list contains all groups where cost is spent in, depending on the chosen group type. The group list is hidden when grouping is switched off. </para>
-<para
->The function list contains the functions of the selected group (or all functions if grouping is switched off), ordered by some column, e.g. inclusive or self costs spent therein. There is a maximal number of functions shown in the list, which is configurable in Settings/Configure KCachegrind. </para>
+<title>Flat Profile</title>
+<para>The flat profile contains a group list and a function list. The group list contains all groups where cost is spent in, depending on the chosen group type. The group list is hidden when grouping is switched off. </para>
+<para>The function list contains the functions of the selected group (or all functions if grouping is switched off), ordered by some column, e.g. inclusive or self costs spent therein. There is a maximal number of functions shown in the list, which is configurable in Settings/Configure KCachegrind. </para>
 </sect2>
 
 <sect2>
-<title
->Parts Overview</title>
-<para
->In a profile run, multiple profile data files can be produced, which can be loaded together into KCachegrind. The Parts Overview dockable shows these, horizontally ordered according creation time; the rectangle sizes are proportional to the cost spent in the parts. You can select one or several parts to constrain the costs shown in the other KCachegrind views to these parts only. </para>
-<para
->The parts are further subdivided: there is a partitioning and an inclusive cost split mode: <itemizedlist>
-<listitem
-><para
->Partitioning: You see the partitioning into groups for a profile data part, according to the group type selected. For example, if ELF object groups are selected, you see coloured rectangles for each used ELF object (shared library or executable), sized according to the cost spent therein. </para
-></listitem>
-<listitem
-><para
->Inclusive Cost Split: A rectangle showing the inclusive cost of the current active function in the part is shown. This, again, is split up to show inclusive costs of its callees. </para
-></listitem>
+<title>Parts Overview</title>
+<para>In a profile run, multiple profile data files can be produced, which can be loaded together into KCachegrind. The Parts Overview dockable shows these, horizontally ordered according creation time; the rectangle sizes are proportional to the cost spent in the parts. You can select one or several parts to constrain the costs shown in the other KCachegrind views to these parts only. </para>
+<para>The parts are further subdivided: there is a partitioning and an inclusive cost split mode: <itemizedlist>
+<listitem><para>Partitioning: You see the partitioning into groups for a profile data part, according to the group type selected. For example, if ELF object groups are selected, you see coloured rectangles for each used ELF object (shared library or executable), sized according to the cost spent therein. </para></listitem>
+<listitem><para>Inclusive Cost Split: A rectangle showing the inclusive cost of the current active function in the part is shown. This, again, is split up to show inclusive costs of its callees. </para></listitem>
 </itemizedlist>
 </para>
 </sect2>
 
 <sect2>
-<title
->Call Stack</title>
-<para
->This is a purely fictional 'most probable' call stack. It is built up by starting with the current active function and adds the callers/callees with highest cost at the top and to bottom. </para>
-<para
->The 'Cost' and 'Calls' columns show the cost used for all calls from the function in the line above. </para>
+<title>Call Stack</title>
+<para>This is a purely fictional 'most probable' call stack. It is built up by starting with the current active function and adds the callers/callees with highest cost at the top and to bottom. </para>
+<para>The 'Cost' and 'Calls' columns show the cost used for all calls from the function in the line above. </para>
 </sect2>
 </sect1>
 
 <sect1 id="concepts-visualizations">
-<title
->Visualisations</title>
+<title>Visualisations</title>
 
 <sect2>
-<title
->Event Types</title>
-<para
->This list shows all cost types available and the corresponding self and inclusive cost of the current active function for that event type. </para>
-<para
->By choosing an event type from the list, you change the type of costs shown all over KCachegrind to be the selected one. </para>
+<title>Event Types</title>
+<para>This list shows all cost types available and the corresponding self and inclusive cost of the current active function for that event type. </para>
+<para>By choosing an event type from the list, you change the type of costs shown all over KCachegrind to be the selected one. </para>
 </sect2>
 
 <sect2>
-<title
->Call Lists</title>
-<para
->These lists show calls to/from the current active function. With ''all' callers/callees functions are meant which can be reached in caller/callee direction, even when other functions are in between. </para>
-<para
->Call list views include: <itemizedlist>
-<listitem
-><para
->Direct Callers </para
-></listitem>
-<listitem
-><para
->Direct Callees </para
-></listitem>
-<listitem
-><para
->All Callers </para
-></listitem>
-<listitem
-><para
->All Callees </para
-></listitem>
+<title>Call Lists</title>
+<para>These lists show calls to/from the current active function. With ''all' callers/callees functions are meant which can be reached in caller/callee direction, even when other functions are in between. </para>
+<para>Call list views include: <itemizedlist>
+<listitem><para>Direct Callers </para></listitem>
+<listitem><para>Direct Callees </para></listitem>
+<listitem><para>All Callers </para></listitem>
+<listitem><para>All Callees </para></listitem>
 </itemizedlist>
 </para>
 </sect2>
 
 <sect2>
-<title
->Maps</title>
-<para
->A treemap visualisation of the primary event type, up or down the call hierarchy. Each coloured rectangle represents a function; its size tries to be proportional to the cost spent therein while the active function is running (however, there are drawing constrains). </para>
-<para
->For the Caller Map, the graph shows the nested hierarchy of all callers of the current activated function; for the Callee Map, it shows the nested hierarchy of all callees of the current activated function. </para>
-<para
->Appearance options can be found in the in the context menu. To get exact size proportions, choose 'Hide incorrect borders'. As this mode can be very time consuming, you may want to limit the maximum drawn nesting level before. 'Best' determinates the split direction for children from the aspect ratio of the parent. 'Always Best' decides on remaining space for each sibling. 'Ignore Proportions' takes space for function name drawing before drawing children. Note that size proportions can get heavily wrong. </para>
-<para
->Keyboard navigation is available with the left/right arrow keys for traversing siblings, and up/down arrow keys to go a nesting level up/down. 'Return' activates the current item. </para>
+<title>Maps</title>
+<para>A treemap visualisation of the primary event type, up or down the call hierarchy. Each coloured rectangle represents a function; its size tries to be proportional to the cost spent therein while the active function is running (however, there are drawing constrains). </para>
+<para>For the Caller Map, the graph shows the nested hierarchy of all callers of the current activated function; for the Callee Map, it shows the nested hierarchy of all callees of the current activated function. </para>
+<para>Appearance options can be found in the in the context menu. To get exact size proportions, choose 'Hide incorrect borders'. As this mode can be very time consuming, you may want to limit the maximum drawn nesting level before. 'Best' determinates the split direction for children from the aspect ratio of the parent. 'Always Best' decides on remaining space for each sibling. 'Ignore Proportions' takes space for function name drawing before drawing children. Note that size proportions can get heavily wrong. </para>
+<para>Keyboard navigation is available with the left/right arrow keys for traversing siblings, and up/down arrow keys to go a nesting level up/down. 'Return' activates the current item. </para>
 </sect2>
 
 <sect2>
-<title
->Call Graph</title>
-<para
->This view shows the call graph around the active function. The shown cost is only the cost which is spent while the active function was actually running; i.e. the cost shown for main() - if it's visible - should be the same as the cost of the active function, as that is the part of inclusive cost of main() spent while the active function was running. </para>
-<para
->For cycles, blue call arrows indicate that this is an artificial call added for correct drawing which actually never happened. </para>
-<para
->If the graph is larger than the widget area, a bird's eye view is shown in one edge. There are similar visualisation options as for the Call Treemap; the selected function is highlighted. </para>
+<title>Call Graph</title>
+<para>This view shows the call graph around the active function. The shown cost is only the cost which is spent while the active function was actually running; i.e. the cost shown for main() - if it's visible - should be the same as the cost of the active function, as that is the part of inclusive cost of main() spent while the active function was running. </para>
+<para>For cycles, blue call arrows indicate that this is an artificial call added for correct drawing which actually never happened. </para>
+<para>If the graph is larger than the widget area, a bird's eye view is shown in one edge. There are similar visualisation options as for the Call Treemap; the selected function is highlighted. </para>
 </sect2>
 
 <sect2>
-<title
->Annotations</title>
-<para
->The annotated source/assembler lists show the source lines/disassembled instructions of the current active function together with (self) cost spent while executing the code of a source line/instruction. If there was a call, lines with details on the call are inserted into the source: the (inclusive) cost spent inside of the call, the number of calls happening, and the call destination. </para>
-<para
->Select such a call information line to activate the call destination. </para>
+<title>Annotations</title>
+<para>The annotated source/assembler lists show the source lines/disassembled instructions of the current active function together with (self) cost spent while executing the code of a source line/instruction. If there was a call, lines with details on the call are inserted into the source: the (inclusive) cost spent inside of the call, the number of calls happening, and the call destination. </para>
+<para>Select such a call information line to activate the call destination. </para>
 </sect2>
 </sect1>
 
@@ -608,128 +309,42 @@
 
 
 <chapter id="commands">
-<title
->Command Reference</title>
+<title>Command Reference</title>
 
 <sect1 id="tdecachegrind-mainwindow">
-<title
->The main &tdecachegrind; window</title>
-<para
-></para>
+<title>The main &tdecachegrind; window</title>
+<para></para>
 
 <sect2>
-<title
->The <guimenu
->File</guimenu
-> Menu</title>
+<title>The <guimenu>File</guimenu> Menu</title>
 <para>
 <variablelist>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo
->&Ctrl;<keycap
->N</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->New</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
-> Opens an empty toplevel window into which you can load profile data. </action
-> This action is not really needed, as File/Open will give you a new toplevel window when the current one shows already some data. </para
-></listitem>
+<term><menuchoice><shortcut> <keycombo>&Ctrl;<keycap>N</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>New</guimenuitem> </menuchoice></term>
+<listitem><para><action> Opens an empty toplevel window into which you can load profile data. </action> This action is not really needed, as File/Open will give you a new toplevel window when the current one shows already some data. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo
->&Ctrl;<keycap
->O</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Open</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
-> Pops up the File Open Dialogue to choose a profile data file to be loaded. </action
-> If there is some data already shown in the current toplevel window, this will open a new window; if you want to open additional profile data in the current window, use File/Add. </para>
-<para
->The name of profile data files usually ends in ..-, where and are optional and are used for multiple profile data files belonging to one application run. By loading a file ending only in ., eventually existing data files for this run, but with additional endings, are loaded too. </para>
-<para
->Example: If there exist profile data files cachegrind.out.123 and cachegrind.out.123.1, by loading the first, the second will be automatically loaded too. </para
-></listitem>
+<term><menuchoice><shortcut> <keycombo>&Ctrl;<keycap>O</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Open</guimenuitem> </menuchoice></term>
+<listitem><para><action> Pops up the File Open Dialogue to choose a profile data file to be loaded. </action> If there is some data already shown in the current toplevel window, this will open a new window; if you want to open additional profile data in the current window, use File/Add. </para>
+<para>The name of profile data files usually ends in ..-, where and are optional and are used for multiple profile data files belonging to one application run. By loading a file ending only in ., eventually existing data files for this run, but with additional endings, are loaded too. </para>
+<para>Example: If there exist profile data files cachegrind.out.123 and cachegrind.out.123.1, by loading the first, the second will be automatically loaded too. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Add</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
-> Adds a profile data file to the current window. </action
-> Using this, you can force multiple data files to be loaded into the same toplevel window even if they are not from the same run as given by the profile data file naming convention. This can, for example, be used for nearside comparison. </para
-></listitem>
+<term><menuchoice><guimenu>File</guimenu> <guimenuitem>Add</guimenuitem> </menuchoice></term>
+<listitem><para><action> Adds a profile data file to the current window. </action> Using this, you can force multiple data files to be loaded into the same toplevel window even if they are not from the same run as given by the profile data file naming convention. This can, for example, be used for nearside comparison. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Reload</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
-> Reload the profile data. </action
-> This is most interesting after another profile data file was generated for an already loaded application run. </para
-></listitem>
+<term><menuchoice><guimenu>File</guimenu> <guimenuitem>Reload</guimenuitem> </menuchoice></term>
+<listitem><para><action> Reload the profile data. </action> This is most interesting after another profile data file was generated for an already loaded application run. </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><shortcut
-> <keycombo
->&Ctrl;<keycap
->Q</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Quit</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
->Quits</action
-> &kappname;</para
-></listitem>
+<term><menuchoice><shortcut> <keycombo>&Ctrl;<keycap>Q</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Quit</guimenuitem> </menuchoice></term>
+<listitem><para><action>Quits</action> &kappname;</para></listitem>
 </varlistentry>
 </variablelist>
 </para>
@@ -737,96 +352,33 @@
 </sect2>
 
 <sect2>
-<title
->The <guimenu
->View</guimenu
-> Menu</title>
+<title>The <guimenu>View</guimenu> Menu</title>
 <para>
 <variablelist>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Primary Event Type</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
->(To-do)</action
-></para
-></listitem>
+<term><menuchoice><guimenu>View</guimenu> <guimenuitem>Primary Event Type</guimenuitem> </menuchoice></term>
+<listitem><para><action>(To-do)</action></para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Secondary Event Type</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
->(To-do)</action
-></para
-></listitem>
+<term><menuchoice><guimenu>View</guimenu> <guimenuitem>Secondary Event Type</guimenuitem> </menuchoice></term>
+<listitem><para><action>(To-do)</action></para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Grouping</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
->(To-do)</action
-></para
-></listitem>
+<term><menuchoice><guimenu>View</guimenu> <guimenuitem>Grouping</guimenuitem> </menuchoice></term>
+<listitem><para><action>(To-do)</action></para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Layout</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
->(To-do)</action
-></para
-></listitem>
+<term><menuchoice><guimenu>View</guimenu> <guimenuitem>Layout</guimenuitem> </menuchoice></term>
+<listitem><para><action>(To-do)</action></para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Split</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
-><action
->(To-do)</action
-></para
-></listitem>
+<term><menuchoice><guimenu>View</guimenu> <guimenuitem>Split</guimenuitem> </menuchoice></term>
+<listitem><para><action>(To-do)</action></para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -839,56 +391,44 @@
 </chapter>
 
 <chapter id="faq">
-<title
->Questions and Answers</title>
+<title>Questions and Answers</title>
 &reporting.bugs; &updating.documentation; <qandaset id="faqlist">
 
 
 <qandaentry>
 <question>
-<para
->What is &tdecachegrind; for? I have no idea. </para>
+<para>What is &tdecachegrind; for? I have no idea. </para>
 </question>
 <answer>
-<para
->&tdecachegrind; is a helpful at a later stage in software development, called Profiling. If you don't develop applications, you don't need &tdecachegrind;. </para>
+<para>&tdecachegrind; is a helpful at a later stage in software development, called Profiling. If you don't develop applications, you don't need &tdecachegrind;. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->What is the difference between 'Incl.' and 'Self' ? </para>
+<para>What is the difference between 'Incl.' and 'Self' ? </para>
 </question>
 <answer>
-<para
->These are cost attributes for functions regarding some event type. As functions can call each other, it makes sense to distinguish the cost of the function itself ('Self Cost') and the cost including all called functions ('Inclusive Cost'). 'Self' is sometimes also referred to as 'Exclusive' costs. </para>
-<para
->So, for example, for main(), you will always have a inclusive cost of almost 100%, whereas the self cost is negligible when the real work is done in another function. </para>
+<para>These are cost attributes for functions regarding some event type. As functions can call each other, it makes sense to distinguish the cost of the function itself ('Self Cost') and the cost including all called functions ('Inclusive Cost'). 'Self' is sometimes also referred to as 'Exclusive' costs. </para>
+<para>So, for example, for main(), you will always have a inclusive cost of almost 100%, whereas the self cost is negligible when the real work is done in another function. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->The toolbar/menubar of my KCachegrind looks so spartanic. Is this normal?</para>
+<para>The toolbar/menubar of my KCachegrind looks so spartanic. Is this normal?</para>
 </question>
 <answer>
-<para
->Obviously KCachegrind is wrongly installed on your system. It is recommended to compile it with the installation prefix to be your system wide KDE base directory like <command
->configure --prefix=/opt/kde3; make install</command
->. If you choose another directory like $HOME/kde, you should set the environment variable TDEDIR to this directory before running KCachegrind. </para>
+<para>Obviously KCachegrind is wrongly installed on your system. It is recommended to compile it with the installation prefix to be your system wide KDE base directory like <command>configure --prefix=/opt/kde3; make install</command>. If you choose another directory like $HOME/kde, you should set the environment variable TDEDIR to this directory before running KCachegrind. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para
->If I double-click on a function down in the Call Graph View, it shows for the function main the same cost as the selected function. Isn't this supposed to be constant 100% ? </para>
+<para>If I double-click on a function down in the Call Graph View, it shows for the function main the same cost as the selected function. Isn't this supposed to be constant 100% ? </para>
 </question>
 <answer>
-<para
->You have activated a function below main() with cost less than main(). For any function, only that part of the full cost of the function is shown, that is spent while the activated function is running; that is, the cost shown for any function can never be higher than the cost of the activated function. </para>
+<para>You have activated a function below main() with cost less than main(). For any function, only that part of the full cost of the function is shown, that is spent while the activated function is running; that is, the cost shown for any function can never be higher than the cost of the activated function. </para>
 </answer>
 </qandaentry>
 
@@ -897,59 +437,21 @@
 </chapter>
 
 <chapter id="glossary">
-<title
->Glossary</title>
-
-<para
->The following is a mixed list of terms. <itemizedlist>
-<listitem
-><para
->Profiling: The process of collecting statistical information about runtime characteristics of program runs. </para
-></listitem>
-<listitem
-><para
->Tracing: The process of supervising a program run and storing events happening sorted by a timestap in a output file, the Trace. </para
-></listitem>
-<listitem
-><para
->Trace: A sequence of timestamped events that occurred while tracing a program run. Its size is typically linear to the execution time of the program run. </para
-></listitem>
-<listitem
-><para
->Profile Data File: A file containing data measured in a profile experiment (or part of) or produced by postprocessing a trace. Its size is typically linear to the code size of the program. </para
-></listitem>
-<listitem
-><para
->Profile Data Part (incorrectly used also: Trace Part): Data from a profile data file. </para
-></listitem>
-<listitem
-><para
->Profile Experiment: A program run supervised by a profiling tool, producing possibly multiple profile data files from parts and/or threads of the run. </para
-></listitem>
-<listitem
-><para
->Profile Project: A configuration for profile experiments used for one program which has to be profiled, perhaps in multiple versions. Comparisons of profile data typically only makes sense between profile data produced in experiments of one profile project. </para
-></listitem>
-<listitem
-><para
->Cost Entity: An abstract item related to source code to which event counts can be attributed. Dimensions for cost entities are code location (e.g. source line, function), data location (e.g. accessed data type, data object), execution location (e.g. thread, process) and tuples or triples of the aforementioned positions (e.g. calls, object access from statement, evicted data from cache). </para
-></listitem>
-<listitem
-><para
->Event Type: The kind of event of which costs can be attributed to a cost entity. There exist real event types and inherited event types. </para
-></listitem>
-<listitem
-><para
->Real Event Type: A event type that can be measured by a tool. This needs the existence of a sensor for the given event type. </para
-></listitem>
-<listitem
-><para
->Inherited Event Type: A virtual event type only visible in the visualisation which is defined by a formula to be calculated from real event types. </para
-></listitem>
-<listitem
-><para
->Event Costs: Sum of events of some event type occurring while the execution is related to some cost entity. The cost is attributed to the entity. </para
-></listitem>
+<title>Glossary</title>
+
+<para>The following is a mixed list of terms. <itemizedlist>
+<listitem><para>Profiling: The process of collecting statistical information about runtime characteristics of program runs. </para></listitem>
+<listitem><para>Tracing: The process of supervising a program run and storing events happening sorted by a timestap in a output file, the Trace. </para></listitem>
+<listitem><para>Trace: A sequence of timestamped events that occurred while tracing a program run. Its size is typically linear to the execution time of the program run. </para></listitem>
+<listitem><para>Profile Data File: A file containing data measured in a profile experiment (or part of) or produced by postprocessing a trace. Its size is typically linear to the code size of the program. </para></listitem>
+<listitem><para>Profile Data Part (incorrectly used also: Trace Part): Data from a profile data file. </para></listitem>
+<listitem><para>Profile Experiment: A program run supervised by a profiling tool, producing possibly multiple profile data files from parts and/or threads of the run. </para></listitem>
+<listitem><para>Profile Project: A configuration for profile experiments used for one program which has to be profiled, perhaps in multiple versions. Comparisons of profile data typically only makes sense between profile data produced in experiments of one profile project. </para></listitem>
+<listitem><para>Cost Entity: An abstract item related to source code to which event counts can be attributed. Dimensions for cost entities are code location (e.g. source line, function), data location (e.g. accessed data type, data object), execution location (e.g. thread, process) and tuples or triples of the aforementioned positions (e.g. calls, object access from statement, evicted data from cache). </para></listitem>
+<listitem><para>Event Type: The kind of event of which costs can be attributed to a cost entity. There exist real event types and inherited event types. </para></listitem>
+<listitem><para>Real Event Type: A event type that can be measured by a tool. This needs the existence of a sensor for the given event type. </para></listitem>
+<listitem><para>Inherited Event Type: A virtual event type only visible in the visualisation which is defined by a formula to be calculated from real event types. </para></listitem>
+<listitem><para>Event Costs: Sum of events of some event type occurring while the execution is related to some cost entity. The cost is attributed to the entity. </para></listitem>
 </itemizedlist>
 </para>
 </chapter>
@@ -957,52 +459,36 @@
 <chapter id="credits">
 
 
-<title
->Credits and License</title>
+<title>Credits and License</title>
 
-<para
->&kappname; </para>
-<para
->Thanks to Julian Seward for his excellent &valgrind;, and Nicholas Nethercote for the &cachegrind; addition. Without these programs, <application
->KCachegrind</application
-> would not exist. Some ideas for this &GUI; were from them, too. </para>
-<para
->And thanks for all the bug reports/suggestions from different users. </para>
+<para>&kappname; </para>
+<para>Thanks to Julian Seward for his excellent &valgrind;, and Nicholas Nethercote for the &cachegrind; addition. Without these programs, <application>KCachegrind</application> would not exist. Some ideas for this &GUI; were from them, too. </para>
+<para>And thanks for all the bug reports/suggestions from different users. </para>
 &underFDL; </chapter>
 
 <appendix id="installation">
-<title
->Installation</title>
+<title>Installation</title>
 
 <sect1 id="getting-tdecachegrind">
-<title
->How to obtain &tdecachegrind;</title>
+<title>How to obtain &tdecachegrind;</title>
 
-<para
->&tdecachegrind; is part of the &package; package of &kde;. For less supported interim releases, &callgrind; and further documentation, see the homepage at <ulink url="http://tdecachegrind.sf.net"
-> http://tdecachegrind.sf.net</ulink
->. Look there for further installation and compile instructions. </para>
+<para>&tdecachegrind; is part of the &package; package of &kde;. For less supported interim releases, &callgrind; and further documentation, see the homepage at <ulink url="http://tdecachegrind.sf.net"> http://tdecachegrind.sf.net</ulink>. Look there for further installation and compile instructions. </para>
 </sect1>
 
 <sect1 id="requirements">
-<title
->Requirements</title>
+<title>Requirements</title>
 
-<para
->In order to successfully use &tdecachegrind;, you need &kde; 3.x. For generating profile data, &cachegrind; or &calltree;/&callgrind; is recommend. </para>
+<para>In order to successfully use &tdecachegrind;, you need &kde; 3.x. For generating profile data, &cachegrind; or &calltree;/&callgrind; is recommend. </para>
 </sect1>
 
 <sect1 id="compilation">
-<title
->Compilation and Installation</title>
+<title>Compilation and Installation</title>
 &install.compile.documentation; </sect1>
 
 <sect1 id="configuration">
-<title
->Configuration</title>
+<title>Configuration</title>
 
-<para
->All configuration options are either in the configuration dialogue or in the context popup menus of the visualisations. </para>
+<para>All configuration options are either in the configuration dialogue or in the context popup menus of the visualisations. </para>
 
 </sect1>
 
diff --git a/tde-i18n-en_GB/docs/tdesdk/umbrello/authors.docbook b/tde-i18n-en_GB/docs/tdesdk/umbrello/authors.docbook
index 8978a5ae7c3..0d60d3f1396 100644
--- a/tde-i18n-en_GB/docs/tdesdk/umbrello/authors.docbook
+++ b/tde-i18n-en_GB/docs/tdesdk/umbrello/authors.docbook
@@ -1,46 +1,15 @@
 <chapter id="authors">
-<title
->Authors and History</title>
-<para
->This project was started by Paul Hensgen as one of his University projects. The original name of the application was <application
->UML Modeller</application
->. Paul did all the development until the end of 2001 when the program reached version 1.0. </para>
-<para
->Version 1.0 already offered a lot of functionality, but after the project had been reviewed at Paul's University, other developers could join and they started making valuable contributions to <application
->UML Modeller</application
->, like switching from a binary file format to an &XML; file, support for more types of &UML; Diagrams, Code Generation and Code Import just to name a few. </para>
-<para
->Paul had to retire from the development team in Summer 2002 but, as Free and Open Source Software, the program continues to improve and evolve and is being maintained by a group of developers from different parts of the world. In September 2002 the project changed its name from <application
->&UML; Modeller</application
->, to &umbrello;. There are several reasons for the change of names, the most important ones being that just <quote
->uml</quote
-> &mdash; as it was commonly known &mdash; was a much too generic name and caused problems with some distributions. The other important reason is that the developers think <application
->Umbrello</application
-> is a much cooler name. </para>
-<para
->The development of &umbrello; as well as discussions as to where the program should head for future versions is open and takes place over the Internet. If you would like to contribute to the project, please do not hesitate to contact the developers. There are many ways in which you can help &umbrello;: </para>
+<title>Authors and History</title>
+<para>This project was started by Paul Hensgen as one of his University projects. The original name of the application was <application>UML Modeller</application>. Paul did all the development until the end of 2001 when the program reached version 1.0. </para>
+<para>Version 1.0 already offered a lot of functionality, but after the project had been reviewed at Paul's University, other developers could join and they started making valuable contributions to <application>UML Modeller</application>, like switching from a binary file format to an &XML; file, support for more types of &UML; Diagrams, Code Generation and Code Import just to name a few. </para>
+<para>Paul had to retire from the development team in Summer 2002 but, as Free and Open Source Software, the program continues to improve and evolve and is being maintained by a group of developers from different parts of the world. In September 2002 the project changed its name from <application>&UML; Modeller</application>, to &umbrello;. There are several reasons for the change of names, the most important ones being that just <quote>uml</quote> &mdash; as it was commonly known &mdash; was a much too generic name and caused problems with some distributions. The other important reason is that the developers think <application>Umbrello</application> is a much cooler name. </para>
+<para>The development of &umbrello; as well as discussions as to where the program should head for future versions is open and takes place over the Internet. If you would like to contribute to the project, please do not hesitate to contact the developers. There are many ways in which you can help &umbrello;: </para>
 <itemizedlist>
-<listitem
-><para
->Reporting bugs or improvements suggestions</para
-></listitem>
-<listitem
-><para
->Fixing bugs or adding features</para
-></listitem>
-<listitem
-><para
->Writing good documentation or translating it to other languages</para
-></listitem>
-<listitem
-><para
->And of course...coding with us!</para
-></listitem>
+<listitem><para>Reporting bugs or improvements suggestions</para></listitem>
+<listitem><para>Fixing bugs or adding features</para></listitem>
+<listitem><para>Writing good documentation or translating it to other languages</para></listitem>
+<listitem><para>And of course...coding with us!</para></listitem>
 </itemizedlist>
-<para
->As you see, there are many ways in which you can contribute. All of them are very important and everyone is welcome to participate. </para>
-<para
->The &umbrello; developers can be reached at <email
->uml-devel@lists.sourceforge.net</email
->. </para>
+<para>As you see, there are many ways in which you can contribute. All of them are very important and everyone is welcome to participate. </para>
+<para>The &umbrello; developers can be reached at <email>uml-devel@lists.sourceforge.net</email>. </para>
 </chapter>
diff --git a/tde-i18n-en_GB/docs/tdesdk/umbrello/code_import_and_generation.docbook b/tde-i18n-en_GB/docs/tdesdk/umbrello/code_import_and_generation.docbook
index 429217884c1..ecb0b0354c7 100644
--- a/tde-i18n-en_GB/docs/tdesdk/umbrello/code_import_and_generation.docbook
+++ b/tde-i18n-en_GB/docs/tdesdk/umbrello/code_import_and_generation.docbook
@@ -1,163 +1,82 @@
 <chapter id="code-import-generation">
-<title
->Code Import and Code Generation</title>
-<para
->&umbrello; is a &UML; modelling tool, and as such its main purpose is to help you in the <emphasis
->analysis and design</emphasis
-> of your systems. However, to make the transition between your design and your <emphasis
->implementation</emphasis
->, &umbrello; allows you to generate source code in different programming languages to get you started. Also, if you want to start using &UML; in an already started C++ project, &umbrello; can help you create a model of your system from the source code by analysing your source code and importing the classes found in it. </para>
+<title>Code Import and Code Generation</title>
+<para>&umbrello; is a &UML; modelling tool, and as such its main purpose is to help you in the <emphasis>analysis and design</emphasis> of your systems. However, to make the transition between your design and your <emphasis>implementation</emphasis>, &umbrello; allows you to generate source code in different programming languages to get you started. Also, if you want to start using &UML; in an already started C++ project, &umbrello; can help you create a model of your system from the source code by analysing your source code and importing the classes found in it. </para>
 <sect1 id="code-generation">
-<title
->Code Generation</title>
-<para
->&umbrello; can generate source code for various programming languages based on your &UML; Model to help you get started with the implementation of your project. The code generated consists of the class declarations, with their methods and attributes so you can <quote
->fill in the blanks</quote
-> by providing the functionality of your classes' operations. </para>
-<para
->&umbrello; 1.2 comes with code generation support for ActionScript, Ada, C++, CORBA IDL, &Java;, JavaScript, <acronym
->PHP</acronym
->, Perl, Python, SQL and XMLSchema. </para>
+<title>Code Generation</title>
+<para>&umbrello; can generate source code for various programming languages based on your &UML; Model to help you get started with the implementation of your project. The code generated consists of the class declarations, with their methods and attributes so you can <quote>fill in the blanks</quote> by providing the functionality of your classes' operations. </para>
+<para>&umbrello; 1.2 comes with code generation support for ActionScript, Ada, C++, CORBA IDL, &Java;, JavaScript, <acronym>PHP</acronym>, Perl, Python, SQL and XMLSchema. </para>
 <sect2 id="generate-code">
-<title
->Generating Code</title>
-<para
->In order to generate code with &umbrello;, you first need to create or load a Model containing at least one class. When you are ready to start writing some code, select the <guimenuitem
->Code Generation Wizard</guimenuitem
-> entry from the <guimenuitem
->Code</guimenuitem
-> menu to start a wizard which will guide you through the code generation process. </para>
-<para
->The first step is to select the classes for which you want to generate source code. By default all the classes of your model are selected, and you can remove the ones for which you do not want to generate code by moving them to the left-hand side list. </para>
-<para
->The next step of the wizard allows you to modify the parameters the Code Generator uses while writing your code. The following options are available: </para>
+<title>Generating Code</title>
+<para>In order to generate code with &umbrello;, you first need to create or load a Model containing at least one class. When you are ready to start writing some code, select the <guimenuitem>Code Generation Wizard</guimenuitem> entry from the <guimenuitem>Code</guimenuitem> menu to start a wizard which will guide you through the code generation process. </para>
+<para>The first step is to select the classes for which you want to generate source code. By default all the classes of your model are selected, and you can remove the ones for which you do not want to generate code by moving them to the left-hand side list. </para>
+<para>The next step of the wizard allows you to modify the parameters the Code Generator uses while writing your code. The following options are available: </para>
 <para>
 <screenshot>
-<screeninfo
->Code Generation Options</screeninfo>
+<screeninfo>Code Generation Options</screeninfo>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="generation-options.png" format="PNG"/>
 	  </imageobject>
 	  <textobject>
-	    <phrase
->Options for the Code Generation in &umbrello;</phrase>
+	    <phrase>Options for the Code Generation in &umbrello;</phrase>
 	  </textobject>
 	  <caption>
-	    <para
->Options for the Code Generation in &umbrello; </para>
+	    <para>Options for the Code Generation in &umbrello; </para>
 	  </caption>
 	</mediaobject>
 </screenshot>
 </para>
 <sect3 id="generation-options">
-<title
->Generation Options</title>
+<title>Generation Options</title>
 <!-- LW; to rearrange -->
 
 <sect4>
-<title
->Code Verbosity</title>
-<para
->The option <guilabel
->Write documentation comments even if empty</guilabel
-> instructs the Code Generator to write comments of the /** blah */ style even if the comment blocks are empty. If you added documentation to your classes, methods or attributes in your Model, the Code Generator will write these comments as <application
->Doxygen</application
-> documentation regardless of what you set here, but if you select this option &umbrello; will write comment blocks for all classes, methods and attributes even if there is no documentation in the Model, in which case you should document your classes later directly in the source code. </para>
-<para
-><guilabel
->Write comments for sections even if section is empty</guilabel
-> causes &umbrello; to write comments in the source code to delimit the different sections of a class. For example <quote
->public methods</quote
-> or <quote
->Attributes</quote
-> before the corresponding sections. If you select this option &umbrello; will write comments for all sections of the class even if the section is empty. For example, it would write a comment saying <quote
->protected methods</quote
-> even if there are no protected methods in your class. </para>
+<title>Code Verbosity</title>
+<para>The option <guilabel>Write documentation comments even if empty</guilabel> instructs the Code Generator to write comments of the /** blah */ style even if the comment blocks are empty. If you added documentation to your classes, methods or attributes in your Model, the Code Generator will write these comments as <application>Doxygen</application> documentation regardless of what you set here, but if you select this option &umbrello; will write comment blocks for all classes, methods and attributes even if there is no documentation in the Model, in which case you should document your classes later directly in the source code. </para>
+<para><guilabel>Write comments for sections even if section is empty</guilabel> causes &umbrello; to write comments in the source code to delimit the different sections of a class. For example <quote>public methods</quote> or <quote>Attributes</quote> before the corresponding sections. If you select this option &umbrello; will write comments for all sections of the class even if the section is empty. For example, it would write a comment saying <quote>protected methods</quote> even if there are no protected methods in your class. </para>
 </sect4>
 <sect4>
-<title
->Folders</title>
-<para
-><guilabel
->Write all generated files to folder</guilabel
->. Here you should select the folder where you want &umbrello; to put the generated sources. </para>
-<para
->The <guilabel
->Include heading files from folder</guilabel
-> option allows you to insert a heading at the beginning of each generated file. Heading files can contain copyright or licensing information and contain variables that are evaluated at generation time. You can take a look at the template heading files shipped with &umbrello; to see how to use this variables for replacing your name or the current date at generation time. </para>
+<title>Folders</title>
+<para><guilabel>Write all generated files to folder</guilabel>. Here you should select the folder where you want &umbrello; to put the generated sources. </para>
+<para>The <guilabel>Include heading files from folder</guilabel> option allows you to insert a heading at the beginning of each generated file. Heading files can contain copyright or licensing information and contain variables that are evaluated at generation time. You can take a look at the template heading files shipped with &umbrello; to see how to use this variables for replacing your name or the current date at generation time. </para>
 </sect4>
 <sect4>
-<title
->Overwrite Policy</title>
+<title>Overwrite Policy</title>
 <!-- FIXME update for Umbrello 1.2's new C++ and Java code generators -->
-<para
->This option tells &umbrello; what to do if the file it wants to create already exists in the destination folder. &umbrello; <emphasis
->cannot modify existing source files</emphasis
->, so you have to choose between overwriting the existing file, skipping the generation of that particular file or letting &umbrello; choose a different file name. If you choose the option to use a different name, &umbrello; will add a suffix to the file name. </para>
+<para>This option tells &umbrello; what to do if the file it wants to create already exists in the destination folder. &umbrello; <emphasis>cannot modify existing source files</emphasis>, so you have to choose between overwriting the existing file, skipping the generation of that particular file or letting &umbrello; choose a different file name. If you choose the option to use a different name, &umbrello; will add a suffix to the file name. </para>
 </sect4>
 <sect4>
-<title
->Language</title>
-<para
->&umbrello; will by default generate code in the language you have selected as Active Language, but with the Code Generation Wizard you have the option to change this to another language. </para>
+<title>Language</title>
+<para>&umbrello; will by default generate code in the language you have selected as Active Language, but with the Code Generation Wizard you have the option to change this to another language. </para>
 </sect4>
-</sect3
-><!--generation-options-->
+</sect3><!--generation-options-->
 <sect3 id="generation-wizard-generation">
-<title
->Generation Wizard Generation</title>
-<para
->The third and last step of the wizard shows the status of the Code Generation process. You need only to click on the Generate button to get your classes written for you. </para>
-<para
->Note that the Options you select during the Code Generation Wizard are only valid for the current generation. The next time you run the wizard you will need to re-select all the options (your headings folder, overwrite policy, and so on). You can set the defaults used by &umbrello; in the <guilabel
->Code Generation</guilabel
-> section of the &umbrello; settings, available at <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure &umbrello;...</guimenuitem
-></menuchoice
-> </para>
-<para
->If you have set your Code Generation options to the right settings and want to generate some code right away without going through the wizard, you can select the entire <guimenuitem
->Generate All Code</guimenuitem
-> from the Code menu. This will generate code for all the classes in your Model using the current settings (including Output Folder and Overwrite Policy, so use with care). </para>
+<title>Generation Wizard Generation</title>
+<para>The third and last step of the wizard shows the status of the Code Generation process. You need only to click on the Generate button to get your classes written for you. </para>
+<para>Note that the Options you select during the Code Generation Wizard are only valid for the current generation. The next time you run the wizard you will need to re-select all the options (your headings folder, overwrite policy, and so on). You can set the defaults used by &umbrello; in the <guilabel>Code Generation</guilabel> section of the &umbrello; settings, available at <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &umbrello;...</guimenuitem></menuchoice> </para>
+<para>If you have set your Code Generation options to the right settings and want to generate some code right away without going through the wizard, you can select the entire <guimenuitem>Generate All Code</guimenuitem> from the Code menu. This will generate code for all the classes in your Model using the current settings (including Output Folder and Overwrite Policy, so use with care). </para>
 </sect3>
-</sect2
-><!--generate-code-->
-</sect1
-> <!--code-generation-->
+</sect2><!--generate-code-->
+</sect1> <!--code-generation-->
 <sect1 id="code-import">
-<title
->Code Import</title>
-<para
->&umbrello; can import source code from your existing projects to help you build Model of your systems. &umbrello; 1.2 supports only C++ source code, but other languages should be available in future versions. </para>
-<para
->To import classes into your Model, select the entry <guimenuitem
->Import Classes...</guimenuitem
-> from the <guimenu
->Code</guimenu
-> menu. In the file dialogue select the files containing the C++ class declarations and press OK. The classes will be imported and you will find them as part of your Model in the Tree View. Note that &umbrello; will not create any kind of Diagram for showing your classes, they will only be imported into your Model so that you can use them later in any diagram you want. </para>
+<title>Code Import</title>
+<para>&umbrello; can import source code from your existing projects to help you build Model of your systems. &umbrello; 1.2 supports only C++ source code, but other languages should be available in future versions. </para>
+<para>To import classes into your Model, select the entry <guimenuitem>Import Classes...</guimenuitem> from the <guimenu>Code</guimenu> menu. In the file dialogue select the files containing the C++ class declarations and press OK. The classes will be imported and you will find them as part of your Model in the Tree View. Note that &umbrello; will not create any kind of Diagram for showing your classes, they will only be imported into your Model so that you can use them later in any diagram you want. </para>
 <para>
 <screenshot>
-<screeninfo
->Code Import</screeninfo>
+<screeninfo>Code Import</screeninfo>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="code-import.png" format="PNG"/>
 	  </imageobject>
 	  <textobject>
-	    <phrase
->Menu for importing source code in &umbrello;</phrase>
+	    <phrase>Menu for importing source code in &umbrello;</phrase>
 	  </textobject>
 	  <caption>
-	    <para
->Menu for importing source code in &umbrello; </para>
+	    <para>Menu for importing source code in &umbrello; </para>
 	  </caption>
 	</mediaobject>
 </screenshot>
 </para>
 </sect1>
-</chapter
-> <!--code-import-generation-->
+</chapter> <!--code-import-generation-->
diff --git a/tde-i18n-en_GB/docs/tdesdk/umbrello/credits.docbook b/tde-i18n-en_GB/docs/tdesdk/umbrello/credits.docbook
index b8a1c5500d9..384ee552c52 100644
--- a/tde-i18n-en_GB/docs/tdesdk/umbrello/credits.docbook
+++ b/tde-i18n-en_GB/docs/tdesdk/umbrello/credits.docbook
@@ -1,11 +1,6 @@
 <chapter id="copyright">
-<title
->Copyright</title>
+<title>Copyright</title>
 
-<para
->Copyright 2001, Paul Hensgen</para>
-<para
->Copyright 2002, 2003 The &umbrello; Authors. See <ulink url="http://uml.sf.net/developers.php"
->http://uml.sf.net/developers.php</ulink
-> for more information</para>
+<para>Copyright 2001, Paul Hensgen</para>
+<para>Copyright 2002, 2003 The &umbrello; Authors. See <ulink url="http://uml.sf.net/developers.php">http://uml.sf.net/developers.php</ulink> for more information</para>
 &underFDL; &underGPL; </chapter>
diff --git a/tde-i18n-en_GB/docs/tdesdk/umbrello/index.docbook b/tde-i18n-en_GB/docs/tdesdk/umbrello/index.docbook
index 055f079585c..117ec0d1d50 100644
--- a/tde-i18n-en_GB/docs/tdesdk/umbrello/index.docbook
+++ b/tde-i18n-en_GB/docs/tdesdk/umbrello/index.docbook
@@ -1,14 +1,10 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
  "dtd/kdex.dtd" [
- <!ENTITY umbrello "<application
->Umbrello &UML; Modeller</application
->">
+ <!ENTITY umbrello "<application>Umbrello &UML; Modeller</application>">
  <!ENTITY kappname "&umbrello;">
  <!ENTITY packagename "tdesdk">
- <!ENTITY UML "<acronym
->UML</acronym
->">
+ <!ENTITY UML "<acronym>UML</acronym>">
  <!ENTITY introduction-chapter SYSTEM "introduction.docbook">
  <!ENTITY uml-basics-chapter SYSTEM "uml_basics.docbook">
  <!ENTITY working-with-umbrello-chapter SYSTEM "working_with_umbrello.docbook">
@@ -17,59 +13,43 @@
  <!ENTITY authors-chapter SYSTEM "authors.docbook">
  <!ENTITY credits-chapter SYSTEM "credits.docbook">
  <!ENTITY % addindex "IGNORE">
- <!ENTITY % British-English "INCLUDE"
-><!-- change language only here -->
+ <!ENTITY % British-English "INCLUDE"><!-- change language only here -->
   <!-- Do not define any other entities; instead, use the entities
        from kde-genent.entities and $LANG/user.entities. -->
 ]>
 
 <book id="Umbrello" lang="&language;">
 <bookinfo>
-<title
->&umbrello; Handbook</title>
+<title>&umbrello; Handbook</title>
 
 <authorgroup>
-<corpauthor
->&umbrello; Authors</corpauthor>
+<corpauthor>&umbrello; Authors</corpauthor>
 </authorgroup>
 
 <copyright>
-<year
->2001</year>
-<holder
->Paul Hensgen</holder>
+<year>2001</year>
+<holder>Paul Hensgen</holder>
 </copyright>
 <copyright>
-<year
->2002, 2003</year>
-<holder
->&umbrello; Authors</holder>
+<year>2002, 2003</year>
+<holder>&umbrello; Authors</holder>
 </copyright>
 
 
-<date
->2003-10-15</date>
-<releaseinfo
->1.2</releaseinfo>
+<date>2003-10-15</date>
+<releaseinfo>1.2</releaseinfo>
 
 <abstract>
-<para
->&umbrello; helps the software development process by using the industry standard Unified Modelling Language (&UML;) to enable you to create diagrams for designing and documenting your systems. </para>
+<para>&umbrello; helps the software development process by using the industry standard Unified Modelling Language (&UML;) to enable you to create diagrams for designing and documenting your systems. </para>
 </abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->UML</keyword>
-<keyword
->modelling</keyword>
-<keyword
->diagrams</keyword>
-<keyword
->software development</keyword>
-<keyword
->development</keyword>
+<keyword>KDE</keyword>
+<keyword>UML</keyword>
+<keyword>modelling</keyword>
+<keyword>diagrams</keyword>
+<keyword>software development</keyword>
+<keyword>development</keyword>
 </keywordset>
 
 </bookinfo>
diff --git a/tde-i18n-en_GB/docs/tdesdk/umbrello/introduction.docbook b/tde-i18n-en_GB/docs/tdesdk/umbrello/introduction.docbook
index 1869425cc45..08cede5dc86 100644
--- a/tde-i18n-en_GB/docs/tdesdk/umbrello/introduction.docbook
+++ b/tde-i18n-en_GB/docs/tdesdk/umbrello/introduction.docbook
@@ -1,57 +1,19 @@
 <chapter id="introduction">
-<title
->Introduction</title>
+<title>Introduction</title>
 
-<para
->&umbrello; is a &UML; diagram tool that can support you in the software development process. Especially during the analysis and design phases of this process, &umbrello; will help you to get a high quality product. &UML; can also be used to document your software designs to help you and your fellow developers. </para>
-<para
->Having a good model of your software is the best way to communicate with other developers working on the project and with your customers. A good model is extremely important for medium and big-size projects, but it is also very useful for small ones. Even if you are working on a small one man project you will benefit from a good model because it will give you an overview that will help you code things right the first time. </para>
-<para
->&UML; is the diagramming language used to describing such models. You can represent your ideas in &UML; using different types of diagrams. &umbrello; 1.2 supports the following types: </para>
+<para>&umbrello; is a &UML; diagram tool that can support you in the software development process. Especially during the analysis and design phases of this process, &umbrello; will help you to get a high quality product. &UML; can also be used to document your software designs to help you and your fellow developers. </para>
+<para>Having a good model of your software is the best way to communicate with other developers working on the project and with your customers. A good model is extremely important for medium and big-size projects, but it is also very useful for small ones. Even if you are working on a small one man project you will benefit from a good model because it will give you an overview that will help you code things right the first time. </para>
+<para>&UML; is the diagramming language used to describing such models. You can represent your ideas in &UML; using different types of diagrams. &umbrello; 1.2 supports the following types: </para>
 <itemizedlist>
-<listitem
-><para
->Class Diagram</para
-></listitem>
-<listitem
-><para
->Sequence Diagram</para
-></listitem>
-<listitem
-><para
->Collaboration Diagram</para
-></listitem>
-<listitem
-><para
->Use Case Diagram</para
-></listitem>
-<listitem
-><para
->State Diagram</para
-></listitem>
-<listitem
-><para
->Activity Diagram</para
-></listitem>
-<listitem
-><para
->Component Diagram</para
-></listitem>
-<listitem
-><para
->Deployment Diagram</para
-></listitem>
+<listitem><para>Class Diagram</para></listitem>
+<listitem><para>Sequence Diagram</para></listitem>
+<listitem><para>Collaboration Diagram</para></listitem>
+<listitem><para>Use Case Diagram</para></listitem>
+<listitem><para>State Diagram</para></listitem>
+<listitem><para>Activity Diagram</para></listitem>
+<listitem><para>Component Diagram</para></listitem>
+<listitem><para>Deployment Diagram</para></listitem>
 </itemizedlist>
-<para
->More information about &UML; can be found at the website of <ulink url="http://www.omg.org"
-><acronym
->OMG</acronym
->, http://www.omg.org</ulink
-> who create the &UML; standard. </para>
-<para
->We hope you enjoy &umbrello; and that it helps you create high quality software. &umbrello; is Free Software and available at no cost, the only thing we ask from you is to report any bugs, problems, or suggestions to the &umbrello; developers at <email
->uml-devel@lists.sourceforge.net</email
-> or <ulink url="http://bugs.kde.org"
->http://bugs.kde.org</ulink
->. </para>
+<para>More information about &UML; can be found at the website of <ulink url="http://www.omg.org"><acronym>OMG</acronym>, http://www.omg.org</ulink> who create the &UML; standard. </para>
+<para>We hope you enjoy &umbrello; and that it helps you create high quality software. &umbrello; is Free Software and available at no cost, the only thing we ask from you is to report any bugs, problems, or suggestions to the &umbrello; developers at <email>uml-devel@lists.sourceforge.net</email> or <ulink url="http://bugs.kde.org">http://bugs.kde.org</ulink>. </para>
 </chapter>
diff --git a/tde-i18n-en_GB/docs/tdesdk/umbrello/other_features.docbook b/tde-i18n-en_GB/docs/tdesdk/umbrello/other_features.docbook
index 20fcfd9f765..ffdb636fd49 100644
--- a/tde-i18n-en_GB/docs/tdesdk/umbrello/other_features.docbook
+++ b/tde-i18n-en_GB/docs/tdesdk/umbrello/other_features.docbook
@@ -1,72 +1,35 @@
 <chapter id="other-features">
-<title
->Other Features</title>
-<sect1
-> 
-<title
->Other &umbrello; Features</title>
-<para
->This chapter will briefly explain some other features &umbrello; offers you.</para>
+<title>Other Features</title>
+<sect1> 
+<title>Other &umbrello; Features</title>
+<para>This chapter will briefly explain some other features &umbrello; offers you.</para>
 <sect2 id="copying-as-png">
-<title
->Copying objects as PNG images</title>
-<para
->Apart from offering you the normal copy, cut and paste functionality that you would expect to copy objects between different diagrams, &umbrello; can copy the objects as PNG pictures so that you can insert them into any other type of document. You do not need to do anything special to use this feature, just select an object from a diagram (Class, Actor, &etc;) and copy it (<keycombo
->&Ctrl;<keycap
->C</keycap
-></keycombo
->, or using the menu), then open a &kword; document (or any program into which you can paste images) and select <guimenuitem
->Paste</guimenuitem
->. This is a great feature to export parts of your diagram as simple pictures. </para>
+<title>Copying objects as PNG images</title>
+<para>Apart from offering you the normal copy, cut and paste functionality that you would expect to copy objects between different diagrams, &umbrello; can copy the objects as PNG pictures so that you can insert them into any other type of document. You do not need to do anything special to use this feature, just select an object from a diagram (Class, Actor, &etc;) and copy it (<keycombo>&Ctrl;<keycap>C</keycap></keycombo>, or using the menu), then open a &kword; document (or any program into which you can paste images) and select <guimenuitem>Paste</guimenuitem>. This is a great feature to export parts of your diagram as simple pictures. </para>
 </sect2>
 <sect2 id="export-as-png">
-<title
->Exporting to an Image</title>
-<para
->You can also export a complete diagram as an image. The only thing you need to do is select the diagram you want to export, and then the option <guimenuitem
->Export as Picture...</guimenuitem
-> from the <guimenu
->Diagram</guimenu
-> menu. </para>
+<title>Exporting to an Image</title>
+<para>You can also export a complete diagram as an image. The only thing you need to do is select the diagram you want to export, and then the option <guimenuitem>Export as Picture...</guimenuitem> from the <guimenu>Diagram</guimenu> menu. </para>
 </sect2>
 <sect2 id="printing">
-<title
->Printing</title>
-<para
->&umbrello; allows you to print individual diagrams. Press the <guiicon
->Print</guiicon
-> button on the application toolbar or selecting the <guimenuitem
->Print</guimenuitem
-> option from the <guimenu
->File</guimenu
-> menu will give you a standard &kde; Print dialogue from where you can print your diagrams. </para>
+<title>Printing</title>
+<para>&umbrello; allows you to print individual diagrams. Press the <guiicon>Print</guiicon> button on the application toolbar or selecting the <guimenuitem>Print</guimenuitem> option from the <guimenu>File</guimenu> menu will give you a standard &kde; Print dialogue from where you can print your diagrams. </para>
 </sect2>
 <sect2 id="logical-folders">
-<title
->Logical Folders</title>
-<para
->To better organise your model, especially for larger projects, you can create logical folders in the Tree View. Just select the option <menuchoice
-><guimenu
->New</guimenu
-><guimenuitem
->Folder</guimenuitem
-></menuchoice
-> from the context menu of the default folders in the Tree View to create them. Folders can be nested, and you can move objects around by dragging them from one folder and dropping them into another. </para>
+<title>Logical Folders</title>
+<para>To better organise your model, especially for larger projects, you can create logical folders in the Tree View. Just select the option <menuchoice><guimenu>New</guimenu><guimenuitem>Folder</guimenuitem></menuchoice> from the context menu of the default folders in the Tree View to create them. Folders can be nested, and you can move objects around by dragging them from one folder and dropping them into another. </para>
 
 <screenshot>
-<screeninfo
->Organising your Model with Folders</screeninfo>
+<screeninfo>Organising your Model with Folders</screeninfo>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="folders.png" format="PNG"/>
 	  </imageobject>
 	  <textobject>
-	    <phrase
->Organising a Model with Logical Folders in &umbrello;</phrase>
+	    <phrase>Organising a Model with Logical Folders in &umbrello;</phrase>
 	  </textobject>
 	  <caption>
-	    <para
->Organising a Model with Logical Folders in &umbrello; </para>
+	    <para>Organising a Model with Logical Folders in &umbrello; </para>
 	  </caption>
 	</mediaobject>
 </screenshot>
diff --git a/tde-i18n-en_GB/docs/tdesdk/umbrello/uml_basics.docbook b/tde-i18n-en_GB/docs/tdesdk/umbrello/uml_basics.docbook
index dffaa498a57..ee4370f7f4d 100644
--- a/tde-i18n-en_GB/docs/tdesdk/umbrello/uml_basics.docbook
+++ b/tde-i18n-en_GB/docs/tdesdk/umbrello/uml_basics.docbook
@@ -1,378 +1,169 @@
 <chapter id="uml-basics">
-<title
->&UML; Basics</title>
+<title>&UML; Basics</title>
 <sect1 id="about-uml">
-<title
->About &UML;</title>
-<para
->This chapter will give you a quick overview of the basics of &UML;. Keep in mind that this is not a comprehensive tutorial on &UML; but rather a brief introduction to &UML; which can be read as a &UML; tutorial. If you would like to learn more about the Unified Modelling Language, or in general about software analysis and design, refer to one of the many books available on the topic. There are also a lot of tutorials on the Internet which you can take as a starting point. </para>
-
-<para
->The Unified Modelling Language (&UML;) is a diagramming language or notation to specify, visualise and document models of Object Orientated software systems. &UML; is not a development method, that means it does not tell you what to do first and what to do next or how to design your system, but it helps you to visualise your design and communicate with others. &UML; is controlled by the Object Management Group (<acronym
->OMG</acronym
->) and is the industry standard for graphically describing software. </para>
-<para
->&UML; is designed for Object Orientated software design and has limited use for other programming paradigms. </para>
-<para
->&UML; is composed of many model elements that represent the different parts of a software system. The &UML; elements are used to create diagrams, which represent a certain part, or a point of view of the system. The following types of diagrams are supported by &umbrello;: </para>
+<title>About &UML;</title>
+<para>This chapter will give you a quick overview of the basics of &UML;. Keep in mind that this is not a comprehensive tutorial on &UML; but rather a brief introduction to &UML; which can be read as a &UML; tutorial. If you would like to learn more about the Unified Modelling Language, or in general about software analysis and design, refer to one of the many books available on the topic. There are also a lot of tutorials on the Internet which you can take as a starting point. </para>
+
+<para>The Unified Modelling Language (&UML;) is a diagramming language or notation to specify, visualise and document models of Object Orientated software systems. &UML; is not a development method, that means it does not tell you what to do first and what to do next or how to design your system, but it helps you to visualise your design and communicate with others. &UML; is controlled by the Object Management Group (<acronym>OMG</acronym>) and is the industry standard for graphically describing software. </para>
+<para>&UML; is designed for Object Orientated software design and has limited use for other programming paradigms. </para>
+<para>&UML; is composed of many model elements that represent the different parts of a software system. The &UML; elements are used to create diagrams, which represent a certain part, or a point of view of the system. The following types of diagrams are supported by &umbrello;: </para>
 
 <itemizedlist>
 
-<listitem
-><para
-><emphasis
-><link linkend="use-case-diagram"
->Use Case Diagrams</link
-></emphasis
-> show actors (people or other users of the system), use cases (the scenarios when they use the system), and their relationships</para
-> </listitem>
-
-<listitem
-><para
-><emphasis
-><link linkend="class-diagram"
->Class Diagrams</link
-></emphasis
-> show classes and the relationships between them</para
-> </listitem>
-
-<listitem
-><para
-><emphasis
-><link linkend="sequence-diagram"
->Sequence Diagrams</link
-></emphasis
-> show objects and a sequence of method calls they make to other objects.</para
-> </listitem>
-
-<listitem
-><para
-><emphasis
-><link linkend="collaboration-diagram"
->Collaboration Diagrams</link
-></emphasis
-> show objects and their relationship, putting emphasis on the objects that participate in the message exchange</para>
+<listitem><para><emphasis><link linkend="use-case-diagram">Use Case Diagrams</link></emphasis> show actors (people or other users of the system), use cases (the scenarios when they use the system), and their relationships</para> </listitem>
+
+<listitem><para><emphasis><link linkend="class-diagram">Class Diagrams</link></emphasis> show classes and the relationships between them</para> </listitem>
+
+<listitem><para><emphasis><link linkend="sequence-diagram">Sequence Diagrams</link></emphasis> show objects and a sequence of method calls they make to other objects.</para> </listitem>
+
+<listitem><para><emphasis><link linkend="collaboration-diagram">Collaboration Diagrams</link></emphasis> show objects and their relationship, putting emphasis on the objects that participate in the message exchange</para>
 </listitem>
 
-<listitem
-><para
-><emphasis
-><link linkend="state-diagram"
->State Diagrams</link
-></emphasis
-> show states, state changes and events in an object or a part of the system</para
-> </listitem>
-
-<listitem
-><para
-><emphasis
-><link linkend="activity-diagram"
->Activity Diagrams</link
-></emphasis
-> show activities and the changes from one activity to another with the events occurring in some part of the system</para
-></listitem>
-
-<listitem
-><para
-><emphasis
-><link linkend="component-diagram"
->Component Diagrams</link
-></emphasis
-> show the high level programming components (such as KParts or Java Beans).</para
-></listitem>
-
-<listitem
-><para
-><emphasis
-><link linkend="deployment-diagram"
->Deployment Diagrams</link
-></emphasis
-> show the instances of the components and their relationships.</para
-></listitem
->
+<listitem><para><emphasis><link linkend="state-diagram">State Diagrams</link></emphasis> show states, state changes and events in an object or a part of the system</para> </listitem>
+
+<listitem><para><emphasis><link linkend="activity-diagram">Activity Diagrams</link></emphasis> show activities and the changes from one activity to another with the events occurring in some part of the system</para></listitem>
+
+<listitem><para><emphasis><link linkend="component-diagram">Component Diagrams</link></emphasis> show the high level programming components (such as KParts or Java Beans).</para></listitem>
+
+<listitem><para><emphasis><link linkend="deployment-diagram">Deployment Diagrams</link></emphasis> show the instances of the components and their relationships.</para></listitem>
 
 </itemizedlist>
 
-</sect1
->   <!-- about-uml -->
+</sect1>   <!-- about-uml -->
 
-<sect1 id="uml-elements"
->
-<title
->&UML; Elements</title>
+<sect1 id="uml-elements">
+<title>&UML; Elements</title>
 <sect2 id="use-case-diagram">
-<title
->Use Case Diagram</title>
-<para
->Use Case Diagrams describe the relationships and dependencies between a group of <emphasis
->Use Cases</emphasis
-> and the Actors participating in the process.</para>
-<para
->It is important to notice that Use Case Diagrams are not suited to represent the design, and cannot describe the internals of a system. Use Case Diagrams are meant to facilitate the communication with the future users of the system, and with the customer, and are specially helpful to determine the required features the system is to have. Use Case Diagrams tell, <emphasis
->what</emphasis
-> the system should do but do not &mdash; and cannot &mdash; specify <emphasis
->how</emphasis
-> this is to be achieved.</para>
+<title>Use Case Diagram</title>
+<para>Use Case Diagrams describe the relationships and dependencies between a group of <emphasis>Use Cases</emphasis> and the Actors participating in the process.</para>
+<para>It is important to notice that Use Case Diagrams are not suited to represent the design, and cannot describe the internals of a system. Use Case Diagrams are meant to facilitate the communication with the future users of the system, and with the customer, and are specially helpful to determine the required features the system is to have. Use Case Diagrams tell, <emphasis>what</emphasis> the system should do but do not &mdash; and cannot &mdash; specify <emphasis>how</emphasis> this is to be achieved.</para>
 <para>
 <screenshot>
-<screeninfo
->An example Use Case diagram.</screeninfo>
+<screeninfo>An example Use Case diagram.</screeninfo>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="use-case-diagram.png" format="PNG"/>
 	  </imageobject>
 	  <textobject>
-	    <phrase
->&umbrello; showing a Use Case Diagram</phrase>
+	    <phrase>&umbrello; showing a Use Case Diagram</phrase>
 	  </textobject>
 	  <caption>
-	    <para
->&umbrello; showing a Use Case Diagram </para>
+	    <para>&umbrello; showing a Use Case Diagram </para>
 	  </caption>
 	</mediaobject>
 </screenshot>
 </para>
 <sect3 id="use-case">
-<title
->Use Case</title>
-<para
->A <emphasis
->Use Case</emphasis
-> describes &mdash; from the point of view of the actors &mdash; a group of activities in a system that produces a concrete, tangible result.</para>
-<para
->Use Cases are descriptions of the typical interactions between the users of a system and the system itself. They represent the external interface of the system and specify a form of requirements of what the system has to do (remember, only what, not how). </para>
-<para
->When working with Use Cases, it is important to remember some simple rules: <itemizedlist>
- <listitem
-><para
->Each Use Case is related to at least one actor</para
-></listitem>
- <listitem
-><para
->Each Use Case has an initiator (&ie; an actor)</para
-></listitem>
- <listitem
-><para
->Each Use Case leads to a relevant result (a result with <quote
->business value</quote
->)</para>
+<title>Use Case</title>
+<para>A <emphasis>Use Case</emphasis> describes &mdash; from the point of view of the actors &mdash; a group of activities in a system that produces a concrete, tangible result.</para>
+<para>Use Cases are descriptions of the typical interactions between the users of a system and the system itself. They represent the external interface of the system and specify a form of requirements of what the system has to do (remember, only what, not how). </para>
+<para>When working with Use Cases, it is important to remember some simple rules: <itemizedlist>
+ <listitem><para>Each Use Case is related to at least one actor</para></listitem>
+ <listitem><para>Each Use Case has an initiator (&ie; an actor)</para></listitem>
+ <listitem><para>Each Use Case leads to a relevant result (a result with <quote>business value</quote>)</para>
  </listitem>
  </itemizedlist>
 </para>
-<para
->Use Cases can also have relationships with other Use Cases. The three most typical types of relationships between Use Cases are:</para>
+<para>Use Cases can also have relationships with other Use Cases. The three most typical types of relationships between Use Cases are:</para>
 <itemizedlist>
-<listitem
-><para
-><emphasis
->&lt;&lt;include&gt;&gt;</emphasis
-> which specifies that a Use Case takes place <emphasis
->inside</emphasis
-> another Use Case</para
-></listitem>
-<listitem
-><para
-><emphasis
->&lt;&lt;extends&gt;&gt;</emphasis
-> which specifies that in certain situations, or at some point (called an extension point) a Use Case will be extended by another.</para
-></listitem>
-<listitem
-><para
-><emphasis
->Generalisation</emphasis
-> specifies that a Use Case inherits the characteristics of the <quote
->Super</quote
->-Use Case, and can override some of them or add new ones in a similar way as the inheritance between classes. </para>
+<listitem><para><emphasis>&lt;&lt;include&gt;&gt;</emphasis> which specifies that a Use Case takes place <emphasis>inside</emphasis> another Use Case</para></listitem>
+<listitem><para><emphasis>&lt;&lt;extends&gt;&gt;</emphasis> which specifies that in certain situations, or at some point (called an extension point) a Use Case will be extended by another.</para></listitem>
+<listitem><para><emphasis>Generalisation</emphasis> specifies that a Use Case inherits the characteristics of the <quote>Super</quote>-Use Case, and can override some of them or add new ones in a similar way as the inheritance between classes. </para>
 </listitem>
 </itemizedlist>
 </sect3>
 <sect3 id="actor">
-<title
->Actor</title>
-<para
->An actor is an external entity (outside of the system) that interacts with the system by participating (and often initiating) a Use Case. Actors can be in real life people (for example users of the system), other computer systems or external events. </para>
-<para
->Actors do not represent the <emphasis
->physical</emphasis
-> people or systems, but their <emphasis
->role</emphasis
->. This means that when a person interacts with the system in different ways (assuming different roles) he will be represented by several actors. For example a person that gives customer support by the telephone and takes orders from the customer into the system would be represented by an actor <quote
->Support Staff</quote
-> and an actor <quote
->Sales Representative</quote
-> </para>
+<title>Actor</title>
+<para>An actor is an external entity (outside of the system) that interacts with the system by participating (and often initiating) a Use Case. Actors can be in real life people (for example users of the system), other computer systems or external events. </para>
+<para>Actors do not represent the <emphasis>physical</emphasis> people or systems, but their <emphasis>role</emphasis>. This means that when a person interacts with the system in different ways (assuming different roles) he will be represented by several actors. For example a person that gives customer support by the telephone and takes orders from the customer into the system would be represented by an actor <quote>Support Staff</quote> and an actor <quote>Sales Representative</quote> </para>
 </sect3>
 <sect3 id="use-case-description">
-<title
->Use Case Description</title>
-<para
->Use Case Descriptions are textual narratives of the Use Case. They usually take the form of a note or a document that is somehow linked to the Use Case, and explains the processes or activities that take place in the Use Case. </para>
+<title>Use Case Description</title>
+<para>Use Case Descriptions are textual narratives of the Use Case. They usually take the form of a note or a document that is somehow linked to the Use Case, and explains the processes or activities that take place in the Use Case. </para>
 </sect3>
-</sect2
-> <!-- use-case-diagram -->
+</sect2> <!-- use-case-diagram -->
 
 <sect2 id="class-diagram">
-<title
->Class Diagram</title>
-<para
->Class Diagrams show the different classes that make up a system and how they relate to each other. Class Diagrams are said to be <quote
->static</quote
-> diagrams because they show the classes, along with their methods and attributes as well as the static relationships between them: which classes <quote
->know</quote
-> about which classes or which classes <quote
->are part</quote
-> of another class, but do not show the method calls between them. </para>
+<title>Class Diagram</title>
+<para>Class Diagrams show the different classes that make up a system and how they relate to each other. Class Diagrams are said to be <quote>static</quote> diagrams because they show the classes, along with their methods and attributes as well as the static relationships between them: which classes <quote>know</quote> about which classes or which classes <quote>are part</quote> of another class, but do not show the method calls between them. </para>
 <para>
 <screenshot>
-<screeninfo
->An example of a Class Diagram</screeninfo>
+<screeninfo>An example of a Class Diagram</screeninfo>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="class-diagram.png" format="PNG"/>
 	  </imageobject>
 	  <textobject>
-	    <phrase
->&umbrello; showing a Class Diagram</phrase>
+	    <phrase>&umbrello; showing a Class Diagram</phrase>
 	  </textobject>
 	  <caption>
-	    <para
->&umbrello; showing a Class Diagram </para>
+	    <para>&umbrello; showing a Class Diagram </para>
 	  </caption>
 	</mediaobject>
 </screenshot>
 </para>
 <sect3 id="class">
-<title
->Class</title>
-<para
->A Class defines the attributes and the methods of a set of objects. All objects of this class (instances of this class) share the same behaviour, and have the same set of attributes (each object has its own set). The term <quote
->Type</quote
-> is sometimes used instead of Class, but it is important to mention that these two are not the same, and Type is a more general term. </para>
-<para
->In &UML;, Classes are represented by rectangles, with the name of the class, and can also show the attributes and operations of the class in two other <quote
->compartments</quote
-> inside the rectangle. </para>
+<title>Class</title>
+<para>A Class defines the attributes and the methods of a set of objects. All objects of this class (instances of this class) share the same behaviour, and have the same set of attributes (each object has its own set). The term <quote>Type</quote> is sometimes used instead of Class, but it is important to mention that these two are not the same, and Type is a more general term. </para>
+<para>In &UML;, Classes are represented by rectangles, with the name of the class, and can also show the attributes and operations of the class in two other <quote>compartments</quote> inside the rectangle. </para>
 <para>
 <screenshot>
-<screeninfo
->A Class in &UML;</screeninfo>
+<screeninfo>A Class in &UML;</screeninfo>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="class.png" format="PNG"/>
 	  </imageobject>
 	  <textobject>
-	    <phrase
->Visual representation of a Class in &UML;</phrase>
+	    <phrase>Visual representation of a Class in &UML;</phrase>
 	  </textobject>
 	  <caption>
-	    <para
->Visual representation of a Class in &UML; </para>
+	    <para>Visual representation of a Class in &UML; </para>
 	  </caption>
 	</mediaobject>
 </screenshot>
 </para>
 <sect4 id="attribute">
-<title
->Attributes</title>
-<para
->In &UML;, Attributes are shown with at least their name, and can also show their type, initial value and other properties. Attributes can also be displayed with their visibility: </para>
+<title>Attributes</title>
+<para>In &UML;, Attributes are shown with at least their name, and can also show their type, initial value and other properties. Attributes can also be displayed with their visibility: </para>
 <itemizedlist>
-<listitem
-><para
-><literal
->+</literal
-> Stands for <emphasis
->public</emphasis
-> attributes</para
-></listitem>
-<listitem
-><para
-><literal
->#</literal
-> Stands for <emphasis
->protected</emphasis
-> attributes</para
-></listitem>
-<listitem
-><para
-><literal
->-</literal
-> Stands for <emphasis
->private</emphasis
-> attributes</para
-></listitem>
+<listitem><para><literal>+</literal> Stands for <emphasis>public</emphasis> attributes</para></listitem>
+<listitem><para><literal>#</literal> Stands for <emphasis>protected</emphasis> attributes</para></listitem>
+<listitem><para><literal>-</literal> Stands for <emphasis>private</emphasis> attributes</para></listitem>
 </itemizedlist>
 </sect4>
 <sect4 id="operation">
-<title
->Operations</title>
-<para
->Operations (methods) are also displayed with at least their name, and can also show their parameters and return types. Operations can, just as Attributes, display their visibility: <itemizedlist>
-<listitem
-><para
-><literal
->+</literal
-> Stands for <emphasis
->public</emphasis
-> operations</para
-></listitem>
-<listitem
-><para
-><literal
->#</literal
-> Stands for <emphasis
->protected</emphasis
-> operations</para
-></listitem>
-<listitem
-><para
-><literal
->-</literal
-> Stands for <emphasis
->private</emphasis
-> operations</para
-></listitem>
+<title>Operations</title>
+<para>Operations (methods) are also displayed with at least their name, and can also show their parameters and return types. Operations can, just as Attributes, display their visibility: <itemizedlist>
+<listitem><para><literal>+</literal> Stands for <emphasis>public</emphasis> operations</para></listitem>
+<listitem><para><literal>#</literal> Stands for <emphasis>protected</emphasis> operations</para></listitem>
+<listitem><para><literal>-</literal> Stands for <emphasis>private</emphasis> operations</para></listitem>
 </itemizedlist>
 </para>
 </sect4>
 
 <sect4 id="templates">
-<title
->Templates</title>
-<para
->Classes can have templates, a value which is used for an unspecified class or type. The template type is specified when a class is initiated (&ie; an object is created). Templates exist in modern C++ and will be introduced in Java 1.5 where they will be called Generics. </para>
+<title>Templates</title>
+<para>Classes can have templates, a value which is used for an unspecified class or type. The template type is specified when a class is initiated (&ie; an object is created). Templates exist in modern C++ and will be introduced in Java 1.5 where they will be called Generics. </para>
 </sect4>
 </sect3>
 
 <sect3 id="class-associations">
-<title
->Class Associations</title>
-<para
->Classes can relate (be associated with) to each other in different ways:</para>
+<title>Class Associations</title>
+<para>Classes can relate (be associated with) to each other in different ways:</para>
 <sect4 id="generalization">
-<title
->Generalisation</title>
-<para
->Inheritance is one of the fundamental concepts of Object Orientated programming, in which a class <quote
->gains</quote
-> all of the attributes and operations of the class it inherits from, and can override/modify some of them, as well as add more attributes and operations of its own.</para>
-<para
->In &UML;, a <emphasis
->Generalisation</emphasis
-> association between two classes puts them in a hierarchy representing the concept of inheritance of a derived class from a base class. In &UML;, Generalisations are represented by a line connecting the two classes, with an arrow on the side of the base class. <screenshot>
-<screeninfo
->Generalisation</screeninfo>
+<title>Generalisation</title>
+<para>Inheritance is one of the fundamental concepts of Object Orientated programming, in which a class <quote>gains</quote> all of the attributes and operations of the class it inherits from, and can override/modify some of them, as well as add more attributes and operations of its own.</para>
+<para>In &UML;, a <emphasis>Generalisation</emphasis> association between two classes puts them in a hierarchy representing the concept of inheritance of a derived class from a base class. In &UML;, Generalisations are represented by a line connecting the two classes, with an arrow on the side of the base class. <screenshot>
+<screeninfo>Generalisation</screeninfo>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="generalization.png" format="PNG"/>
 	  </imageobject>
 	  <textobject>
-	    <phrase
->Visual representation of a generalisation in &UML;</phrase>
+	    <phrase>Visual representation of a generalisation in &UML;</phrase>
 	  </textobject>
 	  <caption>
-	    <para
->Visual representation of a generalisation in &UML; </para>
+	    <para>Visual representation of a generalisation in &UML; </para>
 	  </caption>
 	</mediaobject>
 </screenshot>
@@ -380,35 +171,21 @@
 </sect4>
 
 <sect4 id="uml-associations">
-<title
->Associations</title>
-<para
->An association represents a relationship between classes, and gives the common semantics and structure for many types of <quote
->connections</quote
-> between objects.</para>
-<para
->Associations are the mechanism that allows objects to communicate to each other. It describes the connection between different classes (the connection between the actual objects is called object connection, or <emphasis
->link</emphasis
->. </para>
-<para
->Associations can have a role that specifies the purpose of the association and can be uni- or bidirectional (indicates if the two objects participating in the relationship can send messages to the other, of if only one of them knows about the other). Each end of the association also has a multiplicity value, which dictates how many objects on this side of the association can relate to one object on the other side. </para>
-<para
->In &UML;, associations are represented as lines connecting the classes participating in the relationship, and can also show the role and the multiplicity of each of the participants. Multiplicity is displayed as a range [min..max] of non-negative values, with a star (<literal
->*</literal
->) on the maximum side representing infinite. <screenshot>
-<screeninfo
->&UML; Association</screeninfo>
+<title>Associations</title>
+<para>An association represents a relationship between classes, and gives the common semantics and structure for many types of <quote>connections</quote> between objects.</para>
+<para>Associations are the mechanism that allows objects to communicate to each other. It describes the connection between different classes (the connection between the actual objects is called object connection, or <emphasis>link</emphasis>. </para>
+<para>Associations can have a role that specifies the purpose of the association and can be uni- or bidirectional (indicates if the two objects participating in the relationship can send messages to the other, of if only one of them knows about the other). Each end of the association also has a multiplicity value, which dictates how many objects on this side of the association can relate to one object on the other side. </para>
+<para>In &UML;, associations are represented as lines connecting the classes participating in the relationship, and can also show the role and the multiplicity of each of the participants. Multiplicity is displayed as a range [min..max] of non-negative values, with a star (<literal>*</literal>) on the maximum side representing infinite. <screenshot>
+<screeninfo>&UML; Association</screeninfo>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="association.png" format="PNG"/>
 	  </imageobject>
 	  <textobject>
-	    <phrase
->Visual representation of an Association in &UML;</phrase>
+	    <phrase>Visual representation of an Association in &UML;</phrase>
 	  </textobject>
 	  <caption>
-	    <para
->Visual representation of an Association in &UML; </para>
+	    <para>Visual representation of an Association in &UML; </para>
 	  </caption>
 	</mediaobject>
 </screenshot>
@@ -416,367 +193,226 @@
 </sect4>
 
 <sect4 id="aggregation">
-<title
->Aggregation</title>
-<para
->Aggregations are a special type of associations in which the two participating classes don't have an equal status, but make a <quote
->whole-part</quote
-> relationship. An Aggregation describes how the class that takes the role of the whole, is composed (has) of other classes, which take the role of the parts. For Aggregations, the class acting as the whole always has a multiplicity of one. </para>
-<para
->In &UML;, Aggregations are represented by an association that shows a rhomb on the side of the whole. <screenshot>
-<screeninfo
->Aggregation</screeninfo>
+<title>Aggregation</title>
+<para>Aggregations are a special type of associations in which the two participating classes don't have an equal status, but make a <quote>whole-part</quote> relationship. An Aggregation describes how the class that takes the role of the whole, is composed (has) of other classes, which take the role of the parts. For Aggregations, the class acting as the whole always has a multiplicity of one. </para>
+<para>In &UML;, Aggregations are represented by an association that shows a rhomb on the side of the whole. <screenshot>
+<screeninfo>Aggregation</screeninfo>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="aggregation.png" format="PNG"/>
 	  </imageobject>
 	  <textobject>
-	    <phrase
->Visual representation of an Aggregation relationship in &UML;</phrase>
+	    <phrase>Visual representation of an Aggregation relationship in &UML;</phrase>
 	  </textobject>
 	  <caption>
-	    <para
->Visual representation of an Aggregation relationship in &UML; </para>
+	    <para>Visual representation of an Aggregation relationship in &UML; </para>
 	  </caption>
 	</mediaobject>
 </screenshot>
 </para>
 </sect4>
 <sect4 id="composition">
-<title
->Composition</title>
-<para
->Compositions are associations that represent <emphasis
->very strong</emphasis
-> aggregations. This means, Compositions form whole-part relationships as well, but the relationship is so strong that the parts cannot exist on its own. They exist only inside the whole, and if the whole is destroyed the parts die too.</para>
-<para
->In &UML;, Compositions are represented by a solid rhomb on the side of the whole. </para>
-<para
-><screenshot>
-<screeninfo
->Composition</screeninfo>
+<title>Composition</title>
+<para>Compositions are associations that represent <emphasis>very strong</emphasis> aggregations. This means, Compositions form whole-part relationships as well, but the relationship is so strong that the parts cannot exist on its own. They exist only inside the whole, and if the whole is destroyed the parts die too.</para>
+<para>In &UML;, Compositions are represented by a solid rhomb on the side of the whole. </para>
+<para><screenshot>
+<screeninfo>Composition</screeninfo>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="composition.png" format="PNG"/>
 	  </imageobject>
 	  <textobject>
-	    <phrase
->Visual representation of a Composition relationship in &UML;</phrase>
+	    <phrase>Visual representation of a Composition relationship in &UML;</phrase>
 	  </textobject>
 	</mediaobject>
-</screenshot
-></para>
+</screenshot></para>
 </sect4>
-</sect3
-> <!--class-associations-->
+</sect3> <!--class-associations-->
 
 <sect3 id="other-class-diagram-items">
-<title
->Other Class Diagram Items</title>
-<para
->Class diagrams can contain several other items besides classes.</para>
+<title>Other Class Diagram Items</title>
+<para>Class diagrams can contain several other items besides classes.</para>
 <sect4 id="interfaces">
-<title
->Interfaces</title>
-<para
->Interfaces are abstract classes which means instances can not be directly created of them. They can contain operations but no attributes. Classes can inherit from interfaces (through a realisation association) and instances can then be made of these classes.</para>
+<title>Interfaces</title>
+<para>Interfaces are abstract classes which means instances can not be directly created of them. They can contain operations but no attributes. Classes can inherit from interfaces (through a realisation association) and instances can then be made of these classes.</para>
 <!-- FIXME screenshot -->
 </sect4>
 <sect4 id="datatype">
-<title
->Datatypes</title>
-<para
->Datatypes are primitives which are typically built into a programming language. Common examples include integers and booleans. They can not have relationships to classes but classes can have relationships to them.</para>
+<title>Datatypes</title>
+<para>Datatypes are primitives which are typically built into a programming language. Common examples include integers and booleans. They can not have relationships to classes but classes can have relationships to them.</para>
 <!-- FIXME screenshot -->
 </sect4>
 <sect4 id="enum">
-<title
->Enums</title>
-<para
->Enums are a simple list of values. A typical example is an enum for days of the week. The options of an enum are called Enum Literals. Like datatypes they can not have relationships to classes but classes can have relationships to them.</para>
+<title>Enums</title>
+<para>Enums are a simple list of values. A typical example is an enum for days of the week. The options of an enum are called Enum Literals. Like datatypes they can not have relationships to classes but classes can have relationships to them.</para>
 <!-- FIXME screenshot -->
 </sect4>
 <sect4 id="package">
-<title
->Packages</title>
-<para
->Packages represent a namespace in a programming language. In a diagram they are used to represent parts of a system which contain more than one class, maybe hundreds of classes.</para>
+<title>Packages</title>
+<para>Packages represent a namespace in a programming language. In a diagram they are used to represent parts of a system which contain more than one class, maybe hundreds of classes.</para>
 <!-- FIXME screenshot -->
 </sect4>
 </sect3>
 
-</sect2
-> <!-- class diagram -->
+</sect2> <!-- class diagram -->
 
 <sect2 id="sequence-diagram">
-<title
->Sequence Diagrams</title>
+<title>Sequence Diagrams</title>
 
-<para
->Sequence Diagrams show the message exchange (&ie; method call) between several Objects in a specific time-delimited situation. Objects are instances of classes. Sequence Diagrams put special emphasis in the order and the times in which the messages to the objects are sent.</para>
+<para>Sequence Diagrams show the message exchange (&ie; method call) between several Objects in a specific time-delimited situation. Objects are instances of classes. Sequence Diagrams put special emphasis in the order and the times in which the messages to the objects are sent.</para>
 
-<para
->In Sequence Diagrams objects are represented through vertical dashed lines, with the name of the Object on the top. The time axis is also vertical, increasing downwards, so that messages are sent from one Object to another in the form of arrows with the operation name and optionally the actual parameter values. </para>
+<para>In Sequence Diagrams objects are represented through vertical dashed lines, with the name of the Object on the top. The time axis is also vertical, increasing downwards, so that messages are sent from one Object to another in the form of arrows with the operation name and optionally the actual parameter values. </para>
 
 <!-- FIXME update screenshot to show synchronous messages -->
 <screenshot>
-<screeninfo
->Sequence Diagram</screeninfo>
+<screeninfo>Sequence Diagram</screeninfo>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="sequence-diagram.png" format="PNG"/>
 	  </imageobject>
 	  <textobject>
-	    <phrase
->&umbrello; showing a Sequence Diagram</phrase>
+	    <phrase>&umbrello; showing a Sequence Diagram</phrase>
 	  </textobject>
 	  <caption>
-	    <para
->&umbrello; showing a Sequence Diagram </para>
+	    <para>&umbrello; showing a Sequence Diagram </para>
 	  </caption>
 	</mediaobject>
 </screenshot>
 
-<para
->Messages can be either synchronous, the normal type of message call where control is passed to the called object until that method has finished running, or asynchronous where control is passed back directly to the calling object. Synchronous messages have a vertical box on the side of the called object to show the flow of program control.</para>
-</sect2
-> <!-- sequence diagrams -->
+<para>Messages can be either synchronous, the normal type of message call where control is passed to the called object until that method has finished running, or asynchronous where control is passed back directly to the calling object. Synchronous messages have a vertical box on the side of the called object to show the flow of program control.</para>
+</sect2> <!-- sequence diagrams -->
 
 <sect2 id="collaboration-diagram">
-<title
->Collaboration Diagrams</title>
+<title>Collaboration Diagrams</title>
 
-<para
->Collaboration Diagrams show the interactions occurring between the objects participating in a specific situation. This is more or less the same information shown by Sequence Diagrams but there the emphasis is put on how the interactions occur in time while the Collaboration Diagrams put the relationships between the objects and their topology in the foreground.</para>
+<para>Collaboration Diagrams show the interactions occurring between the objects participating in a specific situation. This is more or less the same information shown by Sequence Diagrams but there the emphasis is put on how the interactions occur in time while the Collaboration Diagrams put the relationships between the objects and their topology in the foreground.</para>
 
-<para
->In Collaboration Diagrams messages sent from one object to another are represented by arrows, showing the message name, parameters, and the sequence of the message. Collaboration Diagrams are specially well suited to showing a specific program flow or situation and are one of the best diagram types to quickly demonstrate or explain one process in the program logic. </para>
+<para>In Collaboration Diagrams messages sent from one object to another are represented by arrows, showing the message name, parameters, and the sequence of the message. Collaboration Diagrams are specially well suited to showing a specific program flow or situation and are one of the best diagram types to quickly demonstrate or explain one process in the program logic. </para>
 
 <screenshot>
-<screeninfo
->Collaboration</screeninfo>
+<screeninfo>Collaboration</screeninfo>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="collaboration-diagram.png" format="PNG"/>
 	  </imageobject>
 	  <textobject>
-	    <phrase
->&umbrello; showing a Collaboration Diagram</phrase>
+	    <phrase>&umbrello; showing a Collaboration Diagram</phrase>
 	  </textobject>
 	  <caption>
-	    <para
->&umbrello; showing a Collaboration Diagram </para>
+	    <para>&umbrello; showing a Collaboration Diagram </para>
 	  </caption>
 	</mediaobject>
 </screenshot>
 
-</sect2
-> <!-- collaboration diagrams -->
+</sect2> <!-- collaboration diagrams -->
 
 <sect2 id="state-diagram">
-<title
->State Diagram</title>
-<para
->State Diagrams show the different states of an Object during its life and the stimuli that cause the Object to change its state. </para
->
-<para
->State Diagrams exhibit Objects as <emphasis
->state machines</emphasis
-> or finite automata that can be in one of a finite set of states and that can change its state via one of a finite set of stimuli. For example an Object of type <emphasis
->NetServer</emphasis
-> can be in one of following states during its life: </para>
+<title>State Diagram</title>
+<para>State Diagrams show the different states of an Object during its life and the stimuli that cause the Object to change its state. </para>
+<para>State Diagrams exhibit Objects as <emphasis>state machines</emphasis> or finite automata that can be in one of a finite set of states and that can change its state via one of a finite set of stimuli. For example an Object of type <emphasis>NetServer</emphasis> can be in one of following states during its life: </para>
 <itemizedlist>
-<listitem
-><para
->Ready</para
-></listitem>
-<listitem
-><para
->Listening</para
-></listitem>
-<listitem
-><para
->Working</para
-></listitem>
-<listitem
-><para
->Stopped</para
-></listitem>
+<listitem><para>Ready</para></listitem>
+<listitem><para>Listening</para></listitem>
+<listitem><para>Working</para></listitem>
+<listitem><para>Stopped</para></listitem>
 </itemizedlist>
-<para
->and the events that can cause the Object to change states are</para>
+<para>and the events that can cause the Object to change states are</para>
 <itemizedlist>
-<listitem
-><para
->Object is created</para
-></listitem>
-<listitem
-><para
->Object receives message listen</para
-></listitem>
-<listitem
-><para
->A Client requests a connection over the network</para
-></listitem>
-<listitem
-><para
->A Client terminates a request</para
-></listitem>
-<listitem
-><para
->The request is executed and terminated</para
-></listitem>
-<listitem
-><para
->Object receives message stop</para
-></listitem>
-<listitem
-><para
->etc</para
-></listitem>
+<listitem><para>Object is created</para></listitem>
+<listitem><para>Object receives message listen</para></listitem>
+<listitem><para>A Client requests a connection over the network</para></listitem>
+<listitem><para>A Client terminates a request</para></listitem>
+<listitem><para>The request is executed and terminated</para></listitem>
+<listitem><para>Object receives message stop</para></listitem>
+<listitem><para>etc</para></listitem>
 </itemizedlist>
 <para>
 <screenshot>
-<screeninfo
->State Diagram</screeninfo>
+<screeninfo>State Diagram</screeninfo>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="state-diagram.png" format="PNG"/>
 	  </imageobject>
 	  <textobject>
-	    <phrase
->&umbrello; showing a State Diagram</phrase>
+	    <phrase>&umbrello; showing a State Diagram</phrase>
 	  </textobject>
 	  <caption>
-	    <para
->&umbrello; showing a State Diagram </para>
+	    <para>&umbrello; showing a State Diagram </para>
 	  </caption>
 	</mediaobject>
 </screenshot>
 </para>
 <sect3 id="state">
-<title
->State</title>
-<para
->States are the building block of State Diagrams. A State belongs to exactly one class and represents a summary of the values the attributes of a class can take. A &UML; State describes the internal state of an object of one particular class. </para
->
-<para
->Note that not every change in one of the attributes of an object should be represented by a State but only those changes that can significantly affect the workings of the object.</para>
-<para
->There are two special types of States: Start and End. They are special in that there is no event that can cause an Object to return to its Start state, in the same way as there is no event that can possibly take an Object out of its End state once it has reached it. </para>
+<title>State</title>
+<para>States are the building block of State Diagrams. A State belongs to exactly one class and represents a summary of the values the attributes of a class can take. A &UML; State describes the internal state of an object of one particular class. </para>
+<para>Note that not every change in one of the attributes of an object should be represented by a State but only those changes that can significantly affect the workings of the object.</para>
+<para>There are two special types of States: Start and End. They are special in that there is no event that can cause an Object to return to its Start state, in the same way as there is no event that can possibly take an Object out of its End state once it has reached it. </para>
 </sect3>
 
-</sect2
-> <!-- state diagrams -->
+</sect2> <!-- state diagrams -->
 
 <sect2 id="activity-diagram">
-<title
->Activity Diagram</title>
-<para
->Activity Diagrams describe the sequence of activities in a system with the help of Activities. Activity Diagrams are a special form of State Diagrams, that only (or mostly) contains Activities. </para>
+<title>Activity Diagram</title>
+<para>Activity Diagrams describe the sequence of activities in a system with the help of Activities. Activity Diagrams are a special form of State Diagrams, that only (or mostly) contains Activities. </para>
 <para>
 <screenshot>
-<screeninfo
->An example Activity Diagram.</screeninfo>
+<screeninfo>An example Activity Diagram.</screeninfo>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="activity-diagram.png" format="PNG"/>
 	  </imageobject>
 	  <textobject>
-	    <phrase
->&umbrello; showing an Activity Diagram</phrase>
+	    <phrase>&umbrello; showing an Activity Diagram</phrase>
 	  </textobject>
 	  <caption>
-	    <para
->&umbrello; showing an Activity Diagram </para>
+	    <para>&umbrello; showing an Activity Diagram </para>
 	  </caption>
 	</mediaobject>
 </screenshot>
 </para>
-<para
->Activity Diagrams are similar to procedural Flux Diagrams, with the difference that all Activities are clearly attached to Objects.</para>
-
-<para
->Activity Diagrams are always associated to a <emphasis
->Class</emphasis
->, an <emphasis
->Operation</emphasis
-> or a <emphasis
->Use Case</emphasis
->.</para>
-
-<para
->Activity Diagrams support sequential as well as parallel Activities. Parallel execution is represented via Fork/Wait icons, and for the Activities running in parallel, it is not important the order in which they are carried out (they can be executed at the same time or one after the other)</para>
+<para>Activity Diagrams are similar to procedural Flux Diagrams, with the difference that all Activities are clearly attached to Objects.</para>
+
+<para>Activity Diagrams are always associated to a <emphasis>Class</emphasis>, an <emphasis>Operation</emphasis> or a <emphasis>Use Case</emphasis>.</para>
+
+<para>Activity Diagrams support sequential as well as parallel Activities. Parallel execution is represented via Fork/Wait icons, and for the Activities running in parallel, it is not important the order in which they are carried out (they can be executed at the same time or one after the other)</para>
 <sect3 id="activity">
-<title
->Activity</title>
-<para
->An Activity is a single step in a process. One Activity is one state in the system with internal activity and, at least, one outgoing transition. Activities can also have more than one outgoing transition if they have different conditions. </para
->
-<para
->Activities can form hierarchies, this means that an Activity can be composed of several <quote
->detail</quote
-> Activities, in which case the incoming and outgoing transitions should match the incoming and outgoing transitions of the detail diagram. </para>
+<title>Activity</title>
+<para>An Activity is a single step in a process. One Activity is one state in the system with internal activity and, at least, one outgoing transition. Activities can also have more than one outgoing transition if they have different conditions. </para>
+<para>Activities can form hierarchies, this means that an Activity can be composed of several <quote>detail</quote> Activities, in which case the incoming and outgoing transitions should match the incoming and outgoing transitions of the detail diagram. </para>
 
 </sect3>
-</sect2
-> <!-- activity diagram -->
+</sect2> <!-- activity diagram -->
 
 <sect2 id="helper-elements">
-<title
->Helper Elements</title>
-<para
->There are a few elements in &UML; that have no real semantic value for the model, but help to clarify parts of the diagram. These elements are </para>
+<title>Helper Elements</title>
+<para>There are a few elements in &UML; that have no real semantic value for the model, but help to clarify parts of the diagram. These elements are </para>
 <itemizedlist>
-<listitem
-><para
->Text lines</para
-></listitem>
-<listitem
-><para
->Text Notes and anchors</para
-></listitem>
-<listitem
-><para
->Boxes</para
-></listitem>
-</itemizedlist
->
-<para
->Text lines are useful to add short text information to a diagram. It is free-standing text and has no meaning to the Model itself. </para
->
-
-<para
->Notes are useful to add more detailed information about an object or a specific situation. They have the great advantage that notes can be anchored to &UML; Elements to show that the note <quote
->belongs</quote
-> to a specific object or situation. </para>
-
-<para
->Boxes are free-standing rectangles which can be used to group items together to make diagrams more readable. They have no logical meaning in the model.</para>
+<listitem><para>Text lines</para></listitem>
+<listitem><para>Text Notes and anchors</para></listitem>
+<listitem><para>Boxes</para></listitem>
+</itemizedlist>
+<para>Text lines are useful to add short text information to a diagram. It is free-standing text and has no meaning to the Model itself. </para>
+
+<para>Notes are useful to add more detailed information about an object or a specific situation. They have the great advantage that notes can be anchored to &UML; Elements to show that the note <quote>belongs</quote> to a specific object or situation. </para>
+
+<para>Boxes are free-standing rectangles which can be used to group items together to make diagrams more readable. They have no logical meaning in the model.</para>
 
 <!-- FIXME, screenshot -->
-</sect2
-> <!-- helper elements -->
+</sect2> <!-- helper elements -->
 
 <sect2 id="component-diagram">
-<title
->Component Diagrams</title>
-<para
->Component Diagrams show the software components (either component technologies such as KParts, CORBA components or Java Beans or just sections of the system which are clearly distinguishable) and the artefacts they are made out of such as source code files, programming libraries or relational database tables.</para>
+<title>Component Diagrams</title>
+<para>Component Diagrams show the software components (either component technologies such as KParts, CORBA components or Java Beans or just sections of the system which are clearly distinguishable) and the artefacts they are made out of such as source code files, programming libraries or relational database tables.</para>
 
-<para
->Components can have interfaces (&ie; abstract classes with operations) that allow associations between components.</para>
+<para>Components can have interfaces (&ie; abstract classes with operations) that allow associations between components.</para>
 </sect2>
 
 <sect2 id="deployment-diagram">
-<title
->Deployment Diagrams</title>
+<title>Deployment Diagrams</title>
 
-<para
->Deployment diagrams show the runtime component instances and their associations. They include Nodes which are physical resources, typically a single computer. They also show interfaces and objects (class instances).</para>
+<para>Deployment diagrams show the runtime component instances and their associations. They include Nodes which are physical resources, typically a single computer. They also show interfaces and objects (class instances).</para>
 
 </sect2>
 
-</sect1
->
+</sect1>
 </chapter>
diff --git a/tde-i18n-en_GB/docs/tdesdk/umbrello/working_with_umbrello.docbook b/tde-i18n-en_GB/docs/tdesdk/umbrello/working_with_umbrello.docbook
index ffa6cbf2bf7..2aeba7660cc 100644
--- a/tde-i18n-en_GB/docs/tdesdk/umbrello/working_with_umbrello.docbook
+++ b/tde-i18n-en_GB/docs/tdesdk/umbrello/working_with_umbrello.docbook
@@ -1,411 +1,188 @@
 <chapter id="working-with-umbrello">
-<title
->Working with &umbrello;</title>
+<title>Working with &umbrello;</title>
 <!-- Umbrello basics: creating diagrams, creating classes, adding objects to diagrams,
    associations, editing properties, anchor points in associations, removing objects, removing
    diagrams
 -->
 
-<para
->This chapter will introduce you to &umbrello;'s user interface and will tell you all you need to know to start modelling. All actions in &umbrello; are accessible via the menu and the toolbars, but &umbrello; also makes extensive use of &RMB; context menus. You can &RMB; click on almost any element in &umbrello;'s work area or tree view to get a menu with the most useful functions that can be applied to the particular element you are working on. Some users find this a little confusing at the beginning because they are more used to working with the menu or tool bars, but once you get used to <mousebutton
->right</mousebutton
-> clicking it will greatly speed up your work. </para>
+<para>This chapter will introduce you to &umbrello;'s user interface and will tell you all you need to know to start modelling. All actions in &umbrello; are accessible via the menu and the toolbars, but &umbrello; also makes extensive use of &RMB; context menus. You can &RMB; click on almost any element in &umbrello;'s work area or tree view to get a menu with the most useful functions that can be applied to the particular element you are working on. Some users find this a little confusing at the beginning because they are more used to working with the menu or tool bars, but once you get used to <mousebutton>right</mousebutton> clicking it will greatly speed up your work. </para>
 
 <sect1 id="user-interface">
-<title
->User Interface</title>
-<para
->&umbrello;'s main window is divided in three areas that will help you keep an overview of your entire system and access the different diagrams quickly while working on your model. </para>
-<para
->These areas are called:</para>
+<title>User Interface</title>
+<para>&umbrello;'s main window is divided in three areas that will help you keep an overview of your entire system and access the different diagrams quickly while working on your model. </para>
+<para>These areas are called:</para>
 <itemizedlist>
-<listitem
-><para
->Tree View</para
-></listitem>
-<listitem
-><para
->Work Area</para
-></listitem>
-<listitem
-><para
->Documentation Window</para
-></listitem>
+<listitem><para>Tree View</para></listitem>
+<listitem><para>Work Area</para></listitem>
+<listitem><para>Documentation Window</para></listitem>
 </itemizedlist>
 
 <screenshot>
-<screeninfo
->&umbrello;'s User Interface</screeninfo>
+<screeninfo>&umbrello;'s User Interface</screeninfo>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="umbrello-ui.png" format="PNG"/>
 	  </imageobject>
 	  <textobject>
-	    <phrase
->&umbrello;'s User Interface</phrase>
+	    <phrase>&umbrello;'s User Interface</phrase>
 	  </textobject>
 	  <caption>
-	    <para
->&umbrello;'s User Interface </para>
+	    <para>&umbrello;'s User Interface </para>
 	  </caption>
 	</mediaobject>
 </screenshot>
 
 <sect2 id="tree-view">
-<title
->Tree View</title>
-<para
->The Tree View is usually located on the top left hand side of the window and shows all the diagrams, classes, actors and use cases that build up your model. The Tree View allows you to have a quick overview of the elements composing your model. The Tree View also gives you a quick way to switch between the different diagrams in your model and inserting elements from your model into the current diagram. </para>
-<para
->If you are working on a model with more than just a few classes and diagrams, the Tree View may help you stay on top of things by organising your model elements in folders. You can create folders by selecting the appropriate option from the context menu (&RMB; click on one of the folders in the tree view) and you can organise your elements by moving them to the appropriate folder (drag and drop) </para>
+<title>Tree View</title>
+<para>The Tree View is usually located on the top left hand side of the window and shows all the diagrams, classes, actors and use cases that build up your model. The Tree View allows you to have a quick overview of the elements composing your model. The Tree View also gives you a quick way to switch between the different diagrams in your model and inserting elements from your model into the current diagram. </para>
+<para>If you are working on a model with more than just a few classes and diagrams, the Tree View may help you stay on top of things by organising your model elements in folders. You can create folders by selecting the appropriate option from the context menu (&RMB; click on one of the folders in the tree view) and you can organise your elements by moving them to the appropriate folder (drag and drop) </para>
 </sect2>
 
 <sect2 id="documentation-window">
-<title
->Documentation Window</title>
-<para
->The Documentation Window is the small window located on the left bottom of &umbrello;, and it gives you a quick preview of the documentation for the currently selected item. The Documentation Window is rather small because it is intended to allow you just a quick pick into the element's documentation while taking as little screen space as possible. If you need to view the documentation in more detail you can always open the item's properties. </para>
+<title>Documentation Window</title>
+<para>The Documentation Window is the small window located on the left bottom of &umbrello;, and it gives you a quick preview of the documentation for the currently selected item. The Documentation Window is rather small because it is intended to allow you just a quick pick into the element's documentation while taking as little screen space as possible. If you need to view the documentation in more detail you can always open the item's properties. </para>
 </sect2>
 <sect2 id="work-area">
-<title
->Work Area</title>
-<para
->The Work Area is the main window in &umbrello; and is where the real action takes place. You use the Work Area to edit and view the diagrams in your model. The Work Area shows the currently active diagram. Currently only one diagram can be shown on the Work Area at any time. </para>
+<title>Work Area</title>
+<para>The Work Area is the main window in &umbrello; and is where the real action takes place. You use the Work Area to edit and view the diagrams in your model. The Work Area shows the currently active diagram. Currently only one diagram can be shown on the Work Area at any time. </para>
 </sect2>
-</sect1
-> <!--user-interface-->
+</sect1> <!--user-interface-->
 <sect1 id="load-save">
-<title
->Creating, Loading and Saving Models</title>
-<para
->The first thing you need to start doing something useful with &umbrello; is to create a model to work on. When you start &umbrello; it always loads the last used model or creates a new, empty model (depending on your preferences set in the configuration dialogue). This will allow you to start working right away. </para>
+<title>Creating, Loading and Saving Models</title>
+<para>The first thing you need to start doing something useful with &umbrello; is to create a model to work on. When you start &umbrello; it always loads the last used model or creates a new, empty model (depending on your preferences set in the configuration dialogue). This will allow you to start working right away. </para>
 <sect2 id="new-model">
-<title
->New Model</title>
-<para
->If at any time you need to create a new model you can do this by selecting the <guimenuitem
->New</guimenuitem
-> entry from the <guimenu
->File</guimenu
-> menu, or by clicking on the <guiicon
->New</guiicon
-> icon from the application toolbar. If you are currently working on a model which has been modified &umbrello; will ask you if it should save your changes before loading the new model. </para>
+<title>New Model</title>
+<para>If at any time you need to create a new model you can do this by selecting the <guimenuitem>New</guimenuitem> entry from the <guimenu>File</guimenu> menu, or by clicking on the <guiicon>New</guiicon> icon from the application toolbar. If you are currently working on a model which has been modified &umbrello; will ask you if it should save your changes before loading the new model. </para>
 </sect2>
 <sect2 id="save-model">
-<title
->Save Model</title>
-<para
->You can save your model at any time by selecting the option <guimenuitem
->Save</guimenuitem
-> from the <guimenu
->File</guimenu
-> Menu or by clicking on the <guiicon
->Save</guiicon
-> button from the application toolbar. If you need to save your model under a different name you can use the option <guimenuitem
->Save As</guimenuitem
-> from the <guimenu
->File</guimenu
-> Menu. </para>
-<para
->For your convenience &umbrello; also offers you the option to automatically save your work each certain time period. You can configure if you want this option as well as the time intervals in the <guimenu
->Settings</guimenu
-> from &umbrello;</para>
+<title>Save Model</title>
+<para>You can save your model at any time by selecting the option <guimenuitem>Save</guimenuitem> from the <guimenu>File</guimenu> Menu or by clicking on the <guiicon>Save</guiicon> button from the application toolbar. If you need to save your model under a different name you can use the option <guimenuitem>Save As</guimenuitem> from the <guimenu>File</guimenu> Menu. </para>
+<para>For your convenience &umbrello; also offers you the option to automatically save your work each certain time period. You can configure if you want this option as well as the time intervals in the <guimenu>Settings</guimenu> from &umbrello;</para>
 </sect2>
 <sect2 id="load-model">
-<title
->Load Model</title>
-<para
->For loading an already existing model you may select the option <guimenuitem
->Open</guimenuitem
-> from the <guimenu
->File</guimenu
-> Menu or click on the <guiicon
->Open</guiicon
-> icon from the application toolbar. The most recently used models are also available under the submenu <guimenuitem
->Open Recent</guimenuitem
-> in the <guimenu
->File</guimenu
-> Menu to speed up access to your most frequently used models. </para>
-<para
->&umbrello; can only work on one model at a time, so if you ask the program to load a model for you and your current model has been modified since the last time you save it, &umbrello; will ask you whether your changes should be saved to prevent any loss of work. You can start two or more instances of &umbrello; at any one time, you can also copy and paste between instances. </para>
+<title>Load Model</title>
+<para>For loading an already existing model you may select the option <guimenuitem>Open</guimenuitem> from the <guimenu>File</guimenu> Menu or click on the <guiicon>Open</guiicon> icon from the application toolbar. The most recently used models are also available under the submenu <guimenuitem>Open Recent</guimenuitem> in the <guimenu>File</guimenu> Menu to speed up access to your most frequently used models. </para>
+<para>&umbrello; can only work on one model at a time, so if you ask the program to load a model for you and your current model has been modified since the last time you save it, &umbrello; will ask you whether your changes should be saved to prevent any loss of work. You can start two or more instances of &umbrello; at any one time, you can also copy and paste between instances. </para>
 </sect2>
-</sect1
->  <!--load-save-->
+</sect1>  <!--load-save-->
 <sect1 id="edit-model">
-<title
->Editing Models</title>
-<para
->In &umbrello;, there are basically two ways for editing the elements in your model. <itemizedlist>
-<listitem
-><para
->Edit model elements directly through the Tree View</para
-></listitem>
-<listitem
-><para
->Edit model elements through a Diagram</para
-></listitem>
+<title>Editing Models</title>
+<para>In &umbrello;, there are basically two ways for editing the elements in your model. <itemizedlist>
+<listitem><para>Edit model elements directly through the Tree View</para></listitem>
+<listitem><para>Edit model elements through a Diagram</para></listitem>
 </itemizedlist>
 </para>
-<para
->Using the context menu of the different items in the Tree View you are able to add, remove, and modify almost all the elements in your model. <mousebutton
->Right</mousebutton
-> clicking on the folders in the Tree View will give you options for creating the different types of diagrams as well as, depending on whether the folder is a <emphasis
->Use Case View</emphasis
-> or a <emphasis
->Logical View</emphasis
->, Actors, Use Cases, Classes, etc. </para>
-<para
->Once you have added elements to your model you can also edit an element by accessing its properties dialogue, which you find by selecting the option <emphasis
->Properties</emphasis
-> from the context menu shown when <mousebutton
->right</mousebutton
-> clicking on the items in the Tree View. </para>
-<para
->You can also edit your model by creating or modifying elements through diagrams. More details on how to do this are given in the following sections. </para>
+<para>Using the context menu of the different items in the Tree View you are able to add, remove, and modify almost all the elements in your model. <mousebutton>Right</mousebutton> clicking on the folders in the Tree View will give you options for creating the different types of diagrams as well as, depending on whether the folder is a <emphasis>Use Case View</emphasis> or a <emphasis>Logical View</emphasis>, Actors, Use Cases, Classes, etc. </para>
+<para>Once you have added elements to your model you can also edit an element by accessing its properties dialogue, which you find by selecting the option <emphasis>Properties</emphasis> from the context menu shown when <mousebutton>right</mousebutton> clicking on the items in the Tree View. </para>
+<para>You can also edit your model by creating or modifying elements through diagrams. More details on how to do this are given in the following sections. </para>
 </sect1>
 <sect1 id="add-remove-diagrams">
-<title
->Adding and Removing Diagrams</title>
-<para
->Your &UML; model consists of a set of &UML; elements and associations between them. However you cannot see the model directly, you use <emphasis
->Diagrams</emphasis
-> to look at it. </para>
+<title>Adding and Removing Diagrams</title>
+<para>Your &UML; model consists of a set of &UML; elements and associations between them. However you cannot see the model directly, you use <emphasis>Diagrams</emphasis> to look at it. </para>
 <sect2 id="create-diagram">
-<title
->Creating Diagrams</title>
-<para
->To create a new diagram in your model simply select the diagram type you need from the <guimenuitem
->New</guimenuitem
-> submenu in the <guimenu
->Diagram</guimenu
-> menu and give a name to it. The diagram will be created and made active, and you will immediately see it in the tree view. </para>
-<para
->Remember that &umbrello; makes extensive use of context menus: you can also &RMB; click on a folder in the Tree View and select the appropriate diagram type from the <guisubmenu
->New</guisubmenu
-> submenu in the context menu. Note that you can create Use Case Diagrams only in Use Case View folders, and the other types of diagram can only be created in the Logical View folders. </para>
+<title>Creating Diagrams</title>
+<para>To create a new diagram in your model simply select the diagram type you need from the <guimenuitem>New</guimenuitem> submenu in the <guimenu>Diagram</guimenu> menu and give a name to it. The diagram will be created and made active, and you will immediately see it in the tree view. </para>
+<para>Remember that &umbrello; makes extensive use of context menus: you can also &RMB; click on a folder in the Tree View and select the appropriate diagram type from the <guisubmenu>New</guisubmenu> submenu in the context menu. Note that you can create Use Case Diagrams only in Use Case View folders, and the other types of diagram can only be created in the Logical View folders. </para>
 </sect2>
 <sect2 id="remove-diagram">
-<title
->Removing Diagrams</title>
-<para
->Should you need to remove a diagram from your model, you can do this by making it active and selecting <guimenuitem
->Delete</guimenuitem
-> from the <guimenu
->Diagram</guimenu
-> Menu. You can also achieve this by selecting <guimenuitem
->Delete</guimenuitem
-> from the diagrams context menu in the Tree View </para>
-<para
->Since deleting a diagram is something serious that could cause loss of work if done by accident, &umbrello; will ask you to confirm the delete operation before actually removing the Diagram. Once a diagram has been deleted and the file has been saved there is no way to undo this action. </para>
+<title>Removing Diagrams</title>
+<para>Should you need to remove a diagram from your model, you can do this by making it active and selecting <guimenuitem>Delete</guimenuitem> from the <guimenu>Diagram</guimenu> Menu. You can also achieve this by selecting <guimenuitem>Delete</guimenuitem> from the diagrams context menu in the Tree View </para>
+<para>Since deleting a diagram is something serious that could cause loss of work if done by accident, &umbrello; will ask you to confirm the delete operation before actually removing the Diagram. Once a diagram has been deleted and the file has been saved there is no way to undo this action. </para>
 </sect2>
 <sect2 id="rename-diagram">
-<title
->Renaming Diagrams</title>
-<para
->If you want to change the name of an existing diagram you can easily do this by selecting the Rename option from its &RMB; menu in the Tree View. </para>
-<para
->Another way to rename a diagram is to do this via its properties dialogue, which you obtain by selecting Properties from its Context Menu or by double clicking on it in the Tree View. </para>
+<title>Renaming Diagrams</title>
+<para>If you want to change the name of an existing diagram you can easily do this by selecting the Rename option from its &RMB; menu in the Tree View. </para>
+<para>Another way to rename a diagram is to do this via its properties dialogue, which you obtain by selecting Properties from its Context Menu or by double clicking on it in the Tree View. </para>
 </sect2>
 </sect1>
 <sect1 id="edit-diagram">
-<title
->Editing Diagrams</title>
-<para
->When working on a diagram, &umbrello; will try to guide you by applying some simple rules as to which elements are valid in the different types of diagrams, as well as the relationships that can exist between them. If you are an &UML; expert you will probably not even notice it, but this will help &UML; novices create standard-conformant diagrams. </para>
-<para
->Once you have created your diagrams it is time to start editing them. Here you should notice the (for beginners subtle) difference between editing your diagram, and editing the <emphasis
->model</emphasis
->. As you already know, Diagrams are <emphasis
->views</emphasis
-> of your model. For example, if you create a class by editing a Class Diagram, you are really editing both, your Diagram and your model. If you change the colour or other display options of a Class in your Class Diagram, you are only editing the Diagram, but nothing is changed in your model. </para>
+<title>Editing Diagrams</title>
+<para>When working on a diagram, &umbrello; will try to guide you by applying some simple rules as to which elements are valid in the different types of diagrams, as well as the relationships that can exist between them. If you are an &UML; expert you will probably not even notice it, but this will help &UML; novices create standard-conformant diagrams. </para>
+<para>Once you have created your diagrams it is time to start editing them. Here you should notice the (for beginners subtle) difference between editing your diagram, and editing the <emphasis>model</emphasis>. As you already know, Diagrams are <emphasis>views</emphasis> of your model. For example, if you create a class by editing a Class Diagram, you are really editing both, your Diagram and your model. If you change the colour or other display options of a Class in your Class Diagram, you are only editing the Diagram, but nothing is changed in your model. </para>
 <sect2 id="insert-elements">
-<title
->Insert Elements</title>
-<para
->One of the first things you will do when editing a new diagram is to insert elements into them (Classes, Actors, Use Cases, &etc;) There is basically two ways of doing this:</para>
+<title>Insert Elements</title>
+<para>One of the first things you will do when editing a new diagram is to insert elements into them (Classes, Actors, Use Cases, &etc;) There is basically two ways of doing this:</para>
 <itemizedlist>
-<listitem
-><para
->Dragging existing elements in your model from the Tree View</para
-></listitem>
-<listitem
-><para
->Creating new elements in your model and adding them to your diagram at the same time, by using one of the edit Tools in the Work Toolbar</para
-></listitem>
+<listitem><para>Dragging existing elements in your model from the Tree View</para></listitem>
+<listitem><para>Creating new elements in your model and adding them to your diagram at the same time, by using one of the edit Tools in the Work Toolbar</para></listitem>
 </itemizedlist>
-<para
->To insert elements that already exist in your model, just drag them from the Tree View and drop them where you want them to be in your diagram. You can always move elements around in your Diagram using the Select Tool </para>
-<para
->The second way of adding elements to your diagram is by using the Work Toolbar's edit tools (note that this will also add the elements to your model). </para>
-<para
->The Work Toolbar was by default located on the far right of the application window, &umbrello; 1.2 has moved this to the top of the window. You can dock it into other edge or have it floating around if you prefer. The tools available on this toolbar (the buttons you see on it) change depending on the type of diagram you are currently working on. The button for the currently selected tool is activated in the toolbar. You can switch to the select tool by pressing the &Esc; key. </para>
-<para
->When you have selected an edit tool from the Work Toolbar (for example, the tool to insert classes) the mouse pointer changes to a cross, and you can insert the elements in your model by single clicking in your diagram. Note that elements in &UML; must have a <emphasis
->Unique Name</emphasis
->. So that if you have a class in one diagram whose name is <quote
->ClassA</quote
-> and then you use the insert Class tool to insert a class into another diagram you cannot name this new class <quote
->ClassA</quote
-> as well. If these two are supposed to be two different elements, you have to give them a unique name. If you are trying to add the <emphasis
->same</emphasis
-> element to your diagram, then the Insert Class is not the right tool for that. You should drag and drop the class from the Tree View instead. </para>
+<para>To insert elements that already exist in your model, just drag them from the Tree View and drop them where you want them to be in your diagram. You can always move elements around in your Diagram using the Select Tool </para>
+<para>The second way of adding elements to your diagram is by using the Work Toolbar's edit tools (note that this will also add the elements to your model). </para>
+<para>The Work Toolbar was by default located on the far right of the application window, &umbrello; 1.2 has moved this to the top of the window. You can dock it into other edge or have it floating around if you prefer. The tools available on this toolbar (the buttons you see on it) change depending on the type of diagram you are currently working on. The button for the currently selected tool is activated in the toolbar. You can switch to the select tool by pressing the &Esc; key. </para>
+<para>When you have selected an edit tool from the Work Toolbar (for example, the tool to insert classes) the mouse pointer changes to a cross, and you can insert the elements in your model by single clicking in your diagram. Note that elements in &UML; must have a <emphasis>Unique Name</emphasis>. So that if you have a class in one diagram whose name is <quote>ClassA</quote> and then you use the insert Class tool to insert a class into another diagram you cannot name this new class <quote>ClassA</quote> as well. If these two are supposed to be two different elements, you have to give them a unique name. If you are trying to add the <emphasis>same</emphasis> element to your diagram, then the Insert Class is not the right tool for that. You should drag and drop the class from the Tree View instead. </para>
 </sect2>
 <sect2 id="delete-elements">
-<title
->Deleting Elements</title>
-<para
->You can delete any element by selecting the option <guimenuitem
->Delete</guimenuitem
-> from its context menu. </para>
-<para
->Again, there is a <emphasis
->big</emphasis
-> difference between removing an object from a diagram, and deleting an object from your model: If you delete an object from within a diagram, you are only removing the object from that particular diagram: the element will still be part of your model and if there are other diagrams using the same element they will not suffer any change. If, on the other hand, you delete the element from the Tree View, you are actually deleting the element from your <emphasis
->model</emphasis
->. Since the element no longer exist in your model, it will be automatically removed from all the diagrams it appears in. </para>
+<title>Deleting Elements</title>
+<para>You can delete any element by selecting the option <guimenuitem>Delete</guimenuitem> from its context menu. </para>
+<para>Again, there is a <emphasis>big</emphasis> difference between removing an object from a diagram, and deleting an object from your model: If you delete an object from within a diagram, you are only removing the object from that particular diagram: the element will still be part of your model and if there are other diagrams using the same element they will not suffer any change. If, on the other hand, you delete the element from the Tree View, you are actually deleting the element from your <emphasis>model</emphasis>. Since the element no longer exist in your model, it will be automatically removed from all the diagrams it appears in. </para>
 </sect2>
 <sect2 id="edit-elements">
-<title
->Editing Elements</title>
-<para
->You can edit most of the &UML; elements in your model and diagrams by opening its Properties dialogue and selecting the appropriate options. To edit the properties of an object, select <guimenuitem
->Properties</guimenuitem
-> from its context menu (&RMB; click). Each element has a dialogue consisting of several pages where you can configure the options corresponding to that element. For some elements, like actors you can only set a couple of options, like the object name and documentation, while for other elements, like classes, you can edit its attributes and operations, select what you want to be shown in the diagram (whole operation signature or just operation names, etc) and even the colours you want to use for the line and fill of the class' representation on the diagram. </para>
+<title>Editing Elements</title>
+<para>You can edit most of the &UML; elements in your model and diagrams by opening its Properties dialogue and selecting the appropriate options. To edit the properties of an object, select <guimenuitem>Properties</guimenuitem> from its context menu (&RMB; click). Each element has a dialogue consisting of several pages where you can configure the options corresponding to that element. For some elements, like actors you can only set a couple of options, like the object name and documentation, while for other elements, like classes, you can edit its attributes and operations, select what you want to be shown in the diagram (whole operation signature or just operation names, etc) and even the colours you want to use for the line and fill of the class' representation on the diagram. </para>
 
-<para
->For most &UML; elements you can also open the properties dialogue by double clicking on it if you are using the selection tool (arrow). The exception to this is Associations, in which case a double click creates an anchor point. For associations you need to use the &RMB; context menu to get the properties dialogue. </para>
+<para>For most &UML; elements you can also open the properties dialogue by double clicking on it if you are using the selection tool (arrow). The exception to this is Associations, in which case a double click creates an anchor point. For associations you need to use the &RMB; context menu to get the properties dialogue. </para>
 
-<para
->Note that you can also select the properties option from the context menu of the elements in the Tree View. This allows you to also edit the properties for the diagrams, like setting whether the grid should be shown or not. </para>
+<para>Note that you can also select the properties option from the context menu of the elements in the Tree View. This allows you to also edit the properties for the diagrams, like setting whether the grid should be shown or not. </para>
 </sect2>
 <sect2 id="edit-classes">
-<title
->Editing Classes</title>
-<para
->Even though editing the properties of all objects was already covered in the previous section, classes deserve a special section because they are a bit more complicated and have more options than most of the other &UML; elements. </para>
-<para
->In the properties dialogue for a class you can set everything, from the colour it uses to the operations and attributes it has. </para>
+<title>Editing Classes</title>
+<para>Even though editing the properties of all objects was already covered in the previous section, classes deserve a special section because they are a bit more complicated and have more options than most of the other &UML; elements. </para>
+<para>In the properties dialogue for a class you can set everything, from the colour it uses to the operations and attributes it has. </para>
 <sect3 id="class-general-settings">
-<title
->Class General Settings</title>
-<para
->The General Settings page of the properties dialogue is self-explanatory. Here you can change the class' name, visibility, documentation, &etc; This page is always available. </para>
+<title>Class General Settings</title>
+<para>The General Settings page of the properties dialogue is self-explanatory. Here you can change the class' name, visibility, documentation, &etc; This page is always available. </para>
 </sect3>
 <sect3 id="class-attributes-settings">
-<title
->Class Attribute Settings</title>
-<para
->In the Attributes Settings page you can add, edit, or delete attributes (variables) of the class. You can move attributes up and down the list by pressing the arrow button on the side. This page is always available. </para>
+<title>Class Attribute Settings</title>
+<para>In the Attributes Settings page you can add, edit, or delete attributes (variables) of the class. You can move attributes up and down the list by pressing the arrow button on the side. This page is always available. </para>
 </sect3>
 <sect3 id="class-operations-settings">
-<title
->Class Operations Settings</title>
-<para
->Similar to the Attribute Settings Page, in the Operation Settings Page you can add, edit, or remove operations for your class. When adding or editing an operation, you enter the basic data in the <emphasis
->Operation Properties</emphasis
-> dialogue. If you want to add parameters to your operation you need to click the <guibutton
->New Parameter</guibutton
-> button, which will show the <emphasis
->Parameter Properties</emphasis
-> dialogue. This page is always available </para>
+<title>Class Operations Settings</title>
+<para>Similar to the Attribute Settings Page, in the Operation Settings Page you can add, edit, or remove operations for your class. When adding or editing an operation, you enter the basic data in the <emphasis>Operation Properties</emphasis> dialogue. If you want to add parameters to your operation you need to click the <guibutton>New Parameter</guibutton> button, which will show the <emphasis>Parameter Properties</emphasis> dialogue. This page is always available </para>
 </sect3>
 <sect3 id="class-template-settings">
-<title
->Class Template Settings</title>
-<para
->This page allows you to add class templates which are unspecified classes or datatypes. In Java 1.5 these will be called Generics. </para>
+<title>Class Template Settings</title>
+<para>This page allows you to add class templates which are unspecified classes or datatypes. In Java 1.5 these will be called Generics. </para>
 </sect3>
 <sect3 id="class-associations-page">
-<title
->Class Associations Page</title>
-<para
->The <guilabel
->Class Associations</guilabel
-> page shows all the associations of this class in the current diagram. Double clicking on an association shows its properties, and depending on the type of association you may modify some parameters here such as setting multiplicity and Role name. If the association does not allow such options be be modified, the Association Properties dialogue is read-only and you can only modify the documentation associated with this association. </para>
-<para
->This page is only available if you open the Class Properties from within a diagram. If you select the class properties from the context menu in the Tree View this page is not available. </para>
+<title>Class Associations Page</title>
+<para>The <guilabel>Class Associations</guilabel> page shows all the associations of this class in the current diagram. Double clicking on an association shows its properties, and depending on the type of association you may modify some parameters here such as setting multiplicity and Role name. If the association does not allow such options be be modified, the Association Properties dialogue is read-only and you can only modify the documentation associated with this association. </para>
+<para>This page is only available if you open the Class Properties from within a diagram. If you select the class properties from the context menu in the Tree View this page is not available. </para>
 </sect3>
 <sect3 id="class-display-page">
-<title
->Class Display Page</title>
-<para
->In the <guilabel
->Display Options</guilabel
-> page, you can set what is to be shown in the diagram. A class can be shown as only one rectangle with the class name in it (useful if you have many classes in your diagram, or are for the moment not interested in the details of each class) or as complete as showing packages, stereotypes, and attributes and operations with full signature and visibility </para>
-<para
->Depending on the amount of information you want to see you can select the corresponding options in this page. The changes you make here are only <emphasis
->display options</emphasis
-> for the diagram. This means that <quote
->hiding</quote
-> a class' operations only makes them not to be shown in the diagram, but the operations are still there as part of your model. This option is only available if you select the class properties from within a Diagram. If you open the class properties from the Tree View this page is missing since such Display Options do not make sense in that case</para>
+<title>Class Display Page</title>
+<para>In the <guilabel>Display Options</guilabel> page, you can set what is to be shown in the diagram. A class can be shown as only one rectangle with the class name in it (useful if you have many classes in your diagram, or are for the moment not interested in the details of each class) or as complete as showing packages, stereotypes, and attributes and operations with full signature and visibility </para>
+<para>Depending on the amount of information you want to see you can select the corresponding options in this page. The changes you make here are only <emphasis>display options</emphasis> for the diagram. This means that <quote>hiding</quote> a class' operations only makes them not to be shown in the diagram, but the operations are still there as part of your model. This option is only available if you select the class properties from within a Diagram. If you open the class properties from the Tree View this page is missing since such Display Options do not make sense in that case</para>
 </sect3>
 <sect3 id="class-color-page">
-<title
->Class Colour Page</title>
-<para
->In the <guilabel
->Widget Colour</guilabel
-> page you can configure the colours you want for the line and the fill of the widget. This option obviously makes sense only for classes displayed in diagrams, and is missing if you open the class' properties dialogue from the Tree View. </para>
+<title>Class Colour Page</title>
+<para>In the <guilabel>Widget Colour</guilabel> page you can configure the colours you want for the line and the fill of the widget. This option obviously makes sense only for classes displayed in diagrams, and is missing if you open the class' properties dialogue from the Tree View. </para>
 </sect3>
 </sect2>
 
 <sect2 id="associations">
-<title
->Associations</title>
-<para
->Associations relate two &UML; objects to each other. Normally associations are defined between two classes, but some types of associations can also exist between use cases and actors. </para>
-<para
->To create an association select the appropriate tool from the Work Toolbar (generic Association, Generalization, Aggregation, &etc;) and single click on the first element participating in the association and then single click on the second item participating. Note that those are two clicks, one on each of the objects participating in the association, it is <emphasis
->not</emphasis
-> a drag from one object to the other. </para>
-<para
->If you try to use an association in a way against the &UML; specification &umbrello; will refuse to create the association and you will get an error message. This would be the case if, for example, a Generalisation exists from class A to class B and then you try to create another Generalisation from Class B to class A </para>
-<para
-><mousebutton
->Right</mousebutton
-> clicking on an association will show a context menu with the actions you can apply on it. If you need to delete an association simply select the <guimenuitem
->Delete</guimenuitem
-> option from this context menu. You can also select the <guimenuitem
->Properties</guimenuitem
-> option and, depending on the association type edit attributes such as roles and multiplicity. </para>
+<title>Associations</title>
+<para>Associations relate two &UML; objects to each other. Normally associations are defined between two classes, but some types of associations can also exist between use cases and actors. </para>
+<para>To create an association select the appropriate tool from the Work Toolbar (generic Association, Generalization, Aggregation, &etc;) and single click on the first element participating in the association and then single click on the second item participating. Note that those are two clicks, one on each of the objects participating in the association, it is <emphasis>not</emphasis> a drag from one object to the other. </para>
+<para>If you try to use an association in a way against the &UML; specification &umbrello; will refuse to create the association and you will get an error message. This would be the case if, for example, a Generalisation exists from class A to class B and then you try to create another Generalisation from Class B to class A </para>
+<para><mousebutton>Right</mousebutton> clicking on an association will show a context menu with the actions you can apply on it. If you need to delete an association simply select the <guimenuitem>Delete</guimenuitem> option from this context menu. You can also select the <guimenuitem>Properties</guimenuitem> option and, depending on the association type edit attributes such as roles and multiplicity. </para>
 <sect3 id="anchor-points">
-<title
->Anchor Points</title>
-<para
->Associations are drawn, by default, as a straight line connecting the two objects in the diagram. </para>
-<para
->You can add anchor points to bend an association by <mousebutton
->double</mousebutton
-> clicking some where along the association line. This will insert an anchor point (displayed as a blue point when the association line is selected) which you can move around to give shape to the association </para>
-<para
->If you need to remove an anchor point, <mousebutton
->double</mousebutton
-> click on it again to remove it </para>
-<para
->Note that the only way to edit the properties of an association is through the context menu. If you try to <mousebutton
->double</mousebutton
-> click on it as with other &UML; objects, this will only insert an anchor point. </para>
+<title>Anchor Points</title>
+<para>Associations are drawn, by default, as a straight line connecting the two objects in the diagram. </para>
+<para>You can add anchor points to bend an association by <mousebutton>double</mousebutton> clicking some where along the association line. This will insert an anchor point (displayed as a blue point when the association line is selected) which you can move around to give shape to the association </para>
+<para>If you need to remove an anchor point, <mousebutton>double</mousebutton> click on it again to remove it </para>
+<para>Note that the only way to edit the properties of an association is through the context menu. If you try to <mousebutton>double</mousebutton> click on it as with other &UML; objects, this will only insert an anchor point. </para>
 </sect3>
 </sect2>
 
 <sect2 id="notes">
-<title
->Notes, Text and Boxes</title>
-<para
->Notes, Lines Of Text and Boxes are elements that can be present in any type of diagram and have no real semantic value, but are very helpful to add extra comments or explanations that can make your diagram easier to understand. </para>
-<para
->To add a Note or a Line Of Text, select the corresponding tool from the Work Toolbar and single click on the diagram where you want to put your comment. You can edit the text by opening the element through its context menu or in the case of notes by <mousebutton
->double</mousebutton
-> clicking on them as well. </para>
+<title>Notes, Text and Boxes</title>
+<para>Notes, Lines Of Text and Boxes are elements that can be present in any type of diagram and have no real semantic value, but are very helpful to add extra comments or explanations that can make your diagram easier to understand. </para>
+<para>To add a Note or a Line Of Text, select the corresponding tool from the Work Toolbar and single click on the diagram where you want to put your comment. You can edit the text by opening the element through its context menu or in the case of notes by <mousebutton>double</mousebutton> clicking on them as well. </para>
 <sect3 id="anchors">
-<title
->Anchors</title>
-<para
->Anchors are used to link a text note and another &UML; Element together. For example, you normally use a text note to explain or make some comment about a class or a particular association, in which case you can use the anchor to make it clear that the note <quote
->belongs</quote
-> to that particular element. </para>
-<para
->To add an anchor between a note and another &UML; element, use the anchor tool from the work toolbar. You first need to click on the note and then click on the &UML; element you want the note to be linked to. </para>
+<title>Anchors</title>
+<para>Anchors are used to link a text note and another &UML; Element together. For example, you normally use a text note to explain or make some comment about a class or a particular association, in which case you can use the anchor to make it clear that the note <quote>belongs</quote> to that particular element. </para>
+<para>To add an anchor between a note and another &UML; element, use the anchor tool from the work toolbar. You first need to click on the note and then click on the &UML; element you want the note to be linked to. </para>
 </sect3>
 </sect2>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdeutils/kcontrol/kcmlowbatcrit/index.docbook b/tde-i18n-en_GB/docs/tdeutils/kcontrol/kcmlowbatcrit/index.docbook
index 95256fd3d72..bc9626f5140 100644
--- a/tde-i18n-en_GB/docs/tdeutils/kcontrol/kcmlowbatcrit/index.docbook
+++ b/tde-i18n-en_GB/docs/tdeutils/kcontrol/kcmlowbatcrit/index.docbook
@@ -2,86 +2,43 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE" 
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE" > <!-- change language only here -->
 ]>
 
 <article>
 <articleinfo>
 
 <authorgroup>
-<author
-> <firstname
->Mike</firstname
-> <surname
->McBride</surname
-> </author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->KDE British Conversion</contrib
-></othercredit>
+<author> <firstname>Mike</firstname> <surname>McBride</surname> </author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>KDE British Conversion</contrib></othercredit>
 </authorgroup>
 
-<date
->2002-02-12</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-02-12</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->Battery</keyword>
-<keyword
->Power</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>Battery</keyword>
+<keyword>Power</keyword>
 </keywordset>
 </articleinfo>
 
 <sect1 id="lowbatcrit">
 
-<title
->Low Battery Critical</title>
-<!-- <note
-><para
->The laptop modules require the correct installation of the
+<title>Low Battery Critical</title>
+<!-- <note><para>The laptop modules require the correct installation of the
 apm modules.  For more information see the section entitled Laptop
-Information</link
->.</para
-></note
-> -->
+Information</link>.</para></note> -->
 <sect2 id="low-bat-crit-use">
-<title
->Use</title>
-<para
-></para>
+<title>Use</title>
+<para></para>
 </sect2>
 <sect2 id="low-bat-crit-author">
-<title
->Section Author</title>
-<para
->This section written by Paul Campbell <email
->paul@taniwha.com</email
-></para>
-<para
->Converted to Docbook by Mike McBride <email
->mpmcbride7@yahoo.com</email
-></para>
-<para
->KDE British Conversion Malcolm Hunter <email
->malcolm.hunter@gmx.co.uk</email
-></para>
+<title>Section Author</title>
+<para>This section written by Paul Campbell <email>paul@taniwha.com</email></para>
+<para>Converted to Docbook by Mike McBride <email>mpmcbride7@yahoo.com</email></para>
+<para>KDE British Conversion Malcolm Hunter <email>malcolm.hunter@gmx.co.uk</email></para>
 </sect2>
 </sect1>