From 5a8bc6f7f9bd58a08032e3712dd321f254c864d8 Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Thu, 17 Nov 2011 02:20:48 +0100
Subject: [PATCH] Add a couple other whatsnew items

---
 Doc/whatsnew/3.3.rst | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
index ebebb16003f..a0ce3e46f18 100644
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -307,6 +307,15 @@ handle NAT with non-secure FTP without opening fixed ports.
 (Contributed by Giampaolo Rodolà in :issue:`12139`)
 
 
+imaplib
+-------
+
+The :class:`~imaplib.IMAP4_SSL` constructor now accepts an SSLContext
+parameter to control parameters of the secure channel.
+
+(Contributed by Sijin Joseph in :issue:`8808`)
+
+
 math
 ----
 
@@ -534,8 +543,6 @@ ssl
 
   (Contributed by Jacek Konieczny in :issue:`12551`)
 
-
-
 shutil
 ------
 
@@ -547,6 +554,15 @@ shutil
     path also specifying the user/group names and not only their numeric
     ids. (Contributed by Sandro Tosi in :issue:`12191`)
 
+smtplib
+-------
+
+The :class:`~smtplib.SMTP_SSL` constructor and the :meth:`~smtplib.SMTP.starttls`
+method now accept an SSLContext parameter to control parameters of the secure
+channel.
+
+(Contributed by Kasun Herath in :issue:`8809`)
+
 urllib
 ------