[mapserver-commits] r8234 - in trunk/docs: . _templates

[svn at osgeo.org]

Author: hobu
Date: 2008-12-10 00:28:59 -0500 (Wed, 10 Dec 2008)
New Revision: 8234

Added:
   trunk/docs/copyright.txt
Modified:
   trunk/docs/_templates/layout.html
   trunk/docs/conf.py
   trunk/docs/index.txt
Log:
add license

Modified: trunk/docs/_templates/layout.html
===================================================================
--- trunk/docs/_templates/layout.html	2008-12-10 03:09:54 UTC (rev 8233)
+++ trunk/docs/_templates/layout.html	2008-12-10 05:28:59 UTC (rev 8234)
@@ -3,7 +3,7 @@
 {% block rootrellink %}
         <li><a href="{{ pathto('index') }}">Home </a> |&nbsp;</li>
         <li><a href="{{ pathto('download') }}">Download </a> |&nbsp;</li>
-        <li><a href="{{ pathto('documentation') }}">Documentation </a> <a href="./MapServer.pdf">(PDF) </a>|&nbsp;</li>
+        <li><a href="{{ pathto('documentation') }}">Documentation </a> <a href="/MapServer.pdf">(PDF) </a>|&nbsp;</li>
         <li><a href="http://mapserver.gis.umn.edu/community">Community</a> |&nbsp;</li>
 {% endblock %}
 

Modified: trunk/docs/conf.py
===================================================================
--- trunk/docs/conf.py	2008-12-10 03:09:54 UTC (rev 8233)
+++ trunk/docs/conf.py	2008-12-10 05:28:59 UTC (rev 8234)
@@ -39,7 +39,7 @@
 
 # General information about the project.
 project = u'MapServer'
-copyright = u'2008, Steve Lime'
+copyright = u'2008, Regents of the University of Minnesota'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -48,7 +48,7 @@
 # The short X.Y version.
 version = '5'
 # The full version, including alpha/beta/rc tags.
-release = '5.4.0'
+release = '5.2.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

Added: trunk/docs/copyright.txt
===================================================================
--- trunk/docs/copyright.txt	                        (rev 0)
+++ trunk/docs/copyright.txt	2008-12-10 05:28:59 UTC (rev 8234)
@@ -0,0 +1,43 @@
+License
+------------------------------------------------------------------------------
+
+
+Copyright (c) 1996-2008 Regents of the University of Minnesota.
+
+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 of this Software or works derived from this 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.
+
+Credits
+------------------------------------------------------------------------------
+
+
+Major funding for development of MapServer has been provided by NASA through
+cooperative agreements with the University of Minnesota, Department of Forest
+Resources. Additional enhancements have been made by the State of Minnesota,
+Department of Natural Resources and the Land Management Information Center.
+
+* MapServer and MapScript have been developed by Stephen Lime.
+
+* Raster access module developed by Pete Olson and Stephen Lime.
+
+* PHP/MapScript module was developed and is maintained by `MapGears`_
+
+* Portions copyright (c) 1998 State of Minnesota, Land Management Information
+  Center.
+
+.. _`MapGears`: http://mapgears.com
\ No newline at end of file


Property changes on: trunk/docs/copyright.txt
___________________________________________________________________
Name: svn:mime-type
   + text/x-rst
Name: svn:keywords
   + Id Author Rev Date

Modified: trunk/docs/index.txt
===================================================================
--- trunk/docs/index.txt	2008-12-10 03:09:54 UTC (rev 8233)
+++ trunk/docs/index.txt	2008-12-10 05:28:59 UTC (rev 8234)
@@ -83,5 +83,4 @@
    cgi/index
    development/index
    download
-   documentation
    glossary