Merge remote-tracking branch 'origin/master'

15 files changed, 145 insertions, 161 deletions

diff --git a/2021/captions/emacsconf-2021-news--emacs-news-highlights--sacha-chua.vtt b/2021/captions/emacsconf-2021-news--emacs-news-highlights--sacha-chua.vtt
index cae57e66..3b8f2db3 100644
--- a/2021/captions/emacsconf-2021-news--emacs-news-highlights--sacha-chua.vtt
+++ b/2021/captions/emacsconf-2021-news--emacs-news-highlights--sacha-chua.vtt
@@ -52,7 +52,7 @@ on native compilation too.
 2.
 
 00:31.206 --> 00:33.732
-Org Mode is now at version 9.5.
+Org mode is now at version 9.5.
 
 00:33.732 --> 00:35.086
 New features include
@@ -438,44 +438,53 @@ and Mike Zamansky
 04:03.220 --> 04:04.255
 are back, hooray!
 
-04:04.255 --> 04:04.926
+04:04.255 --> 04:06.626
+And Marcin Borkowski has just finished
+
+04:06.626 --> 04:08.516
+writing an intermediate textbook
+
+04:08.516 --> 04:09.751
+Emacs Lisp, too!
+
+04:09.751 --> 04:10.422
 10.
 
-04:04.926 --> 04:06.433
+04:10.422 --> 04:11.929
 Lastly, if you want to chat
 
-04:06.433 --> 04:07.587
+04:11.929 --> 04:13.083
 with other Emacs folks
 
-04:07.587 --> 04:09.788
-and get help on Emacs, Org Mode,
+04:13.083 --> 04:15.284
+and get help on Emacs, Org mode,
 
-04:09.788 --> 04:10.715
+04:15.284 --> 04:16.211
 or other topics,
 
-04:10.715 --> 04:11.940
+04:16.211 --> 04:17.436
 the #emacs and #org-mode
 
-04:11.940 --> 04:14.365
+04:17.436 --> 04:19.861
 Internet Relay Chat or IRC channels
 
-04:14.365 --> 04:16.251
+04:19.861 --> 04:21.747
 are now on the libera.chat network
 
-04:16.251 --> 04:17.517
+04:21.747 --> 04:23.013
 instead of Freenode.
 
-04:17.517 --> 04:19.392
+04:23.013 --> 04:24.888
 If you'd like to add something I've missed,
 
-04:19.392 --> 04:21.087
+04:24.888 --> 04:26.583
 please add them to the wiki page,
 
-04:21.087 --> 04:23.538
+04:26.583 --> 04:29.034
 or e-mail me at sacha@sachachua.com .
 
-04:23.538 --> 04:25.058
+04:29.034 --> 04:30.554
 That's all for this quick review.
 
-04:25.058 --> 04:27.608
+04:30.554 --> 04:33.104
 Enjoy the rest of EmacsConf 2021!
diff --git a/2021/contribute.md b/2021/contribute.md
index 8c351cd8..9a11abce 100644
--- a/2021/contribute.md
+++ b/2021/contribute.md
@@ -27,12 +27,12 @@ Many sessions will have live question and answer sessions via BigBlueButton
 ready to go: their audio works, their screen can be shared properly, and so
 on. You can help by testing their setup beforehand.
 
-You can test your own connection at <https://test.bigbluebutton.org>
-. If that works for you, you can be a tech-check volunteer.  Let us
-know what your availability is and we can match you up with speakers
-who want to doublecheck their setup before the conference. All you'd
-need to do is to go through a checklist with them and send us a quick
-email afterwards.
+You can test your own connection at <https://test.bigbluebutton.org>. If that
+works for you, you can be a tech-check volunteer!  You can add yourself to the
+table on our [Prepare](https://emacsconf.org/2021/prepare/) page and let us
+know what your availability is so that we may match you up with speakers who
+want to doublecheck their setup before the conference. All you'd need to do is
+to go through a checklist with them.
 
 Here are some notes on the process:
 
diff --git a/2021/info/borg-schedule.md b/2021/info/borg-schedule.md
index 2473f125..77fc3ecc 100644
--- a/2021/info/borg-schedule.md
+++ b/2021/info/borg-schedule.md
@@ -2,11 +2,11 @@
 
 # Status
 
-Waiting for speaker to send prerecorded video
+Captions added to video
 
 # Schedule
 
-Allocated 10 minutes
+Allocated 8 minutes
 
 
 
diff --git a/2021/info/dashboard-nav.md b/2021/info/dashboard-nav.md
index a7a30028..c79c7f6f 100644
--- a/2021/info/dashboard-nav.md
+++ b/2021/info/dashboard-nav.md
@@ -1,3 +1,3 @@
 Back to the [[schedule]]  
-Previous: <a href="/2021/talks/invoice">Find Your (In)voice: Emacs for Invoicing</a>  
+Previous: <a href="/2021/talks/invoice">Finding Your (In)voice: Emacs for Invoicing</a>  
 Next: <a href="/2021/talks/nyxt">Emacs with Nyxt: extend your editor with the power of a Lisp browser</a>  
diff --git a/2021/info/freedom-schedule.md b/2021/info/freedom-schedule.md
index 09a66236..1a7e78f7 100644
--- a/2021/info/freedom-schedule.md
+++ b/2021/info/freedom-schedule.md
@@ -6,7 +6,7 @@ Captions added to video
 
 # Schedule
 
-Allocated 40 minutes
+Allocated 38 minutes
 
 
 
diff --git a/2021/info/invoice-schedule.md b/2021/info/invoice-schedule.md
index 0dcc666a..81a6f5ae 100644
--- a/2021/info/invoice-schedule.md
+++ b/2021/info/invoice-schedule.md
@@ -2,7 +2,7 @@
 
 # Status
 
-Waiting for speaker to send prerecorded video
+Prerecorded video received, waiting for captions
 
 # Schedule
 
diff --git a/2021/info/org-outside-schedule.md b/2021/info/org-outside-schedule.md
index c938c65b..e803a040 100644
--- a/2021/info/org-outside-schedule.md
+++ b/2021/info/org-outside-schedule.md
@@ -6,7 +6,7 @@ Captions added to video
 
 # Schedule
 
-Allocated 10 minutes
+Allocated 12 minutes
 
 
 
diff --git a/2021/info/professional-schedule.md b/2021/info/professional-schedule.md
index 63541012..3acc8521 100644
--- a/2021/info/professional-schedule.md
+++ b/2021/info/professional-schedule.md
@@ -2,7 +2,7 @@
 
 # Status
 
-Prerecorded video received, waiting for captions
+Captions added to video
 
 # Schedule
 
diff --git a/2021/info/project-nav.md b/2021/info/project-nav.md
index f519f4c7..7d456be3 100644
--- a/2021/info/project-nav.md
+++ b/2021/info/project-nav.md
@@ -1,3 +1,3 @@
 Back to the [[schedule]]  
 Previous: <a href="/2021/talks/molecular">Reproducible molecular graphics with Org-mode</a>  
-Next: <a href="/2021/talks/invoice">Find Your (In)voice: Emacs for Invoicing</a>  
+Next: <a href="/2021/talks/invoice">Finding Your (In)voice: Emacs for Invoicing</a>  
diff --git a/2021/info/unix-schedule.md b/2021/info/unix-schedule.md
index 6a8e311e..7eabc819 100644
--- a/2021/info/unix-schedule.md
+++ b/2021/info/unix-schedule.md
@@ -2,11 +2,11 @@
 
 # Status
 
-Waiting for speaker to send prerecorded video
+Prerecorded video received, waiting for captions
 
 # Schedule
 
-Allocated 10 minutes
+Allocated 7 minutes
 
 
 
diff --git a/2021/prepare.md b/2021/prepare.md
index 3d78a407..47f7e143 100644
--- a/2021/prepare.md
+++ b/2021/prepare.md
@@ -38,6 +38,7 @@ your name, please start your video with something along the lines of:
 
 "Hi! I'm ${NAME} and I'll be talking about ${TOPIC}."
 
+<a name="ftp-upload"></a>
 Please **upload your prerecording(s) (and script/notes if any) via FTP** to the FTP server we have set up with the following details:
 
 - host: ftp-upload.emacsconf.org
@@ -115,11 +116,75 @@ passes. During the first pass, the frame count will increase, but the
 speed will be 0. After the first pass, it will display proper progress
 information.
 
-# Tech check
-
-If you're planning to do live Q&A, you can check your system setup at
-https://test.bigbluebutton.org/ .  We'll set up a tech-check call with
-you, too.  We'll post details here closer to that time.
+<a name="tech-check"></a>
+# Tech-check
+
+We ask that speakers who plan to participate in live Q&A sessions schedule
+a short tech-check in the weeks leading to the conference; this is to ensure
+that you can perform all the common tasks you'd need such as sharing your
+screen or toggling your microphone.
+
+We use BigBlueButton for our video-conferencing needs, and a quick way to
+familiarize yourself with it is to run it in a test-room:
+https://test.bigbluebutton.org/
+
+If this is your first time at EmacsConf or if you run into any problems,
+please get in touch with us and we'll sort things out together!  In those
+cases, since we'll need to schedule a 1-on-1 tech-check with you, we ask that
+you email the closest volunteer to your timezone in the list below (or zaeph
+if none of the timezones is a good fit).  You can also visit us at
+[#emacsconf-org on Libera](irc://libera.chat/#emacsconf-org).
+
+We will likely schedule those 1-on-1 tech-checks with you on Saturdays or
+Sundays, but we would be happy to try and work out another time if that
+doesn't work for you.
+
+<table>
+<thead>
+<tr>
+<td>Volunteer</td>
+<td>Email</td>
+<td>IRC Nick</td>
+<td>Timezone</td>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>Leo Vivier</td>
+<td>&lt;<a href="mailto:zaeph@zaeph.net">zaeph@zaeph.net</a>&gt;</td>
+<td>zaeph</td>
+<td>CET (UTC+1)</td>
+</tr>
+<tr>
+<td><strong>Wanna help out?  You can add your name and contact-info here!</strong></td>
+<td>&lt;<a href="mailto:your@email">your@email</a>&gt;</td>
+<td>…</td>
+<td>…</td>
+</tr>
+<tr>
+<td>Corwin Brust</td>
+<td>&lt;<a href="mailto:corwin@bru.st">corwin@bru.st</a>&gt;</td>
+<td>corwin</td>
+<td>US/Central (UTC-6)</td>
+</tr>
+<tr>
+<td>Amin Bandali</td>
+<td>&lt;<a href="mailto:bandali@gnu.org">bandali@gnu.org</a>&gt;</td>
+<td>bandali</td>
+<td>US/Eastern (UTC-5)</td>
+</tr>
+<tr>
+<td>Yuchen Pei</td>
+<td>&lt;<a href="mailto:hi@ypei.me">hi@ypei.me</a>&gt;</td>
+<td></td>
+<td>Australia/Eastern (UTC+11)</td>
+</tr>
+</tbody>
+</table>
+
+If you'd like to help out with the tech-checks, feel free to add your name and
+email to the above list and email &lt;<a
+href="mailto:zaeph@zaeph.net">zaeph@zaeph.net</a>&gt; to plan the logistics.
 
 Thank you so much for helping with EmacsConf 2021!
 
@@ -190,83 +255,6 @@ Please email <emacsconf-submit@gnu.org>.  We'd love to hear from you.
 
 Thanks for contributing to EmacsConf 2021!
 
-
-<!-- #### Office hours for video call tech-checks -->
-
-<!-- After you submit your prerecorded video, we will schedule a tech-check with  -->
-<!-- We ask that speakers who plan to participate in Q&A sessions and/or -->
-<!-- plan to present live schedule a short tech-check with us in the weeks -->
-<!-- leading to the conference, in order to quickly check their ability for -->
-<!-- joining video calls and performing common tasks such as sharing their -->
-<!-- screen.  The office hours will likely be on Saturdays or Sundays, but -->
-<!-- we would be happy to try and work out another time if that doesn’t -->
-<!-- work for a speaker. -->
-
-<!-- To schedule a short tech-check, email one of the people listed below -->
-<!-- or visit with us on [#emacsconf-org on Freenode -->
-<!-- IRC](irc://chat.freenode.net/#emacsconf-org). -->
-
-<!-- <table> -->
-<!-- <thead> -->
-<!-- <tr> -->
-<!-- <td>Volunteer</td> -->
-<!-- <td>Email</td> -->
-<!-- <td>IRC Nick</td> -->
-<!-- <td>Timezone</td> -->
-<!-- </tr> -->
-<!-- </thead> -->
-<!-- <tbody> -->
-<!-- <tr> -->
-<!-- <td>Corwin Brust</td> -->
-<!-- <td>&lt;<a href="mailto:corwin@bru.st">corwin@bru.st</a>&gt;</td> -->
-<!-- <td>mplsCorwin</td> -->
-<!-- <td>US/Central (UTC-6)</td> -->
-<!-- </tr> -->
-<!-- <tr> -->
-<!-- <td>Leo Vivier</td> -->
-<!-- <td>&lt;<a href="mailto:zaeph@zaeph.net">zaeph@zaeph.net</a>&gt;</td> -->
-<!-- <td>zaeph</td> -->
-<!-- <td>CET (UTC+1)</td> -->
-<!-- </tr> -->
-<!-- <tr> -->
-<!-- <td>Bhavin Gandhi</td> -->
-<!-- <td>&lt;<a href="mailto:bhavin192@geeksocket.in">bhavin192@geeksocket.in</a>&gt;</td> -->
-<!-- <td>bhavin192</td> -->
-<!-- <td>Asia/Kolkata (UTC+05:30)</td> -->
-<!-- </tr> -->
-<!-- <tr> -->
-<!-- <td>Karl Voit</td> -->
-<!-- <td>&lt;<a href="mailto:EmacsConf@Karl-Voit.at">EmacsConf@Karl-Voit.at</a>&gt;</td> -->
-<!-- <td>publicvoit</td> -->
-<!-- <td>CET (UTC+1)</td> -->
-<!-- </tr> -->
-<!-- <tr> -->
-<!-- <tr> -->
-<!-- <td><strong>Your Name</strong></td> -->
-<!-- <td>&lt;your@email&gt;</td> -->
-<!-- <td>&nbsp;</td> -->
-<!-- <td>&nbsp;</td> -->
-<!-- </tr> -->
-<!-- <tr> -->
-<!-- <td><strong>David O'Toole</strong></td> -->
-<!-- <td>&lt;deeteeoh1138@gmail.com&gt;</td> -->
-<!-- <td>dto</td> -->
-<!-- <td>US/Eastern (UTC-5)</td> -->
-<!-- </tr> -->
-<!-- <tr> -->
-<!-- <td>Amin Bandali</td> -->
-<!-- <td>&lt;<a href="mailto:bandali@gnu.org">bandali@gnu.org</a>&gt;</td> -->
-<!-- <td>bandali</td> -->
-<!-- <td>US/Eastern (UTC-5)</td> -->
-<!-- </tr> -->
-<!-- </tbody> -->
-<!-- </table> -->
-
-<!-- If you'd like to help out with the tech-checks, feel free to add your -->
-<!-- name and email to the above list and email <bandali@gnu.org> to plan -->
-<!-- the logistics. -->
-
-
 <!-- <a name="tech-checklist"></a> -->
 <!-- #### Tech checklist -->
 
diff --git a/2021/schedule-details.md b/2021/schedule-details.md
index fe3fa139..81ae4962 100644
--- a/2021/schedule-details.md
+++ b/2021/schedule-details.md
@@ -26,7 +26,7 @@
 <tr><td><a href="/2021/talks/babel">Babel for academics</a></td><td>Asilata Bapat</td></tr>
 <tr><td><a href="/2021/talks/molecular">Reproducible molecular graphics with Org-mode</a></td><td>Blaine Mooers</td></tr>
 <tr><td><a href="/2021/talks/project">Budgeting, Project Monitoring and Invoicing with Org Mode</a></td><td>Adolfo Villafiorita</td></tr>
-<tr><td><a href="/2021/talks/invoice">Find Your (In)voice: Emacs for Invoicing</a></td><td>Bala Ramadurai</td></tr>
+<tr><td><a href="/2021/talks/invoice">Finding Your (In)voice: Emacs for Invoicing</a></td><td>Bala Ramadurai</td></tr>
 <tr><td><a href="/2021/talks/dashboard">Productivity Dashboards with Emacs and Kindle</a></td><td>Mehmet Tekman</td></tr>
 <tr><td><a href="/2021/talks/nyxt">Emacs with Nyxt: extend your editor with the power of a Lisp browser</a></td><td>Andrea</td></tr>
 <tr><td><a href="/2021/talks/design">On the design of text editors</a></td><td>Nicolas P. Rougier</td></tr>
diff --git a/2021/schedule.md b/2021/schedule.md
index 8fd6e2c1..93d6a7f6 100644
--- a/2021/schedule.md
+++ b/2021/schedule.md
@@ -1,7 +1,7 @@
 [[!meta title="Schedule"]]
 [[!meta copyright="Copyright &copy; 2021 Amin Bandali and Sacha Chua"]]
 
-EmacsConf 2021 will be on November 27 (Sat) and November 28 (Sun), 2021 from 9am-5pm Toronto/EST time; equivalently, 6am-2pm PST, 2pm-10pm UTC, 3pm-11pm Zurich/CET. 
+EmacsConf 2021 will be on November 27 (Sat) and November 28 (Sun), 2021 from 9am-5pm Toronto/EST time; equivalently, 6am-2pm PST, 2pm-10pm UTC, 3pm-11pm Zurich/CET, 7pm-4am(next-day) India/IST. 
 
 *Please note that the program is still being worked on and this list may change. We're still figuring out how things will go! =)* 
 
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"]]