1
0
mirror of https://github.com/github/choosealicense.com synced 2024-07-03 08:59:12 +02:00
Commit Graph

875 Commits

Author SHA1 Message Date
Ben Balter
d7ca8a2c19 readme cleanup 2013-06-16 10:57:21 -04:00
Phil Haack
48e67fbaab Merge pull request #73 from github/howto-escaping
sidebar: convert <</>> into brackets in page.how
2013-06-15 12:30:30 -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
62066749b5 sidebar: convert <</>> into brackets in page.how
We already do this in the license bodies, and we need to
match here (currently we just print junk like `replace <>
with ...` because we end up with garbled HTML.

This replacement should arguably be factored out, as it
would want to be the same everywhere (and we might want to
make it bold everywhere or something).
2013-06-15 04:13:13 -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
Jeff King
3298755706 fix capitalization of PERL/artistic license
Perl-ites prefer "Perl" for the language and "perl" for the implementation, but never "PERL" (see `perldoc perlfaq1`).

Text referring to a license as a proper noun reads better with the noun capitalized (e.g., "the Artistic License"), and this form is used by `perldoc artistic`.
2013-06-15 04:56:01 -03:00
Phil Haack
d6d1df171b Merge pull request #69 from github/meta-license
Add MIT license to project root
2013-06-12 19:49:38 -07:00
Ben Balter
f8f6335264 add license, fixes #68 2013-06-12 22:22:50 -04:00
Phil Haack
42e9887c9e Merge pull request #64 from github/no-license-no-parents
First cut at adding a no-license description
2013-06-11 16:02:00 -07:00
Phil Haack
15aa0e99ac Merge pull request #66 from github/escape-variables
Escape variables in license body
2013-06-11 16:01:13 -07:00
Ben Balter
85c01c1d7f replace double < and > with [ and ] 2013-06-11 18:51:26 -04:00
Phil Haack
80810fd65e Merge pull request #67 from github/no-license-prettifying
Pretty pass
2013-06-11 15:42:51 -07:00
Phil Haack
cc1ee73496 Merge pull request #65 from github/tos-link
Add link to GitHub.com TOS to footer
2013-06-11 15:40:13 -07:00
Jason Long
3fbb75b49e license table cleanup 2013-06-11 14:13:00 -04:00
Jason Long
2ed47b6bde cleaned up alternative licenses blurb 2013-06-11 12:39:22 -04:00
Ben Balter
9bf0d9e8df properly spell the word Modification 2013-06-11 10:51:13 -04:00
Ben Balter
1fb31d2314 add negative properties to _config.yml 2013-06-11 10:49:46 -04:00
Ben Balter
18e0fb6e2e tighten description to be closer to the others 2013-06-11 10:45:09 -04:00
Ben Balter
7fae1b0910 add YML title 2013-06-11 10:43:55 -04:00
Ben Balter
aa6dcd3ac0 swap opening brackets for &lt; signs to prevent parsing as tags 2013-06-11 10:37:11 -04:00
Ben Balter
5e4bf025d0 move include-copyright to valid property 2013-06-11 10:35:33 -04:00
Ben Balter
e90932e95b validate YML 2013-06-11 10:32:14 -04:00
Ben Balter
5375ae8e38 add link to GitHub.com TOS to footer, fixes #63 2013-06-11 10:13:27 -04:00
Julio Avalos
85f1429e24 Update no-license.html 2013-05-29 19:59:43 -06:00
Phil Haack
4712fe2d68 Removing extraneous copyright notice 2013-05-23 19:48:29 -07:00
Phil Haack
140c1e2700 Linking to GitHub's TOS 2013-05-23 19:48:29 -07:00
Phil Haack
18bb317b5a Using proper Mustache template strings
Per code review suggestion.
2013-05-23 19:46:38 -07:00
Haacked
07edfe2ba4 First cut at adding a no-license description
I have no idea if this looks good. We may want to get a designer to
figure out the layout here. :)
2013-05-23 19:46:37 -07:00
Phil Haack
3cf2c03d54 Merge pull request #57 from github/minor-tweaks
Minor language tweaks
2013-05-23 19:39:01 -07:00
Benjamin J. Balter
0be80cf73f Merge branch 'master' into html-to-txt 2013-05-23 17:11:01 -04:00
Ben Balter
53e5eb36ca Merge pull request #59 from github/long-live-the-gpl
Remove gpl disambiguation page
2013-05-23 13:35:46 -07:00
Ben Balter
d7fd099204 Merge pull request #61 from github/server-cleanup
Clean up _site folder after serving
2013-05-23 13:33:22 -07:00
Zach Holman
6bc9b3ffa7 Use <<>> instead of {{}} 2013-05-22 17:30:18 -07:00
Benjamin J. Balter
f8a3809616 Clean up after serving
Your mother doesn't work here.
2013-05-22 20:13:08 -04:00
Benjamin J. Balter
8458ff5b3f change license extention to .txt 2013-05-22 20:09:55 -04:00
Zach Holman
06a54414b7 Merge pull request #58 from github/mustache
Proper mustache
2013-05-22 16:52:18 -07:00
Benjamin J. Balter
29bebf30ae remove gpl disambiguation page 2013-05-22 19:52:13 -04:00
Zach Holman
4514b00e07 Proper mustache 2013-05-22 16:50:39 -07:00
Haacked
2d5cc17086 Fixup a bad merge.
I did a bad merge. I need to fix the callout.
2013-05-21 15:33:26 -07:00
Haacked
3b265d6ff7 Minor language tweaks
Also replaced tick marks with apostrophes.
2013-05-21 15:19:58 -07:00
Benjamin J. Balter
cf71a7bf6d update gemfile and build script to jekyll 1.0.2 2013-05-21 15:17:12 -07:00
Benjamin J. Balter
337cf0a2b1 add link to boostrap instructions to readme 2013-05-21 15:17:12 -07:00
Benjamin J. Balter
a88cd6646b add project license to readme, fixes #50 2013-05-21 15:17:11 -07:00
Julio Avalos
a58ec6bb5c Update index.html 2013-05-21 15:17:11 -07:00
Haacked
71a4c87882 Add CONTRIBUTING file.
Fixes #35
2013-05-21 15:17:10 -07:00
Benjamin J. Balter
804e14b105 s/gemfile/Gemfile/ 2013-05-21 15:17:10 -07:00