Commits

Phil Gyford  committed ff418d0

Add License and tweak licensing in JS.

  • Participants
  • Parent commits 42e6228

Comments (0)

Files changed (2)

+Copyright (c) 2010-2011, Phil Gyford ( phil@gyford.com http://www.gyford.com/ )
+All rights reserved.
+
+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 Phil Gyford 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 PHIL GYFORD 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.
+
+
+NOTE: Elements of the JavaScript file are copyright of other authors and released 
+under varying licenses. See the file public/js/reader.js for more details.
+
+

File public/js/reader.js

  * https://bitbucket.org/philgyford/daily-paper/
  * This file contains various libraries in one file for loading speed.
  *
- * The main code (reader) is dual licensed under MIT and GPL.
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
+ * The main code (reader) under the 3-clause BSD License (see LICENSE.txt).
  * Copyright 2010-2011 Phil Gyford (phil@gyford.com http://www.gyford.com/)
  *
- * This file contains other code with varying licences:
+ * This file also contains other code with varying licences:
  *
  *  * scrollbarWidth - Calculate the width of the vertical scrollbar.
  *  * ScrollTo - The generic code for handling the "scroll to this position stuff".