Lots of markup fixes and improvements.

Submitted by:	ue

1 files changed, 47 insertions, 23 deletions

diff --git a/release/doc/en_US.ISO8859-1/installation/sparc64/install.sgml b/release/doc/en_US.ISO8859-1/installation/sparc64/install.sgml
index 615eae2..7c06a8b 100644
--- a/release/doc/en_US.ISO8859-1/installation/sparc64/install.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/sparc64/install.sgml
@@ -56,7 +56,7 @@ This file contains sparc64-specific installation instructions.
       <para>This section describes the files you will need for a
 	&os;/&arch; installation.  The links in this document point to
 	the main &os; FTP server.  Please use a mirror site instead if
-	possible.
+	possible.</para>
 
       <important>
 	<para>The URLs in this section are provisional and subject to
@@ -139,12 +139,29 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 	on the keyboard, or send a
         <command>BREAK</command> over the serial console (using for
         example <command>~#</command> in &man.tip.1; or &man.cu.1;) to
-        get to the PROM prompt.  It looks like
-
-        <screen>ok </screen>
-        or
-        <screen>ok {0} </screen>
-        (on SMP systems).</para>
+        get to the PROM prompt.  It looks like this:</para>
+
+      <screenco>
+        <areaspec>
+	  <area id="prompt-single" coords="1 5">
+
+	  <area id="prompt-smp" coords="2 5">
+        </areaspec>
+        <screen><prompt>ok     </prompt>                            
+<prompt>ok {0} </prompt>                   </screen>
+
+        <calloutlist>
+	  <callout arearefs="prompt-single">
+	    <para>This is the prompt used on systems with just
+	      one CPU.</para>
+          </callout>
+
+	  <callout arearefs="prompt-smp">
+	    <para>This is the prompt used on SMP systems, the digit
+	      indicates the number of the active CPU.</para>
+	  </callout>
+        </calloutlist>
+      </screenco>
     </sect3>
   </sect2>
     
@@ -242,7 +259,7 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
   :rp="<replaceable>tftp-server-ip-address</replaceable>:<replaceable>nfs-root-directory</replaceable>":\
   :sm=<replaceable>ip-netmask</replaceable>
 
-&lt;name of the entry>:\
+<replaceable>name-of-the-entry</replaceable>:\
   ha=<replaceable>sparc64-ethernet-address</replaceable>:ip=<replaceable>sparc64-ip-address</replaceable>:tc=.default</programlisting>
 
         <para>The Ethernet address must be the same as the one in the
@@ -287,7 +304,7 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
            <literal>option host-name</literal> is resolvable, i.e. has
            a DNS entry or is associated with an address in
            <filename>/etc/hosts</filename>, the
-           <literal>fixed-address</literal> specification can be omitted.
+           <literal>fixed-address</literal> specification can be omitted.</para>
       </sect4>
     </sect3>
 
@@ -396,18 +413,22 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
     <para>To create a disk label, the following procedure is the
       easiest:</para>
 
-    <para>First, use:
-<screen>&prompt.root; <userinput>disklabel -w -r &lt;device&gt; auto</userinput></screen>
-      This will create a basic disk label. The third argument you need
+    <procedure>
+      <step>
+    <para>Run
+<command>disklabel -w -r <replaceable>device</replaceable> auto</command>
+      to create a basic disk label. The third argument you need
       specify here is just the name of the device, not the complete
       path to the device node (e.g. <devicename>ad0</devicename> for
       the first ATA disk).</para>
+      </step>
 
+      <step>
     <para>
-      Now, use:
-<screen>&prompt.root; <userinput>disklabel -e &lt;device&gt; auto</userinput></screen>
-      This will open an editor in which you can edit the disk
-      label. The information presented to you should look like:
+      Use
+<command>disklabel -e <replaceable>device</replaceable></command>
+      to open an editor in which you can edit the disk
+      label. The information presented to you should look like:</para>
 
 <screen># /dev/ad6c:
 type: unknown
@@ -430,10 +451,9 @@ drivedata: 0
 
 8 partitions:
 #        size   offset    fstype   [fsize bsize bps/cpg]
-  c: 80418240        0    unused        0     0         # (Cyl.    0 - 79779)
-</screen>
+  c: 80418240        0    unused        0     0         # (Cyl.    0 - 79779)</screen>
 
-      You can now add new partitions in the same format as the already
+      <para>You can now add new partitions in the same format as the already
       present line. Using <literal>*</literal> in the offset field makes the procedure
       easier; please refer to the &man.disklabel.8; manual page for more
       information.</para>
@@ -451,7 +471,9 @@ drivedata: 0
       this disk must have their respective partition entries in the
       old and new label match <emphasis>exactly</emphasis>, or they
       will be lost.</para></warning>
+      </step>
 
+      <step>
     <para>Use <command>disklabel -B</command> if you want to make the
       disk bootable for &os;/&arch;.</para>
 
@@ -467,6 +489,8 @@ drivedata: 0
       <ulink
       url="ftp://ftp.FreeBSD.org/pub/FreeBSD/development/sparc64/loader-ufs.gz"></ulink>
     </para>
+      </step>
+    </procedure>
 
   </sect2>
    
@@ -491,19 +515,19 @@ drivedata: 0
 
     <para>To create file systems and to install the base system, boot
       from CDROM or via NFS and create a disk label as described in
-      <xref linkend="creating-disk-label">.
+      <xref linkend="creating-disk-label">.</para>
 
     <para>When booting the first time and you have not entered your
       root partition into <filename>/etc/fstab</filename> yet, you may
       need to specify your root partition on the mountroot prompt when
       booting (use a format like
-      <command>ufs:&lt;disk>&lt;partition></command>, i.e. leave the
+      <command>ufs:<replaceable>disk</replaceable><replaceable>partition</replaceable></command>, i.e. leave the
       slice specification out). If the kernel does automatically
       attempt to boot from another file system, press a key other than
       <keycap>Enter</keycap> on the <application>loader</application>
-      prompt:
+      prompt:</para>
 <screen>Hit [Enter] to boot immediately, or any other key for command prompt.</screen>
-      Then, boot the kernel using <command>boot -a -s</command>, which
+      <para>Then, boot the kernel using <command>boot -a -s</command>, which
       will cause the kernel to ask you for the root partition and
       then boot into single-user mode. Once the root file system has
       been entered into <filename>/etc/fstab</filename>, it should be