]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
Move website/sphinx/ to docs/, remove rest of appengine website dir.
authorBen Darnell <ben@bendarnell.com>
Sun, 10 Mar 2013 20:05:20 +0000 (16:05 -0400)
committerBen Darnell <ben@bendarnell.com>
Sun, 10 Mar 2013 20:05:20 +0000 (16:05 -0400)
62 files changed:
docs/auth.rst [moved from website/sphinx/auth.rst with 100% similarity]
docs/autoreload.rst [moved from website/sphinx/autoreload.rst with 100% similarity]
docs/conf.py [moved from website/sphinx/conf.py with 100% similarity]
docs/documentation.rst [moved from website/sphinx/documentation.rst with 100% similarity]
docs/escape.rst [moved from website/sphinx/escape.rst with 100% similarity]
docs/favicon.ico [moved from website/sphinx/favicon.ico with 100% similarity]
docs/gen.rst [moved from website/sphinx/gen.rst with 100% similarity]
docs/httpclient.rst [moved from website/sphinx/httpclient.rst with 100% similarity]
docs/httpserver.rst [moved from website/sphinx/httpserver.rst with 100% similarity]
docs/httputil.rst [moved from website/sphinx/httputil.rst with 100% similarity]
docs/index.rst [moved from website/sphinx/index.rst with 100% similarity]
docs/integration.rst [moved from website/sphinx/integration.rst with 100% similarity]
docs/ioloop.rst [moved from website/sphinx/ioloop.rst with 100% similarity]
docs/iostream.rst [moved from website/sphinx/iostream.rst with 100% similarity]
docs/locale.rst [moved from website/sphinx/locale.rst with 100% similarity]
docs/log.rst [moved from website/sphinx/log.rst with 100% similarity]
docs/netutil.rst [moved from website/sphinx/netutil.rst with 100% similarity]
docs/networking.rst [moved from website/sphinx/networking.rst with 100% similarity]
docs/options.rst [moved from website/sphinx/options.rst with 100% similarity]
docs/overview.rst [moved from website/sphinx/overview.rst with 100% similarity]
docs/process.rst [moved from website/sphinx/process.rst with 100% similarity]
docs/releases.rst [moved from website/sphinx/releases.rst with 100% similarity]
docs/releases/next.rst [moved from website/sphinx/releases/next.rst with 100% similarity]
docs/releases/v1.0.0.rst [moved from website/sphinx/releases/v1.0.0.rst with 100% similarity]
docs/releases/v1.0.1.rst [moved from website/sphinx/releases/v1.0.1.rst with 100% similarity]
docs/releases/v1.1.0.rst [moved from website/sphinx/releases/v1.1.0.rst with 100% similarity]
docs/releases/v1.1.1.rst [moved from website/sphinx/releases/v1.1.1.rst with 100% similarity]
docs/releases/v1.2.0.rst [moved from website/sphinx/releases/v1.2.0.rst with 100% similarity]
docs/releases/v1.2.1.rst [moved from website/sphinx/releases/v1.2.1.rst with 100% similarity]
docs/releases/v2.0.0.rst [moved from website/sphinx/releases/v2.0.0.rst with 100% similarity]
docs/releases/v2.1.0.rst [moved from website/sphinx/releases/v2.1.0.rst with 100% similarity]
docs/releases/v2.1.1.rst [moved from website/sphinx/releases/v2.1.1.rst with 100% similarity]
docs/releases/v2.2.0.rst [moved from website/sphinx/releases/v2.2.0.rst with 100% similarity]
docs/releases/v2.2.1.rst [moved from website/sphinx/releases/v2.2.1.rst with 100% similarity]
docs/releases/v2.3.0.rst [moved from website/sphinx/releases/v2.3.0.rst with 100% similarity]
docs/releases/v2.4.0.rst [moved from website/sphinx/releases/v2.4.0.rst with 100% similarity]
docs/releases/v2.4.1.rst [moved from website/sphinx/releases/v2.4.1.rst with 100% similarity]
docs/stack_context.rst [moved from website/sphinx/stack_context.rst with 100% similarity]
docs/template.rst [moved from website/sphinx/template.rst with 100% similarity]
docs/testing.rst [moved from website/sphinx/testing.rst with 100% similarity]
docs/tornado.png [moved from website/sphinx/tornado.png with 100% similarity]
docs/twisted.rst [moved from website/sphinx/twisted.rst with 100% similarity]
docs/utilities.rst [moved from website/sphinx/utilities.rst with 100% similarity]
docs/web.rst [moved from website/sphinx/web.rst with 100% similarity]
docs/webframework.rst [moved from website/sphinx/webframework.rst with 100% similarity]
docs/websocket.rst [moved from website/sphinx/websocket.rst with 100% similarity]
docs/wsgi.rst [moved from website/sphinx/wsgi.rst with 100% similarity]
website/Makefile [deleted file]
website/app.yaml [deleted file]
website/index.yaml [deleted file]
website/static/base.css [deleted file]
website/static/facebook.png [deleted file]
website/static/favicon.ico [deleted file]
website/static/friendfeed.png [deleted file]
website/static/robots.txt [deleted file]
website/static/sphinx.css [deleted file]
website/static/tornado.png [deleted file]
website/static/twitter.png [deleted file]
website/templates/base.html [deleted file]
website/templates/index.html [deleted file]
website/tornado [deleted symlink]
website/website.py [deleted file]

similarity index 100%
rename from website/sphinx/auth.rst
rename to docs/auth.rst
similarity index 100%
rename from website/sphinx/conf.py
rename to docs/conf.py
similarity index 100%
rename from website/sphinx/escape.rst
rename to docs/escape.rst
similarity index 100%
rename from website/sphinx/favicon.ico
rename to docs/favicon.ico
similarity index 100%
rename from website/sphinx/gen.rst
rename to docs/gen.rst
similarity index 100%
rename from website/sphinx/index.rst
rename to docs/index.rst
similarity index 100%
rename from website/sphinx/ioloop.rst
rename to docs/ioloop.rst
similarity index 100%
rename from website/sphinx/locale.rst
rename to docs/locale.rst
similarity index 100%
rename from website/sphinx/log.rst
rename to docs/log.rst
similarity index 100%
rename from website/sphinx/netutil.rst
rename to docs/netutil.rst
similarity index 100%
rename from website/sphinx/options.rst
rename to docs/options.rst
similarity index 100%
rename from website/sphinx/process.rst
rename to docs/process.rst
similarity index 100%
rename from website/sphinx/testing.rst
rename to docs/testing.rst
similarity index 100%
rename from website/sphinx/tornado.png
rename to docs/tornado.png
similarity index 100%
rename from website/sphinx/twisted.rst
rename to docs/twisted.rst
similarity index 100%
rename from website/sphinx/web.rst
rename to docs/web.rst
similarity index 100%
rename from website/sphinx/wsgi.rst
rename to docs/wsgi.rst
diff --git a/website/Makefile b/website/Makefile
deleted file mode 100644 (file)
index 202e2d1..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-SPHINXOPTS=-W -d sphinx/build/doctrees sphinx
-
-.PHONY: sphinx
-sphinx:
-       sphinx-build -b html $(SPHINXOPTS) sphinx/build/html
-
-.PHONY: coverage
-coverage:
-       sphinx-build -b coverage ${SPHINXOPTS} sphinx/build/coverage
-       cat sphinx/build/coverage/python.txt
-
-.PHONY: latex
-latex:
-       sphinx-build -b latex $(SPHINXOPTS) sphinx/build/latex
-
-# Building a pdf requires a latex installation.  For macports, the needed
-# packages are texlive-latex-extra and texlive-fonts-recommended.
-# The output is in sphinx/build/latex/tornado.pdf
-.PHONY: pdf
-pdf: latex
-       cd sphinx/build/latex && pdflatex -interaction=nonstopmode tornado.tex
-
-clean:
-       rm -rf sphinx/build
diff --git a/website/app.yaml b/website/app.yaml
deleted file mode 100644 (file)
index f1fcfdf..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-application: python-tornado-hrd
-version: 3
-runtime: python27
-api_version: 1
-threadsafe: yes
-
-handlers:
-- url: /static/tornado-0.1.tar.gz
-  script: website.application
-
-- url: /static/tornado-0.2.tar.gz
-  script: website.application
-
-- url: /static/
-  static_dir: static
-
-- url: /robots\.txt
-  static_files: static/robots.txt
-  upload: static/robots.txt
-
-- url: /favicon\.ico
-  static_files: static/favicon.ico
-  upload: static/favicon.ico
-
-- url: /documentation/?
-  script: website.application
-
-- url: /documentation
-  static_dir: sphinx/build/html
-
-- url: /.*
-  script: website.application
diff --git a/website/index.yaml b/website/index.yaml
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/website/static/base.css b/website/static/base.css
deleted file mode 100644 (file)
index 543d6f2..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-body {
-  background: white;
-  color: black;
-  font-family: Georgia, serif;
-  font-size: 11pt;
-  margin: 10px;
-  margin-top: 15px;
-  margin-bottom: 15px;
-}
-
-h1,
-h2,
-h3,
-h4 {
-  font-family: Calibri, sans-serif;
-  margin: 0;
-}
-
-img {
-  border: 0;
-}
-
-pre,
-code {
-  color: #060;
-}
-
-a,
-a code {
-  color: #216093;
-}
-
-table {
-  border-collapse: collapse;
-  border: 0;
-}
-
-td {
-  border: 0;
-  padding: 0;
-}
-
-#body {
-  margin: auto;
-  max-width: 850px;
-}
-
-#header {
-  margin-bottom: 15px;
-  margin-right: 30px;
-}
-
-#content,
-#footer {
-  margin-left: 31px;
-  margin-right: 31px;
-}
-
-#content p,
-#content li,
-#footer {
-  line-height: 16pt;
-}
-
-#content pre {
-  line-height: 14pt;
-  margin: 17pt;
-  padding-left: 1em;
-  border-left: 1px solid #ccc;
-}
-
-#footer {
-  margin-top: 5em;
-}
-
-#header .logo {
-  line-height: 0;
-  padding-bottom: 5px;
-  padding-right: 15px;
-}
-
-#header .logo img {
-  width: 286px;
-  height: 72px;
-}
-
-#header .title {
-  vertical-align: bottom;
-}
-
-#header .title h1 {
-  font-size: 35px;
-  font-weight: normal;
-}
-
-#header .title h1,
-#header .title h1 a {
-  color: #666;
-}
-
-#content h1,
-#content h2,
-#content h3 {
-  color: #4d8cbf;
-  margin-bottom: 2pt;
-  margin-top: 17pt;
-}
-
-#content h2 {
-  font-size: 19pt;
-}
-
-#content h3 {
-  font-size: 15pt;
-}
-
-#content p {
-  margin: 0;
-  margin-bottom: 1em;
-}
diff --git a/website/static/facebook.png b/website/static/facebook.png
deleted file mode 100644 (file)
index 4773832..0000000
Binary files a/website/static/facebook.png and /dev/null differ
diff --git a/website/static/favicon.ico b/website/static/favicon.ico
deleted file mode 100644 (file)
index c9cc4d6..0000000
Binary files a/website/static/favicon.ico and /dev/null differ
diff --git a/website/static/friendfeed.png b/website/static/friendfeed.png
deleted file mode 100644 (file)
index ac09f4e..0000000
Binary files a/website/static/friendfeed.png and /dev/null differ
diff --git a/website/static/robots.txt b/website/static/robots.txt
deleted file mode 100644 (file)
index 0ad279c..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-User-Agent: *
-Disallow:
diff --git a/website/static/sphinx.css b/website/static/sphinx.css
deleted file mode 100644 (file)
index de4d690..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-@import url("default.css");
-
-/* These style tweaks are probably going to turn out to be a little fragile.
-   They're currently based on the default theme from sphinx 1.0.7.
-*/
-
-div.body h1,
-div.body h2,
-div.body h3,
-div.body h4,
-div.body h5,
-div.body h6,
-div.sphinxsidebar h3,
-div.sphinxsidebar h4 {
-    font-weight: bold;
-    border-bottom: none;
-}
-
-pre {
-    line-height: 14pt;
-    margin: 17pt;
-    padding-left: 1em;
-    border: none;
-    border-left: 1px solid #ccc;
-}
-
-div.body p, div.body dd, div.body li {
-    text-align: left;
-}
-
-.highlight {
-    background: #fff !important;
-}
-
-th.field-name {
-    background: #fff;
-}
-
-tt {
-    background: #fff;
-}
-
-/* "related" = top header */
-div.related {
-    position: fixed;
-}
-
-/* body settings copied from div.sphinxsidebar so following a link to a
-   specific object positions that object below the fixed header */
-div.body {
-    top: 30px;
-    bottom: 0;
-    right: 0;
-    left: 230px;
-    margin: 0;
-    position: fixed;
-    overflow: auto;
-    height: auto;
-}
-
-div.related, div.sphinxsidebar {
-    font-family: Calibri, sans-serif;
-}
-
-div.section {
-    max-width: 850px;
-}
\ No newline at end of file
diff --git a/website/static/tornado.png b/website/static/tornado.png
deleted file mode 100644 (file)
index a920aa5..0000000
Binary files a/website/static/tornado.png and /dev/null differ
diff --git a/website/static/twitter.png b/website/static/twitter.png
deleted file mode 100644 (file)
index 5099c62..0000000
Binary files a/website/static/twitter.png and /dev/null differ
diff --git a/website/templates/base.html b/website/templates/base.html
deleted file mode 100644 (file)
index 88529a1..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> 
-    <title>{% block title %}Tornado Web Server{% end %}</title>
-    <link rel="shortcut icon" href="/static/favicon.ico" type="image/x-icon" />
-    <link rel="stylesheet" href="/static/base.css" type="text/css"/>
-    {% block head %}{% end %}
-  </head>
-  <body>
-    <div id="body">
-      <div id="header">
-        <table>
-          <tr>
-            <td class="logo"><a href="/"><img src="/static/tornado.png" alt="Tornado"/></a></td>
-            <td class="title">{% block headertitle %}{% end %}</td>
-          </tr>
-        </table>
-      </div>
-      <div id="content">{% block body %}{% end %}</div>
-      <div id="footer">
-        <div>Tornado is one of <a href="http://developers.facebook.com/opensource/">Facebook's open source technologies</a>. It is available under the <a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache Licence, Version 2.0</a>.</div>
-        <div>This web site and all documentation is licensed under <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons 3.0</a>.</div>
-      </div>
-    </div>
-    {% block bottom %}{% end %}
-  </body>
-</html>
diff --git a/website/templates/index.html b/website/templates/index.html
deleted file mode 100644 (file)
index bd61129..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-{% extends "base.html" %}
-
-{% block body %}
-  <p><a href="http://www.tornadoweb.org/">Tornado</a> is an open source version of the scalable, non-blocking web server and tools that power <a href="http://friendfeed.com/">FriendFeed</a>. The FriendFeed application is written using a web framework that looks a bit like <a href="http://webpy.org/">web.py</a> or <a href="http://code.google.com/appengine/docs/python/tools/webapp/">Google's webapp</a>, but with additional tools and optimizations to take advantage of the underlying non-blocking infrastructure.</p>
-  <p>The framework is distinct from most mainstream web server frameworks (and certainly most Python frameworks) because it is non-blocking and reasonably fast. Because it is non-blocking and uses <a href="http://www.kernel.org/doc/man-pages/online/pages/man4/epoll.4.html"><code>epoll</code></a> or <code>kqueue</code>, it can handle thousands of simultaneous standing connections, which means it is ideal for real-time web services. We built the web server specifically to handle FriendFeed's real-time features &mdash; every active user of FriendFeed maintains an open connection to the FriendFeed servers. (For more information on scaling servers to support thousands of clients, see The <a href="http://www.kegel.com/c10k.html">C10K problem</a>.)</p>
-
-  <h2>Upgrading from Tornado 1.x</h2>
-
-  <p>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
-    <a href="/documentation/releases/v2.0.0.html">release notes</a> for
-    information about backwards compatibility.</p>
-
-  <h2>Quick links</h2>
-
-  <ul>
-    <li><a href="/documentation/index.html">Documentation</a></li>
-    <li><a href="https://github.com/downloads/facebook/tornado/tornado-{{version}}.tar.gz">Download version {{version}}</a> (<a href="/documentation/releases.html">release notes</a>)</li>
-    <li><a href="https://github.com/facebook/tornado">Source (github)</a></li>
-    <li><a href="http://groups.google.com/group/python-tornado">Mailing list</a></li>
-    <li><a href="https://github.com/facebook/tornado/wiki/Links">Wiki</a></li>
-  </ul>
-
-  <h2>Hello, world</h2>
-  <p>Here is the canonical &quot;Hello, world&quot; example app for Tornado:</p>
-  <pre><code>import tornado.ioloop
-import tornado.web
-
-class MainHandler(tornado.web.RequestHandler):
-    def get(self):
-        self.write("Hello, world")
-
-application = tornado.web.Application([
-    (r"/", MainHandler),
-])
-
-if __name__ == "__main__":
-    application.listen(8888)
-    tornado.ioloop.IOLoop.instance().start()</code></pre>
-  <p>See the <a href="/documentation/index.html">Tornado documentation</a> for a detailed walkthrough of the framework.</p>
-
-  <h2>Installation</h2>
-
-  <p><b>Automatic installation:</b> Tornado is listed in <a href="http://pypi.python.org/pypi/tornado">PyPI</a> and can be installed with <code>pip</code> or <code>easy_install</code>.  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.</p>
-
-  <p><b>Manual installation:</b> Download <a href="https://github.com/downloads/facebook/tornado/tornado-{{version}}.tar.gz">tornado-{{version}}.tar.gz</a></p>
-  <pre><code>tar xvzf tornado-{{version}}.tar.gz
-cd tornado-{{version}}
-python setup.py build
-sudo python setup.py install</code></pre>
-  <p>The Tornado source code is <a href="https://github.com/facebook/tornado">hosted on GitHub</a>.  It is also possible to simply add the tornado directory to your <code>PYTHONPATH</code> instead of building with <code>setup.py</code>.
-
-  <p><b>Prerequisites:</b> Tornado runs on Python 2.6+ and 3.2+.  Both CPython and PyPy are supported.  There are no required dependencies outside the Python standard library, although unittest2 is required to run Tornado's unittest suite on Python 2.6.  Certain optional features require additional third-party modules:
-  <ul>
-    <li>tornado.curl_httpclient needs <a href="http://pycurl.sourceforge.net/">PycURL</a> (version 7.18.2 or higher required; version 7.21.1 or higher recommended)</li>
-    <li>Multithreading support requires the concurrent.futures module, which is in the standard library for Python 3.2+ and available <a href="http://pypi.python.org/pypi/futures">on pypi</a> for older versions.</li>
-  </ul></p>
-
-  <p><b>Platforms:</b> Tornado should run on any Unix-like platform, although
-    for the best performance and scalability only Linux and BSD (including
-    BSD derivatives like Mac OS X) are recommended.</p>
-
-  <h2>Discussion and support</h2>
-  <p>You can discuss Tornado and report bugs on <a href="http://groups.google.com/group/python-tornado">the Tornado developer mailing list</a>.  Links to additional resources can be found on the <a href="https://github.com/facebook/tornado/wiki/Links">Tornado wiki</a>.
-
-{% end %}
diff --git a/website/tornado b/website/tornado
deleted file mode 120000 (symlink)
index 18db1e4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../tornado
\ No newline at end of file
diff --git a/website/website.py b/website/website.py
deleted file mode 100644 (file)
index 2d1d837..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2009 Bret Taylor
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-import os
-import os.path
-import tornado.web
-import tornado.wsgi
-
-
-class ContentHandler(tornado.web.RequestHandler):
-    def get(self, path="index"):
-        paths = ("index",)
-        if path not in paths:
-            raise tornado.web.HTTPError(404)
-        self.render(path + ".html", version=tornado.version)
-
-
-settings = {
-    "template_path": os.path.join(os.path.dirname(__file__), "templates"),
-    "xsrf_cookies": True,
-    "debug": os.environ.get("SERVER_SOFTWARE", "").startswith("Development/"),
-}
-application = tornado.wsgi.WSGIApplication([
-    (r"/", ContentHandler),
-    (r"/(index)", ContentHandler),
-    (r"/static/tornado-0.1.tar.gz", tornado.web.RedirectHandler,
-     dict(url="https://github.com/downloads/facebook/tornado/tornado-0.1.tar.gz")),
-    (r"/static/tornado-0.2.tar.gz", tornado.web.RedirectHandler,
-     dict(url="https://github.com/downloads/facebook/tornado/tornado-0.2.tar.gz")),
-
-    (r"/documentation/?", tornado.web.RedirectHandler,
-     dict(url="/documentation/index.html")),
-
-], **settings)