File diff bb9ac9fd67cf → 5f01790f40fc
pinaxcon/templates/static_pages/code_of_conduct/code_of_conduct.md
Show inline comments
...
 
@@ -33,7 +33,7 @@ If a participant engages in behavior that violates this code of conduct, the con
 
Contact Information
 
-------------------
 

	
 
If you are being harassed, notice that someone else is being harassed, or have any other concerns, please contact a member of conference staff. Conference staff will be wearing t-shirts and/or badges that clearly identify them as staff. You may also contact venue staff and ask to be put in touch with conference chair [Christopher Neugebauer](mailto:chrisjrn@northbaypython.org "chrisjrn@northbaypython.org").
 
If you are being harassed, notice that someone else is being harassed, or have any other concerns, please contact a member of conference staff. Conference staff will be wearing t-shirts and/or badges that clearly identify them as staff. You may also contact venue staff and ask to be put in touch with conference chair [Christopher Neugebauer](mailto:chrisjrn@northbaypython.org).
 

	
 
If the matter is especially urgent, please call our Code of Conduct and safety incident hotline. **The phone number for this hotline will be released shortly before the conference begins.** This number will automatically route to a member of the conference staff who can render assistance.
 

	
...
 
@@ -41,10 +41,10 @@ Conference staff will be happy to help participants contact hotel/venue security
 

	
 
Procedure for Handling Harassment
 
------------------------------------------
 
- [Attendee procedure for incident handling](/code-of-conduct/harassment-incidents "North Bay Python attendee procedure for incident handling")
 
- [Staff procedure for incident handling](/code-of-conduct/harassment-staff-procedures "North Bay Python staff procedure for incident handling")
 
- [Attendee procedure for incident handling](/code-of-conduct/harassment-incidents)
 
- [Staff procedure for incident handling](/code-of-conduct/harassment-staff-procedures)
 

	
 
License
 
-------
 

	
 
This Code of Conduct was forked from the [PyCon US Code of Conduct](https://github.com/python/pycon-code-of-conduct "PyCon United States Code of Conduct") under a [Creative Commons Attribution 3.0 Unported](http://creativecommons.org/licenses/by/3.0/ "Creative Commons Attribution 3.0 Unported License") license, itself originally forked from the example policy in [Geek Feminism wiki](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy "Geek Feminism Wiki Example Anti-harassment Policy"), created by the Ada Initiative and other volunteers. which is under a [Creative Commons Zero](https://creativecommons.org/publicdomain/zero/1.0/ "Creative Commons Zero License") license.
...
 
\ No newline at end of file
 
This Code of Conduct was forked from the [PyCon US Code of Conduct](https://github.com/python/pycon-code-of-conduct) under a [Creative Commons Attribution 3.0 Unported](http://creativecommons.org/licenses/by/3.0/) license, itself originally forked from the example policy in [Geek Feminism wiki](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy), created by the Ada Initiative and other volunteers. which is under a [Creative Commons Zero](https://creativecommons.org/publicdomain/zero/1.0/) license.