Move PostgreSQL ifnormation from ServersideInstallation to Admin misc.
[working/Evergreen.git] / 1.6 / admin / StaffclientInstallation.xml
index 8463f7f..ead3d03 100644 (file)
@@ -1,70 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <chapter xml:id="StaffclientInstallation" xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xl="http://www.w3.org/1999/xlink">\r
        <title>Installing the Staff Client</title>\r
-       <para>You can install the Staff Client from pre-built images and packages without actually having to first build it. Pre-built packages are currently available for <systemitem class="osname">Windows</systemitem>, <systemitem class="osname">Mac OS X</systemitem>, and <systemitem class="osname">Linux</systemitem>. If you need to manually build the Staff Client, see <xref linkend="serversideinstallation-building-staffclient"/>.</para>\r
+       <para>You can install the Staff Client from pre-built images and packages without actually having to first build it. Pre-built packages are currently available \r
+       for <systemitem class="osname">Windows</systemitem>, <systemitem class="osname">Mac OS X</systemitem>, and <systemitem class="osname">Linux</systemitem>. If you need to manually build \r
+       the Staff Client, see <xref linkend="serversideinstallation-building-staffclient"/>.</para>\r
        <section xml:id="serversideinstallation-prebuilt-staffclient">\r
                <title>Installing a Pre-Built Staff Client</title>\r
                <para>This section reviews the process of installing pre-built versions of the Staff Client in various environments.</para>\r
-               <section>\r
+               <simplesect>\r
                        <title>Installing on <systemitem class="osname">Windows</systemitem></title>\r
-                       <para>A standard <systemitem class="osname">Windows</systemitem> installer that contains the current version of the Staff Client is available from the downloads section of the Evergreen website at <ulink url="http://www.evergreen-ils.org/downloads.php">http://www.evergreen-ils.org/downloads.php</ulink>. Download the Staff Client installer, then run it. A screen that looks similar to this should appear:</para>\r
-                       <figure>\r
-                               <title>Running the Staff Client installer</title>\r
-                               <mediaobject>\r
-                                       <imageobject>\r
-                                               <imagedata fileref="../media/serversideinstallation-staffclient-1.png" scalefit="1" width="70%"/>\r
-                                       </imageobject>\r
-                               </mediaobject>\r
-                       </figure>\r
-                       <para>Click <guibutton>Next</guibutton> to continue through the guided install process. The install wizard will ask you to agree to the end-user license, ask you where to install the software, ask about where to place icons, and then will install the software on your workstation.</para>\r
+                       <para>A standard <systemitem class="osname">Windows</systemitem> installer that contains the current version of the Staff Client is available from the downloads section \r
+                       of the Evergreen website at <ulink url="http://www.evergreen-ils.org/downloads.php">http://www.evergreen-ils.org/downloads.php</ulink>. Download the Staff Client installer, \r
+                       then run it.</para>\r
+                       <para>Click <guibutton>Next</guibutton> to continue through the guided install process. The install wizard will ask you to agree to the end-user license, ask you where to \r
+                       install the software, ask about where to place icons, and then will install the software on your workstation.</para>\r
                        <para>When you run the Staff Client for the first time, a screen similar to this should appear:</para>\r
-                       <figure>\r
-                               <title>Running the Staff Client for the first time</title>\r
                                <mediaobject>\r
                                        <imageobject>\r
                                                <imagedata fileref="../media/serversideinstallation-staffclient-2.png" scalefit="1" width="70%"/>\r
                                        </imageobject>\r
                                </mediaobject>\r
-                       </figure>\r
-                       <para>First, configure the server you would like to connect to in the <emphasis role="bold">Server</emphasis> section. For example, the PINES demo system is <systemitem class="domain">demo.gapines.org</systemitem>. After selecting a server, click <guibutton>Re-Test Server</guibutton>.</para>\r
-                       <para>Because this is the initial run of the Staff Client, the <emphasis role="bold">Workstation</emphasis> section in the upper-right states: <emphasis role="bold">Not yet configured for the specified server</emphasis>. The first thing that must be done to the Staff Client on every workstation is to assign it a workstation name. This is covered in <xref linkend="serversideinstallation-workstationnames"/>.</para>\r
-               </section>\r
-               <section>\r
+                       <para>First, configure the server you would like to connect to in the <emphasis role="bold">Server</emphasis> section. For example, the PINES demo system is \r
+                       <systemitem class="domain">demo.gapines.org</systemitem>. After selecting a server, click <guibutton>Re-Test Server</guibutton>.</para>\r
+                       <para>Because this is the initial run of the Staff Client, the <emphasis role="bold">Workstation</emphasis> section in the upper-right states: <emphasis role="bold">Not \r
+                       yet configured for the specified server</emphasis>. The first thing that must be done to the Staff Client on every workstation is to assign it a workstation name. This is \r
+                       covered in <xref linkend="serversideinstallation-workstationnames"/>.</para>\r
+               </simplesect>\r
+               <simplesect>\r
                        <title>Installing on <systemitem class="osname">Mac OS X</systemitem></title>\r
-                       <para>A <systemitem class="osname">Mac OS X</systemitem> package that contains the current version of the Staff Client is available for use with <application>"xulrunner"</application>.</para>\r
-                       <section>\r
+                       <para>A <systemitem class="osname">Mac OS X</systemitem> package that contains the current version of the Staff Client is available for use with \r
+                       <application>"xulrunner"</application>.</para>\r
+                       <simplesect>\r
                                <title>Evergreen Indiana Pkg file [Evergreen v1.2.3.0]</title>\r
                                <procedure>\r
-                                       <step>Download and install the latest version of <application>"xulrunner"</application> for <systemitem class="osname">Mac OS X</systemitem>. Release notes for the latest version can be found here: <ulink url="http://developer.mozilla.org/en/docs/XULRunner_1.8.0.4_Release_Notes">http://developer.mozilla.org/en/docs/XULRunner_1.8.0.4_Release_Notes</ulink>. Note, later versions may not work correctly.</step>\r
-                                       <step>Download and install the <systemitem class="osname">Mac OS X</systemitem> Installation package for the 1_2_3_0 Version Staff Client from <ulink url="http://evergreen.lib.in.us/opac/extras/files/evergreen_osx_staff_client_1_2_3.zip">http://evergreen.lib.in.us/opac/extras/files/evergreen_osx_staff_client_1_2_3.zip</ulink>.</step>\r
-                                       <step>To upgrade to a more recent version of the Staff Client, you can copy the directory <emphasis>build</emphasis> from a working <systemitem class="osname">Windows</systemitem> installation of the desired version of the Staff Client to your Mac. The required files may be located in a directory like this on the <systemitem class="osname">Windows</systemitem> machine: <filename class="directory">C:\Program Files\Evergreen Staff Client\build</filename>. Copy these files into the folder <filename class="directory">Resources</filename> within the Open-ILS package in your Applications directory on the Mac, overwriting files with the same names.</step>\r
+                                       <step>Download and install the latest version of <application>"xulrunner"</application> for <systemitem class="osname">Mac OS X</systemitem>. Release notes \r
+                                       for the latest version can be found here: \r
+                                       <ulink url="http://developer.mozilla.org/en/docs/XULRunner_1.8.0.4_Release_Notes">http://developer.mozilla.org/en/docs/XULRunner_1.8.0.4_Release_Notes</ulink>.\r
+                                        Note, later versions may not work correctly.</step>\r
+                                       <step>Download and install the <systemitem class="osname">Mac OS X</systemitem> Installation package for the 1_2_3_0 Version Staff Client from \r
+                                       <ulink url="http://evergreen.lib.in.us/opac/extras/files/evergreen_osx_staff_client_1_2_3.zip">\r
+                                       http://evergreen.lib.in.us/opac/extras/files/evergreen_osx_staff_client_1_2_3.zip</ulink>.</step>\r
+                                       <step>To upgrade to a more recent version of the Staff Client, you can copy the directory <emphasis>build</emphasis> from a working \r
+                                       <systemitem class="osname">Windows</systemitem> installation of the desired version of the Staff Client to your Mac. The required files may be located in \r
+                                       a directory like this on the <systemitem class="osname">Windows</systemitem> machine: <filename class="directory">C:\Program Files\Evergreen Staff Client\build\r
+                                       </filename>. Copy these files into the folder <filename class="directory">Resources</filename> within the Open-ILS package in your Applications directory on \r
+                                       the Mac, overwriting files with the same names.</step>\r
                                        <step>Drag the application's icon into your toolbar for easier access.</step>\r
                                </procedure>\r
                                <para/>\r
-                               <para>When you run the Staff Client installer, a screen will appear that looks similar to this:</para>\r
-                               <figure>\r
-                                       <title>Running the Staff Client installer</title>\r
-                                       <mediaobject>\r
-                                               <imageobject>\r
-                                                       <imagedata fileref="../media/serversideinstallation-staffclient-3.png" scalefit="1" width="20%"/>\r
-                                               </imageobject>\r
-                                       </mediaobject>\r
-                               </figure>\r
-                               <caution> FIX BAD LINK: http://es.zionsville.lib.in.us/atheos/eg_osx_a.gif </caution>\r
-                               <para>Click <guibutton>Continue</guibutton>, accept the license, then finish the installation. The application will be located at the destination you selected during installation. You will then be able to drag the application into your toolbar for easier access.</para>\r
-                               <figure>\r
-                                       <title>Finishing the installation</title>\r
-                                       <mediaobject>\r
-                                               <imageobject>\r
-                                                       <imagedata fileref="../media/serversideinstallation-staffclient-4.png" scalefit="1" width="20%"/>\r
-                                               </imageobject>\r
-                                       </mediaobject>\r
-                               </figure>\r
-                               <caution> FIX BAD LINK: http://es.zionsville.lib.in.us/atheos/eg_osx_a.gif </caution>\r
-                       </section>\r
-                       <section>\r
+               \r
+                               <para>Click <guibutton>Continue</guibutton>, accept the license, then finish the installation. The application will be located at the destination you selected \r
+                               during installation. You will then be able to drag the application into your toolbar for easier access.</para>\r
+                       </simplesect>\r
+                       <simplesect>\r
                                <title>Running directly using <application>"xulrunner"</application></title>\r
-                               <para>You must install an appropriate version of <application>"xulrunner"</application> to match the Evergreen version. See the following table for the recommended version of <application>"xulrunner"</application>:</para>\r
+                               <para>You must install an appropriate version of <application>"xulrunner"</application> to match the Evergreen version. See the following table for the recommended \r
+                               version of <application>xulrunner</application>:</para>\r
                                <table>\r
                                        <title>Evergreen / XULRunner Dependencies</title>\r
                                        <tgroup align="left" cols="2" colsep="1" rowsep="1">\r
                                                </tbody>\r
                                        </tgroup>\r
                                </table>\r
-                               <note>If you have issues removing previously installed <application>"xulrunner"</application> versions see <xref linkend="serversideinstallation-staffclient-remove-xulrunner"/> for information on removing previous <application>"XULRunner"</application> versions.</note>\r
-                               <para>The Staff Client data from the directory <filename class="directory">./staff_client/build</filename> must be placed somewhere on the machine (e.g. <emphasis>~/Desktop/Evergreen_Staff_Client</emphasis>). Remember to call <application>"XULRunner"</application> with the full path to the binary, followed by the install command and the path to the client data. See the following command:</para>\r
-                               <figure>\r
-                                       <title>Executing <application>"xulrunner"</application></title>\r
-                                       <screen>\r
-                                       /Library/Frameworks/XUL.framework/xulrunner-bin --install-app ~/Desktop/Evergreen_Staff_Client\r
-                                       </screen>\r
-                               </figure>\r
-                               <para>This command should exit quietly. A folder will be created, named <emphasis>/Applications/OpenILS</emphasis>, containing a launcher named <emphasis>open_ils_staff_client</emphasis>.</para>\r
-                       </section>\r
-                       <section xml:id="serversideinstallation-staffclient-remove-xulrunner">\r
-                               <title>Removing previously installed <application>"xulrunner"</application> versions</title>\r
-                               <para>If you already have a newer version installed, per the release notes, you will need to remove the entire directory <filename class="directory">/Library/Frameworks/XUL.framework</filename> before downgrading.</para>\r
+                               <note><para>If you have issues removing previously installed <application>xulrunner</application> versions see \r
+                               <xref linkend="serversideinstallation-staffclient-remove-xulrunner"/> for information on removing previous <application>"XULRunner"</application> versions.</para></note>\r
+                               <para>The Staff Client data from the directory <filename class="directory">./staff_client/build</filename> must be placed somewhere on the machine (e.g. \r
+                               <emphasis>~/Desktop/Evergreen_Staff_Client</emphasis>). Remember to call <application>XULRunner</application> with the full path to the binary, followed by \r
+                               the install command and the path to the client data:</para>\r
+<screen>\r
+<userinput>/Library/Frameworks/XUL.framework/xulrunner-bin --install-app ~/Desktop/Evergreen_Staff_Client</userinput>\r
+</screen>\r
+                               <para>This command should exit quietly. A folder will be created, named <emphasis>/Applications/OpenILS</emphasis>, containing a launcher \r
+                               named <emphasis>open_ils_staff_client</emphasis>.</para>\r
+                       </simplesect>\r
+                       <simplesect xml:id="serversideinstallation-staffclient-remove-xulrunner">\r
+                               <title>Removing previously installed <application>xulrunner</application> versions</title>\r
+                               <para>If you already have a newer version installed, per the release notes, you will need to remove the entire directory \r
+                               <filename class="directory">/Library/Frameworks/XUL.framework</filename> before downgrading.</para>\r
                                <para>In addition, you may also need to remove the previous file <filename>/Library/Receipts/xulrunner-ver-mak.pkg</filename>.</para>\r
-                               <para>If there is no file <filename>/Library/Receipts/xulrunner-ver-mak.pkg</filename> (possibly in newer OSX releases) you need to flush the file <emphasis>receiptdb</emphasis>.</para>\r
-                               <note>If you install a newer version over a previous (older) install, the older one is not removed but the symlinks get changed to the newer one.</note>\r
+                               <para>If there is no file <filename>/Library/Receipts/xulrunner-ver-mak.pkg</filename> (possibly in newer OSX releases) you need to flush the file \r
+                               <emphasis>receiptdb</emphasis>.</para>\r
+                               <note><para>If you install a newer version over a previous (older) install, the older one is not removed but the symlinks get changed to the newer one.</para></note>\r
                                <para>First, get the package identifier, then purge/forget the build that was initially installed:</para>\r
-                               <figure>\r
-                                       <title>Purging previous build</title>\r
-                                       <screen>\r
-                                       sudo pkgutil --pkgs > /tmp/pkgs.txt\r
-                                       sudo pkgutil --forget org.mozilla.xulrunner\r
-                                       </screen>\r
-                               </figure>\r
-                               <note>It may not be necessary to edit the file <filename>/Library/Receipts/InstallHistory.plist</filename> after deleting the folder <emphasis>XUL.framework</emphasis>.</note>\r
-                       </section>\r
-                       <section>\r
+<screen>\r
+<userinput>sudo pkgutil --pkgs > /tmp/pkgs.txt</userinput>\r
+<userinput>sudo pkgutil --forget org.mozilla.xulrunner</userinput>\r
+</screen>\r
+                               <note><para>It may not be necessary to edit the file <filename>/Library/Receipts/InstallHistory.plist</filename> after deleting the folder \r
+                               <emphasis>XUL.framework</emphasis>.</para></note>\r
+                       </simplesect>\r
+                       <simplesect>\r
                                <title>Creating an APP file: Staff Client &amp; <application>"xulrunner"</application> Bundled</title>\r
-                               <para>An APP file is basically a folder. Start with a folder structure like this:</para>\r
-                               <figure>\r
-                                       <title>Sample APP file folder structure</title>\r
-                                       <screen>\r
-                                       * Evergreen.app\r
-                                         * Contents\r
-                                           * Frameworks\r
-                                           * Resources\r
-                                           * MacOS\r
-                                       </screen>\r
-                               </figure>\r
+                               <para>An APP file is basically a folder. Start with a folder structure like this:</para>                                \r
+<screen>\r
+* Evergreen.app\r
+  * Contents\r
+    * Frameworks\r
+    * Resources\r
+    * MacOS\r
+</screen>\r
                                <para>Create an APP folder structure with the following commands:</para>\r
-                               <figure>\r
-                                       <title>Creating a folder structure</title>\r
-                                       <screen>\r
-                                       mkdir -p Evergreen.app/Contents/Frameworks\r
-                                       mkdir -p Evergreen.app/Contents/Resources\r
-                                       mkdir -p Evergreen.app/Contents/MacOS\r
-                                       </screen>\r
-                               </figure>\r
+<screen>\r
+<userinput>mkdir -p Evergreen.app/Contents/Frameworks</userinput>\r
+<userinput>mkdir -p Evergreen.app/Contents/Resources</userinput>\r
+<userinput>mkdir -p Evergreen.app/Contents/MacOS</userinput>\r
+</screen>\r
                                <para/>\r
                                <procedure>\r
                                        <step>\r
-                                               <para>Create a new file in the folder <emphasis>Evergreen.app/Contents/Info.plist</emphasis> containing the following data (adjust for your version of Evergreen):</para>\r
-                                               \r
-                                                       \r
+                                               <para>Create a new file in the folder <emphasis>Evergreen.app/Contents/Info.plist</emphasis> containing the following data (adjust for your \r
+                                               version of Evergreen):</para>                                   \r
 <programlisting language="xml"><![CDATA[\r
 <?xml version="1.0" encoding="UTF-8"?>\r
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\r
 ]]></programlisting>\r
                                                \r
                                        </step>\r
-                                       <step>Download and install an appropriate <systemitem class="osname">Mac OS X</systemitem>package of <application>"XULRunner"</application> from \r
-                                       the Mozilla website (see above for recommendations).</step>\r
+                                       <step>\r
+                                               <para>Download and install an appropriate <systemitem class="osname">Mac OS X</systemitem>package of <application>"XULRunner"</application> from \r
+                                               the Mozilla website (see above for recommendations).</para></step>\r
                                        <step>\r
                                                <para>Make a copy of <emphasis>/Library/Frameworks/XUL.Framework</emphasis> inside your APP file. It should look something like this:</para>\r
                                                \r
@@ -186,31 +172,28 @@ ______* libxpcom.dylib -> Versions/Current/libxpcom.dylib
 ______* xulrunner-bin -> Versions/Current/xulrunner-bin\r
 </screen>\r
                                        </step>\r
-                                       <step>Copy <emphasis>XUL.Framework/Versions/Current/xulrunner</emphasis> into <emphasis>Evergreen.app/MacOS</emphasis> \r
-                                       (do not symlink; copy the file).</step>\r
+                                       <step><para>Copy <emphasis>XUL.Framework/Versions/Current/xulrunner</emphasis> into <emphasis>Evergreen.app/MacOS</emphasis> \r
+                                       (do not symlink; copy the file).</para></step>\r
                                        <step>\r
                                                <para>Make <emphasis>Evergreen.app/Resources</emphasis> the root of your Evergreen application files like this:</para>\r
-                                               <figure>\r
-                                                       <title>Example APP file</title>\r
-                                                       <screen>\r
-                                                       * Evergreen.app/\r
-                                                       __* Contents/\r
-                                                       ____* Resources/\r
-                                                       ______* BUILD_ID\r
-                                                       ______* application.ini\r
-                                                       ______* chrome/\r
-                                                       ______* components/\r
-                                                       ______* etc.\r
-                                                       </screen>\r
-                                               </figure>\r
+<screen>\r
+* Evergreen.app/\r
+__* Contents/\r
+____* Resources/\r
+______* BUILD_ID\r
+______* application.ini\r
+______* chrome/\r
+______* components/\r
+______* etc.\r
+</screen>\r
                                        </step>\r
                                        <step>Put a <systemitem class="osname">Mac</systemitem> format icon file named <emphasis>Evergreen.icns</emphasis> in Resources.</step>\r
                                </procedure>\r
-                       </section>\r
-               </section>\r
-               <section xml:id="serversideinstallation-staffclient">\r
+                       </simplesect>\r
+               </simplesect>\r
+               <simplesect xml:id="serversideinstallation-staffclient">\r
                        <title>Installing on <systemitem class="osname">Linux</systemitem></title>\r
-                       <section>\r
+                       <simplesect>\r
                                <title>Quick Upgrade of the Staff Client</title>\r
                                <para>A <systemitem class="osname">Linux</systemitem> Staff Client is automatically built on the server as part of the normal \r
                                <emphasis>make install</emphasis> process for Evergreen server-side software. To upgrade the Staff Client on a remote workstation with a new version, \r
@@ -222,19 +205,14 @@ ______* xulrunner-bin -> Versions/Current/xulrunner-bin
                                <para>As the <systemitem class="username">opensrf</systemitem> user, change directory to the Staff Client source directory, then recursively copy \r
                                the entire directory tree to the remote workstation:</para>                     \r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.7/Open-ILS/xul/staff_client</userinput>\r
 <userinput>scp -r build user@client.linux.machine:~/eg-client-x.x.x.x/</userinput>\r
 </screen>\r
                                <para>To test the newly copied Staff Client, as the <systemitem class="username">opensrf</systemitem> user log into the remote workstation and execute \r
                                it as shown:</para>                             \r
-<screen>\r
-<userinput>su - opensrf</userinput>\r
-<userinput>xulrunner ~/eg-client-x.x.x.x/build/application.ini</userinput>\r
-</screen>\r
-                               \r
-                       </section>\r
-                       <section>\r
+                               <screen><userinput>xulrunner ~/eg-client-x.x.x.x/build/application.ini</userinput></screen>     \r
+                       </simplesect>\r
+                       <simplesect>\r
                                <title>Building the Staff Client on the Server</title>\r
                                <para>A <systemitem class="osname">Linux</systemitem> Staff Client is automatically built on the server as part of the normal \r
                                <emphasis>make install</emphasis> process for Evergreen server-side software.</para>\r
@@ -248,12 +226,11 @@ ______* xulrunner-bin -> Versions/Current/xulrunner-bin
                                server to work together, the BUILD_ID must match the name of the directory containing the server components of the Staff Client, or the name of a symbolic \r
                                link to that directory.</para>\r
 <screen>\r
-<userinput>su - root</userinput>\r
 <userinput>cd /openils/var/web/xul</userinput>\r
 <userinput>ln -s SERVER_BUILD_ID/ CLIENT_BUILD_ID</userinput>\r
 </screen>      \r
-                       </section>\r
-                       <section>\r
+                       </simplesect>\r
+                       <simplesect>\r
                                <title>Building the Staff Client on the client Machine</title>\r
                                <para>This section is directed toward end-users who wish to use <systemitem class="osname">Linux</systemitem> rather than \r
                                <systemitem class="osname">Windows</systemitem> for client machines, but have limited <systemitem class="osname">Linux</systemitem> experience. You can \r
@@ -280,16 +257,24 @@ ______* xulrunner-bin -> Versions/Current/xulrunner-bin
                                                <itemizedlist>\r
                                                        <listitem>\r
                                                                <para>Determine which version is needed</para>\r
-                                                               <para>For most end-users, a specific version is required to communicate properly with the Evergreen server. Check with your system administrator, IT person, or HelpDesk to determine which Staff Client versions are supported.</para>\r
-                                                               <para>Next, you need to determine which <emphasis>tag</emphasis> to use when downloading the source code. Tags are markers in the source code to create a snapshot of the code as it existed at a certain time; tags usually point to tested and stable code, or at least a community-recognized release version.</para>\r
-                                                               <para>To determine which tag to use, browse to <ulink url="http://svn.open-ils.org/trac/ILS/browser">http://svn.open-ils.org/trac/ILS/browser</ulink>. Look in the <guibutton>Visit</guibutton> drop-down box; see the list of Branches and, further down, a list of Tags. You may have to do some guesswork, but it is fairly straightforward to determine which tag to use. If the server is version 1.2.1.4, you will want to use the tag that looks most appropriate. For example, as you look through the tag list, notice the tag named 'rel_1_2_1_4'. This is the tag you need; make a note of it for the next step.</para>\r
+                                                               <para>For most end-users, a specific version is required to communicate properly with the Evergreen server. Check with your \r
+                                                               system administrator, IT person, or HelpDesk to determine which Staff Client versions are supported.</para>\r
+                                                               <para>Next, you need to determine which <emphasis>tag</emphasis> to use when downloading the source code. Tags are markers in the \r
+                                                               source code to create a snapshot of the code as it existed at a certain time; tags usually point to tested and stable code, or at \r
+                                                               least a community-recognized release version.</para>\r
+                                                               <para>To determine which tag to use, browse to \r
+                                                               <ulink url="http://svn.open-ils.org/trac/ILS/browser">http://svn.open-ils.org/trac/ILS/browser</ulink>. Look in the \r
+                                                               <guibutton>Visit</guibutton> drop-down box; see the list of Branches and, further down, a list of Tags. You may have to do some \r
+                                                               guesswork, but it is fairly straightforward to determine which tag to use. If the server is version 1.2.1.4, you will want to use the \r
+                                                               tag that looks most appropriate. For example, as you look through the tag list, notice the tag named 'rel_1_2_1_4'. This is the \r
+                                                               tag you need; make a note of it for the next step.</para>\r
                                                        </listitem>\r
                                                        <listitem>\r
                                                                <para>Download the Code</para>\r
-                                                               <para>As the <systemitem class="username">opensrf</systemitem> user, open a terminal (command-line prompt) and navigate to the directory in which you wish to download the Staff Client. Use the following commands to download the proper version of the source code by tag name:</para>\r
-                                                               \r
+                                                               <para>As the <systemitem class="username">opensrf</systemitem> user, open a terminal (command-line prompt) and navigate to the directory \r
+                                                               in which you wish to download the Staff Client. Use the following commands to download the proper version of the source code by tag \r
+                                                               name:</para>                    \r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>cd /YOUR/DOWNLOAD/DIRECTORY</userinput>\r
 <userinput>svn co svn://svn.open-ils.org/ILS/tags/rel_1_2_1_4/</userinput>\r
 </screen>\r
@@ -301,11 +286,14 @@ ______* xulrunner-bin -> Versions/Current/xulrunner-bin
                                                <para>Build the Staff Client</para>\r
                                                <section>\r
                                                        <title>Evergreen 1.2.x</title>\r
-                                                       <para>In the following example, navigate to the directory in which the source code was downloaded, then navigate to the proper subdirectory and run the <command>make</command> utility to actually build the Staff Client. Remember to check with your system administrator about which Staff Client BUILD_ID to use. The server checks the Staff Client BUILD_ID against itself to determine whether or not a connecting client is supported. For instance, for the PINES installation (version 1.2.1.4) the supported BUILD_ID is <literal>rel_1_2_1_4</literal>. Modify the following commands accordingly.</para>\r
+                                                       <para>In the following example, navigate to the directory in which the source code was downloaded, then navigate to the proper subdirectory and \r
+                                                       run the <command>make</command> utility to actually build the Staff Client. Remember to check with your system administrator about which \r
+                                                       Staff Client BUILD_ID to use. The server checks the Staff Client BUILD_ID against itself to determine whether or not a connecting client \r
+                                                       is supported. For instance, for the PINES installation (version 1.2.1.4) the supported BUILD_ID is <literal>rel_1_2_1_4</literal>. Modify \r
+                                                       the following commands accordingly.</para>\r
                                                        <para>As the <systemitem class="username">opensrf</systemitem> user, run the following commands to build the Staff \r
                                                        Client:</para>                                                  \r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>cd /YOUR/DOWNLOAD/DIRECTORY</userinput>\r
 <userinput>cd Open-ILS/xul/staff_client</userinput>\r
 <userinput>make STAFF_CLIENT_BUILD_ID='rel_1_2_1_4'</userinput>\r
@@ -314,11 +302,11 @@ ______* xulrunner-bin -> Versions/Current/xulrunner-bin
                                                </section>\r
                                                <section>\r
                                                        <title>Evergreen 1.4.x</title>\r
-                                                       <para>The 1.4 series of Evergreen has complicated the build process for the Staff Client a bit. If you downloaded a .tar.gz (compressed tar archive) of Evergreen, then your steps will resemble the following:</para>\r
+                                                       <para>The 1.4 series of Evergreen has complicated the build process for the Staff Client a bit. If you downloaded a .tar.gz (compressed \r
+                                                       tar archive) of Evergreen, then your steps will resemble the following:</para>\r
                                                        <caution>FIXME -- Need instructions for getting certain Javascript files from OpenSRF, preferably without actually installing OpenSRF.\r
 </caution>                                                     \r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>wget http://evergreen-ils.org/downloads/Evergreen-ILS-1.4.0.4.tar.gz</userinput>\r
 <userinput>tar xfz Evergreen-ILS-1.4.0.4.tar.gz</userinput>\r
 <userinput>cd Evergreen-ILS-1.4.0.4/</userinput>\r
@@ -330,7 +318,6 @@ ______* xulrunner-bin -> Versions/Current/xulrunner-bin
                                                        <para>If you're installing from a Subversion checkout:</para>\r
 \r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>svn co svn://svn.open-ils.org/ILS/tags/rel_1_4_0_4/</userinput>\r
 <userinput>cd rel_1_4_0_4</userinput>\r
 <userinput>./autogen.sh</userinput>   # If you downloaded a .tar.gz of Evergreen, you may skip this step\r
@@ -343,59 +330,54 @@ ______* xulrunner-bin -> Versions/Current/xulrunner-bin
                                        </step>\r
                                        <step>\r
                                                <para>Run the Staff Client (from the command line)</para>\r
-                                               <para>As the <systemitem class="username">opensrf</systemitem> user, navigate to the directory <filename class="directory">build/</filename> (not <filename class="directory">staff_client/</filename>) and run the following command:</para>                                   \r
-<screen>\r
-<userinput>su - opensrf</userinput>\r
-<userinput>xulrunner application.ini</userinput>\r
-</screen>\r
+                                               <para>As the <systemitem class="username">opensrf</systemitem> user, navigate to the directory <filename class="directory">build/</filename> \r
+                                               (not <filename class="directory">staff_client/</filename>) and run the following command:</para>                                        \r
+                                               <screen><userinput>xulrunner application.ini</userinput></screen>\r
                                        </step>\r
                                        <step>\r
                                                <para>(OPTIONAL) Cleaning Up / Creating Shortcuts</para>\r
                                                <para>The source code download included many files that are needed to build the Staff Client, but are not necessary to run it. You may \r
                                                wish to remove them to save space, or to create a clean directory containing the built Staff Client that can be copied to other machines. To \r
-                                               create a clean "staging" directory in which to place the finished Staff Client, issue the following commands:</para>                                            \r
+                                               create a clean "staging" directory in which to place the finished Staff Client, issue the following commands:</para>    \r
+                                       \r
 <screen>\r
 <userinput>mkdir ~/&lt;Destination Directory&gt;</userinput>\r
 <userinput>cd ~/&lt;Download Directory>/Open-ILS/xul/</userinput>\r
 <userinput>cp -r staff_client ~/&lt;Destination Directory~/&gt;</userinput>\r
 </screen>\r
                                                <para>Finally, test the Staff Client to verify that all the necessary files were moved to the destination directory:</para>\r
-                                               \r
+                                       \r
 <screen>\r
 <userinput>cd ~/&lt;Destination Directory>/staff_client/build</userinput>\r
 <userinput>xulrunner application.ini</userinput>\r
 </screen>\r
-                                               \r
                                                <para>If there were no problems, then finish the cleanup by removing the original download directory and all subdirectories:</para>\r
-<screen>\r
-<userinput>rm -r -f ~/&lt;Download Directory&gt;</userinput>\r
-</screen>\r
-                                               \r
+                                               <screen><userinput>rm -r -f ~/&lt;Download Directory&gt;</userinput></screen>\r
                                                <para>Finally, test the copied Staff Client. You can create "Desktop / Start Menu / K-Menu" shortcuts for the Staff Client by using the following command as the target:</para>                                         \r
 <screen>\r
 <userinput>xulrunner ~/&lt;Destination Directory&gt;/staff_client/build/application.ini</userinput>\r
-</screen>\r
-                                       \r
+</screen>      \r
                                        </step>\r
                                </procedure>\r
-                       </section>\r
-                       <section>\r
+                       </simplesect>\r
+                       <simplesect>\r
                                <title>Using <application>"Wine"</application> to Install On Linux</title>\r
-                               <para>The <systemitem class="osname">Linux</systemitem> application <application>"Wine"</application> is another alternative for those who wish to install the packaged <systemitem class="osname">Windows</systemitem> versions rather than building the Staff Client manually. <application>"Wine"</application> is a <systemitem class="osname">Linux</systemitem> application that allows users to directly run <systemitem class="osname">Windows</systemitem> executables, and is a simple way for casual <systemitem class="osname">Linux</systemitem> users to use the Staff Client. More information about <application>"Wine"</application> can be found at <ulink url="http://www.winehq.org/site/docs/wineusr-guide/getting-wine">http://www.winehq.org/site/docs/wineusr-guide/getting-wine</ulink>.</para>\r
-                               <para>As the <systemitem class="username">root</systemitem> user, use <application>"apt-get"</application> to install the package for <application>"Wine"</application>. You can also use <application>"synaptic"</application>, the graphical user interface.</para>\r
+                               <para>The <systemitem class="osname">Linux</systemitem> application <application>"Wine"</application> is another alternative for those who wish to install the \r
+                               packaged <systemitem class="osname">Windows</systemitem> versions rather than building the Staff Client manually. <application>"Wine"</application> is a \r
+                               <systemitem class="osname">Linux</systemitem> application that allows users to directly run <systemitem class="osname">Windows</systemitem> executables, and is a simple \r
+                               way for casual <systemitem class="osname">Linux</systemitem> users to use the Staff Client. More information about <application>"Wine"</application> can be found at \r
+                               <ulink url="http://www.winehq.org/site/docs/wineusr-guide/getting-wine">http://www.winehq.org/site/docs/wineusr-guide/getting-wine</ulink>.</para>\r
+                               <para>As the <systemitem class="username">root</systemitem> user, use <application>"apt-get"</application> to install the package for <application>"Wine"</application>. \r
+                               You can also use <application>"synaptic"</application>, the graphical user interface.</para>\r
                                <procedure>\r
                                        <step>\r
-                                               <para>Install <application>"Wine"</application></para>\r
-                                                                                                       \r
-<screen>\r
-<userinput>sudo apt-get install wine</userinput>\r
-</screen>\r
+                                               <para>Install <application>"Wine"</application></para>                                                          \r
+                                               <screen><userinput>sudo apt-get install wine</userinput></screen>\r
                                        </step>\r
                                        <step>\r
                                                <para>Download <systemitem class="osname">Windows</systemitem> installer for the Staff Client</para>\r
                                                <para>As the <systemitem class="username">opensrf</systemitem> user, run the following commands to download the <systemitem class="osname">Windows</systemitem> installer for the proper Staff Client from the <emphasis>open-ils.org</emphasis> website and place it in a temporary directory:</para>\r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>cd /YOUR/DOWNLOAD/DIRECTORY</userinput>\r
 <userinput>wget http://open-ils.org/downloads/evergreen-setup-rel_version-number.exe</userinput>\r
 </screen>\r
@@ -403,84 +385,100 @@ ______* xulrunner-bin -> Versions/Current/xulrunner-bin
                                        </step>\r
                                        <step>\r
                                                <para>Run the downloaded <systemitem class="osname">Windows</systemitem> installer</para>\r
-                                               <para>As the <systemitem class="username">opensrf</systemitem> user, navigate to the directory where you downloaded the <systemitem class="osname">Windows</systemitem> executable file, then execute it:</para>\r
+                                               <para>As the <systemitem class="username">opensrf</systemitem> user, navigate to the directory where you downloaded the \r
+                                               <systemitem class="osname">Windows</systemitem> executable file, then execute it:</para>\r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>cd /YOUR/DOWNLOAD/DIRECTORY</userinput>\r
 <userinput>wine evergreen-setup-rel_version-number.exe</userinput>\r
 </screen>\r
                                                \r
-                                               <para>If this step fails, you may need to configure Wine first to properly emulate <systemitem class="osname">WindowsXP</systemitem>. To do so, type the command <command>winecfg</command> from the command line; in the <guibutton>Applications</guibutton> tab of the window that pops up, select <guibutton>Default Settings</guibutton> and choose <guibutton>Windows XP</guibutton> from the drop-down menu, then click <guibutton>Apply</guibutton>.</para>\r
+                                               <para>If this step fails, you may need to configure Wine first to properly emulate <systemitem class="osname">WindowsXP</systemitem>. To do so, type \r
+                                               the command <command>winecfg</command> from the command line; in the <guibutton>Applications</guibutton> tab of the window that pops up, \r
+                                               select <guibutton>Default Settings</guibutton> and choose <guibutton>Windows XP</guibutton> from the drop-down menu, then click \r
+                                               <guibutton>Apply</guibutton>.</para>\r
                                        </step>\r
                                        <step>\r
                                                <para>Launch the Staff Client</para>\r
-                                               <para>A new entry for the Staff Client should now appear somewhere in the <guibutton>All Applications</guibutton> menu of your <systemitem class="osname">Linux</systemitem> desktop. Also, find a new desktop shortcut for the Staff Client. To launch the Staff Client, visit the <guibutton>All Applications</guibutton> menu, find a section similar to <emphasis><menuchoice><guimenu>Wine</guimenu><guimenuitem>Program Files</guimenuitem><guimenuitem>Evergreen Staff Client</guimenuitem><guimenuitem>Evergreen Staff Client</guimenuitem></menuchoice></emphasis>\r
-, or else launch the Staff Client from the desktop shortcut.</para>\r
+                                               <para>A new entry for the Staff Client should now appear somewhere in the <guibutton>All Applications</guibutton> menu of your \r
+                                               <systemitem class="osname">Linux</systemitem> desktop. Also, find a new desktop shortcut for the Staff Client. To launch the Staff Client, visit \r
+                                               the <guibutton>All Applications</guibutton> menu, find a section similar to <emphasis><menuchoice><guimenu>Wine</guimenu>\r
+                                               <guimenuitem>Program Files</guimenuitem><guimenuitem>Evergreen Staff Client</guimenuitem><guimenuitem>Evergreen Staff Client</guimenuitem>\r
+                                               </menuchoice></emphasis>, or else launch the Staff Client from the desktop shortcut.</para>\r
                                        </step>\r
                                </procedure>\r
-                       </section>\r
-                       <section>\r
+                       </simplesect>\r
+                       <simplesect>\r
                                <title>Running the Staff Client over an SSH Tunnel</title>\r
                                <para>The Staff Client can use an SSH tunnel as a SOCKS 5 proxy. For more details, see <xref linkend="serversideinstallation-proxy"/>.</para>\r
-                       </section>\r
-               </section>\r
-               <section xml:id="serversideinstallation-workstationnames">\r
+                       </simplesect>\r
+               </simplesect>\r
+               <simplesect xml:id="serversideinstallation-workstationnames">\r
                        <title>Assigning Workstation Names</title>\r
-                       <para>The Staff Client must be assigned to a library and given a unique name before it will connect fully to the Evergreen server. The only restriction is that the workstation's name must be unique within the assigned library. Make sure to select a workstation name that you will remember later, and reflects the role, purpose, and/or location of a particular computer. These names will come up later in statistical reporting, and can also be handy when troubleshooting.</para>\r
-<mediaobject>\r
-<imageobject>\r
-       <imagedata fileref="../media/serversideinstallation-staffclient-workstationnames-1.png" scalefit="1" width="70%"/>\r
-</imageobject>\r
-</mediaobject>\r
-                       <para>In order to assign a workstation a name, a user with appropriate permissions must login to the Staff Client. In PINES, the local system administrator (OPSM) has the ability to assign workstation names in his or her library system. Library managers (LIBM's) have the ability within their branch. To assign a workstation a name, login to the system. You will be prompted to assign the workstation a library and a name:</para>\r
-<mediaobject>\r
-<imageobject>\r
-       <imagedata fileref="../media/serversideinstallation-staffclient-workstationnames-2.png" scalefit="1" width="70%"/>\r
-</imageobject>\r
-</mediaobject>\r
-                       <para>Select the library this workstation physically operates in from the drop down menu. In this example, we have selected <literal>MGRL-MA</literal>. Type in a friendly name for the workstation. In this example, we are installing the Staff Client on the director's personal system, and have named it as such. Then hit <emphasis role="bold">Register</emphasis>.</para>\r
+                       <para>The Staff Client must be assigned to a library and given a unique name before it will connect fully to the Evergreen server. The only restriction is that the \r
+                       workstation's name must be unique within the assigned library. Make sure to select a workstation name that you will remember later, and reflects the role, purpose, and/or \r
+                       location of a particular computer. These names will come up later in statistical reporting, and can also be handy when troubleshooting.</para>\r
+                       <mediaobject>\r
+                       <imageobject>\r
+                               <imagedata fileref="../media/serversideinstallation-staffclient-workstationnames-1.png" scalefit="1" width="70%"/>\r
+                       </imageobject>\r
+                       </mediaobject>\r
+                       <para>In order to assign a workstation a name, a user with appropriate permissions must login to the Staff Client. In PINES, the local system administrator (OPSM) has the \r
+                       ability to assign workstation names in his or her library system. Library managers (LIBM's) have the ability within their branch. To assign a workstation a name, login to \r
+                       the system. You will be prompted to assign the workstation a library and a name:</para>\r
+                       <mediaobject>\r
+                       <imageobject>\r
+                               <imagedata fileref="../media/serversideinstallation-staffclient-workstationnames-2.png" scalefit="1" width="70%"/>\r
+                       </imageobject>\r
+                       </mediaobject>\r
+                       <para>Select the library this workstation physically operates in from the drop down menu. In this example, we have selected <literal>MGRL-MA</literal>. Type in a friendly name \r
+                       for the workstation. In this example, we are installing the Staff Client on the director's personal system, and have named it as such. Then hit \r
+                       <emphasis role="bold">Register</emphasis>.</para>\r
                        <para>Once you have registered your workstation with the server, your screen will look like this:</para>\r
-<mediaobject>\r
-<imageobject>\r
-       <imagedata fileref="../media/serversideinstallation-staffclient-workstationnames-3.png" scalefit="1" width="70%"/>\r
-</imageobject>\r
-</mediaobject>\r
+                       <mediaobject>\r
+                       <imageobject>\r
+                               <imagedata fileref="../media/serversideinstallation-staffclient-workstationnames-3.png" scalefit="1" width="70%"/>\r
+                       </imageobject>\r
+                       </mediaobject>\r
                        <para>You are now ready to log into the Staff Client for the first time. Type in your password again, and hit <emphasis role="bold">Login</emphasis>.</para>\r
-               </section>\r
+               </simplesect>\r
        </section>\r
        <section xml:id="serversideinstallation-building-staffclient">\r
                <title>Manually Building the Staff Client</title>\r
                <para>This section reviews the process of manually building the Staff Client in various environments.</para>\r
-               <para>The Staff Client is automatically built by default as part of the normal <emphasis>make install</emphasis> process for Evergreen server-side software. See <xref linkend="serversideinstallation-compilingevergreen"/> to review details related to building the Staff Client in the final compile/link/install phase of the default Evergreen build process.</para>\r
-               <section>\r
+               <para>The Staff Client is automatically built by default as part of the normal <emphasis>make install</emphasis> process for Evergreen server-side software. See \r
+               <xref linkend="serversideinstallation-compilingevergreen"/> to review details related to building the Staff Client in the final compile/link/install phase of the default Evergreen \r
+               build process.</para>\r
+               <simplesect>\r
                        <title>Building the Staff Client</title>\r
-                       <para>You can also manually build the Staff Client by using the <command>make</command> utility in the Staff Client source directory (e.g., the directory <filename class="directory">/home/opensrf/Evergreen-ILS-1.6.0.7/Open-ILS/xul/staff_client</filename> for the current Evergreen version). There are a number of possible options to manually build special versions of the Staff Client on a <systemitem class="osname">Linux</systemitem> system. Following is a list of environment variables that can be passed to <command>make</command> to influence the manual build process:</para>\r
-                       <section>\r
+                       <para>You can also manually build the Staff Client by using the <command>make</command> utility in the Staff Client source directory (e.g., the directory \r
+                       <filename class="directory">/home/opensrf/Evergreen-ILS-1.6.0.7/Open-ILS/xul/staff_client</filename> for the current Evergreen version). There are a number of possible options \r
+                       to manually build special versions of the Staff Client on a <systemitem class="osname">Linux</systemitem> system. Following is a list of environment variables that can be passed \r
+                       to <command>make</command> to influence the manual build process:</para>\r
+                       <simplesect>\r
                                <title>Option STAFF_CLIENT_BUILD_ID</title>\r
-                               <para>During the normal <emphasis>make install</emphasis> Evergreen server-side software build process, the variable defaults to an automatically generated date/time string, but you can also override the value of BUILD_ID.</para>\r
+                               <para>During the normal <emphasis>make install</emphasis> Evergreen server-side software build process, the variable defaults to an automatically generated \r
+                               date/time string, but you can also override the value of BUILD_ID.</para>\r
                                <para>The following commands could be used during the normal build process:</para>\r
 <screen>\r
-<userinput>su - root</userinput>\r
 <userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.7</userinput>\r
 <userinput>make STAFF_CLIENT_BUILD_ID=rel_1_6_0_7 install</userinput>\r
-...\r
 </screen>                                      \r
                                <para>The following commands will manually build the Staff Client using a different BUILD_ID.</para>\r
                                <para>As the <systemitem class="username">opensrf</systemitem> user, change directory to the Staff Client source directory, then set the variable and \r
                                build the Staff Client:</para>                                  \r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.7/Open-ILS/xul/staff_client</userinput>\r
 <userinput>make STAFF_CLIENT_BUILD_ID=my_test_id  build</userinput>\r
 ...\r
 </screen>              \r
-                       </section>\r
-                       <section>\r
+                       </simplesect>\r
+                       <simplesect>\r
                                <title>Option STAFF_CLIENT_VERSION</title>\r
-                               <para>During the normal <emphasis>make install</emphasis> Evergreen server-side software build process, the variable is pulled automatically from a README file in the Evergreen source root. The variable defaults to <emphasis>0trunk.revision</emphasis>, where the value of <literal>revision</literal> is automatically generated. You can override the value of VERSION similarly to the BUILD_ID.</para>\r
+                               <para>During the normal <emphasis>make install</emphasis> Evergreen server-side software build process, the variable is pulled automatically from a README file in \r
+                               the Evergreen source root. The variable defaults to <emphasis>0trunk.revision</emphasis>, where the value of <literal>revision</literal> is automatically generated. You \r
+                               can override the value of VERSION similarly to the BUILD_ID.</para>\r
                                <para>The following commands could be used during the normal build process:</para>\r
 <screen>\r
-<userinput>$ su - root</userinput>\r
 <userinput>$ cd /home/opensrf/Evergreen-ILS-1.6.0.7</userinput>\r
 <userinput>$ make STAFF_CLIENT_VERSION=0mytest.200 install</userinput>\r
 ...\r
@@ -488,26 +486,23 @@ ______* xulrunner-bin -> Versions/Current/xulrunner-bin
 \r
                                <para>The following commands will manually build the Staff Client using a different VERSION.</para>\r
                                <para>If you plan to make extensions update automatically, the VERSION needs to conform to the format recommended in \r
-                               <ulink url="https://developer.mozilla.org/en/Toolkit_version_format">Toolkit Version Format</ulink> and newer versions need to be "higher" \r
+                               <ulink url="https://developer.mozilla.org/en/Toolkit_version_format">Toolkit Version Format</ulink> and newer versions need to be higher \r
                                than older versions.</para>\r
-                               <para>As the <systemitem class="username">opensrf</systemitem> user, change directory to the Staff Client source directory, then set the variable and build the Staff Client:</para>\r
+                               <para>As the <systemitem class="username">opensrf</systemitem> user, change directory to the Staff Client source directory, then set the variable and build the \r
+                               Staff Client:</para>\r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.7/Open-ILS/xul/staff_client</userinput>\r
 <userinput>make STAFF_CLIENT_VERSION=0mytest.200  build</userinput>\r
-...\r
 </screen>\r
-                       </section>\r
-                       <section>\r
+                       </simplesect>\r
+                       <simplesect>\r
                                <title>Option STAFF_CLIENT_STAMP_ID variable</title>\r
                                <para>During the normal <emphasis>make install</emphasis> Evergreen server-side software build process, this variable is generated from STAFF_CLIENT_VERSION. \r
                                You can override the value of STAMP_ID similarly to the BUILD_ID.</para>\r
                                <para>The following commands could be used during the normal build process:</para>\r
 <screen>\r
-<userinput>su - root</userinput>\r
 <userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.7</userinput>\r
 <userinput>make STAFF_CLIENT_STAMP_ID=my_test_stamp install</userinput>\r
-...\r
 </screen>\r
                                <para>The following commands will manually build the Staff Client using a different STAMP_ID.</para>\r
                                <para>It is possible to have multiple versions of the Staff Client by specifying a different STAMP_ID for each, possibly for different uses or \r
@@ -515,14 +510,12 @@ ______* xulrunner-bin -> Versions/Current/xulrunner-bin
                                <para>As the <systemitem class="username">opensrf</systemitem> user, change directory to the Staff Client source directory, then set the variable and \r
                                build the Staff Client:</para>\r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.7/Open-ILS/xul/staff_client</userinput>\r
 <userinput>make STAFF_CLIENT_STAMP_ID=my_test_stamp  build</userinput>\r
-...\r
 </screen>                              \r
-                       </section>\r
-               </section>\r
-               <section>\r
+                       </simplesect>\r
+               </simplesect>\r
+               <simplesect>\r
                        <title>Advanced Build Options</title>\r
                        <para>In addition to the basic options listed above, there are a number of advanced options for building the Staff Client. Most are target names for \r
                        the <command>make</command> utility and require that you build the Staff Client from its source directory. See the following table for a list of possible \r
@@ -599,64 +592,52 @@ ______* xulrunner-bin -> Versions/Current/xulrunner-bin
                                        <para>As the <systemitem class="username">opensrf</systemitem> user, run <command>make</command> from the Staff Client source directory:</para>\r
                                                <title>Commands to do a "developer build"</title>\r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.7/Open-ILS/xul/staff_client</userinput>\r
 <userinput>make devbuild</userinput>\r
-...\r
 </screen>                      \r
                                </listitem>\r
                                <listitem>\r
                                        <para>Compressed Javascript</para>\r
-                                       <para>You can execute the Google application <application>"Closure Compiler"</application> to automatically review and compress Javascript code after the build process completes, by substituting <literal>compress-javascript</literal> for <literal>build</literal> when running <command>make</command>. For more information see <ulink url="http://code.google.com/closure/compiler/">Google "Closure Compiler"</ulink>.</para>\r
+                                       <para>You can execute the Google application <application>"Closure Compiler"</application> to automatically review and compress Javascript code after the \r
+                                       build process completes, by substituting <literal>compress-javascript</literal> for <literal>build</literal> when running <command>make</command>. \r
+                                       For more information see <ulink url="http://code.google.com/closure/compiler/">Google "Closure Compiler"</ulink>.</para>\r
                                        <para>As the <systemitem class="username">opensrf</systemitem> user, run the following commands from the Staff Client source directory:</para>\r
                                        \r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.7/Open-ILS/xul/staff_client</userinput>\r
 <userinput>make compress-javascript</userinput>\r
-...\r
 </screen>\r
                                        <para>You can also combine Javascript review and compression, and also perform a "developer build".</para>\r
                                        <para>As the <systemitem class="username">opensrf</systemitem> user, run the following commands from the Staff Client source directory:</para>\r
-\r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.7/Open-ILS/xul/staff_client</userinput>\r
-\r
 # order of options is important!\r
 <userinput>make  devbuild  compress-javascript</userinput>\r
-...\r
 </screen>                      \r
                                </listitem>\r
                                <listitem>\r
                                        <para>Automatic Update Host</para>\r
                                        <para>The host used to check for automatic Staff Client updates can be overridden by specifying the AUTOUPDATE_HOST option. \r
                                        The following commands could have been used during the normal build process:</para>\r
-                                       <figure>\r
-                                               <title>Commands to set AUTOUPDATE_HOST for normal Evergreen build</title>\r
-                                               <screen>\r
-                                               $ su - root\r
-                                               $ cd /home/opensrf/Evergreen-ILS-1.6.0.7\r
-                                               $ make AUTOUPDATE_HOST=localhost install\r
-                                               ...\r
-                                               </screen>\r
-                                       </figure>\r
+<screen>\r
+<userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.7</userinput>\r
+<userinput>make AUTOUPDATE_HOST=localhost install</userinput>\r
+</screen>\r
+                                       \r
                                        <para>You can manually set AUTOUPDATE_HOST to set up automatic update checking. The following commands will manually build the Staff \r
                                        Client using a different AUTOUPDATE_HOST.</para>\r
                                        <para>As the <systemitem class="username">opensrf</systemitem> user, change directory to the Staff Client source directory, then set the \r
                                        variable and build the Staff Client:</para>\r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.7/Open-ILS/xul/staff_client</userinput>\r
 <userinput>make AUTOUPDATE_HOST=localhost build</userinput>\r
-...\r
 </screen>\r
                                        \r
                                        <para>For more information on Automatic Updates, see <xref linkend="serversideinstallation-staffclient-autoupdate"/>.</para>\r
                                </listitem>\r
                        </itemizedlist>\r
-               </section>\r
-               <section>\r
+               </simplesect>\r
+               <simplesect>\r
                        <title>Installing and Activating a Manually Built Staff Client</title>\r
                        <para>The Staff Client is automatically built, installed and activated as part of the normal <emphasis>make install</emphasis> process for Evergreen server-side \r
                        software. However, if you manually build the Staff Client, then you need to take additional steps to properly install and activate it. You also have the option \r
@@ -664,34 +645,44 @@ ______* xulrunner-bin -> Versions/Current/xulrunner-bin
                        <para>Assuming you have already built the Staff Client, and that your installation is in the directory <filename class="directory">/openils/var/web/xul</filename>, \r
                        as the <systemitem class="username">opensrf</systemitem> user, change directory to the Staff Client source directory, then execute the following commands:</para>\r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.7/Open-ILS/xul/staff_client</userinput>\r
 <userinput>mkdir -p "/openils/var/web/xul/$(cat build/BUILD_ID)"</userinput>\r
 <userinput>cp -R build/server "/openils/var/web/xul/$(cat build/BUILD_ID)"</userinput>\r
 </screen>\r
 \r
-               </section>\r
-               <section>\r
+               </simplesect>\r
+               <simplesect>\r
                        <title>Packaging the Staff Client</title>\r
-                       <para>Once the Staff Client has been built, you can create several forms of client packages by using some targeted <command>make</command> commands in the Staff Client source directory.</para>\r
+                       <para>Once the Staff Client has been built, you can create several forms of client packages by using some targeted <command>make</command> commands in the Staff \r
+                       Client source directory.</para>\r
                        <itemizedlist>\r
                                <listitem>\r
                                        <para>Packaging a Generic Client</para>\r
-                                       <para>This build creates a Staff Client packaged as an XPI file to use with <emphasis>XULRunner</emphasis>. It requires that you already have the <application>"zip"</application> utility installed on your system. It will create the output file <filename>evergreen_staff_client.xpi</filename>, suitable for use with the <emphasis>XULRunner</emphasis> option <option>--install-app</option>.</para>\r
-                                       <para>As the <systemitem class="username">opensrf</systemitem> user, change directory to the Staff Client source directory, then execute the following commands:</para>\r
+                                       <para>This build creates a Staff Client packaged as an XPI file to use with <emphasis>XULRunner</emphasis>. It requires that you already have \r
+                                       the <application>"zip"</application> utility installed on your system. It will create the output file <filename>evergreen_staff_client.xpi</filename>, \r
+                                       suitable for use with the <emphasis>XULRunner</emphasis> option <option>--install-app</option>.</para>\r
+                                       <para>As the <systemitem class="username">opensrf</systemitem> user, change directory to the Staff Client source directory, \r
+                                       then execute the following commands:</para>\r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.7/Open-ILS/xul/staff_client</userinput>\r
 <userinput>make generic-client</userinput>\r
-...\r
 </screen>\r
 \r
                                </listitem>\r
                                <listitem>\r
                                        <para>Packaging a <systemitem class="osname">Windows</systemitem> Client</para>\r
-                                       <para>This build creates a Staff Client packaged as a <systemitem class="osname">Windows</systemitem> executable. It requires that you already have the <application>"unzip"</application> utility installed on your system. It also requires that you install <ulink url="http://nsis.sourceforge.net/">NSIS (Nullsoft Scriptable Install System)</ulink>, a professional open source utility package used to create <systemitem class="osname">Windows</systemitem> installers (the <application>"makensis"</application> utility is installed as part of the <application>"nsis"</application> package). We recommend using Version 2.45 or later. This build will create the output file <filename>evergreen_staff_client_setup.exe</filename>.</para>\r
-                                       <para>(OPTIONAL) If you wish for the Staff Client to have a link icon/tray icon by default, you may wish to provide a pre-modified <filename>xulrunner-stub.exe</filename>. Place it in the Staff Client source directory and <application>"make"</application> will automatically use it instead of the one that comes with the downloaded <emphasis>XULRunner</emphasis> release. The version of <filename>xulrunner-stub.exe</filename> need not match exactly.</para>\r
-                                       <para>(OPTIONAL) You can also use a tool such as <ulink url="http://www.angusj.com/resourcehacker/">Resource Hacker</ulink> to embed icons. <application>"Resource Hacker"</application> is an open-source utility used to view, modify, rename, add, delete and extract resources in 32bit <systemitem class="osname">Windows</systemitem> executables. See the following table for some useful icon ID strings:</para>\r
+                                       <para>This build creates a Staff Client packaged as a <systemitem class="osname">Windows</systemitem> executable. It requires that you already have \r
+                                       the <application>"unzip"</application> utility installed on your system. It also requires that you install <ulink url="http://nsis.sourceforge.net/">NSIS \r
+                                       (Nullsoft Scriptable Install System)</ulink>, a professional open source utility package used to create <systemitem class="osname">Windows</systemitem> \r
+                                       installers (the <application>"makensis"</application> utility is installed as part of the <application>"nsis"</application> package). We recommend using \r
+                                       Version 2.45 or later. This build will create the output file <filename>evergreen_staff_client_setup.exe</filename>.</para>\r
+                                       <para>(OPTIONAL) If you wish for the Staff Client to have a link icon/tray icon by default, you may wish to provide a pre-modified \r
+                                       <filename>xulrunner-stub.exe</filename>. Place it in the Staff Client source directory and <application>"make"</application> will automatically use it instead  \r
+                                       of the one that comes with the downloaded <emphasis>XULRunner</emphasis> release. The version of <filename>xulrunner-stub.exe</filename> need not match \r
+                                       exactly.</para>\r
+                                       <para>(OPTIONAL) You can also use a tool such as <ulink url="http://www.angusj.com/resourcehacker/">Resource Hacker</ulink> to embed icons. \r
+                                       <application>Resource Hacker</application> is an open-source utility used to view, modify, rename, add, delete and extract resources in 32bit \r
+                                       <systemitem class="osname">Windows</systemitem> executables. See the following table for some useful icon ID strings:</para>\r
                                        <table>\r
                                                <title>Useful icon ID strings</title>\r
                                                <tgroup align="left" cols="2" colsep="1" rowsep="1">\r
@@ -711,10 +702,8 @@ ______* xulrunner-bin -> Versions/Current/xulrunner-bin
                                        </table>\r
                                        <para>As the <systemitem class="username">opensrf</systemitem> user, change directory to the Staff Client source directory, then execute the following commands:</para>\r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.7/Open-ILS/xul/staff_client</userinput>\r
 <userinput>make win-client</userinput>\r
-...\r
 </screen>\r
                                </listitem>\r
                                <listitem>\r
@@ -726,10 +715,8 @@ ______* xulrunner-bin -> Versions/Current/xulrunner-bin
                                        \r
                                                \r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.7/Open-ILS/xul/staff_client</userinput>\r
 <userinput>make linux-client</userinput>\r
-...\r
 </screen>\r
                                        \r
                                </listitem>\r
@@ -740,20 +727,18 @@ ______* xulrunner-bin -> Versions/Current/xulrunner-bin
                                        <para>As the <systemitem class="username">opensrf</systemitem> user, change directory to the Staff Client source directory, then \r
                                        execute the following commands:</para>                                                  \r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.7/Open-ILS/xul/staff_client</userinput>\r
 <userinput>make extension</userinput>\r
-...\r
 </screen>\r
                                        \r
                                </listitem>\r
                        </itemizedlist>\r
-               </section>\r
-               <section xml:id="serversideinstallation-staffclient-autoupdate">\r
+               </simplesect>\r
+               <simplesect xml:id="serversideinstallation-staffclient-autoupdate">\r
                        <title>Staff Client Automatic Updates</title>\r
                        <para>It is possible to set up support for automatic Staff Client updates, either during the normal Evergreen server-side build process, or by manually \r
                        building the Staff Client with certain special options.</para>\r
-                       <section>\r
+                       <simplesect>\r
                                <title>WARNINGS</title>\r
                                <para>Automatic update server certificate requirements are more strict than normal server requirements. Firefox and \r
                                <emphasis>XULRunner</emphasis> will both ignore any automatic update server that is not validated by a trusted certificate authority. \r
@@ -766,8 +751,8 @@ ______* xulrunner-bin -> Versions/Current/xulrunner-bin
                                <para>You can pre-install the signing key into the file <filename>install.rdf</filename> directly, or install it into a copy as \r
                                <emphasis>install.mccoy.rdf</emphasis>. If the latter exists it will be copied into the build instead of the original file \r
                                <filename>install.rdf</filename>.</para>\r
-                       </section>\r
-                       <section>\r
+                       </simplesect>\r
+                       <simplesect>\r
                                <title>Autoupdate Host</title>\r
                                <para>The name of the automatic update host can be provided in either of two ways:</para>\r
                                <orderedlist>\r
@@ -782,11 +767,9 @@ ______* xulrunner-bin -> Versions/Current/xulrunner-bin
                                                As the <systemitem class="username">opensrf</systemitem> user, use the <command>configure</command> utility as shown:</para>\r
                                                \r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.7</userinput>\r
 <userinput>./configure --prefix=/openils --sysconfdir=/openils/conf --with-updateshost=hostname</userinput>\r
 <userinput>make</userinput>\r
-...\r
 </screen>\r
                                                \r
                                        </listitem>\r
@@ -798,62 +781,49 @@ ______* xulrunner-bin -> Versions/Current/xulrunner-bin
                                                <para>If neither option is used then, by default, the Staff Client will not include the automatic update preferences.</para>\r
                                        </listitem>\r
                                </itemizedlist>\r
-                       </section>\r
-                       <section>\r
+                       </simplesect>\r
+                       <simplesect>\r
                                <title>Building Updates</title>\r
                                <para>Similar to building clients, the targets <literal>generic-updates</literal>, <literal>win-updates</literal>, <literal>linux-updates</literal>, \r
                                and <literal>extension-updates</literal> can be used individually with <command>make</command> to build the update files for the Staff Client. To build \r
                                all the targets at once, simply use the target <literal>updates</literal>.</para>\r
                                <para>A "full" update will be built for each specified target (or for all if you use the target <literal>updates</literal>). For all but extensions \r
-                               any previous "full" updates (archived by default in the directory <filename class="directory">/openils/var/updates/archives</filename>) will be used to \r
-                               make "partial" updates. Partial updates tend to be much smaller and will thus download more quickly, but if something goes wrong with a partial update the \r
+                               any previous full updates (archived by default in the directory <filename class="directory">/openils/var/updates/archives</filename>) will be used to \r
+                               make partial updates. Partial updates tend to be much smaller and will thus download more quickly, but if something goes wrong with a partial update the \r
                                full update will be used as a fallback. Extensions do not currently support partial updates.</para>\r
                                <para>As the <systemitem class="username">opensrf</systemitem> user, change directory to the Staff Client source directory, then execute the \r
                                following commands:</para>                      \r
-<screen>\r
-<userinput>su - opensrf</userinput>\r
-<userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.7/Open-ILS/xul/staff_client</userinput>\r
+                               <screen><userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.7/Open-ILS/xul/staff_client</userinput></screen>\r
+                               <para>Command to build all updates at once:</para>\r
+                               <screen><userinput>make updates</userinput></screen>\r
+                               <para>Commands to build updates individually:</para>\r
 \r
-# command to build all updates at once:\r
-<userinput>make updates</userinput>\r
-...\r
-\r
-# commands to build updates individually:\r
+<screen>\r
 <userinput>make generic-updates</userinput>\r
-...\r
 <userinput>make win-updates</userinput>\r
-...\r
 <userinput>make linux-updates</userinput>\r
-...\r
 <userinput>make extension-updates</userinput>\r
-...\r
 </screen>\r
        \r
-                       </section>\r
-                       <section>\r
+                       </simplesect>\r
+                       <simplesect>\r
                                <title>Building updates with clients</title>\r
-                               <para>To save time and effort you can build updates and manual download clients at the same time by adding the string "-client" to each target name. For instance, you can specify <literal>win-updates-client</literal>. You can also specify <literal>updates-client</literal> to build all the targets at once. This does not work for extension-updates.</para>\r
+                               <para>To save time and effort you can build updates and manual download clients at the same time by adding the string "-client" to each target name. For instance, you \r
+                               can specify <literal>win-updates-client</literal>. You can also specify <literal>updates-client</literal> to build all the targets at once. This does not work for \r
+                               extension-updates.</para>\r
                                <para>The clients will be installed alongside the updates and listed on the web page <uri>manualupdate.html</uri>, rather than left in the Staff Client directory.</para>\r
                                <para>As the <systemitem class="username">opensrf</systemitem> user, change directory to the Staff Client source directory, then execute the following commands:</para>\r
-\r
+                               <screen><userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.7/Open-ILS/xul/staff_client</userinput></screen>\r
+                               <para>Command to build all updates at once:</para>\r
+                               <screen><userinput>make updates-client</userinput></screen>\r
+                               <para>Commands to build updates individually:</para>\r
 <screen>\r
-$ su - opensrf\r
-<userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.7/Open-ILS/xul/staff_client</userinput>\r
-\r
-# command to build all updates at once:\r
-<userinput>make updates-client</userinput>\r
-...\r
-\r
-# commands to build updates individually:\r
 <userinput>make generic-updates-client</userinput>\r
-...\r
 <userinput>make win-updates-client</userinput>\r
-...\r
 <userinput>make linux-updates-client</userinput>\r
-...\r
 </screen>\r
-                       </section>\r
-                       <section>\r
+                       </simplesect>\r
+                       <simplesect>\r
                                <title>Activating the Update Server</title>\r
                                <para>This section reviews scripts associated with the update server, and requires some final adjustments to file permissions.</para>\r
                                <para>The Apache example configuration creates a directory <filename class="directory">updates</filename> that, by default, points to the directory \r
@@ -865,38 +835,39 @@ $ su - opensrf
                                <para>The following scripts should be marked as executable: <emphasis>check, download, manualupdate.html, update.rdf</emphasis>. As the \r
                                <systemitem class="username">root</systemitem> user, change directory to the updates directory, then execute the following commands:</para>\r
 <screen>\r
-<userinput>su - root</userinput>\r
 <userinput>cd /openils/var/updates/pub</userinput>\r
 <userinput>chmod +x  check  download  manualupdate.html  update.rdf</userinput>\r
 </screen>\r
                                \r
-                       </section>\r
-               </section>\r
-               <section>\r
+                       </simplesect>\r
+               </simplesect>\r
+               <simplesect>\r
                        <title>Other tips</title>\r
-                       <section>\r
+                       <simplesect>\r
                                <title>Multiple workstations on one install</title>\r
-                               <para>Multiple workstation registrations for the same server can be accomplished with a single Staff Client install by using multiple profiles. When running <emphasis>XULRunner</emphasis> you can specify the option <option>-profilemanager</option> or <option>-P</option> (uppercase "P") to force the Profile Manager to start. Unchecking the option <option>Don't ask at startup</option> will make this the default.</para>\r
-                               <para>Once you have opened the Profile Manager you can create additional profiles, one for each workstation you wish to register. You may need to install SSL exceptions for each profile.</para>\r
-                               <para>When building targets <literal>win-client</literal>, <literal>win-updates-client</literal>, or <literal>updates-client</literal>, you can specify <literal>NSIS_EXTRAOPTS=-DPROFILES</literal> to add an "Evergreen Staff Client Profile Manager" option to the start menu.</para>\r
+                               <para>Multiple workstation registrations for the same server can be accomplished with a single Staff Client install by using multiple profiles. When \r
+                               running <emphasis>XULRunner</emphasis> you can specify the option <option>-profilemanager</option> or <option>-P</option> (uppercase "P") to force the Profile Manager \r
+                               to start. Unchecking the option <option>Don't ask at startup</option> will make this the default.</para>\r
+                               <para>Once you have opened the Profile Manager you can create additional profiles, one for each workstation you wish to register. You may need to install SSL exceptions \r
+                               for each profile.</para>\r
+                               <para>When building targets <literal>win-client</literal>, <literal>win-updates-client</literal>, or <literal>updates-client</literal>, you can \r
+                               specify <literal>NSIS_EXTRAOPTS=-DPROFILES</literal> to add an "Evergreen Staff Client Profile Manager" option to the start menu.</para>\r
                                <para>As the <systemitem class="username">opensrf</systemitem> user, change directory to the Staff Client source directory, then execute the following commands:</para>\r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.7/Open-ILS/xul/staff_client</userinput>\r
 <userinput>make NSIS_EXTRAOPTS=-DPROFILES win-client</userinput>\r
-...\r
 </screen>\r
                                \r
-                       </section>\r
-                       <section>\r
+                       </simplesect>\r
+                       <simplesect>\r
                                <title> Multiple Staff Clients</title>\r
                                <para>This may be confusing if you are not careful, but you can log in to multiple Evergreen servers at the same time, or a single Evergreen server multiple \r
                                times. In either case you will need to create an additional profile for each additional server or workstation you want to log in as (see previous tip).</para>\r
                                <para>Once you have created the profiles, run <emphasis>XULRunner</emphasis> with the option <option>-no-remote</option> (in addition to \r
                                <option>-profilemanger</option> or <option>-P</option> if needed). Instead of <emphasis>XULRunner</emphasis> opening a new login window on your existing \r
                                session it will start a new session instead, which can then be logged in to a different server or workstation ID.</para>\r
-                       </section>\r
-               </section>\r
+                       </simplesect>\r
+               </simplesect>\r
        </section>\r
        <section xml:id="serversideinstallation-running-staffclient">\r
                <title>Running the Staff Client</title>\r
@@ -904,10 +875,7 @@ $ su - opensrf
                default with Firefox version 3.0 and later on <systemitem class="osname">Ubuntu</systemitem> and <systemitem class="osname">Debian</systemitem> distributions).</para>\r
                <para>For example, if the source files for the Evergreen installation are in the directory <filename class="directory">/home/opensrf/Evergreen-ILS-1.6.0.7/</filename>, \r
                start the Staff Client as shown in the following command example:</para>\r
-<screen>\r
-<userinput>su - opensrf</userinput>\r
-<userinput>xulrunner /home/opensrf/Evergreen-ILS-1.6.0.7/Open-ILS/xul/staff_client/build/application.ini</userinput>\r
-</screen>\r
+               <screen><userinput>xulrunner /home/opensrf/Evergreen-ILS-1.6.0.7/Open-ILS/xul/staff_client/build/application.ini</userinput></screen>\r
        </section>\r
        <section xml:id="serversideinstallation-proxy">\r
                <title>Configuring a Proxy for the Staff Client</title>\r
@@ -915,7 +883,7 @@ $ su - opensrf
                servers. In addition to providing excellent data security, this method also buffers and caches data traveling to and from the Staff Client and can speed up access to resources \r
                on remote Evergreen servers. This is important if your system architecture includes many Staff Clients and Evergreen servers in a busy environment, through network firewalls, \r
                or must operate over insecure networks.</para>\r
-               <section>\r
+               <simplesect>\r
                        <title>Why Use a Proxy for the Staff Client?</title>\r
                        <para>There are several reasons for sending network traffic for the Staff Client through an SSH proxy:</para>\r
                        <itemizedlist>\r
@@ -925,8 +893,8 @@ $ su - opensrf
                                This is especially true when wireless is otherwise the best option for connecting a staff machine to the network.</listitem>\r
                                <listitem>You may wish to buffer and cache data from remote Evergreen servers to speed up access from Staff Clients.</listitem>\r
                        </itemizedlist>\r
-               </section>\r
-               <section>\r
+               </simplesect>\r
+               <simplesect>\r
                        <title>Setting Up an SSH Tunnel</title>\r
                        <para>You will need a server that has network access to the Evergreen server you want to reach, and allows you to log in there via SSH. Use your username and \r
                        password for that SSH server to set up a tunnel.</para>\r
@@ -947,8 +915,8 @@ $ su - opensrf
                                <step>Use the menu on the left to go back to "Session", and enter the host name of the SSH server.</step>\r
                                <step>A window will open up so that you can enter your username and password. Once you are logged in, the tunnel is open.</step>\r
                        </procedure>\r
-               </section>\r
-               <section>\r
+               </simplesect>\r
+               <simplesect>\r
                        <title>Configuring the Staff Client to Use the SSH Tunnel</title>\r
                        <para>In order to tell the Staff Client that all traffic should be sent through the SSH tunnel just configured, you must edit the file \r
                        <filename>C:\Program Files\Evergreen Staff Client\greprefs\all.js</filename>. Search this file for the word <emphasis role="bold">socks</emphasis> to \r
@@ -972,6 +940,6 @@ $ su - opensrf
                                </mediaobject>\r
                        <para>If everything is working correctly, you should now be able to run the Staff Client and all its data will be sent encrypted through the SSH \r
                        tunnel you have just configured.</para>\r
-               </section>\r
+               </simplesect>\r
        </section>\r
 </chapter>\r