diff options
| author | Sacha Chua <sacha@sachachua.com> | 2021-01-16 00:09:12 -0500 |
|---|---|---|
| committer | Sacha Chua <sacha@sachachua.com> | 2021-01-16 00:09:12 -0500 |
| commit | 3dada39bece8fa8b262ba3a69338876e952f28b1 (patch) | |
| tree | 86f4912c607485265dc73a456054c8bdaa0a099b /2020 | |
| parent | 2448dbcf9afdb25df9f52411973f2bc79ad21ad4 (diff) | |
| parent | c1591d3f9dd1e929bb26a2c308b8a8692a5bfa9e (diff) | |
| download | emacsconf-wiki-3dada39bece8fa8b262ba3a69338876e952f28b1.tar.xz emacsconf-wiki-3dada39bece8fa8b262ba3a69338876e952f28b1.zip | |
Merge branch 'master' of git.emacsconf.org:emacsconf-wiki
Diffstat (limited to '2020')
| -rw-r--r-- | 2020/prepare.md | 10 | ||||
| -rw-r--r-- | 2020/sidebar.md | 2 |
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]] |