[frameworks/kio] docs: Documentation fixes

Antoni Bella Pérez null at kde.org
Sat Oct 10 20:34:16 BST 2020


Git commit ab1203f87e06f047abdf1c7333be370a2bc92566 by Antoni Bella Pérez.
Committed on 10/10/2020 at 19:34.
Pushed by bellaperez into branch 'master'.

Documentation fixes

* Use more entities
* Change http: to https:
* Sync GUI messages
* And some punctuation

M  +1    -1    docs/kcontrol5/cache/index.docbook
M  +3    -3    docs/kcontrol5/cookies/index.docbook
M  +1    -1    docs/kcontrol5/netpref/index.docbook
M  +8    -8    docs/kcontrol5/proxy/index.docbook
M  +21   -22   docs/kcontrol5/smb/index.docbook
M  +3    -3    docs/kcontrol5/trash/index.docbook
M  +3    -3    docs/kcontrol5/useragent/index.docbook
M  +16   -17   docs/kcontrol5/webshortcuts/index.docbook
M  +8    -8    docs/kcookiejar5/man-kcookiejar5.8.docbook
M  +11   -11   docs/kioslave5/data/index.docbook
M  +2    -2    docs/kioslave5/ftp/index.docbook
M  +5    -5    docs/kioslave5/help/documentationnotfound/index.docbook
M  +5    -6    docs/kioslave5/http/index.docbook
M  +2    -2    docs/kioslave5/webdav/index.docbook

https://invent.kde.org/frameworks/kio/commit/ab1203f87e06f047abdf1c7333be370a2bc92566

diff --git a/docs/kcontrol5/cache/index.docbook b/docs/kcontrol5/cache/index.docbook
index 95119e30..155c90b8 100644
--- a/docs/kcontrol5/cache/index.docbook
+++ b/docs/kcontrol5/cache/index.docbook
@@ -52,7 +52,7 @@ try the cache, and if an object is not there, it will not attempt to
 download it from the Internet.</para>
 
 <para>You can control the size of the cache by typing a number into the
-text box labeled <guilabel>Disk cache size</guilabel>.  This is the
+text box labeled <guilabel>Disk cache size:</guilabel>.  This is the
 average amount of space in kilobytes that the cache folder is allowed
 to use. When the cache grows too large, &konqueror; will delete older
 files to reduce the size of the cache folder.</para>
diff --git a/docs/kcontrol5/cookies/index.docbook b/docs/kcontrol5/cookies/index.docbook
index 4daeb7ef..66a0a23c 100644
--- a/docs/kcontrol5/cookies/index.docbook
+++ b/docs/kcontrol5/cookies/index.docbook
@@ -47,7 +47,7 @@ the web sites get, or to customize banner advertising.</para>
 
 <para>The cookies page allows you to set policies
 for the use of cookies when you are browsing the web with the
-&konqueror; web browser. </para>
+&konqueror; web browser.</para>
 
 <warning><para>Note that the policies that you set using this control
 module will <emphasis>not</emphasis> apply to other web browsers such
@@ -169,7 +169,7 @@ choose a general policy for a specific host (for example, by selecting
 confirm a cookie).</para>
 
 <para>You can also select a specific host domain from the list and click the
-<guibutton>Change</guibutton> button to choose a different policy for that
+<guibutton>Change...</guibutton> button to choose a different policy for that
 domain than the one shown in the list.</para>
 
 <para>To delete a domain specific policy, choose a domain from the list, and
@@ -193,7 +193,7 @@ of these cookies, you will notice that its contents will show up in the frame
 <para>By clicking the <guibutton>Delete</guibutton> button you can now delete the selected
 cookie. Click <guibutton>Delete All</guibutton> to delete all cookies stored.</para>
 
-<para>If a domain is selected, you can use <guibutton>Configure Policy</guibutton> to set 
+<para>If a domain is selected, you can use <guibutton>Configure Policy...</guibutton> to set
 a site policy.</para>
 
 <para>Choose <guibutton>Reload List</guibutton> to reload the list
diff --git a/docs/kcontrol5/netpref/index.docbook b/docs/kcontrol5/netpref/index.docbook
index 704dd0c9..383dd8fa 100644
--- a/docs/kcontrol5/netpref/index.docbook
+++ b/docs/kcontrol5/netpref/index.docbook
@@ -98,7 +98,7 @@ which makes it usable through firewalls.</para></listitem>
 <term><guilabel>Mark partially uploaded files</guilabel></term>
 <listitem><para>When a mark is placed in this box, partially uploaded files will 
 have a <literal role="extension">.part</literal> extension added to the end 
-of the file. This extension is removed once the file download is complete. </para></listitem>
+of the file. This extension is removed once the file download is complete.</para></listitem>
 </varlistentry>
 
 </variablelist>
diff --git a/docs/kcontrol5/proxy/index.docbook b/docs/kcontrol5/proxy/index.docbook
index 418aec4b..a348d53f 100644
--- a/docs/kcontrol5/proxy/index.docbook
+++ b/docs/kcontrol5/proxy/index.docbook
@@ -100,7 +100,7 @@ more information.</para></note>
 </varlistentry>
 
 <varlistentry>
-<term><guilabel>Use proxy auto configuration URL</guilabel></term>
+<term><guilabel>Use proxy auto configuration URL:</guilabel></term>
 <listitem>
 <para>Select this option if your proxy support is provided through a
 script file located at a specific address.  You can then enter the
@@ -110,7 +110,7 @@ icon to browse to it.</para>
 </varlistentry>
 
 <varlistentry>
-<term><guilabel>Use system proxy configuration</guilabel></term>
+<term><guilabel>Use system proxy configuration:</guilabel></term>
 <listitem>
 <para>Some systems are setup with $<envar>HTTP_PROXY</envar> to allow
 graphical as well as non-graphical applications to share the same
@@ -119,7 +119,7 @@ proxy configuration information.</para>
 the <guibutton>Auto Detect</guibutton> button to provide the environment
 variable names used to set the address of the proxy server(s).</para>
 <!-- Exceptions fields are different for system proxy (envar) + manual proxy list of hosts/IPs? -->
-<para>In the <guilabel>Exceptions</guilabel> field enter the environment variable, 
+<para>In the <guilabel>Exceptions:</guilabel> field enter the environment variable,
 ⪚ $<envar>NO_PROXY</envar>, used to store the 
 addresses of sites for which the proxy server should not be used.</para>
 <para>Use <guilabel>Show the value of the environment variables</guilabel> to 
@@ -132,18 +132,18 @@ How to enable Auto Detect button?
 </listitem>
 </varlistentry>
 <varlistentry>
-<term><guilabel>Use manually specified proxy configuration</guilabel></term>
+<term><guilabel>Use manually specified proxy configuration:</guilabel></term>
 <listitem>
 
 <para>The complete addressing information for the proxy includes both
 the Internet address and a port number. You should enter these into
 the relevant text boxes. Check <guilabel>Use this proxy server for all 
-protocols</guilabel> to copy the addresses and port of the HTTP proxy server 
+protocols</guilabel> to copy the addresses and port of the &HTTP; proxy server
 into all other proxy fields, in order to help save some typing.</para>
 
 <variablelist>
 <varlistentry>
-<term><guilabel>Exceptions</guilabel></term>
+<term><guilabel>Exceptions:</guilabel></term>
 <listitem>
 <para>Enter a comma separated list of hostnames or ip addresses that should 
 be excluded from using the above proxy settings. If you want to exclude all 
@@ -151,8 +151,8 @@ hosts for a given domain, then simply enter the domain name preceded by a dot.
 For example, to exclude all hostnames for kde.org, enter <userinput>.kde.org</userinput>. 
 Wildcard characters such as <userinput>*</userinput> or <userinput>?</userinput> 
 are not supported and will have no effect. 
-Additionally, you can also enter IP addresses, e.g. 127.0.0.1 and 
-IP addresses with a subnet, e.g. 192.168.0.1/24.</para>
+Additionally, you can also enter IP addresses, ⪚ 127.0.0.1 and
+IP addresses with a subnet, ⪚ 192.168.0.1/24.</para>
 </listitem>
 </varlistentry>
 </variablelist>
diff --git a/docs/kcontrol5/smb/index.docbook b/docs/kcontrol5/smb/index.docbook
index b94d2846..a3c03222 100644
--- a/docs/kcontrol5/smb/index.docbook
+++ b/docs/kcontrol5/smb/index.docbook
@@ -7,7 +7,7 @@
 
 <article id="smb" lang="&language;">
 <articleinfo>
-<title>Windows Shares</title>
+<title>&Windows; Shares</title>
 <authorgroup>
 <author>&Mike.McBride; &Mike.McBride.mail;</author>
 <author>&Jost.Schenck; &Jost.Schenck.mail;</author>
@@ -24,26 +24,26 @@
 </keywordset>
 </articleinfo>
 <sect1 id="windows-shares">
-<title>Windows Shares</title>
+<title>&Windows; Shares</title>
 
 <sect2 id="windows-shares-intro">
 <title>Introduction</title>
 
-<para>In many small local area networks, the <acronym>SMB</acronym>
+<para>In many small local area networks, the &SMB;
 protocol is used to offer network services. Names like
 <quote>&Windows; Network</quote> or <quote>&Windows; for Workgroups
 Network</quote> or <quote>LanManager</quote> are often used as
-well. Using <acronym>SMB</acronym> you can access so-called
+well. Using &SMB; you can access so-called
 <quote>shares</quote> (&ie; folders made available by the server)
-as well as printers.  </para>
+as well as printers.</para>
 
-<para>&kde; comes with built-in support for the <acronym>SMB</acronym>
+<para>&kde; comes with built-in support for the &SMB;
 protocol. As &kde; is network-transparent that means you can access
-<acronym>SMB</acronym> shares from everywhere you can access your
+&SMB; shares from everywhere you can access your
 local files, for example in the &konqueror; file manager and in the
 file dialog. To make use of this you should provide &kde; with some
-information on your <acronym>SMB</acronym> network. But don't worry,
-this is normally pretty simple as, for example, all the Windows
+information on your &SMB; network. But don't worry,
+this is normally pretty simple as, for example, all the &Windows;
 clients in your network need and have the same information.</para>
 
 <!-- Don't know if the following info should go in the base
@@ -55,9 +55,8 @@ very cool thing (TM) btw. If you want to write some documentation for
 this one too, have a look at kdenetwork/lanbrowsing/lisa/README and
 contact me if you have questions. -->
 
-<note><para>For the <acronym>SMB</acronym> protocol to work, it is
-required to have <application>Samba</application> correctly
-installed.</para></note>
+<note><para>For the &SMB; protocol to work, it is
+required to have &Samba; correctly installed.</para></note>
 
 <!-- TODO: link to some place which explains USING SMB, i.e. konqueror
 or file dialog manual -->
@@ -67,25 +66,25 @@ or file dialog manual -->
 <sect2 id="windows-shares-use">
 <title>Use</title>
 
-<para>Although there are a lot of insecure <acronym>SMB</acronym>
+<para>Although there are a lot of insecure &SMB;
 networks out there which allow access to anyone, in principle you have
 to authenticate yourself to access the services of an
-<acronym>SMB</acronym> server.  By default, &kde; will use the data
-entered in the <guilabel>Default user name</guilabel> and
-<guilabel>Default password</guilabel> fields to authenticate itself on
-<acronym>SMB</acronym> hosts. If you leave the field <guilabel>Default
-user name</guilabel> empty, &kde; will try to access
-<acronym>SMB</acronym> hosts without a username. If you leave the
+&SMB; server.  By default, &kde; will use the data
+entered in the <guilabel>Default user name:</guilabel> and
+<guilabel>Default password:</guilabel> fields to authenticate itself on
+&SMB; hosts. If you leave the field <guilabel>Default
+user name:</guilabel> empty, &kde; will try to access
+&SMB; hosts without a username. If you leave the
 default password empty, it will try without a password. If &kde; is
 unsuccessful accessing the host using these settings, you will be
 asked for a username and a password.</para>
 
 <important><para>While it makes things more comfortable if &kde;
-stores your <acronym>SMB</acronym> password, this may be a security
-problem. If you are using <acronym>SMB</acronym> in a security
+stores your &SMB; password, this may be a security
+problem. If you are using &SMB; in a security
 conscious environment, you should not store your password here but
 rather enter it anew every time you need to access an
-<acronym>SMB</acronym> host.</para></important>
+&SMB; host.</para></important>
 
 </sect2>
 
diff --git a/docs/kcontrol5/trash/index.docbook b/docs/kcontrol5/trash/index.docbook
index 6866d7fd..ad158373 100644
--- a/docs/kcontrol5/trash/index.docbook
+++ b/docs/kcontrol5/trash/index.docbook
@@ -27,7 +27,7 @@ This module allows you to configure the settings for the trash.
 </para>
 
 <variablelist>
-<varlistentry><term><guilabel>Cleanup</guilabel></term>
+<varlistentry><term><guilabel>Cleanup:</guilabel></term>
 <listitem><para>
 Check this box to allow automatic deletion of files that are 
 older than the value specified. Leave this disabled to <emphasis>not</emphasis> 
@@ -37,7 +37,7 @@ older than this will be automatically deleted.
 </para></listitem>
 </varlistentry>
 
-<varlistentry><term><guilabel>Size</guilabel></term>
+<varlistentry><term><guilabel>Size:</guilabel></term>
 <listitem><para>
 Check this box to limit the trash to the maximum amount of disk space 
 that you specify. Otherwise, it will be unlimited.
@@ -52,7 +52,7 @@ the trash is displayed right of the spinbox.
 </para></listitem>
 </varlistentry>
 
-<varlistentry><term><guilabel>Full trash</guilabel></term>
+<varlistentry><term><guilabel>Full trash:</guilabel></term>
 <listitem><para>
 When the size limit is reached, the selected action will be performed, 
 either the oldest or biggest files will be deleted automatically
diff --git a/docs/kcontrol5/useragent/index.docbook b/docs/kcontrol5/useragent/index.docbook
index 54fac97d..6c97c90d 100644
--- a/docs/kcontrol5/useragent/index.docbook
+++ b/docs/kcontrol5/useragent/index.docbook
@@ -72,16 +72,16 @@ deny you access to some websites, so disable this with caution.</para>
 <guibutton>New...</guibutton> button.  Type the name of the server or
 a domain in the text box at the top of the dialog that pops up, which
 is labeled <guilabel>When browsing the following
-site</guilabel>.</para>
+site:</guilabel>.</para>
 
 <para>Note that you can <emphasis>not</emphasis> use the wildcard
 character <token>*</token> in this text box. However, the string
 <userinput>kde.org</userinput> will match all hosts in the domain
-<systemitem>kde.org</systemitem></para>
+<systemitem>kde.org</systemitem>.</para>
 
 <para>After typing the name of the server, select the identifying
 string in the next combo box, which is labeled <guilabel>Use the
-following identification:</guilabel>. The <guilabel>Real identification</guilabel>
+following identification:</guilabel>. The <guilabel>Real identification:</guilabel>
 &ie; the strings sent to the server, is displayed in the field.</para>
 
 <para>You can click on an existing entry in the list, and then modify the contents of the
diff --git a/docs/kcontrol5/webshortcuts/index.docbook b/docs/kcontrol5/webshortcuts/index.docbook
index 85a15139..d41dafcd 100644
--- a/docs/kcontrol5/webshortcuts/index.docbook
+++ b/docs/kcontrol5/webshortcuts/index.docbook
@@ -41,12 +41,11 @@ experience. One such feature is <emphasis>Web Shortcuts</emphasis>.</para>
 For example, you can click on the <guimenuitem>Run</guimenuitem> menu
 item or type the keyboard shortcut assigned to that command (<keycombo
 action="simul">&Alt;<keycap>F2</keycap></keycombo> or <keycombo
-action="simul">&Alt;<keycap>Space</keycap></keycombo>,
+action="simul">&Alt;&Space;</keycombo>,
 unless you have changed it) and type in a &URI;.
 <footnote><para>Uniform Resource Identifier. A standardized way of
 referring to a resource such as a file on your computer, a World Wide
-Web address, an email address,
-<abbrev>etc...</abbrev>.</para></footnote></para>
+Web address, an email address, &etc;</para></footnote></para>
 
 <para>Web shortcuts, on the other hand, let you come up with new pseudo
 &URL; schemes, or shortcuts, that basically let you
@@ -68,39 +67,39 @@ input is not properly &URL; encoded, so one will type
 shortcuts wherever you would normally use
 &URI;s. Shortcuts for several search engines should
 already be configured on your system, but you can add new keywords, and
-change or delete existing ones in this module. </para>
+change or delete existing ones in this module.</para>
 
 </sect2>
 
 <sect2 id="ebrowse-use">
 
-<title>Web Shortcuts</title>
+<title>Web Search Keywords</title>
 
 <para>The descriptive names of defined web shortcuts are shown in a
 list box. As with other lists in &kde;, you can click on a column
 heading to toggle the sort order between ascending and
 descending, and you can resize the columns.</para>
 
-<para>At the bottom of the list the option <guilabel>Enable Web shortcuts</guilabel> 
+<para>At the bottom of the list the option <guilabel>Enable Web search keywords</guilabel>
 has to be checked to enable this feature. Use the buttons on the right to 
 create, modify or delete shortcuts.</para>
 
-<para>If <guilabel>Use preferred shortcuts only</guilabel> is checked, only
-web shortcuts marked as preferred in the third column of the list
+<para>If <guilabel>Use preferred keywords only</guilabel> is checked, only
+keywords marked as preferred in the second column of the list
 are used in places where only a few select 
 shortcuts can be shown at one time.
 </para>
  
 <para>Below the list you find two additional options:</para>
 <variablelist>
-<varlistentry><term><guilabel>Default Web shortcuts</guilabel></term>
+<varlistentry><term><guilabel>Default Web search keyword:</guilabel></term>
 <listitem>
 <para>Select the search engine to use for input boxes that provide automatic 
 lookup services when you type in normal words and phrases instead of a &URL;. 
 To disable this feature select <guilabel>None</guilabel> from the list.
 </para></listitem>
 </varlistentry>
-<varlistentry><term><guilabel>Keyword delimiter</guilabel></term>
+<varlistentry><term><guilabel>Keyword delimiter:</guilabel></term>
 <listitem>
 <para>Choose the delimiter that separates the keyword from the phrase or word to 
 be searched.</para></listitem>
@@ -108,7 +107,7 @@ be searched.</para></listitem>
 </variablelist>
 
 <para>If you double-click on a specific entry in the list of defined
-search providers or click the <guibutton>Change</guibutton> button, 
+search providers or click the <guibutton>Change...</guibutton> button,
 the details for that entry are shown in a popup
 dialog.  In addition to the descriptive name for the item, you can
 also see the &URI; which is used, as well as the
@@ -121,27 +120,27 @@ about an item in the list of web shortcuts, but also for modifying or
 adding new items.</para>
 
 <para>You can change the contents of either the <guilabel>Shortcut 
-URL</guilabel> or the <guilabel>Shortcuts</guilabel> text box.
+URL:</guilabel> or the <guilabel>Shortcuts:</guilabel> text box.
 Click <guibutton>OK</guibutton> to save your changes or
 <guibutton>Cancel</guibutton> to exit the dialog with no
 changes.</para>
 
-<para>If you examine the contents of the <guilabel>Shortcuts 
-URL</guilabel> text box, you will find that most, if not all of the
+<para>If you examine the contents of the <guilabel>Shortcut
+URL:</guilabel> text box, you will find that most, if not all of the
 entries have a <option>\{@}</option> in them. This sequence of four
 characters acts as a parameter, which is to say that they are replaced
 by whatever you happen to type after the colon character that is
 between a shortcut and its parameter. To add this query placeholder 
-to a shortcuts url, click on the button at the right of the text box.
+to a shortcut &URL;, click on the button at the right of the text box.
 Let's consider some examples to clarify how to use web shortcuts.</para>
 
 <para>Suppose that the &URI; is
-<userinput>http://www.google.com/search?q=\{@}</userinput>, and
+<userinput>https://www.google.com/search?q=\{@}</userinput>, and
 <userinput>gg</userinput> is a shortcut to this
 &URI;. Then, typing
 <userinput>gg:<replaceable>alpha</replaceable></userinput> is
 equivalent to
-<userinput>http://www.google.com/search?q=<replaceable>alpha</replaceable></userinput>.
+<userinput>https://www.google.com/search?q=<replaceable>alpha</replaceable></userinput>.
 You could type anything after the <userinput>:</userinput> character;
 whatever you have typed simply replaces the <option>\{@}</option>
 characters, after being converted to the appropriate character set for
diff --git a/docs/kcookiejar5/man-kcookiejar5.8.docbook b/docs/kcookiejar5/man-kcookiejar5.8.docbook
index 786267dc..2c949cbe 100644
--- a/docs/kcookiejar5/man-kcookiejar5.8.docbook
+++ b/docs/kcookiejar5/man-kcookiejar5.8.docbook
@@ -35,7 +35,7 @@
 
 <refnamediv>
 <refname><command>kcookiejar5</command></refname>
-<refpurpose>Command line interface to the &kde; HTTP cookie daemon</refpurpose>
+<refpurpose>Command line interface to the &kde; &HTTP; cookie daemon</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
@@ -56,8 +56,8 @@
 <refsect1>
 <title>Description</title>
 
-<para><command>kcookiejar5</command> is a command line interface to the HTTP cookie store used by KDE,
-a D-BUS service to store/retrieve/clean cookies.
+<para><command>kcookiejar5</command> is a command line interface to the &HTTP; cookie store used by &kde;,
+a &DBus; service to store/retrieve/clean cookies.
 </para>
 </refsect1>
 
@@ -76,14 +76,14 @@ a D-BUS service to store/retrieve/clean cookies.
 <varlistentry>
 <term><option>-v</option><option>--version</option></term>
 <listitem>
-<para>Show version information</para>
+<para>Show version information.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term><option>--shutdown</option></term>
 <listitem>
-<para>Shut down cookie jar and the D-BUS service.
+<para>Shut down cookie jar and the &DBus; service.
 </para>
 </listitem>
 </varlistentry>
@@ -120,9 +120,9 @@ Reloads the configuration file.
 
 <refsect1>
 <title>Usage</title>
-<para><command>kcookiejar5</command> is a command line tool to access the kded module which manages cookies in <command>Konqueror</command> and other KDE applications.</para>
+<para><command>kcookiejar5</command> is a command line tool to access the kded module which manages cookies in &konqueror; and other &kde; applications.</para>
 <para>
-When started without parameters it loads the kded module to provide the dbus interface to store cookies.
+When started without parameters it loads the kded module to provide the &DBus; interface to store cookies.
 </para>
 <para>
 When <command>kcookiejar5</command> is started with some parameters, it does
@@ -140,7 +140,7 @@ additional tasks to the cookies jar it provides, like removing the cookies from
 
 <refsect1>
 <title>Bugs</title>
-<para>Please use <ulink url="https://bugs.kde.org">KDE's bugtracker</ulink> to report bugs.</para>
+<para>Please use <ulink url="https://bugs.kde.org">&kde;'s bugtracker</ulink> to report bugs.</para>
 </refsect1>
 
 </refentry>
diff --git a/docs/kioslave5/data/index.docbook b/docs/kioslave5/data/index.docbook
index 94d5f7db..81afb8ae 100644
--- a/docs/kioslave5/data/index.docbook
+++ b/docs/kioslave5/data/index.docbook
@@ -6,7 +6,7 @@
 ]>
 	
 <article lang="&language;" id="data">
-<title>Data URLs</title>
+<title>Data &URL;s</title>
 
 <articleinfo>
 <authorgroup>
@@ -21,30 +21,30 @@
 
 </articleinfo>
 
-<para>Data URLs allow small document data to be included in the URL itself.
-This is useful for very small HTML testcases or other occasions that do not
+<para>Data URLs allow small document data to be included in the &URL; itself.
+This is useful for very small &HTML; testcases or other occasions that do not
 justify a document of their own.</para>
 
 <para><userinput>data:,foobar</userinput>
 (note the comma after the colon) will deliver a text document that contains
-nothing but <literal>foobar</literal>
+nothing but <literal>foobar</literal>.
 </para>
 
-<para>The last example delivered a text document. For HTML documents one
-has to specify the MIME type <literal>text/html</literal>:
-<userinput>data:text/html,<title>Testcase</title><p>This
-is a testcase</p></userinput>. This will produce exactly the same
+<para>The last example delivered a text document. For &HTML; documents one
+has to specify the &MIME; type <literal>text/html</literal>:
+<quote><userinput>data:text/html,<title>Testcase</title><p>This
+is a testcase</p></userinput></quote>. This will produce exactly the same
 output as if the content had been loaded from a document of its own.
 </para>
 
 <para>Specifying alternate character sets is also possible. Note that 8-Bit
 characters have to be escaped by a percentage sign and their two-digit
 hexadecimal codes:
-<userinput>data:;charset=iso-8859-1,Gr%FC%DFe aus Schl%E4gl</userinput>
+<quote><userinput>data:;charset=iso-8859-1,Gr%FC%DFe aus Schl%E4gl</userinput></quote>
 results in
-<literal>Grüße aus Schlägl</literal>
+<quote><literal>Grüße aus Schlägl</literal></quote>
 whereas omitting the charset attribute might lead to something like
-<literal>Gr??e aus Schl?gl</literal>
+<quote><literal>Gr??e aus Schl?gl</literal></quote>.
 </para>
 
 <para><ulink url="https://www.ietf.org/rfc/rfc2397.txt">IETF
diff --git a/docs/kioslave5/ftp/index.docbook b/docs/kioslave5/ftp/index.docbook
index 6e7e4754..f11108fb 100644
--- a/docs/kioslave5/ftp/index.docbook
+++ b/docs/kioslave5/ftp/index.docbook
@@ -26,12 +26,12 @@ the transfer of one or more files. The local &FTP; program becomes a
 client that uses <acronym>TCP</acronym> to contact an &FTP; server
 program on the remote computer. Each time the user requests a file
 transfer, the client and the server programs cooperate to send a copy
-of the data across the Internet.  </para>
+of the data across the Internet.</para>
 
 <para> &FTP; servers which allow <quote>anonymous &FTP;</quote> permit
 any user, not only users with accounts on the host, to browse the
 <quote>ftp</quote> archives and download files. Some &FTP; servers are
-configured to allow users to upload files.  </para>
+configured to allow users to upload files.</para>
 
 <para>
 &FTP; is commonly used to retrieve information and obtain software stored in 
diff --git a/docs/kioslave5/help/documentationnotfound/index.docbook b/docs/kioslave5/help/documentationnotfound/index.docbook
index cb4cdfc3..eedbd33b 100644
--- a/docs/kioslave5/help/documentationnotfound/index.docbook
+++ b/docs/kioslave5/help/documentationnotfound/index.docbook
@@ -38,7 +38,7 @@ He will just tell you to follow the instructions on this page.
 <para>If the application is &kde; software, first use the search function in
 &khelpcenter;.  In some cases, the documentation has a different name than the
 software was using to try to find it.  If that doesn't work, try searching the
-<ulink url="https://docs.kde.org/">KDE Documentation site</ulink> for the
+<ulink url="https://docs.kde.org/">&kde; Documentation site</ulink> for the
 requested documentation. If you find the documentation on that site, your
 distribution might ship a separate package for documentation (⪚ called
 plasma-doc for documentation related to &plasma;). Please use the package
@@ -53,20 +53,20 @@ might have disabled the installation of the documentation.
 <para>If you have done that, but still get this page displayed instead of the
 application handbook, you probably found a bug in the help
 system.  In this case, please report this on the <ulink
-url="https://bugs.kde.org/">KDE Bug Tracker</ulink> under the KIO product.
+url="https://bugs.kde.org/">&kde;'s bugtracker</ulink> under the KIO product.
 </para>
 
 <para>If you do not find any documentation on the <ulink
-url="https://docs.kde.org/">KDE Documentation site</ulink>, the
+url="https://docs.kde.org/">&kde; Documentation site</ulink>, the
 application may not have offline documentation.  Please report this on
-the <ulink url="https://bugs.kde.org/">KDE Bug Tracker</ulink> under the
+the <ulink url="https://bugs.kde.org/">&kde;'s bugtracker</ulink> under the
 product for the application.
 </para>
 
 <para>In case the application does not have offline documentation, you should
 use the online resources <ulink
 url="https://userbase.kde.org/">UserBase Documentation</ulink> and
-<ulink url="https://forum.kde.org/">KDE Community Forums</ulink> to get
+<ulink url="https://forum.kde.org/">&kde; Community Forums</ulink> to get
 help.
 </para>
 
diff --git a/docs/kioslave5/http/index.docbook b/docs/kioslave5/http/index.docbook
index c3fbef88..c059bcc2 100644
--- a/docs/kioslave5/http/index.docbook
+++ b/docs/kioslave5/http/index.docbook
@@ -14,17 +14,16 @@
 </authorgroup>
 </articleinfo>
 
-<para><acronym>http</acronym> is the
+<para>&HTTP; is the
 <emphasis>H</emphasis>yper<emphasis>T</emphasis>ext
 <emphasis>T</emphasis>ransfer <emphasis>P</emphasis>rotocol.</para>
 
-<para>The http kioslave is used by all &kde; applications to handle
-connections to http servers, that is, web servers.  The most common
+<para>The https kioslave is used by all &kde; applications to handle
+connections to &HTTP; servers, that is, web servers.  The most common
 usage is to view web pages in the &konqueror; web browser.</para>
 
-<para>You can use the http kioslave in &konqueror; by giving it a
-<acronym>URL</acronym>.  
-<userinput>http://<replaceable>www.kde.org</replaceable></userinput>.</para>
+<para>You can use the https kioslave in &konqueror; by giving it a &URL;.
+<userinput>https://<replaceable>www.kde.org</replaceable></userinput>.</para>
 
 <para>https is http encapsulated in a SSL/TLS stream.</para>
 <para>
diff --git a/docs/kioslave5/webdav/index.docbook b/docs/kioslave5/webdav/index.docbook
index 35f1b991..22aacd4e 100644
--- a/docs/kioslave5/webdav/index.docbook
+++ b/docs/kioslave5/webdav/index.docbook
@@ -19,12 +19,12 @@
 <emphasis>A</emphasis>uthoring and <emphasis>V</emphasis>ersioning
 protocol for the World Wide Web. It allows for easy management of
 documents and scripts on a <ulink
-url="help:/kioslave/webdav.html">http</ulink> server, and has
+url="help:/kioslave/webdav.html">&HTTP;</ulink> server, and has
 additional features designed to simplify version management amongst
 multiple authors.</para>
 
 <para>Usage of this protocol is simple. Type the location you want to
-view, similar to a <acronym>http</acronym> URL except for the
+view, similar to a &HTTP; &URL; except for the
 webdav:// protocol name at the start. An example is
 <userinput>webdav://<replaceable>www.hostname.com/path/</replaceable></userinput>.
 If you specify a folder name, a list of files and folders will be


More information about the kde-doc-english mailing list