Fix build errors, make various minor improvements and standardize source layout (whitespace)

1 files changed, 85 insertions, 46 deletions

diff --git a/en/boot-installer/arm.xml b/en/boot-installer/arm.xml
index 7ea76596e..b4463c15b 100644
--- a/en/boot-installer/arm.xml
+++ b/en/boot-installer/arm.xml
@@ -112,77 +112,116 @@ tool</ulink> for Windows to upgrade the firmware via the network.
 </para>
     </sect4>
    </sect3>
-   <sect3 arch="arm" id="boot-firmware-ss4000e"><title>Booting the SS4000-E</title>
-    <para>
+
+   <sect3 arch="arm" id="boot-firmware-ss4000e">
+   <title>Booting the SS4000-E</title>
+<para>
+
 Due to limitations in the SS4000-E firmware, it unfortunately is not
 possible to boot the installer without the use of a serial port at
 this time. To boot the installer, you will need a serial nullmodem
-cable; a computer with a serial port<footnote
-id='arm-s4ke-port'><para>a USB serial converter will also
-work</para></footnote>; and a ribbon cable with a male DB9 connector
-at one end, and a 10-pin .1" IDC header at the other<footnote
-id='arm-s4k-rib'><para>this cable is often found in older desktop
-machines with builtin 9-pin serial ports</para></footnote>
-    </para>
-    <para>
+cable; a computer with a serial port<footnote id="arm-s4ke-port">
+
+<para>
+A USB serial converter will also work.
+</para>
+
+</footnote>; and a ribbon cable with a male DB9 connector at one end,
+and a 10-pin .1" IDC header at the other<footnote id="arm-s4k-rib">
+
+<para>
+This cable is often found in older desktop machines with builtin 9-pin
+serial ports.
+</para>
+
+</footnote>.
+
+</para><para>
+
 To boot the SS4000-E, first load the Debian-provided firmware image
 (ss4000e.pkg) through the SS4000-E's web interface (go to
-'administration', then to 'firmware', and upload the image). Next,
+<quote>administration</quote>, then to <quote>firmware</quote>, and
+upload the image). Next,
 use your serial nullmodem cable and the ribbon cable to connect to the
 serial port of the SS4000-E, and reboot the machine. You need to use a
 serial terminal application to communicate with the machine; a good
 option on a Debian GNU/Linux is to use the <command>cu</command>
 program, in the package of the same name. Assuming the serial port on
-your computer is to be found on <file>/dev/ttyS0</file>, use the
-following command line:</para>
-    <informalexample><screen>
+your computer is to be found on <filename>/dev/ttyS0</filename>, use the
+following command line:
+
+</para>
+
+<informalexample><screen>
 cu -lttyS0 -s115200
-    </screen></informalexample>
-    <para>
+</screen></informalexample>
+
+<para>
+
 If using Windows, you may want to consider using the program
-"hyperterminal". Use a baud rate of 115200, 8 bits word length, no
-stop bits, and one parity bit.
-    </para>
-    <para>
+<classname>hyperterminal</classname>. Use a baud rate of 115200,
+8 bits word length, no stop bits, and one parity bit.
+
+</para><para>
+
 When the machine boots, you will see the following line of output:
-    </para>
-    <informalexample><screen>
+
+</para>
+
+<informalexample><screen>
 No network interfaces found
 
 EM-7210 ver.T04 2005-12-12 (For ver.AA)
 == Executing boot script in 1.000 seconds - enter ^C to abort
-    </screen></informalexample>
-    <para>
-At this point, hit Control-C to interrupt the boot loader.<footnote
-id='arm-s4ke-sec'><para>Note that you have only one second to do so;
-if you miss this window, just powercycle the machine and try
-again</para></footnote>. This will give you the RedBoot prompt. Enter
-the following command:
-    </para>
-    <informalexample><screen>
+</screen></informalexample>
+
+<para>
+
+At this point, hit Control-C to interrupt the boot
+loader<footnote id="arm-s4ke-sec">
+
+<para>
+Note that you have only one second to do so; if you miss this window,
+just powercycle the machine and try again.
+</para>
+
+</footnote>. This will give you the RedBoot prompt. Enter the
+following command:
+
+</para>
+
+<informalexample><screen>
 fconfig boot_script_data
-    </screen></informalexample>
-    <para>
+</screen></informalexample>
+
+<para>
+
 RedBoot is now waiting for you to enter the boot script. Make sure to
-<emphasize>exactly</emphasize> enter the following script:
-    </para>
-    <informalexample><screen>
+<emphasis>exactly</emphasis> enter the following script:
+
+</para>
+
+<informalexample><screen>
 fis load ramdisk.gz
 fis load zImage
 exec -c "console=ttyS0,115200 rw root=/dev/ram mem=256M@0xa0000000" -r 0x01800000
-    </screen></informalexample>
-    <para>
-Finish the script with an empty line, and enter 'y' at the prompt to
-update the non-volatile configuration. Finally, use 'reset' to restart
-the system, and allow it to boot normally. The installer should now
-come up as normal. You can either install Debian through the serial
-port, or use an SSH client to connect through SSH.
-    </para>
-    <para>
+</screen></informalexample>
+
+<para>
+
+Finish the script with an empty line, and enter <quote>y</quote> at the
+prompt to update the non-volatile configuration. Finally, use
+<quote>reset</quote> to restart the system, and allow it to boot normally.
+The installer should now come up as normal. You can either install Debian
+through the serial port, or use an SSH client to connect through SSH.
+
+</para><para>
+
 Note that it is not necessary to update the boot script after the
 installation. The system will be configured to take the root device from
 system configuration, rather than from the kernel command line. It will
 not do any harm to do so anyway, however.
-    </para>
+
+</para>
    </sect3>
   </sect2>