summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kornienko <alexfh@google.com>2016-03-03 10:42:46 +0000
committerAlexander Kornienko <alexfh@google.com>2016-03-03 10:42:46 +0000
commit33a03cd89845b0a251bcd32acc3af730b8650a2d (patch)
tree0b280e106482b3950a1ee486ef24a6a55bb4ac05
parent13ce8cd6bc5343f3f3ddd822f7ce99d2b34d5c92 (diff)
downloadbcm5719-llvm-33a03cd89845b0a251bcd32acc3af730b8650a2d.tar.gz
bcm5719-llvm-33a03cd89845b0a251bcd32acc3af730b8650a2d.zip
[docs] Updated doxygen files to work well with doxygen 1.8.11
Doxygen 1.8.11 doesn't seem to like files with ".intro" extension by default. llvm-svn: 262603
-rw-r--r--clang/docs/doxygen.cfg.in14
-rw-r--r--clang/docs/doxygen.intro15
2 files changed, 1 insertions, 28 deletions
diff --git a/clang/docs/doxygen.cfg.in b/clang/docs/doxygen.cfg.in
index f6c7cba6d39..adf9068613b 100644
--- a/clang/docs/doxygen.cfg.in
+++ b/clang/docs/doxygen.cfg.in
@@ -745,7 +745,7 @@ WARN_LOGFILE =
INPUT = @abs_srcdir@/../include \
@abs_srcdir@/../lib \
- @abs_srcdir@/doxygen.intro
+ @abs_srcdir@/doxygen-mainpage.dox
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -1791,18 +1791,6 @@ GENERATE_XML = NO
XML_OUTPUT = xml
-# The XML_SCHEMA tag can be used to specify a XML schema, which can be used by a
-# validating XML parser to check the syntax of the XML files.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_SCHEMA =
-
-# The XML_DTD tag can be used to specify a XML DTD, which can be used by a
-# validating XML parser to check the syntax of the XML files.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_DTD =
-
# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
# listings (including syntax highlighting and cross-referencing information) to
# the XML output. Note that enabling this will significantly increase the size
diff --git a/clang/docs/doxygen.intro b/clang/docs/doxygen.intro
deleted file mode 100644
index accab72bd08..00000000000
--- a/clang/docs/doxygen.intro
+++ /dev/null
@@ -1,15 +0,0 @@
-/// @mainpage clang
-///
-/// @section main_intro Introduction
-/// Welcome to the clang project.
-///
-/// This documentation describes the @b internal software that makes
-/// up clang, not the @b external use of clang. There are no instructions
-/// here on how to use clang, only the APIs that make up the software. For
-/// usage instructions, please see the programmer's guide or reference
-/// manual.
-///
-/// @section main_caveat Caveat
-/// This documentation is generated directly from the source code with doxygen.
-/// Since clang is constantly under active development, what you're about to
-/// read is out of date!
OpenPOWER on IntegriCloud