Rev 6251: (jelmer) Fix the help message for the changelog_merge plugin. (Jelmer in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6251 [merge]
revision-id: pqm at pqm.ubuntu.com-20111109160934-uzl2bf236oib7u3x
parent: pqm at pqm.ubuntu.com-20111108200030-7muon3zmq1pxfy4f
parent: jelmer at samba.org-20111109141952-1m5mvac1jnkvfozg
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2011-11-09 16:09:34 +0000
message:
  (jelmer) Fix the help message for the changelog_merge plugin. (Jelmer
   Vernooij)
modified:
  bzrlib/plugins/changelog_merge/__init__.py __init__.py-20100920024628-tdrjysnxjm1q96oq-1
=== modified file 'bzrlib/plugins/changelog_merge/__init__.py'
--- a/bzrlib/plugins/changelog_merge/__init__.py	2011-03-31 15:10:05 +0000
+++ b/bzrlib/plugins/changelog_merge/__init__.py	2011-11-09 14:19:52 +0000
@@ -16,7 +16,7 @@
 
 __doc__ = """Merge hook for GNU-format ChangeLog files
 
-To enable this plugin, add a section to your location.conf
+To enable this plugin, add a section to your locations.conf
 like::
 
     [/home/user/proj]