summaryrefslogtreecommitdiffstats
path: root/Doc/includes
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-10-29 07:37:29 (GMT)
committerGeorg Brandl <georg@python.org>2014-10-29 07:37:29 (GMT)
commitcadc3fdcb5ee891b2325f7fa5c98b789ea512aa3 (patch)
tree7cf9c5f4bd20f8074adbf7ffd5eafc79685de9b3 /Doc/includes
parent347c3f6e346bf861b881d96f35feb5434ab8de92 (diff)
parente73778c1ac0e58d3520b37308b970073e818fa00 (diff)
downloadcpython-cadc3fdcb5ee891b2325f7fa5c98b789ea512aa3.zip
cpython-cadc3fdcb5ee891b2325f7fa5c98b789ea512aa3.tar.gz
cpython-cadc3fdcb5ee891b2325f7fa5c98b789ea512aa3.tar.bz2
Merge with 3.4
Diffstat (limited to 'Doc/includes')
-rwxr-xr-x[-rw-r--r--]Doc/includes/email-alternative.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/includes/email-alternative.py b/Doc/includes/email-alternative.py
index 33c430a..85070f3 100644..100755
--- a/Doc/includes/email-alternative.py
+++ b/Doc/includes/email-alternative.py
@@ -17,14 +17,14 @@ msg['From'] = me
msg['To'] = you
# Create the body of the message (a plain-text and an HTML version).
-text = "Hi!\nHow are you?\nHere is the link you wanted:\nhttp://www.python.org"
+text = "Hi!\nHow are you?\nHere is the link you wanted:\nhttps://www.python.org"
html = """\
<html>
<head></head>
<body>
<p>Hi!<br>
How are you?<br>
- Here is the <a href="http://www.python.org">link</a> you wanted.
+ Here is the <a href="https://www.python.org">link</a> you wanted.
</p>
</body>
</html>