Merge branch 'juanfra684-isc' into gh-pages

licenses/bsd.txt

@@ -1,9 +1,9 @@
 ---
 layout: license
-title: BSD 2-Clause license
+title: BSD license
 category: BSD
 tab-slug: bsd
-hide-from-license-list: false
+hide-from-license-list: true
 permalink: /licenses/bsd/
 
 description: A permissive license that comes in two variants, the <a href="/licenses/bsd">BSD 2-Clause</a> and <a href="/licenses/bsd-3-clause">BSD 3-Clause</a>. Both have very minute differences to the MIT license.

licenses/isc.txt

@@ -0,0 +1,42 @@
+---
+layout: license
+title: ISC license
+permalink: /licenses/isc/
+source: http://opensource.org/licenses/isc-license
+category: BSD
+tab-slug: isc
+
+description: A permissive license lets people do anything with your code with proper attribution and without warranty. The ISC license is functionally equivalent to the <a href="/licenses/bsd">BSD 2-Clause</a> and <a href="/licenses/mit">MIT</a> licenses, removing some language that is no longer necessary.
+
+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. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders.  [email] is optional but recommended.
+
+filename: LICENSE
+
+required:
+  - include-copyright
+
+permitted:
+  - commercial-use
+  - distribution
+  - modifications
+  - private-use
+  - sublicense
+
+forbidden:
+  - no-liability
+
+---
+
+Copyright (c) [year], [fullname] <[email]>
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.