Merge pull request #326 from github/no-license

consolidate no license info in /no-license, remove from /licenses

_licenses/no-license.txt

@@ -1,26 +0,0 @@
----
-title: No License
-source: "http://choosealicense.com/no-license/"
-
-description: You retain all rights and do not permit distribution, reproduction, or derivative works. You may grant some rights in cases where you publish your source code to a site that requires accepting terms of service. For example, publishing code in a public repository on GitHub requires that you allow others to view and fork your code.
-
-how: Simply do nothing, though including a copyright notice is recommended.
-
-note: This option may be subject to the Terms Of Use of the site where you publish your source code.
-
-required:
-  - include-copyright
-
-permitted:
-  - commercial-use
-  - private-use
-
-forbidden:
-  - modifications
-  - distribution
-  - sublicense
-
-hidden: false
----
-
-Copyright [year] [fullname]

licenses.html

@@ -5,7 +5,7 @@ class: license-types
 title: Licenses
 ---
 
-<h2>Featured Licenses</h2>
+<h2>Featured licenses</h2>
 
 {% assign featured_licenses = site.licenses | where:"featured",true %}
 {% for license in featured_licenses | sort: 'path' %}

no-license.md

@@ -1,14 +1,33 @@
 ---
 layout: default
 permalink: no-license/
+redirect_from: /licenses/no-license/
 title: No License
 description: "You're under no obligation to choose a license and it's your right not to include one with your code or project. But please note that opting out of open source licenses doesn't mean you're opting out of copyright law."
 ---
 
-You're under no obligation to choose a license and it's your right not to include one with your code or project. But please note that opting out of open source licenses doesn't mean you're opting out of copyright law.
+Opting out of open source licenses doesn't mean you're opting out of copyright law.
 
 You'll have to check with your own legal counsel regarding your particular project, but generally speaking, the absence of a license means that default copyright laws apply. This means that you retain all rights to your source code and that nobody else may reproduce, distribute, or create derivative works from your work.
 
-Disallowing use of your code might not be what you intend by "no license." An [open-source license](/) allows reuse of your code while maintaining copyright. If your goal is to explicitly opt-out of copyright protections, try a public domain dedication like the [Unlicense](/licenses/unlicense/) or [CC0](/licenses/cc0). If you want to share your work with others, you must opt into it.
+You don't have to do anything to not offer a license, though including a copyright notice is recommended.
 
-Even in the absence of a license file, you may grant some rights in cases where you publish your source code to a site that requires accepting terms of service. For example, if you publish your source code in a public repository on GitHub, you have accepted the [Terms of Service](https://help.github.com/articles/github-terms-of-service) which do allow other GitHub users some rights. Specifically, you allow others to view and fork your repository.
+<div class="clearfix">
+<div class="license-body">
+<pre id="license-text">Copyright [year] [fullname]</pre>
+</div> <!-- /license-body -->
+</div>
+
+Disallowing use of your code might not be what you intend by "no license." An [open-source license](/) allows reuse of your code while retaining copyright. If your goal is to completely opt-out of copyright restrictions, try a [public domain dedication](/licenses/#unlicense).
+
+Even in the absence of a license file, you may grant some rights in cases where you publish your source code to a site that requires accepting terms of service. For example, if you publish your source code in a public repository on GitHub, you have accepted the [Terms of Service](https://help.github.com/articles/github-terms-of-service) by which you allow others to view and fork your repository.
+
+## For users
+
+If you find software that doesn't have a license, that generally means you have no permission from the creators of the software to use, modify, or share the software. Your options:
+
+**Ask the maintainers nicely to add a license.** Unless the software includes strong indications to the contrary, lack of a license is probably an oversight. If the software is hosted on a site like GitHub, open an issue requesting a license and include a link to this site, or if you're bold and it's fairly obvious what license is most appropriate, open a pull request to add a license.
+
+**Don't use the software.** Find or create an alternative that is under an open source license.
+
+**Negotiate a private license.** Bring your lawyer.

spec/license_shown_spec.rb

@@ -19,12 +19,11 @@ describe "shown licenses" do
     lgpl-3.0
     mit
     mpl-2.0
-    no-license
     unlicense
   ]
 
   it "has the expected number of shown licenses" do
-    expect(shown_licenses.count).to eql(16)
+    expect(shown_licenses.count).to eql(15)
   end
 
   shown_licenses.each do |license|