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

Proposed by Paul Stewart on 2011-07-21
Status: Merged
Merge reported by: Martin Pool
Merged at revision: not available
Proposed branch: lp:~paulbrianstewart/ubuntu/oneiric/bzr/814311-typo-52825-manBzr
Merge into: lp:ubuntu/oneiric/bzr
Diff against target: 17 lines (+3/-3)
1 file modified
bzrlib/doc_generate/autodoc_man.py (+3/-3)
To merge this branch: bzr merge lp:~paulbrianstewart/ubuntu/oneiric/bzr/814311-typo-52825-manBzr
Reviewer Review Type Date Requested Status
Ubuntu branches 2011-07-21 Pending
Review via email: mp+68752@code.launchpad.net

Commit message

* 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.

Description of the change

* 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.

To post a comment you must log in.
Paul Stewart (paulbrianstewart) wrote :

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

Martin Pool (mbp) wrote :

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) wrote :

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) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/doc_generate/autodoc_man.py'
2--- bzrlib/doc_generate/autodoc_man.py 2010-11-06 10:55:58 +0000
3+++ bzrlib/doc_generate/autodoc_man.py 2011-07-21 21:59:42 +0000
4@@ -186,10 +186,10 @@
5 .B "help"
6 .I "command"
7 .SH "DESCRIPTION"
8-Bazaar (or %(bzrcmd)s) is a project of Canonical to develop an free
9+Part of the GNU Project, Bazaar (or %(bzrcmd)s) is a project sponsored by Canonical to develop a free
10 distributed version control system that is powerful, friendly, and scalable.
11-Version control means a system that keeps track of previous revisions
12-of software source code or similar information and helps people work on it in teams.
13+Version control systems track changes to software source code or similar information
14+and helps people work on it in teams.
15 """
16
17 man_foot = """\

Subscribers

People subscribed via source and target branches

to all changes: