File diff 64b017e16d76 → 0488e14e5e2e
pinaxcon/templates/static_pages/code_of_conduct/code_of_conduct.md
Show inline comments
...
 
@@ -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)
 
- [Staff procedure for incident handling](/code-of-conduct/harassment-staff-procedures)
 
- [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")
 

	
 
License
 
-------
 

	
 
This Code of Conduct was forked from the [PyCon US Code of Conduct](https://github.com/python/pycon-code-of-conduct) under a <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 Unported License</a>, itself originally forked from the example policy from the [Geek Feminism wiki, created by the Ada Initiative and other volunteers.](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy) which is under a Creative Commons Zero 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 "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