diff --git a/doc/kmail2/getting-started.docbook b/doc/kmail2/getting-started.docbook
index 15ed44281..8f6cb9c3a 100644
--- a/doc/kmail2/getting-started.docbook
+++ b/doc/kmail2/getting-started.docbook
@@ -33,8 +33,8 @@
-2013-12-11
-&kde; 4.12
+2017-04-18
+Applications 17.08
@@ -64,16 +64,24 @@ start working with it right away. For more in-depth information see the
The first time you run &kmail; you will be greeted with the Account Wizard.If at anytime you need to run the account wizard again, you can find it under
-ToolsAccount Wizard.
+SettingsAdd Account.
The wizard will take you through the process of creating your email accounts. Your screens will vary depending
on how much the wizard can determine on its own. Below is an outline of the screens you may encounter while using this wizard.
- Provide personal data is the first screen of the wizard. It will prompt you for your basic account information: Full name:, E-mail address, and Password:.
+ Provide personal data is the first screen of the wizard. It will prompt you for your basic account information: Full name:, E-mail address, and Password.
By default, the Find provider settings on the Internet option is checked, the wizard will attempt to retrieve the necessary
information from the server. Uncheck this option if you are an expert user and you need to set up advanced configuration. Click the Next button once finished.
If you use GMail 2-step verification you will need to generate an application-specific password within gmail security settings and enter that password
- in the password text box.
+ in the password text box.
+
+
+
+ If you want to secure your communication with GnuPG you can generate a new key and publish the key on a public key server
+ or import an existing key.
+
+ When sending mails &kmail; then automatically looks for encryption keys of your recipients and secures the mail when keys for each recipient can be found.
+ It also signs your mails cryptographically so that it can be verified that your messages have not been tampered with.
@@ -82,9 +90,9 @@ start working with it right away. For more in-depth information see the
Once your account type has been selected, click the Next button, and you will be presented with the Personal Settings screen.
The Provide personal data screen will show again with the server details it found if the wizard was successful at determining the account type.
-
- Click the Create Account button, and it will set up the account. Click the Finish to complete the wizard and close the window.
+ Click the Finish set up the account, complete the wizard and close the window.
+
The Personal Settings screen will show if you had to enter your account type.
@@ -105,8 +113,8 @@ start working with it right away. For more in-depth information see the
The Configure window consists of six sections:
Identities, Accounts,
Appearance, Composer,
-Security, and
-Misc.
+Security, Misc, and
+Plugins.To begin sending and receiving messages you will only have to
change some settings in the Identities and
@@ -136,6 +144,7 @@ change some settings in the Identities and
linkend="configure-identity-cryptography">Cryptography
tab.
+
Optionally, go to the Signature tab and
enter your signature. This is a short text that will be
@@ -162,13 +171,7 @@ administrator.The Sending tab provides a list of
ways to send messages. The first item in the list is the default
way to send messages. Using the Add...
-button you can choose between two different ways of sending messages:
-SMTP and
-Sendmail. &Sendmail; here
-means a local software installation -- this has a
-reputation of being difficult to set up, so if you do not already have a
-working &Sendmail; configuration, choose
-SMTP and fill in the Name
+button you can fill in the Name
field with a descriptive name
(⪚ My Mail Account). Click the Create and Configure
and fill the Outgoing mail server
@@ -177,12 +180,6 @@ field with the name and domain of your mail server
not need to change the Port setting (the default is
25).
-
-If you do want to use &Sendmail; and you are using a dial-up
-connection, follow the instructions for setting up sendmail for a
-dial-up connection in the &FAQ;
-section.
-
The way of sending messages configured here will be used for
your default identity and for all other identities that do not have their own
way of sending messages. You can use different ways of sending
@@ -204,16 +201,20 @@ chapter.Receiving Messages
-
+
+By default the Local Folders (inbox, outgoing, sentmail,
+trash, drafts and templates) with data from a local Maildir folder are predefined on this tab.
+Using the drop down box you can select the Retrieval Options for these folders.
+
To set up an account so you can receive mail, press the
Add... button in the Receiving
tab. You will then be prompted for the type of your email account. Most users should
-select POP3 or IMAP E-Mail Server. If
+select POP3 E-Mail Server or IMAP E-Mail Server. If
you want to use a local mailbox file, please see the FAQ
about file locking.You will then be presented with
-the Akonadi Resource window. First, fill in the
+the account settings window. First, fill in the
Account name field to name your account. You can choose any name
you like. Username, Password, and
Incoming mail server should be filled in with the appropriate information
@@ -222,38 +223,8 @@ need to change the Port setting (the default for POP3 is
110, the default for IMAP is
143).
-
-Options relevant to Kolab server
-
-Select Disconnected IMAP when choosing your Account Type. Fill in the Login and Password fields with respectively your user email address and password on the Kolab server. In the Security section click on the Check What the Server Supports button for automated set-up of your Security configuration. The default should be TLS/PLAIN. The Kolab server supports SSL/PLAIN as well. These settings may of course be configured manually.
-
-If you want to use the "Out of Office" Replies functionality of the Kolab server, set-up the Filtering section of you DIMAP account by checking the Server supports Sieve option as well as Reuse host and login configuration, Managesieve port should be set to 2000 as default.
-
-
-
-
-Options only relevant to DIMAP (Kolab server)
-
-After having configured your Disconnect IMAP account, you
-need to activate the Groupware functionalities and set-up
-the Misc page for KMail.
-
-
-In the Misc page, of the Configure dialog, choose the Groupware tab. Check the Enable IMAP resource functionality option and select Kolab (XML) as Format used for the groupware folders. The Resource folders are in account combo-box should be set on the Receiving (kolab user) account of your choice (if you happen to have several accounts). You may if you wish hide the groupware folder by checking this option. It is recommended to check both Groupware Compatibility and Legacy Options for compatibility with an eventual Kolab Microsoft Outlook client for sending invitations and replies from a Kolab KDE client.
-
-
-
Options only relevant to IMAP
-If you are using IMAP, you can optionally
-specify a path in the Prefix to folders field. This
-tells &kmail; where it can find your folders on the server. If you also
-have a shell account on the server and the messages are stored in your home
-folder it might be useful to store the messages in a subfolder
-Mail. Use this as a value in
-the Prefix to folders field so that &kmail; does
-not mix up mailbox files and other files. If you are not interested in
-this feature, simple leave the field blank.If you check Automatically compact folders
&kmail; removes the messages you deleted from the
@@ -300,17 +271,6 @@ server. You should carefully test this to make sure it works safely.Options for both IMAP and POP3
-
&kmail; supports encryption via SSL/TLS and
STARTTLS (SSL/TLS should be preferred
if it is available).
@@ -323,7 +283,9 @@ if it is available).
LOGIN, CRAM-MD5 (recommended
if DIGEST-MD5 is not available),
-DIGEST-MD5 (recommended) and
+DIGEST-MD5 (recommended),
+NTLM,
+GSSAPINTLM and APOP authentication.