docs: licence -> license and 2009/2010 -> 2011

(cherry picked from commit 6c151597e22b763af2174c257e6e4af47a0839f8)

6 files changed, 11 insertions, 110 deletions

diff --git a/LICENSE.txt b/LICENSE.txt
index 2d76589..fb43a45 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2009, Marcel Hellkamp.
+Copyright (c) 2011, Marcel Hellkamp.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README b/README
deleted file mode 100644
index 3574b41..0000000
--- a/README
+++ /dev/null
@@ -1,58 +0,0 @@
-Bottle Web Framework
-====================
-
-.. image:: http://bottle.paws.de/bottle-logo.png
-  :alt: Bottle Logo
-  :align: right
-
-Bottle is a fast and simple micro-framework for small web applications. It
-offers request dispatching (URL routing) with URL parameter support, templates,
-a built-in HTTP Server and adapters for many third party WSGI/HTTP-server and
-template engines - all in a single file and with no dependencies other than the
-Python Standard Library.
-
-Homepage and documentation: http://bottle.paws.de/
-
-
-Installation and Dependencies
------------------------------
-
-Install bottle with ``pip install bottle`` or just `download bottle.py <http://pypi.python.org/pypi/bottle>`_ and place it in your project directory. There are no (hard) dependencies other than the Python Standard Library.
-
-
-Example
--------
-
-::
-
-    from bottle import route, run
-
-    @route('/hello/:name')
-    def hello(name):
-        return '<h1>Hello %s!</h1>' % name.title()
-
-    run(host='localhost', port=8080)
-
-
-Licence (MIT)
--------------
-
-    Copyright (c) 2010, Marcel Hellkamp.
-
-    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.
diff --git a/README.rst b/README.rst
index 016a108..a9d30da 100644
--- a/README.rst
+++ b/README.rst
@@ -1,7 +1,7 @@
 Bottle Web Framework
 ====================
 
-.. image:: http://bottle.paws.de/bottle-logo.png
+.. image:: http://bottlepy.org/bottle-logo.png
   :alt: Bottle Logo
   :align: right
 
@@ -11,8 +11,8 @@ a built-in HTTP Server and adapters for many third party WSGI/HTTP-server and
 template engines - all in a single file and with no dependencies other than the
 Python Standard Library.
 
-Homepage and documentation: http://bottlepy.org/
-
+Homepage and documentation: http://bottle.paws.de/
+License: MIT (see LICENSE.txt)
 
 Installation and Dependencies
 -----------------------------
@@ -32,27 +32,3 @@ Example
         return '<h1>Hello %s!</h1>' % name.title()
 
     run(host='localhost', port=8080)
-
-
-Licence (MIT)
--------------
-
-    Copyright (c) 2011, Marcel Hellkamp.
-
-    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.
diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
index 32b46cb..4f88cb4 100755
--- a/docs/_templates/layout.html
+++ b/docs/_templates/layout.html
@@ -31,7 +31,7 @@
       })();
     </script>
     <div class="footer">
-    &copy; <a href="{{ pathto('index') }}#licence">Copyright</a> {{ copyright|e }} - <a href="{{ pathto('contact') }}">Contact</a><br />
+    &copy; <a href="{{ pathto('index') }}#license">Copyright</a> {{ copyright|e }} - <a href="{{ pathto('contact') }}">Contact</a><br />
     Last updated on {{ last_updated|e }}. Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> {{ sphinx_version|e }}.<br />
     Powered by Bottle {{version|e}}
     </div>
diff --git a/docs/index.rst b/docs/index.rst
index a04b58f..93881b5 100755
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -90,32 +90,15 @@ These chapters are intended for developers interested in the bottle development
 
    plugins/index
    
-Licence
+License
 ==================
 
-Code and documentation are available according to the MIT Licence::
+Code and documentation are available according to the MIT License:
 
-  Copyright (c) 2010, Marcel Hellkamp.
+.. include:: ../LICENSE.txt
+  :literal:
 
-  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.
-
-The Bottle logo however is *NOT* covered by that licence. It is allowed to
+The Bottle logo however is *NOT* covered by that license. It is allowed to
 use the logo as a link to the bottle homepage or in direct context with
 the unmodified library. In all other cases please ask first.
 
diff --git a/plugins/werkzeug/bottle_werkzeug.py b/plugins/werkzeug/bottle_werkzeug.py
index 844bbfa..61fbfe8 100644
--- a/plugins/werkzeug/bottle_werkzeug.py
+++ b/plugins/werkzeug/bottle_werkzeug.py
@@ -32,7 +32,7 @@ Example::
 
 __autor__ = "Marcel Hellkamp"
 __version__ = '0.1'
-__licence__ = 'MIT'
+__license__ = 'MIT'
 
 import werkzeug
 from werkzeug import *