From: Martin Panter <vadmium+py@gmail.com>
Date: Sat, 14 Nov 2015 00:58:32 +0000 (+0000)
Subject: Correct Content-Type syntax in documentation
X-Git-Tag: v3.5.1rc1~45^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ac34e09bbfe59e0d2075be7db317b91da6ca2c69;p=thirdparty%2FPython%2Fcpython.git

Correct Content-Type syntax in documentation
---

diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
index 74f3c1f1428e..4df0f568c85d 100644
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -1107,7 +1107,7 @@ The code for the sample CGI used in the above example is::
    #!/usr/bin/env python
    import sys
    data = sys.stdin.read()
-   print('Content-type: text-plain\n\nGot Data: "%s"' % data)
+   print('Content-type: text/plain\n\nGot Data: "%s"' % data)
 
 Here is an example of doing a ``PUT`` request using :class:`Request`::
 
diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py
index dbd34d28ffc7..cad6b3ac60bd 100644
--- a/Lib/http/cookiejar.py
+++ b/Lib/http/cookiejar.py
@@ -423,10 +423,10 @@ def join_header_words(lists):
     Takes a list of lists of (key, value) pairs and produces a single header
     value.  Attribute values are quoted if needed.
 
-    >>> join_header_words([[("text/plain", None), ("charset", "iso-8859/1")]])
-    'text/plain; charset="iso-8859/1"'
-    >>> join_header_words([[("text/plain", None)], [("charset", "iso-8859/1")]])
-    'text/plain, charset="iso-8859/1"'
+    >>> join_header_words([[("text/plain", None), ("charset", "iso-8859-1")]])
+    'text/plain; charset="iso-8859-1"'
+    >>> join_header_words([[("text/plain", None)], [("charset", "iso-8859-1")]])
+    'text/plain, charset="iso-8859-1"'
 
     """
     headers = []