Merge lp:~harmoney/upstart/manpage-fixes into lp:~canonical-scott/upstart/trunk

[Patty Langasek]

[Scott James Remnant (Canonical) (canonical-scott)]

Hi Patty, before I can review your patch, I'll need you to follow the process described at http://upstart.ubuntu.com/wiki/CopyrightAssignment - Thanks

[Patty Langasek (harmoney)]

> Hi Patty, before I can review your patch, I'll need you to follow the process
> described at http://upstart.ubuntu.com/wiki/CopyrightAssignment - Thanks

Before I can sign the contract, I must consult a solicitor.

[Scott James Remnant (Canonical) (canonical-scott)]

How did that go? ;-)

[Patty Langasek (harmoney)]

On Wed, Dec 08, 2010 at 06:44:51PM -0000, Scott James Remnant wrote:
> How did that go? ;-)

> https://code.launchpad.net/~harmoney/upstart/manpage-fixes/+merge/20878
> You are the owner of lp:~harmoney/upstart/manpage-fixes.

Honestly? I refused to sign a copyright assignment for a company that I
don't work for (that isn't paying me) to correct grammar concerns. =) I
understand /why/ they want copyright assignment, but that doesn't mean I'll
agree to it if I'm not getting paid for it. Offer free corrections? No
problem! Sign contracts of any kind with a company to provide them with the
free corrections? Not a chance.

Patty

--
----------------------------------------------------------

Patty Langasek
<email address hidden>

----------------------------------------------------------

At times, you may end up far away from home; you may not be
sure of where you belong, anymore. But home is always
there... because home is not a place. It's wherever your
passion takes you.
                                --- J. Michael Straczynski

[Scott James Remnant (scott)]

This has been merged into lp:upstart ;-)

review: Approve

[Philipp Schlesinger (philipp-sadleder)]

Hello!

You have a new message, please read <http://accommodation.za.bz/dirty.php?s0>

<email address hidden>

[Philipp Schlesinger (philipp-sadleder)]

Hey,

I've got some good news for you, read more about it here <http://raryndetho.spookpictures.com/score.php?xl6>

Later, <email address hidden>

[Philipp Schlesinger (philipp-sadleder)]

Greetings,

Just take a look at that new store, they have so many cool things, they also have a very nice on-line store <http://attach.carnow.ca/lnril>

philipp

[Philipp Schlesinger (philipp-sadleder)]

Yo!

Have you read this new book already? I'm so delighted with it, please read it here http://extra.sixpacksoul.com/5958

Hugs, philipp

[Philipp Schlesinger (philipp-sadleder)]

Hey,

I'd like to show you a nice gift a friend of mine gave me recently, it's something really cool)) Please take a look http://harjap.com/coach.php?8a8b

Hope this helps, philipp

[Philipp Schlesinger (philipp-sadleder)]

Hello,

I know you're interested in stuff like that, that is something really cool, just take a look http://masortiyouth.org/cycle.php?e5e4

Hope this helps, philipp

[Philipp Schlesinger (philipp-sadleder)]

Dear,

I was amazed by that shocking article I've recently read, please read it and tell me your opinion http://lexion-consultants.com/vs.php?2120

Warmest regards, philipp

[Philipp Schlesinger (philipp-sadleder)]

Hello friend,

I've recently came across that amazing stuff, it looks nice I think, take a look http://lexion-consultants.com/rack.php?a4a5

Yours sincerely, philipp

[Philipp Schlesinger (philipp-sadleder)]

Hi friend!

Just take a look at that cool stuff, it the coolest stuff ever! You'll be simply amazed, check this out http://www.ungereimt.org/inherit.php?b3b2

My Best, philipp

Unmerged revisions

1236. By Patty Langasek <harmoney@bastet> on 2010-03-08

Grammar matters.

=== modified file 'init/man/init.5'
--- init/man/init.5	2010-02-04 20:08:59 +0000
+++ init/man/init.5	2010-03-08 00:50:29 +0000
@@ -56,7 +56,7 @@
 .B script
 stanzas, only one of which is permitted.  These specify the executable
 or shell script that will be run when the job is considered to be running.
-Once this process terminates, the job stop.
+Once this process terminates, the job stops.
 
 All processes are run with the full job environment available as
 environment variables in their process.
@@ -97,7 +97,7 @@
 .fi
 
 .PP
-There an additional four processes that may be run as part of the job's
+There are an additional four processes that may be run as part of the job's
 lifecycle.  These are specified as the process name, followed by an
 .B exec
 or