delegation

svn path=/trunk/; revision=20856

2 files changed, 177 insertions, 52 deletions

diff --git a/help/C/usage-exchange.xml b/help/C/usage-exchange.xml
index 783f8a59cb..3fae0231d3 100644
--- a/help/C/usage-exchange.xml
+++ b/help/C/usage-exchange.xml
@@ -711,7 +711,7 @@ There are, however, some features which are not available:
       </para>
 
       <sect2 id="exchange-delegate">
-        <title>Delegating and Acting as a Delegate</title>
+        <title>Access Delegation</title>
         <para>
           You can allow other people in your organization's Global
           Address List  to access your calendar, address
@@ -720,20 +720,131 @@ There are, however, some features which are not available:
           other's schedules to completely manage their personal
           information.
         </para>
+
+        <sect3 id="exchange-delegate-to-others">
+          <title>Delegating Access to Others</title>
         <para>
           To add someone to your list of delegates, click the
           <guibutton>Add</guibutton> button and select them from the
-          Global Address List. You may choose which folders they can
-          handle, grant read-only, or read and write privileges.
+          Global Address List. When delegating you can grant different
+          levels of access to different types of data. You may also
+          decide whether the access you grant applies to items marked
+          <guilabel>Private</guilabel>, or only to public items.
+        </para>
+
+        <para>
+          For each of the four types of folder, you may select one of
+          the following levels of access:
+          <variablelist>
+            <varlistentry>
+              <term>None</term>
+              <listitem>
+                <para>
+                  Do not allow this person to access any folders of
+                  this type.
+                </para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term>Reviewer (read-only)</term>
+              <listitem>
+                <para>
+                  Allow the person to see items in this type of
+                  folder, but not create new items or edit existing
+                  items.
+                </para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term>Author (read, create)</term>
+              <listitem>
+                <para>
+                  The delegate may view items in your folders, and may
+                  create new items, but may not change any existing items.
+                </para>
+              </listitem>
+            </varlistentry>
+        
+            <varlistentry>
+              <term>Editor (read, create, edit)</term>
+              <listitem>
+                <para>
+                  The delegate may view, create, and change items in
+                  your folders.
+                </para>
+              </listitem>
+            </varlistentry>
+          </variablelist>
         </para>
+      </sect3>
+      <sect3 id="exchange-delegated-to-you">
+        <title>Acting as a Delegate for Others</title>
         <para>
           To see the list of people who have granted you access to
           their folders, click the <guilabel>Acting as a
-          Delegate</guilabel> tab. Their folders will appear in your
-        normal folder tree under their account names.
+          Delegate</guilabel> tab in the Exchange Delegation settings
+          window. If you plan to send email on behalf of someone,
+          click the checkbox next to their name, and an email identity
+          will be created. You can then select that identity in the
+          <guilabel>From</guilabel> list in your message composer.
         </para>
 
-      </sect2>
+        <para>
+          To access the folders delegated to you, do the following:
+          <orderedlist>
+            <listitem>
+              <para>
+                Select 
+                <menuchoice>
+                  <guimenu>File</guimenu>
+                  <guimenuitem>Open Other User's Folder</guimenuitem>
+                </menuchoice>
+              </para>
+            </listitem>
+            <listitem>
+              <para>
+                Enter the email address of the user who
+                has delegated to you or click the
+                <guibutton>User</guibutton> button to select them from your
+                addressbook. 
+              </para>
+            </listitem>
+          
+            <listitem>
+              <para>
+                Select the folder you wish to open.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                Click OK.
+              </para>
+            </listitem>
+          </orderedlist>
+        </para>
+        <para>
+          Folders delegated to you appear in your folder list inside a 
+          folder labeled with the name of their owner. For example, if
+          Martha Thompson delegates folders to you, you will see a
+          folder called <guilabel>Martha Thompson's Folders</guilabel>
+          in the folder tree at the same level as your <guilabel>Personal
+          Folders</guilabel> and <guilabel>Public
+          Folders</guilabel>. 
+        </para>
+
+        <note id="error">
+          <title>Error Messages</title>
+          <para>
+            If the folder fails to open properly, check with the
+            folder owner that you have been granted the correct access
+            permissions.
+          </para>
+        </note>
+      </sect3>
+    </sect2>
 
       
       <sect2 id="exchange-out-of-office">
diff --git a/help/C/usage-mail.xml b/help/C/usage-mail.xml
index aa55b1b5d2..a1a3bcb018 100644
--- a/help/C/usage-mail.xml
+++ b/help/C/usage-mail.xml
@@ -32,6 +32,7 @@
       </keycombo>.
     </para>
 
+
       <tip id="spaceandbs">
 	<title>Reading Mail with the Keyboard</title>
 	<para>
@@ -39,6 +40,16 @@
 	  an email, and press backspace to page up in an email.  This
 	  may help to make reading your email faster.
 	</para>
+    
+        <para>
+          You can navigate the message list by pressing the arrow keys up
+          and down. To jump to the next unread message, press the
+          <keycap>.</keycap> (period)
+          or <keycap>]</keycap> (close bracket) key. You can go to the
+          previous unread message with
+          <keycap>,</keycap> (comma) or <keycap>[</keycap> (open
+          bracket).
+        </para>
       </tip>
 
     <sect2 id="usage-mail-listorder">
@@ -64,7 +75,7 @@
 	<title>Email Headers</title>
 	<para>
 	  To look at the complete headers for email messages, select
-	  <menuchoice><guimenu>View</guimenu><guisubmenu>Message
+          <menuchoice><guimenu>View</guimenu><guisubmenu>Message
 	  Display</guisubmenu><guimenuitem>Show Full
 	  Headers</guimenuitem></menuchoice>. To see absolutely every
 	  bit, choose
@@ -520,51 +531,54 @@
       </para>
     </sect2>
 
-  <sect2 id="usage-mail-getnsend-offline">
-            <title>Working Offline</title>
-            <para>
-              Offline mode is a tool designed for use with a dialup
-              connection or for laptop users who do not have a network
-              connection at all times. It allows you to cache messages
-              for reference while you are not connected to the
-              network, and to compose messages and leave them in your
-              Outbox to be sent the next time you connect to the network.
-             </para>
-            <para>
-	      Select
-	      <menuchoice><guimenu>File</guimenu><guimenuitem>Work
-	      Offline</guimenuitem></menuchoice> to have
-	      <application>Ximian Evolution</application> disconnect
-	      from the Internet while you work. When you want to
-	      reconnect, choose
-	      <menuchoice><guimenu>File</guimenu><guimenuitem>Work
-	      Online</guimenuitem></menuchoice>.  Alternatively, you
-	      can click the connection button at the bottom left side
-	      of the window.
-            </para>
-            <para>
-               If you use POP mail, all your messages will be
-               available to you, because they are stored locally. If
-               you use IMAP or Exchange mail, messages are stored
-               remotely, so availability is a little different.
-            </para>
-            <para>
-               Messages that you have read are cached and stored
-               locally; all read messages will be available to you
-               even if you are offline. Unread messages will be
-               downloaded and saved for offline use if they are in a
-               folder that you have marked as an Offline Folder. To
-               mark a folder for offline use, select
-               <menuchoice><guimenu>Settings</guimenu>
-               <guimenuitem>Preferences</guimenuitem></menuchoice> and
-               then click the <guilabel>Folders</guilabel> icon. In
-               the <guilabel>Offline Folders</guilabel> tab, click the
-               check-box next to the folders that you would like to
-               use while you are offline. Then, when you select
-               <guimenuitem>Go Offline</guimenuitem>, Evolution will
-               fetch their contents and store them for later
-               reference.
-          </para>
+    <sect2 id="usage-mail-getnsend-offline">
+      <title>Working Offline</title>
+    
+      <para>
+        Offline mode is a tool designed for use with IMAP or Exchange
+        mail accounts in situations where you will not be connected to
+        the network at all times. It will keep a local copy of one or
+        more folders, and allow you to compose messages, storing them
+        in your Outbox to be sent the next time you connect.
+      </para>
+     
+      <para>
+        While POP mail downloads all messages to your local system,
+        IMAP and Exchange connections usually download just the
+        headers, and fetch the rest only when you want to read the
+        message.  Before you go offline, Evolution will download
+        the unread messages from the folders you have chosen to
+        store.
+      </para>
+
+      <para>
+        To mark a folder for offline use, select <menuchoice>
+        <guimenu>Settings</guimenu>
+        <guimenuitem>Preferences</guimenuitem> </menuchoice> and then
+        click the <guilabel>Folders</guilabel> icon. In the
+        <guilabel>Offline Folders</guilabel> tab, click the check-box
+        next to the folders that you would like to use while you are
+        offline. 
+      </para>
+
+      <para>
+        Your connection status is shown by the small icon in the lower
+        left border of the Evolution main window. When you are online,
+        it will display two connected cables. When you go offline, the
+        cables will separate.
+      </para>
+
+      <para>
+        To cache your selected folders and disconnect from the
+        network, select <menuchoice><guimenu>File</guimenu><guimenuitem>Work
+        Offline</guimenuitem></menuchoice> or click the
+        connection status icon in the lower left of the screen. When you
+        want to reconnect, choose
+        <menuchoice><guimenu>File</guimenu><guimenuitem>Work
+        Online</guimenuitem></menuchoice> or click the connection
+        status icon again.
+      </para>
+           
        </sect2>
     <sect2 id="usage-mail-getnsend-send-compose">
       <title>More About Mail Composition</title>