Merge remote-tracking branch 'origin/master'

2 files changed, 11 insertions, 11 deletions

diff --git a/2022/organizers-notebook.md b/2022/organizers-notebook.md
index 86ca7fb1..990b7dc4 100644
--- a/2022/organizers-notebook.md
+++ b/2022/organizers-notebook.md
@@ -458,7 +458,7 @@ Hi, ${speakers-short}!
 
 ${prerec-note}Here are the instructions for uploading the video${plural} for your talk${plural}.
 You can find the latest version of the instructions at https://emacsconf.org/2022/upload/ .
-There are two ways to upload your talk${plural} this year:
+There are two ways to upload your talk${plural} this year, so you can pick the one that works best for you:
 
 -   Web-based: <https://ftp-upload.emacsconf.org> , password emacsconf
 -   FTP: host: ftp-upload.emacsconf.org, port: 21, username: anonymous, folder: upload-here
@@ -473,7 +473,7 @@ ${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 light text on a dark 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
 
@@ -1246,9 +1246,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?](#org67168c2)
--   [How do we want to name the BBB rooms?](#org516b046)
--   [Uh&#x2026; how should ikiwiki be set up?](#orgab7b157)
+-   [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)
 -   [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 +1459,7 @@ Ideas:
     -   Worked fine last time
 
 
-<a id="org67168c2"></a>
+<a id="org07aba36"></a>
 
 ## How easy do we want to make it to join the BBB session?
 
@@ -1487,7 +1487,7 @@ Options:
     -   Waiting users don&rsquo;t make the user notification go ding.
 
 
-<a id="org516b046"></a>
+<a id="org1654c5d"></a>
 
 ## How do we want to name the BBB rooms?
 
@@ -1502,7 +1502,7 @@ Needs to be easy to:
 ec22-sat-am-dev Speaker Name (slugs)
 
 
-<a id="orgab7b157"></a>
+<a id="orge17bde9"></a>
 
 ## Uh&#x2026; how should ikiwiki be set up?
 
@@ -2425,7 +2425,7 @@ Probably focus on grabbing the audio first and seeing what&rsquo;s worth keeping
 
 Make a table of the form
 
-<table id="orgad8e68d" border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
+<table id="org9ceb8dd" 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 7194f576..2b8c176c 100644
--- a/2022/organizers-notebook/index.org
+++ b/2022/organizers-notebook/index.org
@@ -210,7 +210,7 @@ Hi, ${speakers-short}!
 
 ${prerec-note}Here are the instructions for uploading the video${plural} for your talk${plural}.
 You can find the latest version of the instructions at https://emacsconf.org/2022/upload/ .
-There are two ways to upload your talk${plural} this year:
+There are two ways to upload your talk${plural} this year, so you can pick the one that works best for you:
 - Web-based: https://ftp-upload.emacsconf.org , password emacsconf
 - FTP: host: ftp-upload.emacsconf.org, port: 21, username: anonymous, folder: upload-here
 
@@ -223,7 +223,7 @@ ${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 light text on a dark background, with enough contrast to make
+- 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
 - leave 5 seconds of quiet at the end of the video to facilitate noise