From a57fab2872e98c9caa5ae8a157b03830fed8aaf0 Mon Sep 17 00:00:00 2001
From: Joshua Simmons
Date: Thu, 10 Aug 2017 16:49:53 -0700
Subject: [PATCH] add colophon copy
---
.../static_pages/about/colophon.html | 25 ++++++++++++++++---
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/pinaxcon/templates/static_pages/about/colophon.html b/pinaxcon/templates/static_pages/about/colophon.html
index 78d7f82..8cd0f46 100644
--- a/pinaxcon/templates/static_pages/about/colophon.html
+++ b/pinaxcon/templates/static_pages/about/colophon.html
@@ -10,9 +10,26 @@
{% block content %}
- * Python logo attribution and copyright notice
- * SFC copyright notices
- * information about codebase inc. Django, Symposion, Registrasion
- * COC attribution
+Call for Proposals
+
+
Portions of our Call for Proposals page were drawn from ideas seen on DjangoCon EU, SeaGL, Fog City Ruby, and others. Thanks to all for their inspiration and permission to borrow!
+ +Our Code of Conduct was forked from the PyCon US Code of Conduct, including the staff and attendee guides, under a Creative Commons Attribution 3.0 Unported License, itself originally forked from the example policy from the Geek Feminism wiki, created by the Ada Initiative and other volunteers. which is under a Creative Commons Zero license.
+ +"Python" and the Python logos are trademarks or registered trademarks of the Python Software Foundation, used by North Bay Python with permission from the Foundation.
+ +Our website is powered by a heap of free and open source software, most notably:
+ +