Remove m68k from English version of the manual

4 files changed, 3 insertions, 371 deletions

diff --git a/en/boot-installer/accessibility.xml b/en/boot-installer/accessibility.xml
index 73aef393b..a042e7c10 100644
--- a/en/boot-installer/accessibility.xml
+++ b/en/boot-installer/accessibility.xml
@@ -9,7 +9,7 @@ Some users may need specific support because of e.g. some visual
 impairment.
 <phrase arch="alpha;ia64;powerpc;x86">USB braille displays are detected
 automatically, but most other</phrase>
-<phrase arch="arm;hppa;mips;mipsel;m68k;sparc">Most</phrase>
+<phrase arch="arm;hppa;mips;mipsel;sparc">Most</phrase>
 accessibility features have to be enabled manually.
 <phrase arch="x86">On machines that support it, the boot menu emits a beep
 when it is ready to receive keystrokes.</phrase>
diff --git a/en/boot-installer/boot-installer.xml b/en/boot-installer/boot-installer.xml
index 8dc497914..057d730f9 100644
--- a/en/boot-installer/boot-installer.xml
+++ b/en/boot-installer/boot-installer.xml
@@ -5,7 +5,7 @@
 
 <!-- Include only archs that are documented to avoid build-errors -->
 <!-- The arch="..." condition can be deleted when al archs are present -->
- <sect1 arch="alpha;arm;x86;ia64;m68k;mips;mipsel;s390;powerpc;sparc">
+ <sect1 arch="alpha;arm;x86;ia64;mips;mipsel;s390;powerpc;sparc">
  <title>Booting the Installer on &arch-title;</title>
 
 <!-- This info is so architecture dependent, that I have turned the   -->
@@ -35,7 +35,6 @@ For information on how to boot the graphical installer, see
 <!-- &boot-installer-hppa.xml; -->
 &boot-installer-x86.xml;
 &boot-installer-ia64.xml;
-&boot-installer-m68k.xml;
 &boot-installer-mips.xml;
 &boot-installer-mipsel.xml;
 &boot-installer-s390.xml;
diff --git a/en/boot-installer/m68k.xml b/en/boot-installer/m68k.xml
deleted file mode 100644
index 4346cf868..000000000
--- a/en/boot-installer/m68k.xml
+++ /dev/null
@@ -1,363 +0,0 @@
-<!-- retain these comments for translator revision tracking -->
-<!-- $Id$ -->
-
-  <sect2 arch="m68k"><title>Choosing an Installation Method</title>
-
-<para>
-
-Some &arch-title; subarchs have the option of booting using either a
-2.4.x or 2.2.x linux kernel. When such a choice exists, try the 2.4.x
-linux kernel. The installer should also require less memory when using
-a 2.4.x linux kernel as 2.2.x support requires a fixed-sized ramdisk
-and 2.4.x uses tmpfs.
-
-</para><para>
-
-If you are using a 2.2.x linux kernel, then you need to use the &ramdisksize;
-kernel parameter.
-
-</para><para>
-
-Make sure <userinput>root=/dev/ram</userinput> is one of your kernel
-parameters.
-
-</para><para>
-
-If you're having trouble, check
-<ulink url="&url-m68k-cts-faq;">cts's &arch-title; debian-installer FAQ</ulink>.
-
-</para>
-
-<itemizedlist>
-	<listitem><para><xref linkend="m68k-boot-amiga"/></para></listitem>
-	<listitem><para><xref linkend="m68k-boot-atari"/></para></listitem>
-	<listitem><para><xref linkend="m68k-boot-bvme6000"/></para></listitem>
-	<listitem><para><xref linkend="m68k-boot-mac"/></para></listitem>
-	<listitem><para><xref linkend="m68k-boot-mvme"/></para></listitem>
-	<listitem><para><xref linkend="m68k-boot-q40"/></para></listitem>
-</itemizedlist>
-
-
-    <sect3 id="m68k-boot-amiga"><title>Amiga</title>
-<para>
-
-The only method of installation available to amiga is the hard drive
-(see <xref linkend="m68k-boot-hd"/>).
-<emphasis>In other words the cdrom is not bootable.</emphasis>
-
-</para><para>
-
-Amiga does not currently work with bogl, so if
-you are seeing bogl errors, you need to include the boot parameter
-<userinput>fb=false</userinput>.
-
-</para>
-    </sect3>
-
-    <sect3 id="m68k-boot-atari"><title>Atari</title>
-<para>
-
-The installer for atari may be started from either the hard
-drive (see <xref linkend="m68k-boot-hd"/>) or from floppies
-(see <xref linkend="boot-from-floppies"/>).
-<emphasis>In other words the cdrom is not bootable.</emphasis>
-
-</para><para>
-
-Atari does not currently work with bogl, so if
-you are seeing bogl errors, you need to include the boot parameter
-<userinput>fb=false</userinput>.
-
-</para>
-    </sect3>
-
-    <sect3 id="m68k-boot-bvme6000"><title>BVME6000</title>
-<para>
-
-The installer for BVME6000 may be started from a cdrom
-(see <xref linkend="m68k-boot-cdrom"/>), floppies
-(see <xref linkend="boot-from-floppies"/>), or the net
-(see <xref linkend="boot-tftp"/>).
-
-</para>
-    </sect3>
-
-    <sect3 id="m68k-boot-mac"><title>Macintosh</title>
-<para>
-
-The only method of installation available to mac is from
-the hard drive (see <xref linkend="m68k-boot-hd"/>).
-<emphasis>In other words the cdrom is not bootable.</emphasis>
-Macs do not have a working 2.4.x kernel.
-
-</para><para>
-
-If your hardware uses a 53c9x-based scsi bus, then you may need to
-include the kernel parameter <userinput>mac53c9x=1,0</userinput>.
-Hardware with two such scsi buses, such as the Quadra 950, will need
-<userinput>mac53c9x=2,0</userinput> instead. Alternatively, the
-parameter can be specified as <userinput>mac53c9x=-1,0</userinput>
-which will leave autodetection on, but which will disable SCSI
-disconnects. Note that specifying this parameter is only necessary
-if you have more than one hard disk; otherwise, the system will run
-faster if you do not specify it.
-
-</para>
-    </sect3>
-
-    <sect3 id="m68k-boot-mvme"><title>MVME147 and MVME16x</title>
-<para>
-
-The installer for MVME147 and MVME16x may be started from
-either floppies (see <xref linkend="boot-from-floppies"/>)
-or the net (see <xref linkend="boot-tftp"/>).
-<emphasis>In other words the cdrom is not bootable.</emphasis>
-
-</para>
-    </sect3>
-
-    <sect3 id="m68k-boot-q40"><title>Q40/Q60</title>
-<para>
-
-The only method of installation available to Q40/Q60 is
-from the hard drive (see <xref linkend="m68k-boot-hd"/>).
-<emphasis>In other words the cdrom is not bootable.</emphasis>
-
-</para>
-    </sect3>
-
-  </sect2>
-
-  <sect2 arch="m68k" id="m68k-boot-hd"><title>Booting from a Hard Disk</title>
-
-&boot-installer-intro-hd.xml;
-
-<para>
-
-At least six different ramdisks may be used to boot from the hard
-drive, three different types each with and without support for a
-2.2.x linux kernel (see
-<ulink url="&disturl;/main/installer-&architecture;/current/images/MANIFEST">MANIFEST</ulink>
-for details).
-
-</para><para>
-
-The three different types of ramdisks are <filename>cdrom</filename>,
-<filename>hd-media</filename>, and <filename>nativehd</filename>. These
-ramdisks differ only in their source for installation packages.
-The <filename>cdrom</filename> ramdisk uses a cdrom to get
-debian-installer packages. The <filename>hd-media</filename> ramdisk
-uses an iso image file of a cdrom currently residing on a hard disk.
-Finally, the <filename>nativehd</filename> ramdisk uses the net to
-install packages.
-
-</para>
-
-<itemizedlist>
-	<listitem><para><xref linkend="m68k-boothd-amiga"/></para></listitem>
-	<listitem><para><xref linkend="m68k-boothd-atari"/></para></listitem>
-	<listitem><para><xref linkend="m68k-boothd-mac"/></para></listitem>
-	<listitem><para><xref linkend="m68k-boothd-q40"/></para></listitem>
-</itemizedlist>
-
-
-    <sect3 id="m68k-boothd-amiga"><title>Booting from AmigaOS</title>
-<para>
-
-In the <command>Workbench</command>, start the Linux installation
-process by double-clicking on the <guiicon>StartInstall</guiicon> icon
-in the <filename>debian</filename> directory.
-
-</para><para>
-
-You may have to press the &enterkey; key twice after the Amiga
-installer program has output some debugging information into a window.
-After this, the screen will go grey, there will be a few seconds'
-delay. Next, a black screen with white text should come up, displaying
-all kinds of kernel debugging information.  These messages may scroll
-by too fast for you to read, but that's OK.  After a couple of
-seconds, the installation program should start automatically, so you
-can continue down at <xref linkend="d-i-intro"/>.
-
-</para>
-    </sect3>
-
-
-    <sect3 id="m68k-boothd-atari"><title>Booting from Atari TOS</title>
-<para>
-
-At the GEM desktop, start the Linux installation process by
-double-clicking on the <guiicon>bootstra.prg</guiicon> icon in the
-<filename>debian</filename> directory and clicking
-<guibutton>Ok</guibutton> at the program options dialog box.
-
-</para><para>
-
-You may have to press the &enterkey; key after the Atari
-bootstrap program has output some debugging information into a
-window. After this, the screen will go grey, there will be a few
-seconds' delay.  Next, a black screen with white text should come up,
-displaying all kinds of kernel debugging information. These messages
-may scroll by too fast for you to read, but that's OK. After a couple
-of seconds, the installation program should start automatically, so
-you can continue below at <xref linkend="d-i-intro"/>.
-
-</para>
-    </sect3>
-
-
-    <sect3 id="m68k-boothd-mac"><title>Booting from MacOS</title>
-<para>
-
-You must retain the original Mac system and
-boot from it. It is <emphasis>essential</emphasis> that, when booting
-MacOS in preparation for booting the Penguin linux loader, you
-hold the <keycap>shift</keycap> key down to prevent extensions from
-loading. If you don't use MacOS except for loading linux, you can
-accomplish the same thing by removing all extensions and control
-panels from the Mac's System Folder. Otherwise extensions may be left
-running and cause random problems with the running linux kernel.
-
-</para><para>
-
-Macs require the <command>Penguin</command> bootloader, which can be
-downloaded from <ulink url="&url-m68k-mac;">the Linux/mac68k
-sourceforge.net project</ulink>. If you do not have the tools to handle
-a <command>Stuffit</command> archive, you can put it on a
-MacOS-formatted floppy using a second GNU/Linux machine of any
-architecture and the <command>hmount</command>,
-<command>hcopy</command>, and <command>humount</command> tools from the
-<classname>hfsutils</classname> suite.
-
-</para><para>
-
-At the MacOS desktop, start the Linux installation process by
-double-clicking on the <guiicon>Penguin Prefs</guiicon> icon in
-the <filename>Penguin</filename> directory. The
-<command>Penguin</command> booter will start up. Go to the
-<guimenuitem>Settings</guimenuitem> item in the
-<guimenu>File</guimenu> menu, click the
-<guilabel>Kernel</guilabel> tab.  Select the kernel
-(<filename>vmlinuz</filename>) and ramdisk
-(<filename>initrd.gz</filename>) images in the
-<filename>install</filename> directory by clicking on the corresponding
-buttons in the upper right corner, and navigating the file select
-dialogs to locate the files.
-
-</para><para>
-
-To set the boot parameters in Penguin, choose <guimenu>File</guimenu> -&gt;
-<guimenuitem>Settings...</guimenuitem>, then switch to the
-<guilabel>Options</guilabel> tab.  Boot parameters may be typed in to
-the text entry area.  If you will always want to use these settings,
-select <guimenu>File</guimenu> -&gt; <guimenuitem>Save Settings as
-Default</guimenuitem>.
-
-</para><para>
-
-Close the <guilabel>Settings</guilabel>
-dialog, save the settings and start the bootstrap using the
-<guimenuitem>Boot Now</guimenuitem> item in the
-<guimenu>File</guimenu> menu.
-
-</para><para>
-
-The <command>Penguin</command> booter will output some debugging
-information into a window. After this, the screen will go grey, there
-will be a few seconds' delay. Next, a black screen with white text
-should come up, displaying all kinds of kernel debugging
-information. These messages may scroll by too fast for you to read,
-but that's OK. After a couple of seconds, the installation program
-should start automatically, so you can continue below at
-<xref linkend="d-i-intro"/>.
-
-</para>
-
-    </sect3>
-
-    <sect3 id="m68k-boothd-q40"><title>Booting from Q40/Q60</title>
-
-<para>
-
-FIXME
-
-</para><para>
-
-The installation program should start automatically, so you can
-continue below at <xref linkend="d-i-intro"/>.
-
-</para>
-
-    </sect3>
-  </sect2>
-
-
-  <sect2 arch="m68k" id="m68k-boot-cdrom"><title>Booting from a CD-ROM</title>
-<para>
-
-Currently, the only &arch-title; subarchitecture that
-supports CD-ROM booting is the BVME6000.
-
-</para>
-
-&boot-installer-intro-cd.xml;
-
-  </sect2>
-
-
-  <sect2 arch="m68k" id="boot-tftp"><title>Booting with TFTP</title>
-
-&boot-installer-intro-net.xml;
-
-<para>
-
-After booting the VMEbus systems you will be presented with the LILO
-<prompt>Boot:</prompt> prompt.  At that prompt enter one of the
-following to boot Linux and begin installation proper of the Debian
-software using vt102 terminal emulation:
-
-<!-- Because the &enterkey; definition uses <keycap>,    -->
-<!-- we use <screen> instead of <userinput> in this list -->
-
-<itemizedlist>
-<listitem><para>
-
-type <screen>i6000 &enterkey;</screen> to install a BVME4000/6000
-
-</para></listitem>
-<listitem><para>
-
-type <screen>i162 &enterkey;</screen> to install an MVME162
-
-</para></listitem>
-<listitem><para>
-
-type <screen>i167 &enterkey;</screen> to install an MVME166/167
-
-</para></listitem>
-    </itemizedlist>
-
-</para><para>
-
-You may additionally append the string
-<screen>TERM=vt100</screen> to use vt100 terminal emulation,
-e.g., <screen>i6000 TERM=vt100 &enterkey;</screen>.
-
-</para>
-  </sect2>
-
-
-  <sect2 arch="m68k" id="boot-from-floppies">
-  <title>Booting from Floppies</title>
-<para>
-
-For most &arch-title; architectures, booting from a local filesystem is the
-recommended method.
-
-</para><para>
-
-Booting from the boot floppy is supported only for Atari and VME
-(with a SCSI floppy drive on VME) at this time.
-
-</para>
- </sect2>
diff --git a/en/boot-installer/parameters.xml b/en/boot-installer/parameters.xml
index 8eae5a8cb..0c091141a 100644
--- a/en/boot-installer/parameters.xml
+++ b/en/boot-installer/parameters.xml
@@ -254,10 +254,6 @@ The <userinput>video=vga16:off</userinput> argument may also be used
 to disable the kernel's use of the framebuffer. Such problems have been
 reported on a Dell Inspiron with Mobile Radeon card.
 
-</para><para arch="m68k">
-
-Such problems have been reported on the Amiga 1200 and SE/30.
-
 </para><para arch="hppa">
 
 Such problems have been reported on hppa.
@@ -420,7 +416,7 @@ disable that authentication.
 </para></listitem>
 </varlistentry>
 
-<varlistentry arch="alpha;m68k;mips;mipsel">
+<varlistentry arch="alpha;mips;mipsel">
 <term>ramdisk_size</term>
 <listitem><para>