Automatic pull of documentation from Wiki.

svn path=/trunk/; revision=5102

3 files changed, 4 insertions, 3 deletions

diff --git a/doc/doc.RPKI.CA.UI.GUI b/doc/doc.RPKI.CA.UI.GUI
index 6c41c58d..d0521099 100644
--- a/doc/doc.RPKI.CA.UI.GUI
+++ b/doc/doc.RPKI.CA.UI.GUI
@@ -8,7 +8,7 @@ sets $PYTHONPATH and $DJANGO_SETTINGS_MODULE.
 
 ***** Prerequisites *****
 
-* Django 1.3.7 or later
+* Django 1.4 (Django 1.5 is not currently supported)
 
 * Django South 0.7.6 or later
 
diff --git a/doc/doc.RPKI.Installation b/doc/doc.RPKI.Installation
index b819b356..616284b7 100644
--- a/doc/doc.RPKI.Installation
+++ b/doc/doc.RPKI.Installation
@@ -99,14 +99,15 @@ Packages you will need:
   o Ubuntu: python-mysqldb
 
 * http://www.djangoproject.com/, the Django web user interface toolkit. The GUI
-  interface to the CA tools requires this. Django 1.3.7 or later is required.
+  interface to the CA tools requires this. Django 1.4 is required. Django 1.5
+  is currently not supported.
 
   o FreeBSD: /usr/ports/www/py-django (py27-django)
   o Ubuntu: Do not use the python-django package (Django 1.3.1) in 12.04 LTS,
     as it is known not to work.
     Instead, install a recent version using easy_install or pip:
 
-      $ sudo pip install django>=1.3.7
+      $ sudo pip install django==1.4.5
 
 * http://vobject.skyhouseconsulting.com/, a Python library for parsing VCards.
   The GUI uses this to parse the payload of RPKI Ghostbuster objects.
diff --git a/doc/manual.pdf b/doc/manual.pdf
index b5efac14..b858230e 100644
--- a/doc/manual.pdf
+++ b/doc/manual.pdf