[pim/kmail] doc/kmail2: Updating Chapter 4 of Kmail documentation -- configuration dialogs. New "Plugins" page is still incomplete.
Sandro Knauß
null at kde.org
Wed Feb 10 23:08:08 GMT 2021
Git commit 9e4f777fc39ebe0da16cbb7e01d31dd2fbd3a2d2 by Sandro Knauß, on behalf of David Bryant.
Committed on 10/02/2021 at 19:17.
Pushed by davidbryant into branch 'master'.
Updating Chapter 4 of Kmail documentation -- configuration dialogs. New "Plugins" page is still incomplete.
A +- -- doc/kmail2/accounts-ldap.png
A +- -- doc/kmail2/accounts-receiving.png
A +- -- doc/kmail2/accounts-sending.png
D +- -- doc/kmail2/aggregationtheme.png
A +- -- doc/kmail2/appearancecolors.png
A +- -- doc/kmail2/appearancefonts.png
A +- -- doc/kmail2/appearancegeneral.png
A +- -- doc/kmail2/appearancelayout.png
A +- -- doc/kmail2/appearancelist.png
A +- -- doc/kmail2/appearancetags.png
A +- -- doc/kmail2/composerattach.png
A +- -- doc/kmail2/composercharset.png
A +- -- doc/kmail2/composercorrect.png
A +- -- doc/kmail2/composercustom.png
A +- -- doc/kmail2/composergeneral.png
A +- -- doc/kmail2/composerheaders.png
A +- -- doc/kmail2/composerresize.png
A +- -- doc/kmail2/composerstandard.png
A +- -- doc/kmail2/composersubject.png
M +2130 -1056 doc/kmail2/configure.docbook
A +- -- doc/kmail2/dialog-cancel.png
A +- -- doc/kmail2/dialog-ok-apply.png
A +- -- doc/kmail2/edit-undo.png
M +- -- doc/kmail2/identitypicture.png
M +- -- doc/kmail2/mail-mark-unread.png
D +- -- doc/kmail2/messagelisttheme.png
A +- -- doc/kmail2/miscfolders.png
A +- -- doc/kmail2/miscinvite.png
A +- -- doc/kmail2/miscprint.png
A +- -- doc/kmail2/securitycomposing.png
A +- -- doc/kmail2/securitymdn.png
A +- -- doc/kmail2/securitymisc.png
A +- -- doc/kmail2/securityreading.png
A +- -- doc/kmail2/securitysmime.png
A +- -- doc/kmail2/system-help.png
https://invent.kde.org/pim/kmail/commit/9e4f777fc39ebe0da16cbb7e01d31dd2fbd3a2d2
diff --git a/doc/kmail2/accounts-ldap.png b/doc/kmail2/accounts-ldap.png
new file mode 100644
index 000000000..04197129e
Binary files /dev/null and b/doc/kmail2/accounts-ldap.png differ
diff --git a/doc/kmail2/accounts-receiving.png b/doc/kmail2/accounts-receiving.png
new file mode 100644
index 000000000..ef9622855
Binary files /dev/null and b/doc/kmail2/accounts-receiving.png differ
diff --git a/doc/kmail2/accounts-sending.png b/doc/kmail2/accounts-sending.png
new file mode 100644
index 000000000..3040c1a8e
Binary files /dev/null and b/doc/kmail2/accounts-sending.png differ
diff --git a/doc/kmail2/aggregationtheme.png b/doc/kmail2/aggregationtheme.png
deleted file mode 100644
index c118c4172..000000000
Binary files a/doc/kmail2/aggregationtheme.png and /dev/null differ
diff --git a/doc/kmail2/appearancecolors.png b/doc/kmail2/appearancecolors.png
new file mode 100644
index 000000000..49e2924a3
Binary files /dev/null and b/doc/kmail2/appearancecolors.png differ
diff --git a/doc/kmail2/appearancefonts.png b/doc/kmail2/appearancefonts.png
new file mode 100644
index 000000000..ff82d669e
Binary files /dev/null and b/doc/kmail2/appearancefonts.png differ
diff --git a/doc/kmail2/appearancegeneral.png b/doc/kmail2/appearancegeneral.png
new file mode 100644
index 000000000..59997ac10
Binary files /dev/null and b/doc/kmail2/appearancegeneral.png differ
diff --git a/doc/kmail2/appearancelayout.png b/doc/kmail2/appearancelayout.png
new file mode 100644
index 000000000..ac06d2ec9
Binary files /dev/null and b/doc/kmail2/appearancelayout.png differ
diff --git a/doc/kmail2/appearancelist.png b/doc/kmail2/appearancelist.png
new file mode 100644
index 000000000..9ecc36b8c
Binary files /dev/null and b/doc/kmail2/appearancelist.png differ
diff --git a/doc/kmail2/appearancetags.png b/doc/kmail2/appearancetags.png
new file mode 100644
index 000000000..eb4297264
Binary files /dev/null and b/doc/kmail2/appearancetags.png differ
diff --git a/doc/kmail2/composerattach.png b/doc/kmail2/composerattach.png
new file mode 100644
index 000000000..0b67667cc
Binary files /dev/null and b/doc/kmail2/composerattach.png differ
diff --git a/doc/kmail2/composercharset.png b/doc/kmail2/composercharset.png
new file mode 100644
index 000000000..47bcd0393
Binary files /dev/null and b/doc/kmail2/composercharset.png differ
diff --git a/doc/kmail2/composercorrect.png b/doc/kmail2/composercorrect.png
new file mode 100644
index 000000000..abfe20429
Binary files /dev/null and b/doc/kmail2/composercorrect.png differ
diff --git a/doc/kmail2/composercustom.png b/doc/kmail2/composercustom.png
new file mode 100644
index 000000000..11f1cd796
Binary files /dev/null and b/doc/kmail2/composercustom.png differ
diff --git a/doc/kmail2/composergeneral.png b/doc/kmail2/composergeneral.png
new file mode 100644
index 000000000..825c0a8b7
Binary files /dev/null and b/doc/kmail2/composergeneral.png differ
diff --git a/doc/kmail2/composerheaders.png b/doc/kmail2/composerheaders.png
new file mode 100644
index 000000000..465f14e88
Binary files /dev/null and b/doc/kmail2/composerheaders.png differ
diff --git a/doc/kmail2/composerresize.png b/doc/kmail2/composerresize.png
new file mode 100644
index 000000000..854a47db4
Binary files /dev/null and b/doc/kmail2/composerresize.png differ
diff --git a/doc/kmail2/composerstandard.png b/doc/kmail2/composerstandard.png
new file mode 100644
index 000000000..c5c4caa05
Binary files /dev/null and b/doc/kmail2/composerstandard.png differ
diff --git a/doc/kmail2/composersubject.png b/doc/kmail2/composersubject.png
new file mode 100644
index 000000000..8e8ab4cc4
Binary files /dev/null and b/doc/kmail2/composersubject.png differ
diff --git a/doc/kmail2/configure.docbook b/doc/kmail2/configure.docbook
index ccc9e2fe4..9a1f112c6 100644
--- a/doc/kmail2/configure.docbook
+++ b/doc/kmail2/configure.docbook
@@ -2,36 +2,39 @@
<chapterinfo>
<authorgroup>
-<author>
-&Daniel.Naber;
-&Daniel.Naber.mail;
-</author>
-<author>
-&David.Rugge;
-&David.Rugge.mail;
-</author>
-<author>
-&Marc.Mutz;
-&Marc.Mutz.mail;
-</author>
-<author>
-<firstname>Michel</firstname>
-<surname>Boyer de la Giroday</surname>
-<email>michel at kdab.net</email>
-</author>
-<author>
-&Laurent.Montel;
-&Laurent.Montel.mail;
-</author>
-<author>
-&Scarlett.Clark;
-&Scarlett.Clark.mail;
-</author>
+ <author>
+ &Daniel.Naber;
+ &Daniel.Naber.mail;
+ </author>
+ <author>
+ &David.Rugge;
+ &David.Rugge.mail;
+ </author>
+ <author>
+ &Marc.Mutz;
+ &Marc.Mutz.mail;
+ </author>
+ <author>
+ &Michel.Boyer;
+ &Michel.Boyer.mail;
+ </author>
+ <author>
+ &Laurent.Montel;
+ &Laurent.Montel.mail;
+ </author>
+ <author>
+ &Scarlett.Clark;
+ &Scarlett.Clark.mail;
+ </author>
+ <author>
+ &David.Bryant;
+ &David.Bryant.mail;
+ </author>
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
-<date>2013-12-18</date>
-<releaseinfo>(&kde; 4.12)</releaseinfo>
+<date>2020-11-03</date>
+<releaseinfo>5.14.2 (Applications 20.04.2)</releaseinfo>
</chapterinfo>
<title>Configure &kmail;</title>
@@ -49,73 +52,100 @@
<phrase>Configure &kmail; Dialog</phrase>
</textobject>
<caption>
- <para>Configure &kmail; Dialog</para>
+ <para>The Configure &kmail; Dialog</para>
</caption>
</mediaobject>
</screenshot>
-<para>&kmail;'s configuration window enables you to configure &kmail;
-in many ways. You can reach it via
-<menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure
+<para> </para><!-- add whitespace -->
+<para>&kmail;'s configuration window lets you configure &kmail;.
+You can reach it via
+<menuchoice><guimenu>Settings</guimenu><guimenuitem><inlinemediaobject>
+<imageobject><imagedata fileref="configurebutton.png" format="PNG"/>
+</imageobject></inlinemediaobject> Configure
&kmail;...</guimenuitem></menuchoice></para>
-<para>The dialog has several buttons:</para>
+<para>The dialog has several buttons across the bottom.</para>
<variablelist>
<varlistentry>
-<term><guibutton>Help</guibutton></term>
-<listitem><para>This will open this manual at the appropriate page.</para></listitem>
+<term><guibutton><inlinemediaobject><imageobject><imagedata fileref="system-help.png"
+format="PNG"/></imageobject></inlinemediaobject> Help</guibutton></term>
+<listitem><para>This will open The &kmail; Handbook (this manual) at the appropriate page.</para></listitem>
</varlistentry>
+
<varlistentry>
-<term><guibutton>Defaults</guibutton></term>
-<listitem><para>This will reset the configuration options on the current
-page back to the default values.</para></listitem>
+<term><guibutton><inlinemediaobject><imageobject><imagedata fileref="edit-undo.png"
+format="PNG"/></imageobject></inlinemediaobject> Reset</guibutton></term>
+<listitem><para>This resets all the changes you have made since you last saved
+the settings.</para></listitem>
</varlistentry>
<varlistentry>
-<term><guibutton>Reset</guibutton></term>
-<listitem><para>This resets all changes you have made since you last saved
-the settings.</para></listitem>
+<term><guibutton>Defaults</guibutton></term>
+<listitem><para>This will reset the configuration options on the current
+page to the default values.</para></listitem>
</varlistentry>
+
<varlistentry>
-<term><guibutton>OK</guibutton></term>
+<term><guibutton><inlinemediaobject><imageobject><imagedata fileref="dialog-ok-apply.png"
+format="PNG"/></imageobject></inlinemediaobject> OK</guibutton></term>
<listitem><para>This saves the settings and closes the configuration dialog.</para></listitem>
</varlistentry>
+
<varlistentry>
-<term><guibutton>Apply</guibutton></term>
+<term><guibutton><inlinemediaobject><imageobject><imagedata fileref="dialog-ok-apply.png"
+format="PNG"/></imageobject></inlinemediaobject> Apply</guibutton></term>
<listitem><para>This saves the settings without closing the configuration
dialog.</para></listitem>
</varlistentry>
+
<varlistentry>
-<term><guibutton>Cancel</guibutton></term>
+<term><guibutton><inlinemediaobject><imageobject><imagedata fileref="dialog-cancel.png"
+format="PNG"/></imageobject></inlinemediaobject> Cancel</guibutton></term>
<listitem><para>This closes the configuration dialog without saving the
changes you have made.</para></listitem>
</varlistentry>
</variablelist>
-<para>The configuration pages are divided into six pages, each of them represented by one of the
-icons in the list on the left hand side of the dialog. The pages will be described in detail below.</para>
+
+<para>
+ The configuration dialog is divided into six subsets, each of them represented by one of the
+ icons in the list on the left. These subsets are described in detail below.
+</para>
</sect1>
<sect1 id="configure-identity">
-<title>Identities Page</title>
+<title>Accounts Page</title>
+
+<para>The <guilabel>Accounts</guilabel> page is automatically presented
+when <menuchoice><guimenu>Settings</guimenu><guimenuitem><inlinemediaobject>
+<imageobject><imagedata fileref="configurebutton.png" format="PNG"/>
+</imageobject></inlinemediaobject> Configure &kmail;...</guimenuitem></menuchoice>
+is selected. There are four tabs: <guilabel>Identities</guilabel>,
+<guilabel>Receiving</guilabel>, <guilabel>Sending</guilabel>, and <guilabel>LDAP
+server</guilabel>. (The <guilabel>Identities</guilabel> tab is illustrated in
+the <link linkend="configure-generalinfo">Configure &kmail;</link> section above.)</para>
+<para> </para><!-- add whitespace -->
+<sect2 id="configure-identities-tab">
+<title>Identities Tab</title>
<para>You can find a quick introduction to the
-<guilabel>Identities</guilabel> page in the <link
+<guilabel>Identities</guilabel> tab in the <link
linkend="getting-started">Getting Started</link> section.</para>
<para>This page allows you to create one or more
-<emphasis>Identities</emphasis>, &ie; combinations of name, email
-address and other settings. For example, you can create one identity
-for business communication and one for
-personal communication. If you have more than one email
-address, you can create one identity per address. You will then be
-able to select an identity on a per-message basis.</para>
-
-<para>The page consists of a list of identities and buttons to manage
-them. The identities list will always show at
+<emphasis>Identities</emphasis>, &ie;, combinations of a name, an email
+address, and some other settings. For example, you can create one identity
+for business communication and another for
+personal use. If you have more than one email
+address, you can create one identity for each address. You will then be
+able to select a suitable identity whenever you compose a new message.</para>
+
+<para>This dialog consists of a list of identities, plus buttons to manage
+them. After initial setup, the list will always show at
least one identity, which is then the <guilabel>Default</guilabel>
-identity.</para>
-
-<para>To add a new identity to the identity list, click on the
+identity. To add a new identity to the identity list, click on the
<guibutton>Add...</guibutton> button.</para>
+<para> </para><!-- add whitespace -->
+</sect2>
<sect2 id="configure-identity-newidentitydialog">
<title>The New Identity Dialog</title>
@@ -123,30 +153,30 @@ identity.</para>
<screeninfo>New Identity Dialog</screeninfo>
<mediaobject>
<imageobject>
- <imagedata fileref="identity.png" format="PNG"/>
+ <imagedata fileref="newidentity.png" format="PNG"/>
</imageobject>
<textobject>
<phrase>New Identity Dialog</phrase>
</textobject>
<caption>
- <para>New Identity Dialog</para>
+ <para>The New Identity Dialog</para>
</caption>
</mediaobject>
</screenshot>
-<para>You have to enter the name of the new identity into the
-<guilabel>New Identity</guilabel> edit field. This will be the name
-shown in the identity list.</para>
+<para> </para><!-- add whitespace -->
+<para>Enter a name for the new identity in the
+<guilabel>New Identity</guilabel> edit field. This name
+will be shown in the identity list.</para>
-<para>You can choose how the new identity should be initialized by
-checking one of the three radio buttons in the middle of the
-dialog:</para>
+<para>You can choose how the new identity is initialized by
+checking one of three radio buttons.</para>
<variablelist>
<varlistentry>
<term><guilabel>With empty fields</guilabel></term>
<listitem>
-<para>All fields of the new identity are cleared or preset with
+<para>All fields of the new identity will be cleared, or preset with
standard values.</para>
</listitem>
</varlistentry>
@@ -154,23 +184,21 @@ standard values.</para>
<varlistentry>
<term><guilabel>Use System Settings values</guilabel></term>
<listitem>
-<para>Uses the values from <menuchoice><guimenu>Account Details</guimenu>
-<guimenuitem>Password & User Account</guimenuitem></menuchoice> in the
-&systemsettings; category <guilabel>Common Appearance and Behavior</guilabel>.</para>
+<para>Uses the values from your default identity.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><guilabel>Duplicate existing identity</guilabel></term>
<listitem>
-<para>Copies all fields from an existing identity. You can
+<para>Copies all fields from an existing identity. You may
choose which identity to copy from by selecting the corresponding
entry in the <guilabel>Existing identities</guilabel> drop down box.</para>
</listitem>
</varlistentry>
</variablelist>
-
+<para> </para><!-- add whitespace -->
</sect2>
<sect2 id="configure-identity-general">
@@ -189,6 +217,7 @@ entry in the <guilabel>Existing identities</guilabel> drop down box.</para>
</caption>
</mediaobject>
</screenshot>
+<para> </para><!-- add whitespace -->
<para>The <guilabel>General</guilabel> tab allows you to specify some
basic settings for the currently selected identity.</para>
@@ -197,8 +226,7 @@ basic settings for the currently selected identity.</para>
<term><guilabel>Your name</guilabel></term>
<listitem>
<para>Enter your full name here (sometimes also called <emphasis>display name</emphasis>).
-Although this field is not strictly mandatory, it is recommended to enter
-the correct value here.</para>
+Although this field is not mandatory, you should enter your name here.</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -210,7 +238,7 @@ the correct value here.</para>
<varlistentry>
<term><guilabel>Email address</guilabel></term>
<listitem>
-<para>Enter your email address here, &ie; something like
+<para>Enter your email address here, &ie;, something like
<userinput>joe at example.com</userinput>.</para>
<example>
<title>Email address</title>
@@ -224,9 +252,11 @@ address</guilabel> field.</para></example>
<varlistentry>
<term><guilabel>Email aliases</guilabel></term>
<listitem>
-<para>This field contains alias addresses that should also be
-considered as belonging to this identity (as opposed to representing
-a different identity).</para>
+<para>This field contains alias addresses that also
+belong to this identity (as opposed to representing
+a different identity). You may define multiple aliases. To add another
+alias. enter an email address in the <guilabel>Email aliases:</guilabel>
+field, then click the <guibutton>+ Add</guibutton> button</para>
<example>
<title>Email aliases</title>
<para>Primary address: first.last at example.org</para>
@@ -235,7 +265,7 @@ a different identity).</para>
</listitem>
</varlistentry>
</variablelist>
-
+<para> </para><!-- add whitespace -->
</sect2>
<sect2 id="configure-identity-cryptography">
@@ -254,42 +284,64 @@ a different identity).</para>
</caption>
</mediaobject>
</screenshot>
-<para>The <guilabel>Cryptography</guilabel> tab allows you to specify &openpgp; and &smime; keys associated with this identity,
- as well as choosing the preferred (cryptographic) message format to use.</para>
-<variablelist>
+<para> </para><!-- add whitespace -->
+<para>The <guilabel>Cryptography</guilabel> tab allows you to specify the &openpgp; and/or &smime; keys associated with this identity,
+ and to choose the preferred (cryptographic) message format to use.</para>
+
+ <variablelist>
<varlistentry id="configure-identity-cryptography-openpgp-sign">
-<term><guilabel>OpenPGP signing key</guilabel></term>
+<term><guilabel>OpenPGP signing key:</guilabel></term>
<listitem>
-<para>Here you can select the key to be used when &openpgp;-signing messages written with this identity in effect.</para>
-<para>For brevity, only the short key id of selected keys is shown. Hovering with the mouse over the key list will show more information in a tooltip.</para>
-<para>To clear the label press the <guibutton>Clear</guibutton> button. To change the selected key, press the <guibutton>Change...</guibutton> button. A dialog
-listing all configured secret &openpgp; keys will be shown allowing you to select the one to use. If you do not have key configured yet, click the <guibutton>Start
-Certificate Manager</guibutton> to open &kleopatra;. See <ulink url="help:kleopatra">&kleopatra;</ulink> for information on using &kleopatra; to create and manage openpgp
-keys and certificates. Listed below is a brief description of the chosen key/certificate uses.</para>
+<para>Here you may select an &openpgp; key for signing messages written with this identity in effect.
+For brevity, only the short key id of selected keys is shown. Hovering over the item will display more information in a tooltip.
+To select an existing key, use the drop down list. If you wish to create a new public / private key pair, select
+<guilabel>Generate a new key pair</guilabel>.</para>
</listitem></varlistentry>
+
<varlistentry id="configure-identity-cryptography-openpgp-encrypt">
-<term><guilabel>OpenPGP encryption key</guilabel></term>
-<listitem><para>Here you can select the key to &openpgp;-encrypt messages to when this identity and <xref linkend="configure-security-composing-encrypt-to-self"/>
- are in effect. This key is also used for the <xref linkend="composer-attach-attach-my-public-key"/> function of the <link linkend="the-composer-window">Composer</link>.</para>
+<term><guilabel>OpenPGP encryption key:</guilabel></term>
+<listitem><para>Here you may select an &openpgp; key for encrypting messages when this identity and
+<xref linkend="configure-security-composing-encrypt-to-self"/> are in effect. This key is also used for
+the <xref linkend="composer-attach-attach-my-public-key"/> function.</para>
</listitem></varlistentry>
+
<varlistentry id="configure-identity-cryptography-smime-sign">
-<term><guilabel>&smime; signing certificate</guilabel></term>
+<term><guilabel>&smime; signing certificate:</guilabel></term>
<listitem>
-<para>Here you can select the certificate to be used when &smime;-signing messages written with this identity in effect.</para>
+<para>Here you may select an x.509 certificate used to sign messages written with this identity in effect.
+&kmail; cannot generate x.509 certificates. They are issued by certificate authorities. If you have added
+such a certificate to your key ring, &kmail; can import and use it.</para>
</listitem></varlistentry>
+
<varlistentry id="configure-identity-cryptography-smime-encrypt">
-<term><guilabel>&smime; encryption certificate</guilabel></term>
+<term><guilabel>&smime; encryption certificate:</guilabel></term>
<listitem>
-<para>Here you can select the certificate to &smime;-encrypt messages when this identity and <xref linkend="configure-security-composing-encrypt-to-self"/> are in effect.</para>
+<para>Here you may select an x.509 certificate for encrypting messages when this identity and
+<xref linkend="configure-security-composing-encrypt-to-self"/> are in effect.</para>
</listitem></varlistentry>
+
<varlistentry id="configure-identity-cryptography-preferred-format">
-<term><guilabel>Preferred format</guilabel></term>
+<term><guilabel>Preferred format:</guilabel></term>
<listitem>
-<para>Here you can choose which cryptographic message format to use by default with this identity. You can either select any of the four formats supported
- by &kmail; or leave the option at the recommended default setting of <guilabel>Any</guilabel>, which will choose a suitable format based on the recipients
- of the message, or might even go so far as to create two copies of the message, one &smime; signed and/or encrypted, the other &openpgp; signed and/or encrypted.</para>
+<para>Here you can choose the default cryptographic message format to use with this identity. You may either select one of the four formats supported
+by &kmail;, or leave the option at the recommended default setting of <guilabel>Any</guilabel>; this will choose the right format for each recipient
+you specify, and may create multiple copies of the message, some signed and/or encrypted with an x.509 certificate,
+and the others signed and/or encrypted with an &openpgp; key.</para>
</listitem></varlistentry>
+
+<varlistentry>
+<term><guilabel>Automatically sign messages:</guilabel></term>
+<listitem><para>Checking this box causes &kmail; to affix your digital signature to messages composed by this identity unless this option
+is manually overridden in the <guilabel>Composer</guilabel> window.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><guilabel>Automatically encrypt messages:</guilabel></term>
+<listitem><para>Checking this box causes &kmail; to encrypt messages composed by this identity whenever such encryption is possible
+(unless overridden in the <guilabel>Composer</guilabel> window).</para></listitem>
+</varlistentry>
</variablelist>
+<para> </para><!-- add whitespace -->
</sect2>
<sect2 id="configure-identity-advanced">
@@ -309,53 +361,65 @@ keys and certificates. Listed below is a brief description of the chosen key/cer
</caption>
</mediaobject>
</screenshot>
+<para> </para><!-- add whitespace -->
<para>The <guilabel>Advanced</guilabel> tab allows you to specify some
-rarely used or otherwise specialized settings for the currently
-selected identity.</para>
+infrequently used settings for the identity you're currently editing.</para>
+
<variablelist>
<varlistentry>
-<term><guilabel>Reply-To address</guilabel></term>
+<term><guilabel>Reply-To address:</guilabel></term>
<listitem>
<para>Enter the address to which replies to your messages should be
-sent. Only fill out this field if it is different from your normal
+sent. You need this field only if it is different from your normal
address (specified using the <guilabel>Name</guilabel> and
-<guilabel>Email Address</guilabel> on the <link
+<guilabel>Email Address</guilabel> fields on the <link
linkend="configure-identity-general"><guilabel>General</guilabel>
tab</link>), since replies default to the sender's address
anyway.</para>
-<para>This field is only useful if you want replies to your mail
-to go somewhere else than your regular email address, ⪚ if you are
+<para>This field is useful if you want replies to your mail
+to go somewhere else than your regular email address, ⪚, if you are
using this identity to send messages from an email address that cannot
-receive messages.</para>
-<note><para>Note that some mailing lists overwrite this header field with their post address to
-make sure that replies go to the list instead of individuals. So the usefulness of this field is very limited and it should only be used in
-rare cases.</para></note>
+receive replies.</para>
+<note><para>Some mailing lists overwrite this header field with their post address (to
+ensure that replies go to the list instead of to individuals). So the reliability of this
+field is limited, and it should be used with caution.</para></note>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term><guilabel>CC addresses:</guilabel></term>
+<listitem>
+<para>Optionally enter one or more addresses, separated by commas, to which carbon copies of your messages
+should be sent. When you compose a message with this identity, the <guilabel>CC</guilabel>
+field will be filled with these addresses.</para>
</listitem>
</varlistentry>
<varlistentry>
-<term><guilabel>BCC addresses</guilabel></term>
+<term><guilabel>BCC addresses:</guilabel></term>
<listitem>
-<para>Optionally enter addresses separated by a comma to which blind copies of your messages
-should be sent to. When you compose a message with this identity, the <guilabel>BCC</guilabel>
-field is filled with these addresses. If you want to send a BCC regardless
-of this setting, you should look at the <guilabel>Headers</guilabel> tab of the
-<guilabel>Composer</guilabel> page.</para>
+<para>Optionally enter addresses, separated by commas, to which blind copies of your messages
+should be sent. When you compose a message with this identity, the <guilabel>BCC</guilabel>
+field will be filled with these addresses. If you want to send a BCC to the same address for
+every identity you define, see the <link linkend="configure-composer-headers"><guilabel>Headers</guilabel>
+tab of the <guilabel>Composer</guilabel> subset</link> (create a custom BCC header).</para>
</listitem>
</varlistentry>
+
<varlistentry>
-<term><guilabel>Dictionary</guilabel></term>
+<term><guilabel>Dictionary:</guilabel></term>
<listitem>
-<para>Select the default dictionary for current identity.</para>
+<para>Select the default dictionary for the current identity.</para>
</listitem>
</varlistentry>
+
<varlistentry>
-<term><guilabel>Sent-mail folder</guilabel></term>
+<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
+<para>Select the folder in which messages should be saved after sending
+them from 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
+stored in a local folder. Then they can access sent messages from a
different location.</para>
<tip><para>You can exercise more fine-grained control over where to
file sent messages by creating a corresponding <link
@@ -365,28 +429,30 @@ messages.</para></tip>
</varlistentry>
<varlistentry>
-<term><guilabel>Drafts folder</guilabel></term>
+<term><guilabel>Drafts folder:</guilabel></term>
<listitem>
-<para>Select the folder into which drafts should be filed when using
+<para>Select the folder in which drafts should be saved 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
-stored in a local folder. This way they can easily continue to work
-on their drafts at a different location.</para>
+stored in a local folder. That way they can easily continue to work
+on their drafts from a different location.</para>
</listitem>
</varlistentry>
<varlistentry>
-<term><guilabel>Templates folder</guilabel></term>
+<term><guilabel>Templates folder:</guilabel></term>
<listitem>
-<para>Select the folder into which templates should be filed when using
-this identity. Please see <link linkend="new-compose-from-templates">Compose from templates</link> for more information on templates.</para>
+<para>Select the folder in which templates should be saved when using
+this identity. Please see <link linkend="new-compose-from-templates">Compose
+from templates</link> for more information about templates.</para>
</listitem>
</varlistentry>
<varlistentry>
-<term><guilabel>Outgoing Account</guilabel></term>
+<term><guilabel>Outgoing Account:</guilabel></term>
<listitem>
-<para>Select or enter an alternative &SMTP; server to be used when sending messages using this identity.</para>
+<para>Specify an alternative &SMTP; / &Sendmail; / &Microsoft; Exchange
+server to be used when sending messages from this identity.</para>
<note><para>You need to configure outgoing mail servers first, before
you can choose them from the list. You can do this on the <link
linkend="configure-accounts-sending"><guilabel>Sending</guilabel>
@@ -394,7 +460,70 @@ tab</link> of the <link linkend="configure-accounts">
<guilabel>Accounts</guilabel> page</link>.</para></note>
</listitem>
</varlistentry>
+
+<varlistentry>
+<term><guilabel>Templates folder:</guilabel></term>
+<listitem>
+<para>Select the folder in which templates should be saved when using
+this identity. Please see <link linkend="new-compose-from-templates">Compose
+from templates</link> for more information about templates.</para>
+<para> </para><!-- add whitespace -->
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term><guilabel>Attach my vCard to message</guilabel></term>
+<listitem>
+<para>Choose this option if you want to attach a vCard file to each
+message sent from this identity. A short dialog will ensue.</para>
+ <variablelist>
+ <varlistentry>
+ <term><guilabel>With empty fields</guilabel></term>
+ <listitem><para>This option opens a dialog just like the <ulink
+ url="help:/kaddressbook/editing-contact-data.html">&kaddressbook; Adding
+ Contact Data</ulink> dialog. Enter your name, email address, &etc;, then
+ click <guilabel>OK</guilabel> to create a new vCard.</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><guilabel>From existing vCard</guilabel></term>
+ <listitem><para>This option opens a browse directories dialog which
+ allows you to to select a .vcf file. (Hint: Use &kaddressbook;
+ to export a vCard file that can be used here.)</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><guilabel>Duplicate existing vCard</guilabel></term>
+ <listitem><para>This option opens a drop down list of all the other identities
+ already defined, so you may select the vCard associated with one of them.</para></listitem>
+ </varlistentry>
+ </variablelist>
+ <para> </para><!-- add whitespace -->
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term><guilabel>Autocorrection language:</guilabel></term>
+<listitem>
+<para>Use the drop down list to select the language associated
+with the optional autocorrection tool when using this identity.</para>
+</listitem><!-- FIXME Need a link to "Plugins" section -->
+</varlistentry>
+
+<varlistentry>
+<term><guilabel>Default domain:</guilabel></term>
+<listitem>
+<para>This field is filled with the value from the <filename>hostnames</filename>
+file (in /etc) by default. The <guilabel>Composer</guilabel> will append this domain name
+to any purely local email address you specify. This feature is primarily useful in a
+&Sendmail; environment.</para>
+<example>
+<title>Default domain</title>
+<para>Default domain set to <userinput>kde.org</userinput>; "To:" address set to <userinput>foo</userinput>.</para>
+<para><guilabel>Composer</guilabel> sends the message to foo at kde.org.</para>
+</example>
+</listitem>
+</varlistentry>
</variablelist>
+<para> </para><!-- add whitespace -->
</sect2>
<sect2 id="configure-identity-templates">
@@ -413,13 +542,42 @@ tab</link> of the <link linkend="configure-accounts">
</caption>
</mediaobject>
</screenshot>
-<para>Here you can create and manage templates to use when composing new
-messages, replies or forwarded messages.</para>
-<para>The message templates support substitution commands, either simply
-type them or select them from the <guimenu>Insert Command</guimenu> menu.</para>
+<para> </para><!-- add whitespace -->
+<para>Here you may create and manage custom templates for this identity to use when composing new
+messages, replying to someone, or forwarding messages inline. The message templates support substitution
+commands. You may simply type them in, or select them from the <guimenu>Insert Command <inlinemediaobject>
+<imageobject><imagedata fileref="go-down.png" format="PNG"/></imageobject></inlinemediaobject></guimenu> menu.
+Three kinds of commands are provided.</para>
+
+<variablelist>
+ <varlistentry>
+ <term><guilabel>Original Message ></guilabel> / <guilabel>Current Message ></guilabel></term>
+ <listitem><para>These commands extract information from the message you're replying to, or forwarding,
+ and insert that information into the composition window.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Process with External Programs ></guilabel></term>
+ <listitem><para>These commands will pipe the message to which you are responding through an external
+ program, then insert the output into &kmail;'s composition window.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Miscellaneous ></guilabel></term>
+ <listitem><para>These commands perform functions like choosing the dictionary the spell checker should
+ use, or inserting the contents of a text file into the composition window.</para></listitem>
+ </varlistentry>
+</variablelist>
+
+<para>The <guilabel>Quote indicator:</guilabel> field allows you to override the default quotation indicator
+character ">". The <guibutton>Copy Global Templates</guibutton> button will reset all the custom
+templates defined here to &kmail;'s defaults. (You can achieve the same end result by unselecting the <guilabel>Use
+custom message templates for this identity</guilabel> check box at the top left of this dialog box.)</para>
+
<para>Templates specified here are identity-specific. They override global
-templates, but can be overridden by per-folder templates if they are
+templates, but can be overridden by folder-specific templates if those are
specified.</para>
+<para> </para><!-- add whitespace -->
</sect2>
<sect2 id="configure-identity-signature">
@@ -438,40 +596,48 @@ specified.</para>
</caption>
</mediaobject>
</screenshot>
+<para> </para><!-- add whitespace -->
<para>This tab allows you to specify a signature (sometimes called
<quote>footer</quote> or <quote>disclaimer</quote>)
-to be appended to each message sent using this identity.</para>
+to be appended to each message sent from this identity.</para>
<note><para>This type of signature has nothing to do with the
-(digital) signatures for which you can select the keys to use on
-the <link linkend="configure-identity-cryptography">Cryptography</link>
-tab. It is just bad wording to call this a signature, but since
-the term is already used everywhere else, we keep this notation. Just
-keep in mind that these signatures and digital signatures are two
+(digital) signatures discussed in the
+<link linkend="configure-identity-cryptography">Cryptography</link>
+section. It is a bit confusing to call this a signature, but since
+the term is already used everywhere else, we keep this nomenclature. Just
+remember that these "signatures" and digital signatures are two
completely different things.</para></note>
+
<para>Check the <guilabel>Enable signature</guilabel> option if you
-want to be able to append the signature when using this identity. To
+want &kmail; to append a signature when using this identity. To
<emphasis>automatically</emphasis> append it to every new message
-you also have to select <guilabel>Automatically insert
-signature</guilabel> in the <guilabel>Composer</guilabel> configuration page.</para>
+you must also select <guilabel>Automatically insert signature</guilabel>
+option on the <guilabel>Composer</guilabel> configuration page.</para>
+
<para>&kmail; can obtain the signature text from various sources. The default is <guilabel>Input Field Below</guilabel>.
-Just enter what you would like your signature to be into the textbox.</para>
-<para>The traditional way on Unix is to read the text from a file called <filename>.signature</filename> in your home folder.
- This file can be shared between several programs, so you get the same signature in each mail program you use.
- Select <guilabel>File</guilabel> from the <guilabel>Obtain Signature text from</guilabel> drop down menu.
+Just enter your signature in the textbox. If you want to use rich text, select the <guilabel>Use &HTML;</guilabel>
+checkbox at the lower left. A formatting toolbar will then appear.</para>
+
+<para>The traditional procedure in Unix is to read the text from a file called <filename>.signature</filename> in your home folder.
+This file may be shared among several programs, so the same signature appears in every email program you use.
+To do this, select <guilabel>File</guilabel> from the <guilabel>Obtain Signature text from:</guilabel> drop down menu.
If you want to edit the file, click the <guilabel>Edit File</guilabel> button.</para>
-<para>&kmail; can also read the signature text from the output of a command. Thus, you can use programs such as <command>fortune</command> to create a new signature text for
-every message. Everything the program prints onto <acronym>stdout</acronym> is caught and used as the signature text. To read the text from the output of a command you select
-<guilabel>Output of Command</guilabel>. Enter the command (preferably with full path) in the <guilabel>Specify command</guilabel> edit field.</para>
+
+<para>&kmail; can also read the signature text from the output of a command.
+You can use programs such as <command>fortune</command> to create a randomly selected signature for
+each new message. Everything the program prints onto <acronym>stdout</acronym> is caught
+and used as the signature text. To read the text from the output of a command, select
+the <guilabel>Output of Command</guilabel> option. Enter the command (with full path)
+in the <guilabel>Specify command:</guilabel> edit field.</para>
+
<note><para>On the Internet, signatures are by convention separated
from the body of the message by a line containing only the three
-character <quote>-- </quote> (dash, dash, space). &kmail; will
-automatically prepend the signature text with this line if it is not
-already present in the signature text.</para>
-<para>If you do not wish the separator to be prepended
-automatically by &kmail;, simply add it to the signature
-text yourself.</para>
-</note>
-
+characters <quote>-- </quote> (dash, dash, space). If the
+<guilabel>Prepend separator to signature</guilabel> option has been
+set in the <guilabel>Composer</guilabel> configuration, &kmail; will
+automatically prepend this line to the signature text (unless it is
+already present).</para></note>
+<para> </para><!-- add whitespace -->
</sect2>
<sect2 id="configure-identity-pictures">
@@ -490,8 +656,9 @@ text yourself.</para>
</caption>
</mediaobject>
</screenshot>
+<para> </para><!-- add whitespace -->
<para>&kmail; can send a small (48x48 pixels), low-quality, monochrome picture
-with every message. For example, this could be a picture of you or a glyph.
+with every message. For example, this could be a picture of you, or a glyph.
It is shown in the recipient's mail client (if supported).</para>
<variablelist>
@@ -503,23 +670,32 @@ messages written with this identity. An X-Face is a small (48x48 pixels)
black and white image that some mail clients are able to display.</para>
</listitem>
</varlistentry>
+
+<varlistentry>
+<term><guilabel>Obtain picture from:</guilabel></term>
+<listitem>
+<para>This drop down list gives you two ways to select an image.</para>
+</listitem>
+</varlistentry>
+
<varlistentry>
-<term><guilabel>External Source</guilabel></term>
+<term><guilabel>External Source <inlinemediaobject><imageobject><imagedata
+fileref="go-down.png" format="PNG"/></imageobject></inlinemediaobject></guilabel> (the default)</term>
<listitem>
<variablelist>
<varlistentry>
-<term><guilabel>Select File...</guilabel></term>
+<term><guibutton>Select File...</guibutton></term>
<listitem>
-<para>Use this to select an image file to create the picture from. The image
-should be of high contrast and nearly quadratic shape. A light background
+<para>Use this button to select an image file from which to create the picture. Use
+a high-contrast image that is square, or nearly square. A light background
helps improve the result.</para>
</listitem>
</varlistentry>
<varlistentry>
-<term><guilabel>Set From Address Book</guilabel></term>
+<term><guibutton>Set From Address Book</guibutton></term>
<listitem>
-<para>You can use a scaled-down version of the picture you have set in your
-address book entry.</para>
+<para>You may use this button to create a scaled-down version of the picture you have set in your
+own address book entry.</para>
</listitem>
</varlistentry>
</variablelist>
@@ -529,40 +705,102 @@ address book entry.</para>
<varlistentry>
<term><guilabel>Input Field Below</guilabel></term>
<listitem>
-<para>Use this field to enter an arbitrary X-Face string.
+<para>Use this option to enter an arbitrary X-Face string.
Examples are available at <ulink url="https://ace.home.xs4all.nl/X-Faces/"
>https://ace.home.xs4all.nl/X-Faces/</ulink>
</para>
</listitem>
</varlistentry>
</variablelist>
-
+<para> </para><!-- add whitespace -->
</sect2>
</sect1>
<sect1 id="configure-accounts">
-<title>Accounts Page</title>
+<title>Email Accounts</title>
-<para>You can find a quick introduction to the
-<guilabel>Accounts</guilabel> page in the <link
+<para>You can find a quick introduction to
+both sending and receiving accounts in the <link
linkend="setting-up-your-account">Setting up your Account</link>
section.</para>
<para>This page allows you to create one or more (incoming and
-outgoing) <emphasis>accounts</emphasis>, &ie; combinations of mail
-servers, login information and other settings. Typically, you will
+outgoing) <emphasis>accounts</emphasis>, &ie;, combinations of mail
+servers, login information, and other settings. Typically, you will
create one outgoing (used for sending messages) and one incoming (used to
-retrieve messages) account. You can create as many accounts as you want, though,
-and assign each one to different <link
-linkend="configure-identity">identities</link> or decide on a per-message
-basis.</para>
+retrieve messages) account. You may create as many accounts as you want, though,
+and assign each one to a different <link
+linkend="configure-identity">identity</link>. Or you may set up just one identity,
+and decide which account to use each time you compose a message. This page
+also lets you set up one or more <acronym>LDAP</acronym> (Lightweight Directory
+Access Protocol) servers.</para>
+
+<para> </para><!-- add whitespace -->
+
+<sect2 id="configure-accounts-receiving">
+<title>Receiving</title>
+<screenshot>
+<screeninfo>Receiving Account</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="accounts-receiving.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Receiving Account</phrase>
+ </textobject>
+ <caption>
+ <para>The Receiving Account Tab</para>
+ </caption>
+ </mediaobject>
+</screenshot>
+<para> </para><!-- add whitespace -->
+<para>For basic information, see <link
+linkend="receiving-mail">Setting up your Account: Receiving</link>.</para>
+
+<para>The column of buttons on the right let you <guibutton>Add...</guibutton> a new
+account, and <guibutton>Modify</guibutton> or <guilabel>Remove</guilabel> an existing
+account. You ought not modify or remove the <guilabel>Local Folders</guilabel>
+entry, which is present by default. The <guilabel>Restart</guilabel> button will
+simulate a program restart.</para>
+
+<para>The <guibutton>Customize Accounts Order...</guibutton> button opens a dialog that
+lets you move any IMAP accounts you have created, and the group of accounts associated with
+<guilabel>Local Folders</guilabel>, higher or lower in the list.</para>
+
+<para>The <guilabel>Retrieval Options</guilabel> popup menu for each account
+lets you specify whether &kmail; should check for new mail immediately after it has
+been started. You may also select <guilabel>Include in Manual Mail Check</guilabel>
+and <guilabel>Switch offline on &kmail; Shutdown</guilabel>.
+</para>
+
+<para>If <guilabel>Detailed new mail notification</guilabel> is enabled then
+&kmail; will show the number of new messages for each folder provided
+you have chosen to be notified with a dialog. More advanced
+notification options, like playing a sound or synthesizing speech,
+are available via the <guibutton>Other Actions</guibutton> button.</para>
+<para> </para><!-- add whitespace -->
+</sect2>
<sect2 id="configure-accounts-sending">
<title>Sending</title>
-
-<para>The <guilabel>Sending</guilabel> tab allows you to define new
-outgoing mail servers and set some common options.</para>
+<screenshot>
+<screeninfo>Sending Account</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="accounts-sending.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Sending Account</phrase>
+ </textobject>
+ <caption>
+ <para>The Sending Account Tab</para>
+ </caption>
+ </mediaobject>
+</screenshot>
+<para> </para><!-- add whitespace -->
+<para>The <guilabel>Sending</guilabel> tab lets you define new
+outgoing mail servers, and also set some options that affect all the messages you send.</para>
<para>For basic information, see <link
linkend="sending-mail">Setting up your Account: Sending</link>.</para>
@@ -572,77 +810,89 @@ linkend="sending-mail">Setting up your Account: Sending</link>.</para>
Account</guilabel> or <guilabel>Configure account</guilabel> dialogs
will open respectively. For sending via &Sendmail;
or similar programs
-you can specify a name and the location of the
+you may specify a name and the location of the
&Sendmail; program. For &SMTP; you
-can specify <guilabel>Name</guilabel>, <guilabel>Outgoing mail server</guilabel>, and
+must specify the <guilabel>Name</guilabel>, <guilabel>Outgoing mail server</guilabel>, and
<guilabel>Port</guilabel> of the server. <guilabel>Server requires
authentication</guilabel> will enable the <guilabel>Login</guilabel>
and <guilabel>Password</guilabel> fields. If you are not sure about the
-security settings you can make &kmail; test for the best settings by
+security settings, you should make &kmail; test for the best settings by
using <guibutton>Auto Detect</guibutton> on the
<guilabel>Advanced</guilabel> tab.</para>
<para><guilabel>Confirm before send</guilabel> will pop up a
-confirmation box every time you send a message.</para>
+confirmation box every time you send a message. <guilabel>Check
+spelling before sending</guilabel> will invoke the spell checker
+before a message is sent.</para>
<para><guilabel>Send messages in outbox folder</guilabel> lets you specify
-when queued messages, &ie; messages in the outbox folder pending to be sent,
-should be sent. You can choose between:</para>
+when queued messages, &ie;, messages in the outbox folder waiting to be sent,
+should be dispatched. You may choose among three options.</para>
+
<variablelist>
<varlistentry>
-<term><guilabel>Never Automatically</guilabel></term>
+<term><guilabel>Never Automatically <inlinemediaobject><imageobject><imagedata
+fileref="go-down.png" format="PNG"/></imageobject></inlinemediaobject></guilabel></term>
<listitem><para>Queued messages will only be sent if you select
<menuchoice><guimenu>File</guimenu><guimenuitem>Send queued messages</guimenuitem></menuchoice>.</para></listitem>
</varlistentry>
+
<varlistentry>
<term><guilabel>On Manual Mail Checks</guilabel></term>
<listitem><para>Queued messages will be sent after you have manually checked
-for new mail, ⪚ with <menuchoice><guimenu>File</guimenu><guimenuitem>Check Mail</guimenuitem></menuchoice>. Of course, you can also
-manually send the queued messages with
+for new mail, ⪚ with <menuchoice><guimenu>File</guimenu><guimenuitem>Check Mail</guimenuitem></menuchoice>.
+Of course, you may also send the queued messages manually via
<menuchoice><guimenu>File</guimenu><guimenuitem>Send queued messages</guimenuitem></menuchoice>.</para></listitem>
</varlistentry>
+
<varlistentry>
<term><guilabel>On All Mail Checks</guilabel></term>
-<listitem><para>Queued messages will be sent after all checks for new mail,
-&ie; after automatic mail checks as well as after manual mail checks.
-Of course, you can also manually send the queued messages with
+<listitem><para>Queued messages will be sent after every check for new mail,
+&ie;, after automatic mail checks, and also after manual mail checks.
+Of course, you may also send the queued messages manually via
<menuchoice><guimenu>File</guimenu><guimenuitem>Send queued messages</guimenuitem></menuchoice>.</para></listitem>
</varlistentry>
</variablelist>
-<para><guilabel>Default send method</guilabel> lets you define what
+<para><guilabel>Default send method:</guilabel> lets you define what
happens when a message is sent. If <guilabel>Send now</guilabel> is
-selected, the message is sent to the mail server immediately, while if
+selected, the message is sent to the mail server immediately. If
<guilabel>Send later</guilabel> is selected, the message is queued in
the outbox to be sent later with the
<menuchoice><guimenu>File</guimenu><guimenuitem>Send
-Queued Messages</guimenuitem></menuchoice> command or automatically when you
-check your mail, depending on the setting of
-<guilabel>Send messages in outbox folder</guilabel> above.</para>
-
-</sect2>
+Queued Messages</guimenuitem></menuchoice> command, or automatically when you
+check your mail, depending on the setting chosen for
+<guilabel>Send messages in outbox folder</guilabel>, above.</para>
-<sect2 id="configure-accounts-receiving">
-<title>Receiving</title>
+<para>The <guilabel>Enable Undo Send:</guilabel> checkbox lets you specify an
+interval of time (from 10 to 50 seconds) during which you may abort mail transport.
+Your message will be queued, and a small <guibutton>Undo Send</guibutton> button
+will appear in the notification area. Click the button (in time) to stop the message
+from being sent.</para>
-<para>For basic information, see <link
-linkend="receiving-mail">Setting up your Account: Receiving</link>.</para>
-
-<para>Using the <guilabel>Retrieval Options</guilabel> popup menu for each resource,
-lets you specify whether &kmail; should check for new mail immediately after it has
-been started. You can also select <guilabel>Include in Manual Mail Check</guilabel>
-and <guilabel>Switch offline on &kmail; Shutdown</guilabel>.
-</para>
-
-<para>With <guilabel>New Mail Notification</guilabel> you can set
-how &kmail; will notify you if new messages have arrived:
-<guilabel>Beep</guilabel> will play a short beep sound;
-if <guilabel>Detailed new mail notification</guilabel> is enabled then
-&kmail; will show the number of new messages for each folder provided
-you have chosen to be notified with a dialog. More advanced
-notification options, like showing a dialog or running a certain command,
-are available via the <guibutton>Other Actions</guibutton> button.</para>
+<para> </para><!-- add whitespace -->
+</sect2>
+<sect2 id="configure-ldap-servers">
+<title>LDAP Servers</title>
+<screenshot>
+<screeninfo>LDAP Servers</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="accounts-ldap.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>LDAP Servers</phrase>
+ </textobject>
+ <caption>
+ <para>The LDAP Servers Tab</para>
+ </caption>
+ </mediaobject>
+</screenshot>
+<para> </para><!-- add whitespace -->
+<para>Use this dialog to configure any LDAP servers you wish to access. Please
+consult the <ulink url="help:/kaddressbook/configure-ldap-server.html">&kaddressbook;
+Appendix</ulink> for more details.</para>
</sect2>
</sect1>
@@ -650,32 +900,153 @@ are available via the <guibutton>Other Actions</guibutton> button.</para>
<sect1 id="configure-appearance">
<title>Appearance Page</title>
-<sect2 id="configure-appearance-fonts">
-<title>Fonts</title>
+<para>The Appearance page lets you adjust many aspects of &kmail;'s
+graphical user interface, including color schemes, font selection, and even
+the physical arrangement of the message list in the main window.</para>
+
+<!-- <sect2 id="configure-appearance-message-window"> -->
+<sect2 id="configure-appearance-general">
+<title>General</title>
-<para>This section allows you to change the type, size and character set of the
-display fonts. <guilabel>Message Body</guilabel> sets the font for
-the reader pane, <guilabel>Composer</guilabel> sets the font for
-the body of your messages written in &kmail; Composer.
+<screenshot>
+<screeninfo>Appearance General</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="appearancegeneral.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Appearance General</phrase>
+ </textobject>
+ <caption>
+ <para>The Appearance (General) Tab</para>
+ </caption>
+ </mediaobject>
+</screenshot>
+<para> </para><!-- add whitespace -->
+<para>If the <guilabel>Close message window after replying or forwarding</guilabel> option is
+activated, &kmail; will close the separate message window when a composer window (for a reply,
+or to forward the message) is opened. <guilabel>Enable access key</guilabel> is selected by default.
+Access keys allow you to use the keyboard for functions normally done with the mouse, such as following links.
+For more information see <ulink url="help:/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>
+
+<para>Enable <guilabel>Replace smileys by emoticons</guilabel> if you want smileys
+like <userinput>:-)</userinput> appearing in the message text to be
+replaced by emoticons (small pictures) such as
+<inlinemediaobject><imageobject>
+<imagedata fileref="smile.png" format="PNG"/></imageobject>
+</inlinemediaobject>.</para> --><!-- No longer on the General tab. -->
+
+<para>Enable <guilabel>Reduce font size for quoted text</guilabel> to show quoted
+text (in a reply) with a smaller type face. <guilabel>Show expand/collapse quote marks</guilabel>
+displays little widgets along with each bit of quoted text. These allow you to show (+)
+or hide (-) nested quotes beyond a certain level. This is useful in protracted email
+conversations where nobody deletes what has gone before.</para>
+
+<!-- <para><guilabel>Fallback character encoding</guilabel>:
+Some emails, especially those generated automatically, do not specify the
+character encoding which needs to be used to properly display them. In such
+cases a fallback character encoding will be used, which you can configure
+here. Set it to the character encoding most commonly used in your part of
+the world. As a default the encoding configured for the whole system is used.</para> -->
+
+<para>Changing <guilabel>Override character encoding:</guilabel>
+from its default value <guilabel>Auto</guilabel> will force the use of the specified
+encoding for all messages, no matter what the &MIME; headers say. <guilabel>Minimum
+font size:</guilabel> lets you control the smallest
+font &kmail; will use. Set this higher if you have trouble reading really small fonts.</para>
+
+<para><guilabel>System Tray</guilabel> provides three ways to control &kmail;'s interaction
+with the &kde; task bar / panel. If <guilabel>Enable system tray icon</guilabel> is
+selected, a small icon (<inlinemediaobject><imageobject><imagedata fileref="mail-mark-unread.png"
+format="PNG"/></imageobject></inlinemediaobject>) will be displayed in the system tray
+area. If <guilabel>Start minimized to tray</guilabel> is activated, only this icon will
+appear when &kmail; is launched. Selecting <guilabel>Show unread email in taskbar</guilabel>
+causes the number of currently unread messages to appear on &kmail;'s taskbar button.</para>
+
+<para>When the icon is visible, you may hide &kmail;'s main window either by
+clicking on the icon or by clicking on the window's close button. Clicking
+on the icon will make &kmail;'s main window visible again.
+If you click on the icon with the &RMB;, a context menu will appear. You can check
+for new mail, create a new message, or quit &kmail;. If there are any
+unread messages, the entry <guilabel>New Messages In ></guilabel> will appear, along
+with a list of the folders containing unread messages. Select one of these folders,
+and it will be opened in &kmail;'s main window.
</para>
+<para> </para><!-- add whitespace -->
+</sect2>
+<sect2 id="configure-appearance-fonts">
+<title>Fonts</title>
+
+<screenshot>
+<screeninfo>Appearance Fonts</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="appearancefonts.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Appearance General</phrase>
+ </textobject>
+ <caption>
+ <para>The Appearance (Fonts) Tab</para>
+ </caption>
+ </mediaobject>
+</screenshot>
+<para> </para><!-- add whitespace -->
+
+<para>This section lets you tailor the fonts &kmail; uses.
+Select <guilabel>Use custom fonts</guilabel> to activate the dialog.
+Apply to: <guilabel>Message Body</guilabel> sets the font for
+the reader pane. The <guilabel>Composer</guilabel> option sets the
+font in which new plain text messages are shown while they are being
+written. <guilabel>Message List</guilabel> changes the font used to
+display the message list. You can also choose special fonts for
+Unread, Important, and Action Item message list entries. <guilabel>Printing
+Output</guilabel> alters the font used when printing. <guilabel>Fixed
+Width Font</guilabel> affects the display of some &HTML; messages.</para>
+
+<para><guilabel>Show only monospaced fonts</guilabel> restricts the number
+of fonts available. Only the names of fixed-width fonts will be displayed
+when this option is in effect.</para>
+<para> </para><!-- add whitespace -->
</sect2>
<sect2 id="configure-appearance-colors">
<title>Colors</title>
-<para>This section allows you to change the color of the text by double clicking
-on an item in the listbox.
-<guilabel>Recycle colors on deep quoting</guilabel> will restart the quote coloring at the first level
-after the third level of quoting has been reached. Note that the
+<screenshot>
+<screeninfo>Appearance Colors</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="appearancecolors.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Appearance Colors</phrase>
+ </textobject>
+ <caption>
+ <para>The Appearance (Colors) Tab</para>
+ </caption>
+ </mediaobject>
+</screenshot>
+<para> </para><!-- add whitespace -->
+<para>This section allows you to change the color of a few things by double clicking
+on an entry in the list box. Select <guilabel>Use custom colors</guilabel> to activate
+this feature. Select <guilabel>Do not change color from original HTML mail</guilabel>
+to preserve the color scheme selected by the sender of any &HTML; message.</para>
+
+<para><guilabel>Recycle colors on deep quoting</guilabel> will restart the quote coloring
+at the first level 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,
-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.
-
-</para>
-
+the composer. If you want folders which are getting close to their quota
+(space allotment, used on &IMAP; servers) to be displayed in a different color,
+you may specify a percentage value as a threshold.</para>
+<para> </para><!-- add whitespace -->
</sect2>
<sect2 id="configure-appearance-layout">
@@ -684,90 +1055,132 @@ can be configured along with the other custom colors.
<screeninfo>Default Layout</screeninfo>
<mediaobject>
<imageobject>
- <imagedata fileref="layout.png" format="PNG"/>
+ <imagedata fileref="appearancelayout.png" format="PNG"/>
</imageobject>
<textobject>
<phrase>Default Layout</phrase>
</textobject>
<caption>
- <para>Default Layout</para>
+ <para>The Appearance (Layout) Tab</para>
</caption>
</mediaobject>
</screenshot>
-<para>This tab lets you configure the layout of the main window.</para>
-<para>In the <guilabel>Folder List</guilabel> section you can choose between the
-<guilabel>Long folder list</guilabel> (default) using the full height of the window and
-the <guilabel>Short folder list</guilabel> with the message preview pane using the
-entire bottom part of the window.</para>
-<para>If you want to have your favorite folders and a quick search field for folders at
-the top left of the main window select the next two options.</para>
+<para> </para><!-- add whitespace -->
+<para>This tab lets you configure the layout of &kmail;'s main window.</para>
+<para>In the <guilabel>Folder List</guilabel> section you may choose between the
+<guilabel>Long folder list</guilabel> (default option), which uses the full height of the window, and
+the <guilabel>Short folder list</guilabel>. With the <guilabel>Short</guilabel> option, if you have selected
+<guilabel>Show the message preview pane below the message list</guilabel>, the message
+list and the folder list will occupy a horizontal strip, with the message preview pane
+using the entire bottom portion of the window. If you have selected <guilabel>Show the message
+preview pane next to the message list</guilabel>, the folder list and the message list will
+occupy a vertical strip, with the message preview pane on the right.</para>
+
+<para>Select <guilabel>Show folder quick search field</guilabel> to create a small text box
+at the top of the folder list. When you type something in that box, only the folders whose
+names match the characters you entered will appear. Clear the box to display all your folders.</para>
+
<para> The <guilabel>Show Favorite Folders View</guilabel> section allows you
-to change how your favorites folder displays your favorite folder. <guilabel>As Icons</guilabel> uses a lot of space, so if you have several favorite folders you might try <guilabel>As List</guilabel>. If you do not have any favorite folders you can disable the view altogether by selecting <guilabel>Never</guilabel>.</para>
-<para> On by default, <guilabel>Folder Tooltips</guilabel> display additional information like the total number of messages, unread messages and storage size when hovering a folder with the mouse pointer. Select <guilabel>Never</guilabel> to disable this feature.</para>
-<para>You can choose where in relation to the message list you want the <guilabel>Message Preview Pane</guilabel> or disable it all together.</para>
+to change how your favorite folders are displayed. <guilabel>As Icons</guilabel>
+uses a lot of space, so if you have several favorite folders you might try <guilabel>As
+List</guilabel>. If you do not care about favorite folders you can disable this
+feature altogether by selecting <guilabel>Never</guilabel>.</para>
+
+<para> On by default, <guilabel>Folder Tooltips</guilabel> display additional information
+(total number of messages, unread messages, and storage size) when hovering over a folder
+with the mouse pointer. Select <guilabel>Never</guilabel> to disable this feature.</para>
+
+<para>In the <guilabel>Message Preview Pane</guilabel> section you can choose where in
+relation to the message list you want the message preview pane to appear. Or you can
+remove it entirely, and use only the full screen reader to view selected messages (press &Enter;).</para>
+<para> </para><!-- add whitespace -->
</sect2>
<sect2 id="configure-appearance-message-list">
<title>Message List</title>
-<para>In the <guilabel>General</guilabel> section you can alter the appearance of the Message List pane.</para>
-<para>Choose to <guilabel>Display tooltips for messages and group headers</guilabel>.
-Check <guilabel>Hide tab bar when only one tab is open</guilabel> to have more space for
-the messages in the list.</para>
-
-<para>The next options are the settings for <guilabel>Default Aggregation</guilabel> and
-<guilabel>Default Theme</guilabel> which can be overridden using the <guilabel>Folder
-Properties</guilabel> dialog for each folder individually.</para>
-<para>Using the <guibutton>Configure</guibutton> button opens a window to customize the default
-aggregation or theme to your needs and allows you to add your own.</para>
-<para>Available aggregations and themes:</para>
+
+<screenshot>
+<screeninfo>Appearance Message List</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="appearancelist.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Appearance Message List</phrase>
+ </textobject>
+ <caption>
+ <para>The Appearance (Message List) Tab</para>
+ </caption>
+ </mediaobject>
+</screenshot>
+<para> </para><!-- add whitespace -->
+<para>Use this dialog to alter the appearance of the Message List pane.</para>
+<para>If you select <guilabel>Display tooltips for messages and group headers</guilabel>,
+you will see a brief summary of each message (or group -- depends on the view mode) when
+the mouse cursor hovers over a message list item.</para>
+
+<para><guilabel>Default Aggregation</guilabel> and
+<guilabel>Default Theme</guilabel> may be overridden using the <guilabel>Folder
+Properties</guilabel> dialog for each folder individually. Clicking the
+<guibutton>Configure</guibutton> button opens a window to customize the pre-configured
+aggregations / themes; you can create your own schemes that way.</para>
+
+<para>Eight aggregation modes and three themes have been pre-configured.</para>
<variablelist>
<varlistentry>
-<term>Default aggregation</term>
+<term><guilabel>Default aggregation:</guilabel> (drop down list)</term>
<listitem>
<variablelist>
<varlistentry>
-<term>Senders/Receivers, Flat</term>
-<listitem><para>
-This view groups the messages by senders or receivers (depending on the folder type).
-Messages are not threaded.</para></listitem>
-</varlistentry>
-<varlistentry>
<term>Activity by Date, Flat</term>
<listitem><para>This view uses day-by-day groups. Messages are not threaded. So for example,
-in <quote>Today</quote> you will simply find all the messages arrived today.</para></listitem>
+in <quote>Today</quote> you will simply find all the messages that arrived today. The groups
+are displayed by default in reverse chronological order, and labeled "Today", "Yesterday",
+then the preceding five days of the week, followed by mm/dd/yy.</para></listitem>
</varlistentry>
<varlistentry>
<term>Activity by Date, Threaded</term>
<listitem><para>This view uses day-by-day groups. Messages are threaded. So for example, in
-<quote>Today</quote> you will find all the messages arrived today and all the threads.</para></listitem>
+<quote>Today</quote> you will find all the messages that arrived today and all the threads
+that have been active today. Uses the same grouping as Activity by Date, Flat.</para></listitem>
</varlistentry>
<varlistentry>
<term>Current Activity, Flat</term>
<listitem><para>This view uses smart date range groups. Messages are not threaded. So for
-example, in <quote>Today</quote> you will simply find all the messages arrived today.</para></listitem>
+example, in <quote>Today</quote> you will simply find all the messages that arrived today.
+The groups are displayed by default in reverse chronological order: "Today", "Yesterday",
+the five preceding days of the week, "Last Week", "Two Weeks Ago", and then month by month.</para></listitem>
</varlistentry>
<varlistentry>
<term>Current Activity, Threaded </term>
<listitem><para>This view uses smart date range groups. Messages are threaded. So for
-example, in <quote>Today</quote> you will find all the messages arrived today and all
-the threads that have been active today.</para></listitem>
+example, in <quote>Today</quote> you will find all the messages that arrived today and all
+the threads that have been active today. Otherwise the same as Current Activity, Flat.</para></listitem>
</varlistentry>
<varlistentry>
-<term>Thread Starters</term>
-<listitem><para>This view groups the messages in threads and then groups the threads by the starting user.</para></listitem>
+<term>Flat Date View</term>
+<listitem><para>This is a plain, old-fashioned list of messages sorted by date. No groups and no threading.</para></listitem>
</varlistentry>
<varlistentry>
-<term>Flat Date View</term>
-<listitem><para>This is a plain and old list of messages sorted by date: no groups and no threading.</para></listitem>
+<term>Senders/Receivers, Flat</term>
+<listitem><para>This view groups the messages by senders or receivers (depending on the folder type).
+You may specify senders (or receivers) in the <menuchoice><guimenu>Folders</guimenu>
+<guimenuitem>Folder Properties</guimenuitem></menuchoice> dialog ("View" tab, <guilabel>Show
+Column:</guilabel>).Messages are not threaded.</para></listitem>
</varlistentry>
<varlistentry>
<term>Standard Mailing List</term>
-<listitem><para>This is a plain and old mailing list view: no groups and heavy threading.</para></listitem>
+<listitem><para>This is a plain, old-fashioned mailing list view: no groups and heavy threading, ordered by the
+date each thread began.</para></listitem>
+</varlistentry>
+<varlistentry>
+<term>Thread Starters</term>
+<listitem><para>This view arranges the messages in threads and then groups the threads by the starting user.</para></listitem>
</varlistentry>
<varlistentry id="customize-aggregation-theme">
-<term>Customize...</term>
+ <term><guibutton>Configure...</guibutton> button</term>
<listitem>
-<screenshot>
+<!-- <screenshot>
<screeninfo>Customize Message Aggregation Modes</screeninfo>
<mediaobject>
<imageobject>
@@ -780,40 +1193,43 @@ the threads that have been active today.</para></listitem>
<para>Customize Message Aggregation Modes</para>
</caption>
</mediaobject>
- </screenshot>
-<para>To create a custom aggregation theme, click the <guibutton>Configure...</guibutton> button. Select an existing aggregation similar to what you want to
- change it to and click the <guibutton>Clone Aggregation</guibutton>, if none are similar click the <guibutton>New Aggregation</guibutton> button. The <guilabel>General</guilabel>
+ </screenshot> -->
+
+<para>To create a custom aggregation theme, click the <guibutton>Configure...</guibutton> button. Select an existing aggregation similar to the one you want to
+ create, then click <guibutton>Clone Aggregation</guibutton>. If none are similar, click the <guibutton>New Aggregation</guibutton> button. The <guilabel>General</guilabel>
tab allows you to change the <guilabel>Name:</guilabel> and <guilabel>Description:</guilabel>. The <guilabel>Groups & Threading</guilabel> tab
- allows you to configure several elements to customize your aggregation.</para>
+ lets you configure several elements to customize your aggregation.</para>
<itemizedlist>
<listitem><para>
-<guilabel>Grouping:</guilabel> Allows you to select from dates, sender/receiver or none. With the smart options &kmail; will group related emails together.
+<guilabel>Grouping:</guilabel> lets you select from dates, sender/receiver or none. With the smart options &kmail; will group related emails together.
</para></listitem>
<listitem><para>
-<guilabel>Group expand policy:</guilabel> Allows you to set whether &kmail; will automatically expand grouped emails.
+<guilabel>Group expand policy:</guilabel> lets you set whether &kmail; will automatically expand grouped emails, or not.
</para></listitem>
<listitem><para>
-<guilabel>Threading:</guilabel> Allows you to change if &kmail; will include references and subject in determining perfect threading. You can also turn off threading all together.
+<guilabel>Threading:</guilabel> allows you to decide if &kmail; will include references and subject to determine perfect threading.
+You may also turn off threading altogether.
</para></listitem>
<listitem><para>
-<guilabel>Thread leader:</guilabel> Allows you to change the leader of the thread between most recent message or topmost.
+<guilabel>Thread leader:</guilabel> lets you change the leader of the thread: most recent message, or the first one.
</para></listitem>
<listitem><para>
-<guilabel>Thread expand policy:</guilabel> Allows you to change how &kmail; determines whether a thread should be expanded or no expanding at all.
+<guilabel>Thread expand policy:</guilabel> allows you to change how &kmail; determines whether a thread should be expanded.
</para></listitem>
</itemizedlist>
-<para>The <guilabel>Advanced</guilabel> allows you to change the <guilabel>Fill view strategy:</guilabel> You would choose Favor speed if you have a slow connection. Interactivity will show
- all of your current conversations first. And Batch mode will not sort the view at all.</para>
+<para>The <guilabel>Advanced</guilabel> tab lets you change the <guilabel>Fill view strategy:</guilabel> Choose
+"Favor speed" if you have a slow connection. "Interactivity" will show
+all of your current conversations first. "Batch" mode will not do any sorting.</para>
</listitem>
</varlistentry>
</variablelist>
</listitem>
</varlistentry>
</variablelist>
-
+<para> </para><!-- add whitespace -->
<variablelist>
<varlistentry>
-<term>Default Theme</term>
+<term><guilabel>Default Theme:</guilabel> (drop down list)</term>
<listitem>
<variablelist>
<varlistentry>
@@ -829,9 +1245,9 @@ the threads that have been active today.</para></listitem>
<listitem><para>A smart multi-line and multi-item theme with a clickable status column</para></listitem>
</varlistentry>
<varlistentry id="customize-messagelist-theme">
-<term>Configure...</term>
+ <term><guibutton>Configure...</guibutton> button</term>
<listitem>
-<screenshot >
+<!-- <screenshot >
<screeninfo>Customize Message List Theme</screeninfo>
<mediaobject>
<imageobject>
@@ -844,143 +1260,209 @@ the threads that have been active today.</para></listitem>
<para>Customize Message List Theme</para>
</caption>
</mediaobject>
- </screenshot>
-<para>To create a custom message list theme, click the <guibutton>Configure...</guibutton> button. Select an existing theme similar to what you want to
- change it to and click the <guibutton>Clone Theme</guibutton>, if none are similar click the <guibutton>New Theme</guibutton> button. The <guilabel>
- General</guilabel> tab allows you to change the <guilabel>Name:</guilabel> and <guilabel>Description:</guilabel>. </para>
-<para>The <guilabel>Appearance</guilabel> tab allows you to configure visible columns and status items. To add a column, right click the column bar and select <guilabel>Add Column</guilabel>.
- Name the column and select what the column will represent from the <guilabel>Header click sorts messages:</guilabel> drop down list.
- By default <guilabel>Visible by default</guilabel> is checked, uncheck it if you only want the column to be available on the &RMB; add or remove menu for the clickable sort bar.
- Then drag the appropriate label from the <guilabel>Content Items</guilabel> to the column view box under the column bar, ⪚ if you chose to add a size column you would drag the Size label to
- underneath the Size column. Continue to do this until you have all the columns you desire. You can change the font and color of column items through the view area &RMB; menu. Move, delete and
- resize columns through the &RMB; menu of the column bar.</para>
-<para>The <guilabel>Advanced</guilabel> tab allows you to change whether to show headers. You can also change the size of status icons.</para>
-</listitem></varlistentry>
+ </screenshot> -->
+
+<para>To create a custom message list theme, click the <guibutton>Configure...</guibutton> button. Select an existing theme similar to the one you want to
+create, then click <guibutton>Clone Theme</guibutton>. If none are similar, click the <guibutton>New Theme</guibutton> button. The <guilabel>
+General</guilabel> tab allows you to change the <guilabel>Name:</guilabel> and <guilabel>Description:</guilabel>.</para>
+
+<para>The <guilabel>Appearance</guilabel> tab lets you configure visible columns and status items. To add a column,
+right click the column bar and select <guilabel>Add Column</guilabel>.
+Name the column, then select what the column will represent from the <guilabel>Header click sorts messages:</guilabel> drop down list.
+<guilabel>Visible by default</guilabel> is automatically checked.
+Uncheck it if you only want the column to be available on the context menu for the clickable sort bar.
+Drag the appropriate label from the <guilabel>Content Items</guilabel> to the column view box under the column bar,
+⪚, if you chose to add a size column you would drag the Size label
+underneath the Size column. Continue to do this until you have all the columns you desire.
+You can change the font and color of column items through the view area &RMB; menu. Move, delete and
+resize columns via the &RMB; menu on the column bar.</para>
+
+<para>The <guilabel>Advanced</guilabel> tab lets you show headers. You may also change the size of status icons.</para>
+</listitem></varlistentry>
</variablelist>
</listitem></varlistentry>
</variablelist>
-<para>In the <guilabel>Date Display</guilabel> section you can choose between several date formats. The <guilabel>Localized Format</guilabel>
- is the one you can specify under <guilabel>Country/Region & Language</guilabel> in the &systemsettings;. <guilabel>Smart format</guilabel> will show
- today, yesterday &etc; The <guilabel>Custom</guilabel> format you can get a description of the possible values by clicking on
- <guilabel>Custom format information</guilabel> option.</para>
-</sect2>
-
-<sect2 id="configure-appearance-message-window">
-<title>Message Window</title>
-
-<para>If the <guilabel>Close message window after replying or forwarding</guilabel> option is
-activated, &kmail; will close the message window after replying to or forwarding the message that
-is displayed in the window. This only applies to the separate message window, not to the embedded
-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>
-
-<para>Enable <guilabel>Replace smileys by emoticons</guilabel> if you want smileys
-like <userinput>:-)</userinput> appearing in the message text to be
-replaced by emoticons (small pictures) such as
-<inlinemediaobject><imageobject>
-<imagedata fileref="smile.png" format="PNG"/></imageobject>
-</inlinemediaobject>.</para>
-<para>Enable <guilabel>Reduce font size for quoted text</guilabel> to show quoted
-text with a smaller font.</para>
-
-<para>Enable <guilabel>Show expand/collapse quote marks</guilabel> to show
-different levels of quoted text. Disable to hide
-the levels of quoted text.</para>
-
-<para><guilabel>Fallback character encoding</guilabel>:
-Some emails, especially those generated automatically, do not specify the
-character encoding which needs to be used to properly display them. In such
-cases a fallback character encoding will be used, which you can configure
-here. Set it to the character encoding most commonly used in your part of
-the world. As a default the encoding configured for the whole system is used.</para>
-
-<para><guilabel>Override character encoding</guilabel>:
-Changing this from its default <guilabel>Auto</guilabel> will force the use of the specified
-encoding for all emails, regardless of what they specify themselves.</para>
-
-<para><guilabel>Minimum font size:</guilabel> This option allows you to set the smallest size a font will show as.
- This can be helpful if you have a hard time reading really small fonts.</para>
-
-<para>To customize which headers you would like to view in the message window (⪚ subject, from, to, cc, bcc, date), click the <guibutton>Configure Custom Headers</guibutton> button next to <guilabel>Headers:</guilabel>.
- Add your selection in the dialog that pops up. If you are using fancy headers, you can enable <guilabel>Show spam status in fancy headers</guilabel> here. Please note that if your email provider does not provide <application>Spamassassin</application>
- services to check your email for spam, you will need to install it on your computer. ⪚ through a package manager (Yast on &SuSE;, &ubuntu; Software Center on &ubuntu; &etc;).
- For more information see: <link linkend="the-anti-spam-wizard">Anti-Spam Wizard</link> to set up spamassassin with &kmail;.</para>
+<para> </para><!-- add whitespace -->
+<para>In the <guilabel>Date Display</guilabel> section you may choose one of three date formats (or create your own).
+The <guilabel>Standard Format</guilabel> shows the day of the week and the date. The <guilabel>Localized Format</guilabel>
+is shorter, omitting the day of the week. The <guilabel>Smart format</guilabel> will show
+today, yesterday, &etc; If you want to create a <guilabel>Custom</guilabel> date format, just click
+on <guilabel>Custom format information</guilabel> and follow the directions.</para>
+<para> </para><!-- add whitespace -->
</sect2>
+<sect2 id="configure-message-tags">
+ <title>Message Tags</title>
+
+<screenshot>
+<screeninfo>Appearance Tags</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="appearancetags.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Appearance Tags</phrase>
+ </textobject>
+ <caption>
+ <para>The Appearance (Tags) Tab</para>
+ </caption>
+ </mediaobject>
+</screenshot>
+<para> </para><!-- add whitespace -->
+<para>&kmail; by default gives you several ways to mark messages (Important / Action
+Item / Birthday), accessible via the <menuchoice><guimenu>Message</guimenu>
+<guisubmenu>Mark Message ></guisubmenu></menuchoice> sub-menu. You may also
+define additional tags to help you categorize messages.</para>
-<sect2 id="configure-appearance-systemtray">
-<title>System Tray</title>
+<para>Use the <guilabel>Available Tags</guilabel> input field to name your special
+tag. Use the <guibutton> + </guibutton> button to add this name to
+the list. Use the <guibutton> − </guibutton> button to remove a tag.
+(The "Birthday" tag is built-in, and cannot be removed.) Use the up and down arrow
+buttons to sort the items in the list.</para>
-<para>If you enable the system tray icon then a small &kmail; icon with the
-number of unread messages will be shown in the system tray. You can enable
-&kmail;'s system tray icon with <guilabel>Enable system tray icon</guilabel>,
-and with <guilabel>System Tray Mode</guilabel>
-you can specify whether the tray icon should always be shown or only if
-you have unread messages.</para>
+<para>Highlight an item in the list to activate the <guilabel>Tag Settings</guilabel>
+dialog. You may choose any or all of six options.</para>
-<para>If the icon is visible then you can hide &kmail;'s main window by
-clicking on the icon or by clicking on the window close button. By clicking
-on the icon you can make &kmail;'s main window visible again.
-If you click on the icon with the <mousebutton>right</mousebutton>
-mousebutton then you get a menu with a few useful commands. You can check
-for new mail, create a new message or quit &kmail;. Additionally, there is
-the entry <guilabel>New Messages In</guilabel> which lists all folders
-containing unread messages. If you choose one of those folders then this
-folder will be selected in &kmail;'s main window.
-</para>
+<variablelist>
+ <varlistentry>
+ <term><guilabel>Change text color:</guilabel></term>
+ <listitem><para>Select this option to display tagged message
+ list entries in a different color. A color palette will
+ be presented when you choose this option. Select a preset
+ color, or choose "Custom..." for more flexibility.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Change background color:</guilabel></term>
+ <listitem><para>Choose this option to alter the background color
+ of tagged message list entries.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Change font:</guilabel></term>
+ <listitem><para>You may select either a bold or
+ <emphasis>italic</emphasis> type face.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Message tag icon:</guilabel></term>
+ <listitem><para>Click this button to open an icon selection
+ dialog. The icon will be displayed on tagged message list entries.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Shortcut:</guilabel></term>
+ <listitem><para>Use this button to create a keyboard shortcut
+ for associating this tag with selected messages.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Enable toolbar button:</guilabel></term>
+ <listitem><para>Select this option to add a new button to the &kmail;
+ toolbar. Clicking the button will tag the currently selected message.</para></listitem>
+ </varlistentry>
+</variablelist>
+<para>All the tags defined here will automatically appear as new options in the <menuchoice>
+ <guimenu>Message</guimenu><guisubmenu>Mark Message ></guisubmenu></menuchoice> sub-menu.</para>
</sect2>
-
- <!-- Message Tags tab missing for 2.1.96 -->
</sect1>
- <sect1 id="configure-composer">
+<sect1 id="configure-composer">
<title>
Composer Page
</title>
+
+ <para>
+ For a description of how to use the <guilabel>Composer</guilabel>,
+ read <link linkend="the-composer-window">this page</link>. To
+ learn more about fine-tuning the <guilabel>Composer</guilabel>'s
+ behavior, press on.
+ </para>
<sect2 id="configure-composer-general">
<title>
General
</title>
-
- <variablelist>
+
+ <screenshot>
+ <screeninfo>Composer General</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="composergeneral.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Composer General</phrase>
+ </textobject>
+ <caption>
+ <para>The Composer (General) Tab</para>
+ </caption>
+ </mediaobject>
+ </screenshot>
+ <para> </para><!-- add whitespace -->
+
+ <para>
+ This dialog lets you adjust the way &kmail; handles signatures.
+ It also permits you to control some formatting features, to adjust
+ some autocompletion options, and to tweak &kmail;'s autosave feature.
+ </para>
+
+ <variablelist>
<varlistentry id="configure-composer-general-append-signature">
<term>
<guilabel>Automatically insert signature</guilabel>
</term>
<listitem>
<para>
- If checked, your signature as defined in the <link
+ If checked, your signature as defined on the <link
linkend="configure-identity-signature">identity
page</link> is automatically included at the end of
- all messages you create (&ie; new messages, replies, &etc;).
+ every message you create (&ie;, new messages, replies, &etc;).
</para>
</listitem>
</varlistentry>
- <!-- Insert signature above quoted text + Prepend separator to signature missing -->
- <varlistentry id="configure-composer-general-smart-quoting">
+ <varlistentry>
<term>
- <guilabel>Use smart quoting</guilabel>
+ <guilabel>Insert signature above quoted text</guilabel>
</term>
<listitem>
<para>
- If checked, &kmail; will break long lines but will try
- to keep the correct quoting (⪚ the <quote>>
- </quote> will always be at the start of the line).
+ If checked, &kmail; will insert your signature at the top of
+ the composer window, and not at the bottom.
</para>
</listitem>
</varlistentry>
- <varlistentry id="configure-composer-general-quote-selection-only">
+ <varlistentry>
+ <term>
+ <guilabel>Prepend separator to signature</guilabel>
+ </term>
+ <listitem>
+ <para>
+ If checked, &kmail; will insert "-- " (dash dash space)
+ before your signature if your signature does not begin
+ that way. (This separator line is a <emphasis>de facto</emphasis>
+ internet standard.)
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <guilabel>Remove the signature when replying</guilabel>
+ </term>
+ <listitem>
+ <para>
+ If checked, &kmail; will remove the signature from the original
+ message when you compose a reply. Of course, if you have not
+ selected the signature and the <guilabel>Only quote selected
+ text ...</guilabel> option has been checked, &kmail; will omit
+ the signature without referring to this setting.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry id="configure-composer-general-quote-selection-only">
<term>
<guilabel>Only quote selected text when replying</guilabel>
</term>
@@ -989,23 +1471,61 @@ folder will be selected in &kmail;'s main window.
If checked, &kmail; will quote only the selected text in the message window,
instead of the complete message, when replying.
With this, it is possible to quickly generate replies that quote only the relevant
- paragraph to which you are actually replying, and omits the other paragraphs that are
- not relevant to the context.
+ paragraph(s) to which you are actually replying. If this option is checked and you
+ select nothing, &kmail; will quote the entire message.
</para>
</listitem>
</varlistentry>
- <varlistentry id="configure-composer-general-strip-signatures">
+ <varlistentry id="configure-composer-general-smart-quoting">
+ <term>
+ <guilabel>Use smart quoting</guilabel>
+ </term>
+ <listitem>
+ <para>
+ If checked, &kmail; will break long lines but will try
+ to keep the correct quoting (&ie;, the <quote>></quote>
+ will always be at the start of the line).
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term>
- <guilabel>Remove the signature when replying</guilabel>
+ <guilabel>Word wrap at column:</guilabel>
</term>
<listitem>
<para>
- If checked, &kmail; will remove the signature from the quoted text
- when replying to a message. This is useful since it reduces the amount
- of quoted text, which makes it easier to read the reply.
+ If checked, the word wrap option (<menuchoice>
+ <guimenu>Options</guimenu><guimenuitem>Wordwrap</guimenuitem>
+ </menuchoice> in the composer window) will be selected
+ automatically. Use the spin box to set the maximum line length.
</para>
</listitem>
- </varlistentry>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <guilabel>Reply or forward using &HTML; if present</guilabel>
+ </term>
+ <listitem>
+ <para>
+ If checked, &kmail; will always enable the rich text editing toolbar if the
+ message to which you are responding contains an &HTML; &MIME; header. If this option
+ is not selected, the composer retains the toolbar state from the previous session.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <guilabel>Improve plain text version of &HTML; message</guilabel>
+ </term>
+ <listitem>
+ <para>
+ If checked, &kmail; will append footnotes to the plain text version
+ of every message composed in &HTML;. These plain text footnotes will be clickable
+ links pointing to any resources coded as anchor tags (aka links) in the
+ &HTML; version of the message.
+ </para>
+ </listitem>
+ </varlistentry>
<varlistentry id="configure-composer-general-auto-request-mdns">
<term>
<guilabel>Automatically request message disposition notifications</guilabel>
@@ -1017,199 +1537,343 @@ folder will be selected in &kmail;'s main window.
<emphasis>on</emphasis>. Check this option only if you
know what you are doing. &mdn;s are considered a
nuisance (or are simply ignored) by a lot of people. It
- is better to decide to request them on a
- message-by-message basis.
+ is better to request them only when necessary.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <guilabel>Use addresses indexed from emails for autocompletion</guilabel>
+ </term>
+ <listitem>
+ <para>
+ If checked, &kmail; will include the addresses from all your saved
+ messages in the list of autocompletion targets (⪚, when you
+ start typing in the To: input field). These will appear as "Contacts
+ found in your data". If you switch this off, only the matching &kaddressbook;
+ entries and "Recent Addresses" will appear in the list. Use the spin
+ box to limit the number of items displayed in the list.
</para>
</listitem>
</varlistentry>
- <!-- Use recent addresses for autocompletion missing -->
- <varlistentry id="configure-composer-general-word-wrap">
+ <varlistentry>
<term>
- <guilabel>Word wrap at column</guilabel>
+ <guilabel>Use recent addresses for autocompletion</guilabel>
</term>
<listitem>
<para>
- Lets you turn word wrapping on and off in the composer
- window and lets you set the column at which words will
- be wrapped (you probably should not need to change the
- default value, which is <literal>78</literal>).
+ If checked, &kmail; will include the addresses that have been used
+ recently in the list of autocompletion targets (⪚, when you
+ start typing in the CC: input field). These will appear as "Recent
+ Addresses". If you switch this off, only the matching &kaddressbook;
+ entries and "Contacts found in your data" will appear in the list. Use
+ the spin box to limit the number of items considered "Recent".
</para>
</listitem>
</varlistentry>
- <!-- not in kmail 2.0.96 varlistentry id="configure-composer-general-too-many-recipients">
- <term>
- <guilabel>Warn if the number of recipients is larger than</guilabel>
- </term>
- <listitem>
- <para>
- If the number of recipients is larger than this value, &kmail; will
- warn and ask for a confirmation before sending the mail.
- The default is to warn if there are more than <literal>5</literal> recipients.
- This warning can be turned off.
- </para>
- </listitem>
- </varlistentry-->
- <varlistentry id="configure-composer-general-autosave-interval">
+ <varlistentry>
<term>
- <guilabel>Autosave interval</guilabel>
+ <guibutton>Configure Completion ...</guibutton> button
</term>
<listitem>
<para>
- A backup copy of the text in the composer window can be created
- regularly. This option lets you specify the interval used to
- create the backup. You can disable autosaving by setting it to
- the value <literal>0</literal>.
+ Click on this button to open the autocompletion configuration
+ dialog. You may adjust the order in which items appear, add or
+ remove "Recent" addresses, and create a blacklist of addresses
+ that should never appear as autocompletion targets. Notice that
+ this dialog may also be invoked from a context menu by clicking
+ the &RMB; in, say, the "To:" field of the composer.
</para>
</listitem>
</varlistentry>
- <!-- not in kmail 2.0.96 varlistentry id="configure-composer-general-forwading-type">
+ <varlistentry id="configure-composer-general-autosave-interval">
<term>
- <guilabel>Default Forwarding Type</guilabel>
+ <guilabel>Autosave interval</guilabel>
</term>
<listitem>
<para>
- Lets you decide whether you want to forward messages inline or as an attachment by default.
- This changes which type of forwarding mechanism is used when you click the toolbar icon or
- when you activate the shortcut for forwarding.
+ A backup copy of the text in the composer window is by default created
+ regularly. This option lets you specify how often a backup copy
+ is created. You can disable autosaving by selecting "No autosave".
</para>
</listitem>
- </varlistentry-->
- <!--missing: Configure Completion Order + Edit Recent Addresses -->
-
- </variablelist>
-
+ </varlistentry>
+ </variablelist>
+ <para> </para><!-- add whitespace -->
</sect2>
-<sect2 id="configure-composer-standard-templates">
-<title>Standard Templates</title>
-<para>Here you can add, edit, and delete custom message templates to use
-when you compose a reply or forwarding message.</para>
-<para>Message templates support substitution commands, by simply typing them
-or selecting them from the <guimenu>Insert Command</guimenu> menu.</para>
-<para>These are global (default) templates. They can be overridden by
-per-identity templates or per-folder templates if they are specified.</para>
-</sect2>
-
-<sect2 id="configure-composer-custom-templates">
-<title>Custom Templates</title>
-<para>Here you can add, edit, and delete custom message templates to use
-when you compose a reply or forwarding message. Create the custom template
-by typing the name into the input box and press the <guiicon>+</guiicon> button.
-You can bind a keyboard combination to the template for faster operations.</para>
-<!-- To and CC field-->
-<para>Message templates support substitution commands, by simply typing them
-or selecting them from the <guimenu>Insert Command</guimenu> menu.</para>
-<para>There are four types of custom templates: used to <guilabel>Reply</guilabel>,
-<guilabel>Reply to All</guilabel>, <guilabel>Forward</guilabel>, and
-<guilabel>Universal</guilabel> which can be used for all kinds of operations.
-You cannot bind a keyboard shortcut to <guilabel>Universal</guilabel>
-templates.</para>
-</sect2>
- <!-- replaced by Standard Templates / Custom Templates tabs, remove it lueck 31.05.2011
-<sect2 id="configure-composer-phrases">
-<title>Phrases</title>
-
-<para>The <guilabel>Phrases</guilabel> tab lets you define the automatically
-generated lines that are added to message replies, forwarded messages, and the
-character that is added in front of quoted text.
-There are special %-denoted characters that will insert certain
-values, which are also displayed at the top of the <guilabel>Phrases</guilabel> section.
-You can add reply phrases in languages other than
-your default &kde; language using the <guibutton>Add...</guibutton> button.
-You can then choose between different languages with the
-<guilabel>Language</guilabel> drop down box.
-This will only work for languages whose i18n package you have installed.</para>
-</sect2>
--->
-<sect2 id="configure-composer-subject">
-<title>Subject</title>
-
-<para>This section contains a list of prefixes for <quote>Reply</quote> and
-<quote>Forward</quote>. If you receive messages that use prefixes different
-to the standard ones, you can add them here so &kmail; will recognize
-them. This way &kmail; can ignore them for sorting messages and
-when setting the subject of a reply or a forwarded messages, and optionally
-replace them with <quote>Re:</quote> or <quote>Fwd:</quote>
-respectively.</para>
-
-</sect2>
-
-<sect2 id="configure-composer-charset">
-<title>Charset</title>
-
-<para>Here you can manage the default charsets used for your own messages.
-Every message you send will be checked if it is written in one of the listed
-charsets, starting at the top of the list. If it is, this charset will be used.
-If it is not, a dialog will show up and tell you that you manually have to choose
-a charset using
-<menuchoice><guimenu>Options</guimenu><guisubmenu>Set Encoding</guisubmenu></menuchoice>.
-</para>
-
-<para>If you select <guilabel>Keep original charset when replying
-or forwarding (if possible)</guilabel>, the original message's charset
-will be kept, unless there are now characters that cannot be
-represented using that charset.</para>
-
-</sect2>
-
-<sect2 id="configure-composer-headers">
-<title>Headers</title>
-
-<para>Check the <guilabel>Use custom message-id suffix</guilabel>
-checkbox if you want &kmail; to generate Message-Id's with a custom
-suffix. Enter the desired suffix in the <guilabel>Custom message-id
-suffix</guilabel> field. Please make sure that the suffix that you
-specify is world-wide unique. The best thing is to use the name of a
-domain which you are the owner of. If you do not check <guilabel>Use
-custom Message-Id suffix</guilabel> then &kmail; will automatically
-generate the complete Message-Id. If you do not know what this is all
-about do not check this option.</para>
-
-<para>The <guilabel>Define custom mime header fields</guilabel> list
-sets the headers that &kmail; will use for its outgoing messages. You
-can both invent new fields and overwrite existing ones. This feature
-is only useful for advanced users.</para>
+ <sect2 id="configure-composer-standard-templates">
+ <title>Standard Templates</title>
+ <screenshot>
+ <screeninfo>Composer Standard Templates</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="composerstandard.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Composer Standard Templates</phrase>
+ </textobject>
+ <caption>
+ <para>The Composer (Standard Templates) Tab</para>
+ </caption>
+ </mediaobject>
+ </screenshot>
+ <para> </para><!-- add whitespace -->
+
+ <para>
+ Here you can edit the default message templates used when you
+ compose a new message, write a reply, or forward a message. Message templates support
+ substitution commands, by simply typing them or selecting them from the
+ <guimenu>Insert Command</guimenu> menu. These are global (default) templates.
+ They may be overridden by per-identity templates or per-folder templates if
+ any such are specified. Most people are happy with the standard default
+ templates. But if you wish to tweak the defaults, this is the place to do it.
+ </para>
+
+ <para>
+ For a more detailed explanation of template configuration, please refer to <link
+ linkend="configure-identity-templates">the Identities chapter.</link>
+ </para>
+ <para> </para><!-- add whitespace -->
+ </sect2>
-</sect2>
+ <sect2 id="configure-composer-custom-templates">
+ <title>Custom Templates</title>
+ <screenshot>
+ <screeninfo>Composer Custom Templates</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="composercustom.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Composer Custom Templates</phrase>
+ </textobject>
+ <caption>
+ <para>The Composer (Custom Templates) Tab</para>
+ </caption>
+ </mediaobject>
+ </screenshot>
+ <para> </para><!-- add whitespace -->
+
+ <para>
+ Here you can add, edit, and delete custom message templates to use
+ when you compose a reply or forward a message. Create the custom template
+ by typing the name into the input box and press the <guiicon>+</guiicon> button.
+ You can bind a keyboard combination to the template for faster operations.
+ </para>
+ <!-- To and CC field--><!-- I tested this, and I can't get it to work. David Bryant -->
+
+ <para>
+ Message templates support substitution commands, by simply typing them
+ or selecting them from the <guimenu>Insert Command</guimenu> menu.
+ </para>
+
+ <para>
+ There are four types of custom templates: used to <guilabel>Reply</guilabel>,
+ <guilabel>Reply to All</guilabel>, <guilabel>Forward</guilabel>, and
+ <guilabel>Universal</guilabel> which can be used for all kinds of operations.
+ You cannot bind a keyboard shortcut to <guilabel>Universal</guilabel>
+ templates.
+ </para>
+
+ <para> </para><!-- add whitespace -->
+ </sect2>
-<sect2 id="configure-composer-attachments">
-<title>Attachments</title>
+ <sect2 id="configure-composer-subject">
+ <title>Subject</title>
+ <screenshot>
+ <screeninfo>Composer Subject</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="composersubject.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Composer Subject</phrase>
+ </textobject>
+ <caption>
+ <para>The Composer (Subject) Tab</para>
+ </caption>
+ </mediaobject>
+ </screenshot>
+ <para> </para><!-- add whitespace -->
+
+ <para>
+ This section contains a list of prefixes for <quote>Reply</quote> and
+ <quote>Forward</quote>. If you receive messages that use prefixes differing
+ from the standard prefixes, you may add them to this list so &kmail; will recognize
+ them. &kmail; will then ignore the odd-ball prefixes when sorting messages (and
+ when setting the subject of a reply or a forwarded message), and optionally
+ replace them with <quote>Re:</quote> or <quote>Fwd:</quote>,
+ respectively.
+ </para>
+ <para> </para><!-- add whitespace -->
+ </sect2>
-<para>If you have to send attachments with filenames containing non-English
-characters to users of
-<application>&Microsoft; Outlook</application> or
-<application>&Microsoft; Outlook Express</application>
-then you might want to check the <guilabel>Outlook-compatible attachment naming</guilabel>
-option. &kmail; will then encode the attachment names in a non-standard way that
-is understood by <application>&Microsoft; Outlook</application>.
-</para>
-<para>Note that &kmail; will create non-standard compliant messages, and
-consequently it is possible that your messages will not be understood by
-standard-compliant mail clients. So, unless you have no other choice, you
-should not enable this option.</para>
+ <sect2 id="configure-composer-charset">
+ <title>Character Set</title>
+ <screenshot>
+ <screeninfo>Composer Character Set</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="composercharset.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Composer Character Set</phrase>
+ </textobject>
+ <caption>
+ <para>The Composer (Character Set) Tab</para>
+ </caption>
+ </mediaobject>
+ </screenshot>
+ <para> </para><!-- add whitespace -->
+
+ <para>
+ Here you can manage the default character sets used for your own messages.
+ Every message you send will be checked to see if it is written with one of the listed
+ character sets, starting at the top of the list. If it is, that character set will be used.
+ If it is not, a dialog will appear and tell you that you must choose
+ a character set via
+ <menuchoice><guimenu>Options</guimenu><guisubmenu>Set Encoding</guisubmenu></menuchoice>.
+ </para>
+
+ <para>
+ If you select <guilabel>Keep original charset when replying
+ or forwarding (if possible)</guilabel>, the original message's character set
+ will be kept, unless there are now characters that cannot be
+ represented using that set of characters.
+ </para>
+ <para> </para><!-- add whitespace -->
+ </sect2>
-<para>Check the <guilabel>Enable detection of missing attachments</guilabel>
-checkbox if you want &kmail; to warn you whenever you are about to send a
-message without attachments although the message text contains certain
-words which indicate that you wanted to include an attachment. The list
-of key words can be modified.</para>
+ <sect2 id="configure-composer-headers">
+ <title>Headers</title>
+ <screenshot>
+ <screeninfo>Composer Headers</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="composerheaders.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Composer Headers</phrase>
+ </textobject>
+ <caption>
+ <para>The Composer (Headers) Tab</para>
+ </caption>
+ </mediaobject>
+ </screenshot>
+ <para> </para><!-- add whitespace -->
+
+ <para>
+ Check the <guilabel>Use custom message-id suffix</guilabel>
+ checkbox if you want &kmail; to generate Message-Id's with a custom
+ suffix. Enter the desired suffix in the <guilabel>Custom message-id
+ suffix</guilabel> field. Please make sure that the suffix you
+ specify is unique (within the webiverse). The simplest way to ensure uniqueness is to use
+ the name of your own domain, if you have one. If you do not check <guilabel>Use
+ custom Message-Id suffix</guilabel>, &kmail; will automatically
+ generate the complete Message-Id. If you do not know what this is all
+ about, do not choose this option.
+ </para>
+
+ <para>
+ The <guilabel>Define custom mime header fields</guilabel> list
+ sets the headers that &kmail; will use for its outgoing messages. You
+ may both invent new fields and overwrite existing ones. This feature
+ is only useful for experts.
+ </para>
+ <para> </para><!-- add whitespace -->
+ </sect2>
-</sect2>
+ <sect2 id="configure-composer-attachments">
+ <title>Attachments</title>
+ <screenshot>
+ <screeninfo>Composer Attachments</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="composerattach.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Composer Attachments</phrase>
+ </textobject>
+ <caption>
+ <para>The Composer (Attachments) Tab</para>
+ </caption>
+ </mediaobject>
+ </screenshot>
+ <para> </para><!-- add whitespace -->
+
+ <para>
+ If you have to send attachments with filenames containing non-English
+ characters to users of
+ <application>&Microsoft; Outlook</application> or
+ <application>&Microsoft; Outlook Express</application>,
+ you might want to check the <guilabel>Outlook-compatible attachment naming</guilabel>
+ option. &kmail; will then encode the attachment names in a non-standard way that
+ is understood by <application>&Microsoft; Outlook</application>.
+ </para>
+
+ <para>
+ When you select this option, &kmail; will create messages that do not comply with email
+ standards, and consequently it is possible that your messages will not be understood by
+ standards-compliant mail clients. So you should not enable this option unless you must.
+ </para>
+
+ <para>
+ Check the <guilabel>Enable detection of missing attachments</guilabel>
+ checkbox if you want &kmail; to warn you whenever you are about to send a
+ message without attachments even though the message text contains certain
+ words which may indicate that you want to include an attachment. The list
+ of key words can be modified.
+ </para>
+
+ <para>
+ Use the <guilabel>Maximum Attachment Size:</guilabel> spin box to
+ limit the size of any attachments you send. If you try to attach a
+ file larger than the specified limit, &kmail; will issue an error
+ message and refuse to attach the file. Note that this is an individual
+ limit, and not an aggregate limit. Also, the file size is checked
+ before the file is converted to base 64 encoding, if that is necessary.
+ </para>
+
+ <para> </para><!-- add whitespace -->
+ </sect2>
- <sect2 id="configure-composer-autocorrection">
- <title>Autocorrection</title>
- <para>To enable the feature, check the <guilabel>Enable autocorrection</guilabel> option. In the
- drop down box choose the language you would like to use. You can import settings from <application>LibreOffice</application> or another &kmail; installation by selecting the
- appropriate choice from the <guilabel>Import</guilabel> drop down box. If you need to save your settings for another installation or application, select the <guibutton>Export</guibutton> button.
- </para>
- <para>
- <variablelist><title>Autocorrect Options</title>
- <varlistentry>
+ <sect2 id="configure-composer-autocorrection">
+ <title>Autocorrection</title>
+ <screenshot>
+ <screeninfo>Composer Autocorrection</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="composercorrect.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Composer Autocorrection</phrase>
+ </textobject>
+ <caption>
+ <para>The Composer (Autocorrection) Tab</para>
+ </caption>
+ </mediaobject>
+ </screenshot>
+ <para> </para><!-- add whitespace -->
+
+ <para>
+ To enable automatic correction of common typing errors, select the <guilabel>Enable
+ autocorrection</guilabel> option. Use the drop down list to choose your language.
+ You may import settings, either from <application>LibreOffice</application> or another &kmail;
+ / &calligra; installation, via the <guibutton>Import ... <inlinemediaobject>
+ <imageobject><imagedata fileref="go-down.png" format="PNG"/></imageobject>
+ </inlinemediaobject></guibutton> button. If you need to save your settings for
+ another installation or application, use the <guibutton>Export</guibutton> button.
+ </para>
+
+ <para>
+ <variablelist><title>Autocorrect Options</title>
+ <varlistentry>
<term><guilabel>Simple Autocorrection</guilabel></term>
<listitem>
<para>
- This allows you to configure &kmail; to autocorrect various simple corrections.
- Check the box next to the autocorrect feature you would like to enable.
+ This allows you to configure &kmail; to automatically correct various common
+ typographical errors. Check the boxes next to the autocorrection features you want.
</para>
</listitem>
</varlistentry>
@@ -1217,8 +1881,8 @@ of key words can be modified.</para>
<term><guilabel>Custom Quotes</guilabel></term>
<listitem>
<para>
- You can replace double or single quotes with typographical quotes by checking the appropriate box.
- You can also add non breaking space before specific punctuation marks in French text by selecting the option.
+ You can replace double or single quotes with “smart” quotes by checking the appropriate box.
+ You can also add a non-breaking space before specific punctuation marks in French text by selecting that option.
</para>
</listitem>
</varlistentry>
@@ -1226,9 +1890,12 @@ of key words can be modified.</para>
<term><guilabel>Advanced Autocorrection</guilabel></term>
<listitem>
<para>
- You can enter custom automatic word replacement by checking this option. To enter a custom string to replace automatically
- enter the word to be replaced in the <guilabel>Find</guilabel> box, and the replacement word in the <guilabel>Replace</guilabel> box and click the <guibutton>Add</guibutton> button.
- To remove a custom word replacement string, highlight the string and click <guibutton>Remove</guibutton>.
+ You can customize automatic word replacement by selecting this option.
+ To enter a custom string that will be replaced automatically,
+ enter the word to be replaced in the <guilabel>Find</guilabel> box and
+ enter the replacement word in the <guilabel>Replace</guilabel> box, then
+ click the <guibutton>Add</guibutton> button. To remove a custom word
+ from the list, highlight that entry and click <guibutton>Remove</guibutton>.
</para>
</listitem>
</varlistentry>
@@ -1236,293 +1903,454 @@ of key words can be modified.</para>
<term><guilabel>Exceptions</guilabel></term>
<listitem>
<para>
- This allows you to set exceptions where you would like &kmail; to ignore your autocorrect selections for end of sentence and two uppercase letters. Enter the exception and click <guibutton>Add</guibutton> button.
- To remove the exception, highlight the string and click <guibutton>Remove</guibutton> button.
+ This dialog lets you create exceptions where you can tell &kmail; to ignore
+ some periods (end of sentence) and two uppercase letters (⪚, &kmail;). Enter
+ the exception and click the <guibutton>Add</guibutton> button.
+ To remove the exception, highlight the string and click <guibutton>Remove</guibutton>.
</para>
</listitem>
</varlistentry>
</variablelist>
- </para>
- <para>
- Once you have made all of your autocorrect selections click the <guibutton>Apply</guibutton> button.
- </para>
- </sect2>
- <sect2 id="configure-resize-image">
- <title>Auto Resize Image</title>
- <para>In some circumstances you may need to have &kmail; automatically resize image attachments on outgoing emails. ⪚ Mail server limits. To do so, select <guilabel>Automatically resize images</guilabel>.
- There are several options that come with this feature.</para>
- <variablelist>
+ </para>
+
+ <para>
+ Once you have made all of your autocorrect selections, click <guibutton>Apply</guibutton>, or <guibutton>OK</guibutton>.
+ </para>
+ <para> </para><!-- add whitespace -->
+ </sect2>
+
+ <sect2 id="configure-resize-image">
+ <title>Auto Resize Image</title>
+ <screenshot>
+ <screeninfo>Composer Auto Resize</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="composerresize.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Composer Auto Resize</phrase>
+ </textobject>
+ <caption>
+ <para>The Composer (Auto Resize Image) Tab</para>
+ </caption>
+ </mediaobject>
+ </screenshot>
+ <para> </para><!-- add whitespace -->
+
+ <para>
+ In some circumstances you may want to have &kmail; automatically resize image attachments in
+ outgoing emails (⪚, because of server limits). To do so, select <guilabel>Automatically resize
+ images</guilabel>. There are several options that accompany this feature.
+ </para>
+
+ <variablelist>
<varlistentry><term><guilabel>General</guilabel></term>
<listitem>
- <para>Some general options for auto image resizing are as follows: If you need your images to keep the ratio of length and width intact ⪚
- Photographs, select <guilabel>Keep ratio</guilabel>. The default behavior is for &kmail; to prompt and ask if you want to resize before resizing, if you want it to resize
- without asking, unselect <guilabel>Ask before resizing</guilabel>. &kmail; will save the file in <acronym>JPG</acronym>, if you would rather have them save in
- <acronym>PNG</acronym> format, select it from the <guilabel>Write to format</guilabel> drop down box.</para>
- </listitem>
+ <para>
+ There are three options under "General". If you want to preserve the aspect ratio
+ of all images, select <guilabel>Keep ratio</guilabel>. &kmail; by default asks you
+ if you want to resize before resizing. If you want the program to resize images
+ without asking, unselect <guilabel>Ask before resizing</guilabel>. &kmail; will by default
+ send the resized image in <acronym>JPG</acronym> format. If you would rather have such images sent in
+ <acronym>PNG</acronym> format, select that from the <guilabel>Fallback to format:</guilabel> drop down box.
+ </para>
+ </listitem>
</varlistentry>
<varlistentry><term><guilabel>Image</guilabel></term>
<listitem>
- <para> Say you have a relative that can only receive image files of a certain size due to their email providers limits, you can use the <guilabel>Reduce image to maximum dimension:</guilabel> option
- to select a size to reduce the image to and enter their email into the filters on the <guilabel>Recipients</guilabel> tab. The recipients tab is discussed in further detail at the end of this section.
- If you need a custom size, choose the last option <guilabel>Custom</guilabel> from the width and height drop down boxes, and enter the number in the text box. You can also enlarge images by selecting
- <guilabel>Enlarge image to minimum dimension</guilabel>. The last option allows you to skip images of a certain filesize (this will verify image size by width x height only).</para>
+ <para>
+ Suppose you have a relative who can only receive image files of a certain size because of their
+ email provider's limits. You can use the <guilabel>Reduce image to maximum dimension:</guilabel> option
+ to select a size to shrink the image to, and enter their email into the filters on the <guilabel>Recipients</guilabel>
+ tab. (The <guilabel>Recipients</guilabel> tab is discussed in further detail below.)
+ If you need a custom size, choose the last option <guilabel>Custom</guilabel> from the width and
+ height drop down boxes, and enter a number of pixels in the text box. You may also enlarge images by selecting
+ <guilabel>Enlarge image to minimum dimension</guilabel>. The last option allows you to skip resizing images
+ that are smaller than the specified file size.
+ </para>
</listitem>
</varlistentry>
+
<varlistentry><term><guilabel>Filename</guilabel></term>
<listitem>
- <variablelist>
+
+ <variablelist>
<varlistentry><term><guilabel>Source filter</guilabel></term>
- <listitem><para>If you would like the resizing to be done based on the name of the file, you would select the appropriate filter here. ⪚ You need to send your boss multiple images daily,
- and your boss requires them to be the same size. You could name all of your work images work1, work2 &etc; then select <guilabel>Include all files whose names contains one of the patterns</guilabel> and
+ <listitem>
+ <para>
+ If you would like the resizing to be done based on the name of the file, select
+ the appropriate filter here. Suppose you need to send your boss multiple images daily,
+ and your boss requires all of them to be the same size. You could name your work images
+ work1, work2 &etc;, then select <guilabel>Include all files whose names contains one of the patterns</guilabel> and
enter work into the <guilabel>Pattern:</guilabel> text box. You can also exclude files in the same way by selecting
- <guilabel>Exclude all files whose names contains one of the patterns</guilabel>. The default behavior is no filtering.</para>
+ <guilabel>Exclude all files whose names contains one of the patterns</guilabel>. The default behavior is no filtering.
+ </para>
</listitem>
</varlistentry>
<varlistentry><term><guilabel>Image Format</guilabel></term>
<listitem>
- <para> Select <guilabel>Resize all images with one of these formats</guilabel> to set a specific format to resize the image to.</para>
+ <para>
+ Select <guilabel>Resize all images with one of these formats</guilabel> to set a specific format to resize the image to.
+ </para>
<itemizedlist>
- <listitem><para>When this option is enabled you must select the <guibutton>Select Format...</guibutton> button and select a format from the dialog.</para></listitem>
+ <listitem>
+ <para>
+ When this option is enabled, you must click the <guibutton>Select Format...</guibutton> button,
+ then select a format from the dialog.
+ </para>
+ </listitem>
</itemizedlist>
</listitem>
</varlistentry>
<varlistentry><term><guilabel>Resize filename</guilabel></term>
<listitem>
- <para>Select <guilabel>Rename resized images with the following pattern</guilabel> if you would like your resized images to be renamed with a specific pattern. Enter the pattern into the text box. You can use:
+ <para>
+ Select <guilabel>Rename resized images with the following pattern:</guilabel> if you would like your
+ resized images to be renamed with a specific pattern. Enter the pattern into the text box. You may use:
<simplelist>
<member>%t set current time</member>
<member>%d set current date</member>
<member>%n original filename</member>
<member>%e original extension</member>
<member>%x new extension</member>
- </simplelist></para>
+ </simplelist>
+ </para>
</listitem>
</varlistentry>
</variablelist>
+
</listitem>
</varlistentry>
- <varlistentry><term><guilabel>Recipients</guilabel></term>
- <listitem>
- <para>This tab is where you would specify recipients that need to have resized images. ⪚ grandma at myfamily.net; boss at mywork.com.
- You need to decide if you need multiple or only one, and enter the email(s) into the text box using the <quote>;</quote> as a separator when you have multiple. You can also specify
- if you do not want certain recipient(s) images to be resized. The default is no filtering.</para>
- </listitem>
- </varlistentry>
- </variablelist>
- </sect2>
-
- <sect2 id="configure-composer-general-external-editor">
- <title>External Editor</title>
- <variablelist>
- <varlistentry>
- <term><guilabel>Use external editor instead of composer</guilabel></term>
- <listitem>
- <para>This selection allows you to use a different editor. Please note that the composer window will still open,
- and the external editor will open on top of the composer window. When you are done, save the text and exit the editor.
- The text will now appear in the composer window, where you can send it. Note that your editor may not return immediately, you have to use ⪚
- <userinput><command> gvim <option>-f</option> <varname>%f</varname></command></userinput> for <application>gvim</application>.</para>
- </listitem>
- </varlistentry>
- </variablelist>
-</sect2>
+
+ <varlistentry><term><guilabel>Recipients</guilabel></term>
+ <listitem>
+ <para>
+ This tab is where you specify recipients who need to receive resized images.
+ You must decide if you need multiple entries or only one, and enter the email(s)
+ into the text box using the <quote>;</quote> as a separator when there are multiple
+ items. You may also specify certain recipients for whom images ought not be resized.
+ The default is no filtering.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <para> </para><!-- add whitespace -->
+ </sect2>
</sect1>
<sect1 id="configure-security">
<title>Security Page</title>
+
+ <para>
+ The Security configuration dialog lets you fine-tune certain rich text (&HTML;) options.
+ It also allows you to control encryption and decryption features, to adjust some built-in
+ anti-phishing logic, and to specify how message disposition notification requests (aka
+ return receipts) are handled. Notice that this dialog does <emphasis>not</emphasis> have
+ anything to do with anti-virus security measures. See the <link linkend="the-anti-virus-wizard">Using
+ &kmail;: The Anti-Virus Wizard</link> chapter if you want anti-virus security.
+ </para>
+
<sect2 id="configure-security-reading">
<title>Reading</title>
- <para>On this tab you can configure security-relevant options for
- reading messages.</para>
+
+ <screenshot>
+ <screeninfo>Security Reading</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="securityreading.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Security Reading</phrase>
+ </textobject>
+ <caption>
+ <para>The Security (Reading) Tab</para>
+ </caption>
+ </mediaobject>
+ </screenshot>
+ <para> </para><!-- add whitespace -->
+
+ <para>On this tab you can configure security options that
+ affect the way you read messages.</para>
+
<variablelist>
<varlistentry id="configure-security-reading-prefer-html">
<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
+ 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>
+ as security problems with &HTML; might show up.
+ </para>
+ <para>
+ You can still easily view messages in &HTML; format by
+ clicking the plain message/HTML message toggle bar on the left hand side of the preview pane.
+ Please see <link linkend="configure-appearance-general">the General tab</link>
+ on the <guilabel>Appearance</guilabel> page to enable this feature.
+ </para>
</listitem>
</varlistentry>
<varlistentry id="configure-security-reading-external-references">
<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
- 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
- these are not supported in &kmail; at all, which is a good thing, as most viruses propagate through these.</para>
+ <para>
+ If checked, &kmail; can load external images, style sheets, &etc; from the Internet
+ when you view an &HTML; message. We strongly recommend that you leave this option off
+ (although it has no effect until you enable &HTML;).
+ </para>
+ <para>
+ By adding external references to their messages, people sending spam can detect when
+ you have looked at their message, your location, and a lot of other information that
+ may get logged on web servers. Note that this option has no effect on &Java; or JavaScript,
+ as these are not supported in &kmail; at all.
+ </para>
</listitem>
</varlistentry>
+
<!--http://www.aegiap.eu/kdeblog/2013/04/news-in-kdepim-4-11-scam-detection/-->
- <varlistentry id="configure-security-email-scams">
- <term><guilabel>Informs if message reading is a suspected email scam</guilabel></term>
+ <varlistentry id="configure-security-email-scams">
+ <term><guilabel>Informs if message reading is a suspected email scam</guilabel></term>
+ <listitem>
+ <para>
+ As email has become more popular, email scams have proliferated. Email scams may
+ include emails made to appear as if they come from legitimate companies, even though
+ they really link to malicious web sites requesting your personal information. This
+ may lead to identity theft, and worse. By default &kmail; analyzes messages for common scams,
+ and will inform you if a message is a suspected scam. We recommend that you keep this feature
+ enabled. If you wish to disable these warnings, uncheck
+ <guilabel>Informs if message reading is a suspected email scam</guilabel>.
+ </para>
+ <para>
+ If legitimate emails are being flagged, (⪚, from trusted friends), you can add
+ their email addresses to the <guilabel>Whitelist:</guilabel> by clicking
+ the <guibutton>Add...</guibutton> button and entering an address into the dialog that pops up.
+ Please note that at this time, only complete email addresses can be whitelisted.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Check URL with Phishing Google System</guilabel></term>
<listitem>
- <para>With the popularity of email, unfortunately comes the popularity of email scams. Email scams can include emails made to appear as though they come from legitimate companies,
- but they really link to malicious web sites requesting your personal information. This can lead to identity theft and worse. By default &kmail; analyzes messages for common scams,
- and will inform you if the email is a suspected scam. It is highly advised to keep this feature enabled. If you wish to disable this great feature, uncheck
- <guilabel>Informs if message reading is a suspected email scam</guilabel>.</para>
- <para>If you have legitimate emails being flagged, ⪚ from trusted friends, you can add their email to the <guilabel>Whitelist:</guilabel> by clicking
- the <guibutton>Add...</guibutton> and enter the email into the dialog that pops up. Please note that at this time, only individual emails are supported.</para>
+ <para>
+ Select this option to force &kmail; to consult Google's database of suspected phishing
+ web sites when URLs are embedded in a message, and to warn you whenever a match is found.
+ </para>
</listitem>
</varlistentry>
+
<varlistentry>
- <term><guilabel>Encrypted messages</guilabel></term>
+ <term><guilabel>Scan emails for tracking URLs</guilabel></term>
<listitem>
- <para>By default, &kmail; will automatically attempt to decrypt encrypted messages when you view them. If you prefer to do it manually, unselect this option.</para>
+ <para>
+ By default, &kmail; will automatically check URLs embedded in &HTML; messages, and
+ warn you if any of them appear to be trying to track you.
+ </para>
</listitem>
</varlistentry>
+
<varlistentry>
- <term><guilabel>Certificate & Key Bundle Attachments</guilabel></term>
+ <term><guilabel>Attempt decryption of encrypted messages when viewing</guilabel></term>
<listitem>
- <para>If you would like to have &kmail; to <guilabel>Automatically import keys and certificate</guilabel> from incoming messages for decryption, select this option.</para>
+ <para>
+ By default, &kmail; will automatically attempt to decrypt encrypted messages when you view them.
+ If you prefer to do this manually, unselect this option.
+ </para>
</listitem>
</varlistentry>
- <varlistentry id="configure-security-reading-mdns">
- <term>
- <guilabel>Message Disposition Notifications</guilabel>
- </term>
- <listitem>
- <para>
- &mdn;s are a generalization of what is commonly called a
- <quote>read receipt</quote>. The message author requests
- a disposition notification to be sent and the receiver's
- mail program generates a reply from which the author can
- learn what happened to his message. Common disposition
- types include <quote>displayed</quote> (&ie; read),
- <quote>deleted</quote> and <quote>dispatched</quote>
- (⪚ forwarded).
- </para>
- <para>
- The following options (listed as <guilabel>Send
- policy</guilabel>) are available to control
- <emphasis>when</emphasis> &kmail; sends &mdn;s:
- </para>
- <variablelist>
- <varlistentry>
- <term>
- <guilabel>Ignore</guilabel> (recommended)
- </term>
- <listitem>
- <para>
- Ignores any request for disposition
- notifications. No &mdn; will ever be sent
- automatically.
- </para>
- </listitem>
- </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Automatically import keys and certificate</guilabel></term>
+ <listitem>
+ <para>
+ If checked, &kmail; automatically imports any attachments
+ containing &openpgp; keys into your local keyring, and any
+ attachments containing &smime; keys into your local key box.
+ </para>
+ <note>
+ <para>
+ Verifying &smime; signatures always involves importing
+ the contained certificates. This option does not
+ affect that. It is also unrelated to &gpg;'s
+ <option>auto-key-retrieve</option> feature, where &gpg;
+ will try to import unknown keys from a key server.
+ </para>
+ </note>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <para> </para><!-- add whitespace -->
+ </sect2>
+
+ <sect2 id="configure-message-disposition-notifications">
+ <title>Message Disposition Notifications</title>
+ <screenshot>
+ <screeninfo>Security MDNs</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="securitymdn.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Security MDNs</phrase>
+ </textobject>
+ <caption>
+ <para>The Security (Message Disposition Notifications) Tab</para>
+ </caption>
+ </mediaobject>
+ </screenshot>
+ <para> </para><!-- add whitespace -->
+
+ <variablelist>
+ <varlistentry id="configure-security-reading-mdns">
+ <term>
+ <guilabel>Message Disposition Notifications</guilabel>
+ </term>
+ <listitem>
+ <para>
+ &mdn;s are a generalization of what is commonly called a
+ <quote>read receipt</quote>. The message author requests
+ a disposition notification to be sent, and the receiver's
+ email program generates a reply from which the author can
+ learn what happened to his message. Common disposition
+ types include <quote>displayed</quote> (&ie;, read),
+ <quote>deleted</quote>, and <quote>dispatched</quote>
+ (&ie;, forwarded).
+ </para>
+ <para>
+ The following options (listed as <guilabel>Send
+ policy</guilabel>) are available to control
+ <emphasis>when</emphasis> &kmail; sends &mdn;s.
+ </para>
+ <variablelist>
+ <varlistentry>
+ <term>
+ <guilabel>Ignore</guilabel> (recommended)
+ </term>
+ <listitem>
+ <para>
+ Ignores any request for disposition
+ notifications. No &mdn;s will ever be sent
+ automatically.
+ </para>
+ </listitem>
+ </varlistentry>
+
<varlistentry>
- <term>
- <guilabel>Ask</guilabel>
- </term>
- <listitem>
- <para>
- Answers requests only after asking the user for
- permission. This way, you can send &mdn;s for
- selected messages while denying or ignoring them
- for others.
- </para>
- </listitem>
+ <term>
+ <guilabel>Ask</guilabel>
+ </term>
+ <listitem>
+ <para>
+ Answers requests only after asking the user for
+ permission. This way, you can send &mdn;s for
+ selected messages while denying or ignoring them
+ for others.
+ </para>
+ </listitem>
</varlistentry>
+
<varlistentry>
- <term>
- <guilabel>Deny</guilabel>
- </term>
- <listitem>
- <para>
- Always sends a <quote>denied</quote>
- notification. This is only
- <emphasis>slightly</emphasis> better than always
- sending &mdn;s. The author will still know that
- the messages has been acted upon, he just cannot
- tell whether it was deleted or read &etc;
- </para>
- </listitem>
+ <term>
+ <guilabel>Deny</guilabel>
+ </term>
+ <listitem>
+ <para>
+ Always sends a <quote>denied</quote>
+ notification. This is only
+ <emphasis>slightly</emphasis> better than always
+ sending &mdn;s. The author will still know that
+ the message has been acted upon; he just cannot
+ tell whether it was deleted or read, &etc;
+ </para>
+ </listitem>
</varlistentry>
+
<varlistentry>
- <term>
- <guilabel>Always send</guilabel>
- </term>
- <listitem>
- <para>
- Always sends the requested disposition
- notification. That means that the author of the
- message gets to know when the message was acted
- upon and, in addition, what happened to it
- (displayed, deleted, &etc;). This option is
- strongly discouraged, but since it makes sense
- where privacy is not a concern, ⪚ in customer
- relationship management, it has been made
- available.
- </para>
- </listitem>
+ <term>
+ <guilabel>Always send</guilabel>
+ </term>
+ <listitem>
+ <para>
+ Always sends the requested disposition
+ notification. This means that the author of the
+ message gets to know when the message was acted
+ upon and, in addition, what happened to it
+ (displayed, deleted, &etc;). This option is
+ strongly discouraged, but since it makes sense
+ where privacy is not a concern, ⪚, in customer
+ relationship management, it has been made
+ available.
+ </para>
+ </listitem>
</varlistentry>
</variablelist>
+
<para>
If you are unsure, experiment a while with
- <guilabel>Ask</guilabel> and if you find &kmail;s
+ <guilabel>Ask</guilabel>. Then, if you find &kmail;'s
questions annoying, switch to <guilabel>Ignore</guilabel>.
</para>
+ <para> </para><!-- add whitespace -->
+
<para>
The following options (listed as <guilabel>Quote
original message</guilabel>) are available to control
<emphasis>how much</emphasis> of the original message
- &kmail; sends back in &mdn;s.
+ &kmail; sends back with &mdn;s.
</para>
+
<variablelist>
<varlistentry>
- <term>
- <guilabel>Nothing</guilabel>
- </term>
- <listitem>
- <para>
- No parts of the message other than the mandatory
- message-id and the original recipient is included
- in the &mdn; reply. This preserves enough
- information for the sender to find the message in
- his sent messages for which this &mdn; was
- generated.
- </para>
- </listitem>
+ <term>
+ <guilabel>Nothing</guilabel>
+ </term>
+ <listitem>
+ <para>
+ No parts of the message other than the mandatory
+ message-id and the original recipient are included
+ in the &mdn; reply. This preserves enough
+ information for the sender to uniquely identify
+ the message for which this &mdn; was generated.
+ </para>
+ </listitem>
</varlistentry>
+
<varlistentry>
- <term>
- <guilabel>Full message</guilabel>
- </term>
- <listitem>
- <para>
- Attaches the complete message to the disposition
- notification. Usually, this is overkill. It does
- not add any valuable information that cannot be
- deduced from the message headers alone, but people
- sometimes insist on this, since it is much easier
- for humans to correlate the content of the message
- than just the headers to what they sent earlier.
- </para>
- </listitem>
+ <term>
+ <guilabel>Full message</guilabel>
+ </term>
+ <listitem>
+ <para>
+ Attaches the complete message to the disposition
+ notification. Usually, this is overkill. It does
+ not add any valuable information that cannot be
+ deduced from the message headers alone, but people
+ sometimes insist on this, since it is much easier
+ for humans to correlate the content of the message
+ (and not just the headers) with what they sent earlier.
+ </para>
+ </listitem>
</varlistentry>
+
<varlistentry>
- <term>
- <guilabel>Only headers</guilabel>
- </term>
- <listitem>
- <para>
- Attaches only the headers to the disposition
- notification. This is usually enough to enable
- both humans (by subject) and computers (by
- message-id) to easily correlate &mdn; and original
- message.
- </para>
- </listitem>
+ <term>
+ <guilabel>Only headers</guilabel>
+ </term>
+ <listitem>
+ <para>
+ Attaches only the headers to the disposition
+ notification. This is usually enough to enable
+ both humans (by subject) and computers (by
+ message-id) to easily correlate &mdn; and original
+ message.
+ </para>
+ </listitem>
</varlistentry>
</variablelist>
+
<para>
- If unsure, leave the option at the default.
+ If unsure, leave this option set to the default value (nothing).
</para>
</listitem>
</varlistentry>
@@ -1541,49 +2369,40 @@ of key words can be modified.</para>
</para>
<para>
Strictly speaking, this option is not needed, since
- &kmail; sends &mdn;s regardless of whether the message
- could be successfully decrypted or not (the disposition
+ &kmail; sends &mdn;s whether the message
+ could be successfully decrypted, or not (the disposition
notification request resides in the unencrypted part of
- the message), but it gives the security-conscious user
- the choice to either send them always if requested
+ the message); but it gives the security-conscious user
+ a choice: either to send them when requested
(option unchecked), or never (option checked).
</para>
<para>
- If unsure, leave the option checked.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>
- <guilabel>Automatically import keys and certificates</guilabel>
- </term>
- <listitem>
- <para>
- If checked, &kmail; automatically imports any attachments
- containing &openpgp; keys into your local keyring, and any
- attachments containing &smime; keys into your local key
- box.
+ If unsure, leave this option checked (the default value).
</para>
- <note>
- <para>
- Verifying &smime; signatures always involves importing
- the contained certificates. This option thus does not
- affect this. It is also unrelated to &gpg;'s
- <option>auto-key-retrieve</option> feature, where &gpg;
- will try to import unknown keys from a key server.
- </para>
- </note>
</listitem>
</varlistentry>
- </variablelist>
+ </variablelist>
+ <para> </para><!-- add whitespace -->
</sect2>
<sect2 id="configure-security-composing">
- <title>
- Composing
- </title>
-
+ <title>Composing</title>
+ <screenshot>
+ <screeninfo>Security Composing</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="securitycomposing.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Security Composing</phrase>
+ </textobject>
+ <caption>
+ <para>The Security (Composing) Tab</para>
+ </caption>
+ </mediaobject>
+ </screenshot>
+ <para> </para><!-- add whitespace -->
+
<para>
On this tab you can configure security-relevant options for
composing messages.
@@ -1621,7 +2440,7 @@ of key words can be modified.</para>
<para>
If you uncheck this option, you may not be able to
decrypt the messages written by yourself and encrypted
- to other people anymore.
+ to other people any more.
</para>
</warning>
</listitem>
@@ -1629,24 +2448,24 @@ of key words can be modified.</para>
<varlistentry id="configure-security-composing-store-sent-encrypted">
<term>
- <guilabel>Store sent messages encrypted</guilabel><!--
- --><footnote>
+ <guilabel>Store sent messages encrypted</guilabel>
+ <footnote>
<para>
- This option enables a mode of using mail encryption
- that is sometimes (misleadingly) called
- <quote>transport-only</quote> encryption. In this mode
- of operation, the message encryption is stripped off
- as soon as the message has reached its
- destination. The encryption lasts only while the
- message is on its way.
+ This option enables a mode of using mail encryption
+ that is sometimes (misleadingly) called
+ <quote>transport-only</quote> encryption. In this mode
+ of operation, the message encryption is stripped off
+ as soon as the message has reached its
+ destination. The encryption lasts only while the
+ message is on its way.
</para>
<para>
- &kmail; supports this mode half-heartedly, since such
- functionality should better placed at the mail
- <emphasis>server</emphasis> (<acronym>MTA</acronym>)
- than at the mail <emphasis>client</emphasis>
- (<acronym>MUA</acronym>) level. Thus, future versions
- of &kmail; may drop support for this option.
+ &kmail; supports this mode half-heartedly, since such
+ functionality should be placed at the mail
+ <emphasis>server</emphasis> (<acronym>MTA</acronym>)
+ and not at the mail <emphasis>client</emphasis>
+ (<acronym>MUA</acronym>) level. Thus, future versions
+ of &kmail; may drop support for this option.
</para>
</footnote>
</term>
@@ -1674,7 +2493,7 @@ of key words can be modified.</para>
<para>
If checked, every time you encrypt a message, a dialog
will appear that presents you with the encryption keys
- that will be used for each recipient. You can then
+ that will be used for each recipient. You may then
review the choice of keys, change them, and approve or
cancel the encryption operation. We recommend to keep
this option checked, since it makes the encryption
@@ -1699,7 +2518,7 @@ of key words can be modified.</para>
</para>
<para>
It is highly recommended to turn this on, as it makes
- encrypting messages really easy to use.
+ encryption really easy to use.
</para>
</listitem>
</varlistentry>
@@ -1722,13 +2541,27 @@ of key words can be modified.</para>
</varlistentry>
</variablelist>
-
+ <para> </para><!-- add whitespace -->
</sect2>
<sect2 id="configure-security-warnings">
- <title>
- Miscellaneous
- </title>
+ <title>Miscellaneous</title>
+ <screenshot>
+ <screeninfo>Security Miscellaneous Autocorrection</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="securitymisc.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Security Miscellaneous</phrase>
+ </textobject>
+ <caption>
+ <para>The Security (Miscellaneous) Tab</para>
+ </caption>
+ </mediaobject>
+ </screenshot>
+ <para> </para><!-- add whitespace -->
+
<para>
On this tab you can switch security-relevant warnings on and
@@ -1775,7 +2608,7 @@ of key words can be modified.</para>
</listitem>
</varlistentry>
- <varlistentry id="configure-security-warnings-warn-receiver-email-not-in-cert">
+ <!-- <varlistentry id="configure-security-warnings-warn-receiver-email-not-in-cert">
<term>
<guilabel>Warn if receiver's email address is not in certificate</guilabel>
</term>
@@ -1794,7 +2627,7 @@ of key words can be modified.</para>
that does not include the email address of the sender.
</para>
</listitem>
- </varlistentry>
+ </varlistentry> --> <!-- This option is no longer provided. @dcb2020340. -->
<varlistentry id="configure-security-warnings-warn-near-expire">
<term>
@@ -1815,9 +2648,23 @@ of key words can be modified.</para>
</para>
</listitem>
</varlistentry>
- <!--
- GnuPG Settings
- -->
+
+ <varlistentry>
+ <term>
+ <guibutton>GnuPG Settings ...</guibutton>
+ </term>
+ <listitem>
+ <para>
+ Click on this button to open an extensive dialog which configures the
+ interactions between &kmail; and &gpg;, the Gnu Privacy Guard
+ program. &gpg; is too complex to document here. For details you
+ should refer to <ulink url="https://www.gnupg.org/docs.html#guides">The
+ &GNU; Privacy Handbook</ulink>. Unless you're an encryption expert,
+ you probably ought to accept the default settings here.
+ </para>
+ </listitem>
+ </varlistentry>
+
<varlistentry id="configure-security-warnings-reenable-all-warnings">
<term>
<guilabel>Re-Enable All "Don't Ask Again" Warnings</guilabel>
@@ -1825,39 +2672,52 @@ of key words can be modified.</para>
<listitem>
<para>
Apart from the main warnings described above, there are
- more warning and information messages, which contain an
- option to not show them again. If you would like to
- re-enable them after choosing not to show them again,
- you can achieve this by pressing this button.<!--
- --><footnote>
+ many warning and informational messages, each containing an
+ option not to show them again. If you would like to
+ re-enable these messages after suppressing them,
+ you can achieve that by pressing this button.
+ <footnote>
<para>
This will re-enable <emphasis>all</emphasis> such
warnings for &kmail;. It does not make much sense to
allow more fine-grained selection of which warnings
to show since you can just check the option to
- suppress them again when they next show up.
+ suppress them again the next time they appear.
</para>
- </footnote>
+ </footnote>
</para>
</listitem>
</varlistentry>
</variablelist>
-
+ <para> </para><!-- add whitespace -->
</sect2>
<sect2 id="configure-security-smime-validation">
<!-- copy of section configuration-smime-validation from kleopatra docbook
keep in sync, both apps have the same page in settings-->
- <title>
- &smime; Validation
- </title>
+ <title>&smime; Validation</title>
+ <screenshot>
+ <screeninfo>Security &smime; Validation</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="securitysmime.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Security &smime; Validation</phrase>
+ </textobject>
+ <caption>
+ <para>The Security (&smime; Validation) Tab</para>
+ </caption>
+ </mediaobject>
+ </screenshot>
+ <para> </para><!-- add whitespace -->
<para>
- This tab contains selected entries from &gpgsm;'s <!--link
- linkend="configure-security-crypto-backends-configure">dynamic
- backend configuration dialog</link-->. Please refer
- to the &gpgsm; manual for a description of these options.
+ This tab contains selected entries from &gpgsm;'s <ulink
+ url="https://linux.die.net/man/1/gpgsm">dynamic
+ back end configuration dialog</ulink>. Please refer
+ to the &gpgsm; manual for a more detailed description of these options.
</para>
<variablelist>
@@ -1870,6 +2730,7 @@ of key words can be modified.</para>
<para>
If checked, &smime; certificates are validated using
Certificate Revocation Lists (<acronym>CRLs</acronym>).
+ This is the default configuration option.
</para>
</listitem>
</varlistentry>
@@ -1881,25 +2742,20 @@ of key words can be modified.</para>
<listitem>
<para>
If this option is selected, &smime; certificates are validated
- using the Online Certificates Status Protocol
- (<acronym>OCSP</acronym>).
- </para>
- <para>
- Fill in the &URL; of the <acronym>OCSP</acronym>
- responder in the field reserved at this effect.
- </para>
+ using the Online Certificates Status Protocol
+ (<acronym>OCSP</acronym>).
+ </para>
</listitem>
</varlistentry>
<varlistentry id="configure-smime-online-certificate-responder-url">
<term>
- <guilabel>OCSP responder &URL;</guilabel>
+ <guilabel>OCSP responder &URL;:</guilabel>
</term>
<listitem>
<para>
- Enter the address of the server for online validation
- of certificates. The &URL;
- is usually starting with <emphasis>https://</emphasis>.
+ Enter the address of the server for online validation
+ of certificates. This &URL; usually starts with <emphasis>https://</emphasis>.
</para>
</listitem>
</varlistentry>
@@ -1911,7 +2767,7 @@ of key words can be modified.</para>
<listitem>
<para>
Select or change and enter the &smime; key to use.
- </para>
+ </para>
</listitem>
</varlistentry>
@@ -1922,7 +2778,7 @@ of key words can be modified.</para>
<listitem>
<para>
Check this option to skip online validation using the OCSP.
- This Option requires <emphasis>dirmngr >= 0.9.0</emphasis>.
+ This option requires <emphasis>dirmngr >= 0.9.0</emphasis>.
</para>
</listitem>
</varlistentry>
@@ -1934,9 +2790,9 @@ of key words can be modified.</para>
<listitem>
<para>
By default, <guilabel>GnuPG</guilabel> uses the file
- <emphasis>~/.gnupg/policies.txt</emphasis> to check if a
- certificate policy is allowed. If this option is selected,
- policies are not checked.
+ <filename>~/.gnupg/policies.txt</filename> to check if a
+ certificate policy is allowed. If this option is selected,
+ such policies are not checked.
</para>
</listitem>
</varlistentry>
@@ -1948,7 +2804,7 @@ of key words can be modified.</para>
<listitem>
<para>
If this option is checked, Certificate Revocation Lists are
- never used to validate &smime; certificates.
+ never used to validate &smime; certificates.
</para>
</listitem>
</varlistentry>
@@ -1960,8 +2816,8 @@ of key words can be modified.</para>
<listitem>
<para>
Check this option if you want the missing issuer certificates
- to be fetched when necessary. This applies to both validation
- methods, <acronym>CRLs</acronym> and <acronym>OCSP</acronym>.
+ to be fetched when necessary. This applies to both validation
+ methods, <acronym>CRLs</acronym> and <acronym>OCSP</acronym>.
</para>
</listitem>
</varlistentry>
@@ -1972,8 +2828,7 @@ of key words can be modified.</para>
</term>
<listitem>
<para>
- Entirely disables the use of &HTTP; for
- &smime;.
+ Entirely disables the use of &HTTP; for &smime;.
</para>
</listitem>
</varlistentry>
@@ -1984,15 +2839,15 @@ of key words can be modified.</para>
</term>
<listitem>
<para>
- When looking for the location of a CRL,
- the <quote>to-be-tested</quote> certificate usually contains
- what are known as CRL Distribution Point (<acronym>DP</acronym>) entries,
- which are &URL;s describing the way to access
- the &URL;. The first found <acronym>DP</acronym>
- entry is used.
- With this option all entries using the &HTTP;
- scheme are ignored when looking for a suitable
- <acronym>DP</acronym>.
+ When looking for the location of a CRL,
+ the <quote>to-be-tested</quote> certificate usually contains
+ what are known as CRL Distribution Point (<acronym>DP</acronym>) entries,
+ which are &URL;s describing the way to access
+ the &URL;. The first found <acronym>DP</acronym>
+ entry is used.
+ With this option all entries using the &HTTP;
+ scheme are ignored when looking for a suitable
+ <acronym>DP</acronym>.
</para>
</listitem>
</varlistentry>
@@ -2003,10 +2858,10 @@ of key words can be modified.</para>
</term>
<listitem>
<para>
- If this option is selected, the value of the
- &HTTP; proxy shown on the right
- (which comes from the environment variable <varname>http_proxy</varname>)
- will be used for any &HTTP; request.
+ If this option is selected, the value of the
+ &HTTP; proxy shown on the right
+ (which comes from the environment variable <varname>http_proxy</varname>)
+ will be used for any &HTTP; request.
</para>
</listitem>
</varlistentry>
@@ -2017,11 +2872,11 @@ of key words can be modified.</para>
</term>
<listitem>
<para>
- Enter here the location of your &HTTP; Proxy,
- which will be used for all &HTTP; requests
- relating to &smime;
- The syntax is <quote>host:port</quote>, for instance
- <emphasis>myproxy.nowhere.com:3128</emphasis>.
+ Enter the location of your &HTTP; Proxy here,
+ which will be used for all &HTTP; requests
+ relating to &smime;.
+ The syntax is <quote>host:port</quote>, for example,
+ <emphasis>myproxy.nowhere.com:3128</emphasis>.
</para>
</listitem>
</varlistentry>
@@ -2032,8 +2887,7 @@ of key words can be modified.</para>
</term>
<listitem>
<para>
- Entirely disables the use of LDAP for
- &smime;.
+ Entirely disables the use of LDAP for &smime;.
</para>
</listitem>
</varlistentry>
@@ -2044,15 +2898,15 @@ of key words can be modified.</para>
</term>
<listitem>
<para>
- When looking for the location of a <acronym>CRL</acronym>,
- the <quote>to-be-tested</quote> certificate usually contains
- what are known as CRL Distribution Point (<acronym>DP</acronym>) entries,
- which are &URL;s describing the way to access
- the &URL;.
- The first found <acronym>DP</acronym> entry is used.
- With this option all entries using the <acronym>LDAP</acronym>
- scheme are ignored when looking for a suitable
- <acronym>DP</acronym>.
+ When looking for the location of a <acronym>CRL</acronym>,
+ the <quote>to-be-tested</quote> certificate usually contains
+ what are known as CRL Distribution Point (<acronym>DP</acronym>) entries,
+ which are &URL;s describing the way to access
+ the &URL;.
+ The first found <acronym>DP</acronym> entry is used.
+ With this option all entries using the <acronym>LDAP</acronym>
+ scheme are ignored when looking for a suitable
+ <acronym>DP</acronym>.
</para>
</listitem>
</varlistentry>
@@ -2063,131 +2917,165 @@ of key words can be modified.</para>
</term>
<listitem>
<para>
- Entering a <acronym>LDAP</acronym> server here will make all
- <acronym>LDAP</acronym> requests go to that server first.
- More precisely, this setting overrides any specified host
- and port part in a <acronym>LDAP</acronym> &URL; and will also
- be used if host and port have been omitted from the
- &URL;. Other <acronym>LDAP</acronym> servers
- will be used only if the connection to the
- <emphasis>proxy</emphasis> failed.
- The syntax is <acronym>HOST</acronym> or
- <acronym>HOST:PORT</acronym>. If <acronym>PORT</acronym> is
- omitted, <quote>port 389</quote>
- (standard <acronym>LDAP</acronym> port) is used.
+ Entering a <acronym>LDAP</acronym> server here will make all
+ <acronym>LDAP</acronym> requests go to that server first.
+ More precisely, this setting overrides any specified host
+ and port part in a <acronym>LDAP</acronym> &URL; and will also
+ be used if host and port have been omitted from the
+ &URL;. Other <acronym>LDAP</acronym> servers
+ will be used only if the connection to the
+ <emphasis>proxy</emphasis> failed.
+ The syntax is <acronym>HOST</acronym> or
+ <acronym>HOST:PORT</acronym>. If <acronym>PORT</acronym> is
+ omitted, <quote>port 389</quote>
+ (standard <acronym>LDAP</acronym> port) is used.
</para>
</listitem>
</varlistentry>
- </variablelist>
+ </variablelist>
+ <para> </para><!-- add whitespace -->
</sect2>
- </sect1> <!-- configure-security -->
+</sect1> <!-- configure-security -->
<sect1 id="configure-misc">
<title>Misc Page</title>
-<sect2 id="configure-misc-folders">
-<title>Folders</title>
-
-<variablelist>
-
-<varlistentry>
-<term><guilabel>Ask for confirmation before moving all messages to trash</guilabel></term>
-<listitem>
-<para>Enable this option if you want to be asked for confirmation whenever
-you use <menuchoice><guimenu>Folder</guimenu><guimenuitem>Move All to Trash</guimenuitem></menuchoice>.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><guilabel>Exclude important messages from expiry</guilabel></term>
-<listitem>
-<para>Enable this option if important messages should never be deleted
-during message expiration, &ie; during automatic deletion of old
-messages.</para>
-</listitem>
-</varlistentry>
+ <sect2 id="configure-misc-folders">
+ <title>Folders</title>
+ <screenshot>
+ <screeninfo>Miscellaneous Folders</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="miscfolders.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Miscellaneous Folders</phrase>
+ </textobject>
+ <caption>
+ <para>The Miscellaneous (Folders) Tab</para>
+ </caption>
+ </mediaobject>
+ </screenshot>
+ <para> </para><!-- add whitespace -->
+
+ <variablelist>
+
+ <!--varlistentry>
+ <term><guilabel>Ask for confirmation before moving all messages to trash</guilabel></term>
+ <listitem>
+ <para>
+ Enable this option if you want to be asked for confirmation whenever
+ you use <menuchoice><guimenu>Folder</guimenu><guimenuitem>Move All to Trash</guimenuitem></menuchoice>.
+ </para>
+ </listitem>
+ </varlistentry--><!-- Option has been removed @dcb2020311 -->
-<varlistentry id="configure-misc-folders-go-unread">
-<term><guilabel>When trying to find unread messages</guilabel></term>
-<listitem>
-<para>This option controls what happens if you press one of the shortcuts to
-go to the next or previous unread message (⪚ <keycap>Space</keycap>).
-If you ask &kmail; to go to the next unread message although there is no
-unread message below the currently selected message then the following happens:
-<itemizedlist>
-<listitem>
-<para>If <guilabel>Do not Loop</guilabel> is selected then nothing will happen.
-</para>
-</listitem>
-<listitem>
-<para>If <guilabel>Loop in Current Folder</guilabel> is selected then &kmail;
-will search from the beginning of the current folder for an unread message. If
-none is found then nothing happens.</para>
-</listitem>
-<listitem>
-<para>If <guilabel>Loop in All Folders</guilabel> is selected then &kmail;
-will first search in the current folder for another unread message. If none
-is found then &kmail; will search the next folder containing unread messages.
-</para>
-</listitem>
-</itemizedlist>
-Correspondingly, if you ask &kmail; to go to the previous unread message.
-</para>
-</listitem>
-</varlistentry>
+ <varlistentry>
+ <term><guilabel>Exclude important messages from expiry</guilabel></term>
+ <listitem>
+ <para>
+ Enable this option if important messages should never be deleted
+ automatically.
+ </para>
+ </listitem>
+ </varlistentry>
-<varlistentry>
+ <varlistentry id="configure-misc-folders-go-unread">
+ <term><guilabel>When trying to find unread messages</guilabel></term>
+ <listitem>
+ <para>
+ This option controls what happens if you press one of the shortcuts to
+ go to the next or previous unread message (⪚ <keycap>Space</keycap>).
+ If you ask &kmail; to go to the next unread message although there is no
+ unread message below the currently selected message then the following happens.
+
+ <itemizedlist>
+ <listitem>
+ <para>
+ If <guilabel>Do not Loop</guilabel> is selected then nothing will happen.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ If <guilabel>Loop in Current Folder</guilabel> is selected then &kmail;
+ will search from the beginning of the current folder for an unread message. If
+ none is found then nothing happens.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ If <guilabel>Loop in All Folders</guilabel> is selected then &kmail;
+ will first search in the current folder for another unread message. If none
+ is found then &kmail; will search the next folder containing unread messages.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </listitem>
+ </varlistentry>
-<term><guilabel>When entering a folder</guilabel></term>
-<listitem>
-<para>This option controls what happens if you open a folder.
-<itemizedlist>
-<listitem>
-<para>If <guilabel>Jump to First Unread Message</guilabel> is selected then &kmail; will
-select the first message it finds that is marked as unread.
-</para>
-</listitem>
-<listitem>
-<para>If <guilabel>Jump to Last Selected Message</guilabel> is selected then &kmail; will select
-the message that was selected when the folder was open the last time.
-</para>
-</listitem>
-<listitem>
-<para>If <guilabel>Jump to Newest Message</guilabel> is selected then &kmail; will select the newest
-message by date.
-</para>
-</listitem>
-<listitem>
-<para>If <guilabel>Jump to Oldest Message</guilabel> is selected then &kmail; will select the oldest
-message by date.
-</para>
-</listitem>
-</itemizedlist>
+ <varlistentry>
+ <term><guilabel>When entering a folder</guilabel></term>
+ <listitem>
+ <para>
+ This option controls what happens when you open a folder.
+
+ <itemizedlist>
+ <listitem>
+ <para>
+ If <guilabel>Jump to First Unread Message</guilabel> is selected, &kmail; will
+ select the first message it finds that is marked as unread.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ If <guilabel>Jump to Last Selected Message</guilabel> is selected, &kmail; will select
+ the message that had been selected when the folder was most recently open.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ If <guilabel>Jump to Newest Message</guilabel> is selected, &kmail; will select the newest
+ message.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ If <guilabel>Jump to Oldest Message</guilabel> is selected, &kmail; will select the oldest
+ message.
+ </para>
+ </listitem>
+ </itemizedlist>
-</para>
-</listitem>
-</varlistentry>
+ </para>
+ </listitem>
+ </varlistentry>
-<varlistentry>
-<term><guilabel>Mark selected message as read after...</guilabel></term>
-<listitem>
-<para>When you select a <guilabel>new</guilabel> or
-<guilabel>unread</guilabel> message, &kmail; will change the
-message's status to <guilabel>read</guilabel> after the number of seconds
-entered here. If you disable this option, messages will keep their
-<guilabel>new</guilabel> or <guilabel>unread</guilabel> status.</para>
-</listitem>
-</varlistentry>
+ <varlistentry>
+ <term><guilabel>Mark selected message as read after...</guilabel></term>
+ <listitem>
+ <para>
+ When you select a <guilabel>new</guilabel> or
+ <guilabel>unread</guilabel> message, &kmail; will change the
+ message's status to <guilabel>read</guilabel> after this many seconds.
+ If you disable this option, messages will retain their
+ <guilabel>new</guilabel> or <guilabel>unread</guilabel> status until
+ you adjust it manually (via the <guilabel>Folder</guilabel> menu).
+ </para>
+ </listitem>
+ </varlistentry>
-<varlistentry>
-<term><guilabel>Ask for action after dragging messages to another folder</guilabel></term>
-<listitem>
-<para>When you drag a message to a different folder, a small popup will ask
-you if you want to move or copy the message. If you disable this option,
-the message will be moved immediately, without a popup.</para>
-</listitem>
-</varlistentry>
+ <varlistentry>
+ <term><guilabel>Ask for action after dragging messages to another folder</guilabel></term>
+ <listitem>
+ <para>
+ When you drag a message to a different folder, a small popup will ask
+ you if you want to move or copy the message. If you disable this option,
+ the message will be moved immediately, without a popup.
+ </para>
+ </listitem>
+ </varlistentry>
<!-- not in kmail 2.0.96 varlistentry>
<term><guilabel>By default, message folders on disk are...</guilabel></term>
@@ -2197,56 +3085,99 @@ that is used when you create a new folder.</para>
</listitem>
</varlistentry-->
-<varlistentry>
-<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
-folders in the folder list, and then they will stay collapsed when &kmail;
-starts.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><guilabel>Empty the local trash folder on program exit</guilabel></term>
-<listitem>
-<para>The trash folder is cleared of messages when you quit &kmail; if this
-option is selected.</para>
-</listitem>
-</varlistentry>
-
-</variablelist>
-
-</sect2>
-
-<sect2 id="configure-misc-invitation">
-<title>Invitations</title>
-
-<variablelist>
+ <varlistentry>
+ <term><guilabel>Open this folder on startup</guilabel></term>
+ <listitem>
+ <para>
+ Here you can set the folder that should be selected when 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
+ folders in the folder list, and they will stay collapsed when &kmail; starts.
+ </para>
+ </listitem>
+ </varlistentry>
-<varlistentry>
-<term><guilabel>Mangle From:/To: headers in replies to invitations</guilabel></term>
-<listitem>
-<para>Enable this option to make <application>&Microsoft; Outlook</application> understand your answers to invitations replies.</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term><guilabel>Send invitations in the mail body</guilabel></term>
-<listitem>
-<para>Invitations are usually sent as attachments to a mail. When this option is enabled, invitation are sent in the text of the mail, which is necessary to send invitations and replies to <application>&Microsoft; Outlook</application>.</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term><guilabel>Exchange compatible invitations naming</guilabel></term>
-<listitem>
-<para><application>&Microsoft; Outlook</application>, when used in combination with a &Microsoft; Exchange
-server, has a problem understanding standards-compliant groupware e-mail.
-Enable this option to send groupware invitations in a way that &Microsoft;
-Exchange understands. The invitation will be sent as an attachment with name <filename>ical.ics</filename>.</para>
-</listitem>
-</varlistentry>
-<varlistentry>
+ <varlistentry>
+ <term><guilabel>Empty the local trash folder on program exit</guilabel></term>
+ <listitem>
+ <para>
+ The trash folder is cleared of messages when you quit &kmail; if this
+ option is selected.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Allow deleting messages without confirmation</guilabel></term>
+ <listitem>
+ <para>
+ &kmail;'s default behavior is to ask for confirmation when deleting a message.
+ Select this option if you wish to skip that verification step. (Note that the
+ <guilabel>Delete</guilabel> function is not accessible from &kmail;'s menus. But you
+ can add a <guibutton>Delete</guibutton> button to the toolbar via the <menuchoice>
+ <guimenu>Settings</guimenu><guimenuitem>Configure Toolbars ...</guimenuitem></menuchoice>
+ dialog.)
+ </para>
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
+ <para> </para><!-- add whitespace -->
+ </sect2>
+
+ <sect2 id="configure-misc-invitation">
+ <title>Invitations</title>
+ <screenshot>
+ <screeninfo>Miscellaneous Invitation</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="miscinvite.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Miscellaneous Invitation</phrase>
+ </textobject>
+ <caption>
+ <para>The Miscellaneous (Invitation) Tab</para>
+ </caption>
+ </mediaobject>
+ </screenshot>
+ <para> </para><!-- add whitespace -->
+
+ <variablelist>
+
+ <varlistentry>
+ <term><guilabel>Mangle From:/To: headers in replies to invitations</guilabel></term>
+ <listitem>
+ <para>
+ Enable this option to make <application>&Microsoft; Outlook</application> understand your reply to an invitation.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Send invitations in the mail body</guilabel></term>
+ <listitem>
+ <para>
+ Invitations are usually sent as attachments to a message. When this option is enabled,
+ invitations are sent in the body of the message. This is necessary when sending
+ invitations and replies to <application>&Microsoft; Outlook</application>.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Exchange compatible invitations naming</guilabel></term>
+ <listitem>
+ <para>
+ <application>&Microsoft; Outlook</application>, when used in combination with a &Microsoft; Exchange
+ server, has a problem understanding standards-compliant groupware e-mail.
+ Enable this option to send groupware invitations in a format that &Microsoft;
+ Exchange can decipher. The invitation will be sent as an attachment named <filename>ical.ics</filename>.
+ </para>
+ </listitem>
+ </varlistentry>
+
+<!--varlistentry>
<term><guilabel>Outlook compatible invitation reply comments</guilabel></term>
<listitem>
<para>When the user provides comments when responding to invitations, send the comment in a way that <application>&Microsoft; Outlook</application> understands. If this option is not enabled, the response comments will not be seen in Outlook.</para>
@@ -2265,23 +3196,166 @@ This is the default. The user can turn this option off if they want to see the i
<varlistentry>
<term><guilabel>Automatic invitation sending</guilabel></term>
<listitem>
-<para>When this is checked, you will not see the mail composer window. Instead,
+<para>When this is checked, you will not see the mail composer window. Instead,
all invitation mails are sent automatically. If you want to see the mail
before sending it, you can uncheck this option. However, be aware that the
text in the composer window is in iCalendar syntax, and you should not try
modifying it by hand.</para>
</listitem>
-</varlistentry>
-<varlistentry>
-<term><guilabel>Delete invitation emails after the reply to them has been sent</guilabel></term>
-<listitem>
-<para>When this is checked, received invitation emails that have been replied to
-will be moved to the Trash folder, once the reply has been successfully sent.</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</sect2>
+</varlistentry--><!-- These options are no longer available. @dcb2020342-->
+
+ <varlistentry>
+ <term><guilabel>Delete invitation emails after the reply to them has been sent</guilabel></term>
+ <listitem>
+ <para>
+ When this option is checked, invitations that have been replied to
+ will be moved to the Trash folder as soon as the reply has been sent.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <para> </para><!-- add whitespace -->
+ </sect2>
+
+ <sect2 id="configure-misc-printing">
+ <title>Printing</title>
+ <screenshot>
+ <screeninfo>Miscellaneous Printing</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="miscprint.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Miscellaneous Printing</phrase>
+ </textobject>
+ <caption>
+ <para>The Miscellaneous (Printing) Tab</para>
+ </caption>
+ </mediaobject>
+ </screenshot>
+ <para> </para><!-- add whitespace -->
+
+ <para>
+ This dialog helps you fine tune the way the <menuchoice>
+ <guimenu>File</guimenu><guimenuitem>Print</guimenuitem>
+ </menuchoice> function operates.
+ </para>
+
+ <variablelist>
+
+ <varlistentry>
+ <term><guilabel>Print only selected text</guilabel></term>
+ <listitem>
+ <para>
+ Enable this option to allow printing of only the selected portion of a message.
+ The default value disables this feature, so the entire message is printed by default.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Respect expand/collapse quote marks settings</guilabel></term>
+ <listitem>
+ <para>
+ This option is intended to interact with the <guilabel>Show expand/collapse quote marks</guilabel>
+ feature of the <link linkend="configure-appearance-general">Appearance/General</link> tab, but
+ it is not currently functioning correctly. In other words, there's a bug.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Print background color and images</guilabel></term>
+ <listitem>
+ <para>
+ Like the preceding option, there is a bug here, so &kmail; always prints images, no matter
+ how this option flag is set.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Always show encryption/signature details</guilabel></term>
+ <listitem>
+ <para>
+ Enable this option to make &kmail; print encryption details for encrypted and/or digitally
+ signed messages.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
+ </sect2>
+
+</sect1>
+<sect1 id="configure-plugins">
+ <title>Plugins Page</title>
+
+ <para>
+ This section of the documentation is still under construction.
+ </para>
+
+ <!-- <para>Add verbiage about the new "Plugins" page.</para>
+
+ <sect2 id="configure-plugins-akonadi">
+ <title>Akonadi</title>
+ <para>Describe Akonadi plugins here.</para>
+ </sect2>
+
+ <sect2 id="configure-plugins-check-before-send">
+ <title>Check Before Send</title>
+ <para>Describe Check Before Send plugins here.</para>
+ </sect2>
+
+ <sect2 id="configure-plugins-composer">
+ <title>Composer / External Editor</title>
+ <para>Describe Composer / External Editor plugin here.</para>
+ </sect2>
+
+ <sect2 id="configure-plugins-editor">
+ <title>Built-in Editor</title>
+ <para>Describe Editor plugins here.</para>
+ </sect2>
+
+ <sect2 id="configure-plugins-grammar">
+ <title>Grammar Check</title>
+ <para>Describe Grammar Check plugins here.</para>
+ </sect2>
+
+ <sect2 id="configure-plugins-header-style">
+ <title>Header Styles</title>
+ <para>Describe Header Style plugins here.</para>
+ </sect2>
+
+ <sect2 id="configure-plugins-message-viewer">
+ <title>Message Viewer</title>
+ <para>Describe Message Viewer plugins here.</para>
+ </sect2>
+
+ <sect2 id="configure-plugins-misc">
+ <title>Miscellaneous</title>
+ <para>Describe Miscellaneous plugins here.</para>
+ </sect2>
+
+ <sect2 id="configure-plugins-tools">
+ <title>Tools</title>
+ <para>Describe Tools plugins here.</para> -->
+<!-- <sect2 id="configure-composer-general-external-editor">
+ <title>External Editor</title>
+ <variablelist>
+ <varlistentry>
+ <term><guilabel>Use external editor instead of composer</guilabel></term>
+ <listitem>
+ <para>This selection allows you to use a different editor. Please note that the composer window will still open,
+ and the external editor will open on top of the composer window. When you are done, save the text and exit the editor.
+ The text will now appear in the composer window, where you can send it. Note that your editor may not return immediately, you have to use ⪚
+ <userinput><command> gvim <option>-f</option> <varname>%f</varname></command></userinput> for <application>gvim</application>.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </sect2> -->
+
</sect1>
<sect1 id="configure-non-gui-options">
@@ -2297,7 +3371,7 @@ The <command>kwriteconfig</command> will add the section for you as long as you
<para>
The &kmail; configuration file is called <filename>kmail2rc</filename>
-and can be found in your home directory. The location can vary according
+and can be found in your home directory. The location may vary according
to your operating system or distribution, but can always be found by running
the command <userinput><command>kf5-config --path config --locate kmail2rc</command></userinput>.
For the remainder of this section, assume that the configuration file is
@@ -2396,7 +3470,7 @@ To disable the feature, add to the <quote>[OutOfOffice]</quote> section:
<listitem>
<para>
In case you don't want users to be able to upload their own out-of-office scripts to
-the server you can add to the <quote>[OutOfOffice]</quote> section:
+the server you may add to the <quote>[OutOfOffice]</quote> section:
</para>
<itemizedlist>
<listitem><para>Configuration file:</para>
@@ -2414,7 +3488,7 @@ the server you can add to the <quote>[OutOfOffice]</quote> section:
<listitem>
<para>
If you want to allow your users to upload their own out-of-office scripts but you do not want them to be
-able to change the domain to react to and the react-to-spam setting, you can add to the <quote>[OutOfOffice]</quote> section:
+able to change the domain to react to and the react-to-spam setting, you may add to the <quote>[OutOfOffice]</quote> section:
</para>
<itemizedlist>
<listitem><para>Configuration file:</para>
@@ -2431,7 +3505,7 @@ able to change the domain to react to and the react-to-spam setting, you can add
<term><guilabel>OutOfOfficeDomain</guilabel></term>
<listitem>
<para>
-When editing vacation (out-of-office) scripts, the user can specify a domain to
+When editing vacation (out-of-office) scripts, the user may specify a domain to
limit the sending of such replies to. Applying defaults to the out-of-office configuration dialog via the corresponding
button will restore this domain, in case the user has changed it.
To pre-load this setting with a default value, add to the <quote>[OutOfOffice]</quote> section:</para>
diff --git a/doc/kmail2/dialog-cancel.png b/doc/kmail2/dialog-cancel.png
new file mode 100644
index 000000000..a1eaa948c
Binary files /dev/null and b/doc/kmail2/dialog-cancel.png differ
diff --git a/doc/kmail2/dialog-ok-apply.png b/doc/kmail2/dialog-ok-apply.png
new file mode 100644
index 000000000..e10d040fa
Binary files /dev/null and b/doc/kmail2/dialog-ok-apply.png differ
diff --git a/doc/kmail2/edit-undo.png b/doc/kmail2/edit-undo.png
new file mode 100644
index 000000000..921667bea
Binary files /dev/null and b/doc/kmail2/edit-undo.png differ
diff --git a/doc/kmail2/identitypicture.png b/doc/kmail2/identitypicture.png
index 4c4333a31..e0a8837ab 100644
Binary files a/doc/kmail2/identitypicture.png and b/doc/kmail2/identitypicture.png differ
diff --git a/doc/kmail2/mail-mark-unread.png b/doc/kmail2/mail-mark-unread.png
index e1c34c2f1..d9ea49660 100644
Binary files a/doc/kmail2/mail-mark-unread.png and b/doc/kmail2/mail-mark-unread.png differ
diff --git a/doc/kmail2/messagelisttheme.png b/doc/kmail2/messagelisttheme.png
deleted file mode 100644
index d4e88dd88..000000000
Binary files a/doc/kmail2/messagelisttheme.png and /dev/null differ
diff --git a/doc/kmail2/miscfolders.png b/doc/kmail2/miscfolders.png
new file mode 100644
index 000000000..5a343d5da
Binary files /dev/null and b/doc/kmail2/miscfolders.png differ
diff --git a/doc/kmail2/miscinvite.png b/doc/kmail2/miscinvite.png
new file mode 100644
index 000000000..b5d8846fa
Binary files /dev/null and b/doc/kmail2/miscinvite.png differ
diff --git a/doc/kmail2/miscprint.png b/doc/kmail2/miscprint.png
new file mode 100644
index 000000000..1e8641500
Binary files /dev/null and b/doc/kmail2/miscprint.png differ
diff --git a/doc/kmail2/securitycomposing.png b/doc/kmail2/securitycomposing.png
new file mode 100644
index 000000000..b4c103795
Binary files /dev/null and b/doc/kmail2/securitycomposing.png differ
diff --git a/doc/kmail2/securitymdn.png b/doc/kmail2/securitymdn.png
new file mode 100644
index 000000000..e9dfd6978
Binary files /dev/null and b/doc/kmail2/securitymdn.png differ
diff --git a/doc/kmail2/securitymisc.png b/doc/kmail2/securitymisc.png
new file mode 100644
index 000000000..f31622457
Binary files /dev/null and b/doc/kmail2/securitymisc.png differ
diff --git a/doc/kmail2/securityreading.png b/doc/kmail2/securityreading.png
new file mode 100644
index 000000000..7fa454946
Binary files /dev/null and b/doc/kmail2/securityreading.png differ
diff --git a/doc/kmail2/securitysmime.png b/doc/kmail2/securitysmime.png
new file mode 100644
index 000000000..d93298183
Binary files /dev/null and b/doc/kmail2/securitysmime.png differ
diff --git a/doc/kmail2/system-help.png b/doc/kmail2/system-help.png
new file mode 100644
index 000000000..d85b9dd3b
Binary files /dev/null and b/doc/kmail2/system-help.png differ
More information about the kde-doc-english
mailing list