-doxygen fixes

10 files changed, 12 insertions, 15 deletions

diff --git a/doc/doxygen/libmicrohttpd.doxy b/doc/doxygen/libmicrohttpd.doxy
index 01a66d74..25f2cd7f 100644
--- a/doc/doxygen/libmicrohttpd.doxy
+++ b/doc/doxygen/libmicrohttpd.doxy
@@ -32,7 +32,6 @@ SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = NO
 QT_AUTOBRIEF           = NO
 MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP         = NO
 INHERIT_DOCS           = NO
 SEPARATE_MEMBER_PAGES  = NO
 TAB_SIZE               = 8
@@ -76,7 +75,6 @@ GENERATE_DEPRECATEDLIST= NO
 ENABLED_SECTIONS       = 
 MAX_INITIALIZER_LINES  = 30
 SHOW_USED_FILES        = YES
-SHOW_DIRECTORIES       = YES
 FILE_VERSION_FILTER    = 
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
@@ -133,7 +131,6 @@ HTML_FILE_EXTENSION    = .html
 HTML_HEADER            = 
 HTML_FOOTER            = 
 HTML_STYLESHEET        = 
-HTML_ALIGN_MEMBERS     = YES
 GENERATE_HTMLHELP      = NO
 GENERATE_DOCSET        = NO
 DOCSET_FEEDNAME        = "Doxygen generated docs"
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index d06c0f92..84d1cacf 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -1091,7 +1091,7 @@ typedef int
  *        with plenty of upload data) this allows the application
  *        to easily associate some request-specific state.
  *        If necessary, this state can be cleaned up in the
- *        global #MHD_RequestCompleted callback (which
+ *        global #MHD_RequestCompletedCallback (which
  *        can be set with the #MHD_OPTION_NOTIFY_COMPLETED).
  *        Initially, `*con_cls` will be NULL.
  * @return #MHD_YES if the connection was handled successfully,
@@ -1764,7 +1764,7 @@ enum MHD_UpgradeEventMask
  * the local platform), to wait for the 'external' select loop to
  * trigger another round.  It is also possible to specify "no events"
  * to terminate the connection; in this case, the
- * MHD_RequestCompletedCallback will be called and all resources of
+ * #MHD_RequestCompletedCallback will be called and all resources of
  * the connection will be released.
  *
  * Except when in 'thread-per-connection' mode, implementations
@@ -1777,7 +1777,7 @@ enum MHD_UpgradeEventMask
  *                   to inspect the original HTTP request
  * @param con_cls value as set by the last call to the
  *                MHD_AccessHandlerCallback; will afterwards
- *                be also given to the MHD_RequestCompletedCallback
+ *                be also given to the #MHD_RequestCompletedCallback
  * @param data_in_size available data for reading, set to data read
  * @param data_in data read from the socket
  * @param data_out_size available buffer for writing, set to bytes 
@@ -1952,7 +1952,7 @@ MHD_create_post_processor (struct MHD_Connection *connection,
  * Parse and process POST data.  Call this function when POST data is
  * available (usually during an #MHD_AccessHandlerCallback) with the
  * "upload_data" and "upload_data_size".  Whenever possible, this will
- * then cause calls to the #MHD_IncrementalKeyValueIterator.
+ * then cause calls to the #MHD_PostDataIterator.
  *
  * @param pp the post processor
  * @param post_data @a post_data_len bytes of POST data
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index 2e5979c5..5a7e7160 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -2572,7 +2572,7 @@ MHD_set_http_callbacks_ (struct MHD_Connection *connection)
  * Obtain information about the given connection.
  *
  * @param connection what connection to get information about
- * @param infoType what information is desired?
+ * @param info_type what information is desired?
  * @param ... depends on @a info_type
  * @return NULL if this information is not available
  *         (or if the @a info_type is unknown)
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 900f7e4e..2d9de7ac 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file daemon.c
+ * @file microhttpd/daemon.c
  * @brief  A minimal-HTTP server library
  * @author Daniel Pittman
  * @author Christian Grothoff
diff --git a/src/microhttpd/internal.c b/src/microhttpd/internal.c
index 1730c0c9..52d0979f 100644
--- a/src/microhttpd/internal.c
+++ b/src/microhttpd/internal.c
@@ -18,7 +18,7 @@
 */
 
 /**
- * @file internal.h
+ * @file microhttpd/internal.c
  * @brief  internal shared structures
  * @author Daniel Pittman
  * @author Christian Grothoff
diff --git a/src/microhttpd/internal.h b/src/microhttpd/internal.h
index ffb1a667..5089b896 100644
--- a/src/microhttpd/internal.h
+++ b/src/microhttpd/internal.h
@@ -18,7 +18,7 @@
 */
 
 /**
- * @file internal.h
+ * @file microhttpd/internal.h
  * @brief  internal shared structures
  * @author Daniel Pittman
  * @author Christian Grothoff
diff --git a/src/microhttpd/postprocessor.c b/src/microhttpd/postprocessor.c
index e6677b7f..08b31a08 100644
--- a/src/microhttpd/postprocessor.c
+++ b/src/microhttpd/postprocessor.c
@@ -1091,7 +1091,7 @@ END:
  * Parse and process POST data.  Call this function when POST data is
  * available (usually during an #MHD_AccessHandlerCallback) with the
  * "upload_data" and "upload_data_size".  Whenever possible, this will
- * then cause calls to the #MHD_IncrementalKeyValueIterator.
+ * then cause calls to the #MHD_PostDataIterator.
  *
  * @param pp the post processor
  * @param post_data @a post_data_len bytes of POST data
diff --git a/src/microspdy/daemon.c b/src/microspdy/daemon.c
index 77129894..93cda875 100644
--- a/src/microspdy/daemon.c
+++ b/src/microspdy/daemon.c
@@ -17,7 +17,7 @@
 */
 
 /**
- * @file daemon.c
+ * @file microspdy/daemon.c
  * @brief  daemon functionality
  * @author Andrey Uzunov
  */
diff --git a/src/microspdy/internal.c b/src/microspdy/internal.c
index 6bcfdbf9..0ba83768 100644
--- a/src/microspdy/internal.c
+++ b/src/microspdy/internal.c
@@ -17,7 +17,7 @@
 */
 
 /**
- * @file internal.c
+ * @file microspdy/internal.c
  * @brief  internal functions and macros for the framing layer
  * @author Andrey Uzunov
  */
diff --git a/src/microspdy/internal.h b/src/microspdy/internal.h
index a7aec14f..72dfd3ec 100644
--- a/src/microspdy/internal.h
+++ b/src/microspdy/internal.h
@@ -17,7 +17,7 @@
 */
 
 /**
- * @file structures.h
+ * @file microspdy/internal.h
  * @brief  internal functions and macros for the framing layer
  * @author Andrey Uzunov
  */