[Debconf-video-commits] r527 - in package/trunk: conf/dc10 doc

[Eric Dantan Rzewnicki]

Author: edrz-guest
Date: 2010-07-01 23:01:16 +0000 (Thu, 01 Jul 2010)
New Revision: 527

Modified:
   package/trunk/conf/dc10/default-scratchy
   package/trunk/conf/dc10/default-selma
   package/trunk/doc/streaming-plan.txt
Log:
Fix documentation bug. Swap scratch/selma room names.



Modified: package/trunk/conf/dc10/default-scratchy
===================================================================
--- package/trunk/conf/dc10/default-scratchy	2010-07-01 20:27:01 UTC (rev 526)
+++ package/trunk/conf/dc10/default-scratchy	2010-07-01 23:01:16 UTC (rev 527)
@@ -1,7 +1,7 @@
 # Name of the location from which we are recording
 CONFERENCE_NAME='DebConf10'
 VENUE_NAME="Columbia University, New York City, United States"
-ROOM_NAME="Davis Auditorium"
+ROOM_NAME="Interschool Lab"
 # Sources and sinks
 SOURCES="firewire:scratchy firewire:itchy/0 firewire:itchy/1"
 SINKS="icecast:daffy file:barney"

Modified: package/trunk/conf/dc10/default-selma
===================================================================
--- package/trunk/conf/dc10/default-selma	2010-07-01 20:27:01 UTC (rev 526)
+++ package/trunk/conf/dc10/default-selma	2010-07-01 23:01:16 UTC (rev 527)
@@ -1,7 +1,7 @@
 # Name of the location from which we are recording
 CONFERENCE_NAME='DebConf10'
 VENUE_NAME="Columbia University, New York City, United States"
-ROOM_NAME="Interschool Lab"
+ROOM_NAME="Davis Auditorium"
 # Sources and sinks
 SOURCES="firewire:selma firewire:patty/0 firewire:patty/1"
 SINKS="icecast:daffy file:barney"

Modified: package/trunk/doc/streaming-plan.txt
===================================================================
--- package/trunk/doc/streaming-plan.txt	2010-07-01 20:27:01 UTC (rev 526)
+++ package/trunk/doc/streaming-plan.txt	2010-07-01 23:01:16 UTC (rev 527)
@@ -16,7 +16,7 @@
     interschool_lab: (relayed by krusty)
 
 krusty.debconf.org (dc-ext-master)
-    relays davis_auditorium & interschool_lab via <master_relay> from lisa
+    relays davis_auditorium & interschool_lab via <relay> from lisa
     relays fallback from apu
 
 apu
@@ -25,7 +25,7 @@
   relays krusty's davis_auditorium & interschool_lab
 
 other, non-apu relays
-  relay all krusty mountpoints via <master_relay>
+  relay krusty mountpoints via <relay> definititions