Beautify docbook files

41 files changed, 368 insertions, 1988 deletions

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>