summaryrefslogtreecommitdiffstats
path: root/2021/info
diff options
context:
space:
mode:
authorJean-Christophe Helary <jean.christophe.helary@traduction-libre.org>2021-11-07 09:47:41 +0900
committerJean-Christophe Helary <jean.christophe.helary@traduction-libre.org>2021-11-07 09:47:41 +0900
commitb92718d2ad1446b6c006118fce7e0eba1a75dffe (patch)
tree3d3229190211952da8b9d9ade9c403de1d5d1ba5 /2021/info
parentd278842e8ed734c07da4aa9287a298142c47105a (diff)
parentf17ad33c8a06ce1e353c36fe5024e921c29c930e (diff)
downloademacsconf-wiki-b92718d2ad1446b6c006118fce7e0eba1a75dffe.tar.xz
emacsconf-wiki-b92718d2ad1446b6c006118fce7e0eba1a75dffe.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to '2021/info')
-rw-r--r--2021/info/adventure-nav.md2
-rw-r--r--2021/info/dsl-nav.md2
-rw-r--r--2021/info/faster-nav.md2
-rw-r--r--2021/info/freedom-schedule.md2
-rw-r--r--2021/info/mold-schedule.md2
-rw-r--r--2021/info/native-schedule.md2
-rw-r--r--2021/info/news-schedule.md2
-rw-r--r--2021/info/nongnu-schedule.md4
-rw-r--r--2021/info/nyxt-schedule.md2
-rw-r--r--2021/info/omegat-nav.md2
-rw-r--r--2021/info/org-outside-schedule.md2
-rw-r--r--2021/info/professional-schedule.md4
-rw-r--r--2021/info/tech-schedule.md4
-rw-r--r--2021/info/telega-schedule.md4
14 files changed, 18 insertions, 18 deletions
diff --git a/2021/info/adventure-nav.md b/2021/info/adventure-nav.md
index e83ae6d4..13d1bf25 100644
--- a/2021/info/adventure-nav.md
+++ b/2021/info/adventure-nav.md
@@ -1,3 +1,3 @@
Back to the [[schedule]]
Previous: <a href="/2021/talks/frownies">The True Frownies are the Friends We Made Along the Way: An Anecdote of Emacs's Malleability</a>
-Next: <a href="/2021/talks/unix">"GNU's Not UNIX: Why Emacs Demonstrates The UNIX Philosophy Isn't Always The Only Answer"</a>
+Next: <a href="/2021/talks/unix">GNU's Not UNIX: Why Emacs Demonstrates The UNIX Philosophy Isn't Always The Only Answer</a>
diff --git a/2021/info/dsl-nav.md b/2021/info/dsl-nav.md
index a29effef..df0175ce 100644
--- a/2021/info/dsl-nav.md
+++ b/2021/info/dsl-nav.md
@@ -1,3 +1,3 @@
Back to the [[schedule]]
-Previous: <a href="/2021/talks/structural">Why structural editing is the future of code editing, and a novel approach for editing everyday languages</a>
+Previous: <a href="/2021/talks/structural">Tree-edit: Structural editing for Java, Python, C, and beyond!</a>
Next: <a href="/2021/talks/ui">"Yak-shaving to a UI framework" (/"Help! I accidentally yak-shaved my way to writing a UI framework because overlays were slow")</a>
diff --git a/2021/info/faster-nav.md b/2021/info/faster-nav.md
index 21324165..460ebc9c 100644
--- a/2021/info/faster-nav.md
+++ b/2021/info/faster-nav.md
@@ -1,3 +1,3 @@
Back to the [[schedule]]
Previous: <a href="/2021/talks/day2-open">Opening remarks day 2</a>
-Next: <a href="/2021/talks/structural">Why structural editing is the future of code editing, and a novel approach for editing everyday languages</a>
+Next: <a href="/2021/talks/structural">Tree-edit: Structural editing for Java, Python, C, and beyond!</a>
diff --git a/2021/info/freedom-schedule.md b/2021/info/freedom-schedule.md
index 9700ca40..09a66236 100644
--- a/2021/info/freedom-schedule.md
+++ b/2021/info/freedom-schedule.md
@@ -2,7 +2,7 @@
# Status
-Waiting for speaker to send prerecorded video
+Captions added to video
# Schedule
diff --git a/2021/info/mold-schedule.md b/2021/info/mold-schedule.md
index 54a253ed..a01b5dbe 100644
--- a/2021/info/mold-schedule.md
+++ b/2021/info/mold-schedule.md
@@ -2,7 +2,7 @@
# Status
-Waiting for speaker to send prerecorded video
+Captions added to video
# Schedule
diff --git a/2021/info/native-schedule.md b/2021/info/native-schedule.md
index a36fef40..00e0666e 100644
--- a/2021/info/native-schedule.md
+++ b/2021/info/native-schedule.md
@@ -6,7 +6,7 @@ Waiting for speaker to send prerecorded video
# Schedule
-Allocated 20 minutes
+Allocated 40 minutes
diff --git a/2021/info/news-schedule.md b/2021/info/news-schedule.md
index ea2dd5a9..ce9cf23a 100644
--- a/2021/info/news-schedule.md
+++ b/2021/info/news-schedule.md
@@ -2,7 +2,7 @@
# Status
-Waiting for speaker to send prerecorded video
+Captions added to video
# Schedule
diff --git a/2021/info/nongnu-schedule.md b/2021/info/nongnu-schedule.md
index 74e71a21..43e04a6e 100644
--- a/2021/info/nongnu-schedule.md
+++ b/2021/info/nongnu-schedule.md
@@ -2,11 +2,11 @@
# Status
-Waiting for speaker to send prerecorded video
+Captions added to video
# Schedule
-Allocated 10 minutes
+Allocated 7 minutes
diff --git a/2021/info/nyxt-schedule.md b/2021/info/nyxt-schedule.md
index 644430df..692f0df4 100644
--- a/2021/info/nyxt-schedule.md
+++ b/2021/info/nyxt-schedule.md
@@ -2,7 +2,7 @@
# Status
-Waiting for confirmation from the speaker(s)
+Prerecorded video received, waiting for captions
# Schedule
diff --git a/2021/info/omegat-nav.md b/2021/info/omegat-nav.md
index d021dacf..bbb1da5c 100644
--- a/2021/info/omegat-nav.md
+++ b/2021/info/omegat-nav.md
@@ -1,3 +1,3 @@
Back to the [[schedule]]
-Previous: <a href="/2021/talks/unix">"GNU's Not UNIX: Why Emacs Demonstrates The UNIX Philosophy Isn't Always The Only Answer"</a>
+Previous: <a href="/2021/talks/unix">GNU's Not UNIX: Why Emacs Demonstrates The UNIX Philosophy Isn't Always The Only Answer</a>
Next: <a href="/2021/talks/nongnu">NonGNU ELPA Update</a>
diff --git a/2021/info/org-outside-schedule.md b/2021/info/org-outside-schedule.md
index 1ab76033..c938c65b 100644
--- a/2021/info/org-outside-schedule.md
+++ b/2021/info/org-outside-schedule.md
@@ -2,7 +2,7 @@
# Status
-Waiting for confirmation from the speaker(s)
+Captions added to video
# Schedule
diff --git a/2021/info/professional-schedule.md b/2021/info/professional-schedule.md
index 3a7e5a61..63541012 100644
--- a/2021/info/professional-schedule.md
+++ b/2021/info/professional-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 11 minutes
diff --git a/2021/info/tech-schedule.md b/2021/info/tech-schedule.md
index 19304c4e..cd6293da 100644
--- a/2021/info/tech-schedule.md
+++ b/2021/info/tech-schedule.md
@@ -2,11 +2,11 @@
# Status
-Waiting for speaker to send prerecorded video
+Captions added to video
# Schedule
-Allocated 10 minutes
+Allocated 11 minutes
diff --git a/2021/info/telega-schedule.md b/2021/info/telega-schedule.md
index e417ef4c..50737950 100644
--- a/2021/info/telega-schedule.md
+++ b/2021/info/telega-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