summaryrefslogtreecommitdiff
path: root/configs/motif.conf.sample
diff options
context:
space:
mode:
authorMatthew Jordan <mjordan@digium.com>2013-02-15 13:38:12 +0000
committerMatthew Jordan <mjordan@digium.com>2013-02-15 13:38:12 +0000
commitd04ab3c6450f3d92aa004ae9d6e0e7da51f702a3 (patch)
tree821330ff71a4484afa46ade4a2bbd211c800a992 /configs/motif.conf.sample
parentedf0483f4f0e73ded128f1e613b60f31925af102 (diff)
Add CLI configuration documentation
This patch allows a module to define its configuration in XML in source, such that it can be parsed by the XML documentation engine. Documentation is generated in a two-pass approach: 1. The documentation is first generated from the XML pulled from the source 2. The documentation is then enhanced by the registration of configuration options that use the configuration framework This patch include configuration documentation for the following modules: * chan_motif * res_xmpp * app_confbridge * app_skel * udptl Two new CLI commands have been added: * config show help - show configuration help by module, category, and item * xmldoc dump - dump the in-memory representation of the XML documentation to a new XML file. Review: https://reviewboard.asterisk.org/r/2278 Review: https://reviewboard.asterisk.org/r/2058 patches: on review 2058 uploaded by twilson git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@381527 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'configs/motif.conf.sample')
-rw-r--r--configs/motif.conf.sample27
1 files changed, 17 insertions, 10 deletions
diff --git a/configs/motif.conf.sample b/configs/motif.conf.sample
index ae3ab30d7..9d5bc808c 100644
--- a/configs/motif.conf.sample
+++ b/configs/motif.conf.sample
@@ -75,18 +75,25 @@ context=incoming-motif ; Default context that incoming sessions will land in
;maxpayloads = 30 ; Maximum number of payloads we will offer
; Sample configuration entry for Jingle
-[jingle-endpoint](default)
-transport=ice-udp ; Change the default protocol of outgoing sessions to Jingle ICE-UDP
-allow=g722 ; Add G.722 as an allowed format since the other side may support it
-connection=local-jabber-account ; Connection to accept traffic on and send traffic out
-accountcode=jingle ; Account code for CDR purposes
+;[jingle-endpoint](default)
+;transport=ice-udp ; Change the default protocol of outgoing sessions to Jingle ICE-UDP
+;allow=g722 ; Add G.722 as an allowed format since the other side may support it
+;connection=local-jabber-account ; Connection to accept traffic on and send traffic out
+;accountcode=jingle ; Account code for CDR purposes
; Sample configuration entry for Google Talk
[gtalk-endpoint](default)
-transport=google ; Since this is a Google Talk endpoint we want to offer Google Jingle for outgoing sessions
-connection=gtalk-account
+;transport=google ; Since this is a Google Talk endpoint we want to offer Google Jingle for outgoing sessions
+;connection=gtalk-account
; Sample configuration entry for Google Voice
-[gvoice](default)
-transport=google-v1 ; Google Voice uses the original Google Talk protocol
-connection=gvoice-account
+;[gvoice](default)
+;transport=google-v1 ; Google Voice uses the original Google Talk protocol
+;connection=gvoice-account
+
+; Additional options
+; callgroup
+; pickupgroup
+; language
+; musicclass
+; parkinglot