Rev 6392: (gz) Small fix to plugin docstring and formatting (Benjamin Peterson) 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: 6392 [merge]
revision-id: pqm at pqm.ubuntu.com-20111220232724-wje5zrxmccnqhsph
parent: pqm at pqm.ubuntu.com-20111220184735-nvjnbab2d88i60ca
parent: benjamin at python.org-20111220221351-banbx3s0shan4c2n
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2011-12-20 23:27:24 +0000
message:
  (gz) Small fix to plugin docstring and formatting (Benjamin Peterson)
modified:
  bzrlib/plugins/news_merge/news_merge.py news_merge.py-20100118070008-sb1qe88ha64es7nv-1
  bzrlib/plugins/po_merge/__init__.py __init__.py-20111123180440-la918t6t068pzacx-3
=== modified file 'bzrlib/plugins/news_merge/news_merge.py'
--- a/bzrlib/plugins/news_merge/news_merge.py	2011-12-19 13:23:58 +0000
+++ b/bzrlib/plugins/news_merge/news_merge.py	2011-12-20 22:13:51 +0000
@@ -30,7 +30,7 @@
 
     def merge_text(self, params):
         """Perform a simple 3-way merge of a bzr NEWS file.
-        
+
         Each section of a bzr NEWS file is essentially an ordered set of bullet
         points, so we can simply take a set of bullet points, determine which
         bullets to add and which to remove, sort, and reserialize.

=== modified file 'bzrlib/plugins/po_merge/__init__.py'
--- a/bzrlib/plugins/po_merge/__init__.py	2011-12-18 12:46:49 +0000
+++ b/bzrlib/plugins/po_merge/__init__.py	2011-12-20 22:09:13 +0000
@@ -73,7 +73,7 @@
 
 
 def po_merge_hook(merger):
-    """Merger.merge_file_content hook for bzr-format NEWS files."""
+    """Merger.merge_file_content hook for po files."""
     from bzrlib.plugins.po_merge.po_merge import PoMerger
     return PoMerger(merger)