Revision: 6222
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6222&view=rev
Author: jdh2358
Date: 2008-10-16 17:23:18 +0000 (Thu, 16 Oct 2008)
Log Message:
-----------
updated licensing template
Modified Paths:
--------------
trunk/matplotlib/doc/_templates/indexsidebar.html
trunk/matplotlib/doc/users/license.rst
Modified: trunk/matplotlib/doc/_templates/indexsidebar.html
===================================================================
--- trunk/matplotlib/doc/_templates/indexsidebar.html 2008-10-16 17:08:13 UTC
(rev 6221)
+++ trunk/matplotlib/doc/_templates/indexsidebar.html 2008-10-16 17:23:18 UTC
(rev 6222)
@@ -6,11 +6,13 @@
href="{{ pathto('users/installing') }}">installing</a> page).
<p>
-There are also optional <a href="{{ pathto('users/toolkits') }}">toolkits</a>
for matplotlib.
+There are several matplotlib addon <a href="{{
+pathto('users/toolkits') }}">toolkits</a>, including the
+projection and mapping toolkit <a
href=http://matplotlib.sf.net/basemap/doc/html>basemap</a>.
</p>
<h3>Need help?</h3>
-<p>Check the <a href="{{ pathto('users/index') }}"}>user</a> guide, the <a
+<p>Check the <a href="{{ pathto('users/index') }}">user</a> guide, the <a
href="{{ pathto('faq/index') }}">faq</a>, the <a href="{{
pathto('api/index') }}"}>api</a> docs, <a
href=http://www.nabble.com/matplotlib---users-f2906.html>archives</a>, and join
the matplotlib mailing <a
href="http://sourceforge.net/mail/?group_id=80706";>lists</a>
Modified: trunk/matplotlib/doc/users/license.rst
===================================================================
--- trunk/matplotlib/doc/users/license.rst 2008-10-16 17:08:13 UTC (rev
6221)
+++ trunk/matplotlib/doc/users/license.rst 2008-10-16 17:23:18 UTC (rev
6222)
@@ -14,8 +14,8 @@
behind the licencing choice, see :ref:`license-discussion`.
-License agreement for matplotlib 0.98
-=====================================
+License agreement for matplotlib |version|
+==============================================
1. This LICENSE AGREEMENT is between John D. Hunter ("JDH"), and the
Individual or Organization ("Licensee") accessing and otherwise using
@@ -25,30 +25,30 @@
2. Subject to the terms and conditions of this License Agreement, JDH
hereby grants Licensee a nonexclusive, royalty-free, world-wide license
to reproduce, analyze, test, perform and/or display publicly, prepare
-derivative works, distribute, and otherwise use matplotlib 0.98
+derivative works, distribute, and otherwise use matplotlib |version|
alone or in any derivative version, provided, however, that JDH's
License Agreement and JDH's notice of copyright, i.e., "Copyright (c)
2002-2008 John D. Hunter; All Rights Reserved" are retained in
-matplotlib 0.98 alone or in any derivative version prepared by
+matplotlib |version| alone or in any derivative version prepared by
Licensee.
3. In the event Licensee prepares a derivative work that is based on or
-incorporates matplotlib 0.98 or any part thereof, and wants to
+incorporates matplotlib |version| or any part thereof, and wants to
make the derivative work available to others as provided herein, then
Licensee hereby agrees to include in any such work a brief summary of
-the changes made to matplotlib 0.98.
+the changes made to matplotlib |version|.
-4. JDH is making matplotlib 0.98 available to Licensee on an "AS
+4. JDH is making matplotlib |version| available to Licensee on an "AS
IS" basis. JDH MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, JDH MAKES NO AND
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.98
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB |version|
WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF MATPLOTLIB
-0.98 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
+|version| FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
-MATPLOTLIB 0.98, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
+MATPLOTLIB |version|, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
THE POSSIBILITY THEREOF.
6. This License Agreement will automatically terminate upon a material
@@ -60,7 +60,7 @@
trademarks or trade name in a trademark sense to endorse or promote
products or services of Licensee, or any third party.
-8. By copying, installing or otherwise using matplotlib 0.98,
+8. By copying, installing or otherwise using matplotlib |version|,
Licensee agrees to be bound by the terms and conditions of this License
Agreement.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
