From: Chris Snow <chsnow123@gmail.com>
Date: Tue, 27 Jun 2017 20:31:24 +0000 (+0100)
Subject: FriendFeed website seems to have gone
X-Git-Tag: v5.0.0~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2677780aa74fabc76126c35ec6aa5e3585b3657;p=thirdparty%2Ftornado.git

FriendFeed website seems to have gone
---

diff --git a/docs/guide/intro.rst b/docs/guide/intro.rst
index d5b975d55..d17e74420 100644
--- a/docs/guide/intro.rst
+++ b/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