Automatic pull of documentation from Wiki.

svn path=/trunk/; revision=5789

4 files changed, 8 insertions, 8 deletions

diff --git a/doc/doc.RPKI.CA.Configuration.CreatingRoot b/doc/doc.RPKI.CA.Configuration.CreatingRoot
index b9004a4c..503725c8 100644
--- a/doc/doc.RPKI.CA.Configuration.CreatingRoot
+++ b/doc/doc.RPKI.CA.Configuration.CreatingRoot
@@ -81,9 +81,9 @@ suitable for this:
   rpki-root-key           = ${myrpki::bpki_servers_directory}/root.key
 
 To create a TAL format trust anchor locator use the make-tal.sh script from
-$top/rcynic:
+$top/rp/rcynic:
 
-  $top/rcynic/make-tal.sh  rsync://example.org/rpki/root/root.cer  root.cer
+  $top/rp/rcynic/make-tal.sh  rsync://example.org/rpki/root/root.cer  root.cer
 
 Note that, like any certificate, the root.cer you just generated will expire
 eventually. Either you need to remember to regenerate it before that happens,
diff --git a/doc/doc.RPKI.CA.MySQLSetup b/doc/doc.RPKI.CA.MySQLSetup
index a40a776c..344d9693 100644
--- a/doc/doc.RPKI.CA.MySQLSetup
+++ b/doc/doc.RPKI.CA.MySQLSetup
@@ -37,7 +37,7 @@ tool, as follows:
   mysql> GRANT all ON rpki_database.* TO rpki_user@localhost IDENTIFIED BY
   'rpki_password';
   mysql> USE rpki_database;
-  mysql> SOURCE $top/rpkid/rpkid.sql;
+  mysql> SOURCE $top/schemas/sql/rpkid.sql;
   mysql> COMMIT;
   mysql> quit
 
@@ -51,7 +51,7 @@ If you are running pubd and are doing manual SQL setup, you'll also have to do:
   mysql> GRANT all ON pubd_database.* TO pubd_user@localhost IDENTIFIED BY
   'pubd_password';
   mysql> USE pubd_database;
-  mysql> SOURCE $top/rpkid/pubd.sql;
+  mysql> SOURCE $top/schemas/sql/pubd.sql;
   mysql> COMMIT;
   mysql> quit
 
diff --git a/doc/doc.RPKI.Installation.FromSource b/doc/doc.RPKI.Installation.FromSource
index 1adea8d4..b6acdc02 100644
--- a/doc/doc.RPKI.Installation.FromSource
+++ b/doc/doc.RPKI.Installation.FromSource
@@ -194,10 +194,10 @@ run some basic regression tests.
 
 Some of the tests for the CA tools require MySQL databases to store their data.
 To set up all the databases that the tests will need, run the SQL commands in
-rpkid/tests/smoketest.setup.sql. The MySQL command line client is usually the
+ca/tests/smoketest.setup.sql. The MySQL command line client is usually the
 easiest way to do this, eg:
 
-  $ cd $top/rpkid
+  $ cd $top/ca
   $ mysql -u root -p <tests/smoketest.setup.sql
 
 To run the tests, run "make test":
@@ -206,9 +206,9 @@ To run the tests, run "make test":
   $ make test
 
 To run a more extensive set of tests on the CA tool, run "make all-tests" in
-the rpkid/ directory:
+the ca/ directory:
 
-  $ cd $top/rpkid
+  $ cd $top/ca
   $ make all-tests
 
 If nothing explodes, your installation is probably ok. Any Python backtraces in
diff --git a/doc/manual.pdf b/doc/manual.pdf
index 9168f15d..c719e430 100644
--- a/doc/manual.pdf
+++ b/doc/manual.pdf