CopyleftConf/copyleftconf-website Changeset - eb0fb2624479

Changeset - eb0fb2624479

Parent rev.

Child rev.

[Not reviewed]

Merge

0 13 5

Josh Simmons - 7 years ago 2017-08-15 01:29:09
joshuasimmons@google.com

Merge pull request #45 from northbaypython/josh/copy

colophon and attribution updates for license compliance

2 files changed with 6 insertions and 5 deletions:

pinaxcon/templates/static_pages/about/colophon.html

pinaxcon/templates/static_pages/terms_and_conditions.md

0 comments (0 inline, 0 general)

pinaxcon/templates/static_pages/about/colophon.html

➞

Show inline comments

@@ ... / @@ -21,30 +21,31 @@ @@
 <h2>Fiscal Sponsor</h2>
 <p>Our fiscal sponsor is <a href="https://sfconservancy.org" title="Software Freedom Conservancy">Software Freedom Conservancy</a>, a 501(c)(3) charity dedicated to the promotion and development of free and open source software. Conservancy allows us to work without managing our own corporate structure and administrative services. Our relationship with Conservancy goes beyond logistics, though, as we are also philosophically aligned as we work to advance software freedom and expand the Python developer community.</p>
 <h2>Photography</h2>
 <!-- TODO -->
 <p>describe/credit photos used on the home page and other pages, perhaps list event photographer information ...maybe Next Day Video?</p>
 <ul>
   <li>Photo of <a href="https://www.instagram.com/p/BU-G5dGAkHt" title="Photo of Mystic Theatre">Mystic Theatre</a> used on the home page by Christopher Neugebauer under the <a href="https://creativecommons.org/licenses/by-sa/2.0/" title="Creative Commons Attribution Share Alike 2.0 Generic License">Creative Commons Attribute Share Alike 2.0 Generic</a> license.</li>
   <li>Photo of <a href="https://www.flickr.com/photos/richard_jones/14638274749" title="Photo of DjangoGirls Brisbane 2014">DjangoGirls Brisbane 2014</a> used on the home page by Richard Jones under the <a href="https://creativecommons.org/licenses/by/2.0/" title="Creative Commons Attribution 2.0 Generic">Creative Commons Attribution 2.0 Generic</a> license.</li>
 </ul>
 <h2>Python</h2>
 <p>"Python" and the Python logos are trademarks or registered trademarks of the <a href="https://python.org" title="Python Software Foundation">Python Software Foundation</a>, used by North Bay Python with permission from the Foundation.</p>
 <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>
 <p>Our website is powered by a heap of free and open source software, most notably:</p>
 <ul>
   <li><a href="https://www.djangoproject.com/" title="Django Web Framework">Django</a> is the web framework that underpins everything else.</li>
   <li><a href="https://github.com/chrisjrn/symposion/" title="Symposion">Symposion</a> is used for the call for proposals and session scheduling.</li>
   <li><a href="http://github.com/chrisjrn/registrasion/" title="Registrasion">Registrasion</a> is used for ticket sales.</li>
   <li><a href="https://inkscape.org/" title="Inkscape">Inkscape</a> is used to create most of our graphics.</li>
   <li><a href="https://github.com/twitter/twemoji" title="Twitter Emoji">Twitter Emoji</a> is used in many of our graphics.
 </ul>
 {% endblock %}
@@ ... / \ No newline at end of file @@

pinaxcon/templates/static_pages/terms_and_conditions.md

➞

Show inline comments

 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
 ------------
 Registering for the event does not guarantee your ticket until it has been paid for in full. So to secure your ticket, pay the registration invoice as soon as possible.

0 comments (0 inline, 0 general)