gdisirio · gdisirio · commit 4ba07c6fc407 · 2011-03-24T08:30:21.000Z
git-svn-id: https://chibios.svn.sourceforge.net/svnroot/chibios/trunk@2840 35acf78f-673a-0410-8e92-d51de3d6d3f4
diff --git a/docs/Doxyfile_chm b/docs/Doxyfile_chm
@@ -926,13 +926,13 @@ HTML_FILE_EXTENSION    = .html
 # each generated HTML page. If it is left blank doxygen will generate a
 # standard header.
 
-HTML_HEADER            = ./rsc/header.html
+HTML_HEADER            = ./rsc/header_chm.html
 
 # The HTML_FOOTER tag can be used to specify a personal HTML footer for
 # each generated HTML page. If it is left blank doxygen will generate a
 # standard footer.
 
-HTML_FOOTER            = ./rsc/footer.html
+HTML_FOOTER            = ./rsc/footer_chm.html
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading
 # style sheet that is used by each HTML page. It can be used to
@@ -1159,7 +1159,7 @@ ENUM_VALUES_PER_LINE   = 4
 # JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
 # Windows users are probably better off using the HTML help feature.
 
-GENERATE_TREEVIEW      = YES
+GENERATE_TREEVIEW      = NO
 
 # By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
 # and Class Hierarchy pages using a tree view instead of an ordered list.
diff --git a/docs/Doxyfile_html b/docs/Doxyfile_html
diff --git a/docs/readme.txt b/docs/readme.txt
@@ -1,8 +1,3 @@
-*** Documentation access ***
-
-Open ./docs/index.html to open the start page or ./docs/html/index.html in
-order to access directly the doxigen documentation.
-
 *** Documentation build procedure ***
 
 The following software must be installed:
@@ -12,5 +7,5 @@ The following software must be installed:
 
 Build procedure:
 - Run Doxywizard.
-- Load ./docs/Doxyfile from Doxywizard.
+- Load ./docs/Doxyfile_html or ./docs/Doxyfile_chm from Doxywizard.
 - Start.
diff --git a/docs/rsc/footer_chm.html b/docs/rsc/footer_chm.html
@@ -0,0 +1,4 @@
+<hr class="footer"/><address class="footer"><small>
+Generated on $datetime for $projectname by&#160;<a href="http://www.doxygen.org/index.html"><img class="footer" src="$relpath$doxygen.png" alt="doxygen"/></a> $doxygenversion</small></address>
+</body>
+</html>
diff --git a/docs/rsc/footer_html.html b/docs/rsc/footer_html.html
diff --git a/docs/rsc/header_chm.html b/docs/rsc/header_chm.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<title>$title</title>
+<link href="$relpath$tabs.css" rel="stylesheet" type="text/css"/>
+<link href="$relpath$doxygen.css" rel="stylesheet" type="text/css"/>
+</head>
+<body>
+<div id="top"><!-- do not remove this div! -->
+<div id="titlearea">
+<table cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr style="height: 56px;">
+  <td style="padding-left: 0.5em;">
+   <div id="projectname">ChibiOS/RT&#160;<span id="projectnumber">2.3.1</span></div>
+  </td>
+ </tr>
+ </tbody>
+</table>
+</div>
diff --git a/docs/rsc/header_html.html b/docs/rsc/header_html.html
diff --git a/documentation.html b/documentation.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
   <head>
-    <meta http-equiv="Refresh" content="0; URL=http://chibios.sourceforge.net/dokuwiki/doku.php?id=chibios:documents">
+    <meta http-equiv="Refresh" content="0; URL=http://www.chibios.org/dokuwiki/doku.php?id=chibios:documents">
   </head>
   <body>
   </body>
diff --git a/readme.txt b/readme.txt
@@ -97,7 +97,8 @@
   more readable output. Also modified the documentation layout to put functions
   and variables ahead of everything else in the group pages.
   Doxygen version below 1.7.3 cannot be used anymore because differences in
-  templates.
+  templates. Note that now there are two Doxygen projects, one for generating
+  the CHM file the other for plain HTML.
 
 *** 2.3.0 ***
 - FIX: Fixed race condition in CM0 ports, the fix also improves the
