summaryrefslogtreecommitdiffstats
path: root/2020
diff options
context:
space:
mode:
authorAmin Bandali <bandali@gnu.org>2021-01-15 19:43:59 -0500
committerAmin Bandali <bandali@gnu.org>2021-01-15 19:44:15 -0500
commitc1591d3f9dd1e929bb26a2c308b8a8692a5bfa9e (patch)
treec9caadfda2422bbebe03a49b407766a304967bbf /2020
parent1a2c6812dc8b50c43624fe02251fff721ead90a3 (diff)
downloademacsconf-wiki-c1591d3f9dd1e929bb26a2c308b8a8692a5bfa9e.tar.xz
emacsconf-wiki-c1591d3f9dd1e929bb26a2c308b8a8692a5bfa9e.zip
s/Code of Conduct/Guidelines for Conduct/
Diffstat (limited to '2020')
-rw-r--r--2020/prepare.md10
-rw-r--r--2020/sidebar.md2
2 files changed, 6 insertions, 6 deletions
diff --git a/2020/prepare.md b/2020/prepare.md
index 5e3de2f5..17a3e308 100644
--- a/2020/prepare.md
+++ b/2020/prepare.md
@@ -16,15 +16,15 @@ updates.
[[!toc levels=4]]
-### Code of conduct
+### Guidelines for conduct
-First and foremost, we ask that you review our [[code of
+First and foremost, we ask that you review our [[guidelines for
conduct|conduct]] when preparing your talk, to make sure we're all on
the same page and strive to make the event a great experience for all.
We would be happy to chat with you if you are unsure whether your talk
-or presentation style meets the guidelines laid out in the code of
-conduct. You can email Sacha Chua at <sacha@sachachua.com> to chat
-more about this.
+or presentation style meets the guidelines laid out in the guidelines
+for conduct. You can email Sacha Chua at <sacha@sachachua.com> to
+chat more about this.
### Before the conference
diff --git a/2020/sidebar.md b/2020/sidebar.md
index d6584f7d..f9c053fe 100644
--- a/2020/sidebar.md
+++ b/2020/sidebar.md
@@ -5,4 +5,4 @@
---
* [[**Talks**|talks]]
-* [[Code of Conduct|conduct]]
+* [[Guidelines for Conduct|conduct]]