Rename to 2021/cfp.org, try exporting from it, office hours sched

2 files changed, 157 insertions, 111 deletions

diff --git a/2021/cfp.md b/2021/cfp.md
index 1a2c2d55..c6be19e1 100644
--- a/2021/cfp.md
+++ b/2021/cfp.md
@@ -1,31 +1,29 @@
 [[!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"]]
+[[!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. --->
 
-<p class="center"><strong>EmacsConf 2021 | November 27 and 28, 2021 |
-Online Conference</strong></p>
 
-[[EmacsConf 2021|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|cfp]] by **September 30, 2021**.
+# Call for Proposals
 
-EmacsConf 2021 is about the joy of [Emacs][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 talk.  What have you found exciting about Emacs
-lately?  What do you 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?
+[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
+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
+talk.  What have you found exciting about Emacs lately?  What do you
+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|2020/schedule]],
-[[2019|2019/schedule]], [[2015|2015/schedule]], [[2013|2013#program]].
-You might also find some neat ideas on the [[ideas]] page.  Feel free
-to add yours there too!  If you're still not sure, come by our IRC
+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][libera-emacsconf], or by
-visiting [chat.emacsconf.org][chat] in your web browser.
+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
@@ -39,33 +37,49 @@ something that you think others would like to hear more about, they
 may realize that they have something worth sharing and that we would
 love to hear from them.
 
-## Important dates
+
+# 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
 availability, it might be two half-days.
 
-<table>
+<table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
+
+
+<colgroup>
+<col  class="org-left" />
+
+<col  class="org-left" />
+</colgroup>
 <tbody>
 <tr>
-<td colspan="2" align="left">CFP opens</td>
-<td colspan="2" align="right">August 5, 2021</td>
+<td class="org-left">CFP opens</td>
+<td class="org-left">August 5, 2021</td>
 </tr>
+
+
 <tr>
-<td colspan="2" align="left">CFP closes</td>
-<td colspan="2" align="right">September 30, 2021</td>
+<td class="org-left">CFP closes</td>
+<td class="org-left">September 30, 2021</td>
 </tr>
+
+
 <tr>
-<td colspan="2" align="left">Speaker notifications</td>
-<td colspan="2" align="right">October 15, 2021</td>
+<td class="org-left">Speaker notifications</td>
+<td class="org-left">October 15, 2021</td>
 </tr>
+
+
 <tr>
-<td colspan="2" align="left">Schedule published</td>
-<td colspan="2" align="right">October 31, 2021</td>
+<td class="org-left">Schedule published</td>
+<td class="org-left">October 31, 2021</td>
 </tr>
+
+
 <tr>
-<td colspan="2" align="left">EmacsConf 2021!</td>
-<td colspan="2" align="right">November 27 and 28, 2021</td>
+<td class="org-left">EmacsConf 2021!</td>
+<td class="org-left">November 27 and 28, 2021</td>
 </tr>
 </tbody>
 </table>
@@ -75,15 +89,15 @@ neat idea that you'd like to share, please propose it anyway!  You can
 always handle questions after the conference, and we might even be
 able to coordinate with other Emacs meetups for regional events (if
 you're an Emacs meetup organizer and would like to make this happen
-let's [[get in touch|contact]]!).
+let's [get in touch](https://emacsconf.org/contact/)!).
 
 Please note that although we will try our best to stick to the above
 dates in the coming months, given the current state of the world, we
 may have to move things around a bit in case of unforeseen events.
 Thank you for your patience and understanding.
 
-<a name="formats"></a>
-## Talk formats
+
+# Talk formats
 
 We'd like EmacsConf 2021 to inspire lots of different people to
 explore lots of different things in Emacs.  We hope to put together a
@@ -93,18 +107,18 @@ might find interesting or useful.
 
 As you think about your talk, consider what you can share in:
 
-- **Up to 10 minutes total:** What is the core idea?  What do you want
-  people to do or remember?  You can show just enough to get people
-  interested and then point them to where they can learn more
-  afterwards.  You can answer questions over IRC, the pad, or the
-  wiki, and there's no limit to how long that conversation can go.
+-   **Up to 10 minutes total:** What is the core idea?  What do you want
+    people to do or remember?  You can show just enough to get people
+    interested and then point them to where they can learn more
+    afterwards.  You can answer questions over IRC, the pad, or the
+    wiki, and there's no limit to how long that conversation can go.
 
-- **Up to 20 minutes total:** How would you flesh out some of the
-  points from your 5-10 minute presentation?  How can you show the
-  pieces working together?
+-   **Up to 20 minutes total:** How would you flesh out some of the points
+    from your 5-10 minute presentation?  How can you show the pieces
+    working together?
 
-- **Up to 40 minutes total:** What would benefit from a deep dive?
-  How do you keep it engaging?
+-   **Up to 40 minutes total:** What would benefit from a deep dive?
+    How do you keep it engaging?
 
 When writing your proposal, please write an outline of what you plan
 to talk about if you have 5-10 minutes.  If you'd like to propose a
@@ -113,12 +127,12 @@ present (up to 40 minutes, including Q&A).
 
 Here's an example for a potentially 40-minute talk:
 
-- 5-10 minutes: quick demo of the abc package working together with
-  xyz package.
-- 20 minutes: same as above, with some customization options to
-  accommodate a different workflow.
-- 40 minutes: all of the above, including modifying the behaviour of
-  the package in order to add something new.
+-   5-10 minutes: quick demo of the abc package working together with
+    xyz package.
+-   20 minutes: same as above, with some customization options to
+    accommodate a different workflow.
+-   40 minutes: all of the above, including modifying the behaviour of
+    the package in order to add something new.
 
 This flexibility would help us in devising the conference schedule so
 that as many people as possible could get a chance to present their
@@ -127,11 +141,11 @@ ideas, while still allowing for featuring longer deep dive talks.
 Other session formats such as tutorials, workshops, and hangouts are
 welcome as well, in case you would find those other formats preferable
 to a traditional talk format.  If you're interested in these or other
-session types, please let us know [publicly][emacsconf-org] or
-[privately][emacsconf-org-private].  We'll be happy to work something
-out with you.
+session types, please let us know [publicly](https://lists.gnu.org/mailman/listinfo/emacsconf-org) or [privately](https://lists.gnu.org/mailman/listinfo/emacsconf-org-private).  We'll be
+happy to work something out with you.
+
 
-## Office hours
+# 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
@@ -143,16 +157,20 @@ 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|contact]]!
+Emacs user and would like to help with this, please [get in touch](https://emacsconf.org/contact/)!
 
-Our first office hour this year is planned for Saturday, August 14,
-from 3pm to 4pm UTC with zaeph (Leo Vivier) at the following
-BigBlueButton room: <https://bbb.emacsverse.org/b/ban-qye-fd1-5kw>.
+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>.
 
-## Submitting your proposal
 
-Once you're ready to submit your proposal, the [[submit]] page has the
+# Submitting your proposal
+
+Once you're ready to submit your proposal, the [submit](https://emacsconf.org/2021/submit/) page has the
 instructions on how to submit your talk.
 
 We use an anonymized submission process to reduce bias and encourage
@@ -163,44 +181,45 @@ a selection committee.
 
 If your talk is approved, we'd love it if you could help us make sure
 the conference runs smoothly.  After we email you with the time
-alloted for your talk, we'll ask you to
+allotted for your talk, we'll ask you to
 
-- prepare a prerecording of your talk, or record it with our help if
-  that'd be easier for you; and
-- schedule a short tech-check if you'd like to be able to answer
-  questions in a live session.
+-   prepare a prerecording of your talk, or record it with our help if
+    that'd be easier for you; and
+-   schedule a short tech-check if you'd like to be able to answer
+    questions in a live session.
 
-Don't forget to subscribe to our main mailing list,
-[emacsconf-discuss][emacsconf-discuss], for discussion
-and announcements about the EmacsConf conference.
+Don't forget to subscribe to our main mailing list, [emacsconf-discuss](https://lists.gnu.org/mailman/listinfo/emacsconf-discuss),
+for discussion and announcements about the EmacsConf conference.
 
 We look forward to your ideas and submissions!
 
-## Getting involved
+
+# Getting involved
 
 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]]
-page and come say hi to us at `#emacsconf-org` on `irc.libera.chat`.
+accessible, editing video transcripts, etc.), see our [planning](https://emacsconf.org/2021/planning/) page
+and come say hi to us at `#emacsconf` on `irc.libera.chat`.
 
-In addition to the [emacsconf-discuss][emacsconf-discuss] list, feel
-free to subscribe to [emacsconf-org][emacsconf-org] as well, for
-discussions related to organizing the conference by the EmacsConf
-organizers and volunteers.
+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
 so far!
 
 
-## Commitment to freedom
+# Commitment to freedom
 
 We remain fully committed to freedom, and we will continue
 using our infrastructure and streaming setup consisting entirely
-of [free software][freesw], much like previous EmacsConf conferences.
+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.
 
 
+# Additional links
+
 [emacs]: https://www.gnu.org/software/emacs/
 [freesw]: https://www.gnu.org/philosophy/free-sw.html
 [libera-emacsconf]: ircs://irc.libera.chat:6697/emacsconf
@@ -208,3 +227,4 @@ and will be announced on the emacsconf-discuss list when published.
 [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
+
diff --git a/2021/emacsconf-2021-cfp.org b/2021/cfp.org
index f3dd36c0..f2a5ca0f 100644
--- a/2021/emacsconf-2021-cfp.org
+++ b/2021/cfp.org
@@ -3,6 +3,45 @@
 #+date: November 27 and 28, 2021
 #+options: author:nil
 
+#+begin_export md
+[[!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. --->
+#+end_export
+
+* COMMENT How to export this file  :noexport:
+
+As of the time of writing this document (Org mode version 9.3.7), the
+Org links library (=ol.el=) does not yet recognize =ircs= link types,
+and will throw an error if you try to export a file containing them,
+such as this file.
+
+To work around that, you can use something along the lines of the
+Emacs Lisp code below, by either adding it to your init file, or by
+putting the point in the code block and hitting =C-c C-v e= (that is,
+hold Ctrl, then hit c followed by v, then release Ctrl, and hit e) to
+evaluate the code, working around the issue only for the current
+session.
+
+#+begin_src emacs-lisp :results silent
+(org-link-set-parameters
+ "ircs"
+ :export
+ (lambda (link description format)
+   "Export an ircs link.
+See `org-link-parameters' for details about LINK, DESCRIPTION and
+FORMAT."
+   (let ((desc (or description link)))
+     (pcase format
+       (`html (format "<a href=\"ircs:%s\">%s</a>" link desc))
+       (`md (format "[%s](ircs:%s)" desc link))
+       (_ nil)))))
+#+end_src
+
+[[elisp:(org-md-export-to-markdown)][Export this file to Markdown]]
+  
+* Call for Proposals
+  
 [[https://emacsconf.org/2021/][EmacsConf 2021]] will be a virtual conference on *November 27 and 28,
 2021 (Sat-Sun)*.  If you'd like to present at the conference, please
 [[https://emacsconf.org/2021/cfp/][submit your proposal]] by *September 30, 2021*.
@@ -120,9 +159,13 @@ 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 [[https://emacsconf.org/contact/][get in touch]]!
 
-Our first office hour this year is planned for Saturday, August 14,
-from 3pm to 4pm UTC with zaeph (Leo Vivier) at the following
-BigBlueButton room: https://bbb.emacsverse.org/b/ban-qye-fd1-5kw.
+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.
 
 * Submitting your proposal
 
@@ -171,6 +214,17 @@ of [[https://www.gnu.org/philosophy/free-sw.html][free software]], much like pre
 An article describing our infrastructure and tools is underway,
 and will be announced on the emacsconf-discuss list when published.
 
+* Additional links
+
+#+begin_export md
+[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
+#+end_export
 
 * COMMENT Copyright & License
 
@@ -188,31 +242,3 @@ version.
 A copy of these two licenses is available on the EmacsConf wiki, in
 the [[https://emacsconf.org/COPYING.CC-BY-SA][COPYING.CC-BY-SA]] and [[https://emacsconf.org/COPYING.GPL][COPYING.GPL]] files.
 
-* COMMENT How to export this file
-
-As of the time of writing this document (Org mode version 9.3.7), the
-Org links library (=ol.el=) does not yet recognize =ircs= link types,
-and will throw an error if you try to export a file containing them,
-such as this file.
-
-To work around that, you can use something along the lines of the
-Emacs Lisp code below, by either adding it to your init file, or by
-putting the point in the code block and hitting =C-c C-v e= (that is,
-hold Ctrl, then hit c followed by v, then release Ctrl, and hit e) to
-evaluate the code, working around the issue only for the current
-session.
-
-#+begin_src emacs-lisp :results silent
-(org-link-set-parameters
- "ircs"
- :export
- (lambda (link description format)
-   "Export an ircs link.
-See `org-link-parameters' for details about LINK, DESCRIPTION and
-FORMAT."
-   (let ((desc (or description link)))
-     (pcase format
-       (`html (format "<a href=\"ircs:%s\">%s</a>" link desc))
-       (`md (format "[%s](ircs:%s)" desc link))
-       (_ nil)))))
-#+end_src