diff --git a/website/sphinx/overview.rst b/website/sphinx/overview.rst index c3ef03cf..7ea7b68d 100644 --- a/website/sphinx/overview.rst +++ b/website/sphinx/overview.rst @@ -11,7 +11,7 @@ application is written using a web framework that looks a bit like but with additional tools and optimizations to take advantage of the non-blocking web server and tools. -`Tornado `_ is an open source +`Tornado `_ is an open source version of this web server and some of the tools we use most often at FriendFeed. The framework is distinct from most mainstream web server frameworks (and certainly most Python frameworks) because it is @@ -192,7 +192,7 @@ There are three ways to return an error from a `RequestHandler`: The default error page includes a stack trace in debug mode and a one-line description of the error (e.g. "500: Internal Server Error") otherwise. To produce a custom error page, override `RequestHandler.write_error`. -This method may produce output normally via methods such as +This method may produce output normally via methods such as `~RequestHandler.write` and `~RequestHandler.render`. If the error was caused by an exception, an ``exc_info`` triple will be passed as a keyword argument (note that this exception is not guaranteed to be the current @@ -203,7 +203,7 @@ In Tornado 2.0 and earlier, custom error pages were implemented by overriding ``RequestHandler.get_error_html``, which returned the error page as a string instead of calling the normal output methods (and had slightly different semantics for exceptions). This method is still supported, but it is -deprecated and applications are encouraged to switch to +deprecated and applications are encouraged to switch to `RequestHandler.write_error`. Redirection @@ -239,7 +239,7 @@ website: application = tornado.wsgi.WSGIApplication([ (r"/([a-z]*)", ContentHandler), (r"/static/tornado-0.2.tar.gz", tornado.web.RedirectHandler, - dict(url="http://github.com/downloads/facebook/tornado/tornado-0.2.tar.gz")), + dict(url="https://github.com/downloads/facebook/tornado/tornado-0.2.tar.gz")), ], **settings) The default ``RedirectHandler`` status code is diff --git a/website/sphinx/releases/v1.0.0.rst b/website/sphinx/releases/v1.0.0.rst index bf9f2b99..0cf04f85 100644 --- a/website/sphinx/releases/v1.0.0.rst +++ b/website/sphinx/releases/v1.0.0.rst @@ -3,15 +3,15 @@ What's new in Tornado 1.0 July 22, 2010 ------------- - + :: We are pleased to announce the release of Tornado 1.0, available from - http://github.com/downloads/facebook/tornado/tornado-1.0.tar.gz. + https://github.com/downloads/facebook/tornado/tornado-1.0.tar.gz. There have been many changes since version 0.2; here are some of the highlights: - + New features: * Improved support for running other WSGI applications in a Tornado server (tested with Django and CherryPy) @@ -41,7 +41,7 @@ July 22, 2010 * Improved logging configuration in tornado.options. * UIModule.html_body() can be used to return html to be inserted at the end of the document body. - + Backwards-incompatible changes: * RequestHandler.get_error_html() now receives the exception object as a keyword argument if the error was caused by an @@ -54,8 +54,8 @@ July 22, 2010 from the path now have %-escapes decoded, for consistency with the processing that was already done with other query parameters. - + Many thanks to everyone who contributed patches, bug reports, and feedback that went into this release! - + -Ben diff --git a/website/sphinx/releases/v1.1.0.rst b/website/sphinx/releases/v1.1.0.rst index 617271c4..68142f48 100644 --- a/website/sphinx/releases/v1.1.0.rst +++ b/website/sphinx/releases/v1.1.0.rst @@ -5,10 +5,10 @@ Sep 7, 2010 ----------- :: - + We are pleased to announce the release of Tornado 1.1, available from - http://github.com/downloads/facebook/tornado/tornado-1.1.tar.gz - + https://github.com/downloads/facebook/tornado/tornado-1.1.tar.gz + Changes in this release: * RequestHandler.async_callback and related functions in other classes are no longer needed in most cases (although it's harmless to continue @@ -35,7 +35,7 @@ Sep 7, 2010 * The httpclient module now supports HTTP proxies. * When HTTPServer is run in SSL mode, the SSL handshake is now non-blocking. * Many smaller bug fixes and documentation updates - + Backwards-compatibility notes: * While most users of Tornado should not have to deal with the stack_context module directly, users of worker thread pools and similar constructs may @@ -46,8 +46,8 @@ Sep 7, 2010 cannot be completed under the new module. This applies only to the initial authorization process; once an authorized token is issued that token works with either version. - + Many thanks to everyone who contributed patches, bug reports, and feedback that went into this release! - + -Ben diff --git a/website/sphinx/releases/v1.1.1.rst b/website/sphinx/releases/v1.1.1.rst index 275a8c10..cf7b593c 100644 --- a/website/sphinx/releases/v1.1.1.rst +++ b/website/sphinx/releases/v1.1.1.rst @@ -5,18 +5,18 @@ Feb 8, 2011 ----------- :: - + Tornado 1.1.1 is a BACKWARDS-INCOMPATIBLE security update that fixes an XSRF vulnerability. It is available at - http://github.com/downloads/facebook/tornado/tornado-1.1.1.tar.gz - + https://github.com/downloads/facebook/tornado/tornado-1.1.1.tar.gz + This is a backwards-incompatible change. Applications that previously relied on a blanket exception for XMLHTTPRequest may need to be modified to explicitly include the XSRF token when making ajax requests. - + The tornado chat demo application demonstrates one way of adding this token (specifically the function postJSON in demos/chat/static/chat.js). - + More information about this change and its justification can be found at http://www.djangoproject.com/weblog/2011/feb/08/security/ http://weblog.rubyonrails.org/2011/2/8/csrf-protection-bypass-in-ruby-on-rails diff --git a/website/sphinx/releases/v1.2.0.rst b/website/sphinx/releases/v1.2.0.rst index 2448924e..4797628f 100644 --- a/website/sphinx/releases/v1.2.0.rst +++ b/website/sphinx/releases/v1.2.0.rst @@ -5,10 +5,10 @@ Feb 20, 2011 ------------ :: - + We are pleased to announce the release of Tornado 1.2, available from - http://github.com/downloads/facebook/tornado/tornado-1.2.tar.gz - + https://github.com/downloads/facebook/tornado/tornado-1.2.tar.gz + Backwards compatibility notes: * This release includes the backwards-incompatible security change from version 1.1.1. Users upgrading from 1.1 or earlier should read the @@ -19,7 +19,7 @@ Feb 20, 2011 https://github.com/facebook/tornado/commit/7a7e24143e77481d140fb5579bc67e4c45cbcfad * When XSRF tokens are used, the token must also be present on PUT and DELETE requests (anything but GET and HEAD) - + New features: * A new HTTP client implementation is available in the module tornado.simple_httpclient. This HTTP client does not depend on pycurl. @@ -61,7 +61,7 @@ Feb 20, 2011 * FacebookGraphMixin.get_authenticated_user now accepts a new parameter 'extra_fields' which may be used to request additional information about the user - + Bug fixes: * auth: Fixed KeyError with Facebook offline_access * auth: Uses request.uri instead of request.path as the default redirect @@ -100,8 +100,8 @@ Feb 20, 2011 root path * websocket: Now works over SSL * websocket: Improved compatibility with proxies - + Many thanks to everyone who contributed patches, bug reports, and feedback that went into this release! - + -Ben diff --git a/website/sphinx/releases/v1.2.1.rst b/website/sphinx/releases/v1.2.1.rst index 7f1dc9a1..78fa4b19 100644 --- a/website/sphinx/releases/v1.2.1.rst +++ b/website/sphinx/releases/v1.2.1.rst @@ -5,16 +5,16 @@ Mar 3, 2011 ----------- :: - + We are pleased to announce the release of Tornado 1.2.1, available from - http://github.com/downloads/facebook/tornado/tornado-1.2.1.tar.gz - + https://github.com/downloads/facebook/tornado/tornado-1.2.1.tar.gz + This release contains only two small changes relative to version 1.2: * FacebookGraphMixin has been updated to work with a recent change to the Facebook API. * Running "setup.py install" will no longer attempt to automatically install pycurl. This wasn't working well on platforms where the best way to install pycurl is via something like apt-get instead of easy_install. - + This is an important upgrade if you are using FacebookGraphMixin, but otherwise it can be safely ignored. diff --git a/website/templates/index.html b/website/templates/index.html index 40fb1661..9414d2f2 100644 --- a/website/templates/index.html +++ b/website/templates/index.html @@ -8,7 +8,7 @@

Tornado 2.0 introduces several potentially backwards-incompatible changes, including in particular automatic escaping of template output. Users - who are upgrading from Tornado 1.x should see the + who are upgrading from Tornado 1.x should see the release notes for information about backwards compatibility.

@@ -19,7 +19,7 @@
  • Download version {{version}} (release notes)
  • Source (github)
  • Mailing list
    • -
  • Wiki
    • +
  • Wiki

    • Hello, world

    @@ -44,12 +44,12 @@ if __name__ == "__main__":

    Automatic installation: Tornado is listed in PyPI and can be installed with pip or easy_install. Note that the source distribution includes demo applications that are not present when Tornado is installed in this way, so you may wish to download a copy of the source tarball as well.

    -

    Manual installation: Download tornado-{{version}}.tar.gz

    +

    Manual installation: Download tornado-{{version}}.tar.gz

    tar xvzf tornado-{{version}}.tar.gz
 cd tornado-{{version}}
 python setup.py build
 sudo python setup.py install
    -

    The Tornado source code is hosted on GitHub. On Python 2.6 and 2.7, it is also possible to simply add the tornado directory to your PYTHONPATH instead of building with setup.py, since the standard library includes epoll support.

    +

    The Tornado source code is hosted on GitHub. On Python 2.6 and 2.7, it is also possible to simply add the tornado directory to your PYTHONPATH instead of building with setup.py, since the standard library includes epoll support.

    Prerequisites: Tornado runs on Python 2.5, 2.6, 2.7 and 3.2.