summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-12-12 14:56:54 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-12-12 14:56:54 (GMT)
commit8ac7cbb2530477e709117bac2f1c09a11f1ba540 (patch)
tree65b6f3ab7f5d4434c9a398e1c13f0273c0b5f4bb
parent60b33cc6a5e734cce4650ef9ca8868a1f190a55a (diff)
parentf615d1fe8ecc2afa674d837f1d3c8af87d35aa82 (diff)
downloadcpython-8ac7cbb2530477e709117bac2f1c09a11f1ba540.zip
cpython-8ac7cbb2530477e709117bac2f1c09a11f1ba540.tar.gz
cpython-8ac7cbb2530477e709117bac2f1c09a11f1ba540.tar.bz2
merge 3.4
-rw-r--r--Doc/howto/webservers.rst4
1 files changed, 1 insertions, 3 deletions
diff --git a/Doc/howto/webservers.rst b/Doc/howto/webservers.rst
index 9ce9095..9e9b69d 100644
--- a/Doc/howto/webservers.rst
+++ b/Doc/howto/webservers.rst
@@ -728,6 +728,4 @@ found in the Python wiki.
<https://wiki.python.org/moin/WebFrameworks>`_.
Most frameworks also have their own mailing lists and IRC channels, look out
- for these on the projects' web sites. There is also a general "Python in the
- Web" IRC channel on freenode called `#python.web
- <https://wiki.python.org/moin/PoundPythonWeb>`_.
+ for these on the projects' web sites.