Merge branch 'master' of git.emacsconf.org:emacsconf-wiki

2 files changed, 22 insertions, 31 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/omegat.md b/2021/talks/omegat.md
index b48a2bfe..8fe9ec58 100644
--- a/2021/talks/omegat.md
+++ b/2021/talks/omegat.md
@@ -52,6 +52,13 @@ I will *not* show:
 
 People who are interested in knowing more about OmegaT are invited to check the [online user manual](https://omegat.sourceforge.io/manual-latest/en/).
 
+# Personal information
+- Name pronunciation: [ʒɑ̃kRstɔf elaRi](https://doublet.jp/wp-content/uploads/2021/11/jch.ogg)
+- Pronouns: he
+- Homepage: [https://mac4translators.blogspot.com](https://mac4translators.blogspot.com)
+- Preferred contact info: [jean.christophe.helary@traduction-libre.org](jean.christophe.helary@traduction-libre.org)
+- Links for sponsoring/supporting (multilingual translations): [https://doublet.jp](https://doublet.jp)
+
 
 [[!inline pages="internal(2021/info/omegat-schedule)" raw="yes"]]