diff --git a/pinaxcon/templates/static_pages/about/colophon.html b/pinaxcon/templates/static_pages/about/colophon.html index 8b7069ab68a0ddbb7223dc5e7671f9b1e20b7efb..81868f769c02edbc5b3ccc71e25a580f55a52151 100644 --- a/pinaxcon/templates/static_pages/about/colophon.html +++ b/pinaxcon/templates/static_pages/about/colophon.html @@ -24,8 +24,10 @@

Photography

- -

describe/credit photos used on the home page and other pages, perhaps list event photographer information ...maybe Next Day Video?

+

Python

@@ -33,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

@@ -44,7 +46,6 @@
  • Symposion is used for the call for proposals and session scheduling.
  • Registrasion is used for ticket sales.
  • Inkscape is used to create most of our graphics.
  • -
  • Twitter Emoji is used in many of our graphics. {% endblock %} \ No newline at end of file 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 ------------