Merge lp:~paulbrianstewart/ubuntu/oneiric/bzr/814311-typo-52825-manBzr into lp:ubuntu/oneiric/bzr

[Paul Stewart]

* Corrected spelling of "an" to "a" the man bzr "Description" paragraph.
* Added "Part of the GNU Project" to the beginning of the man bzr "Description" paragraph.

* Corrected spelling of "an" to "a" the man bzr "Description" paragraph.
* Added "Part of the GNU Project" to the beginning of the man bzr "Description" paragraph.

[Paul Stewart (paulbrianstewart)]

This is a fix for bug #813411 and bug #528254

[Martin Pool (mbp)]

Thanks for tackling this.

This ought to be fixed upstream, not in the ubuntu-specific branch, so I proposed <https://code.launchpad.net/~mbp/bzr/doc-2.4/+merge/68760> and I'm going to close this one.

[Martin Pool (mbp)]

because of an lp bug i can't reject this, but it's effectively superseded by mine so i'll mark it merged.

[Paul Stewart (paulbrianstewart)]

Ok..thanks...let me know if you need me to do anything else.
Paul

=== modified file 'bzrlib/doc_generate/autodoc_man.py'
--- bzrlib/doc_generate/autodoc_man.py	2010-11-06 10:55:58 +0000
+++ bzrlib/doc_generate/autodoc_man.py	2011-07-21 21:59:42 +0000
@@ -186,10 +186,10 @@
 .B "help"
 .I "command"
 .SH "DESCRIPTION"
-Bazaar (or %(bzrcmd)s) is a project of Canonical to develop an free
+Part of the GNU Project, Bazaar (or %(bzrcmd)s) is a project sponsored by Canonical to develop a free
 distributed version control system that is powerful, friendly, and scalable.
-Version control means a system that keeps track of previous revisions
-of software source code or similar information and helps people work on it in teams.
+Version control systems track changes to software source code or similar information 
+and helps people work on it in teams.
 """
 
 man_foot = """\