diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-02-22 20:19:28 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-02-22 20:19:28 -0800 |
| commit | cce7d53002e8abc346b67ea4100507b0e7c4d68e (patch) | |
| tree | faed484c15cde23eec2ec2463a1f30b9a8f4e43b /admin | |
| parent | 4902e827bc04d0e1cb17820fe522992995166fc7 (diff) | |
| parent | 51a13bdd9324860db6381e6da121411467087bec (diff) | |
| download | emacs-cce7d53002e8abc346b67ea4100507b0e7c4d68e.tar.gz | |
Merge from emacs-23; up to 2010-06-02T00:10:42Z!yamaoka@jpl.org.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 4 | ||||
| -rw-r--r-- | admin/notes/bugtracker | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 87ba151dc34..f2c16b42e23 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,7 @@ +2011-02-23 Juanma Barranquero <lekktu@gmail.com> + + * notes/bugtracker (bugtracker_debbugs_url): Fix typo. + 2011-02-19 Eli Zaretskii <eliz@gnu.org> * admin.el (set-version): Add msdos/sed2v2.inp. diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker index 02ca77bf7de..f2805eae443 100644 --- a/admin/notes/bugtracker +++ b/admin/notes/bugtracker @@ -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 |