summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2016-08-30 17:47:49 (GMT)
committerRaymond Hettinger <python@rcn.com>2016-08-30 17:47:49 (GMT)
commit15f44ab043b37c064d6891c7864205fed9fb0dd1 (patch)
tree726736587da36fbfebc1dfb12c4d9c14e6bf9a61 /Doc
parent613debcf0a0409b49ad4e1ee63dfc73119029755 (diff)
downloadcpython-15f44ab043b37c064d6891c7864205fed9fb0dd1.zip
cpython-15f44ab043b37c064d6891c7864205fed9fb0dd1.tar.gz
cpython-15f44ab043b37c064d6891c7864205fed9fb0dd1.tar.bz2
Issue #27895: Spelling fixes (Contributed by Ville Skyttä).
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/datetime.rst2
-rw-r--r--Doc/library/email.contentmanager.rst2
-rw-r--r--Doc/library/idle.rst2
-rw-r--r--Doc/library/smtpd.rst4
-rw-r--r--Doc/whatsnew/3.3.rst2
5 files changed, 6 insertions, 6 deletions
diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
index 272abee..ecaad06 100644
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
@@ -1842,7 +1842,7 @@ Note that the :class:`datetime` instances that differ only by the value of the
:attr:`~datetime.fold` attribute are considered equal in comparisons.
Applications that can't bear wall-time ambiguities should explicitly check the
-value of the :attr:`~datetime.fold` atribute or avoid using hybrid
+value of the :attr:`~datetime.fold` attribute or avoid using hybrid
:class:`tzinfo` subclasses; there are no ambiguities when using :class:`timezone`,
or any other fixed-offset :class:`tzinfo` subclass (such as a class representing
only EST (fixed offset -5 hours), or only EDT (fixed offset -4 hours)).
diff --git a/Doc/library/email.contentmanager.rst b/Doc/library/email.contentmanager.rst
index c25d073..a9c078b 100644
--- a/Doc/library/email.contentmanager.rst
+++ b/Doc/library/email.contentmanager.rst
@@ -433,5 +433,5 @@ Currently the email package provides only one concrete content manager,
If *headers* is specified and is a list of strings of the form
``headername: headervalue`` or a list of ``header`` objects
- (distinguised from strings by having a ``name`` attribute), add the
+ (distinguished from strings by having a ``name`` attribute), add the
headers to *msg*.
diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst
index 0b8171d..ffe8426 100644
--- a/Doc/library/idle.rst
+++ b/Doc/library/idle.rst
@@ -531,7 +531,7 @@ Command line usage
-c command run command in the shell window
-d enable debugger and open shell window
-e open editor window
- -h print help message with legal combinatios and exit
+ -h print help message with legal combinations and exit
-i open shell window
-r file run file in shell window
-s run $IDLESTARTUP or $PYTHONSTARTUP first, in shell window
diff --git a/Doc/library/smtpd.rst b/Doc/library/smtpd.rst
index ad6bd3c..1c255dd 100644
--- a/Doc/library/smtpd.rst
+++ b/Doc/library/smtpd.rst
@@ -44,7 +44,7 @@ SMTPServer Objects
dictionary is a suitable value). If not specified the :mod:`asyncore`
global socket map is used.
- *enable_SMTPUTF8* determins whether the ``SMTPUTF8`` extension (as defined
+ *enable_SMTPUTF8* determines whether the ``SMTPUTF8`` extension (as defined
in :RFC:`6531`) should be enabled. The default is ``False``.
When ``True``, ``SMTPUTF8`` is accepted as a parameter to the ``MAIL``
command and when present is passed to :meth:`process_message` in the
@@ -162,7 +162,7 @@ SMTPChannel Objects
accepted in a ``DATA`` command. A value of ``None`` or ``0`` means no
limit.
- *enable_SMTPUTF8* determins whether the ``SMTPUTF8`` extension (as defined
+ *enable_SMTPUTF8* determines whether the ``SMTPUTF8`` extension (as defined
in :RFC:`6531`) should be enabled. The default is ``False``.
*decode_data* and *enable_SMTPUTF8* cannot be set to ``True`` at the same
time.
diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
index 44c71e0..48b8a3b 100644
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1954,7 +1954,7 @@ ssl
:attr:`~ssl.OP_NO_COMPRESSION` can be used to disable compression.
(Contributed by Antoine Pitrou in :issue:`13634`.)
-* Support has been added for the Next Procotol Negotiation extension using
+* Support has been added for the Next Protocol Negotiation extension using
the :meth:`ssl.SSLContext.set_npn_protocols` method.
(Contributed by Colin Marc in :issue:`14204`.)