summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--2022/watch.md23
1 files changed, 12 insertions, 11 deletions
diff --git a/2022/watch.md b/2022/watch.md
index 3bdb93cf..9c91167f 100644
--- a/2022/watch.md
+++ b/2022/watch.md
@@ -14,11 +14,12 @@ video. If that still doesn't work, please check our status page at
parts of our infrastructure, and instructions on how to get in touch
with us about disruptions.
-If you prefer, you can watch the livestream via Toobnix:
-[General track](https://toobnix.org/w/7t9X8eXuSby8YpyEKTb4aj),
-[Development track](https://toobnix.org/w/w6K77y3bNMo8xsNuqQeCcD).
-Pre-recorded videos and replays will also be available on Toobnix in
-the [EmacsConf channel](https://toobnix.org/c/emacsconf).
+If you prefer, you can watch the livestream via Toobnix (a PeerTube
+instance): [General
+track](https://toobnix.org/w/7t9X8eXuSby8YpyEKTb4aj), [Development
+track](https://toobnix.org/w/w6K77y3bNMo8xsNuqQeCcD). Pre-recorded
+videos and replays will also be available on Toobnix in the [EmacsConf
+channel](https://toobnix.org/c/emacsconf).
To participate in the Q&A, please check the [[talks]] index for a link
to the talk page, and [[read these Q&A tips|qa]]. The talk page will
@@ -36,14 +37,14 @@ and questions to the Etherpad.
Here are the irc.libera.chat IRC channels that we'll be using this year:
-- #emacsconf-gen: discussion for the General track
-- #emacsconf-dev: discussion for the development track
-- #emacsconf: hallway conversations, other general conversations
-- #emacsconf-org: if you need to get in touch with the organizers
+- \#emacsconf-gen: discussion for the General track
+- \#emacsconf-dev: discussion for the development track
+- \#emacsconf: hallway conversations, other general conversations
+- \#emacsconf-org: if you need to get in touch with the organizers
You can use the `/JOIN` command in an IRC client (ex:
-chat.emacsconf.org) to join a different channel. Ex: `/join
-#emacsconf-org` if you want to talk to the organizers.
+chat.emacsconf.org) to join a different channel. Ex: `/join #emacsconf-org`
+if you want to talk to the organizers.
Pre-recorded talk videos will be available on the talk pages after the
talks go live, and other videos (including Q&A) will also be added to