Merge lp:~fheimes/installation-guide/ubuntu-18.04-sys-req-arch into lp:~ubuntu-core-dev/installation-guide/ubuntu

[Frank Heimes]

Again s390x (IBM Z and LinuxONE) related changes to the ubuntu flavor.

Touched docs in sub-folders hardware, preparing and welcome.

Added some FIXMEs at places where I love to write different things for Debian and Ubuntu.
I only found an attribute Condition="not-ubuntu"
but no not-debian or ubuntu-only.
Any idea to realize that is appreciated.
For now I "wrote around" it ...

[Mathieu Trudel-Lapierre (cyphermox)]

review: Approve

=== modified file 'en/hardware/hardware-supported.xml'
--- en/hardware/hardware-supported.xml	2016-01-26 07:14:43 +0000
+++ en/hardware/hardware-supported.xml	2018-04-20 18:49:50 +0000
@@ -11,8 +11,7 @@
 <command>gcc</command>, etc. have been ported, and for which an &ubuntu;
 port exists, can run &ubuntu;.
 <phrase condition="not-ubuntu"> <!-- TODO: Debian-only at the moment -->
-Please refer to the Ports pages at
-<ulink url="&url-ports;"></ulink> for
+Please refer to the Ports pages at <ulink url="&url-ports;"></ulink> for
 more details on &arch-title; architecture systems which have been
 tested with &debian-gnu;.
 </phrase>
@@ -117,7 +116,7 @@
   <entry>5kc-malta</entry>
 </row>
 
-<row>
+<row condition="not-ubuntu">    
   <entry>IBM/Motorola PowerPC</entry>
   <entry>powerpc</entry>
   <entry>PowerMac</entry>
@@ -128,9 +127,9 @@
 </row>
 
 <row>
-  <entry>Power Systems</entry>
+  <entry>IBM POWER Systems</entry>
   <entry>ppc64el</entry>
-  <entry>IBM POWER8 or newer machines</entry>
+  <entry>IBM POWER8 and newer machines</entry>
   <entry></entry>
 </row>
 
@@ -154,22 +153,28 @@
 </row>
 -->
 
-<row>
+<row condition="not-ubuntu">
   <entry>64bit IBM S/390</entry>
   <entry>s390x</entry>
   <entry>IPL from VM-reader and DASD</entry>
   <entry>generic</entry>
 </row>
 
+<row> <!-- FIXME: no option to limit text to ubuntu only ! There is no such thing like condition="not-debian" -->
+  <entry>IBM z/Architecture</entry>
+  <entry>s390x</entry>
+  <entry>IBM Z and IBM LinuxONE, no s390 (31-bit mode) support</entry>
+  <entry>zEC12 and newer machines</entry>
+</row>
+
 </tbody></tgroup></informaltable>
-
 </para>
 
 <para condition="not-ubuntu"> <!-- TODO: Debian-only at the moment -->
 
 This document covers installation for the <emphasis>&arch-title;</emphasis>
 architecture using the <emphasis>&arch-kernel;</emphasis> kernel.
-If you are looking
+If you are looking 
 for information on any of the other &debian;-supported architectures
 take a look at the
 <ulink url="http://www.debian.org/ports/">&debian;-Ports</ulink> pages.
@@ -351,7 +356,7 @@
 the release. Other hardware needs non-free drivers from 3rd parties.
 
 </para>
-<para>
+<para arch="not-s390">
 Details on supported graphics hardware and pointing devices can be found at
 <ulink url="&url-xorg;"></ulink>.  &debian; &release; ships
 with X.Org version &x11ver;.

=== modified file 'en/hardware/installation-media.xml'
--- en/hardware/installation-media.xml	2015-12-19 21:18:18 +0000
+++ en/hardware/installation-media.xml	2018-04-20 18:49:50 +0000
@@ -28,7 +28,7 @@
 </para>
   </sect2>
 
-  <sect2 arch="not-s390"><title>CD-ROM/DVD-ROM/BD-ROM</title>
+  <sect2><title>CD-ROM/DVD-ROM/BD-ROM</title>
 
 <note><para>
 
@@ -36,7 +36,13 @@
 all of CD-ROMs, DVD-ROMs and BD-ROMs, because all these technologies
 are really the same from the operating system's point of view.
 
-</para></note><para>
+</para>
+<para arch="s390">
+
+On IBM S/390 the CD-ROM / DVD-ROM drive of the Hardware Management Console (HMC) can be used for installations.
+</para></note>
+
+<para>
 
 CD-ROM based installation is supported for most architectures.
 
@@ -79,8 +85,11 @@
 particular netbooks and thin laptops, do not have a CD/DVD-ROM drive
 anymore at all and booting from USB media is the standard way of
 installing a new operating system on them.
+</para>
+<para arch="s390">
+On IBM S/390 the USB drive of the Hardware Management Console (HMC) can be used for installations.
+</para>
 
-</para>
   </sect2>
 
   <sect2><title>Network</title>
@@ -95,6 +104,10 @@
 via either HTTP or FTP. After the installation is completed, you can also
 configure your system to use ISDN and PPP.
 
+</para><para arch="s390">
+
+On IBM S/390 network installations using FTP are the preferred and recommended installation technique.
+
 </para><para condition="supports-tftp">
 
 You can also <emphasis>boot</emphasis> the installation system over the
@@ -226,8 +239,9 @@
 </para><para arch="s390">
 
 Any storage system supported by the Linux kernel is also supported by
-the boot system.  This means that FBA and ECKD DASDs are supported with
-the old Linux disk layout (ldl) and the new common S/390 disk layout (cdl).
+the boot system. This means that FBA and ECKD DASDs are supported with
+the old Linux disk layout (ldl) and the new common S/390 disk layout (cdl),
+as well as FCP (SCSI over Fibre Channel). 
 
 </para>
 

=== modified file 'en/hardware/network-cards.xml'
--- en/hardware/network-cards.xml	2015-12-19 21:18:18 +0000
+++ en/hardware/network-cards.xml	2018-04-20 18:49:50 +0000
@@ -51,12 +51,18 @@
 The list of supported network devices is:
 
 <itemizedlist>
- <listitem><para>
-
-Channel to Channel (CTC) and ESCON connection (real or emulated)
-
-</para></listitem>
- <listitem><para>
+<listitem><para>
+
+Channel to Channel (CTC)
+
+</para></listitem>
+<listitem condition="not-ubuntu"><para>
+
+ESCON connection (real or emulated)
+
+</para></listitem>
+
+<listitem condition="not-ubuntu"><para>
 
 OSA-2 Token Ring/Ethernet and OSA-Express Fast Ethernet (non-QDIO)
 
@@ -66,6 +72,11 @@
 OSA-Express in QDIO mode, HiperSockets and Guest-LANs
 
 </para></listitem>
+<listitem><para> <!-- FIXME: no option to limit text to ubuntu only ! There is no such thing like condition="not-debian" -->
+
+RoCE Expresss, SMC-R adapter
+
+</para></listitem>
 </itemizedlist>
 
 </para>
@@ -95,12 +106,12 @@
 will prompt you to load firmware. See <xref linkend="loading-firmware"/>
 for detailed information on how to load firmware during the installation.
 
-</para><para>
+</para><para arch="not-s390">
 
 Wireless NICs that are not supported by the official &arch-kernel; kernel can generally
 be made to work under &debian-gnu;, but are not supported during the installation.
 
-</para><para>
+</para><para arch="not-s390">
 
 If there is a problem with wireless and there
 is no other NIC you can use during the installation, it is still

=== modified file 'en/hardware/supported-peripherals.xml'
--- en/hardware/supported-peripherals.xml	2015-12-19 21:18:18 +0000
+++ en/hardware/supported-peripherals.xml	2018-04-20 18:49:50 +0000
@@ -22,7 +22,7 @@
 
 Package installations from XPRAM and tape are not supported by this
 system.  All packages that you want to install need to be available on a
-DASD or over the network using NFS, HTTP or FTP.
+DASD, FCP LUN or over the network using HTTP or FTP (recommended).
 
 </para>
  </sect2>

=== modified file 'en/hardware/supported/s390.xml'
--- en/hardware/supported/s390.xml	2016-01-26 07:14:43 +0000
+++ en/hardware/supported/s390.xml	2018-04-20 18:49:50 +0000
@@ -1,8 +1,12 @@
 <!-- retain these comments for translator revision tracking -->
 <!-- $Id: s390.xml 70063 2015-11-01 15:36:53Z pkern $ -->
 
-
-  <sect2 arch="s390"><title>zSeries and System z machine types</title>
+  <sect2 arch="s390"><title>IBM Z and LinuxONE machine types</title>
+<para>
+The current product family name of the s390x architecture is IBM Z or the Linux-only variant IBM LinuxONE.
+Older and in between outdated names like z Systems, System z or zSeries can still be found,
+and the 64-bit IBM z/Architecture is sometimes still commonly referred to as S/390.
+</para>
 <para>
 
 <phrase condition="not-ubuntu">Since &debian; Squeeze, support for booting in
@@ -12,11 +16,17 @@
 though.  All zSeries and System z hardware is fully supported.
 </phrase>
 
+<!-- FIXME: no option to limit text to ubuntu only ! There is no such thing like condition="not-debian" -->
+<phrase>For &ubuntu; the machine needs to support the z/Architecture, 
+so 64-bit support is mandatory, and the minimal architectural level for &ubuntu; support is 
+IBM Z EC12/BC12 or IBM LinuxONE Rockhopper/Emperor.
+</phrase>
+
 &arch-title; support software is included from the kernel 4.2 development
 stream.  The most current information about IBM's Linux support can be found at
 the
 <ulink url="http://www.ibm.com/developerworks/linux/linux390/development_technical.html">
-Linux on <trademark class="registered">System z</trademark> page on
+Linux on <trademark class="registered">IBM Z and LinuxONE</trademark> page at
 developerWorks</ulink>.
 
 </para>
@@ -25,7 +35,7 @@
   <sect2 arch="s390"><title>PAV and HyperPAV</title>
 <para>
 
-PAV and HyperPAV are supported transparently, multipathing is not needed to
+PAV and HyperPAV are supported transparently for DASD storage; multipathing is not needed to
 take advantage of these storage system features.  Be sure to configure the
 devices during DASD device selection.  The alias devices will not be
 offered neither for formatting, partitioning nor direct use.

=== modified file 'en/preparing/needed-info.xml'
--- en/preparing/needed-info.xml	2015-12-19 21:18:18 +0000
+++ en/preparing/needed-info.xml	2018-04-20 18:49:50 +0000
@@ -88,7 +88,7 @@
 
 
 Documentation of &arch-title;-specific boot sequence, commands and device
-drivers (e.g. DASD, XPRAM, Console, OSA, HiperSockets and z/VM interaction)
+drivers (e.g. DASD, FCP, Console, OSA, HiperSockets and z/VM interaction)
 
 </para>
 
@@ -96,6 +96,8 @@
 <listitem><para>
 
 <ulink url="http://public.dhe.ibm.com/software/dw/linux390/docu/lk32dd04.pdf">Device Drivers, Features, and Commands (Linux Kernel 3.2)</ulink>
+<ulink url="http://public.dhe.ibm.com/software/dw/linux390/docu/lux1dd00.pdf">Device Drivers, Features, and Commands on Ubuntu Server 16.04 LTS</ulink>
+
 
 </para></listitem>
 </itemizedlist>
@@ -340,13 +342,13 @@
 The IDs are given inside the rightmost square brackets, i.e. here
 10ec is the vendor- and 8168 is the product ID.
 
-</para><para>
+</para><para arch="not-s390">
 
 As another example, a graphics card could give the following output:
 <quote>04:00.0 VGA compatible controller [0300]: Advanced Micro Devices [AMD] nee
 ATI RV710 [Radeon HD 4350] [1002:954f]</quote>.
 
-</para><para>
+</para><para arch="not-s390">
 
 On Windows systems, the IDs for a device can be found in the Windows device
 manager on the tab <quote>details</quote>, where the vendor ID is prefixed with VEN_
@@ -356,7 +358,7 @@
 device manager's details tab to actually see the IDs, as they are not
 displayed by default.
 
-</para><para>
+</para><para arch="not-s390">
 
 Searching on the internet with the vendor/product ID, <quote>&arch-kernel;</quote> and
 <quote>driver</quote> as the search terms often results in information regarding
@@ -462,7 +464,7 @@
 because the DHCP server will provide it directly to your computer
 during the installation process.
 
-</para><para>
+</para><para arch="not-s390">
 
 If you have internet access via DSL or cable modem (i.e. over a cable tv
 network) and have a router (often provided preconfigured by your phone or

=== modified file 'en/welcome/what-is-ubuntu.xml'
--- en/welcome/what-is-ubuntu.xml	2016-04-18 21:06:20 +0000
+++ en/welcome/what-is-ubuntu.xml	2018-04-20 18:49:50 +0000
@@ -46,12 +46,12 @@
 
 Ubuntu is suitable for both desktop and server use. The current Ubuntu
 release supports Intel x86 (IBM-compatible PC), AMD64 (x86-64), ARMv7,
-ARMv8 (ARM64), IBM POWER8, IBM zSeries (zEC12/zEC13), and PowerPC
+ARMv8 (ARM64), IBM POWER8 and IBM POWER9, IBM Z (zEC12/z13/z14) and IBM LinuxONE (Emperor/Rockhopper), and PowerPC
 architectures.
 
 </para><para>
 
-Ubuntu includes more than 1000 pieces of software, starting with the Linux
+Ubuntu includes thousands of pieces of software, starting with the Linux
 kernel version &kernelversion; and GNOME &gnomeversion;, and covering every standard desktop
 application from word processing and spreadsheet applications to internet
 access applications, web server software, email software, programming