Rev 4974: Tweak NEWS entry order and some cleanup. in file:///home/vila/src/bzr/reviews/fix-481526/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/reviews/fix-481526/

------------------------------------------------------------
revno: 4974
revision-id: v.ladeuil+lp at free.fr-20100121091007-af0pudqurqwpuu0z
parent: nmb at wartburg.edu-20100120201026-ayj5al2xqxxz3lzp
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: fix-481526
timestamp: Thu 2010-01-21 10:10:07 +0100
message:
  Tweak NEWS entry order and some cleanup.
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2010-01-18 22:05:00 +0000
+++ b/NEWS	2010-01-21 09:10:07 +0000
@@ -111,12 +111,6 @@
   should appear up-to-date.)
   (John Arbash Meinel, Martin <gzlist>, #488724)
 
-* Improve discussion of pending merges in the documentation for
-  ``revert``.  (Neil Martinsen-Burrell, #505093)
-
-* Add documentation on creating merges with more than one parent.
-  (Neil Martinsen-Burrell, #481526)
-
 Improvements
 ************
 
@@ -143,6 +137,12 @@
 Documentation
 *************
 
+* Add documentation on creating merges with more than one parent.
+  (Neil Martinsen-Burrell, #481526)
+
+* Improve discussion of pending merges in the documentation for
+  ``revert``.  (Neil Martinsen-Burrell, #505093)
+
 * Improved help for ``bzr send``. 
   (Martin Pool, Bojan Nikolic)
 

=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2010-01-20 20:10:26 +0000
+++ b/bzrlib/builtins.py	2010-01-21 09:10:07 +0000
@@ -3671,7 +3671,7 @@
             bzr merge /tmp/merge
 
         To create a merge revision with three parents from two branches
-        ../feature1a and ../feature1b::
+        feature1a and feature1b:
 
             bzr merge ../feature1a
             bzr merge ../feature1b --force