Index: evolution/help/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/help/ChangeLog,v
retrieving revision 1.252
diff -u -p -r1.252 ChangeLog
--- evolution/help/ChangeLog	27 Feb 2006 21:12:29 -0000	1.252
+++ evolution/help/ChangeLog	4 Mar 2006 18:31:07 -0000
@@ -1,3 +1,8 @@
+2006-03-04  Andre Klapper  <a9016009@gmx.de>
+
+	* C/evolution.xml: a few updates.
+	Fixes bug 321872; partially fixes bug 333356.
+
 2006-02-27  Andre Klapper  <a9016009@gmx.de>
  	* quickref/C/quickref.tex: Fixing a typo and pdf.
 
Index: evolution/help/C/evolution.xml
===================================================================
RCS file: /cvs/gnome/evolution/help/C/evolution.xml,v
retrieving revision 1.11
diff -u -p -r1.11 evolution.xml
--- evolution/help/C/evolution.xml	5 Oct 2005 08:42:17 -0000	1.11
+++ evolution/help/C/evolution.xml	4 Mar 2006 18:31:20 -0000
@@ -623,7 +623,7 @@
      <para>Before importing e-mail from Netscape&z-3rdParty;, make sure you have selected File &gt; Compact All Folders. If you don&apos;t, Evolution will import and undelete the messages in your Trash folders.</para>
      <tip>
       <para>Evolution uses standard file types for e-mail and calendar information, so you can copy those files from your <command>~/.evolution</command> directory. The file formats used are <command>mbox</command> for e-mail and iCal for calendar information.</para>
-      <para>Contacts files are stored in a database, but can be saved as a standard vCard&z-3rdParty;. To export contact data, open your contacts tool and select the contacts you want to export (press Ctrl+A to select them all). Click File &gt; Save as VCard. </para>
+      <para>Contacts files are stored in a database, but can be saved as a standard vCard&z-3rdParty;. To export contact data, open your contacts tool and select the contacts you want to export (press Ctrl+A to select them all). Click File &gt; Save Contact as VCard. </para>
      </tip>
     </section>
    </section>
@@ -906,7 +906,7 @@
 
   <section id="usage-mail-getnsend-read">
    <title>Reading Mail</title>
-   <para>If you are not already viewing mail, switch to the mail tool by clicking the Mail shortcut button, or press Ctrl+F1. To read a message, select it in the message list; if you&apos;d like to see it in its own window, either double-click it, press Enter, or press Ctrl+O.</para>
+   <para>If you are not already viewing mail, switch to the mail tool by clicking the Mail shortcut button, or press Ctrl+1. To read a message, select it in the message list; if you&apos;d like to see it in its own window, either double-click it, press Enter, or press Ctrl+O.</para>
    <tip>
     <para>To read mail with the keyboard, you can click the Spacebar to page down while you&apos;re reading an e-mail, and press Backspace to page up in an e-mail. </para>
     <para>Navigate the message list by using the arrow keys on the keyboard. To go to the next and previous unread messages, press the period (.) or comma (,) keys. On most keyboards, these keys are also marked with the &gt; and &lt; symbols, which is a convenient way to remember that they move you forward and backward in your message list. You can also use the right square bracket (]) for the next unread message, and the left square bracket ([) for the previous unread message.</para>
@@ -932,7 +932,7 @@
 
    <section id="usage-mail-getnsend-undelete">
     <title>Undeleting Messages</title>
-    <para>You can undelete a message that has been deleted but not expunged. To undelete a message, select the message, then press Ctrl+U, or click Edit &gt; Undelete.</para>
+    <para>You can undelete a message that has been deleted but not expunged. To undelete a message, select the message, then press Shift+Ctrl+D, or click Edit &gt; Undelete.</para>
     <para>If you have marked a message for deletion, undeleting it unmarks it, and the message is removed from the Trash folder. You cannot undelete messages that have been expunged. </para>
    </section>
   </section>
@@ -1415,7 +1415,7 @@
    <section id="usage-mail-getnsend-fwd">
     <title>Forwarding Mail</title>
     <para>When you receive an e-mail from someone, you can forward it to other individuals or groups that might be interested. You can forward a message as an attachment to a new message (this is the default) or you can send it <link linkend="inline">in	line</link> as a quoted portion of the message you are sending. Attachment forwarding is best if you want to send the full, unaltered message to someone else. Inline forwarding is best if you want to send portions of a message, or if you have a large number of comments on different sections of the message you are forwarding. Remember to note from whom the message came, and whether you have removed or altered content.</para>
-    <para>To forward a message you are reading, click Forward on the toolbar, click Actions &gt; Forward, or press Ctrl+F. If you prefer to forward the message <link linkend="inline">inline</link> instead of attached, click Actions &gt; Forward Inline from the menu. Select an addressee as you would when sending a new message; the subject is already entered, although you can alter it if you want. Add your comments on the message in the composition frame, then click Send.</para>
+    <para>To forward a message you are reading, click Forward on the toolbar, click Message &gt; Forward, or press Ctrl+F. If you prefer to forward the message <link linkend="inline">inline</link> instead of attached, click Message &gt; Forward as &gt; Inline from the menu. Select an addressee as you would when sending a new message; the subject is already entered, although you can alter it if you want. Add your comments on the message in the composition frame, then click Send.</para>
     <para>Attachments to a message you are forwarding only forwarded when you send the original message as an attachment. Inline messages do not forward any attachments.</para>
    </section>
 
@@ -1474,7 +1474,7 @@
    <para>Because IMAP folders exist on the server, and opening them or checking them takes time, you need fine-grained control over the way that you use IMAP folders. You use the IMAP subscriptions manager to do this. If you prefer to have every mail folder displayed, you can select that option as well. However, if you want to choose specific items in your mailbox, and exclude others, you can use the subscription management tool to do that.</para>
    <orderedlist>
     <listitem id="bsmqyfs">
-     <para>Select Tools &gt; Subscribe to Folders.</para>
+     <para>Select Folder &gt; Subscriptions.</para>
     </listitem>
     <listitem id="bsmqyid">
      <para>If you have accounts on multiple IMAP servers, select the server where you want to manage your subscriptions. Evolution displays a list of available files and folders.</para>
@@ -1782,7 +1782,7 @@
       <para>Use the Evolution import tool to import the files.</para>
      </listitem>
     </orderedlist>
-    <para>For POP mail, filters are applied as messages are downloaded. For IMAP mail, filters are applied to new messages when you open the Inbox folder. On Exchange servers, filters are not applied until you select your Inbox folder and click Actions &gt; Apply Filters, or press Ctrl+Y. To force your filters to act on all messages in the folder, select the entire folder by pressing Ctrl+A, then apply the filters by pressing Ctrl+Y. </para>
+    <para>For POP mail, filters are applied as messages are downloaded. For IMAP mail, filters are applied to new messages when you open the Inbox folder. On Exchange servers, filters are not applied until you select your Inbox folder and click Message &gt; Apply Filters, or press Ctrl+Y. To force your filters to act on all messages in the folder, select the entire folder by pressing Ctrl+A, then apply the filters by pressing Ctrl+Y. </para>
    </section>
   </section>
 
@@ -2343,7 +2343,7 @@
      <para>Click Search.</para>
     </listitem>
    </orderedlist>
-   <para>To show all your contacts, Click Clear in the search bar, press Shift+Ctrl+B, or search with an empty query.</para>
+   <para>To show all your contacts, Click Clear in the search bar, or search with an empty query.</para>
   </section>
 
   <section id="usage-contact-organize">
@@ -2681,7 +2681,7 @@
     <title>Sending a Meeting Invitation</title>
     <para>In Evolution, a meeting is an event you schedule for multiple people. Evolution can be used to schedule group meetings and help you manage responses to meeting requests.</para>
     <para>When you create a meeting or group appointment, you can specify the attendees in several categories, such as &ldquo;chair&rdquo; or &ldquo;required.&rdquo; When you save the meeting listing, each attendee is sent an e-mail with the meeting information, which also gives them the option to respond.</para>
-    <para>If you don&apos;t need to collect attendance information when you&apos;re scheduling an event, and would rather just announce the event, click Actions &gt; Forward as iCalendar. This opens a new e-mail message with the event notification attached as an announcement. Recipients can add the event to their calendars with one click, but it won&apos;t automatically send you e-mail about whether they plan to attend.</para>
+    <para>If you don&apos;t need to collect attendance information when you&apos;re scheduling an event, and would rather just announce the event, right-click on the event and use Forward as iCalendar. This opens a new e-mail message with the event notification attached as an announcement. Recipients can add the event to their calendars with one click, but it won&apos;t automatically send you e-mail about whether they plan to attend.</para>
     <para>To schedule a meeting: </para>
     <orderedlist>
      <listitem id="bsb0agm">
@@ -2730,7 +2730,7 @@ Accepting and Replying to a Meeting Requ
    <section id="usage-calendar-freebusy">
     <title>Using the Free/Busy View</title>
     <para>In addition to the standard meeting scheduling tools, you can use the Free/Busy view to check whether people are available in advance. The Free/Busy feature is normally a function of dedicated groupware servers such as Microsoft Exchange and Novell Groupwise. However, you can also publish Free/Busy information online, and access Free/Busy information published elsewhere. If not everyone you collaborate with publishes Free/Busy data, you can still use iCal event invitations to coordinate schedules with other people.</para>
-    <para>To access the free/busy view:   </para>
+    <para>To access the free/busy view:</para>
     <orderedlist>
      <listitem id="bsbzmp5">
       <para>Click File &gt; New &gt; Meeting.</para>
@@ -4435,7 +4435,7 @@ Accepting and Replying to a Meeting Requ
      <para>Start Evolution.</para>
     </listitem>
     <listitem id="bshqejx">
-     <para>Press Shift+Ctrl+F or select File &gt; New Folder to create the folders you want.</para>
+     <para>Select File &gt; New Folder to create the folders you want.</para>
     </listitem>
    </orderedlist>
    <para>To import the data files:</para>
@@ -4486,19 +4486,19 @@ Accepting and Replying to a Meeting Requ
    <bridgehead id="bt4ckg2">New Item</bridgehead>
    <para>Press Ctrl+N to open a new item for whatever part of Evolution you&apos;re working in. In mail, this means you create a new message. If you&apos;re looking at your address book, Ctrl+N creates a new contact card, and in the calendar, a new appointment.</para>
    <bridgehead id="bt4ckg3">Creating a New E-Mail Message</bridgehead>
-   <para>Use File &gt; New &gt; Mail Message or Ctrl+Shift+M. </para>
+   <para>Use File &gt; New &gt; Mail Message or Shift+Ctrl+M. </para>
    <bridgehead id="bt4ckg4">Creating a New Appointment</bridgehead>
-   <para>Use File &gt; New Appointment or Ctrl+Shift+A.</para>
+   <para>Use File &gt; New Appointment or Shift+Ctrl+A.</para>
    <bridgehead id="bt4ckg5">Entering a New Contact </bridgehead>
-   <para> Double-click in any blank space in the contact manager to create a new address card. You can also use File &gt; New Contact or Ctrl+Shift+C. </para>
+   <para> Double-click in any blank space in the contact manager to create a new address card. You can also use File &gt; New Contact or Shift+Ctrl+C. </para>
    <bridgehead id="bt4ckg6">Creating a New Task</bridgehead>
-   <para> File &gt; New Task or Ctrl+Shift+T. </para>
+   <para> File &gt; New Task or Shift+Ctrl+T. </para>
   </section>
 
   <section id="quickref-mail">
    <title>Mail Tasks</title>
    <bridgehead id="bt4ckg7">Send and Receive Mail</bridgehead>
-   <para>Press F9, click the Send/Receive button in the toolbar, or click Actions &gt; Send/Receive.</para>
+   <para>Press F9, click the Send/Receive button in the toolbar, or click File &gt; Send/Receive.</para>
    <bridgehead id="bt4ckg8">Navigating the Message List with the Keyboard</bridgehead>
    <para>Press (]) or (.) to jump to the next unread message. ([) or (,) goes to the previous unread message. Use the arrow keys to move up and down in the list of all messages.</para>
    <bridgehead id="bt4ckg9">Moving the Display Up and Down in the Preview Pane</bridgehead>
@@ -4511,7 +4511,7 @@ Accepting and Replying to a Meeting Requ
    <bridgehead id="bt4ckgc">Opening a Message In a New Window</bridgehead>
    <para>Double-click the message you want to view, or select it and press Enter or Ctrl+O. </para>
    <bridgehead id="bt4ckgd">Creating Filters and Search Folders</bridgehead>
-   <para>Right-click a message and select Create Rule From Message. You can also create filters and search folders in the Tools menu. </para>
+   <para>Right-click a message and select Create Rule From Message. You can also create filters and search folders in the Edit menu. </para>
    <bridgehead id="bt4ckge">Adding a Sender to the Address Book</bridgehead>
    <para>Right-click a message and select Add Sender to Address Book. You can also right-click on any e-mail address to add it to your address book. </para>
   </section>
@@ -4519,10 +4519,10 @@ Accepting and Replying to a Meeting Requ
   <section id="quickref-cal">
    <title>Calendar</title>
    <bridgehead id="bt4ckgf">Creating a New Appointment</bridgehead>
-   <para> Use File &gt; New Appointment or Ctrl+Shift+A. </para>
+   <para> Use File &gt; New Appointment or Shift+Ctrl+A. </para>
    <para>You can also click in any blank spot in the calendar and start typing to create a new appointment entry.</para>
    <bridgehead id="bt4ckgg">Creating a New Task</bridgehead>
-   <para> Use File &gt; New Task or Ctrl+Shift+T. </para>
+   <para> Use File &gt; New Task or Shift+Ctrl+T. </para>
   </section>
 
   <section id="quickref-contact">
@@ -4534,7 +4534,7 @@ Accepting and Replying to a Meeting Requ
    <bridgehead id="bt4ckgj">Sending E-Mail To a Contact</bridgehead>
    <para>Right-click a contact, then click Send Message to Contact.</para>
    <bridgehead id="bt4ckgk">Creating a New Contact </bridgehead>
-   <para>Double-click in any blank space in the contact manager to create a new address card, or right-click anywhere in the address book and select New Contact. You can also click File &gt; New Contact or press Ctrl+Shift+C. </para>
+   <para>Double-click in any blank space in the contact manager to create a new address card, or right-click anywhere in the address book and select New Contact. You can also click File &gt; New Contact or press Shift+Ctrl+C. </para>
   </section>
  </appendix>
 
