[zaptel-commits] tzafrir: branch 1.2 r3972 - in /branches/1.2: Makefile zaptel.conf.sample

[SVN commits to the Zaptel project]

Author: tzafrir
Date: Sun Mar  9 06:59:19 2008
New Revision: 3972

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3972
Log:
More asciidoc polishes and small sample file fixes.

Modified:
    branches/1.2/Makefile
    branches/1.2/zaptel.conf.sample

Modified: branches/1.2/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/Makefile?view=diff&rev=3972&r1=3971&r2=3972
==============================================================================
--- branches/1.2/Makefile (original)
+++ branches/1.2/Makefile Sun Mar  9 06:59:19 2008
@@ -367,7 +367,7 @@
 
 zaptel.conf.asciidoc: zaptel.conf.sample
 	perl -n -e \
-		'if (/^#($$|\s)(.*)/){ if (!$$in_doc){print "\n"}; $$in_doc=1; print "$$2\n" } else { $$in_doc=0; print "  $$_" }' \
+		'if (/^#($$|\s)(.*)/){ if (!$$in_doc){print "\n"}; $$in_doc=1; print "$$2\n" } else { if ($$in_doc){print "\n"}; $$in_doc=0; print "  $$_" }' \
 		$< >$@
 
 README.html: README zaptel.conf.asciidoc

Modified: branches/1.2/zaptel.conf.sample
URL: http://svn.digium.com/view/zaptel/branches/1.2/zaptel.conf.sample?view=diff&rev=3972&r1=3971&r2=3972
==============================================================================
--- branches/1.2/zaptel.conf.sample (original)
+++ branches/1.2/zaptel.conf.sample Sun Mar  9 06:59:19 2008
@@ -42,16 +42,15 @@
 #  6: -15db (CSU)
 #  7: -22.5db (CSU)
 #
-# The framing is one of "d4" or "esf" for T1 or "cas" or "ccs" for E1
-#
-# Note: "d4" could be referred to as "sf" or "superframe" 
-#
-# The coding is one of "ami" or "b8zs" for T1 or "ami" or "hdb3" for E1
-#
-# E1's may have the additional keyword "crc4" to enable CRC4 checking
-#
-# If the keyword "yellow" follows, yellow alarm is transmitted when no
-# channels are open.
+# framing:: 
+#   one of 'd4' or 'esf' for T1 or 'cas' or 'ccs' for E1 and BRI.
+#  'd4' could be referred to as 'sf' or 'superframe'
+#
+# coding:: 
+#   one of 'ami' or 'b8zs' for T1 or 'ami' or 'hdb3' for E1 and BRI.
+#   * For E1 there is the optional keyword 'crc4' to enable CRC4 checking.
+#   * If the keyword 'yellow' follows, yellow alarm is transmitted when no
+#     channels are open.
 #
 #span=1,0,0,esf,b8zs
 #span=2,1,0,esf,b8zs
@@ -101,7 +100,7 @@
 #    
 #     channel# => sf:<rxfreq>,<rxbw>,<rxflag>,<txfreq>,<txlevel>,<txflag>
 #   
-#   rxfreq is rx tone freq in hz, rxbw is rx notch (and decode)
+#   rxfreq is rx tone freq in Hz, rxbw is rx notch (and decode)
 #   bandwith in hz (typically 10.0), rxflag is either 'normal' or
 #   'inverted', txfreq is tx tone freq in hz, txlevel is tx tone 
 #   level in dbm, txflag is either 'normal' or 'inverted'. Set 
@@ -240,14 +239,28 @@
 # valid values are {3125,6250,9375,12500,15625,18750,21875,25000}
 #corthresh=12500
 # Invert COR signal {y,n}
-# invertcor=y
-# # set the external tone mode; yes, no, internal {y,n,i}
+#invertcor=y
+# Set the external tone mode; yes, no, internal {y,n,i}
 #exttone=y
 #
 # Now apply the configuration to the specified channels:
 #
-# # We are all done with our channel parameters, so now we specify what
-# # channels they apply to
+# We are all done with our channel parameters, so now we specify what
+# channels they apply to
 #channels=1-4
-
-
+#
+# Overiding PCM encoding
+# ~~~~~~~~~~~~~~~~~~~~~~
+# Usually the channel driver sets the encoding of the PCM for the
+# channel (mulaw / alaw. That is: g711u or g711a). However there are
+# some cases where you would like to override that. 'mulaw' and 'alaw'
+# set different such encoding. Use them for channels you have already
+# defined with e.g. 'bchan' or 'fxoks'.
+#mulaw=1-4
+#alaw=1-4
+#
+# 'deflaw' is similar, but resets the encoding to the channel driver's
+# default. It must be useful for something, I guess.
+#mulaw=1-10
+#deflaw=5
+#