Merge remote-tracking branch 'origin/master'

2 files changed, 32 insertions, 45 deletions

diff --git a/2021/talks/design.md b/2021/talks/design.md
index e251a704..41c08c4c 100644
--- a/2021/talks/design.md
+++ b/2021/talks/design.md
@@ -17,41 +17,25 @@ habits, reproducing what they are used to. Durint this talk, I will
 characterize these implicit choices and illustrate what are some
 alternatives using GNU Emacs.
 
+# Outline
 
+1. Review of a "modern" code editor (5mn)
+2. Introduction of an alternative using Emacs (5mn)
 
-# Outline
+## Links from the slides:
 
-<!--
--   Brief description for all talk formats up to your maximum   planned
-    length
-
--   40 minutes (preferred option)
-    -   **10 minutes** Demonstrating implicit choices present in most text
-        editors that are all too similar.
-    -   **10 minutes** Showing alternatives, including typography, colors,
-        layout,
-                 user interaction as well as non implemented features
-                 (technical barriers).
-    -   **10 minutes** Live demonstration of my hacked but consistent
-        environment
-                 for edition/news/agenda/mail using various packages
-                 I've
-                 authored.
-    -   **10 minutes** Questions
-
--   20 minutes alternative
-    -   **5 minutes** Rapid overview of text editors implicit choices
-    -   **10 minutes** Showing alternatives, including typography, colors,
-        layout, user interaction and live demonstration of my
-        Emacs
-        environment.
-    -   **5 minutes** Questions
--->
--   10 minutes alternative
-
-Mostly a live demo of my environment with pointers to the different
-packages
+* [Elegant Emacs](https://github.com/rougier/elegant-emacs) (https://github.com/rougier/elegant-emacs)
+* [On the Design of Text Editors](https://arxiv.org/abs/2008.06030) (https://arxiv.org/abs/2008.06030)
+* [N Λ N O Emacs](https://github.com/rougier/nano-emacs) (https://github.com/rougier/nano-emacs)
+* [svg-lib (ELPA)](https://elpa.gnu.org/packages/svg-lib.html) (https://elpa.gnu.org/packages/svg-lib.html)
+* [nano-theme (ELPA)](https://elpa.gnu.org/packages/nano-theme.html) (https://elpa.gnu.org/packages/nano-theme.html)
+* [nano-modeline (ELPA)](https://elpa.gnu.org/packages/nano-modeline.html) (https://elpa.gnu.org/packages/nano-modeline.html)
+* [nano-agenda (ELPA)](https://elpa.gnu.org/packages/nano-agenda.html) (https://elpa.gnu.org/packages/nano-agenda.html)
 
+## Contact information
+* Contact [nicolas.rougier@inria.fr](mailto:nicolas.rougier@inria.fr)
+* Follow my work at [github.com/rougier](https://github.com/rougier)
+* Support my work at [github.com/sponsors/rougier](https://github.com/sponsors/rougier) or [en.liberapay.com/rougier/](https://en.liberapay.com/rougier/)
 
 
 [[!inline pages="internal(2021/info/design-schedule)" raw="yes"]]
diff --git a/2021/talks/news.md b/2021/talks/news.md
index d2e4f103..db89f156 100644
--- a/2021/talks/news.md
+++ b/2021/talks/news.md
@@ -167,20 +167,23 @@ Posting the video early to help test formatting.
 [[!template text="John Kitchin" start="00:04:01.664" video="mainVideo" id=subtitle]]
 [[!template text="and Mike Zamansky" start="00:04:02.474" video="mainVideo" id=subtitle]]
 [[!template text="are back, hooray!" start="00:04:03.220" video="mainVideo" id=subtitle]]
-[[!template new="1" text="10\." start="00:04:04.255" video="mainVideo" id=subtitle]]
-[[!template text="Lastly, if you want to chat" start="00:04:04.926" video="mainVideo" id=subtitle]]
-[[!template text="with other Emacs folks" start="00:04:06.433" video="mainVideo" id=subtitle]]
-[[!template text="and get help on Emacs, Org Mode," start="00:04:07.587" video="mainVideo" id=subtitle]]
-[[!template text="or other topics," start="00:04:09.788" video="mainVideo" id=subtitle]]
-[[!template text="the #emacs and #org-mode" start="00:04:10.715" video="mainVideo" id=subtitle]]
-[[!template text="Internet Relay Chat or IRC channels" start="00:04:11.940" video="mainVideo" id=subtitle]]
-[[!template text="are now on the libera.chat network" start="00:04:14.365" video="mainVideo" id=subtitle]]
-[[!template text="instead of Freenode." start="00:04:16.251" video="mainVideo" id=subtitle]]
-[[!template text="If you'd like to add something I've missed," start="00:04:17.517" video="mainVideo" id=subtitle]]
-[[!template text="please add them to the wiki page," start="00:04:19.392" video="mainVideo" id=subtitle]]
-[[!template text="or e-mail me at sacha@sachachua.com ." start="00:04:21.087" video="mainVideo" id=subtitle]]
-[[!template text="That's all for this quick review." start="00:04:23.538" video="mainVideo" id=subtitle]]
-[[!template text="Enjoy the rest of EmacsConf 2021!" start="00:04:25.058" video="mainVideo" id=subtitle]]
+[[!template text="And Marcin Borkowski has just finished" start="00:04:04.255" video="mainVideo" id=subtitle]]
+[[!template text="writing an intermediate textbook" start="00:04:06.626" video="mainVideo" id=subtitle]]
+[[!template text="Emacs Lisp, too!" start="00:04:08.516" video="mainVideo" id=subtitle]]
+[[!template new="1" text="10\." start="00:04:09.751" video="mainVideo" id=subtitle]]
+[[!template text="Lastly, if you want to chat" start="00:04:10.422" video="mainVideo" id=subtitle]]
+[[!template text="with other Emacs folks" start="00:04:11.929" video="mainVideo" id=subtitle]]
+[[!template text="and get help on Emacs, Org mode," start="00:04:13.083" video="mainVideo" id=subtitle]]
+[[!template text="or other topics," start="00:04:15.284" video="mainVideo" id=subtitle]]
+[[!template text="the #emacs and #org-mode" start="00:04:16.211" video="mainVideo" id=subtitle]]
+[[!template text="Internet Relay Chat or IRC channels" start="00:04:17.436" video="mainVideo" id=subtitle]]
+[[!template text="are now on the libera.chat network" start="00:04:19.861" video="mainVideo" id=subtitle]]
+[[!template text="instead of Freenode." start="00:04:21.747" video="mainVideo" id=subtitle]]
+[[!template new="1" text="If you'd like to add something I've missed," start="00:04:23.013" video="mainVideo" id=subtitle]]
+[[!template text="please add them to the wiki page," start="00:04:24.888" video="mainVideo" id=subtitle]]
+[[!template text="or e-mail me at sacha@sachachua.com ." start="00:04:26.583" video="mainVideo" id=subtitle]]
+[[!template text="That's all for this quick review." start="00:04:29.034" video="mainVideo" id=subtitle]]
+[[!template text="Enjoy the rest of EmacsConf 2021!" start="00:04:30.554" video="mainVideo" id=subtitle]]
 
 [[!inline pages="internal(2021/info/news-schedule)" raw="yes"]]