7 files changed, 25 insertions, 15 deletions
diff --git a/en/boot-installer/mips.xml b/en/boot-installer/mips.xml
index fd776cbf1..ccd7ae422 100644
--- a/en/boot-installer/mips.xml
+++ b/en/boot-installer/mips.xml
@@ -5,7 +5,7 @@
   <sect2 arch="mips" id="boot-tftp"><title>Booting with TFTP</title>
 
    <sect3>
-   <title>SGI Indys TFTP Booting</title>
+   <title>SGI TFTP Booting</title>
 <para>
 
 After entering the command monitor use
@@ -14,7 +14,7 @@ After entering the command monitor use
 bootp():
 </screen></informalexample>
 
-on SGI Indys to boot linux and to begin installation of the Debian
+on SGI machines to boot linux and to begin installation of the Debian
 Software.  In order to make this
 work you may have to unset the <envar>netaddr</envar> environment
 variable. Type
@@ -60,10 +60,10 @@ command, the installer will be loaded automatically.
   <sect2 arch="mips"><title>Boot Parameters</title>
 
    <sect3>
-   <title>SGI Indys TFTP Booting</title>
+   <title>SGI TFTP Booting</title>
 <para>
 
-On SGI Indys you can append boot parameters to the
+On SGI machines you can append boot parameters to the
 <command>bootp():</command> command in the command monitor.
 
 </para><para>
diff --git a/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml
index 158d7937f..8d01923ba 100644
--- a/en/hardware/hardware-supported.xml
+++ b/en/hardware/hardware-supported.xml
@@ -137,13 +137,16 @@ variations of each architecture known as <quote>flavors</quote>.
 </row>
 
 <row>
-  <entry morerows="3">MIPS (big endian)</entry>
+  <entry morerows="4">MIPS (big endian)</entry>
   <entry morerows="2">mips</entry>
-  <entry morerows="1">SGI Indy/Indigo 2</entry>
+  <entry morerows="1">SGI IP22 (Indy/Indigo 2)</entry>
   <entry>r4k-ip22</entry>
 </row><row>
   <entry>r5k-ip22</entry>
 </row><row>
+  <entry>SGI IP32 (O2)</entry>
+  <entry>r5k-ip32</entry>
+</row><row>
   <entry>Broadcom BCM91250A (SWARM)</entry>
   <entry>sb1-bcm91250a</entry>
 </row><row>
@@ -240,7 +243,8 @@ with X.Org version &x11ver;.
 
 </para><para arch="mips">
 
-The X.Org X11 window system is only supported on the SGI Indy.  The
+<!-- FIXME: mention explicit graphics chips and not system names -->
+The X.Org X11 window system is only supported on the SGI Indy and the O2.  The
 Broadcom BCM91250A and BCM91480B evaluation boards have standard 3.3v PCI
 slots and support VGA emulation or Linux framebuffer on a selected range
 of graphics cards.  A <ulink url="&url-bcm91250a-hardware;">compatibility
diff --git a/en/hardware/supported/mips.xml b/en/hardware/supported/mips.xml
index d9fce4361..540c59ebb 100644
--- a/en/hardware/supported/mips.xml
+++ b/en/hardware/supported/mips.xml
@@ -17,6 +17,11 @@ refers to the SGI Indy, the Indigo 2 and Challenge S are meant as well.
 </para></listitem>
 <listitem><para>
 
+SGI IP32: this platform is generally known as SGI O2.
+
+</para></listitem>
+<listitem><para>
+
 Broadcom BCM91250A (SWARM): this is an ATX form factor evaluation board
 from Broadcom based on the dual-core SB1 1250 CPU.
 
@@ -43,7 +48,8 @@ debian-&arch-listname; mailing list</ulink>.
 
 On SGI IP22, SGI Indy, Indigo 2 and Challenge S with R4000, R4400, R4600 and R5000
 processors are supported by the Debian installation system on big endian
-MIPS.  The Broadcom BCM91250A evaluation board comes with an SB1 1250 chip with
+MIPS.  On SGI IP32, currently only systems based on the R5000 are supported.
+The Broadcom BCM91250A evaluation board comes with an SB1 1250 chip with
 two cores which are supported in SMP mode by this installer.  Similarly,
 the BCM91480B evaluation board contains an SB1A 1480 chip with four cores
 which are supported in SMP mode.
diff --git a/en/install-methods/install-tftp.xml b/en/install-methods/install-tftp.xml
index 5f8da88e2..0926ed5dc 100644
--- a/en/install-methods/install-tftp.xml
+++ b/en/install-methods/install-tftp.xml
@@ -125,7 +125,7 @@ server:
 # echo 1 &gt; /proc/sys/net/ipv4/ip_no_pmtu_disc
 </screen></informalexample>
 
-to turn off Path MTU discovery, otherwise the Indy's PROM can't
+to turn off Path MTU discovery, otherwise the SGI's PROM can't
 download the kernel. Furthermore, make sure TFTP packets are sent from
 a source port no greater than 32767, or the download will stall after
 the first packet.  Again, it's Linux 2.4.X tripping this bug in the
@@ -308,10 +308,10 @@ for additional system-specific configuration information.
    </sect3>
 
    <sect3 arch="mips">
-   <title>SGI Indys TFTP Booting</title>
+   <title>SGI TFTP Booting</title>
 <para>
 
-On SGI Indys you can rely on the <command>bootpd</command> to supply
+On SGI machines you can rely on the <command>bootpd</command> to supply
 the name of the TFTP file. It is given either as the
 <userinput>bf=</userinput> in <filename>/etc/bootptab</filename> or as
 the <userinput>filename=</userinput> option in
diff --git a/en/install-methods/tftp/bootp.xml b/en/install-methods/tftp/bootp.xml
index 110d2405d..0f1fb963d 100644
--- a/en/install-methods/tftp/bootp.xml
+++ b/en/install-methods/tftp/bootp.xml
@@ -50,7 +50,7 @@ option specifies the file a client should retrieve via TFTP; see
 <xref linkend="tftp-images"/> for more details.
 
 <phrase arch="mips">
-On SGI Indys you can just enter the command monitor and type
+On SGI machines you can just enter the command monitor and type
 <userinput>printenv</userinput>.  The value of the
 <userinput>eaddr</userinput> variable is the machine's MAC address.
 </phrase>
diff --git a/en/partitioning/partition/mips.xml b/en/partitioning/partition/mips.xml
index d07499625..fa1f01fc5 100644
--- a/en/partitioning/partition/mips.xml
+++ b/en/partitioning/partition/mips.xml
@@ -5,9 +5,9 @@
   <sect2 arch="mips"><title>Partitioning for &arch-title;</title>
 <para>
 
-SGI Indys require an SGI disk label in order to make the system bootable
+SGI machines require an SGI disk label in order to make the system bootable
 from hard disk. It can be created in the fdisk expert menu. The thereby
-created volume header(partition number 9) should be at least 3MB large.
+created volume header (partition number 9) should be at least 3MB large.
 If the volume header created is too small, you can simply delete
 partition number 9 and re-add it with a different size. Note that the
 volume header must start at sector 0.
diff --git a/en/using-d-i/modules/mips/arcboot-installer.xml b/en/using-d-i/modules/mips/arcboot-installer.xml
index aba21a7e5..ed85017e8 100644
--- a/en/using-d-i/modules/mips/arcboot-installer.xml
+++ b/en/using-d-i/modules/mips/arcboot-installer.xml
@@ -5,7 +5,7 @@
   <title><command>arcboot</command>-installer</title>
 <para>
 
-The boot loader on SGI Indys is <command>arcboot</command>.
+The boot loader on SGI machines is <command>arcboot</command>.
 It has to be installed on the same hard disk as the kernel (this is done
 automatically by the installer). Arcboot supports different configurations
 which are set up in <filename>/etc/arcboot.conf</filename>. Each