summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSacha Chua <sacha@sachachua.com>2020-12-03 09:25:41 -0500
committerSacha Chua <sacha@sachachua.com>2020-12-03 09:25:41 -0500
commit87c1476c7b566349c6239978c3c5a1ebd96de9b7 (patch)
treea6a4a7af8400b781bfad4dbdf6d9a2c13ec71a8d
parentc039b865a1fd246fb4e183896631de8c4f35fc13 (diff)
downloademacsconf-wiki-87c1476c7b566349c6239978c3c5a1ebd96de9b7.tar.xz
emacsconf-wiki-87c1476c7b566349c6239978c3c5a1ebd96de9b7.zip
Update text
-rw-r--r--2020.md6
-rw-r--r--2020/sidebar.md4
-rw-r--r--2020/submissions.org4
3 files changed, 6 insertions, 8 deletions
diff --git a/2020.md b/2020.md
index 54065e95..317346bc 100644
--- a/2020.md
+++ b/2020.md
@@ -3,7 +3,7 @@
EmacsConf 2020 | Online Conference | **November 28 and 29, 2020**
[[!img /i/emacsconf-logo1-256.png
alt="EmacsConf logo" class="center"]]
-[[**Schedule**|schedule]] | [[**Poster**|poster]] | [[Planning]] |
+[[**Talks**|talks]] | [[**Poster**|poster]] | [[Planning]] |
[[Code of Conduct|conduct]]
EmacsConf is the conference about the joy of Emacs, Emacs Lisp, and
@@ -23,7 +23,7 @@ last EmacsConf.
## Watching
You can now watch the videos of talks and Q&A sessions from the
-individual talk pages linked to in the [[schedule]]. There's also a
+individual pages linked to in the [[list of talks|talks]]. There's also a
[[playlist|emacsconf-2020.m3u]]. Low-resolution (480p) versions will
be uploaded over the next few weeks. Please let us know of any issues!
@@ -37,7 +37,7 @@ We also took questions from our IRC channel (`#emacsconf` on
channel to the pad on behalf of folks who were not able to or prefer
not to use the web-based questions pad. [[Here's the archived pad.|pad]]
-To follow up after the conference, please check the [[schedule]] for
+To follow up after the conference, please check the [[list of talks|talks]] for
the link to the individual talk page. We've added the questions and
notes from the pad to each talk's page, and we'll ask the speakers to
review the pages and add more information.
diff --git a/2020/sidebar.md b/2020/sidebar.md
index 7abbeb02..d6584f7d 100644
--- a/2020/sidebar.md
+++ b/2020/sidebar.md
@@ -4,7 +4,5 @@
---
-* [[**Schedule**|schedule]]
-* [[**Poster**|poster]]
-* [[Planning]]
+* [[**Talks**|talks]]
* [[Code of Conduct|conduct]]
diff --git a/2020/submissions.org b/2020/submissions.org
index f159cf30..13404475 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 (if (plist-get talk :id)
+ (and talk (if (plist-get talk :talk-id)
(format "<a href=\"/2020/talks/%s\">%s</a>"
(plist-get talk :talk-id)
(plist-get talk :title))
@@ -3299,7 +3299,7 @@ Talk page: <https://emacsconf.org/2020/schedule/%s>
(save-buffer))))
(defun conf/generate-talks-page ()
- (let ((info conf/info))
+ (let ((info (conf/filter-talks conf/info)))
(with-temp-buffer
(find-file "talk-details.md")
(erase-buffer)