summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSacha Chua <sacha@sachachua.com>2021-11-27 07:38:18 -0500
committerSacha Chua <sacha@sachachua.com>2021-11-27 07:38:18 -0500
commit5cc4f104f44229637999b4daf97fb30ae8ab0a35 (patch)
tree62eb935a3fdc86767eb74b8868a3e1fcd80ea19c
parent3badbb7fc81a3404309b6bca7708a6b5c5550de0 (diff)
parenta6c2d1557b22aa76a0eb557febf58a6320611056 (diff)
downloademacsconf-wiki-5cc4f104f44229637999b4daf97fb30ae8ab0a35.tar.xz
emacsconf-wiki-5cc4f104f44229637999b4daf97fb30ae8ab0a35.zip
Merge branch 'master' of git.emacsconf.org:emacsconf-wiki
-rw-r--r--2021/talks/babel.md1
-rw-r--r--2021/talks/day1-open.md13
2 files changed, 9 insertions, 5 deletions
diff --git a/2021/talks/babel.md b/2021/talks/babel.md
index 594b1b85..d0eb1c91 100644
--- a/2021/talks/babel.md
+++ b/2021/talks/babel.md
@@ -48,6 +48,7 @@ would also like to be inspired by other people's babel workflows!
## Links
- Course webpage: <https://asilata.github.io/ggm/2021/>
+- Code: <https://github.com/asilata/emacsconf2021>
## Speaker information
- Name pronunciation: /ˈəsɪʟət̪ɑ ˈbɑpəʈ/ UH-si-luh-tah BAH-putt
diff --git a/2021/talks/day1-open.md b/2021/talks/day1-open.md
index 93326a79..32423dae 100644
--- a/2021/talks/day1-open.md
+++ b/2021/talks/day1-open.md
@@ -16,13 +16,16 @@
- Lots of talks! Shorter time, Q&A might be live/pad/IRC, might have alternate stream
- Streaming with open captions thanks to volunteers
- Prerecorded videos will be published as soon as we can
- - APAC-time-friendly alternate stream <https://libreau.org/upcoming.html#emacsconf21>
+ - APAC-time-friendly alternate stream by LibreAustralia folks <https://libreau.org/upcoming.html#emacsconf21>
- Thanks
- Speakers, volunteers
- - FSF, especially the tech team
- - Fosshost, for bbb & ftp-upload
- - UWaterloo CSC, for continuing hosting the videos/files on mirror.csc
- - yang, for two mirrors in the EU (TODO: add links)
+ - Free Software Foundation, especially the FSF tech team, for their continued help and support
+ - LibrePlanet 2022 Call for Sessions open for a few more days; consider giving a talk! See <https://libreplanet.org/2022/> and <https://my.fsf.org/lp-call-for-sessions/>
+ - FSF's Fall 2021 fundraiser happening now! See <https://fsf.org/appeal> if you'd like to give :)
+ - Fosshost, for BigBlueButton server and for ftp-upload server
+ - Computer Science Club of the University of Waterloo, for continuing hosting the videos/files on the CSC mirror server
+ - Jan Prunk (yang), for EU mirror of EmacsConf videos/files: <https://de1.mirror.si/emacsconf/>
+ - Grant Shangreaux, for beautiful music :) (under CC BY-SA 4.0) <https://churls.world/basement-days/basement-days.html>
- Organizers
- Everyone
- Schedule overview