summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSacha Chua <sacha@sachachua.com>2020-11-28 08:06:05 -0500
committerSacha Chua <sacha@sachachua.com>2020-11-28 08:06:05 -0500
commit1daf0810f858053cefec1816267c6b4719cab87b (patch)
tree85d32f1e42d05dd4031b374002c3c6ce342c9e93
parent04dacd24c1c73813524bedb2823245a0c21e6a71 (diff)
parent68934495f229bf1a050c02abbc34ffae1ff1fbd9 (diff)
downloademacsconf-wiki-1daf0810f858053cefec1816267c6b4719cab87b.tar.xz
emacsconf-wiki-1daf0810f858053cefec1816267c6b4719cab87b.zip
Merge branch 'master' of git.emacsconf.org:emacsconf-wiki
-rw-r--r--2020.md4
-rw-r--r--2020/info/14.md1
-rw-r--r--2020/info/26.md12
3 files changed, 10 insertions, 7 deletions
diff --git a/2020.md b/2020.md
index f7fdb41c..b2559eed 100644
--- a/2020.md
+++ b/2020.md
@@ -9,6 +9,10 @@ EmacsConf 2020 | Online Conference | **November 28 and 29, 2020**
EmacsConf is the conference about the joy of Emacs, Emacs Lisp, and
memorizing key sequences.
+EmacsConf 2020 will be on November 28 (Sat) and November 29 (Sun),
+2020 from 9am-5pm Toronto/EST time; equivalently, 6am-2pm PST,
+2pm-10pm UTC, 3pm-11pm Zurich/CET.
+
We are holding EmacsConf 2020 as a virtual (online) conference again
this year, especially now, given the current state of the world with
the ongoing global pandemic. We remain fully committed to freedom, and
diff --git a/2020/info/14.md b/2020/info/14.md
index 1968a5d1..2a131adf 100644
--- a/2020/info/14.md
+++ b/2020/info/14.md
@@ -9,5 +9,6 @@ from getting outdated, and it allows you to use all the other
wonderful features of org-mode. Watch "README-Driven Design" to see
exactly how to make your README file a powerful literate document.
+- [Companion Blog Post](http://adamard.com/literate_programming.html)
- [Extended Version of Demo File](https://github.com/adam-ard/literate-demo)
- [Literate Static Website](https://github.com/adam-ard/static-website-literate-demo)
diff --git a/2020/info/26.md b/2020/info/26.md
index 851c3de4..12434642 100644
--- a/2020/info/26.md
+++ b/2020/info/26.md
@@ -7,13 +7,11 @@ approach everything at the age of 15. In the two years since
discovering Emacs in my sophomore year of high school, I have been
constantly amazed at what Emacs is capable of. In this talk, I would
like to share this journey of discovery and what I've learned along
-the way, beginning with what led me to Emacs. I will describe the
-many ways that Emacs has shaped my life as a student, a programmer, a
+the way, beginning with what led me to Emacs. I will reflect on my
+experience of the Emacs learning curve and then also talk about the
+many ways that Emacs has shaped my life as a student, programmer,
violinist, and a productive and happy adolescent. In each case, I
have thoroughly enjoyed figuring out the best way to make Emacs work
-for me, and I'd like to share this with others. In addition, I'd like
-to take this opportunity to address some roadblocks that I have
-noticed having observed some of my peers' attempts at learning Emacs
-and possible solutions for those barriers, taking inspiration from
-various sources both from inside and outside the Emacs community.
+for me. Finally, I will reflect on my journey thus far and briefly
+talk about my plans for the future.