Index: evolution/help/C/evolution.xml
===================================================================
RCS file: /cvs/gnome/evolution/help/C/evolution.xml,v
retrieving revision 1.12
diff -u -p -r1.12 evolution.xml
--- evolution/help/C/evolution.xml	6 Mar 2006 10:35:39 -0000	1.12
+++ evolution/help/C/evolution.xml	22 Mar 2006 18:30:49 -0000
@@ -16,7 +16,7 @@
  <bookinfo id="Front">
   <productname>Evolution&trade;</productname>
   <productnumber>2.6</productnumber>
-  <invpartnumber>March 6, 2006</invpartnumber>
+  <invpartnumber>March 22, 2006</invpartnumber>
   <title>User Guide</title>
  </bookinfo>
 
@@ -287,7 +287,7 @@
         <para>Click Forward.</para>
        </listitem>
       </orderedlist>
-      <para>(Conditional) If you chose Microsoft Exchange as the server type, provide your username in the Username field and your Outlook Web Access (OWA) URL in the OWA URL field. The URL and the usernames should use the Outlook format.If the mailbox path is different from the username, the OWA path should also include mailbox path, for example http://<varname>server name</varname>/exchange/<varname>mail box path</varname>.</para>
+      <para>(Conditional) If you chose Microsoft Exchange as the server type, provide your username in the Username field and your Outlook Web Access (OWA) URL in the OWA URL field. The URL and the usernames should use the Outlook format. If the mailbox path is different from the username, the OWA path should also include mailbox path, for example http://<varname>server name</varname>/exchange/<varname>mail box path</varname>.</para>
       <para></para>
       <para>When you have finished, continue with <link linkend="more-mail-options">Receiving Mail Options</link>.</para>
      </section>
@@ -386,7 +386,7 @@
         <para>The GAL contains a list of all e-mail addresses. If you select this option, you need to specify the maximum number of responses.</para>
        </listitem>
        <listitem id="bstgsrp">
-        <para>Select if you want use a password expire warning time period.</para>
+        <para>Select if you want to use a password expire warning time period.</para>
         <para>If you select this option, you need to specify how often Evolution should send the password expire message.</para>
        </listitem>
        <listitem id="bv6uqm7">
@@ -629,7 +629,7 @@
        
       </listitem>
       <listitem id="b10fn8up">
-       <para>Click OK, then click Apply. </para>
+       <para>Click OK, then click Apply.</para>
        <para>Evolution opens with your new account created.</para>
       </listitem>
      </orderedlist>
@@ -643,7 +643,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>
@@ -705,7 +705,7 @@
 
    <section id="usage-mainwindow-shortcutbar">
     <title>The Shortcut Bar</title>
-    <para>The most important job for Evolutions is to give you access to your information and help you use it quickly. One way it does that is through the shortcut bar, which is the column on the left side of the main window. The buttons, such as Mail and Contacts, are the shortcuts. Above them is a list of folders for the current Evolution tool.</para>
+    <para>The most important job for Evolution is to give you access to your information and help you use it quickly. One way it does that is through the shortcut bar, which is the column on the left side of the main window. The buttons, such as Mail and Contacts, are the shortcuts. Above them is a list of folders for the current Evolution tool.</para>
     <para>The folder list organizes your e-mail, calendars, contact lists, and task lists in a tree, similar to a <link linkend="filetree">file tree</link>. Most people find one to four folders at the base of the tree, depending on the tool and their system configuration. Each Evolution tool has at least one folder, called On This Computer, for local information. For example, the folder list for the e-mail tool shows any remote e-mail storage you have set up, plus local folders and search folders, which are discussed in <link linkend="usage-mail-organize-vfolders">Using Search Folders</link>. </para>
     <para>If you get large amounts of e-mail, you might want more folders than just your Inbox. You can create multiple calendar, task, or contacts folders. </para>
     <para>To create a new folder:</para>
@@ -951,7 +951,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>
@@ -1001,7 +1001,7 @@
 
    <section id="usage-mail-getnsend-get-attach">
     <title>Working with Attachments and HTML Mail</title>
-    <para>If someone sends you an <link linkend="attachment">attachment</link>, Evolution displays a file icon at the end of the message to which it&apos;s attached. Text, including HTML formatting and embedded images, appears as part of the message, rather than as a separate attachment. Attachments are also listed on the top bar of the message. To view the attachments, click the arrow to expand the attachment window. To open an attachment, double-click the it. Click the Save All button save all the attachments.</para>
+    <para>If someone sends you an <link linkend="attachment">attachment</link>, Evolution displays a file icon at the end of the message to which it&apos;s attached. Text, including HTML formatting and embedded images, appears as part of the message, rather than as a separate attachment. Attachments are also listed on the top bar of the message. To view the attachments, click the arrow to expand the attachment window. To open an attachment, double-click it. Click the Save All button save all the attachments.</para>
 
     <section id="usage-mail-getnsend-get-attach-actions">
      <title>Saving or Opening Attachments</title>
@@ -1022,7 +1022,7 @@
      <para>To open an attachment using another application: </para>
      <orderedlist>
       <listitem id="bsen4ia">
-       <para>Click the down-arrow on the attachment icon or right-click the attachment icon in the attachment bar</para>
+       <para>Click the down-arrow on the attachment icon or right-click the attachment icon in the attachment bar.</para>
       </listitem>
       <listitem id="bsen4kb">
        <para>Select the application to open the attachment.</para>
@@ -1455,13 +1455,13 @@
 
    <section id="usage-mail-getnsend-fwd">
     <title>Forwarding Mail</title>
-    <para>When you receive an e-mail, 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>When you receive an e-mail, 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">inline</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: </para>
     <orderedlist>
      <listitem id="b10fnnjq">
       <para>Click Forward on the toolbar.</para>
       <para>or</para>
-      <para>If you prefer to forward the message <link linkend="inline">inline</link> instead of attached, click Actions &gt; Forward Inline from the menu.</para>
+      <para>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.</para>
      </listitem>
      <listitem id="b10fnnnk">
       <para>Select an addressee as you would when sending a new message; the subject is already entered, although you can alter it if you want.</para>
@@ -1617,7 +1617,7 @@
     <para>If you want, you can upload your keys to a key server.</para>
     <orderedlist>
      <listitem id="bsg3379">
-      <para>Check your public key ID with gpg--list-keys. It is the string after 1024D on the line beginning with pub. In the example above, it is 32j38dk2.</para>
+      <para>Check your public key ID with gpg --list-keys. It is the string after 1024D on the line beginning with pub. In the example above, it is 32j38dk2.</para>
      </listitem>
      <listitem id="bsg347p">
       <para>Enter the command <command>gpg --send-keys --keyserver wwwkeys.pgp.net <varname>32j38dk2</varname></command>. Substitute your key ID for <varname>32j38dk2</varname>. You need your password to do this.</para>
@@ -1842,7 +1842,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>
 
@@ -2407,7 +2407,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">
@@ -2728,7 +2728,7 @@
        </formalpara>
       </listitem>
      </itemizedlist>
-     <para>Apart from the above notifications, the Evolution alarm icon blink in the notification area. To pause the alarm or view the event, click the notification icon.</para>
+     <para>Apart from the above notifications, the Evolution alarm icon blinks in the notification area. To pause the alarm or view the event, click the notification icon.</para>
      <para>To create a reminder:</para>
      <orderedlist>
       <listitem id="bxmtait">
@@ -4875,7 +4875,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>
@@ -4926,19 +4926,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>
@@ -4951,7 +4951,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 Virtual Folders</bridgehead>
-   <para>Right-click a message and select Create Rule From Message. You can also create filters and virtual folders in the Tools menu. </para>
+   <para>Right-click a message and select Create Rule From Message. You can also create filters and virtual 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>
@@ -4959,10 +4959,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">
@@ -4974,7 +4974,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>
 
@@ -4989,7 +4989,7 @@ Accepting and Replying to a Meeting Requ
   <title>Authors</title>
   <para>Evolution was written by the Evolution&trade; team and numerous other dedicated GNOME programmers. You can see their names by clicking Help &gt; About from any Evolution window.</para>
   <para>The Evolution code owes a great debt to the GNOME-pim and GNOME-Calendar applications, and to KHTMLW. The developers of Evolution acknowledge the efforts and contributions of all who worked on those projects.</para>
-  <para>For more information please visit the Evolution <ulink url="http://www.novell.com/products/desktop/features/evolution.html">Web page</ulink>. Please send all comments, suggestions, and bug reports to the <ulink url="http://bugzilla.ximian.com">bug tracking database</ulink>. Instructions for submitting bug reports can be found on-line at the same location. You can also use the GNOME bug report tool, bug-buddy, to submit your defect reports.</para>
+  <para>For more information please visit the Evolution <ulink url="http://www.novell.com/products/desktop/features/evolution.html">Web page</ulink>. Please send all comments, suggestions, and bug reports to the <ulink url="http://bugzilla.gnome.org">bug tracking database</ulink>. Instructions for submitting bug reports can be found on-line at the same location. You can also use the GNOME bug report tool, bug-buddy, to submit your defect reports.</para>
   <para>This manual was written by:</para>
   <itemizedlist>
    <listitem>
@@ -5261,7 +5261,7 @@ Accepting and Replying to a Meeting Requ
     <member>www.novell.com</member>
    </simplelist>
    <para id="Bktitle">Evolution User Guide</para>
-   <para>March 6, 2006</para>
+   <para>March 22, 2006</para>
    <simplelist>
     <member>To access the online documentation for this and other Novell products, and to get updates, see www.novell.com/documentation.</member>
    </simplelist>
@@ -5278,4 +5278,4 @@ Accepting and Replying to a Meeting Requ
     <member>All third-party trademarks are the property of their respective owners.</member>
    </simplelist>
   </appendix>
-</book>
\ No newline at end of file
+</book>
Index: evolution/help/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/help/ChangeLog,v
retrieving revision 1.254
diff -u -p -r1.254 ChangeLog
--- evolution/help/ChangeLog	6 Mar 2006 10:50:52 -0000	1.254
+++ evolution/help/ChangeLog	22 Mar 2006 18:30:49 -0000
@@ -1,4 +1,9 @@
-2206-03-06  Srinivasa Ragavan <sragavan@novell.com>
+2006-03-22  Andre Klapper  <a9016009@gmx.de>
+
+ 	* C/evolution.xml: Updating the doc for 2.6 and fixing bugs which went
+	in by updating the doc for 2.6.
+
+2006-03-06  Srinivasa Ragavan <sragavan@novell.com>
 
 	* C/figures/Screenshot-Evolution -mailer-Preferences.png:
 	* C/figures/Screenshot-Free-Busy.png: Added two new images for the 2.6
