From e98ec06a7d43052e8928271ef46f11f2c7b94fbb Mon Sep 17 00:00:00 2001
From: Mike Linksvayer <mlinksva@github.com>
Date: Tue, 26 Jan 2016 13:42:29 -0800
Subject: [PATCH] consolidate no license info in /no-license, remove from
 /licenses fixes #196

---
 _licenses/no-license.txt   | 26 --------------------------
 licenses.html              |  2 +-
 no-license.md              |  9 +++++++++
 spec/license_shown_spec.rb |  3 +--
 4 files changed, 11 insertions(+), 29 deletions(-)
 delete mode 100644 _licenses/no-license.txt

diff --git a/_licenses/no-license.txt b/_licenses/no-license.txt
deleted file mode 100644
index 5a0d35b..0000000
--- a/_licenses/no-license.txt
+++ /dev/null
@@ -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]
diff --git a/licenses.html b/licenses.html
index e517497..e1811ba 100644
--- a/licenses.html
+++ b/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' %}
diff --git a/no-license.md b/no-license.md
index 8a3d865..5f324ee 100644
--- a/no-license.md
+++ b/no-license.md
@@ -1,6 +1,7 @@
 ---
 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."
 ---
@@ -9,6 +10,14 @@ You're under no obligation to choose a license and it's your right not to includ
 
 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.
 
+You don't have to do anything to not offer a license, though including a copyright notice is recommended.
+
+<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 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.
 
 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.
diff --git a/spec/license_shown_spec.rb b/spec/license_shown_spec.rb
index 1a9cde3..a1b159d 100644
--- a/spec/license_shown_spec.rb
+++ b/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|