[Python-checkins] cpython (merge 3.4 -> default): Issue #13689: Merge from 3.4.

[berker.peksag]

http://hg.python.org/cpython/rev/4617c0e1f6c4
changeset:   91495:4617c0e1f6c4
parent:      91492:b3f4616b9a94
parent:      91494:e0561df131aa
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Tue Jul 01 06:03:24 2014 +0300
summary:
  Issue #13689: Merge from 3.4.

files:
  Doc/howto/urllib2.rst |  4 +---
  1 files changed, 1 insertions(+), 3 deletions(-)


diff --git a/Doc/howto/urllib2.rst b/Doc/howto/urllib2.rst
--- a/Doc/howto/urllib2.rst
+++ b/Doc/howto/urllib2.rst
@@ -97,7 +97,7 @@
 ----
 
 Sometimes you want to send data to a URL (often the URL will refer to a CGI
-(Common Gateway Interface) script [#]_ or other web application). With HTTP,
+(Common Gateway Interface) script or other web application). With HTTP,
 this is often done using what's known as a **POST** request. This is often what
 your browser does when you submit a HTML form that you filled in on the web. Not
 all POSTs have to come from forms: you can use a POST to transmit arbitrary data
@@ -572,8 +572,6 @@
 
 This document was reviewed and revised by John Lee.
 
-.. [#] For an introduction to the CGI protocol see
-       `Writing Web Applications in Python <http://www.pyzine.com/Issue008/Section_Articles/article_CGIOne.html>`_.
 .. [#] Like Google for example. The *proper* way to use google from a program
        is to use `PyGoogle <http://pygoogle.sourceforge.net>`_ of course. See
        `Voidspace Google <http://www.voidspace.org.uk/python/recipebook.shtml#google>`_

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