[1531] Changes after Jeremy's review.

diff --git a/doc/Doxyfile b/doc/Doxyfile
index d7706d2d01233a4d30d2518afdda4d8f07e51274..0af26d90ab74e832ec58bdbf8158939fb42dcb80 100644 (file)
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -25,13 +25,17 @@ DOXYFILE_ENCODING      = UTF-8
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = BIND
+PROJECT_NAME           = BIND10
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number.
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 10.0.0
+# Currently this variable is overwritten (see devel target in Makefile.am)
+# If the number of paramters to overwrite increases, we should generate
+# Doxyfile (rename it to Doxyfile.in and generate during configure phase)
+
+PROJECT_NUMBER         =
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 833a56c74046b02854d3d61d31cfbfef35dcebdc..76422206f6193858142478b8fbe1f5acd01afbd9 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -4,8 +4,11 @@ EXTRA_DIST = version.ent.in
 
 devel:
        mkdir -p html
-       doxygen Doxyfile > html/doxygen.log 2> html/doxygen-error.log
-       echo "`wc -l html/doxygen-error.log` warnings/errors detected."
+       (cat Doxyfile; echo PROJECT_NUMBER=$(PACKAGE_VERSION)) | doxygen - > html/doxygen.log 2> html/doxygen-error.log
+       echo `grep -i ": warning:" html/doxygen-error.log | wc -l` warnings/errors detected.
+
+clean:
+       rm -rf html
 
 # That's a bit of a hack, but we are making sure that devel target
 # is always valid. The alternative is to make devel depend on all

diff --git a/doc/devel/mainpage.dox b/doc/devel/mainpage.dox
index fd14a44683cced61bcc86c0289612ecf8c691b09..a472add9855a22c41c8a82127f7d7d0576989204 100644 (file)
--- a/doc/devel/mainpage.dox
+++ b/doc/devel/mainpage.dox
@@ -8,7 +8,8 @@
  * for existing and prospective contributors.
  *
  * If you are a user or system administrator, rather than software engineer,
- * you should read BIND10 Guide (Administrator Reference for BIND10) instead.
+ * you should read <a href="http://bind10.isc.org/docs/bind10-guide.html">BIND10
+ * Guide (Administrator Reference for BIND10)</a> instead.
  *
  * Regardless of your field of expertise, you are encouraged to visit
  * <a href="http://bind10.isc.org/">BIND10 webpage (http://bind10.isc.org)</a>