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

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57209 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configs/sla.conf.sample b/configs/sla.conf.sample
index 55312cb65eced5adbe340e8d93f0a3318ed729d4..5e2aeeb901660903d24d5e2daf08a6bbdc7606d3 100644 (file)
--- a/configs/sla.conf.sample
+++ b/configs/sla.conf.sample
@@ -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,8 +59,12 @@
 
 ; ---- 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 
                             ; context without conflict.  The device for this station should 
@@ -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)

diff --git a/doc/sla.txt b/doc/sla.txt
index 7b78001a90957528eba3f6980ba27d812f1ca6e1..8e9eb2b4c1861a0d28138c40ab8d50226cc3a211 100644 (file)
--- a/doc/sla.txt
+++ b/doc/sla.txt
@@ -24,7 +24,7 @@ voicemail:
 exten => s,1,SLATrunk(line1)
 
 [line2]
-exten => s,2,SLATRUNK(line2)
+exten => s,2,SLATrunk(line2)
 
 [sla_stations]
 exten => station1,1,SLAStation(station1)