diff --git a/chapters/install.macosx.xml b/chapters/install.macosx.xml
index f24b7c4611..336e2f21c7 100644
--- a/chapters/install.macosx.xml
+++ b/chapters/install.macosx.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <sect1 id="install.macosx">
  <title>Unix/Mac OS X installs</title>
  <para>
@@ -25,79 +25,108 @@
    There are two slightly different versions of Mac OS X, client and
    server. The following is for OS X Server.
   </simpara>
-   <example id="install.macosx.compile.example">
+  <formalpara id="install.macosx.compile.example">
    <title>Mac OS X server install</title>
-   <screen>
+   <para>
+    <orderedlist>
+     <listitem>
+      <simpara>Get the latest distributions of Apache and PHP.</simpara>
+     </listitem>
+     <listitem>
+      <para>
+       Untar them, and run the <command>configure</command> program on Apache
+       like so.
+       <programlisting role="shell">
 <![CDATA[
-1. Get the latest distributions of Apache and PHP
-2. Untar them, and run the configure program on Apache like so.
-    ./configure --exec-prefix=/usr \ 
-    --localstatedir=/var \ 
-    --mandir=/usr/share/man \ 
-    --libexecdir=/System/Library/Apache/Modules \ 
-    --iconsdir=/System/Library/Apache/Icons \ 
-    --includedir=/System/Library/Frameworks/Apache.framework/Versions/1.3/Headers \ 
-    --enable-shared=max \ 
-    --enable-module=most \ 
-    --target=apache 
-
-4. You may also want to add this line: 
-    setenv OPTIM=-O2 
-    If you want the compiler to do some optimization. 
-    
-5. Next, go to the PHP 4 source directory and configure it. 
-    ./configure --prefix=/usr \ 
-    --sysconfdir=/etc \ 
-    --localstatedir=/var \ 
-    --mandir=/usr/share/man \ 
-    --with-xml \ 
-    --with-apache=/src/apache_1.3.12 
-
-    If you have any other additions (MySQL, GD, etc.), be sure to add
-    them here. For the --with-apache string, put in the path to your 
-    apache source directory, for example "/src/apache_1.3.12". 
-6. make
-7. make install    
-    This will add a directory to your Apache source directory under
-    src/modules/php4.
-    
-8. Now, reconfigure Apache to build in PHP 4.
-    ./configure --exec-prefix=/usr \ 
-    --localstatedir=/var \ 
-    --mandir=/usr/share/man \ 
-    --libexecdir=/System/Library/Apache/Modules \ 
-    --iconsdir=/System/Library/Apache/Icons \ 
-    --includedir=/System/Library/Frameworks/Apache.framework/Versions/1.3/Headers \ 
-    --enable-shared=max \ 
-    --enable-module=most \ 
-    --target=apache \ 
-    --activate-module=src/modules/php4/libphp4.a 
-
-    You may get a message telling you that libmodphp4.a is out of date.
-    If so, go to the src/modules/php4 directory inside your apache
-    source directory and run this command: 
-
-    ranlib libmodphp4.a 
-
-    Then go back to the root of the apache source directory and run the
-    above configure command again. That'll bring the link table up to
-    date. 
-
-9. make
-
-10. make install
-
-11. copy and rename the php.ini-dist file to your "bin" directory from your
-    PHP 4 source directory:
-    cp php.ini-dist /usr/local/bin/php.ini 
-
-    or (if your don't have a local directory) 
-
-    cp php.ini-dist /usr/bin/php.ini 
+./configure --exec-prefix=/usr \
+--localstatedir=/var \
+--mandir=/usr/share/man \
+--libexecdir=/System/Library/Apache/Modules \
+--iconsdir=/System/Library/Apache/Icons \
+--includedir=/System/Library/Frameworks/Apache.framework/Versions/1.3/Headers \
+--enable-shared=max \
+--enable-module=most \
+--target=apache
 ]]>
-   </screen>
-  </example>
-
+       </programlisting>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       If you want the compiler to do some optimization., you may also want to
+       add this line:
+       <programlisting role="shell">
+<![CDATA[
+setenv OPTIM=-O2
+]]>
+       </programlisting>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       Next, go to the PHP 4 source directory and configure it.
+       <programlisting role="shell">
+<![CDATA[
+./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --mandir=/usr/share/man \
+    --with-xml \
+    --with-apache=/src/apache_1.3.12
+]]>
+       </programlisting>
+       If you have any other additions (MySQL, GD, etc.), be sure to add them
+       here. For the <option role="configure">--with-apache</option> string, put
+       in the path to your apache source directory, for example
+       <filename class="directory">/src/apache_1.3.12</filename>.
+      </para>
+     </listitem>
+     <listitem>
+      <simpara>
+       Type <command>make</command> and <command>make install</command>. This
+       will add a directory to your Apache source directory under
+       <filename class="directory">src/modules/php4</filename>.
+      </simpara>
+     </listitem>
+     <listitem>
+      <para>
+       Now, reconfigure Apache to build in PHP 4.
+       <programlisting role="shell">
+<![CDATA[
+./configure --exec-prefix=/usr \
+--localstatedir=/var \
+--mandir=/usr/share/man \
+--libexecdir=/System/Library/Apache/Modules \
+--iconsdir=/System/Library/Apache/Icons \
+--includedir=/System/Library/Frameworks/Apache.framework/Versions/1.3/Headers \
+--enable-shared=max \
+--enable-module=most \
+--target=apache \
+--activate-module=src/modules/php4/libphp4.a
+]]>
+       </programlisting>
+       You may get a message telling you that libmodphp4.a is out of date. If
+       so, go to the <filename class="directory">src/modules/php4</filename>
+       directory inside your apache source directory and run this command: 
+       <command>ranlib libmodphp4.a</command>. Then go back to the root of the
+       apache source directory and run the above <command>configure</command>
+       command again. That'll bring the link table up to date. Run
+       <command>make</command> and <command>make install</command> again.
+      </para>
+     </listitem>
+     <listitem>
+      <simpara>
+       Copy and rename the <filename>php.ini-dist</filename> file to your
+       <filename class="directory">bin</filename> directory from your PHP 4
+       source directory: 
+       <userinput>cp php.ini-dist /usr/local/bin/php.ini</userinput>
+       or (if your don't have a local directory)
+       <userinput>cp php.ini-dist /usr/bin/php.ini</userinput>.
+      </simpara>
+     </listitem>
+    </orderedlist>
+   </para>
+  </formalpara>
   <!--
   <simpara>
   TODO: Someone with Mac OS X skills needs to improve this DOC
@@ -129,30 +158,31 @@
   </simpara>
   <para>
    Do this to install:
-   <itemizedlist>
+   <orderedlist>
     <listitem>
      <simpara>
-      1.	Open a terminal window 
+      Open a terminal window.
      </simpara>
     </listitem>
     <listitem>
      <simpara>
-      2.	Type "wget http://www.diax.ch/users/liyanage/software/macosx/libphp4.so.gz",
-      wait for download to finish 
+      Type
+      <userinput>wget http://www.diax.ch/users/liyanage/software/macosx/libphp4.so.gz</userinput>,
+      wait for the download to finish.
      </simpara>
     </listitem>
     <listitem>
      <simpara>
-      3.	Type "gunzip libphp4.so.gz" 
+      Type <userinput>gunzip libphp4.so.gz</userinput>.
      </simpara>
     </listitem>
     <listitem>
      <simpara>
-      4.	Type "sudo apxs -i -a -n php4 libphp4.so" 
+      Type <userinput>sudo apxs -i -a -n php4 libphp4.so</userinput>
      </simpara>
     </listitem>
-   </itemizedlist>
-   Now type "<literal>sudo open -a TextEdit /etc/httpd/httpd.conf</literal>"
+   </orderedlist>
+   Now type <userinput>sudo open -a TextEdit /etc/httpd/httpd.conf</userinput>.
    TextEdit will open with the web server configuration file. Locate these 
    two lines towards the end of the file: (Use the Find command)
    <programlisting role="apache">
@@ -164,12 +194,14 @@
    Remove the two hash marks (<literal>#</literal>), then save the file and quit TextEdit.
   </para>
   <para>
-   Finally, type "<literal>sudo apachectl graceful</literal>" to restart the web server.
+   Finally, type <userinput>sudo apachectl graceful</userinput>to restart the
+   web server.
   </para>
   <para>
    PHP should now be up and running. You can test it by dropping a file into 
-   your "Sites" folder which is called "test.php". Into that file, write this
-   line: "<literal>&lt;?php phpinfo() ?&gt;</literal>".
+   your <filename class="directory">Sites</filename> folder which is called
+   <filename>test.php</filename>. Into that file, write this line:
+   <literal>&lt;?php phpinfo() ?&gt;</literal>".
   </para>
   <para>
    Now open up <literal>127.0.0.1/~your_username/test.php</literal> in your web browser.