diff --git a/.travis.yml b/.travis.yml index 6f0a9ca..1b743c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ script: "./script/cibuild" #environment language: ruby -rvm: +rvm: - 2.0.0 branches: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 48fb743..04435d9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,13 +4,13 @@ We love Pull Requests! Your contributions help make ChooseALicense.com great. ## Getting Started -So you want to contribute to ChooseALicense. Great! We welcome any help we can -get. But first, please make sure you understand what +So you want to contribute to ChooseALicense. Great! We welcome any help we can +get. But first, please make sure you understand what [this site is all about](http://choosealicense.com/about). It’s not a comprehensive list of all possible licenses. -If you understand the goals of this site and still want to suggest a change, +If you understand the goals of this site and still want to suggest a change, please: * Make sure you have a [GitHub account](https://github.com/signup/free) @@ -20,12 +20,12 @@ please: ## Making Changes -The easiest way to make a change is to simply edit a file from your browser. +The easiest way to make a change is to simply edit a file from your browser. When you click the edit button, it will fork the repository under your account. Note what issue/issues your patch fixes in the commit message. -For example, to [change this file](https://github.com/github/choosealicense.com/blob/master/CONTRIBUTING.md), -find it in the GitHub repository. Then click the `Edit` button. Make your +For example, to [change this file](https://github.com/github/choosealicense.com/blob/master/CONTRIBUTING.md), +find it in the GitHub repository. Then click the `Edit` button. Make your changes, type in a commit message, and click the `Propose File Change` button. That’s it! diff --git a/Gemfile b/Gemfile index 0e84e77..b89849d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,8 @@ -source 'https://rubygems.org' -ruby File.read('.ruby-version').strip +source "https://rubygems.org" +ruby File.read(".ruby-version").strip gem "github-pages" -gem 'ffi', '1.9.0' +gem "ffi", "1.9.0" group :test do gem "html-proofer" diff --git a/LICENSE.md b/LICENSE.md index 5edc1a7..b88134d 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file +THE SOFTWARE. diff --git a/README.md b/README.md index 4c0341b..26c5e05 100644 --- a/README.md +++ b/README.md @@ -5,21 +5,21 @@ Like a Choose Your Own Adventure site, but only much less interesting. # Intro 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 +a license chooser, but if you don't know anything about licenses, how are you supposed to make an informed decision. -ChooseALicense.com is designed to help people make an informed decision about -licenses. +ChooseALicense.com is designed to help people make an informed decision about +licenses. # Immediate Goals * Politics Free - Let's just not get into it. * 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 for specific +* For the 1%, the site will contain a list of licenses common for specific communities and situations. -* Not comprehensive. Seems like an odd goal, but there are a bajillion -(I counted) licenses out there. We're going to have to filter that down to a +* Not comprehensive. Seems like an odd goal, but there are a bajillion +(I counted) 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 @@ -52,10 +52,10 @@ The licenses on choosealicense.com are regularly imported to GitHub.com to be us * `[description]` - The description of the repository * `[year]` - The current year -# Rules +# Rules -* Rules (the license's properties) are stored as a bulleted list within the licenses YAML front matter. A full list of rules can be found in the repository's `_config.yml` file. Each rule has a name e.g., `include-copyright`, a human-readable label, e.g., `Copyright inclusion`, and a description `Include the original copyright with the code`. To add a new rule, simply add it to config.yml and reference it in the appropriate license. +* Rules (the license's properties) are stored as a bulleted list within the licenses YAML front matter. A full list of rules can be found in the repository's `_config.yml` file. Each rule has a name e.g., `include-copyright`, a human-readable label, e.g., `Copyright inclusion`, and a description `Include the original copyright with the code`. To add a new rule, simply add it to config.yml and reference it in the appropriate license. # License -The content of this project itself is licensed under the [Creative Commons Attribution 3.0 license](http://creativecommons.org/licenses/by/3.0/us/deed.en_US), and the underlying source code used to format and display that content is licensed under the [MIT license](http://opensource.org/licenses/mit-license.php). +The content of this project itself is licensed under the [Creative Commons Attribution 3.0 license](http://creativecommons.org/licenses/by/3.0/us/deed.en_US), and the underlying source code used to format and display that content is licensed under the [MIT license](http://opensource.org/licenses/mit-license.php). diff --git a/_config.yml b/_config.yml index 5662322..1d4a27a 100644 --- a/_config.yml +++ b/_config.yml @@ -66,3 +66,4 @@ exclude: - Gemfile* - script - vendor + - app.coffee diff --git a/_includes/breadcrumbs.html b/_includes/breadcrumbs.html index 2022d5a..2552e45 100644 --- a/_includes/breadcrumbs.html +++ b/_includes/breadcrumbs.html @@ -1,5 +1,5 @@ {% unless page.hide_breadcrumbs == true %} -