From fb08c11bc0011db1120a4f312f83e3ac71c1a202 Mon Sep 17 00:00:00 2001
From: Ben Darnell <ben@bendarnell.com>
Date: Tue, 14 Sep 2010 10:42:56 -0700
Subject: [PATCH] Update docs to mention requirement of pycurl 7.18.2.

---
 website/templates/documentation.txt | 6 +-----
 website/templates/index.html        | 5 +----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/website/templates/documentation.txt b/website/templates/documentation.txt
index 2023ae77..d313b90d 100644
--- a/website/templates/documentation.txt
+++ b/website/templates/documentation.txt
@@ -68,16 +68,12 @@ directory included with the Tornado package.
 
 ### Prerequisites
 
-Tornado has been tested on Python 2.5 and 2.6. To use all of the features of Tornado, you need to have [PycURL](http://pycurl.sourceforge.net/) and a JSON library like [simplejson](http://pypi.python.org/pypi/simplejson/) installed. Complete installation instructions for Mac OS X and Ubuntu are included below for convenience.
+Tornado has been tested on Python 2.5 and 2.6. To use all of the features of Tornado, you need to have [PycURL](http://pycurl.sourceforge.net/) (version 7.18.2 or higher) and (for Python 2.5 only) [simplejson](http://pypi.python.org/pypi/simplejson/) installed (Python 2.6 includes JSON support in the standard library so simplejson is not needed). Complete installation instructions for Mac OS X and Ubuntu are included below for convenience.
 
 **Mac OS X 10.6 (Python 2.6)**
 
     sudo easy_install pycurl
 
-**Mac OS X 10.5 (Python 2.5)**
-
-    sudo easy_install setuptools pycurl==7.16.2.1 simplejson
-
 **Ubuntu Linux (Python 2.6)**
 
     sudo apt-get install python-pycurl
diff --git a/website/templates/index.html b/website/templates/index.html
index 7d45cb12..0ec87e37 100644
--- a/website/templates/index.html
+++ b/website/templates/index.html
@@ -14,13 +14,10 @@ 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>
 
   <h3>Prerequisites</h3>
-  <p>Tornado has been tested on Python 2.5 and 2.6. To use all of the features of Tornado, you need to have <a href="http://pycurl.sourceforge.net/">PycURL</a> and a JSON library like <a href="http://pypi.python.org/pypi/simplejson/">simplejson</a> installed. Complete installation instructions for Mac OS X and Ubuntu are included below for convenience.</p>
+  <p>Tornado has been tested on Python 2.5 and 2.6. To use all of the features of Tornado, you need to have <a href="http://pycurl.sourceforge.net/">PycURL</a> (version 7.18.2 or higher) and (for Python 2.5 only) <a href="http://pypi.python.org/pypi/simplejson/">simplejson</a> installed (Python 2.6 includes JSON support in the standard library so simplejson is not needed). Complete installation instructions for Mac OS X and Ubuntu are included below for convenience.</p>
   <p style="font-weight:bold">Mac OS X 10.6 (Python 2.6)</p>
   <pre><code>sudo easy_install setuptools pycurl</code></pre>
 
-  <p style="font-weight:bold">Mac OS X 10.5 (Python 2.5)</p>
-  <pre><code>sudo easy_install setuptools pycurl==7.16.2.1 simplejson</code></pre>
-
   <p style="font-weight:bold">Ubuntu Linux (Python 2.6)</p>
   <pre><code>sudo apt-get install python-pycurl</code></pre>