diff options
| author | Kenichi Handa <handa@m17n.org> | 2011-02-22 10:51:16 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2011-02-22 10:51:16 +0900 |
| commit | 5e73594adafb41804c9f4b25f30532beea2804c3 (patch) | |
| tree | 446412f9cba27dbdec896b86856aa154580ac207 | |
| parent | 251ebe0f6446248399e2820a291365a33f0ead8b (diff) | |
| parent | 31fdb5440874d2fa9fd6e8458dda6f508275fec6 (diff) | |
| download | emacs-5e73594adafb41804c9f4b25f30532beea2804c3.tar.gz | |
merge emacs-23
| -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 33b091ba0b9..d0e7b78f2e8 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,7 @@ +2011-02-22 Juanma Barranquero <lekktu@gmail.com> + + * notes/bugtracker (bugtracker_debbugs_url): Fix typo. + 2011-01-03 Glenn Morris <rgm@gnu.org> * admin.el (set-copyright): Also handle \year in refcards/*.tex. diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker index ca71214cdcc..204948261ba 100644 --- a/admin/notes/bugtracker +++ b/admin/notes/bugtracker @@ -459,7 +459,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 |