3 files changed, 75 insertions, 17 deletions
diff --git a/2022/volunteer.md b/2022/volunteer.md
index 39a96937..25607ee4 100644
--- a/2022/volunteer.md
+++ b/2022/volunteer.md
@@ -133,7 +133,7 @@ for infrastructure and video)) and we'll help you get set up.
 We'll post training material and shift schedules as the conference gets nearer.
 In the meantime, here are some roles you might be able to help with.
 
-### Check in
+### [[Check in|2022/volunteer/checkin]]
 
 When speakers check into the IRC channel, you can direct them to the
 right BigBlueButton room for their Q&A session and help them make sure
@@ -185,3 +185,5 @@ To volunteer as a host,
 
 [We'd love to hear from you!](mailto:emacsconf-org@gnu.org) (or privately:
 [emacsconf-org-private@gnu.org](mailto:emacsconf-org-private@gnu.org))
+
+[[!taglink CategoryVolunteer]]
diff --git a/2022/volunteer/checkin.md b/2022/volunteer/checkin.md
index 319e84e4..9443ec73 100644
--- a/2022/volunteer/checkin.md
+++ b/2022/volunteer/checkin.md
@@ -11,7 +11,10 @@ Perks:
 
 - You get to chat a little with speakers and help them feel at ease
 
-# Materials:
+# Preparation
+
+You'll need an account on bbb.emacsverse.org, and we'll set you up
+with moderator access on the relevant BBB rooms.
 
 We'll share a list of talks for your shift with:
 
@@ -26,8 +29,6 @@ We'll share a list of talks for your shift with:
 - email address
 - emergency contact information
 
-We'll also give you moderator access on the relevant BBB rooms.
-
 # Process
 
 ## Looking for speakers
@@ -43,16 +44,11 @@ When you notice a speaker checking in, you can use something like
 `/msg NICK Hi, let me help you get checked in. Please join BBB_URL .`
 to send a private message to the speaker with the Big Blue Button URL.
 
-Join the BBB room. If you do not have access, let sachac know.
-
-The BBB rooms will be set up so that people will need to be approved
-by a moderator in order to join the meeting, at least in the
-beginning. When the speaker arrives, you will see a **Waiting Users**
-entry on the left side with a red notification badge. Let the speaker
-in by clicking on **Accept** next to their name.
+Join the BBB room. If you do not have moderator access, let sachac know.
 
-You can take a few moments to say hi to them, thank them for
-presenting at EmacsConf, etc.
+The BBB rooms will be set up so that people can join without approval.
+When the speaker arrives, you can take a few moments to say hi to
+them, thank them for presenting at EmacsConf, etc.
 
 Click on their name and choose **Promote to moderator.** 
 
@@ -75,8 +71,13 @@ If the speaker wants to read questions as they come in on Etherpad or
 IRC, help them load the pad or the track-specific IRC channel. If
 there is a host for the session, the host can also read questions out
 loud. Let the speaker know that they can answer questions in any order
-they want, skip questions, or take a little time to think about their
-answers.
+they want, skip questions, take a little time to think about their
+answers, and answer questions for as short or as long as they'd like.
+The room is dedicated for their use, so they don't have to worry about
+stepping on someone else's Q&A. The first part of their Q&A will be
+streamed. The host will let them know when the time for streamed Q&A
+is almost done, but people can continue discussing things in the Q&A
+room if they want.
 
 Once the speaker is settled in, you can let `#emacsconf-org` know that
 the speaker has been checked in.
@@ -85,7 +86,7 @@ Let the speaker know how many minutes before their Q&A starts. They
 can take a break before then. Many speakers choose to watch other
 talks before theirs.
 
-# Heads-up before the Q&A starts
+## Heads-up before the Q&A starts
 
 Check in on the speaker about five minutes before their Q&A session
 starts to give them a heads-up. Ask them to close any other tabs that
@@ -98,11 +99,18 @@ the **Start recording** button at the top.
 
 In between checking in people, feel free to enjoy the conference!
 
-# What if a live Q&A session is starting within 30 minutes and the speaker hasn't shown up yet?
+## What if a live Q&A session is starting within 30 minutes and the speaker hasn't shown up yet?
 
 Let us know on `#emacsconf-org`. You or another organizer can contact
 them using their emergency contact info. If you prefer to not use your
 phone, you can ask one of the organizers in #emacsconf-org and we'll
 call the speaker for you.
 
+## After the Q&A wraps up
+
+If you notice that the Q&A in a room is all done, you can thank the
+speaker and click on **Stop recording** in the top middle.
+
+[[Check out other ways to volunteer|2022/volunteer]]
+
 [[!taglink CategoryVolunteer]]
diff --git a/2022/volunteer/irc.md b/2022/volunteer/irc.md
new file mode 100644
index 00000000..32fd0571
--- /dev/null
+++ b/2022/volunteer/irc.md
@@ -0,0 +1,48 @@
+[[!meta title="IRC volunteer"]]
+
+# Responsibilities
+
+- Keep an eye on the IRC channel for your track and copy questions to
+  the relevant Etherpad so that hosts and speakers can easily find
+  them.
+- (optional) Answer conference-related questions
+- (optional) Announce talks and Q&A sessions.
+
+# Preparation
+
+If you'd like to announce talks and Q&A sessions, we can share a pad
+with announcements that you can copy and paste.
+
+If you would like to help set the channel topic or moderate the
+channel, please ask one of the main organizers (bandali, zaeph, or
+sachac) to add you as a channel operator.
+
+# Process
+
+## Copying questions
+
+Open `#emacsconf-gen` and/or `#emacsconf-dev` depending on your shift
+and your ability to keep track of multiple things at the same time.
+
+In another window, open the Etherpad for the relevant talk(s). You can
+find pad URLs on the talk page or in the talk announcement that is
+also posted on IRC.
+
+When you notice a question posted in IRC, reply to the person and say
+that you'll copy the question into the relevant pad. If you're using
+ERC or another programmable IRC client, you may want to make a command
+that simplifies that process.
+
+Copy the question to the bottom of the question list of the relevant
+pad and add the person's nick after it in parentheses. Please keep it
+as a top-level item instead of nesting it under something else. You
+can reword the question for clarity if needed.
+
+## Announcing talks and Q&A sessions
+
+At the indicated time, paste the announcement into the relevant
+channel. (This might be automated if we get around to it.)
+
+[[Check out other ways to volunteer|2022/volunteer]]
+
+[[!taglink CategoryVolunteer ]]