From bca3a5f4eca9c744883a1af908ef486b061023c4 Mon Sep 17 00:00:00 2001 From: Joshua Simmons Date: Mon, 14 Aug 2017 18:24:38 -0700 Subject: [PATCH] proper attribution for terms and conditions* --- pinaxcon/templates/static_pages/about/colophon.html | 2 +- pinaxcon/templates/static_pages/terms_and_conditions.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pinaxcon/templates/static_pages/about/colophon.html b/pinaxcon/templates/static_pages/about/colophon.html index b072c35..00d5a29 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 GNU General Public License 3.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.

+

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.

Web Application

diff --git a/pinaxcon/templates/static_pages/terms_and_conditions.md b/pinaxcon/templates/static_pages/terms_and_conditions.md index bb27737..6672d8a 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 ------------