summaryrefslogtreecommitdiff
path: root/admin
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2010-11-27 15:04:57 -0500
committerChong Yidong <cyd@stupidchicken.com>2010-11-27 15:04:57 -0500
commit07976ae3b816dea4fd541bbba862603d3132eb2c (patch)
tree4a437b7cb3abb01fb144530a130c991882a1b7f2 /admin
parent9610796712a3bc43730c99005906571a2c0bccbd (diff)
parent402c8a49571227f8a4e678d4a6cdd6ba7841aef9 (diff)
downloademacs-07976ae3b816dea4fd541bbba862603d3132eb2c.tar.gz
Merge changes from emacs-23 branch
Diffstat (limited to 'admin')
-rw-r--r--admin/notes/bugtracker6
1 files changed, 3 insertions, 3 deletions
diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker
index 902067011b0..7c6c0ff4272 100644
--- a/admin/notes/bugtracker
+++ b/admin/notes/bugtracker
@@ -475,8 +475,8 @@ http://lists.gnu.org/archive/html/emacs-devel/2009-11/msg00440.html
** Bazaar stuff
*** You can use `bzr commit --fixes debbugs:123' to mark that a commit fixes
-Emacs bug 123. You will first need to add a line to your ~/bazaar.conf
-or ~/locations.conf:
+Emacs bug 123. You will first need to add a line to one of your
+configuration files, ~/.bazaar/bazaar.conf or ~/.bazaar/locations.conf:
bugtracker_debbugs_url = http://debbugs.gnu.org/{id}
@@ -491,7 +491,7 @@ In the locations.conf file, it should go into the branch-specific
configuration section for the branch where you want this to be in
effect. For example, if you want this to be in effect for the branch
located at `/home/projects/emacs/trunk', you need to have this in your
-~/locations.conf file:
+~/.bazaar/locations.conf file:
[/home/projects/emacs/trunk]
bugtracker_debbugs_url = http://debbugs.gnu.org/{id}