From bca3a5f4eca9c744883a1af908ef486b061023c4 2017-08-15 01:24:38
From: Joshua Simmons <i@joshuasimmons.name>
Date: 2017-08-15 01:24:38
Subject: [PATCH] proper attribution for terms and conditions*

---

diff --git a/pinaxcon/templates/static_pages/about/colophon.html b/pinaxcon/templates/static_pages/about/colophon.html
index b072c35639c87d53a1f8cd563cde35f56551a5bc..00d5a292bd793bf3b5d2c784a8aec7f861d436cc 100644
--- a/pinaxcon/templates/static_pages/about/colophon.html
+++ b/pinaxcon/templates/static_pages/about/colophon.html
@@ -35,7 +35,7 @@
 
 <h2>Terms and Conditions</h2>
 
-<p>Our <a href="/terms-and-conditions" title="North Bay Python Terms and Conditions">Terms and Conditions</a> were forked from the <a href="https://github.com/linuxaustralia/constitution_and_policies/blob/master/terms_and_conditions.md" title="Linux Australia Terms and Conditions">Linux Australia Event Terms and Conditions</a> under the <a href="https://github.com/linuxaustralia/constitution_and_policies/blob/master/LICENCE.md" title="GNU General Public License 3.0">GNU General Public License 3.0</a>. Our Photography and Audio Video Recording policy is adapted from the <a href="https://evergreen-ils.org/conference/photography-policy/" title="Evergreen Event Photography Policy">Evergreen policy</a>, itself adapted from the <a href="https://adacamp.org/adacamp-toolkit/policies/#photo" title="AdaCamp Event Photography Policy">AdaCamp policy</a> under a <a href="http://creativecommons.org/licenses/by-sa/4.0/" title="Creative Commons Attribution Share Alike 4.0 International License">Creative Commons Attribution Share Alike 4.0 International</a> license.</p>
+<p>Our <a href="/terms-and-conditions" title="North Bay Python Terms and Conditions">Terms and Conditions</a> were forked from the <a href="https://github.com/linuxaustralia/constitution_and_policies/blob/master/terms_and_conditions.md" title="Linux Australia Terms and Conditions">Linux Australia Event Terms and Conditions</a> under the <a href="https://creativecommons.org/licenses/by-sa/3.0/au/" title="Creative Commons Attribution Share Alike 3.0 Australia License">Creative Commons Attribution Share Alike 3.0 Australia</a> license. Our Photography and Audio Video Recording policy is adapted from the <a href="https://evergreen-ils.org/conference/photography-policy/" title="Evergreen Event Photography Policy">Evergreen policy</a>, itself adapted from the <a href="https://adacamp.org/adacamp-toolkit/policies/#photo" title="AdaCamp Event Photography Policy">AdaCamp policy</a> under a <a href="http://creativecommons.org/licenses/by-sa/4.0/" title="Creative Commons Attribution Share Alike 4.0 International License">Creative Commons Attribution Share Alike 4.0 International</a> license.</p>
 
 <h2>Web Application</h2>
 
diff --git a/pinaxcon/templates/static_pages/terms_and_conditions.md b/pinaxcon/templates/static_pages/terms_and_conditions.md
index bb2773703b196e9abe3dc00fdf6f2eba724b7f4f..6672d8a0806b4eb0c982bcf27a34a5f8d9426cd4 100644
--- a/pinaxcon/templates/static_pages/terms_and_conditions.md
+++ b/pinaxcon/templates/static_pages/terms_and_conditions.md
@@ -1,4 +1,4 @@
-These Terms and Conditions apply to all attendees who have registered for North Bay Python.
+These Terms and Conditions apply to all attendees who have registered for North Bay Python. This doucment was forked from the [Linux Australia Event Terms and Conditions](https://github.com/linuxaustralia/constitution_and_policies/blob/master/terms_and_conditions.md "Linux Australia Event Terms and Conditions Template") under the [Creative Commons Attribution Share Alike 3.0 Australia](https://creativecommons.org/licenses/by-sa/3.0/au/ "Creative Commons Attribution Share Alike 3.0 Australia License") license.
 
 Registration
 ------------