diff options
| author | Marcel Hellkamp <marc@gsites.de> | 2011-04-29 18:18:35 +0200 |
|---|---|---|
| committer | Marcel Hellkamp <marc@gsites.de> | 2011-05-02 20:12:17 +0200 |
| commit | fc8dfa294d83a92f8251280291c130b56f10fbfb (patch) | |
| tree | 3eed926adc78f21796acda1c4634388002532964 /README.rst | |
| parent | c116e5631b47eea66883de1632d69e80edf607c8 (diff) | |
| download | bottle-fc8dfa294d83a92f8251280291c130b56f10fbfb.tar.gz | |
docs: licence -> license and 2009/2010 -> 2011
(cherry picked from commit 6c151597e22b763af2174c257e6e4af47a0839f8)
Diffstat (limited to 'README.rst')
| -rw-r--r-- | README.rst | 30 |
1 files changed, 3 insertions, 27 deletions
@@ -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. |