summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2015-07-20 18:30:40 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2015-07-20 18:30:40 -0500
commitd16347f33b04ee449481f00189cc6b432e9da682 (patch)
tree0c129b4da99b4055ff7ff8d62f97dc3e8823db59
parentd9094ddd73410fc4da65795511dc6912e007d503 (diff)
parent62c64c3bd1938280cf671afd6708d6026c0b8e49 (diff)
Merge "Documentation: A couple of trivial fixes in sip.conf.sample and func_cdr.c" into 13
-rw-r--r--configs/samples/sip.conf.sample2
-rw-r--r--funcs/func_cdr.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/configs/samples/sip.conf.sample b/configs/samples/sip.conf.sample
index a34b5fa3e..44d2d4352 100644
--- a/configs/samples/sip.conf.sample
+++ b/configs/samples/sip.conf.sample
@@ -802,7 +802,7 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls
;
;register => tls://username:xxxxxx@sip-tls-proxy.example.org
;
-; The 'transport' part defaults to 'udp' but may also be 'tcp', 'tls', 'ws', or 'wss'.
+; The 'transport' part defaults to 'udp' but may also be 'tcp' or 'tls'.
; Using 'udp://' explicitly is also useful in case the username part
; contains a '/' ('user/name').
diff --git a/funcs/func_cdr.c b/funcs/func_cdr.c
index ca54b1e42..95d047eb2 100644
--- a/funcs/func_cdr.c
+++ b/funcs/func_cdr.c
@@ -180,7 +180,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<para>Write-Only</para>
</enum>
<enum name="disable">
- <para>Disable CDRs for this channel.</para>
+ <para>Setting to 1 will disable CDRs for this channel.
+ Setting to 0 will enable CDRs for this channel.</para>
<para>Write-Only</para>
</enum>
</enumlist>