Some mips related cleanups and updates.

Patch #11 from bug#855134: Remove old SGI MIPS boot instructions 
and merge with mipsel.

3 files changed, 4 insertions, 66 deletions

diff --git a/en/boot-installer/boot-installer.xml b/en/boot-installer/boot-installer.xml
index 0d10e1863..d34afddab 100644
--- a/en/boot-installer/boot-installer.xml
+++ b/en/boot-installer/boot-installer.xml
@@ -35,7 +35,6 @@ For information on how to boot the graphical installer, see
 &boot-installer-x86.xml;
 &boot-installer-ia64.xml;
 &boot-installer-mips.xml;
-&boot-installer-mipsel.xml;
 &boot-installer-s390.xml;
 &boot-installer-powerpc.xml;
 &boot-installer-sparc.xml;
diff --git a/en/boot-installer/mips.xml b/en/boot-installer/mips.xml
index fe63cdd0d..a60eba93d 100644
--- a/en/boot-installer/mips.xml
+++ b/en/boot-installer/mips.xml
@@ -2,60 +2,8 @@
 <!-- $Id$ -->
 
 
-  <sect2 arch="mips" id="boot-tftp"><title>Booting with TFTP</title>
+  <sect2 arch="mips;mips64el;mipsel" id="boot-tftp"><title>Booting with TFTP</title>
 
-   <sect3>
-   <title>SGI TFTP Booting</title>
-<para>
-
-After entering the command monitor use
-
-<informalexample><screen>
-bootp():
-</screen></informalexample>
-
-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
-
-<informalexample><screen>
-unsetenv netaddr
-</screen></informalexample>
-
-in the command monitor to do this.
-
-</para>
-  </sect3>
-
-  </sect2>
-
-  <sect2 arch="mips"><title>Boot Parameters</title>
-
-   <sect3>
-   <title>SGI TFTP Booting</title>
-<para>
-
-On SGI machines you can append boot parameters to the
-<command>bootp():</command> command in the command monitor.
-
-</para><para>
-
-Following the <command>bootp():</command> command you can give the
-path and name of the file to boot if you did not give an explicit name
-via your bootp/dhcp server. Example:
-
-<informalexample><screen>
-bootp():/boot/tftpboot.img
-</screen></informalexample>
-
-Further kernel parameters can be passed via <command>append</command>:
-
-<informalexample><screen>
-bootp(): append="root=/dev/sda1"
-</screen></informalexample>
-
-</para>
-  </sect3>
-
-  </sect2>
+&boot-installer-intro-net.xml;
+ 
+   </sect2>
\ No newline at end of file
diff --git a/en/boot-installer/mipsel.xml b/en/boot-installer/mipsel.xml
deleted file mode 100644
index d4f1f37e1..000000000
--- a/en/boot-installer/mipsel.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- retain these comments for translator revision tracking -->
-<!-- $Id$ -->
-
-  <sect2 arch="mipsel;mips64el" id="boot-tftp"><title>Booting with TFTP</title>
-
-&boot-installer-intro-net.xml;
-
-  </sect2>
-