diff options
author | Narayan Desai <desai@mcs.anl.gov> | 2011-05-10 11:24:28 -0500 |
---|---|---|
committer | Narayan Desai <desai@mcs.anl.gov> | 2011-05-10 11:24:28 -0500 |
commit | 0e75875e9bd9900a6a3c7ab118c448e48829eaef (patch) | |
tree | 391204747f48598c4e978d3724afbd5b8aa1d12c /doc/installation/prerequisites.txt | |
parent | f2d218ccd2de93ef639347933ba127ef081b4401 (diff) | |
parent | 91634f9a3b888eee3cd5f9a777fcb075fc666c9a (diff) | |
download | bcfg2-0e75875e9bd9900a6a3c7ab118c448e48829eaef.tar.gz bcfg2-0e75875e9bd9900a6a3c7ab118c448e48829eaef.tar.bz2 bcfg2-0e75875e9bd9900a6a3c7ab118c448e48829eaef.zip |
Merge branch 'master' of git.mcs.anl.gov: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 | | | ++-------------------------------+----------+--------------------------------+ |