diff options
| author | Bryce Harrington <bryce@osg.samsung.com> | 2017-06-12 14:27:42 -0700 |
|---|---|---|
| committer | Bryce Harrington <bryce@osg.samsung.com> | 2017-06-12 14:27:42 -0700 |
| commit | b5df79b2bc09b60f0d1f77b59df666876fac52a7 (patch) | |
| tree | 43b6c7f81057d392cefcee9010c394c44d45499d /XorgFoundation/Policies | |
| parent | 4ea6bb70a5ad575ea737a4bd2371072b0246b225 (diff) | |
policies: Link to fdo's CoC
Diffstat (limited to 'XorgFoundation/Policies')
| -rw-r--r-- | XorgFoundation/Policies/Harassment.mdwn | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/XorgFoundation/Policies/Harassment.mdwn b/XorgFoundation/Policies/Harassment.mdwn index a44dce08..1c7ef511 100644 --- a/XorgFoundation/Policies/Harassment.mdwn +++ b/XorgFoundation/Policies/Harassment.mdwn @@ -2,6 +2,8 @@ *Adopted 22 August 2013 by the [[X.Org Board of Directors|BoardOfDirectors]].* +*See also: [[Freedesktop Code of Conduct|https://www.freedesktop.org/wiki/CodeOfConduct/]]* + ## Policy The [[X.Org Foundation|XorgFoundation]] is dedicated to providing a harassment-free conference @@ -30,8 +32,18 @@ of their own. ## Credit -This anti-harassment policy is based on [[the example policy from the Geek Feminism wiki|http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy]], created by the [[Ada Initiative|http://adainitiative.org/]] and other volunteers. +This anti-harassment policy is based on +[[the example policy from the Geek Feminism wiki|http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy]], +created by the [[Ada Initiative|http://adainitiative.org/]] and other +volunteers. ## Implementation details -Conference/event organizers should see [[the original source|http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy]] for suggested guides on how to handle any incidents that may occur. Any questions or issues that cannot be resolved by the conference organizers should be brought to any [[X.Org Board members|BoardOfDirectors]] in attendance or sent to the Board mailing list as soon as practical. Any incident that results in expulsion of an attendee from the conference must be reported to the Board by the conference organizers. +Conference/event organizers should see +[[the original source|http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy]] +for suggested guides on how to handle any incidents that may occur. Any +questions or issues that cannot be resolved by the conference organizers +should be brought to any [[X.Org Board members|BoardOfDirectors]] in +attendance or sent to the Board mailing list as soon as practical. Any +incident that results in expulsion of an attendee from the conference +must be reported to the Board by the conference organizers. |