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

Merge pull request #57 from github/minor-tweaks

Minor language tweaks
This commit is contained in:
Phil Haack 2013-05-23 19:39:01 -07:00
commit 3cf2c03d54

View File

@ -12,9 +12,9 @@ class: home
<ul class="situations cf"> <ul class="situations cf">
<li class='whatever'> <li class='whatever'>
<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'm interested in simplicity and permissiveness.</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 doesnt include any warranties and lets people do anything they want with your code (with attribution back to you).
</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.
@ -34,7 +34,7 @@ class: home
<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 reciprocity.</a></h3>
<p> <p>
The GPL (<a href="licenses/gpl-v2">V2</a> or <a href="licenses/gpl-v3">V3</a>) isn't a permissive license, meaning that it 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 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.
</p> </p>
<p> <p>
<strong>Linux</strong> and <strong>Git</strong> use the GPL. <strong>Linux</strong> and <strong>Git</strong> use the GPL.