summaryrefslogtreecommitdiffstats
path: root/doc/installation/prerequisites.txt
diff options
context:
space:
mode:
authorFabian Affolter <fabian@bernewireless.net>2010-12-13 23:26:31 +0100
committerFabian Affolter <fabian@bernewireless.net>2010-12-13 23:26:31 +0100
commit875aefd9beb9e7fd464348c0e0fa42896dc329ff (patch)
tree6c9920648f7c56a9a5854c1dafa474d8e8139508 /doc/installation/prerequisites.txt
parentf5792d907e357c90624ec110d908d42b94296a12 (diff)
parent71bb583ac04ff1c52e03d69a91bbb508783566f8 (diff)
downloadbcfg2-875aefd9beb9e7fd464348c0e0fa42896dc329ff.tar.gz
bcfg2-875aefd9beb9e7fd464348c0e0fa42896dc329ff.tar.bz2
bcfg2-875aefd9beb9e7fd464348c0e0fa42896dc329ff.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'doc/installation/prerequisites.txt')
-rw-r--r--doc/installation/prerequisites.txt55
1 files changed, 33 insertions, 22 deletions
diff --git a/doc/installation/prerequisites.txt b/doc/installation/prerequisites.txt
index e4ea715b0..758ee4a21 100644
--- a/doc/installation/prerequisites.txt
+++ b/doc/installation/prerequisites.txt
@@ -14,16 +14,22 @@ what software is needed on the client and server side.
Bcfg2 Client
------------
-===================================== =================== ==============================
-Software Version Requires
-===================================== =================== ==============================
-libxml2 (if lxml is used) Any
-libxslt (if lxml is used) Any libxml2
-python 2.3-2.4, 2.5 [#f1]_
-lxml or elementtree [#f2]_ Any lxml: libxml2, libxslt, python
-python-apt [#f3]_ Any python
-debsums (if APT tool driver is used) Any
-===================================== =================== ==============================
++----------------------------+---------------+--------------------------------+
+| Software | Version | Requires |
++============================+===============+================================+
+| libxml2 (if lxml is used) | Any | |
++----------------------------+---------------+--------------------------------+
+| libxslt (if lxml is used) | Any | libxml2 |
++----------------------------+---------------+--------------------------------+
+| python | >= 2.3 [#f1]_ | |
++----------------------------+---------------+--------------------------------+
+| lxml or elementtree [#f2]_ | Any | lxml: libxml2, libxslt, python |
++----------------------------+---------------+--------------------------------+
+| python-apt [#f3]_ | Any | python |
++----------------------------+---------------+--------------------------------+
+| debsums (if APT tool | Any | |
+| driver is used) | | |
++----------------------------+---------------+--------------------------------+
.. [#f1] python 2.5 works with elementtree.
@@ -33,15 +39,20 @@ debsums (if APT tool driver is used) Any
Bcfg2 Server
------------
-===================================== ============= ==============================
-Software Version Requires
-===================================== ============= ==============================
-libxml2 2.6.24+
-libxslt Any libxml2
-python 2.2-2.5
-lxml 0.9+ lxml: libxml2, libxslt, python
-gamin or fam Any
-python-gamin or python-fam Any gamin or fam, python
-M2crypto Any python, openssl
-===================================== ============= ==============================
-
++----------------------------+----------+--------------------------------+
+| Software | Version | Requires |
++============================+==========+================================+
+| libxml2 | 2.6.24+ | |
++----------------------------+----------+--------------------------------+
+| libxslt | Any | libxml2 |
++----------------------------+----------+--------------------------------+
+| python | 2.2-2.5 | |
++----------------------------+----------+--------------------------------+
+| lxml | 0.9+ | lxml: libxml2, libxslt, python |
++----------------------------+----------+--------------------------------+
+| gamin or fam | Any | |
++----------------------------+----------+--------------------------------+
+| python-gamin or python-fam | Any | gamin or fam, python |
++----------------------------+----------+--------------------------------+
+| M2crypto | Any | python, openssl |
++----------------------------+----------+--------------------------------+