diff options
author | Amin Bandali <bandali@gnu.org> | 2020-07-19 15:52:59 -0400 |
---|---|---|
committer | Amin Bandali <bandali@gnu.org> | 2020-07-19 15:52:59 -0400 |
commit | c7c2ff9b9d45d15b9e715aa72449733dc0178420 (patch) | |
tree | 3dd7d49711a72d1fd2d8f9fecf0f440e2fd0b4b5 /2019/conduct.md | |
parent | 3d9ad5862f8643861543acb25aa6f97953ad4f0a (diff) | |
download | emacsconf-wiki-c7c2ff9b9d45d15b9e715aa72449733dc0178420.tar.xz emacsconf-wiki-c7c2ff9b9d45d15b9e715aa72449733dc0178420.zip |
delete duplicate material, add some copyright notices
Diffstat (limited to '2019/conduct.md')
-rw-r--r-- | 2019/conduct.md | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/2019/conduct.md b/2019/conduct.md index f5703628..477d2a7a 100644 --- a/2019/conduct.md +++ b/2019/conduct.md @@ -1,4 +1,8 @@ [[!meta title="Code of Conduct"]] +[[!meta copyright=""" +Copyright © 2010, 2013, 2018 Free Software Foundation, Inc. +Copyright © 2019 Amin Bandali +"""]] This Code of Conduct, originally based on [that of LibrePlanet](//libreplanet.org/wiki/LibrePlanet:About/Code_of_Conduct), @@ -63,11 +67,11 @@ not encouraging and respectful, we can't hope to gain their support. Frame issues and arguments in a way which is conducive to changing minds, not alienating visitors. People are unlikely to listen if they feel in any way like they're being attacked. They are much more -receptive to ideas which presented in a positive and constructive way. -Being respectful doesn't mean sacrificing our core ideals; we should -always frame the issues we work on in terms of those ideals. That -means using language that foregrounds freedom, like referring to the -operating system we promote as +receptive to ideas which are presented in a positive and constructive +way. Being respectful doesn't mean sacrificing our core ideals; we +should always frame the issues we work on in terms of those ideals. +That means using language that foregrounds freedom, like referring to +the operating system we promote as ["GNU/Linux"](//www.gnu.org/gnu/linux-and-gnu.html), talking about [free software rather than open source](//www.gnu.org/philosophy/open-source-misses-the-point.html), |