summaryrefslogtreecommitdiffstats
path: root/tde-i18n-en_GB/docs/tdebase/kate
diff options
context:
space:
mode:
Diffstat (limited to 'tde-i18n-en_GB/docs/tdebase/kate')
-rw-r--r--tde-i18n-en_GB/docs/tdebase/kate/advanced.docbook356
-rw-r--r--tde-i18n-en_GB/docs/tdebase/kate/configuring.docbook682
-rw-r--r--tde-i18n-en_GB/docs/tdebase/kate/fundamentals.docbook757
-rw-r--r--tde-i18n-en_GB/docs/tdebase/kate/highlighting.docbook579
-rw-r--r--tde-i18n-en_GB/docs/tdebase/kate/index.docbook370
-rw-r--r--tde-i18n-en_GB/docs/tdebase/kate/mdi.docbook284
-rw-r--r--tde-i18n-en_GB/docs/tdebase/kate/menus.docbook1141
-rw-r--r--tde-i18n-en_GB/docs/tdebase/kate/part.docbook660
-rw-r--r--tde-i18n-en_GB/docs/tdebase/kate/plugins.docbook29
-rw-r--r--tde-i18n-en_GB/docs/tdebase/kate/regular-expressions.docbook1167
10 files changed, 1182 insertions, 4843 deletions
diff --git a/tde-i18n-en_GB/docs/tdebase/kate/advanced.docbook b/tde-i18n-en_GB/docs/tdebase/kate/advanced.docbook
index 128a567ef87..44ef40da5df 100644
--- a/tde-i18n-en_GB/docs/tdebase/kate/advanced.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kate/advanced.docbook
@@ -1,171 +1,65 @@
<chapter id="advanced-editing-tools">
<chapterinfo>
<authorgroup>
-<author
->&Anders.Lund; &Anders.Lund.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
->
+<author>&Anders.Lund; &Anders.Lund.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>[email protected]</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit>
</authorgroup>
</chapterinfo>
-<title
->Advanced Editing Tools</title>
+<title>Advanced Editing Tools</title>
<sect1 id="comment">
-<title
->Comment/Uncomment</title>
-
-<para
->The Comment and Uncomment commands, available from the <guimenu
->Tools</guimenu
-> menu allow you to add or remove comment markers to the selection, or the current line if no text is selected, it comments are supported by the format of the text you are editing.</para>
-
-<para
->The rules for how commenting is done are defined in the syntax definitions, so if syntax highlighting is not used, commenting/uncommenting is not possible.</para>
-
-<para
->Some formats define single line comment markers, some multi line markers and some both. If multi line markers are not available, commenting out a selection that does not fully include its last line is not possible.</para>
-
-<para
->If a single line marker is available, commenting single lines is preferred where applicable, as this helps to avoid problems with nested comments.</para>
-
-<para
->When removing comment markers, no uncommented text should be selected. When removing multiline comment markers from a selection, any whitespace outside the comment markers is ignored.</para>
-
-<para
-><indexterm
-><primary
->comment</primary
-></indexterm
-> To place comment markers, use the <menuchoice
-><guimenu
->Tools</guimenu
-><guimenuitem
->Comment</guimenuitem
-></menuchoice
-> menu item or the related keyboard shortcut sequence, default is <keycombo action="simul"
->&Ctrl;<keycap
->#</keycap
-></keycombo
->.</para>
-
-<para
-><indexterm
-><primary
->uncomment</primary
-></indexterm
-> To remove comment markers, use the <menuchoice
-><guimenu
->Tools</guimenu
-><guimenuitem
->Uncomment</guimenuitem
-></menuchoice
-> menu item or the related keyboard shortcut, default is <keycombo action="simul"
->&Ctrl;&Shift;<keycap
->#</keycap
-></keycombo
->.</para>
+<title>Comment/Uncomment</title>
+
+<para>The Comment and Uncomment commands, available from the <guimenu>Tools</guimenu> menu allow you to add or remove comment markers to the selection, or the current line if no text is selected, it comments are supported by the format of the text you are editing.</para>
+
+<para>The rules for how commenting is done are defined in the syntax definitions, so if syntax highlighting is not used, commenting/uncommenting is not possible.</para>
+
+<para>Some formats define single line comment markers, some multi line markers and some both. If multi line markers are not available, commenting out a selection that does not fully include its last line is not possible.</para>
+
+<para>If a single line marker is available, commenting single lines is preferred where applicable, as this helps to avoid problems with nested comments.</para>
+
+<para>When removing comment markers, no uncommented text should be selected. When removing multiline comment markers from a selection, any whitespace outside the comment markers is ignored.</para>
+
+<para><indexterm><primary>comment</primary></indexterm> To place comment markers, use the <menuchoice><guimenu>Tools</guimenu><guimenuitem>Comment</guimenuitem></menuchoice> menu item or the related keyboard shortcut sequence, default is <keycombo action="simul">&Ctrl;<keycap>#</keycap></keycombo>.</para>
+
+<para><indexterm><primary>uncomment</primary></indexterm> To remove comment markers, use the <menuchoice><guimenu>Tools</guimenu><guimenuitem>Uncomment</guimenuitem></menuchoice> menu item or the related keyboard shortcut, default is <keycombo action="simul">&Ctrl;&Shift;<keycap>#</keycap></keycombo>.</para>
</sect1>
<sect1 id="edit-command">
-<title
->Editing Command</title>
-
-<para
->This tool, available from the <menuchoice
-><guimenu
->Tools</guimenu
-><guimenuitem
->Editing Command</guimenuitem
-></menuchoice
-> menu item, provides access to a small set of <application
->vi</application
->/<application
->vim</application
->-like commands for editing the text. It is a no nonsense tool for advanced or experienced users, but do not let that hold you back from experiencing its powers!</para>
-
-<para
->Currently, the following commands are available:</para>
+<title>Editing Command</title>
+
+<para>This tool, available from the <menuchoice><guimenu>Tools</guimenu><guimenuitem>Editing Command</guimenuitem></menuchoice> menu item, provides access to a small set of <application>vi</application>/<application>vim</application>-like commands for editing the text. It is a no nonsense tool for advanced or experienced users, but do not let that hold you back from experiencing its powers!</para>
+
+<para>Currently, the following commands are available:</para>
<variablelist>
<varlistentry>
-<term
-><command
->time</command
-></term>
+<term><command>time</command></term>
<listitem>
-<para
->This command will output the current time as known by your computer in the format <quote
->HH:MM:SS</quote
-></para>
-
-<para
->To use it, launch the Editing Command Dialogue and type into the input box the word <userinput
->time</userinput
-></para>
+<para>This command will output the current time as known by your computer in the format <quote>HH:MM:SS</quote></para>
+
+<para>To use it, launch the Editing Command Dialogue and type into the input box the word <userinput>time</userinput></para>
</listitem>
</varlistentry>
<varlistentry>
-<term
-><command
->char</command
-></term>
+<term><command>char</command></term>
<listitem>
-<para
->This command allows you to insert literal characters by their numerical identifier, in decimal, octal or hexadecimal form. To use it launch the Editing Command dialogue and type <userinput
->char: [number]</userinput
-> in the entry box, then hit <guibutton
->OK</guibutton
->.</para
->
+<para>This command allows you to insert literal characters by their numerical identifier, in decimal, octal or hexadecimal form. To use it launch the Editing Command dialogue and type <userinput>char: [number]</userinput> in the entry box, then hit <guibutton>OK</guibutton>.</para>
<example>
-<title
-><command
->char</command
-> examples</title>
-
-<para
->Input: <userinput
->char:234</userinput
-></para>
-<para
->Output: <computeroutput
->ê</computeroutput
-></para>
-<para
->Input: <userinput
->char:0x1234</userinput
-></para>
-<para
->Output: <computeroutput
->ê</computeroutput
-></para>
-<para
->Input: <userinput
->char:1232</userinput
-></para>
-<para
->Output: <computeroutput
->ê</computeroutput
-></para>
+<title><command>char</command> examples</title>
+
+<para>Input: <userinput>char:234</userinput></para>
+<para>Output: <computeroutput>ê</computeroutput></para>
+<para>Input: <userinput>char:0x1234</userinput></para>
+<para>Output: <computeroutput>ê</computeroutput></para>
+<para>Input: <userinput>char:1232</userinput></para>
+<para>Output: <computeroutput>ê</computeroutput></para>
</example>
</listitem>
@@ -175,157 +69,54 @@
<varlistentry>
<term>
-<indexterm
-><primary
->replace, sed style</primary>
-<secondary
->search, sed style</secondary
-></indexterm>
-<command
->s///[ig]</command
-> <command
->%s///[ig]</command
-></term>
+<indexterm><primary>replace, sed style</primary>
+<secondary>search, sed style</secondary></indexterm>
+<command>s///[ig]</command> <command>%s///[ig]</command></term>
<listitem>
-<para
->This command does a sed-like search/replace operation on the current line, or on the whole file (<command
->%s///</command
->).</para>
-
-<para
->In short, the text is searched for text matching the <emphasis
->search pattern</emphasis
->, the regular expression between the first and the second slash, and when a match is found, the matching part of the text is replaced with the expression between the middle and last part of the string. Parentheses in the search pattern create <emphasis
->back references</emphasis
->, that is the command remembers which part of the match matched in the parentheses; these strings can be reused in the replace pattern, referred to as <userinput
->\1</userinput
-> for the first set of parentheses, <userinput
->\2</userinput
-> for the second and so on.</para>
-
-<para
->To search for a literal <literal
->(</literal
-> or <literal
->)</literal
->, you need to <emphasis
->escape</emphasis
-> it using a backslash character: <userinput
->\(\)</userinput
-></para>
-
-<para
->If you put an <userinput
->i</userinput
-> at the end of the expression, the matching will be case insensitive.</para>
+<para>This command does a sed-like search/replace operation on the current line, or on the whole file (<command>%s///</command>).</para>
+
+<para>In short, the text is searched for text matching the <emphasis>search pattern</emphasis>, the regular expression between the first and the second slash, and when a match is found, the matching part of the text is replaced with the expression between the middle and last part of the string. Parentheses in the search pattern create <emphasis>back references</emphasis>, that is the command remembers which part of the match matched in the parentheses; these strings can be reused in the replace pattern, referred to as <userinput>\1</userinput> for the first set of parentheses, <userinput>\2</userinput> for the second and so on.</para>
+
+<para>To search for a literal <literal>(</literal> or <literal>)</literal>, you need to <emphasis>escape</emphasis> it using a backslash character: <userinput>\(\)</userinput></para>
+
+<para>If you put an <userinput>i</userinput> at the end of the expression, the matching will be case insensitive.</para>
<example>
-<title
->Replacing text in the current line</title>
+<title>Replacing text in the current line</title>
-<para
->Your friendly compiler just stopped, telling you that the class <classname
->myClass</classname
-> mentioned in line 3902 in your source file is not defined.</para>
+<para>Your friendly compiler just stopped, telling you that the class <classname>myClass</classname> mentioned in line 3902 in your source file is not defined.</para>
-<para
->&quot;Buckle!&quot; you think, it is of course <classname
->MyClass</classname
->. You go to line 3902, and instead of trying to find the word in the text, you launch the Editing Command Dialogue, enter <userinput
->s/myclass/MyClass/i</userinput
->, hit the <guibutton
->OK</guibutton
-> button, save the file and compile &ndash; successfully without the error.</para>
+<para>&quot;Buckle!&quot; you think, it is of course <classname>MyClass</classname>. You go to line 3902, and instead of trying to find the word in the text, you launch the Editing Command Dialogue, enter <userinput>s/myclass/MyClass/i</userinput>, hit the <guibutton>OK</guibutton> button, save the file and compile &ndash; successfully without the error.</para>
</example>
<example>
-<title
->Replacing text in the whole file</title>
-
-<para
->Imagine that you have a file, in which you mention a <quote
->Miss Jensen</quote
-> several times, when someone comes in and tells you that she just got married to <quote
->Mr Jones</quote
->. You want, of course, to replace each and every occurrence of <quote
->Miss Jensen</quote
-> with <quote
->Ms Jones</quote
->.</para>
-
-<para
->Launch the Editing Command dialogue, and type into the entry box: <userinput
->%s/Miss Jensen/Ms Jones/</userinput
-> and hit return, you are done.</para>
+<title>Replacing text in the whole file</title>
+
+<para>Imagine that you have a file, in which you mention a <quote>Miss Jensen</quote> several times, when someone comes in and tells you that she just got married to <quote>Mr Jones</quote>. You want, of course, to replace each and every occurrence of <quote>Miss Jensen</quote> with <quote>Ms Jones</quote>.</para>
+
+<para>Launch the Editing Command dialogue, and type into the entry box: <userinput>%s/Miss Jensen/Ms Jones/</userinput> and hit return, you are done.</para>
</example>
<example>
-<title
->A More Advanced Example</title>
-
-<para
->This example makes use of <emphasis
->back references</emphasis
-> as well as a <emphasis
->word class</emphasis
-> (if you do not know what that is, please refer to the related documentation mentioned below).</para>
-
-<para
->Suppose you have the following line: <programlisting
->void MyClass::DoStringOps( String &amp;foo, String &amp;bar String *p, int &amp;a, int &amp;b )</programlisting>
+<title>A More Advanced Example</title>
+
+<para>This example makes use of <emphasis>back references</emphasis> as well as a <emphasis>word class</emphasis> (if you do not know what that is, please refer to the related documentation mentioned below).</para>
+
+<para>Suppose you have the following line: <programlisting>void MyClass::DoStringOps( String &amp;foo, String &amp;bar String *p, int &amp;a, int &amp;b )</programlisting>
</para>
-<para
->Now you realise that this is not nice code, and decide that you want to use the <constant
->const</constant
-> keyword for all <quote
->address of</quote
-> arguments, those characterised by the &amp; operator in front of the argument name. You would also like to simplify the white space, so that there is only 1 whitespace character between each word.</para>
-
-<para
->Launch the Editing Command Dialogue, and enter: <userinput
->s/\s+(\w+)\s+(&amp;)/ const \1 \2/g</userinput
-> and hit the <guibutton
->OK</guibutton
-> button. The <userinput
->g</userinput
-> at the end of the expression makes the regular expression recompile for each match to save the <emphasis
->backreferences</emphasis
->.</para>
-
-<para
->Output: <computeroutput
->void MyClass::DoStringOps( const String &amp;foo, const String &amp;bar String *p, const int &amp;a, const int &amp;b )</computeroutput
-></para>
-
-<para
->Mission completed! Now, what happened? Well, we looked for some white space (<literal
->\s+</literal
->) followed by one or more alphabetic characters (<literal
->\w+</literal
->) followed by some more whitespace (<literal
->\s+</literal
->) followed by an ampersand, and in the process saved the alphabetic chunk and the ampersand for reuse in the replace operation. Then we replaced the matching part of our line with one whitespace followed by <quote
->const</quote
-> followed by one whitespace followed by our saved alphabetical chunk (<literal
->\1</literal
->) followed by one whitespace followed by our saved ampersand (<literal
->\2</literal
->)</para>
-
-<para
->Now in some cases the alphabetical chunk was <quote
->String</quote
->, in some <quote
->int</quote
->, so using the character class <literal
->\w</literal
-> and the <literal
->+</literal
-> quantifier proved a valuable asset.</para>
+<para>Now you realise that this is not nice code, and decide that you want to use the <constant>const</constant> keyword for all <quote>address of</quote> arguments, those characterised by the &amp; operator in front of the argument name. You would also like to simplify the white space, so that there is only 1 whitespace character between each word.</para>
+
+<para>Launch the Editing Command Dialogue, and enter: <userinput>s/\s+(\w+)\s+(&amp;)/ const \1 \2/g</userinput> and hit the <guibutton>OK</guibutton> button. The <userinput>g</userinput> at the end of the expression makes the regular expression recompile for each match to save the <emphasis>backreferences</emphasis>.</para>
+
+<para>Output: <computeroutput>void MyClass::DoStringOps( const String &amp;foo, const String &amp;bar String *p, const int &amp;a, const int &amp;b )</computeroutput></para>
+
+<para>Mission completed! Now, what happened? Well, we looked for some white space (<literal>\s+</literal>) followed by one or more alphabetic characters (<literal>\w+</literal>) followed by some more whitespace (<literal>\s+</literal>) followed by an ampersand, and in the process saved the alphabetic chunk and the ampersand for reuse in the replace operation. Then we replaced the matching part of our line with one whitespace followed by <quote>const</quote> followed by one whitespace followed by our saved alphabetical chunk (<literal>\1</literal>) followed by one whitespace followed by our saved ampersand (<literal>\2</literal>)</para>
+
+<para>Now in some cases the alphabetical chunk was <quote>String</quote>, in some <quote>int</quote>, so using the character class <literal>\w</literal> and the <literal>+</literal> quantifier proved a valuable asset.</para>
</example>
@@ -335,14 +126,7 @@
</variablelist>
<warning>
-<para
->This is extremely powerful, and though the actions can be undone by calling the <menuchoice
-><guimenuitem
->Undo</guimenuitem
-></menuchoice
-> command several times (as required) I recommend you practise a bit before using this command for serious editing if you are not familiar with <application
->sed</application
-> or perl regular expressions.</para>
+<para>This is extremely powerful, and though the actions can be undone by calling the <menuchoice><guimenuitem>Undo</guimenuitem></menuchoice> command several times (as required) I recommend you practise a bit before using this command for serious editing if you are not familiar with <application>sed</application> or perl regular expressions.</para>
</warning>
</sect1>
diff --git a/tde-i18n-en_GB/docs/tdebase/kate/configuring.docbook b/tde-i18n-en_GB/docs/tdebase/kate/configuring.docbook
index e682f0c5e0d..fd370c1aba5 100644
--- a/tde-i18n-en_GB/docs/tdebase/kate/configuring.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kate/configuring.docbook
@@ -1,89 +1,42 @@
<chapter id="configuring-kate">
<chapterinfo>
<authorgroup>
-<author
-><personname
-><firstname
-></firstname
-></personname
-></author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
->
+<author><personname><firstname></firstname></personname></author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>[email protected]</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit>
</authorgroup>
</chapterinfo>
-<title
->Configuring &kate;</title>
+<title>Configuring &kate;</title>
<sect1 id="configuring-overview">
-<title
->Overview</title>
+<title>Overview</title>
<para>
<indexterm>
-<primary
->configure</primary>
-<secondary
->settings</secondary>
-<tertiary
->preferences</tertiary
-></indexterm>
+<primary>configure</primary>
+<secondary>settings</secondary>
+<tertiary>preferences</tertiary></indexterm>
<anchor id="find"/> <anchor id="find-again"/> <anchor id="replace"/> <anchor id="undo"/> <anchor id="redo"/> &kate; offers several means of tweaking the application to behave as desired. The most important ones are: </para>
<variablelist>
<varlistentry>
-<term id="configure"
->The Configuration Dialogue</term>
-<listitem
-><para
->The main configuration tool, allowing you to configure the &kate; application, the editor component and the usage of plugins.</para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term id="settings"
->The <guimenu
->Settings</guimenu
-> Menu</term>
-<listitem
-><para
->Allows you to change often used settings, and to launch the configuration dialogues.</para
-></listitem>
-</varlistentry>
-<varlistentry>
-<term
->The <guimenu
->View</guimenu
-> Menu</term>
-<listitem
-><para
->Allows you to split the current frame, as well as to display the icons and line numbers pane for the currently edited document.</para
-></listitem>
+<term id="configure">The Configuration Dialogue</term>
+<listitem><para>The main configuration tool, allowing you to configure the &kate; application, the editor component and the usage of plugins.</para></listitem>
+</varlistentry>
+<varlistentry>
+<term id="settings">The <guimenu>Settings</guimenu> Menu</term>
+<listitem><para>Allows you to change often used settings, and to launch the configuration dialogues.</para></listitem>
+</varlistentry>
+<varlistentry>
+<term>The <guimenu>View</guimenu> Menu</term>
+<listitem><para>Allows you to split the current frame, as well as to display the icons and line numbers pane for the currently edited document.</para></listitem>
</varlistentry>
</variablelist>
-<para
->The embedded &konsole; is using the configuration defined in the &kcontrolcenter;, and may be configured by clicking the <mousebutton
->right</mousebutton
-> mouse button and choosing from the <guimenuitem
->Settings</guimenuitem
-> sub menu.</para>
+<para>The embedded &konsole; is using the configuration defined in the &kcontrolcenter;, and may be configured by clicking the <mousebutton>right</mousebutton> mouse button and choosing from the <guimenuitem>Settings</guimenuitem> sub menu.</para>
</sect1>
<sect1 id="configuring-kate-configdialog">
-<title
->The Main Configuration Dialogue</title>
+<title>The Main Configuration Dialogue</title>
<mediaobject>
<imageobject>
@@ -91,83 +44,42 @@
</imageobject>
</mediaobject>
-<para
->The &kate; configuration dialogue displays a tree of topics on the left, and a configuration page corresponding to the selected topic on the right. The tree groups the pages of the dialogue into logical groups.</para>
+<para>The &kate; configuration dialogue displays a tree of topics on the left, and a configuration page corresponding to the selected topic on the right. The tree groups the pages of the dialogue into logical groups.</para>
<sect2 id="config-dialog">
-<title
->The &kate; group</title>
-<para
->This group contains pages to configure the main &kate; application</para>
+<title>The &kate; group</title>
+<para>This group contains pages to configure the main &kate; application</para>
<sect3 id="config-dialog-general">
-<title
->The General Page</title>
-<para
->Global Options for &kate;</para>
+<title>The General Page</title>
+<para>Global Options for &kate;</para>
<variablelist>
<varlistentry>
-<term
->Application Mode</term>
+<term>Application Mode</term>
<listitem>
-<para
-><indexterm
-><primary
->MDI</primary
-><secondary
->SDI</secondary
-></indexterm>
-This group lets you choose between &kate; <acronym
->MDI</acronym
-> and &kate; <acronym
->SDI</acronym
-> mode, selecting the appropriate button.</para>
- <para
->&kate; <acronym
->MDI</acronym
-> (Multiple Document Interface), which is the default mode, makes &kate; use a single window for all open files. You can choose the document to edit from the File List (docked into the &kate; window by default) or by selecting the document from the <guimenu
->Document</guimenu
-> menu.</para>
-<para
->&kate; <acronym
->SDI</acronym
-> (Single Document Interface) will make &kate; open each document in a window of its own, and the File List/File Selector will have a separate window.</para>
- <para
->If you change this setting, you will need to restart &kate; for it to take effect.</para>
+<para><indexterm><primary>MDI</primary><secondary>SDI</secondary></indexterm>
+This group lets you choose between &kate; <acronym>MDI</acronym> and &kate; <acronym>SDI</acronym> mode, selecting the appropriate button.</para>
+ <para>&kate; <acronym>MDI</acronym> (Multiple Document Interface), which is the default mode, makes &kate; use a single window for all open files. You can choose the document to edit from the File List (docked into the &kate; window by default) or by selecting the document from the <guimenu>Document</guimenu> menu.</para>
+<para>&kate; <acronym>SDI</acronym> (Single Document Interface) will make &kate; open each document in a window of its own, and the File List/File Selector will have a separate window.</para>
+ <para>If you change this setting, you will need to restart &kate; for it to take effect.</para>
</listitem>
</varlistentry>
<varlistentry>
-<term
->At Startup</term
->
-<listitem
-><para
->These options determine how and if &kate; will restore your editing session when launched after a normal shutdown (if restored by the session manager, &kate; will always attempt to restore your session as close as possible to what it was when you last used &kate;).</para>
+<term>At Startup</term>
+<listitem><para>These options determine how and if &kate; will restore your editing session when launched after a normal shutdown (if restored by the session manager, &kate; will always attempt to restore your session as close as possible to what it was when you last used &kate;).</para>
<variablelist>
<varlistentry>
<term>
<anchor id="config-dialog-general-reopen-files"/>
-<guibutton
->Reopen Files</guibutton
-></term>
-<listitem
-><para
->If this option is enabled, files open when you last closed &kate; will be reopened. Bookmarks will be restored, and the cursor position, icon border and line numbers settings for the last editor used with the document will be re-established</para
-></listitem
->
-</varlistentry>
-<varlistentry>
-<term
-><guibutton
->Restore View Configuration</guibutton
-></term>
-<listitem
-><para
->If this option is enabled, &kate; will attempt to restore your frames exactly as you left them.</para
-></listitem>
+<guibutton>Reopen Files</guibutton></term>
+<listitem><para>If this option is enabled, files open when you last closed &kate; will be reopened. Bookmarks will be restored, and the cursor position, icon border and line numbers settings for the last editor used with the document will be re-established</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><guibutton>Restore View Configuration</guibutton></term>
+<listitem><para>If this option is enabled, &kate; will attempt to restore your frames exactly as you left them.</para></listitem>
</varlistentry>
</variablelist>
@@ -176,55 +88,24 @@ This group lets you choose between &kate; <acronym
</varlistentry>
<varlistentry>
-<term
-><guibutton
->Restrict to single instance</guibutton
-></term>
-<listitem
-><para
->Enabling this means you can only have one running instance of &kate; running at any given time. If you attempt to start another one, the current instance will take over and also open files as requested. For example, if you use &kate; for displaying sources for web pages in Konqueror, they will all be opened in an existing instance of &kate; if this option is enabled.</para
-></listitem>
+<term><guibutton>Restrict to single instance</guibutton></term>
+<listitem><para>Enabling this means you can only have one running instance of &kate; running at any given time. If you attempt to start another one, the current instance will take over and also open files as requested. For example, if you use &kate; for displaying sources for web pages in Konqueror, they will all be opened in an existing instance of &kate; if this option is enabled.</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><guibutton
->Show Contents While Resizing Frames</guibutton
-></term
-> <listitem
-><para
->If this option is enabled, the windows will be fully repainted while dragging the frame splitters. If unchecked, a so-called <quote
->rubber band</quote
-> (indicating the new size of the frame) will be used instead.</para
-></listitem>
+<term><guibutton>Show Contents While Resizing Frames</guibutton></term> <listitem><para>If this option is enabled, the windows will be fully repainted while dragging the frame splitters. If unchecked, a so-called <quote>rubber band</quote> (indicating the new size of the frame) will be used instead.</para></listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="config-dialog-general-sync-konsole"/>
-<guibutton
->Sync Konsole with Active Document</guibutton
-></term>
-<listitem
-><para
->This will cause the built-in &konsole; to <command
->cd</command
-> into the directory of the active document when launched and when a new document gets the focus. If not enabled, you have to do all your navigation in the &konsole; on your own. </para
-></listitem
->
-</varlistentry>
-
-<varlistentry>
-<term
-><guibutton
->Number of Recent Files</guibutton
-></term>
-<listitem
-><para
->Unsurprisingly, this allows you to decide how long the <guimenu
->Open Recent</guimenu
-> files menu should grow.</para
-></listitem>
+<guibutton>Sync Konsole with Active Document</guibutton></term>
+<listitem><para>This will cause the built-in &konsole; to <command>cd</command> into the directory of the active document when launched and when a new document gets the focus. If not enabled, you have to do all your navigation in the &konsole; on your own. </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><guibutton>Number of Recent Files</guibutton></term>
+<listitem><para>Unsurprisingly, this allows you to decide how long the <guimenu>Open Recent</guimenu> files menu should grow.</para></listitem>
</varlistentry>
</variablelist>
@@ -234,126 +115,83 @@ This group lets you choose between &kate; <acronym
</sect2>
<sect2 id="config-dialog-editor">
-<title
->The Editor Group</title>
-<para
->This group contains all pages related to the editor component of &kate;</para>
+<title>The Editor Group</title>
+<para>This group contains all pages related to the editor component of &kate;</para>
<sect3 id="config-dialog-editor-colors">
-<title
->The <guilabel
->Colours</guilabel
-> Page</title
-> <para
->This page allows you to change the background and selection background colours of the editor. Initially, &kate; will use the colours as set in the &kcontrolcenter; <menuchoice
-><guimenu
->Look'n'Feel</guimenu
-><guimenuitem
->Colours</guimenuitem
-> </menuchoice
-> page.</para>
-
-<para
->To change a colour, press the associated button and select the desired colour in the colour chooser.</para>
-
-<note
-><para
->Choosing the background colour may render Syntax Highlighted text unreadable. You should use a light colour for the background, and a dark colour for the selection background. </para>
-<para
->Otherwise, you will probably need to change the <link linkend="config-dialog-editor-highlight-default-styles"
->Default Styles</link
->.</para>
+<title>The <guilabel>Colours</guilabel> Page</title> <para>This page allows you to change the background and selection background colours of the editor. Initially, &kate; will use the colours as set in the &kcontrolcenter; <menuchoice><guimenu>Look'n'Feel</guimenu><guimenuitem>Colours</guimenuitem> </menuchoice> page.</para>
+
+<para>To change a colour, press the associated button and select the desired colour in the colour chooser.</para>
+
+<note><para>Choosing the background colour may render Syntax Highlighted text unreadable. You should use a light colour for the background, and a dark colour for the selection background. </para>
+<para>Otherwise, you will probably need to change the <link linkend="config-dialog-editor-highlight-default-styles">Default Styles</link>.</para>
</note>
</sect3>
<sect3 id="config-dialog-editor-fonts">
-<title
->The Fonts Page</title
-> <!-- FIXME LINKS //-->
+<title>The Fonts Page</title> <!-- FIXME LINKS //-->
-<para
->This page allows you to choose the default fonts for &kate;. The settings will be used for the &kwrite; and for viewing text files in &konqueror; as well.</para>
+<para>This page allows you to choose the default fonts for &kate;. The settings will be used for the &kwrite; and for viewing text files in &konqueror; as well.</para>
-<para
->The page presents two tabs, one for the editor font and one for the printing font. Select a tab and choose the desired font. The default is to use the &kde; global setting for fixed font.</para>
+<para>The page presents two tabs, one for the editor font and one for the printing font. Select a tab and choose the desired font. The default is to use the &kde; global setting for fixed font.</para>
-<tip
-><para
->As it is not currently possible to use individual fonts for documents, nor to change the font for printing from the print dialogue, be careful. A fixed-width font is strongly recommended. </para
-></tip>
+<tip><para>As it is not currently possible to use individual fonts for documents, nor to change the font for printing from the print dialogue, be careful. A fixed-width font is strongly recommended. </para></tip>
</sect3>
<sect3 id="config-dialog-editor-indent">
-<title
->The Indent Page</title>
-<para
->This page allows you to change the behaviour of indentation.</para>
+<title>The Indent Page</title>
+<para>This page allows you to change the behaviour of indentation.</para>
<variablelist>
-<title
->Indent Options</title>
+<title>Indent Options</title>
<varlistentry>
<term>
<anchor id="config-dialog-editor-indent-auto-indent"/>
-<guibutton
->Auto indent</guibutton>
+<guibutton>Auto indent</guibutton>
</term>
<listitem>
-<para
->If checked, &kate; will automatically indent new lines equal to the previous line. If the previous line is blank, the nearest above line with contents is used.</para>
+<para>If checked, &kate; will automatically indent new lines equal to the previous line. If the previous line is blank, the nearest above line with contents is used.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="config-dialog-editor-indent-indent-with-spaces"/>
-<guibutton
->Indent with Spaces</guibutton>
+<guibutton>Indent with Spaces</guibutton>
</term>
<listitem>
-<para
->If checked, &kate; will indent with spaces rather than tabs.</para>
+<para>If checked, &kate; will indent with spaces rather than tabs.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="config-dialog-editor-indent-backspace-key-indents"/>
-<guibutton
->Backspace key indents</guibutton>
+<guibutton>Backspace key indents</guibutton>
</term>
<listitem>
-<para
->If this is checked, &kate; will unindent equal to the nearest above line with contents when you press the <keycap
->Backspace</keycap
-> key if the part of the line preceding the cursor contains only whitespace.</para>
+<para>If this is checked, &kate; will unindent equal to the nearest above line with contents when you press the <keycap>Backspace</keycap> key if the part of the line preceding the cursor contains only whitespace.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="config-dialog-editor-indent-tab-key-indents"/>
-<guibutton
->Tab key indents</guibutton>
+<guibutton>Tab key indents</guibutton>
</term>
<listitem>
-<para
->If this is checked, &kate; will indent the current line equal to the nearest above line with content when you press the <keycap
->Tab</keycap
-> key, if the part of the line preceding the cursor contains only whitespace.</para>
+<para>If this is checked, &kate; will indent the current line equal to the nearest above line with content when you press the <keycap>Tab</keycap> key, if the part of the line preceding the cursor contains only whitespace.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="config-dialog-editor-indent-keep-extra-spaces"/>
-<guibutton
->Keep extra spaces</guibutton>
+<guibutton>Keep extra spaces</guibutton>
</term>
<listitem>
-<para
->With this behaviour checked, &kate; will leave whitespace behind the cursor after indenting.</para>
+<para>With this behaviour checked, &kate; will leave whitespace behind the cursor after indenting.</para>
</listitem>
</varlistentry>
@@ -362,42 +200,31 @@ This group lets you choose between &kate; <acronym
</sect3>
<sect3 id="config-dialog-editor-select">
-<title
->The Select Page</title>
+<title>The Select Page</title>
-<para
->This page provides options for fine tuning the select behaviour of &kate;</para>
+<para>This page provides options for fine tuning the select behaviour of &kate;</para>
<variablelist>
-<title
->Select Options</title>
+<title>Select Options</title>
<varlistentry>
<term>
<anchor id="config-dialog-editor-select-persistent-selections"/>
-<guibutton
->Persistent Selections</guibutton>
+<guibutton>Persistent Selections</guibutton>
</term>
<listitem>
-<para
->When Persistent Selections is enabled, key input will not cause the selection to be removed/diminished.</para
->
-<note
-><para
->This option partly conflicts with the Overwrite Selection option. If both are enabled, pasting text or pressing any other keys than the arrow keys will cause the selection to be overwritten.</para
-></note>
+<para>When Persistent Selections is enabled, key input will not cause the selection to be removed/diminished.</para>
+<note><para>This option partly conflicts with the Overwrite Selection option. If both are enabled, pasting text or pressing any other keys than the arrow keys will cause the selection to be overwritten.</para></note>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="config-dialog-editor-select-overwrite-selections"/>
-<guibutton
->Overwrite Selection</guibutton>
+<guibutton>Overwrite Selection</guibutton>
</term>
<listitem>
-<para
->If this is enabled, any text insertion, whether typed or pasted will cause the selected text to be deleted and replaced with the inserted text.</para>
+<para>If this is enabled, any text insertion, whether typed or pasted will cause the selected text to be deleted and replaced with the inserted text.</para>
</listitem>
</varlistentry>
@@ -405,12 +232,10 @@ This group lets you choose between &kate; <acronym
<varlistentry>
<term>
<anchor id="config-dialog-editor-select-mouse-autocopy"/>
-<guibutton
->Mouse Autocopy</guibutton>
+<guibutton>Mouse Autocopy</guibutton>
</term>
<listitem>
-<para
->If enabled, any text selected by moving the mouse with the left button pressed will
+<para>If enabled, any text selected by moving the mouse with the left button pressed will
be copied to the clipboard, ready for pasting.</para>
</listitem>
</varlistentry>
@@ -420,132 +245,81 @@ be copied to the clipboard, ready for pasting.</para>
</sect3>
<sect3 id="config-dialog-editor-edit">
-<title
->The Edit Page</title>
-<para
->This page contains miscellaneous options for fine-tuning the behaviour of the &kate; editor component.</para>
+<title>The Edit Page</title>
+<para>This page contains miscellaneous options for fine-tuning the behaviour of the &kate; editor component.</para>
<variablelist>
-<title
->Editor Options</title>
+<title>Editor Options</title>
<varlistentry>
<term>
<anchor id="config-dialog-editor-edit-word-wrap"/>
-<guibutton
->Word Wrap</guibutton>
+<guibutton>Word Wrap</guibutton>
</term>
<listitem>
-<para
->Word Wrap as used here means dynamically format the text by breaking lines at an appropriate place, rather than soft wrapping lines in the editor for easier reading.</para>
-<para
->If enabled, &kate; will insert a line break as defined by the <link linkend="document-end-of-line"
->End of Line</link
-> setting for the document when the line extends the length set in <link linkend="config-dialog-editor-edit-wrap-words-at"
->Wrap Words At</link
-> option described below.</para>
+<para>Word Wrap as used here means dynamically format the text by breaking lines at an appropriate place, rather than soft wrapping lines in the editor for easier reading.</para>
+<para>If enabled, &kate; will insert a line break as defined by the <link linkend="document-end-of-line">End of Line</link> setting for the document when the line extends the length set in <link linkend="config-dialog-editor-edit-wrap-words-at">Wrap Words At</link> option described below.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="config-dialog-editor-edit-wrap-words-at"/>
-<guibutton
->Wrap Words At</guibutton>
+<guibutton>Wrap Words At</guibutton>
</term>
<listitem>
-<para
->This option decides the max length of lines if the <link linkend="config-dialog-editor-edit-word-wrap"
->Word Wrap</link
-> option is enabled.</para>
+<para>This option decides the max length of lines if the <link linkend="config-dialog-editor-edit-word-wrap">Word Wrap</link> option is enabled.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="config-dialog-editor-edit-replace-tabs-with-spaces"/>
-<guibutton
->Replace Tabs with Spaces</guibutton>
+<guibutton>Replace Tabs with Spaces</guibutton>
</term>
<listitem>
-<para
->If enabled, &kate; will replace inserted <keycap
->Tab</keycap
-> characters with a number of single whitespace characters as defined in <link linkend="config-dialog-editor-edit-tab-indent-width"
->Tab Width</link
->.</para>
+<para>If enabled, &kate; will replace inserted <keycap>Tab</keycap> characters with a number of single whitespace characters as defined in <link linkend="config-dialog-editor-edit-tab-indent-width">Tab Width</link>.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="config-dialog-editor-edit-remove-trailing-spaces"/>
-<guibutton
->Remove trailing spaces</guibutton>
+<guibutton>Remove trailing spaces</guibutton>
</term>
<listitem>
-<para
->If enabled, &kate; will remove any whitespace at the rear end of a line each time the cursor is moved off that line.</para>
+<para>If enabled, &kate; will remove any whitespace at the rear end of a line each time the cursor is moved off that line.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="config-dialog-editor-edit-tab-indent-width"/>
-<guibutton
->Tab/Indent Width</guibutton>
+<guibutton>Tab/Indent Width</guibutton>
</term>
<listitem>
-<para
->Sets the tab width, which is also used to decide the amount of indentation when <link linkend="config-dialog-editor-indent-auto-indent"
->Auto Indent</link
-> is enabled, or indentation is otherwise called for.</para>
-<para
->Depending on the <link linkend="config-dialog-editor-indent"
->Indent</link
-> settings indentation may be caused by pressing the <keycap
->Tab</keycap
-> and <keycap
->Backspace</keycap
-> keys, and activating the <link linkend="edit-indent"
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Indent</guimenuitem
-></link
-> menu entry will call for indent as well.</para>
+<para>Sets the tab width, which is also used to decide the amount of indentation when <link linkend="config-dialog-editor-indent-auto-indent">Auto Indent</link> is enabled, or indentation is otherwise called for.</para>
+<para>Depending on the <link linkend="config-dialog-editor-indent">Indent</link> settings indentation may be caused by pressing the <keycap>Tab</keycap> and <keycap>Backspace</keycap> keys, and activating the <link linkend="edit-indent"><guimenu>Edit</guimenu> <guimenuitem>Indent</guimenuitem></link> menu entry will call for indent as well.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="config-dialog-editor-edit-auto-brackets"/>
-<guibutton
->Auto Brackets</guibutton>
+<guibutton>Auto Brackets</guibutton>
</term>
<listitem>
-<para
->If this is enabled, &kate; will automatically insert a right bracket immediately to the right of the cursor when a left bracket is inserted from the keyboard. The supported bracket types are <keycap
->(</keycap
->, <keycap
->{</keycap
->, <keycap
->[</keycap
->and <keycap
->&lt;</keycap
-></para>
+<para>If this is enabled, &kate; will automatically insert a right bracket immediately to the right of the cursor when a left bracket is inserted from the keyboard. The supported bracket types are <keycap>(</keycap>, <keycap>{</keycap>, <keycap>[</keycap>and <keycap>&lt;</keycap></para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="config-dialog-editor-edit-group-undos"/>
-<guibutton
->Group undos</guibutton>
+<guibutton>Group undos</guibutton>
</term>
<listitem>
-<para
->If enabled, &kate; will group any number of similar editing actions (for example typing, backspacing, pasting) in one entry in the undo history, so they can all be undone at once.</para>
+<para>If enabled, &kate; will group any number of similar editing actions (for example typing, backspacing, pasting) in one entry in the undo history, so they can all be undone at once.</para>
</listitem>
</varlistentry>
@@ -553,28 +327,20 @@ be copied to the clipboard, ready for pasting.</para>
<varlistentry>
<term>
<anchor id="config-dialog-editor-edit-show-tabs"/>
-<guibutton
->Show Tabs</guibutton>
+<guibutton>Show Tabs</guibutton>
</term>
<listitem>
-<para
->If enabled, &kate; will draw a small dot at the start of a <keycap
->Tab</keycap
-> character in the editor to indicate its presence.</para>
+<para>If enabled, &kate; will draw a small dot at the start of a <keycap>Tab</keycap> character in the editor to indicate its presence.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="config-dialog-editor-edit-smart-home"/>
-<guibutton
->Smart Home</guibutton>
+<guibutton>Smart Home</guibutton>
</term>
<listitem>
-<para
->This will make &kate; move the cursor to the first non-whitespace character of the current line rather than to the absolute beginning, when the <keycap
->Home</keycap
-> key (or other key assigned to that function) is pressed.</para>
+<para>This will make &kate; move the cursor to the first non-whitespace character of the current line rather than to the absolute beginning, when the <keycap>Home</keycap> key (or other key assigned to that function) is pressed.</para>
</listitem>
</varlistentry>
@@ -582,17 +348,11 @@ be copied to the clipboard, ready for pasting.</para>
<varlistentry>
<term>
<anchor id="config-dialog-editor-edit-page-up-down-moves-cursor"/>
-<guibutton
->Page Up/Down moves cursor</guibutton>
+<guibutton>Page Up/Down moves cursor</guibutton>
</term>
<listitem>
-<para
->If enabled, the cursor will be moved to the first/last visible
-line when <keycap
->Page Up</keycap
->/<keycap
->Page Down</keycap
-> (or
+<para>If enabled, the cursor will be moved to the first/last visible
+line when <keycap>Page Up</keycap>/<keycap>Page Down</keycap> (or
other key assigned to those functions) is pressed, rather than being
kept at its relative position.</para>
</listitem>
@@ -601,15 +361,11 @@ kept at its relative position.</para>
<varlistentry>
<term>
<anchor id="config-dialog-editor-edit-wrap-cursor"/>
-<guibutton
->Wrap Cursor</guibutton>
+<guibutton>Wrap Cursor</guibutton>
</term>
<listitem>
-<para
->If enabled, moving the cursor past the end of a line will cause it to continue to the next/previous line if any.</para>
-<para
->If not enabled, the cursor cannot be moved right of the beginning of the line, but it may be moved past the end of line, and when text is inserted &kate; will automatically insert whitespace up to that position. This is sometimes very handy for programmers, for example.</para
->
+<para>If enabled, moving the cursor past the end of a line will cause it to continue to the next/previous line if any.</para>
+<para>If not enabled, the cursor cannot be moved right of the beginning of the line, but it may be moved past the end of line, and when text is inserted &kate; will automatically insert whitespace up to that position. This is sometimes very handy for programmers, for example.</para>
</listitem>
</varlistentry>
@@ -618,58 +374,34 @@ kept at its relative position.</para>
</sect3>
<sect3 id="config-dialog-editor-keyboard">
-<title
->The Keyboard Page</title>
+<title>The Keyboard Page</title>
-<para
->Here you can configure the keyboard shortcuts for the internal commands of the &kate; editor component. These includes commands for moving around in the document and selecting text. For keys related to copying and pasting text, see The Configure Keys Dialogue </para>
+<para>Here you can configure the keyboard shortcuts for the internal commands of the &kate; editor component. These includes commands for moving around in the document and selecting text. For keys related to copying and pasting text, see The Configure Keys Dialogue </para>
-<para
->You may change the keys for a command, or add an alternate key.</para>
+<para>You may change the keys for a command, or add an alternate key.</para>
<procedure>
-<title
->To change the key(s) for a command, follow this procedure:</title>
+<title>To change the key(s) for a command, follow this procedure:</title>
<step>
-<para
->Select the command for which you want to configure the keys.</para>
+<para>Select the command for which you want to configure the keys.</para>
</step>
<step>
-<para
->Choose the <guibutton
->None</guibutton
-> option in the pane below the list if you don't want a key for this command.</para>
-<para
->Choose the <guibutton
->Default</guibutton
-> option to use the default key(s) for the command</para>
-<para
->Choose the <guibutton
->Custom</guibutton
-> option to select a custom key for the command, or set an alternate one.</para>
+<para>Choose the <guibutton>None</guibutton> option in the pane below the list if you don't want a key for this command.</para>
+<para>Choose the <guibutton>Default</guibutton> option to use the default key(s) for the command</para>
+<para>Choose the <guibutton>Custom</guibutton> option to select a custom key for the command, or set an alternate one.</para>
</step>
<step>
-<para
->If you choose the <guibutton
->Custom</guibutton
-> option, the key entering button at the right of the pane will be enabled. To set a key, press it. The &kde; Define Shortcut Dialogue will appear. In this dialogue:</para>
+<para>If you choose the <guibutton>Custom</guibutton> option, the key entering button at the right of the pane will be enabled. To set a key, press it. The &kde; Define Shortcut Dialogue will appear. In this dialogue:</para>
</step>
<step>
<procedure>
<step>
-<para
->Choose whether to set the default or alternate key. <guilabel
->Default</guilabel
-> does not mean that you change the application default for this action, rather it sets the custom standard key for it.</para>
+<para>Choose whether to set the default or alternate key. <guilabel>Default</guilabel> does not mean that you change the application default for this action, rather it sets the custom standard key for it.</para>
</step>
<step>
-<para
->Press the desired key sequence, it will be visualised for you in the dialogue for your confirmation. </para>
+<para>Press the desired key sequence, it will be visualised for you in the dialogue for your confirmation. </para>
-<para
->If you are of an adventurous nature, try playing around with the <guibutton
->Multikey</guibutton
-> option. Using it will allow you to have &Emacs;-like key sequences (one key enters a group, the next performs the action), apart from the fact that instead of just doing the job, &kde; will pop up a menu to choose from in an undefined and most likely inappropriate place. You will now be in no doubt as to whether pressing the next key in the sequence will work, or you have to type the menu accelerator (both will work).</para>
+<para>If you are of an adventurous nature, try playing around with the <guibutton>Multikey</guibutton> option. Using it will allow you to have &Emacs;-like key sequences (one key enters a group, the next performs the action), apart from the fact that instead of just doing the job, &kde; will pop up a menu to choose from in an undefined and most likely inappropriate place. You will now be in no doubt as to whether pressing the next key in the sequence will work, or you have to type the menu accelerator (both will work).</para>
</step>
</procedure>
</step>
@@ -677,142 +409,77 @@ kept at its relative position.</para>
</sect3>
<sect3 id="config-dialog-editor-spelling">
-<title
->The Spelling Page</title>
-<para
->This page allows you to configure how &tdespell; behaves with &kate;</para>
+<title>The Spelling Page</title>
+<para>This page allows you to configure how &tdespell; behaves with &kate;</para>
</sect3>
<sect3 id="config-dialog-editor-hl">
-<title
->The Highlighting Page</title>
+<title>The Highlighting Page</title>
-<para
->This page allows you to fine tune the colour and syntax type selection of &kate;</para>
+<para>This page allows you to fine tune the colour and syntax type selection of &kate;</para>
<para>
<mediaobject>
-<imageobject
-><imagedata format="PNG" fileref="configdialog02.png"/></imageobject>
+<imageobject><imagedata format="PNG" fileref="configdialog02.png"/></imageobject>
</mediaobject>
</para>
-<para
->For more in depth information on the syntax highlighting system, see ??</para>
+<para>For more in depth information on the syntax highlighting system, see ??</para>
-<para
->The page consists of two tabs, one for setting the <guibutton
->Default styles</guibutton
-> and one for managing the <guibutton
->Highlight Modes</guibutton
->. Both tabs display a list of contexts in which the default colours and font are used to visualise the look of each style. The context name is painted using the current properties of the context.</para>
+<para>The page consists of two tabs, one for setting the <guibutton>Default styles</guibutton> and one for managing the <guibutton>Highlight Modes</guibutton>. Both tabs display a list of contexts in which the default colours and font are used to visualise the look of each style. The context name is painted using the current properties of the context.</para>
-<para
->The list has four or five columns, each with the following purpose:</para>
+<para>The list has four or five columns, each with the following purpose:</para>
<variablelist>
<varlistentry>
-<term
->Context</term>
-<listitem
-><para
->Displays the context name, painted using the style properties for the context.</para
-></listitem>
+<term>Context</term>
+<listitem><para>Displays the context name, painted using the style properties for the context.</para></listitem>
</varlistentry>
<varlistentry>
-<term
->Bold</term>
-<listitem
-><para
->The state of this checkbox decides if the context should be rendered using a boldface font.</para
-></listitem>
+<term>Bold</term>
+<listitem><para>The state of this checkbox decides if the context should be rendered using a boldface font.</para></listitem>
</varlistentry>
<varlistentry>
-<term
->Italic</term>
-<listitem
-><para
->The state of this checkbox decides if the context should be rendered using italic font.</para
-></listitem>
+<term>Italic</term>
+<listitem><para>The state of this checkbox decides if the context should be rendered using italic font.</para></listitem>
</varlistentry>
<varlistentry>
-<term
->Normal</term>
-<listitem
-><para
->This button displays the colour for drawing the style in normal mode, when the text is not selected that is. To change the colour, click the button.</para
-></listitem>
+<term>Normal</term>
+<listitem><para>This button displays the colour for drawing the style in normal mode, when the text is not selected that is. To change the colour, click the button.</para></listitem>
</varlistentry>
<varlistentry>
-<term
->Selected</term>
-<listitem
-><para
->This button displays the colour for drawing the style when the text is selected. To change the colour, click the button.</para
-></listitem>
+<term>Selected</term>
+<listitem><para>This button displays the colour for drawing the style when the text is selected. To change the colour, click the button.</para></listitem>
</varlistentry>
<varlistentry>
-<term
->Using Default</term>
-<listitem
-><para
->This checkbox, only available in the <guibutton
->Highlight Modes</guibutton
-> tab shows if the style is using its default values. It will automatically become unchecked if you change any properties of the style. Check it to reset a style to using defaults.</para
-></listitem
->
+<term>Using Default</term>
+<listitem><para>This checkbox, only available in the <guibutton>Highlight Modes</guibutton> tab shows if the style is using its default values. It will automatically become unchecked if you change any properties of the style. Check it to reset a style to using defaults.</para></listitem>
</varlistentry>
</variablelist>
<sect4 id="config-dialog-editor-highlight-default-styles">
-<title
->The Default Styles Tab</title>
-<para
->To change any of the default styles, set its properties as desired.</para>
+<title>The Default Styles Tab</title>
+<para>To change any of the default styles, set its properties as desired.</para>
</sect4>
<sect4 id="config-dialog-editor-highlight-highlight-modes">
-<title
->The Highlight Modes Tab</title
->
-
-<para
-><indexterm
-><primary
->syntax highlighting, configuring</primary
-></indexterm
-> Here you can change the most important properties of each available highlight mode. First, use the <guibutton
->Highlight</guibutton
-> dropdown to choose a mode to work on.</para
-> <para
->Highlight modes are initially chosen based on the &MIME; type and extension of the file. To change the list for the current selection, edit the <guibutton
->File Extensions</guibutton
-> and <guibutton
->Mime Types</guibutton
-> entries. Alternatively, press the wizard button to the right of the <guibutton
->Mime Types</guibutton
-> entry. This will show a dialogue displaying all available &MIME; types to choose from. Using it will edit the &MIME; types as well as the file extensions.</para>
+<title>The Highlight Modes Tab</title>
+
+<para><indexterm><primary>syntax highlighting, configuring</primary></indexterm> Here you can change the most important properties of each available highlight mode. First, use the <guibutton>Highlight</guibutton> dropdown to choose a mode to work on.</para> <para>Highlight modes are initially chosen based on the &MIME; type and extension of the file. To change the list for the current selection, edit the <guibutton>File Extensions</guibutton> and <guibutton>Mime Types</guibutton> entries. Alternatively, press the wizard button to the right of the <guibutton>Mime Types</guibutton> entry. This will show a dialogue displaying all available &MIME; types to choose from. Using it will edit the &MIME; types as well as the file extensions.</para>
<mediaobject>
-<imageobject
-><imagedata format="PNG" fileref="mimetypechooser.png"/></imageobject>
+<imageobject><imagedata format="PNG" fileref="mimetypechooser.png"/></imageobject>
</mediaobject>
-<para
->The &MIME; type chooser dialogue displays a tree of available &MIME; types, with a description and the patterns for the &MIME; type. To include a &MIME; type, check the box beside it. </para>
+<para>The &MIME; type chooser dialogue displays a tree of available &MIME; types, with a description and the patterns for the &MIME; type. To include a &MIME; type, check the box beside it. </para>
-<para
->You can change the style properties of any context as described above.</para
->
+<para>You can change the style properties of any context as described above.</para>
-<para
->At the bottom of the tab, below the highlight properties, you see a button labelled <guibutton
->Download</guibutton
->. Pressing it will attempt to connect to the &kate; website and fetch a list of available syntax highlight modes which you can update or add.</para>
+<para>At the bottom of the tab, below the highlight properties, you see a button labelled <guibutton>Download</guibutton>. Pressing it will attempt to connect to the &kate; website and fetch a list of available syntax highlight modes which you can update or add.</para>
</sect4>
@@ -821,41 +488,20 @@ kept at its relative position.</para>
</sect2>
<sect2 id="config-dialog-plugins">
-<title
->The Plugins Group</title
->
+<title>The Plugins Group</title>
-<para
-><indexterm
-><primary
->plugins, configuring</primary
-></indexterm
-> This group contains pages related to plugins. Apart from the Manager configuration page, some plugins provide individual configuration options. For information on these, see the documentation for the individual plugins.</para>
+<para><indexterm><primary>plugins, configuring</primary></indexterm> This group contains pages related to plugins. Apart from the Manager configuration page, some plugins provide individual configuration options. For information on these, see the documentation for the individual plugins.</para>
<sect3 id="config-dialog-plugins-manager">
-<title
->The Plugin Manager Page</title
->
-
-<para
->This page provides the means of loading/unloading plugins, and minimal information about individual plugins.</para>
-
-<para
->To load an unloaded plugin, select it in the <guibutton
->Available Plugins</guibutton
-> pane and use the arrow buttons to move it to the <guibutton
->Loaded Plugins</guibutton
-> pane.</para>
-
-<para
->To unload a loaded plugin, select it in the <guibutton
->Loaded Plugins</guibutton
-> pane and use the arrow buttons to move it to the <guibutton
->Available buttons</guibutton
-> pane.</para>
-
-<para
->To view a minimal description and information about a plugin, select it and the information will be available below the lists.</para>
+<title>The Plugin Manager Page</title>
+
+<para>This page provides the means of loading/unloading plugins, and minimal information about individual plugins.</para>
+
+<para>To load an unloaded plugin, select it in the <guibutton>Available Plugins</guibutton> pane and use the arrow buttons to move it to the <guibutton>Loaded Plugins</guibutton> pane.</para>
+
+<para>To unload a loaded plugin, select it in the <guibutton>Loaded Plugins</guibutton> pane and use the arrow buttons to move it to the <guibutton>Available buttons</guibutton> pane.</para>
+
+<para>To view a minimal description and information about a plugin, select it and the information will be available below the lists.</para>
</sect3>
</sect2>
diff --git a/tde-i18n-en_GB/docs/tdebase/kate/fundamentals.docbook b/tde-i18n-en_GB/docs/tdebase/kate/fundamentals.docbook
index bf0979d4aa6..a73127b55e1 100644
--- a/tde-i18n-en_GB/docs/tdebase/kate/fundamentals.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kate/fundamentals.docbook
@@ -1,226 +1,95 @@
<chapter id="fundamentals">
<chapterinfo>
<authorgroup>
-<author
-><personname
-><firstname
-></firstname
-></personname
-></author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
->
+<author><personname><firstname></firstname></personname></author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>[email protected]</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit>
</authorgroup>
</chapterinfo>
-<title
->The Fundamentals</title>
+<title>The Fundamentals</title>
-<para
->If you have ever used a text editor, you will have no problem using &kate;. In the next two sections, <link linkend="starting-kate"
->Starting &kate; </link
-> and in <link linkend="working-with-kate"
->Working with &kate;</link
->, we'll show you everything you need to get up and running quickly. </para>
+<para>If you have ever used a text editor, you will have no problem using &kate;. In the next two sections, <link linkend="starting-kate">Starting &kate; </link> and in <link linkend="working-with-kate">Working with &kate;</link>, we'll show you everything you need to get up and running quickly. </para>
<sect1 id="starting-kate">
-<title
->Starting &kate;</title>
+<title>Starting &kate;</title>
-<para
->You can start &kate; from the <guimenu
->TDE menu</guimenu
-> or from the command line. </para>
+<para>You can start &kate; from the <guimenu>TDE menu</guimenu> or from the command line. </para>
<sect2 id="starting-from-the-menu">
-<title
->From the Menu</title>
-<para
->Open the &kde; program menu by clicking on the <guiicon
->big K</guiicon
-> icon on the toolbar at the bottom left of your screen. This will raise the <guimenu
->program menu</guimenu
->. Move your cursor up the menu to the <guimenu
->Editors</guimenu
-> menu item. A list of available editors will appear. Choose <guimenuitem
->&kate;</guimenuitem
->. </para>
-
-<para
->Unless you configure &kate; not to, it will load the last files you edited. See <link linkend="configure"
->Configuring &kate;</link
-> to learn how to toggle this feature on and off. </para>
+<title>From the Menu</title>
+<para>Open the &kde; program menu by clicking on the <guiicon>big K</guiicon> icon on the toolbar at the bottom left of your screen. This will raise the <guimenu>program menu</guimenu>. Move your cursor up the menu to the <guimenu>Editors</guimenu> menu item. A list of available editors will appear. Choose <guimenuitem>&kate;</guimenuitem>. </para>
+
+<para>Unless you configure &kate; not to, it will load the last files you edited. See <link linkend="configure">Configuring &kate;</link> to learn how to toggle this feature on and off. </para>
</sect2>
<sect2 id="starting-from-the-command-line">
-<title
->From the Command Line</title>
+<title>From the Command Line</title>
-<para
->You can start &kate; by typing its name on the command line. If you give it a file name, as in the example below, it will open or create that file. </para>
+<para>You can start &kate; by typing its name on the command line. If you give it a file name, as in the example below, it will open or create that file. </para>
<informalexample>
-<screen
-><prompt
->%</prompt
-><userinput
-><command
->kate</command
-> <option
-><replaceable
->myfile.txt</replaceable
-></option
-></userinput
->
+<screen><prompt>%</prompt><userinput><command>kate</command> <option><replaceable>myfile.txt</replaceable></option></userinput>
</screen>
</informalexample>
-<para
->If you have an active connection, and permission, you can take advantage of &kde;'s network transparency to open files on the internet. </para>
+<para>If you have an active connection, and permission, you can take advantage of &kde;'s network transparency to open files on the internet. </para>
<informalexample>
-<screen
-><prompt
->%</prompt
-><userinput
-><command
->kate</command
-> <option
-><replaceable
->ftp://ftp.kde.org/pub/kde/README_FIRST</replaceable
-></option
-></userinput
->
+<screen><prompt>%</prompt><userinput><command>kate</command> <option><replaceable>ftp://ftp.kde.org/pub/kde/README_FIRST</replaceable></option></userinput>
</screen>
</informalexample>
<sect3 id="command-line-options">
-<title
->Command Line Options</title>
-<para
->&kate; accepts following command line options:</para>
+<title>Command Line Options</title>
+<para>&kate; accepts following command line options:</para>
<variablelist>
<varlistentry>
-<term
-><userinput
-><command
->kate</command
-> <option
->--help</option
-></userinput
-></term>
+<term><userinput><command>kate</command> <option>--help</option></userinput></term>
<listitem>
-<para
->This lists the most basic options available at the command line. </para>
+<para>This lists the most basic options available at the command line. </para>
</listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
-><command
->kate</command
-> <option
->--help-qt</option
-></userinput
-></term>
+<term><userinput><command>kate</command> <option>--help-qt</option></userinput></term>
<listitem>
-<para
->This lists the options available for changing the way &kate; interacts with &Qt;. </para>
+<para>This lists the options available for changing the way &kate; interacts with &Qt;. </para>
</listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
-><command
->kate</command
-> <option
->--help-kde</option
-></userinput
-></term>
+<term><userinput><command>kate</command> <option>--help-kde</option></userinput></term>
<listitem>
-<para
->This lists the options available for changing the way &kate; interacts with &kde;. </para>
+<para>This lists the options available for changing the way &kate; interacts with &kde;. </para>
</listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
-><command
->kate</command
-> <option
->--help-all</option
-></userinput
-></term>
+<term><userinput><command>kate</command> <option>--help-all</option></userinput></term>
<listitem>
-<para
->This lists all of the command line options. </para>
+<para>This lists all of the command line options. </para>
</listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
-><command
->kate</command
-> <option
->--author</option
-></userinput
-></term>
+<term><userinput><command>kate</command> <option>--author</option></userinput></term>
<listitem>
-<para
->Lists &kate;'s authors in the terminal window. </para>
+<para>Lists &kate;'s authors in the terminal window. </para>
</listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
-><command
->kate</command
-> <option
->--version</option
-></userinput
-></term>
+<term><userinput><command>kate</command> <option>--version</option></userinput></term>
<listitem>
-<para
->Lists version information for &Qt;, &kde;, and &kate;. Also available through <userinput
-><command
->kate</command
-> <option
->-V</option
-></userinput
-> </para>
+<para>Lists version information for &Qt;, &kde;, and &kate;. Also available through <userinput><command>kate</command> <option>-V</option></userinput> </para>
</listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
-><command
->kate</command
-> <option
->--license</option
-></userinput
-></term>
+<term><userinput><command>kate</command> <option>--license</option></userinput></term>
<listitem>
-<para
->Shows licence information. </para>
+<para>Shows licence information. </para>
</listitem>
</varlistentry>
</variablelist>
@@ -228,529 +97,189 @@
</sect2>
<sect2 id="drag-and-drop">
-<title
->Drag and Drop</title>
-<para
->&kate; uses the &kde; Drag and Drop protocol. Files may be dragged and dropped onto &kate; from the Desktop, &konqueror; or some remote ftp site opened in one of &konqueror;'s windows. </para>
+<title>Drag and Drop</title>
+<para>&kate; uses the &kde; Drag and Drop protocol. Files may be dragged and dropped onto &kate; from the Desktop, &konqueror; or some remote ftp site opened in one of &konqueror;'s windows. </para>
</sect2>
</sect1>
<sect1 id="working-with-kate">
-<title
->Working with &kate;</title>
-<para
-><link linkend="quick-start"
->Quick Start</link
-> will show you how to toggle four simple options that will let you configure some of &kate;'s more powerful features right away. <link linkend="keystroke-commands"
-> Keystroke Commands</link
-> lays out some of the default keystroke shortcuts for those who can't or don't want to use a mouse. </para>
+<title>Working with &kate;</title>
+<para><link linkend="quick-start">Quick Start</link> will show you how to toggle four simple options that will let you configure some of &kate;'s more powerful features right away. <link linkend="keystroke-commands"> Keystroke Commands</link> lays out some of the default keystroke shortcuts for those who can't or don't want to use a mouse. </para>
<sect2 id="quick-start">
-<title
->Quick Start</title>
+<title>Quick Start</title>
-<para
->This section will describe some of the items on the <guimenu
->Settings</guimenu
-> menu so that you can quickly configure &kate; to work the way you want it. </para>
+<para>This section will describe some of the items on the <guimenu>Settings</guimenu> menu so that you can quickly configure &kate; to work the way you want it. </para>
-<para
->When you start &kate; for the first time you'll see two windows with white backgrounds. Above the two windows is a toolbar with the usual labelled icons. And above that, a menu bar. </para>
+<para>When you start &kate; for the first time you'll see two windows with white backgrounds. Above the two windows is a toolbar with the usual labelled icons. And above that, a menu bar. </para>
-<para
->The left-hand window is a dockable side bar. It combines the Filelist and Fileselector windows. Switch between the two by clicking on the tabs at the top of the window. </para>
+<para>The left-hand window is a dockable side bar. It combines the Filelist and Fileselector windows. Switch between the two by clicking on the tabs at the top of the window. </para>
-<para
->If you've started &kate; with a file, the right-hand window will show the file you are editing and the Filelist on the side bar will show the name of the file. Use the Fileselector window to open files. </para>
+<para>If you've started &kate; with a file, the right-hand window will show the file you are editing and the Filelist on the side bar will show the name of the file. Use the Fileselector window to open files. </para>
-<para
->You can toggle the Filelist and Fileselector window on and off in <guimenu
->Settings</guimenu
-> menu. This menu offers you your first glimpse into &kate;'s power and flexibility. In this section we'll look at four items: </para>
+<para>You can toggle the Filelist and Fileselector window on and off in <guimenu>Settings</guimenu> menu. This menu offers you your first glimpse into &kate;'s power and flexibility. In this section we'll look at four items: </para>
<variablelist>
<varlistentry>
-<term
-><menuchoice
-><guimenuitem
->Show Toolbar</guimenuitem
-></menuchoice
-></term>
+<term><menuchoice><guimenuitem>Show Toolbar</guimenuitem></menuchoice></term>
<listitem>
-<para
->Toggles the toolbar on and off. </para>
+<para>Toggles the toolbar on and off. </para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<menuchoice>
-<guimenuitem
->Show Filelist</guimenuitem>
+<guimenuitem>Show Filelist</guimenuitem>
</menuchoice>
</term>
<listitem>
-<para
->Toggles the Filelist on and off. If the Filelist/Fileselector window is not open, &kate; launches the side bar as a separate, undocked, window. To dock the window grab the two thin parallel lines above the tabs by clicking on them with your &LMB; and holding the button down. Drag the the window into &kate;'s editing window and release the &LMB; when you have positioned the Filelist/Fileselector window as you prefer. </para>
+<para>Toggles the Filelist on and off. If the Filelist/Fileselector window is not open, &kate; launches the side bar as a separate, undocked, window. To dock the window grab the two thin parallel lines above the tabs by clicking on them with your &LMB; and holding the button down. Drag the the window into &kate;'s editing window and release the &LMB; when you have positioned the Filelist/Fileselector window as you prefer. </para>
<tip>
-<para
->If you have grabbed the two parallel lines successfully your mouse pointer will turn into two crossed arrows as you drag. </para>
+<para>If you have grabbed the two parallel lines successfully your mouse pointer will turn into two crossed arrows as you drag. </para>
</tip>
</listitem>
</varlistentry>
<varlistentry>
-<term
-><menuchoice
-><guimenuitem
->Show Fileselector</guimenuitem
-></menuchoice
-></term>
+<term><menuchoice><guimenuitem>Show Fileselector</guimenuitem></menuchoice></term>
<listitem>
-<para
->Toggles the Fileselector on and off. This menu item is the same as <guimenuitem
->Show Filelist</guimenuitem
-> with one difference. Toggling it on launches the window with the Fileselector on top. </para>
+<para>Toggles the Fileselector on and off. This menu item is the same as <guimenuitem>Show Filelist</guimenuitem> with one difference. Toggling it on launches the window with the Fileselector on top. </para>
</listitem>
</varlistentry>
<varlistentry>
-<term
-><menuchoice
-><guimenuitem
->Show Console</guimenuitem
-></menuchoice
-></term>
+<term><menuchoice><guimenuitem>Show Console</guimenuitem></menuchoice></term>
<listitem>
-<para
->Toggles a console emulator on and off at the bottom of &kate;'s window. In other words, it gives you a command line within the application. </para>
+<para>Toggles a console emulator on and off at the bottom of &kate;'s window. In other words, it gives you a command line within the application. </para>
</listitem>
</varlistentry>
</variablelist>
</sect2>
<sect2 id="keystroke-commands">
-<title
->Keystroke Commands</title>
+<title>Keystroke Commands</title>
-<para
->Many of &kate;'s keystroke commands (shortcuts) are configurable by way of the <link linkend="settings"
->Settings</link
-> menu. By default &kate; honours the following key bindings. </para>
+<para>Many of &kate;'s keystroke commands (shortcuts) are configurable by way of the <link linkend="settings">Settings</link> menu. By default &kate; honours the following key bindings. </para>
<informaltable>
<tgroup cols="2">
<tbody>
-<row
-><entry
-><para
-><keycap
->Insert</keycap
-></para
-></entry>
-<entry
-><para
->Toggle between Insert and Overwrite mode. When in insert mode the editor will add any typed characters to the text and push any previously typed data to the right of the text cursor. Overwrite mode causes the entry of each character to eliminate the character immediately to the right of the text cursor.</para
-></entry>
+<row><entry><para><keycap>Insert</keycap></para></entry>
+<entry><para>Toggle between Insert and Overwrite mode. When in insert mode the editor will add any typed characters to the text and push any previously typed data to the right of the text cursor. Overwrite mode causes the entry of each character to eliminate the character immediately to the right of the text cursor.</para></entry>
</row>
<row>
-<entry
-><para
-><keycombo
-><keycap
->Left Arrow</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Move the cursor one character to the left </para
-></entry>
+<entry><para><keycombo><keycap>Left Arrow</keycap></keycombo></para></entry>
+<entry><para>Move the cursor one character to the left </para></entry>
</row>
<row>
-<entry
-><para
-><keycombo
-><keycap
->Right Arrow</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Move the cursor one character to the right </para
-></entry>
+<entry><para><keycombo><keycap>Right Arrow</keycap></keycombo></para></entry>
+<entry><para>Move the cursor one character to the right </para></entry>
</row>
<row>
-<entry
-><para
-><keycombo action="simul"
-><keycap
->Up Arrow</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Move the cursor up one line </para
-></entry>
+<entry><para><keycombo action="simul"><keycap>Up Arrow</keycap></keycombo></para></entry>
+<entry><para>Move the cursor up one line </para></entry>
</row>
<row>
-<entry
-><para
-><keycombo action="simul"
-><keycap
->Down Arrow</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Move the cursor down one line </para
-></entry>
+<entry><para><keycombo action="simul"><keycap>Down Arrow</keycap></keycombo></para></entry>
+<entry><para>Move the cursor down one line </para></entry>
</row>
<row>
-<entry
-><para
-><keycombo action="simul"
-><keycap
->Page Up</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Move the cursor up one page </para
-></entry>
+<entry><para><keycombo action="simul"><keycap>Page Up</keycap></keycombo></para></entry>
+<entry><para>Move the cursor up one page </para></entry>
</row>
<row>
-<entry
-><para
-><keycombo action="simul"
-><keycap
->Page Down</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Move the cursor down one page </para
-></entry>
+<entry><para><keycombo action="simul"><keycap>Page Down</keycap></keycombo></para></entry>
+<entry><para>Move the cursor down one page </para></entry>
</row>
<row>
-<entry
-><para
-><keycombo action="simul"
-><keycap
->Backspace</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Delete the character to the left of the cursor </para
-></entry>
+<entry><para><keycombo action="simul"><keycap>Backspace</keycap></keycombo></para></entry>
+<entry><para>Delete the character to the left of the cursor </para></entry>
</row>
<row>
-<entry
-><para
-><keycombo action="simul"
-><keycap
->Home</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Move the cursor to the beginning of the line </para
-></entry>
+<entry><para><keycombo action="simul"><keycap>Home</keycap></keycombo></para></entry>
+<entry><para>Move the cursor to the beginning of the line </para></entry>
</row>
<row>
-<entry
-><para
-><keycombo action="simul"
-><keycap
->End</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Move the cursor to the end of the line </para
-></entry>
+<entry><para><keycombo action="simul"><keycap>End</keycap></keycombo></para></entry>
+<entry><para>Move the cursor to the end of the line </para></entry>
</row>
<row>
-<entry
-><para
-><keycombo action="simul"
-><keycap
->Delete</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Delete the character to the right of the cursor (or any selected text)</para
-></entry>
+<entry><para><keycombo action="simul"><keycap>Delete</keycap></keycombo></para></entry>
+<entry><para>Delete the character to the right of the cursor (or any selected text)</para></entry>
</row>
<row>
-<entry
-><para
-><keycombo action="simul"
->&Shift;<keycap
->Left Arrow</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Mark text one character to the left </para
-></entry>
+<entry><para><keycombo action="simul">&Shift;<keycap>Left Arrow</keycap></keycombo></para></entry>
+<entry><para>Mark text one character to the left </para></entry>
</row>
<row>
-<entry
-><para
-><keycombo action="simul"
->&Shift;<keycap
->Right Arrow</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Mark text one character to the right </para
-></entry>
+<entry><para><keycombo action="simul">&Shift;<keycap>Right Arrow</keycap></keycombo></para></entry>
+<entry><para>Mark text one character to the right </para></entry>
</row>
<row>
-<entry
-><para
-><keycombo action="simul"
-><keycap
->F1</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Help</para
-></entry>
+<entry><para><keycombo action="simul"><keycap>F1</keycap></keycombo></para></entry>
+<entry><para>Help</para></entry>
</row>
<row>
-<entry
-><para
-><keycombo action="simul"
->&Shift;<keycap
->F1</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
-><link linkend="whats-this"
->What's this?</link
-></para
-></entry>
+<entry><para><keycombo action="simul">&Shift;<keycap>F1</keycap></keycombo></para></entry>
+<entry><para><link linkend="whats-this">What's this?</link></para></entry>
</row>
<row>
-<entry
-><para
-><keycombo action="simul"
->&Ctrl;<keycap
->F</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
-><link linkend="find"
->Find</link
-></para
-></entry>
+<entry><para><keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo></para></entry>
+<entry><para><link linkend="find">Find</link></para></entry>
</row>
<row>
-<entry
-><para
-><keycombo action="simul"
-><keycap
->F3</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
-><link linkend="find-again"
->Find again</link
-></para
-></entry>
+<entry><para><keycombo action="simul"><keycap>F3</keycap></keycombo></para></entry>
+<entry><para><link linkend="find-again">Find again</link></para></entry>
</row>
<row>
-<entry
-><para
-><keycombo action="simul"
->&Ctrl;<keycap
->B</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Set a Bookmark</para
-></entry>
+<entry><para><keycombo action="simul">&Ctrl;<keycap>B</keycap></keycombo></para></entry>
+<entry><para>Set a Bookmark</para></entry>
</row>
<row>
-<entry
-><para
-><keycombo action="simul"
->&Ctrl;<keycap
->C</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Copy the marked text to the clipboard. </para
-></entry>
+<entry><para><keycombo action="simul">&Ctrl;<keycap>C</keycap></keycombo></para></entry>
+<entry><para>Copy the marked text to the clipboard. </para></entry>
</row>
<row>
-<entry
-><para
-><keycombo action="simul"
->&Ctrl;<keycap
->N</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
-><link linkend="new"
->New</link
-> document</para
-></entry>
+<entry><para><keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo></para></entry>
+<entry><para><link linkend="new">New</link> document</para></entry>
</row>
<row>
-<entry
-><para
-><keycombo action="simul"
->&Ctrl;<keycap
->P</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
-><link linkend="print"
->Print</link
-> </para
-></entry>
+<entry><para><keycombo action="simul">&Ctrl;<keycap>P</keycap></keycombo></para></entry>
+<entry><para><link linkend="print">Print</link> </para></entry>
</row>
<row>
-<entry
-><para
-><keycombo action="simul"
->&Ctrl;<keycap
->Q</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Quit - close active copy of editor </para
-></entry>
+<entry><para><keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo></para></entry>
+<entry><para>Quit - close active copy of editor </para></entry>
</row>
<row>
-<entry
-><para
-><keycombo action="simul"
->&Ctrl;<keycap
->R</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
-><link linkend="replace"
->Replace</link
-></para
-></entry>
+<entry><para><keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo></para></entry>
+<entry><para><link linkend="replace">Replace</link></para></entry>
</row>
<row>
-<entry
-><para
-><keycombo action="simul"
->&Ctrl;<keycap
->S</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Save your file.</para
-></entry>
+<entry><para><keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo></para></entry>
+<entry><para>Save your file.</para></entry>
</row>
<row>
-<entry
-><para
-><keycombo action="simul"
->&Ctrl;<keycap
->V</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Paste.</para
-></entry>
+<entry><para><keycombo action="simul">&Ctrl;<keycap>V</keycap></keycombo></para></entry>
+<entry><para>Paste.</para></entry>
</row>
<row>
-<entry
-><para
-><keycombo action="simul"
->&Ctrl;<keycap
->X</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
->Delete the marked text and copy it to the clipboard. </para
-></entry>
+<entry><para><keycombo action="simul">&Ctrl;<keycap>X</keycap></keycombo></para></entry>
+<entry><para>Delete the marked text and copy it to the clipboard. </para></entry>
</row>
<row>
-<entry
-><para
-><keycombo action="simul"
->&Ctrl;<keycap
->Z</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
-><link linkend="undo"
->Undo</link
-></para
-></entry>
+<entry><para><keycombo action="simul">&Ctrl;<keycap>Z</keycap></keycombo></para></entry>
+<entry><para><link linkend="undo">Undo</link></para></entry>
</row>
<row>
-<entry
-><para
-><keycombo action="simul"
->&Ctrl;&Shift;<keycap
->Z</keycap
-></keycombo
-></para
-></entry>
-<entry
-><para
-><link linkend="redo"
->Redo</link
-></para
-></entry>
+<entry><para><keycombo action="simul">&Ctrl;&Shift;<keycap>Z</keycap></keycombo></para></entry>
+<entry><para><link linkend="redo">Redo</link></para></entry>
</row>
</tbody>
</tgroup>
@@ -761,72 +290,38 @@
<sect1 id="fundamentals-getting-help">
-<title
->Getting Help</title>
+<title>Getting Help</title>
<sect2>
-<title
->With &kate;</title>
+<title>With &kate;</title>
<variablelist>
<varlistentry>
-<term
->This manual</term
->
+<term>This manual</term>
<listitem>
-<para
->Offers detailed documentation on all menu commands, configuration options, tools, dialogues, plugins &etc; as well as descriptions of of the &kate; window, the editor and various concepts used in the application.</para>
-
-<para
->Press <keycap
->F1</keycap
-> or use the <menuchoice
-><guimenu
->Help</guimenu
-></menuchoice
-> <guisubmenu
->Contents</guisubmenu
-> menu topic to view this manual.</para
-></listitem>
+<para>Offers detailed documentation on all menu commands, configuration options, tools, dialogues, plugins &etc; as well as descriptions of of the &kate; window, the editor and various concepts used in the application.</para>
+
+<para>Press <keycap>F1</keycap> or use the <menuchoice><guimenu>Help</guimenu></menuchoice> <guisubmenu>Contents</guisubmenu> menu topic to view this manual.</para></listitem>
</varlistentry>
<varlistentry id="whats-this">
-<term
->What's This Help</term
->
+<term>What's This Help</term>
<listitem>
-<para
->What's This help offers immediate help with single elements of graphical windows, such as buttons or other window areas.</para>
-
-<para
->We strive to provide What's This help for any elements for which it makes sense. It is available throughout the configuration dialogue, and in many other dialogues as well.</para>
-
-<para
->To employ What's This help, press <keycombo
->&Shift;<keycap
->F1</keycap
-></keycombo
-> or use the <menuchoice
-><guimenu
->Help</guimenu
-><guimenuitem
->What's This</guimenuitem
-></menuchoice
-> menu item to enable What's This mode. The cursor will turn into an arrow with a question mark, and you can now click any element in the window to read the What's This help for that element, if it is available.</para>
+<para>What's This help offers immediate help with single elements of graphical windows, such as buttons or other window areas.</para>
+
+<para>We strive to provide What's This help for any elements for which it makes sense. It is available throughout the configuration dialogue, and in many other dialogues as well.</para>
+
+<para>To employ What's This help, press <keycombo>&Shift;<keycap>F1</keycap></keycombo> or use the <menuchoice><guimenu>Help</guimenu><guimenuitem>What's This</guimenuitem></menuchoice> menu item to enable What's This mode. The cursor will turn into an arrow with a question mark, and you can now click any element in the window to read the What's This help for that element, if it is available.</para>
</listitem>
</varlistentry>
<varlistentry>
-<term
->Help Buttons in Dialogues</term>
+<term>Help Buttons in Dialogues</term>
<listitem>
-<para
->Some dialogues have a <guibutton
->Help</guibutton
-> Button. Pressing it will start the &khelpcenter; and open the relevant documentation.</para>
+<para>Some dialogues have a <guibutton>Help</guibutton> Button. Pressing it will start the &khelpcenter; and open the relevant documentation.</para>
</listitem>
</varlistentry>
</variablelist>
@@ -834,13 +329,9 @@
</sect2>
<sect2>
-<title
->With Your Text Files</title>
+<title>With Your Text Files</title>
-<para
->&kate; does not (yet!) provide any means for reading document related documentation. Depending on the file you are editing, you may find the <link linkend="kate-mdi-tools-konsole"
->Built in &konsole;</link
-> helpful for viewing related &UNIX; manual pages or info documentation, or you can use &konqueror;.</para>
+<para>&kate; does not (yet!) provide any means for reading document related documentation. Depending on the file you are editing, you may find the <link linkend="kate-mdi-tools-konsole">Built in &konsole;</link> helpful for viewing related &UNIX; manual pages or info documentation, or you can use &konqueror;.</para>
</sect2>
diff --git a/tde-i18n-en_GB/docs/tdebase/kate/highlighting.docbook b/tde-i18n-en_GB/docs/tdebase/kate/highlighting.docbook
index cef036728ef..2785ea10b09 100644
--- a/tde-i18n-en_GB/docs/tdebase/kate/highlighting.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kate/highlighting.docbook
@@ -1,191 +1,103 @@
<appendix id="highlight">
<appendixinfo>
<authorgroup>
-<author
-><personname
-><firstname
-></firstname
-></personname
-></author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
->
+<author><personname><firstname></firstname></personname></author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>[email protected]</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit>
</authorgroup>
</appendixinfo>
-<title
->Working with Syntax Highlighting</title>
+<title>Working with Syntax Highlighting</title>
<sect1 id="highlight-overview">
-<title
->Overview</title>
+<title>Overview</title>
-<para
->Syntax Highlighting is what makes the editor automatically display text in different styles/colours, depending on the function of the string in relation to the purpose of the file. In program source code for example, control statements may be rendered bold, while data types and comments get different colours from the rest of the text. This greatly enhances the readability of the text, and thus helps the author to be more efficient and productive.</para>
+<para>Syntax Highlighting is what makes the editor automatically display text in different styles/colours, depending on the function of the string in relation to the purpose of the file. In program source code for example, control statements may be rendered bold, while data types and comments get different colours from the rest of the text. This greatly enhances the readability of the text, and thus helps the author to be more efficient and productive.</para>
<mediaobject>
-<imageobject
-><imagedata format="PNG" fileref="highlighted.png"/></imageobject>
-<textobject
-><phrase
->A perl function, rendered with syntax highlighting.</phrase
-></textobject>
-<caption
-><para
->A perl function, rendered with syntax highlighting.</para>
+<imageobject><imagedata format="PNG" fileref="highlighted.png"/></imageobject>
+<textobject><phrase>A perl function, rendered with syntax highlighting.</phrase></textobject>
+<caption><para>A perl function, rendered with syntax highlighting.</para>
</caption>
</mediaobject>
<mediaobject>
-<imageobject
-><imagedata format="PNG" fileref="unhighlighted.png"/></imageobject>
-<textobject
-><phrase
->The same perl function, without highlighting.</phrase
-></textobject>
-<caption
-><para
->The same perl function, without highlighting.</para
-></caption>
+<imageobject><imagedata format="PNG" fileref="unhighlighted.png"/></imageobject>
+<textobject><phrase>The same perl function, without highlighting.</phrase></textobject>
+<caption><para>The same perl function, without highlighting.</para></caption>
</mediaobject>
-<para
->Of the two examples, which is easiest to read?</para>
+<para>Of the two examples, which is easiest to read?</para>
-<para
->&kate; comes with a flexible, configurable and capable system for doing syntax highlighting, and the standard distribution provides definitions for a wide range of programming languages, markup and scripting languages and other text file formats. In addition you can provide your own definitions in simple &XML; files.</para>
+<para>&kate; comes with a flexible, configurable and capable system for doing syntax highlighting, and the standard distribution provides definitions for a wide range of programming languages, markup and scripting languages and other text file formats. In addition you can provide your own definitions in simple &XML; files.</para>
-<para
->&kate; will automatically detect the right syntax rules when you open a file, based on the &MIME; Type of the file, determined by its extension, or, if it has none, the contents. Should you experience a bad choice, you can manually set the syntax to use from the <menuchoice
-><guimenu
->Documents</guimenu
-><guisubmenu
->Highlight Mode</guisubmenu
-></menuchoice
-> menu.</para>
+<para>&kate; will automatically detect the right syntax rules when you open a file, based on the &MIME; Type of the file, determined by its extension, or, if it has none, the contents. Should you experience a bad choice, you can manually set the syntax to use from the <menuchoice><guimenu>Documents</guimenu><guisubmenu>Highlight Mode</guisubmenu></menuchoice> menu.</para>
-<para
->The styles and colours used by each syntax highlight definition, as well as which &MIME;types it should be used for, can be configured using the <link linkend="config-dialog-editor-hl"
-> Highlight</link
-> page of the <link linkend="config-dialog"
->Config Dialogue</link
->.</para>
+<para>The styles and colours used by each syntax highlight definition, as well as which &MIME;types it should be used for, can be configured using the <link linkend="config-dialog-editor-hl"> Highlight</link> page of the <link linkend="config-dialog">Config Dialogue</link>.</para>
<note>
-<para
->Syntax highlighting is there to enhance the readability of correct text, but you cannot trust it to validate your text. Marking text for syntax is difficult depending on the format you are using, and in some cases the authors of the syntax rules will be proud if 98% of text gets correctly rendered, though most often you need a rare style to see the incorrect 2%.</para>
+<para>Syntax highlighting is there to enhance the readability of correct text, but you cannot trust it to validate your text. Marking text for syntax is difficult depending on the format you are using, and in some cases the authors of the syntax rules will be proud if 98% of text gets correctly rendered, though most often you need a rare style to see the incorrect 2%.</para>
</note>
<tip>
-<para
->You can download updated or additional syntax highlight definitions from the &kate; website by clicking the <guibutton
->Download</guibutton
-> button in the <link linkend="config-dialog-editor-hl"
->Highlight Page</link
-> of the <link linkend="config-dialog"
->Config Dialogue</link
->.</para>
+<para>You can download updated or additional syntax highlight definitions from the &kate; website by clicking the <guibutton>Download</guibutton> button in the <link linkend="config-dialog-editor-hl">Highlight Page</link> of the <link linkend="config-dialog">Config Dialogue</link>.</para>
</tip>
</sect1>
<sect1 id="katehighlight-system">
-<title
->The &kate; Syntax Highlight System</title>
+<title>The &kate; Syntax Highlight System</title>
-<para
->This section will discuss the &kate; syntax highlighting mechanism in more detail. It is for you if you want to know know about it, or if you want to change or create syntax definitions.</para>
+<para>This section will discuss the &kate; syntax highlighting mechanism in more detail. It is for you if you want to know know about it, or if you want to change or create syntax definitions.</para>
<sect2 id="katehighlight-howitworks">
-<title
->How it Works</title>
-
-<para
->Whenever you open a file, one of the first things the &kate; editor does is detect which syntax definition to use for the file. While reading the text of the file, and while you type away in it, the syntax highlighting system will analyse the text using the rules defined by the syntax definition and mark in it where different contexts and styles begin and end.</para>
-
-<para
->When you type in the document, the new text is analysed and marked on the fly, so that if you delete a character that is marked as the beginning or end of a context, the style of surrounding text changes accordingly.</para>
-
-<para
->The syntax definitions used by the &kate; syntax highlighting system are &XML; files, containing <itemizedlist>
-<listitem
-><para
->Rules for detecting the role of text, organised into context blocks</para
-></listitem>
-<listitem
-><para
->Keyword lists</para
-></listitem>
-<listitem
-><para
->Style Item definitions</para
-></listitem>
+<title>How it Works</title>
+
+<para>Whenever you open a file, one of the first things the &kate; editor does is detect which syntax definition to use for the file. While reading the text of the file, and while you type away in it, the syntax highlighting system will analyse the text using the rules defined by the syntax definition and mark in it where different contexts and styles begin and end.</para>
+
+<para>When you type in the document, the new text is analysed and marked on the fly, so that if you delete a character that is marked as the beginning or end of a context, the style of surrounding text changes accordingly.</para>
+
+<para>The syntax definitions used by the &kate; syntax highlighting system are &XML; files, containing <itemizedlist>
+<listitem><para>Rules for detecting the role of text, organised into context blocks</para></listitem>
+<listitem><para>Keyword lists</para></listitem>
+<listitem><para>Style Item definitions</para></listitem>
</itemizedlist>
</para>
-<para
->When analysing the text, the detection rules are evaluated in the order in which they are defined, and if the beginning of the current string matches a rule, the related context is used. The start point in the text is moved to the final point at which that rule matched and a new loop of the rules begins, starting in the context set by the matched rule.</para>
+<para>When analysing the text, the detection rules are evaluated in the order in which they are defined, and if the beginning of the current string matches a rule, the related context is used. The start point in the text is moved to the final point at which that rule matched and a new loop of the rules begins, starting in the context set by the matched rule.</para>
</sect2>
<sect2 id="highlight-system-rules">
-<title
->Rules</title>
+<title>Rules</title>
-<para
->The detection rules are the heart of the highlighting detection system. A rule is a string, character or <link linkend="regular-expressions"
->regular expression</link
-> against which to match the text being analysed. It contains information about which style to use for the matching part of the text. It may switch the working context of the system either to an explicitly mentioned context or to the previous context used by the text.</para>
+<para>The detection rules are the heart of the highlighting detection system. A rule is a string, character or <link linkend="regular-expressions">regular expression</link> against which to match the text being analysed. It contains information about which style to use for the matching part of the text. It may switch the working context of the system either to an explicitly mentioned context or to the previous context used by the text.</para>
-<para
->Rules are organised in context groups. A context group is used for main text concepts within the format, for example quoted text strings or comment blocks in program source code. This ensures that the highlighting system does not need to loop through all rules when it is not necessary, and that some character sequences in the text can be treated differently depending on the current context. </para>
+<para>Rules are organised in context groups. A context group is used for main text concepts within the format, for example quoted text strings or comment blocks in program source code. This ensures that the highlighting system does not need to loop through all rules when it is not necessary, and that some character sequences in the text can be treated differently depending on the current context. </para>
</sect2>
<sect2 id="highlight-context-styles-keywords">
-<title
->Context Styles and Keywords</title>
+<title>Context Styles and Keywords</title>
-<para
->In some programming languages, integer numbers are treated differently than floating point ones by the compiler (the program that converts the source code to a binary executable), and there may be characters having a special meaning within a quoted string. In such cases, it makes sense to render them differently from the surroundings so that they are easy to identify while reading the text. So even if they do not represent special contexts, they may be seen as such by the syntax highlighting system, so that they can be marked for different rendering.</para>
+<para>In some programming languages, integer numbers are treated differently than floating point ones by the compiler (the program that converts the source code to a binary executable), and there may be characters having a special meaning within a quoted string. In such cases, it makes sense to render them differently from the surroundings so that they are easy to identify while reading the text. So even if they do not represent special contexts, they may be seen as such by the syntax highlighting system, so that they can be marked for different rendering.</para>
-<para
->A syntax definition may contain as many styles as required to cover the concepts of the format it is used for.</para>
+<para>A syntax definition may contain as many styles as required to cover the concepts of the format it is used for.</para>
-<para
->In many formats, there are lists of words that represent a specific concept. For example in programming languages, the control statements is one concept, data type names another, and built in functions of the language a third. The &kate; Syntax Highlighting System can use such lists to detect and mark words in the text to emphasise concepts of the text formats.</para>
+<para>In many formats, there are lists of words that represent a specific concept. For example in programming languages, the control statements is one concept, data type names another, and built in functions of the language a third. The &kate; Syntax Highlighting System can use such lists to detect and mark words in the text to emphasise concepts of the text formats.</para>
</sect2>
<sect2 id="kate-highlight-system-default-styles">
-<title
->Default Styles</title>
+<title>Default Styles</title>
-<para
->If you open a C++ source file, a &Java; source file and an <acronym
->HTML</acronym
-> document in &kate;, you will see that even though the formats are different, and thus different words are chosen for special treatment, the colours used are the same. This is because &kate; has a predefined list of Default Styles, that are employed by the individual syntax definitions.</para>
+<para>If you open a C++ source file, a &Java; source file and an <acronym>HTML</acronym> document in &kate;, you will see that even though the formats are different, and thus different words are chosen for special treatment, the colours used are the same. This is because &kate; has a predefined list of Default Styles, that are employed by the individual syntax definitions.</para>
-<para
->This makes it easy to recognise similar concepts in different text formats. For example comments are present in almost any programming, scripting or markup language, and when they are rendered using the same style in all languages, you do not have to stop and think to identify them within the text.</para>
+<para>This makes it easy to recognise similar concepts in different text formats. For example comments are present in almost any programming, scripting or markup language, and when they are rendered using the same style in all languages, you do not have to stop and think to identify them within the text.</para>
<tip>
-<para
->All styles in a syntax definition use one of the default styles. A few syntax definitions use more styles that there are defaults, so if you use a format often, it may be worth launching the configuration dialogue to see if some concepts are using the same style. For example there is only one default style for strings, but as the perl programming language operates with two types of strings, you can enhance the highlighting by configuring those to be slightly different.</para>
+<para>All styles in a syntax definition use one of the default styles. A few syntax definitions use more styles that there are defaults, so if you use a format often, it may be worth launching the configuration dialogue to see if some concepts are using the same style. For example there is only one default style for strings, but as the perl programming language operates with two types of strings, you can enhance the highlighting by configuring those to be slightly different.</para>
</tip>
</sect2>
@@ -193,74 +105,47 @@
</sect1>
<sect1 id="katehighlight-xml-format">
-<title
->The Highlight Definition &XML; Format</title>
+<title>The Highlight Definition &XML; Format</title>
<sect2>
-<title
->Overview</title>
-
-<para
->This section is an overview of the Highlight Definition &XML; format. It will describe the main components and their meaning and usage, and go into detail with the detection rules.</para>
-
-<para
->The formal definition, aka the <acronym
->DTD</acronym
-> is stored in the file <filename
->language.dtd</filename
-> which should be installed on your system in the folder <filename
->$<envar
->TDEDIR</envar
->/share/apps/kate/syntax</filename
->.</para>
+<title>Overview</title>
+
+<para>This section is an overview of the Highlight Definition &XML; format. It will describe the main components and their meaning and usage, and go into detail with the detection rules.</para>
+
+<para>The formal definition, aka the <acronym>DTD</acronym> is stored in the file <filename>language.dtd</filename> which should be installed on your system in the folder <filename>$<envar>TDEDIR</envar>/share/apps/kate/syntax</filename>.</para>
<variablelist>
-<title
->Main components of &kate; Highlight Definitions</title>
+<title>Main components of &kate; Highlight Definitions</title>
<varlistentry>
-<term
->The General Section</term>
+<term>The General Section</term>
<listitem>
-<para
->The General Section contains information on the comment format of the described language, and defines whether keywords are case sensitive.</para
->
+<para>The General Section contains information on the comment format of the described language, and defines whether keywords are case sensitive.</para>
</listitem>
</varlistentry>
<varlistentry>
-<term
->Highlighting</term>
+<term>Highlighting</term>
<listitem>
-<para
->The Highlighting section contains all data required to analyse and render the text. This includes:</para>
+<para>The Highlighting section contains all data required to analyse and render the text. This includes:</para>
<variablelist>
<varlistentry>
-<term
->ItemDatas</term>
-<listitem
-><para
->Contains ItemData elements, each defining a style.</para
-></listitem
->
+<term>ItemDatas</term>
+<listitem><para>Contains ItemData elements, each defining a style.</para></listitem>
</varlistentry>
<varlistentry>
-<term
->Keyword lists</term>
+<term>Keyword lists</term>
<listitem>
-<para
->Each list has a name, and may contain any number of items.</para>
+<para>Each list has a name, and may contain any number of items.</para>
</listitem>
</varlistentry>
<varlistentry>
-<term
->Contexts</term>
+<term>Contexts</term>
<listitem>
-<para
->Contains contexts, which again contain the syntax detection rules.</para>
+<para>Contains contexts, which again contain the syntax detection rules.</para>
</listitem>
</varlistentry>
</variablelist>
@@ -275,347 +160,175 @@
</sect1>
<sect1 id="kate-highlight-rules-detailled">
-<title
->Highlight Detection Rules</title>
-
-<para
->This section describes the syntax detection rules.</para>
-
-<para
->Each rule can match zero or more characters at the beginning of the string they are asked to test. If the rule matches, the matching characters are assigned the style or <emphasis
->attribute</emphasis
-> defined by the rule, and a rule may ask that the current context is switched.</para>
-
-<para
->The <emphasis
->attribute</emphasis
-> and <emphasis
->context</emphasis
-> attributes are common to all rules.</para>
-
-<para
->A rule looks like this:</para>
-
-<programlisting
->&lt;RuleName attribute=&quot;(identifier)&quot; context=&quot;(identifier|order)&quot; [rule specific attributes] /&gt;</programlisting>
-
-<para
->The <emphasis
->attribute</emphasis
-> identifies the style to use for matched characters by name or index, and the <emphasis
->context</emphasis
-> identifies the context to use from here.</para>
-
-<para
->The <emphasis
->attribute</emphasis
-> can be identified either by name, or by its zero-based index in the ItemDatas group.</para>
-
-<para
->The <emphasis
->context</emphasis
-> can be identified by:</para>
+<title>Highlight Detection Rules</title>
+
+<para>This section describes the syntax detection rules.</para>
+
+<para>Each rule can match zero or more characters at the beginning of the string they are asked to test. If the rule matches, the matching characters are assigned the style or <emphasis>attribute</emphasis> defined by the rule, and a rule may ask that the current context is switched.</para>
+
+<para>The <emphasis>attribute</emphasis> and <emphasis>context</emphasis> attributes are common to all rules.</para>
+
+<para>A rule looks like this:</para>
+
+<programlisting>&lt;RuleName attribute=&quot;(identifier)&quot; context=&quot;(identifier|order)&quot; [rule specific attributes] /&gt;</programlisting>
+
+<para>The <emphasis>attribute</emphasis> identifies the style to use for matched characters by name or index, and the <emphasis>context</emphasis> identifies the context to use from here.</para>
+
+<para>The <emphasis>attribute</emphasis> can be identified either by name, or by its zero-based index in the ItemDatas group.</para>
+
+<para>The <emphasis>context</emphasis> can be identified by:</para>
<itemizedlist>
<listitem>
-<para
->An <emphasis
->identifier</emphasis
->, currently only its zero-based index in the contexts group.</para>
+<para>An <emphasis>identifier</emphasis>, currently only its zero-based index in the contexts group.</para>
</listitem>
<listitem>
-<para
->An <emphasis
->order</emphasis
-> telling the engine to stay in the current context (<userinput
->#stay</userinput
->), or to pop back to a previous context used in the string (<userinput
->#pop</userinput
->).</para
->
-<para
->To go back more steps, the #pop keyword can be repeated: <userinput
->#pop#pop#pop</userinput
-></para
->
+<para>An <emphasis>order</emphasis> telling the engine to stay in the current context (<userinput>#stay</userinput>), or to pop back to a previous context used in the string (<userinput>#pop</userinput>).</para>
+<para>To go back more steps, the #pop keyword can be repeated: <userinput>#pop#pop#pop</userinput></para>
</listitem>
</itemizedlist>
-<para
->Some rules can have <emphasis
->child rules</emphasis
-> which are then evaluated if and only if the parent rule matched. The entire matched string will be given the attribute defined by the parent rule. A rule with child rules looks like this:</para>
+<para>Some rules can have <emphasis>child rules</emphasis> which are then evaluated if and only if the parent rule matched. The entire matched string will be given the attribute defined by the parent rule. A rule with child rules looks like this:</para>
-<programlisting
->&lt;RuleName (attributes)&gt;
+<programlisting>&lt;RuleName (attributes)&gt;
&lt;ChildRuleName (attributes) /&gt;
...
&lt;/RuleName&gt;
</programlisting>
-<para
->Rule specific attributes varies and are described in the following list.</para
->
+<para>Rule specific attributes varies and are described in the following list.</para>
<variablelist>
-<title
->The Rules in Detail</title>
+<title>The Rules in Detail</title>
<varlistentry>
-<term
->DetectChar</term>
+<term>DetectChar</term>
<listitem>
-<para
->Detect a single specific character. Commonly used for example to find the ends of quoted strings.</para
->
-<programlisting
->&lt;DetectChar char=&quot;(character)&quot; (common attributes) /&gt;</programlisting>
-<para
->The <userinput
->char</userinput
-> attribute defines the character to match.</para
->
+<para>Detect a single specific character. Commonly used for example to find the ends of quoted strings.</para>
+<programlisting>&lt;DetectChar char=&quot;(character)&quot; (common attributes) /&gt;</programlisting>
+<para>The <userinput>char</userinput> attribute defines the character to match.</para>
</listitem>
</varlistentry>
<varlistentry>
-<term
->Detect2Chars</term>
+<term>Detect2Chars</term>
<listitem>
-<para
->Detect two specific characters in a defined order.</para>
-<programlisting
->&lt;Detect2Chars char=&quot;(character)&quot; char1=&quot;(character)&quot; (common attributes) /&gt;</programlisting>
-<para
->The <userinput
->char</userinput
-> attribute defines the first character to match, <userinput
->char1</userinput
-> the second.</para>
+<para>Detect two specific characters in a defined order.</para>
+<programlisting>&lt;Detect2Chars char=&quot;(character)&quot; char1=&quot;(character)&quot; (common attributes) /&gt;</programlisting>
+<para>The <userinput>char</userinput> attribute defines the first character to match, <userinput>char1</userinput> the second.</para>
</listitem>
</varlistentry>
<varlistentry>
-<term
->AnyChar</term>
+<term>AnyChar</term>
<listitem>
-<para
->Detect one character of a set of specified characters.</para>
-<programlisting
->&lt;AnyChar String=&quot;(string)&quot; (common attributes) /&gt;</programlisting>
-<para
->The <userinput
->String</userinput
-> attribute defines the set of characters.</para>
+<para>Detect one character of a set of specified characters.</para>
+<programlisting>&lt;AnyChar String=&quot;(string)&quot; (common attributes) /&gt;</programlisting>
+<para>The <userinput>String</userinput> attribute defines the set of characters.</para>
</listitem>
</varlistentry>
<varlistentry>
-<term
->StringDetect</term>
+<term>StringDetect</term>
<listitem>
-<para
->Detect an exact string.</para>
-<programlisting
->&lt;StringDetect String=&quot;(string)&quot; [insensitive=&quot;TRUE|FALSE;&quot;] (common attributes) /&gt;</programlisting>
-<para
->The <userinput
->String</userinput
-> attribute defines the string to match. The <userinput
->insensitive</userinput
-> attribute defaults to <userinput
->FALSE</userinput
-> and is fed to the string comparison function. If the value is <userinput
->TRUE</userinput
-> insensitive comparing is used.</para
->
+<para>Detect an exact string.</para>
+<programlisting>&lt;StringDetect String=&quot;(string)&quot; [insensitive=&quot;TRUE|FALSE;&quot;] (common attributes) /&gt;</programlisting>
+<para>The <userinput>String</userinput> attribute defines the string to match. The <userinput>insensitive</userinput> attribute defaults to <userinput>FALSE</userinput> and is fed to the string comparison function. If the value is <userinput>TRUE</userinput> insensitive comparing is used.</para>
</listitem>
</varlistentry>
<varlistentry>
-<term
->RegExpr</term>
+<term>RegExpr</term>
<listitem>
-<para
->Matches against a regular expression.</para>
-<programlisting
->&lt;RegExpr String=&quot;(string)&quot; [insensitive=&quot;TRUE|FALSE;&quot;] [minimal=&quot;TRUE|FALSE&quot;] (common attributes) /&gt;</programlisting>
-<para
->The <userinput
->String</userinput
-> attribute defines the regular expression.</para>
-<para
-><userinput
->insensitive</userinput
-> defaults to <userinput
->FALSE</userinput
-> and is fed to the regular expression engine.</para>
-<para
-><userinput
->minimal</userinput
-> defaults to <userinput
->FALSE</userinput
-> and is fed to the regular expression engine.</para>
-<para
->Because the rules are always matched against the beginning of the current string, a regular expression starting with a caret (<literal
->^</literal
->) indicates that the rule should only be matched against the start of a line.</para>
-<para
->See <link linkend="regular-expressions"
->Regular Expressions</link
-> for more information on those.</para
->
+<para>Matches against a regular expression.</para>
+<programlisting>&lt;RegExpr String=&quot;(string)&quot; [insensitive=&quot;TRUE|FALSE;&quot;] [minimal=&quot;TRUE|FALSE&quot;] (common attributes) /&gt;</programlisting>
+<para>The <userinput>String</userinput> attribute defines the regular expression.</para>
+<para><userinput>insensitive</userinput> defaults to <userinput>FALSE</userinput> and is fed to the regular expression engine.</para>
+<para><userinput>minimal</userinput> defaults to <userinput>FALSE</userinput> and is fed to the regular expression engine.</para>
+<para>Because the rules are always matched against the beginning of the current string, a regular expression starting with a caret (<literal>^</literal>) indicates that the rule should only be matched against the start of a line.</para>
+<para>See <link linkend="regular-expressions">Regular Expressions</link> for more information on those.</para>
</listitem>
</varlistentry>
<varlistentry>
-<term
->Keyword</term>
+<term>Keyword</term>
<listitem>
-<para
->Detect a keyword from a specified list.</para>
-<programlisting
->&lt;keyword String=&quot;(list name)&quot; (common attributes) /&gt;</programlisting>
-<para
->The <userinput
->String</userinput
-> attribute identifies the keyword list by name. A list with that name must exist.</para>
+<para>Detect a keyword from a specified list.</para>
+<programlisting>&lt;keyword String=&quot;(list name)&quot; (common attributes) /&gt;</programlisting>
+<para>The <userinput>String</userinput> attribute identifies the keyword list by name. A list with that name must exist.</para>
</listitem>
</varlistentry>
<varlistentry>
-<term
->Int</term>
+<term>Int</term>
<listitem>
-<para
->Detect an integer number.</para>
-<para
-><programlisting
->&lt;Int (common attributes) /&gt;</programlisting
-></para>
-<para
->This rule has no specific attributes. Child rules are typically used to detect combinations of <userinput
->L</userinput
-> and <userinput
->U</userinput
-> after the number, indicating the integer type in program code.</para>
+<para>Detect an integer number.</para>
+<para><programlisting>&lt;Int (common attributes) /&gt;</programlisting></para>
+<para>This rule has no specific attributes. Child rules are typically used to detect combinations of <userinput>L</userinput> and <userinput>U</userinput> after the number, indicating the integer type in program code.</para>
</listitem>
</varlistentry>
<varlistentry>
-<term
->Float</term>
+<term>Float</term>
<listitem>
-<para
->Detect a floating point number.</para>
-<para
-><programlisting
->&lt;Float (common attributes)
-/&gt;</programlisting
-></para
->
-<para
->This rule has no specific attributes.</para>
+<para>Detect a floating point number.</para>
+<para><programlisting>&lt;Float (common attributes)
+/&gt;</programlisting></para>
+<para>This rule has no specific attributes.</para>
</listitem>
</varlistentry>
<varlistentry>
-<term
->HlCOct</term>
+<term>HlCOct</term>
<listitem>
-<para
->Detect an octal point number representation.</para>
-<para
-><programlisting
->&lt;HlCOct (common attributes) /&gt;</programlisting
-></para>
-<para
->This rule has no specific attributes.</para>
+<para>Detect an octal point number representation.</para>
+<para><programlisting>&lt;HlCOct (common attributes) /&gt;</programlisting></para>
+<para>This rule has no specific attributes.</para>
</listitem>
</varlistentry>
<varlistentry>
-<term
->HlCHex</term>
+<term>HlCHex</term>
<listitem>
-<para
->Detect a hexadecimal number representation.</para>
-<para
-><programlisting
->&lt;Int (common attributes) /&gt;</programlisting
-></para>
-<para
->This rule has no specific attributes.</para>
+<para>Detect a hexadecimal number representation.</para>
+<para><programlisting>&lt;Int (common attributes) /&gt;</programlisting></para>
+<para>This rule has no specific attributes.</para>
</listitem>
</varlistentry>
<varlistentry>
-<term
->HlCStringChar</term>
+<term>HlCStringChar</term>
<listitem>
-<para
->Detect an escaped character.</para>
-<para
-><programlisting
->&lt;HlCStringChar (common attributes)
-/&gt;</programlisting
-></para>
-<para
->This rule has no specific attributes.</para>
-
-<para
->It matches letteral representations of invisible characters commonly used in program code, for example <userinput
->\n</userinput
-> (newline) or <userinput
->\t</userinput
-> (TAB).</para>
-
-<para
->The following characters will match if they follow a backslash (<literal
->\</literal
->): <userinput
->abefnrtv&quot;'?</userinput
->. Additionally, escaped hexadecimal numbers like for example <userinput
->\xff</userinput
-> and escaped octal numbers, for example <userinput
->\033</userinput
-> will match.</para>
+<para>Detect an escaped character.</para>
+<para><programlisting>&lt;HlCStringChar (common attributes)
+/&gt;</programlisting></para>
+<para>This rule has no specific attributes.</para>
+
+<para>It matches letteral representations of invisible characters commonly used in program code, for example <userinput>\n</userinput> (newline) or <userinput>\t</userinput> (TAB).</para>
+
+<para>The following characters will match if they follow a backslash (<literal>\</literal>): <userinput>abefnrtv&quot;'?</userinput>. Additionally, escaped hexadecimal numbers like for example <userinput>\xff</userinput> and escaped octal numbers, for example <userinput>\033</userinput> will match.</para>
</listitem>
</varlistentry>
<varlistentry>
-<term
->RangeDetect</term>
+<term>RangeDetect</term>
<listitem>
-<para
->Detect a string with defined start and end characters.</para>
-<programlisting
->&lt;RangeDetect char=&quot;(character)&quot; char1=&quot;(character)&quot; (common attributes) /&gt;</programlisting>
-<para
-><userinput
->char</userinput
-> defines the character starting the range, <userinput
->char2</userinput
-> the character ending the range.</para>
-<para
->Useful to detect for example small quoted strings and the like, but note that since the hl engine works on one line at a time, this will not find strings spanning over a line break.</para>
+<para>Detect a string with defined start and end characters.</para>
+<programlisting>&lt;RangeDetect char=&quot;(character)&quot; char1=&quot;(character)&quot; (common attributes) /&gt;</programlisting>
+<para><userinput>char</userinput> defines the character starting the range, <userinput>char2</userinput> the character ending the range.</para>
+<para>Useful to detect for example small quoted strings and the like, but note that since the hl engine works on one line at a time, this will not find strings spanning over a line break.</para>
</listitem>
</varlistentry>
<varlistentry>
-<term
->LineContinue</term>
+<term>LineContinue</term>
<listitem>
-<para
->Matches at end of line.</para>
-<programlisting
->&lt;LineContinue (common attributes) /&gt;</programlisting>
-<para
->This rule has no specific attributes.</para>
-<para
->This rule is useful for switching context at end of line.</para>
+<para>Matches at end of line.</para>
+<programlisting>&lt;LineContinue (common attributes) /&gt;</programlisting>
+<para>This rule has no specific attributes.</para>
+<para>This rule is useful for switching context at end of line.</para>
</listitem>
</varlistentry>
diff --git a/tde-i18n-en_GB/docs/tdebase/kate/index.docbook b/tde-i18n-en_GB/docs/tdebase/kate/index.docbook
index d9202e714c9..62956cc7782 100644
--- a/tde-i18n-en_GB/docs/tdebase/kate/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kate/index.docbook
@@ -13,125 +13,70 @@
<!ENTITY plugins-chapter SYSTEM "plugins.docbook">
<!ENTITY regexp-appendix SYSTEM "regular-expressions.docbook">
<!ENTITY % addindex "IGNORE">
- <!ENTITY % British-English "INCLUDE"
-><!-- change language only here -->
+ <!ENTITY % British-English "INCLUDE"><!-- change language only here -->
]>
<book lang="&language;">
-<title
->The &kate; Handbook</title>
+<title>The &kate; Handbook</title>
<bookinfo>
<authorgroup>
-<author
->&Anders.Lund; &Anders.Lund.mail;</author>
-<author
->&Seth.Rothberg; &Seth.Rothberg.mail;</author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
->
+<author>&Anders.Lund; &Anders.Lund.mail;</author>
+<author>&Seth.Rothberg; &Seth.Rothberg.mail;</author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>[email protected]</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit>
</authorgroup>
<copyright>
-<year
->2000</year>
-<year
->2001</year>
-<holder
->&Seth.Rothberg;</holder>
+<year>2000</year>
+<year>2001</year>
+<holder>&Seth.Rothberg;</holder>
</copyright>
<copyright>
-<year
->2002</year
-><year
->2003</year>
-<holder
->&Anders.Lund;</holder>
+<year>2002</year><year>2003</year>
+<holder>&Anders.Lund;</holder>
</copyright>
-<legalnotice
->&FDLNotice;</legalnotice>
+<legalnotice>&FDLNotice;</legalnotice>
-<date
->2002-01-26</date>
-<releaseinfo
->2.00.00</releaseinfo>
+<date>2002-01-26</date>
+<releaseinfo>2.00.00</releaseinfo>
<abstract>
-<para
->&kate; is a programmer's text editor for &kde; 2.2 and above.</para>
+<para>&kate; is a programmer's text editor for &kde; 2.2 and above.</para>
-<para
->This handbook documents &kate; Version 1.0</para>
+<para>This handbook documents &kate; Version 1.0</para>
</abstract>
<keywordset>
-<keyword
->KDE</keyword>
-<keyword
->tdebase</keyword>
-<keyword
->Kate</keyword>
-<keyword
->text</keyword>
-<keyword
->editor</keyword>
-<keyword
->programmer</keyword>
-<keyword
->programming</keyword>
-<keyword
->projects</keyword>
-<keyword
->MDI</keyword>
-<keyword
->Multi</keyword>
-<keyword
->Document</keyword>
-<keyword
->Interface</keyword>
-<keyword
->terminal</keyword>
-<keyword
->console</keyword>
+<keyword>KDE</keyword>
+<keyword>tdebase</keyword>
+<keyword>Kate</keyword>
+<keyword>text</keyword>
+<keyword>editor</keyword>
+<keyword>programmer</keyword>
+<keyword>programming</keyword>
+<keyword>projects</keyword>
+<keyword>MDI</keyword>
+<keyword>Multi</keyword>
+<keyword>Document</keyword>
+<keyword>Interface</keyword>
+<keyword>terminal</keyword>
+<keyword>console</keyword>
</keywordset>
</bookinfo>
<chapter id="introduction">
-<title
->Introduction</title>
+<title>Introduction</title>
-<para
->Welcome to &kate;, a programmer's text editor for &kde; version 2.2 and above. Some of &kate;'s many features include configurable syntax highlighting for languages ranging from C and C++ to <acronym
->HTML</acronym
-> to bash scripts, the ability to create and maintain projects, a multiple document interface (<acronym
->MDI</acronym
->), and a self-contained terminal emulator. </para>
+<para>Welcome to &kate;, a programmer's text editor for &kde; version 2.2 and above. Some of &kate;'s many features include configurable syntax highlighting for languages ranging from C and C++ to <acronym>HTML</acronym> to bash scripts, the ability to create and maintain projects, a multiple document interface (<acronym>MDI</acronym>), and a self-contained terminal emulator. </para>
-<para
->But &kate; is more than a programmer's editor. Its ability to open several files at once makes it ideal for editing &UNIX;'s many configuration files. This document was written in &kate;. </para>
+<para>But &kate; is more than a programmer's editor. Its ability to open several files at once makes it ideal for editing &UNIX;'s many configuration files. This document was written in &kate;. </para>
<para>
<mediaobject>
-<imageobject
-><imagedata format="PNG" fileref="kate.png"/></imageobject>
-<caption
-><para
->Editing this manual...</para
-></caption>
+<imageobject><imagedata format="PNG" fileref="kate.png"/></imageobject>
+<caption><para>Editing this manual...</para></caption>
</mediaobject>
</para>
@@ -153,253 +98,123 @@
<chapter id="credits">
-<title
->Credits and Licence</title>
+<title>Credits and Licence</title>
-<para
->&kate;. Program copyright 2000, 2001, 2002 by the &kate; developer team. </para>
+<para>&kate;. Program copyright 2000, 2001, 2002 by the &kate; developer team. </para>
<variablelist>
-<title
->The &kate; team:</title>
+<title>The &kate; team:</title>
<varlistentry>
-<term
->&Christoph.Cullmann; &Christoph.Cullmann.mail;</term>
-<listitem
-><para
->Project Manager &amp; Core Developer</para
-></listitem>
+<term>&Christoph.Cullmann; &Christoph.Cullmann.mail;</term>
+<listitem><para>Project Manager &amp; Core Developer</para></listitem>
</varlistentry>
<varlistentry>
-<term
->&Anders.Lund; &Anders.Lund.mail;</term>
-<listitem
-><para
->Core Developer, Perl syntax highlighting, documentation</para
-></listitem>
+<term>&Anders.Lund; &Anders.Lund.mail;</term>
+<listitem><para>Core Developer, Perl syntax highlighting, documentation</para></listitem>
</varlistentry>
<varlistentry>
-<term
->&Joseph.Wenninger; &Joseph.Wenninger.mail;</term>
-<listitem
-><para
->Core Developer, syntax highlighting</para
-></listitem>
+<term>&Joseph.Wenninger; &Joseph.Wenninger.mail;</term>
+<listitem><para>Core Developer, syntax highlighting</para></listitem>
</varlistentry>
<varlistentry>
-<term
->Michael Bartl <email
-></term>
-<listitem
-><para
->Core Developer</para
-></listitem>
+<term>Michael Bartl <email>[email protected]</email></term>
+<listitem><para>Core Developer</para></listitem>
</varlistentry>
<varlistentry>
-<term
->Phlip <email
-></term>
-<listitem
-><para
->The project compiler</para
-></listitem>
+<term>Phlip <email>[email protected]</email></term>
+<listitem><para>The project compiler</para></listitem>
</varlistentry>
<varlistentry>
-<term
->&Waldo.Bastian; &Waldo.Bastian.mail;</term>
-<listitem
-><para
->The cool buffer system</para
-></listitem>
+<term>&Waldo.Bastian; &Waldo.Bastian.mail;</term>
+<listitem><para>The cool buffer system</para></listitem>
</varlistentry>
<varlistentry>
-<term
->Matt Newell <email
-></term>
-<listitem
-><para
->Testing...</para
-></listitem>
+<term>Matt Newell <email>[email protected]</email></term>
+<listitem><para>Testing...</para></listitem>
</varlistentry>
<varlistentry>
-<term
->Michael McCallum <email
-></term>
-<listitem
-><para
->Core Developer</para
-></listitem>
+<term>Michael McCallum <email>[email protected]</email></term>
+<listitem><para>Core Developer</para></listitem>
</varlistentry>
<varlistentry>
-<term
->Jochen Wilhemly <email
-></term>
-<listitem
-><para
->KWrite Author</para
-></listitem>
+<term>Jochen Wilhemly <email>[email protected]</email></term>
+<listitem><para>KWrite Author</para></listitem>
</varlistentry>
<varlistentry>
-<term
->&Michael.Koch; &Michael.Koch.mail;</term>
-<listitem
-><para
->KWrite port to KParts</para
-></listitem>
+<term>&Michael.Koch; &Michael.Koch.mail;</term>
+<listitem><para>KWrite port to KParts</para></listitem>
</varlistentry>
<varlistentry>
-<term
->Christian Gebauer <email
-></term>
-<listitem
-><para
->Unspecified</para
-></listitem>
+<term>Christian Gebauer <email>[email protected]</email></term>
+<listitem><para>Unspecified</para></listitem>
</varlistentry>
<varlistentry>
-<term
->&Simon.Hausmann; &Simon.Hausmann.mail;</term>
-<listitem
-><para
->Unspecified</para
-></listitem>
+<term>&Simon.Hausmann; &Simon.Hausmann.mail;</term>
+<listitem><para>Unspecified</para></listitem>
</varlistentry>
<varlistentry>
-<term
->Glen Parker <email
-></term>
-<listitem
-><para
->KWrite Undo History, KSpell integration</para
-></listitem>
+<term>Glen Parker <email>[email protected]</email></term>
+<listitem><para>KWrite Undo History, KSpell integration</para></listitem>
</varlistentry>
<varlistentry>
-<term
->Scott Manson <email
-></term>
-<listitem
-><para
->KWrite XML syntax highlighting support</para
-></listitem>
+<term>Scott Manson <email>[email protected]</email></term>
+<listitem><para>KWrite XML syntax highlighting support</para></listitem>
</varlistentry>
<varlistentry>
-<term
->&John.Firebaugh; &John.Firebaugh.mail;</term>
-<listitem
-><para
->Various Patches</para
-></listitem>
+<term>&John.Firebaugh; &John.Firebaugh.mail;</term>
+<listitem><para>Various Patches</para></listitem>
</varlistentry>
</variablelist>
<variablelist>
-<title
->Many other people have contributed:</title>
+<title>Many other people have contributed:</title>
<varlistentry>
-<term
->Matteo Merli <email
-></term>
-<listitem
-><para
->Highlighting for RPM Spec-Files, Diff and more</para
-></listitem>
+<term>Matteo Merli <email>[email protected]</email></term>
+<listitem><para>Highlighting for RPM Spec-Files, Diff and more</para></listitem>
</varlistentry>
<varlistentry>
-<term
->Rocky Scaletta <email
-></term>
-<listitem
-><para
->Highlighting for VHDL</para
-></listitem>
+<term>Rocky Scaletta <email>[email protected]</email></term>
+<listitem><para>Highlighting for VHDL</para></listitem>
</varlistentry>
<varlistentry>
-<term
->Yury Lebedev </term>
-<listitem
-><para
->Highlighting for SQL</para
-></listitem>
+<term>Yury Lebedev </term>
+<listitem><para>Highlighting for SQL</para></listitem>
</varlistentry>
<varlistentry>
-<term
->Chris Ross</term>
-<listitem
-><para
->Highlighting for Ferite</para
-></listitem>
+<term>Chris Ross</term>
+<listitem><para>Highlighting for Ferite</para></listitem>
</varlistentry>
<varlistentry>
-<term
->Nick Roux</term>
-<listitem
-><para
->Highlighting for ILERPG</para
-></listitem>
+<term>Nick Roux</term>
+<listitem><para>Highlighting for ILERPG</para></listitem>
</varlistentry>
<varlistentry>
-<term
->John Firebaugh</term>
-<listitem
-><para
->Highlighting for Java, and much more</para
-></listitem>
+<term>John Firebaugh</term>
+<listitem><para>Highlighting for Java, and much more</para></listitem>
</varlistentry>
<varlistentry>
-<term
->Carsten Niehaus</term>
-<listitem
-><para
->Highlighting for LaTeX</para
-></listitem>
+<term>Carsten Niehaus</term>
+<listitem><para>Highlighting for LaTeX</para></listitem>
</varlistentry>
<varlistentry>
-<term
->Per Wigren</term>
-<listitem
-><para
->Highlighting for Makefiles, Python</para
-></listitem>
+<term>Per Wigren</term>
+<listitem><para>Highlighting for Makefiles, Python</para></listitem>
</varlistentry>
<varlistentry>
-<term
->Jan Fritz</term>
-<listitem
-><para
->Highlighting for Python</para
-></listitem>
+<term>Jan Fritz</term>
+<listitem><para>Highlighting for Python</para></listitem>
</varlistentry>
<varlistentry>
-<term
->&Daniel.Naber;</term>
-<listitem
-><para
->Small bugfixes, XML plugin</para
-></listitem>
+<term>&Daniel.Naber;</term>
+<listitem><para>Small bugfixes, XML plugin</para></listitem>
</varlistentry>
</variablelist>
-<para
->Documentation copyright 2000,2001 &Seth.Rothberg; &Seth.Rothberg.mail;</para>
+<para>Documentation copyright 2000,2001 &Seth.Rothberg; &Seth.Rothberg.mail;</para>
-<para
->Documentation copyright 2002, 2003 &Anders.Lund; &Anders.Lund.mail;</para>
+<para>Documentation copyright 2002, 2003 &Anders.Lund; &Anders.Lund.mail;</para>
-<para
->Conversion to British English: John Knight <email
-></para
->
+<para>Conversion to British English: John Knight <email>[email protected]</email></para>
&underFDL; &underGPL; </chapter>
&highlighting-appendix;
@@ -407,8 +222,7 @@
&regexp-appendix;
<appendix id="installation">
-<title
->Installation</title>
+<title>Installation</title>
&install.intro.documentation;
diff --git a/tde-i18n-en_GB/docs/tdebase/kate/mdi.docbook b/tde-i18n-en_GB/docs/tdebase/kate/mdi.docbook
index 38ddee1ee8e..76b3536507d 100644
--- a/tde-i18n-en_GB/docs/tdebase/kate/mdi.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kate/mdi.docbook
@@ -1,88 +1,38 @@
<chapter id="kate-mdi">
<chapterinfo>
<authorgroup>
-<author
->&Anders.Lund; &Anders.Lund.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
->
+<author>&Anders.Lund; &Anders.Lund.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>[email protected]</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit>
</authorgroup>
</chapterinfo>
-<title
->Working With the &kate; <acronym
->MDI</acronym
-></title>
+<title>Working With the &kate; <acronym>MDI</acronym></title>
<sect1 id="kate-mdi-overview">
-<title
->Overview</title>
+<title>Overview</title>
-<para
->Window, View, Document, Frame, Editor... What are they all in the terminology of &kate;, and how do you get the most out of it? This chapter will explain all of that, and even more.</para>
+<para>Window, View, Document, Frame, Editor... What are they all in the terminology of &kate;, and how do you get the most out of it? This chapter will explain all of that, and even more.</para>
<sect2 id="kate-mdi-overview-mainwindow">
-<title
->The Main Window</title>
+<title>The Main Window</title>
-<para
-><indexterm
-><primary
->Main window</primary
-></indexterm
-> The &kate; Main Window is a standard &kde; application window, with the addition of dockable subwindows, or tool windows. It has a Menubar with all the common menus, and some more, and a toolbar providing access to commonly used commands.</para>
+<para><indexterm><primary>Main window</primary></indexterm> The &kate; Main Window is a standard &kde; application window, with the addition of dockable subwindows, or tool windows. It has a Menubar with all the common menus, and some more, and a toolbar providing access to commonly used commands.</para>
-<para
->The most important part of the window is the Editing Area, by default displaying a single text editor component, in which you can work with your documents.</para>
+<para>The most important part of the window is the Editing Area, by default displaying a single text editor component, in which you can work with your documents.</para>
-<para
->The docking capabilities of the window is used for the tool windows:</para>
+<para>The docking capabilities of the window is used for the tool windows:</para>
<itemizedlist>
-<listitem
-><para
-><link linkend="kate-mdi-tools-file-list"
->The File List</link
-></para
-></listitem>
-<listitem
-><para
-><link linkend="kate-mdi-tools-file-selector"
->The File Selector</link
-></para
-></listitem>
-<listitem
-><para
-><link linkend="kate-mdi-tools-konsole"
->The Built in Terminal Emulator</link
-></para
-></listitem>
+<listitem><para><link linkend="kate-mdi-tools-file-list">The File List</link></para></listitem>
+<listitem><para><link linkend="kate-mdi-tools-file-selector">The File Selector</link></para></listitem>
+<listitem><para><link linkend="kate-mdi-tools-konsole">The Built in Terminal Emulator</link></para></listitem>
</itemizedlist>
-<para
->And possibly other tool windows, for example provided by plugins.</para>
+<para>And possibly other tool windows, for example provided by plugins.</para>
-<para
-><indexterm
-><primary
->Tool Windows</primary
-></indexterm
-> The Tool Windows can be placed anywhere you want them inside or outside the main window by dragging the handle bar in the top of them with the &LMB; pressed, and stacked in shared tab windows if desired.</para>
+<para><indexterm><primary>Tool Windows</primary></indexterm> The Tool Windows can be placed anywhere you want them inside or outside the main window by dragging the handle bar in the top of them with the &LMB; pressed, and stacked in shared tab windows if desired.</para>
-<para
->When dragging a docked window, a black rectangle will be displayed to indicate where the window will be placed if you release the mouse button, unless you move the mouse cursor outside the main window, in which case the dragged window will become a free floating top level window.</para>
+<para>When dragging a docked window, a black rectangle will be displayed to indicate where the window will be placed if you release the mouse button, unless you move the mouse cursor outside the main window, in which case the dragged window will become a free floating top level window.</para>
</sect2>
@@ -91,137 +41,60 @@
<sect1 id="kate-mdi-editor">
-<title
->The Editor area</title>
+<title>The Editor area</title>
-<para
-><indexterm
-><primary
->Editing Area</primary
-></indexterm
-> &kate; is capable of having more than one document open at the same time, and also of splitting the editing area into any number of frames, similar to how for example &konqueror; or the popular <application
->emacs</application
-> text editor works. This way you can view several documents at the same time, or more instances of the same document, handy for example if your document contains definitions in the top that you want to see often for reference. Or you could view a program source header in one frame, while editing the implementation file in another.</para>
+<para><indexterm><primary>Editing Area</primary></indexterm> &kate; is capable of having more than one document open at the same time, and also of splitting the editing area into any number of frames, similar to how for example &konqueror; or the popular <application>emacs</application> text editor works. This way you can view several documents at the same time, or more instances of the same document, handy for example if your document contains definitions in the top that you want to see often for reference. Or you could view a program source header in one frame, while editing the implementation file in another.</para>
-<para
->When a document is available in more than one editor, changes made in one editor will immediately be reflected in the others as well. This includes changing the text as well as selecting text. Search operations or cursor movement is only reflected in the current editor.</para>
+<para>When a document is available in more than one editor, changes made in one editor will immediately be reflected in the others as well. This includes changing the text as well as selecting text. Search operations or cursor movement is only reflected in the current editor.</para>
-<para
->It is currently not possible to have more instances of the same document open in the sense that one instance will be edited while the other will not.</para>
+<para>It is currently not possible to have more instances of the same document open in the sense that one instance will be edited while the other will not.</para>
-<para
->When splitting an editor into two frames, it is divided into two equally sized frames, both displaying the current document of that editor. The new frame will be at the bottom (in the case of a horizontal split) or at the right (for a vertical split). The new frame gets the focus, which is visualised by a small green led in the focused frame.</para>
+<para>When splitting an editor into two frames, it is divided into two equally sized frames, both displaying the current document of that editor. The new frame will be at the bottom (in the case of a horizontal split) or at the right (for a vertical split). The new frame gets the focus, which is visualised by a small green led in the focused frame.</para>
</sect1>
<sect1 id="kate-mdi-tools-file-list">
-<title
->The File List</title>
-
-<para
-><indexterm
-><primary
->File list</primary
-></indexterm
-> The file list displays a list of all documents currently open in &kate;. Modified files will have a small <guiicon
->floppy disk</guiicon
-> icon on their left to indicate that state.</para>
-
-<para
->If two or more files with the same name (located in different folders) are open, the names of the second will be prepended <quote
->&lt;2&gt;</quote
-> and so on. The tool-tip for the file will display its full name including the path, allowing you to choose the desired one.</para
-> <para
->To display a document in the currently active frame, click the document name in the list.</para>
-
-<para
->The default location in the &kate; window is to the left of the editing area, in a dockable tab window shared with the <link linkend="kate-mdi-tools-file-selector"
->File Selector</link
->.</para>
+<title>The File List</title>
+
+<para><indexterm><primary>File list</primary></indexterm> The file list displays a list of all documents currently open in &kate;. Modified files will have a small <guiicon>floppy disk</guiicon> icon on their left to indicate that state.</para>
+
+<para>If two or more files with the same name (located in different folders) are open, the names of the second will be prepended <quote>&lt;2&gt;</quote> and so on. The tool-tip for the file will display its full name including the path, allowing you to choose the desired one.</para> <para>To display a document in the currently active frame, click the document name in the list.</para>
+
+<para>The default location in the &kate; window is to the left of the editing area, in a dockable tab window shared with the <link linkend="kate-mdi-tools-file-selector">File Selector</link>.</para>
</sect1>
<sect1 id="kate-mdi-tools-file-selector">
-<title
->The File Selector</title>
+<title>The File Selector</title>
-<para
-><indexterm
-><primary
->File selector</primary
-></indexterm
-> The File Selector is a folder viewer, allowing you to open files from a displayed folder in the current frame.</para>
+<para><indexterm><primary>File selector</primary></indexterm> The File Selector is a folder viewer, allowing you to open files from a displayed folder in the current frame.</para>
-<para
->From top down, the file selector consist of the following elements:</para>
+<para>From top down, the file selector consist of the following elements:</para>
<variablelist>
<varlistentry>
-<term
->A Toolbar</term>
+<term>A Toolbar</term>
<listitem>
-<para
->This contains standard navigations tool buttons:</para>
+<para>This contains standard navigations tool buttons:</para>
<variablelist>
<varlistentry>
-<term
-><guibutton
->Home</guibutton
-></term>
-<listitem
-><para
->Pressing it will cause the folder view to <command
->cd</command
-> to your home folder.</para
-></listitem>
+<term><guibutton>Home</guibutton></term>
+<listitem><para>Pressing it will cause the folder view to <command>cd</command> to your home folder.</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><guibutton
->Up</guibutton
-></term>
-<listitem
-><para
->This will cause the folder view to <command
->cd</command
-> to the immediate parent of the currently displayed folder if possible.</para
-></listitem>
+<term><guibutton>Up</guibutton></term>
+<listitem><para>This will cause the folder view to <command>cd</command> to the immediate parent of the currently displayed folder if possible.</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><guibutton
->Back</guibutton
-></term>
-<listitem
-><para
->Causes the folder view to <command
->cd</command
-> to the previously displayed folder in the history. This button is disabled, if there is no previous item.</para
-></listitem>
+<term><guibutton>Back</guibutton></term>
+<listitem><para>Causes the folder view to <command>cd</command> to the previously displayed folder in the history. This button is disabled, if there is no previous item.</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><guibutton
->Forward</guibutton
-></term>
-<listitem
-><para
->Causes the folder view to <command
->cd</command
-> to the next folder in the history. This button is disabled, if there is no next folder.</para
-></listitem>
+<term><guibutton>Forward</guibutton></term>
+<listitem><para>Causes the folder view to <command>cd</command> to the next folder in the history. This button is disabled, if there is no next folder.</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><guibutton
->Sync</guibutton
-></term>
-<listitem
-><para
->This button will cause the folder view to <command
->cd</command
-> to the folder of the currently active document if possible. This button is disabled, if the active document is a new, unsaved file, or the folder in which it resides can not be decided.</para
-></listitem
->
+<term><guibutton>Sync</guibutton></term>
+<listitem><para>This button will cause the folder view to <command>cd</command> to the folder of the currently active document if possible. This button is disabled, if the active document is a new, unsaved file, or the folder in which it resides can not be decided.</para></listitem>
</varlistentry>
</variablelist>
@@ -229,43 +102,24 @@
</varlistentry>
<varlistentry>
-<term
->A &URL; entry</term>
+<term>A &URL; entry</term>
<listitem>
-<para
->Here you can type the path of a folder to browse. The &URL; entry maintains a list of previously typed paths. To choose one use the arrow button to the right of the entry.</para>
-<tip
-><para
->The &URL; entry has folder auto-completion. The completion method can be set using the &RMB; menu of the text entry.</para
-></tip>
-</listitem
->
+<para>Here you can type the path of a folder to browse. The &URL; entry maintains a list of previously typed paths. To choose one use the arrow button to the right of the entry.</para>
+<tip><para>The &URL; entry has folder auto-completion. The completion method can be set using the &RMB; menu of the text entry.</para></tip>
+</listitem>
</varlistentry>
<varlistentry>
-<term
->A Folder View</term>
-<listitem
-><para
->This is a standard &kde; folder view.</para
-></listitem>
+<term>A Folder View</term>
+<listitem><para>This is a standard &kde; folder view.</para></listitem>
</varlistentry>
<varlistentry>
-<term
->A Filter Entry</term>
+<term>A Filter Entry</term>
<listitem>
-<para
->The Filter entry allows you to enter a filter for the files displayed in the folder view. The filter uses standard globs; patterns must be separated by white space. Example: <userinput
->*.cpp *.h *.moc</userinput
-></para>
-<para
->To display all files, enter a single asterisk <userinput
->*</userinput
->.</para>
-<para
->The filter entry saves the last 10 filters entered between sessions, to use one, press the arrow button on the right of the entry and select the desired filter string.</para
->
+<para>The Filter entry allows you to enter a filter for the files displayed in the folder view. The filter uses standard globs; patterns must be separated by white space. Example: <userinput>*.cpp *.h *.moc</userinput></para>
+<para>To display all files, enter a single asterisk <userinput>*</userinput>.</para>
+<para>The filter entry saves the last 10 filters entered between sessions, to use one, press the arrow button on the right of the entry and select the desired filter string.</para>
</listitem>
</varlistentry>
@@ -275,33 +129,13 @@
<sect1 id="kate-mdi-tools-konsole">
-<title
->The Built in Terminal Emulator</title>
-
-<para
-><indexterm
-><primary
->Terminal emulator</primary
-></indexterm
-> The built in Terminal Emulator is a copy of the &kde; &konsole; terminal application, for your convenience. It is available from the <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Show Terminal Emulator</guimenuitem
-></menuchoice
-> menu item or by pressing the <keycombo action="simul"
-><keycap
->F7</keycap
-></keycombo
-> key, and will get the focus whenever displayed. Additionally, if the <link linkend="config-dialog-general-sync-konsole"
->Sync &konsole; with active document</link
-> option is enabled, it will change into the directory of the current document if possible when it is displayed, or when the current document changes.</para>
-
-<para
->The default location in the &kate; window is at the bottom, below the editing area.</para>
-
-<para
->You can configure the &konsole; using it's &RMB; menu, for more information, see the &konsole; manual.</para>
+<title>The Built in Terminal Emulator</title>
+
+<para><indexterm><primary>Terminal emulator</primary></indexterm> The built in Terminal Emulator is a copy of the &kde; &konsole; terminal application, for your convenience. It is available from the <menuchoice><guimenu>Settings</guimenu><guimenuitem>Show Terminal Emulator</guimenuitem></menuchoice> menu item or by pressing the <keycombo action="simul"><keycap>F7</keycap></keycombo> key, and will get the focus whenever displayed. Additionally, if the <link linkend="config-dialog-general-sync-konsole">Sync &konsole; with active document</link> option is enabled, it will change into the directory of the current document if possible when it is displayed, or when the current document changes.</para>
+
+<para>The default location in the &kate; window is at the bottom, below the editing area.</para>
+
+<para>You can configure the &konsole; using it's &RMB; menu, for more information, see the &konsole; manual.</para>
</sect1>
diff --git a/tde-i18n-en_GB/docs/tdebase/kate/menus.docbook b/tde-i18n-en_GB/docs/tdebase/kate/menus.docbook
index b59173e1e7c..b9d6d439ad1 100644
--- a/tde-i18n-en_GB/docs/tdebase/kate/menus.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kate/menus.docbook
@@ -1,663 +1,289 @@
<chapter id="menu-entries">
<chapterinfo>
<authorgroup>
-<author
-><personname
-><firstname
-></firstname
-></personname
-></author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
->
+<author><personname><firstname></firstname></personname></author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>[email protected]</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit>
</authorgroup>
</chapterinfo>
-<title
->Menu Entries</title>
+<title>Menu Entries</title>
<sect1 id="file-menu">
-<title
->The <guimenu
->File</guimenu
-> Menu</title>
+<title>The <guimenu>File</guimenu> Menu</title>
<variablelist>
<varlistentry>
<term>
<anchor id="new"/>
-<menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->N</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->New</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>New</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->This command <action
->starts a new document</action
-> in the editing window. In the <guibutton
->Filelist</guibutton
-> on the left the new file is named <emphasis
->Untitled</emphasis
->. </para>
+<para>This command <action>starts a new document</action> in the editing window. In the <guibutton>Filelist</guibutton> on the left the new file is named <emphasis>Untitled</emphasis>. </para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="open"/>
-<menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->O</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Open</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>O</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Open</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->This command does not <action
->open a file</action
->. It launches &kde;'s open file dialogue box which waits for you to select the files you want to open. </para>
-
-<para
->The open file dialogue box works like a simple version of &konqueror;. Use your &LMB; to click on a file name to select it. Double-click on a file name to open that file. Once you've selected a file name, you can also press the <guibutton
->OK</guibutton
-> button to open the file. </para>
+<para>This command does not <action>open a file</action>. It launches &kde;'s open file dialogue box which waits for you to select the files you want to open. </para>
+
+<para>The open file dialogue box works like a simple version of &konqueror;. Use your &LMB; to click on a file name to select it. Double-click on a file name to open that file. Once you've selected a file name, you can also press the <guibutton>OK</guibutton> button to open the file. </para>
<tip>
-<para
->Select multiple files by holding down the &Ctrl; or the &Shift; key along with the &LMB;. <keycombo action="simul"
-> &Ctrl;<mousebutton
->Left</mousebutton
-> </keycombo
-> click selects one file at a time. <keycombo action="simul"
-> &Shift;<mousebutton
->Left</mousebutton
-> </keycombo
-> click selects a contiguous set of files. </para>
+<para>Select multiple files by holding down the &Ctrl; or the &Shift; key along with the &LMB;. <keycombo action="simul"> &Ctrl;<mousebutton>Left</mousebutton> </keycombo> click selects one file at a time. <keycombo action="simul"> &Shift;<mousebutton>Left</mousebutton> </keycombo> click selects a contiguous set of files. </para>
</tip>
-<para
->Clicking on a folder name in the file selection window opens that folder and displays its contents. Clicking on a file name shows a thumbnail view of the file in the preview window to the right of the file system window. </para>
+<para>Clicking on a folder name in the file selection window opens that folder and displays its contents. Clicking on a file name shows a thumbnail view of the file in the preview window to the right of the file system window. </para>
-<para
->Use the buttons and combo box on the toolbar above the file selection window to move through the file system or to adjust the properties of the open file dialogue box. </para>
+<para>Use the buttons and combo box on the toolbar above the file selection window to move through the file system or to adjust the properties of the open file dialogue box. </para>
-<para
->Below the file selection window is the Location combo box. Type the name of the file you want to edit here. If you click the arrow on the right of the drop down box, you can choose from recently used files. Open several files at once by quoting each file name. </para>
+<para>Below the file selection window is the Location combo box. Type the name of the file you want to edit here. If you click the arrow on the right of the drop down box, you can choose from recently used files. Open several files at once by quoting each file name. </para>
-<para
->Below the Location combo box is the Filter combo box. Enter file masks here to filter the kinds of files shown in the selection window. For example, typing the filter <literal role="extension"
->*.txt</literal
-> and pressing <keycap
->Enter</keycap
-> will limit the display to files with a <literal role="extension"
->.txt</literal
-> extension. The Filter combo contains a list of your most recently used filters. </para>
+<para>Below the Location combo box is the Filter combo box. Enter file masks here to filter the kinds of files shown in the selection window. For example, typing the filter <literal role="extension">*.txt</literal> and pressing <keycap>Enter</keycap> will limit the display to files with a <literal role="extension">.txt</literal> extension. The Filter combo contains a list of your most recently used filters. </para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="open-recent"/>
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Open Recent</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>File</guimenu> <guimenuitem>Open Recent</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->This command allows you to <action
->open a file</action
-> from a submenu that contains a list of recently edited files. </para>
+<para>This command allows you to <action>open a file</action> from a submenu that contains a list of recently edited files. </para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="save"/>
-<menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->S</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Save</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Save</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->This command <action
->saves your file</action
->. Use it often. If the file is <emphasis
->Untitled</emphasis
-> then <guimenuitem
->Save</guimenuitem
-> becomes <guimenuitem
->Save As</guimenuitem
->. </para>
+<para>This command <action>saves your file</action>. Use it often. If the file is <emphasis>Untitled</emphasis> then <guimenuitem>Save</guimenuitem> becomes <guimenuitem>Save As</guimenuitem>. </para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="save-as"/>
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Save As</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>File</guimenu> <guimenuitem>Save As</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
-><action
->Name and rename files</action
-> with this command. It launches the save file dialogue box. This dialogue works just as the open file dialogue box does. You can use it to navigate through your file system, preview existing files, or filter your file view with file masks. </para>
-
-<para
->Type the name you want to give the file you are saving in the Location combo box and press the <guibutton
->OK</guibutton
-> button. </para>
+<para><action>Name and rename files</action> with this command. It launches the save file dialogue box. This dialogue works just as the open file dialogue box does. You can use it to navigate through your file system, preview existing files, or filter your file view with file masks. </para>
+
+<para>Type the name you want to give the file you are saving in the Location combo box and press the <guibutton>OK</guibutton> button. </para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="save-all"/>
-<menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->L</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Save All</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>L</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Save All</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->This command <action
->saves all open files</action
->. </para>
+<para>This command <action>saves all open files</action>. </para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="reload"/>
-<menuchoice
-><shortcut
-> <keycombo action="simul"
-><keycap
->F5</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Reload</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut> <keycombo action="simul"><keycap>F5</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Reload</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
-><action
->Reloads the active file from disk</action
->. This command is useful if another program or process has changed the file while you have it open in &kate; </para>
+<para><action>Reloads the active file from disk</action>. This command is useful if another program or process has changed the file while you have it open in &kate; </para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="open-with"/>
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Open with</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>File</guimenu> <guimenuitem>Open with</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->This command launches the open with dialogue box that allows you to <action
->select another application to open the active file</action
->. Your file will still be open in &kate;. </para>
+<para>This command launches the open with dialogue box that allows you to <action>select another application to open the active file</action>. Your file will still be open in &kate;. </para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="print"/>
-<menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->P</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Print</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>P</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Print</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
-><action
->Print the active file</action
->. </para>
+<para><action>Print the active file</action>. </para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="close"/>
-<menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->W</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Close</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>W</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Close</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
-><action
->Close the active file</action
-> with this command. If you have made unsaved changes, you will be prompted to save the file before &kate; closes it. </para>
+<para><action>Close the active file</action> with this command. If you have made unsaved changes, you will be prompted to save the file before &kate; closes it. </para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="close-all"/>
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Close All</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>File</guimenu> <guimenuitem>Close All</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->This command <action
->closes all the files you have open</action
-> in &kate;. </para>
+<para>This command <action>closes all the files you have open</action> in &kate;. </para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="new-window"/>
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->New Window</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>File</guimenu> <guimenuitem>New Window</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
-><action
->Opens another instance of &kate;</action
->. The new instance will be identical to your previous instance. </para>
+<para><action>Opens another instance of &kate;</action>. The new instance will be identical to your previous instance. </para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="quit"/>
-<menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->Q</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Quit</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Quit</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->This command <action
->closes &kate;</action
-> and any files you were editing. If you have made unsaved changes to any of the files you were editing, you will be prompted to save them. </para>
+<para>This command <action>closes &kate;</action> and any files you were editing. If you have made unsaved changes to any of the files you were editing, you will be prompted to save them. </para>
</listitem>
</varlistentry>
</variablelist>
</sect1>
<sect1 id="edit-menu">
-<title
->The <guimenu
->Edit</guimenu
-> Menu</title>
-<para
->The <guimenu
->Edit</guimenu
-> menu contains a host of commands, all to work with the currently active document.</para>
+<title>The <guimenu>Edit</guimenu> Menu</title>
+<para>The <guimenu>Edit</guimenu> menu contains a host of commands, all to work with the currently active document.</para>
<variablelist>
-<title
->Menu Entries</title>
+<title>Menu Entries</title>
<varlistentry>
<term>
<anchor id="edit-undo"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->Z</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Undo</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>Z</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Undo</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Undo the last editing command (typing, copying, cutting etc.)</para>
-<note
-><para
->If grouped undo is enabled, this may undo several editing commands of the same type, like typing in characters.</para
-></note>
+<para>Undo the last editing command (typing, copying, cutting etc.)</para>
+<note><para>If grouped undo is enabled, this may undo several editing commands of the same type, like typing in characters.</para></note>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="edit-redo"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;&Shift;<keycap
->Z</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Redo</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>Z</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Redo</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Redo the last undo step.</para>
+<para>Redo the last undo step.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="edit-cut"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->X</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Cut</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>X</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Cut</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Removes selected text if any, and places a copy of the removed text in the clipboard.</para>
+<para>Removes selected text if any, and places a copy of the removed text in the clipboard.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="edit-copy"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->C</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Copy</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>C</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Copy</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Copies selected text, if any, to the clipboard.</para>
+<para>Copies selected text, if any, to the clipboard.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="edit-paste"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->V</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Paste</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>V</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Paste</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Copies the first item in the clipboard into the editor at cursor position.</para>
-<note
-><para
->If Overwrite Selection is enabled, the pasted text will overwrite the selection, if any.</para
-></note>
+<para>Copies the first item in the clipboard into the editor at cursor position.</para>
+<note><para>If Overwrite Selection is enabled, the pasted text will overwrite the selection, if any.</para></note>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="edit-select-all"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->A</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Select All</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>A</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Select All</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Selects all text in the editor.</para>
+<para>Selects all text in the editor.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="edit-deselect"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;&Shift;<keycap
->A</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Deselect</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>A</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Deselect</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Deselects the selected text in the editor if any.</para>
+<para>Deselects the selected text in the editor if any.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="edit-toggle-block-selection"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
-><keycap
->F4</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Toggle Block Selection</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul"><keycap>F4</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Toggle Block Selection</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Toggles Selection Mode. When the Selection Mode is <quote
->BLOCK</quote
->, you can make vertical selections, ie select column 5 to 10 in lines 9 to 15.</para>
-<para
->The status bar shows the current state of the Selection Mode, either <quote
->NORM</quote
-> or <quote
->BLK</quote
->.</para>
+<para>Toggles Selection Mode. When the Selection Mode is <quote>BLOCK</quote>, you can make vertical selections, ie select column 5 to 10 in lines 9 to 15.</para>
+<para>The status bar shows the current state of the Selection Mode, either <quote>NORM</quote> or <quote>BLK</quote>.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="edit-find"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->F</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Find</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Find</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Launch the Find Dialogue to allow you to search for text in the edited document.</para>
+<para>Launch the Find Dialogue to allow you to search for text in the edited document.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="edit-find-next"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
-><keycap
->F3</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Find Next</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul"><keycap>F3</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Find Next</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Go to the nearest downwards match of the last text or regular expression searched for, starting from cursor position</para>
+<para>Go to the nearest downwards match of the last text or regular expression searched for, starting from cursor position</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="edit-find-previous"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Shift;<keycap
->F3</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Find Previous</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Shift;<keycap>F3</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Find Previous</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Go to the nearest upwards match of the last text or regular expression searched for, starting from cursor position</para>
+<para>Go to the nearest upwards match of the last text or regular expression searched for, starting from cursor position</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="edit-replace"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->R</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Replace</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Replace</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Launch the Replace Dialogue to replace one or more instances of a defined text with something else.</para>
+<para>Launch the Replace Dialogue to replace one or more instances of a defined text with something else.</para>
</listitem>
</varlistentry>
@@ -665,129 +291,54 @@
<varlistentry>
<term>
<anchor id="edit-indent"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->I</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Indent</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>I</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Indent</guimenuitem> </menuchoice>
</term>
-<listitem
-><!-- FIXME LINK -->
-<para
->Adds one indent step to the current line, or all lines covered by a possible selection.</para>
-<para
->The indentation depends on the settings in the Indent Page of the Configuration Dialogue.</para>
+<listitem><!-- FIXME LINK -->
+<para>Adds one indent step to the current line, or all lines covered by a possible selection.</para>
+<para>The indentation depends on the settings in the Indent Page of the Configuration Dialogue.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="edit-unindent"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;&Shift;<keycap
->I</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Unindent</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>I</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Unindent</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Removes one indent step from the current line, or all lines covered by a possible selection.</para>
-<para
->The indentation depends on the settings in the Indent Page of the Configuration Dialogue.</para>
+<para>Removes one indent step from the current line, or all lines covered by a possible selection.</para>
+<para>The indentation depends on the settings in the Indent Page of the Configuration Dialogue.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="edit-comment"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->#</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Comment</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>#</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Comment</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Enclose or prepend the current line, or any selected text, with (a) comment marker(s), according to the rules defined by the syntax rules for the document. Does nothing if no comment rules are defined.</para>
-<para
->This is interesting mostly when working with source code, for example with C/C++, perl, python &etc;, as well as with markup text like <acronym
->HTML</acronym
->, &XML;, <acronym
->CSS</acronym
-> and so on.</para>
+<para>Enclose or prepend the current line, or any selected text, with (a) comment marker(s), according to the rules defined by the syntax rules for the document. Does nothing if no comment rules are defined.</para>
+<para>This is interesting mostly when working with source code, for example with C/C++, perl, python &etc;, as well as with markup text like <acronym>HTML</acronym>, &XML;, <acronym>CSS</acronym> and so on.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="edit-uncomment"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;&Shift;<keycap
->#</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
-></guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>#</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem></guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Remove comment marker(s) from the current line, or a possible selection, according to the syntax rules for the document. </para>
-<para
->See also <link linkend="edit-comment"
-><guimenu
->Edit</guimenu
-><guimenuitem
->Comment</guimenuitem
-></link
-></para>
+<para>Remove comment marker(s) from the current line, or a possible selection, according to the syntax rules for the document. </para>
+<para>See also <link linkend="edit-comment"><guimenu>Edit</guimenu><guimenuitem>Comment</guimenuitem></link></para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="edit-go-to-line"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->G</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Go to line...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>G</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Go to line...</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Launches the Go To Line Dialogue, allowing you to enter the number of a line to find in the document</para>
+<para>Launches the Go To Line Dialogue, allowing you to enter the number of a line to find in the document</para>
</listitem>
</varlistentry>
@@ -796,97 +347,44 @@
</sect1>
<sect1 id="document-menu">
-<title
->The <guimenu
->Document</guimenu
->Menu</title>
-<para
->The <guimenu
->Document</guimenu
-> menu has two purposes:</para>
+<title>The <guimenu>Document</guimenu>Menu</title>
+<para>The <guimenu>Document</guimenu> menu has two purposes:</para>
<itemizedlist>
-<listitem
-><para
->Allowing you to change the document-specific settings for the currently active document.</para
-></listitem>
-<listitem
-><para
->Choosing which of the open documents to work on</para
-></listitem>
+<listitem><para>Allowing you to change the document-specific settings for the currently active document.</para></listitem>
+<listitem><para>Choosing which of the open documents to work on</para></listitem>
</itemizedlist>
-<para
->A menu entry for each open document will be available below the entries documented here. Clicking one of these will bring the requested document to focus. If you have multiple frames, an editor for that document will be displayed in the currently active frame.</para>
+<para>A menu entry for each open document will be available below the entries documented here. Clicking one of these will bring the requested document to focus. If you have multiple frames, an editor for that document will be displayed in the currently active frame.</para>
<variablelist>
-<title
->Menu items</title>
+<title>Menu items</title>
<varlistentry>
<term>
<anchor id="document-back"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Alt;<keycap
->Left</keycap
-></keycombo
-></shortcut
-> <guimenu
->Document</guimenu
-> <guimenuitem
->Back</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Alt;<keycap>Left</keycap></keycombo></shortcut> <guimenu>Document</guimenu> <guimenuitem>Back</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->This will bring the previous document in the stack in focus. If you have multiple frames, an editor for the document will be displayed in the currently active frame.</para
-> <para
->The order is the order in which documents were opened, rather than a logical history. This behaviour may change in future versions of &kate;.</para>
+<para>This will bring the previous document in the stack in focus. If you have multiple frames, an editor for the document will be displayed in the currently active frame.</para> <para>The order is the order in which documents were opened, rather than a logical history. This behaviour may change in future versions of &kate;.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="document-forward"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Alt;<keycap
->Right</keycap
-></keycombo
-></shortcut
-> <guimenu
->Document</guimenu
-> <guimenuitem
->Forward</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Alt;<keycap>Right</keycap></keycombo></shortcut> <guimenu>Document</guimenu> <guimenuitem>Forward</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->This will bring the previous document in the stack in focus. If you have multiple frames, an editor for the document will be displayed in the currently active frame.</para>
-<para
->The order is the order in which the documents were opened, rather than a logical history. This behaviour may change in future versions of &kate;.</para>
+<para>This will bring the previous document in the stack in focus. If you have multiple frames, an editor for the document will be displayed in the currently active frame.</para>
+<para>The order is the order in which the documents were opened, rather than a logical history. This behaviour may change in future versions of &kate;.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="document-highlight-mode"/>
-<menuchoice
-><guimenu
->Document</guimenu
-> <guisubmenu
->Highlight Mode</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Document</guimenu> <guisubmenu>Highlight Mode</guisubmenu> </menuchoice>
</term>
<listitem>
-<para
->The <guimenu
->Highlight Mode</guimenu
-> menu allows you to manually decide which syntax rules to use for highlighting and <link linkend="edit-comment"
-><guimenuitem
->comment</guimenuitem
-></link
->'ing the active document. The menu groups the available syntax rule sets into logical groups.</para>
+<para>The <guimenu>Highlight Mode</guimenu> menu allows you to manually decide which syntax rules to use for highlighting and <link linkend="edit-comment"><guimenuitem>comment</guimenuitem></link>'ing the active document. The menu groups the available syntax rule sets into logical groups.</para>
<!-- FIXME link to syntax rules chapter, when written :) -->
</listitem>
</varlistentry>
@@ -894,53 +392,27 @@
<varlistentry>
<term>
<anchor id="document-end-of-line"/>
-<menuchoice
-><guimenu
->Document</guimenu
-> <guisubmenu
->End of Line</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Document</guimenu> <guisubmenu>End of Line</guisubmenu> </menuchoice>
</term>
<listitem>
-<para
->This menu allows you to manually set the End of Line mode for the active document. Changing the mode will replace all line separators in the document with the character sequence for the new mode.</para>
+<para>This menu allows you to manually set the End of Line mode for the active document. Changing the mode will replace all line separators in the document with the character sequence for the new mode.</para>
-<para
->The available modes are:</para>
+<para>The available modes are:</para>
<variablelist>
<varlistentry>
-<term
-><guimenuitem
->Unix</guimenuitem
-></term>
+<term><guimenuitem>Unix</guimenuitem></term>
<listitem>
-<para
->On &UNIX; systems, end of line is a single newline character.</para
-></listitem>
+<para>On &UNIX; systems, end of line is a single newline character.</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><guimenuitem
->DOS</guimenuitem
-></term>
-<listitem
-><para
->On <acronym
->DOS</acronym
-> (and &Windows;) systems, end of line is represented by a carriage return followed by a newline.</para
-></listitem>
+<term><guimenuitem>DOS</guimenuitem></term>
+<listitem><para>On <acronym>DOS</acronym> (and &Windows;) systems, end of line is represented by a carriage return followed by a newline.</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><guimenuitem
->Mac</guimenuitem
-></term>
-<listitem
-><para
->On &Mac; systems, end of line is represented by a by a carriage return.</para
-></listitem>
+<term><guimenuitem>Mac</guimenuitem></term>
+<listitem><para>On &Mac; systems, end of line is represented by a by a carriage return.</para></listitem>
</varlistentry>
</variablelist>
</listitem>
@@ -949,157 +421,69 @@
</sect1>
<sect1 id="view-menu">
-<title
->The <guimenu
->View</guimenu
-> menu</title>
+<title>The <guimenu>View</guimenu> menu</title>
-<para
->The <guimenu
->View</guimenu
-> menu allows you to manage settings specific to the active editor, and to manage frames.</para>
+<para>The <guimenu>View</guimenu> menu allows you to manage settings specific to the active editor, and to manage frames.</para>
<variablelist>
-<title
->Menu Items</title>
+<title>Menu Items</title>
<varlistentry>
<term>
<anchor id="view-split-vertical"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;&Shift;<keycap
->L</keycap
-></keycombo
-></shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Split Vertical</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>L</keycap></keycombo></shortcut> <guimenu>View</guimenu> <guimenuitem>Split Vertical</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->This will split the frame (which may be the main editing area) in two equally sized frames, the new one to the left of the current one. The new frame gets the focus, and will display the same document as the old one.</para>
-<para
->See also <link linkend="kate-mdi"
->Working with the &kate; MDI</link
-></para>
+<para>This will split the frame (which may be the main editing area) in two equally sized frames, the new one to the left of the current one. The new frame gets the focus, and will display the same document as the old one.</para>
+<para>See also <link linkend="kate-mdi">Working with the &kate; MDI</link></para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="view-split-horizontal"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;&Shift;<keycap
->T</keycap
-></keycombo
-></shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Split Horizontal</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>T</keycap></keycombo></shortcut> <guimenu>View</guimenu> <guimenuitem>Split Horizontal</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Splits the current frame (which may be the main editing area) in two equally sized frames, the new one at the bottom half. The new frame gets the focus, and displays the same document as the old one.</para>
-<para
->See also <link linkend="kate-mdi"
->Working with the &kate; MDI</link
-></para>
+<para>Splits the current frame (which may be the main editing area) in two equally sized frames, the new one at the bottom half. The new frame gets the focus, and displays the same document as the old one.</para>
+<para>See also <link linkend="kate-mdi">Working with the &kate; MDI</link></para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="view-close-current"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;&Shift;<keycap
->R</keycap
-></keycombo
-></shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Close Current</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>R</keycap></keycombo></shortcut> <guimenu>View</guimenu> <guimenuitem>Close Current</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Closes the active frame. This is disabled, if there is only one frame (the main editing area).</para
-> <para
->No documents get closed by closing a frame &ndash; they will still be available in the <link linkend="document-menu"
-><guimenu
->Documents</guimenu
-> Menu</link
-> as well as in the File List.</para
-> <para
->See also <link linkend="kate-mdi"
->Working with the &kate; MDI</link
-></para>
+<para>Closes the active frame. This is disabled, if there is only one frame (the main editing area).</para> <para>No documents get closed by closing a frame &ndash; they will still be available in the <link linkend="document-menu"><guimenu>Documents</guimenu> Menu</link> as well as in the File List.</para> <para>See also <link linkend="kate-mdi">Working with the &kate; MDI</link></para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="view-show-icon-border"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
-><keycap
->F6</keycap
-></keycombo
-></shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Show Icon Border</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul"><keycap>F6</keycap></keycombo></shortcut> <guimenu>View</guimenu> <guimenuitem>Show Icon Border</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->This is a toggle item. Setting it on checked will make the side of the active editor, and vice versa.</para>
+<para>This is a toggle item. Setting it on checked will make the side of the active editor, and vice versa.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="view-show-line-numbers"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
-><keycap
->F11</keycap
-></keycombo
-></shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Show Line Numbers</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul"><keycap>F11</keycap></keycombo></shortcut> <guimenu>View</guimenu> <guimenuitem>Show Line Numbers</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->This is a toggle Item. Setting it on checked will make a pane displaying the line numbers of the document visible in the left border of the active editor, and vice versa.</para>
+<para>This is a toggle Item. Setting it on checked will make a pane displaying the line numbers of the document visible in the left border of the active editor, and vice versa.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="view-go"/>
-<menuchoice
-><guimenu
->View</guimenu
-> <guisubmenu
->Go</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guisubmenu>Go</guisubmenu> </menuchoice>
</term>
<listitem>
@@ -1108,48 +492,22 @@
<varlistentry>
<term>
<anchor id="view-go-next-view"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
-><keycap
->F8</keycap
-></keycombo
-></shortcut
-> <guimenuitem
->Next View</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul"><keycap>F8</keycap></keycombo></shortcut> <guimenuitem>Next View</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Move focus to the next frame; the order is following order of creation rather than that of visual logic. This behaviour may change in a future version of &kate;</para>
-<para
->See also <link linkend="kate-mdi"
->Working with the &kate; MDI</link
-></para>
+<para>Move focus to the next frame; the order is following order of creation rather than that of visual logic. This behaviour may change in a future version of &kate;</para>
+<para>See also <link linkend="kate-mdi">Working with the &kate; MDI</link></para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="view-go-previous-view"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Shift;<keycap
->F8</keycap
-></keycombo
-></shortcut
-> <guimenuitem
->Previous View</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Shift;<keycap>F8</keycap></keycombo></shortcut> <guimenuitem>Previous View</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Move focus to the previous frame; the order is following order of creation rather than that of visual logic. This behaviour may change in a future version of &kate;</para>
-<para
->See also <link linkend="kate-mdi"
->Working with the &kate; MDI</link
-></para>
+<para>Move focus to the previous frame; the order is following order of creation rather than that of visual logic. This behaviour may change in a future version of &kate;</para>
+<para>See also <link linkend="kate-mdi">Working with the &kate; MDI</link></para>
</listitem>
</varlistentry>
@@ -1166,59 +524,33 @@
</sect1>
<sect1 id="bookmarks-menu">
-<title
->The <guimenu
->Bookmarks</guimenu
-> Menu</title>
+<title>The <guimenu>Bookmarks</guimenu> Menu</title>
-<para
->The <guimenu
->Bookmarks</guimenu
-> menu allows you to work with the bookmarks in the currently active document.</para>
+<para>The <guimenu>Bookmarks</guimenu> menu allows you to work with the bookmarks in the currently active document.</para>
-<para
->Below the entries described here, one entry for each bookmark in the active document will be available. The text will be the first few words of the marked line. Choose an item to move the cursor to the start of that line. The editor will scroll as necessary to make that line visible.</para>
+<para>Below the entries described here, one entry for each bookmark in the active document will be available. The text will be the first few words of the marked line. Choose an item to move the cursor to the start of that line. The editor will scroll as necessary to make that line visible.</para>
<variablelist>
-<title
->Menu Items</title>
+<title>Menu Items</title>
<varlistentry>
<term>
<anchor id="bookmarks-toggle-bookmark"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->B</keycap
-></keycombo
-></shortcut
-> <guimenu
->Bookmarks</guimenu
-> <guimenuitem
->Toggle Bookmark</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>B</keycap></keycombo></shortcut> <guimenu>Bookmarks</guimenu> <guimenuitem>Toggle Bookmark</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Sets or removes a bookmark in the current line of the active document. (If it's there, it is removed, otherwise one is set.)</para>
+<para>Sets or removes a bookmark in the current line of the active document. (If it's there, it is removed, otherwise one is set.)</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="bookmarks-clear-bookmarks"/>
-<menuchoice
-><guimenu
->Bookmarks</guimenu
-> <guimenuitem
->Clear Bookmarks</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Bookmarks</guimenu> <guimenuitem>Clear Bookmarks</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Clears (removes) all bookmarks of the active document.</para>
+<para>Clears (removes) all bookmarks of the active document.</para>
</listitem>
</varlistentry>
@@ -1229,30 +561,12 @@
<sect1 id="tools-menu">
-<title
->The <guimenu
->Tools</guimenu
-> Menu</title>
-
-<para
->The <guimenu
->Tools</guimenu
-> menu contains commands of two categories: <itemizedlist>
-<listitem
-><para
->Tools doing advanced editing of the current document, for example <link linkend="tools-menu-editing-command"
-><guimenuitem
->Editing Command</guimenuitem
-></link
->.</para>
+<title>The <guimenu>Tools</guimenu> Menu</title>
+
+<para>The <guimenu>Tools</guimenu> menu contains commands of two categories: <itemizedlist>
+<listitem><para>Tools doing advanced editing of the current document, for example <link linkend="tools-menu-editing-command"><guimenuitem>Editing Command</guimenuitem></link>.</para>
</listitem>
-<listitem
-><para
->Tools adding functionality to the application, for example the <link linkend="tools-menu-find-in-files"
-><guimenuitem
->Find in Files</guimenuitem
-></link
-> tool.</para>
+<listitem><para>Tools adding functionality to the application, for example the <link linkend="tools-menu-find-in-files"><guimenuitem>Find in Files</guimenuitem></link> tool.</para>
</listitem>
</itemizedlist>
</para>
@@ -1262,62 +576,30 @@
<varlistentry>
<term>
<anchor id="tools-menu-editing-command"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->M</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Editing Command...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>M</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Editing Command...</guimenuitem> </menuchoice>
</term>
-<listitem
-><!-- FIXME LINK, DOCUMENT THAT TODO: add a minimal desc here-->
-<para
->Launch the Editing Command Dialogue</para>
+<listitem><!-- FIXME LINK, DOCUMENT THAT TODO: add a minimal desc here-->
+<para>Launch the Editing Command Dialogue</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="tools-menu-find-in-files"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;&Shift;<keycap
->F</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Find in Files...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>F</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Find in Files...</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Launch the Find In Files Dialogue to search for a specified text in files on disk.</para>
+<para>Launch the Find In Files Dialogue to search for a specified text in files on disk.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="tools-menu-apply-word-wrap"/>
-<menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Apply Word Wrap</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Edit</guimenu> <guimenuitem>Apply Word Wrap</guimenuitem> </menuchoice>
</term>
-<listitem
-><!-- FIXME LINKS TEST MORE? //-->
-<para
->Apply word wrap to ? according to the settings in the ? </para>
+<listitem><!-- FIXME LINKS TEST MORE? //-->
+<para>Apply word wrap to ? according to the settings in the ? </para>
</listitem>
</varlistentry>
@@ -1325,16 +607,10 @@
<varlistentry>
<term>
<anchor id="tools-menu-spelling"/>
-<menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Spelling...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Edit</guimenu> <guimenuitem>Spelling...</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Spell check the current document using the &kde; spell checker</para>
+<para>Spell check the current document using the &kde; spell checker</para>
</listitem>
</varlistentry>
@@ -1346,111 +622,61 @@
<sect1 id="settings-menu">
-<title
->The <guimenu
->Settings</guimenu
-> Menu</title>
+<title>The <guimenu>Settings</guimenu> Menu</title>
-<para
->The <guimenu
->Settings</guimenu
-> menu allows you to change the properties of the main window, such as showing/hiding toolbars and boxes, and provides access to the configuration dialogues.</para>
+<para>The <guimenu>Settings</guimenu> menu allows you to change the properties of the main window, such as showing/hiding toolbars and boxes, and provides access to the configuration dialogues.</para>
<variablelist>
<varlistentry>
<term>
<anchor id="settings-show-toolbar"/>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show Toolbar</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Toolbar</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Toggles the display of the main toolbar.</para>
+<para>Toggles the display of the main toolbar.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="settings-show-filelist"/>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show Filelist</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Filelist</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Toggle the display of the &kate; Filelist</para>
+<para>Toggle the display of the &kate; Filelist</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="settings-show-fileselector"/>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show Fileselector</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Fileselector</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Toggle the display of the &kate; File Selector</para>
+<para>Toggle the display of the &kate; File Selector</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="settings-show-konsole"/>
-<menuchoice
-><shortcut
-><keycombo action="simul"
-><keycap
->F7</keycap
-></keycombo
-></shortcut
-> <guimenu
->Settings</guimenu
-> <guimenuitem
->Show Konsole</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul"><keycap>F7</keycap></keycombo></shortcut> <guimenu>Settings</guimenu> <guimenuitem>Show Konsole</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Toggles the display of the built in terminal emulator.</para>
-<para
->When activated the first time, the terminal will be created.</para>
-<para
->When the terminal emulator is displayed, it will get the focus, so that you can start typing in commands immediately. If the <link linkend="config-dialog-general-sync-konsole"
->Sync Konsole with Active Document</link
-> option is enabled in the <link linkend="config-dialog-general"
->General Page</link
-> of the <link linkend="config-dialog"
->Main configuration dialogue</link
-> the shell session will change to the directory of the active document, if it is a local file.</para>
+<para>Toggles the display of the built in terminal emulator.</para>
+<para>When activated the first time, the terminal will be created.</para>
+<para>When the terminal emulator is displayed, it will get the focus, so that you can start typing in commands immediately. If the <link linkend="config-dialog-general-sync-konsole">Sync Konsole with Active Document</link> option is enabled in the <link linkend="config-dialog-general">General Page</link> of the <link linkend="config-dialog">Main configuration dialogue</link> the shell session will change to the directory of the active document, if it is a local file.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="settings-configure-shortcuts"/>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Shortcuts</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Shortcuts</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Display the the familiar &kde; Keyboard Shortcut Configuration Dialogue.</para>
+<para>Display the the familiar &kde; Keyboard Shortcut Configuration Dialogue.</para>
</listitem>
</varlistentry>
@@ -1458,34 +684,20 @@
<varlistentry>
<term>
<anchor id="settings-configure-toolbars"/>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Toolbars</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Toolbars</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Display the the familiar &kde; Toolbar Configuration Dialogue.</para>
+<para>Display the the familiar &kde; Toolbar Configuration Dialogue.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<anchor id="settings-configure-kate"/>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure &kate;</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure &kate;</guimenuitem> </menuchoice>
</term>
<listitem>
-<para
->Launch the <link linkend="config-dialog"
->Main Configuration Dialogue</link
-></para>
+<para>Launch the <link linkend="config-dialog">Main Configuration Dialogue</link></para>
</listitem>
</varlistentry>
@@ -1496,20 +708,11 @@
<sect1 id="help-menu">
-<title
->The <guimenu
->Help</guimenu
-> Menu</title>
+<title>The <guimenu>Help</guimenu> Menu</title>
-<para
->The <guimenu
->Help</guimenu
-> menu provides access to the online help available for &kate;; as well as to the usual about dialogues.</para>
+<para>The <guimenu>Help</guimenu> menu provides access to the online help available for &kate;; as well as to the usual about dialogues.</para>
-<para
->As well as the standard &kde; <guimenu
->Help</guimenu
-> menu items described below, if you have installed the tdeaddons package with additional &kate; plugins, you will have a menu entry to show the Plugins User Manuals.</para>
+<para>As well as the standard &kde; <guimenu>Help</guimenu> menu items described below, if you have installed the tdeaddons package with additional &kate; plugins, you will have a menu entry to show the Plugins User Manuals.</para>
&help.menu.documentation; </sect1>
</chapter>
diff --git a/tde-i18n-en_GB/docs/tdebase/kate/part.docbook b/tde-i18n-en_GB/docs/tdebase/kate/part.docbook
index f0e11a9d57c..24d3c81be3d 100644
--- a/tde-i18n-en_GB/docs/tdebase/kate/part.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kate/part.docbook
@@ -1,303 +1,136 @@
<chapter id="kate-part">
<chapterinfo>
<authorgroup>
-<author
-><personname
-><firstname
-></firstname
-></personname
-></author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
->
+<author><personname><firstname></firstname></personname></author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>[email protected]</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit>
</authorgroup>
</chapterinfo>
-<title
->Working with the &kate; editor</title>
+<title>Working with the &kate; editor</title>
<sect1 id="kate-part-overview">
-<title
->Overview</title>
+<title>Overview</title>
-<para
->The &kate; editor is the editing area of the &kate; window. This editor is also used by &kwrite;, and it can be used in &konqueror; for displaying text files from your local computer, or from the network.</para>
+<para>The &kate; editor is the editing area of the &kate; window. This editor is also used by &kwrite;, and it can be used in &konqueror; for displaying text files from your local computer, or from the network.</para>
-<para
->The editor is composed of the following components:</para>
+<para>The editor is composed of the following components:</para>
<variablelist>
<varlistentry>
-<term
->The editing area</term>
-<listitem
-><para
->This is where the text of your document is located.</para
-></listitem>
+<term>The editing area</term>
+<listitem><para>This is where the text of your document is located.</para></listitem>
</varlistentry>
<varlistentry>
-<term
->The Scroll bars</term>
+<term>The Scroll bars</term>
<listitem>
-<para
->The scroll bars indicate the position of the visible part of the document text, and can be used to move around the document. Dragging the scrollbars will not cause the insertion cursor to be moved.</para>
-<para
->The scroll bars are displayed and hidden as required.</para>
+<para>The scroll bars indicate the position of the visible part of the document text, and can be used to move around the document. Dragging the scrollbars will not cause the insertion cursor to be moved.</para>
+<para>The scroll bars are displayed and hidden as required.</para>
</listitem>
</varlistentry>
<varlistentry>
-<term
->The Icon Border</term>
+<term>The Icon Border</term>
<listitem>
-<para
->The icon border is a small pane on the left side of the editor, displaying a small icon next to marked lines.</para>
-<para
->You can set or remove a <link linkend="kate-part-bookmarks"
->bookmark</link
-> in a visible line by clicking the &LMB; in the icon border next to that line.</para>
-<para
->The display of the icon border can be toggled using the <menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Show Icon Border</guimenuitem
-></menuchoice
-> menu item.</para
->
+<para>The icon border is a small pane on the left side of the editor, displaying a small icon next to marked lines.</para>
+<para>You can set or remove a <link linkend="kate-part-bookmarks">bookmark</link> in a visible line by clicking the &LMB; in the icon border next to that line.</para>
+<para>The display of the icon border can be toggled using the <menuchoice><guimenu>View</guimenu> <guimenuitem>Show Icon Border</guimenuitem></menuchoice> menu item.</para>
</listitem>
</varlistentry>
<varlistentry>
-<term
->The Line Numbers Pane</term>
+<term>The Line Numbers Pane</term>
<listitem>
-<para
->The Line numbers pane shows the line numbers of all visible lines in the document.</para
->
-<para
->The display of the Line Numbers Pane can be toggled using the <menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Show Line Numbers</guimenuitem
-></menuchoice
-> menu item.</para>
+<para>The Line numbers pane shows the line numbers of all visible lines in the document.</para>
+<para>The display of the Line Numbers Pane can be toggled using the <menuchoice><guimenu>View</guimenu> <guimenuitem>Show Line Numbers</guimenuitem></menuchoice> menu item.</para>
</listitem>
</varlistentry>
</variablelist>
<itemizedlist>
-<title
->Also in this Chapter:</title>
-<listitem
-><para
-><link linkend="kate-part-navigation"
->Navigating in the Text</link
-> </para
-></listitem>
-<listitem
-><para
-><link linkend="kate-part-selection"
->Working with the Selection</link
-></para
-></listitem>
-<listitem
-><para
-><link linkend="kate-part-copy-and-paste"
->Copying and Pasting Text</link
-></para
-></listitem>
-<listitem
-><para
-><link linkend="kate-part-find-replace"
->Finding and Replacing Text</link
-></para
-></listitem>
-<listitem
-><para
-><link linkend="kate-part-bookmarks"
->Using Bookmarks</link
-></para
-></listitem>
-<listitem
-><para
-><link linkend="kate-part-auto-wrap"
->Automatically Wrapping Text</link
-></para
-></listitem>
+<title>Also in this Chapter:</title>
+<listitem><para><link linkend="kate-part-navigation">Navigating in the Text</link> </para></listitem>
+<listitem><para><link linkend="kate-part-selection">Working with the Selection</link></para></listitem>
+<listitem><para><link linkend="kate-part-copy-and-paste">Copying and Pasting Text</link></para></listitem>
+<listitem><para><link linkend="kate-part-find-replace">Finding and Replacing Text</link></para></listitem>
+<listitem><para><link linkend="kate-part-bookmarks">Using Bookmarks</link></para></listitem>
+<listitem><para><link linkend="kate-part-auto-wrap">Automatically Wrapping Text</link></para></listitem>
</itemizedlist>
</sect1>
<sect1 id="kate-part-navigation">
-<title
->Navigating in the Text</title>
+<title>Navigating in the Text</title>
-<para
->This section is not yet documented.</para>
+<para>This section is not yet documented.</para>
</sect1>
<sect1 id="kate-part-selection">
-<title
->Working with the Selection</title>
+<title>Working with the Selection</title>
-<para
->There are two basic ways of selecting text in &kate;: using the mouse, and using the keyboard.</para>
+<para>There are two basic ways of selecting text in &kate;: using the mouse, and using the keyboard.</para>
-<para
->To select using the mouse, hold down the &LMB; while dragging the mouse cursor from where the selection should start, to the desired end point. The text gets selected as you drag.</para>
+<para>To select using the mouse, hold down the &LMB; while dragging the mouse cursor from where the selection should start, to the desired end point. The text gets selected as you drag.</para>
-<para
->Double-clicking a word will select that word.</para>
+<para>Double-clicking a word will select that word.</para>
-<para
->Triple-clicking in a line will select the entire line.</para>
+<para>Triple-clicking in a line will select the entire line.</para>
-<para
->If &Shift; is held down while clicking, text will be selected:</para>
+<para>If &Shift; is held down while clicking, text will be selected:</para>
<itemizedlist>
-<listitem
-><para
->If nothing is already selected, from the text cursor position to the mouse cursor position.</para
-></listitem>
-<listitem
-><para
->If there is a selection, from and including that selection to the mouse cursor position</para
-></listitem>
+<listitem><para>If nothing is already selected, from the text cursor position to the mouse cursor position.</para></listitem>
+<listitem><para>If there is a selection, from and including that selection to the mouse cursor position</para></listitem>
</itemizedlist>
<note>
-<para
->When selecting text by dragging the mouse, the selected text is copied to the clipboard, and can be pasted by clicking the middle mouse button in the editor, or in any other application to which you want to paste the text. </para>
+<para>When selecting text by dragging the mouse, the selected text is copied to the clipboard, and can be pasted by clicking the middle mouse button in the editor, or in any other application to which you want to paste the text. </para>
</note>
-<para
->To select using the keyboard, hold down the &Shift; key while using the navigation keys (The Arrow keys, <keycap
->Page Up</keycap
->, <keycap
->Page Down</keycap
->, <keycap
->Home</keycap
-> and <keycap
->End</keycap
->, possibly in combination with &Ctrl; to extend the move of the text cursor).</para>
-
-<para
->See also the section <link linkend="kate-part-navigation"
->Navigating in the Text</link
-> in this Chapter.</para>
-
-<para
->To <action
->Copy</action
-> the current selection, use the <menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Copy</guimenuitem
-></menuchoice
-> menu item or the keyboard shortcut (defaults to <keycombo action="simul"
->&Ctrl;<keycap
->C</keycap
-></keycombo
->).</para>
-
-<para
->To <action
->Deselect</action
-> the current selection, use the <menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Deselect</guimenuitem
-></menuchoice
-> menu item, or the keyboard shortcut (default is <keycombo action="simul"
->&Ctrl;&Shift;<keycap
->A</keycap
-></keycombo
->), or click with the &LMB; in the editor.</para>
+<para>To select using the keyboard, hold down the &Shift; key while using the navigation keys (The Arrow keys, <keycap>Page Up</keycap>, <keycap>Page Down</keycap>, <keycap>Home</keycap> and <keycap>End</keycap>, possibly in combination with &Ctrl; to extend the move of the text cursor).</para>
+
+<para>See also the section <link linkend="kate-part-navigation">Navigating in the Text</link> in this Chapter.</para>
+
+<para>To <action>Copy</action> the current selection, use the <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Copy</guimenuitem></menuchoice> menu item or the keyboard shortcut (defaults to <keycombo action="simul">&Ctrl;<keycap>C</keycap></keycombo>).</para>
+
+<para>To <action>Deselect</action> the current selection, use the <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Deselect</guimenuitem></menuchoice> menu item, or the keyboard shortcut (default is <keycombo action="simul">&Ctrl;&Shift;<keycap>A</keycap></keycombo>), or click with the &LMB; in the editor.</para>
<sect2 id="kate-part-selection-block">
-<title
->Using Block Selection</title>
-
-<para
->When Block Selection is enabled, you can make <quote
->vertical selections</quote
-> in the text, meaning selecting limited columns from multiple lines. This is handy for working with tab separated lines for example.</para>
-
-<para
->Block Selection can be toggled using the <menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Toggle Block Selection</guimenuitem
-></menuchoice
-> menu item. The default keyboard shortcut is <keycap
->F4</keycap
-></para>
+<title>Using Block Selection</title>
+
+<para>When Block Selection is enabled, you can make <quote>vertical selections</quote> in the text, meaning selecting limited columns from multiple lines. This is handy for working with tab separated lines for example.</para>
+
+<para>Block Selection can be toggled using the <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Toggle Block Selection</guimenuitem></menuchoice> menu item. The default keyboard shortcut is <keycap>F4</keycap></para>
</sect2>
<sect2 id="kate-part-seleciton-overwrite">
-<title
->Using Overwrite Selection</title>
+<title>Using Overwrite Selection</title>
-<para
->If Overwrite Selection is enabled, typing or pasting text into the selection will cause the selected text to be replaced. If not enabled, new text will be added at the position of the text cursor.</para>
+<para>If Overwrite Selection is enabled, typing or pasting text into the selection will cause the selected text to be replaced. If not enabled, new text will be added at the position of the text cursor.</para>
-<para
->Overwrite Selection is enabled by default.</para>
+<para>Overwrite Selection is enabled by default.</para>
-<para
->To change the setting for this option, use the <link linkend="config-dialog-editor-select"
->Select Page</link
-> of the <link linkend="config-dialog"
->Configuration Dialogue</link
->.</para>
+<para>To change the setting for this option, use the <link linkend="config-dialog-editor-select">Select Page</link> of the <link linkend="config-dialog">Configuration Dialogue</link>.</para>
</sect2>
<sect2 id="kate-part-selection-persistent">
-<title
->Using Persistent Selection</title>
+<title>Using Persistent Selection</title>
-<para
->When Persistent selection is enabled, typing characters or moving the cursor will not cause the Selection to become deselected. This means that you can move the cursor away from the selection and type text.</para>
+<para>When Persistent selection is enabled, typing characters or moving the cursor will not cause the Selection to become deselected. This means that you can move the cursor away from the selection and type text.</para>
-<para
->Persistent Selection is disabled by default.</para>
+<para>Persistent Selection is disabled by default.</para>
-<para
->Persistent Selection can be enabled in the <link linkend="config-dialog-editor-select"
->Select Page</link
-> of the <link linkend="config-dialog"
->Configuration Dialogue</link
->.</para>
+<para>Persistent Selection can be enabled in the <link linkend="config-dialog-editor-select">Select Page</link> of the <link linkend="config-dialog">Configuration Dialogue</link>.</para>
<warning>
-<para
->If Persistent Selection and Overwrite Selection are both enabled, typing or pasting text when the text cursor is inside the selection will cause it to be replaced and deselected.</para>
+<para>If Persistent Selection and Overwrite Selection are both enabled, typing or pasting text when the text cursor is inside the selection will cause it to be replaced and deselected.</para>
</warning>
</sect2>
@@ -306,325 +139,152 @@
<sect1 id="kate-part-copy-and-paste">
-<title
->Copying and Pasting Text</title>
-
-<para
->To copy text, select it and use the <menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Copy</guimenuitem
-></menuchoice
-> menu item. Additionally, selecting text with the mouse will cause selected text to be copied to the clipboard.</para>
-
-<para
->To paste the text currently in the clipboard, use the <menuchoice
-> <guimenu
->Edit</guimenu
-><guimenuitem
->Paste</guimenuitem
-></menuchoice
-> menu item.</para>
-
-<para
->Additionally, text selected with the mouse may be pasted by clicking the <mousebutton
->middle</mousebutton
-> mouse button at the desired position.</para>
+<title>Copying and Pasting Text</title>
+
+<para>To copy text, select it and use the <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Copy</guimenuitem></menuchoice> menu item. Additionally, selecting text with the mouse will cause selected text to be copied to the clipboard.</para>
+
+<para>To paste the text currently in the clipboard, use the <menuchoice> <guimenu>Edit</guimenu><guimenuitem>Paste</guimenuitem></menuchoice> menu item.</para>
+
+<para>Additionally, text selected with the mouse may be pasted by clicking the <mousebutton>middle</mousebutton> mouse button at the desired position.</para>
<tip>
-<para
->If you are using the &kde; desktop, you can retrieve earlier copied text from any application using the &klipper; icon in the &kicker; icon tray.</para>
+<para>If you are using the &kde; desktop, you can retrieve earlier copied text from any application using the &klipper; icon in the &kicker; icon tray.</para>
</tip>
</sect1>
<sect1 id="kate-part-find-replace">
-<title
->Finding and Replacing Text</title>
+<title>Finding and Replacing Text</title>
<sect2 id="find-replace-dialog">
-<title
->The <guilabel
->Find Text</guilabel
-> and <guilabel
->Replace Text</guilabel
-> Dialogues</title>
+<title>The <guilabel>Find Text</guilabel> and <guilabel>Replace Text</guilabel> Dialogues</title>
-<para
->The Find and Replace Text dialogues in &kate; are very much the same, except the Replace Text dialogue offers the means of entering a replacement string along with a few extra options.</para>
+<para>The Find and Replace Text dialogues in &kate; are very much the same, except the Replace Text dialogue offers the means of entering a replacement string along with a few extra options.</para>
-<para
->The dialogues offer the following common options:</para>
+<para>The dialogues offer the following common options:</para>
<variablelist>
<varlistentry>
-<term
-><guilabel
->Text to Find</guilabel
-></term>
-<listitem
-><para
->This is where to enter the search string. The interpretation of the string depends on some of the options described below.</para
-></listitem>
+<term><guilabel>Text to Find</guilabel></term>
+<listitem><para>This is where to enter the search string. The interpretation of the string depends on some of the options described below.</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><guilabel
->Regular Expression</guilabel
-></term>
+<term><guilabel>Regular Expression</guilabel></term>
<listitem>
-<para
->If checked, the search string is interpreted as a regular expression. A button for using a graphical tool to create or edit the expression will be enabled.</para
->
-<para
->See <link linkend="regular-expressions"
->Regular Expressions</link
-> for more on these.</para
->
+<para>If checked, the search string is interpreted as a regular expression. A button for using a graphical tool to create or edit the expression will be enabled.</para>
+<para>See <link linkend="regular-expressions">Regular Expressions</link> for more on these.</para>
</listitem>
</varlistentry>
<varlistentry>
-<term
-><guilabel
->Case Insensitive</guilabel
-></term>
+<term><guilabel>Case Insensitive</guilabel></term>
<listitem>
-<para
->If enabled, the search will be case insensitive.</para>
+<para>If enabled, the search will be case insensitive.</para>
</listitem>
</varlistentry>
<varlistentry>
-<term
-><guilabel
->Whole Words Only</guilabel
-></term>
+<term><guilabel>Whole Words Only</guilabel></term>
<listitem>
-<para
->If checked, the search will only match if there is a word boundary at both ends of the string matching, meaning not an alphanumeric character - either some other visible character or a line end.</para>
+<para>If checked, the search will only match if there is a word boundary at both ends of the string matching, meaning not an alphanumeric character - either some other visible character or a line end.</para>
</listitem>
</varlistentry>
<varlistentry>
-<term
-><guilabel
->From Beginning</guilabel
-></term>
+<term><guilabel>From Beginning</guilabel></term>
<listitem>
-<para
->If checked, the search will start at the beginning of the first line in the document, otherwise it will start at cursor position.</para>
+<para>If checked, the search will start at the beginning of the first line in the document, otherwise it will start at cursor position.</para>
</listitem>
</varlistentry>
<varlistentry>
-<term
-><guilabel
->Find Backwards</guilabel
-></term>
+<term><guilabel>Find Backwards</guilabel></term>
<listitem>
-<para
->If checked, the search will look for the first match above the starting point, either cursor position or the beginning of the document, if the <guilabel
->From Beginning</guilabel
-> option is enabled.</para>
+<para>If checked, the search will look for the first match above the starting point, either cursor position or the beginning of the document, if the <guilabel>From Beginning</guilabel> option is enabled.</para>
</listitem>
</varlistentry>
</variablelist>
-<para
->The <guilabel
->Replace Text</guilabel
-> Dialogue offers some additional options:</para>
+<para>The <guilabel>Replace Text</guilabel> Dialogue offers some additional options:</para>
<variablelist>
<varlistentry>
-<term
-><guilabel
->Replace With</guilabel
-></term>
-<listitem
-><para
->This is where to enter the replacement string.</para
-></listitem
->
+<term><guilabel>Replace With</guilabel></term>
+<listitem><para>This is where to enter the replacement string.</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><guilabel
->Selected Text</guilabel
-></term>
+<term><guilabel>Selected Text</guilabel></term>
<listitem>
-<para
->This option is disabled if no text is selected, or if the <guilabel
->Prompt on Replace</guilabel
-> option is enabled. If checked, all matches of the search string within the selected text will be replaced with the replace string.</para>
+<para>This option is disabled if no text is selected, or if the <guilabel>Prompt on Replace</guilabel> option is enabled. If checked, all matches of the search string within the selected text will be replaced with the replace string.</para>
</listitem>
</varlistentry>
<varlistentry>
-<term
-><guilabel
->Prompt on Replace</guilabel
-></term>
-<listitem
-><para
->If checked, a small dialogue will prompt you for what to do for each time a match is found. It offers the following options: <variablelist>
+<term><guilabel>Prompt on Replace</guilabel></term>
+<listitem><para>If checked, a small dialogue will prompt you for what to do for each time a match is found. It offers the following options: <variablelist>
<varlistentry>
-<term
-><guibutton
->Yes</guibutton
-></term>
-<listitem
-><para
->Activate this to replace the current match (which is selected in the editor).</para
-></listitem
->
+<term><guibutton>Yes</guibutton></term>
+<listitem><para>Activate this to replace the current match (which is selected in the editor).</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><guibutton
->No</guibutton
-></term>
-<listitem
-><para
->Activate to skip the current match, and try to find another one.</para
-></listitem>
+<term><guibutton>No</guibutton></term>
+<listitem><para>Activate to skip the current match, and try to find another one.</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><guibutton
->All</guibutton
-></term>
-<listitem
-><para
->Activate to cancel prompting, and just replace all matches.</para
-></listitem
->
+<term><guibutton>All</guibutton></term>
+<listitem><para>Activate to cancel prompting, and just replace all matches.</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><guibutton
->Close</guibutton
-></term>
-<listitem
-><para
->Activate this skip the current match and end the searching.</para
-></listitem
->
+<term><guibutton>Close</guibutton></term>
+<listitem><para>Activate this skip the current match and end the searching.</para></listitem>
</varlistentry>
</variablelist>
-</para
-></listitem>
+</para></listitem>
</varlistentry>
</variablelist>
<note>
-<para
->There is currently no way to use minimal matching when searching for a regular expression. This will be added in a future version of &kate;</para
->
+<para>There is currently no way to use minimal matching when searching for a regular expression. This will be added in a future version of &kate;</para>
</note>
</sect2>
<sect2 id="finding-text">
-<title
->Finding Text</title>
-
-<para
->To find text, launch the <guilabel
->Find Text</guilabel
-> Dialogue with <keycombo action="simul"
->&Ctrl;<keycap
->F</keycap
-></keycombo
->or from the <menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Find...</guimenuitem
-></menuchoice
-> menu item,enter a search string, set the <link linkend="find-replace-dialog"
->options</link
-> as desired and hit <guibutton
->Ok</guibutton
->. If no matches is found between the starting point for the search (either the text cursor position or the beginning of the document) you will be prompted for permission to continue from the start (or end, if you are searching backwards) of the document.</para>
-
-<para
->If a match is found it is selected and the <guilabel
->Find Text</guilabel
-> Dialogue is hidden, but stay tuned, finding further matches is very easy:</para>
-
-<para
->To find the next match in the search direction, use the <menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Find Next</guimenuitem
-></menuchoice
-> command or press <keycap
->F3</keycap
->.</para>
-
-<para
->To find the next match in the opposite direction, use the <menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Find Previous</guimenuitem
-></menuchoice
-> command or press <keycombo action="simul"
->&Shift;<keycap
->F3</keycap
-></keycombo
->.</para>
-
-<para
->If no match is found before reaching the document border, you will be prompted for permission to cross that.</para>
+<title>Finding Text</title>
+
+<para>To find text, launch the <guilabel>Find Text</guilabel> Dialogue with <keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo>or from the <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Find...</guimenuitem></menuchoice> menu item,enter a search string, set the <link linkend="find-replace-dialog">options</link> as desired and hit <guibutton>Ok</guibutton>. If no matches is found between the starting point for the search (either the text cursor position or the beginning of the document) you will be prompted for permission to continue from the start (or end, if you are searching backwards) of the document.</para>
+
+<para>If a match is found it is selected and the <guilabel>Find Text</guilabel> Dialogue is hidden, but stay tuned, finding further matches is very easy:</para>
+
+<para>To find the next match in the search direction, use the <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Find Next</guimenuitem></menuchoice> command or press <keycap>F3</keycap>.</para>
+
+<para>To find the next match in the opposite direction, use the <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Find Previous</guimenuitem></menuchoice> command or press <keycombo action="simul">&Shift;<keycap>F3</keycap></keycombo>.</para>
+
+<para>If no match is found before reaching the document border, you will be prompted for permission to cross that.</para>
</sect2>
<sect2>
-<title
->Replacing Text</title>
-
-<para
->To replace text, launch the <guilabel
->Replace text</guilabel
-> Dialogue using the <menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Replace</guimenuitem
-></menuchoice
-> command, or the <keycombo action="simul"
->&Ctrl;<keycap
->R</keycap
-></keycombo
-> shortcut, enter a search string and optionally a replace string (if the replace string is empty, each match will be replaced with &quot;&quot;), set the <link linkend="find-replace-dialog"
->options</link
-> as desired and hit the <guibutton
->Ok</guibutton
-> button.</para>
+<title>Replacing Text</title>
+
+<para>To replace text, launch the <guilabel>Replace text</guilabel> Dialogue using the <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Replace</guimenuitem></menuchoice> command, or the <keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo> shortcut, enter a search string and optionally a replace string (if the replace string is empty, each match will be replaced with &quot;&quot;), set the <link linkend="find-replace-dialog">options</link> as desired and hit the <guibutton>Ok</guibutton> button.</para>
<tip>
-<para
->If you are using a regular expression to find the text to replace, you can employ backreferences to reuse text captured in parenthesised subpatterns of the expression.</para>
-<para
->See <xref linkend="regular-expressions"/> for more on these.</para>
+<para>If you are using a regular expression to find the text to replace, you can employ backreferences to reuse text captured in parenthesised subpatterns of the expression.</para>
+<para>See <xref linkend="regular-expressions"/> for more on these.</para>
</tip>
</sect2>
@@ -632,100 +292,48 @@
</sect1>
<sect1 id="kate-part-bookmarks">
-<title
->Using Bookmarks</title>
+<title>Using Bookmarks</title>
-<para
->The bookmarks feature allows you to mark certain lines, to be able to easily find them again.</para>
+<para>The bookmarks feature allows you to mark certain lines, to be able to easily find them again.</para>
-<para
->You can set or remove a bookmark in a line in two ways:</para>
+<para>You can set or remove a bookmark in a line in two ways:</para>
<itemizedlist>
<listitem>
-<para
->Moving the insertion cursor to that line, and activate the <menuchoice
-><guimenu
->Bookmarks</guimenu
-><guimenuitem
->Toggle Bookmark</guimenuitem
-></menuchoice
-> (<keycombo action="simul"
->&Ctrl;<keycap
->B</keycap
-></keycombo
->) command.</para
->
+<para>Moving the insertion cursor to that line, and activate the <menuchoice><guimenu>Bookmarks</guimenu><guimenuitem>Toggle Bookmark</guimenuitem></menuchoice> (<keycombo action="simul">&Ctrl;<keycap>B</keycap></keycombo>) command.</para>
</listitem>
<listitem>
-<para
->Clicking in the Icon Border next to that line.</para>
+<para>Clicking in the Icon Border next to that line.</para>
</listitem>
</itemizedlist>
-<para
->Bookmarks are available in the <guimenu
->Bookmarks</guimenu
-> menu. The individual bookmarks are available as menu items, labelled with the line number of the line with the bookmark, and the first few characters of the text in the line. To move the insertion cursor to the beginning of a bookmarked line, open the menu and select the bookmark.</para>
+<para>Bookmarks are available in the <guimenu>Bookmarks</guimenu> menu. The individual bookmarks are available as menu items, labelled with the line number of the line with the bookmark, and the first few characters of the text in the line. To move the insertion cursor to the beginning of a bookmarked line, open the menu and select the bookmark.</para>
<tip>
-<para
->If the <link linkend="config-dialog-general-reopen-files"
->Reopen Files</link
-> option in the <link linkend="config-dialog"
->Config Dialogue</link
-> is enabled (or if &kate; was started by the session manager), your bookmarks will be restored when the document is reopened.</para>
+<para>If the <link linkend="config-dialog-general-reopen-files">Reopen Files</link> option in the <link linkend="config-dialog">Config Dialogue</link> is enabled (or if &kate; was started by the session manager), your bookmarks will be restored when the document is reopened.</para>
</tip>
</sect1>
<sect1 id="kate-part-auto-wrap">
-<title
->Automatically Wrapping text</title>
-
-<para
->This feature allows you to have the text formatted in a very simple way: the text will be wrapped, so that no lines exceed a maximum number of characters per line, unless there is a longer string of non-whitespace characters.</para>
-
-<para
->To enable/disable it, check/uncheck the <guibutton
->Word Wrap</guibutton
-> checkbox in the <link linkend="config-dialog-editor-edit"
->edit page</link
-> of the <link linkend="config-dialog"
->configuration dialogue</link
->.</para>
-
-<para
->To set the maximum line width (maximum characters per line), use the <link linkend="config-dialog-editor-edit-wrap-words-at"
-><guibutton
->Wrap Words At</guibutton
-></link
-> option in the <link linkend="config-dialog-editor-edit"
->edit page</link
-> of the <link linkend="config-dialog"
->configuration dialogue</link
->.</para>
-
-<para
->If enabled, it has the following effects: <itemizedlist>
-<listitem
-><para
->While typing, the editor will automatically insert a hard line break after the last whitespace character at a position before the maximum line width is reached.</para
-></listitem>
-<listitem
-><para
->While loading a document, the editor will wrap the text in a similar way, so that no lines are longer than the maximum line width, if they contain any whitespace allowing that.</para
-></listitem>
+<title>Automatically Wrapping text</title>
+
+<para>This feature allows you to have the text formatted in a very simple way: the text will be wrapped, so that no lines exceed a maximum number of characters per line, unless there is a longer string of non-whitespace characters.</para>
+
+<para>To enable/disable it, check/uncheck the <guibutton>Word Wrap</guibutton> checkbox in the <link linkend="config-dialog-editor-edit">edit page</link> of the <link linkend="config-dialog">configuration dialogue</link>.</para>
+
+<para>To set the maximum line width (maximum characters per line), use the <link linkend="config-dialog-editor-edit-wrap-words-at"><guibutton>Wrap Words At</guibutton></link> option in the <link linkend="config-dialog-editor-edit">edit page</link> of the <link linkend="config-dialog">configuration dialogue</link>.</para>
+
+<para>If enabled, it has the following effects: <itemizedlist>
+<listitem><para>While typing, the editor will automatically insert a hard line break after the last whitespace character at a position before the maximum line width is reached.</para></listitem>
+<listitem><para>While loading a document, the editor will wrap the text in a similar way, so that no lines are longer than the maximum line width, if they contain any whitespace allowing that.</para></listitem>
</itemizedlist>
</para>
-<note
-><para
->There is currently no way to set word wrap for document types, or even to enable or disable the feature on document level. This will be fixed in a future version of &kate;</para
-></note>
+<note><para>There is currently no way to set word wrap for document types, or even to enable or disable the feature on document level. This will be fixed in a future version of &kate;</para></note>
</sect1>
diff --git a/tde-i18n-en_GB/docs/tdebase/kate/plugins.docbook b/tde-i18n-en_GB/docs/tdebase/kate/plugins.docbook
index 6431b95829c..5f0bbaa1ffe 100644
--- a/tde-i18n-en_GB/docs/tdebase/kate/plugins.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kate/plugins.docbook
@@ -1,32 +1,11 @@
<chapter id="plugins">
<chapterinfo>
<authorgroup>
-<author
-><personname
-><firstname
-></firstname
-></personname
-></author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
->
+<author><personname><firstname></firstname></personname></author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>[email protected]</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit>
</authorgroup>
</chapterinfo>
-<title
->Working with Plugins</title>
-<para
->This chapter will describe topics related to using plugins</para>
+<title>Working with Plugins</title>
+<para>This chapter will describe topics related to using plugins</para>
</chapter>
diff --git a/tde-i18n-en_GB/docs/tdebase/kate/regular-expressions.docbook b/tde-i18n-en_GB/docs/tdebase/kate/regular-expressions.docbook
index c692da92cd5..5adc38a3f0c 100644
--- a/tde-i18n-en_GB/docs/tdebase/kate/regular-expressions.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kate/regular-expressions.docbook
@@ -1,491 +1,162 @@
<appendix id="regular-expressions">
<appendixinfo>
<authorgroup>
-<author
->&Anders.Lund; &Anders.Lund.mail;</author>
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
->
+<author>&Anders.Lund; &Anders.Lund.mail;</author>
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>[email protected]</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit>
</authorgroup>
</appendixinfo>
-<title
->Regular Expressions</title>
+<title>Regular Expressions</title>
-<synopsis
->This Appendix contains a brief but hopefully sufficient and
-covering introduction to the world of <emphasis
->regular
-expressions</emphasis
->. It documents regular expressions in the form
+<synopsis>This Appendix contains a brief but hopefully sufficient and
+covering introduction to the world of <emphasis>regular
+expressions</emphasis>. It documents regular expressions in the form
available within &kate;, which is not compatible with the regular
expressions of perl, nor with those of for example
-<command
->grep</command
->.</synopsis>
+<command>grep</command>.</synopsis>
<sect1>
-<title
->Introduction</title>
-
-<para
-><emphasis
->Regular Expressions</emphasis
-> provides us with a way to describe some possible contents of a text string in a way understood by a small piece of software, so that it can investigate if a text matches, and also in the case of advanced applications with the means of saving pieces or the matching text.</para>
-
-<para
->An example: Say you want to search a text for paragraphs that starts with either of the names <quote
->Henrik</quote
-> or <quote
->Pernille</quote
-> followed by some form of the verb <quote
->say</quote
->.</para>
-
-<para
->With a normal search, you would start out searching for the first name, <quote
->Henrik</quote
-> maybe followed by <quote
->sa</quote
-> like this: <userinput
->Henrik sa</userinput
->, and while looking for matches, you would have to discard those not being the beginning of a paragraph, as well as those in which the word starting with the letters <quote
->sa</quote
-> was not either <quote
->says</quote
->, <quote
->said</quote
-> or so. And then of cause repeat all of that with the next name...</para>
-
-<para
->With Regular Expressions, that task could be accomplished with a single search, and with a larger degree of preciseness.</para>
-
-<para
->To achieve this, Regular Expressions defines rules for expressing in details a generalisation of a string to match. Our example, which we might literally express like this: <quote
->A line starting with either <quote
->Henrik</quote
-> or <quote
->Pernille</quote
-> (possibly following up to 4 blanks or tab characters) followed by a whitespace followed by <quote
->sa</quote
-> and then either <quote
->ys</quote
-> or <quote
->id</quote
-></quote
-> could be expressed with the following regular expression:</para
-> <para
-><userinput
->^[ \t]{0,4}(Henrik|Pernille) sa(ys|id)</userinput
-></para>
-
-<para
->The above example demonstrates all four major concepts of modern Regular Expressions, namely:</para>
+<title>Introduction</title>
+
+<para><emphasis>Regular Expressions</emphasis> provides us with a way to describe some possible contents of a text string in a way understood by a small piece of software, so that it can investigate if a text matches, and also in the case of advanced applications with the means of saving pieces or the matching text.</para>
+
+<para>An example: Say you want to search a text for paragraphs that starts with either of the names <quote>Henrik</quote> or <quote>Pernille</quote> followed by some form of the verb <quote>say</quote>.</para>
+
+<para>With a normal search, you would start out searching for the first name, <quote>Henrik</quote> maybe followed by <quote>sa</quote> like this: <userinput>Henrik sa</userinput>, and while looking for matches, you would have to discard those not being the beginning of a paragraph, as well as those in which the word starting with the letters <quote>sa</quote> was not either <quote>says</quote>, <quote>said</quote> or so. And then of cause repeat all of that with the next name...</para>
+
+<para>With Regular Expressions, that task could be accomplished with a single search, and with a larger degree of preciseness.</para>
+
+<para>To achieve this, Regular Expressions defines rules for expressing in details a generalisation of a string to match. Our example, which we might literally express like this: <quote>A line starting with either <quote>Henrik</quote> or <quote>Pernille</quote> (possibly following up to 4 blanks or tab characters) followed by a whitespace followed by <quote>sa</quote> and then either <quote>ys</quote> or <quote>id</quote></quote> could be expressed with the following regular expression:</para> <para><userinput>^[ \t]{0,4}(Henrik|Pernille) sa(ys|id)</userinput></para>
+
+<para>The above example demonstrates all four major concepts of modern Regular Expressions, namely:</para>
<itemizedlist>
-<listitem
-><para
->Patterns</para
-></listitem>
-<listitem
-><para
->Assertions</para
-></listitem>
-<listitem
-><para
->Quantifiers</para
-></listitem>
-<listitem
-><para
->Back references</para
-></listitem>
+<listitem><para>Patterns</para></listitem>
+<listitem><para>Assertions</para></listitem>
+<listitem><para>Quantifiers</para></listitem>
+<listitem><para>Back references</para></listitem>
</itemizedlist>
-<para
->The caret (<literal
->^</literal
->) starting the expression is an assertion, being true only if the following matching string is at the start of a line.</para>
-
-<para
->The stings <literal
->[ \t]</literal
-> and <literal
->(Henrik|Pernille) sa(ys|id)</literal
-> are patterns. The first one is a <emphasis
->character class</emphasis
-> that matches either a blank or a (horizontal) tab character; the other pattern contains first a subpattern matching either <literal
->Henrik</literal
-> <emphasis
->or</emphasis
-> <literal
->Pernille</literal
->, then a piece matching the exact string <literal
-> sa</literal
-> and finally a subpattern matching either <literal
->ys</literal
-> <emphasis
->or</emphasis
-> <literal
->id</literal
-></para>
-
-<para
->The string <literal
->{0,4}</literal
-> is a quantifier saying <quote
->anywhere from 0 up to 4 of the previous</quote
->.</para>
-
-<para
->Because regular expression software supporting the concept of <emphasis
->back references</emphasis
-> saves the entire matching part of the string as well as sub-patterns enclosed in parentheses, given some means of access to those references, we could get our hands on either the whole match (when searching a text document in an editor with a regular expression, that is often marked as selected) or either the name found, or the last part of the verb.</para>
-
-<para
->All together, the expression will match where we wanted it to, and only there.</para>
-
-<para
->The following sections will describe in details how to construct and use patterns, character classes, assertions, quantifiers and back references, and the final section will give a few useful examples.</para>
+<para>The caret (<literal>^</literal>) starting the expression is an assertion, being true only if the following matching string is at the start of a line.</para>
+
+<para>The stings <literal>[ \t]</literal> and <literal>(Henrik|Pernille) sa(ys|id)</literal> are patterns. The first one is a <emphasis>character class</emphasis> that matches either a blank or a (horizontal) tab character; the other pattern contains first a subpattern matching either <literal>Henrik</literal> <emphasis>or</emphasis> <literal>Pernille</literal>, then a piece matching the exact string <literal> sa</literal> and finally a subpattern matching either <literal>ys</literal> <emphasis>or</emphasis> <literal>id</literal></para>
+
+<para>The string <literal>{0,4}</literal> is a quantifier saying <quote>anywhere from 0 up to 4 of the previous</quote>.</para>
+
+<para>Because regular expression software supporting the concept of <emphasis>back references</emphasis> saves the entire matching part of the string as well as sub-patterns enclosed in parentheses, given some means of access to those references, we could get our hands on either the whole match (when searching a text document in an editor with a regular expression, that is often marked as selected) or either the name found, or the last part of the verb.</para>
+
+<para>All together, the expression will match where we wanted it to, and only there.</para>
+
+<para>The following sections will describe in details how to construct and use patterns, character classes, assertions, quantifiers and back references, and the final section will give a few useful examples.</para>
</sect1>
<sect1 id="regex-patterns">
-<title
->Patterns</title>
+<title>Patterns</title>
-<para
->Patterns consists of literal strings and character classes. Patterns may contain sub-patterns, which are patterns enclosed in parentheses.</para>
+<para>Patterns consists of literal strings and character classes. Patterns may contain sub-patterns, which are patterns enclosed in parentheses.</para>
<sect2>
-<title
->Escaping characters</title>
+<title>Escaping characters</title>
-<para
->In patterns as well as in character classes, some characters have a special meaning. To literally match any of those characters, they must be marked or <emphasis
->escaped</emphasis
-> to let the regular expression software know that it should interpret such characters in their literal meaning.</para>
+<para>In patterns as well as in character classes, some characters have a special meaning. To literally match any of those characters, they must be marked or <emphasis>escaped</emphasis> to let the regular expression software know that it should interpret such characters in their literal meaning.</para>
-<para
->This is done by prepending the character with a backslash (<literal
->\</literal
->).</para>
+<para>This is done by prepending the character with a backslash (<literal>\</literal>).</para>
-<para
->The regular expression software will silently ignore escaping a character that does not have any special meaning in the context, so escaping for example a <quote
->j</quote
-> (<userinput
->\j</userinput
->) is safe. If you are in doubt whether a character could have a special meaning, you can therefore escape it safely.</para>
+<para>The regular expression software will silently ignore escaping a character that does not have any special meaning in the context, so escaping for example a <quote>j</quote> (<userinput>\j</userinput>) is safe. If you are in doubt whether a character could have a special meaning, you can therefore escape it safely.</para>
-<para
->Escaping of cause includes the backslash character it self, to literally match a such, you would write <userinput
->\\</userinput
->.</para>
+<para>Escaping of cause includes the backslash character it self, to literally match a such, you would write <userinput>\\</userinput>.</para>
</sect2>
<sect2>
-<title
->Character Classes and abbreviations</title>
-
-<para
->A <emphasis
->character class</emphasis
-> is an expression that matches one of a defined set of characters. In Regular Expressions, character classes are defined by putting the legal characters for the class in square brackets, <literal
->[]</literal
->, or by using one of the abbreviated classes described below.</para>
-
-<para
->Simple character classes just contains one or more literal characters, for example <userinput
->[abc]</userinput
-> (matching either of the letters <quote
->a</quote
->, <quote
->b</quote
-> or <quote
->c</quote
->) or <userinput
->[0123456789]</userinput
-> (matching any digit).</para>
-
-<para
->Because letters and digits have a logical order, you can abbreviate those by specifying ranges of them: <userinput
->[a-c]</userinput
-> is equal to <userinput
->[abc]</userinput
-> and <userinput
->[0-9]</userinput
-> is equal to <userinput
->[0123456789]</userinput
->. Combining these constructs, for example <userinput
->[a-fynot1-38]</userinput
-> is completely legal (the last one would match, of cause, either of <quote
->a</quote
->,<quote
->b</quote
->,<quote
->c</quote
->,<quote
->d</quote
->, <quote
->e</quote
->,<quote
->f</quote
->,<quote
->y</quote
->,<quote
->n</quote
->,<quote
->o</quote
->,<quote
->t</quote
->, <quote
->1</quote
->,<quote
->2</quote
->,<quote
->3</quote
-> or <quote
->8</quote
->).</para>
-
-<para
->As capital letters are different characters from their non-capital equivalents, to create a caseless character class matching <quote
->a</quote
-> or <quote
->b</quote
->, in any case, you need to write it <userinput
->[aAbB]</userinput
->.</para>
-
-<para
->It is of cause possible to create a <quote
->negative</quote
-> class matching as <quote
->anything but</quote
-> To do so put a caret (<literal
->^</literal
->) at the beginning of the class: </para>
-
-<para
-><userinput
->[^abc]</userinput
-> will match any character <emphasis
->but</emphasis
-> <quote
->a</quote
->, <quote
->b</quote
-> or <quote
->c</quote
->.</para>
-
-<para
->In addition to literal characters, some abbreviations are defined, making life still a bit easier: <variablelist>
+<title>Character Classes and abbreviations</title>
+
+<para>A <emphasis>character class</emphasis> is an expression that matches one of a defined set of characters. In Regular Expressions, character classes are defined by putting the legal characters for the class in square brackets, <literal>[]</literal>, or by using one of the abbreviated classes described below.</para>
+
+<para>Simple character classes just contains one or more literal characters, for example <userinput>[abc]</userinput> (matching either of the letters <quote>a</quote>, <quote>b</quote> or <quote>c</quote>) or <userinput>[0123456789]</userinput> (matching any digit).</para>
+
+<para>Because letters and digits have a logical order, you can abbreviate those by specifying ranges of them: <userinput>[a-c]</userinput> is equal to <userinput>[abc]</userinput> and <userinput>[0-9]</userinput> is equal to <userinput>[0123456789]</userinput>. Combining these constructs, for example <userinput>[a-fynot1-38]</userinput> is completely legal (the last one would match, of cause, either of <quote>a</quote>,<quote>b</quote>,<quote>c</quote>,<quote>d</quote>, <quote>e</quote>,<quote>f</quote>,<quote>y</quote>,<quote>n</quote>,<quote>o</quote>,<quote>t</quote>, <quote>1</quote>,<quote>2</quote>,<quote>3</quote> or <quote>8</quote>).</para>
+
+<para>As capital letters are different characters from their non-capital equivalents, to create a caseless character class matching <quote>a</quote> or <quote>b</quote>, in any case, you need to write it <userinput>[aAbB]</userinput>.</para>
+
+<para>It is of cause possible to create a <quote>negative</quote> class matching as <quote>anything but</quote> To do so put a caret (<literal>^</literal>) at the beginning of the class: </para>
+
+<para><userinput>[^abc]</userinput> will match any character <emphasis>but</emphasis> <quote>a</quote>, <quote>b</quote> or <quote>c</quote>.</para>
+
+<para>In addition to literal characters, some abbreviations are defined, making life still a bit easier: <variablelist>
<varlistentry>
-<term
-><userinput
->\a</userinput
-></term>
-<listitem
-><para
->This matches the <acronym
->ASCII</acronym
-> bell character (BEL, 0x07).</para
-></listitem>
+<term><userinput>\a</userinput></term>
+<listitem><para>This matches the <acronym>ASCII</acronym> bell character (BEL, 0x07).</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->\f</userinput
-></term>
-<listitem
-><para
->This matches the <acronym
->ASCII</acronym
-> form feed character (FF, 0x0C).</para
-></listitem>
+<term><userinput>\f</userinput></term>
+<listitem><para>This matches the <acronym>ASCII</acronym> form feed character (FF, 0x0C).</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->\n</userinput
-></term>
-<listitem
-><para
->This matches the <acronym
->ASCII</acronym
-> line feed character (LF, 0x0A, Unix newline).</para
-></listitem>
+<term><userinput>\n</userinput></term>
+<listitem><para>This matches the <acronym>ASCII</acronym> line feed character (LF, 0x0A, Unix newline).</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->\r</userinput
-></term>
-<listitem
-><para
->This matches the <acronym
->ASCII</acronym
-> carriage return character (CR, 0x0D).</para
-></listitem>
+<term><userinput>\r</userinput></term>
+<listitem><para>This matches the <acronym>ASCII</acronym> carriage return character (CR, 0x0D).</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->\t</userinput
-></term>
-<listitem
-><para
->This matches the <acronym
->ASCII</acronym
-> horizontal tab character (HT, 0x09).</para
-></listitem>
+<term><userinput>\t</userinput></term>
+<listitem><para>This matches the <acronym>ASCII</acronym> horizontal tab character (HT, 0x09).</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->\v</userinput
-></term>
-<listitem
-><para
->This matches the <acronym
->ASCII</acronym
-> vertical tab character (VT, 0x0B).</para
-></listitem>
+<term><userinput>\v</userinput></term>
+<listitem><para>This matches the <acronym>ASCII</acronym> vertical tab character (VT, 0x0B).</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->\xhhhh</userinput
-></term>
-
-<listitem
-><para
->This matches the Unicode character corresponding to the hexadecimal number hhhh (between 0x0000 and 0xFFFF). \0ooo (&ie;, \zero ooo) matches the <acronym
->ASCII</acronym
->/Latin-1 character corresponding to the octal number ooo (between 0 and 0377).</para
-></listitem>
+<term><userinput>\xhhhh</userinput></term>
+
+<listitem><para>This matches the Unicode character corresponding to the hexadecimal number hhhh (between 0x0000 and 0xFFFF). \0ooo (&ie;, \zero ooo) matches the <acronym>ASCII</acronym>/Latin-1 character corresponding to the octal number ooo (between 0 and 0377).</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->.</userinput
-> (dot)</term>
-<listitem
-><para
->This matches any character (including newline).</para
-></listitem>
+<term><userinput>.</userinput> (dot)</term>
+<listitem><para>This matches any character (including newline).</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->\d</userinput
-></term>
-<listitem
-><para
->This matches a digit. Equal to <literal
->[0-9]</literal
-></para
-></listitem>
+<term><userinput>\d</userinput></term>
+<listitem><para>This matches a digit. Equal to <literal>[0-9]</literal></para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->\D</userinput
-></term>
-<listitem
-><para
->This matches a non-digit. Equal to <literal
->[^0-9]</literal
-> or <literal
->[^\d]</literal
-></para
-></listitem>
+<term><userinput>\D</userinput></term>
+<listitem><para>This matches a non-digit. Equal to <literal>[^0-9]</literal> or <literal>[^\d]</literal></para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->\s</userinput
-></term>
-<listitem
-><para
->This matches a whitespace character. Practically equal to <literal
->[ \t\n\r]</literal
-></para
-></listitem>
+<term><userinput>\s</userinput></term>
+<listitem><para>This matches a whitespace character. Practically equal to <literal>[ \t\n\r]</literal></para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->\S</userinput
-></term>
-<listitem
-><para
->This matches a non-whitespace. Practically equal to <literal
->[^ \t\r\n]</literal
->, and equal to <literal
->[^\s]</literal
-></para
-></listitem>
+<term><userinput>\S</userinput></term>
+<listitem><para>This matches a non-whitespace. Practically equal to <literal>[^ \t\r\n]</literal>, and equal to <literal>[^\s]</literal></para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->\w</userinput
-></term>
-<listitem
-><para
->Matches any <quote
->word character</quote
-> - in this case any letter or digit. Note that underscore (<literal
->_</literal
->) is not matched, as is the case with perl regular expressions. Equal to <literal
->[a-zA-Z0-9]</literal
-></para
-></listitem>
+<term><userinput>\w</userinput></term>
+<listitem><para>Matches any <quote>word character</quote> - in this case any letter or digit. Note that underscore (<literal>_</literal>) is not matched, as is the case with perl regular expressions. Equal to <literal>[a-zA-Z0-9]</literal></para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->\W</userinput
-></term>
-<listitem
-><para
->Matches any non-word character - anything but letters or numbers. Equal to <literal
->[^a-zA-Z0-9]</literal
-> or <literal
->[^\w]</literal
-></para
-></listitem>
+<term><userinput>\W</userinput></term>
+<listitem><para>Matches any non-word character - anything but letters or numbers. Equal to <literal>[^a-zA-Z0-9]</literal> or <literal>[^\w]</literal></para></listitem>
</varlistentry>
@@ -493,69 +164,31 @@ expressions of perl, nor with those of for example
</para>
-<para
->The abbreviated classes can be put inside a custom class, for example to match a word character, a blank or a dot, you could write <userinput
->[\w \.]</userinput
-></para
->
+<para>The abbreviated classes can be put inside a custom class, for example to match a word character, a blank or a dot, you could write <userinput>[\w \.]</userinput></para>
-<note
-> <para
->The POSIX notation of classes, <userinput
->[:&lt;class name&gt;:]</userinput
-> is currently not supported.</para
-> </note>
+<note> <para>The POSIX notation of classes, <userinput>[:&lt;class name&gt;:]</userinput> is currently not supported.</para> </note>
<sect3>
-<title
->Characters with special meanings inside character classes</title>
+<title>Characters with special meanings inside character classes</title>
-<para
->The following characters has a special meaning inside the <quote
->[]</quote
-> character class construct, and must be escaped to be literally included in a class:</para>
+<para>The following characters has a special meaning inside the <quote>[]</quote> character class construct, and must be escaped to be literally included in a class:</para>
<variablelist>
<varlistentry>
-<term
-><userinput
->]</userinput
-></term>
-<listitem
-><para
->Ends the character class. Must be escaped unless it is the very first character in the class (may follow an unescaped caret)</para
-></listitem>
+<term><userinput>]</userinput></term>
+<listitem><para>Ends the character class. Must be escaped unless it is the very first character in the class (may follow an unescaped caret)</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->^</userinput
-> (caret)</term>
-<listitem
-><para
->Denotes a negative class, if it is the first character. Must be escaped to match literally if it is the first character in the class.</para
-></listitem
->
+<term><userinput>^</userinput> (caret)</term>
+<listitem><para>Denotes a negative class, if it is the first character. Must be escaped to match literally if it is the first character in the class.</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->-</userinput
-> (dash)</term>
-<listitem
-><para
->Denotes a logical range. Must always be escaped within a character class.</para
-></listitem>
+<term><userinput>-</userinput> (dash)</term>
+<listitem><para>Denotes a logical range. Must always be escaped within a character class.</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->\</userinput
-> (backslash)</term>
-<listitem
-><para
->The escape character. Must always be escaped.</para
-></listitem>
+<term><userinput>\</userinput> (backslash)</term>
+<listitem><para>The escape character. Must always be escaped.</para></listitem>
</varlistentry>
</variablelist>
@@ -566,240 +199,110 @@ expressions of perl, nor with those of for example
<sect2>
-<title
->Alternatives: matching <quote
->one of</quote
-></title>
-
-<para
->If you want to match one of a set of alternative patterns, you can separate those with <literal
->|</literal
-> (vertical bar character).</para>
-
-<para
->For example to find either <quote
->John</quote
-> or <quote
->Harry</quote
-> you would use an expression <userinput
->John|Harry</userinput
->.</para>
+<title>Alternatives: matching <quote>one of</quote></title>
+
+<para>If you want to match one of a set of alternative patterns, you can separate those with <literal>|</literal> (vertical bar character).</para>
+
+<para>For example to find either <quote>John</quote> or <quote>Harry</quote> you would use an expression <userinput>John|Harry</userinput>.</para>
</sect2>
<sect2>
-<title
->Sub Patterns</title>
+<title>Sub Patterns</title>
-<para
-><emphasis
->Sub patterns</emphasis
-> are patterns enclosed in parentheses, and they have several uses in the world of regular expressions.</para>
+<para><emphasis>Sub patterns</emphasis> are patterns enclosed in parentheses, and they have several uses in the world of regular expressions.</para>
<sect3>
-<title
->Specifying alternatives</title>
-
-<para
->You may use a sub pattern to group a set of alternatives within a larger pattern. The alternatives are separated by the character <quote
->|</quote
-> (vertical bar).</para>
-
-<para
->For example to match either of the words <quote
->int</quote
->, <quote
->float</quote
-> or <quote
->double</quote
->, you could use the pattern <userinput
->int|float|double</userinput
->. If you only want to find one if it is followed by some whitespace and then some letters, put the alternatives inside a subpattern: <userinput
->(int|float|double)\s+\w+</userinput
->.</para>
+<title>Specifying alternatives</title>
+
+<para>You may use a sub pattern to group a set of alternatives within a larger pattern. The alternatives are separated by the character <quote>|</quote> (vertical bar).</para>
+
+<para>For example to match either of the words <quote>int</quote>, <quote>float</quote> or <quote>double</quote>, you could use the pattern <userinput>int|float|double</userinput>. If you only want to find one if it is followed by some whitespace and then some letters, put the alternatives inside a subpattern: <userinput>(int|float|double)\s+\w+</userinput>.</para>
</sect3>
<sect3>
-<title
->Capturing matching text (back references)</title>
-
-<para
->If you want to use a back reference, use a sub pattern to have the desired part of the pattern remembered.</para>
-
-<para
->For example, it you want to find two occurrences of the same word separated by a comma and possibly some whitespace, you could write <userinput
->(\w+),\s*\1</userinput
->. The sub pattern <literal
->\w+</literal
-> would find a chunk of word characters, and the entire expression would match if those were followed by a comma, 0 or more whitespace and then an equal chunk of word characters. (The string <literal
->\1</literal
-> references <emphasis
->the first sub pattern enclosed in parentheses</emphasis
->)</para>
-
-<!-- <para
->See also <link linkend="backreferences"
->Back references</link
->.</para
-> -->
+<title>Capturing matching text (back references)</title>
+
+<para>If you want to use a back reference, use a sub pattern to have the desired part of the pattern remembered.</para>
+
+<para>For example, it you want to find two occurrences of the same word separated by a comma and possibly some whitespace, you could write <userinput>(\w+),\s*\1</userinput>. The sub pattern <literal>\w+</literal> would find a chunk of word characters, and the entire expression would match if those were followed by a comma, 0 or more whitespace and then an equal chunk of word characters. (The string <literal>\1</literal> references <emphasis>the first sub pattern enclosed in parentheses</emphasis>)</para>
+
+<!-- <para>See also <link linkend="backreferences">Back references</link>.</para> -->
</sect3>
<sect3 id="lookahead-assertions">
-<title
->Lookahead Assertions</title>
-
-<para
->A lookahead assertion is a sub pattern, starting with either <literal
->?=</literal
-> or <literal
->?!</literal
->.</para>
-
-<para
->For example to match the literal string <quote
->Bill</quote
-> but only if not followed by <quote
-> Gates</quote
->, you could use this expression: <userinput
->Bill(?! Gates)</userinput
->. (This would find <quote
->Bill Clinton</quote
-> as well as <quote
->Billy the kid</quote
->, but silently ignore the other matches.)</para>
-
-<para
->Sub patterns used for assertions are not captured.</para>
-
-<para
->See also <link linkend="assertions"
->Assertions</link
-></para>
+<title>Lookahead Assertions</title>
+
+<para>A lookahead assertion is a sub pattern, starting with either <literal>?=</literal> or <literal>?!</literal>.</para>
+
+<para>For example to match the literal string <quote>Bill</quote> but only if not followed by <quote> Gates</quote>, you could use this expression: <userinput>Bill(?! Gates)</userinput>. (This would find <quote>Bill Clinton</quote> as well as <quote>Billy the kid</quote>, but silently ignore the other matches.)</para>
+
+<para>Sub patterns used for assertions are not captured.</para>
+
+<para>See also <link linkend="assertions">Assertions</link></para>
</sect3>
</sect2>
<sect2 id="special-characters-in-patterns">
-<title
->Characters with a special meaning inside patterns</title>
+<title>Characters with a special meaning inside patterns</title>
-<para
->The following characters have meaning inside a pattern, and must be escaped if you want to literally match them: <variablelist>
+<para>The following characters have meaning inside a pattern, and must be escaped if you want to literally match them: <variablelist>
<varlistentry>
-<term
-><userinput
->\</userinput
-> (backslash)</term>
-<listitem
-><para
->The escape character.</para
-></listitem>
+<term><userinput>\</userinput> (backslash)</term>
+<listitem><para>The escape character.</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->^</userinput
-> (caret)</term>
-<listitem
-><para
->Asserts the beginning of the string.</para
-></listitem>
+<term><userinput>^</userinput> (caret)</term>
+<listitem><para>Asserts the beginning of the string.</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->$</userinput
-></term>
-<listitem
-><para
->Asserts the end of string.</para
-></listitem>
+<term><userinput>$</userinput></term>
+<listitem><para>Asserts the end of string.</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->()</userinput
-> (left and right parentheses)</term>
-<listitem
-><para
->Denotes sub patterns.</para
-></listitem>
+<term><userinput>()</userinput> (left and right parentheses)</term>
+<listitem><para>Denotes sub patterns.</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->{}</userinput
-> (left and right curly braces)</term>
-<listitem
-><para
->Denotes numeric quantifiers.</para
-></listitem>
+<term><userinput>{}</userinput> (left and right curly braces)</term>
+<listitem><para>Denotes numeric quantifiers.</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->[]</userinput
-> (left and right square brackets)</term>
-<listitem
-><para
->Denotes character classes.</para
-></listitem>
+<term><userinput>[]</userinput> (left and right square brackets)</term>
+<listitem><para>Denotes character classes.</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->|</userinput
-> (vertical bar)</term>
-<listitem
-><para
->logical OR. Separates alternatives.</para
-></listitem>
+<term><userinput>|</userinput> (vertical bar)</term>
+<listitem><para>logical OR. Separates alternatives.</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->+</userinput
-> (plus sign)</term>
-<listitem
-><para
->Quantifier, 1 or more.</para
-></listitem>
+<term><userinput>+</userinput> (plus sign)</term>
+<listitem><para>Quantifier, 1 or more.</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->*</userinput
-> (asterisk)</term>
-<listitem
-><para
->Quantifier, 0 or more.</para
-></listitem>
+<term><userinput>*</userinput> (asterisk)</term>
+<listitem><para>Quantifier, 0 or more.</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->?</userinput
-> (question mark)</term>
-<listitem
-><para
->An optional character. Can be interpreted as a quantifier, 0 or 1.</para
-></listitem>
+<term><userinput>?</userinput> (question mark)</term>
+<listitem><para>An optional character. Can be interpreted as a quantifier, 0 or 1.</para></listitem>
</varlistentry>
</variablelist>
@@ -811,125 +314,58 @@ expressions of perl, nor with those of for example
</sect1>
<sect1 id="quantifiers">
-<title
->Quantifiers</title>
-
-<para
-><emphasis
->Quantifiers</emphasis
-> allows a regular expression to match a specified number or range of numbers of either a character, character class or sub pattern.</para>
-
-<para
->Quantifiers are enclosed in curly brackets (<literal
->{</literal
-> and <literal
->}</literal
->) and have the general form <literal
->{[minimum-occurrences][,[maximum-occurrences]]}</literal
-> </para>
-
-<para
->The usage is best explained by example: <variablelist>
+<title>Quantifiers</title>
+
+<para><emphasis>Quantifiers</emphasis> allows a regular expression to match a specified number or range of numbers of either a character, character class or sub pattern.</para>
+
+<para>Quantifiers are enclosed in curly brackets (<literal>{</literal> and <literal>}</literal>) and have the general form <literal>{[minimum-occurrences][,[maximum-occurrences]]}</literal> </para>
+
+<para>The usage is best explained by example: <variablelist>
<varlistentry>
-<term
-><userinput
->{1}</userinput
-></term>
-<listitem
-><para
->Exactly 1 occurrence</para
-></listitem>
+<term><userinput>{1}</userinput></term>
+<listitem><para>Exactly 1 occurrence</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->{0,1}</userinput
-></term>
-<listitem
-><para
->Zero or 1 occurrences</para
-></listitem>
+<term><userinput>{0,1}</userinput></term>
+<listitem><para>Zero or 1 occurrences</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->{,1}</userinput
-></term>
-<listitem
-><para
->The same, with less work;)</para
-></listitem>
+<term><userinput>{,1}</userinput></term>
+<listitem><para>The same, with less work;)</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->{5,10}</userinput
-></term>
-<listitem
-><para
->At least 5 but maximum 10 occurrences.</para
-></listitem>
+<term><userinput>{5,10}</userinput></term>
+<listitem><para>At least 5 but maximum 10 occurrences.</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->{5,}</userinput
-></term>
-<listitem
-><para
->At least 5 occurrences, no maximum.</para
-></listitem>
+<term><userinput>{5,}</userinput></term>
+<listitem><para>At least 5 occurrences, no maximum.</para></listitem>
</varlistentry>
</variablelist>
</para>
-<para
->Additionally, there are some abbreviations: <variablelist>
+<para>Additionally, there are some abbreviations: <variablelist>
<varlistentry>
-<term
-><userinput
->*</userinput
-> (asterisk)</term>
-<listitem
-><para
->similar to <literal
->{0,}</literal
->, find any number of occurrences.</para
-></listitem>
+<term><userinput>*</userinput> (asterisk)</term>
+<listitem><para>similar to <literal>{0,}</literal>, find any number of occurrences.</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->+</userinput
-> (plus sign)</term>
-<listitem
-><para
->similar to <literal
->{1,}</literal
->, at least 1 occurrence.</para
-></listitem>
+<term><userinput>+</userinput> (plus sign)</term>
+<listitem><para>similar to <literal>{1,}</literal>, at least 1 occurrence.</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->?</userinput
-> (question mark)</term>
-<listitem
-><para
->similar to <literal
->{0,1}</literal
->, zero or 1 occurrence.</para
-></listitem>
+<term><userinput>?</userinput> (question mark)</term>
+<listitem><para>similar to <literal>{0,1}</literal>, zero or 1 occurrence.</para></listitem>
</varlistentry>
</variablelist>
@@ -938,98 +374,39 @@ expressions of perl, nor with those of for example
<sect2>
-<title
->Greed</title>
+<title>Greed</title>
-<para
->When using quantifiers with no maximum, regular expressions defaults to match as much of the searched string as possible, commonly known as <emphasis
->greedy</emphasis
-> behaviour.</para>
+<para>When using quantifiers with no maximum, regular expressions defaults to match as much of the searched string as possible, commonly known as <emphasis>greedy</emphasis> behaviour.</para>
-<para
->Modern regular expression software provides the means of <quote
->turning off greediness</quote
->, though in a graphical environment it is up to the interface to provide you with access to this feature. For example a search dialogue providing a regular expression search could have a check box labelled <quote
->Minimal matching</quote
-> as well as it ought to indicate if greediness is the default behaviour.</para>
+<para>Modern regular expression software provides the means of <quote>turning off greediness</quote>, though in a graphical environment it is up to the interface to provide you with access to this feature. For example a search dialogue providing a regular expression search could have a check box labelled <quote>Minimal matching</quote> as well as it ought to indicate if greediness is the default behaviour.</para>
</sect2>
<sect2>
-<title
->In context examples</title>
+<title>In context examples</title>
-<para
->Here are a few examples of using quantifiers</para>
+<para>Here are a few examples of using quantifiers</para>
<variablelist>
<varlistentry>
-<term
-><userinput
->^\d{4,5}\s</userinput
-></term>
-<listitem
-><para
->Matches the digits in <quote
->1234 go</quote
-> and <quote
->12345 now</quote
->, but neither in <quote
->567 eleven</quote
-> nor in <quote
->223459 somewhere</quote
-></para
-></listitem>
+<term><userinput>^\d{4,5}\s</userinput></term>
+<listitem><para>Matches the digits in <quote>1234 go</quote> and <quote>12345 now</quote>, but neither in <quote>567 eleven</quote> nor in <quote>223459 somewhere</quote></para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->\s+</userinput
-></term>
-<listitem
-><para
->Matches one or more whitespace characters</para
-></listitem>
+<term><userinput>\s+</userinput></term>
+<listitem><para>Matches one or more whitespace characters</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->(bla){1,}</userinput
-></term>
-<listitem
-><para
->Matches all of <quote
->blablabla</quote
-> and the <quote
->bla</quote
-> in <quote
->blackbird</quote
-> or <quote
->tabla</quote
-></para
-></listitem>
+<term><userinput>(bla){1,}</userinput></term>
+<listitem><para>Matches all of <quote>blablabla</quote> and the <quote>bla</quote> in <quote>blackbird</quote> or <quote>tabla</quote></para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->/?&gt;</userinput
-></term>
-<listitem
-><para
->Matches <quote
->/&gt;</quote
-> in <quote
->&lt;closeditem/&gt;</quote
-> as well as <quote
->&gt;</quote
-> in <quote
->&lt;openitem&gt;</quote
->.</para
-></listitem>
+<term><userinput>/?&gt;</userinput></term>
+<listitem><para>Matches <quote>/&gt;</quote> in <quote>&lt;closeditem/&gt;</quote> as well as <quote>&gt;</quote> in <quote>&lt;openitem&gt;</quote>.</para></listitem>
</varlistentry>
</variablelist>
@@ -1039,164 +416,56 @@ expressions of perl, nor with those of for example
</sect1>
<sect1 id="assertions">
-<title
->Assertions</title>
-
-<para
-><emphasis
->Assertions</emphasis
-> allows a regular expression to match only under certain controlled conditions.</para>
-
-<para
->An assertion does not need a character to match, it rather investigates the surroundings of a possible match before acknowledging it. For example the <emphasis
->word boundary</emphasis
-> assertion does not try to find a non word character opposite a word one at its position, instead it makes sure that there is not a word character. This means that the assertion can match where there is no character, &ie; at the ends of a searched string.</para>
-
-<para
->Some assertions actually does have a pattern to match, but the part of the string matching that will not be a part of the result of the match of the full expression.</para>
-
-<para
->Regular Expressions as documented here supports the following assertions: <variablelist>
-
-<varlistentry
->
-<term
-><userinput
->^</userinput
-> (caret: beginning of string)</term
->
-<listitem
-><para
->Matches the beginning of the searched string.</para
-> <para
->The expression <userinput
->^Peter</userinput
-> will match at <quote
->Peter</quote
-> in the string <quote
->Peter, hey!</quote
-> but not in <quote
->Hey, Peter!</quote
-> </para
-> </listitem>
+<title>Assertions</title>
+
+<para><emphasis>Assertions</emphasis> allows a regular expression to match only under certain controlled conditions.</para>
+
+<para>An assertion does not need a character to match, it rather investigates the surroundings of a possible match before acknowledging it. For example the <emphasis>word boundary</emphasis> assertion does not try to find a non word character opposite a word one at its position, instead it makes sure that there is not a word character. This means that the assertion can match where there is no character, &ie; at the ends of a searched string.</para>
+
+<para>Some assertions actually does have a pattern to match, but the part of the string matching that will not be a part of the result of the match of the full expression.</para>
+
+<para>Regular Expressions as documented here supports the following assertions: <variablelist>
+
+<varlistentry>
+<term><userinput>^</userinput> (caret: beginning of string)</term>
+<listitem><para>Matches the beginning of the searched string.</para> <para>The expression <userinput>^Peter</userinput> will match at <quote>Peter</quote> in the string <quote>Peter, hey!</quote> but not in <quote>Hey, Peter!</quote> </para> </listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->$</userinput
-> (end of string)</term>
-<listitem
-><para
->Matches the end of the searched string.</para>
-
-<para
->The expression <userinput
->you\?$</userinput
-> will match at the last you in the string <quote
->You didn't do that, did you?</quote
-> but nowhere in <quote
->You didn't do that, right?</quote
-></para>
+<term><userinput>$</userinput> (end of string)</term>
+<listitem><para>Matches the end of the searched string.</para>
+
+<para>The expression <userinput>you\?$</userinput> will match at the last you in the string <quote>You didn't do that, did you?</quote> but nowhere in <quote>You didn't do that, right?</quote></para>
</listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->\b</userinput
-> (word boundary)</term>
-<listitem
-><para
->Matches if there is a word character at one side and not a word character at the other.</para>
-<para
->This is useful to find word ends, for example both ends to find a whole word. The expression <userinput
->\bin\b</userinput
-> will match at the separate <quote
->in</quote
-> in the string <quote
->He came in through the window</quote
->, but not at the <quote
->in</quote
-> in <quote
->window</quote
->.</para
-></listitem>
+<term><userinput>\b</userinput> (word boundary)</term>
+<listitem><para>Matches if there is a word character at one side and not a word character at the other.</para>
+<para>This is useful to find word ends, for example both ends to find a whole word. The expression <userinput>\bin\b</userinput> will match at the separate <quote>in</quote> in the string <quote>He came in through the window</quote>, but not at the <quote>in</quote> in <quote>window</quote>.</para></listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->\B</userinput
-> (non word boundary)</term>
-<listitem
-><para
->Matches wherever <quote
->\b</quote
-> does not.</para>
-<para
->That means that it will match for example within words: The expression <userinput
->\Bin\B</userinput
-> will match at in <quote
->window</quote
-> but not in <quote
->integer</quote
-> or <quote
->I'm in love</quote
->.</para>
+<term><userinput>\B</userinput> (non word boundary)</term>
+<listitem><para>Matches wherever <quote>\b</quote> does not.</para>
+<para>That means that it will match for example within words: The expression <userinput>\Bin\B</userinput> will match at in <quote>window</quote> but not in <quote>integer</quote> or <quote>I'm in love</quote>.</para>
</listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->(?=PATTERN)</userinput
-> (Positive lookahead)</term>
-<listitem
-><para
->A lookahead assertion looks at the part of the string following a possible match. The positive lookahead will prevent the string from matching if the text following the possible match does not match the <emphasis
->PATTERN</emphasis
-> of the assertion, but the text matched by that will not be included in the result.</para>
-<para
->The expression <userinput
->handy(?=\w)</userinput
-> will match at <quote
->handy</quote
-> in <quote
->handyman</quote
-> but not in <quote
->That came in handy!</quote
-></para>
+<term><userinput>(?=PATTERN)</userinput> (Positive lookahead)</term>
+<listitem><para>A lookahead assertion looks at the part of the string following a possible match. The positive lookahead will prevent the string from matching if the text following the possible match does not match the <emphasis>PATTERN</emphasis> of the assertion, but the text matched by that will not be included in the result.</para>
+<para>The expression <userinput>handy(?=\w)</userinput> will match at <quote>handy</quote> in <quote>handyman</quote> but not in <quote>That came in handy!</quote></para>
</listitem>
</varlistentry>
<varlistentry>
-<term
-><userinput
->(?!PATTERN)</userinput
-> (Negative lookahead)</term>
-
-<listitem
-><para
->The negative lookahead prevents a possible match to be acknowledged if the following part of the searched string does match its <emphasis
->PATTERN</emphasis
->.</para>
-<para
->The expression <userinput
->const \w+\b(?!\s*&amp;)</userinput
-> will match at <quote
->const char</quote
-> in the string <quote
->const char* foo</quote
-> while it can not match <quote
->const QString</quote
-> in <quote
->const QString&amp; bar</quote
-> because the <quote
->&amp;</quote
-> matches the negative lookahead assertion pattern.</para>
+<term><userinput>(?!PATTERN)</userinput> (Negative lookahead)</term>
+
+<listitem><para>The negative lookahead prevents a possible match to be acknowledged if the following part of the searched string does match its <emphasis>PATTERN</emphasis>.</para>
+<para>The expression <userinput>const \w+\b(?!\s*&amp;)</userinput> will match at <quote>const char</quote> in the string <quote>const char* foo</quote> while it can not match <quote>const QString</quote> in <quote>const QString&amp; bar</quote> because the <quote>&amp;</quote> matches the negative lookahead assertion pattern.</para>
</listitem>
</varlistentry>
@@ -1208,11 +477,9 @@ expressions of perl, nor with those of for example
<!-- TODO sect1 id="backreferences">
-<title
->Back References</title>
+<title>Back References</title>
-<para
-></para>
+<para></para>
</sect1 -->