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 | |
| 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 '')
| -rw-r--r-- | 2020.md | 2 | ||||
| -rw-r--r-- | 2020/prepare.md | 10 | ||||
| -rw-r--r-- | 2020/sidebar.md | 2 | ||||
| -rw-r--r-- | conduct.md | 12 |
4 files changed, 13 insertions, 13 deletions
@@ -4,7 +4,7 @@ EmacsConf 2020 | Online Conference | **November 28 and 29, 2020** [[!img /i/emacsconf-logo1-256.png alt="EmacsConf logo" class="center"]] [[**Talks**|talks]] | [[**Poster**|poster]] | [[Planning]] | -[[Code of Conduct|conduct]] +[[Guidelines for Conduct|conduct]] EmacsConf is the conference about the joy of Emacs, Emacs Lisp, and memorizing key sequences. 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]] @@ -1,14 +1,14 @@ -[[!meta title="Code of Conduct"]] +[[!meta title="Guidelines for Conduct"]] [[!meta copyright=""" Copyright © 2010, 2013, 2018 Free Software Foundation, Inc.<br/> Copyright © 2019 Amin Bandali """]] -This Code of Conduct, originally based on [that of -LibrePlanet](//libreplanet.org/wiki/LibrePlanet:About/Code_of_Conduct), -applies to us as participants in any campaigns, projects, and -communities under the EmacsConf name, and covers our behaviour in any -related forum, mailing list, IRC channel, wiki, web site, public +These Guidelines for Conduct, originally based on [the LibrePlanet +Code of Conduct](//libreplanet.org/wiki/LibrePlanet:About/Code_of_Conduct), +apply to us as participants in any conferences, campaigns, projects, +and communities under the EmacsConf name, and covers our behaviour in +any related forum, mailing list, IRC channel, wiki, web site, public meeting, or private correspondence. # Rules |