summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSacha Chua <sacha@sachachua.com>2021-11-27 08:53:37 -0500
committerSacha Chua <sacha@sachachua.com>2021-11-27 08:53:37 -0500
commit0676b5908139c057359f3b60a3e3d6a6d3dee711 (patch)
tree452e5ce454f47e41a16a936f9a75708602e2d6c5
parent680e81be257d2740e922a8f57cfa0766f7bb12f5 (diff)
downloademacsconf-wiki-0676b5908139c057359f3b60a3e3d6a6d3dee711.tar.xz
emacsconf-wiki-0676b5908139c057359f3b60a3e3d6a6d3dee711.zip
update
Diffstat (limited to '')
-rw-r--r--2021/talks/day1-open.md19
-rw-r--r--playbook.md28
2 files changed, 37 insertions, 10 deletions
diff --git a/2021/talks/day1-open.md b/2021/talks/day1-open.md
index 76a8e9d7..11892889 100644
--- a/2021/talks/day1-open.md
+++ b/2021/talks/day1-open.md
@@ -10,12 +10,15 @@
[[!inline pages="internal(2021/info/day1-open-schedule)" raw="yes"]]
- Welcome to EmacsConf 2021
-- How to participate
-- Conduct guidelines
+- How to participate:
+ - Collecting questions, answers, and shared notes on Etherpad (https://etherpad.wikimedia.org/p/emacsconf-2021)
+ - You can also post questions and discuss things on #emacsconf on chat.emacsconf.org (frontend for libera.chat if you want to use your favorite IRC client)
+- Conduct guidelines:
+ - One of the neat things about Emacs is that there are so many ways to do things. Please remember to be nice! =)
- What's new in this EmacsConf 2021
- - Lots of talks! Shorter time, Q&A might be live/pad/IRC, might have alternate stream
- - Streaming with open captions thanks to volunteers
- - Prerecorded videos will be published as soon as we can
+ - Lots of talks! Shorter time, Q&A might be live/pad/IRC, might have alternate stream if needed
+ - Streaming with open captions thanks to volunteers - all the day 1 talks have been captioned, and we might get day 2 sorted out too
+ - Prerecorded videos will be published as soon as we can (aiming for publishing them as the talks stream, so you can easily catch up with any talks you've missed)
- APAC-time-friendly alternate stream by LibreAustralia folks <https://libreau.org/upcoming.html#emacsconf21>
- Thanks
- Speakers, volunteers
@@ -30,15 +33,15 @@
- Organizers
- Everyone
- Schedule overview
- - Day 1 (general talks), Day 2 (development) - but come back for the closing talk on M-x Forever by David Wilson (System Crafters)
+ - Day 1 (general talks), Day 2 (development) - but come back for some general-audience talks at the end of day 2, including the closing talk on M-x Forever by David Wilson (System Crafters)
- Day 1
- Morning
- User stories
- Philosophy (including a talk by Prot)
- Configuration
- - Emacs's flexibility
+ - Demos of Emacs's flexibility
- Afternoon
- - A peek behind the curtain at Emacs Development
+ - A peek behind the curtain at Emacs Development (janitor talk)
- Org Mode
- Workflows
- Tech
diff --git a/playbook.md b/playbook.md
index 23809cb1..d8c04274 100644
--- a/playbook.md
+++ b/playbook.md
@@ -123,6 +123,30 @@
<td class="org-left">${media}</td>
<td class="org-left"><a href="file://ssh:front:/var/www/media.emacsconf.org/2021/">file://ssh:front:/var/www/media.emacsconf.org/2021/</a></td>
</tr>
+
+
+<tr>
+<td class="org-left">${live-main}</td>
+<td class="org-left"><a href="file://ssh:front:/var/www/live.emacsconf.org/main.html">file://ssh:front:/var/www/live.emacsconf.org/main.html</a></td>
+</tr>
+
+
+<tr>
+<td class="org-left">${live-480p}</td>
+<td class="org-left"><a href="file://ssh:front:/var/www/live.emacsconf.org/main-480p.html">file://ssh:front:/var/www/live.emacsconf.org/main-480p.html</a></td>
+</tr>
+
+
+<tr>
+<td class="org-left">${live-index}</td>
+<td class="org-left"><a href="file://ssh:front:/var/www/live.emacsconf.org/index.html">file://ssh:front:/var/www/live.emacsconf.org/index.html</a></td>
+</tr>
+
+
+<tr>
+<td class="org-left">${live-alt}</td>
+<td class="org-left"><a href="file://ssh:front:/var/www/live.emacsconf.org/alt.html">file://ssh:front:/var/www/live.emacsconf.org/alt.html</a></td>
+</tr>
</tbody>
</table>
@@ -159,9 +183,9 @@
- Start backup process for pad
while true; do
- curl https://etherpad.wikimedia.org/p/emacsconf-2021/export/html > emacsconf-$(date +"%Y%m%d-%H%M%S").html
+ curl https://etherpad.wikimedia.org/p/emacsconf-2021/export/html > emacsconf-$(date +"%Y%m%d-%H%M%S").html
sleep 15m
- end
+ done
- Computer for alternate streaming:
- Open browser for joining BBB
- Open MPV for playing <https://live0.emacsconf.org/main.webm>