summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--2022/organizers-notebook/index.org2
-rw-r--r--2022/talks.md16
2 files changed, 13 insertions, 5 deletions
diff --git a/2022/organizers-notebook/index.org b/2022/organizers-notebook/index.org
index dfeef70e..a656e39e 100644
--- a/2022/organizers-notebook/index.org
+++ b/2022/organizers-notebook/index.org
@@ -801,6 +801,8 @@ should the captions be outside the wiki?
- You can create new categories by making up new CategoryNames.
- You can also link to a talk with a link like this: =\[[/2022/talks/maint|Maintaining the Maintainers: Attribution as an Economic Model for Open Source]]=
You can make a new heading called =# Related talks=
+** TODO Turn off file upload service on media.emacsconf.org :sachac:infra:
+SCHEDULED: <2022-12-14 Wed>
* Projects to bear in mind but which are not actual
:PROPERTIES:
:CUSTOM_ID: maybe-projects
diff --git a/2022/talks.md b/2022/talks.md
index b98374d1..7c0e655e 100644
--- a/2022/talks.md
+++ b/2022/talks.md
@@ -3,11 +3,7 @@
[[!sidebar content=""]]
EmacsConf 2022 will be on Dec 3 (Sat) and Dec 4 (Sun), 2022 from 9am-5pm Toronto/EST time; equivalently, 6am-3pm PST,
-2pm-10pm UTC, 3pm-11pm Zurich/CET, 7:30pm-4:30am(next-day) India/IST, 10pm-6am GMT+8. <!-- You
-can also get this in [iCalendar format](https://media.emacsconf.org/2022/emacsconf.ics), and there's
-some experimental code over at
-<https://git.emacsconf.org/emacsconf-el/> for downloading the
-schedule and updating an Org file with the data. -->
+2pm-10pm UTC, 3pm-11pm Zurich/CET, 7:30pm-4:30am(next-day) India/IST, 10pm-6am GMT+8.
EmacsConf 2022 will have two tracks. The General track will include
talks about Emacs workflows and community resources, while the
@@ -43,6 +39,16 @@ Legend:
[[!inline pages="internal(2022/schedule-details)" raw="yes"]]
+# iCalendar format
+
+You can subscribe to these calendars in your favorite calendar program.
+
+* [All talks](https://media.emacsconf.org/2022/emacsconf.ics)
+* [General talks](https://media.emacsconf.org/2022/emacsconf-gen.ics)
+* [Development talks](https://media.emacsconf.org/2022/emacsconf-dev.ics)
+
+# Other stuff
+
You can subscribe to the
[emacsconf-discuss mailing list](https://lists.gnu.org/mailman/listinfo/emacsconf-discuss)
to be sure to get updates.