[svn-commits] russell: branch russell/sla_updates r57237 - in /team/russell/sla_updates: ./...

[svn-commits at lists.digium.com]

Author: russell
Date: Wed Feb 28 17:26:41 2007
New Revision: 57237

URL: http://svn.digium.com/view/asterisk?view=rev&rev=57237
Log:
Merged revisions 57203,57207 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r57203 | russell | 2007-02-28 16:07:05 -0600 (Wed, 28 Feb 2007) | 7 lines

Merge more changes from svn/asterisk/team/russell/sla_updates

* Add support for private hold.  By setting "hold=private" for a trunk, only
  the station that put the call on hold will be able to retrieve it from hold.
  Also, by setting "hold=private" for a station, any call that station puts
  on hold can only be retrieved by that station.

........
r57207 | russell | 2007-02-28 17:01:52 -0600 (Wed, 28 Feb 2007) | 2 lines

minor tweaks to the sla docs

........

Modified:
    team/russell/sla_updates/   (props changed)
    team/russell/sla_updates/configs/sla.conf.sample
    team/russell/sla_updates/doc/sla.txt

Propchange: team/russell/sla_updates/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Feb 28 17:26:41 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-57147
+/branches/1.4:1-57236

Modified: team/russell/sla_updates/configs/sla.conf.sample
URL: http://svn.digium.com/view/asterisk/team/russell/sla_updates/configs/sla.conf.sample?view=diff&rev=57237&r1=57236&r2=57237
==============================================================================
--- team/russell/sla_updates/configs/sla.conf.sample (original)
+++ team/russell/sla_updates/configs/sla.conf.sample Wed Feb 28 17:26:41 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: team/russell/sla_updates/doc/sla.txt
URL: http://svn.digium.com/view/asterisk/team/russell/sla_updates/doc/sla.txt?view=diff&rev=57237&r1=57236&r2=57237
==============================================================================
--- team/russell/sla_updates/doc/sla.txt (original)
+++ team/russell/sla_updates/doc/sla.txt Wed Feb 28 17:26:41 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)