summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--en/bookinfo.xml19
-rw-r--r--en/boot-installer/accessibility.xml2
-rw-r--r--en/boot-installer/boot-installer.xml3
-rw-r--r--en/boot-installer/m68k.xml363
-rw-r--r--en/boot-installer/parameters.xml6
-rw-r--r--en/boot-new/boot-new.xml76
-rw-r--r--en/hardware/buying-hardware.xml16
-rw-r--r--en/hardware/hardware-supported.xml21
-rw-r--r--en/hardware/installation-media.xml15
-rw-r--r--en/hardware/memory-disk-requirements.xml29
-rw-r--r--en/hardware/network-cards.xml3
-rw-r--r--en/hardware/supported/m68k.xml39
-rw-r--r--en/install-methods/create-floppy.xml6
-rw-r--r--en/install-methods/download/m68k.xml23
-rw-r--r--en/install-methods/downloading-files.xml1
-rw-r--r--en/install-methods/floppy/m68k.xml27
-rw-r--r--en/install-methods/install-tftp.xml21
-rw-r--r--en/partitioning/device-names.xml20
-rw-r--r--en/partitioning/schemes.xml5
-rw-r--r--en/post-install/shutdown.xml2
-rw-r--r--en/preparing/backup.xml11
-rw-r--r--en/preparing/bios-setup/m68k.xml23
-rw-r--r--en/preparing/minimum-hardware-reqts.xml5
-rw-r--r--en/preparing/needed-info.xml14
-rw-r--r--en/preparing/non-debian-partitioning.xml6
-rw-r--r--en/preparing/nondeb-part/m68k.xml127
-rw-r--r--en/preparing/pre-install-bios-setup.xml17
-rw-r--r--en/using-d-i/modules/clock-setup-finish.xml2
-rw-r--r--en/using-d-i/modules/nobootloader.xml4
29 files changed, 9 insertions, 897 deletions
diff --git a/en/bookinfo.xml b/en/bookinfo.xml
index 7e6fdb3fa..b8b5d87d1 100644
--- a/en/bookinfo.xml
+++ b/en/bookinfo.xml
@@ -14,25 +14,6 @@ information on how to make the most of your new Debian system.
</para>
<para>
-<note arch="m68k"><para>
-Because the &arch-title; port is not a release architecture for
-&releasename;, there is no official version of this manual for
-&arch-title; for &releasename;. However, because the port is still
-active and there is hope that &arch-title; may be included again
-in future official releases, this development version of the
-Installation Guide is still available.
-
-</para><para>
-
-Because &arch-title; is not an official architecture, some of the
-information, and especially some links, in this manual may be
-incorrect. For additional information, please check the
-<ulink url="&url-ports;">webpages</ulink> of the port or contact the
-<ulink url="&url-list-subscribe;">debian-&arch-listname; mailing
-list</ulink>.
-
-</para></note>
-
<warning condition="not-checked"><para>
This installation guide is based on an earlier manual written for
the old Debian installation system (the <quote>boot-floppies</quote>), and has
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>
diff --git a/en/boot-new/boot-new.xml b/en/boot-new/boot-new.xml
index 6541061bd..8b295b00b 100644
--- a/en/boot-new/boot-new.xml
+++ b/en/boot-new/boot-new.xml
@@ -52,82 +52,6 @@ or not detected correctly, please file an installation report.
</para>
- <sect2 arch="m68k"><title>BVME 6000 Booting</title>
-<para>
-
-If you have just performed a diskless install on a BVM or Motorola
-VMEbus machine: once the system has loaded the
-<command>tftplilo</command> program from the TFTP server, from the
-<prompt>LILO Boot:</prompt> prompt enter one of:
-
-<itemizedlist>
-<listitem><para>
-
-<userinput>b6000</userinput> followed by &enterkey;
-to boot a BVME 4000/6000
-
-</para></listitem><listitem><para>
-
-<userinput>b162</userinput> followed by &enterkey;
-to boot an MVME162
-
-</para></listitem><listitem><para>
-
-<userinput>b167</userinput> followed by &enterkey;
-to boot an MVME166/167
-
-</para></listitem>
-</itemizedlist>
-
-</para>
-
- </sect2>
-
- <sect2 arch="m68k"><title>Macintosh Booting</title>
-
-<para>
-
-Go to the directory containing the installation files and start up the
-<command>Penguin</command> booter, holding down the
-<keycap>command</keycap> key. Go to the
-<userinput>Settings</userinput> dialogue (<keycombo>
-<keycap>command</keycap> <keycap>T</keycap> </keycombo>), and locate
-the kernel options line which should look like
-<userinput>root=/dev/ram ramdisk_size=15000</userinput> or similar.
-
-</para><para>
-
-You need to change the entry to
-<userinput>root=/dev/<replaceable>yyyy</replaceable></userinput>.
-Replace the <replaceable>yyyy</replaceable> with the Linux name of the
-partition onto which you installed the system (e.g.
-<filename>/dev/sda1</filename>); you wrote this down earlier. For users
-with tiny screens, adding <userinput>fbcon=font:VGA8x8</userinput> (or
-<userinput>video=font:VGA8x8</userinput> on pre-2.6 kernels) may help
-readability. You can change this at any time.
-
-</para><para>
-
-If you don't want to start GNU/Linux immediately each time you start,
-uncheck the <userinput>Auto Boot</userinput> option. Save your
-settings in the <filename>Prefs</filename> file using the
-<userinput>Save Settings As Default</userinput> option.
-
-</para><para>
-
-Now select <userinput>Boot Now</userinput> (<keycombo>
-<keycap>command</keycap> <keycap>B</keycap> </keycombo>) to start your
-freshly installed GNU/Linux instead of the RAMdisk installer system.
-
-</para><para>
-
-Debian should boot, and you should see the same messages as
-when you first booted the installation system, followed by some new
-messages.
-
-</para>
- </sect2>
-
<sect2 arch="powerpc"><title>OldWorld PowerMacs</title>
<para>
diff --git a/en/hardware/buying-hardware.xml b/en/hardware/buying-hardware.xml
index 60eb7c7d4..9fb757631 100644
--- a/en/hardware/buying-hardware.xml
+++ b/en/hardware/buying-hardware.xml
@@ -11,11 +11,6 @@ distributions of GNU/Linux
for the privilege, but it does buy a level of peace of mind, since you can
be sure that the hardware is well-supported by GNU/Linux.
-</para><para arch="m68k">
-
-Unfortunately, it's quite rare to find any vendor shipping
-new &arch-title; machines at all.
-
</para><para arch="x86">
If you do have to buy a machine with Windows bundled, carefully read
@@ -43,17 +38,6 @@ for their hardware. Others won't allow us access to the documentation
without a non-disclosure agreement that would prevent us from
releasing the Linux source code.
-</para><para arch="m68k">
-
-Another example is the proprietary hardware in the older
-Macintosh line. In fact, no specifications or documentation have ever
-been released for any Macintosh hardware, most notably the ADB
-controller (used by the mouse and keyboard), the floppy controller,
-and all acceleration and CLUT manipulation of the video hardware
-(though we do now support CLUT manipulation on nearly all internal
-video chips). In a nutshell, this explains why the Macintosh Linux
-port lags behind other Linux ports.
-
</para><para>
Since we haven't been granted access to the documentation on these
diff --git a/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml
index 2f96fa518..f25468c63 100644
--- a/en/hardware/hardware-supported.xml
+++ b/en/hardware/hardware-supported.xml
@@ -127,26 +127,6 @@ variations of each architecture known as <quote>flavors</quote>.
<entry>5kc-malta</entry>
</row>
-<row arch="m68k">
- <entry morerows="5">Motorola 680x0</entry>
- <entry morerows="5">m68k</entry>
- <entry>Atari</entry>
- <entry>atari</entry>
-</row><row arch="m68k">
- <entry>Amiga</entry>
- <entry>amiga</entry>
-</row><row arch="m68k">
- <entry>68k Macintosh</entry>
- <entry>mac</entry>
-</row><row arch="m68k">
- <entry morerows="2">VME</entry>
- <entry>bvme6000</entry>
-</row><row arch="m68k">
- <entry>mvme147</entry>
-</row><row arch="m68k">
- <entry>mvme16x</entry>
-</row>
-
<row>
<entry morerows="1">IBM/Motorola PowerPC</entry>
<entry morerows="1">powerpc</entry>
@@ -220,7 +200,6 @@ as well.
&supported-hppa.xml;
&supported-i386.xml;
&supported-ia64.xml; <!-- FIXME: currently missing -->
-&supported-m68k.xml;
&supported-mips.xml;
&supported-mipsel.xml;
&supported-powerpc.xml;
diff --git a/en/hardware/installation-media.xml b/en/hardware/installation-media.xml
index 8c6e6def3..541b506cb 100644
--- a/en/hardware/installation-media.xml
+++ b/en/hardware/installation-media.xml
@@ -96,11 +96,6 @@ Booting the installation system directly from a hard disk is another option
for many architectures. This will require some other operating system
to load the installer onto the hard disk.
-</para><para arch="m68k">
-
-In fact, installation from your local disk is the preferred
-installation technique for most &architecture; machines.
-
</para><para arch="sparc">
Although the &arch-title; does not allow booting from SunOS
@@ -190,16 +185,6 @@ SCSI disk controllers from many different manufacturers are supported. See the
<ulink url="&url-hardware-howto;">Linux Hardware Compatibility HOWTO</ulink>
for more details.
-</para><para arch="m68k">
-
-Pretty much all storage systems supported by the Linux kernel are
-supported by the Debian installation system. Note that the current
-Linux kernel does not support floppies on the Macintosh at all, and
-the Debian installation system doesn't support floppies for Amigas.
-Also supported on the Atari is the Macintosh HFS system, and AFFS as a
-module. Macs support the Atari (FAT) file system. Amigas support the
-FAT file system, and HFS as a module.
-
</para><para arch="sparc">
Any storage system supported by the Linux kernel is also supported by
diff --git a/en/hardware/memory-disk-requirements.xml b/en/hardware/memory-disk-requirements.xml
index 7adc6961e..a6566cb37 100644
--- a/en/hardware/memory-disk-requirements.xml
+++ b/en/hardware/memory-disk-requirements.xml
@@ -28,35 +28,6 @@ the former should be selected.
</footnote> or disk space available may be possible but is only advised for
experienced users.
-</para><para arch="m68k">
-
-On the Amiga the size of FastRAM is relevant towards the total memory
-requirements. Also, using Zorro cards with 16-bit RAM is not
-supported; you'll need 32-bit RAM. The <command>amiboot</command>
-program can be used to disable 16-bit RAM; see the
-<ulink url="&url-m68k-faq;">Linux/m68k FAQ</ulink>. Recent kernels should
-disable 16-bit RAM automatically.
-
-</para><para arch="m68k">
-
-On the Atari, both ST-RAM and Fast RAM (TT-RAM) are used by Linux.
-Many users have reported problems running the kernel itself in Fast
-RAM, so the Atari bootstrap will place the kernel in ST-RAM. The
-minimum requirement for ST-RAM is 2 MB. You will need an additional
-12 MB or more of TT-RAM.
-
-</para><para arch="m68k">
-
-On the Macintosh, care should be taken on machines with RAM-based
-video (RBV). The RAM segment at physical address 0 is used as screen
-memory, making the default load position for the kernel unavailable.
-The alternate RAM segment used for kernel and RAMdisk must be at least
-4 MB.
-
-</para><para arch="m68k">
-
-<emphasis condition="FIXME">FIXME: is this still true?</emphasis>
-
</para>
</sect1>
diff --git a/en/hardware/network-cards.xml b/en/hardware/network-cards.xml
index e3efafdf1..be142f984 100644
--- a/en/hardware/network-cards.xml
+++ b/en/hardware/network-cards.xml
@@ -12,9 +12,6 @@ should normally be loaded automatically.
<phrase arch="x86">This includes most PCI and PCMCIA cards.</phrase>
<phrase arch="i386">Many older ISA cards are supported as well.</phrase>
-<phrase arch="m68k">Again, see <ulink url="&url-m68k-faq;"></ulink>
-for complete details.</phrase>
-
</para><para arch="sparc">
This includes a lot of generic PCI cards (for systems that have PCI) and
diff --git a/en/hardware/supported/m68k.xml b/en/hardware/supported/m68k.xml
deleted file mode 100644
index 6f33d20e3..000000000
--- a/en/hardware/supported/m68k.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<!-- retain these comments for translator revision tracking -->
-<!-- $Id$ -->
-
- <sect2 arch="m68k"><title>CPU, Main Boards, and Video Support</title>
-<para>
-
-Complete information concerning supported M68000 based
-(<emphasis>&architecture;</emphasis>) systems can be found at the
-<ulink url="&url-m68k-faq;">Linux/m68k FAQ</ulink>. This section merely
-outlines the basics.
-
-</para><para>
-
-The &architecture; port of Linux runs on any 680x0 with a PMMU (Paged
-Memory Management Unit) and a FPU (floating-point unit). This
-includes the 68020 with an external 68851 PMMU, the 68030, and better,
-and excludes the <quote>EC</quote> line of 680x0 processors. See the
-<ulink url="&url-m68k-faq;">Linux/m68k FAQ</ulink> for complete details.
-
-</para><para>
-
-There are four major supported
-<emphasis>&architecture;</emphasis> flavors: Amiga, Atari, Macintosh
-and VME machines. Amiga and Atari were the first two systems to which
-Linux was ported; in keeping, they are also the two most
-well-supported Debian ports. The Macintosh line is supported
-incompletely, both by Debian and by the Linux kernel; see
-<ulink url="&url-m68k-mac;">Linux m68k for Macintosh</ulink> for project
-status and supported hardware. The BVM and Motorola single board
-VMEbus computers are the most recent addition to the list of machines
-supported by Debian. Ports to other &architecture; architectures,
-such as the Sun3 architecture and NeXT black box, are underway but not
-yet supported by Debian.
-
-</para>
- </sect2>
-
-
-
diff --git a/en/install-methods/create-floppy.xml b/en/install-methods/create-floppy.xml
index fb384b4ab..8489678ac 100644
--- a/en/install-methods/create-floppy.xml
+++ b/en/install-methods/create-floppy.xml
@@ -13,11 +13,6 @@ installer on hardware that cannot boot from CD or by other means.
Booting the installer from floppy disk reportedly fails on Mac USB
floppy drives.
-</para><para arch="m68k">
-
-Booting the installer from floppy disk is not supported on Amigas or
-68k Macs.
-
</para><para>
Disk images are files containing the complete contents of a floppy
@@ -107,7 +102,6 @@ to install it.
</sect2>
&floppy-i386.xml; <!-- can be used for other arches -->
-&floppy-m68k.xml;
&floppy-powerpc.xml;
</sect1>
diff --git a/en/install-methods/download/m68k.xml b/en/install-methods/download/m68k.xml
deleted file mode 100644
index a89b62076..000000000
--- a/en/install-methods/download/m68k.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!-- retain these comments for translator revision tracking -->
-<!-- $Id$ -->
-
-
- <sect3 arch="m68k" id="kernel-22">
- <title>Choosing a Kernel</title>
-
-<para>
-
-Some m68k subarchs have a choice of kernels to install. In general we
-recommend trying the most recent version first. If your subarch or
-machine needs to use a 2.2.x kernel, make sure you choose one of the
-images that supports 2.2.x kernels (see the <ulink
-url="&disturl;/main/installer-&architecture;/current/images/MANIFEST">MANIFEST</ulink>).
-
-</para>
-<para>
-
-All of the m68k images for use with 2.2.x kernels, require the kernel
-parameter &ramdisksize;.
-
-</para>
- </sect3>
diff --git a/en/install-methods/downloading-files.xml b/en/install-methods/downloading-files.xml
index 662986267..7be75fd04 100644
--- a/en/install-methods/downloading-files.xml
+++ b/en/install-methods/downloading-files.xml
@@ -29,7 +29,6 @@ lists each image and its purpose.
&download-alpha.xml;
&download-arm.xml;
&download-powerpc.xml;
-&download-m68k.xml;
</sect2>
diff --git a/en/install-methods/floppy/m68k.xml b/en/install-methods/floppy/m68k.xml
deleted file mode 100644
index 776bfd0bc..000000000
--- a/en/install-methods/floppy/m68k.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- retain these comments for translator revision tracking -->
-<!-- $Id$ -->
-
-
- <sect2 arch="m68k"><title>Writing Disk Images on Atari Systems</title>
-<para>
-
-You'll find the &rawwrite.ttp; program in the same directory as the
-floppy disk images. Start the program by double clicking on the
-program icon, and type in the name of the floppy image file you want
-written to the floppy at the TOS program command line dialog box.
-
-</para>
-
- </sect2>
-
- <sect2 arch="m68k"><title>Writing Disk Images on Macintosh Systems</title>
-<para>
-
-Since the current release does not yet support booting from floppies to
-start the installation, there would be no point in doing this on
-Macintosh Systems. However, these files are needed for the installation
-of the operating system and modules, later in the process.
-
-</para>
-
- </sect2>
diff --git a/en/install-methods/install-tftp.xml b/en/install-methods/install-tftp.xml
index efd69e631..eff4340da 100644
--- a/en/install-methods/install-tftp.xml
+++ b/en/install-methods/install-tftp.xml
@@ -28,9 +28,6 @@ way is to use the BOOTP protocol.</phrase>
informs a computer of its IP address and where on the network to obtain
a boot image.</phrase>
-<phrase arch="m68k">Yet another alternative exists on VMEbus
-systems: the IP address can be manually configured in boot ROM.</phrase>
-
The DHCP (Dynamic Host Configuration Protocol) is a more flexible,
backwards-compatible extension of BOOTP.
Some systems can only be configured via DHCP.
@@ -277,24 +274,6 @@ in the directory that the TFTP server looks in.
</para>
</sect3>
- <sect3 arch="m68k">
- <title>BVM/Motorola TFTP Booting</title>
-<para>
-
-For BVM and Motorola VMEbus systems copy the files
-&bvme6000-tftp-files; to <filename>/tftpboot/</filename>.
-
-</para><para>
-
-Next, configure your boot ROMs or BOOTP server to initially load the
-<filename>tftplilo.bvme</filename> or
-<filename>tftplilo.mvme</filename> files from the TFTP server. Refer
-to the <filename>tftplilo.txt</filename> file for your subarchitecture
-for additional system-specific configuration information.
-
-</para>
- </sect3>
-
<sect3 arch="mips">
<title>SGI TFTP Booting</title>
<para>
diff --git a/en/partitioning/device-names.xml b/en/partitioning/device-names.xml
index 7034eb676..0780ac543 100644
--- a/en/partitioning/device-names.xml
+++ b/en/partitioning/device-names.xml
@@ -59,19 +59,6 @@ The master and slave disks of the secondary controller can be called
respectively. Newer IDE controllers can actually have two channels,
effectively acting like two controllers.
-<phrase arch="m68k">
-The letters may differ from what shows in the mac program pdisk
-(i.e. what shows up as <filename>/dev/hdc</filename> on pdisk may show
-up as <filename>/dev/hda</filename> in Debian).
-</phrase>
-
-</para></listitem>
-
-<listitem arch="m68k"><para>
-
-The first ACSI device is named <filename>/dev/ada</filename>, the
-second is named <filename>/dev/adb</filename>.
-
</para></listitem>
</itemizedlist>
@@ -126,13 +113,6 @@ partition, that is, the primary partition holding the logical
partitions, is not usable by itself. This applies to SCSI disks as
well as IDE disks.
-</para><para arch="m68k">
-
-VMEbus systems using the TEAC FC-1 SCSI floppy drive will see it as normal
-SCSI disk. To make identification of the drive simpler the installation
-software will create a symbolic link to the appropriate device and name
-it <filename>/dev/sfd0</filename>.
-
</para><para arch="sparc">
Sun disk partitions allow for 8 separate partitions (or slices). The
diff --git a/en/partitioning/schemes.xml b/en/partitioning/schemes.xml
index e1297d1d9..6ff4253ef 100644
--- a/en/partitioning/schemes.xml
+++ b/en/partitioning/schemes.xml
@@ -49,11 +49,6 @@ most cases. Of course, there are exceptions to these rules. If you
are trying to solve 10000 simultaneous equations on a machine with
256MB of memory, you may need a gigabyte (or more) of swap.
-</para><para arch="m68k">
-
-On the other hand, Atari Falcons and Macs feel pain when swapping, so
-instead of making a large swap partition, get as much RAM as possible.
-
</para><para>
On 32-bit architectures (i386, m68k, 32-bit SPARC, and PowerPC), the
diff --git a/en/post-install/shutdown.xml b/en/post-install/shutdown.xml
index 500495721..1bcf78855 100644
--- a/en/post-install/shutdown.xml
+++ b/en/post-install/shutdown.xml
@@ -19,7 +19,7 @@ the system.
Alternatively you can press the key combination <keycombo>
<keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </keycombo>
-<phrase arch="powerpc;m68k"> or <keycombo> <keycap>Control</keycap>
+<phrase arch="powerpc"> or <keycombo> <keycap>Control</keycap>
<keycap>Shift</keycap> <keycap>Power</keycap> </keycombo> on Macintosh
systems</phrase>. A last option is to log in as root and type one of the
commands <command>poweroff</command>, <command>halt</command> or
diff --git a/en/preparing/backup.xml b/en/preparing/backup.xml
index 4d7bde4ee..548646bb7 100644
--- a/en/preparing/backup.xml
+++ b/en/preparing/backup.xml
@@ -27,15 +27,4 @@ partitions.
</para>
-<para arch="m68k">
-
-With the exception of the BVM and Motorola VMEbus computers, the only
-supported installation method for m68k systems is booting from a local
-disk or floppy using an AmigaOS/TOS/MacOS-based bootstrap, for these
-machines you will need the original operating system in order to boot
-Linux. In order to boot Linux on the BVM and Motorola VMEbus machines
-you will need the <quote>BVMBug</quote> or <quote>16xBug</quote> boot ROMs.
-
-</para>
-
</sect1>
diff --git a/en/preparing/bios-setup/m68k.xml b/en/preparing/bios-setup/m68k.xml
deleted file mode 100644
index 4c7d4b178..000000000
--- a/en/preparing/bios-setup/m68k.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!-- retain these comments for translator revision tracking -->
-<!-- $Id$ -->
-
-
- <sect2 arch="m68k" id="firmware-revs">
- <title>Firmware Revisions and Existing OS Setup</title>
-
-<para>
-
-&arch-title; machines are generally self-configuring and do not require
-firmware configuration. However, you should make sure that you have
-the appropriate ROM and system patches. On the Macintosh, MacOS
-version >= 7.1 is recommended because version 7.0.1 contains a bug in
-the video drivers preventing the boot loader from deactivating the
-video interrupts, resulting in a boot hang. On the BVM VMEbus systems
-you should make sure you are using BVMBug revision G or higher boot ROMs.
-The BVMBug boot ROMs do not come as standard on the BVM systems but are
-available from BVM on request free of charge.
-
-</para>
-
- </sect2>
-
diff --git a/en/preparing/minimum-hardware-reqts.xml b/en/preparing/minimum-hardware-reqts.xml
index db88ed3f9..71ea4ed63 100644
--- a/en/preparing/minimum-hardware-reqts.xml
+++ b/en/preparing/minimum-hardware-reqts.xml
@@ -20,11 +20,6 @@ risk being frustrated if they ignore these suggestions.
A Pentium 4, 1GHz system is the minimum recommended for a desktop
system.
-</para><para arch="m68k">
-
-A 68030 or better processor is recommended for m68k
-installs. You may get by with a little less drive space than shown.
-
</para><para arch="powerpc">
Any OldWorld or NewWorld PowerPC can serve well as a desktop system.
diff --git a/en/preparing/needed-info.xml b/en/preparing/needed-info.xml
index 7589751f8..8dfffbd71 100644
--- a/en/preparing/needed-info.xml
+++ b/en/preparing/needed-info.xml
@@ -52,19 +52,13 @@ Often contains useful information on configuring or using your hardware.
<!-- We need the arch dependence for the whole list to ensure proper xml
as long as not architectures have a paragraph -->
- <itemizedlist arch="x86;m68k;alpha;sparc;mips;mipsel">
+ <itemizedlist arch="x86;alpha;sparc;mips;mipsel">
<listitem arch="x86"><para>
<ulink url="&url-hardware-howto;">Linux Hardware Compatibility HOWTO</ulink>
</para></listitem>
-<listitem arch="m68k"><para>
-
-<ulink url="&url-m68k-faq;">Linux/m68k FAQ</ulink>
-
-</para></listitem>
-
<listitem arch="alpha"><para>
<ulink url="&url-alpha-faq;">Linux/Alpha FAQ</ulink>
@@ -214,13 +208,9 @@ networking and e-mail.
<entry>How many you have.</entry>
</row>
<row arch="not-s390"><entry>Their order on the system.</entry></row>
-<!-- "not-m68k;not-s390" would really turn out to be everything... -->
-<row arch="alpha;arm;hppa;x86;ia64;mips;mipsel;powerpc;sparc">
+<row arch="not-s390">
<entry>Whether IDE (also known as PATA), SATA or SCSI.</entry>
</row>
-<row arch="m68k">
- <entry>Whether IDE or SCSI (most m68k computers are SCSI).</entry>
-</row>
<row arch="not-s390"><entry>Available free space.</entry></row>
<row arch="not-s390"><entry>Partitions.</entry></row>
<row arch="not-s390">
diff --git a/en/preparing/non-debian-partitioning.xml b/en/preparing/non-debian-partitioning.xml
index ad82c4d17..3ebf133cc 100644
--- a/en/preparing/non-debian-partitioning.xml
+++ b/en/preparing/non-debian-partitioning.xml
@@ -32,10 +32,6 @@ If you already have an operating system on your system
(VM, z/OS, OS/390, &hellip;)
</phrase>
-<phrase arch="m68k">
-(Amiga OS, Atari TOS, Mac OS, &hellip;)
-</phrase>
-
and want to stick Linux on the same disk, you will need to repartition
the disk. Debian requires its own hard disk partitions. It cannot be
installed on Windows or MacOS partitions. It may be able to share some
@@ -49,7 +45,6 @@ You can find information about your current partition setup by using
a partitioning tool for your current operating system<phrase
arch="x86">, such as fdisk or PartitionMagic</phrase><phrase
arch="powerpc">, such as Drive Setup, HD Toolkit, or MacTools</phrase><phrase
-arch="m68k">, such as HD SC Setup, HDToolBox, or SCSITool</phrase><phrase
arch="s390">, such as the VM diskmap</phrase>. Partitioning tools always
provide a way to show existing partitions without making changes.
@@ -191,7 +186,6 @@ Boot the Debian installer to continue installing Debian.
&nondeb-part-alpha.xml;
&nondeb-part-x86.xml;
-&nondeb-part-m68k.xml;
&nondeb-part-sparc.xml;
&nondeb-part-powerpc.xml;
diff --git a/en/preparing/nondeb-part/m68k.xml b/en/preparing/nondeb-part/m68k.xml
deleted file mode 100644
index 37734ca55..000000000
--- a/en/preparing/nondeb-part/m68k.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<!-- retain these comments for translator revision tracking -->
-<!-- $Id$ -->
-
-
- <sect2 arch="m68k"><title>Partitioning in AmigaOS</title>
-<para>
-
-If you are running AmigaOS, you can use the <command>HDToolBox</command>
-program to adjust your native partitions prior to installation.
-
-</para>
- </sect2>
-
- <sect2 arch="m68k"><title>Partitioning in Atari TOS</title>
-<para>
-
-Atari partition IDs are three ASCII characters, use <quote>LNX</quote> for
-data and <quote>SWP</quote> for swap partitions. If using the low memory
-installation method, a small Minix partition is also needed (about 2 MB),
-for which the partition ID is <quote>MNX</quote>. Failure to set the
-appropriate partition IDs not only prevents the Debian installation process
-from recognizing the partitions, but also results in TOS attempting to use
-the Linux partitions, which confuses the hard disk driver and renders the
-whole disk inaccessible.
-
-</para><para>
-
-There are a multitude of third party partitioning tools available (the
-Atari <command>harddisk</command> utility doesn't permit changing the
-partition ID); this manual cannot give detailed descriptions for all
-of them. The following description covers <command>SCSITool</command> (from
-Hard+Soft GmBH).
-
-<orderedlist>
-<listitem><para>
-
-Start <command>SCSITool</command> and select the disk you want to partition
-(<guimenu>Disk</guimenu> menu, item <guimenuitem>select</guimenuitem>).
-
-</para></listitem>
-<listitem><para>
-
-From the <guimenu>Partition</guimenu> menu, select either
-<guimenuitem>New</guimenuitem> to add new partitions or change the
-existing partition sizes, or <guimenuitem>Change</guimenuitem> to
-change one specific partition. Unless you have already created
-partitions with the right sizes and only want to change the partition
-ID, <guimenuitem>New</guimenuitem> is probably the best choice.
-
-</para></listitem>
-<listitem><para>
-
-For the <guimenuitem>New</guimenuitem> choice, select
-<guilabel>existing</guilabel> in the dialog box
-prompting the initial settings. The next window shows a list of
-existing partitions which you can adjust using the scroll buttons, or
-by clicking in the bar graphs. The first column in the partition list
-is the partition type; just click on the text field to edit it. When
-you are finished changing partition settings, save the changes by
-leaving the window with the <guibutton>OK</guibutton> button.
-
-</para></listitem>
-<listitem><para>
-
-For the <guimenuitem>Change</guimenuitem> option, select the partition
-to change in the selection list, and select <guilabel>other
-systems</guilabel> in the dialog box. The
-next window lists detailed information about the location of this
-partition, and lets you change the partition ID. Save changes by
-leaving the window with the <guibutton>OK</guibutton> button.
-
-</para></listitem>
-<listitem><para>
-
-Write down the Linux names for each of the partitions you created or
-changed for use with Linux &mdash; see <xref linkend="device-names"/>.
-
-</para></listitem>
-<listitem><para>
-
-Quit <command>SCSITool</command> using the
-<guimenuitem>Quit</guimenuitem> item from the <guimenu>File</guimenu>
-menu. The computer will reboot to make sure the changed partition
-table is used by TOS. If you changed any TOS/GEM partitions, they will
-be invalidated and have to be reinitialized (we told you to back up
-everything on the disk, didn't we?).
-
-</para></listitem>
-</orderedlist>
-
-</para><para>
-
-There is a partitioning tool for Linux/m68k called
-<command>atari-fdisk</command> in the installation system, but for now we
-recommend you partition your disk using a TOS partition editor or some
-disk tool. If your partition editor doesn't have an option to edit the
-partition type, you can do this crucial step at a later stage (from
-the booted temporary install RAMdisk). <command>SCSITool</command> is only
-one of the partition editors we know of which supports selection of
-arbitrary partition types. There may be others; select the tool that
-suits your needs.
-
-</para>
-</sect2>
-
- <sect2 arch="m68k"><title>Partitioning in MacOS</title>
-<para>
-
-Partitioning tools for Macintosh tested include <command>pdisk</command>,
-<command>HD SC Setup</command> 7.3.5 (Apple), <command>HDT</command> 1.8 (FWB),
-<command>SilverLining</command> (LaCie), and <command>DiskTool</command> (Tim
-Endres, GPL). Full versions are required for <command>HDT</command> and
-<command>SilverLining</command>. The Apple tool requires a patch in order
-to recognize third-party disks (a description on how to patch <command>HD
-SC Setup</command> using <command>ResEdit</command> can be found at
-<ulink url="http://www.euronet.nl/users/ernstoud/patch.html"></ulink>).
-
-</para><para>
-
-For IDE based Macs, you need to use <command>Apple Drive Setup</command> to create
-empty space for the Linux partitions, and complete the partitioning under
-Linux, or use the MacOS version of pdisk available for download from
-<ulink url="http://homepage.mac.com/alk/downloads/pdisk.sit.hqx">Alsoft</ulink>.
-
-</para>
-</sect2>
-
diff --git a/en/preparing/pre-install-bios-setup.xml b/en/preparing/pre-install-bios-setup.xml
index 2e80da6b1..3bf222467 100644
--- a/en/preparing/pre-install-bios-setup.xml
+++ b/en/preparing/pre-install-bios-setup.xml
@@ -16,28 +16,13 @@ hardware; it is most critically invoked during the bootstrap process
</para>
&bios-setup-i386.xml;
-&bios-setup-m68k.xml;
&bios-setup-powerpc.xml;
&bios-setup-sparc.xml;
&bios-setup-s390.xml;
- <sect2 arch="m68k;x86;powerpc" id="hardware-issues">
+ <sect2 arch="x86;powerpc" id="hardware-issues">
<title>Hardware Issues to Watch Out For</title>
-<para arch="m68k">
-
-Atari TT RAM boards are notorious for RAM problems under Linux; if you
-encounter any strange problems, try running at least the kernel in
-ST-RAM. Amiga users may need to exclude RAM using a booter memfile.
-
-<phrase condition="FIXME"><emphasis>
-
-FIXME: more description of this needed.
-
-</emphasis></phrase>
-
-</para>
-
<formalpara arch="x86">
<title>USB BIOS support and keyboards</title>
<para>
diff --git a/en/using-d-i/modules/clock-setup-finish.xml b/en/using-d-i/modules/clock-setup-finish.xml
index 2adcb04cf..e704e56d1 100644
--- a/en/using-d-i/modules/clock-setup-finish.xml
+++ b/en/using-d-i/modules/clock-setup-finish.xml
@@ -15,7 +15,7 @@ systems are installed.
In expert mode you will always be able to choose
whether or not the clock is set to UTC.
-<phrase arch="m68k;powerpc">Macintosh hardware clocks are normally
+<phrase arch="powerpc">Macintosh hardware clocks are normally
set to local time. If you want to dual-boot, select local time instead of
UTC.</phrase>
<phrase arch="x86">Systems that (also) run Dos or Windows are normally
diff --git a/en/using-d-i/modules/nobootloader.xml b/en/using-d-i/modules/nobootloader.xml
index df251b1a5..f0e60d2c9 100644
--- a/en/using-d-i/modules/nobootloader.xml
+++ b/en/using-d-i/modules/nobootloader.xml
@@ -9,9 +9,7 @@
This option can be used to complete the installation even when no boot
loader is to be installed, either because the arch/subarch doesn't
provide one, or because none is desired (e.g. you will use existing
-boot loader). <phrase arch="m68k">This option is especially useful for
-Macintosh, Atari, and Amiga systems, where the original operating system
-must be maintained on the box and used to boot GNU/Linux.</phrase>
+boot loader).
</para><para>