couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nsla...@apache.org
Subject git commit: Fixed up NOTICE and LICENSE
Date Sat, 01 Dec 2012 17:13:19 GMT
Updated Branches:
  refs/heads/docs 2fda0363c -> 16cd47318


Fixed up NOTICE and LICENSE


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/16cd4731
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/16cd4731
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/16cd4731

Branch: refs/heads/docs
Commit: 16cd4731809ae4c7a841d41bbbd6bfdd27e4b86c
Parents: 2fda036
Author: Noah Slater <nslater@apache.org>
Authored: Sat Dec 1 17:13:14 2012 +0000
Committer: Noah Slater <nslater@apache.org>
Committed: Sat Dec 1 17:13:14 2012 +0000

----------------------------------------------------------------------
 LICENSE |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 NOTICE  |   14 +++++++++-----
 2 files changed, 63 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/16cd4731/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 3dcf50a..8892711 100644
--- a/LICENSE
+++ b/LICENSE
@@ -207,7 +207,7 @@ The Apache CouchDB project includes a number of subcomponents with separate
 copyright notices and license terms. Your use of the code for the these
 subcomponents is subject to the terms and conditions of the following licenses.
 
-For the share/doc/static/rtd.css
+For the share/doc/build/html/_static components:
 
   Copyright (c) 2007-2011 by the Sphinx team (see AUTHORS file).
   All rights reserved.
@@ -235,6 +235,59 @@ For the share/doc/static/rtd.css
   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+For the share/doc/build/html/_static/jquery.js component:
+
+  Copyright 2010, John Resig
+  
+  Copyright 2010, The Dojo Foundation
+  
+  Copyright 2012 jQuery Foundation and other contributors
+  http://jquery.com/
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+For the share/doc/build/html/_static/underscore.js component:
+
+  Copyright (c) 2009-2012 Jeremy Ashkenas, DocumentCloud
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation
+  files (the "Software"), to deal in the Software without
+  restriction, including without limitation the rights to use,
+  copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following
+  conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+  OTHER DEALINGS IN THE SOFTWARE.
+
 For the share/www/script/jquery.js component:
 
   Copyright (c) 2009 John Resig, http://jquery.com/

http://git-wip-us.apache.org/repos/asf/couchdb/blob/16cd4731/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index d0a8012..e627b92 100644
--- a/NOTICE
+++ b/NOTICE
@@ -6,10 +6,6 @@ The Apache Software Foundation (http://www.apache.org/).
 
 This product also includes the following third-party components:
 
- * Sphinx (http://sphinx-doc.org/)
- 
-   Copyright 2011, the Sphinx team
-
  * jQuery (http://jquery.com/)
 
    Copyright 2011, John Resig
@@ -66,6 +62,14 @@ This product also includes the following third-party components:
 
   Copyright 2011, Jeremy Ashkenas
 
+ * Sphinx (http://sphinx-doc.org/)
+ 
+   Copyright 2011, the Sphinx team
+
+ * Sizzle (http://sizzlejs.com/)
+ 
+   Copyright 2010, The Dojo Foundation
+ 
  * Underscore.js 1.4.2 (http://underscorejs.org)
 
-  Copyright 2012, Jeremy Ashkenas
+   Copyright 2012, Jeremy Ashkenas


Mime
View raw message