Merge lp:~jamesodhunt/upstart/upstart-fix-677392 into lp:~canonical-scott/upstart/trunk

[James Hunt]

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

review: Approve

[Philipp Schlesinger (philipp-sadleder)]

Hello!

New message, please read <http://okna-blagodat.com/blood.php?md2x0>

<email address hidden>

[Philipp Schlesinger (philipp-sadleder)]

Hey, Don't miss up this new stuff, you're going to be delighted, read more here <http://sespunkugo.masswerks.com/remark.php?d4>

Best, <email address hidden>

[Philipp Schlesinger (philipp-sadleder)]

Hello friend,

Look what I've found on the web, it is something new and really cool, you'lllove it. More info here <http://thank.carnow.ca/lnlfxqt>

Sincerely yours, philipp

[Philipp Schlesinger (philipp-sadleder)]

Hey,

There are a cople of stories I wanted to share with you, please, read more here <http://tifiduxy.cctvessentials.com/lnslm>

Take care, philipp

[Philipp Schlesinger (philipp-sadleder)]

Hi,

I've just received a message from my friend with such an exciting information, please read it here http://look.testforechopodcast.com/cecf

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

=== modified file 'init/event.c'
--- init/event.c	2009-07-02 17:31:25 +0000
+++ init/event.c	2010-11-19 14:42:54 +0000
@@ -87,11 +87,11 @@
  * array of environment variables in KEY=VALUE form.  @env will be referenced
  * by the new event.  After calling this function, you should never use
  * nih_free() to free @env and instead use nih_unref() or nih_discard() if
- * you longer need to use it.
+ * you no longer need to use it.
  *
  * When the event reaches the top of the queue, it is taken off and placed
  * into the handling queue.  It is not removed from that queue until there
- * are no longer anything referencing it.
+ * are no remaining references to it.
  *
  * The event is created with nothing blocking it.  Be sure to call
  * event_block() otherwise it will be automatically freed next time
@@ -156,7 +156,7 @@
 
 /**
  * event_block:
- * @emission: event to block.
+ * @event: event to block.
  *
  * This function should be called by jobs that wish to hold a reference on
  * the event and block it from finishing.

=== modified file 'init/event_operator.c'
--- init/event_operator.c	2010-02-04 20:08:59 +0000
+++ init/event_operator.c	2010-11-19 14:42:54 +0000
@@ -368,7 +368,7 @@
  * @env: NULL-terminated array of environment variables for expansion.
  *
  * Handles the emission of @event, matching it against EVENT_MATCH nodes in
- * the EventOperator tree rooted at @oper, and updating the values of other
+ * the EventOperator tree rooted at @root, and updating the values of other
  * nodes to match.
  *
  * @env is optional, and may be NULL; if given it should be a NULL-terminated
@@ -380,10 +380,10 @@
  * using event_operator_reset().
  *
  * Note that this returns to indicate whether a successful match was made;
- * you should also check the value of @oper to make sure you react to this,
+ * you should also check the value of @root to make sure you react to this,
  * as that still may be FALSE.
  *
- * Returns: TRUE if @event matched an entry in the tree under @oper, FALSE
+ * Returns: TRUE if @event matched an entry in the tree under @root, FALSE
  * otherwise.
  **/
 int

=== modified file 'init/man/init.5'
--- init/man/init.5	2010-03-31 17:29:24 +0000
+++ init/man/init.5	2010-11-19 14:42:54 +0000
@@ -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
@@ -144,7 +144,7 @@
 such as removing temporary directories.
 
 .PP
-All of these process, including the main process, are optional.  Services
+All of these processes, including the main process, are optional.  Services
 without a main process will appear to be running until they are stopped,
 this is commonly used to define states such as runlevels.  It's quite
 permissable to have no main process, but to have
@@ -162,7 +162,7 @@
 .\"
 .SS Event definition
 Jobs can be manually started and stopped at any time by a system adminstrator
-using the.
+using the
 .BR start (8)
 and
 .BR stop (8)
@@ -307,7 +307,11 @@
 .BR stopping (7)
 and
 .BR stopped (7)
-events for this job.
+events for this job
+.ft B
+and to all resultant events
+.ft
+(not just those relating to the current job).
 .\"
 .SS Services, tasks and respawning
 Jobs are