Updated talks

2 files changed, 26 insertions, 24 deletions

diff --git a/pages/past.org b/pages/past.org
index 8c76f50..3476c52 100644
--- a/pages/past.org
+++ b/pages/past.org
@@ -6,6 +6,21 @@
   :END:
 Here you can find a list of past events of [[file:index.org][LibreAustralia]]. There is [[file:upcoming.org][a separate page listing upcoming events]].
 
+** 22nd Nov 2021: Weekly virtual meeting
+   :PROPERTIES:
+   :CUSTOM_ID: 2021-11-22
+   :END:
+
+- When :: 20:00-21:00 Monday 22nd Nov 2021 UTC+11 ([[file:index.org::#timezone-conversion][what time in my timezone?]])
+- Where :: [[https://j.libreau.org/la][Jitsi]]
+- What :: [[file:index.org][LibreAustralia]] meets virtually every Monday, unless otherwise specified.
+
+  In the meeting we generally have free flow discussions, to share discoveries, experiences, resources, tips and issues related to free software.
+  Sometimes we will watch a video about free software like a conference talk together.
+  And sometimes we also try to be like a normal tech meetup group and host talks, workshops and what-have-you.
+
+  Everyone is welcome to join, whether you reside in Australia or not.
+
 ** 15th Nov 2021: Weekly virtual meeting
    :PROPERTIES:
    :CUSTOM_ID: 2021-11-15
diff --git a/pages/upcoming.org b/pages/upcoming.org
index 9393739..d6eda05 100644
--- a/pages/upcoming.org
+++ b/pages/upcoming.org
@@ -6,46 +6,32 @@
   :END:
 Here you can find a list of upcoming events of [[file:index.org][LibreAustralia]]. There is [[file:past.org][a separate page listing past events]].
 
-** 22nd Nov 2021: Weekly virtual meeting
-   :PROPERTIES:
-   :CUSTOM_ID: 2021-11-22
-   :END:
-
-- When :: 20:00-21:00 Monday 22nd Nov 2021 UTC+11 ([[file:index.org::#timezone-conversion][what time in my timezone?]])
-- Where :: [[https://j.libreau.org/la][Jitsi]]
-- What :: [[file:index.org][LibreAustralia]] meets virtually every Monday, unless otherwise specified.
-
-  In the meeting we generally have free flow discussions, to share discoveries, experiences, resources, tips and issues related to free software.
-  Sometimes we will watch a video about free software like a conference talk together.
-  And sometimes we also try to be like a normal tech meetup group and host talks, workshops and what-have-you.
-
-  Everyone is welcome to join, whether you reside in Australia or not.
-
 ** 28th Nov 2021: EmacsConf 2021 Alternate Stream for APAC
    :PROPERTIES:
    :CUSTOM_ID: emacsconf21
    :END:
-- When :: 11:00-17:30 Sunday 28th Nov 2021 UTC+11 ([[file:index.org::#timezone-conversion][what time in my timezone?]])
-- Where :: Online (streaming link to be posted closer to the event)
+- When :: 11:00-17:45 Sunday 28th Nov 2021 UTC+11 ([[file:index.org::#timezone-conversion][what time in my timezone?]])
+- Where :: Online at <https://stream.libreau.org/live.webm>
 - What :: An alternate stream of EmacsConf 2021 for APAC hours.
 
   [[https://emacsconf.org/][EmacsConf]] is the annual conference about the joy of Emacs, Emacs Lisp, and memorising key bindings.  It is a conference for people of all levels and backgrounds.
 
   The [[https://emacsconf.org/2021][2021 Edition]] will take place 27th-28th November online.  To help make the conference more accessible, LibreAustralia will be [[/upcoming.html#emacsconf21][streaming]] a subset of the talks with hours favourable to APAC timezones on Sunday 28th Nov.
 
+  The stream will be available at <https://stream.libreau.org/live.webm> and can be viewed with a media player like mpv or vlc, or in a browser like IceCat, Abrowser or Firefox.
+
   Just like the main stream, we will be utilising IRC ([[irc://libera.chat/libreau][#libreau at libera.chat]]) for discussions.  If you are not familiar with IRC and/or prefer to using something "webby", we will provide a webchat (to be posted later when it is ready for use).
 
   We will also use Etherpad for (async) Q&As.  The link to the pad will be posted closer to the event.
 
   See below for a provisional schedule.  Talks marked with * means the speaker will be able to take live Q&A.
 
-
-  | When         | What                                                                                                  | Speaker(s)                                             |
+  | when         | what                                                                                                  | speaker(s)                                             |
   |--------------+-------------------------------------------------------------------------------------------------------+--------------------------------------------------------|
   | ~11:00-11:05 | [[https://emacsconf.org/2021/talks/day1-open][Opening remarks]]                                                                                       |                                                        |
   | ~11:06-11:11 | [[https://emacsconf.org/2021/talks/news][Emacs News Highlights]]                                                                                 | Sacha Chua                                             |
-  | ~11:12-11:36 | [[https://emacsconf.org/2021/talks/pattern][Emacs as Design Pattern Learning]]                                                                      | Greta Goetz                                            |
-  | ~11:39-12:05 | [[https://emacsconf.org/2021/talks/janitor][A day in the life of a janitor]]*                                                                 | Stefan Monnier                                         |
+  | ~11:12-11:36 | [[https://emacsconf.org/2021/talks/pattern][Choose Your Own (Technology-Enhanced Learning) Adventure]]                                              | Greta Goetz                                            |
+  | ~11:39-12:05 | [[https://emacsconf.org/2021/talks/janitor][A day in the life of a janitor]]*                                                                       | Stefan Monnier                                         |
   | ~12:08-12:38 | [[https://emacsconf.org/2021/talks/bindat][Turbo Bindat]]*                                                                                         | Stefan Monnier                                         |
   | ~12:41-12:48 | [[https://emacsconf.org/2021/talks/unix][GNU's Not UNIX: Why Emacs Demonstrates The UNIX Philosophy Isn't Always The Only Answer]]               | Daniel Rose                                            |
   | ~12:50-13:20 | break                                                                                                 |                                                        |
@@ -56,9 +42,9 @@ Here you can find a list of upcoming events of [[file:index.org][LibreAustralia]
   | ~14:34-14:40 | [[https://emacsconf.org/2021/talks/nongnu][NonGNU ELPA Update]]                                                                                    | Philip Kaludercic                                      |
   | ~14:42-14:52 | [[https://emacsconf.org/2021/talks/gregorian][Typesetting Gregorian Chant with Emacs]]                                                                | Spencer King                                           |
   | ~14:54-15:04 | [[https://emacsconf.org/2021/talks/montessori][Emacs and Montessori Philosophy]]                                                                       | Grant Shangreaux                                       |
-  | ~15:06-15:16 | [[https://emacsconf.org/2021/talks/erg][Emacs Research Group, Season Zero: What we did together with Emacs in 2 hours a week for a year]]       | Noorah Alhasan, Joe Corneli, Raymond Puzio, Leo Vivier |
+  | ~15:06-15:16 | [[https://emacsconf.org/2021/talks/erg][Emacs Research Group, Season Zero: What we did together with Emacs in 0:2 hours a week for a year]]     | Noorah Alhasan, Joe Corneli, Raymond Puzio, Leo Vivier |
   | ~15:19-15:49 | break                                                                                                 |                                                        |
-  | ~15:49-15:59 | [[https://emacsconf.org/2021/talks/babel][Babel for academics]]                                                                                   | Asilata Bapat                                          |
+  | ~15:49-15:59 | [[https://emacsconf.org/2021/talks/babel][Babel for academics]]*                                                                                  | Asilata Bapat                                          |
   | ~16:01-16:06 | [[https://emacsconf.org/2021/talks/research][Managing a research workflow (bibliographies, note-taking, and arXiv)]]                                 | Ahmed Khaled                                           |
   | ~16:07-16:17 | [[https://emacsconf.org/2021/talks/tech][Creating technical API documentation and presentations using org-babel, restclient, and org-treeslide]] | Jan Ypma                                               |
   | ~16:19-16:26 | [[https://emacsconf.org/2021/talks/exec][Org as an executable format]]                                                                           | Tom Gillespie                                          |
@@ -66,7 +52,8 @@ Here you can find a list of upcoming events of [[file:index.org][LibreAustralia]
   | ~16:52-17:02 | [[https://emacsconf.org/2021/talks/project][Budgeting, Project Monitoring and Invoicing with Org Mode]]                                             | Adolfo Villafiorita                                    |
   | ~17:04-17:14 | [[https://emacsconf.org/2021/talks/invoice][Finding Your (In)voice: Emacs for Invoicing]]                                                           | Bala Ramadurai                                         |
   | ~17:16-17:24 | [[https://emacsconf.org/2021/talks/nyxt][Emacs with Nyxt: extend your editor with the power of a Lisp browser]]                                  | Andrea                                                 |
-  | ~17:26-17:33 | [[https://emacsconf.org/2021/talks/design][On the design of text editors]]                                                                         | Nicolas P. Rougier                                     |
+  | ~17:26-17:36 | [[https://emacsconf.org/2021/talks/mold][Moldable Emacs, a step towards sustainable software]]                                                   | Andrea                                                 |
+  | ~17:38-17:45 | [[https://emacsconf.org/2021/talks/design][On the design of text editors]]                                                                         | Nicolas P. Rougier                                     |
 
   *: The speaker of this talk will be able to attend live Q&A.