Merge pull request #2099 from snowch/patch-1

FriendFeed website seems to have gone

docs/guide/intro.rst

@@ -3,7 +3,7 @@ Introduction
 
 `Tornado <http://www.tornadoweb.org>`_ is a Python web framework and
 asynchronous networking library, originally developed at `FriendFeed
-<http://friendfeed.com>`_.  By using non-blocking network I/O, Tornado
+<https://en.wikipedia.org/wiki/FriendFeed>`_.  By using non-blocking network I/O, Tornado
 can scale to tens of thousands of open connections, making it ideal for
 `long polling <http://en.wikipedia.org/wiki/Push_technology#Long_polling>`_,
 `WebSockets <http://en.wikipedia.org/wiki/WebSocket>`_, and other