diff --git a/pinaxcon/templates/static_pages/about/colophon.html b/pinaxcon/templates/static_pages/about/colophon.html index 81868f769c02edbc5b3ccc71e25a580f55a52151..2e962dec76ea0f5c2dcf4762062c20c325c52dd5 100644 --- a/pinaxcon/templates/static_pages/about/colophon.html +++ b/pinaxcon/templates/static_pages/about/colophon.html @@ -35,7 +35,7 @@

Terms and Conditions

-

Our Terms and Conditions were forked from the Linux Australia Event Terms and Conditions under the Creative Commons Attribution Share Alike 3.0 Australia license. Our Photography and Audio Video Recording policy is adapted from the Evergreen policy, itself adapted from the AdaCamp policy under a Creative Commons Attribution Share Alike 4.0 International license.

+

Our Terms and Conditions were forked from the Linux Australia Event Terms and Conditions under the GNU General Public License v3.0. Our Photography and Audio Video Recording policy is adapted from the Evergreen policy, itself adapted from the AdaCamp policy under a Creative Commons Attribution Share Alike 4.0 International license.

Web Application

diff --git a/pinaxcon/templates/static_pages/terms_and_conditions.md b/pinaxcon/templates/static_pages/terms_and_conditions.md index 6672d8a0806b4eb0c982bcf27a34a5f8d9426cd4..49fad46a23b4abf0a7e741785f35aed2a3fb1d64 100644 --- a/pinaxcon/templates/static_pages/terms_and_conditions.md +++ b/pinaxcon/templates/static_pages/terms_and_conditions.md @@ -1,4 +1,6 @@ -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. +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 [GNU General Public License v3.0](https://github.com/linuxaustralia/constitution_and_policies/blob/master/LICENCE.md "GNU General Public License v3.0"). + + Registration ------------