109 files changed, 11 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 6a517889d..886f976f8 100644
--- a/Makefile
+++ b/Makefile
@@ -660,7 +660,7 @@ upgrade: bininstall
 adsi:
 	@echo Installing adsi config files...
 	$(INSTALL) -d "$(DESTDIR)$(ASTETCDIR)"
-	@for x in configs/*.adsi; do \
+	@for x in configs/samples/*.adsi; do \
 		dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
 		if [ -f "$${dst}" ] ; then \
 			echo "Overwriting $$x" ; \
@@ -672,7 +672,7 @@ adsi:
 
 samples: adsi
 	@echo Installing other config files...
-	@for x in configs/*.sample; do \
+	@for x in configs/samples/*.sample; do \
 		dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ;	\
 		if [ -f "$${dst}" ]; then \
 			if [ "$(OVERWRITE)" = "y" ]; then \
diff --git a/UPGRADE.txt b/UPGRADE.txt
index 4dab29121..84b3e8d5a 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -23,6 +23,9 @@
 
 From 12 to 13:
 
+ - Sample config files have been moved from configs/ to a subfolder of that
+   directory, 'samples'.
+
  - The menuselect utility has been pulled into the Asterisk repository. As a
    result, the libxml2 development library is now a required dependency for
    Asterisk.
diff --git a/configs/acl.conf.sample b/configs/samples/acl.conf.sample
index b052606ce..b052606ce 100644
--- a/configs/acl.conf.sample
+++ b/configs/samples/acl.conf.sample
diff --git a/configs/adsi.conf.sample b/configs/samples/adsi.conf.sample
index 0f36f80da..0f36f80da 100644
--- a/configs/adsi.conf.sample
+++ b/configs/samples/adsi.conf.sample
diff --git a/configs/agents.conf.sample b/configs/samples/agents.conf.sample
index 0cf0c4c90..0cf0c4c90 100644
--- a/configs/agents.conf.sample
+++ b/configs/samples/agents.conf.sample
diff --git a/configs/alarmreceiver.conf.sample b/configs/samples/alarmreceiver.conf.sample
index e4815a9eb..e4815a9eb 100644
--- a/configs/alarmreceiver.conf.sample
+++ b/configs/samples/alarmreceiver.conf.sample
diff --git a/configs/alsa.conf.sample b/configs/samples/alsa.conf.sample
index ced5b4485..ced5b4485 100644
--- a/configs/alsa.conf.sample
+++ b/configs/samples/alsa.conf.sample
diff --git a/configs/amd.conf.sample b/configs/samples/amd.conf.sample
index ce4808a0c..ce4808a0c 100644
--- a/configs/amd.conf.sample
+++ b/configs/samples/amd.conf.sample
diff --git a/configs/app_mysql.conf.sample b/configs/samples/app_mysql.conf.sample
index fafd4f7a2..fafd4f7a2 100644
--- a/configs/app_mysql.conf.sample
+++ b/configs/samples/app_mysql.conf.sample
diff --git a/configs/app_skel.conf.sample b/configs/samples/app_skel.conf.sample
index ada8461e3..ada8461e3 100644
--- a/configs/app_skel.conf.sample
+++ b/configs/samples/app_skel.conf.sample
diff --git a/configs/ari.conf.sample b/configs/samples/ari.conf.sample
index 59f9a44e5..59f9a44e5 100644
--- a/configs/ari.conf.sample
+++ b/configs/samples/ari.conf.sample
diff --git a/configs/asterisk.adsi b/configs/samples/asterisk.adsi
index a58952589..a58952589 100644
--- a/configs/asterisk.adsi
+++ b/configs/samples/asterisk.adsi
diff --git a/configs/asterisk.conf.sample b/configs/samples/asterisk.conf.sample
index e4883ec97..e4883ec97 100644
--- a/configs/asterisk.conf.sample
+++ b/configs/samples/asterisk.conf.sample
diff --git a/configs/calendar.conf.sample b/configs/samples/calendar.conf.sample
index 82b8702f0..82b8702f0 100644
--- a/configs/calendar.conf.sample
+++ b/configs/samples/calendar.conf.sample
diff --git a/configs/ccss.conf.sample b/configs/samples/ccss.conf.sample
index 21b0b0668..21b0b0668 100644
--- a/configs/ccss.conf.sample
+++ b/configs/samples/ccss.conf.sample
diff --git a/configs/cdr.conf.sample b/configs/samples/cdr.conf.sample
index 458e19ab4..458e19ab4 100644
--- a/configs/cdr.conf.sample
+++ b/configs/samples/cdr.conf.sample
diff --git a/configs/cdr_adaptive_odbc.conf.sample b/configs/samples/cdr_adaptive_odbc.conf.sample
index f3c806e75..f3c806e75 100644
--- a/configs/cdr_adaptive_odbc.conf.sample
+++ b/configs/samples/cdr_adaptive_odbc.conf.sample
diff --git a/configs/cdr_custom.conf.sample b/configs/samples/cdr_custom.conf.sample
index bec9e3377..bec9e3377 100644
--- a/configs/cdr_custom.conf.sample
+++ b/configs/samples/cdr_custom.conf.sample
diff --git a/configs/cdr_manager.conf.sample b/configs/samples/cdr_manager.conf.sample
index aa596b718..aa596b718 100644
--- a/configs/cdr_manager.conf.sample
+++ b/configs/samples/cdr_manager.conf.sample
diff --git a/configs/cdr_mysql.conf.sample b/configs/samples/cdr_mysql.conf.sample
index 04b70493b..04b70493b 100644
--- a/configs/cdr_mysql.conf.sample
+++ b/configs/samples/cdr_mysql.conf.sample
diff --git a/configs/cdr_odbc.conf.sample b/configs/samples/cdr_odbc.conf.sample
index 93bd6fff8..93bd6fff8 100644
--- a/configs/cdr_odbc.conf.sample
+++ b/configs/samples/cdr_odbc.conf.sample
diff --git a/configs/cdr_pgsql.conf.sample b/configs/samples/cdr_pgsql.conf.sample
index 286baab42..c5a989f31 100644
--- a/configs/cdr_pgsql.conf.sample
+++ b/configs/samples/cdr_pgsql.conf.sample
@@ -11,6 +11,6 @@
 ;password=password
 ;user=postgres
 ;appname=asterisk    ; Postgres application_name support (optional). Whitespace not allowed.
-;table=cdr           ; SQL table where CDRs will be inserted
-;encoding=LATIN9     ; Encoding of logged characters in Asterisk
-;timezone=UTC        ; Uncomment if you want datetime fields in UTC/GMT
+;table=cdr		;SQL table where CDRs will be inserted
+;encoding=LATIN9	; Encoding of logged characters in Asterisk
+;timezone=UTC		; Uncomment if you want datetime fields in UTC/GMT
diff --git a/configs/cdr_sqlite3_custom.conf.sample b/configs/samples/cdr_sqlite3_custom.conf.sample
index 0d5dc091c..0d5dc091c 100644
--- a/configs/cdr_sqlite3_custom.conf.sample
+++ b/configs/samples/cdr_sqlite3_custom.conf.sample
diff --git a/configs/cdr_syslog.conf.sample b/configs/samples/cdr_syslog.conf.sample
index 3a619be9f..3a619be9f 100644
--- a/configs/cdr_syslog.conf.sample
+++ b/configs/samples/cdr_syslog.conf.sample
diff --git a/configs/cdr_tds.conf.sample b/configs/samples/cdr_tds.conf.sample
index 309599e5f..309599e5f 100644
--- a/configs/cdr_tds.conf.sample
+++ b/configs/samples/cdr_tds.conf.sample
diff --git a/configs/cel.conf.sample b/configs/samples/cel.conf.sample
index d92e2745d..d92e2745d 100644
--- a/configs/cel.conf.sample
+++ b/configs/samples/cel.conf.sample
diff --git a/configs/cel_custom.conf.sample b/configs/samples/cel_custom.conf.sample
index 126248aca..126248aca 100644
--- a/configs/cel_custom.conf.sample
+++ b/configs/samples/cel_custom.conf.sample
diff --git a/configs/cel_odbc.conf.sample b/configs/samples/cel_odbc.conf.sample
index 0c0b83fda..0c0b83fda 100644
--- a/configs/cel_odbc.conf.sample
+++ b/configs/samples/cel_odbc.conf.sample
diff --git a/configs/cel_pgsql.conf.sample b/configs/samples/cel_pgsql.conf.sample
index 10e3285ec..2298b2ddc 100644
--- a/configs/cel_pgsql.conf.sample
+++ b/configs/samples/cel_pgsql.conf.sample
@@ -64,5 +64,5 @@
 ;dbname=asterisk
 ;password=password
 ;user=postgres
-;table=cel          ; SQL table where CEL's will be inserted
-;appname=asterisk   ; Postgres application_name support (optional). Whitespace not allowed.
+;table=cel		;SQL table where CEL's will be inserted
+;appname=asterisk   ; Postgres application_name support (optional). Whitespace not allowed.
+\ No newline at end of file
diff --git a/configs/cel_sqlite3_custom.conf.sample b/configs/samples/cel_sqlite3_custom.conf.sample
index 2d9a24fc7..2d9a24fc7 100644
--- a/configs/cel_sqlite3_custom.conf.sample
+++ b/configs/samples/cel_sqlite3_custom.conf.sample
diff --git a/configs/cel_tds.conf.sample b/configs/samples/cel_tds.conf.sample
index 399093b47..399093b47 100644
--- a/configs/cel_tds.conf.sample
+++ b/configs/samples/cel_tds.conf.sample
diff --git a/configs/chan_dahdi.conf.sample b/configs/samples/chan_dahdi.conf.sample
index 13691fcdf..13691fcdf 100644
--- a/configs/chan_dahdi.conf.sample
+++ b/configs/samples/chan_dahdi.conf.sample
diff --git a/configs/chan_mobile.conf.sample b/configs/samples/chan_mobile.conf.sample
index c9c4d2d85..c9c4d2d85 100644
--- a/configs/chan_mobile.conf.sample
+++ b/configs/samples/chan_mobile.conf.sample
diff --git a/configs/cli.conf.sample b/configs/samples/cli.conf.sample
index 0ddd92c99..0ddd92c99 100644
--- a/configs/cli.conf.sample
+++ b/configs/samples/cli.conf.sample
diff --git a/configs/cli_aliases.conf.sample b/configs/samples/cli_aliases.conf.sample
index 21353fdb4..21353fdb4 100644
--- a/configs/cli_aliases.conf.sample
+++ b/configs/samples/cli_aliases.conf.sample
diff --git a/configs/cli_permissions.conf.sample b/configs/samples/cli_permissions.conf.sample
index 4a6973f50..4a6973f50 100644
--- a/configs/cli_permissions.conf.sample
+++ b/configs/samples/cli_permissions.conf.sample
diff --git a/configs/codecs.conf.sample b/configs/samples/codecs.conf.sample
index 9b5738577..9b5738577 100644
--- a/configs/codecs.conf.sample
+++ b/configs/samples/codecs.conf.sample
diff --git a/configs/confbridge.conf.sample b/configs/samples/confbridge.conf.sample
index 860f1cb87..860f1cb87 100644
--- a/configs/confbridge.conf.sample
+++ b/configs/samples/confbridge.conf.sample
diff --git a/configs/config_test.conf.sample b/configs/samples/config_test.conf.sample
index 2fff45ece..2fff45ece 100644
--- a/configs/config_test.conf.sample
+++ b/configs/samples/config_test.conf.sample
diff --git a/configs/console.conf.sample b/configs/samples/console.conf.sample
index 606254eee..606254eee 100644
--- a/configs/console.conf.sample
+++ b/configs/samples/console.conf.sample
diff --git a/configs/dbsep.conf.sample b/configs/samples/dbsep.conf.sample
index 9cfa23740..9cfa23740 100644
--- a/configs/dbsep.conf.sample
+++ b/configs/samples/dbsep.conf.sample
diff --git a/configs/dnsmgr.conf.sample b/configs/samples/dnsmgr.conf.sample
index e34dbcf0a..e34dbcf0a 100644
--- a/configs/dnsmgr.conf.sample
+++ b/configs/samples/dnsmgr.conf.sample
diff --git a/configs/dsp.conf.sample b/configs/samples/dsp.conf.sample
index 08c5a5715..08c5a5715 100644
--- a/configs/dsp.conf.sample
+++ b/configs/samples/dsp.conf.sample
diff --git a/configs/dundi.conf.sample b/configs/samples/dundi.conf.sample
index 70f97d422..70f97d422 100644
--- a/configs/dundi.conf.sample
+++ b/configs/samples/dundi.conf.sample
diff --git a/configs/enum.conf.sample b/configs/samples/enum.conf.sample
index 39c723175..39c723175 100644
--- a/configs/enum.conf.sample
+++ b/configs/samples/enum.conf.sample
diff --git a/configs/extconfig.conf.sample b/configs/samples/extconfig.conf.sample
index 52a49cfbe..52a49cfbe 100644
--- a/configs/extconfig.conf.sample
+++ b/configs/samples/extconfig.conf.sample
diff --git a/configs/extensions.ael.sample b/configs/samples/extensions.ael.sample
index 495001f90..495001f90 100644
--- a/configs/extensions.ael.sample
+++ b/configs/samples/extensions.ael.sample
diff --git a/configs/extensions.conf.sample b/configs/samples/extensions.conf.sample
index df91223f0..df91223f0 100644
--- a/configs/extensions.conf.sample
+++ b/configs/samples/extensions.conf.sample
diff --git a/configs/extensions.lua.sample b/configs/samples/extensions.lua.sample
index 1b4428c7c..1b4428c7c 100644
--- a/configs/extensions.lua.sample
+++ b/configs/samples/extensions.lua.sample
diff --git a/configs/extensions_minivm.conf.sample b/configs/samples/extensions_minivm.conf.sample
index 2f9d24637..2f9d24637 100644
--- a/configs/extensions_minivm.conf.sample
+++ b/configs/samples/extensions_minivm.conf.sample
diff --git a/configs/features.conf.sample b/configs/samples/features.conf.sample
index 1724fc155..1724fc155 100644
--- a/configs/features.conf.sample
+++ b/configs/samples/features.conf.sample
diff --git a/configs/festival.conf.sample b/configs/samples/festival.conf.sample
index e91821719..e91821719 100644
--- a/configs/festival.conf.sample
+++ b/configs/samples/festival.conf.sample
diff --git a/configs/followme.conf.sample b/configs/samples/followme.conf.sample
index a233948bf..a233948bf 100644
--- a/configs/followme.conf.sample
+++ b/configs/samples/followme.conf.sample
diff --git a/configs/func_odbc.conf.sample b/configs/samples/func_odbc.conf.sample
index fd528d216..fd528d216 100644
--- a/configs/func_odbc.conf.sample
+++ b/configs/samples/func_odbc.conf.sample
diff --git a/configs/hep.conf.sample b/configs/samples/hep.conf.sample
index 40b17aa0e..40b17aa0e 100644
--- a/configs/hep.conf.sample
+++ b/configs/samples/hep.conf.sample
diff --git a/configs/http.conf.sample b/configs/samples/http.conf.sample
index 44095a11e..44095a11e 100644
--- a/configs/http.conf.sample
+++ b/configs/samples/http.conf.sample
diff --git a/configs/iax.conf.sample b/configs/samples/iax.conf.sample
index e17c7dfeb..e17c7dfeb 100644
--- a/configs/iax.conf.sample
+++ b/configs/samples/iax.conf.sample
diff --git a/configs/iaxprov.conf.sample b/configs/samples/iaxprov.conf.sample
index 668809c4d..668809c4d 100644
--- a/configs/iaxprov.conf.sample
+++ b/configs/samples/iaxprov.conf.sample
diff --git a/configs/indications.conf.sample b/configs/samples/indications.conf.sample
index 7ac1ba936..7ac1ba936 100644
--- a/configs/indications.conf.sample
+++ b/configs/samples/indications.conf.sample
diff --git a/configs/logger.conf.sample b/configs/samples/logger.conf.sample
index 0fa7dcc8d..0fa7dcc8d 100644
--- a/configs/logger.conf.sample
+++ b/configs/samples/logger.conf.sample
diff --git a/configs/manager.conf.sample b/configs/samples/manager.conf.sample
index f31c6d397..f31c6d397 100644
--- a/configs/manager.conf.sample
+++ b/configs/samples/manager.conf.sample
diff --git a/configs/meetme.conf.sample b/configs/samples/meetme.conf.sample
index c40c4606e..c40c4606e 100644
--- a/configs/meetme.conf.sample
+++ b/configs/samples/meetme.conf.sample
diff --git a/configs/mgcp.conf.sample b/configs/samples/mgcp.conf.sample
index 7c725bc3d..7c725bc3d 100644
--- a/configs/mgcp.conf.sample
+++ b/configs/samples/mgcp.conf.sample
diff --git a/configs/minivm.conf.sample b/configs/samples/minivm.conf.sample
index 55a39c869..55a39c869 100644
--- a/configs/minivm.conf.sample
+++ b/configs/samples/minivm.conf.sample
diff --git a/configs/misdn.conf.sample b/configs/samples/misdn.conf.sample
index ac54dbc5a..ac54dbc5a 100644
--- a/configs/misdn.conf.sample
+++ b/configs/samples/misdn.conf.sample
diff --git a/configs/modules.conf.sample b/configs/samples/modules.conf.sample
index 38e33e1f4..38e33e1f4 100644
--- a/configs/modules.conf.sample
+++ b/configs/samples/modules.conf.sample
diff --git a/configs/motif.conf.sample b/configs/samples/motif.conf.sample
index 9d5bc808c..9d5bc808c 100644
--- a/configs/motif.conf.sample
+++ b/configs/samples/motif.conf.sample
diff --git a/configs/musiconhold.conf.sample b/configs/samples/musiconhold.conf.sample
index 1211c8a6d..1211c8a6d 100644
--- a/configs/musiconhold.conf.sample
+++ b/configs/samples/musiconhold.conf.sample
diff --git a/configs/muted.conf.sample b/configs/samples/muted.conf.sample
index 15c7409d9..15c7409d9 100644
--- a/configs/muted.conf.sample
+++ b/configs/samples/muted.conf.sample
diff --git a/configs/ooh323.conf.sample b/configs/samples/ooh323.conf.sample
index aeeb02fab..aeeb02fab 100644
--- a/configs/ooh323.conf.sample
+++ b/configs/samples/ooh323.conf.sample
diff --git a/configs/osp.conf.sample b/configs/samples/osp.conf.sample
index e72aa3259..e72aa3259 100644
--- a/configs/osp.conf.sample
+++ b/configs/samples/osp.conf.sample
diff --git a/configs/oss.conf.sample b/configs/samples/oss.conf.sample
index c3781a2a2..c3781a2a2 100644
--- a/configs/oss.conf.sample
+++ b/configs/samples/oss.conf.sample
diff --git a/configs/phone.conf.sample b/configs/samples/phone.conf.sample
index 3d4a7c2dd..3d4a7c2dd 100644
--- a/configs/phone.conf.sample
+++ b/configs/samples/phone.conf.sample
diff --git a/configs/phoneprov.conf.sample b/configs/samples/phoneprov.conf.sample
index 17d8b1f49..17d8b1f49 100644
--- a/configs/phoneprov.conf.sample
+++ b/configs/samples/phoneprov.conf.sample
diff --git a/configs/pjsip.conf.sample b/configs/samples/pjsip.conf.sample
index 58774dc7c..3aa05a96b 100644
--- a/configs/pjsip.conf.sample
+++ b/configs/samples/pjsip.conf.sample
@@ -435,8 +435,6 @@
 ;  SYNOPSIS: Endpoint
 ;100rel=yes     ; Allow support for RFC3262 provisional ACK tags (default:
                 ; "yes")
-;accountcode=foo        ; Set a default account code for channels created for
-                        ; this endpoint
 ;aggregate_mwi=yes      ;  (default: "yes")
 ;allow= ; Media Codec s to allow (default: "")
 ;aors=  ; AoR s to be used with the endpoint (default: "")
diff --git a/configs/pjsip_notify.conf.sample b/configs/samples/pjsip_notify.conf.sample
index 8224ee1ff..8224ee1ff 100644
--- a/configs/pjsip_notify.conf.sample
+++ b/configs/samples/pjsip_notify.conf.sample
diff --git a/configs/queuerules.conf.sample b/configs/samples/queuerules.conf.sample
index fb2a1ba87..fb2a1ba87 100644
--- a/configs/queuerules.conf.sample
+++ b/configs/samples/queuerules.conf.sample
diff --git a/configs/queues.conf.sample b/configs/samples/queues.conf.sample
index bea62e83e..bea62e83e 100644
--- a/configs/queues.conf.sample
+++ b/configs/samples/queues.conf.sample
diff --git a/configs/res_config_mysql.conf.sample b/configs/samples/res_config_mysql.conf.sample
index ab8ebf095..ab8ebf095 100644
--- a/configs/res_config_mysql.conf.sample
+++ b/configs/samples/res_config_mysql.conf.sample
diff --git a/configs/res_config_sqlite.conf.sample b/configs/samples/res_config_sqlite.conf.sample
index 04e6ae2e7..04e6ae2e7 100644
--- a/configs/res_config_sqlite.conf.sample
+++ b/configs/samples/res_config_sqlite.conf.sample
diff --git a/configs/res_config_sqlite3.conf.sample b/configs/samples/res_config_sqlite3.conf.sample
index 5416c809e..5416c809e 100644
--- a/configs/res_config_sqlite3.conf.sample
+++ b/configs/samples/res_config_sqlite3.conf.sample
diff --git a/configs/res_corosync.conf.sample b/configs/samples/res_corosync.conf.sample
index 9a72c1ccd..9a72c1ccd 100644
--- a/configs/res_corosync.conf.sample
+++ b/configs/samples/res_corosync.conf.sample
diff --git a/configs/res_curl.conf.sample b/configs/samples/res_curl.conf.sample
index cc472989f..cc472989f 100644
--- a/configs/res_curl.conf.sample
+++ b/configs/samples/res_curl.conf.sample
diff --git a/configs/res_fax.conf.sample b/configs/samples/res_fax.conf.sample
index dfaa4ce93..dfaa4ce93 100644
--- a/configs/res_fax.conf.sample
+++ b/configs/samples/res_fax.conf.sample
diff --git a/configs/res_ldap.conf.sample b/configs/samples/res_ldap.conf.sample
index ac345cdd4..ac345cdd4 100644
--- a/configs/res_ldap.conf.sample
+++ b/configs/samples/res_ldap.conf.sample
diff --git a/configs/res_odbc.conf.sample b/configs/samples/res_odbc.conf.sample
index 66659ae42..66659ae42 100644
--- a/configs/res_odbc.conf.sample
+++ b/configs/samples/res_odbc.conf.sample
diff --git a/configs/res_parking.conf.sample b/configs/samples/res_parking.conf.sample
index d24be2039..d24be2039 100644
--- a/configs/res_parking.conf.sample
+++ b/configs/samples/res_parking.conf.sample
diff --git a/configs/res_pgsql.conf.sample b/configs/samples/res_pgsql.conf.sample
index 015d68c13..cc7442fd0 100644
--- a/configs/res_pgsql.conf.sample
+++ b/configs/samples/res_pgsql.conf.sample
@@ -18,7 +18,7 @@ dbpass=password
 ; actual socket is constructed as a combination of dbsock and dbport.  For
 ; example, the values of '/tmp' and '5432', respectively, will specify a socket
 ; file of '/tmp/.s.PGSQL.5432'.
-;
+; 
 ;dbsock=/tmp
 ;
 ; requirements - At startup, each realtime family will make requirements
diff --git a/configs/res_pktccops.conf.sample b/configs/samples/res_pktccops.conf.sample
index 769508db6..769508db6 100644
--- a/configs/res_pktccops.conf.sample
+++ b/configs/samples/res_pktccops.conf.sample
diff --git a/configs/res_snmp.conf.sample b/configs/samples/res_snmp.conf.sample
index a6e40c8e2..a6e40c8e2 100644
--- a/configs/res_snmp.conf.sample
+++ b/configs/samples/res_snmp.conf.sample
diff --git a/configs/res_stun_monitor.conf.sample b/configs/samples/res_stun_monitor.conf.sample
index 12d32a4cd..12d32a4cd 100644
--- a/configs/res_stun_monitor.conf.sample
+++ b/configs/samples/res_stun_monitor.conf.sample
diff --git a/configs/rtp.conf.sample b/configs/samples/rtp.conf.sample
index c22acaa9f..c22acaa9f 100644
--- a/configs/rtp.conf.sample
+++ b/configs/samples/rtp.conf.sample
diff --git a/configs/say.conf.sample b/configs/samples/say.conf.sample
index 6285dbe1e..6285dbe1e 100644
--- a/configs/say.conf.sample
+++ b/configs/samples/say.conf.sample
diff --git a/configs/sip.conf.sample b/configs/samples/sip.conf.sample
index 0d81a6b63..0d81a6b63 100644
--- a/configs/sip.conf.sample
+++ b/configs/samples/sip.conf.sample
diff --git a/configs/sip_notify.conf.sample b/configs/samples/sip_notify.conf.sample
index 8224ee1ff..8224ee1ff 100644
--- a/configs/sip_notify.conf.sample
+++ b/configs/samples/sip_notify.conf.sample
diff --git a/configs/skinny.conf.sample b/configs/samples/skinny.conf.sample
index be88dc230..be88dc230 100644
--- a/configs/skinny.conf.sample
+++ b/configs/samples/skinny.conf.sample
diff --git a/configs/sla.conf.sample b/configs/samples/sla.conf.sample
index b5e1ef614..b5e1ef614 100644
--- a/configs/sla.conf.sample
+++ b/configs/samples/sla.conf.sample
diff --git a/configs/smdi.conf.sample b/configs/samples/smdi.conf.sample
index cca0a5cb9..cca0a5cb9 100644
--- a/configs/smdi.conf.sample
+++ b/configs/samples/smdi.conf.sample
diff --git a/configs/sorcery.conf.sample b/configs/samples/sorcery.conf.sample
index 7406214fb..7406214fb 100644
--- a/configs/sorcery.conf.sample
+++ b/configs/samples/sorcery.conf.sample
diff --git a/configs/ss7.timers.sample b/configs/samples/ss7.timers.sample
index 9cf9bd1ab..9cf9bd1ab 100644
--- a/configs/ss7.timers.sample
+++ b/configs/samples/ss7.timers.sample
diff --git a/configs/statsd.conf.sample b/configs/samples/statsd.conf.sample
index 806097300..806097300 100644
--- a/configs/statsd.conf.sample
+++ b/configs/samples/statsd.conf.sample
diff --git a/configs/telcordia-1.adsi b/configs/samples/telcordia-1.adsi
index 1486aa95e..1486aa95e 100644
--- a/configs/telcordia-1.adsi
+++ b/configs/samples/telcordia-1.adsi
diff --git a/configs/test_sorcery.conf.sample b/configs/samples/test_sorcery.conf.sample
index c465dbf74..c465dbf74 100644
--- a/configs/test_sorcery.conf.sample
+++ b/configs/samples/test_sorcery.conf.sample
diff --git a/configs/udptl.conf.sample b/configs/samples/udptl.conf.sample
index 1d635da5c..1d635da5c 100644
--- a/configs/udptl.conf.sample
+++ b/configs/samples/udptl.conf.sample
diff --git a/configs/unistim.conf.sample b/configs/samples/unistim.conf.sample
index c33426b0c..c33426b0c 100644
--- a/configs/unistim.conf.sample
+++ b/configs/samples/unistim.conf.sample
diff --git a/configs/users.conf.sample b/configs/samples/users.conf.sample
index 50b80a1c5..50b80a1c5 100644
--- a/configs/users.conf.sample
+++ b/configs/samples/users.conf.sample
diff --git a/configs/voicemail.conf.sample b/configs/samples/voicemail.conf.sample
index f3d7d4f44..f3d7d4f44 100644
--- a/configs/voicemail.conf.sample
+++ b/configs/samples/voicemail.conf.sample
diff --git a/configs/vpb.conf.sample b/configs/samples/vpb.conf.sample
index fecb3ec59..fecb3ec59 100644
--- a/configs/vpb.conf.sample
+++ b/configs/samples/vpb.conf.sample
diff --git a/configs/xmpp.conf.sample b/configs/samples/xmpp.conf.sample
index dad0f79ef..dad0f79ef 100644
--- a/configs/xmpp.conf.sample
+++ b/configs/samples/xmpp.conf.sample