Automatic pull of documentation from Wiki.

svn path=/trunk/; revision=6331

3 files changed, 12 insertions, 2 deletions

diff --git a/doc/doc.RPKI.Installation b/doc/doc.RPKI.Installation
index 67746d55..dc671dd1 100644
--- a/doc/doc.RPKI.Installation
+++ b/doc/doc.RPKI.Installation
@@ -7,7 +7,17 @@ platform on which you're trying to install.
   Debian 7 ("Wheezy"), you can use Debian binary packages.
 
      At present we only generate binary packages for Precise Pangolin and
-     Wheezy. This may change in the future.
+     Wheezy. This may change in the future. They work on Trusty Tahir as
+     well.
+
+* if you want to install a simple RPKI cache to feed routers from a Ubuntu
+  14.04 system, here is a one page ten minute recipe.
+
+* If you want to install a CA and a cache on a Ubuntu 14.04 with a rootd CA,
+  here is a one page hack. It will take less than an hour.
+
+* If you are feeling dangerous and want to try the rrdp testbed CA and RP, here
+  is a one page hack. It does not support rootd.
 
 * On FreeBSD, you can use FreeBSD ports.
 
diff --git a/doc/doc.RPKI.RP.rcynic b/doc/doc.RPKI.RP.rcynic
index 4bd95ae1..f3ba5e4c 100644
--- a/doc/doc.RPKI.RP.rcynic
+++ b/doc/doc.RPKI.RP.rcynic
@@ -447,7 +447,7 @@ except when building complex topologies where rcynic running on one set of
 machines acts as aggregators for another set of validators. A large ISP might
 want to build such a topology so that they could have a local validation cache
 in each POP while minimizing load on the global repository system and
-maintaining some degree of internal consistancy between POPs. In such cases,
+maintaining some degree of internal consistency between POPs. In such cases,
 one might want the rcynic instances in the POPs to validate data fetched from
 the aggregators via an external process, without the POP rcynic instances
 attempting to fetch anything themselves.
diff --git a/doc/manual.pdf b/doc/manual.pdf
index bd98c08b..627d79f0 100644
--- a/doc/manual.pdf
+++ b/doc/manual.pdf