Clean up formatting.

diff --git a/1.6/admin/AdminMisc.xml b/1.6/admin/AdminMisc.xml
index 6430e72..50f6dff 100644 (file)
--- a/1.6/admin/AdminMisc.xml
+++ b/1.6/admin/AdminMisc.xml
@@ -214,63 +214,51 @@ size 50M
                        <step>\r
                                <para>Install the application <application>stow</application> on your system if it is not already installed. Issue the following command as \r
                                the <systemitem class="username">root</systemitem> user:</para>\r
-                               \r
-                                       <title>Installing <application>stow</application></title>\r
-                                       <screen>\r
-                                       $ apt-get install stow\r
-                                       ...\r
-                                       </screen>\r
+<screen>\r
+<userinput>apt-get install stow</userinput>\r
+</screen>\r
                        </step>\r
                        <step>\r
                                <para>Download, compile, and install the latest release for PostgreSQL 8.2 (which was version <literal>8.2.12</literal> at the time of this writing). \r
                                As the <systemitem class="username">root</systemitem> user, follow these steps:</para>\r
-                               <figure>\r
-                                       <title>Installing PostgreSQL</title>\r
-                                       <screen>\r
-                                       $ wget http://wwwmaster.postgresql.org/redir/198/h/source/v8.2.17/postgresql-8.2.17.tar.bz2\r
-                                       $ tar xzf postgresql-8.2.17.tar.gz\r
-                                       $ cd postgresql-8.2.17\r
-                                       $ ./configure --with-perl --enable-integer-datetimes --with-openssl --prefix=/usr/local/stow/pgsql\r
-                                       ...\r
-                                       $ make\r
-                                       ...\r
-                                       $ make install\r
-                                       ...\r
-                                       $ cd contrib\r
-                                       $ make\r
-                                       ...\r
-                                       $ make install\r
-                                       $ cd xml2\r
-                                       $ make\r
-                                       ...\r
-                                       $ make install\r
-                                       $ cd /usr/local/stow\r
-                                       $ stow pgsql\r
-                                       </screen>\r
-                               </figure>\r
+                               \r
+<screen>\r
+<userinput>\r
+wget http://wwwmaster.postgresql.org/redir/198/h/source/v8.2.17/postgresql-8.2.17.tar.bz2\r
+tar xzf postgresql-8.2.17.tar.gz\r
+cd postgresql-8.2.17\r
+./configure --with-perl --enable-integer-datetimes --with-openssl --prefix=/usr/local/stow/pgsql\r
+make\r
+make install\r
+cd contrib\r
+make\r
+make install\r
+cd xml2\r
+make\r
+make install\r
+cd /usr/local/stow\r
+stow pgsql\r
+</userinput>\r
+</screen>\r
+                               \r
                        </step>\r
                        <step>\r
                                <para>Create the new user <systemitem class="username">postgres</systemitem> to run the PostgreSQL processes. \r
                                As the <systemitem class="username">root</systemitem> user, execute this command:</para>\r
-                               <figure>\r
-                                       <title>Adding <systemitem class="username">postgres</systemitem></title>\r
-                                       <screen>\r
-                                       $ adduser postgres\r
-                                       </screen>\r
-                               </figure>\r
+                               <screen><userinput>adduser postgres</userinput></screen>\r
                        </step>\r
                        <step>\r
                                <para>Initialize the database directory and start up PostgreSQL. As the <systemitem class="username">root</systemitem> user, follow these steps:</para>\r
-                               <figure>\r
-                                       <title>Adding <systemitem class="username">postgres</systemitem></title>\r
-                                       <screen>\r
-                                       $ mkdir -p /usr/local/pgsql/data\r
-                                       $ chown postgres /usr/local/pgsql/data\r
-                                       $ su - postgres\r
-                                       $ initdb -D /usr/local/pgsql/data -E UNICODE --locale=C\r
-                                       $ pg_ctl -D /usr/local/pgsql/data -l /home/postgres/logfile start\r
-                                       </screen>\r
-                               </figure>\r
+                               \r
+<screen>\r
+<userinput>\r
+mkdir -p /usr/local/pgsql/data\r
+chown postgres /usr/local/pgsql/data\r
+su - postgres\r
+initdb -D /usr/local/pgsql/data -E UNICODE --locale=C\r
+pg_ctl -D /usr/local/pgsql/data -l /home/postgres/logfile start\r
+</userinput>\r
+</screen>\r
                                <note>\r
                                        <para>If an error occurs during the final step above, review the path of the home directory for the \r
                                        <systemitem class="username">postgres</systemitem> user. It may be <literal>/var/lib/postresql</literal> instead of <literal>/home/postres</literal>.</para>\r