Permalink
Browse files

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

(cherry picked from commit 6c15159)
  • Loading branch information...
defnull committed Apr 29, 2011
1 parent c116e56 commit fc8dfa294d83a92f8251280291c130b56f10fbfb
Showing with 11 additions and 110 deletions.
  1. +1 −1 LICENSE.txt
  2. +0 −58 README
  3. +3 −27 README.rst
  4. +1 −1 docs/_templates/layout.html
  5. +5 −22 docs/index.rst
  6. +1 −1 plugins/werkzeug/bottle_werkzeug.py
View
@@ -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
View
58 README
@@ -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.
View
@@ -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.
@@ -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>
View
@@ -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.
@@ -32,7 +32,7 @@ def say_hello(name):
__autor__ = "Marcel Hellkamp"
__version__ = '0.1'
-__licence__ = 'MIT'
+__license__ = 'MIT'
import werkzeug
from werkzeug import *

0 comments on commit fc8dfa2

Please sign in to comment.