Merge lp:~frank-heimes/installation-guide/ubuntu-18.04-s390x into lp:~ubuntu-core-dev/installation-guide/ubuntu

Proposed by Frank Heimes on 2018-04-18
Status: Merged
Approved by: Mathieu Trudel-Lapierre on 2018-04-25
Approved revision: 542
Merged at revision: 542
Proposed branch: lp:~frank-heimes/installation-guide/ubuntu-18.04-s390x
Merge into: lp:~ubuntu-core-dev/installation-guide/ubuntu
Diff against target: 43 lines (+9/-7)
2 files modified
en/bookinfo.xml (+1/-0)
en/welcome/what-is-ubuntu.xml (+8/-7)
To merge this branch: bzr merge lp:~frank-heimes/installation-guide/ubuntu-18.04-s390x
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre 2018-04-18 Approve on 2018-04-25
Review via email: mp+343552@code.launchpad.net

Commit message

IBM Z/s390x and IBM POWER data, adjusted support time

Description of the change

bookinfo.xml added year 2018
what-is-ubuntu.xml adjusted support times
adjusted info on IBM Power and IBM Z and LinuxONE (new family names for s390x)

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'en/bookinfo.xml'
2--- en/bookinfo.xml 2015-12-19 21:18:18 +0000
3+++ en/bookinfo.xml 2018-04-18 18:35:31 +0000
4@@ -60,6 +60,7 @@
5 <year>2009</year>
6 <year>2010</year>
7 <year>2015</year>
8+ <year>2018</year>
9 <holder>Canonical Ltd.</holder>
10 </copyright>
11
12
13=== modified file 'en/welcome/what-is-ubuntu.xml'
14--- en/welcome/what-is-ubuntu.xml 2016-04-18 21:06:20 +0000
15+++ en/welcome/what-is-ubuntu.xml 2018-04-18 18:35:31 +0000
16@@ -28,9 +28,10 @@
17 <listitem><para>
18
19 Ubuntu is shipped in stable and regular release cycles; <emphasis>a new
20-release will be shipped every six months</emphasis>. You can use the current
21-stable release or the current development release. A release will be
22-supported for 18 months.
23+release will be shipped every six months</emphasis>.
24+Every two even years an Ubuntu long term support (LTS) release will become available,
25+that is supported for 5 years.
26+The Ubuntu releases in between (known as development or non-LTS releases) are supported for 9 month each.
27
28 </para></listitem>
29 <listitem><para>
30@@ -44,10 +45,10 @@
31
32 </para><para>
33
34-Ubuntu is suitable for both desktop and server use. The current Ubuntu
35-release supports Intel x86 (IBM-compatible PC), AMD64 (x86-64), ARMv7,
36-ARMv8 (ARM64), IBM POWER8, IBM zSeries (zEC12/zEC13), and PowerPC
37-architectures.
38+Ubuntu is suitable for both desktop and server use.
39+The current Ubuntu release supports Intel x86 (IBM-compatible PC), AMD64 (x86-64),
40+ARMv7, ARMv8 (ARM64), IBM POWER8/POWER9 (ppc64el), IBM Z zEC12/zEC13/z14 and
41+IBM LinuxONE Rockhopper I+II/Emporer I+II (s390x).
42
43 </para><para>
44

Subscribers

People subscribed via source and target branches

to all changes: