From f5436204e62b1f7b2716a21e024ae2c572739cf2 Mon Sep 17 00:00:00 2001
From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 20 Feb 2011 12:56:18 -0800
Subject: [PATCH] Update version number to 1.2

---
 setup.py                            | 2 +-
 tornado/__init__.py                 | 4 ++--
 website/templates/documentation.txt | 6 +++---
 website/templates/index.html        | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/setup.py b/setup.py
index 38011a05..8e1550e8 100644
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@ if "linux" in sys.platform.lower() and not python_26:
     extensions.append(distutils.core.Extension(
         "tornado.epoll", ["tornado/epoll.c"]))
 
-version = "1.1.1"
+version = "1.2"
 
 distutils.core.setup(
     name="tornado",
diff --git a/tornado/__init__.py b/tornado/__init__.py
index b5992116..bfb96b08 100644
--- a/tornado/__init__.py
+++ b/tornado/__init__.py
@@ -16,5 +16,5 @@
 
 """The Tornado web server and tools."""
 
-version = "1.1.1"
-version_info = (1, 1, 1)
+version = "1.2"
+version_info = (1, 2, 0)
diff --git a/website/templates/documentation.txt b/website/templates/documentation.txt
index 129ce348..ffea8e71 100644
--- a/website/templates/documentation.txt
+++ b/website/templates/documentation.txt
@@ -50,9 +50,9 @@ Download and install
 --------------------
   <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>.  If you do not already have libcurl installed you may need to install it separately; see the prerequisites section below.  Note that the source distribution includes demo applications that are not present when Tornado is installed using <code>pip</code> or <code>easy_install</code></p>
 
-  <p><b>Manual installation:</b> Download <a href="http://github.com/downloads/facebook/tornado/tornado-1.1.1.tar.gz">tornado-1.1.1.tar.gz</a></p>
-  <pre><code>tar xvzf tornado-1.1.1.tar.gz
-cd tornado-1.1.1
+  <p><b>Manual installation:</b> Download <a href="http://github.com/downloads/facebook/tornado/tornado-1.2.tar.gz">tornado-1.2.tar.gz</a></p>
+  <pre><code>tar xvzf tornado-1.2.tar.gz
+cd tornado-1.2
 python setup.py build
 sudo python setup.py install</code></pre>
   <p>The Tornado source code is <a href="http://github.com/facebook/tornado">hosted on GitHub</a>.  On Python 2.6+, it is also possible to simply add the tornado directory to your <code>PYTHONPATH</code> instead of building with <code>setup.py</code>, since the standard library includes <code>epoll</code> support.</p>
diff --git a/website/templates/index.html b/website/templates/index.html
index ff003a48..a34a7e48 100644
--- a/website/templates/index.html
+++ b/website/templates/index.html
@@ -8,9 +8,9 @@
   <h2>Download and install</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>.  If you do not already have libcurl installed you may need to install it separately; see the prerequisites section below.  Note that the source distribution includes demo applications that are not present when Tornado is installed using <code>pip</code> or <code>easy_install</code></p>
 
-  <p><b>Manual installation:</b> Download <a href="http://github.com/downloads/facebook/tornado/tornado-1.1.1.tar.gz">tornado-1.1.1.tar.gz</a></p>
-  <pre><code>tar xvzf tornado-1.1.1.tar.gz
-cd tornado-1.1.1
+  <p><b>Manual installation:</b> Download <a href="http://github.com/downloads/facebook/tornado/tornado-1.2.tar.gz">tornado-1.2.tar.gz</a></p>
+  <pre><code>tar xvzf tornado-1.2.tar.gz
+cd tornado-1.2
 python setup.py build
 sudo python setup.py install</code></pre>
   <p>The Tornado source code is <a href="http://github.com/facebook/tornado">hosted on GitHub</a>.  On Python 2.6+, it is also possible to simply add the tornado directory to your <code>PYTHONPATH</code> instead of building with <code>setup.py</code>, since the standard library includes <code>epoll</code> support.</p>