summaryrefslogtreecommitdiffstats
path: root/2023
diff options
context:
space:
mode:
authorSacha Chua <sacha@sachachua.com>2023-11-02 09:14:41 -0400
committerSacha Chua <sacha@sachachua.com>2023-11-02 09:14:41 -0400
commitf390ebdd86b82974794cd4921add9664fb439f5a (patch)
treedac60edd7479ad26bac39696d2c9325cc55cba57 /2023
parent50b7e985fc320d95c344d063fa296e0ca1800a3e (diff)
downloademacsconf-wiki-f390ebdd86b82974794cd4921add9664fb439f5a.tar.xz
emacsconf-wiki-f390ebdd86b82974794cd4921add9664fb439f5a.zip
mention Lucerne
Diffstat (limited to '')
-rw-r--r--2023.md7
-rw-r--r--2023/talks.md6
2 files changed, 10 insertions, 3 deletions
diff --git a/2023.md b/2023.md
index 3f0b07a8..e4236945 100644
--- a/2023.md
+++ b/2023.md
@@ -12,8 +12,7 @@ alt="EmacsConf logo"]]</p>
<a href="https://www.gnu.org/software/emacs/">GNU Emacs</a> and
Emacs Lisp.</p>
-2023-10-10 update: We're working on the schedule and infrastructure.
-Speakers are currently working on their presentations.
+2023-10-10 update: Speakers are currently working on their presentations.
[[Instructions for speakers|prepare]] (Target date for videos:
November 4) It's all going to come together...
@@ -27,6 +26,10 @@ 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/2023-11-01_announcing_emacsconf__swiss_satellite.html).
+Let us know if you're organizing one in your area!
+
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
diff --git a/2023/talks.md b/2023/talks.md
index abb5964c..de8a380c 100644
--- a/2023/talks.md
+++ b/2023/talks.md
@@ -2,7 +2,11 @@
[[!meta copyright="Copyright &copy; 2023 Sacha Chua"]]
[[!sidebar content=""]]
-We're getting ready for EmacsConf 2023, which will once again be an **online conference**. Here's the line-up of talks:
+We're getting ready for EmacsConf 2023, which will once again be an **online conference**.
+
+There is also a satellite event in [Lucerne, Switzerland](https://200ok.ch/posts/2023-11-01_announcing_emacsconf__swiss_satellite.html). Let us know if you're organizing one in your area!
+
+Here's the line-up of talks:
[[!inline pages="internal(2023/schedule-details)" raw="yes"]]