Commit 818a3954 authored by David Bryant's avatar David Bryant 💬

Replace locally defined entities with entities from global "general.entities" where possible.

Remove extraneous XML tags and regularize references to authors by using items from global
"contributor.entities" wherever that is possible. Patch some punctuation.
parent dafdbc7f
Pipeline #30821 passed with stage
in 44 minutes and 59 seconds
......@@ -3,53 +3,33 @@
<chapterinfo>
<authorgroup>
<author>
<firstname>Daniel</firstname>
<surname>Naber</surname>
<affiliation><address>
&Daniel.Naber;
&Daniel.Naber.mail;
</address></affiliation>
</author>
<author>
<firstname>David</firstname>
<surname>Rugge</surname>
<affiliation><address>
&David.Rugge;
&David.Rugge.mail;
</address></affiliation>
</author>
<author>
<firstname>Marc</firstname>
<surname>Mutz</surname>
<affiliation>
<orgname>Klar&auml;lvdalens Datakonsult AB</orgname>
<address>
&Marc.Mutz;
&Marc.Mutz.mail;
</address>
</affiliation>
</author>
<author>
<firstname>Michel</firstname>
<surname>Boyer de la Giroday</surname>
<affiliation><address>
<email>michel@kdab.net</email>
</address></affiliation>
</author>
<author>
<firstname>Laurent</firstname>
<surname>Montel</surname>
<affiliation><address>
&Laurent.Montel;
&Laurent.Montel.mail;
</address></affiliation>
</author>
<author>
<firstname>Scarlett</firstname>
<surname>Clark</surname>
<affiliation><address>
&Scarlett.Clark;
&Scarlett.Clark.mail;
</address></affiliation>
</author>
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
<date>2013-12-18</date>
<releaseinfo>(&kde; 4.12)</releaseinfo>
</chapterinfo>
......@@ -373,8 +353,8 @@ of this setting, you should look at the <guilabel>Headers</guilabel> tab of the
<term><guilabel>Sent-mail folder</guilabel></term>
<listitem>
<para>Select the folder into which messages should be filed after sending
when using this identity. &imap; users should consider changing this to an
&imap; folder, so their sent-mail is stored on a server instead of being
when using this identity. &IMAP; users should consider changing this to an
&IMAP; folder, so their sent-mail is stored on a server instead of being
stored in a local folder. This way they can access these messages from a
different location.</para>
<tip><para>You can exercise more fine-grained control over where to
......@@ -388,8 +368,8 @@ messages.</para></tip>
<term><guilabel>Drafts folder</guilabel></term>
<listitem>
<para>Select the folder into which drafts should be filed when using
this identity. &imap; users should consider changing this to an
&imap; folder, so their drafts are stored on a server instead of being
this identity. &IMAP; users should consider changing this to an
&IMAP; folder, so their drafts are stored on a server instead of being
stored in a local folder. This way they can easily continue to work
on their drafts at a different location.</para>
</listitem>
......@@ -690,7 +670,7 @@ on an item in the listbox.
after the third level of quoting has been reached. Note that the
<guilabel>Quoted text</guilabel> colors only work in the message reader, not in
the composer. If you want folders which are close to their quota
(space allotment, usually used on &imap; servers) to be displayed in a different color,
(space allotment, usually used on &IMAP; servers) to be displayed in a different color,
you can specify a percentage value as a threshold for this. The color to be used
can be configured along with the other custom colors.
......@@ -895,10 +875,10 @@ message preview pane.</para>
<para>By default, <guilabel>Enable access key</guilabel> is enabled. Access keys allow you to use the keyboard keys for functions which would perhaps normally be done with the mouse, such as following links.
For more information on access keys please see <ulink url="https://docs.kde.org/stable/en/applications/konqueror/accesskeys.html">Access keys</ulink>.</para>
<para><guilabel>Show HTML status bar</guilabel> activates a bar at the left side of the reader
pane that tells you if a message is &html; or not. This is important because
&html; messages might imitate the look of a signed and encrypted message, so
you should be aware of the fact that you are reading an &html; message. The &html;
status bar itself cannot be influenced by the &html; code of the message.</para>
pane that tells you if a message is &HTML; or not. This is important because
&HTML; messages might imitate the look of a signed and encrypted message, so
you should be aware of the fact that you are reading an &HTML; message. The &HTML;
status bar itself cannot be influenced by the &HTML; code of the message.</para>
<para>Enable <guilabel>Replace smileys by emoticons</guilabel> if you want smileys
like <userinput>:-)</userinput> appearing in the message text to be
......@@ -1359,11 +1339,11 @@ of key words can be modified.</para>
<term><guilabel>Prefer HTML to plain text</guilabel></term>
<listitem>
<para>
By default &kmail; will show &html; messages in plain text. If you prefer to view messages with
&html; formatting and layout automatically, select this option. However, we recommend leaving this option off,
as security problems with &html; might show up.</para>
<para>You can still easily view messages in &html; format per email by
clicking the plain message/html message toggle bar on the left hand side of the message window. Please see <link linkend="configure-appearance-message-window">Message Window</link>
By default &kmail; will show &HTML; messages in plain text. If you prefer to view messages with
&HTML; formatting and layout automatically, select this option. However, we recommend leaving this option off,
as security problems with &HTML; might show up.</para>
<para>You can still easily view messages in &HTML; format per email by
clicking the plain message/HTML message toggle bar on the left hand side of the message window. Please see <link linkend="configure-appearance-message-window">Message Window</link>
to enable this feature.</para>
</listitem>
</varlistentry>
......@@ -1372,7 +1352,7 @@ of key words can be modified.</para>
<term><guilabel>Allow messages to load external references from the Internet</guilabel></term>
<listitem>
<para>If checked, &kmail; can load external images, stylesheets &etc; from the Internet
when you look at an &html; message. We strongly recommend to leave this option off (although it has no effect if you only view
when you look at an &HTML; message. We strongly recommend to leave this option off (although it has no effect if you only view
plain text messages).</para>
<para>By adding external references to their messages, people sending spam can detect when you have looked at their message, your location, and
alot of other information that gets logged on web servers. Note that this option has no effect on &Java;, JavaScript and Plugins as
......@@ -1734,7 +1714,7 @@ of key words can be modified.</para>
encrypt messages that are merely saved to the
<guilabel>drafts</guilabel> folder. This is more
convenient, and does not result in a gross loss of
security, provided the drafts folder is safe. &imap;
security, provided the drafts folder is safe. &IMAP;
users might want this option turned off, if their
<guilabel>drafts</guilabel> folder is on the server.
</para>
......@@ -2221,8 +2201,8 @@ that is used when you create a new folder.</para>
<term><guilabel>Open this folder on startup</guilabel></term>
<listitem>
<para>Here you can set the folder that should be selected by default if you
start &kmail;. If you use only &imap; folders then you might want to set
this to your &imap; inbox folder. If you do that, you can collapse the local
start &kmail;. If you use only &IMAP; folders then you might want to set
this to your &IMAP; inbox folder. If you do that, you can collapse the local
folders in the folder list, and then they will stay collapsed when &kmail;
starts.</para>
</listitem>
......
......@@ -3,18 +3,16 @@
<chapterinfo>
<authorgroup>
<author>
<firstname>Daniel</firstname>
<surname>Naber</surname>
<affiliation><address>
&Daniel.Naber;
&Daniel.Naber.mail;
</address></affiliation>
</author>
<author>
<firstname>David</firstname>
<surname>Rugge</surname>
<affiliation><address>
&David.Rugge;
&David.Rugge.mail;
</address></affiliation>
</author>
<author>
&Scarlett.Clark;
&Scarlett.Clark.mail;
</author>
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
......@@ -107,30 +105,29 @@
<title>Documentation</title>
<para>Update for &kmail; 4.11 by
Laurent Montel <email>montel@kde.org</email> and
Scarlett Clark <email>scarlett@scarlettgatelyclark.com</email></para>
&Laurent.Montel; &Laurent.Montel.mail; and
&Scarlett.Clark; &Scarlett.Clark.mail;.</para>
<para>Update for &kmail; 1.7 by
Ingo Kl&ouml;cker &Ingo.Kloecker.mail; and
&Marc.Mutz; &Marc.Mutz.mail;,
Anti-Spam Wizard chapter by &Andreas.Gungl; &Andreas.Gungl.mail;,
section about filter log by &Andreas.Gungl; &Andreas.Gungl.mail; and
&Brad.Hards; &Brad.Hards.mail;,
additional changes by &Daniel.Naber; &Daniel.Naber.mail;.</para>
<para>Update for &kmail; 1.2 to 1.5 by &Daniel.Naber;
&Daniel.Naber.mail;,
&Ingo.Kloecker; &Ingo.Kloecker.mail; and
&Marc.Mutz; &Marc.Mutz.mail;.
Anti-Spam Wizard chapter by &Andreas.Gungl; &Andreas.Gungl.mail;.
Section about filter log by &Andreas.Gungl; &Andreas.Gungl.mail; and
&Brad.Hards; &Brad.Hards.mail;.
Additional changes by &Daniel.Naber; &Daniel.Naber.mail;.</para>
<para>Update for &kmail; 1.2 to 1.5 by &Daniel.Naber; &Daniel.Naber.mail;,
<application>OpenPGP</application> chapter by &Andreas.Gungl;
&Andreas.Gungl.mail; and Ingo Kl&ouml;cker &Ingo.Kloecker.mail;,
&Andreas.Gungl.mail; and &Ingo.Kloecker; &Ingo.Kloecker.mail;,
message filter chapter by &Marc.Mutz;
&Marc.Mutz.mail;, download filter chapter by &Thorsten.Zachmann;
&Marc.Mutz.mail;, and download filter chapter by &Thorsten.Zachmann;
&Thorsten.Zachmann.mail;. Other parts have been
contributed by various &kmail; developers.</para>
<para>&kmail; 1.0
documentation by &David.Rugge; &David.Rugge.mail;.
Original documentation by Markus Wuebben
<email>markus.&Bernd.Johannes.Wuebben.mail;</email>, Robert Williams
Original documentation by &Bernd.Johannes.Wuebben;
&Bernd.Johannes.Wuebben.mail;, Robert Williams
<email>rwilliams@kde.org</email> (Editor).</para>
<para>Thanks to Michael Elkins <email>me@cs.hmc.edu</email> for his excellent
......
......@@ -6,6 +6,7 @@
<author>&David.Rugge; &David.Rugge.mail;</author>
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
<date>2013-12-20</date>
<releaseinfo>&kde; 4.12</releaseinfo>
</chapterinfo>
......@@ -40,15 +41,15 @@
<qandaentry><question><para>How to store sent mails in a special folder?</para></question>
<answer>
<para><emphasis>Symptom:</emphasis> You want to store mails in a special folder. Maybe you are using an &imap; server and want to store your mails on the server, not in the client.</para>
<para><emphasis>Symptom:</emphasis> You want to store mails in a special folder. Maybe you are using an &IMAP; server and want to store your mails on the server, not in the client.</para>
<para><emphasis>Solution:</emphasis> In &kmail;, choose <menuchoice><guimenu>Settings</guimenu><guisubmenu>Configure KMail</guisubmenu><guimenuitem>Identities</guimenuitem><guimenuitem>(Choose an identity)</guimenuitem><guimenuitem>Modify</guimenuitem><guimenuitem>Advanced</guimenuitem><guimenuitem>Sent-mail folder</guimenuitem></menuchoice></para>
</answer>
</qandaentry>
<qandaentry><question><para>How to store trash mails in a special folder?</para></question>
<answer>
<para><emphasis>Symptom:</emphasis> You want to store mails in a special folder. Maybe you are using an &imap; server and want Trashed mails to be stored on the server, not in the client.</para>
<para>In the settings dialog select an &imap; account on the <guilabel>Accounts</guilabel> page.
<para><emphasis>Symptom:</emphasis> You want to store mails in a special folder. Maybe you are using an &IMAP; server and want Trashed mails to be stored on the server, not in the client.</para>
<para>In the settings dialog select an &IMAP; account on the <guilabel>Accounts</guilabel> page.
Click on <guibutton>Modify</guibutton> and change the trash folder location on the <guilabel>Advanced</guilabel> tab.</para>
</answer>
</qandaentry>
......@@ -62,11 +63,11 @@
</answer>
</qandaentry>
<qandaentry><question><para>How to filter spam on an &imap; server?</para></question>
<qandaentry><question><para>How to filter spam on an &IMAP; server?</para></question>
<!--FIXME replace this with a link to the sieve section?-->
<answer>
<para><emphasis>Symptom:</emphasis> You intend moving on to reading your mail from an &imap; server, and wonder how filtering and spam handling will occur?</para>
<para><emphasis>Solution:</emphasis> The machine that already has your mail can become your &imap; server. You will need to configure a server application. <guilabel>Dovecot</guilabel> is one such, and the guidance on the project web pages make it easy to set up. That still leaves you with the problem of filtering, as it makes sense to do it on the server (when you point &kmail; at the server you will see the folders that you have created on the server). Again there are options, but one of the best known is <guilabel>procmail</guilabel>. Again there is plenty of information on the Internet on how to set this up. You give it a set of <quote>recipes</quote> - here's an example:</para>
<para><emphasis>Symptom:</emphasis> You intend moving on to reading your mail from an &IMAP; server, and wonder how filtering and spam handling will occur?</para>
<para><emphasis>Solution:</emphasis> The machine that already has your mail can become your &IMAP; server. You will need to configure a server application. <guilabel>Dovecot</guilabel> is one such, and the guidance on the project web pages make it easy to set up. That still leaves you with the problem of filtering, as it makes sense to do it on the server (when you point &kmail; at the server you will see the folders that you have created on the server). Again there are options, but one of the best known is <guilabel>procmail</guilabel>. Again there is plenty of information on the Internet on how to set this up. You give it a set of <quote>recipes</quote> - here's an example:</para>
<para><screen><markup> :0
* (^To|^CC|^List-ID): .*kde-linux
${MAILDIR}.INBOX.KDE-Lists.kde-users/
......@@ -152,12 +153,12 @@ to export and import settings and data. Please see <ulink url="help:/pimsettinge
</qandaentry>
<qandaentry>
<question><para>Why are my filters not applied to incoming messages of &imap; accounts?</para></question>
<question><para>Why are my filters not applied to incoming messages of &IMAP; accounts?</para></question>
<answer>
<para>Normal &imap; mode does not support filtering, but the new
disconnected &imap; account type does. You could try to use server-side
<para>Normal &IMAP; mode does not support filtering, but the new
disconnected &IMAP; account type does. You could try to use server-side
filtering (ask your admin for how to install filters on the server and in
which format), since &imap; is all about managing your email <emphasis>on the server</emphasis>.
which format), since &IMAP; is all about managing your email <emphasis>on the server</emphasis>.
Unfortunately, although there exists a mail filter language (Sieve, defined
in RFC3028), there is no standardized access protocol for installing or
editing server-side Sieve scripts. If such a protocol becomes available in
......@@ -577,17 +578,17 @@ Is there any documentation on the available interfaces?</para></question>
<qandaentry>
<question><para>I am only using &imap;, can I get rid of those Local Folders in
<question><para>I am only using &IMAP;, can I get rid of those Local Folders in
the folder list or at least keep them collapsed all the time?</para></question>
<answer><para>No, you cannot get rid of them. The local folders function as a
fallback when the &imap; server is unreachable. Although you only use &imap;,
fallback when the &IMAP; server is unreachable. Although you only use &IMAP;,
&kmail; uses the outbox for sending the messages. If we hide all local folders
you will not be able to fix messages in the outbox which cannot be send for some
reason. But it is possible to keep the local folders collapsed. What
you have to do is go to <menuchoice><guimenu>Settings</guimenu><guimenuitem>
Configure &kmail;...</guimenuitem></menuchoice> and go to the section Misc,
there you can setup the folder on startup. If you change that to a folder on
the &imap; account, the Local Folders will stay collapsed when &kmail; starts.
the &IMAP; account, the Local Folders will stay collapsed when &kmail; starts.
</para></answer>
</qandaentry>
......
......@@ -3,36 +3,26 @@
<chapterinfo>
<authorgroup>
<author>
<firstname>Daniel</firstname>
<surname>Naber</surname>
<affiliation><address>
<email>daniel.naber@t-online.de</email>
</address></affiliation>
&Daniel.Naber;
&Daniel.Naber.mail;
</author>
<author>
<firstname>David</firstname>
<surname>Rugge</surname>
<affiliation><address>
<email>davidrugge@mediaone.net</email>
</address></affiliation>
&David.Rugge;
&David.Rugge.mail;
</author>
<author>
<firstname>Michel</firstname>
<surname>Boyer de la Giroday</surname>
<affiliation><address>
<email>michel@klaralvdalens-datakonsult.se</email>
</address></affiliation>
</author>
<author>
<firstname>Scarlett</firstname>
<surname>Clark</surname>
<affiliation><address>
&Scarlett.Clark;
&Scarlett.Clark.mail;
</address></affiliation>
</author>
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
<date>2017-04-18</date>
<releaseinfo>Applications 17.08</releaseinfo>
</chapterinfo>
......@@ -97,7 +87,7 @@ start working with it right away. For more in-depth information see the
<listitem>
<para>The <guilabel>Personal Settings</guilabel> screen will show if you had to enter your account type.
Verify that your information is correct on this page. Select <guilabel>Download all messages for offline use</guilabel>
if you want your messages available when you do not have an Internet connection (&imap; only).
if you want your messages available when you do not have an Internet connection (&IMAP; only).
Click the <guibutton>Next</guibutton> button once finished.</para>
</listitem>
<listitem>
......@@ -220,11 +210,11 @@ you like. <guilabel>Username</guilabel>, <guilabel>Password</guilabel>, and
<guilabel>Incoming mail server</guilabel> should be filled in with the appropriate information
from your <acronym>ISP</acronym> or system administrator. You should not
need to change the <guilabel>Port</guilabel> setting (the default for POP3 is
<userinput>110</userinput>, the default for <acronym>IMAP</acronym> is
<userinput>110</userinput>, the default for &IMAP; is
<userinput>143</userinput>).</para>
<sect3 id="receiving-mail-imap">
<title>Options only relevant to <acronym>IMAP</acronym></title>
<title>Options only relevant to &IMAP;</title>
<para>If you check <guilabel>Automatically compact folders</guilabel>
&kmail; removes the messages you deleted from the
......@@ -270,7 +260,7 @@ server. You should carefully test this to make sure it works safely.</para>
</sect3>
<sect3 id="receiving-mail-imap-pop3">
<title>Options for both <acronym>IMAP</acronym> and POP3</title>
<title>Options for both &IMAP; and POP3</title>
<para>&kmail; supports encryption via <guilabel>SSL/TLS</guilabel> and
<guilabel>STARTTLS</guilabel> (<guilabel>SSL/TLS</guilabel> should be preferred
if it is available).</para>
......@@ -294,14 +284,14 @@ if <guilabel>DIGEST-MD5</guilabel> is not available),</para></listitem>
options are only secure when used together with <guilabel>SSL</guilabel>
or <guilabel>TLS</guilabel>. You should only use <guilabel>Clear
text</guilabel> if your server does not support any of the other
authentication methods. Additionally, for <acronym>IMAP</acronym>
authentication methods. Additionally, for &IMAP;
<guilabel>Anonymous</guilabel> is supported, but <guilabel>APOP</guilabel>
is not. Use the <guibutton>Check what the server supports</guibutton> button
on the <guilabel>Security</guilabel> tab
to automatically select the most secure settings supported by your server.</para>
<para>You are now ready to send and receive mail. For
<acronym>IMAP</acronym>, just open your folders in the
&IMAP;, just open your folders in the
folder tree in &kmail;'s main window. &kmail; then connects to your
server and displays the messages it finds. For POP3 use
<menuchoice><guimenu>File</guimenu><guimenuitem>Check
......
......@@ -10,12 +10,10 @@
<!ENTITY kmail-credits-and-licenses SYSTEM "credits-and-licenses.docbook">
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE" > <!-- change language only here -->
<!ENTITY html "<acronym>HTML</acronym>">
<!ENTITY gpg "<application>GPG</application>">
<!ENTITY gpgsm "<application>GpgSM</application>">
<!ENTITY mdn "<acronym>MDN</acronym>">
<!ENTITY acl "<acronym>ACL</acronym>">
<!ENTITY imap "<acronym>IMAP</acronym>">
<!ENTITY nntp "<acronym>NNTP</acronym>">
<!ENTITY openpgp "<acronym>OpenPGP</acronym>">
<!ENTITY smime "<acronym>S/MIME</acronym>">
......@@ -33,7 +31,7 @@
-->
<!-- TODO:
*index (see kdegames/kpat/)
* index (see kdegames/kpat/)
* guisubmenu vs. guititem ??
* more about security?
......@@ -58,35 +56,23 @@
<authorgroup>
<author>
<firstname>Daniel</firstname>
<surname>Naber</surname>
<affiliation><address>
&Daniel.Naber;
&Daniel.Naber.mail;
</address></affiliation>
</author>
<author>
<firstname>David</firstname>
<surname>Rugge</surname>
<affiliation><address>
&David.Rugge;
&David.Rugge.mail;
</address></affiliation>
</author>
<author>
<firstname>Laurent</firstname>
<surname>Montel</surname>
<affiliation><address>
&Laurent.Montel;
&Laurent.Montel.mail;
</address></affiliation>
</author>
<author>
<firstname>Scarlett</firstname>
<surname>Clark</surname>
<affiliation><address>
&Scarlett.Clark;
&Scarlett.Clark.mail;
</address></affiliation>
</author>
......@@ -107,7 +93,7 @@
<copyright>
<year>2004</year>
<holder>&Daniel.Naber;</holder>
<holder>Ingo Kl&ouml;cker</holder>
<holder>&Ingo.Kloecker;</holder>
</copyright>
<copyright>
<year>2013</year>
......@@ -115,8 +101,8 @@
</copyright>
<legalnotice>&FDLNotice;</legalnotice>
<date>2013-06-26</date>
<releaseinfo>(&kde; 4.12)</releaseinfo>
<date>2020-08-14</date>
<releaseinfo>(&kde;5.14.3)</releaseinfo>
<abstract>
......@@ -138,7 +124,7 @@
</keywordset>
</bookinfo>
&kmail-intro; <!-- 4.7-->
&kmail-intro; <!-- 4.7-->
&kmail-getting-started; <!-- 4.7-->
&kmail-using-kmail; <!-- 4.11 -->
&kmail-configure; <!-- 4.11 -->
......
......@@ -3,18 +3,12 @@
<chapterinfo>
<authorgroup>
<author>
<firstname>Daniel</firstname>
<surname>Naber</surname>
<affiliation><address>
<email>daniel.naber@t-online.de</email>
</address></affiliation>
&Daniel.Naber;
&Daniel.Naber.mail;
</author>
<author>
<firstname>Scarlett</firstname>
<surname>Clark</surname>
<affiliation><address>
&Scarlett.Clark;
&Scarlett.Clark.mail;
</address></affiliation>
</author>
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
......@@ -65,7 +59,7 @@ options in <link linkend="import-restore">Restore and Import in &kmail;</link>.<
</listitem>
<listitem>
<para>Organize your folders with ease using &kmail;s extensive <link linkend="folders">Folders</link> options.
Some of the features include handling per folder: mailing lists, acl (&imap; only), and archiving.</para>
Some of the features include handling per folder: mailing lists, acl (&IMAP; only), and archiving.</para>
</listitem>
<listitem>
<para>Compliment your folder setup with highly configurable <link linkend="filters">filters</link>.</para>
......
......@@ -3,43 +3,30 @@
<chapterinfo>
<authorgroup>
<author>
<firstname>Daniel</firstname>
<surname>Naber</surname>
<affiliation><address>
&Daniel.Naber;
&Daniel.Naber.mail;
</address></affiliation>
</author>
<author>
<firstname>David</firstname>
<surname>Rugge</surname>
<affiliation><address>
&David.Rugge;
&David.Rugge.mail;
</address></affiliation>
</author>
<author>
<firstname>Michel</firstname>
<surname>Boyer de la Giroday</surname>
<affiliation><address>
<email>michel@klaralvdalens-datakonsult.se</email>
</address></affiliation>
</author>
<author>
<firstname>Laurent</firstname>
<surname>Montel</surname>
<affiliation><address>
&Laurent.Montel;
&Laurent.Montel.mail;
</address></affiliation>
</author>
<author>
<firstname>Scarlett</firstname>
<surname>Clark</surname>
<affiliation><address>
&Scarlett.Clark;
&Scarlett.Clark.mail;
</address></affiliation>
</author>
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
<date>2013-11-25</date>
<releaseinfo>&kde; 4.11</releaseinfo>
</chapterinfo>
......@@ -161,7 +148,7 @@ performs a menu item function, the default shortcut is listed with the menu item
<guimenu>File</guimenu>
<guimenuitem>Empty All Trash Folders</guimenuitem>
</menuchoice></term>
<listitem><para><action>Use this to empty all trash folders,</action> &ie; the local trash folder and all trash folders that you might have on &imap; servers.</para></listitem>
<listitem><para><action>Use this to empty all trash folders,</action> &ie; the local trash folder and all trash folders that you might have on &IMAP; servers.</para></listitem>
</varlistentry>
<varlistentry id="reader-work-offline">
<term><menuchoice>
......@@ -199,7 +186,7 @@ which needs to be selected to go back online (required to send and receive).</pa
<guimenuitem>Update Folder</guimenuitem>
</menuchoice></term>
<listitem><para><action>Checks whether new mail arrived in the currently selected folder.</action></para>
<note><para> This is only available for &imap; folders.</para></note></listitem>
<note><para> This is only available for &IMAP; folders.</para></note></listitem>
</varlistentry>
<varlistentry id="reader-update-this-folder-and-all-subfolders">
<term><menuchoice>
......@@ -211,7 +198,7 @@ which needs to be selected to go back online (required to send and receive).</pa
</menuchoice></term>
<listitem><para><action>Checks whether new mail arrived in the currently selected folder and all of its subfolders.</action></para>
<para>You can also select multiple folders and the menu item will turn into <menuchoice><guimenu>File</guimenu><guimenuitem>Update These Folders and All Their Subfolders</guimenuitem></menuchoice></para>
<note><para> This is only available for &imap; folders.</para></note></listitem>
<note><para> This is only available for &IMAP; folders.</para></note></listitem>
</varlistentry>
<varlistentry id="reader-send-queued-messages">
<term><menuchoice>
......@@ -600,7 +587,7 @@ servers have been used to send the message by looking at the <literal>Received:<
<guimenuitem>Update Folder</guimenuitem>
</menuchoice></term>
<listitem><para><action>Checks whether new mail arrived in the currently selected folder.</action></para>
<note><para>This is only available for &imap; folders.</para></note></listitem>
<note><para>This is only available for &IMAP; folders.</para></note></listitem>
</varlistentry>
<varlistentry id="reader-folder-update-folder-and-all-its-subfolders">
<term><menuchoice>
......@@ -611,7 +598,7 @@ servers have been used to send the message by looking at the <literal>Received:<
<guimenuitem>Update Folder and All Its Subfolders</guimenuitem>
</menuchoice></term>
<listitem><para><action>Checks whether new mail arrived in the currently selected folder and all of its subfolders.</action></para>
<note><para>This is only available for &imap; folders.</para></note></listitem>
<note><para>This is only available for &IMAP; folders.</para></note></listitem>
</varlistentry>
<varlistentry id="reader-folder-move-all-messages-to-trash">
<term><menuchoice>
......@@ -670,7 +657,7 @@ Please see next section for details.</para></note></listitem>
<guimenu>Folder</guimenu>
<guimenuitem>Prefer HTML to Plain Text</guimenuitem>
</menuchoice></term>
<listitem><para><action>If enabled then &html; messages in this folder will be shown using &html; rendering.</action></para>
<listitem><para><action>If enabled then &HTML; messages in this folder will be shown using &HTML; rendering.</action></para>
<warning><para>For security reasons, we recommend to only activate this for folders which only contain trusted messages.</para></warning></listitem>
</varlistentry>
<varlistentry id="reader-folder-load-external-references">
......@@ -678,7 +665,7 @@ Please see next section for details.</para></note></listitem>
<guimenu>Folder</guimenu>
<guimenuitem>Load External References</guimenuitem>
</menuchoice></term>
<listitem><para>If you have &html; messages enabled (see above), then you have the option to enable this to have <action>images and resources linked from the web will load automatically.</action></para>
<listitem><para>If you have &HTML; messages enabled (see above), then you have the option to enable this to have <action>images and resources linked from the web will load automatically.</action></para>
<warning><para>For security reasons, we recommend to only activate this for folders which only contain trusted messages.</para></warning></listitem>
</varlistentry>
<varlistentry id="reader-folder-mailing-list-management">
......@@ -1110,7 +1097,7 @@ Please see next section for details.</para></note></listitem>
<guisubmenu>Edit "Out of Office" Replies...</guisubmenu>
</menuchoice></term>
<listitem><para><action>Launch the <guilabel>Configure "Out of Office" Replies</guilabel> dialog,</action> which allows you to set-up vacation notifications.</para>
<note><para><guilabel>Out of Office reply</guilabel> functionality relies on server-side filtering. To be able to use it you need to configure the <link linkend="receiving-mail">Filtering tab</link> (see option relevant to kolab server) of your &imap; account set-up.</para></note></listitem>
<note><para><guilabel>Out of Office reply</guilabel> functionality relies on server-side filtering. To be able to use it you need to configure the <link linkend="receiving-mail">Filtering tab</link> (see option relevant to kolab server) of your &IMAP; account set-up.</para></note></listitem>
</varlistentry>
<varlistentry id="reader-tools-debug-sieve">
<term><menuchoice>
......@@ -1576,7 +1563,7 @@ Cryptographic Message Formats</link> for more information.</para></listitem>
<guimenu>Options</guimenu>
<guisubmenu>Rich Text Editing</guisubmenu>
</menuchoice></term>
<listitem><para>Enables Rich Text/&html; editing.</para></listitem>
<listitem><para>Enables Rich Text/&HTML; editing.</para></listitem>
</varlistentry>
<varlistentry id="composer-options-encoding">
<term><menuchoice>
......
......@@ -37,7 +37,7 @@ Online=true</screen>
</para>
</sect1>
<sect1 id="clean-start-after-a-failed-migration"><title>Clean start after a failed migration</title>
<para>In case migration from &kmail; 1 to &kmail; 2 fails or you have weird problems after it, you can try to do a clean import of your data, instead of migrating the existing settings. Be warned, this needs more manual setup, so do only if you are confident of setting up your &kmail; accounts again; it can generate a large amount of network traffic for &imap; resources.
<para>In case migration from &kmail; 1 to &kmail; 2 fails or you have weird problems after it, you can try to do a clean import of your data, instead of migrating the existing settings. Be warned, this needs more manual setup, so do only if you are confident of setting up your &kmail; accounts again; it can generate a large amount of network traffic for &IMAP; resources.
</para>
<orderedlist>
<listitem><para>Stop Akonadi and related applications</para>
......@@ -85,7 +85,7 @@ Online=true</screen>
</para>
<para>In &kmail;: <menuchoice><guimenu>Settings</guimenu><guisubmenu>Configure KMail</guisubmenu><guimenuitem>Accounts</guimenuitem></menuchoice> and use <guilabel>Add</guilabel>.
</para>
<para>If you use &imap;, add a new <guimenuitem>&imap; E-Mail server</guimenuitem>. If you want disconnected mode (so you can read the mails offline), enable it on the <guilabel>Advanced</guilabel> tab. Be sure to check that you are subscribed to all your important folders.
<para>If you use &IMAP;, add a new <guimenuitem>&IMAP; E-Mail server</guimenuitem>. If you want disconnected mode (so you ca