merge emacs-23

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