summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--2020/info/01.md3
-rw-r--r--2020/schedule/00.md2
-rw-r--r--2020/schedule/01.md2
-rw-r--r--2020/schedule/02.md2
-rw-r--r--2020/schedule/03.md2
-rw-r--r--2020/schedule/04.md2
-rw-r--r--2020/schedule/05.md2
-rw-r--r--2020/schedule/06.md2
-rw-r--r--2020/schedule/07.md2
-rw-r--r--2020/schedule/08.md2
-rw-r--r--2020/schedule/09.md2
-rw-r--r--2020/schedule/10.md2
-rw-r--r--2020/schedule/11.md2
-rw-r--r--2020/schedule/12.md2
-rw-r--r--2020/schedule/13.md2
-rw-r--r--2020/schedule/14.md2
-rw-r--r--2020/schedule/15.md2
-rw-r--r--2020/schedule/16.md2
-rw-r--r--2020/schedule/17.md2
-rw-r--r--2020/schedule/18.md2
-rw-r--r--2020/schedule/19.md2
-rw-r--r--2020/schedule/20.md2
-rw-r--r--2020/schedule/21.md2
-rw-r--r--2020/schedule/22.md2
-rw-r--r--2020/schedule/23.md2
-rw-r--r--2020/schedule/24.md2
-rw-r--r--2020/schedule/25.md2
-rw-r--r--2020/schedule/26.md2
-rw-r--r--2020/schedule/27.md2
-rw-r--r--2020/schedule/28.md2
-rw-r--r--2020/schedule/29.md2
-rw-r--r--2020/schedule/30.md2
-rw-r--r--2020/schedule/31.md2
-rw-r--r--2020/schedule/32.md2
-rw-r--r--2020/schedule/33.md2
-rw-r--r--2020/schedule/34.md2
-rw-r--r--2020/schedule/35.md2
-rw-r--r--2020/schedule/38.md2
-rw-r--r--2020/schedule/39.md2
-rw-r--r--2020/schedule/40.md2
-rw-r--r--2020/schedule/41.md2
-rw-r--r--2020/schedule/42.md2
-rw-r--r--2020/submissions.org27
-rw-r--r--2020/talks/01.md2
44 files changed, 57 insertions, 57 deletions
diff --git a/2020/info/01.md b/2020/info/01.md
index afa62eeb..ac2c180b 100644
--- a/2020/info/01.md
+++ b/2020/info/01.md
@@ -1,11 +1,14 @@
# Emacs News Highlights
Sacha Chua
+[[!template id=vid src="https://mirror.csclub.uwaterloo.ca/emacsconf/2020/emacsconf-2020--01-emacs-news-highlights--sacha-chua.webm]] 11M
+
Quick highlights from Emacs News since the last EmacsConf
# Links
- https://github.com/sachac/emacsconf-2020-emacs-news-highlights
+- https://mirror.csclub.uwaterloo.ca/emacsconf/2020/emacsconf-2020--04-music-in-plain-text--jonathan-gregory.webm (720p, 18M)
# Following up
diff --git a/2020/schedule/00.md b/2020/schedule/00.md
index 7f80a241..4cbeb5ae 100644
--- a/2020/schedule/00.md
+++ b/2020/schedule/00.md
@@ -1 +1 @@
-[!meta redir=../talks/00]]
+[[!meta redir=../talks/00]]
diff --git a/2020/schedule/01.md b/2020/schedule/01.md
index 4c6ffb1f..e2adc243 100644
--- a/2020/schedule/01.md
+++ b/2020/schedule/01.md
@@ -1 +1 @@
-[!meta redir=../talks/01]]
+[[!meta redir=../talks/01]]
diff --git a/2020/schedule/02.md b/2020/schedule/02.md
index b68b5428..07e13e92 100644
--- a/2020/schedule/02.md
+++ b/2020/schedule/02.md
@@ -1 +1 @@
-[!meta redir=../talks/02]]
+[[!meta redir=../talks/02]]
diff --git a/2020/schedule/03.md b/2020/schedule/03.md
index ce2c96ec..0ad9bd0c 100644
--- a/2020/schedule/03.md
+++ b/2020/schedule/03.md
@@ -1 +1 @@
-[!meta redir=../talks/03]]
+[[!meta redir=../talks/03]]
diff --git a/2020/schedule/04.md b/2020/schedule/04.md
index 0020b14a..328ffdaf 100644
--- a/2020/schedule/04.md
+++ b/2020/schedule/04.md
@@ -1 +1 @@
-[!meta redir=../talks/04]]
+[[!meta redir=../talks/04]]
diff --git a/2020/schedule/05.md b/2020/schedule/05.md
index 29bc38ff..9d35f811 100644
--- a/2020/schedule/05.md
+++ b/2020/schedule/05.md
@@ -1 +1 @@
-[!meta redir=../talks/05]]
+[[!meta redir=../talks/05]]
diff --git a/2020/schedule/06.md b/2020/schedule/06.md
index cf51f473..8546c942 100644
--- a/2020/schedule/06.md
+++ b/2020/schedule/06.md
@@ -1 +1 @@
-[!meta redir=../talks/06]]
+[[!meta redir=../talks/06]]
diff --git a/2020/schedule/07.md b/2020/schedule/07.md
index 39b324cd..4d6f21e5 100644
--- a/2020/schedule/07.md
+++ b/2020/schedule/07.md
@@ -1 +1 @@
-[!meta redir=../talks/07]]
+[[!meta redir=../talks/07]]
diff --git a/2020/schedule/08.md b/2020/schedule/08.md
index 89cc02d0..3c775af2 100644
--- a/2020/schedule/08.md
+++ b/2020/schedule/08.md
@@ -1 +1 @@
-[!meta redir=../talks/08]]
+[[!meta redir=../talks/08]]
diff --git a/2020/schedule/09.md b/2020/schedule/09.md
index af6200ff..cb1028e1 100644
--- a/2020/schedule/09.md
+++ b/2020/schedule/09.md
@@ -1 +1 @@
-[!meta redir=../talks/09]]
+[[!meta redir=../talks/09]]
diff --git a/2020/schedule/10.md b/2020/schedule/10.md
index 20c6a1ec..ea3a5470 100644
--- a/2020/schedule/10.md
+++ b/2020/schedule/10.md
@@ -1 +1 @@
-[!meta redir=../talks/10]]
+[[!meta redir=../talks/10]]
diff --git a/2020/schedule/11.md b/2020/schedule/11.md
index f9c929af..f1b7d40a 100644
--- a/2020/schedule/11.md
+++ b/2020/schedule/11.md
@@ -1 +1 @@
-[!meta redir=../talks/11]]
+[[!meta redir=../talks/11]]
diff --git a/2020/schedule/12.md b/2020/schedule/12.md
index 32dfe3f5..3da8fab7 100644
--- a/2020/schedule/12.md
+++ b/2020/schedule/12.md
@@ -1 +1 @@
-[!meta redir=../talks/12]]
+[[!meta redir=../talks/12]]
diff --git a/2020/schedule/13.md b/2020/schedule/13.md
index 9fb47c46..f2f177ab 100644
--- a/2020/schedule/13.md
+++ b/2020/schedule/13.md
@@ -1 +1 @@
-[!meta redir=../talks/13]]
+[[!meta redir=../talks/13]]
diff --git a/2020/schedule/14.md b/2020/schedule/14.md
index 0ddce567..4ec43df1 100644
--- a/2020/schedule/14.md
+++ b/2020/schedule/14.md
@@ -1 +1 @@
-[!meta redir=../talks/14]]
+[[!meta redir=../talks/14]]
diff --git a/2020/schedule/15.md b/2020/schedule/15.md
index 39c1d6dd..f5fbd9b9 100644
--- a/2020/schedule/15.md
+++ b/2020/schedule/15.md
@@ -1 +1 @@
-[!meta redir=../talks/15]]
+[[!meta redir=../talks/15]]
diff --git a/2020/schedule/16.md b/2020/schedule/16.md
index 9a1d1381..9018064f 100644
--- a/2020/schedule/16.md
+++ b/2020/schedule/16.md
@@ -1 +1 @@
-[!meta redir=../talks/16]]
+[[!meta redir=../talks/16]]
diff --git a/2020/schedule/17.md b/2020/schedule/17.md
index 3590b599..49f846d2 100644
--- a/2020/schedule/17.md
+++ b/2020/schedule/17.md
@@ -1 +1 @@
-[!meta redir=../talks/17]]
+[[!meta redir=../talks/17]]
diff --git a/2020/schedule/18.md b/2020/schedule/18.md
index bc50a949..b898bdd1 100644
--- a/2020/schedule/18.md
+++ b/2020/schedule/18.md
@@ -1 +1 @@
-[!meta redir=../talks/18]]
+[[!meta redir=../talks/18]]
diff --git a/2020/schedule/19.md b/2020/schedule/19.md
index 8e79a784..c1a55890 100644
--- a/2020/schedule/19.md
+++ b/2020/schedule/19.md
@@ -1 +1 @@
-[!meta redir=../talks/19]]
+[[!meta redir=../talks/19]]
diff --git a/2020/schedule/20.md b/2020/schedule/20.md
index 2c42ba09..ab36d75b 100644
--- a/2020/schedule/20.md
+++ b/2020/schedule/20.md
@@ -1 +1 @@
-[!meta redir=../talks/20]]
+[[!meta redir=../talks/20]]
diff --git a/2020/schedule/21.md b/2020/schedule/21.md
index 0dfe48bc..123c416f 100644
--- a/2020/schedule/21.md
+++ b/2020/schedule/21.md
@@ -1 +1 @@
-[!meta redir=../talks/21]]
+[[!meta redir=../talks/21]]
diff --git a/2020/schedule/22.md b/2020/schedule/22.md
index f9632901..848e2967 100644
--- a/2020/schedule/22.md
+++ b/2020/schedule/22.md
@@ -1 +1 @@
-[!meta redir=../talks/22]]
+[[!meta redir=../talks/22]]
diff --git a/2020/schedule/23.md b/2020/schedule/23.md
index 2d9bbd23..6fdc9fda 100644
--- a/2020/schedule/23.md
+++ b/2020/schedule/23.md
@@ -1 +1 @@
-[!meta redir=../talks/23]]
+[[!meta redir=../talks/23]]
diff --git a/2020/schedule/24.md b/2020/schedule/24.md
index 641c5eee..5579b33a 100644
--- a/2020/schedule/24.md
+++ b/2020/schedule/24.md
@@ -1 +1 @@
-[!meta redir=../talks/24]]
+[[!meta redir=../talks/24]]
diff --git a/2020/schedule/25.md b/2020/schedule/25.md
index d675a349..96b389bf 100644
--- a/2020/schedule/25.md
+++ b/2020/schedule/25.md
@@ -1 +1 @@
-[!meta redir=../talks/25]]
+[[!meta redir=../talks/25]]
diff --git a/2020/schedule/26.md b/2020/schedule/26.md
index 111895c7..15608f28 100644
--- a/2020/schedule/26.md
+++ b/2020/schedule/26.md
@@ -1 +1 @@
-[!meta redir=../talks/26]]
+[[!meta redir=../talks/26]]
diff --git a/2020/schedule/27.md b/2020/schedule/27.md
index 7e47b721..a60da97a 100644
--- a/2020/schedule/27.md
+++ b/2020/schedule/27.md
@@ -1 +1 @@
-[!meta redir=../talks/27]]
+[[!meta redir=../talks/27]]
diff --git a/2020/schedule/28.md b/2020/schedule/28.md
index c5452a45..f6c48d47 100644
--- a/2020/schedule/28.md
+++ b/2020/schedule/28.md
@@ -1 +1 @@
-[!meta redir=../talks/28]]
+[[!meta redir=../talks/28]]
diff --git a/2020/schedule/29.md b/2020/schedule/29.md
index 16ce69a8..f3a32d41 100644
--- a/2020/schedule/29.md
+++ b/2020/schedule/29.md
@@ -1 +1 @@
-[!meta redir=../talks/29]]
+[[!meta redir=../talks/29]]
diff --git a/2020/schedule/30.md b/2020/schedule/30.md
index acc20540..6dc14b36 100644
--- a/2020/schedule/30.md
+++ b/2020/schedule/30.md
@@ -1 +1 @@
-[!meta redir=../talks/30]]
+[[!meta redir=../talks/30]]
diff --git a/2020/schedule/31.md b/2020/schedule/31.md
index 16191909..16718f2a 100644
--- a/2020/schedule/31.md
+++ b/2020/schedule/31.md
@@ -1 +1 @@
-[!meta redir=../talks/31]]
+[[!meta redir=../talks/31]]
diff --git a/2020/schedule/32.md b/2020/schedule/32.md
index e2aab9fc..83452231 100644
--- a/2020/schedule/32.md
+++ b/2020/schedule/32.md
@@ -1 +1 @@
-[!meta redir=../talks/32]]
+[[!meta redir=../talks/32]]
diff --git a/2020/schedule/33.md b/2020/schedule/33.md
index 9477b813..ed3bae21 100644
--- a/2020/schedule/33.md
+++ b/2020/schedule/33.md
@@ -1 +1 @@
-[!meta redir=../talks/33]]
+[[!meta redir=../talks/33]]
diff --git a/2020/schedule/34.md b/2020/schedule/34.md
index 4ff2f608..641fad99 100644
--- a/2020/schedule/34.md
+++ b/2020/schedule/34.md
@@ -1 +1 @@
-[!meta redir=../talks/34]]
+[[!meta redir=../talks/34]]
diff --git a/2020/schedule/35.md b/2020/schedule/35.md
index 12618816..23a2388c 100644
--- a/2020/schedule/35.md
+++ b/2020/schedule/35.md
@@ -1 +1 @@
-[!meta redir=../talks/35]]
+[[!meta redir=../talks/35]]
diff --git a/2020/schedule/38.md b/2020/schedule/38.md
index aeb4bab7..1d4eb53a 100644
--- a/2020/schedule/38.md
+++ b/2020/schedule/38.md
@@ -1 +1 @@
-[!meta redir=../talks/38]]
+[[!meta redir=../talks/38]]
diff --git a/2020/schedule/39.md b/2020/schedule/39.md
index 67826ee8..db6e8a68 100644
--- a/2020/schedule/39.md
+++ b/2020/schedule/39.md
@@ -1 +1 @@
-[!meta redir=../talks/39]]
+[[!meta redir=../talks/39]]
diff --git a/2020/schedule/40.md b/2020/schedule/40.md
index f43ef58a..26ff995e 100644
--- a/2020/schedule/40.md
+++ b/2020/schedule/40.md
@@ -1 +1 @@
-[!meta redir=../talks/40]]
+[[!meta redir=../talks/40]]
diff --git a/2020/schedule/41.md b/2020/schedule/41.md
index 1e49f748..c4f1cb9a 100644
--- a/2020/schedule/41.md
+++ b/2020/schedule/41.md
@@ -1 +1 @@
-[!meta redir=../talks/41]]
+[[!meta redir=../talks/41]]
diff --git a/2020/schedule/42.md b/2020/schedule/42.md
index 3797e8f4..aceb5a21 100644
--- a/2020/schedule/42.md
+++ b/2020/schedule/42.md
@@ -1 +1 @@
-[!meta redir=../talks/42]]
+[[!meta redir=../talks/42]]
diff --git a/2020/submissions.org b/2020/submissions.org
index eece253c..12c3f04e 100644
--- a/2020/submissions.org
+++ b/2020/submissions.org
@@ -3166,7 +3166,7 @@ The total is written to the MIN_TIME_SUM property of this heading"
list))
(defun conf/format-talk-link (talk)
- (and talk (format "<a href=\"/2020/schedule/%s\">%s</a>"
+ (and talk (format "<a href=\"/2020/talks/%s\">%s</a>"
(plist-get talk :talk-id)
(plist-get talk :title))))
@@ -3214,6 +3214,15 @@ The total is written to the MIN_TIME_SUM property of this heading"
(let* ((timestamp (org-timestamp-from-string (plist-get o :scheduled)))
(next-talk (conf/format-talk-link (pop next-talks)))
(prev-talk (conf/format-talk-link (pop prev-talks)))
+ (schedule (mapconcat
+ (lambda (tz)
+ (format "%s - %s"
+ (format-time-string "%A, %b %e %Y, ~%l:%M %p"
+ (org-timestamp-to-time (org-timestamp-split-range timestamp)) tz)
+ (format-time-string "%l:%M %p %Z"
+ (org-timestamp-to-time (org-timestamp-split-range timestamp t)) tz)))
+ conf/timezones
+ " \n"))
(nav-links (format "Back to the [[schedule]] \n%s%s"
(if prev-talk (format "Previous: %s \n" prev-talk) "")
(if next-talk (format "Next: %s \n" next-talk) ""))))
@@ -3224,10 +3233,7 @@ The total is written to the MIN_TIME_SUM property of this heading"
%s
-Approximate time (might be earlier or later):
-%s
-
-[[!inline pages=\"internal(2020/info/%s)\" raw=\"yes\"]]
+!inline pages=\"internal(2020/info/%s)\" raw=\"yes\"]]
%s
@@ -3240,18 +3246,9 @@ conference for instructions on how to watch and participate. See you then!
"!meta"
(plist-get o :speakers)
nav-links
- (mapconcat
- (lambda (tz)
- (format "%s - %s"
- (format-time-string "%A, %b %e %Y, ~%l:%M %p"
- (org-timestamp-to-time (org-timestamp-split-range timestamp)) tz)
- (format-time-string "%l:%M %p %Z"
- (org-timestamp-to-time (org-timestamp-split-range timestamp t)) tz)))
- conf/timezones
- " \n")
(plist-get o :talk-id)
nav-links)))
- (write-file (format "schedule/%s.md" (plist-get o :talk-id)))))
+ (write-file (format "talks/%s.md" (plist-get o :talk-id)))))
talks)))
(defun conf/get-talk-info-from-file (&optional filename)
diff --git a/2020/talks/01.md b/2020/talks/01.md
index 8f25d7d1..836f7a40 100644
--- a/2020/talks/01.md
+++ b/2020/talks/01.md
@@ -3,11 +3,11 @@
<!-- To edit the talk information, change /2020/info/TALKID.md. Boilerplate automatically generated from submissions.org using conf/generate-schedule-files --->
-
Back to the [[schedule]]
Previous: <a href="/2020/schedule/00">9:00 - 9:30 Opening remarks</a>
Next: <a href="/2020/schedule/02">An Emacs Developer Story: From User to Package Maintainer</a>
+[[!template id=vid src="https://mirror.csclub.uwaterloo.ca/emacsconf/2020/emacsconf-2020--01-emacs-news-highlights--sacha-chua.webm]] 11M
Approximate time (might be earlier or later):
Saturday, Nov 28 2020, ~ 9:33 AM - 9:37 AM EST