summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSacha Chua <sacha@sachachua.com>2022-10-19 09:19:28 -0400
committerSacha Chua <sacha@sachachua.com>2022-10-19 09:19:28 -0400
commitd0d9f4ade602a263126101e9e6d63af6091b1ee9 (patch)
tree8a7d53e4e1f964b6008343523c851a123e343b21
parentc512858019821fdcff522f9efca570ee77ad5d1c (diff)
downloademacsconf-wiki-d0d9f4ade602a263126101e9e6d63af6091b1ee9.tar.xz
emacsconf-wiki-d0d9f4ade602a263126101e9e6d63af6091b1ee9.zip
try to make it clear that people don't have to upload to both
-rw-r--r--2022/organizers-notebook.md16
-rw-r--r--2022/organizers-notebook/index.org2
2 files changed, 9 insertions, 9 deletions
diff --git a/2022/organizers-notebook.md b/2022/organizers-notebook.md
index 8d5ea88f..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
@@ -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?](#orge6ad039)
-- [How do we want to name the BBB rooms?](#org366a5a7)
-- [Uh&#x2026; how should ikiwiki be set up?](#org2c63cda)
+- [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="orge6ad039"></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="org366a5a7"></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="org2c63cda"></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="org8c7ed19" 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 c6032daf..80af12d0 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