From 68c1afee09b4ea6d0d93229443e07fbabe1632db Mon Sep 17 00:00:00 2001
From: Philipp Kern <pkern@debian.org>
Date: Tue, 21 May 2013 11:24:36 +0000
Subject: Get rid of tapes on s390(x).

---
 en/appendix/preseed.xml                |  2 +-
 en/hardware/hardware-supported.xml     | 14 ++++----------
 en/install-methods/install-methods.xml |  1 -
 en/install-methods/ipl-tape.xml        | 24 ------------------------
 en/install-methods/official-cdrom.xml  |  4 ++--
 en/preparing/bios-setup/s390.xml       |  9 ++++-----
 6 files changed, 11 insertions(+), 43 deletions(-)
 delete mode 100644 en/install-methods/ipl-tape.xml

diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index 011bd727d..d7fa144ca 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -105,7 +105,7 @@ installation methods.
   <entry>no</entry>
   <entry>yes</entry>
 </row><row arch="s390">
-  <entry>generic/tape</entry>
+  <entry>generic</entry>
   <entry>yes</entry>
   <entry>no</entry>
   <entry>yes</entry>
diff --git a/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml
index a540b7226..7b2f1941a 100644
--- a/en/hardware/hardware-supported.xml
+++ b/en/hardware/hardware-supported.xml
@@ -137,23 +137,17 @@ variations of each architecture known as <quote>flavors</quote>.
 </row>
 
 <row>
-  <entry morerows="1">IBM S/390</entry>
-  <entry morerows="1">s390</entry>
+  <entry>IBM S/390</entry>
+  <entry>s390</entry>
   <entry>IPL from VM-reader and DASD</entry>
   <entry>generic</entry>
-</row><row>
-  <entry>IPL from tape</entry>
-  <entry>tape</entry>
 </row>
 
 <row>
-  <entry morerows="1">64bit IBM S/390</entry>
-  <entry morerows="1">s390x</entry>
+  <entry>64bit IBM S/390</entry>
+  <entry>s390x</entry>
   <entry>IPL from VM-reader and DASD</entry>
   <entry>generic</entry>
-</row><row>
-  <entry>IPL from tape</entry>
-  <entry>tape</entry>
 </row>
 
 </tbody></tgroup></informaltable>
diff --git a/en/install-methods/install-methods.xml b/en/install-methods/install-methods.xml
index 47ff9c1bc..3042e1190 100644
--- a/en/install-methods/install-methods.xml
+++ b/en/install-methods/install-methods.xml
@@ -6,7 +6,6 @@
 
 &official-cdrom.xml;
 &downloading-files.xml;
-&ipl-tape.xml;
 &create-floppy.xml;
 &boot-usb-files.xml;
 &boot-drive-files.xml;
diff --git a/en/install-methods/ipl-tape.xml b/en/install-methods/ipl-tape.xml
deleted file mode 100644
index fe8080e79..000000000
--- a/en/install-methods/ipl-tape.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- retain these comments for translator revision tracking -->
-<!-- $Id$ -->
-
- <sect1 arch="s390" id="ipl-tape">
- <title>Creating an IPL tape</title>
-
-<para>
-
-If you can't boot (IPL) from the CD-ROM and you are not using VM
-you need to create an IPL tape first. This is described in section
-3.4.3 in the
-<ulink url="http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg246264.pdf">
-Linux for IBM eServer zSeries and S/390: Distributions</ulink>
-Redbook. The files you
-need to write to the tape are (in this order):
-<filename>kernel.debian</filename>,
-<filename>parmfile.debian</filename> and
-<filename>initrd.debian</filename>. The files can be downloaded
-from the <filename>tape</filename> sub-directory, see
-<xref linkend="where-files"/>.
-
-</para>
- </sect1>
-
diff --git a/en/install-methods/official-cdrom.xml b/en/install-methods/official-cdrom.xml
index febdae2bd..512011690 100644
--- a/en/install-methods/official-cdrom.xml
+++ b/en/install-methods/official-cdrom.xml
@@ -36,7 +36,7 @@ you can use an alternative strategy such as
 
 <phrase condition="supports-floppy-boot">floppy disk,</phrase>
 
-<phrase arch="s390">tape, emulated tape,</phrase>
+<phrase arch="s390">VM reader,</phrase>
 
 <phrase condition="bootable-disk">hard disk,</phrase>
 
@@ -61,7 +61,7 @@ files it needs from the CD.
 If you don't have a CD set, then you will need to download the
 installer system files and place them on the
 
-<phrase arch="s390">installation tape</phrase>
+<phrase arch="s390">VM minidisk</phrase>
 
 <phrase condition="supports-floppy-boot">floppy disk or</phrase>
 
diff --git a/en/preparing/bios-setup/s390.xml b/en/preparing/bios-setup/s390.xml
index e9124377e..33e91db63 100644
--- a/en/preparing/bios-setup/s390.xml
+++ b/en/preparing/bios-setup/s390.xml
@@ -19,11 +19,10 @@ browser.  This is due to that special system architecture where the
 
 Linux on this platform runs either natively on the bare machine, in a
 so-called LPAR (Logical Partition) or in a virtual machine supplied by
-the VM system.  You can use a boot tape on all of those systems; you
-may use some other boot media, too, but those may not be generally
-available.  For example, you can use the virtual card reader of a
-virtual machine, or boot from the HMC (Hardware Management Console) of
-an LPAR if the HMC and this option is available for you.
+the VM system.  Boot media differs depending on the runtime mode.  For
+example, you can use the virtual card reader of a virtual machine, or
+boot from the HMC (Hardware Management Console) of an LPAR if the HMC
+and this option is available for you.
 
 </para><para>
 
-- 
cgit v1.2.3