Doxygen Updates - Title update

Update and extend the configuration_file group and enable linking. Commit other cleanups from multi-version Doxygen testing.  Update title that was left behind many years ago.

(issue ASTERISK-20259)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375182 65c4cc65-6c06-0410-ace0-fbb531ad65f3

34 files changed, 132 insertions, 379 deletions

diff --git a/Makefile b/Makefile
index 49b6f9fdb..d64479f78 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# Asterisk -- A telephony toolkit for Linux.
+# Asterisk -- An open source telephony toolkit.
 #
 # Top level Makefile
 #
diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules
index 2c922daf7..939e79f80 100644
--- a/Makefile.moddir_rules
+++ b/Makefile.moddir_rules
@@ -1,5 +1,5 @@
 #
-# Asterisk -- A telephony toolkit for Linux.
+# Asterisk -- An open source telephony toolkit.
 #
 # Makefile rules for subdirectories containing modules
 #
diff --git a/Makefile.rules b/Makefile.rules
index 5b4dfab96..688a4853c 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -1,5 +1,5 @@
 #
-# Asterisk -- A telephony toolkit for Linux.
+# Asterisk -- An open source telephony toolkit.
 # 
 # Makefile rules
 #
diff --git a/codecs/log2comp.h b/codecs/log2comp.h
index aa397c858..6dc59c307 100644
--- a/codecs/log2comp.h
+++ b/codecs/log2comp.h
@@ -1,7 +1,7 @@
 /*! \file 
  * \brief log2comp.h - various base 2 log computation versions
  * 
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
  * \author Alex Volkov <codepro@usa.net>
  *
diff --git a/contrib/asterisk-ng-doxygen b/contrib/asterisk-ng-doxygen
index f83f76a53..51a3f5d58 100644
--- a/contrib/asterisk-ng-doxygen
+++ b/contrib/asterisk-ng-doxygen
@@ -646,9 +646,10 @@ EXCLUDE_SYMBOLS        =
 # directories that contain example code fragments that are included (see
 # the \include command).
 
-EXAMPLE_PATH           = ./ \
+EXAMPLE_PATH           = . \
                          doc \
-                         configs
+                         configs \
+                         contrib
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
@@ -662,7 +663,7 @@ EXAMPLE_PATTERNS       =
 # commands irrespective of the value of the RECURSIVE tag.
 # Possible values are YES and NO. If left blank NO is used.
 
-EXAMPLE_RECURSIVE      = YES
+EXAMPLE_RECURSIVE      = NO
 
 # The IMAGE_PATH tag can be used to specify one or more files or
 # directories that contain image that are included in the documentation (see
diff --git a/include/asterisk.h b/include/asterisk.h
index 24e4c0512..a25f291e5 100644
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -1,5 +1,5 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
  * General Definitions for Asterisk top level program
  *
diff --git a/include/asterisk/compat.h b/include/asterisk/compat.h
index 62e456b6f..afb851d2e 100644
--- a/include/asterisk/compat.h
+++ b/include/asterisk/compat.h
@@ -1,5 +1,5 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  * 
  * Copyright (C) 1999-2006, Digium, Inc.
  *
diff --git a/include/asterisk/doxygen/architecture.h b/include/asterisk/doxygen/architecture.h
index d507044ee..5d5c706d2 100644
--- a/include/asterisk/doxygen/architecture.h
+++ b/include/asterisk/doxygen/architecture.h
@@ -24,7 +24,6 @@
 /*!
 \page AsteriskArchitecture Asterisk Architecture Overview
 \author Russell Bryant <russell@digium.com>
-\AsteriskTrunkWarning
 
 <hr>
 
diff --git a/include/asterisk/doxygen/asterisk-git-howto.h b/include/asterisk/doxygen/asterisk-git-howto.h
index 3a13792c9..0719a4da5 100644
--- a/include/asterisk/doxygen/asterisk-git-howto.h
+++ b/include/asterisk/doxygen/asterisk-git-howto.h
@@ -21,8 +21,6 @@
 /*!
  * \page AsteriskGitHowto How to setup a local GIT mirror of the Asterisk SVN repository
  *
- * \AsteriskTrunkWarning
- *
  * <hr>
  *
  * \section Introduction Introduction
diff --git a/include/asterisk/doxygen/commits.h b/include/asterisk/doxygen/commits.h
index 7f39c6e8e..990b7a01b 100644
--- a/include/asterisk/doxygen/commits.h
+++ b/include/asterisk/doxygen/commits.h
@@ -21,8 +21,6 @@
 /*!
  * \page CommitMessages Guidelines for Commit Messages
  *
- * \AsteriskTrunkWarning
- *
  * <hr>
  *
  * \section CommitMsgFormatting Commit Message Formatting
@@ -114,5 +112,3 @@
  * see the following page on %asterisk.org:
  * \arg http://www.asterisk.org/developers/svn-branching-merging
  */
-
-
diff --git a/include/asterisk/doxygen/licensing.h b/include/asterisk/doxygen/licensing.h
index 387554005..27d55bfa0 100644
--- a/include/asterisk/doxygen/licensing.h
+++ b/include/asterisk/doxygen/licensing.h
@@ -22,7 +22,7 @@
  * \page Licensing Asterisk Licensing Information
  *
  * \section license Asterisk License
- * \verbinclude LICENSE
+ * \note See the LICENSE file for up to date info
  *
  * \section otherlicenses Licensing of 3rd Party Code
  *
diff --git a/include/asterisk/doxygen/releases.h b/include/asterisk/doxygen/releases.h
index 7e53f3769..d1b33ffd2 100644
--- a/include/asterisk/doxygen/releases.h
+++ b/include/asterisk/doxygen/releases.h
@@ -21,8 +21,6 @@
 /*!
  * \page ReleaseStatus Asterisk Release Status
  *
- * @AsteriskTrunkWarning
- *
  * \section warranty Warranty
  * The following warranty applies to all open source releases of Asterisk:
  *
@@ -124,8 +122,6 @@
 /*!
  * \page ReleasePolicies Asterisk Release and Commit Policies
  *
- * \AsteriskTrunkWarning
- *
  * \section releasestatus Asterisk Release Status
  *
  * For more information on the current status of each Asterisk release series,
diff --git a/include/asterisk/doxygen/reviewboard.h b/include/asterisk/doxygen/reviewboard.h
index 0b05b01dd..59ab852bd 100644
--- a/include/asterisk/doxygen/reviewboard.h
+++ b/include/asterisk/doxygen/reviewboard.h
@@ -21,8 +21,6 @@
 /*!
  * \page Reviewboard Reviewboard Usage and Guidelines
  *
- * \AsteriskTrunkWarning
- *
  * <hr>
  *
  * \section ReviewboardGuidelines Usage Guidelines
diff --git a/include/asterisk/doxyref.h b/include/asterisk/doxyref.h
index e8d72582a..9bacd8302 100644
--- a/include/asterisk/doxyref.h
+++ b/include/asterisk/doxyref.h
@@ -58,7 +58,6 @@
  * \arg \ref AstSpeech
  *
  * \section debugconfig Debugging and Configuration References
- * \arg \ref AstREADME : General Administrator README file
  * \arg \ref AstDebug : Hints on debugging
  * \arg \ref extref 
  * \arg \ref ConfigFiles
@@ -131,24 +130,6 @@
  */
 
 /*! 
- * \page AstDebug Debugging
- * \section debug Debugging
- * \todo include backtrace txt that was removed
- */
-
-/*!
- * \page AstSpeech The Generic Speech Recognition API
- * \section debug The Generic Speech Recognition API
- * \todo include missing speechrec txt
- */
-
-/*! 
- * \page DataStores Channel Data Stores
- * \section debug Channel Data Stores
- * \todo include missing datastores txt
- */
-
-/*! 
  * \page AstAMI AMI - The Manager Interface
  * \section ami AMI - The manager Interface
  * \arg \link Config_ami Configuration file \endlink
@@ -180,7 +161,7 @@
  * \par References
  * \arg DUNDi is documented at http://www.dundi.com
  * \arg Implemented in \ref pbx_dundi.c and \ref dundi-parser.c
- * \arg Configuration in \link Config_dun dundi.conf \endlink
+ * \arg Configuration in \ref dundi.conf
  */
 
 /*! 
@@ -195,11 +176,6 @@
  */
 
 /*! 
- * \page AstREADME README
- * \verbinclude README
- */
- 
-/*! 
  * \page AstCREDITS CREDITS
  * \verbinclude CREDITS
  */
@@ -272,78 +248,12 @@
  */
 
 /*! 
- * \page AstENUM ENUM
- * \section enumreadme ENUM
- * \arg Configuration: \ref Config_enum
- * \arg \ref enum.c
- * \arg \ref func_enum.c
- *
- */
-
-/*! 
- * \page ConfigFiles Configuration files
- * \section config Main configuration files
- * \arg \link Config_ast asterisk.conf - the main configuration file \endlink
- * \arg \link Config_ext extensions.conf - The Dial Plan \endlink
- * \arg \link Config_mod modules.conf - which modules to load and not to load \endlink
- * \arg \link Config_fea features.conf - call features (transfer, parking, etc) \endlink
- * \section chanconf Channel configuration files
- * \arg \link Config_iax IAX2 configuration  \endlink
- * \arg \link Config_sip SIP configuration  \endlink
- * \arg \link Config_mgcp MGCP configuration  \endlink
- * \arg \link Config_rtp RTP configuration  \endlink
- * \arg \link Config_dahdi DAHDI configuration  \endlink
- * \arg \link Config_oss OSS (sound card) configuration  \endlink
- * \arg \link Config_alsa ALSA (sound card) configuration  \endlink
- * \arg \link Config_agent Agent (proxy channel) configuration  \endlink
- * \arg \link Config_misdn MISDN Experimental ISDN BRI channel configuration  \endlink
- * \arg \link Config_h323 H.323 configuration  \endlink
- * \section appconf Application configuration files
- * \arg \link Config_mm Meetme (conference bridge) configuration  \endlink
- * \arg \link Config_qu Queue system configuration  \endlink
- * \arg \link Config_vm Voicemail configuration  \endlink
- * \arg \link Config_followme Followme configuration  \endlink
- * \section cdrconf CDR configuration files
- * \arg \link Config_cdr CDR configuration  \endlink
- * \arg \link cdr_csv Default CDR driver configuration \endlink
- * \arg \link cdr_custom Custom CDR driver configuration \endlink
- * \arg \link cdr_ami Manager CDR driver configuration \endlink
- * \arg \link cdr_odbc ODBC CDR driver configuration \endlink
- * \arg \link cdr_adaptive_odbc Adaptive ODBC CDR driver configuration \endlink
- * \arg \link cdr_pgsql PostgreSQL CDR driver configuration \endlink
- * \arg \link cdr_radius RADIUS CDR driver configuration \endlink
- * \arg \link cdr_sqlite SQLite 2 CDR driver configuration \endlink
- * \arg \link cdr_sqlite3_custom SQLite 3 CDR driver configuration \endlink
- * \arg \link cdr_syslog Syslog CDR driver configuration \endlink
- * \arg \link cdr_tds FreeTDS CDR driver configuration (Microsoft SQL Server) \endlink
- * \section miscconf Miscellenaous configuration files
- * \arg \link Config_adsi ADSI configuration  \endlink
- * \arg \link Config_ami AMI - Manager configuration  \endlink
- * \arg \link Config_ara Realtime configuration  \endlink
- * \arg \link Config_codec Codec configuration  \endlink
- * \arg \link Config_dun DUNDi configuration  \endlink
- * \arg \link Config_enum ENUM configuration  \endlink
- * \arg \link Config_moh Music on Hold configuration  \endlink
- * \arg \link Config_vm Voicemail configuration  \endlink
- * \arg \link res_config_sqlite SQLite Resource driver configuration \endlink
- */
-
-/*! 
  * \page Config_mod Modules configuration
  * All res_ resource modules are loaded with globals on, which means
  * that non-static functions are callable from other modules.
  *
  * If you want your non res_* module to export functions to other modules
  * you have to include it in the [global] section.
- * \verbinclude modules.conf.sample
- */
-
-/*! 
- * \page Config_fea Call features configuration
- * \par See also
- * \arg \ref features.c : Call feature implementation
- * \section featconf features.conf
- * \verbinclude features.conf.sample
  */
 
 /*!
@@ -353,101 +263,6 @@
  */
 
 /*! 
- * \page Config_iax IAX2 configuration
- * IAX2 is implemented in \ref chan_iax2.c
- * \arg \link Config_iax iax.conf Configuration file example \endlink
- * \section iaxreadme IAX readme file
- * \section Config_iax IAX Configuration example
- * \verbinclude iax.conf.sample
- * \section iaxjitter IAX Jitterbuffer information
- */
-
-/*! 
- * \page Config_iax IAX configuration
- * \arg Implemented in \ref chan_iax2.c
- * \section iaxconf iax.conf
- * \verbinclude iax.conf.sample
- */
-
-/*! 
- * \page Config_sip SIP configuration
- * Also see \ref Config_rtp RTP configuration
- * \arg Implemented in \ref chan_sip.c
- * \section sipconf sip.conf
- * \verbinclude sip.conf.sample
- *
- * \arg \b Back \ref chanconf
- */
-
-/*! 
- * \page Config_mgcp MGCP configuration
- * Also see \ref Config_rtp RTP configuration
- * \arg Implemented in \ref chan_mgcp.c
- * \section mgcpconf mgcp.conf
- * \verbinclude mgcp.conf.sample
- */
-
-/*! 
- * \page README_misdn MISDN documentation
- * \arg See \ref Config_misdn
- * \section mISDN configuration
- */
-
-/*! 
- * \page Config_misdn MISDN configuration
- * \arg Implemented in \ref chan_misdn.c
- * \arg \ref README_misdn
- * \arg See the mISDN home page: http://www.isdn4linux.de/mISDN/
- * \section misdnconf misdn.conf
- * \verbinclude misdn.conf.sample
- */
-
-/*! 
- * \page Config_vm VoiceMail configuration
- * \section vmconf voicemail.conf
- * \arg Implemented in \ref app_voicemail.c
- * \verbinclude voicemail.conf.sample
- */
-
-/*! 
- * \page Config_dahdi DAHDI configuration
- * \section dahdiconf dahdi.conf
- * \arg Implemented in \ref chan_dahdi.c
- * \verbinclude dahdi.conf.sample
- */
-
-/*! 
- * \page Config_h323 H.323 channel driver information
- * This is the configuration of the H.323 channel driver within the Asterisk
- * distribution. There's another one, called OH323, in asterisk-addons
- * \arg Implemented in \ref chan_h323.c
- * \section h323conf h323.conf
- * \ref chan_h323.c
- */
-
-/*! 
- * \page Config_oss OSS configuration
- * \section ossconf oss.conf
- * \arg Implemented in \ref chan_oss.c
- * \verbinclude oss.conf.sample
- */
-
-/*! 
- * \page Config_alsa ALSA configuration
- * \section alsaconf alsa.conf
- * \arg Implemented in \ref chan_alsa.c
- * \verbinclude alsa.conf.sample
- */
-
-/*! 
- * \page Config_agent Agent configuration
- * \section agentconf agents.conf
- * The agent channel is a proxy channel for queues
- * \arg Implemented in \ref chan_agent.c
- * \verbinclude agents.conf.sample
- */
-
-/*! 
  * \page Config_rtp RTP configuration
  * \arg Implemented in \ref rtp.c
  * Used in \ref chan_sip.c and \ref chan_mgcp.c (and various H.323 channels)
@@ -456,136 +271,6 @@
  */
 
 /*! 
- * \page Config_dun DUNDi Configuration
- * \arg See also \ref AstDUNDi
- * \section dundiconf dundi.conf
- * \verbinclude dundi.conf.sample
- */
-
-/*! 
- * \page Config_enum ENUM Configuration
- * \section enumconf enum.conf
- * \arg See also \ref enumreadme
- * \arg Implemented in \ref func_enum.c and \ref enum.c
- * \verbinclude enum.conf.sample
- */
-
-/*!
- * \page cdr_csv Default CDR driver configuration
- * \par See also
- * \arg \ref cdrconf
- * \arg Implemented in \ref cdr_csv.c
- * \verbinclude cdr.conf.sample
- */
-
-/*! 
- * \page cdr_custom Custom CDR Configuration
- * \par See also 
- * \arg \ref cdrconf
- * \arg Implemented in \ref cdr_custom.c
- * \verbinclude cdr_custom.conf.sample
- */
-
-/*! 
- * \page cdr_ami Manager CDR driver configuration
- * \par See also 
- * \arg \ref cdrconf
- * \arg \ref AstAMI
- * \arg Implemented in \ref cdr_manager.c
- * \verbinclude cdr_manager.conf.sample
- */
-
-/*! 
- * \page cdr_odbc ODBC CDR driver configuration
- * \arg See also \ref cdrconf
- * \arg Implemented in \ref cdr_odbc.c
- * \verbinclude cdr_odbc.conf.sample
- * See also:
- * \arg http://www.unixodbc.org
- */
-
-/*! 
- * \page cdr_odbc Adaptive ODBC CDR driver configuration
- * \li See also \ref cdrconf
- * \verbinclude cdr_adaptive_odbc.conf.sample
- * See also:
- * \arg http://www.unixodbc.org
- */
-
-/*! 
- * \page cdr_pgsql PostgreSQL CDR driver configuration
- * \arg See also \ref cdrconf
- * \arg Implemented in \ref cdr_pgsql.c
- * See also:
- * \arg http://www.postgresql.org
- * \verbinclude cdr_pgsql.conf.sample
- */
-
-/*! 
- * \page cdr_sqlite SQLite 2 CDR driver configuration
- * \arg See also \ref cdrconf
- * \arg Implemented in \ref cdr_sqlite.c
- * See also:
- * \arg http://www.sqlite.org
- */
-
-/*!
- * \page cdr_sqlite3_custom SQLite 3 CDR driver configuration
- * \arg See also \ref cdrconf
- * \arg Implemented in \ref cdr_sqlite3_custom.c
- * See also:
- * \arg http://www.sqlite.org
- * \verbinclude cdr_sqlite3_custom.conf.sample
- */
-
-/*!
- * \page cdr_syslog Syslog CDR driver configuration
- * \arg See also \ref cdrconf
- * \arg \ref cdr_syslog.c
- * \verbinclude cdr_syslog.conf.sample
- */
-
-/*! 
- * \page cdr_tds FreeTDS CDR driver configuration
- * \arg See also \ref cdrconf
- * See also:
- * \arg http://www.freetds.org
- * \verbinclude cdr_tds.conf.sample
- */
-
-/*! 
- * \page Config_cdr CDR configuration
- * \par See also
- * \arg \ref cdr_drivers
- * \arg \link Config_cdr CDR configuration  \endlink  
- * \arg \link cdr_csv Default CDR driver configuration \endlink
- * \arg \link cdr_custom Custom CDR driver configuration \endlink
- * \arg \link cdr_ami Manager CDR driver configuration \endlink
- * \arg \link cdr_odbc ODBC CDR driver configuration \endlink
- * \arg \link cdr_adaptive_odbc Adaptive ODBC CDR driver configuration \endlink
- * \arg \link cdr_pgsql PostgreSQL CDR driver configuration \endlink
- * \arg \link cdr_radius RADIUS CDR driver configuration \endlink
- * \arg \link cdr_sqlite SQLite 2 CDR driver configuration \endlink
- * \arg \link cdr_sqlite3_custom SQLite 3 CDR driver configuration \endlink
- * \arg \link cdr_syslog Syslog CDR driver configuration \endlink
- * \arg \link cdr_tds FreeTDS CDR driver configuration (Microsoft SQL Server) \endlink
- * \verbinclude cdr.conf.sample
- */
-
-/*! 
- * \page Config_moh Music on Hold Configuration
- * \arg Implemented in \ref res_musiconhold.c
- * \section mohconf musiconhold.conf
- * \verbinclude musiconhold.conf.sample
- */
-
-/*! 
- * \page Config_adsi ADSI Configuration
- * \section adsiconf adsi.conf
- * \verbinclude adsi.conf.sample
- */
-
-/*! 
  * \page Config_codec CODEC Configuration
  * \section codecsconf codecs.conf
  * \verbinclude codecs.conf.sample
@@ -606,20 +291,6 @@
  */
 
 /*! 
- * \page Config_qu ACD - Queue system configuration
- * \arg Implemented in \ref app_queue.c
- * \section quconf queues.conf
- * \verbinclude queues.conf.sample
- */
-
-/*! 
- * \page Config_mm Meetme - The conference bridge configuration
- * \arg Implemented in \ref app_meetme.c
- * \section mmconf meetme.conf
- * \verbinclude meetme.conf.sample
- */
-
-/*! 
  * \page SoundFiles Sound files
  * \section SecSound Asterisk Sound files
  * Asterisk includes a large number of sound files. Many of these
@@ -637,16 +308,6 @@
  * \arg \link Config_ami Configuration file \endlink
  */
 
-/*! 
- * \page res_config_sqlite SQLite Resource driver configuration
- * \arg Implemented in \ref res_config_sqlite.c
- * \arg Configuration file:
- * \verbinclude res_config_sqlite.conf
- * \arg SQL tables:
- * \arg See also:
- * http://www.sqlite.org
- */
-
 /*
  * Doxygen Groups
  */
@@ -671,7 +332,7 @@
  */
 
 /*! 
- * \addtogroup applications Module: Dial plan applications
+ * \addtogroup applications Dial plan applications
  * \section app_generic Asterisk Dial Plan Applications
  * \brief Applications support the dialplan. They register dynamically with 
  *        \see ast_register_application() and unregister with 
diff --git a/include/asterisk/module.h b/include/asterisk/module.h
index 087318c78..46628586f 100644
--- a/include/asterisk/module.h
+++ b/include/asterisk/module.h
@@ -25,8 +25,7 @@
  * provide and some other module related functions.
  */
 
-/*!
- * \li The Modules library uses the configuration file \ref modules.conf
+/*! \li \ref module.h uses the configuration file \ref modules.conf
  * \addtogroup configuration_file
  */
 
diff --git a/include/asterisk/paths.h b/include/asterisk/paths.h
index 987ac8158..14da7aaf9 100644
--- a/include/asterisk/paths.h
+++ b/include/asterisk/paths.h
@@ -1,5 +1,5 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
  * Paths to configurable Asterisk directories
  * 
diff --git a/include/asterisk/smdi.h b/include/asterisk/smdi.h
index 090470d4a..16a402987 100644
--- a/include/asterisk/smdi.h
+++ b/include/asterisk/smdi.h
@@ -1,5 +1,5 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
  * Copyright (C) 2005-2008, Digium, Inc.
  *
diff --git a/include/asterisk/udptl.h b/include/asterisk/udptl.h
index ae5c5a596..337762c62 100644
--- a/include/asterisk/udptl.h
+++ b/include/asterisk/udptl.h
@@ -1,5 +1,5 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
  * UDPTL support for T.38
  * 
diff --git a/main/app.c b/main/app.c
index bd94b40ea..e3a5f02c3 100644
--- a/main/app.c
+++ b/main/app.c
@@ -23,8 +23,10 @@
  * \author Mark Spencer <markster@digium.com>
  */
 
-/** \example app_skel.c
- * This is an example of how to develop an app
+/** \example
+ * \par This is an example of how to develop an app.
+ * Application Skeleton is an example of creating an application for Asterisk.
+ * \verbinclude app_skel.c
  */
 
 /*** MODULEINFO
diff --git a/main/asterisk.c b/main/asterisk.c
index 78a481d7c..80643b15a 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -48,6 +48,8 @@
  * \arg \ref Licensing
  * \arg \ref DevDoc
  * \arg \ref configuration_file
+ * \arg \ref channel_drivers
+ * \arg \ref applications
  *
  * \section copyright Copyright and Author
  *
@@ -133,8 +135,7 @@
  *	Implementation of PBX core functions and CLI interface.
  */
 
-/*!
- * \li The Asterisk core uses the configuration file \ref asterisk.conf
+/*! \li \ref asterisk.c uses the configuration file \ref asterisk.conf
  * \addtogroup configuration_file
  */
 
diff --git a/main/ccss.c b/main/ccss.c
index 70e16c7a9..d6b10b261 100644
--- a/main/ccss.c
+++ b/main/ccss.c
@@ -21,6 +21,15 @@
  * \author Mark Michelson <mmichelson@digium.com>
  */
 
+/*! \li \ref ccss.c uses the configuration file \ref ccss.conf
+ * \addtogroup configuration_file Configuration Files
+ */
+
+/*!
+ * \page ccss.conf ccss.conf
+ * \verbinclude ccss.conf.sample
+ */
+
 /*** MODULEINFO
 	<support_level>core</support_level>
  ***/
diff --git a/main/cdr.c b/main/cdr.c
index 9c4efee21..44cf1c3d2 100644
--- a/main/cdr.c
+++ b/main/cdr.c
@@ -30,6 +30,14 @@
  * isn't properly generated and posted.
  */
 
+/*! \li \ref cdr.c uses the configuration file \ref cdr.conf
+ * \addtogroup configuration_file Configuration Files
+ */
+
+/*!
+ * \page cdr.conf cdr.conf
+ * \verbinclude cdr.conf.sample
+ */
 
 /*** MODULEINFO
 	<support_level>core</support_level>
diff --git a/main/cel.c b/main/cel.c
index 3301e81e7..6af617478 100644
--- a/main/cel.c
+++ b/main/cel.c
@@ -27,6 +27,15 @@
  *       as expected.
  */
 
+/*! \li \ref cel.c uses the configuration file \ref cel.conf
+ * \addtogroup configuration_file Configuration Files
+ */
+
+/*!
+ * \page cel.conf cel.conf
+ * \verbinclude cel.conf.sample
+ */
+
 /*** MODULEINFO
 	<support_level>core</support_level>
  ***/
diff --git a/main/cli.c b/main/cli.c
index 6a2a39f81..fc307b164 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -23,6 +23,15 @@
  * \author Mark Spencer <markster@digium.com>
  */
 
+/*! \li \ref cli.c uses the configuration file \ref cli_permissions.conf
+ * \addtogroup configuration_file Configuration Files
+ */
+
+/*!
+ * \page cli_permissions.conf cli_permissions.conf
+ * \verbinclude cli_permissions.conf.sample
+ */
+
 /*** MODULEINFO
 	<support_level>core</support_level>
  ***/
diff --git a/main/dnsmgr.c b/main/dnsmgr.c
index d4b9d94d2..1a5fd154e 100644
--- a/main/dnsmgr.c
+++ b/main/dnsmgr.c
@@ -28,6 +28,17 @@
  * thread is in the middle of updating it to the new address.
  */
 
+
+/*! \li \ref dnsmgr.c uses the configuration file \ref dnsmgr.conf
+ * \addtogroup configuration_file Configuration Files
+ */
+
+/*!
+ * \page dnsmgr.conf dnsmgr.conf
+ * \verbinclude dnsmgr.conf.sample
+ */
+
+
 /*** MODULEINFO
 	<support_level>core</support_level>
  ***/
diff --git a/main/dsp.c b/main/dsp.c
index 56fae0db4..6027cd748 100644
--- a/main/dsp.c
+++ b/main/dsp.c
@@ -27,6 +27,15 @@
  * \author Steve Underwood <steveu@coppice.org>
  */
 
+/*! \li \ref dsp.c uses the configuration file \ref dsp.conf
+ * \addtogroup configuration_file Configuration Files
+ */
+
+/*!
+ * \page dsp.conf dsp.conf
+ * \verbinclude dsp.conf.sample
+ */
+
 /* Some routines from tone_detect.c by Steven Underwood as published under the zapata library */
 /*
 	tone_detect.c - General telephony tone detection, and specific
diff --git a/main/enum.c b/main/enum.c
index 0dead9aa5..60e603d21 100644
--- a/main/enum.c
+++ b/main/enum.c
@@ -45,6 +45,15 @@
  * \todo The service type selection needs to be redone.
  */
 
+/*! \li \ref enum.c uses the configuration file \ref enum.conf
+ * \addtogroup configuration_file Configuration Files
+ */
+
+/*!
+ * \page enum.conf enum.conf
+ * \verbinclude enum.conf.sample
+ */
+
 /*** MODULEINFO
 	<support_level>core</support_level>
  ***/
diff --git a/main/features.c b/main/features.c
index e84a2a271..42aaa7c5f 100644
--- a/main/features.c
+++ b/main/features.c
@@ -24,6 +24,15 @@
  * \author Mark Spencer <markster@digium.com>
  */
 
+/*! \li \ref features.c uses the configuration file \ref features.conf
+ * \addtogroup configuration_file Configuration Files
+ */
+
+/*!
+ * \page features.conf features.conf
+ * \verbinclude features.conf.sample
+ */
+
 /*** MODULEINFO
 	<support_level>core</support_level>
  ***/
diff --git a/main/http.c b/main/http.c
index b940ae17e..62552529a 100644
--- a/main/http.c
+++ b/main/http.c
@@ -30,8 +30,7 @@
  * \ref AstHTTP - AMI over the http protocol
  */
 
-/*!
- * \li The core module http uses the configuration file \ref http.conf
+/*! \li \ref http.c uses the configuration file \ref http.conf
  * \addtogroup configuration_file
  */
 
diff --git a/main/logger.c b/main/logger.c
index c4836c653..945a453d0 100644
--- a/main/logger.c
+++ b/main/logger.c
@@ -25,6 +25,15 @@
  * \author Mark Spencer <markster@digium.com>
  */
 
+/*! \li \ref logger.c uses the configuration file \ref logger.conf
+ * \addtogroup configuration_file Configuration Files
+ */
+
+/*!
+ * \page logger.conf logger.conf
+ * \verbinclude logger.conf.sample
+ */
+
 /*** MODULEINFO
 	<support_level>core</support_level>
  ***/
diff --git a/main/manager.c b/main/manager.c
index a493af346..b383b8720 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -36,8 +36,7 @@
  * \ref amiconf
  */
 
-/*!
- * \li The core Manager uses the configuration file \ref manager.conf
+/*! \li \ref manager.c uses the configuration file \ref manager.conf and \ref users.conf
  * \addtogroup configuration_file
  */
 
@@ -45,6 +44,10 @@
  * \verbinclude manager.conf.sample
  */
 
+/*! \page users.conf users.conf
+ * \verbinclude users.conf.sample
+ */
+
 /*** MODULEINFO
 	<support_level>core</support_level>
  ***/
diff --git a/main/named_acl.c b/main/named_acl.c
index fce6aa88e..a70ca87a4 100644
--- a/main/named_acl.c
+++ b/main/named_acl.c
@@ -1,5 +1,5 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
  * Copyright (C) 2012, Digium, Inc.
  *
diff --git a/main/udptl.c b/main/udptl.c
index 83dcd3d90..4e48ac80e 100644
--- a/main/udptl.c
+++ b/main/udptl.c
@@ -1,5 +1,5 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
  * UDPTL support for T.38
  *
@@ -48,6 +48,15 @@
  * - app_fax.c
  */
 
+/*! \li \ref udptl.c uses the configuration file \ref udptl.conf
+ * \addtogroup configuration_file Configuration Files
+ */
+
+/*!
+ * \page udptl.conf udptl.conf
+ * \verbinclude udptl.conf.sample
+ */
+
 /*** MODULEINFO
 	<support_level>core</support_level>
  ***/
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index 338be0c5c..931109901 100644
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -21,6 +21,15 @@
  * \brief Distributed Universal Number Discovery (DUNDi)
  */
 
+/*! \li \ref pbx_dundi.c uses configuration file \ref dundi.conf
+ * \addtogroup configuration_file Configuration Files
+ */
+
+/*!
+ * \page dundi.conf dundi.conf
+ * \verbinclude dundi.conf.sample
+ */
+
 /*** MODULEINFO
 	<depend>zlib</depend>
 	<use type="external">crypto</use>