Permalink
Browse files

updated to ISC License

  • Loading branch information...
1 parent 334d2a4 commit 6a2119cadaff6c20a927c37ee25d77c592128f5e nick committed Jun 27, 2009
Showing with 13 additions and 25 deletions.
  1. +11 −23 LICENSE.txt
  2. +2 −2 index.html
View
@@ -1,25 +1,13 @@
-Khaos License v1.2
+Copyright (C) 2009 Nick Johnson
-A "section" is any file or directory containing a copyright notice that covers
-all of the work contained within it. The smallest unit that may be considered
-to be a section is a single file.
+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.
-Permission is hereby granted to use, copy, modify, merge, link, disassemble,
-publish, and/or distribute this software and/or its source code, with or
-without modification, in whole, in part, or as part of another work, for any
-purpose, provided that if this software is distributed in any way or form,
-this copyright notice, license, and disclaimer are preserved upon all
-sections containing part of the original program, and the source code is
-publicly available for all sections of the program covered by this license.
-All executables containing any section covered by this license must have all
-sections licensed in such a way that the user is allowed to use and/or
-disassemble the executable, for any purpose.
-
-THIS SOFTWARE IS PROVIDED "AS IS" WITH NO WARRANTY OF ANY KIND, EITHER
-EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER OR CONTRIBUTORS 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.
+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.
View
@@ -49,15 +49,15 @@
<span class="small">by <a href="http://github.com/nickbjohnson4224">nickbjohnson4224</a></span></h1>
<div class="description">
- Simple OS kernel
+ Simple OS kernel and utilities
</div>
<h2>Dependencies</h2>
<p>make, tar, gcc for building;
linux 2.6 w/ loopback + bochs 2.3.7 for testing;
multiboot compliant bootloader for booting</p>
<h2>License</h2>
-<p>Custom, weak copyleft, open source. See <a href="LICENSE.txt">LICENSE</a> for details.</p>
+<p>ISC License, see <a href="LICENSE.txt">LICENSE</a>
<h2>Authors</h2>
<p>Nick Johnson</p>
<h2>Contact</h2>

0 comments on commit 6a2119c

Please sign in to comment.