Merge from emacs-23; up to 2010-06-02T00:10:42Z!yamaoka@jpl.org.

This commit is contained in:
Glenn Morris
2011-02-22 20:19:28 -08:00
16 changed files with 113 additions and 68 deletions

View File

@@ -489,7 +489,7 @@ Here "{id}" is a literal string, a placeholder that will be replaced
by the bug number you specify after `--fixes debbugs:' in the bzr
command line (123 in the example above).
In the bazaar.conf file, this setting should go into the [DEFAULTS]
In the bazaar.conf file, this setting should go into the [DEFAULT]
section.
In the locations.conf file, it should go into the branch-specific