summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2011-05-05 11:25:42 -0500
committerSol Jerome <sol.jerome@gmail.com>2011-05-05 11:25:42 -0500
commit2da170f2e5ba51d0d3f1e4632e60440fe6dc7499 (patch)
treee06e1687f173a1c5f6ba43b64e1a99f4ed0b7127
parentb6c9928eced9b725d936260d003026f1ebfa455d (diff)
downloadbcfg2-2da170f2e5ba51d0d3f1e4632e60440fe6dc7499.tar.gz
bcfg2-2da170f2e5ba51d0d3f1e4632e60440fe6dc7499.tar.bz2
bcfg2-2da170f2e5ba51d0d3f1e4632e60440fe6dc7499.zip
doc: Add mention of python-ssl alternative to m2crypto
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
-rw-r--r--doc/installation/prerequisites.txt37
1 files changed, 20 insertions, 17 deletions
diff --git a/doc/installation/prerequisites.txt b/doc/installation/prerequisites.txt
index be7ec6c85..0cb721bb9 100644
--- a/doc/installation/prerequisites.txt
+++ b/doc/installation/prerequisites.txt
@@ -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 | | |
++-------------------------------+----------+--------------------------------+