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

Merge branch 'gh-pages' into solo-license-page-355

This commit is contained in:
Leo F 2016-04-27 15:50:26 -07:00
commit f77da9af1d
5 changed files with 8 additions and 0 deletions

View File

@ -49,6 +49,7 @@ Licenses sit in the `/_licenses` folder. Each license has YAML front matter desc
#### Optional fields #### Optional fields
* `featured` - Whether the license should be featured on the main page (defaults to false)
* `note` - Additional information about the licenses * `note` - Additional information about the licenses
* `using` - A list of notable projects using the license in the form of `project_name: "url"` * `using` - A list of notable projects using the license in the form of `project_name: "url"`
* `redirect_from` - Relative path(s) to redirect to the license from, to prevent breaking old URLs * `redirect_from` - Relative path(s) to redirect to the license from, to prevent breaking old URLs

View File

@ -31,6 +31,10 @@
# Optional fields # Optional fields
- name: featured
description: Whether the license should be featured on the main page (defaults to false)
required: false
- name: note - name: note
description: Additional information about the licenses description: Additional information about the licenses
required: false required: false

View File

@ -2,6 +2,7 @@
title: Apache License 2.0 title: Apache License 2.0
redirect_from: /licenses/apache/ redirect_from: /licenses/apache/
source: http://www.apache.org/licenses/LICENSE-2.0.html source: http://www.apache.org/licenses/LICENSE-2.0.html
featured: true
description: A permissive license that also provides an express grant of patent rights from contributors to users. description: A permissive license that also provides an express grant of patent rights from contributors to users.

View File

@ -3,6 +3,7 @@ title: GNU General Public License v3.0
nickname: GNU GPLv3 nickname: GNU GPLv3
redirect_from: /licenses/gpl-v3/ redirect_from: /licenses/gpl-v3/
source: http://www.gnu.org/licenses/gpl-3.0.txt source: http://www.gnu.org/licenses/gpl-3.0.txt
featured: true
description: The GNU GPL is the most widely used free software license and has a strong copyleft requirement. When distributing derived works, the source code of the work must be made available under the same license. description: The GNU GPL is the most widely used free software license and has a strong copyleft requirement. When distributing derived works, the source code of the work must be made available under the same license.

View File

@ -1,6 +1,7 @@
--- ---
title: MIT License title: MIT License
source: https://opensource.org/licenses/MIT source: https://opensource.org/licenses/MIT
featured: true
description: A permissive license that is short and to the point. It lets people do anything with your code with proper attribution and without warranty. description: A permissive license that is short and to the point. It lets people do anything with your code with proper attribution and without warranty.