summaryrefslogtreecommitdiffstats
path: root/conduct.md
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 /conduct.md
parent1a2c6812dc8b50c43624fe02251fff721ead90a3 (diff)
downloademacsconf-wiki-c1591d3f9dd1e929bb26a2c308b8a8692a5bfa9e.tar.xz
emacsconf-wiki-c1591d3f9dd1e929bb26a2c308b8a8692a5bfa9e.zip
s/Code of Conduct/Guidelines for Conduct/
Diffstat (limited to 'conduct.md')
-rw-r--r--conduct.md12
1 files changed, 6 insertions, 6 deletions
diff --git a/conduct.md b/conduct.md
index 0dbf2d5e..0e7673cf 100644
--- a/conduct.md
+++ b/conduct.md
@@ -1,14 +1,14 @@
-[[!meta title="Code of Conduct"]]
+[[!meta title="Guidelines for Conduct"]]
[[!meta copyright="""
Copyright &copy; 2010, 2013, 2018 Free Software Foundation, Inc.<br/>
Copyright &copy; 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