Merge lp:~jamesodhunt/ubuntu/precise/upstart/ffe-bug-962124 into lp:ubuntu/precise/upstart

[James Hunt]

Doc changes only.

  * init/man/init.8: Remove duplicate telinit(8).
  * debian/manpages/upstart-events.7:
    - Added table 'Job Goals and State Transitions'.
    - Corrected errors and omissions in 'Job Lifecycle' section.

[Didier Roche-Tolomelli (didrocks)]

@James: upstart 1.5 is already in precise, can you please add a new changelog for it?
Also, the above merge description doesn't match at all the content. Please repropose a new branch with the correct rationale :)

review: Needs Fixing

Unmerged revisions

1382. By James Hunt on 2012-03-22

debian/conf/flush-early-job-log.conf: Change initctl command from
'flush-early-job-log' to 'notify-disk-writeable' to reflect new name.

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-23 00:01:38 +0000
+++ debian/changelog	2012-03-27 13:43:21 +0000
@@ -9,6 +9,8 @@
     'initctl check-config'.
   * debian/manpages/upstart-events.7: Added 'failsafe-boot' and
     'recovery' events.
+  * debian/conf/flush-early-job-log.conf: Change initctl command from
+    'flush-early-job-log' to 'notify-disk-writeable' to reflect new name.
 
  -- James Hunt <[e-mail]>  Thu, 22 Mar 2012 13:50:31 +0000
 

=== modified file 'debian/conf/flush-early-job-log.conf'
--- debian/conf/flush-early-job-log.conf	2012-02-14 17:01:16 +0000
+++ debian/conf/flush-early-job-log.conf	2012-03-27 13:43:21 +0000
@@ -8,4 +8,4 @@
 
 start on filesystem
 
-exec initctl flush-early-job-log
+exec initctl notify-disk-writeable