merge with /trunk

svn path=/branches/tk274/; revision=4866

4 files changed, 16 insertions, 60 deletions

diff --git a/doc/doc.RPKI.CA.UI b/doc/doc.RPKI.CA.UI
index 0643f9d0..ac180a39 100644
--- a/doc/doc.RPKI.CA.UI
+++ b/doc/doc.RPKI.CA.UI
@@ -85,20 +85,22 @@ the same:
      home underneath your parent in the publication tree.
   6. Each of your parents sends (...) back the response XML file generated by
      the "configure_child" command.
-  7. You feed the response message you just got into the IRBE using either
-     rpkic or the GUI rpkic using the. This registers the parent's information
-     in your database, handles BPKI cross-certification of your parent., and
+  7. You feed the response message you just got into the IRBE using rpkic's
+     "configure_parent" command. This registers the parent's information in
+     your database, handles BPKI cross-certification of your parent., and
      processes the repository offer or referral to generate a publication
      request message.
   8. You send (...) the publication request message to the repository. The
      contact_info element in the request message should (in theory) provide
      some clue as to where you should send this.
-  9. The repository operator processes your request. This registers your
-     information, including BPKI cross-certification, and generates a response
-     message containing the repository's BPKI trust anchor and service URL.
+  9. The repository operator processes your request using rpkic's
+     "configure_publication_client" command. This registers your information,
+     including BPKI cross-certification, and generates a response message
+     containing the repository's BPKI trust anchor and service URL.
  10. Repository operator sends (...) the publication confirmation message back
      to you.
- 11. You process the publication confirmation message.
+ 11. You process the publication confirmation message using rpkic's
+     "configure_repository" command.
 
 At this point you should, in theory, have established relationships, exchanged
 trust anchors, and obtained service URLs from all of your parents and
diff --git a/doc/doc.RPKI.CA.UI.GUI b/doc/doc.RPKI.CA.UI.GUI
index d52e0a6b..109890d6 100644
--- a/doc/doc.RPKI.CA.UI.GUI
+++ b/doc/doc.RPKI.CA.UI.GUI
@@ -42,6 +42,9 @@ Now bring your database up to date with the current release:
 
   $ rpki-manage migrate app
 
+From this point on you will just need to run the latter command every time you
+upgrade.
+
 ***** New Installation *****
 
 **** Create the initial tables ****
@@ -122,55 +125,6 @@ In addition, your rcynic script should also have
 
 after the rcynic run.
 
-****** GUI Installation to Work With rootd ******
-
-Some of the commands depend on whether your are upgrading your existing
-database, or starting a new installation from scratch.
-
-[All users] First step is you will need to install Django South. For FreeBSD
-this is /usr/ports/databases/py-south.
-
-The code is currently in the tk316 branch, so in order to play, you will need
-to check it out:
-
-  $ svn co https://subvert-rpki.hactrn.net/branches/tk316
-  $ cd tk316
-  $ ./configure
-  $ make
-  $ make install
-
-[Upgrading users] You will need to edit /usr/local/etc/rpki/settings.py and add
-'south' to the INSTALLED_APPS list. See /usr/local/etc/rpki/settings.py.new for
-an example (we don't automatically overwrite settings.py).
-
-[All users] Run syncdb:
-
-  $ django-admin syncdb --pythonpath=/usr/local/etc/rpki --settings=settings
-
-Verify that Django South is installed:
-
-  $ django-admin migrate --list --pythonpath=/usr/local/etc/rpki --
-  settings=settings
-
-[Upgrading Users] Since you already have an existing db, you need to fake doing
-the initial migration step:
-
-  $ django-admin migrate app 0001 --fake --pythonpath=/usr/local/etc/rpki --
-  settings=settings
-
-[All users] Perform the database migrations new to this release:
-
-  $ django-admin migrate app --pythonpath=/usr/local/etc/rpki --
-  settings=settings
-
-[All users] Restart apache so that the web portal picks up the newly installed
-code:
-
-  $ apachectl restart
-
-Now head back to the gui. Click on the 'refresh' link when viewing the altCA
-dashboard, and it should now pick up the resources from the root cert.
-
 ****** Using the GUI ******
 
 ****** GUI Examples ******
diff --git a/doc/doc.RPKI.Installation b/doc/doc.RPKI.Installation
index 3fd3f8cf..20f42c2c 100644
--- a/doc/doc.RPKI.Installation
+++ b/doc/doc.RPKI.Installation
@@ -119,12 +119,12 @@ Packages you will need:
 
   o FreeBSD: /usr/ports/www/mod_wsgi3
 
-* http://south.aeracode.org/ Django South. This tool is used to ease the pain
-  of changes to the web portal database schema.
+* http://south.aeracode.org/ Django South 0.7.6 or later. This tool is used to
+  ease the pain of changes to the web portal database schema.
 
   o FreeBSD: /usr/ports/databases/py-south
-  o Ubuntu: python-django-south
-  o CentOS/RHEL: Django-south
+  o Ubuntu: do not use the python-django-south 0.7.3 package in 12.04 LTS as it
+    is known not to work
 
 ***** Configure and build *****
 
diff --git a/doc/manual.pdf b/doc/manual.pdf
index a01fdcaf..89bbebd5 100644
--- a/doc/manual.pdf
+++ b/doc/manual.pdf