From 07491fb98475487d88b2fb321c8e8ef10207073e Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 23 Jan 2014 12:23:17 +0200 Subject: [PATCH 1/4] Improve fix from 098369b33f694becf53fcdd9535c631e3f18a062. Remove extra newlines which aren't needed. --- _includes/header.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_includes/header.html b/_includes/header.html index 5c6d2b3..ef840ea 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -3,8 +3,8 @@ - {% if page.title %}{{ page.title | markdownify | strip_html }} - {% endif %}{{ site.title}} - {% if page.description %}{% endif %} + {% if page.title %}{{ page.title | markdownify | strip_html | strip_newlines }} - {% endif %}{{ site.title}} + {% if page.description %}{% endif %} @@ -19,5 +19,5 @@ {% include breadcrumbs.html %} {% if page.title %} -

{{ page.title | markdownify | strip_html }}

+

{{ page.title | markdownify | strip_html | strip_newlines }}

{% endif %} From 13c9eb92fb1b01d441e68570979a2da349914d9c Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 23 Jan 2014 12:23:47 +0200 Subject: [PATCH 2/4] Simplify license.html. Remove the custom `replace` filter and use `markdownify` instead. --- _layouts/license.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/license.html b/_layouts/license.html index 379b935..a369626 100644 --- a/_layouts/license.html +++ b/_layouts/license.html @@ -2,7 +2,7 @@
- 
{{ content | replace:"<", "[" | replace:">", "]" }}
+ 
{{ content | markdownify | strip_html }}
{% include sidebar.html %} From d40409be96dbfc8a05df3e626280362b1b427867 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 23 Jan 2014 12:44:09 +0200 Subject: [PATCH 3/4] Revert 26bb900113ad6385c743b7a6d61c5595364d075b. Jekyll already takes care of those. --- about.md | 2 +- index.html | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/about.md b/about.md index b8ae7e9..4436d6e 100644 --- a/about.md +++ b/about.md @@ -2,7 +2,7 @@ title: About layout: default permalink: /about/ -title: What’s this about? +title: What's this about? --- GitHub wants to help developers choose a license for their source code. diff --git a/index.html b/index.html index 607f5b2..a00b37b 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ layout: default class: home hide_breadcrumbs: true -title: Choosing an OSS license doesn’t need to be scary +title: Choosing an OSS license doesn't need to be scary description: A site to provide non-judgmental guidance on choosing a license for your open source project --- @@ -18,7 +18,7 @@ description: A site to provide non-judgmental guidance on choosing a license for

I want it simple and permissive.

- The MIT License is a permissive license that is short and to the point. It lets people do anything they want with your code as long as they provide attribution back to you and don’t hold you liable. + The MIT License is a permissive license that is short and to the point. It lets people do anything they want with your code as long as they provide attribution back to you and don't hold you liable.

jQuery and Rails use the MIT License. @@ -27,7 +27,7 @@ description: A site to provide non-judgmental guidance on choosing a license for

  • -

    I’m concerned about patents.

    +

    I'm concerned about patents.

    The Apache License is a permissive license similar to the MIT License, but also provides an express grant of patent rights from contributors to users. @@ -56,7 +56,7 @@ description: A site to provide non-judgmental guidance on choosing a license for

    • -

      My content isn’t code.

      +

      My content isn't code.

      Check out Creative Commons.

      @@ -68,9 +68,9 @@ description: A site to provide non-judgmental guidance on choosing a license for

    • -

      I don’t want to choose a license.

      +

      I don't want to choose a license.

      - You don’t have to. + You don't have to.

    From fcfc139ad1367952b6afc6a5c53fe734b0a48bd3 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 23 Jan 2014 12:44:27 +0200 Subject: [PATCH 4/4] Simplify quotes and apostrophes. --- licenses/mozilla.txt | 52 ++++++++++++++++++++++---------------------- terms-of-service.md | 18 +++++++-------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/licenses/mozilla.txt b/licenses/mozilla.txt index 4e74bd6..16b03bf 100644 --- a/licenses/mozilla.txt +++ b/licenses/mozilla.txt @@ -30,28 +30,28 @@ Mozilla Public License, version 2.0 1. Definitions -1.1. “Contributor” +1.1. "Contributor" means each individual or legal entity that creates, contributes to the creation of, or owns Covered Software. -1.2. “Contributor Version” +1.2. "Contributor Version" means the combination of the Contributions of others (if any) used by a - Contributor and that particular Contributor’s Contribution. + Contributor and that particular Contributor's Contribution. -1.3. “Contribution” +1.3. "Contribution" means Covered Software of a particular Contributor. -1.4. “Covered Software” +1.4. "Covered Software" means Source Code Form to which the initial Contributor has attached the notice in Exhibit A, the Executable Form of such Source Code Form, and Modifications of such Source Code Form, in each case including portions thereof. -1.5. “Incompatible With Secondary Licenses” +1.5. "Incompatible With Secondary Licenses" means a. that the initial Contributor has attached the notice described in @@ -61,26 +61,26 @@ Mozilla Public License, version 2.0 version 1.1 or earlier of the License, but not also under the terms of a Secondary License. -1.6. “Executable Form” +1.6. "Executable Form" means any form of the work other than Source Code Form. -1.7. “Larger Work” +1.7. "Larger Work" means a work that combines Covered Software with other material, in a separate file or files, that is not Covered Software. -1.8. “License” +1.8. "License" means this document. -1.9. “Licensable” +1.9. "Licensable" means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently, any and all of the rights conveyed by this License. -1.10. “Modifications” +1.10. "Modifications" means any of the following: @@ -89,7 +89,7 @@ Mozilla Public License, version 2.0 b. any new file in Source Code Form that contains any Covered Software. -1.11. “Patent Claims” of a Contributor +1.11. "Patent Claims" of a Contributor means any patent claim(s), including without limitation, method, process, and apparatus claims, in any patent Licensable by such @@ -97,22 +97,22 @@ Mozilla Public License, version 2.0 by the making, using, selling, offering for sale, having made, import, or transfer of either its Contributions or its Contributor Version. -1.12. “Secondary License” +1.12. "Secondary License" means either the GNU General Public License, Version 2.0, the GNU Lesser General Public License, Version 2.1, the GNU Affero General Public License, Version 3.0, or any later versions of those licenses. -1.13. “Source Code Form” +1.13. "Source Code Form" means the form of the work preferred for making modifications. -1.14. “You” (or “Your”) +1.14. "You" (or "Your") means an individual or a legal entity exercising rights under this - License. For legal entities, “You” includes any entity that controls, is + License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with You. For purposes of this - definition, “control” means (a) the power, direct or indirect, to cause + definition, "control" means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity. @@ -151,7 +151,7 @@ Mozilla Public License, version 2.0 a. for any code that a Contributor has removed from Covered Software; or - b. for infringements caused by: (i) Your and any other third party’s + b. for infringements caused by: (i) Your and any other third party's modifications of Covered Software, or (ii) the combination of its Contributions with other software (except as part of its Contributor Version); or @@ -197,7 +197,7 @@ Mozilla Public License, version 2.0 the terms of this License. You must inform recipients that the Source Code Form of the Covered Software is governed by the terms of this License, and how they can obtain a copy of this License. You may not - attempt to alter or restrict the recipients’ rights in the Source Code + attempt to alter or restrict the recipients' rights in the Source Code Form. 3.2. Distribution of Executable Form @@ -213,7 +213,7 @@ Mozilla Public License, version 2.0 b. You may distribute such Executable Form under the terms of this License, or sublicense it under different terms, provided that the license for the Executable Form does not attempt to limit or alter the - recipients’ rights in the Source Code Form under this License. + recipients' rights in the Source Code Form under this License. 3.3. Distribution of a Larger Work @@ -291,7 +291,7 @@ Mozilla Public License, version 2.0 6. Disclaimer of Warranty - Covered Software is provided under this License on an “as is” basis, + Covered Software is provided under this License on an "as is" basis, without warranty of any kind, either expressed, implied, or statutory, including, without limitation, warranties that the Covered Software is free of defects, merchantable, fit for a particular purpose or non-infringing. @@ -313,7 +313,7 @@ Mozilla Public License, version 2.0 other commercial damages or losses, even if such party shall have been informed of the possibility of such damages. This limitation of liability shall not apply to liability for death or personal injury resulting from - such party’s negligence to the extent applicable law prohibits such + such party's negligence to the extent applicable law prohibits such limitation. Some jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so this exclusion and limitation may not apply to You. @@ -324,7 +324,7 @@ Mozilla Public License, version 2.0 of a jurisdiction where the defendant maintains its principal place of business and such litigation shall be governed by laws of that jurisdiction, without reference to its conflict-of-law provisions. Nothing - in this Section shall prevent a party’s ability to bring cross-claims or + in this Section shall prevent a party's ability to bring cross-claims or counter-claims. 9. Miscellaneous @@ -383,8 +383,8 @@ notice. You may add additional accurate notices of copyright ownership. -Exhibit B - “Incompatible With Secondary Licenses” Notice +Exhibit B - "Incompatible With Secondary Licenses" Notice - This Source Code Form is “Incompatible - With Secondary Licenses”, as defined by + This Source Code Form is "Incompatible + With Secondary Licenses", as defined by the Mozilla Public License, v. 2.0. \ No newline at end of file diff --git a/terms-of-service.md b/terms-of-service.md index 4181269..e2d6036 100644 --- a/terms-of-service.md +++ b/terms-of-service.md @@ -6,31 +6,31 @@ permalink: /terms-of-service/ --- ### 1. Introduction -Welcome to Choosealicense.com (the “Site”). The Site is operated by GitHub, Inc. (“GitHub” or “we”), a Delaware corporation headquartered in lovely San Francisco, California. This document – the Site’s terms of service – is an agreement between you, the beloved user, and GitHub. It’s referred to as the “Terms” or the “Agreement.” -These Terms govern your use of the Site and this Site only. The Terms neither relate to any other GitHub website, service or property nor your use of any other GitHub website, service or property. For example, these Terms don’t govern your use of www.github.com. +Welcome to Choosealicense.com (the "Site"). The Site is operated by GitHub, Inc. ("GitHub" or "we"), a Delaware corporation headquartered in lovely San Francisco, California. This document – the Site's terms of service – is an agreement between you, the beloved user, and GitHub. It's referred to as the "Terms" or the "Agreement". +These Terms govern your use of the Site and this Site only. The Terms neither relate to any other GitHub website, service or property nor your use of any other GitHub website, service or property. For example, these Terms don't govern your use of www.github.com. ### 2. Agreement to the Terms Terms of service agreements are contracts. That means that this Agreement is a contract between you and GitHub for the limited purpose of laying out what our respective rights and obligations are with respect to Choosealicense.com. -If there’s something in these Terms you don’t agree with or don’t understand, please don’t use the Site. By accessing or using the Site, you signal your agreement with and consent to the Terms. By accessing or using any Website or Service you also represent that you have the legal authority to accept the Terms on behalf of yourself and any party you represent in connection with your use of any Website or Service. +If there's something in these Terms you don't agree with or don't understand, please don't use the Site. By accessing or using the Site, you signal your agreement with and consent to the Terms. By accessing or using any Website or Service you also represent that you have the legal authority to accept the Terms on behalf of yourself and any party you represent in connection with your use of any Website or Service. Unless otherwise agreed to in writing with GitHub, your use of any Website or Service will always be subject to, at a minimum, the terms and conditions set out in this document. ### 3. No legal advice is being provided -GitHub is a lot of things, but it’s not a law firm. GitHub does not provide legal advice. Using the Site or sending us an email about the Site does not create an attorney-client relationship. Use of Choosealicense.com does not constitute legal advice nor does it create an attorney-client relationship. If you have any questions about the Site or its content, you should consult with your own legal counsel before moving forward with your project. In fact, you should always consult with your own lawyer before making any decisions that might have legal ramifications or that may impact your legal rights. +GitHub is a lot of things, but it's not a law firm. GitHub does not provide legal advice. Using the Site or sending us an email about the Site does not create an attorney-client relationship. Use of Choosealicense.com does not constitute legal advice nor does it create an attorney-client relationship. If you have any questions about the Site or its content, you should consult with your own legal counsel before moving forward with your project. In fact, you should always consult with your own lawyer before making any decisions that might have legal ramifications or that may impact your legal rights. -GitHub created the Site to help users get started with their open source projects. And we do hope it helps. But please keep in mind that we’re not lawyers (at least not most of us) and that we make mistakes like everyone else. For that reason, GitHub provides the Site on an “as-is” basis. GitHub makes no warranties regarding any information or licenses provided on or through the Site, and disclaims liability for damages resulting from use of the Site. +GitHub created the Site to help users get started with their open source projects. And we do hope it helps. But please keep in mind that we're not lawyers (at least not most of us) and that we make mistakes like everyone else. For that reason, GitHub provides the Site on an "as-is" basis. GitHub makes no warranties regarding any information or licenses provided on or through the Site, and disclaims liability for damages resulting from use of the Site. -The next few sections of these Terms go into greater detail on these disclaimers and lack of warranties. They’re in caps so that you notice them. +The next few sections of these Terms go into greater detail on these disclaimers and lack of warranties. They're in caps so that you notice them. ### 4. DISCLAIMER OF WARRANTIES -TO THE FULLEST EXTENT PERMITTED BY APPLICABLE LAW, GITHUB OFFERS THE SITE ON AN AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WEBSITES OR SERVICES, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NONINFRINGEMENT. GITHUB DOES NOT WARRANT THAT THE FUNCTIONS OR CONTENT CONTAINED ON THE WEBSITE OR SERVICES WILL BE ERROR-FREE, THAT DEFECTS WILL BE CORRECTED, OR THAT GITHUB’S SERVERS ARE FREE OF VIRUSES OR OTHER HARMFUL COMPONENTS. GITHUB DOES NOT WARRANT OR MAKE ANY REPRESENTATION REGARDING USE OR THE RESULT OF USE OF THE CONTENT IN TERMS OF ACCURACY, RELIABILITY, OR OTHERWISE. +TO THE FULLEST EXTENT PERMITTED BY APPLICABLE LAW, GITHUB OFFERS THE SITE ON AN AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WEBSITES OR SERVICES, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NONINFRINGEMENT. GITHUB DOES NOT WARRANT THAT THE FUNCTIONS OR CONTENT CONTAINED ON THE WEBSITE OR SERVICES WILL BE ERROR-FREE, THAT DEFECTS WILL BE CORRECTED, OR THAT GITHUB'S SERVERS ARE FREE OF VIRUSES OR OTHER HARMFUL COMPONENTS. GITHUB DOES NOT WARRANT OR MAKE ANY REPRESENTATION REGARDING USE OR THE RESULT OF USE OF THE CONTENT IN TERMS OF ACCURACY, RELIABILITY, OR OTHERWISE. ### 5. LIMITATION OF LIABILITY -EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW AND THEN ONLY TO THAT EXTENT, IN NO EVENT WILL GITHUB, ITS EMPLOYEES, OFFICERS, DIRECTORS, AFFILIATES OR AGENTS (“THE GITHUB PARTIES”) BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY INCIDENTAL, DIRECT, INDIRECT, PUNITIVE, ACTUAL, CONSEQUENTIAL, SPECIAL, EXEMPLARY OR OTHER DAMAGES, INCLUDING WITHOUT LIMITATION, LOSS OF REVENUE OR INCOME, LOST PROFITS, PAIN AND SUFFERING, EMOTIONAL DISTRESS, COST OF SUBSTITUTE GOODS OR SERVICES, OR SIMILAR DAMAGES SUFFERED OR INCURRED BY YOU OR ANY THIRD PARTY THAT ARISE IN CONNECTION WITH THE WEBSITES OR SERVICES (OR THE TERMINATION THEREOF FOR ANY REASON), EVEN IF THE GITHUB PARTIES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. +EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW AND THEN ONLY TO THAT EXTENT, IN NO EVENT WILL GITHUB, ITS EMPLOYEES, OFFICERS, DIRECTORS, AFFILIATES OR AGENTS ("THE GITHUB PARTIES") BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY INCIDENTAL, DIRECT, INDIRECT, PUNITIVE, ACTUAL, CONSEQUENTIAL, SPECIAL, EXEMPLARY OR OTHER DAMAGES, INCLUDING WITHOUT LIMITATION, LOSS OF REVENUE OR INCOME, LOST PROFITS, PAIN AND SUFFERING, EMOTIONAL DISTRESS, COST OF SUBSTITUTE GOODS OR SERVICES, OR SIMILAR DAMAGES SUFFERED OR INCURRED BY YOU OR ANY THIRD PARTY THAT ARISE IN CONNECTION WITH THE WEBSITES OR SERVICES (OR THE TERMINATION THEREOF FOR ANY REASON), EVEN IF THE GITHUB PARTIES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. THE GITHUB PARTIES SHALL NOT BE RESPONSIBLE OR LIABLE WHATSOEVER IN ANY MANNER FOR ANY CONTENT POSTED ON THE SITE (INCLUDING CLAIMS OF INFRINGEMENT RELATING TO CONTENT POSTED ON THE WEBSITES OR SERVICES, FOR YOUR USE OF THE WEBSITES AND SERVICES, OR FOR THE CONDUCT OF THIRD PARTIES WHETHER ON THE WEBSITES, IN CONNECTION WITH THE SERVICES OR OTHERWISE RELATING TO THE WEBSITES OR SERVICES. @@ -47,7 +47,7 @@ The disclaimer of warranties, the limitation of liability and the jurisdiction a These Terms are governed by and construed by the laws of the State of California, in the United States, exclusive of its choice of law rules. -The parties agree that any disputes or proceedings between GitHub and you concerning these Terms or the Site shall be brought in a federal or state court of competent jurisdiction sitting in the Northern District of California, and hereby consent to the personal jurisdiction and venue of such court. Either party’s failure to insist on or enforce strict performance of any of the Terms shall not be construed as a waiver of any provision or right. +The parties agree that any disputes or proceedings between GitHub and you concerning these Terms or the Site shall be brought in a federal or state court of competent jurisdiction sitting in the Northern District of California, and hereby consent to the personal jurisdiction and venue of such court. Either party's failure to insist on or enforce strict performance of any of the Terms shall not be construed as a waiver of any provision or right. If any term or part of the Terms is held to be invalid or unenforceable by any law or regulation or final determination of a competent court or tribunal, that provision will be deemed severable and will not affect the validity and enforceability of any remaining provisions.