Merge branch '1.11' into 1.12

bitprophet · bitprophet · commit 247ef7f6f7d1 · 2014-03-04T15:56:46.000-08:00
diff --git a/sites/docs/index.rst b/sites/docs/index.rst
@@ -4,7 +4,7 @@ Welcome to Paramiko's documentation!
 
 This site covers Paramiko's usage & API documentation. For basic info on what
 Paramiko is, including its public changelog & how the project is maintained,
-please see `the main website <http://paramiko.org>`_.
+please see `the main project website <http://paramiko.org>`_.
 
 
 API documentation
