* 2022/cfp.org: First pass for changes for 2022.

Mainly, experiment with renaming the CfP from 'Call for Proposals' to
'Call for Participation', and drop the 'Office hours' section for the
time being.

1 files changed, 42 insertions, 59 deletions

diff --git a/2022/cfp.md b/2022/cfp.md
index 0b0a9acd..c848043c 100644
--- a/2022/cfp.md
+++ b/2022/cfp.md
@@ -1,15 +1,22 @@
-[[!meta title="Call for Proposals"]]
-[[!meta copyright="Copyright &copy; 2020 Amin Bandali, Sacha Chua, David Bremner<br />Copyright &copy; 2021 Amin Bandali, Sacha Chua, Leo Vivier, Sebastian Crane"]]
-<!-- This file is exported from cfp.org, so don't modify it directly. --->
+[[!meta title="Call for Participation"]]
+[[!meta copyright="Copyright &copy; 2020 Amin Bandali, Sacha Chua,
+David Bremner<br />
+Copyright &copy; 2021 Amin Bandali, Sacha Chua, Leo Vivier,
+Sebastian Crane<br />
+Copyright &copy; 2022 Amin Bandali"]]
+<!-- cfp.md is exported from cfp.org, please modify that instead. -->
 
 
-# Call for Proposals
+# THIS IS A DRAFT; PLEASE DO NOT POST/SHARE!
 
-[EmacsConf 2021](https://emacsconf.org/2021/) will be a virtual conference on **November 27 and 28,
-2021 (Sat-Sun)**.  If you'd like to present at the conference, please
-[submit your proposal](https://emacsconf.org/2021/cfp/) by **September 30, 2021**.
 
-EmacsConf 2021 is about the joy of [Emacs](https://www.gnu.org/software/emacs/) and Emacs Lisp.  Come share
+# Call for Participation
+
+[EmacsConf 2022](https://emacsconf.org/2022/) will be a virtual conference on **MMMM DD and DD,
+2022 (Sat-Sun)**.  If you'd like to present at the conference, please
+[submit your proposal](https://emacsconf.org/2022/cfp/) by **August 31, 2022**.
+
+EmacsConf 2022 is about the joy of [Emacs](https://www.gnu.org/software/emacs/) and Emacs Lisp.  Come share
 your experiments and adventures with the Emacs text editor / operating
 system / way of life!  We welcome speakers of **all backgrounds** and
 **all levels of experience**, including newcomers giving their first
@@ -18,15 +25,15 @@ wish someone had told you when you were starting out?  What part of
 your workflow might inspire someone to get into Emacs or go deeper?
 
 A great way to get started with writing a proposal is to start by
-exploring the programs from previous years: [2020](https://emacsconf.org/2020/schedule/), [2019](https://emacsconf.org/2019/schedule/), [2015](https://emacsconf.org/2015/schedule/), [2013](https://emacsconf.org/2013/#program).
-You might also find some neat ideas on the [ideas](https://emacsconf.org/2021/ideas/) page.  Feel free to
-add yours there too!  If you're still not sure, come by our IRC
-channel `#emacsconf` on `irc.libera.chat` and say hi.  You can join
-the chat using [your favourite IRC client](ircs://irc.libera.chat:6697/emacsconf), or by visiting
+exploring the programs from previous years: [2021](https://emacsconf.org/2021/schedule/), [2020](https://emacsconf.org/2020/schedule/), [2019](https://emacsconf.org/2019/schedule/), [2015](https://emacsconf.org/2015/schedule/),
+[2013](https://emacsconf.org/2013/#program). You might also find some neat ideas on the [ideas](https://emacsconf.org/2022/ideas/) page.  Feel
+free to add yours there too!  If you're still not sure, come by our
+IRC channel `#emacsconf` on `irc.libera.chat` and say hi.  You can
+join the chat using [your favourite IRC client](ircs://irc.libera.chat:6697/emacsconf), or by visiting
 [chat.emacsconf.org](https://chat.emacsconf.org) in your web browser.
 
 All kinds of people use Emacs for all kinds of things.  We'd love it
-if EmacsConf 2021 could highlight interesting perspectives and reflect
+if EmacsConf 2022 could highlight interesting perspectives and reflect
 the diversity of our community.  If you know someone who might have a
 good idea for a talk, please reach out to them and encourage them to
 submit a proposal.  Many people (especially from underrepresented
@@ -40,8 +47,8 @@ love to hear from them.
 
 # Important dates
 
-For EmacsConf 2021, we are planning for 9am to 5pm Toronto/EST
-(2pm-10pm UTC) on November 27 and 28.  Depending on people's
+For EmacsConf 2022, we are planning for 9am to 5pm Toronto/EST
+(2pm-10pm UTC) on MMMM DD and DD.  Depending on people's
 availability, it might be two half-days.
 
 <table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
@@ -55,31 +62,31 @@ availability, it might be two half-days.
 <tbody>
 <tr>
 <td class="org-left">CFP opens</td>
-<td class="org-left">August 5, 2021</td>
+<td class="org-left">June DD, 2022</td>
 </tr>
 
 
 <tr>
 <td class="org-left">CFP closes</td>
-<td class="org-left">September 30, 2021</td>
+<td class="org-left">August 31, 2022</td>
 </tr>
 
 
 <tr>
 <td class="org-left">Speaker notifications</td>
-<td class="org-left">October 15, 2021</td>
+<td class="org-left">MMMM DD, 2022</td>
 </tr>
 
 
 <tr>
 <td class="org-left">Schedule published</td>
-<td class="org-left">October 31, 2021</td>
+<td class="org-left">MMMM DD, 2022</td>
 </tr>
 
 
 <tr>
-<td class="org-left">EmacsConf 2021!</td>
-<td class="org-left">November 27 and 28, 2021</td>
+<td class="org-left">EmacsConf 2022!</td>
+<td class="org-left">MMMM DD and DD, 2022</td>
 </tr>
 </tbody>
 </table>
@@ -101,7 +108,7 @@ Thank you for your patience and understanding.
 
 # Talk formats
 
-We'd like EmacsConf 2021 to inspire lots of different people to
+We'd like EmacsConf 2022 to inspire lots of different people to
 explore lots of different things in Emacs.  We hope to put together a
 stream of quick ideas followed by lots of conversation over IRC and/or
 Q&A sessions, with occasional deep dives into topics that many people
@@ -147,32 +154,17 @@ session types, please let us know [publicly](https://lists.gnu.org/mailman/listi
 happy to work something out with you.
 
 
-# Office hours
-
-We're aware that it can be intimidating to submit a proposal to a
-conference, so we thought we'd try to help!  This year, we're opening
-up the doors of our virtual offices for you to come talk to us about
-your proposals with hopes of helping you with any hurdles you may be
-facing with preparing your proposal.
-
-We'd like to publish a schedule of availabilities of volunteers for
-holding office hours.  Currently these volunteers consist of some of
-the EmacsConf organizers, but we'd love to have the help of other
-members of the Emacs community as well.  If you are a more experienced
-Emacs user and would like to help with this, please [get in touch](https://emacsconf.org/contact/)!
-
-You can find the schedule for upcoming office hours (along with other
-Emacs events) at <https://www.emacswiki.org/emacs/Usergroups> .  You can
-also get an iCal feed at
-<https://emacslife.com/calendar/emacs-calendar.ics> or get HTML/Org
-files in various timezones at <https://emacslife.com/calendar/> .  When
-in session, the office hours will be held in this BigBlueButton room:
-<https://bbb.emacsverse.org/b/ban-qye-fd1-5kw>.
-
+# Preparing and submitting your proposal
 
-# Submitting your proposal
+We're aware that it can be challenging and intimidating to prepare and
+submit a proposal to a conference, and we want to help make it less
+so.  Come say hi to us on our IRC channel `#emacsconf` on
+`irc.libera.chat`, and we'd be happy to try and answer any questions
+or concerns you may have about writing your proposal or submitting it.
+We'd also love to receive suggestions on how we can best help you and
+other prospective speakers interested in giving a talk at EmacsConf.
 
-Once you're ready to submit your proposal, the [submit](https://emacsconf.org/2021/submit/) page has the
+Once you're ready to submit your proposal, the [submit](https://emacsconf.org/2022/submit/) page has the
 instructions on how to submit your talk.
 
 We use an anonymized submission process to reduce bias and encourage
@@ -200,14 +192,14 @@ We look forward to your ideas and submissions!
 
 If you would like to help with the conference (planning the sessions,
 reviewing proposals, helping with infrastructure, making sessions more
-accessible, editing video transcripts, etc.), see our [planning](https://emacsconf.org/2021/planning/) page
+accessible, editing video transcripts, etc.), see our [planning](https://emacsconf.org/2022/planning/) page
 and come say hi to us at `#emacsconf` on `irc.libera.chat`.
 
 In addition to the [emacsconf-discuss](https://lists.gnu.org/mailman/listinfo/emacsconf-discuss) list, feel free to subscribe to
 [emacsconf-org](https://lists.gnu.org/mailman/listinfo/emacsconf-org) as well, for discussions related to organizing the
 conference by the EmacsConf organizers and volunteers.
 
-We'd really appreciate your help in making EmacsConf 2021 the best one
+We'd really appreciate your help in making EmacsConf 2022 the best one
 so far!
 
 
@@ -216,14 +208,5 @@ so far!
 We remain fully committed to freedom, and we will continue
 using our infrastructure and streaming setup consisting entirely
 of [free software](https://www.gnu.org/philosophy/free-sw.html), much like previous EmacsConf conferences.
-An article describing our infrastructure and tools is underway,
-and will be announced on the emacsconf-discuss list when published.
-
-[emacs]: https://www.gnu.org/software/emacs/
-[freesw]: https://www.gnu.org/philosophy/free-sw.html
-[libera-emacsconf]: ircs://irc.libera.chat:6697/emacsconf
-[chat]: https://chat.emacsconf.org
-[emacsconf-discuss]: https://lists.gnu.org/mailman/listinfo/emacsconf-discuss
-[emacsconf-org]: https://lists.gnu.org/mailman/listinfo/emacsconf-org
-[emacsconf-org-private]: https://lists.gnu.org/mailman/listinfo/emacsconf-org-private
+TODO: Announce infrastructure article when published.