Permalink
Browse files

changed licens to proper BSD

git-svn-id: https://erlyaws.svn.sourceforge.net/svnroot/erlyaws/trunk/yaws@958 9fbdc01b-0d2c-0410-bfb7-fb27d70d8b52
  • Loading branch information...
1 parent 2e22685 commit 3aac258d3b0fbd3308594d0f0df3efa1f11f97ec @klacke committed Apr 5, 2006
Showing with 23 additions and 8 deletions.
  1. +23 −8 LICENSE
View
31 LICENSE
@@ -1,12 +1,27 @@
-This software (the yaws webserver) is free software.
-Parts of this software is Copyright (c) Claes Wikstrom <klacke@hyber.org>
-Any use or misuse of the source code is hereby freely allowed.
+Copyright (c) 2006, Claes Wikstrom, klacke@hyber.org
+All rights reserved.
-1. Redistributions of source code must retain the above copyright
- notice as well as this list of conditions.
-
-2. Redistributions in binary form must reproduce the above copyright
- notice as well as this list of conditions.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of "Yaws" nor the names of its contributors may be
+ used to endorse or promote products derived from this software without
+ specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.

0 comments on commit 3aac258

Please sign in to comment.