Merge lp:~jamesodhunt/ubuntu/precise/upstart/upstart-events-man-pagecorrect-static-network-up-event into lp:ubuntu/precise/upstart

Proposed by James Hunt
Status: Merged
Merged at revision: 1387
Proposed branch: lp:~jamesodhunt/ubuntu/precise/upstart/upstart-events-man-pagecorrect-static-network-up-event
Merge into: lp:ubuntu/precise/upstart
Diff against target: 27 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
debian/manpages/upstart-events.7 (+1/-1)
To merge this branch: bzr merge lp:~jamesodhunt/ubuntu/precise/upstart/upstart-events-man-pagecorrect-static-network-up-event
Reviewer Review Type Date Requested Status
Clint Byrum (community) Approve
Ubuntu branches Pending
Review via email: mp+99700@code.launchpad.net

Description of the change

Doc change only.

* debian/manpages/upstart-events.7: Correct emitter for
  "static-network-up" event.

To post a comment you must log in.
Revision history for this message
Clint Byrum (clint-fewbar) wrote :

Looks good, thanks James.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-03-28 10:06:34 +0000
3+++ debian/changelog 2012-03-28 11:17:18 +0000
4@@ -1,3 +1,10 @@
5+upstart (1.5-0ubuntu3) precise; urgency=low
6+
7+ * debian/manpages/upstart-events.7: Correct emitter for
8+ "static-network-up" event.
9+
10+ -- James Hunt <james.hunt@ubuntu.com> Wed, 28 Mar 2012 11:59:56 +0100
11+
12 upstart (1.5-0ubuntu2) precise; urgency=low
13
14 * debian/conf/flush-early-job-log.conf: Change initctl command from
15
16=== modified file 'debian/manpages/upstart-events.7'
17--- debian/manpages/upstart-events.7 2012-03-28 10:06:34 +0000
18+++ debian/manpages/upstart-events.7 2012-03-28 11:17:18 +0000
19@@ -78,7 +78,7 @@
20 5@\fBstartup\fP(7)@S@I@Boot@J
21 @\fBstarted\fP(7)@S@I@> job started@K
22 @\fBstarting\fP(7)@H@I@< job starts@K
23- 8@static\-network\-up@S@I@> last static IF up@
24+ 8@static\-network\-up@S@N@> last static IF up@
25 @\fBstopped\fP(7)@S@I@> job stopped@K
26 @\fBstopping\fP(7)@H@I@< job stops@K
27 @T{

Subscribers

People subscribed via source and target branches

to all changes: