docs/choosealicense.com
docs/choosealicense.com
1
0
Fork 0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 12:50:24 +01:00
Code Issues Releases Wiki Activity

Merge pull request #80 from github/homepage-changes

Browse Source 
homepage text tweaking per legal review
This commit is contained in:
Phil Haack 2013-07-12 14:48:41 -07:00
commit e43eded157
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css/application.css
View File

@ -204,7 +204,7 @@ strong {
margin-left: 0; margin-left: 0;
margin-top: 16px; margin-top: 16px;
} }
.situations .reciprocity { .situations .copyleft {
margin-top: 3px; margin-top: 3px;
} }
.situations h3 { .situations h3 {

10
index.html
View File

@ -14,7 +14,7 @@ class: home
<a href="licenses/mit"><img height='57' src='images/three-arrows@2x.png' width='72'></a> <a href="licenses/mit"><img height='57' src='images/three-arrows@2x.png' width='72'></a>
<h3><a href="licenses/mit">I want it simple and permissive.</a></h3> <h3><a href="licenses/mit">I want it simple and permissive.</a></h3>
<p> <p>
The <a href="licenses/mit">MIT License</a> is a permissive license that is short and to the point. It doesn’t include any warranties and lets people do anything they want with your code (with attribution back to you). The <a href="licenses/mit">MIT License</a> is a permissive license that is short and to the point. It lets people do anything they want with your code as long as they provide attribution back to you and don’t hold you liable.
</p> </p>
<p> <p>
<strong>jQuery</strong> and <strong>Rails</strong> use the MIT License. <strong>jQuery</strong> and <strong>Rails</strong> use the MIT License.
@ -24,17 +24,17 @@ class: home
<a href="licenses/apache"><img height='72' src='images/lightbulb@2x.png' width='43'></a> <a href="licenses/apache"><img height='72' src='images/lightbulb@2x.png' width='43'></a>
<h3><a href="licenses/apache">I’m concerned about patents.</a></h3> <h3><a href="licenses/apache">I’m concerned about patents.</a></h3>
<p> <p>
The <a href="licenses/apache/">Apache License</a> is a permissive license similar to the MIT License, but also contains a patent license for any code that infringes on a contributor’s patents. The <a href="licenses/apache/">Apache License</a> is a permissive license similar to the MIT License, but also provides an express grant of patent rights from contributors to users.
</p> </p>
<p> <p>
<strong>Apache</strong>, <strong>SVN</strong>, and <strong>NuGet</strong> use the Apache License. <strong>Apache</strong>, <strong>SVN</strong>, and <strong>NuGet</strong> use the Apache License.
</p> </p>
</li> </li>
<li class='reciprocity'> <li class='copyleft'>
<a href="licenses/gpl-v2"><img height='69' src='images/circular@2x.png' width='72'></a> <a href="licenses/gpl-v2"><img height='69' src='images/circular@2x.png' width='72'></a>
<h3><a href="licenses/gpl-v3">I care about reciprocity.</a></h3> <h3><a href="licenses/gpl-v3">I care about sharing improvements.</a></h3>
<p> <p>
The GPL (<a href="licenses/gpl-v2">V2</a> or <a href="licenses/gpl-v3">V3</a>) is a reciprocal license that requires that folks who modify your code also license their changes under the GPL. V3 is similar to V2, but adds a restriction restricting use in hardware that forbids software alterations. The GPL (<a href="licenses/gpl-v2">V2</a> or <a href="licenses/gpl-v3">V3</a>) is a copyleft license that requires others who modify your code to disclose their changes if they redistribute it in source or binary form. V3 is similar to V2, but adds a restriction restricting use in hardware that forbids software alterations.
</p> </p>
<p> <p>
<strong>Linux</strong> and <strong>Git</strong> use the GPL. <strong>Linux</strong> and <strong>Git</strong> use the GPL.