summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorPauli Virtanen <pav@iki.fi>2010-05-06 08:05:05 +0000
committerPauli Virtanen <pav@iki.fi>2010-05-06 08:05:05 +0000
commit20757e2fe36792e67613e3231e10eaa109660fea (patch)
tree084b29100b7d17a416c8fd726b966f5b30891dff /doc
parentf9eb8537984c12ee67657b008cdba74736538052 (diff)
downloadnumpy-20757e2fe36792e67613e3231e10eaa109660fea.tar.gz
numpy.scipy.org: add license information (#1478), tidy up CSS
Diffstat (limited to 'doc')
-rw-r--r--doc/numpy.scipy.org/_theme/scipy/index.html2
-rw-r--r--doc/numpy.scipy.org/_theme/scipy/static/scipy.css11
-rw-r--r--doc/numpy.scipy.org/content.rst2
-rw-r--r--doc/numpy.scipy.org/license.rst33
4 files changed, 46 insertions, 2 deletions
diff --git a/doc/numpy.scipy.org/_theme/scipy/index.html b/doc/numpy.scipy.org/_theme/scipy/index.html
index 75d61d05d..1a71ea1ab 100644
--- a/doc/numpy.scipy.org/_theme/scipy/index.html
+++ b/doc/numpy.scipy.org/_theme/scipy/index.html
@@ -46,6 +46,8 @@
multi-dimensional container of generic data. Arbitrary data-types can be
defined. This allows NumPy to seamlessly and speedily integrate with a wide
variety of databases.</p>
+ <p>Numpy is licensed under the <a class="reference external" href="license.html">BSD license</a>,
+ enabling reuse with few restrictions.</p>
<div class="section" id="getting-started">
<h1>Getting Started<a class="headerlink" href="#getting-started" title="Permalink to this headline">¶</a></h1>
diff --git a/doc/numpy.scipy.org/_theme/scipy/static/scipy.css b/doc/numpy.scipy.org/_theme/scipy/static/scipy.css
index 377c45955..f818c6f14 100644
--- a/doc/numpy.scipy.org/_theme/scipy/static/scipy.css
+++ b/doc/numpy.scipy.org/_theme/scipy/static/scipy.css
@@ -13,6 +13,12 @@ div.bodywrapper {
width: 100%;
}
+div.documentwrapper {
+ border-left: 1px solid #ccc;
+ border-right: 1px solid #ccc;
+ border-bottom: 1px solid #ccc;
+}
+
div.body p, div.body dd, div.body li {
line-height: 125%;
}
@@ -181,9 +187,10 @@ table.footnote td, table.footnote th {
*/
body div.top-logo-header {
text-align: left;
- background-color: #8CAAE6;
+ background-color: #a2bae8;
border-bottom: 8px solid #003399;
- border-top: 10px solid #6487dc;
+ margin-top: 10px;
+ border-top: 1px solid #bbb;
}
/**
diff --git a/doc/numpy.scipy.org/content.rst b/doc/numpy.scipy.org/content.rst
index 1f9c95a0e..5c1ed49d4 100644
--- a/doc/numpy.scipy.org/content.rst
+++ b/doc/numpy.scipy.org/content.rst
@@ -5,3 +5,5 @@ Numerical Python
:maxdepth: 2
old_array_packages.rst
+ license.rst
+
diff --git a/doc/numpy.scipy.org/license.rst b/doc/numpy.scipy.org/license.rst
new file mode 100644
index 000000000..862859658
--- /dev/null
+++ b/doc/numpy.scipy.org/license.rst
@@ -0,0 +1,33 @@
+Numpy license
+=============
+
+| Copyright © 2005-2010, NumPy Developers.
+| 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 the NumPy Developers nor the names of any
+ 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.