[Python-checkins] cpython (merge 3.4 -> default): merge from 3.4

[senthil.kumaran]

http://hg.python.org/cpython/rev/a6892bd4f752
changeset:   91131:a6892bd4f752
parent:      91128:8b4b8f5d7321
parent:      91130:08fa17130fb3
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Wed Jun 11 06:19:47 2014 -0700
summary:
  merge from 3.4

files:
  Doc/howto/webservers.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/howto/webservers.rst b/Doc/howto/webservers.rst
--- a/Doc/howto/webservers.rst
+++ b/Doc/howto/webservers.rst
@@ -687,7 +687,7 @@
 The newest version of TurboGears, version 2.0, moves even further in direction
 of WSGI support and a component-based architecture.  TurboGears 2 is based on
 the WSGI stack of another popular component-based web framework, `Pylons
-<http://pylonshq.com/>`_.
+<http://www.pylonsproject.org/>`_.
 
 
 Zope

-- 
Repository URL: http://hg.python.org/cpython