diff options
| -rw-r--r-- | help/C/intro-first-run.page | 2 | ||||
| -rw-r--r-- | help/C/mail-account-manage-imap-plus.page | 2 | ||||
| -rw-r--r-- | help/C/mail-receiving-options-imap.page | 58 | ||||
| -rw-r--r-- | help/Makefile.am | 1 |
4 files changed, 1 insertions, 62 deletions
diff --git a/help/C/intro-first-run.page b/help/C/intro-first-run.page index f99fdfc291..619c5c7343 100644 --- a/help/C/intro-first-run.page +++ b/help/C/intro-first-run.page @@ -45,8 +45,6 @@ <p>The most common available server types for normal users are:</p> <list> <item><p>None: If you do not plan to use Evolution for receiving email.</p><p>Continue <link xref="#sending">here</link> for configuration.</p></item> -<item><p>IMAP: Keeps the mail on the server so you can access your mail from multiple systems.</p><p>Continue <link xref="mail-receiving-options-imap">here</link> for configuration.</p></item> -<!-- TODO:DEVELOPERS: So what's the difference between IMAP and IMAP+, and what is recommended, dear developers? --> <item><p>IMAP+: Keeps the mail on the server so you can access your mail from multiple systems.</p><p>Continue <link xref="mail-receiving-options-imap-plus">here</link> for configuration.</p></item> <item><p>POP: Downloads your email to your hard disk.</p><p>Continue <link xref="mail-receiving-options-pop">here</link> for configuration.</p></item> <item><p>USENET News: Connects to a news server and downloads a list of available news digests.</p><p>Continue <link xref="mail-receiving-options-usenet-news">here</link> for configuration.</p></item> diff --git a/help/C/mail-account-manage-imap-plus.page b/help/C/mail-account-manage-imap-plus.page index 3df0d13bdb..67c263f579 100644 --- a/help/C/mail-account-manage-imap-plus.page +++ b/help/C/mail-account-manage-imap-plus.page @@ -47,7 +47,7 @@ via XInclude. See +http://blogs.gnome.org/shaunm/2011/07/21/understanding-xinclu <title>Security</title> </section> -<!-- TODO:DEVELOPERS: No "IMAP Headers" tab for IMAP+ under Edit>Prefs>MailAccounts>Edit existing. See https://bugzilla.gnome.org/show_bug.cgi?id=655519 --> +<!-- Note: There is no "IMAP Headers" tab for IMAP+ under Edit>Prefs>MailAccounts>Edit existing as it was for IMAP. See https://bugzilla.gnome.org/show_bug.cgi?id=655519 --> </section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it --> diff --git a/help/C/mail-receiving-options-imap.page b/help/C/mail-receiving-options-imap.page deleted file mode 100644 index 96e0887d4e..0000000000 --- a/help/C/mail-receiving-options-imap.page +++ /dev/null @@ -1,58 +0,0 @@ -<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" - type="topic" id="mail-receiving-options-imap"> - - <info> - <desc>Receiving options for IMAP accounts.</desc> - - <link type="guide" xref="mail-receiving-options#common-server-types"/> - <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/> - <credit type="author"> - <name its:translate="no">Andre Klapper</name> - <email its:translate="no">ak-47@gmx.net</email> - </credit> - <credit type="author"> - <name its:translate="no">Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mainwindow-starting.html.en#bstggh0 --> - </credit> - <license> - <p>Creative Commons Share Alike 3.0</p> - </license> - - </info> - - <title>IMAP receiving options</title> - -<section id="receiving-email"> -<title>Receiving Email</title> - -<p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p> - -<list> -<item><p>Enter the address of the email server in the <gui>Server</gui> field and enter your username for that server.</p></item> -<item><p>Select if you want to use a secure connection (SSL or TLS).</p><p>You should enable this option if your server supports it.</p> -<note style="tip"><p>Free webmail providers often supply information about which of these options can be used. If you are in an organizational environment, you may want to contact your system administrator for more information.</p></note></item> -<item><p>Select your authentication type in the Authentication list, or click <gui style="button">Check for Supported Types</gui> to have Evolution check for supported authentication mechanisms. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work.</p></item> -<item><p>Select if you want Evolution to remember your password.</p></item> -</list> - -</section> - -<section id="receiving-options"> -<title>Receiving Options</title> - -<p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p> - -<list> -<item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p></item> -<item><p>You can also define if Evolution checks for new messages in all folders, or only in subscribed folders.</p></item> -<item><p>Select if you want Evolution to use custom commands to connect to the IMAP server.</p></item> -<item><p>Select if you want Evolution to show only <link xref="mail-imap-subscriptions">subscribed folders</link>.</p></item> -<item><p>Select if you want Evolution to override server-supplied folder namespaces.</p></item> -</list> - -</section> - -<section id="return-to-assistant-bottom-link"> -<!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. --> -<p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p> -</section> -</page> diff --git a/help/Makefile.am b/help/Makefile.am index 7bb7403dc8..835b2107c1 100644 --- a/help/Makefile.am +++ b/help/Makefile.am @@ -175,7 +175,6 @@ HELP_FILES = \ mail-received-notification.page \ mail-receiving-options-exchange-ews.page \ mail-receiving-options-exchange-mapi.page \ - mail-receiving-options-imap.page \ mail-receiving-options-imap-plus.page \ mail-receiving-options-local-delivery.page \ mail-receiving-options-maildir-format-directories.page \ |