Bug #688294 - Update how online/offline mode works nowadays

2 files changed, 16 insertions, 11 deletions

diff --git a/help/C/mail-working-offline.page b/help/C/mail-working-offline.page
index 8d5d79c137..91b748603e 100644
--- a/help/C/mail-working-offline.page
+++ b/help/C/mail-working-offline.page
@@ -6,7 +6,7 @@
 <!-- TODO:POST-3-2: Offline work for web calendars etc also exists => create index page for Offline working? -->
     <link type="guide" xref="index#mail-basic" />
 
-    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <revision pkgversion="3.7.4" version="0.3" date="2013-01-22" status="final"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
@@ -22,9 +22,11 @@
 
 <title>Working Offline</title>
 
-<p>Offline mode helps you communicate with remote mail storage systems like GroupWise, IMAP or Exchange, in situations where you are not connected to the network at all times. Evolution keeps a local copy of one or more folders to allow you to compose messages, storing them in your Outbox to be sent the next time you connect.</p>
+<p>Forced offline mode helps you communicate with remote mail storage systems like GroupWise, IMAP or Exchange, in situations where you are not connected to the network at all times. Evolution keeps a local copy of one or more folders to allow you to compose messages, storing them in your Outbox to be sent the next time you connect.</p>
 
-<p>POP mail downloads all messages to your local system, but other connections usually download just the headers, and get the rest only when you want to read the message. Before you go offline, Evolution downloads the unread messages from the folders you have chosen to store.</p>
+<note style="warning"><p>Evolution's forced offline mode only refers to mail and does not apply to contacts and calendars.</p></note>
+
+<p>POP mail downloads all messages to your local system, but other connections usually download just the headers, and get the rest only when you want to read the message. Before you force Evolution to be offline, Evolution downloads the unread messages from the folders you have chosen to store.</p>
 
 <section id="mark-folders">
 <title>Marking folders for offline usage</title>
@@ -37,13 +39,13 @@
 
 <section id="sync-for-offline">
 <title>Syncing messages for offline usage</title>
-<p>Your connection status is shown by the small icon in the lower left corner of the Evolution main window. When you are online, it displays two connected cables. When you go offline via clicking the icon or via <guiseq><gui>File</gui><gui>Work Offline</gui></guiseq>, the cables separate. You will be asked whether you want to go offline immediately or synchronize folders locally before you go offline.</p>
+<p>Your connection status is shown by the small icon in the lower left corner of the Evolution main window. When you are online, it displays two connected cables. When you force offline mode via clicking the icon or via <guiseq><gui>File</gui><gui>Work Offline</gui></guiseq>, the cables separate. You will be asked whether you want to go offline immediately or synchronize folders locally before you go offline.</p>
 <p>To download Messages for Offline Operations without immediately going offline, select <guiseq><gui>File</gui><gui>Download Messages for Offline Usage</gui></guiseq>.</p>
 </section>
 
 <section id="network-manager-integration">
 <title>Automatic Network State Handling</title>
-<p>Evolution automatically understands the network state and acts accordingly. For instance, Evolution switches to offline mode when the network goes down and automatically switches on when the network is up again. Ensure that your system has Network Manager installed to enable this feature.</p>
+<p>Evolution automatically understands the network state and acts accordingly. For instance, Evolution switches to offline mode when the network goes down and automatically switches on when the network is up again.</p>
 </section>
 
 </page>
diff --git a/help/C/offline.page b/help/C/offline.page
index 930ed02ab1..120f1b8fe9 100644
--- a/help/C/offline.page
+++ b/help/C/offline.page
@@ -2,12 +2,12 @@
       type="topic" id="offline">
 
   <info>
-    <desc>Make Evolution be online again.</desc>
+    <desc>Make Evolution mail be online again.</desc>
     
     <link type="guide" xref="index#common-other-problems"/>
     <link type="seealso" xref="mail-working-offline" />
 
-    <revision pkgversion="3.2.1" version="0.3" date="2012-08-09" status="final"/>
+    <revision pkgversion="3.7.4" version="0.3" date="2013-01-22" status="final"/>
     <credit type="author">
       <name its:translate="no">Brian Grohe</name>
       <email its:translate="no">grohe43@gmail.com</email>
@@ -20,10 +20,13 @@
     </license>
 
   </info>
-<title>Why is Evolution offline when my net connection is working?</title>
-<p>You may have started Evolution with the <cmd>--offline</cmd> commandline option.</p>
+<title>Why is Evolution's mail offline when my net connection is working?</title>
+<p>You may have started Evolution with the <cmd>--offline</cmd> commandline option to enforce offline mode.</p>
 
-<p>If this is not the case and Evolution normally works but has suddenly stopped connecting, you may have unintentionally clicked on the connection icon in the lower left corner. When connected, the icon resembles a pair of sockets joined together. If the sockets are open, there is no connection (and the <gui style="button">Send/Receive</gui> button is grayed out). Click on the icon to change its state.</p>
+<p>If this is not the case and Evolution normally works but has suddenly stopped connecting to your mail accounts, you may have unintentionally clicked on the connection icon in the lower left corner. When connected, the icon resembles a pair of sockets joined together. If the sockets are open, there is no connection to your mail accounts (and the <gui style="button">Send/Receive</gui> button is grayed out). Click on the icon to change its state.</p>
+
+<p>If the problem persists and you are sure you have not clicked the icon, but you can still reach the network from other apps on your system (browsers, FTP, SSH, ping etc.) it may be that your network connection is not properly configured. For more information please take a look at the <link href="help:gnome-help/net-problem">Desktop help</link> or seek help from your distribution support forums, mailing lists etc.</p>
+
+<note style="warning"><p>Evolution's forced offline mode only refers to mail and does not apply to contacts and calendars.</p></note>
 
-<p>If the problem persists and you are sure you have not clicked the icon, but you can still reach the network from other apps on your system (browsers, FTP, SSH, ping etc.) it may be that NetworkManager (NM) is not properly configured. Many Linux distributions now use NM to manage their connections, and if it is installed Evolution will use it to detect if the network is up. However NM can be installed but not properly configured, leaving the network working but not detectable by Evolution. (Note that other GNOME-based applications may also fail for the same reason.) The solution is to configure NM to manage your network interface. This is usually easy to do but is outside the scope of this document. For more information please take a look at the <link href="help:gnome-help/net">Desktop help</link> or seek help from your distribution support forums, mailing lists etc.</p>
 </page>