CopyleftConf/copyleftconf-website
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #45 from northbaypython/josh/copy

Browse source 
colophon and attribution updates for license compliance
This commit is contained in:
Josh Simmons 2017-08-15 11:29:09 +10:00 • committed by GitHub
commit eb0fb26244
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pinaxcon/templates/static_pages/about/colophon.html
View file

@ -24,8 +24,10 @@
<h2>Photography</h2> <h2>Photography</h2>
<!-- TODO --> <ul>
<p>describe/credit photos used on the home page and other pages, perhaps list event photographer information ...maybe Next Day Video?</p> <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> <h2>Python</h2>
@ -33,7 +35,7 @@
<h2>Terms and Conditions</h2> <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> <h2>Web Application</h2>
@ -44,7 +46,6 @@
<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="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="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://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> </ul>
{% endblock %} {% endblock %}

2
pinaxcon/templates/static_pages/terms_and_conditions.md
View file

@ -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 Registration
------------ ------------