From: Michael Wallner <mike@php.net>
Date: Wed, 30 Sep 2015 12:18:16 +0000 (+0200)
Subject: Merge branch 'v1.0.x'
X-Git-Tag: release-2.0.0RC1~4
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=6bb2f2584faf986f1b0b764f69e760b69163f48c;hp=82a22c5890659bb20931c76b94198a949447f1ea;p=m6w6%2Fext-propro

Merge branch 'v1.0.x'
---

diff --git a/Doxyfile b/Doxyfile
index d0ed188..a130460 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -33,7 +33,7 @@ OPTIMIZE_OUTPUT_FOR_C  = YES
 OPTIMIZE_OUTPUT_JAVA   = NO
 OPTIMIZE_FOR_FORTRAN   = NO
 OPTIMIZE_OUTPUT_VHDL   = NO
-EXTENSION_MAPPING      =
+EXTENSION_MAPPING      = no_extension=md
 MARKDOWN_SUPPORT       = YES
 AUTOLINK_SUPPORT       = YES
 BUILTIN_STL_SUPPORT    = NO
@@ -100,7 +100,7 @@ WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 # Configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = php_propro.h src
+INPUT                  = README.md CONTRIBUTING.md php_propro.h src
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          =
 RECURSIVE              = NO
@@ -116,7 +116,7 @@ INPUT_FILTER           =
 FILTER_PATTERNS        =
 FILTER_SOURCE_FILES    = NO
 FILTER_SOURCE_PATTERNS =
-USE_MDFILE_AS_MAINPAGE =
+USE_MDFILE_AS_MAINPAGE = README.md
 #---------------------------------------------------------------------------
 # Configuration options related to source browsing
 #---------------------------------------------------------------------------
@@ -145,7 +145,7 @@ HTML_HEADER            =
 HTML_FOOTER            =
 HTML_STYLESHEET        =
 HTML_EXTRA_STYLESHEET  =
-HTML_EXTRA_FILES       =
+HTML_EXTRA_FILES       = BUGS CONTRIBUTING.md LICENSE THANKS TODO
 HTML_COLORSTYLE_HUE    = 220
 HTML_COLORSTYLE_SAT    = 100
 HTML_COLORSTYLE_GAMMA  = 80