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

Proposed by Paul Stewart
Status: Rejected
Rejected by: John A Meinel
Proposed branch: lp:~paulbrianstewart/bzr/814311-typo-52825-manBzr
Merge into: lp:bzr
Diff against target: 19 lines (+4/-4)
1 file modified
bzrlib/doc_generate/autodoc_man.py (+4/-4)
To merge this branch: bzr merge lp:~paulbrianstewart/bzr/814311-typo-52825-manBzr
Reviewer Review Type Date Requested Status
bzr-core Pending
Review via email: mp+68756@code.launchpad.net

Commit message

Fix for bug #528254
Fix for bug #814311

Description of the change

* Corrected spelling of "an" to "a" the man bzr "Description" paragraph, re bug #814311.
* Added "Part of the GNU Project" to the beginning of the man bzr "Description" paragraph, re bug #528254

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Thanks, it seems to've worked alright this time. :)

Revision history for this message
Paul Stewart (paulbrianstewart) wrote :

Phew!!!

Thanks for your patience and help Jelmer, I appreciate it.

Paul

Revision history for this message
John A Meinel (jameinel) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 7/22/2011 2:16 AM, Martin Pool wrote:
> The proposal to merge lp:~paulbrianstewart/bzr/814311-typo-52825-manBzr into lp:bzr has been updated.
>
> Status: Needs review => Rejected
>
> For more details, see:
> https://code.launchpad.net/~paulbrianstewart/bzr/814311-typo-52825-manBzr/+merge/68756

I think you rejected the wrong one, Martin.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk4pKMIACgkQJdeBCYSNAAM+XgCgok122w2kCgzPm/WZVw73uaTi
l3QAnRyCrdFL+c3BYginSGEumi9JrIxQ
=Pcg5
-----END PGP SIGNATURE-----

Revision history for this message
John A Meinel (jameinel) wrote :

I'm guessing this got rejected because the other one was deleted, and Martin was trying to delete that one.

I'm not sure about the GNU Project change. I fully agree we should mention it, but this specific change makes it clumsy and the sentence a bit too long.

Revision history for this message
John A Meinel (jameinel) wrote :

Or maybe I should just read the rest of my email first... ugh. Sorry about all the noise.

Unmerged revisions

6037. By 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.

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 22:46:06 +0000
4@@ -185,11 +185,11 @@
5 .B "%(bzrcmd)s"
6 .B "help"
7 .I "command"
8-.SH "DESCRIPTION"
9-Bazaar (or %(bzrcmd)s) is a project of Canonical to develop an free
10+.SH "DESCRIPTION"
11+Part of the GNU Project, Bazaar (or %(bzrcmd)s) is a project sponsored by Canonical to develop a free
12 distributed version control system that is powerful, friendly, and scalable.
13-Version control means a system that keeps track of previous revisions
14-of software source code or similar information and helps people work on it in teams.
15+Version control systems track changes to software source code or similar information
16+and helps people work on it in teams.
17 """
18
19 man_foot = """\