aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/conduct.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/www/conduct.md b/www/conduct.md
index d9a1eab5..25206f73 100644
--- a/www/conduct.md
+++ b/www/conduct.md
@@ -42,21 +42,21 @@ response to any instances of unacceptable behavior.
Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
+that are not aligned to these conduct guidelines, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.
Scope
-----
-This Code of Conduct applies both within project spaces and in public spaces
+These conduct guidelines apply both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.
-Specifically, in normal circumstances, the scope of this Code of Conduct applies
+Specifically, in normal circumstances, the scope of these guidelines apply
directly to:
* The IRC channel (#libreboot on Freenode)