Merge branch 'gh-pages' into home-reform

Author: mlinksva

README.md

@@ -1,21 +1,15 @@
-# Choosealicense.com
+**[ChooseALicense.com](https://choosealicense.com)** aims to provide **accurate**, **non-judgmental**, and **understandable** information about popular **open source licenses** in order to **help people make informed decisions** about the projects they start, maintain, contribute to, and use.
 
 [![Build Status](https://travis-ci.org/github/choosealicense.com.svg?branch=gh-pages)](https://travis-ci.org/github/choosealicense.com)
 
-Like a Choose Your Own Adventure site, but only much less interesting.
+We catalog [select](CONTRIBUTING.md#adding-a-license) open source licenses with a [Jekyll collection](https://jekyllrb.com/docs/collections/) (in `_licenses`). The catalog is used to render [ChooseALicense.com](https://choosealicense.com) and is regularly vendored into [Licensee](https://github.com/benbalter/licensee), which GitHub uses to provide a [license chooser and license detection](https://help.github.com/articles/adding-a-license-to-a-repository/), a [licenses API](https://developer.github.com/v3/licenses/), and to [display license descriptions and metadata](https://github.com/blog/2335-open-source-license-descriptions-and-metadata).
 
-## Intro
+## Goals
 
-A lot of repositories on GitHub.com don't have a license. GitHub provides a license chooser, but if you don't know anything about licenses, how are you supposed to make an informed decision?
-
-[ChooseALicense.com](https://www.choosealicense.com "Choose A Licence website") is designed to help people make an informed decision about licenses by demystifying license choices through non-judgmental guidance.
-
-## Immediate Goals
-
-* Non-judgmental. Our goal is to help you find a license that meets *your* goals.
-* Well designed, but that goes without saying.
-* The homepage should have just enough to help 99% of folks make a decision.
-* For the 1%, the site will contain a list of licenses common to specific communities and situations.
+* Be accurate, non-judgmental, and understandable. Our goal is to help you find a license that meets *your* goals.
+* The homepage should have just enough to help most folks make a decision about what license to use for a project they contribute to.
+* For the rest, the site will contain additional information about licenses common to specific communities and situations.
+* Collaborate with and reinforce other licensing best practices and standards projects.
 * Not comprehensive. Seems like an odd goal, but there are a bajillion licenses out there. We're going to have to filter that down to a small list of those that matter.
 
 ## Run It On Your Machine

_config.yml

@@ -40,6 +40,7 @@ plugins:
   - jekyll-redirect-from
   - jekyll-seo-tag
   - jekyll-coffeescript
+  - jekyll-github-metadata # For 'Improve this page' links
 
 sass:
     style: :compressed

_includes/footer.html

@@ -2,6 +2,7 @@
         <nav>
           <a href="/about/">About</a>
           <a href="/terms-of-service/">Terms of Service</a>
+          {% github_edit_link "Help improve this page" %}
         </nav>
         <p>
           The content of this site is licensed under the <a href="https://creativecommons.org/licenses/by/3.0/">

_licenses/cc0-1.0.txt

@@ -4,7 +4,7 @@ spdx-id: CC0-1.0
 redirect_from: /licenses/cc0/
 source: https://creativecommons.org/publicdomain/zero/1.0/
 
-description: The <a href="https://creativecommons.org/publicdomain/zero/1.0/">Creative Commons CC0 Public Domain Dedication</a> waives copyright interest in any a work you've created and dedicates it to the world-wide public domain. Use CC0 to opt out of copyright entirely and ensure your work has the widest reach. As with the Unlicense and typical software licenses, CC0 disclaims warranties. CC0 is very similar to the Unlicense.
+description: The <a href="https://creativecommons.org/publicdomain/zero/1.0/">Creative Commons CC0 Public Domain Dedication</a> waives copyright interest in a work you've created and dedicates it to the world-wide public domain. Use CC0 to opt out of copyright entirely and ensure your work has the widest reach. As with the Unlicense and typical software licenses, CC0 disclaims warranties. CC0 is very similar to the Unlicense.
 
 how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the CC0 into the file.
 

_licenses/epl-1.0.txt

@@ -2,7 +2,6 @@
 title: Eclipse Public License 1.0
 spdx-id: EPL-1.0
 source: https://www.eclipse.org/legal/epl-v10.html
-hidden: true
 
 description: This commercially-friendly copyleft license provides the ability to commercially license binaries; a modern royalty-free patent license grant; and the ability for linked works to use other licenses, including commercial ones.
 

_licenses/epl-2.0.txt

@@ -12,7 +12,7 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of
 using:
   - Eclipse Ditto: https://github.com/eclipse/ditto/blob/master/LICENSE
   - Eclipse SmartHome: https://github.com/eclipse/smarthome/blob/master/LICENSE
-  - SUMO: https://github.com/DLR-TS/sumo/blob/master/COPYING
+  - SUMO: https://github.com/eclipse/sumo/blob/master/LICENSE
 
 permissions:
   - commercial-use

_licenses/gpl-3.0.txt

@@ -710,4 +710,4 @@ into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<https://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

_licenses/postgresql.txt

@@ -10,7 +10,7 @@ how: To use it, say that it is The PostgreSQL License, and then substitute the c
 using:
   - pgBadger: https://github.com/dalibo/pgbadger/blob/master/LICENSE
   - pgAdmin: https://github.com/postgres/pgadmin4/blob/master/LICENSE
-  - .NET Access to PostgreSQL: https://github.com/npgsql/npgsql/blob/dev/LICENSE.txt
+  - .NET Access to PostgreSQL: https://github.com/npgsql/npgsql/blob/dev/LICENSE
 
 permissions:
   - commercial-use

about.md

@@ -10,9 +10,9 @@ If you already know what you're doing and have a license you prefer to use, that
 
 ## Not comprehensive
 
-This site is not a comprehensive directory of open source licenses. We think there are too many options, which adds to the confusion. On the [homepage](/), we break it down into just three licenses. The vast majority of projects will likely be fine choosing from one of these three. Just in case you have specific needs not covered by those three, we also highlight a [few other licenses to consider](/licenses/), and have a page about [licenses for non-software projects](/non-software/).
+This site is not a comprehensive directory of open source licenses. On the [homepage](/), we break it down into just three licenses. The vast majority of projects will likely be fine choosing from one of these three. Just in case you have specific needs not covered by those three, we also highlight a [few other licenses to consider](/licenses/), and have a page about [licenses for non-software projects](/non-software/).
 
-See our [appendix](/appendix) for a table of all of the licenses cataloged in the choosealicense.com repository and the links below for *even more licenses* that you **do not** need to learn about when choosing a license for your project.
+See our [appendix](/appendix/) for a table of all of the licenses cataloged in the choosealicense.com repository and the links below for *even more licenses* that you **do not** need to learn about when choosing a license for your project.
 
 ### Additional resources