doc: -bottle.paws.de +bottlepy.org

README.rst

@@ -11,7 +11,7 @@ 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/
+Homepage and documentation: http://bottlepy.org/
 
 
 Installation and Dependencies
@@ -37,7 +37,7 @@ Example
 Licence (MIT)
 -------------
 
-    Copyright (c) 2010, 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

apidoc/api.rst

@@ -5,7 +5,7 @@ API Reference
 .. module:: bottle
    :platform: Unix, Windows
    :synopsis: WSGI micro framework
-.. moduleauthor:: Marcel Hellkamp <marc@paws.de>
+.. moduleauthor:: Marcel Hellkamp <marc@gsites.de>
 
 This is a mostly auto-generated API. If you are new to bottle, you might find the
 narrative :doc:`tutorial` more helpful. 

apidoc/sphinx/conf.py

@@ -24,7 +24,7 @@
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx']
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', 'sphinx.ext.viewcode']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['templates']

apidoc/sphinx/templates/layout.html

@@ -4,6 +4,9 @@
     <link rel="shortcut icon" type="image/x-icon" href="{{ pathto('_static/favicon.ico', 1) }}" />
     <link rel="image_src" type="image/png" href="{{ pathto('_static/logo_reddit.png', 1) }}" />
     <script type="application/javascript" src="{{ pathto('_static/default.js', 1) }}"></script>
+    {% if pagename == 'index' -%}
+    <meta name="description" content="Bottle is a fast, simple and lightweight WSGI micro web-framework for Python." /> 
+    {% endif %}
     {{ super() }}
 {% endblock %}
 

apidoc/sphinx/templates/sidebar-intro.html

@@ -3,26 +3,24 @@
 </p>
 <h3>Some Links</h3>
 <ul>
-  <li><a href="http://bottle.paws.de/">The Bottle Website</a></li>
-  <li><a target="_blank" href="https://github.com/defnull/bottle/issues">Bottle Issue Tracker</a></li>
+  <li><a target="_blank" href="https://github.com/defnull/bottle/issues">Issue Tracker</a></li>
   <li><a target="_blank" href="http://pypi.python.org/pypi/bottle">Bottle @ PyPI</a></li>
   <li><a target="_blank" href="https://github.com/defnull/bottle">Bottle @ GitHub</a></li>
   <li><a target="_blank" href="http://groups.google.de/group/bottlepy">Bottle @ Google Groups</a></li>
   <li><a target="_blank" href="http://twitter.com/bottlepy">Bottle @ Twitter</a></li>
-  <li><a target="_blank" href="http://flattr.com/thing/21888/Bottle-A-Python-Web-Framework">Bottle @ Flattr</a></li>
 </ul>
 <h3>Installation</h3>
 <p>Install Bottle with <code>pip&nbsp;install&nbsp;bottle</code> or download the source package at <a href="http://pypi.python.org/pypi/bottle">PyPI</a>.</p>
 <h3>Documentation</h3>
 <p>
-  You can download this documentation as <a href="http://bottle.paws.de/docs/bottle-docs.pdf">PDF</a> or <a href="http://bottle.paws.de/docs/bottle-docs.zip">HTML (zip)</a> for offline use. 
+  Download this documentation as <a href="http://bottlepy.org/docs/bottle-docs.pdf">PDF</a> or <a href="http://bottlepy.org/docs/bottle-docs.zip">HTML (zip)</a> for offline use. 
 </p>
 <h3>Sources</h3>
-<p>You can browse the sources at <a href="https://github.com/defnull/bottle">GitHub</a>.</p>
+<p>Browse the sources at <a href="https://github.com/defnull/bottle">GitHub</a>.</p>
 <h3>Other Releases</h3>
 <ul>
-  <li><a href="http://bottle.paws.de/docs/dev/">Bottle dev (in development)</a></li>
-  <li><a href="http://bottle.paws.de/docs/0.8/">Bottle 0.8 (stable)</a></li>
+  <li><a href="http://bottlepy.org/docs/dev/">Bottle dev (in development)</a></li>
+  <li><a href="http://bottlepy.org/docs/0.8/">Bottle 0.8 (stable)</a></li>
 </ul>
 
 

apidoc/tutorial.rst

@@ -34,7 +34,7 @@ This tutorial introduces you to the concepts and features of the Bottle web fram
 * :ref:`tutorial-routing`: Web development starts with binding URLs to code. This section tells you how to do it.
 * :ref:`tutorial-output`: You have to return something to the Browser. Bottle makes it easy for you, supporting more than just plain strings.
 * :ref:`tutorial-request`: Each client request carries a lot of information. HTTP-headers, form data and cookies to name just three. Here is how to use them.
-* :ref:`tutorial-templates`: You don't want to write HTML within your python code, do you? Templates separate code from presentation.
+* :ref:`tutorial-templates`: You don't want to clutter your Python code with HTML fragments, do you? Templates separate code from presentation.
 * :ref:`tutorial-debugging`: These tools and features will help you during development.
 * :ref:`tutorial-deployment`: Get it up and running.
 

bottle.py

@@ -6,7 +6,7 @@
 template engines - all in a single file and with no dependencies other than the
 Python Standard Library.
 
-Homepage and documentation: http://bottle.paws.de/
+Homepage and documentation: http://bottlepy.org/
 
 Copyright (c) 2011, Marcel Hellkamp.
 License: MIT (see LICENSE.txt for details)

setup.py

@@ -23,7 +23,7 @@
       long_description='Bottle is a fast and simple micro-framework for small web-applications. It offers request dispatching (Routes) 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.',
       author='Marcel Hellkamp',
       author_email='[email protected]',
-      url='http://bottle.paws.de/',
+      url='http://bottlepy.org/',
       py_modules=['bottle'],
       license='MIT',
       platforms = 'any',