Merge "Automatically update doxygen configuration to local version." into devel/master

diff --git a/build/tizen/docs/.gitignore b/build/tizen/docs/.gitignore
index 37cfe18..52fdd1f 100644 (file)
--- a/build/tizen/docs/.gitignore
+++ b/build/tizen/docs/.gitignore
@@ -1 +1,2 @@
 doxygen-errors.txt
+dali.doxy.bak

diff --git a/build/tizen/docs/Makefile.am b/build/tizen/docs/Makefile.am
index 1314654..776a275 100644 (file)
--- a/build/tizen/docs/Makefile.am
+++ b/build/tizen/docs/Makefile.am
@@ -1,5 +1,6 @@
 all-local:
        @rm -f doxygen-errors.txt
+       @-doxygen -u dali.doxy
        @-doxygen dali.doxy &> doxygen-errors.txt || rm doxygen-errors.txt
        @touch doxygen-errors.txt
        @cat doxygen-errors.txt
@@ -7,4 +8,4 @@ all-local:
        @rm doxygen-errors.txt
 # Build JavaScript API documentation using yuidoc ( Yahoo JavaScript Documentation Tool )
 # We first test yuidoc exists, then change in to the dali-script-v8 docs directory and run yuidoc
-       @if [ ! `which yuidoc` = "" ]; then cd ../../../plugins/dali-script-v8/docs && yuidoc --config yuidoc.json -e ".cpp,.js,.md"  -o generated .. ../../../docs/content/shared-javascript-and-cpp-documentation/ ; fi
\ No newline at end of file
+       @if [ ! `which yuidoc` = "" ]; then cd ../../../plugins/dali-script-v8/docs && yuidoc --config yuidoc.json -e ".cpp,.js,.md"  -o generated .. ../../../docs/content/shared-javascript-and-cpp-documentation/ ; fi

diff --git a/doc/dali-toolkit-doc.h b/doc/dali-toolkit-doc.h
index b2bd746..0127bec 100644 (file)
--- a/doc/dali-toolkit-doc.h
+++ b/doc/dali-toolkit-doc.h
@@ -59,7 +59,7 @@
  *
  * @brief DALi Toolkit provides UI components and various effects on top of the DALi Core.
  *
- * @section dali_core_overview Overview
+ * @section dali_toolkit_overview Overview
  *
  * DALi Toolkit consists of the following groups of API:
  *