diff --git a/channels/Makefile b/channels/Makefile
index f9b5b3ad78..286f9d8caa 100644
--- a/channels/Makefile
+++ b/channels/Makefile
@@ -1,5 +1,5 @@
 #
-# Asterisk -- A telephony toolkit for Linux.
+# Asterisk -- An open source telephony toolkit.
 # 
 # Makefile for channel drivers
 #
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index ec4fa8c335..c43decb1c1 100644
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -24,8 +24,7 @@
  * \ingroup channel_drivers
  */
 
-/*!
- * \li The channel chan_alsa uses the configuration file \ref alsa.conf
+/*! \li \ref chan_alsa.c uses the configuration file \ref alsa.conf
  * \addtogroup configuration_file
  */
 
diff --git a/channels/chan_console.c b/channels/chan_console.c
index d936084e76..0f4d01ebd0 100644
--- a/channels/chan_console.c
+++ b/channels/chan_console.c
@@ -47,8 +47,7 @@
  * - console_video support
  */
 
-/*!
- * \li The channel chan_console uses the configuration file \ref console.conf
+/*! \li \ref chan_console.c uses the configuration file \ref console.conf
  * \addtogroup configuration_file
  */
 
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 6783126312..85f9f057aa 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -34,8 +34,7 @@
  * \todo Deprecate the "musiconhold" configuration option post 1.4
  */
 
-/*!
- * \li The channel chan_dahdi uses the configuration file \ref chan_dahdi.conf
+/*! \li \ref chan_dahdi.c uses the configuration file \ref chan_dahdi.conf
  * \addtogroup configuration_file
  */
 
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index d257f0f3d7..49e7ce8ff9 100644
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -31,8 +31,7 @@
  * \todo Fix native bridging.
  */
 
-/*!
- * \li The channel chan_gtalk uses the configuration file \ref gtalk.conf
+/*! \li \ref chan_gtalk.c uses the configuration file \ref gtalk.conf
  * \addtogroup configuration_file
  */
 
diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 9aba21a38a..f6364a1186 100644
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -34,6 +34,14 @@
  * \ingroup channel_drivers
  */
 
+/*! \li \ref chan_h323.c uses the configuration file \ref h323.conf
+ * \addtogroup configuration_file
+ */
+
+/*! \page h323.conf h323.conf
+ * \verbinclude h323.conf.sample
+ */
+
 /*** MODULEINFO
 	<depend>openh323</depend>
 	<defaultenabled>no</defaultenabled>
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 961efa7df0..b6b7e97c17 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -31,8 +31,7 @@
  * \todo Implement musicclass settings for IAX2 devices
  */
 
-/*!
- * \li The channel chan_iax uses the configuration file \ref iax.conf
+/*! \li \ref chan_iax2.c uses the configuration file \ref iax.conf
  * \addtogroup configuration_file
  */
 
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c
index d5fe3c019e..d65d126982 100644
--- a/channels/chan_jingle.c
+++ b/channels/chan_jingle.c
@@ -27,8 +27,7 @@
  * \ingroup channel_drivers
  */
 
-/*!
- * \li The channel chan_jingle uses the configuration file \ref jingle.conf
+/*! \li \ref chan_jingle.c uses the configuration file \ref jingle.conf
  * \addtogroup configuration_file
  */
 
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index 1655399b1a..ff909a3be4 100644
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -25,8 +25,7 @@
  * \ingroup channel_drivers
  */
 
-/*!
- * \li The channel chan_mgcp uses the configuration file \ref mgcp.conf
+/*! \li \ref chan_mgcp.c uses the configuration file \ref mgcp.conf
  * \addtogroup configuration_file
  */
 
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 2f93d09892..e605108207 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -29,8 +29,7 @@
  * \ingroup channel_drivers
  */
 
-/*!
- * \li The channel chan_misdn uses the configuration file \ref misdn.conf
+/*! \li \ref chan_misdn.c uses the configuration file \ref misdn.conf
  * \addtogroup configuration_file
  */
 
diff --git a/channels/chan_motif.c b/channels/chan_motif.c
index 5380f1cd95..4f01ccec5a 100644
--- a/channels/chan_motif.c
+++ b/channels/chan_motif.c
@@ -27,8 +27,7 @@
  * \ingroup channel_drivers
  */
 
-/*!
- * \li The channel chan_motif uses the configuration file \ref motif.conf
+/*! \li \ref chan_motif.c uses the configuration file \ref motif.conf
  * \addtogroup configuration_file
  */
 
diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index 504cb902c4..2545138b14 100644
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -30,8 +30,7 @@
  * \ingroup channel_drivers
  */
 
-/*!
- * \li The channel chan_oss uses the configuration file \ref oss.conf
+/*! \li \ref chan_oss.c uses the configuration file \ref oss.conf
  * \addtogroup configuration_file
  */
 
diff --git a/channels/chan_phone.c b/channels/chan_phone.c
index 0f050f6c9e..71a498a858 100644
--- a/channels/chan_phone.c
+++ b/channels/chan_phone.c
@@ -25,6 +25,14 @@
  * \ingroup channel_drivers
  */
 
+/*! \li \ref chan_phone.c uses the configuration file \ref phone.conf
+ * \addtogroup configuration_file
+ */
+
+/*! \page phone.conf phone.conf
+ * \verbinclude phone.conf.sample
+ */
+
 /*** MODULEINFO
 	<depend>ixjuser</depend>
 	<support_level>extended</support_level>
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index ae5d2c1281..c5de402d7a 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -92,8 +92,7 @@
  * the sip_hangup() function
  */
 
-/*! 
- * \li The channel chan_sip uses configuration files \ref sip.conf and \ref sip_notify.conf
+/*! \li \ref chan_sip.c uses configuration files \ref sip.conf and \ref sip_notify.conf
  * \addtogroup configuration_file
  */
 
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index a62de91f36..01b1c6024c 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -25,8 +25,7 @@
  * \ingroup channel_drivers
  */
 
-/*!
- * \li The channel chan_skinny uses the configuration file \ref skinny.conf
+/*! \li \ref chan_skinny.c uses the configuration file \ref skinny.conf
  * \addtogroup configuration_file
  */
 
diff --git a/channels/chan_vpb.cc b/channels/chan_vpb.cc
index d4d08c097d..58fc73f699 100644
--- a/channels/chan_vpb.cc
+++ b/channels/chan_vpb.cc
@@ -29,8 +29,7 @@
  * \ingroup channel_drivers
  */
 
-/*!
- * \li The channel chan_vpb uses the configuration file \ref vpb.conf
+/*! \li \ref chan_vpb.cc uses the configuration file \ref vpb.conf
  * \addtogroup configuration_file
  */
 
diff --git a/channels/iax2-parser.h b/channels/iax2-parser.h
index 978ca0d2a4..caa1210393 100644
--- a/channels/iax2-parser.h
+++ b/channels/iax2-parser.h
@@ -1,5 +1,5 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
  * Implementation of Inter-Asterisk eXchange
  * 
diff --git a/channels/iax2.h b/channels/iax2.h
index 87e7bf3985..c064b1fcb4 100644
--- a/channels/iax2.h
+++ b/channels/iax2.h
@@ -1,5 +1,5 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
  * Implementation of Inter-Asterisk eXchange
  *