fix typo in encryption section.

2003-07-14  Aaron Weber  <aaron@ximian.com>

	* C/usage-mail.xml: fix typo in encryption section.

	* C/menuref.xml: add command line reference.

svn path=/trunk/; revision=21808

2 files changed, 120 insertions, 17 deletions

diff --git a/help/C/menuref.xml b/help/C/menuref.xml
index a88dc9962a..f3cbab4a5f 100644
--- a/help/C/menuref.xml
+++ b/help/C/menuref.xml
@@ -15,25 +15,128 @@
 <note id="shortcuts">
 <title>Custom Keyboard Shortcuts</title>
 <para>
-  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
+   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, 
    <keycombo action="simul">
     <keycap>Ctrl</keycap>
-    <keycap>W</keycap>
+    <keycap>K</keycap>
   </keycombo>
-  will act as "Cut region" rather than as "Close Window" in the
-  message composer.
+  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.
 </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-mail.xml b/help/C/usage-mail.xml
index 4bb6f8c9d5..0facfd8fd7 100644
--- a/help/C/usage-mail.xml
+++ b/help/C/usage-mail.xml
@@ -1758,11 +1758,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 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.
+	    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.
 	  </para>
           <para>
              If you don't have a key you need to unlock or encrypt a