Rev 5096: (igc) What's New in 2.2 doc in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5096 [merge]
revision-id: pqm at pqm.ubuntu.com-20100318072627-y6reuz3rao6l0jqp
parent: pqm at pqm.ubuntu.com-20100318065553-0rmuklt8qff3629j
parent: ian.clatworthy at canonical.com-20100318062218-hmjjq7rau60qvwjm
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2010-03-18 07:26:27 +0000
message:
  (igc) What's New in 2.2 doc
added:
  doc/en/whats-new/whats-new-in-2.2.txt whatsnewin2.2.txt-20100304041442-cj7jdn23zakcw08l-1
modified:
  doc/en/_templates/index.html   index.html-20090722133849-lus2rzwsmlhpgqhv-1
  doc/en/index.txt               contents.txt-20090722133816-63ik5s6s5gsnz7zy-13
=== modified file 'doc/en/_templates/index.html'
--- a/doc/en/_templates/index.html	2010-03-02 10:21:39 +0000
+++ b/doc/en/_templates/index.html	2010-03-04 04:15:18 +0000
@@ -7,7 +7,7 @@
 
   <table class="contentstable" align="center" style="margin-left: 30px"><tr>
     <td width="50%">
-        <p class="biglink"><a class="biglink" href="{{ pathto("whats-new/whats-new-in-2.1") }}">What's New in Bazaar 2.1?</a><br/>
+        <p class="biglink"><a class="biglink" href="{{ pathto("whats-new/whats-new-in-2.2") }}">What's New in Bazaar 2.2?</a><br/>
         <span class="linkdescr">what's new in this release</span>
       </p>
         <p class="biglink"><a class="biglink" href="{{ pathto("user-guide/index") }}">User Guide</a><br/>

=== modified file 'doc/en/index.txt'
--- a/doc/en/index.txt	2010-02-19 03:02:07 +0000
+++ b/doc/en/index.txt	2010-03-04 04:15:18 +0000
@@ -10,7 +10,7 @@
 .. toctree::
    :maxdepth: 1
 
-   whats-new/whats-new-in-2.1
+   whats-new/whats-new-in-2.2
    user-guide/index
    tutorials/index
    quick-reference/index

=== added file 'doc/en/whats-new/whats-new-in-2.2.txt'
--- a/doc/en/whats-new/whats-new-in-2.2.txt	1970-01-01 00:00:00 +0000
+++ b/doc/en/whats-new/whats-new-in-2.2.txt	2010-03-04 04:15:18 +0000
@@ -0,0 +1,70 @@
+What's New in Bazaar 2.2?
+=========================
+
+This document outlines the major improvements in Bazaar 2.2
+vs Bazaar 2.1. As well as summarizing improvements made to
+the core product, it highlights enhancements within the broader
+Bazaar world of potential interest to those upgrading.
+
+.. warning::
+
+   Bazaar 2.2.0 is currently in development. While less stable than
+   Bazaar 2.1.x, we aim to keep quality at a high level:
+
+   * Monthly beta releases should be suitable for early adopters of new
+     features.
+
+   * Nightly builds are suitable for users interested in assisting
+     with testing.
+
+   If it doubt, please use the latest 2.1 release instead.
+
+
+Improved conflict handling
+--------------------------
+
+Tree-shape conflicts can be resolved by providing ``--take-this`` and
+``--take-other`` to the ``bzr resolve`` command. Just marking the conflict
+as resolved is still accessible via the ``--done`` default action.
+
+
+Improved Launchpad integration
+------------------------------
+
+Merges can be proposed on Launchpad with the new **lp-propose-merge**
+command.
+
+
+Notable plugin enhancements
+---------------------------
+
+The grep plugin ...
+
+
+Better documentation
+--------------------
+
+Numerous improvements have been made to the developer documentation.
+
+
+Enhanced GUI clients
+--------------------
+
+(Details coming soon.)
+
+
+Further information
+-------------------
+
+For more detailed information on the changes made, be sure to check
+the :doc:`../release-notes/index` for:
+
+* the interim bzr `milestones <https://launchpad.net/bzr/2.2>`_
+* the plugins you use.
+
+For a summary of changes made in earlier releases, see:
+
+* :doc:`whats-new-in-2.1`
+
+Enjoy,
+The Bazaar Development Team