Backmerge from trunk.

Alpha complex code review.


git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@894 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 702c4d667de4e7191d1050e6d855d2f79117f954

1 files changed, 7 insertions, 11 deletions

diff --git a/src/Doxyfile b/src/Doxyfile
index 90884779..81f55e29 100644
--- a/src/Doxyfile
+++ b/src/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = "Gudhi"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "1.1.0"
+PROJECT_NUMBER         = "1.2.0"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -672,7 +672,8 @@ LAYOUT_FILE            =
 # search path. Do not use file names with spaces, bibtex cannot handle them. See
 # also \cite for info how to create references.
 
-CITE_BIB_FILES         = biblio/bibliography.bib
+CITE_BIB_FILES         = biblio/bibliography.bib \
+                        biblio/how_to_cite_gudhi.bib
 
 #---------------------------------------------------------------------------
 # Configuration options related to warning and progress messages
@@ -811,7 +812,8 @@ EXCLUDE_SYMBOLS        =
 # that contain example code fragments that are included (see the \include
 # command).
 
-EXAMPLE_PATH           = example/common/ \
+EXAMPLE_PATH           = biblio/
+    example/common/ \
     example/Alpha_complex/
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
@@ -832,16 +834,10 @@ EXAMPLE_RECURSIVE      = NO
 # that contain images that are to be included in the documentation (see the
 # \image command).
 
-<<<<<<< .working
 IMAGE_PATH             = doc/Skeleton_blocker/ \
 	doc/Alpha_complex/ \
 	doc/common/ \
 	doc/Contraction/
-=======
-IMAGE_PATH             = doc/Skeleton_blocker/ \
-	doc/common/ \
-	doc/Contraction/
->>>>>>> .merge-right.r851
 
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
@@ -1346,7 +1342,7 @@ ECLIPSE_DOC_ID         = org.doxygen.Project
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-DISABLE_INDEX          = NO
+DISABLE_INDEX          = YES
 
 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
 # structure should be generated to display hierarchical information. If the tag
@@ -1363,7 +1359,7 @@ DISABLE_INDEX          = NO
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-GENERATE_TREEVIEW      = NO
+GENERATE_TREEVIEW      = YES
 
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.