[Libreoffice-commits] core.git: solenv/bin solenv/inc

[Chris Sherlock]

 solenv/bin/mkdocs.sh   |    2 +-
 solenv/inc/doxygen.cfg |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f8f6ea8a68f326e0191e2c9031137462685c8dcb
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Wed Feb 17 16:41:05 2016 +1100

    solenv: use html files for doxygen, not xhtml files
    
    Change-Id: I2dd6e80698818f2a02e63cf91a72fe8c08b2265c
    Reviewed-on: https://gerrit.libreoffice.org/22453
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Chris Sherlock <chris.sherlock79 at gmail.com>

diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh
index 4efc5ba..6b2edd6 100755
--- a/solenv/bin/mkdocs.sh
+++ b/solenv/bin/mkdocs.sh
@@ -220,7 +220,7 @@ for module_name in *; do
       text="<p><b>View module in:</b>"
 	  text="${text}   <a href=\"http://cgit.freedesktop.org/libreoffice/core/tree/${module_name}\">cgit</a>"
       if $(echo $INPUT_PROJECTS | grep -q $module_name); then
-        text="${text}   <a href=\"${module_name}/html/classes.xhtml\">Doxygen</a>"
+        text="${text}   <a href=\"${module_name}/html/classes.html\">Doxygen</a>"
       fi
       text="${text} </p><p> </p>"
 	  echo -e $text >> "$BASE_OUTPUT/${module_name}.html"
diff --git a/solenv/inc/doxygen.cfg b/solenv/inc/doxygen.cfg
index 11fbf2a..bb5872e 100644
--- a/solenv/inc/doxygen.cfg
+++ b/solenv/inc/doxygen.cfg
@@ -1052,7 +1052,7 @@ HTML_OUTPUT            =
 # The default value is: .html.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_FILE_EXTENSION    = .xhtml
+HTML_FILE_EXTENSION    = .html
 
 # The HTML_HEADER tag can be used to specify a user-defined HTML header file for
 # each generated HTML page. If the tag is left blank doxygen will generate a