summaryrefslogtreecommitdiffstats
path: root/doc/installation
diff options
context:
space:
mode:
authorFabian Affolter <fabian@affolter-engineering.ch>2011-01-22 17:44:07 +0100
committerSol Jerome <sol.jerome@gmail.com>2011-01-22 13:07:15 -0600
commitec9812e5b4d0cdf356d289f2e6b29d97c88da699 (patch)
treef004b86d2301eb60b25dbdab4666ebfe418729e2 /doc/installation
parent21b9876d68b4585d4ee71d32900aac6844a172a6 (diff)
downloadbcfg2-ec9812e5b4d0cdf356d289f2e6b29d97c88da699.tar.gz
bcfg2-ec9812e5b4d0cdf356d289f2e6b29d97c88da699.tar.bz2
bcfg2-ec9812e5b4d0cdf356d289f2e6b29d97c88da699.zip
Updated
Diffstat (limited to 'doc/installation')
-rw-r--r--doc/installation/prerequisites.txt40
1 files changed, 20 insertions, 20 deletions
diff --git a/doc/installation/prerequisites.txt b/doc/installation/prerequisites.txt
index 758ee4a21..c86e86774 100644
--- a/doc/installation/prerequisites.txt
+++ b/doc/installation/prerequisites.txt
@@ -14,25 +14,25 @@ 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 [#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.
++----------------------------+------------------------+--------------------------------+
+| Software | Version | Requires |
++============================+========================+================================+
+| libxml2 (if lxml is used) | Any | |
++----------------------------+------------------------+--------------------------------+
+| libxslt (if lxml is used) | Any | libxml2 |
++----------------------------+------------------------+--------------------------------+
+| python | 2.3-2.4, 2.5-2.7 [#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 and later works with elementtree.
.. [#f2] elementtree is included in python 2.5 and later.
.. [#f3] python-apt is only required on platforms that use apt, such as Debian and Ubuntu.
@@ -46,7 +46,7 @@ Bcfg2 Server
+----------------------------+----------+--------------------------------+
| libxslt | Any | libxml2 |
+----------------------------+----------+--------------------------------+
-| python | 2.2-2.5 | |
+| python | 2.2-2.7 | |
+----------------------------+----------+--------------------------------+
| lxml | 0.9+ | lxml: libxml2, libxslt, python |
+----------------------------+----------+--------------------------------+