summaryrefslogtreecommitdiffstats
path: root/doc/installation
diff options
context:
space:
mode:
Diffstat (limited to 'doc/installation')
-rw-r--r--doc/installation/distributions.txt10
-rw-r--r--doc/installation/prerequisites.txt5
2 files changed, 7 insertions, 8 deletions
diff --git a/doc/installation/distributions.txt b/doc/installation/distributions.txt
index 5dad4d860..6abf438f0 100644
--- a/doc/installation/distributions.txt
+++ b/doc/installation/distributions.txt
@@ -22,16 +22,14 @@ Just use `apk` to perform the installation ::
.. _Alpine Linux: http://www.alpinelinux.org/
.. _testing: http://git.alpinelinux.org/cgit/aports/tree/testing/bcfg2
-ArchLinux
-=========
+Arch Linux
+==========
Packages for `Arch Linux`_ are available in the Arch User Repository (AUR_).
-Just use `pacman` to perform the installation ::
-
- pacman -S bcfg2 bcfg2-server
+The bcfg2 package includes bcfg2-server.
.. _Arch Linux: http://www.archlinux.org/
-.. _AUR: http://aur.archlinux.org/packages.php?ID=20979
+.. _AUR: http://aur.archlinux.org/packages/bcfg2
Debian
======
diff --git a/doc/installation/prerequisites.txt b/doc/installation/prerequisites.txt
index d89d44894..e6de2a9f6 100644
--- a/doc/installation/prerequisites.txt
+++ b/doc/installation/prerequisites.txt
@@ -56,7 +56,8 @@ Bcfg2 Server
+-------------------------------+----------+--------------------------------+
| python-gamin or pyinotify | Any | gamin or inotify, python |
+-------------------------------+----------+--------------------------------+
-| python-ssl (note | Any | python, backported ssl module |
+| python-ssl (this is included | Any | |
+| in Python2.6 and later) | | |
+-------------------------------+----------+--------------------------------+
| python-setuptools | Any | |
+-------------------------------+----------+--------------------------------+
@@ -72,7 +73,7 @@ reporting, such as Apache + mod_wsgi or nginx.
+-------------------------------+----------+--------------------------------+
| Software | Version | Requires |
+===============================+==========+================================+
-| django | 1.2.0+ | |
+| django | 1.3.0+ | |
+-------------------------------+----------+--------------------------------+
| south | 0.7.5+ | |
+-------------------------------+----------+--------------------------------+