Rev 4748: Merge in the 2.0 series, resolve the NEWS issues in lp:///~jameinel/bzr/start-2.1.0b2

[John Arbash Meinel]

At lp:///~jameinel/bzr/start-2.1.0b2

------------------------------------------------------------
revno: 4748 [merge]
revision-id: john at arbash-meinel.com-20091015040632-yt0cvxmgm8kolta9
parent: john at arbash-meinel.com-20091015040126-a0aeamcjsjeredvv
parent: john at arbash-meinel.com-20091015034714-4c7e3seksf4gzgjd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: start-2.1.0b2
timestamp: Wed 2009-10-14 23:06:32 -0500
message:
  Merge in the 2.0 series, resolve the NEWS issues
  make sure there is specific room for the 2.0.2 changes, and bring
  in the template, etc.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2009-10-15 04:01:26 +0000
+++ b/NEWS	2009-10-15 04:06:32 +0000
@@ -13,8 +13,23 @@
 :2.1.0b2: ???
 
 
+Compatibility Breaks
+********************
+
+New Features
+************
+
+Bug Fixes
+*********
+
+Improvements
+************
+
+Documentation
+*************
+
 API Changes
-###########
+***********
 
 * ``UIFactory`` now has new ``show_error``, ``show_message`` and
   ``show_warning`` methods, which can be hooked by non-text UIs.  
@@ -38,6 +53,40 @@
   20-40%, and significantly improve performance by removing objects from
   being inspected by the garbage collector. (John Arbash Meinel)
 
+Testing
+*******
+
+
+bzr 2.0.2 (not released yet)
+############################
+
+:Codename:
+:2.0.2: ???
+
+Compatibility Breaks
+********************
+
+New Features
+************
+
+Bug Fixes
+*********
+
+Improvements
+************
+
+Documentation
+*************
+
+API Changes
+***********
+
+Internals
+*********
+
+Testing
+*******
+
 
 bzr 2.1.0b1
 ###########
@@ -10942,5 +10991,38 @@
 * Storage of local versions: init, add, remove, rm, info, log,
   diff, status, etc.
 
+
+bzr ?.?.? (not released yet)
+############################
+
+:Codename: template
+:2.0.2: ???
+
+Compatibility Breaks
+********************
+
+New Features
+************
+
+Bug Fixes
+*********
+
+Improvements
+************
+
+Documentation
+*************
+
+API Changes
+***********
+
+Internals
+*********
+
+Testing
+*******
+
+
+
 ..
    vim: tw=74 ft=rst ff=unix