diff options
| author | Chong Yidong | 2010-11-27 15:04:57 -0500 |
|---|---|---|
| committer | Chong Yidong | 2010-11-27 15:04:57 -0500 |
| commit | 07976ae3b816dea4fd541bbba862603d3132eb2c (patch) | |
| tree | 4a437b7cb3abb01fb144530a130c991882a1b7f2 /admin/notes/bugtracker | |
| parent | 9610796712a3bc43730c99005906571a2c0bccbd (diff) | |
| parent | 402c8a49571227f8a4e678d4a6cdd6ba7841aef9 (diff) | |
| download | emacs-07976ae3b816dea4fd541bbba862603d3132eb2c.tar.gz emacs-07976ae3b816dea4fd541bbba862603d3132eb2c.zip | |
Merge changes from emacs-23 branch
Diffstat (limited to 'admin/notes/bugtracker')
| -rw-r--r-- | admin/notes/bugtracker | 6 |
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 | |||
| 475 | ** Bazaar stuff | 475 | ** Bazaar stuff |
| 476 | 476 | ||
| 477 | *** You can use `bzr commit --fixes debbugs:123' to mark that a commit fixes | 477 | *** You can use `bzr commit --fixes debbugs:123' to mark that a commit fixes |
| 478 | Emacs bug 123. You will first need to add a line to your ~/bazaar.conf | 478 | Emacs bug 123. You will first need to add a line to one of your |
| 479 | or ~/locations.conf: | 479 | configuration files, ~/.bazaar/bazaar.conf or ~/.bazaar/locations.conf: |
| 480 | 480 | ||
| 481 | bugtracker_debbugs_url = http://debbugs.gnu.org/{id} | 481 | bugtracker_debbugs_url = http://debbugs.gnu.org/{id} |
| 482 | 482 | ||
| @@ -491,7 +491,7 @@ In the locations.conf file, it should go into the branch-specific | |||
| 491 | configuration section for the branch where you want this to be in | 491 | configuration section for the branch where you want this to be in |
| 492 | effect. For example, if you want this to be in effect for the branch | 492 | effect. For example, if you want this to be in effect for the branch |
| 493 | located at `/home/projects/emacs/trunk', you need to have this in your | 493 | located at `/home/projects/emacs/trunk', you need to have this in your |
| 494 | ~/locations.conf file: | 494 | ~/.bazaar/locations.conf file: |
| 495 | 495 | ||
| 496 | [/home/projects/emacs/trunk] | 496 | [/home/projects/emacs/trunk] |
| 497 | bugtracker_debbugs_url = http://debbugs.gnu.org/{id} | 497 | bugtracker_debbugs_url = http://debbugs.gnu.org/{id} |