summaryrefslogtreecommitdiffstats
path: root/2024.md
diff options
context:
space:
mode:
Diffstat (limited to '2024.md')
-rw-r--r--2024.md10
1 files changed, 6 insertions, 4 deletions
diff --git a/2024.md b/2024.md
index 8a397199..377a508b 100644
--- a/2024.md
+++ b/2024.md
@@ -6,8 +6,7 @@
<p class="center">[[!img /i/emacsconf-logo1-256.png
alt="EmacsConf logo"]]</p>
-<p class="center">[[<b>Call for Participation</b>|cfp]] | [[Ideas]] |
-[[Submit a Proposal|submit]] | [[Volunteer]] | [[Guidelines for Conduct|conduct]]</p>
+<p class="center"><strong>[[How to watch/participate|watch]]</strong> | <strong>[[Talks]]</strong> | [[Volunteer]] | [[Guidelines for Conduct|conduct]]</p>
<p class="center">EmacsConf is the conference about the joy of
<a href="https://www.gnu.org/software/emacs/">GNU Emacs</a> and
@@ -15,14 +14,17 @@ Emacs Lisp.</p>
We are busy putting things together for EmacsConf 2024, and we would
love to have *your* help to make EmacsConf 2024 amazing, much like the
-previous EmacsConfs. See our [[**Call for Participation**|cfp]], get
-involved, and help spread the word!
+previous EmacsConfs. Missed the proposal deadline but got a great idea anyway? [[Let us know|/2024/cfp]] just in case we can still squeeze you in somehow.
We are holding EmacsConf 2024 as an online conference again this year.
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.
+There is also a satellite event in
+[Lucerne, Switzerland](https://200ok.ch/posts/2024-09-16_announcing_emacsconf__official_swiss_satellite.html).
+Let us know if you want to organize one too!
+
For general EmacsConf discussions, join the
[emacsconf-discuss](https://lists.gnu.org/mailman/listinfo/emacsconf-discuss)
mailing list. For discussions related to organizing EmacsConf, join