Merge branch 'master' of git://git.emacsconf.org/emacsconf-wiki

2 files changed, 24 insertions, 20 deletions

diff --git a/2022/organizers-notebook.md b/2022/organizers-notebook.md
index 990b7dc4..0dac8bbc 100644
--- a/2022/organizers-notebook.md
+++ b/2022/organizers-notebook.md
@@ -103,7 +103,7 @@ Other projects:
 <td class="org-left"><span class="timestamp-wrapper"><span class="timestamp">[2022-10-16 Sun]</span></span></td>
 <td class="org-left"><a href="#etherpad">Etherpad</a>, <a href="#upload">stream</a></td>
 <td class="org-left">&#xa0;</td>
-<td class="org-left">&#xa0;</td>
+<td class="org-left">infra update</td>
 <td class="org-left">&#xa0;</td>
 </tr>
 
@@ -463,9 +463,9 @@ There are two ways to upload your talk${plural} this year, so you can pick the o
 -   Web-based: <https://ftp-upload.emacsconf.org> , password emacsconf
 -   FTP: host: ftp-upload.emacsconf.org, port: 21, username: anonymous, folder: upload-here
 
-If you upload slides and other resources, we can include them on the
-talk page when your talk goes live. If you happen to have a script,
-please include that as well. We can use it to help with captions.
+If you upload slides and other resources, we can include them on the talk page
+when your talk goes live. If you happen to have a script or a transcript,
+please include them as well (it’ll speed up the captioning for us).
 
 Please start your filenames with the ID for the talk that it&rsquo;s for:
 ${slugs}.
@@ -473,9 +473,11 @@ ${slugs}.
 If you&rsquo;re still working on your talk, you might find the tips at <https://emacsconf.org/2022/prepare> useful. In brief:
 
 -   at least 1280x720 resolution
--   we recommend dark text on a light background, with enough contrast to make it easy to read
+-   we recommend dark text on a light background, with enough contrast to make
+    it easy to read
 -   if possible, use a headset or external microphone to record your audio
--   if you can leave 5 seconds of quiet (just background noise) at the end of the video, we can try to use that for noise reduction
+-   leave 5 seconds of quiet at the end of the video to facilitate noise
+    reduction for us
 
 Please plan to upload your talk by November 4 (next Friday) so that we
 can get started preparing it for streaming. If you can&rsquo;t make it by
@@ -1015,7 +1017,7 @@ Where:
     Nice if there&rsquo;s an Ansible playbook
     
     sachac&rsquo;s notes:
-    <file:///home/sacha/code/docker/emacsconf-publish/>
+    <file:///home/zaeph/code/docker/emacsconf-publish/>
 -   probably good to set it up on front
 
 It&rsquo;s now on front. 
@@ -1246,9 +1248,9 @@ Note on how DebConf handled incidents:
 -   [How do we want to make better use of Etherpad?](#pad-decision)
 -   [Can we nudge people to ask IRC questions in a way that will make it easier for us to follow them?](#irc-markers)
 -   [How many BBB rooms do we want to set up?](#bbb-rooms)
--   [How easy do we want to make it to join the BBB session?](#org07aba36)
--   [How do we want to name the BBB rooms?](#org1654c5d)
--   [Uh&#x2026; how should ikiwiki be set up?](#orge17bde9)
+-   [How easy do we want to make it to join the BBB session?](#org093cf00)
+-   [How do we want to name the BBB rooms?](#org4a3e415)
+-   [Uh&#x2026; how should ikiwiki be set up?](#org5145555)
 -   [Do we want people to advertise any openings with their companies or any work that they&rsquo;re looking for?](#advertising)
 -   [Decision archive](#decision-archive)
 
@@ -1459,7 +1461,7 @@ Ideas:
     -   Worked fine last time
 
 
-<a id="org07aba36"></a>
+<a id="org093cf00"></a>
 
 ## How easy do we want to make it to join the BBB session?
 
@@ -1487,7 +1489,7 @@ Options:
     -   Waiting users don&rsquo;t make the user notification go ding.
 
 
-<a id="org1654c5d"></a>
+<a id="org4a3e415"></a>
 
 ## How do we want to name the BBB rooms?
 
@@ -1502,7 +1504,7 @@ Needs to be easy to:
 ec22-sat-am-dev Speaker Name (slugs)
 
 
-<a id="orge17bde9"></a>
+<a id="org5145555"></a>
 
 ## Uh&#x2026; how should ikiwiki be set up?
 
@@ -2425,7 +2427,7 @@ Probably focus on grabbing the audio first and seeing what&rsquo;s worth keeping
 
 Make a table of the form
 
-<table id="org9ceb8dd" border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
+<table id="orgce84c9c" border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
 
 
 <colgroup>
diff --git a/2022/organizers-notebook/index.org b/2022/organizers-notebook/index.org
index 2ea43c2b..4d789ee3 100644
--- a/2022/organizers-notebook/index.org
+++ b/2022/organizers-notebook/index.org
@@ -60,7 +60,7 @@ or ~C-c \~ (~org-match-sparse-tree~) to see anything tagged with your tag.
 |                  | Work                 | Speakers                                        | Volunteers                                    | Public             |
 | [2022-09-30 Fri] |                      | [[#acceptance][acceptance, reply to confirm]]                    |                                               |                    |
 | [2022-10-09 Sun] |                      | [[#check-sched][schedule, reply if not okay]]                     | [[#volunteer-2022-10-09][overall priorities]] |                    |
-| [2022-10-16 Sun] | [[#etherpad][Etherpad]], [[#upload][stream]]     |                                                 | [[#volunteer-2022-10-17][infra update]]                                  |                    |
+| [2022-10-16 Sun] | [[#etherpad][Etherpad]], [[#upload][stream]]     |                                                 | infra update                                  |                    |
 | [2022-10-23 Sun] | [[#upload][file upload]]          | [[#mail-upload][file upload instructions]]                        | [[#volunteer-2022-10-23][training]]                                |                    |
 | [2022-10-30 Sun] | [[#intro][intro, exit]]          |                                                 | [[#shifts][shifts]]                                        | [[#announce-program][schedule]], posters? |
 | [2022-11-06 Sun] | [[#write-viewing][watch pages]], prerecs | [[#ack-prerec][prerec confirmation]]/reminder, [[#approve-captions][caption progress]]  | caption kickoff                               |                    |
@@ -214,18 +214,20 @@ There are two ways to upload your talk${plural} this year, so you can pick the o
 - Web-based: https://ftp-upload.emacsconf.org , password emacsconf
 - FTP: host: ftp-upload.emacsconf.org, port: 21, username: anonymous, folder: upload-here
 
-If you upload slides and other resources, we can include them on the
-talk page when your talk goes live. If you happen to have a script,
-please include that as well. We can use it to help with captions.
+If you upload slides and other resources, we can include them on the talk page
+when your talk goes live. If you happen to have a script or a transcript,
+please include them as well (it’ll speed up the captioning for us).
 
 Please start your filenames with the ID for the talk that it's for:
 ${slugs}.
 
 If you're still working on your talk, you might find the tips at https://emacsconf.org/2022/prepare useful. In brief:
 - at least 1280x720 resolution
-- we recommend dark text on a light background, with enough contrast to make it easy to read
+- we recommend dark text on a light background, with enough contrast to make
+  it easy to read
 - if possible, use a headset or external microphone to record your audio
-- if you can leave 5 seconds of quiet (just background noise) at the end of the video, we can try to use that for noise reduction
+- leave 5 seconds of quiet at the end of the video to facilitate noise
+  reduction for us
 
 Please plan to upload your talk by November 4 (next Friday) so that we
 can get started preparing it for streaming. If you can't make it by