Author: russell
Date: Wed Feb 28 17:02:49 2007
New Revision: 57209
URL: http://svn.digium.com/view/asterisk?view=rev&rev=57209
Log:
Merged revisions 57207 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r57207 | russell | 2007-02-28 17:01:52 -0600 (Wed, 28 Feb 2007) | 2 lines
minor tweaks to the sla docs
........
Modified:
trunk/ (props changed)
trunk/configs/sla.conf.sample
trunk/doc/sla.txt
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Modified: trunk/configs/sla.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/sla.conf.sample?view=diff&rev=57209&r1=57208&r2=57209
==============================================================================
--- trunk/configs/sla.conf.sample (original)
+++ trunk/configs/sla.conf.sample Wed Feb 28 17:02:49 2007
@@ -14,8 +14,9 @@
; ---- Trunk Declarations -------------
;
;[line1] ; Provide a name for this trunk.
+
;type=trunk ; This line is what marks this entry as a trunk.
-;
+
;device=Zap/3 ; Map this trunk declaration to a specific device.
; NOTE: At this point, this *must* be a zap channel!
@@ -58,7 +59,11 @@
; ---- Station Declarations ------------
+;[station1] ; Define a name for this station.
+
;type=station ; This line indicates that this entry is a station.
+
+;device=SIP/station1 ; Each station must be mapped to a device.
;autocontext=sla_stations ; This supports automatic generation of the dialplan entries if
; the autocontext option is used. All stations can use the same
@@ -100,10 +105,7 @@
; This value is in seconds.
-;[station1](station) ; Define a station that uses the configuration from the template "station".
-;device=SIP/station1 ; Each station must be mapped to a device.
-;
-;[station2](station)
+;[station2](station) ; Define a station that uses the configuration from the template "station".
;device=SIP/station2
;
;[station3](station)
Modified: trunk/doc/sla.txt
URL: http://svn.digium.com/view/asterisk/trunk/doc/sla.txt?view=diff&rev=57209&r1=57208&r2=57209
==============================================================================
--- trunk/doc/sla.txt (original)
+++ trunk/doc/sla.txt Wed Feb 28 17:02:49 2007
@@ -24,7 +24,7 @@
exten => s,1,SLATrunk(line1)
[line2]
-exten => s,2,SLATRUNK(line2)
+exten => s,2,SLATrunk(line2)
[sla_stations]
exten => station1,1,SLAStation(station1)