diff options
author | Jack Neely <jjneely@ncsu.edu> | 2011-06-10 13:29:23 -0400 |
---|---|---|
committer | Jack Neely <jjneely@ncsu.edu> | 2011-06-10 13:29:23 -0400 |
commit | 90c85147bacea14771abf8faa1fc5f185418d14b (patch) | |
tree | b10e06fc80ed714f5376b169e32b8953479211f1 /doc/installation/prerequisites.txt | |
parent | 4f3da4543ec4e8c3c4776ae2ee3611e47ce78525 (diff) | |
parent | ce6a228d33ace4136dc2b5388c64795dfbd26ffb (diff) | |
download | bcfg2-90c85147bacea14771abf8faa1fc5f185418d14b.tar.gz bcfg2-90c85147bacea14771abf8faa1fc5f185418d14b.tar.bz2 bcfg2-90c85147bacea14771abf8faa1fc5f185418d14b.zip |
Merge branch 'master' of github.com:solj/bcfg2
Diffstat (limited to 'doc/installation/prerequisites.txt')
-rw-r--r-- | doc/installation/prerequisites.txt | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/doc/installation/prerequisites.txt b/doc/installation/prerequisites.txt index c86e86774..0cb721bb9 100644 --- a/doc/installation/prerequisites.txt +++ b/doc/installation/prerequisites.txt @@ -1,6 +1,6 @@ .. -*- mode: rst -*- -.. _prerequisites: +.. _installation-prerequisites: Prerequisites ============= @@ -21,7 +21,7 @@ Bcfg2 Client +----------------------------+------------------------+--------------------------------+ | libxslt (if lxml is used) | Any | libxml2 | +----------------------------+------------------------+--------------------------------+ -| python | 2.3-2.4, 2.5-2.7 [#f1] | | +| python | 2.4 and greater [#f1] | | +----------------------------+------------------------+--------------------------------+ | lxml or elementtree [#f2]_ | Any | lxml: libxml2, libxslt, python | +----------------------------+------------------------+--------------------------------+ @@ -39,20 +39,23 @@ Bcfg2 Client Bcfg2 Server ------------ -+----------------------------+----------+--------------------------------+ -| Software | Version | Requires | -+============================+==========+================================+ -| libxml2 | 2.6.24+ | | -+----------------------------+----------+--------------------------------+ -| libxslt | Any | libxml2 | -+----------------------------+----------+--------------------------------+ -| python | 2.2-2.7 | | -+----------------------------+----------+--------------------------------+ -| 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.7 | | ++-------------------------------+----------+--------------------------------+ +| lxml | 0.9+ | lxml: libxml2, libxslt, python | ++-------------------------------+----------+--------------------------------+ +| gamin or fam | Any | | ++-------------------------------+----------+--------------------------------+ +| python-gamin or python-fam | Any | gamin or fam, python | ++-------------------------------+----------+--------------------------------+ +| M2crypto or python-ssl (note | Any | python, openssl | +| that the ssl module is | | | +| included in python versions | | | +| 2.6 and later | | | ++-------------------------------+----------+--------------------------------+ |