summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSacha Chua <sacha@sachachua.com>2020-11-10 11:05:30 -0500
committerSacha Chua <sacha@sachachua.com>2020-11-10 11:05:30 -0500
commit90eb2fbee7424fc6f6002d2fcce4fa330e4e197c (patch)
tree86a44894af66b79b3091cc3c994438baeb94519c
parent62b248612ef546f0e24eb0e333f70c4009e6cca0 (diff)
downloademacsconf-wiki-90eb2fbee7424fc6f6002d2fcce4fa330e4e197c.tar.xz
emacsconf-wiki-90eb2fbee7424fc6f6002d2fcce4fa330e4e197c.zip
Add schedule and poster, remove CFP paragraph
-rw-r--r--2020.md12
1 files changed, 4 insertions, 8 deletions
diff --git a/2020.md b/2020.md
index dd81eecf..ea300a44 100644
--- a/2020.md
+++ b/2020.md
@@ -10,17 +10,13 @@ EmacsConf 2020 | Online Conference | **November 28 and 29, 2020**
EmacsConf is the conference about the joy of Emacs, Emacs Lisp, and
memorizing key sequences.
-We are busy putting things together for EmacsConf 2020, and we need
-*your* help to make EmacsConf 2020 amazing, much like the previous
-EmacsConfs. See our [[**Call for Proposals**|cfp]], get involved, and
-help spread the word!
-
We are holding EmacsConf 2020 as a virtual (online) conference again
this year, especially now, given the current state of the world with
-the ongoing global pandemic. We remain fully committed to freedom,
-and we will continue using our infrastructure and streaming setup
+the ongoing global pandemic. We remain fully committed to freedom, and
+we will continue using our infrastructure and streaming setup
consisting entirely of [free software][freesw], much like the last
-EmacsConf.
+EmacsConf. Check out the [[**Schedule**|schedule]] and
+[[**Poster**|poster]] for more details.
Come hang out with us in `#emacsconf` on `chat.freenode.net`. You can
join the chat using [your favourite IRC client][ircs], or by visiting