[utilities/kate] doc: Documentation fixes: Use more entities, some punctuation
Christoph Cullmann
null at kde.org
Thu Oct 1 20:35:46 BST 2020
Git commit ac42556a0d5c0eca8da5f3e5a897ce61c407cd5f by Christoph Cullmann, on behalf of Antoni Bella Pérez.
Committed on 01/10/2020 at 19:35.
Pushed by cullmann into branch 'master'.
Documentation fixes: Use more entities, some punctuation
M +1 -1 doc/kate/configuring.docbook
M +7 -7 doc/kate/development.docbook
M +12 -12 doc/kate/fundamentals.docbook
M +3 -2 doc/kate/index.docbook
M +11 -11 doc/kate/man-kate.1.docbook
M +12 -12 doc/kate/menus.docbook
M +44 -44 doc/kate/plugins.docbook
M +14 -14 doc/katepart/advanced.docbook
M +18 -19 doc/katepart/configuring.docbook
M +36 -36 doc/katepart/development.docbook
M +87 -87 doc/katepart/fundamentals.docbook
M +2 -2 doc/katepart/index.docbook
M +15 -15 doc/katepart/menus.docbook
M +13 -19 doc/katepart/part.docbook
M +14 -14 doc/katepart/regular-expressions.docbook
M +26 -26 doc/katepart/vi.docbook
M +3 -3 doc/kwrite/index.docbook
https://invent.kde.org/utilities/kate/commit/ac42556a0d5c0eca8da5f3e5a897ce61c407cd5f
diff --git a/doc/kate/configuring.docbook b/doc/kate/configuring.docbook
index 48d10f540..a450c603a 100644
--- a/doc/kate/configuring.docbook
+++ b/doc/kate/configuring.docbook
@@ -63,7 +63,7 @@ document.</para></listitem>
left, and a configuration page corresponding to the selected topic on
the right.</para>
-<para>The configuration is divided into two groups, namely
+<para>The configuration is divided into two groups, namely:
<itemizedlist>
<listitem><para><link linkend="config-dialog">Application configuration</link>
</para></listitem>
diff --git a/doc/kate/development.docbook b/doc/kate/development.docbook
index faa5909cd..6911a2f29 100644
--- a/doc/kate/development.docbook
+++ b/doc/kate/development.docbook
@@ -12,11 +12,11 @@
<para>Like any advanced text editor, &kate; offers a variety of ways to extend
its functionality. You can <link linkend="dev-scripting">write simple scripts
-to add functionality with JavaScript</link>
+to add functionality with &javascript;</link>
or add even more functionality to the editor itself with
<link linkend="dev-app">&kate; Application Plugins written in C++</link>.
Finally, once you have extended &kate;, you are welcome to
-<ulink url="http://kate-editor.org/join-us/">join us</ulink> and share your
+<ulink url="https://kate-editor.org/join-us/">join us</ulink> and share your
enhancements with the world!</para>
</sect1>
@@ -32,10 +32,10 @@ Handbook</ulink>.</para>
</sect1>
<sect1 id="dev-scripting">
-<title>Scripting with JavaScript</title>
+<title>Scripting with &javascript;</title>
-<para>For information about scripting with JavaScript, see the
-<ulink url="help:/katepart/dev-scripting.html">Scripting with JavaScript
+<para>For information about scripting with &javascript;, see the
+<ulink url="help:/katepart/dev-scripting.html">Scripting with &javascript;
section of the Development chapter of the &katepart; Handbook</ulink>.</para>
</sect1>
@@ -43,12 +43,12 @@ section of the Development chapter of the &katepart; Handbook</ulink>.</para>
<sect1 id="dev-app">
<title>&kate; (C++) Application Plugins</title>
-<para><link linkend="kate-application-plugins">Kate Application Plugins</link>
+<para><link linkend="kate-application-plugins">&kate; Application Plugins</link>
extend the functionality of the &kate; editor itself in any way you can imagine,
using the same programming language &kate; is written in, C++.</para>
<para>To get started, see the
-<ulink url="http://kate-editor.org/2004/01/06/writing-a-kate-plugin/">Writing a
+<ulink url="https://kate-editor.org/2004/01/06/writing-a-kate-plugin/">Writing a
&kate; Plugin tutorial on the &kate; website</ulink>.</para>
</sect1>
diff --git a/doc/kate/fundamentals.docbook b/doc/kate/fundamentals.docbook
index e07628b31..e3999a3f0 100644
--- a/doc/kate/fundamentals.docbook
+++ b/doc/kate/fundamentals.docbook
@@ -57,7 +57,7 @@ of &kde;'s network transparency to open files on the internet.
<informalexample>
<screen>
-<prompt>%</prompt><userinput><command>kate</command> <option><replaceable>ftp://ftp.kde.org/pub/kde/README</replaceable></option></userinput>
+<prompt>%</prompt><userinput><command>kate</command> <option><replaceable>&kde-ftp;README</replaceable></option></userinput>
</screen>
</informalexample>
@@ -89,7 +89,7 @@ This lists the options available at the command line.
<option>-s</option> <option>--start</option> <parameter>name</parameter></userinput></term>
<listitem>
<para>
-Starts kate with the session <parameter>name</parameter>. The session is created
+Starts &kate; with the session <parameter>name</parameter>. The session is created
if it does not exist already. If a &kate; instance running the specified session
exists, the specified files are loaded in that instance.
</para>
@@ -160,10 +160,10 @@ if no parameters and no URLs are given at all.</para></listitem>
given to open.</para>
<para>
You can use &kate; with this option as editor for typing in commit messages for version
-control systems like <application>Git</application> or <application>Subversion</application>.
+control systems like &git; or <application>Subversion</application>.
These systems expect to block the editor till you have entered your
message, because they then open the temporary file, which would be empty
-if kate immediately returned to the caller.
+if &kate; immediately returned to the caller.
</para>
<para>This option is also needed with KIO (&kde; Input/Output), if you open a remote file (which has been
downloaded to a temporary) and should be reuploaded, after you saved it.
@@ -226,7 +226,7 @@ Shows license information.
<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, the filemanager &dolphin; or some remote ftp
+dropped onto &kate; from the Desktop, the filemanager &dolphin; or some remote &FTP;
site opened in one of &dolphin;'s windows.
</para>
</sect2>
@@ -466,7 +466,7 @@ focused frame.</para>
<title>Using Sessions</title>
<para>Sessions is how &kate; lets you keep more than one list of files and
-GUI configuration around. You can have as many named sessions as you want,
+&GUI; configuration around. You can have as many named sessions as you want,
and you can use unnamed or anonymous sessions for files you want to use only
once. Currently &kate; can save the list of open files, and the general window
configuration in the session; future versions of &kate; may add more features
@@ -479,7 +479,7 @@ one as it used to do as the default behavior.</para>
<itemizedlist>
<listitem><para><link linkend="command-line-options"><emphasis>Command line
options</emphasis></link> that lets you select and start sessions when launching
-kate from the command line.</para>
+&kate; from the command line.</para>
</listitem>
<listitem><para><link linkend="sessions-menu"><emphasis>The Sessions
menu</emphasis></link> that lets you switch, save, start and manage your
@@ -491,7 +491,7 @@ behave.</para></listitem>
</para>
-<para>When starting a new session, the GUI configuration of <guilabel>Default
+<para>When starting a new session, the &GUI; configuration of <guilabel>Default
Session</guilabel> is loaded. To save window configuration in the default
session, you need to enable saving window configuration in the sessions
configuration page of the configuration dialog and then load the default
@@ -499,14 +499,14 @@ session, set up the window as desired and save the session again.</para>
<para>When a named session is loaded, &kate; will display the session name at
the start of the window title, which then has the form
-"<replaceable>Session Name</replaceable>: <replaceable>Document name or
-&URL;</replaceable> - &kate;"</para>
+<quote><replaceable>Session Name</replaceable>: <replaceable>Document name or
+&URL;</replaceable> - &kate;</quote>.</para>
<para>When opening files on the command line with <option>--start
<replaceable>name</replaceable></option> or if a session is selected using the
session chooser, the specified session is loaded prior to the files specified
on the command line. To open files from the command line in a new, unnamed
-session, configure kate to start a new session as default in the session page of
+session, configure &kate; to start a new session as default in the session page of
the configuration dialog or use <option>--start</option> with an empty string:
<replaceable>''</replaceable>.</para>
<!--FIXME still valid for kf5 -->
@@ -588,7 +588,7 @@ info documentation, or you can use &konqueror;.</para>
<sect2>
<title>Articles on &kate;</title>
-<para>&kate;'s homepage provides some <ulink url="http://kate-editor.org/featured-articles">
+<para>&kate;'s homepage provides some <ulink url="https://kate-editor.org/featured-articles">
Articles and Howtos</ulink> with further information beyond the scope of this handbook.</para>
</sect2>
diff --git a/doc/kate/index.docbook b/doc/kate/index.docbook
index 473bb0e6f..e26a94d88 100644
--- a/doc/kate/index.docbook
+++ b/doc/kate/index.docbook
@@ -2,6 +2,7 @@
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN"
"dtd/kdedbx45.dtd" [
<!ENTITY gdb "<acronym>GDB</acronym>">
+ <!ENTITY kparts "<acronym>KParts</acronym>">
<!ENTITY configuring-chapter SYSTEM "configuring.docbook">
<!ENTITY fundamentals-chapter SYSTEM "fundamentals.docbook">
<!ENTITY menu-chapter SYSTEM "menus.docbook">
@@ -178,7 +179,7 @@ documentation</para></listitem>
</varlistentry>
<varlistentry>
<term>&Michael.Koch; &Michael.Koch.mail;</term>
-<listitem><para>&kwrite; port to KParts</para></listitem>
+<listitem><para>&kwrite; port to &kparts;</para></listitem>
</varlistentry>
<varlistentry>
<term>&Christian.Gebauer; <email>gebauer at bigfoot.com</email></term>
@@ -234,7 +235,7 @@ documentation</para></listitem>
</varlistentry>
<varlistentry>
<term>&Carsten.Niehaus;</term>
-<listitem><para>Highlighting for LaTeX</para></listitem>
+<listitem><para>Highlighting for &latex;</para></listitem>
</varlistentry>
<varlistentry>
<term>Per Wigren</term>
diff --git a/doc/kate/man-kate.1.docbook b/doc/kate/man-kate.1.docbook
index 66b6755b7..c20ae1a1b 100644
--- a/doc/kate/man-kate.1.docbook
+++ b/doc/kate/man-kate.1.docbook
@@ -51,7 +51,7 @@ line</replaceable></group>
the name &kwrite;.</para>
<para>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
+&HTML; to bash scripts, the ability to create and
maintain projects, a multiple document interface
(<acronym>MDI</acronym>), and a self-contained terminal emulator.
</para>
@@ -98,33 +98,33 @@ pid</replaceable></term>
<varlistentry>
<term><option>-e, --encoding</option> <replaceable>
name</replaceable></term>
-<listitem><para>Set encoding for the file to open</para><para>You can use
+<listitem><para>Set encoding for the file to open.</para><para>You can use
this to force a file opened in utf-8 format, for instance. (The command
<command>iconv -l</command> provides a list of encodings, which may be
helpful to you.)</para></listitem>
</varlistentry>
<varlistentry>
<term><option>-l, --line</option> <replaceable> line</replaceable></term>
-<listitem><para>Navigate to this line</para></listitem>
+<listitem><para>Navigate to this line.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>-c, --column</option> <replaceable>
column</replaceable></term>
-<listitem><para>Navigate to this column</para></listitem>
+<listitem><para>Navigate to this column.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>-i, --stdin</option></term>
<listitem><para>Read the contents of
-<filename>stdin</filename></para></listitem>
+<filename>stdin</filename>.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--tempfile</option></term>
<listitem><para>The files/&URL;s opened by the application will be
-deleted after use</para></listitem>
+deleted after use.</para></listitem>
</varlistentry>
<varlistentry>
<term><option><replaceable>file</replaceable></option></term>
-<listitem><para>File to open</para></listitem>
+<listitem><para>File to open.</para></listitem>
</varlistentry>
</variablelist>
@@ -135,13 +135,13 @@ deleted after use</para></listitem>
<simplelist><member>More detailed user documentation is available from <ulink
url="help:/kate">help:/kate</ulink>
-(either enter this <acronym>URL</acronym> into &konqueror;, or run
+(either enter this &URL; into &konqueror;, or run
<userinput><command>khelpcenter</command>
<parameter>help:/kate</parameter></userinput>).</member>
<member>kf5options(7)</member>
<member>qt5options(7)</member>
<member>There is also further information available at the <ulink
-url="http://kate-editor.org/">&kate; website</ulink>.</member>
+url="https://kate-editor.org/">&kate; website</ulink>.</member>
</simplelist>
</refsect1>
@@ -155,12 +155,12 @@ line 25, in an existing &kate; window, you could use:</para>
</screen>
<para>If you have an active internet connection, you can take advantage of
-&kde;'s network transparency to open a file from an ftp site. If you do not
+&kde;'s network transparency to open a file from an &FTP; site. If you do not
have write permission on the remote server, the file will be opened read
only and you will be prompted for a local filename to save to if you make
changes. If you do have write permission, changes will be saved
transparently over the network.</para>
-<screen><userinput><command>kate</command> <option><replaceable>ftp://ftp.kde.org/pub/kde/README</replaceable></option></userinput></screen>
+<screen><userinput><command>kate</command> <option><replaceable>&kde-ftp;README</replaceable></option></userinput></screen>
<!-- FIXME: Some more useful examples would be cool, how about this snagged -->
<!-- from a mail of anders (slightly edited /line/l to remove the double -->
diff --git a/doc/kate/menus.docbook b/doc/kate/menus.docbook
index 2412614e1..fa2e78efc 100644
--- a/doc/kate/menus.docbook
+++ b/doc/kate/menus.docbook
@@ -63,7 +63,7 @@ location.
</term>
<listitem>
<para>
-This submenu presents a list of applications known to handle the mime type
+This submenu presents a list of applications known to handle the &MIME; type
of your current document. Activating an entry will open the current document
with that application.</para>
<para>In addition, an entry <guimenuitem>Other...</guimenuitem> launches
@@ -300,7 +300,7 @@ action="simul">&Ctrl;<keycap>Z</keycap></keycombo>
<guimenuitem>Undo</guimenuitem>
</menuchoice></term>
<listitem>
-<para>Undo the last editing command (typing, copying, cutting etc.)</para>
+<para>Undo the last editing command (typing, copying, cutting &etc;)</para>
<note><para>This may undo several editing commands of the same type, like typing
in characters.</para></note>
</listitem>
@@ -315,7 +315,7 @@ in characters.</para></note>
<guimenuitem>Redo</guimenuitem>
</menuchoice></term>
<listitem>
-<para>This will reverse the most recent change (if any) made using Undo</para>
+<para>This will reverse the most recent change (if any) made using Undo.</para>
</listitem>
</varlistentry>
@@ -702,7 +702,7 @@ The new instance will be identical to your previous instance.
<varlistentry id="view-next-tab">
<term><menuchoice>
<shortcut>
-<keycombo action="simul">&Alt;<keysym>Right</keysym></keycombo>
+<keycombo action="simul">&Alt;&Right;</keycombo>
</shortcut>
<guimenu>View</guimenu>
<guimenuitem>Next Tab</guimenuitem>
@@ -715,7 +715,7 @@ The new instance will be identical to your previous instance.
<varlistentry id="view-previous-tab">
<term><menuchoice>
<shortcut>
-<keycombo action="simul">&Alt;<keysym>Left</keysym></keycombo>
+<keycombo action="simul">&Alt;&Left;</keycombo>
</shortcut>
<guimenu>View</guimenu>
<guimenuitem>Previous Tab</guimenuitem>
@@ -738,7 +738,7 @@ The new instance will be identical to your previous instance.
While entering text in the search
field the document names and document &URL;s are searched for matching text.
While entering text in the search field you can use
-the cursor keys <keysym>Up</keysym> and <keysym>Down</keysym> to navigate in the
+the cursor keys &Up; and &Down; to navigate in the
list view. Pressing the &Enter; key or double clicking on an item in the list switches
the view to the document selected in the list view. This makes switching between
documents easier, if there are a lot of them open.</para>
@@ -790,7 +790,7 @@ area in more views.</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>
+<para>See also <link linkend="kate-mdi">Working with the &kate; MDI</link>.</para>
</listitem>
</varlistentry>
@@ -1222,7 +1222,7 @@ the list of markers which is appended at the bottom of this menu item.
<varlistentry id="bookmarks-bookmarks-previous">
<term><menuchoice>
<shortcut>
-<keycombo action="simul">&Alt;<keycap>PgUp</keycap></keycombo>
+<keycombo action="simul">&Alt;&PgUp;</keycombo>
</shortcut>
<guimenu>Bookmarks</guimenu>
<guimenuitem>Previous</guimenuitem>
@@ -1236,7 +1236,7 @@ in a line above the cursor.</para></listitem>
<varlistentry id="bookmarks-bookmarks-next">
<term><menuchoice>
<shortcut>
-<keycombo action="simul">&Alt;<keycap>PgDown</keycap></keycombo>
+<keycombo action="simul">&Alt;&PgDn;</keycombo>
</shortcut>
<guimenu>Bookmarks</guimenu>
<guimenuitem>Next</guimenuitem>
@@ -1415,7 +1415,7 @@ document. This overwrites the global end of line mode set in <menuchoice>
<para>Checking this action you can explicitly add a byte order mark for unicode
encoded documents. The byte order mark (BOM) is a Unicode character used to signal
the endianness (byte order) of a text file or stream, for more information see
-<ulink url="http://en.wikipedia.org/wiki/Byte_Order_Mark">Byte Order Mark</ulink>.</para>
+<ulink url="https://en.wikipedia.org/wiki/Byte_order_mark">Byte Order Mark</ulink>.</para>
</listitem>
</varlistentry>
@@ -1438,7 +1438,7 @@ scripts in the &katepart; documentation.</ulink></para>
<varlistentry id="tools-invoke-code-completition">
<term><menuchoice>
<shortcut>
-<keycombo action="simul">&Ctrl;<keycap>Space</keycap></keycombo>
+<keycombo action="simul">&Ctrl;&Space;</keycombo>
</shortcut>
<guimenu>Tools</guimenu>
<guimenuitem>Invoke Code Completion</guimenuitem>
@@ -1669,7 +1669,7 @@ a new line of text will automatically start when the current
line exceeds the length specified by the <guilabel>Wrap words at</guilabel> option
in the Editing tab in <menuchoice>
<guimenu>Settings</guimenu><guimenuitem>Configure
-Editor...</guimenuitem></menuchoice></para></listitem>
+Editor...</guimenuitem></menuchoice>.</para></listitem>
</varlistentry>
</variablelist>
diff --git a/doc/kate/plugins.docbook b/doc/kate/plugins.docbook
index 596ac7e48..d3a807a90 100644
--- a/doc/kate/plugins.docbook
+++ b/doc/kate/plugins.docbook
@@ -80,7 +80,7 @@ simple &gdb; frontend</para>
- Opens the corresponding .h/[.cpp|.c] file</para>
</listitem>
<listitem>
-<para><link linkend="kate-application-plugin-projects">Project Plugin</link> - Integration with Git and other source control systems</para>
+<para><link linkend="kate-application-plugin-projects">Project Plugin</link> - Integration with &git; and other source control systems</para>
</listitem>
<listitem>
<para>Replicode - Constructivist AI language and runtime</para>
@@ -105,7 +105,7 @@ query on SQL databases</para>
- Extract and show reference symbols from source</para>
</listitem>
<listitem>
-<para><link linkend="kate-application-plugin-konsole">Terminal tool view</link> - Have a terminal at the ready, using KDE's Konsole widget</para>
+<para><link linkend="kate-application-plugin-konsole">Terminal tool view</link> - Have a terminal at the ready, using &kde;'s &konsole; widget</para>
</listitem>
<listitem>
<para><link linkend="kate-application-plugin-textfilter">Text Filter</link> - Process text using terminal commands</para>
@@ -143,7 +143,7 @@ directories where the source code is located.
<member><filename>kdepim-runtime/resources/gmail/saslplugin/config.h</filename></member>
</simplelist>
-<para>To pick the right choice, the plugin picks the last two parts of the url,
+<para>To pick the right choice, the plugin picks the last two parts of the &URL;,
in this case this would be</para>
<simplelist>
@@ -173,14 +173,14 @@ in this case this would be</para>
<para>Clicking <guibutton>OK</guibutton> will start indexing.
When indexing is finished, open the toolview <guilabel>Backtrace Browser</guilabel>.</para>
<para>Now you can load a backtrace from the clipboard (⪚, when you clicked
-<guibutton>Copy to Clipboard</guibutton> in DrKonqi) or from a file.</para>
+<guibutton>Copy to Clipboard</guibutton> in &drkonqi;) or from a file.</para>
</sect2>
</sect1>
<sect1 id="kate-application-plugin-build">
-<!--http://kate-editor.org/2011/06/21/kate-plugin-updates-part-1/ -->
+<!--https://kate-editor.org/2011/06/21/kate-plugin-updates-part-1/ -->
<sect1info>
<authorgroup>
<author><firstname>Salma</firstname> <surname>Sultana</surname></author>
@@ -336,7 +336,7 @@ To navigate to the next error, press
<varlistentry id="build-previous-error">
<term><menuchoice>
-<shortcut><keycombo action="simul">&Ctrl;&Alt;<keysym>Left</keysym></keycombo></shortcut>
+<shortcut><keycombo action="simul">&Ctrl;&Alt;&Left;</keycombo></shortcut>
<guimenu>Build</guimenu><guimenuitem>Previous Error</guimenuitem>
</menuchoice></term>
<listitem><para>Moves the cursor to the location of the previous error in the
@@ -345,7 +345,7 @@ document.</para></listitem>
<varlistentry id="build-next-error">
<term><menuchoice>
-<shortcut><keycombo action="simul">&Ctrl;&Alt;<keysym>Right</keysym></keycombo></shortcut>
+<shortcut><keycombo action="simul">&Ctrl;&Alt;&Right;</keycombo></shortcut>
<guimenu>Build</guimenu><guimenuitem>Next Error</guimenuitem>
</menuchoice></term>
<listitem><para>Moves the cursor to the location of the next error in the
@@ -475,7 +475,7 @@ directories containing the source code and regenerate the common CTags database.
</para>
<para>For more information about all available options please read the CTags man page. This man page
-is available in &khelpcenter; and you can also enter the &URL; <emphasis>man/:ctags</emphasis>
+is available in &khelpcenter; and you can also enter the &URL; <emphasis>man:/ctags</emphasis>
directly into &konqueror;
</para>
@@ -611,13 +611,13 @@ place the cursor at the start of the definition.</para>
<title>Introduction</title>
<para>
The plugin enables a live preview of the currently edited text document in the
-final format in the sidebar. So when editing ⪚ a Markdown text or an SVG image,
+final format in the sidebar. So when editing ⪚ a &Markdown; text or an &SVG; image,
the result is instantly visible next to the source text.
</para>
-<para>For the display the plugin uses that KParts plugin which is currently selected
+<para>For the display the plugin uses that &kparts; plugin which is currently selected
as the preferred one for the &MIME; type of the document.
-If there is no KParts plugin for that type, no preview is possible.
+If there is no &kparts; plugin for that type, no preview is possible.
</para>
<para>To change the preferred plugin open the <guilabel>File Associations</guilabel>
@@ -626,23 +626,23 @@ on the <guilabel>Embedding</guilabel> tab.
</para>
<table>
-<title>Some available KParts plugins</title>
+<title>Some available &kparts; plugins</title>
<tgroup cols="2">
<tbody>
<row>
-<entry>&MIME; type</entry><entry>KParts plugin</entry>
+<entry>&MIME; type</entry><entry>&kparts; plugin</entry>
</row>
<row>
-<entry>Markdown text</entry><entry>KMarkdownWebViewPart or OkularPart</entry>
+<entry>&Markdown; text</entry><entry>KMarkdownWebViewPart or OkularPart</entry>
</row>
<row>
-<entry>SVG image</entry><entry>SVGPart</entry>
+<entry>&SVG; image</entry><entry>SVGPart</entry>
</row>
<row>
<entry>&Qt; UI files</entry><entry>KUIViewerPart</entry>
</row>
<row>
-<entry>Dot graph files</entry><entry>KGraphviewerPart</entry>
+<entry>&DOT; graph files</entry><entry>KGraphviewerPart</entry>
</row>
</tbody>
</tgroup>
@@ -683,7 +683,7 @@ this document.</para>
<para>Manually update the preview of the current document content</para>
</listitem>
<listitem>
-<para>A dropdown menu with actions from the KParts plugin</para>
+<para>A dropdown menu with actions from the &kparts; plugin</para>
</listitem>
</itemizedlist>
</sect2>
@@ -1087,7 +1087,7 @@ View.</para></listitem>
</sect1>
<sect1 id="kate-application-plugin-gdb">
-<!--http://kate-editor.org/2011/06/23/kate-plugin-updates-part-2/-->
+<!--https://kate-editor.org/2011/06/23/kate-plugin-updates-part-2/-->
<sect1info>
<authorgroup>
<author><firstname>Martin</firstname> <surname>Gergov</surname></author>
@@ -1104,7 +1104,7 @@ Project Debugger.</para>
<important>
<para>Previous experience with &gdb; is strongly recommended. For more
-information on using &gdb;, visit <ulink url="http://www.gnu.org/s/gdb/">the
+information on using &gdb;, visit <ulink url="https://www.gnu.org/software/gdb/">the
&gdb; website</ulink>.</para>
</important>
@@ -1609,8 +1609,8 @@ For instance, the <quote>Kate</quote> <filename>.kateproject</filename> file loo
}
</screen>
-<para>The file content is written in JSON syntax. The project name is <quote>Kate</quote>, and
-the files contained in should be read from git.
+<para>The file content is written in &JSON; syntax. The project name is <quote>Kate</quote>, and
+the files contained in should be read from &git;.
</para>
<para>
@@ -1970,7 +1970,7 @@ and so it may not be advisable to have both enabled at the same time.
<guisubmenu>Close all non-diagnostics tabs</guisubmenu>
</menuchoice></term>
<listitem>
-<para>Close all non-diagnostics (e.g. references) tabs in plugin toolview.</para>
+<para>Close all non-diagnostics (⪚ references) tabs in plugin toolview.</para>
</listitem>
</varlistentry>
@@ -2005,7 +2005,7 @@ and so it may not be advisable to have both enabled at the same time.
<para>
The plugin's configuration page mostly allows for persistent configuration of
some of the above menu items. However, there is one additional entry
-to specify the Server Configuration file. This is a JSON file that
+to specify the Server Configuration file. This is a &JSON; file that
can be used to specify the LSP server to start (and then to communicate
with over stdin/stdout). For convenience, the following default configuration
is included (though alternative server implementation are equally valid
@@ -2078,7 +2078,7 @@ considered as well (see further below).
</para>
<para>
-The "highlightingModeRegex" is used to map the highlighting mode as used by Kate
+The "highlightingModeRegex" is used to map the highlighting mode as used by &kate;
to the language id of the server. If no regular expression is given, the language id
itself is used.
</para>
@@ -2129,12 +2129,12 @@ the view of many separate instances.
<para>
Each particular LSP server has its own way of customization and may use
-language/tool specific means for configuration, e.g.
+language/tool specific means for configuration, ⪚
<filename>tox.ini</filename> (a.o. for python),
<filename>.clang-format</filename> for C++ style format. Such configuration may
then also be used by other (non-LSP) tools (such as then
<application>tox</application> or <application>clang-format</application>). On
-top of that, some LSP servers also load configuration from custom files (e.g.
+top of that, some LSP servers also load configuration from custom files (⪚
<filename>.ccls</filename>). Furthermore, custom server configuration can also
be passed through LSP (protocol), see the aforementioned
"initializationOptions" and "settings" entries in server configuration.
@@ -2173,7 +2173,7 @@ the above example's server supports many more options in "settings".
See <ulink url="https://github.com/neoclide/coc.nvim/wiki/Language-servers">
another LSP client's documentation</ulink> for various other language server
examples and corresponding settings, which can easily and readily be
-transformed to the JSON configuration that is used here and outlined above.
+transformed to the &JSON; configuration that is used here and outlined above.
</para>
</sect3>
@@ -2452,7 +2452,7 @@ are typically hidden by your &OS;. This option is only available when using
<term><guilabel>Follow symbolic links</guilabel></term>
<listitem><para>
The Search in Files plugin typically does not follow
-<ulink url="http://en.wikipedia.org/wiki/Symbolic_link">symbolic links</ulink>.
+<ulink url="https://en.wikipedia.org/wiki/Symbolic_link">symbolic links</ulink>.
When this option is enabled, the plugin will follow them instead and search inside
the files or folders they reference. This option is only available when using
<guilabel>Folder</guilabel> mode.
@@ -2566,13 +2566,13 @@ plugin.</para>
<author>&TC.Hollingsworth; &TC.Hollingsworth.mail;</author>
</authorgroup>
</sect1info>
-<title>Kate Snippets</title>
+<title>&kate; Snippets</title>
<sect2 id="snippets-intro">
<title>Introduction</title>
-<para>Kate Snippets is a plugin used to save you some time by adding support for
+<para>&kate; Snippets is a plugin used to save you some time by adding support for
so-called <quote>snippets</quote> (re-usable source code, machine code or text). The plugin
-also supports code completion and JavaScript.</para>
+also supports code completion and &javascript;.</para>
</sect2>
<sect2 id="snippets-menu">
@@ -2605,7 +2605,7 @@ may insert in any part of any document.</para>
<title>Snippets panel</title>
<screenshot id="screenshot-snippets-panel">
-<screeninfo>Kate Snippets Panel</screeninfo>
+<screeninfo>&kate; Snippets Panel</screeninfo>
<mediaobject>
<imageobject><imagedata fileref="snippets-panel.png" format="PNG"/></imageobject>
<textobject><phrase>The &kate; snippets panel.</phrase></textobject>
@@ -2721,12 +2721,12 @@ simple, editable field. All subsequent occurrences of the same
of the first during editing.</para>
<para><userinput>${<replaceable>field_name=default</replaceable>}</userinput>
can be used to specify a default value for the field.
-<replaceable>default</replaceable> can be any JavaScript expression.</para>
+<replaceable>default</replaceable> can be any &javascript; expression.</para>
<para>Use <userinput>${<replaceable>field_name</replaceable>=<replaceable>text</replaceable>}</userinput>
to specify a fixed string as default value.</para>
<para><userinput>${func(<replaceable>other_field1</replaceable>,
<replaceable>other_field2</replaceable>, ...)}</userinput> can be used to create a
-field which evaluates a JavaScript function on each edit and contains its
+field which evaluates a &javascript; function on each edit and contains its
contents. See the <guilabel>Scripts</guilabel> tab for more information.</para>
<para><userinput>${cursor}</userinput> can be used to mark the end position
of the cursor after everything else was filled in.</para>
@@ -2735,8 +2735,8 @@ of the cursor after everything else was filled in.</para>
<varlistentry>
<term><guilabel>Scripts</guilabel></term>
-<listitem><para>JavaScript helper functions to use in your snippets.</para>
-<para>All JavaScript functions should return the contents you want to place in a
+<listitem><para>&javascript; helper functions to use in your snippets.</para>
+<para>All &javascript; functions should return the contents you want to place in a
template field as a string.</para>
<para>Functions are called in a scope which contains the contents of all
editable template fields as local variables. For example in a snippet
@@ -2763,7 +2763,7 @@ documentation for more information</para>
<title>Using Snippets</title>
<screenshot id="screenshot-snippets-usage">
-<screeninfo>Kate Snippets in Action</screeninfo>
+<screeninfo>&kate; Snippets in Action</screeninfo>
<mediaobject>
<imageobject><imagedata fileref="snippets-usage.png" format="PNG"/></imageobject>
<textobject><phrase>Accessing &kate; Snippets from a tool view and a drop down menu.</phrase></textobject>
@@ -2776,7 +2776,7 @@ documentation for more information</para>
<itemizedlist>
<listitem><para>By choosing the snippet from the tool view.</para></listitem>
<listitem><para>While writing, you can press <keycombo action="simul">&Ctrl;
-<keysym>Space</keysym></keycombo>, which will display all the snippets in a
+&Space;</keycombo>, which will display all the snippets in a
convenient window from which you can choose. This key combination provides
functionality similar to code completion.</para></listitem>
</itemizedlist>
@@ -2829,7 +2829,7 @@ deleting, and requesting information from databases.</para>
<title>Connecting to a Database</title>
<para>Select <guibutton>Add Connection</guibutton> from the <guimenu>SQL</guimenu>
-menu or toolbar, and then select the Qt database driver you want to use (including
+menu or toolbar, and then select the &Qt; database driver you want to use (including
QSQLITE, QMYSQL3, QMYSQL, QODBC3, QODBC, QPSQL7, and QPSQL). If you can't see
the desired driver, you need to install it. Then, press <guibutton>Next</guibutton>.
</para>
@@ -2929,7 +2929,7 @@ current document in the Comma Separated Values format.</para></listitem>
<varlistentry>
<term><guibutton>Clear</guibutton></term>
-<listitem><para>Removes everything from the table view</para></listitem>
+<listitem><para>Removes everything from the table view.</para></listitem>
</varlistentry>
<!--FIXME Use system locale -->
@@ -2937,7 +2937,7 @@ current document in the Comma Separated Values format.</para></listitem>
</variablelist>
<para>You can now change the colors displayed in the table in the <guilabel>SQL</guilabel>
-section of <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &kate;</guimenuitem>
+section of <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &kate;...</guimenuitem>
</menuchoice>.</para>
</sect3>
@@ -3033,7 +3033,7 @@ writing much of this section.</para>
<para>It allows developers to view symbols (functions, macros and structures) from source code.</para>
<para>By clicking the parsed information you can easily browse the code.</para>
<para>At the moment the following languages are supported:</para>
-<para>C/C++, Java, Perl, PHP, Python, Ruby, XSLT, Tcl/Tk, Fortran</para>
+<para>C/C++, &Java;, Perl, PHP, Python, Ruby, XSLT, Tcl/Tk, Fortran</para>
<para>Feature list:</para>
<simplelist>
@@ -3307,7 +3307,7 @@ However, remote DTDs specified via http are supported.</para>
<para>If the file has no doctype it will be checked for being well-formed.</para>
-<para>To learn more about &XML; check out the <ulink url="http://www.w3.org/XML/"> official W3C &XML; pages</ulink>.</para>
+<para>To learn more about &XML; check out the <ulink url="https://www.w3.org/XML/"> official W3C &XML; pages</ulink>.</para>
<para>Internally this plugin calls the external command <command>xmllint</command>, which
is part of libxml2. If this command is not correctly installed on your system, the plugin
@@ -3492,7 +3492,7 @@ You will have to repeat it when you start &kate; the next time.</para></listitem
&kate; Plugin <quote>&XML; Completion</quote> copyright 2001,2002 &Daniel.Naber;
&Daniel.Naber.mail;.
</para>
-<para>KDE SC 4 version copyright 2010 Tomáš Trnka</para>
+<para>&kde; SC 4 version copyright 2010 Tomáš Trnka</para>
<para>Documentation copyright 2001,2002 &Daniel.Naber;</para>
</sect2>
</sect1>
diff --git a/doc/katepart/advanced.docbook b/doc/katepart/advanced.docbook
index cf8592fe2..4b765da5f 100644
--- a/doc/katepart/advanced.docbook
+++ b/doc/katepart/advanced.docbook
@@ -53,7 +53,7 @@ action="simul">&Ctrl;&Shift;<keycap>D</keycap></keycombo>.</para>
<title>The Editor Component Command Line</title>
<para>&kappname;'s editor component has an internal command line, allowing you to
-perform various actions from a minimal GUI. The command line is a text entry
+perform various actions from a minimal &GUI;. The command line is a text entry
at the bottom of the editor area; to show it select
<menuchoice><guimenu>View</guimenu><guimenuitem>Switch to Command Line</guimenuitem></menuchoice>
or use the shortcut (default is
@@ -73,8 +73,8 @@ issue <command>help list</command>; to view help for a specific command, do
<command>help <replaceable>command</replaceable></command>.</para>
<para>The command line has a built in history, so you can reuse commands already
-typed. To navigate the history, use the <keycap>Up</keycap> and
-<keycap>Down</keycap> keys. When showing historical commands, the argument part
+typed. To navigate the history, use the &Up; and
+&Down; keys. When showing historical commands, the argument part
of the command will be selected, allowing you to easily overwrite the
arguments.</para>
@@ -237,8 +237,8 @@ argument.</para></listitem>
<varlistentry>
<term><cmdsynopsis><command>reload-scripts</command></cmdsynopsis></term>
-<listitem><para>Reload all <link linkend="dev-scripting">JavaScript
-scripts</link> used by Kate, including indenters and command line scripts.</para></listitem>
+<listitem><para>Reload all <link linkend="dev-scripting">&javascript;
+scripts</link> used by &kate;, including indenters and command line scripts.</para></listitem>
</varlistentry>
<varlistentry>
@@ -373,12 +373,12 @@ if none is specified. The following translations are done when interpreting
<tbody>
<row><entry><literal>d</literal></entry><entry>The day as number without a leading zero (1-31).</entry></row>
<row><entry><literal>dd</literal></entry><entry>The day as number with a leading zero (01-31).</entry></row>
-<row><entry><literal>ddd</literal></entry><entry>The abbreviated localized day name (e.g. 'Mon'..'Sun').</entry></row>
-<row><entry><literal>dddd</literal></entry><entry>The long localized day name (e.g. 'Monday'..'Sunday').</entry></row>
+<row><entry><literal>ddd</literal></entry><entry>The abbreviated localized day name (⪚ 'Mon'..'Sun').</entry></row>
+<row><entry><literal>dddd</literal></entry><entry>The long localized day name (⪚ 'Monday'..'Sunday').</entry></row>
<row><entry><literal>M</literal></entry><entry>The month as number without a leading zero (1-12).</entry></row>
<row><entry><literal>MM</literal></entry><entry>The month as number with a leading zero (01-12).</entry></row>
-<row><entry><literal>MMMM</literal></entry><entry>The long localized month name (e.g. 'January'..'December').</entry></row>
-<row><entry><literal>MMM</literal></entry><entry>The abbreviated localized month name (e.g. 'Jan'..'Dec').</entry></row>
+<row><entry><literal>MMMM</literal></entry><entry>The long localized month name (⪚ 'January'..'December').</entry></row>
+<row><entry><literal>MMM</literal></entry><entry>The abbreviated localized month name (⪚ 'Jan'..'Dec').</entry></row>
<row><entry><literal>yy</literal></entry><entry>The year as two digit number
(00-99).</entry></row>
<row><entry><literal>yyyy</literal></entry><entry>The year as four digit number (1752-8000).</entry></row>
@@ -598,7 +598,7 @@ document.</para></listitem>
<varlistentry>
<term><cmdsynopsis><command>each</command><arg choice="req">STRING script</arg></cmdsynopsis></term>
-<listitem><para>Given a JavaScript function as an argument, call that for the list of
+<listitem><para>Given a &javascript; function as an argument, call that for the list of
selected lines and replace them with the return value of that callback.</para>
<example>
@@ -617,7 +617,7 @@ selected lines and replace them with the return value of that callback.</para>
<varlistentry>
<term><cmdsynopsis><command>filter</command><arg choice="req">STRING script</arg></cmdsynopsis></term>
-<listitem><para>Given a JavaScript function as an argument, call that for the list of
+<listitem><para>Given a &javascript; function as an argument, call that for the list of
selected lines and remove those where the callback returns false.</para>
<example>
@@ -634,7 +634,7 @@ selected lines and remove those where the callback returns false.</para>
<varlistentry>
<term><cmdsynopsis><command>map</command><arg choice="req">STRING script</arg></cmdsynopsis></term>
-<listitem><para>Given a JavaScript function as an argument, call that for the list of
+<listitem><para>Given a &javascript; function as an argument, call that for the list of
selected lines and replace the line with the value of the callback.</para>
<example>
@@ -681,7 +681,7 @@ line.replace(/^s+/,"");}'
</cmdsynopsis></term>
<listitem><para>Search the document for the regular expression
<userinput>pattern</userinput>. For more information, see
-<xref linkend="regular-expressions" /></para>
+<xref linkend="regular-expressions" />.</para>
</listitem>
</varlistentry>
@@ -741,7 +741,7 @@ replacement string.</para></listitem>
<listitem><para>This command provides <quote>as-you-type</quote> searching. You
can configure the behavior of the search by appending a colon
followed by one or more options, like this:
-<userinput>ifind:options pattern</userinput>. Allowed options are
+<userinput>ifind:options pattern</userinput>. Allowed options are:
<variablelist>
<varlistentry>
diff --git a/doc/katepart/configuring.docbook b/doc/katepart/configuring.docbook
index b2b0ae834..9b533662a 100644
--- a/doc/katepart/configuring.docbook
+++ b/doc/katepart/configuring.docbook
@@ -192,7 +192,7 @@ This allows you to quickly switch to another part of the document.</para>
<listitem><para>If this option is checked, every new view will show a mini map of the
document on the vertical scrollbar.</para>
<para>For more information on the scrollbar minimap, see
-<xref linkend="kate-part-scrollbar-minimap"/></para></listitem>
+<xref linkend="kate-part-scrollbar-minimap"/>.</para></listitem>
</varlistentry>
<varlistentry>
<term><guilabel>Minimap Width</guilabel></term>
@@ -348,14 +348,14 @@ folding documentation</link>.</para></listitem>
<term><guilabel>Modified Lines</guilabel></term>
<listitem><para>This color is used to highlight to the left of a document lines
that have been modified but not yet saved. For more information, see
-<xref linkend="kate-part-line-modification"/></para></listitem>
+<xref linkend="kate-part-line-modification"/>.</para></listitem>
</varlistentry>
<varlistentry>
<term><guilabel>Saved Lines</guilabel></term>
<listitem><para>This color is used to highlight to the left of a document lines
that have been modified this session and saved. For more information, see
-<xref linkend="kate-part-line-modification"/></para></listitem>
+<xref linkend="kate-part-line-modification"/>.</para></listitem>
</varlistentry>
</variablelist>
@@ -662,9 +662,9 @@ skip white space and go to the start of a line's text.</para>
<term><guilabel>PageUp/PageDown moves cursor</guilabel></term>
<listitem>
<para>This option changes the behavior of the cursor when the user presses
-the <keycap>Page Up</keycap> or <keycap>Page Down</keycap> key. If unselected
-the text cursor will maintain its relative position within the visible text in
-&kappname; as new text becomes visible as a result of the operation. So if the
+the &PgUp; or &PgDn; key. If unselected the text cursor will maintain its
+relative position within the visible text in &kappname; as new text becomes
+visible as a result of the operation. So if the
cursor is in the middle of the visible text when the operation occurs it will
remain there (except when one reaches the beginning or end.) With this option
selected, the first key press will cause the cursor to move to either the top or
@@ -816,7 +816,7 @@ if the cursor is located in the leading blank space of a line.</para>
<listitem>
<para>
If you want to align the current line in the current code block
-like in emacs, make a shortcut to the action <guimenuitem>Align</guimenuitem>.
+like in &Emacs;, make a shortcut to the action <guimenuitem>Align</guimenuitem>.
</para>
<variablelist>
<varlistentry>
@@ -1025,7 +1025,7 @@ type. The first found end of line type will be used for the whole file.</para>
<para>The byte order mark is a special sequence at the beginning of unicode
encoded documents. It helps editors to open text documents with the correct
unicode encoding. For more information see <ulink
-url="http://en.wikipedia.org/wiki/Byte_Order_Mark">Byte Order Mark</ulink>.</para>
+url="https://en.wikipedia.org/wiki/Byte_order_mark">Byte Order Mark</ulink>.</para>
</listitem>
</varlistentry>
@@ -1142,8 +1142,8 @@ This is useful for network file systems to avoid unnecessary network traffic.</p
<sect3 id="pref-open-save-modes-filetypes">
<title>Modes & Filetypes</title>
<para>This page allows you to override the default configuration for documents
-of specified mimetypes. When the editor loads a document, it will try if it
-matches the file masks or mimetypes for one of the defined filetypes, and if so
+of specified &MIME; types. When the editor loads a document, it will try if it
+matches the file masks or &MIME; types for one of the defined filetypes, and if so
apply the variables defined. If more filetypes match, the one with the highest
priority will be used.
</para>
@@ -1179,7 +1179,7 @@ listed.</para>
<listitem><para>The name of the filetype will be the text of the corresponding
menu item. This name is displayed in the
<menuchoice><guimenu>Tools</guimenu><guimenuitem>Filetypes</guimenuitem>
-</menuchoice ></para></listitem>
+</menuchoice> menu.</para></listitem>
</varlistentry>
<varlistentry>
<term><guilabel>Section:</guilabel></term>
@@ -1191,9 +1191,8 @@ menus. This is also used in the
<varlistentry>
<term><guilabel>Variables:</guilabel></term>
<listitem><para>This string allows you to configure &kappname;'s settings for the
-files selected by this mimetype using &kappname; variables. You can set almost any
-configuration option, such as highlight, indent-mode,
-etc.</para>
+files selected by this &MIME; type using &kappname; variables. You can set almost any
+configuration option, such as highlight, indent-mode, &etc;</para>
<para>Press <guibutton>Edit</guibutton> to see a list of all available variables
and their descriptions. Select the checkbox on the left to enable a particular
variable and then set the value of the variable on the right. Some variables
@@ -1228,7 +1227,7 @@ masks.</para></listitem>
<varlistentry>
<term><guilabel>MIME types:</guilabel></term>
<listitem><para>Displays a wizard that helps you easily select
-mimetypes.</para></listitem>
+&MIME; types.</para></listitem>
</varlistentry>
<varlistentry>
@@ -1261,7 +1260,7 @@ Variable names are single words (no whitespace), and anything up to the next
semicolon is the value. The semicolon is required.</para>
<para>Here is an example variable line, forcing indentation settings for a C++,
-java or javascript file:
+&Java; or &javascript; file:
<programlisting>// kate: replace-tabs on; indent-width 4; indent-mode cstyle;</programlisting>
</para>
@@ -1279,7 +1278,7 @@ additionally plugins can use variables, in which case it should be documented in
the plugin's documentation.</para>
<para>&kappname; has support for reading configurations from <filename>.editorconfig</filename>
-files, when the <ulink url="http://editorconfig.org/">editorconfig</ulink> library is installed.
+files, when the <ulink url="https://editorconfig.org/">editorconfig</ulink> library is installed.
&kappname; automatically searches for a <filename>.editorconfig</filename>
whenever you open a file. It gives priority to <filename>.kateconfig</filename> files, though.
</para>
@@ -1594,13 +1593,13 @@ And Makefiles use tabs, &ie; tabs are not replaced with spaces.</para>
<programlisting>kate-wildcard(*.json;*.xml): indent-width 2;</programlisting>
-<para>Further, you can also use the mimetype to match certain files, ⪚ to indent
+<para>Further, you can also use the &MIME; type to match certain files, ⪚ to indent
all C++ source files with 4 spaces, you can write:
</para>
<programlisting>kate-mimetype(text/x-c++src): indent-width 4;</programlisting>
-<note><para>Next to the support in <filename>.kateconfig</filename> files, wildcard and mimetype
+<note><para>Next to the support in <filename>.kateconfig</filename> files, wildcard and &MIME; type
dependent document variables are also supported in the files itself as comments.
</para></note>
diff --git a/doc/katepart/development.docbook b/doc/katepart/development.docbook
index 215452fd1..6123dff22 100644
--- a/doc/katepart/development.docbook
+++ b/doc/katepart/development.docbook
@@ -13,7 +13,7 @@
<para>Like any advanced text editor component, &katepart; offers a variety of
ways to extend its functionality. You can <link linkend="dev-scripting">write
-simple scripts to add functionality with JavaScript</link>.
+simple scripts to add functionality with &javascript;</link>.
Finally, once you have extended &katepart;, you are
welcome to <ulink url="https://kate-editor.org/join-us/">join us</ulink>
and share your enhancements with the world!</para>
@@ -178,7 +178,7 @@ emphasize concepts of the text formats.</para>
<title>Default Styles</title>
<para>If you open a C++ source file, a &Java; source file and an
-<acronym>HTML</acronym> document in &kappname;, you will see that even
+&HTML; document in &kappname;, you will see that even
though the formats are different, and thus different words are chosen
for special treatment, the colors used are the same. This is because
&kappname; has a predefined list of Default Styles which are employed by
@@ -213,7 +213,7 @@ will be explained later.</para>
<title>Overview</title>
<para>&kappname; uses the Syntax-Highlighting framework from &kde-frameworks;.
-The default highlighting xml files shipped with &kappname; are compiled
+The default highlighting &XML; files shipped with &kappname; are compiled
into the Syntax-Highlighting library by default.
</para>
@@ -240,10 +240,10 @@ for each application. In a Flatpak application, usually is
<filename class="directory"><envar>$HOME</envar>/.var/app/<replaceable>package-name</replaceable>/data/</filename>
and in a Snap application is
<filename class="directory"><envar>$HOME</envar>/snap/<replaceable>package-name</replaceable>/current/.local/share/</filename>.
-For example, for <ulink url="https://flathub.org/apps/details/org.kde.kate">Kate's Flatpak package</ulink>,
+For example, for <ulink url="https://flathub.org/apps/details/org.kde.kate">&kate;'s Flatpak package</ulink>,
the custom &XML; files are located in
<filename class="directory"><envar>$HOME</envar>/.var/app/org.kde.kate/data/org.kde.syntax-highlighting/syntax/</filename>
-and for <ulink url="https://snapcraft.io/kate">Kate's Snap package</ulink>,
+and for <ulink url="https://snapcraft.io/kate">&kate;'s Snap package</ulink>,
it is <filename class="directory"><envar>$HOME</envar>/snap/kate/current/.local/share/org.kde.syntax-highlighting/syntax/</filename>.
</para>
@@ -256,7 +256,7 @@ it is <filename class="directory"><envar>$HOME</envar>/snap/kate/current/.local/
<title>Main sections of &kappname; Highlight Definition files</title>
<varlistentry>
-<term>A highlighting file contains a header that sets the XML version:</term>
+<term>A highlighting file contains a header that sets the &XML; version:</term>
<listitem>
<programlisting>
<?xml version="1.0" encoding="UTF-8"?>
@@ -581,11 +581,11 @@ as a short summary: Default styles are predefined font and color styles.</para>
<para><userinput>dsNormal</userinput>, when no special highlighting is required.</para>
<para><userinput>dsKeyword</userinput>, built-in language keywords.</para>
<para><userinput>dsFunction</userinput>, function calls and definitions.</para>
-<para><userinput>dsVariable</userinput>, if applicable: variable names (e.g. $someVar in PHP/Perl).</para>
+<para><userinput>dsVariable</userinput>, if applicable: variable names (⪚ $someVar in PHP/Perl).</para>
<para><userinput>dsControlFlow</userinput>, control flow keywords like if, else, switch, break, return, yield, ...</para>
<para><userinput>dsOperator</userinput>, operators like + - * / :: < ></para>
<para><userinput>dsBuiltIn</userinput>, built-in functions, classes, and objects.</para>
-<para><userinput>dsExtension</userinput>, common extensions, such as Qt classes and functions/macros in C++ and Python.</para>
+<para><userinput>dsExtension</userinput>, common extensions, such as &Qt; classes and functions/macros in C++ and Python.</para>
<para><userinput>dsPreprocessor</userinput>, preprocessor statements or macro definitions.</para>
<para><userinput>dsAttribute</userinput>, annotations such as @override and __declspec(...).</para>
</listitem>
@@ -598,7 +598,7 @@ as a short summary: Default styles are predefined font and color styles.</para>
<para><userinput>dsSpecialChar</userinput>, chars with special meaning in strings such as escapes, substitutions, or regex operators.</para>
<para><userinput>dsString</userinput>, strings like "hello world".</para>
<para><userinput>dsVerbatimString</userinput>, verbatim or raw strings like 'raw \backlash' in Perl, CoffeeScript, and shells, as well as r'\raw' in Python.</para>
-<para><userinput>dsSpecialString</userinput>, SQL, regexes, HERE docs, LaTeX math mode, ...</para>
+<para><userinput>dsSpecialString</userinput>, SQL, regexes, HERE docs, &latex; math mode, ...</para>
<para><userinput>dsImport</userinput>, import, include, require of modules.</para>
</listitem>
</varlistentry>
@@ -678,7 +678,7 @@ previous context used in the string (<userinput>#pop</userinput>).</para>
<para>An <emphasis>order</emphasis> followed by an exclamation mark
(<emphasis>!</emphasis>) and an <emphasis>identifier</emphasis>, which
will make the engine first follow the order and then switch to the
-other context, e.g. <userinput>#pop#pop!OtherContext</userinput>.</para>
+other context, ⪚ <userinput>#pop#pop!OtherContext</userinput>.</para>
</listitem>
</itemizedlist>
@@ -891,7 +891,7 @@ to match. The <userinput>insensitive</userinput> attribute defaults to
<emphasis>false</emphasis> and is passed to the string comparison
function. If the value is <emphasis>true</emphasis> insensitive
comparing is used.</para>
-<para>Since: Kate 3.5 (KDE 4.5)</para>
+<para>Since: &kate; 3.5 (&kde; 4.5)</para>
</listitem>
</varlistentry>
@@ -1029,7 +1029,7 @@ will not find strings spanning over a line break.</para>
<para>Matches a specified char at the end of a line.</para>
<programlisting><LineContinue (common attributes) [char="\"] /></programlisting>
<para><userinput>char</userinput> optional character to match, default is
-backslash (<userinput>'\'</userinput>). New since KDE 4.13.</para>
+backslash (<userinput>'\'</userinput>). New since &kde; 4.13.</para>
<para>This rule is useful for switching context at end of line. This is needed for
example in C/C++ to continue macros or strings.</para>
</listitem>
@@ -1151,10 +1151,10 @@ keep the matched string for the next context.
<para>Use default styles whenever you can. This way the user will find a familiar environment.</para>
</listitem>
<listitem>
-<para>Look into other XML-files to see how other people implement tricky rules.</para>
+<para>Look into other &XML; files to see how other people implement tricky rules.</para>
</listitem>
<listitem>
-<para>You can validate every XML file by using the command
+<para>You can validate every &XML; file by using the command
<command>validatehl.sh language.xsd mySyntax.xml</command>.
The files <filename>validatehl.sh</filename> and <filename>language.xsd</filename>
are available in <ulink url="https://commits.kde.org/syntax-highlighting?path=data/schema">Syntax
@@ -1183,11 +1183,11 @@ expression.</para>
<sect1 id="dev-scripting">
-<title>Scripting with JavaScript</title>
+<title>Scripting with &javascript;</title>
<para>
The &kappname; editor component is easily extensible by writing scripts.
-The scripting language is ECMAScript (widely known as JavaScript).
+The scripting language is ECMAScript (widely known as &javascript;).
&kappname; supports two kinds of scripts: indentation and command line scripts.
</para>
@@ -1214,7 +1214,7 @@ either <filename>~/.local</filename> or <filename>~/.local/share</filename>.
<sect3 id="dev-scripting-indentation-header">
<title>The Indentation Script Header</title>
<para>
-The header of the file <filename>javascript.js</filename> is embedded as JSON at the beginning of the document as follows:
+The header of the file <filename>javascript.js</filename> is embedded as &JSON; at the beginning of the document as follows:
<programlisting>
var katescript = {
@@ -1252,7 +1252,7 @@ and in the configuration dialog.
<literal>required-syntax-style</literal> [optional]: The required syntax style, which matches the specified <literal>style</literal> in syntax highlighting files. This is important for indenters that rely on specific highlight information in the document. If a required syntax style is specified, the indenter is available only when the appropriate highlighter is active. This prevents <quote>undefined behavior</quote> caused by using the indenter without the expected highlighting schema. For instance, the Ruby indenter makes use of this in the files <filename>ruby.js</filename> and <filename>ruby.xml</filename>.
</para></listitem>
<listitem><para>
-<literal>indent-languages</literal> [optional]: JSON array of syntax styles the indenter can indent correctly, ⪚: <literal>["c++", "java"]</literal>.
+<literal>indent-languages</literal> [optional]: &JSON; array of syntax styles the indenter can indent correctly, ⪚: <literal>["c++", "java"]</literal>.
</para></listitem>
<listitem><para>
<literal>priority</literal> [optional]: If several indenters are suited for a certain highlighted file, the priority decides which indenter is chosen as default indenter.
@@ -1269,7 +1269,7 @@ Having specified the header this section explains how the indentation scripting
itself works. The basic skeleton of the body looks like this:
<programlisting>
-// required katepart js libraries, e.g. range.js if you use Range
+// required katepart js libraries, ⪚ range.js if you use Range
require ("range.js");
triggerCharacters = "{}/:;";
@@ -1325,7 +1325,7 @@ with a different tab width.
<para>
A default &kde; installation ships &kappname; with several indenters. The
-corresponding JavaScript source code can be found in <filename>$<envar>XDG_DATA_DIRS</envar>/katepart5/script/indentation</filename>.</para>
+corresponding &javascript; source code can be found in <filename>$<envar>XDG_DATA_DIRS</envar>/katepart5/script/indentation</filename>.</para>
<para>On &Windows; these files are located in <filename>%USERPROFILE%\AppData\Local\katepart5\indentation</filename>.
<replaceable>%USERPROFILE%</replaceable> usually expands to <filename>C:\\Users\\<replaceable>user</replaceable></filename>.
</para>
@@ -1370,7 +1370,7 @@ either <filename>~/.local</filename> or <filename>~/.local/share</filename>.</pa
<sect3 id="dev-scripting-command-line-header">
<title>The Command Line Script Header</title>
<para>
-The header of each command line script is embedded in JSON at the beginning of the script as follows:
+The header of each command line script is embedded in &JSON; at the beginning of the script as follows:
<programlisting>
var katescript = {
@@ -1401,13 +1401,13 @@ Each entry is explained in detail now:
<listitem><para><literal>license</literal> [optional]: Short form of the license, such as BSD License or LGPLv2.</para></listitem>
<listitem><para><literal>revision</literal> [required]: The revision of the script. This number should be increased whenever the script is modified.</para></listitem>
<listitem><para><literal>kate-version</literal> [required]: Minimum required &kappname; version.</para></listitem>
-<listitem><para><literal>functions</literal> [required]: JSON array of commands in the script.</para></listitem>
-<listitem><para><literal>actions</literal> [optional]: JSON Array of JSON objects that defines the actions that appear in the application menu. Detailed information is provided in the section <link linkend="advanced-editing-tools-commandline">Binding Shortcuts</link>.</para></listitem>
+<listitem><para><literal>functions</literal> [required]: &JSON; array of commands in the script.</para></listitem>
+<listitem><para><literal>actions</literal> [optional]: &JSON; Array of &JSON; objects that defines the actions that appear in the application menu. Detailed information is provided in the section <link linkend="advanced-editing-tools-commandline">Binding Shortcuts</link>.</para></listitem>
</itemizedlist>
</para>
<para>
-Since the value of <literal>functions</literal> is a JSON array, a single script is able to contain an arbitrary number
+Since the value of <literal>functions</literal> is a &JSON; array, a single script is able to contain an arbitrary number
of command line commands. Each function is available through &kappname;'s
<link linkend="advanced-editing-tools-commandline">built-in command line</link>.
</para>
@@ -1423,7 +1423,7 @@ functions <command>sort</command> and <command>moveLinesDown</command>.
All functions have the following syntax:
<programlisting>
-// required katepart js libraries, e.g. range.js if you use Range
+// required katepart js libraries, ⪚ range.js if you use Range
require ("range.js");
function <name>(arg1, arg2, ...)
@@ -1435,7 +1435,7 @@ function <name>(arg1, arg2, ...)
<para>
Arguments in the command line are passed to the function as
-<parameter>arg1</parameter>, <parameter>arg2</parameter>, etc.
+<parameter>arg1</parameter>, <parameter>arg2</parameter>, &etc;
In order to provide documentation for each command, simply implement the
'<function>help</function>' function as follows:
@@ -1494,7 +1494,7 @@ The fields for one action are as follows:
<listitem><para><literal>name</literal> [required]: The text appears in the script menu.</para></listitem>
<listitem><para><literal>icon</literal> [optional]: The icon appears next to the text in the menu. All &kde; icon names can be used here.</para></listitem>
<listitem><para><literal>category</literal> [optional]: If a category is specified, the script appears in a submenu.</para></listitem>
-<listitem><para><literal>shortcut</literal> [optional]: The shortcut given here is the default shortcut. Example: <literal>Ctrl+Alt+t</literal>. See the <ulink url="https://doc.qt.io/qt-5/qt.html#Key-enum">Qt documentation</ulink> for further details.</para></listitem>
+<listitem><para><literal>shortcut</literal> [optional]: The shortcut given here is the default shortcut. Example: <literal>Ctrl+Alt+t</literal>. See the <ulink url="https://doc.qt.io/qt-5/qt.html#Key-enum">&Qt; documentation</ulink> for further details.</para></listitem>
<listitem><para><literal>interactive</literal> [optional]: If the script needs user input in the command line, set this to <literal>true</literal>.</para></listitem>
</itemizedlist>
</para>
@@ -1518,7 +1518,7 @@ The <classname>Cursor</classname> and <classname>Range</classname> classes are p
If you want to use them in your script, which needs to use some of the <classname>Document</classname> or <classname>View</classname> functions, please include the necessary library by using:
<programlisting>
-// required katepart js libraries, e.g. range.js if you use Range
+// required katepart js libraries, ⪚ range.js if you use Range
require ("range.js");
</programlisting>
</para>
@@ -1541,7 +1541,7 @@ require ("myscriptnamehere.js");
To extend existing prototypes like <classname>Cursor</classname> or
<classname>Range</classname>, the recommended way is to
<emphasis>not</emphasis> modify the global <filename>*.js</filename> files.
-Instead, change the <classname>Cursor</classname> prototype in JavaScript after the <filename>cursor.js</filename> is included into your
+Instead, change the <classname>Cursor</classname> prototype in &javascript; after the <filename>cursor.js</filename> is included into your
script via <literal>require</literal>.
</para>
@@ -1962,7 +1962,7 @@ void i18n(<parameter>String <replaceable>text</replaceable></parameter>, <replac
<listitem><para>
Translates <replaceable>text</replaceable> into the language used by the application.
The arguments <replaceable>arg1</replaceable>, ..., are optional and used to
-replace the placeholders <literal>%1</literal>, <literal>%2</literal>, etc.</para></listitem>
+replace the placeholders <literal>%1</literal>, <literal>%2</literal>, &etc;</para></listitem>
</varlistentry>
<varlistentry>
@@ -1974,7 +1974,7 @@ Translates <replaceable>text</replaceable> into the language used by the
application. Additionally, the string <replaceable>context</replaceable> is
visible to translators so they can provide a better translation.
The arguments <replaceable>arg1</replaceable>, ..., are optional and used to
-replace the placeholders <literal>%1</literal>, <literal>%2</literal>, etc.</para></listitem>
+replace the placeholders <literal>%1</literal>, <literal>%2</literal>, &etc;</para></listitem>
</varlistentry>
<varlistentry>
@@ -1986,7 +1986,7 @@ Translates either <replaceable>singular</replaceable> or
<replaceable>plural</replaceable> into the language used by the application,
depending on the given <replaceable>number</replaceable>.
The arguments <replaceable>arg1</replaceable>, ..., are optional and used to
-replace the placeholders <literal>%1</literal>, <literal>%2</literal>, etc.</para></listitem>
+replace the placeholders <literal>%1</literal>, <literal>%2</literal>, &etc;</para></listitem>
</varlistentry>
<varlistentry>
@@ -2000,7 +2000,7 @@ depending on the given <replaceable>number</replaceable>. Additionally, the
string <replaceable>context</replaceable> is visible to translators so they
can provide a better translation. The arguments <replaceable>arg1</replaceable>,
..., are optional and used to replace the placeholders <literal>%1</literal>,
-<literal>%2</literal>, etc.</para></listitem>
+<literal>%2</literal>, &etc;</para></listitem>
</varlistentry></variablelist>
</sect4>
@@ -2170,7 +2170,7 @@ Returns the document's filename or an empty string for unsaved text buffers.
String document.url();
</synopsis></term>
<listitem><para>
-Returns the document's full url or an empty string for unsaved text buffers.
+Returns the document's full &URL; or an empty string for unsaved text buffers.
</para></listitem>
</varlistentry>
@@ -2180,8 +2180,8 @@ Returns the document's full url or an empty string for unsaved text buffers.
String document.mimeType();
</synopsis></term>
<listitem><para>
-Returns the document's mime type or the mime type <literal>application/octet-stream</literal>
-if no appropriate mime type could be found.
+Returns the document's &MIME; type or the &MIME; type <literal>application/octet-stream</literal>
+if no appropriate &MIME; type could be found.
</para></listitem>
</varlistentry>
diff --git a/doc/katepart/fundamentals.docbook b/doc/katepart/fundamentals.docbook
index 45ebdaf1b..95d0dfa59 100644
--- a/doc/katepart/fundamentals.docbook
+++ b/doc/katepart/fundamentals.docbook
@@ -36,128 +36,128 @@ cursor.</para></entry>
</row>
<row>
<entry><para>&Left;</para></entry>
-<entry><para>Move the cursor one character to the left</para></entry>
+<entry><para>Move the cursor one character to the left.</para></entry>
</row>
<row>
<entry><para>&Right;</para></entry>
-<entry><para>Move the cursor one character to the right</para></entry>
+<entry><para>Move the cursor one character to the right.</para></entry>
</row>
<row>
<entry><para>&Up;</para></entry>
-<entry><para>Move the cursor up one line</para></entry>
+<entry><para>Move the cursor up one line.</para></entry>
</row>
<row>
<entry><para>&Down;</para></entry>
-<entry><para>Move the cursor down one line</para></entry>
+<entry><para>Move the cursor down one line.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Ctrl;<keycap>E</keycap></keycombo></para></entry>
-<entry><para>Go to previous editing line</para></entry>
+<entry><para>Go to previous editing line.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Ctrl;&Shift;<keycap>E</keycap></keycombo></para></entry>
-<entry><para>Go to next editing line</para></entry>
+<entry><para>Go to next editing line.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Alt;&Shift;&Up;</keycombo></para></entry>
-<entry><para>Move cursor to previous matching indent</para></entry>
+<entry><para>Move cursor to previous matching indent.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Alt;&Shift;&Down;</keycombo></para></entry>
-<entry><para>Move cursor to previous matching indent</para></entry>
+<entry><para>Move cursor to previous matching indent.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Ctrl;<keycap>6</keycap></keycombo></para></entry>
-<entry><para>Move to Matching Bracket</para></entry>
+<entry><para>Move to Matching Bracket.</para></entry>
</row>
<row>
<entry><para>&PgUp;</para></entry>
-<entry><para>Move the cursor up one page</para></entry>
+<entry><para>Move the cursor up one page.</para></entry>
</row>
<row>
<entry><para>&PgDn;</para></entry>
-<entry><para>Move the cursor down one page</para></entry>
+<entry><para>Move the cursor down one page.</para></entry>
</row>
<row>
<entry><para>&Home;</para></entry>
-<entry><para>Move the cursor to the beginning of the line</para></entry>
+<entry><para>Move the cursor to the beginning of the line.</para></entry>
</row>
<row>
<entry><para>&End;</para></entry>
-<entry><para>Move the cursor to the end of the line</para></entry>
+<entry><para>Move the cursor to the end of the line.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Ctrl;&Home;</keycombo></para></entry>
-<entry><para>Move to Beginning of Document</para></entry>
+<entry><para>Move to Beginning of Document.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Ctrl;&End;</keycombo></para></entry>
-<entry><para>Move to End of Document</para></entry>
+<entry><para>Move to End of Document.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Ctrl;&Up;</keycombo></para></entry>
-<entry><para>Scroll Line Up</para></entry>
+<entry><para>Scroll Line Up.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Ctrl;&Down;</keycombo></para></entry>
-<entry><para>Scroll Line Down</para></entry>
+<entry><para>Scroll Line Down.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Ctrl;&Right;</keycombo></para></entry>
-<entry><para>Move Word Right</para></entry>
+<entry><para>Move Word Right.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Ctrl;&Left;</keycombo></para></entry>
-<entry><para>Move Word Left</para></entry>
+<entry><para>Move Word Left.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Ctrl;&Shift;&Up;</keycombo></para></entry>
-<entry><para>Move Lines Up</para></entry>
+<entry><para>Move Lines Up.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Ctrl;&Shift;&Down;</keycombo></para></entry>
-<entry><para>Move Lines Down</para></entry>
+<entry><para>Move Lines Down.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Ctrl;&Alt;&Up;</keycombo></para></entry>
-<entry><para>Duplicate Selected Lines Up</para></entry>
+<entry><para>Duplicate Selected Lines Up.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Ctrl;&Alt;&Down;</keycombo></para></entry>
-<entry><para>Duplicate Selected Lines Down</para></entry>
+<entry><para>Duplicate Selected Lines Down.</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>Set a Bookmark.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Alt;&PgUp;</keycombo></para></entry>
-<entry><para>Previous Bookmark</para></entry>
+<entry><para>Previous Bookmark.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Alt;&PgDn;</keycombo></para></entry>
-<entry><para>Next Bookmark</para></entry>
+<entry><para>Next Bookmark.</para></entry>
</row>
<row>
<entry><para>∇</para></entry>
<entry><para>Delete the character to the right of the cursor (or any selected
-text)</para></entry>
+text).</para></entry>
</row>
<row>
<entry><para>&Backspace;</para></entry>
-<entry><para>Delete the character to the left of the cursor</para></entry>
+<entry><para>Delete the character to the left of the cursor.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Ctrl;∇</keycombo></para></entry>
-<entry><para>Delete Right Word</para></entry>
+<entry><para>Delete Right Word.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Ctrl;&Backspace;</keycombo></para></entry>
-<entry><para>Delete Left Word</para></entry>
+<entry><para>Delete Left Word.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Ctrl;<keycap>K</keycap></keycombo></para></entry>
-<entry><para>Delete Line</para></entry>
+<entry><para>Delete Line.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Shift;&Enter;</keycombo></para></entry>
@@ -168,149 +168,149 @@ characters at the beginning of each new line with comments.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Shift;&Left;</keycombo></para></entry>
-<entry><para> Mark text one character to the left </para></entry>
+<entry><para>Mark text one character to the left.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Shift;&Right;</keycombo></para></entry>
-<entry><para> Mark text one character to the right </para></entry>
+<entry><para>Mark text one character to the right.</para></entry>
</row>
<row>
<entry><para><keycombo
action="simul">&Ctrl;<keycap>F</keycap></keycombo></para></entry>
-<entry><para><link linkend="edit-find"> Find</link></para></entry>
+<entry><para><link linkend="edit-find">Find</link>.</para></entry>
</row>
<row>
<entry><para><keycombo
action="simul"><keycap>F3</keycap></keycombo></para></entry>
-<entry><para><link linkend="edit-find-next"> Find Next</link></para></entry>
+<entry><para><link linkend="edit-find-next">Find Next</link>.</para></entry>
</row>
<row>
<entry><para><keycombo
action="simul">&Shift;<keycap>F3</keycap></keycombo></para></entry>
-<entry><para><link linkend="edit-find-previous"> Find Previous</link></para></entry>
+<entry><para><link linkend="edit-find-previous">Find Previous</link>.</para></entry>
</row>
<row>
<entry><para><keycombo
action="simul">&Ctrl;<keycap>H</keycap></keycombo></para></entry>
-<entry><para><link linkend="edit-find-selected">Find Selected</link></para></entry>
+<entry><para><link linkend="edit-find-selected">Find Selected</link>.</para></entry>
</row>
<row>
<entry><para><keycombo
action="simul">&Ctrl;&Shift;<keycap>H</keycap></keycombo></para></entry>
-<entry><para><link linkend="edit-find-selected-backwards">Find Selected Backwards</link></para></entry>
+<entry><para><link linkend="edit-find-selected-backwards">Find Selected Backwards</link>.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Ctrl;&Shift;&Right;</keycombo></para></entry>
-<entry><para>Select Word Right</para></entry>
+<entry><para>Select Word Right.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Ctrl;&Shift;&Left;</keycombo></para></entry>
-<entry><para>Select Word Left</para></entry>
+<entry><para>Select Word Left.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Shift;&Home;</keycombo></para></entry>
-<entry><para>Select to Beginning of Line</para></entry>
+<entry><para>Select to Beginning of Line.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Shift;&End;</keycombo></para></entry>
-<entry><para>Select to End of Line</para></entry>
+<entry><para>Select to End of Line.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Shift;&Up;</keycombo></para></entry>
-<entry><para>Select to Previous Line</para></entry>
+<entry><para>Select to Previous Line.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Shift;&Down;</keycombo></para></entry>
-<entry><para>Select to Next Line</para></entry>
+<entry><para>Select to Next Line.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Ctrl;&Shift;<keycap>6</keycap></keycombo></para></entry>
-<entry><para>Select to Matching Bracket</para></entry>
+<entry><para>Select to Matching Bracket.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Ctrl;&Shift;&PgUp;</keycombo></para></entry>
-<entry><para>Select to Top of View</para></entry>
+<entry><para>Select to Top of View.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Ctrl;&Shift;&PgDn;</keycombo></para></entry>
-<entry><para>Select to Bottom of View</para></entry>
+<entry><para>Select to Bottom of View.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Shift;&PgUp;</keycombo></para></entry>
-<entry><para>Select Page Up</para></entry>
+<entry><para>Select Page Up.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Shift;&PgDn;</keycombo></para></entry>
-<entry><para>Select Page Down</para></entry>
+<entry><para>Select Page Down.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Ctrl;&Shift;&Home;</keycombo></para></entry>
-<entry><para>Select to Beginning of Document</para></entry>
+<entry><para>Select to Beginning of Document.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Ctrl;&Shift;&End;</keycombo></para></entry>
-<entry><para>Select to End of Document</para></entry>
+<entry><para>Select to End of Document.</para></entry>
</row>
<row>
<entry><para><keycombo
action="simul">&Ctrl;&Home;</keycombo></para></entry>
-<entry><para>Select All</para></entry>
+<entry><para>Select All.</para></entry>
</row>
<row>
<entry><para><keycombo
action="simul">&Ctrl;&Shift;<keycap>A</keycap></keycombo></para></entry>
-<entry><para>Deselect</para></entry>
+<entry><para>Deselect.</para></entry>
</row>
<row>
<entry><para><keycombo
action="simul">&Ctrl;&Shift;<keycap>B</keycap></keycombo></para></entry>
-<entry><para>Block Selection Mode</para></entry>
+<entry><para>Block Selection Mode.</para></entry>
</row>
<row>
<entry><para><keycombo
action="simul">&Ctrl;<keycap>C</keycap></keycombo> / <keycombo
action="simul">&Ctrl;&Ins;</keycombo></para></entry>
-<entry><para> Copy the marked text to the clipboard. </para></entry>
+<entry><para>Copy the marked text to the clipboard.</para></entry>
</row>
<row>
<entry><para><keycombo
action="simul">&Ctrl;<keycap>D</keycap></keycombo></para></entry>
-<entry><para> Comment</para></entry>
+<entry><para>Comment.</para></entry>
</row>
<row>
<entry><para><keycombo
action="simul">&Ctrl;&Shift;<keycap>D</keycap></keycombo></para></entry>
-<entry><para> Uncomment</para></entry>
+<entry><para>Uncomment.</para></entry>
</row>
<row>
<entry><para><keycombo
action="simul">&Ctrl;<keycap>G</keycap></keycombo></para></entry>
-<entry><para> Go to line...</para></entry>
+<entry><para>Go to line...</para></entry>
</row>
<row>
<entry><para><keycombo
action="simul">&Ctrl;<keycap>I</keycap></keycombo></para></entry>
-<entry><para> Indent selection</para></entry>
+<entry><para>Indent selection.</para></entry>
</row>
<row>
<entry><para><keycombo
action="simul">&Ctrl;&Shift;<keycap>I</keycap></keycombo></para></entry>
-<entry><para> Unindent selection</para></entry>
+<entry><para>Unindent selection.</para></entry>
</row>
<row>
<entry><para><keycombo
action="simul">&Ctrl;<keycap>J</keycap></keycombo></para></entry>
-<entry><para>Join Lines</para></entry>
+<entry><para>Join Lines.</para></entry>
</row>
<row>
<entry><para><keycombo
action="simul">&Ctrl;<keycap>P</keycap></keycombo></para></entry>
-<entry><para><link linkend="file-print">Print</link> </para></entry>
+<entry><para><link linkend="file-print">Print</link>.</para></entry>
</row>
<row>
<entry><para><keycombo
action="simul">&Ctrl;<keycap>R</keycap></keycombo></para></entry>
-<entry><para><link linkend="edit-replace"> Replace</link></para></entry>
+<entry><para><link linkend="edit-replace">Replace</link>.</para></entry>
</row>
<row>
<entry><para><keycombo
@@ -321,28 +321,28 @@ linkend="file-save"><guilabel>Save</guilabel></link> command.</para></entry>
<row>
<entry><para><keycombo
action="simul">&Ctrl;&Shift;<keycap>S</keycap></keycombo></para></entry>
-<entry><para>Save As</para></entry>
+<entry><para>Save As.</para></entry>
</row>
<row>
<entry><para><keycombo
action="simul">&Ctrl;<keycap>U</keycap></keycombo></para></entry>
-<entry><para>Uppercase</para></entry>
+<entry><para>Uppercase.</para></entry>
</row>
<row>
<entry><para><keycombo
action="simul">&Ctrl;&Shift;<keycap>U</keycap></keycombo></para></entry>
-<entry><para>Lowercase</para></entry>
+<entry><para>Lowercase.</para></entry>
</row>
<row>
<entry><para><keycombo
action="simul">&Ctrl;&Alt;<keycap>U</keycap></keycombo></para></entry>
-<entry><para>Capitalize</para></entry>
+<entry><para>Capitalize.</para></entry>
</row>
<row>
<entry><para><keycombo
action="simul">&Ctrl;<keycap>V</keycap></keycombo> / <keycombo
action="simul">&Shift;&Ins;</keycombo></para></entry>
-<entry><para> Paste the clipboard text into line edit. </para></entry>
+<entry><para>Paste the clipboard text into line edit.</para></entry>
</row>
<row>
<entry><para><keycombo
@@ -354,86 +354,86 @@ action="simul">&Shift;&Ins;</keycombo></para></entry>
<row>
<entry><para><keycombo
action="simul">&Ctrl;<keycap>Z</keycap></keycombo></para></entry>
-<entry><para><link linkend="edit-undo">Undo</link></para></entry>
+<entry><para><link linkend="edit-undo">Undo</link>.</para></entry>
</row>
<row>
<entry><para><keycombo
action="simul">&Ctrl;&Shift;<keycap>Z</keycap></keycombo></para></entry>
-<entry><para><link linkend="edit-redo">Redo</link></para></entry>
+<entry><para><link linkend="edit-redo">Redo</link>.</para></entry>
</row>
<row>
<entry><para><keycombo
action="simul">&Ctrl;<keycap>-</keycap></keycombo></para></entry>
-<entry><para>Shrink Font</para></entry>
+<entry><para>Shrink Font.</para></entry>
</row>
<row>
<entry><para><keycombo
action="simul">&Ctrl;<keycap>+</keycap></keycombo><keycombo
action="simul">&Ctrl;<keycap>=</keycap></keycombo></para></entry>
-<entry><para>Enlarge Font</para></entry>
+<entry><para>Enlarge Font.</para></entry>
</row>
<row>
<entry><para><keycombo
action="simul">&Ctrl;&Shift;<keycap>-</keycap></keycombo></para></entry>
-<entry><para>Fold Toplevel Nodes</para></entry>
+<entry><para>Fold Toplevel Nodes.</para></entry>
</row>
<row>
<entry><para><keycombo
action="simul">&Ctrl;&Shift;<keycap>+</keycap></keycombo></para></entry>
-<entry><para>Unfold Toplevel Nodes</para></entry>
+<entry><para>Unfold Toplevel Nodes.</para></entry>
</row>
<row>
<entry><para><keycombo
action="simul">&Ctrl;&Space;</keycombo></para></entry>
-<entry><para>Invoke Code Completion</para></entry>
+<entry><para>Invoke Code Completion.</para></entry>
</row>
<row>
<entry><para><keycap>F5</keycap></para></entry>
-<entry><para><link linkend="file-reload"> Reload</link></para></entry>
+<entry><para><link linkend="file-reload"> Reload</link>.</para></entry>
</row>
<row>
<entry><para><keycap>F6</keycap></para></entry>
-<entry><para>Show/Hide Icon Border</para></entry>
+<entry><para>Show/Hide Icon Border.</para></entry>
</row>
<row>
<entry><para><keycap>F7</keycap></para></entry>
-<entry><para> Switch to Command Line</para></entry>
+<entry><para>Switch to Command Line.</para></entry>
</row>
<row>
<entry><para><keycap>F9</keycap></para></entry>
-<entry><para> Show/Hide Folding Markers</para></entry>
+<entry><para>Show/Hide Folding Markers.</para></entry>
</row>
<row>
<entry><para><keycap>F10</keycap></para></entry>
-<entry><para> Dynamic Word Wrap</para></entry>
+<entry><para>Dynamic Word Wrap.</para></entry>
</row>
<row>
<entry><para><keycap>F11</keycap></para></entry>
-<entry><para> Show/Hide Line Numbers</para></entry>
+<entry><para>Show/Hide Line Numbers.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Ctrl;<keycap>T</keycap></keycombo></para></entry>
-<entry><para>Transpose Characters</para></entry>
+<entry><para>Transpose Characters.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Ctrl;&Shift;<keycap>O</keycap></keycombo></para></entry>
-<entry><para>Automatic Spell Checking</para></entry>
+<entry><para>Automatic Spell Checking.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Ctrl;&Shift;<keycap>V</keycap></keycombo></para></entry>
-<entry><para>Switch to Next Input Mode</para></entry>
+<entry><para>Switch to Next Input Mode.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Ctrl;<keycap>8</keycap></keycombo></para></entry>
-<entry><para>Reuse Word Above</para></entry>
+<entry><para>Reuse Word Above.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Ctrl;<keycap>9</keycap></keycombo></para></entry>
-<entry><para>Reuse Word Below</para></entry>
+<entry><para>Reuse Word Below.</para></entry>
</row>
<row>
<entry><para><keycombo action="simul">&Ctrl;&Alt;<keycap>#</keycap></keycombo></para></entry>
-<entry><para>Expand Abbreviation</para></entry>
+<entry><para>Expand Abbreviation.</para></entry>
</row>
</tbody>
</tgroup>
diff --git a/doc/katepart/index.docbook b/doc/katepart/index.docbook
index 0ac3c34e2..33f032050 100644
--- a/doc/katepart/index.docbook
+++ b/doc/katepart/index.docbook
@@ -53,7 +53,7 @@
<legalnotice>&FDLNotice;</legalnotice>
<date>2018-08-20</date>
-<releaseinfo>Frameworks 5.50</releaseinfo>
+<releaseinfo>&frameworks; 5.50</releaseinfo>
<abstract>
<para>&katepart; is a fully featured editor component by &kde;.</para>
@@ -183,7 +183,7 @@ The original &kwrite; documentation was written by &Thad.McGinnis;
<para>The current &katepart; documentation is maintained by &TC.Hollingsworth;
&TC.Hollingsworth.mail;. Please send comments or suggestions to the &katepart;
development mailing list at <email>kwrite-devel at kde.org</email> or file a bug
-in the <ulink url="https://bugs.kde.org/">KDE Bugtracking System</ulink>.</para>
+in the <ulink url="https://bugs.kde.org/">&kde; Bugtracking System</ulink>.</para>
<!-- TRANS:CREDIT_FOR_TRANSLATORS -->
diff --git a/doc/katepart/menus.docbook b/doc/katepart/menus.docbook
index 36d23421b..ab3e22b5f 100644
--- a/doc/katepart/menus.docbook
+++ b/doc/katepart/menus.docbook
@@ -206,7 +206,7 @@ action="simul">&Ctrl;<keycap>Z</keycap></keycombo>
<guimenuitem>Undo</guimenuitem>
</menuchoice></term>
<listitem>
-<para>Undo the last editing command (typing, copying, cutting etc.)</para>
+<para>Undo the last editing command (typing, copying, cutting &etc;)</para>
<note><para>This may undo several editing commands of the same type, like typing
in characters.</para></note>
</listitem>
@@ -221,7 +221,7 @@ in characters.</para></note>
<guimenuitem>Redo</guimenuitem>
</menuchoice></term>
<listitem>
-<para>This will reverse the most recent change (if any) made using Undo</para>
+<para>This will reverse the most recent change (if any) made using Undo.</para>
</listitem>
</varlistentry>
@@ -354,7 +354,7 @@ the current mode. The behavior of this mode can be configured in the
<varlistentry id="edit-overwrite-mode">
<term><menuchoice>
<shortcut>
-<keycombo action="simul"><keycap>Ins</keycap></keycombo>
+<keycombo action="simul">&Ins;</keycombo>
</shortcut>
<guimenu>Edit</guimenu>
<guimenuitem>Overwrite Mode</guimenuitem>
@@ -750,7 +750,7 @@ linkend="view-show-icon-border">Icon Border</link>.</para>
</menuchoice></term>
<listitem><para>This will replace the scrollbar with a visualization of the
current document. For more information on the scrollbar minimap, see
-<xref linkend="kate-part-scrollbar-minimap"/></para></listitem>
+<xref linkend="kate-part-scrollbar-minimap"/>.</para></listitem>
</varlistentry>
<varlistentry id="view-code-folding">
@@ -865,7 +865,7 @@ the list of markers which is appended at the bottom of this menu item.
<varlistentry id="bookmarks-bookmarks-previous">
<term><menuchoice>
<shortcut>
-<keycombo action="simul">&Alt;<keycap>PgUp</keycap></keycombo>
+<keycombo action="simul">&Alt;&PgUp;</keycombo>
</shortcut>
<guimenu>Bookmarks</guimenu>
<guimenuitem>Previous</guimenuitem>
@@ -879,7 +879,7 @@ in a line above the cursor.</para></listitem>
<varlistentry id="bookmarks-bookmarks-next">
<term><menuchoice>
<shortcut>
-<keycombo action="simul">&Alt;<keycap>PgDown</keycap></keycombo>
+<keycombo action="simul">&Alt;&PgDn;</keycombo>
</shortcut>
<guimenu>Bookmarks</guimenu>
<guimenuitem>Next</guimenuitem>
@@ -986,7 +986,7 @@ document. This overwrites the global end of line mode set in <menuchoice>
<para>Checking this action you can explicitly add a byte order mark for unicode
encoded documents. The byte order mark (BOM) is a Unicode character used to signal
the endianness (byte order) of a text file or stream, for more information see
-<ulink url="http://en.wikipedia.org/wiki/Byte_Order_Mark">Byte Order Mark</ulink>.</para>
+<ulink url="https://en.wikipedia.org/wiki/Byte_order_mark">Byte Order Mark</ulink>.</para>
</listitem>
</varlistentry>
@@ -1014,7 +1014,7 @@ own scripts</link>. This way, &katepart; can be extended with user-defined tools
<varlistentry id="tools-scripts-navigation-previous-indent">
<term><menuchoice>
<shortcut>
-<keycombo action="simul">&Alt;&Shift;<keysym>Up</keysym></keycombo>
+<keycombo action="simul">&Alt;&Shift;&Up;</keycombo>
</shortcut>
<guimenu>Tools</guimenu>
<guisubmenu>Scripts</guisubmenu>
@@ -1030,7 +1030,7 @@ the same level as the current line.
<varlistentry id="tools-scripts-navigation-next-indent">
<term><menuchoice>
<shortcut>
-<keycombo action="simul">&Alt;&Shift;<keysym>Down</keysym></keycombo>
+<keycombo action="simul">&Alt;&Shift;&Down;</keycombo>
</shortcut>
<guimenu>Tools</guimenu>
<guisubmenu>Scripts</guisubmenu>
@@ -1075,7 +1075,7 @@ Sorts the selected text or whole document in ascending order.
<varlistentry id="tools-scripts-editing-move-down">
<term><menuchoice>
<shortcut>
-<keycombo action="simul">&Ctrl;&Shift;<keysym>Down</keysym></keycombo>
+<keycombo action="simul">&Ctrl;&Shift;&Down;</keycombo>
</shortcut>
<guimenu>Tools</guimenu>
<guisubmenu>Scripts</guisubmenu>
@@ -1090,7 +1090,7 @@ Move selected lines down.
<varlistentry id="tools-scripts-editing-move-up">
<term><menuchoice>
<shortcut>
-<keycombo action="simul">&Ctrl;&Shift;<keysym>Up</keysym></keycombo>
+<keycombo action="simul">&Ctrl;&Shift;&Up;</keycombo>
</shortcut>
<guimenu>Tools</guimenu>
<guisubmenu>Scripts</guisubmenu>
@@ -1105,7 +1105,7 @@ Move selected lines up.
<varlistentry id="tools-scripts-editing-dupe-down">
<term><menuchoice>
<shortcut>
-<keycombo action="simul">&Ctrl;&Alt;<keysym>Down</keysym></keycombo>
+<keycombo action="simul">&Ctrl;&Alt;&Down;</keycombo>
</shortcut>
<guimenu>Tools</guimenu>
<guisubmenu>Scripts</guisubmenu>
@@ -1120,7 +1120,7 @@ Duplicates the selected lines down.
<varlistentry id="tools-scripts-editing-dupe-up">
<term><menuchoice>
<shortcut>
-<keycombo action="simul">&Ctrl;&Alt;<keysym>Up</keysym></keycombo>
+<keycombo action="simul">&Ctrl;&Alt;&Up;</keycombo>
</shortcut>
<guimenu>Tools</guimenu>
<guisubmenu>Scripts</guisubmenu>
@@ -1361,7 +1361,7 @@ For example, if <userinput>4.5</userinput> is selected, it will become
<varlistentry id="tools-invoke-code-completition">
<term><menuchoice>
<shortcut>
-<keycombo action="simul">&Ctrl;<keycap>Space</keycap></keycombo>
+<keycombo action="simul">&Ctrl;&Space;</keycombo>
</shortcut>
<guimenu>Tools</guimenu>
<guimenuitem>Invoke Code Completion</guimenuitem>
@@ -1702,7 +1702,7 @@ a new line of text will automatically start when the current
line exceeds the length specified by the <guilabel>Wrap words at</guilabel> option
in the Editing tab in <menuchoice>
<guimenu>Settings</guimenu><guimenuitem>Configure
-Editor...</guimenuitem></menuchoice></para></listitem>
+Editor...</guimenuitem></menuchoice> menu.</para></listitem>
</varlistentry>
</variablelist>
diff --git a/doc/katepart/part.docbook b/doc/katepart/part.docbook
index 534501615..117e935f5 100644
--- a/doc/katepart/part.docbook
+++ b/doc/katepart/part.docbook
@@ -98,22 +98,20 @@ Wrapping Text</link></para></listitem>
<para>Moving around in the text in &kappname; is similar to most graphical text
editors. You move the cursor using the arrow keys and the
-<keycap>Page Up</keycap>, <keycap>Page Down</keycap>, <keycap>Home</keycap> and
-<keycap>End</keycap> keys in combination with the &Ctrl; and
+&PgUp;, &PgDn;, &Home; and &End; keys in combination with the &Ctrl; and
&Shift; modifiers. The &Shift; key is always used
to generate a selection, while the &Ctrl; key has different
effects on different keys:
<itemizedlist>
-<listitem><para>For the <keycap>Up</keycap> and <keycap>Down</keycap> keys it
+<listitem><para>For the &Up; and &Down; keys it
means scroll rather than move the cursor.</para></listitem>
-<listitem><para>For the <keycap>Left</keycap> and <keycap>Right</keycap>
+<listitem><para>For the &Left; and &Right;
keys it means skip words rather than characters.</para></listitem>
-<listitem><para>For the <keycap>Page Up</keycap> and <keycap>Page Down</keycap>
+<listitem><para>For the &PgUp; and &PgDn;
keys it means move to the visible edge of the view rather than browse.</para>
</listitem>
-<listitem><para>For the <keycap>Home</keycap> and <keycap>End</keycap> keys it
-means move to the beginning or end of the document rather than the beginning or
-end of the line.</para></listitem>
+<listitem><para>For the &Home; and &End; keys it means move to the beginning or
+end of the document rather than the beginning or end of the line.</para></listitem>
</itemizedlist>
</para>
@@ -161,9 +159,8 @@ application to which you want to paste the text.
</note>
<para>To select using the keyboard, hold down the &Shift; key while
-using the navigation keys (Arrow keys, <keycap>Page Up</keycap>,
-<keycap>Page Down</keycap>, <keycap>Home</keycap> and
-<keycap>End</keycap>, possibly in combination with &Ctrl; to extend
+using the navigation keys (Arrow keys, &PgUp;, &PgDn;, &Home; and
+&End;, possibly in combination with &Ctrl; to extend
the move of the text cursor).</para>
<para>See also the section <link
@@ -257,8 +254,7 @@ the X selection.</para>
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>
+clicking the &MMB; at the desired position.</para>
<tip>
<para>If you are using the &kde; desktop, you can retrieve earlier
@@ -491,11 +487,9 @@ bookmark.</para>
<para>To quickly move between bookmarks or to the next/previous bookmark,
use the <menuchoice><guimenu>Bookmarks</guimenu><guimenuitem>Next</guimenuitem>
-</menuchoice> (<keycombo action="simul">&Alt;
-<keycap>PgDown</keycap></keycombo>) or <menuchoice>
+</menuchoice> (<keycombo action="simul">&Alt;&PgDn;</keycombo>) or <menuchoice>
<guimenu>Bookmarks</guimenu><guimenuitem>Previous</guimenuitem></menuchoice>
-(<keycombo action="simul">&Alt;<keycap>PgUp</keycap>
-</keycombo>) commands.</para>
+(<keycombo action="simul">&Alt;&PgUp;</keycombo>) commands.</para>
</sect1>
@@ -528,7 +522,7 @@ no lines are longer than the maximum line width, if they contain any whitespace
</para>
<note><para>There is currently no way to set word wrap for document types, or even to enable or disable
-the feature on a per document level. This will be fixed in a future version of &kappname;</para></note>
+the feature on a per document level. This will be fixed in a future version of &kappname;.</para></note>
</sect1>
@@ -572,7 +566,7 @@ with using the indent and unindent actions for indenting to your own taste.
<varlistentry><term>C Style</term>
<listitem><para>An indenter for C and similar languages, such as
-C++, C#, java, javascript and so on. This indenter will not work with scripting
+C++, C#, &Java;, &javascript; and so on. This indenter will not work with scripting
languages such as Perl or PHP.</para></listitem>
</varlistentry>
diff --git a/doc/katepart/regular-expressions.docbook b/doc/katepart/regular-expressions.docbook
index cbe8e6912..c11faecab 100644
--- a/doc/katepart/regular-expressions.docbook
+++ b/doc/katepart/regular-expressions.docbook
@@ -176,39 +176,39 @@ defined, making life still a bit easier:
<varlistentry>
<term><userinput>\a</userinput></term>
-<listitem><para> This matches the <acronym>ASCII</acronym> bell character (BEL, 0x07).</para></listitem>
+<listitem><para> This matches the &ASCII; 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>
+<listitem><para> This matches the &ASCII; 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>
+<listitem><para> This matches the &ASCII; 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>
+<listitem><para> This matches the &ASCII; 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>
+<listitem><para> This matches the &ASCII; 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>
+<listitem><para> This matches the &ASCII; 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
+\zero ooo) matches the &ASCII;/Latin-1 character
corresponding to the octal number ooo (between 0 and
0377).</para></listitem>
</varlistentry>
@@ -277,7 +277,7 @@ literally included in a class:</para>
<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>
+class (may follow an unescaped caret).</para></listitem>
</varlistentry>
<varlistentry>
<term><userinput>^</userinput> (caret)</term>
@@ -350,7 +350,7 @@ write <userinput>(\w+),\s*\1</userinput>. The sub pattern
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>
+enclosed in parentheses</emphasis>.)</para>
<note>
<para>To avoid ambiguities with usage of <userinput>\1</userinput> with some digits behind it (⪚ <userinput>\12</userinput> can be 12th subpattern or just the first subpattern with <userinput>2</userinput>) we use <userinput>\{12}</userinput> as syntax for multi-digit subpatterns.</para>
@@ -380,7 +380,7 @@ 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>
+<para>See also <link linkend="assertions">Assertions</link>.</para>
</sect3>
@@ -558,24 +558,24 @@ default behavior.</para>
<sect2>
<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>
+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>
+<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>
+<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>
diff --git a/doc/katepart/vi.docbook b/doc/katepart/vi.docbook
index 7189b2bb2..726892386 100644
--- a/doc/katepart/vi.docbook
+++ b/doc/katepart/vi.docbook
@@ -29,8 +29,8 @@ On this tab you can set options for the VI Input Mode and define and edit
the key mapping in this mode.
VI Input Mode can also be toggled with the <guimenuitem>VI Input Mode</guimenuitem>
setting in the <guimenu>Edit</guimenu> menu. (The default shortcut key is
-<keycombo action="simul"><keysym>Meta</keysym>&Ctrl;<keycap>V</keycap></keycombo>
- - where <keysym>Meta</keysym> usually is the <keysym>Windows</keysym> key).</para>
+<keycombo action="simul">&Meta;&Ctrl;<keycap>V</keycap></keycombo>
+ - where &Meta; usually is the <keysym>Windows</keysym> key).</para>
<note>
<para>Many Vi Mode keyboard commands are case-sensitive, unlike most &kde;
@@ -106,7 +106,7 @@ and puts you in insert mode.</para>
<para>Vim: <userinput>O</userinput> and <userinput>o</userinput> opens a new line and inserts
text [<replaceable>count</replaceable>] times when leaving insert mode.</para>
<para>This is mostly done as a consequence of witnessing many people being
-confused by this behavior on a vim irc channel (#vim on freenode).</para>
+confused by this behavior on a vim &irc; channel (#vim on freenode).</para>
</listitem>
</itemizedlist>
@@ -139,25 +139,25 @@ some specific to &kappname;. For more information on these commands, see
press <keycap>:</keycap>, enter the command, and press &Enter;.</para>
</listitem>
</itemizedlist>
-<!-- add a picture like http://de.wikipedia.org/wiki/Vi#Arbeitsmodi here? -->
+<!-- add a picture like https://de.wikipedia.org/wiki/Vi#Arbeitsmodi here? -->
</sect2>
<sect2 id="vi-integration">
-<title>Integration with Kate features</title>
+<title>Integration with &kate; features</title>
<itemizedlist>
<listitem>
<para>Visual Mode is entered automatically when text is selected with the mouse.
-It is also entered when using functions of Kate that select text, such as Select
+It is also entered when using functions of &kate; that select text, such as Select
All (either from the menu or via <keycombo action="simul">&Ctrl;<keycap>A</keycap>
</keycombo>.)</para>
</listitem>
<listitem>
-<para>Vi marks and <link linkend="kate-part-bookmarks">Kate bookmarks</link> are
-integrated. When a mark is created in Vi Mode, a corresponding Kate bookmark is
+<para>Vi marks and <link linkend="kate-part-bookmarks">&kate; bookmarks</link> are
+integrated. When a mark is created in Vi Mode, a corresponding &kate; bookmark is
created and appears in the <guimenu>Bookmarks</guimenu> menu. Conversely, when
-a Kate bookmark is created, a corresponding Vi mark at the 0 column is also
+a &kate; bookmark is created, a corresponding Vi mark at the 0 column is also
created.</para>
</listitem>
@@ -185,7 +185,7 @@ created.</para>
<row><entry><para><userinput>i</userinput></para></entry>
<entry><para>Enter Insert Mode; insert before cursor</para></entry>
</row>
-<row><entry><para><keycap>Insert</keycap></para></entry>
+<row><entry><para>&Ins;</para></entry>
<entry><para>Enter Insert Mode; insert before cursor</para></entry>
</row>
<row><entry><para><userinput>I</userinput></para></entry>
@@ -242,7 +242,7 @@ created.</para>
<row><entry><para><userinput>x</userinput></para></entry>
<entry><para>Delete character to right of cursor</para></entry>
</row>
-<row><entry><para><keycap>Delete</keycap></para></entry>
+<row><entry><para>∇</para></entry>
<entry><para>Delete character to right of cursor</para></entry>
</row>
<row><entry><para><userinput>X</userinput></para></entry>
@@ -330,7 +330,7 @@ created.</para>
<entry><para>Page up</para></entry>
</row>
<row><entry><para><userinput>ga</userinput></para></entry>
-<entry><para>Print the ASCII value of the character</para></entry>
+<entry><para>Print the &ASCII; value of the character</para></entry>
</row>
<row><entry><para><userinput>.</userinput></para></entry>
<entry><para>Repeat last change</para></entry>
@@ -357,25 +357,25 @@ created.</para>
<row><entry><para><keycombo action="simul">&Ctrl;
<keycap>W</keycap></keycombo>, <userinput>h</userinput></para>
<para><keycombo action="seq"><keycombo action="simul">&Ctrl;
-<keycap>W</keycap></keycombo><keysym>Left</keysym></keycombo></para></entry>
+<keycap>W</keycap></keycombo>&Left;</keycombo></para></entry>
<entry><para>Go to left split window</para></entry>
</row>
<row><entry><para><keycombo action="simul">&Ctrl;
<keycap>W</keycap></keycombo>, <userinput>l</userinput></para>
<para><keycombo action="seq"><keycombo action="simul">&Ctrl;
-<keycap>W</keycap></keycombo><keysym>Right</keysym></keycombo></para></entry>
+<keycap>W</keycap></keycombo>&Right;</keycombo></para></entry>
<entry><para>Go to right split window</para></entry>
</row>
<row><entry><para><keycombo action="simul">&Ctrl;
<keycap>W</keycap></keycombo>, <userinput>k</userinput></para>
<para><keycombo action="seq"><keycombo action="simul">&Ctrl;
-<keycap>W</keycap></keycombo><keysym>Up</keysym></keycombo></para></entry>
+<keycap>W</keycap></keycombo>&Up;</keycombo></para></entry>
<entry><para>Go to above split window</para></entry>
</row>
<row><entry><para><keycombo action="simul">&Ctrl;
<keycap>W</keycap></keycombo>, <userinput>j</userinput></para>
<para><keycombo action="seq"><keycombo action="simul">&Ctrl;
-<keycap>W</keycap></keycombo><keysym>Down</keysym></keycombo></para></entry>
+<keycap>W</keycap></keycombo>&Down;</keycombo></para></entry>
<entry><para>Go to below split window</para></entry>
</row>
</tbody>
@@ -402,7 +402,7 @@ which indicates how many of the appropriate movements to make.</para>
<row><entry><para><userinput>h</userinput></para></entry>
<entry><para>Left</para></entry>
</row>
-<row><entry><para><keysym>Left</keysym></para></entry>
+<row><entry><para>&Left;</para></entry>
<entry><para>Left</para></entry>
</row>
<row><entry><para>&Backspace;</para></entry>
@@ -411,34 +411,34 @@ which indicates how many of the appropriate movements to make.</para>
<row><entry><para><userinput>j</userinput></para></entry>
<entry><para>Down</para></entry>
</row>
-<row><entry><para><keysym>Down</keysym></para></entry>
+<row><entry><para>&Down;</para></entry>
<entry><para>Down</para></entry>
</row>
<row><entry><para><userinput>k</userinput></para></entry>
<entry><para>Up</para></entry>
</row>
-<row><entry><para><keysym>Up</keysym></para></entry>
+<row><entry><para>&Up;</para></entry>
<entry><para>Up</para></entry>
</row>
<row><entry><para><userinput>l</userinput></para></entry>
<entry><para>Right</para></entry>
</row>
-<row><entry><para><keysym>Right</keysym></para></entry>
+<row><entry><para>&Right;</para></entry>
<entry><para>Right</para></entry>
</row>
-<row><entry><para><keysym>Space</keysym></para></entry>
+<row><entry><para>&Space;</para></entry>
<entry><para>Right</para></entry>
</row>
<row><entry><para><userinput>$</userinput></para></entry>
<entry><para>End of line</para></entry>
</row>
-<row><entry><para><keycap>End</keycap></para></entry>
+<row><entry><para>&End;</para></entry>
<entry><para>End of line</para></entry>
</row>
<row><entry><para><userinput>0</userinput></para></entry>
<entry><para>First character of line (Column 0)</para></entry>
</row>
-<row><entry><para><keycap>Home</keycap></para></entry>
+<row><entry><para>&Home;</para></entry>
<entry><para>First character of line</para></entry>
</row>
<row><entry><para><userinput>^</userinput></para></entry>
@@ -526,10 +526,10 @@ which indicates how many of the appropriate movements to make.</para>
<entry><para>Go one line up visually (when using dynamic word wrap)</para></entry></row>
<row><entry><para><userinput>gj</userinput></para></entry>
<entry><para>Go one line down visually (when using dynamic word wrap)</para></entry></row>
-<row><entry><para><keycombo action="simul">&Ctrl;<keycap>Left</keycap></keycombo></para></entry>
+<row><entry><para><keycombo action="simul">&Ctrl;&Left;</keycombo></para></entry>
<entry><para>Move one word left</para></entry>
</row>
-<row><entry><para><keycombo action="simul">&Ctrl;<keycap>Right</keycap></keycombo></para></entry>
+<row><entry><para><keycombo action="simul">&Ctrl;&Right;</keycombo></para></entry>
<entry><para>Move one word right</para></entry>
</row>
</tbody>
@@ -654,7 +654,7 @@ excluding the backticks</para></entry>
<row><entry><para><keycombo action="simul">&Ctrl;<keycap>H</keycap></keycombo></para></entry>
<entry><para>Delete char backward</para></entry>
</row>
-<row><entry><para><keycombo action="simul">&Ctrl;<keycap>Home</keycap></keycombo></para></entry>
+<row><entry><para><keycombo action="simul">&Ctrl;&Home;</keycombo></para></entry>
<entry><para>Move to first character in the document</para></entry>
</row>
<row><entry><para><keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo>
diff --git a/doc/kwrite/index.docbook b/doc/kwrite/index.docbook
index e42e5807d..39cdd55b5 100644
--- a/doc/kwrite/index.docbook
+++ b/doc/kwrite/index.docbook
@@ -59,7 +59,7 @@ Bash, Modula 2, &HTML;, and Ada. &kwrite; has a single document interface
<para>
&kwrite; is a simple interface to the &katepart; component also used by &kate;,
-KDevelop, and other applications from &kde; that require advanced text editing.
+&kdevelop;, and other applications from &kde; that require advanced text editing.
Therefore, complete documentation for all the features of &kwrite; can be found
in the <ulink url="help:/katepart">&katepart; Handbook</ulink>.
</para>
@@ -126,7 +126,7 @@ line.</para></listitem>
<term><userinput><command>kwrite</command>
<option>--author</option></userinput></term>
<listitem><para>Lists &kwrite;'s authors in the terminal
-window</para></listitem>
+window.</para></listitem>
</varlistentry>
<varlistentry>
@@ -136,7 +136,7 @@ window</para></listitem>
</varlistentry>
<varlistentry>
-<term><userinput><command>&kwrite;</command>
+<term><userinput><command>kwrite</command>
<option>--license</option></userinput></term>
<listitem>
<para>Shows license information.</para>
More information about the kde-doc-english
mailing list