diff --git a/Makefile b/Makefile
index 49b6f9fdbb9cfe11e3a286c2b8221ac87ce69a1f..d64479f78ed2e97a7acfd56ac0b847ef775931c1 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 2c922daf73f14daf88251f363661e1b0efa33c14..939e79f8009e153c9b8d738b53cf6d1819db1da3 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 5b4dfab96b93cf55a3be78f9889e4af9cea6dc1a..688a4853cc88c53df1e268678f85c3305361495b 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 aa397c858f5426bbe1df0bcd652b76ed75db72a1..6dc59c307339f4ae37d4a8f75b69459858880507 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 f83f76a5385a5e16aea8a60ef2fb3aa6ecdcb864..51a3f5d5835a0f28b1ff4ce0f61a9465ff04faa9 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 24e4c05128ddef94294d669dcbd4db12e1d17091..a25f291e50540638d618fd5540612b983bae1efe 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 62e456b6f94af1e3bdaaae551b49656b8aac9817..afb851d2ea61ef9e9e8379dc4728ebed8ace9213 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 d507044ee568139b8b9915aabc213eac782de42a..5d5c706d2e383a22021fe5f506974d8a074c6f20 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 3a13792c92f03bd8a2eaae987362df7293724543..0719a4da5ff95e927832c00748c7336ff9f45c95 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 7f39c6e8e0b169c53a740609db15ce8162b70131..990b7a01bd7f9465a295724750e27f9611d500c6 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 387554005b03ec6e114f8473529cd118baeebd3b..27d55bfa04e2fb966d533fc182bf160a89f3da03 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 7e53f376965d6decf906b1b3734d6071e1574716..d1b33ffd290f93e1c5ebedbeb37ec333ff93457b 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 0b05b01dd02dc2e7feb02da43c9182b1261739d8..59ab852bd1fd9509f3e7f7f61d6b9f9490ad6fc6 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 e8d72582a55642c3ccdae3a68e0efd29c1c8df6d..9bacd83022c176c877f2035f9c97bfe122f7398f 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
@@ -130,24 +129,6 @@
  * \li ast_channel_alloc()
  */
 
-/*! 
- * \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
@@ -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
  */
 
 /*! 
@@ -194,11 +175,6 @@
  * \todo include missing cdrdriver txt
  */
 
-/*! 
- * \page AstREADME README
- * \verbinclude README
- */
- 
 /*! 
  * \page AstCREDITS CREDITS
  * \verbinclude CREDITS
@@ -271,63 +247,6 @@
  * with the list starting at varshead in struct ast_channel
  */
 
-/*! 
- * \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
@@ -335,15 +254,6 @@
  *
  * 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
  */
 
 /*!
@@ -352,101 +262,6 @@
  * \verbinclude extensions.conf.sample
  */
 
-/*! 
- * \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
@@ -455,136 +270,6 @@
  * \verbinclude rtp.conf.sample
  */
 
-/*! 
- * \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
@@ -605,20 +290,6 @@
  * \verbinclude manager.conf.sample
  */
 
-/*! 
- * \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
@@ -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 087318c7838819e07fb9100a18925c0f3caaba60..46628586fdfee5243bafd6fc1759bcbd02a50477 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 987ac8158adf7de29f25f37304643f4d634be886..14da7aaf993aa2242cf623b7e80cb29317f3aa67 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 090470d4a5f1cc88f089d2fad2dfbb1a18ec99d0..16a402987bc0f991fa2fc6acbfe983fdbcd465a5 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 ae5c5a596c09a2e7266f52ac956764d6122041b5..337762c62fdefb77dcdac0a9e46f1232a1c62e12 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 bd94b40eaf48ffb1e41797da73b5c6df56299614..e3a5f02c39271ca1d69909cde3a3cd8a9d857304 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 78a481d7c152888b518d41b59e8694284a6167fb..80643b15a92a927cfb3d266625cc1e78a870836a 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 70e16c7a96ea6a59cc2d6508be32e75a5a1c4ff3..d6b10b2614a75d16c356b1c8c4cf741f09880beb 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 9c4efee2134cdb80d4c2c15ae00cafa2ccdc6c0c..44cf1c3d220eb455f0960e1235fee9a52df304d7 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 3301e81e7fc1881d03cfaaf50229222f3cd6c95c..6af617478050bfa257fe103b3d3a88f7981a6cdc 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 6a2a39f814a322105e315000d010cfd932adc5d1..fc307b164b24a89d5e59db6103ffb6471d86e4ad 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 d4b9d94d2d1d2d8bd9a0d704b95944320300327a..1a5fd154e278a3494b0caa14609d6e5253ea0903 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 56fae0db4033c2ad4b9e296a3f096eea33f87e6f..6027cd74855a3aaa1044e2d3669651fd676c6416 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 0dead9aa5b853a63696e870fb88cf9dc46b6bacb..60e603d21b38fefb9027a6897737b6f43d2f66cb 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 e84a2a27154e5bde20c716cdc2b0b2e998e139c4..42aaa7c5f928b69e222e460baf83b4502ea469ea 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 b940ae17e8ecbf412bba36daaa9b1fbe835a80e8..62552529a97a551ed1f233ff8e2c4f9aaf6d8cff 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 c4836c6538e60669ffb8e918e7e05f4843d3f2d1..945a453d094f44bdf7dd00fc78a6365219c056f4 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 a493af346abbe056ed77401bde1c297a283b2f24..b383b87204770ac4042669fde71d8d3b91e2006b 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 fce6aa88ed5daef914e21681a9d1b012917629db..a70ca87a4879c7ab3aca900566baec11de1ae3ac 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 83dcd3d908cc8d4035d092bfb7fc008668b9a9aa..4e48ac80ef3602594ae182a2803956447802406f 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 338be0c5cadf54685e719d78e0d0f9540069a491..9311099010430e393124ee2907341d30825437a5 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>