From 6121241ffb65c72919a3c6de021386636fe8d2e4 Mon Sep 17 00:00:00 2001 From: Andre Klapper Date: Sat, 22 Jun 2013 07:42:09 -0700 Subject: User docs: Embed account type configuration instructions on First Run Wizard page. The instructions per account are collapsed by default and expandable in clients that support ui: (like recent Yelp versions). This requires turning the of account types on intro-first-run.page into
s as ui:expandable is not supported inside of elements. Embedding directly does not require users to follow "Click here for configuration instructions for this account" links anymore, that we get rid of "Click here to get to next step if you came from the First Run Wizard help page" sections at the bottom of each account type configuration page. --- help/C/intro-first-run.page | 214 +++++++++++++++++---- help/C/mail-receiving-options-exchange-ews.page | 5 - help/C/mail-receiving-options-exchange-mapi.page | 4 - help/C/mail-receiving-options-imap-plus.page | 4 - help/C/mail-receiving-options-local-delivery.page | 4 - ...ceiving-options-maildir-format-directories.page | 4 - ...il-receiving-options-mh-format-directories.page | 4 - help/C/mail-receiving-options-pop.page | 4 - ...eceiving-options-unix-mbox-spool-directory.page | 4 - ...ail-receiving-options-unix-mbox-spool-file.page | 4 - help/C/mail-receiving-options-usenet-news.page | 4 - help/C/mail-sending-options-smtp.page | 3 - 12 files changed, 177 insertions(+), 81 deletions(-) diff --git a/help/C/intro-first-run.page b/help/C/intro-first-run.page index 5fe79d6069..1df68cfc72 100644 --- a/help/C/intro-first-run.page +++ b/help/C/intro-first-run.page @@ -42,28 +42,65 @@ xmlns="http://www.w3.org/2001/XInclude"/>
+
Receiving Email

First, choose the server type from the Server Type drop-down list.

If you are unsure about the type of server to choose, ask your system administrator or Internet Service Provider.

+

Later on, if you want to change an account, or if you want to create another one, go to EditPreferencesMail Accounts. Select the account you want to change, then click Edit. Alternately, add a new account by clicking Add.

 + +
+IMAP+ +

Keeps the mail on the server so you can access your mail from multiple systems.

+ +
+ + Show how to configure this account type + + IMAP+ receiving options + +
+ +
+ +
+POP +

Downloads your email to your hard disk.

+ +
+ + Show how to configure this account type + + POP receiving options + +
+ +
+ +
+USENET News +

Connects to a news server and downloads a list of available news digests.

+ +
+ + Show how to configure this account type + + Usenet news receiving options + +
-
-Common server types -

The most common available server types for normal users are:

- -

None: If you do not plan to use Evolution for receiving email.

Continue here for configuration.

 -

IMAP+: Keeps the mail on the server so you can access your mail from multiple systems.

Continue here for configuration.

 -

POP: Downloads your email to your hard disk.

Continue here for configuration.

 -

USENET News: Connects to a news server and downloads a list of available news digests.

Continue here for configuration.

 -
-
-Corporate server types -

Available server types for corporate users are:

- -

Exchange EWS: For connecting to a Microsoft Exchange 2007/2010 or OpenChange server. Note that this is currently under development and will replace the Exchange MAPI account type in the future. It might not be available yet for your distribution.

Continue here for configuration.

+
+Exchange EWS +

For connecting to a Microsoft Exchange 2007/2010 or OpenChange server. Note that this is currently under development and will replace the Exchange MAPI account type in the future. It might not be available yet for your distribution.

This requires having the evolution-ews package installed.

@@ -72,9 +109,22 @@ - -

Exchange MAPI: For connecting to a Microsoft Exchange 2007/2010 or OpenChange server.

Continue here for configuration.

+
+ + Show how to configure this account type + + Exchange Web Services receiving options + +
+ +
+ +
+Exchange MAPI +

For connecting to a Microsoft Exchange 2007/2010 or OpenChange server.

This requires having the evolution-mapi package installed.

@@ -83,30 +133,102 @@ - - + +
+ + Show how to configure this account type + + Exchange MAPI receiving options + +
+
-
-Local account server types -

Available local account server types for advanced users are:

- -

Local delivery: If you want to move email from the spool (the location where mail waits for delivery) and store it in your home directory. You need to provide the path to the mail spool you want to use. If you want to leave email in your system's spool files, choose the Standard Unix Mbox Spool option instead.

Continue here for configuration.

 +
+Local delivery +

Local delivery: If you want to move email from the spool (the location where mail waits for delivery) and store it in your home directory. You need to provide the path to the mail spool you want to use. If you want to leave email in your system's spool files, choose the Standard Unix Mbox Spool option instead.

-

MH-Format Mail Directories: For downloading email using MH or another MH-style application.

-

Continue here for configuration.

 +
+ + Show how to configure this account type + + Local delivery receiving options + +
-

Maildir-Format Mail Directories: For downloading your email using Qmail or another Maildir-style application.

-

Continue here for configuration.

 +
-

Standard Unix mbox spool file: For reading and storing email in the mail spool file on your local system.

-

Continue here for configuration.

 +
+MH-Format Mail Directories +

For downloading email using MH or another MH-style application.

-

Standard Unix mbox spool directory: For reading and storing email in the mail spool directory on your local system.

-

Continue here for configuration.

 - +
+ + Show how to configure this account type + + MH-format mail directories receiving options + +
+ +
+ +
+Maildir-Format Mail Directories +

Maildir-Format Mail Directories: For downloading your email using Qmail or another Maildir-style application.

+ +
+ + Show how to configure this account type + + Maildir-format mail directories receiving options + +
-

Later on, if you want to change an account, or if you want to create another one, go to EditPreferencesMail Accounts. Select the account you want to change, then click Edit. Alternately, add a new account by clicking Add.

 +
+ +
+Standard Unix mbox spool file +

Standard Unix mbox spool file: For reading and storing email in the mail spool file on your local system.

+ +
+ + Show how to configure this account type + + Standard Unix mbox spool file receiving options + +
+ +
+ +
+Standard Unix mbox spool directory +

Standard Unix mbox spool directory: For reading and storing email in the mail spool directory on your local system.

+ +
+ + Show how to configure this account type + + Standard Unix mbox spool directory receiving options + +
+ +
+ +
+None +

If you do not plan to use Evolution for receiving email.

@@ -114,10 +236,28 @@
Sending mail

Available server types are:

- -

SMTP: Sends mail using an outbound mail server. This is the most common choice for sending mail.

Continue here for configuration.

 -

Sendmail: Uses the Sendmail application to send mail from your system. It is not easy to configure, so you should select this option only if you know how to set up a Sendmail service.

 - + +
+SMTP +

Sends mail using an outbound mail server. This is the most common choice for sending mail.

+ +
+ + Show how to configure this account type + + SMTP sending options + +
+ +
+ +
+Sendmail +

Uses the Sendmail application to send mail from your system. It is not easy to configure, so you should select this option only if you know how to set up a Sendmail service.

+
+
diff --git a/help/C/mail-receiving-options-exchange-ews.page b/help/C/mail-receiving-options-exchange-ews.page index b79efc3860..e67690d12d 100644 --- a/help/C/mail-receiving-options-exchange-ews.page +++ b/help/C/mail-receiving-options-exchange-ews.page @@ -47,9 +47,4 @@
- - diff --git a/help/C/mail-receiving-options-exchange-mapi.page b/help/C/mail-receiving-options-exchange-mapi.page index 90a3bada04..6c46b3c6aa 100644 --- a/help/C/mail-receiving-options-exchange-mapi.page +++ b/help/C/mail-receiving-options-exchange-mapi.page @@ -47,8 +47,4 @@
- diff --git a/help/C/mail-receiving-options-imap-plus.page b/help/C/mail-receiving-options-imap-plus.page index 73cd223431..9ff70c0a77 100644 --- a/help/C/mail-receiving-options-imap-plus.page +++ b/help/C/mail-receiving-options-imap-plus.page @@ -53,8 +53,4 @@
- diff --git a/help/C/mail-receiving-options-local-delivery.page b/help/C/mail-receiving-options-local-delivery.page index d64f268ef4..bbe1476f83 100644 --- a/help/C/mail-receiving-options-local-delivery.page +++ b/help/C/mail-receiving-options-local-delivery.page @@ -41,8 +41,4 @@
- diff --git a/help/C/mail-receiving-options-maildir-format-directories.page b/help/C/mail-receiving-options-maildir-format-directories.page index 75cf4adc56..e78fb26b17 100644 --- a/help/C/mail-receiving-options-maildir-format-directories.page +++ b/help/C/mail-receiving-options-maildir-format-directories.page @@ -42,8 +42,4 @@ - diff --git a/help/C/mail-receiving-options-mh-format-directories.page b/help/C/mail-receiving-options-mh-format-directories.page index fd109afdf7..11ff2b18c1 100644 --- a/help/C/mail-receiving-options-mh-format-directories.page +++ b/help/C/mail-receiving-options-mh-format-directories.page @@ -41,8 +41,4 @@ - diff --git a/help/C/mail-receiving-options-pop.page b/help/C/mail-receiving-options-pop.page index 26a262d0b1..11a903cfd2 100644 --- a/help/C/mail-receiving-options-pop.page +++ b/help/C/mail-receiving-options-pop.page @@ -54,8 +54,4 @@ - diff --git a/help/C/mail-receiving-options-unix-mbox-spool-directory.page b/help/C/mail-receiving-options-unix-mbox-spool-directory.page index 310ccaad0f..86912e41f1 100644 --- a/help/C/mail-receiving-options-unix-mbox-spool-directory.page +++ b/help/C/mail-receiving-options-unix-mbox-spool-directory.page @@ -41,8 +41,4 @@ - diff --git a/help/C/mail-receiving-options-unix-mbox-spool-file.page b/help/C/mail-receiving-options-unix-mbox-spool-file.page index d32b71e100..d1a758a8f4 100644 --- a/help/C/mail-receiving-options-unix-mbox-spool-file.page +++ b/help/C/mail-receiving-options-unix-mbox-spool-file.page @@ -42,8 +42,4 @@ - diff --git a/help/C/mail-receiving-options-usenet-news.page b/help/C/mail-receiving-options-usenet-news.page index 2f433d209a..8f1d7a1b51 100644 --- a/help/C/mail-receiving-options-usenet-news.page +++ b/help/C/mail-receiving-options-usenet-news.page @@ -52,8 +52,4 @@ - diff --git a/help/C/mail-sending-options-smtp.page b/help/C/mail-sending-options-smtp.page index 55097cf732..da34213c49 100644 --- a/help/C/mail-sending-options-smtp.page +++ b/help/C/mail-sending-options-smtp.page @@ -38,7 +38,4 @@

Choose Use secure connection if you want to connect securely.

 - -

If you came to this page from the first-run wizard help page, click here to continue with the next step.

- -- cgit v1.2.3