Merge branch 'gh-pages' into adius-patch-1

_includes/footer.html

@@ -4,12 +4,11 @@
           <a href="/terms-of-service/">Terms of Service</a>
         </nav>
         <p>
-          If you have questions or issues, it is always best to consult a legal professional.<br>
           The content of this site is licensed under the <a href="https://creativecommons.org/licenses/by/3.0/">
           Creative Commons Attribution 3.0 Unported License</a>.
         </p>
         <div class="with-love">
-          Demystified with &lt;3 by <a href="https://github.com">GitHub, Inc.</a>
+          Curated with &lt;3 by <a href="https://github.com">GitHub, Inc.</a>
         </div>
       </footer>
 

_licenses/epl-1.0.txt

@@ -1,19 +1,16 @@
 ---
 title: Eclipse Public License 1.0
 redirect_from: /licenses/eclipse/
-source: http://www.eclipse.org/legal/epl-v10.html
+source: https://www.eclipse.org/legal/epl-v10.html
 
 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.
 
 how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file.
 
 using:
-  - The Eclipse Foundation: "http://www.eclipse.org"
+  - Clojure: https://github.com/clojure/clojure/blob/master/epl-v10.html
-  - OpenDaylight: "http://www.opendaylight.org/"
+  - JUnit: https://github.com/junit-team/junit/blob/master/LICENSE-junit.txt
-  - Clojure: "http://clojure.org/"
+  - openHAB: https://github.com/openhab/openhab/blob/master/LICENSE.TXT
-  - JUnit: "http://junit.org/"
-  - Ruby: "https://github.com/jruby/jruby"
-  - Mondrian: "https://en.wikipedia.org/wiki/Mondrian_OLAP_server"
 
 conditions:
   - disclose-source

_licenses/osl-3.0.txt

@@ -9,11 +9,9 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of
 note: OSL 3.0's author has <a href="http://rosenlaw.com/OSL3.0-explained.htm">provided an explanation</a> behind the creation of the license.
 
 using:
-  - Magento Community Edition: "http://magento.com/"
+  - appserver.io: https://github.com/appserver-io/appserver/blob/master/LICENSE.txt
-  - Parsimony: "https://github.com/parsimony/parsimony"
+  - Magento 2: https://github.com/magento/magento2/blob/develop/LICENSE.txt
-  - PrestaShop: "https://www.prestashop.com"
+  - Restyaboard: https://github.com/RestyaPlatform/board/blob/master/LICENSE.txt
-  - Mulgara: "http://mulgara.org"
-  - AbanteCart: "https://github.com/abantecart/abantecart-src"
 
 conditions:
   - include-copyright

about.md

@@ -4,9 +4,9 @@ permalink: /about/
 title: "What's this about?"
 ---
 
-GitHub wants to help developers choose a license for their source code.
+GitHub wants to help developers choose an open source license for their source code.
 
-If you already know what you're doing and have a license you prefer to use, that's great! We're not here to change your mind. But if you are bewildered by the large number of OSS license choices, maybe we can help.
+If you already know what you're doing and have a license you prefer to use, that's great! We're not here to change your mind. But if you are bewildered by the large number of open source license choices, maybe we can help.
 
 ## Not comprehensive
 
@@ -36,4 +36,4 @@ Choosealicense.com isn't just about open source, the site itself is open source
 
 ## Disclaimer
 
-We are not lawyers. Well, most of us anyway. It is not the goal of this site to provide legal advice. The goal of this site is to provide a starting point to help you make an informed choice by providing information on popular open source licenses. If you have any questions regarding the right license for your code or any other legal issues relating to it, it's always best to consult with a professional.
+We are not lawyers. Well, most of us anyway. It is not the goal of this site to provide legal advice. The goal of this site is to provide a starting point to help you make an informed choice by providing information on popular open source licenses. If you have any questions regarding the right license for your code or any other legal issues relating to it, it's up to you to do further research or consult with a professional.

index.html

@@ -2,7 +2,7 @@
 layout: default
 class: home
 hide_breadcrumbs: true
-title: Choosing an open source license doesn’t need to be scary
+title: Choose an open source license
 permalink: /
 ---