38 files changed, 16 insertions, 19 deletions
diff --git a/tests/resource-set/Makefile b/openssl/tests/Makefile
index f7b803eb..f7b803eb 100644
--- a/tests/resource-set/Makefile
+++ b/openssl/tests/Makefile
diff --git a/tests/resource-set/resource-set-test.c b/openssl/tests/resource-set-test.c
index a14d7a72..a14d7a72 100644
--- a/tests/resource-set/resource-set-test.c
+++ b/openssl/tests/resource-set-test.c
diff --git a/tests/resource-set/test.conf b/openssl/tests/test.conf
index 161eb5be..161eb5be 100644
--- a/tests/resource-set/test.conf
+++ b/openssl/tests/test.conf
diff --git a/docs/Makefile b/presentations/Makefile
index a568b5e4..a568b5e4 100644
--- a/docs/Makefile
+++ b/presentations/Makefile
diff --git a/docs/README b/presentations/README
index 26bc0688..26bc0688 100644
--- a/docs/README
+++ b/presentations/README
diff --git a/docs/bpki-asymmetric.dot b/presentations/bpki-asymmetric.dot
index 739cd6ee..739cd6ee 100644
--- a/docs/bpki-asymmetric.dot
+++ b/presentations/bpki-asymmetric.dot
diff --git a/docs/bpki-asymmetric.pdf b/presentations/bpki-asymmetric.pdf
index fbd0362d..fbd0362d 100644
--- a/docs/bpki-asymmetric.pdf
+++ b/presentations/bpki-asymmetric.pdf
diff --git a/docs/bpki-symmetric.dot b/presentations/bpki-symmetric.dot
index 48e89483..48e89483 100644
--- a/docs/bpki-symmetric.dot
+++ b/presentations/bpki-symmetric.dot
diff --git a/docs/bpki-symmetric.pdf b/presentations/bpki-symmetric.pdf
index 9db46451..9db46451 100644
--- a/docs/bpki-symmetric.pdf
+++ b/presentations/bpki-symmetric.pdf
diff --git a/docs/bpki.pdf b/presentations/bpki.pdf
index 979c1380..979c1380 100644
--- a/docs/bpki.pdf
+++ b/presentations/bpki.pdf
diff --git a/docs/bpki.tex b/presentations/bpki.tex
index c07c6534..c07c6534 100644
--- a/docs/bpki.tex
+++ b/presentations/bpki.tex
diff --git a/docs/entity-decompose.pdf b/presentations/entity-decompose.pdf
index afde3c27..afde3c27 100644
--- a/docs/entity-decompose.pdf
+++ b/presentations/entity-decompose.pdf
diff --git a/docs/images/prague-whiteboard-2007-03-21-02-29-14.jpg b/presentations/images/prague-whiteboard-2007-03-21-02-29-14.jpg
index 79c0a807..79c0a807 100644
--- a/docs/images/prague-whiteboard-2007-03-21-02-29-14.jpg
+++ b/presentations/images/prague-whiteboard-2007-03-21-02-29-14.jpg
diff --git a/docs/images/prague-whiteboard-2007-03-22-21-50-26.jpg b/presentations/images/prague-whiteboard-2007-03-22-21-50-26.jpg
index 4c3c828d..4c3c828d 100644
--- a/docs/images/prague-whiteboard-2007-03-22-21-50-26.jpg
+++ b/presentations/images/prague-whiteboard-2007-03-22-21-50-26.jpg
diff --git a/docs/images/prague-whiteboard-2007-03-22-23-15-01.jpg b/presentations/images/prague-whiteboard-2007-03-22-23-15-01.jpg
index 7b973ab0..7b973ab0 100644
--- a/docs/images/prague-whiteboard-2007-03-22-23-15-01.jpg
+++ b/presentations/images/prague-whiteboard-2007-03-22-23-15-01.jpg
diff --git a/docs/images/repository-structure.dot b/presentations/images/repository-structure.dot
index 7154202d..7154202d 100644
--- a/docs/images/repository-structure.dot
+++ b/presentations/images/repository-structure.dot
diff --git a/docs/images/repository-structure.pdf b/presentations/images/repository-structure.pdf
index 0fcc7615..0fcc7615 100644
--- a/docs/images/repository-structure.pdf
+++ b/presentations/images/repository-structure.pdf
diff --git a/docs/images/whiteboard-object-model.dot b/presentations/images/whiteboard-object-model.dot
index 3c61f3ab..3c61f3ab 100644
--- a/docs/images/whiteboard-object-model.dot
+++ b/presentations/images/whiteboard-object-model.dot
diff --git a/docs/images/whiteboard-object-model.pdf b/presentations/images/whiteboard-object-model.pdf
index 9b7da850..9b7da850 100644
--- a/docs/images/whiteboard-object-model.pdf
+++ b/presentations/images/whiteboard-object-model.pdf
diff --git a/docs/presentations/070523.lacnic-pki.pdf b/presentations/presentations/070523.lacnic-pki.pdf
index 5ab83fa3..5ab83fa3 100644
--- a/docs/presentations/070523.lacnic-pki.pdf
+++ b/presentations/presentations/070523.lacnic-pki.pdf
diff --git a/docs/repository-engine-objects.dot b/presentations/repository-engine-objects.dot
index 24abc8dd..24abc8dd 100644
--- a/docs/repository-engine-objects.dot
+++ b/presentations/repository-engine-objects.dot
diff --git a/docs/repository-engine-objects.pdf b/presentations/repository-engine-objects.pdf
index 68c6d2d6..68c6d2d6 100644
--- a/docs/repository-engine-objects.pdf
+++ b/presentations/repository-engine-objects.pdf
diff --git a/docs/repository-structure.txt b/presentations/repository-structure.txt
index 327663b7..327663b7 100644
--- a/docs/repository-structure.txt
+++ b/presentations/repository-structure.txt
diff --git a/docs/sample-irdb-data.sql b/presentations/sample-irdb-data.sql
index df24b48f..df24b48f 100644
--- a/docs/sample-irdb-data.sql
+++ b/presentations/sample-irdb-data.sql
diff --git a/docs/signed-manifests b/presentations/signed-manifests
index d1bd3f5e..d1bd3f5e 100644
--- a/docs/signed-manifests
+++ b/presentations/signed-manifests
diff --git a/docs/up-down-protocol b/presentations/up-down-protocol
index 4e4aa86c..4e4aa86c 100644
--- a/docs/up-down-protocol
+++ b/presentations/up-down-protocol
diff --git a/rpkid/rpki/Doxyfile b/rpkid/Doxyfile
index 53ac97da..8907523a 100644
--- a/rpkid/rpki/Doxyfile
+++ b/rpkid/Doxyfile
@@ -40,7 +40,7 @@ PROJECT_NUMBER         = 1.0
 # If a relative path is entered, it will be relative to the location 
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = 
+OUTPUT_DIRECTORY       = doc
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
 # 4096 sub-directories (in 2 levels) under the output directory of each output 
@@ -474,7 +474,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = .
+INPUT                  = rpki rpkid.py pubd.py
 
 # This tag can be used to specify the character encoding of the source files that 
 # doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default 
@@ -529,7 +529,7 @@ EXCLUDE_SYMBOLS        =
 # directories that contain example code fragments that are included (see 
 # the \include command).
 
-EXAMPLE_PATH           = ..
+EXAMPLE_PATH           = .
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the 
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
diff --git a/rpkid/Makefile b/rpkid/Makefile
index f9e2dd17..ba94e12f 100644
--- a/rpkid/Makefile
+++ b/rpkid/Makefile
@@ -79,21 +79,21 @@ irbe-cli.usage: irbe-cli.py
 	python irbe-cli.py --help | sed 's/^/      /' >$@
 
 dox doxygen: irbe-cli.usage
-	cd rpki && TZ='' doxygen
-	cd rpki/latex && TZ='' make >/dev/null 2>&1
+	TZ='' doxygen
+	cd doc/latex && TZ='' make >/dev/null 2>&1
 
-doc:: dox INSTALLATION OPERATION ../docs/left-right-protocol ../docs/publication-protocol
+doc:: dox doc/INSTALLATION doc/OPERATION doc/left-right-protocol doc/publication-protocol
 
-INSTALLATION: rpki/html/Installation.html
+doc/INSTALLATION: doc/html/Installation.html
 	${HTML2TEXT}
 
-OPERATION: rpki/html/Operation.html
+doc/OPERATION: doc/html/Operation.html
 	${HTML2TEXT}
 
-../docs/left-right-protocol: rpki/html/Left-right.html
+doc/left-right-protocol: doc/html/Left-right.html
 	${HTML2TEXT}
 
-../docs/publication-protocol: rpki/html/Publication.html
+doc/publication-protocol: doc/html/Publication.html
 	${HTML2TEXT}
 
 tags:
diff --git a/rpkid/cronjob.sh b/rpkid/cronjob.sh
index 97438a86..6e2e8a70 100755
--- a/rpkid/cronjob.sh
+++ b/rpkid/cronjob.sh
@@ -16,8 +16,6 @@
 # PERFORMANCE OF THIS SOFTWARE.
 
 # Generate Doxygen manual for RPKI code.
-#
-# At the moment this is just for the Python libraries.
 
 lock=cronjob.lock
 
@@ -30,11 +28,10 @@ case "$1" in
 locked)
     exec >cronjob.log 2>&1
     set -x
-    cd rpki || exit
     /usr/local/bin/svn update --quiet
-    /bin/rm -rf html
+    /bin/rm -rf doc/html
     PATH=/bin:/usr/bin:/usr/local/bin /usr/local/bin/doxygen </dev/null
-    /usr/local/bin/rsync --archive --itemize-changes --delete-after html/ $target/
+    /usr/local/bin/rsync --archive --itemize-changes --delete-after doc/html/ $target/
     ;;
 
 *)
diff --git a/rpkid/INSTALLATION b/rpkid/doc/INSTALLATION
index 4e2717c4..aec99f3f 100644
--- a/rpkid/INSTALLATION
+++ b/rpkid/doc/INSTALLATION
@@ -68,5 +68,5 @@ Installation
      __________________________________________________________________
 
 
-    Generated on Thu Jun 12 02:43:52 2008 for RPKI Engine by  doxygen
+    Generated on Thu Jun 12 17:41:24 2008 for RPKI Engine by  doxygen
     1.5.5
diff --git a/rpkid/OPERATION b/rpkid/doc/OPERATION
index 7304512a..19471050 100644
--- a/rpkid/OPERATION
+++ b/rpkid/doc/OPERATION
@@ -688,5 +688,5 @@ testpoke.py
      __________________________________________________________________
 
 
-    Generated on Thu Jun 12 02:43:52 2008 for RPKI Engine by  doxygen
+    Generated on Thu Jun 12 17:41:24 2008 for RPKI Engine by  doxygen
     1.5.5
diff --git a/docs/left-right-protocol b/rpkid/doc/left-right-protocol
index 1ec9d1f6..ba2d447f 100644
--- a/docs/left-right-protocol
+++ b/rpkid/doc/left-right-protocol
@@ -473,5 +473,5 @@ Error handling
      __________________________________________________________________
 
 
-    Generated on Thu Jun 12 02:43:52 2008 for RPKI Engine by  doxygen
+    Generated on Thu Jun 12 17:41:25 2008 for RPKI Engine by  doxygen
     1.5.5
diff --git a/docs/publication-protocol b/rpkid/doc/publication-protocol
index 29834874..c6bf4c13 100644
--- a/docs/publication-protocol
+++ b/rpkid/doc/publication-protocol
@@ -223,5 +223,5 @@ Additional access control considerations.
      __________________________________________________________________
 
 
-    Generated on Thu Jun 12 02:43:52 2008 for RPKI Engine by  doxygen
+    Generated on Thu Jun 12 17:41:25 2008 for RPKI Engine by  doxygen
     1.5.5
diff --git a/tests/Makefile b/utils/Makefile
index 51aa972d..51aa972d 100644
--- a/tests/Makefile
+++ b/utils/Makefile
diff --git a/tests/uri/Makefile b/utils/uri/Makefile
index 229dc702..229dc702 100644
--- a/tests/uri/Makefile
+++ b/utils/uri/Makefile
diff --git a/tests/uri/dot.awk b/utils/uri/dot.awk
index ca1b490b..ca1b490b 100644
--- a/tests/uri/dot.awk
+++ b/utils/uri/dot.awk
diff --git a/tests/uri/table.awk b/utils/uri/table.awk
index d8627f67..d8627f67 100644
--- a/tests/uri/table.awk
+++ b/utils/uri/table.awk
diff --git a/tests/uri/uri.c b/utils/uri/uri.c
index 2420d49f..2420d49f 100644
--- a/tests/uri/uri.c
+++ b/utils/uri/uri.c