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 @@
Custom Keyboard Shortcuts
- If you have set custom keyboard shortcuts for your desktop, (you can
- do this the control center: select
- SystemSettings
- from your menu panel), they may interfere with Evolution keyboard
- shortcuts.
-
-
- 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
+
+Ctrl
+A
+ shortcut
+select the entire message (as noted in in
+EditSelect
+All), not go to the beginning of a line, as it would in Emacs.
+
+
+
+ Keybindings that are not overridden by menu definitions are not affected. For example,
Ctrl
- W
+ K
- will act as "Cut region" rather than as "Close Window" in the
- message composer.
+ still acts as "cut line."
+
+
+ To change keybinding settings, select
+ SystemPersonal
+ Settings
+ from your menu panel and double-click the
+Shortcuts icon.
+
+
+
+ Command Line Options
+
+ Evolution is primarily a graphical (GUI) tool, but it has a few
+ command-line flags and options you may want to use.
+
+
+
+
+ Force Evolution to Quit
+
+
+ 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 evolution-1.4
+ --force-shutdown.
+
+
+
+
+
+ Handling Mailto Links with a Subject
+
+
+ Evolution handles mailto links from browsers. If you use
+ Galeon, you can set the mail handler by selecting
+ SystemPersonal
+ Preferences and double-clicking the File
+ Associations icon.
+
+
+ For other browsers or applications, enter your custom
+ email handler as the command evolution-1.4 "%s"
+
+ To create a preformed subject, enter the command like so:
+ evolution-1.4 mailto:address@isp.com?subject="Subject of Message"
+
+
+
+
+
+
+
+ Disable splash screen
+
+
+ If you dislike the splash screen, add the flag
+ --no-splash.
+
+
+
+
+
+ Start Online or Offline
+
+
+ To start in online mode or in offline mode, add the --offline
+ or --online flag to the command line.
+
+
+
+
+
+ Capture Debugging Output
+
+
+ To gather debugging information for a bug report, run
+ Evolution with the flag
+ --debug=filename.txt. All debugging output
+ will go to the file name you choose.
+
+
+
+
+
+ Additional Command Line Help
+
+
+ Run evolution --help or
+ evolution -? 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
+ evolution-1.4 --usage.
+
+
+
+
+
+
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. Substitute your key ID for
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.
If you don't have a key you need to unlock or encrypt a