summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSacha Chua <sacha@sachachua.com>2021-11-20 20:17:18 -0500
committerSacha Chua <sacha@sachachua.com>2021-11-20 20:17:18 -0500
commit19796f0a8375d922c444fe07e9ad963b8a9da885 (patch)
treeb90f3d7d318dda490a9800596b315df34aa206b3
parentc42aa40033fd9d16e1da51cccc56b6063d6eec6e (diff)
parent85cec06fd56ef397b30dfd86d4151ddda873952c (diff)
downloademacsconf-wiki-19796f0a8375d922c444fe07e9ad963b8a9da885.tar.xz
emacsconf-wiki-19796f0a8375d922c444fe07e9ad963b8a9da885.zip
Merge branch 'master' of git.emacsconf.org:emacsconf-wiki
-rw-r--r--2021.md2
-rw-r--r--2021/schedule.md2
-rw-r--r--2021/sidebar.md2
3 files changed, 3 insertions, 3 deletions
diff --git a/2021.md b/2021.md
index 1d9330d0..20208c27 100644
--- a/2021.md
+++ b/2021.md
@@ -6,7 +6,7 @@
<p class="center">[[!img /i/emacsconf-logo1-256.png
alt="EmacsConf logo"]]</p>
-<p class="center">[[<strong>Program</strong>|schedule]] |
+<p class="center">[[<strong>Schedule</strong>|schedule]] |
[[<strong>Posters</strong>|poster]] | [[Prepare]] | [[Planning]] |
[[Guidelines for Conduct|conduct]]</p>
diff --git a/2021/schedule.md b/2021/schedule.md
index 79e2f12e..5edc75f9 100644
--- a/2021/schedule.md
+++ b/2021/schedule.md
@@ -12,6 +12,6 @@ schedule and updating an Org file with hem.
There is also an alternate stream for APAC hours, see
<https://libreau.org/upcoming.html#emacsconf21>.
-*Please note that the program is still being worked on and this list may change. We're still figuring out how things will go! =)*
+*Please note that the schedule is still being worked on and this list may change. We're still figuring out how things will go! =)*
[[!inline pages="internal(2021/schedule-details)" raw="yes"]]
diff --git a/2021/sidebar.md b/2021/sidebar.md
index 06da22d7..d092d02f 100644
--- a/2021/sidebar.md
+++ b/2021/sidebar.md
@@ -4,7 +4,7 @@
---
-* [[**Program**|schedule]]
+* [[**Schedule**|schedule]]
* [[**Posters**|poster]]
* [[Prepare]]
* [[Planning]]