Rev 4983: Merge the 2.0.4 branch, bringing in the NEWS updates. in http://bazaar.launchpad.net/~jameinel/bzr/2.1.0rc1-dev

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.1.0rc1-dev

------------------------------------------------------------
revno: 4983 [merge]
revision-id: john at arbash-meinel.com-20100121201243-q3ptdkmf8udx1ltw
parent: john at arbash-meinel.com-20100121201030-b7albw78182jpr31
parent: john at arbash-meinel.com-20100121193557-r0djw2lu8ehba3v1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1.0rc1-dev
timestamp: Thu 2010-01-21 14:12:43 -0600
message:
  Merge the 2.0.4 branch, bringing in the NEWS updates.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2010-01-21 20:10:30 +0000
+++ b/NEWS	2010-01-21 20:12:43 +0000
@@ -248,17 +248,17 @@
   tests that 'failed' - they're all just failures.
   (Martin Pool)
 
-bzr 2.0.4 (not released yet)
-############################
-
-:Codename:
-:2.0.4: smooth sailing
-
-Compatibility Breaks
-********************
-
-New Features
-************
+bzr 2.0.4
+#########
+
+:Codename: smooth sailing
+:2.0.4: 2010-01-21
+
+The fourth bugfix-only release in the 2.0 series contains more than a
+dozen bugfixes relative to 2.0.3. The primary focus is on handling
+interruptions and concurrent operations more cleanly, there is also a fair
+improvement to ``bzr export`` when exporting a remote branch.
+
 
 Bug Fixes
 *********
@@ -322,18 +322,6 @@
   the right time will get propagated, rather than silently failing to move
   the block pointer. (John Arbash Meinel, Gareth White, #495023)
 
-Improvements
-************
-
-Documentation
-*************
-
-API Changes
-***********
-
-Internals
-*********
-
 Testing
 *******