Merge lp:~kirkland/ubuntu-motd/ubuntu-motd into lp:~brian-murray/ubuntu-motd/update-date

Proposed by Dustin Kirkland 
Status: Needs review
Proposed branch: lp:~kirkland/ubuntu-motd/ubuntu-motd
Merge into: lp:~brian-murray/ubuntu-motd/update-date
Diff against target: 29 lines (+6/-6)
2 files modified
README (+3/-4)
index.txt (+3/-2)
To merge this branch: bzr merge lp:~kirkland/ubuntu-motd/ubuntu-motd
Reviewer Review Type Date Requested Status
Brian Murray Pending
Review via email: mp+331292@code.launchpad.net

Description of the change

soften language; "reboot later", rather than "never reboot"

To post a comment you must log in.
Revision history for this message
Brian Murray (brian-murray) wrote :

I think you've chosen the wrong merge target here.

lp:~kirkland/ubuntu-motd/ubuntu-motd updated
26. By Dustin Kirkland 

zero out motd message

27. By Dustin Kirkland 

add kernel cve message

28. By Dustin Kirkland 

update for 17.10 ga

29. By Dustin Kirkland 

ubuntu community appreciation day

30. By Dustin Kirkland 

google code in message

31. By Dustin Kirkland 

added link to blog post about Ubuntu updates for meltdown / spectre

32. By Dustin Kirkland 

add pointer to new spectre insights post

33. By Dustin Kirkland 

update with detailed meltdown/spectre blog post

34. By Dustin Kirkland 

switch to ubu.one

Unmerged revisions

34. By Dustin Kirkland 

switch to ubu.one

33. By Dustin Kirkland 

update with detailed meltdown/spectre blog post

32. By Dustin Kirkland 

add pointer to new spectre insights post

31. By Dustin Kirkland 

added link to blog post about Ubuntu updates for meltdown / spectre

30. By Dustin Kirkland 

google code in message

29. By Dustin Kirkland 

ubuntu community appreciation day

28. By Dustin Kirkland 

update for 17.10 ga

27. By Dustin Kirkland 

add kernel cve message

26. By Dustin Kirkland 

zero out motd message

25. By Dustin Kirkland 

update text about livepatch

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README'
2--- README 2016-12-05 19:40:07 +0000
3+++ README 2018-01-26 17:51:44 +0000
4@@ -1,12 +1,11 @@
5 This repository contains news related to the dynamic Ubuntu Message of the Day.
6
7 Rules:
8- - The file, "index.txt" should contain no more than 2 lines.
9+ - The file, "index.txt" should contain no more than 10 lines.
10 - No line should contain more than 80 characters
11- - The first line should present an informative header, title
12- - The second line should start with a whitespace, followed by an asterisk, a whitespace, and then a url
13+ - The first line should start with a white space, an asterisk, and a whitespace, followed by an informative header
14+ - The last line should be a link to more information
15
16 Example index.txt:
17
18-Enterprise kernel livepatch service, free to Ubuntu community:
19 * https://ubuntu.com/zero-downtime
20
21=== modified file 'index.txt'
22--- index.txt 2017-04-27 16:33:02 +0000
23+++ index.txt 2018-01-26 17:51:44 +0000
24@@ -1,2 +1,3 @@
25-Ubuntu 12.04 LTS end-of-life was April 28, 2017 -- Upgrade your Precise systems!
26- $ sudo do-release-upgrade -m server
27+ * Meltdown, Spectre and Ubuntu: What are the attack vectors,
28+ how the fixes work, and everything else you need to know
29+ - https://ubu.one/u2Know

Subscribers

People subscribed via source and target branches