Issue #17532: Always include Options menu for IDLE on OS X.
Patch by Guilherme Sim?es.
Issue #17532: merge
Issue #18031:  %-formatting isn't dead yet and might pull through.
merge
Issue 17844: Clarify meaning of different codec tables
Merge issue 17844 from 3.3
Fix #18007 : Document CookieJar.add_cookie_header request parameter changes in 3.3
merge from 3.3

Fix #18007 : Document CookieJar.add_cookie_header request parameter changes in 3.3 and 3.4.