Rev 3312: Reduced the evangelism in the User Guide (Ian Clatworthy) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Fri Mar 28 03:28:13 GMT 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3312
revision-id:pqm at pqm.ubuntu.com-20080328032801-o2sda79zu2g6ckxg
parent: pqm at pqm.ubuntu.com-20080327163915-wtpepv5kq5hm42zv
parent: ian.clatworthy at canonical.com-20080328014920-hbtesze2sw6yfls6
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-03-28 03:28:01 +0000
message:
Reduced the evangelism in the User Guide (Ian Clatworthy)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
doc/en/user-guide/annotating_changes.txt annotating_changes.t-20071122141511-0knao2lklsdsvb1q-1
doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
doc/en/user-guide/introducing_bazaar.txt introducing_bazaar.t-20071114035000-q36a9h57ps06uvnl-5
------------------------------------------------------------
revno: 3311.1.1
revision-id:ian.clatworthy at canonical.com-20080328014920-hbtesze2sw6yfls6
parent: pqm at pqm.ubuntu.com-20080327163915-wtpepv5kq5hm42zv
parent: ian.clatworthy at canonical.com-20080327075110-afgd7x03ybju06ez
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Fri 2008-03-28 11:49:20 +1000
message:
Reduced the evangelism in the User Guide (Ian Clatworthy)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
doc/en/user-guide/annotating_changes.txt annotating_changes.t-20071122141511-0knao2lklsdsvb1q-1
doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
doc/en/user-guide/introducing_bazaar.txt introducing_bazaar.t-20071114035000-q36a9h57ps06uvnl-5
------------------------------------------------------------
revno: 3309.1.1
revision-id:ian.clatworthy at canonical.com-20080327075110-afgd7x03ybju06ez
parent: pqm at pqm.ubuntu.com-20080327022136-3r7xq97mm5j5s1x6
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.ug1-refresh
timestamp: Thu 2008-03-27 17:51:10 +1000
message:
Reduce evangelism in the User Guide
modified:
doc/en/user-guide/annotating_changes.txt annotating_changes.t-20071122141511-0knao2lklsdsvb1q-1
doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
doc/en/user-guide/introducing_bazaar.txt introducing_bazaar.t-20071114035000-q36a9h57ps06uvnl-5
=== modified file 'NEWS'
--- a/NEWS 2008-03-27 15:06:04 +0000
+++ b/NEWS 2008-03-28 01:49:20 +0000
@@ -62,6 +62,8 @@
* Minor fixes to the User Guide. (Matthew Fuller)
+ * Reduced the evangelism in the User Guide. (Ian Clatworthy)
+
API BREAKS:
* Attempting to pull data from a ghost aware repository (e.g. knits) into a
=== modified file 'doc/en/user-guide/annotating_changes.txt'
--- a/doc/en/user-guide/annotating_changes.txt 2007-11-22 14:15:37 +0000
+++ b/doc/en/user-guide/annotating_changes.txt 2008-03-27 07:51:10 +0000
@@ -31,5 +31,5 @@
The GUI tools typically provide a much richer display of
interesting information (e.g. all the changes in each commit)
-so they are often preferred over the text-based command by users.
+so you may prefer them over the text-based command.
=== modified file 'doc/en/user-guide/bazaar_workflows.txt'
--- a/doc/en/user-guide/bazaar_workflows.txt 2008-02-27 16:41:53 +0000
+++ b/doc/en/user-guide/bazaar_workflows.txt 2008-03-27 07:51:10 +0000
@@ -4,13 +4,16 @@
Bazaar is just a tool
---------------------
-One of the best things about Bazaar is that it supports many
-different ways of working together. This means that you can
+Bazaar supports many different ways of working together.
+This means that you can
start with one workflow and adapt it over time as circumstances
change. There is no "one true way" that always makes sense and
there never will be. This section provides a brief overview of
some popular workflows supported by Bazaar.
+Keep in mind that these workflow are just *some* examples of how
+Bazaar can be used. You may want to use a workflow not listed here,
+perhaps building on the ideas below.
Solo
----
@@ -65,8 +68,7 @@
.. image:: images/workflows_centralized.png
Subversion and CVS are good choices for implementing this workflow because they
-make it easy. Unlike the vast majority of distributed VCS tools, Bazaar makes
-it easy as well by directly supporting it. In addition, Bazaar provides some
+make it easy. Bazaar directly supports it as well while providing some
important advantages over CVS and Subversion:
* better branching and merging
=== modified file 'doc/en/user-guide/installing_bazaar.txt'
--- a/doc/en/user-guide/installing_bazaar.txt 2007-12-14 07:35:49 +0000
+++ b/doc/en/user-guide/installing_bazaar.txt 2008-03-27 07:51:10 +0000
@@ -55,13 +55,13 @@
Running the development version
-------------------------------
-If you wish to always be using the very latest development version of
-Bazaar, it is easy to do so. Note that this is not recommended for
+You may wish to always be using the very latest development version of
+Bazaar. Note that this is not recommended for
the majority of users as there is an increased risk of bugs. On the other
hand, the development version is remarkably solid (thanks to the processes
-we follow) and running it makes it easier for you to help us make Bazaar
-even better, either through increased testing or sending us changes for
-bugs and improvements.
+we follow) and running it makes it easier for you to send us changes for
+bugs and improvements. It also helps us by having more people testing
+the latest software.
Here are the steps to follow:
@@ -81,8 +81,8 @@
Running multiple versions
-------------------------
-One of the neat things about Bazaar is that it's really easy to have
-multiple versions installed and to switch between them. To do this,
+It's easy to have multiple versions of Bazaar installed and to switch
+between them. To do this,
simply provide the full pathname to the **bzr** command you wish to run.
The relevant libraries will be automatically detected and used. Of course,
if you do not provide a pathname, then the **bzr** used will be the one
@@ -90,4 +90,3 @@
Note that this capability is particularly useful if you wish to run
(or test) both the latest released version and the development version say.
-
=== modified file 'doc/en/user-guide/introducing_bazaar.txt'
--- a/doc/en/user-guide/introducing_bazaar.txt 2007-12-17 02:00:45 +0000
+++ b/doc/en/user-guide/introducing_bazaar.txt 2008-03-28 01:49:20 +0000
@@ -26,13 +26,12 @@
------------------------------------------
Version control tools have been evolving for several decades now. In
-simple terms, there have been 5 generations of tools:
+simple terms, there have been 4 generations of tools:
1. file versioning tools, e.g. SCCS, RCS
2. tree versioning tools - central style, e.g. CVS
- 3. tree versioning tools - central style, done right, e.g. Subversion
- 4. tree versioning tools - distributed style, e.g. Arch
- 5. tree versioning tools - distributed style, done right, e.g. Bazaar.
+ 3. tree versioning tools - central style, take two, e.g. Subversion
+ 4. tree versioning tools - distributed style, e.g. Bazaar.
The design and implementation of Bazaar builds on the lessons learned
from all the previous generations of tools. In particular, Bazaar
@@ -98,38 +97,13 @@
While Bazaar is not the only distributed VCS tool around, it does have some
notable features that make it an excellent choice for many teams and
-communities. These include:
-
- * it **Just Works** - a high focus on usability and performance
- * **adaptive** - cleanly supports many different ways of working together
- * **rich metadata** that tracks merge history across distributed locations,
- understands directories as first-class objects and correctly tracks
- renames of both files and directories
- * **integrated merging** that uses this metadata intelligently to
- ensure that merging is safe without being painful, letting you
- collaborate without fear
- * **truly portable** across many operating systems including Windows
- * **safe with your data** - integrity is checked using cryptographic
- techniques and all changes can be digitally signed if required
- * **low administration**, e.g. access to FTP or SFTP is enough to
- share with others - no special server required
- * **efficiently stores data** across branches in a flexible and safe way
- * an **open architecture and API** that makes it easy to integrate
- with other tools
- * a **large number of plugins** including bzr-svn and GUI front-ends
- * **excellent integration** with a range of companion tools and services
- including PQM, Bundle Buggy and Launchpad
- * **completely open source**
- * **commercial training and support** available from Canonical,
- the company that sponsors Ubuntu.
-
-While all of these are important, perhaps the greatest asset Bazaar has is
-an active and growing open source community behind it. Bazaar is completely
-free software written in Python so it is easy to contribute improvements.
-Our collective goal is to build and support a distributed VCS tool that
-developers love to use, a tool that helps them get their job done without
-getting in their way. If you wish to get involved, please see
-http://bazaar-vcs.org/BzrSupport.
+communities. A summary of these and comparisons with other VCS tools
+can be found on the Bazaar Wiki, http://bazaar-vcs.org.
+
+Of the many features, one in particular is worth highlighting:
+Bazaar is completely free software written in Python. As a result,
+it is easy to contribute improvements. If you wish to get involved,
+please see http://bazaar-vcs.org/BzrSupport.
Learning more
@@ -155,8 +129,8 @@
* `Bazaar Quick Start Card`_ - a one page summary of commonly used commands.
-The online help and `Bazaar User Reference`_ are also particularly useful as
-they provide all the gory details on the commands and options available.
+In addition, the online help and `Bazaar User Reference`_ provide all the
+details on the commands and options available.
.. _Bazaar in five minutes: ../mini-tutorial/index.html
.. _Bazaar Quick Start Card: ../quick-reference/quick-start-summary.svg
More information about the bazaar-commits
mailing list