Update installation instructions.

diff --git a/website/templates/documentation.txt b/website/templates/documentation.txt
index 5c55999fb05d224d0a679eb29ed8badc09ae9dac..67bdf895b1ca89e725d672aaed6f73d10a4972f5 100644 (file)
--- a/website/templates/documentation.txt
+++ b/website/templates/documentation.txt
@@ -70,11 +70,19 @@ directory included with the Tornado package.
 
 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.
 
-**Mac OS X 10.5/10.6**
+**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**
+**Ubuntu Linux (Python 2.6)**
+
+    sudo apt-get install python-pycurl
+
+**Ubuntu Linux (Python 2.5)**
 
     sudo apt-get install python-dev python-pycurl python-simplejson
 
@@ -688,7 +696,7 @@ the Google credentials in a cookie for later access:
                 self.get_authenticated_user(self.async_callback(self._on_auth))
                 return
             self.authenticate_redirect()
-    
+
         def _on_auth(self, user):
             if not user:
                 self.authenticate_redirect()
@@ -704,7 +712,7 @@ Web application performance is generally bound by architecture, not frontend
 performance. That said, Tornado is pretty fast relative to most popular
 Python web frameworks.
 
-We ran a few remedial load tests on a simple "Hello, world" application 
+We ran a few remedial load tests on a simple "Hello, world" application
 in each of the most popular Python web frameworks
 ([Django](http://www.djangoproject.com/), [web.py](http://webpy.org/), and
 [CherryPy](http://www.cherrypy.org/)) to get the baseline performance of
@@ -779,7 +787,7 @@ are running on ports 8000 - 8003:
         tcp_nodelay on;
         gzip on;
         gzip_min_length 1000;
-        gzip_proxied any;              
+        gzip_proxied any;
         gzip_types text/plain text/html text/css text/xml
                    application/x-javascript application/xml
                    application/atom+xml text/javascript;

diff --git a/website/templates/index.html b/website/templates/index.html
index 4aa716598bedfb9551438f795dacf46c3f7f1efe..13e9427e6078acc594c978e73fd0bb090b594c16 100644 (file)
--- a/website/templates/index.html
+++ b/website/templates/index.html
@@ -11,14 +11,20 @@
 cd tornado-0.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>.</p>
+  <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 style="font-weight:bold">Mac OS X 10.5/10.6</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</p>
+  <p style="font-weight:bold">Ubuntu Linux (Python 2.6)</p>
+  <pre><code>sudo apt-get install python-pycurl</code></pre>
+
+  <p style="font-weight:bold">Ubuntu Linux (Python 2.5)</p>
   <pre><code>sudo apt-get install python-dev python-pycurl python-simplejson</code></pre>
 
   <h2>Hello, world</h2>
@@ -43,7 +49,7 @@ if __name__ == "__main__":
 
   <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>.
-        
+
   <h2>Updates</h2>
   <p>Follow us on <a href="http://www.facebook.com/pages/Tornado-Web-Server/144144048921">Facebook</a>, <a href="http://twitter.com/tornadoweb">Twitter</a>, or <a href="http://friendfeed.com/tornado-web">FriendFeed</a> to get updates and announcements:</p>
   <div style="margin-top:1em"><a href="http://www.facebook.com/pages/Tornado-Web-Server/144144048921" style="margin-right:10px"><img src="/static/facebook.png" style="width:64px;height:64px" alt="Facebook"/></a><a href="http://twitter.com/tornadoweb" style="margin-right:10px"><img src="/static/twitter.png" style="width:64px;height:64px" alt="Twitter"/></a><a href="http://friendfeed.com/tornado-web" style="margin-right:10px"><img src="/static/friendfeed.png" style="width:64px;height:64px" alt="Facebook"/></a></div>