[zaptel-commits] tzafrir: branch 1.4 r3973 - in /branches/1.4: ./ zaptel.conf.sample

[SVN commits to the Zaptel project]

Author: tzafrir
Date: Sun Mar  9 07:06:50 2008
New Revision: 3973

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

Merged revisions 3972 via svnmerge from 
http://svn.digium.com/svn/zaptel/branches/1.2

Modified:
    branches/1.4/   (props changed)
    branches/1.4/zaptel.conf.sample

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/zaptel.conf.sample
URL: http://svn.digium.com/view/zaptel/branches/1.4/zaptel.conf.sample?view=diff&rev=3973&r1=3972&r2=3973
==============================================================================
--- branches/1.4/zaptel.conf.sample (original)
+++ branches/1.4/zaptel.conf.sample Sun Mar  9 07:06:50 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 
@@ -119,7 +118,6 @@
 #   The zaptel driver performs HDLC encoding and decoding on the 
 #   bundle, and the resulting data is communicated via the master
 #   device.
-<<<<<<< .working
 # dchan::
 #   The zapdel driver performs HDLC encoding and decoding on the
 #   bundle and also performs incoming and outgoing FCS insertion
@@ -261,8 +259,7 @@
 #
 # Invert COR signal {y,n}
 #invertcor=y
-#
-# set the external tone mode; yes, no, internal {y,n,i}
+# Set the external tone mode; yes, no, internal {y,n,i}
 #exttone=y
 #
 # Now apply the configuration to the specified channels: