1
0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 12:50:24 +01:00

Merge branch 'content-B' of https://github.com/afeld/choosealicense.com into food-licenses

This commit is contained in:
Mike Linksvayer 2016-02-25 18:18:41 -08:00
commit 6df14f2d42
3 changed files with 12 additions and 3 deletions

View File

@ -5,7 +5,7 @@
</nav> </nav>
<p> <p>
If you have questions or issues, it is always best to consult a legal professional.<br> If you have questions or issues, it is always best to consult a legal professional.<br>
This site is licensed under the <a href="http://creativecommons.org/licenses/by/3.0/"> The content of this site is licensed under the <a href="http://creativecommons.org/licenses/by/3.0/">
Creative Commons Attribution 3.0 Unported License</a>. Creative Commons Attribution 3.0 Unported License</a>.
</p> </p>
<div class="with-love"> <div class="with-love">

View File

@ -56,9 +56,9 @@ permalink: /
</h2> </h2>
<ul class="triptych see-more clearfix"> <ul class="triptych see-more clearfix">
<li> <li>
<h3>My content isnt code.</h3> <h3>My project isnt code.</h3>
<p> <p>
Check out <a href="http://creativecommons.org/choose/">Creative Commons</a>. <a href="non-code">There are licenses for that</a>.
</p> </p>
</li> </li>
<li> <li>

9
non-code.md Normal file
View File

@ -0,0 +1,9 @@
---
title: Non-Code
layout: default
permalink: /non-code/
---
While the focus of this site is open source software, there are other licenses more appropriate for projects that aren't code, e.g. [CC0](/licenses/cc0-1.0/) and the [Open Font License](/licenses/ofl-1.1/).
If your project contains a mix of software and content, you can include multiple licenses, as long as you are explicit about which license applies to what segments of the project. See [the license disclaimer for this site](https://github.com/github/choosealicense.com#license) as an example.