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

111 Commits

Author SHA1 Message Date
Andreas Renberg (IQAndreas)
c3f8ee7c88 Use the plaintext formatting of the Artistic License 2.0
Another case where the license was copied from HTML, but had a nicely
formatted plaintext version (this is the last one, I promise).

This time the source was taken from
<http://www.perlfoundation.org/attachment/legal/artistic-2_0.txt>
2013-10-23 08:53:11 +02:00
Andreas Renberg (IQAndreas)
dc58abef62 Add license sources where missing 2013-10-23 08:09:55 +02:00
Andreas Renberg (IQAndreas)
f07c1f9beb Change braces to match the rest of the site 2013-10-22 14:21:04 +02:00
Andreas Renberg (IQAndreas)
d2b1145e6d Switch to use the plaintext formatting for Apache License
It's very clear that the site had copied over the HTML version of the
Apache License.

See [lines 122 to
142](4e2fd06748/licenses/apache.txt (L122))
as an example where the unordered list bullets not copied in along with
the rest of the text, throwing off the formatting and bunching together
text.

Since the site is displaying the plaintext version of the license, it
makes more sense to use the nicely formatted [plaintext version provided
by Apache](http://www.apache.org/licenses/LICENSE-2.0.txt).
2013-10-22 14:14:30 +02:00
Roland Hieber
3edf479745 BSD licenses: bring back the list bullets 2013-07-19 03:15:18 +02:00
Ben Lavender
14bd7cbaed Fix description on artistic license 2013-07-17 17:51:33 -05:00
Ben Lavender
7e7e54d3df These are actually advertisements to use the gpl, not copyright notices 2013-07-17 17:50:31 -05:00
Ben Lavender
61ed4a518c This is probably more correct 2013-07-17 17:48:22 -05:00
Ben Lavender
dc31ddcbe8 gplv2 has a link 2013-07-17 17:43:01 -05:00
Ben Lavender
871eee21de These are just parens. 2013-07-17 15:33:39 -05:00
Ben Lavender
4e2fd06748 single angle braces for links and curly braces for non-vars 2013-07-17 15:32:20 -05:00
Ben Lavender
7ecc0c06d9 Fix inconsistent replace clauses in BSD 3 clause 2013-07-17 12:00:40 -05:00
Ben Lavender
babcaa2a18 No more interpolating << 2013-07-17 11:57:57 -05:00
Ben Lavender
88e4101ce3 Link the unlicense and specificity about waiving 2013-07-17 11:41:30 -05:00
Ben Lavender
ad66f7d405 Unlicense is called UNLICENSE 2013-07-17 11:39:25 -05:00
Ben Lavender
e0ad6dee44 Fix << >> and < > and { } urls 2013-07-17 11:38:47 -05:00
Phil Haack
37f77b1ba4 hwhoops! Quick fix. 2013-07-16 17:25:59 -07:00
Ben Lavender
3250493b77 Words again 2013-07-16 11:33:43 -05:00
Ben Lavender
18b473fd17 Fix wording a little 2013-07-16 11:19:13 -05:00
Ben Lavender
ddfbee3953 Use the unlicense instead of CC0 to represent the public domain 2013-07-16 01:11:04 -05:00
Haacked
fb5546db7f Changing license featured on github.com
This flag controls which license is featured on github.com.
2013-07-15 13:51:09 -07:00
dpen2000
c0e377b4ce Update eclipse.txt - include disclose-source 2013-07-15 19:59:24 +01:00
dpen2000
73c1efe44f Remove include-license (covered by include-copyright) 2013-07-15 19:51:45 +01:00
Ben Balter
c863d3dcf8 Use proper AGPL source link 2013-07-15 14:30:59 -04:00
Ben Balter
3731105442 Merge pull request #11 from rahearn/fix-affero-text
Use Affero GPL text instead of GPLv3
2013-07-15 11:30:09 -07:00
Ben Balter
9543057018 license/ should link to the "no-license" license, not to /no-license 2013-07-15 14:10:31 -04:00
Ryan Ahearn
ba0ae09a11 Use Affero GPL text instead of GPLv3 2013-07-15 13:38:07 -04:00
Anne Epstein
10d5b7a27f Add license name to MIT license
It's very helpful/timesaving to people considering making use of a project for the license text to have the title, so they don't have to do a search to confirm what the license is. Therefore, the portion of the MIT license that gets copied to clipboard should have the license title.
2013-07-15 12:30:15 -05:00
James Dennes
9dbb60c5c6 Use Absolute Permalinks
This removes the deprecation warning about absolute permalinks. Absolute Permalinks will be the default as of Jekyll v1.1: http://jekyllrb.com/docs/upgrading/
2013-07-14 15:32:06 +02:00
Patrick Reynolds
2270711771 fix #88 - broken relative links 2013-07-13 01:16:15 -05:00
Haacked
98f7a3c730 Fix link in public domain license 2013-07-12 16:18:48 -07:00
Haacked
fb92ca1707 Removed warranty category 2013-07-12 15:01:08 -07:00
Haacked
dca341d472 Making things less lawyery 2013-07-12 14:58:56 -07:00
Haacked
300f796aa9 Add no-liability to public domain 2013-07-12 14:58:56 -07:00
Haacked
f0f4402f35 Added patent-grant category 2013-07-12 14:58:56 -07:00
Haacked
c4c48d498c Change nonstatic to library usage
Per review, we should call it library usage. Also pointed out that LGPL
does require disclosing source.
2013-07-12 14:58:56 -07:00
Haacked
2c0cda0e53 Fixup GPL description 2013-07-12 14:58:56 -07:00
Haacked
3c29d5da87 Replace copyright and license with single category 2013-07-12 14:58:56 -07:00
Phil Haack
8ae1c78757 Merge pull request #85 from github/mit-bsd-sync
Clarify bsd 2 clause
2013-07-12 14:58:28 -07:00
Haacked
fd1ea0b72d Improve public domain description 2013-07-12 14:51:14 -07:00
Ben Balter
c90a6a615c clarify bsd 2 clause 2013-07-12 14:58:06 -04:00
Ben Balter
47a12aca16 Add comma 2013-07-10 15:00:18 -04:00
Haacked
776046f049 Add public domain license 2013-07-10 11:20:40 -07:00
Phil Haack
e265b4b988 Merge pull request #72 from github/license-relative-links
licenses: make all permalinks relative
2013-06-15 12:29:49 -07:00
Phil Haack
13750495a1 Merge pull request #71 from github/bsd-license-text
Bsd license text
2013-06-15 12:29:14 -07:00
Jeff King
5b0a1eb033 licenses/bsd: use actual 2-clause form
Reformatting the clauses makes it clear that we accidentally
have the 3-clause form here. Oops.
2013-06-15 04:45:37 -04:00
Jeff King
3434956294 licenses: pre-format bsd license texts
The license text is shown as preformatted text; therefore we
need to wrap it to a sane length (like 80 characters) to
keep it readable.

In addition, we must do any formatting or indentation in the
source file. Both BSD licenses contain a list of conditions
that should be indented like a list, with blank lines in
between.

We could also potentially number the clauses; FreeBSD does
in its copy, but the OSI versions do not.
2013-06-15 04:44:26 -04:00
Jeff King
9ec596780f licenses: make all permalinks relative
Pointing to `/artistic` is a broken link, since the content
is in `licenses/`. Follow the lead of other licenses, which
use a relative link that works.
2013-06-15 04:22:55 -04:00
Jeff King
244f14f93c fix up one more s/PERL/Perl/ instance
Missed this one in the prior commit.
2013-06-15 04:12:01 -04:00
Ben Balter
18e0fb6e2e tighten description to be closer to the others 2013-06-11 10:45:09 -04:00