fixing typos, etc

svn path=/trunk/; revision=22859

10 files changed, 110 insertions, 221 deletions

diff --git a/help/C/apx-authors.xml b/help/C/apx-authors.xml
index c600d49804..24856e2fc3 100644
--- a/help/C/apx-authors.xml
+++ b/help/C/apx-authors.xml
@@ -59,7 +59,11 @@
             </para></listitem>
           
             <listitem><para>
-              Hector Garcia Alvarez for Spanish (.es)
+              
+              For Spanish (.es): Versions prior to 1.2, H&eacute;ctor 
+              Garc&iacute;a &Aacute;lvarez; from 1.2 completely redone 
+              by Ismael Olea and Ignacio R. Maturana for Lambdaux 
+              Software Services.
             </para></listitem>
 
             <listitem><para>
diff --git a/help/C/apx-fdl.xml b/help/C/apx-fdl.xml
index 4af2a495fa..f074a4f453 100644
--- a/help/C/apx-fdl.xml
+++ b/help/C/apx-fdl.xml
@@ -445,7 +445,7 @@
       You may add a section entitled <quote>Endorsements</quote>,
       provided it contains nothing but endorsements of your <link
       linkend="fdl-modified">Modified Version</link> by various
-      parties--for example, statements of peer review or that the text
+      parties&mdash;for example, statements of peer review or that the text
       has been approved by an organization as the authoritative
       definition of a standard.
     </para>
diff --git a/help/C/config-prefs.xml b/help/C/config-prefs.xml
index 8b1fd615cd..582cfbab57 100644
--- a/help/C/config-prefs.xml
+++ b/help/C/config-prefs.xml
@@ -584,7 +584,7 @@ smtp.omniport.com:143
          <term>Loading Images</term>
          <listitem>
            <para>
-             You can embed a message in an email and have it load only
+             You can embed a image in an email and have it load only
              when the message arrives. However, spammers can use image loading
              patterns to confirm "live" addresses and invade your
              privacy. You may elect never to load images
@@ -635,9 +635,9 @@ smtp.omniport.com:143
       <title>Message Composer Preferences</title>
       <para>
         There are three  tabs of settings you can change for the
-        message composer. The General tab covers shortcuts and
+        message composer. The <guilabel>General</guilabel> tab covers shortcuts and
         assorted behavior, and the other two control signatures and
-        spell checking.  In the General tab, you can set:
+        spell checking.  In the <guilabel>General</guilabel> tab, you can set:
 
          <variablelist>
 
@@ -709,9 +709,13 @@ smtp.omniport.com:143
     <para>
       You can check the spelling of messages by selecting
       <menuchoice><guimenu>Edit</guimenu><guimenuitem>Spell Check
-      Document</guimenuitem></menuchoice>.
-      Alternately, check the <guibutton>Check spelling while i
-      type</guibutton> box, and choose a color for your misspelled words.
+      Document</guimenuitem></menuchoice>.  Alternately, in the
+      Evolution main window select
+      <menuchoice><guimenu>Tools</guimenu><guisubmenu>Settings</guisubmenu></menuchoice>,
+      click on the <guiicon>Composer preferences</guiicon> icon, then
+      select the <guilabel>Spell Checking</guilabel> tab and check the
+      <guibutton>Check spelling while i type</guibutton> box, and
+      choose a color for your misspelled words.
   </para>
 </sect1>
 
diff --git a/help/C/menuref.xml b/help/C/menuref.xml
index f3cbab4a5f..a88dc9962a 100644
--- a/help/C/menuref.xml
+++ b/help/C/menuref.xml
@@ -15,128 +15,25 @@
 <note id="shortcuts">
 <title>Custom Keyboard Shortcuts</title>
 <para>
-   As of GNOME 2.0, custom keyboard shortcuts lose out to keyboard
-  shortcuts as defined in application menus. For example, even if you have
-  chosen Emacs-style keybindings, the
-<keycombo>
-<keycap>Ctrl</keycap>
-<keycap>A</keycap>
-</keycombo> shortcut
-select the entire message (as noted in in
-<menuchoice><guimenu>Edit</guimenu><guimenuitem>Select
-All</guimenuitem></menuchoice>), not go to the beginning of a line, as it would in Emacs.
- </para>
-
- <para>
-   Keybindings that are not overridden by menu definitions are not affected. For example, 
+  If you have set custom keyboard shortcuts for your desktop, (you can
+   do this the control center: select
+   <menuchoice><guimenu>System</guimenu><guimenuitem>Settings</guimenuitem></menuchoice>
+   from your menu panel), they may interfere with Evolution keyboard
+   shortcuts.
+</para>
+<para>
+   For example, if you have chosen Emacs-style key bindings for your
+   desktop-wide text editor, the shortcut
    <keycombo action="simul">
     <keycap>Ctrl</keycap>
-    <keycap>K</keycap>
+    <keycap>W</keycap>
   </keycombo>
-  still acts as "cut line."
-</para>
-
-<para>
-  To change keybinding settings, select
-  <menuchoice><guimenu>System</guimenu><guimenuitem>Personal
-  Settings</guimenuitem></menuchoice>
-  from your menu panel and double-click the
-<guiicon>Shortcuts</guiicon> icon.
+  will act as "Cut region" rather than as "Close Window" in the
+  message composer.
 </para>
-
 </note>
 
 
-<sect1 id="commandline">
-  <title>Command Line Options</title>
-  <para>
-    Evolution is primarily a graphical (GUI) tool, but it has a few
-    command-line flags and options you may want to use. 
-  </para>
-
-    <variablelist>
-      <varlistentry>
-        <term>Force Evolution to Quit</term>
-        <listitem>
-          <para>
-            Earlier versions of Evolution shipped with a "killev"
-            script to halt all Evolution processes. Evolution 1.4 uses
-            the --force-shutdown flag instead. If Evolution has
-            stopped responding, try runing the command <command>evolution-1.4
-          --force-shutdown</command>.
-          </para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Handling Mailto Links with a Subject</term>
-        <listitem>
-          <para>
-            Evolution handles mailto links from browsers. If you use
-            Galeon, you can set the mail handler by selecting
-            <menuchoice><guimenu>System</guimenu><guimenuitem>Personal
-            Preferences</guimenuitem></menuchoice> and double-clicking the <guiicon>File
-            Associations</guiicon> icon.
-          </para>
-          <para>
-            For other browsers or applications, enter your custom
-            email handler as the command <userinput>evolution-1.4 "%s"</userinput> </para>
-          <para>
-            To create a preformed subject, enter the command like so:
-            <command>evolution-1.4 mailto:address@isp.com?subject="Subject of Message"</command>
-          </para>
-        </listitem>
-      </varlistentry>
-                 
-
-
-      <varlistentry>
-        <term>  Disable splash screen</term>
-        <listitem>
-          <para>
-            If you dislike the splash screen, add the flag
-            <userinput>--no-splash.</userinput>
-          </para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Start Online or Offline</term>
-        <listitem>
-          <para>
-            To start in online mode or in offline mode, add the <userinput>--offline</userinput>
-          or  <userinput>--online</userinput> flag to the command line.
-          </para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Capture Debugging Output</term>
-        <listitem>
-          <para> 
-          To gather debugging information for a bug report, run
-          Evolution with the flag
-          <userinput>--debug=filename.txt</userinput>.  All debugging output
-          will go to the file name you choose.
-          </para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Additional Command Line Help</term>
-        <listitem>
-          <para>
-            Run <command>evolution --help</command> or
-          <command>evolution -?</command> to get a long listing of
-          additional options, most of which are available for all GNOME
-          applications. To get a short syntax summary, run the command
-          <command>evolution-1.4 --usage</command>.
-          </para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-</sect1>
 
 
   <sect1 id="quickref-open">
diff --git a/help/C/usage-calendar.xml b/help/C/usage-calendar.xml
index 6838b98fd8..88c2f05571 100644
--- a/help/C/usage-calendar.xml
+++ b/help/C/usage-calendar.xml
@@ -419,7 +419,7 @@
       <para>
 	Once you get a reply to your meeting invitation, you'll need
 	to view it inline in the email.  Click the attachment and
-	select <guibutton>View Inline</guibutton>.  At the bottom, you
+	select <guimenuitem>View Inline</guimenuitem>.  At the bottom, you
 	can click <guibutton>OK</guibutton> to update your attendee
 	list.
       </para>
diff --git a/help/C/usage-exchange.xml b/help/C/usage-exchange.xml
index 4d86881603..6c29418a2b 100644
--- a/help/C/usage-exchange.xml
+++ b/help/C/usage-exchange.xml
@@ -432,7 +432,7 @@ There are, however, some features which are not available:
                     <title>The Global Catalog Server</title>
                     <para>
                       The Global Catalog server provides you with
-                      access access to the Global Address List,
+                      access to the Global Address List,
                       free/busy information, and folder delegation
                       features. These may not work properly if you do
                       not have a Global Catalog server.
@@ -864,7 +864,7 @@ There are, however, some features which are not available:
 
             <listitem>
               <para>
-                Click OK.
+                Click <guibutton>OK</guibutton>.
               </para>
             </listitem>
           </orderedlist>
diff --git a/help/C/usage-mail-org.xml b/help/C/usage-mail-org.xml
index bea80ce056..9fc913e938 100644
--- a/help/C/usage-mail-org.xml
+++ b/help/C/usage-mail-org.xml
@@ -311,7 +311,7 @@
 
       <para>
         Flags can help you organize your work in a number of ways. For
-        example, you might add a Flag Status column to your message
+        example, you might add a <interface>Flag Status</interface> column to your message
         list and sort that way. Alternately, you could create a vFolder
         that displays all your flagged messages, and clear the flags
         when you're done, so the vFolder contains only messages with
@@ -610,13 +610,13 @@
 	
 		<listitem><para> Date sent - Filter messages according to the date on
 		    which they were sent: First, choose the conditions you
-		    want a message to meet -- <guilabel>before</guilabel>
+		    want a message to meet &mdash; <guilabel>before</guilabel>
 		    a given time, <guilabel>after</guilabel> it, and so forth.
 		    Then, choose the time. The filter will compare the
 		    message's time-stamp to the system clock when the filter
 		    is run, or to a specific time and date you choose from a
 		    calendar.  You can even have it look for messages within a
-		    range of time relative to the filter -- perhaps you're
+		    range of time relative to the filter &mdash; perhaps you're
 		    looking for messages less than two days old.
 		  </para></listitem>
 		
@@ -671,7 +671,7 @@
 		
 		<listitem>
 		  <para>
-		    Expression - If you know your way around a
+		    Regex Match  - If you know your way around a
 		    <glossterm
 		    linkend="regular-expression">regex</glossterm>, or
 		    regular expression, put your knowledge to use
@@ -786,7 +786,7 @@
            Spam, also known as unsolicited commercial email (UCE), is
            the bane of many people's Inboxes, but it doesn't have to
            be. Using Ximian Evolution filters and an external Spam
-           detection tool like SpamAssassin (<ulink
+           detection tool like <application>SpamAssassin</application> (<ulink
            url="http://spamassassin.org/">http://spamassassin.org/</ulink>),
            you can catch the vast majority of junk mail and drop it
            directly into the trash.
@@ -844,7 +844,7 @@
              </para></listitem>
 
              <listitem><para>
-                Click OK. You're done.
+                Click <guibutton>OK</guibutton>. You're done.
              </para></listitem>
 	   </orderedlist>
          </para>
@@ -866,7 +866,7 @@
          <orderedlist>
            <listitem>
            <para>
-             Open a new create a text file with any text editor (
+             Create a text file with any text editor (
              <menuchoice>
                <guimenu>
                  Programs
@@ -877,26 +877,24 @@
                <guimenuitem>
                  Text Editor
                </guimenuitem>
-             </menuchoice> is the most convenient) and paste in the following:
-             <screen>
-               spamassassin -e
-             </screen>
+             </menuchoice> is the most convenient) and write the next command:
+             <command>spamassassin -e</command>.
              This will run the SpamAssassin command and report back 0
              if the message is not junk.
            </para>
          </listitem>
          <listitem>
            <para>
-             Save the file as "spam-filter.sh"
+             Save the file as <filename>spam-filter.sh</filename>
            </para>
          </listitem>
          <listitem>
            <para>
               Mark the file as an executable program: 
-             Open your home directory in Nautilus, right-click on
+             Open your home directory in <application>Nautilus</application>, right-click on
              spam-filter.sh there, and select
              <guimenuitem>Properties</guimenuitem>. Then, click the
-             "Permissions" tab and check the box in the
+             <guilabel>Permissions</guilabel> tab and check the box in the
              <guilabel>Execute</guilabel> column and the
              <guilabel>Owner</guilabel> row. Alternately, open a terminal
              (<menuchoice>
@@ -909,7 +907,7 @@
              <guimenuitem>
                Terminal
              </guimenuitem>
-           </menuchoice>) and enter the command: chmod +x spam-filter.sh.
+           </menuchoice>) and enter the command: <command>chmod +x spam-filter.sh</command>.
        </para>
      </listitem>
      <listitem>
@@ -921,12 +919,12 @@
    </listitem>
 
              <listitem><para> 
-             Select "Pipe Message to Shell Command" as the first portion of the criterion.
+             Select <guilabel>Pipe Message to Shell Command</guilabel> as the first portion of the criterion.
                </para></listitem>
 
              <listitem><para> 
-             Enter "/home/username/spam-filter.sh" as the shell command, then select
-             "Does Not Return" and "0" as the remaining two
+             Enter <userinput>/home/username/spam-filter.sh</userinput> as the shell command, then select
+             <guilabel>Does Not Return</guilabel>  and <guilabel>0</guilabel> as the remaining two
              items. Substitute your username for "username" so that
              Evolution can find the script.
            </para></listitem>
@@ -940,7 +938,7 @@
              </para></listitem>
            <listitem>
              <para>
-               You're done. Click "OK" to close the filter and "OK" to
+               You're done. Click <guibutton>OK</guibutton> to close the filter and <guibutton>OK</guibutton> to
                close the filter editor.
              </para>
            </listitem>
@@ -1189,13 +1187,13 @@
 		
 		<listitem><para> Date sent - Search messages according to the date on
 		    which they were sent: First, choose the conditions you
-		    want a message to meet -- <guilabel>before</guilabel>
+		    want a message to meet &mdash; <guilabel>before</guilabel>
 		    a given time, <guilabel>after</guilabel> it, and so forth.
 		    Then, choose the time. The vFolder will compare the
 		    message's time-stamp to the system clock when the filter
 		    is run, or to a specific time and date you choose from a
 		    calendar.  You can even have it look for messages within a
-		    range of time relative to the filter -- perhaps you're
+		    range of time relative to the filter &mdash; perhaps you're
 		    looking for messages less than two days old.
 		  </para></listitem>
 		
diff --git a/help/C/usage-mail.xml b/help/C/usage-mail.xml
index 107bc6895e..65a7a30715 100644
--- a/help/C/usage-mail.xml
+++ b/help/C/usage-mail.xml
@@ -286,14 +286,10 @@
           <tip>
             <title>Sharing Mailboxes with Other Mail Programs</title>
             <para>
-              You can use <application>Evolution</application>
-              alongside another email client, such as
-              <application>Mutt</application>, or use transport agents
-              like <application>fetchmail</application> instead of the
-              mail transport mechanism included in
-              <application>Evolution.</application>.
-              To do so, you will set Evolution to read messages from
-              the other application's directories:
+              If you want to use <application>Evolution</application>
+              and another email client, such as
+              <application>Mutt</application>, at the same time,
+              here's how:
               <orderedlist numeration="arabic">
                 <listitem>
                    <para>
@@ -303,45 +299,32 @@
                   </listitem>
                 <listitem>
                    <para>
-                      In <application>Evolution</application>, select 
-                     <menuchoice><guimenu>Tools</guimenu><guimenuitem>
-                      Settings</guimenuitem></menuchoice> and select the 
-                      Mail Accounts configuration tool. 
+                      In <application>Evolution</application>, select
+                      <menuchoice><guimenu>Tools</guimenu><guimenuitem>
+                      Settings</guimenuitem></menuchoice>, go to the
+                      Mail Accounts configuration tool, and pick the account
+                      you'd like to use to share mail. You may want to
+                      create a new account just for this source of
+                      mail.
                    </para>
-                 </listitem>
-                 <listitem>
-                   <para>
-                     Select an existing account and click
-                     <guibutton>Edit</guibutton>, or click
-                     <guibutton>New</guibutton> to create a new account.
-                   </para>
-               </listitem>                                 
+               </listitem>                     
                <listitem>
                    <para>
-                     If editing an existing account, click the
-                     <guilabel>Receiving Mail</guilabel> tab. If you
-                     have created a new account, fill out the
-                     requested information until you reach the
-                     <guilabel>Receiving Mail</guilabel> step.
-                   </para>
-                 </listitem>
-                 <listitem>
-                   <para>
-                      For your mail source, select the type of mail
-                     file that your other mail application uses, and
-                     then enter the full path to that location. A
-                     typical choice would be mbox files, with the path
-                     /home/username/Mail/.
-                   </para>
-                 </listitem>
-                 <listitem>
+                      Under the <guilabel>Receiving Mail</guilabel>
+                      tab, select the type of mail file that your
+                      other mail application uses, and then enter the
+                      full path to that location. A typical choice
+                   would be mbox files, with the path /home/username/Mail/.
+                 </para>
+                  </listitem>
+                <listitem>
                    <para>
-                     Click the <guibutton>OK</guibutton> button.
+                      Click the <guibutton>OK</guibutton> button.
                    </para>
-                 </listitem>
-               </orderedlist>
-             </para>
-           </tip>
+                  </listitem>
+                </orderedlist>
+               </para>
+            </tip>
 
 
 <!-- NOT FOR 1.0
@@ -586,9 +569,9 @@
 
       <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
+        <guimenu>Tools</guimenu>
+        <guimenuitem>Settings</guimenuitem> </menuchoice> and then
+        click the <guilabel>Folder Settings</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. 
@@ -649,10 +632,10 @@
         </para>
         <para>
             To hide the display of files you've attached to the
-            message, select <menuchoice>
-            <guimenu>View</guimenu> <guimenuitem>Hide
+            message, unselect <menuchoice>
+            <guimenu>View</guimenu> <guimenuitem>Show
             Attachments</guimenuitem> </menuchoice>; to show them
-            again, choose <guimenuitem>Show Attachments</guimenuitem>.
+            again, select <guimenuitem>Show Attachments</guimenuitem>.
         </para>
         <para>
             When you send the message, a copy of the attached file
@@ -758,8 +741,8 @@
           <para>
             Alternately, you can click on the
             <guibutton>To:</guibutton>, <guibutton>Cc:</guibutton>, or
-            <guibutton>Bcc:</guibutton> buttons to get a list --
-            potentially a very long one -- of the email addresses
+            <guibutton>Bcc:</guibutton> buttons to get a list &mdash;
+            potentially a very long one &mdash; of the email addresses
             in your contact manager.  Select addresses and click on
             the arrows to move them into the appropriate address
             columns.
@@ -1004,10 +987,10 @@
 		selected, the style will apply to whatever you type
 		next.  The buttons are:
 		<itemizedlist mark="none">
-		  <listitem><para>Push <guibutton>B</guibutton> for bold text</para></listitem>
-		  <listitem><para>Push <guibutton>I</guibutton> for italics</para></listitem>
-		  <listitem><para>Push <guibutton>U</guibutton> to underline</para></listitem>
-		  <listitem><para>Push <guibutton>S</guibutton> for a strikethrough.</para></listitem>
+		  <listitem><para>Push <guiicon>bold A</guiicon> for bold text</para></listitem>
+		  <listitem><para>Push <guiicon>italic A</guiicon> for italics</para></listitem>
+		  <listitem><para>Push <guiicon>underlined A</guiicon> to underline</para></listitem>
+		  <listitem><para>Push <guiicon>striked A</guiicon> for a strikethrough.</para></listitem>
 		</itemizedlist>
 	      </para>
 	    </listitem>
@@ -1049,7 +1032,9 @@
                   selected, the color will apply to whatever you type
                   next.  You can select a background color or image by
                   right-clicking on the message background and
-                  selecting <guilabel>Page</guilabel>.
+                  selecting <menuchoice> <guimenuitem>Style</guimenuitem> 
+                  <guimenuitem>Page Style</guimenuitem>
+                   </menuchoice>.
                </para>
             </listitem>
           </varlistentry>
@@ -1284,7 +1269,7 @@
 		  Insert
 		  </guimenu>
 		  <guimenuitem>
-		    HTML Template
+		    Template
 		  </guimenuitem>
 		</menuchoice>
 	      </para>
@@ -1359,7 +1344,7 @@ action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
           you prefer to forward the message <glossterm
           linkend="inline">inline</glossterm>
           instead of attached, select <menuchoice>
-          <guimenu>Actions</guimenu> <guimenuitem>Forward
+          <guimenu>Actions</guimenu><guisubmenu>Forward</guisubmenu><guimenuitem>
           Inline</guimenuitem> </menuchoice> from the menu.  Choose an
           addressee as you would when sending a new message; the
           subject will already be entered, although you can alter it
@@ -1444,7 +1429,7 @@ action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
     </para>
     <para>
       If you click on the attachment button and click the
-      <guibutton>View Inline</guibutton>, <application>Ximian
+      <guimenuitem>View Inline</guimenuitem>, <application>Ximian
       Evolution</application> will show you information about the
       meeting, and let you respond to the meeting in several ways.
       Select the response that you would like, and then click the
@@ -1737,10 +1722,10 @@ action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
         by typing <command>gpg --list-keys</command>.  You should see
         something similar to this:
         <programlisting>
-	    /home/you/.gnupg/pubring.gpg
-	    ----------------------------
-	    pub 1024D/32j38dk2 2001-06-20 you &lt;you@your-address.com&gt;
-	    sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14]
+        /home/you/.gnupg/pubring.gpg
+        ----------------------------
+        pub 1024D/32j38dk2 2001-06-20 you &lt;you@your-address.com&gt;
+        sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14]
 	</programlisting>
       </para>
       <para>
@@ -1775,11 +1760,11 @@ wwwkeys.pgp.net 32j38dk2</command>.  Substitute your key ID for
 	  <para>
 	    Key servers store your public keys for you so that your
 	    friends can decrypt your messages.  If you choose not to
-	    use a key server, you must distribute your public key in
-	    other ways. For example, you can attach it to emails or
-	    put it on your own web page. However, it's easier to
-	    publish them once, and then let people download them from
-	    a central place when they want.
+	    use a key server, you can manually send your people public
+	    key, include it in your signature file, or put it on your
+	    own web page. However, it's easier to publish them once,
+	    and then let people download them from a central place when
+	    they want.
 	  </para>
           <para>
              If you don't have a key you need to unlock or encrypt a
@@ -1813,7 +1798,7 @@ wwwkeys.pgp.net 32j38dk2</command>.  Substitute your key ID for
       </para>
       <para>
         If someone sends you their public key directly, save it as a
-        plain text file and enter the command <command>gpg --import
+        plain text file and enter the command <command>gpg
         filename</command>. This will add it to your keyring.
       </para>
     </sect2>
diff --git a/help/C/usage-mainwindow.xml b/help/C/usage-mainwindow.xml
index 8d4d55fb2c..b78ba13dfc 100644
--- a/help/C/usage-mainwindow.xml
+++ b/help/C/usage-mainwindow.xml
@@ -954,7 +954,7 @@ the workaround described in the note below.
       <application>Ximian Evolution</application>. It displays all your
       appointments, address cards, and email in a tree that's a lot
       like a <glossterm linkend="filetree">file
-      tree</glossterm>-- it starts small at the top, and branches
+      tree</glossterm>&mdash; it starts small at the top, and branches
       downward. On most computers, there will be three or four
       folders at the base.  First, of course, is the
       <guilabel>Summary</guilabel>, a customizable summary of your
@@ -1201,8 +1201,8 @@ the workaround described in the note below.
           <term> <guimenu>Actions</guimenu>:</term>
           <listitem><para>
 	    Holds actions which maybe applied to a message.  Normally,
-	    if there is only one target for the action -- for
-	    example, replying to a message -- you can find it in
+	    if there is only one target for the action &mdash; for
+	    example, replying to a message &mdash; you can find it in
 	    the <guimenu>Actions</guimenu> menu.
           </para></listitem>
         </varlistentry>
@@ -1491,8 +1491,9 @@ Shows you your calendar. Tasks are displayed below calendar appointments.
       <para>
 	The month pane is a small view of your calendar by month.  To
 	display more months here, drag the column border to the left.
-	If you select a range of days in the month pane they will be
-	displayed <guilabel>Appointment List</guilabel>.
+	To view a specific series of days, select them in the month 
+	view and they will display all the planned events in the 
+	<interface>Appointment List</interface>. 
       </para>
 
       <para>
diff --git a/help/C/usage-print.xml b/help/C/usage-print.xml
index 3c6918b8d1..1e7f5c5b18 100644
--- a/help/C/usage-print.xml
+++ b/help/C/usage-print.xml
@@ -58,7 +58,7 @@
     <para>
        The printer selection window, shown in <xref
        linkend="print-dest"/>, lets you choose the format for
-       printing-- <guilabel>Generic Postscript</guilabel>,
+       printing&mdash; <guilabel>Generic Postscript</guilabel>,
        whether to write to a PDF file, and whether to print to a file
        or to an actual printer in Generic Postscript.  If you choose a
        printer, you'll be asked for the printer command (probably