Merge lp:~mbp/bzr/doc-old into lp:~bzr/bzr/trunk-old

[Martin Pool]

[Martin Pool (mbp)]

rms asked that our release mails mention that bzr is a GNU project.

[Jonathan Lange (jml)]

Fair enough. I don't think this needs to go into 1.16, but it'd be nice to land on trunk as soon as possible.

<jml> poolie: what happened to the '|' line prefix?
<poolie> i removed it so you can more easily copy the text
<jml> poolie: it wasn't necessary for formatting then?
<poolie> i think it changes it from the equivalent of <blockquote> to <pre>

review: Approve

=== added file 'doc/developers/bug-handling.txt'
--- doc/developers/bug-handling.txt	1970-01-01 00:00:00 +0000
+++ doc/developers/bug-handling.txt	2009-06-15 07:35:11 +0000
@@ -0,0 +1,17 @@
+=======================
+Tracking Bugs in Bazaar
+=======================
+
+This document describes the bug-tracking processes for developing Bazaar
+itself.
+
+See also:
+
+* `Bazaar Developer Documents <index.html>`_.
+
+* `The Bazaar Development Cycle <cycle.html>`_.
+
+* `The Bazaar User Guide <../en/user-guide/index.html>`_ -- for
+  information on integrating Bazaar with other bug trackers.
+
+.. vim: ft=rst

=== modified file 'doc/developers/cycle.txt'
--- doc/developers/cycle.txt	2008-10-17 08:05:03 +0000
+++ doc/developers/cycle.txt	2009-06-15 07:35:11 +0000
@@ -1,9 +1,32 @@
+============================
 The Bazaar Development Cycle
 ============================
 
 
-
-General process
+Overview
+--------
+
+Bazaar makes a release every four weeks, with one release candidate one
+week before the final release.  We may vary this schedule from time to
+time, amongst other things to respond to bugs reported in the release
+candidate or the final release.  Nevertheless, we value a regular release
+and we will normally slip only for serious bugs or regressions.
+
+See also:
+
+* `Bazaar Developer Document Catalog <index.html>`_
+
+* `Releasing Bazaar <releasing.html>`_ -- the process for actually making 
+  a release or release candidate.
+
+Longer-Term Planning
+--------------------
+
+Work spanning multiple releases is typically tracked in the bug tracker,
+and summarized in <http://bazaar-vcs.org/Roadmap>.
+
+
+General Process
 ---------------
 
 We normally have one person acting as the release manager, who 
@@ -93,13 +116,6 @@
    <releasing.html>`_ as the first RC.
 
 
-See also
---------
-
-* `Bazaar Developer Document Catalog <index.html>`_
-
-* `Releasing Bazaar <releasing.html>`_ -- the process for actually making 
-  a release or release candidate.
 
 
 ..

=== modified file 'doc/developers/index.txt'
--- doc/developers/index.txt	2009-04-03 01:34:58 +0000
+++ doc/developers/index.txt	2009-06-15 07:35:11 +0000
@@ -49,6 +49,9 @@
 * `EC2 resources <ec2.html>`_ |--| A team resource for 
   Windows packaging and testing, and Ubuntu testing.
 
+* `Tracking Bugs in Bazaar <bug-handling.html>`_ |--| How we use the bug 
+  tracker.
+
 Plans
 =====
 

=== modified file 'doc/developers/releasing.txt'
--- doc/developers/releasing.txt	2009-03-25 16:44:45 +0000
+++ doc/developers/releasing.txt	2009-06-15 07:35:11 +0000
@@ -158,23 +158,27 @@
    ``Reply-To: [e-mail]``, so that people who reply to
    the announcement don't spam other lists.
 
-   The announce mail will look something like this:
+   The announce mail will look something like this::
    
-    | Subject: bzr x.yy released!
-    | 
-    | <<Summary paragraph from news>>
-    |
-    | The Bazaar team is happy to announce availability of a new 
-    | release of the bzr adaptive version control system.
-    |
-    | Thanks to everyone who contributed patches, suggestions, and
-    | feedback.
-    | 
-    | Bazaar is now available for download from 
-    | http://bazaar-vcs.org/Download as a source tarball; packages 
-    | for various systems will be available soon.
-    | 
-    | <<NEWS section from this release back to the last major release>>
+      Subject: bzr x.yy released!
+      
+      <<Summary paragraph from news>>
+     
+      The Bazaar team is happy to announce availability of a new 
+      release of the bzr adaptive version control system.
+      Bazaar is part of the GNU project to develop a complete 
+      free software system.
+     
+      Thanks to everyone who contributed patches, suggestions, and
+      feedback.
+      
+      Bazaar is now available for download from 
+      http://bazaar-vcs.org/Download as a source tarball; packages 
+      for various systems will be available soon.
+      
+      <<NEWS section from this release back to the last major release>>
+
+   Feel free to tweak this to your taste.
 
 #. Make an announcement through <https://launchpad.net/bzr/+announce>
 

=== modified file 'doc/en/developer-guide/HACKING.txt'
--- doc/en/developer-guide/HACKING.txt	2009-06-10 05:00:47 +0000
+++ doc/en/developer-guide/HACKING.txt	2009-06-15 07:35:11 +0000
@@ -1558,16 +1558,6 @@
 Planning Releases
 =================
 
-Roadmaps
---------
-
-As the two senior developers, Martin Pool and Robert Collins coordinate
-the overall Bazaar product development roadmap. Core developers provide
-input and review into this, particularly during sprints. It's totally
-expected that community members ought to be working on things that
-interest them the most. The roadmap is valuable though because it provides
-context for understanding where the product is going as a whole and why.
-
 
 Using Releases and Milestones in Launchpad
 ------------------------------------------