From: Yamil Suarez <yamil@yamil.com>
Date: Mon, 11 Jul 2011 04:24:24 +0000 (-0400)
Subject: Merge branch 'master' of github.com:ysuarez/Evergreen-DocBook
X-Git-Url: http://git.equinoxoli.org/?p=Evergreen-DocBook.git;a=commitdiff_plain;h=a9eb24a12426a458daf53e2f0ff892caaf75d3bc

Merge branch 'master' of github.com:ysuarez/Evergreen-DocBook
---

a9eb24a12426a458daf53e2f0ff892caaf75d3bc
diff --cc 2.0/admin/serversideinstallation_2.0.xml
index 15a72cb,00c4d94..7667bcb
--- a/2.0/admin/serversideinstallation_2.0.xml
+++ b/2.0/admin/serversideinstallation_2.0.xml
@@@ -917,74 -917,9 +917,74 @@@
  					<screen>
  						<userinput>
  	# as the root user:
- 	cd /home/opensrf/Evergreen-ILS-2.0.4
+ 	cd /home/opensrf/Evergreen-ILS-2.0.7
  	make -f Open-ILS/src/extras/Makefile.install [DISTRIBUTION]</userinput>
  					</screen>
 +					
 +					<table xml:id="serversideinstallation-keywords-evergreen">
 +						<?dbfo keep-together="always" ?>
 +						<title>Keyword Targets for Evergreen <application>"make"</application> Command</title>
 +						<tgroup align="left" cols="2" colsep="1" rowsep="1">
 +							<colspec colname="keyword" colnum="1" colwidth="1.0*"/>
 +							<colspec colname="linux_version" colnum="2" colwidth="3.0*"/>
 +							<thead>
 +								<row>
 +									<entry>Keyword</entry>
 +									<entry>Linux Version</entry>
 +								</row>
 +							</thead>
 +							<tbody>
 +								<row>
 +									<entry>debian-squeeze</entry>
 +									<entry>Debian "Squeeze" (6.0)</entry>
 +								</row>
 +								<row>
 +									<entry>debian-lenny</entry>
 +									<entry>Debian "Lenny" (5.0)</entry>
 +								</row>
 +								<row>
 +									<entry>ubuntu-hardy</entry>
 +									<entry>Ubuntu "Hardy Heron" (8.04)</entry>
 +								</row>
 +								<row>
 +									<entry>ubuntu-lucid</entry>
 +									<entry>Ubuntu "Lucid Lynx" (10.04)</entry>
 +								</row>
 +								<row>
 +									<entry>fedora13</entry>
 +									<entry>Fedora "Goddard" (13)</entry>
 +								</row>
 +								<row>
 +									<entry>centos</entry>
 +									<entry>CentOS 5</entry>
 +								</row>
 +								<row>
 +									<entry>rhel</entry>
 +									<entry>Red Hat Enterprise Linux 5</entry>
 +								</row>
 +							</tbody>
 +						</tgroup>
 +					</table>
 +					<indexterm>
 +						<primary>Linux</primary>
 +						<secondary>Debian</secondary>
 +					</indexterm>
 +					<indexterm>
 +						<primary>Linux</primary>
 +						<secondary>Fedora</secondary>
 +					</indexterm>
 +					<indexterm>
 +						<primary>Linux</primary>
 +						<secondary>Ubuntu</secondary>
 +					</indexterm>
 +					<indexterm>
 +						<primary>Linux</primary>
 +						<secondary>CentOS</secondary>
 +					</indexterm>
 +					<indexterm>
 +						<primary>Linux</primary>
 +						<secondary>Red Hat</secondary>
 +					</indexterm>					
  				</step>
  				<step performance="optional">
  					<title>(OPTIONAL) Install the PostgreSQL Server</title>