Automatic pull of documentation from Wiki.

svn path=/trunk/; revision=5530

4 files changed, 7 insertions, 7 deletions

diff --git a/doc/doc.RPKI.CA.UI.GUI.Configuring.Apache b/doc/doc.RPKI.CA.UI.GUI.Configuring.Apache
index cc50be4e..70f0c355 100644
--- a/doc/doc.RPKI.CA.UI.GUI.Configuring.Apache
+++ b/doc/doc.RPKI.CA.UI.GUI.Configuring.Apache
@@ -16,7 +16,7 @@ VirtualHost it is configured in, otherwise it will fail to operate.
 * mod_ssl
 * mod_wsgi 3 or later
 
-***** Ubuntu *****
+***** Debian & Ubuntu *****
 
 First, you need to install apache and enable SSL. Run the following commands in
 a shell as root:
diff --git a/doc/doc.RPKI.RP.rcynic b/doc/doc.RPKI.RP.rcynic
index 186fe1c4..158777b7 100644
--- a/doc/doc.RPKI.RP.rcynic
+++ b/doc/doc.RPKI.RP.rcynic
@@ -23,9 +23,9 @@ goes well, this should "just work".
 
 rcynic has the ability to do all of its work in a chroot jail. This used to be
 the default configuration, but integrating this properly with platform-specific
-packaging systems (FreeBSD ports, Ubuntu apt-get, etc) proved impractical. You
-can still get this behavior if you need it, by installing from source and using
-the --enable-rcynic-jail option to ./configure.
+packaging systems (FreeBSD ports, apt-get on Ubuntu or Debian, etc) proved
+impractical. You can still get this behavior if you need it, by installing from
+source and using the --enable-rcynic-jail option to ./configure.
 
 The default configuration set up by make install and the various packaging
 systems will run rcynic under cron using the rcynic-cron wrapper script. See
diff --git a/doc/doc.RPKI.RP.rpki-rtr b/doc/doc.RPKI.RP.rpki-rtr
index ee7bc55b..0c5db50d 100644
--- a/doc/doc.RPKI.RP.rpki-rtr
+++ b/doc/doc.RPKI.RP.rpki-rtr
@@ -12,9 +12,9 @@ To use rtr-origin, you need to do two things beyond just running rcynic:
      origin. The rcynic-cron script handles this automatically, so the default
      installation should already be taking care of this for you.
   2. You need to set up a listener for the rtr-origin server, using the
-     generated data files. The platform-specific packages for FreeBSD and
-     Ubuntu automatically set up a plain TCP listener, but you will have to do
-     something on other platforms, or if you're using a transport protocol
+     generated data files. The platform-specific packages for FreeBSD, Debian,
+     and Ubuntu automatically set up a plain TCP listener, but you will have to
+     do something on other platforms, or if you're using a transport protocol
      other than plain TCP.
 
 ***** Post-processing rcynic's output *****
diff --git a/doc/manual.pdf b/doc/manual.pdf
index b6f4fd68..b0c31b41 100644
--- a/doc/manual.pdf
+++ b/doc/manual.pdf