Index: configs/iax.conf.sample
===================================================================
--- configs/iax.conf.sample	(revision 229360)
+++ configs/iax.conf.sample	(working copy)
@@ -399,7 +399,7 @@
 ;
 [guest]
 type=user
-context=default
+context=public
 callerid="Guest IAX User"
 
 ;
Index: configs/extensions.lua.sample
===================================================================
--- configs/extensions.lua.sample	(revision 229360)
+++ configs/extensions.lua.sample	(working copy)
@@ -142,7 +142,7 @@
 		end;
 
 		["1000"] = function()
-			app.goto("default", "s", 1)
+			app.goto("demo", "s", 1)
 		end;
 
 		["1234"] = function()
@@ -192,6 +192,10 @@
 		include = {"demo"};
 	};
 
+	public = {
+		include = {"demo"};
+	};
+
 	["local"] = {
 		["_NXXXXXX"] = outgoing_local;
 	};
Index: configs/sip.conf.sample
===================================================================
--- configs/sip.conf.sample	(revision 229360)
+++ configs/sip.conf.sample	(working copy)
@@ -85,7 +85,7 @@
 ; "setvar" to set variables that can be used in the dialplan for various limits.
 
 [general]
-context=default                 ; Default context for incoming calls
+context=public                  ; Default context for incoming calls
 ;allowguest=no                  ; Allow or reject guest calls (default is yes)
 ;match_auth_username=yes        ; if available, match user entry using the
                                 ; 'username' field from the authentication line
Index: configs/vpb.conf.sample
===================================================================
--- configs/vpb.conf.sample	(revision 229360)
+++ configs/vpb.conf.sample	(working copy)
@@ -77,7 +77,7 @@
 ;
 ; Default context
 ;
-context=default
+context=public
 
 ;
 ; Echo cancellation
Index: configs/extensions.conf.sample
===================================================================
--- configs/extensions.conf.sample	(revision 229360)
+++ configs/extensions.conf.sample	(working copy)
@@ -500,6 +500,8 @@
 exten => s,n,Dial(${ARG1})
 exten => s,n(fail),Hangup
 
+[public]
+include => demo
 
 [demo]
 include => stdexten
Index: configs/chan_dahdi.conf.sample
===================================================================
--- configs/chan_dahdi.conf.sample	(revision 229360)
+++ configs/chan_dahdi.conf.sample	(working copy)
@@ -53,6 +53,7 @@
 ;
 ; Context for calls. Defaults to 'default'
 ;
+context=public
 ;context=incoming
 ;
 ; Switchtype:  Only used for PRI.
Index: configs/chan_ooh323.conf.sample
===================================================================
--- configs/chan_ooh323.conf.sample	(revision 229360)
+++ configs/chan_ooh323.conf.sample	(working copy)
@@ -88,7 +88,7 @@
 
 ;Sets default context all clients will be placed in.
 ;Default - default
-context=default
+context=public
 
 ;Sets rtptimeout for all clients, unless overridden
 ;Default - 60 seconds
Index: configs/manager.conf.sample
===================================================================
--- configs/manager.conf.sample	(revision 229360)
+++ configs/manager.conf.sample	(working copy)
@@ -57,6 +57,12 @@
 ;
 ;timestampevents = yes
 
+;
+; Display certain channel variables every time a channel-oriented
+; event is emitted:
+;
+;channelvars = var1,var2,var3
+
 ; debug = on	; enable some debugging info in AMI messages (default off).
 		; Also accessible through the "manager debug" CLI command.
 ;[mark]