diff options
| -rw-r--r-- | Doc/library/dis.rst | 2 | ||||
| -rw-r--r-- | Doc/library/ssl.rst | 2 | ||||
| -rw-r--r-- | Doc/library/zipapp.rst | 2 | ||||
| -rw-r--r-- | Doc/whatsnew/3.6.rst | 2 | ||||
| -rw-r--r-- | Lib/bdb.py | 2 | ||||
| -rw-r--r-- | Modules/_ssl.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst index fe9979db0e..060d4bb699 100644 --- a/Doc/library/dis.rst +++ b/Doc/library/dis.rst @@ -149,7 +149,7 @@ operation is being performed, so the intermediate analysis object isn't useful: .. function:: dis(x=None, *, file=None, depth=None) Disassemble the *x* object. *x* can denote either a module, a class, a - method, a function, a generator, an asynchronous generator, a couroutine, + method, a function, a generator, an asynchronous generator, a coroutine, a code object, a string of source code or a byte sequence of raw bytecode. For a module, it disassembles all functions. For a class, it disassembles all methods (including class and static methods). For a code object or diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index a8cbe236d8..9dadc58b65 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -2658,7 +2658,7 @@ of TLS/SSL. Some new TLS 1.3 features are not yet available. - TLS 1.3 uses a disjunct set of cipher suites. All AES-GCM and ChaCha20 cipher suites are enabled by default. The method :meth:`SSLContext.set_ciphers` cannot enable or disable any TLS 1.3 - ciphers yet, but :meth:`SSLContext.get_cipers` returns them. + ciphers yet, but :meth:`SSLContext.get_ciphers` returns them. - Session tickets are no longer sent as part of the initial handshake and are handled differently. :attr:`SSLSocket.session` and :class:`SSLSession` are not compatible with TLS 1.3. diff --git a/Doc/library/zipapp.rst b/Doc/library/zipapp.rst index 1c45b75955..728315251e 100644 --- a/Doc/library/zipapp.rst +++ b/Doc/library/zipapp.rst @@ -195,7 +195,7 @@ Pack up a directory into an archive, and run it. $ python myapp.pyz <output from myapp> -The same can be done using the :func:`create_archive` functon:: +The same can be done using the :func:`create_archive` function:: >>> import zipapp >>> zipapp.create_archive('myapp.pyz', 'myapp') diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst index d5358b3efe..fec7c620d3 100644 --- a/Doc/whatsnew/3.6.rst +++ b/Doc/whatsnew/3.6.rst @@ -1623,7 +1623,7 @@ a class variable and should not be set on instances of that class. <https://github.com/python/typing/pull/280>`_.) A new :const:`~typing.TYPE_CHECKING` constant that is assumed to be -``True`` by the static type chekers, but is ``False`` at runtime. +``True`` by the static type checkers, but is ``False`` at runtime. (Contributed by Guido van Rossum in `Github #230 <https://github.com/python/typing/issues/230>`_.) diff --git a/Lib/bdb.py b/Lib/bdb.py index 880ff5daf9..25c6260c47 100644 --- a/Lib/bdb.py +++ b/Lib/bdb.py @@ -74,7 +74,7 @@ class Bdb: return: A function or other code block is about to return. exception: An exception has occurred. c_call: A C function is about to be called. - c_return: A C functon has returned. + c_return: A C function has returned. c_exception: A C function has raised an exception. For the Python events, specialized functions (see the dispatch_*() diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 99d4ecceaf..96bdac4491 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -273,7 +273,7 @@ SSL_SESSION_get_ticket_lifetime_hint(const SSL_SESSION *s) #error "Py_SSL_DEFAULT_CIPHERS 0 needs Py_SSL_DEFAULT_CIPHER_STRING" #endif #elif PY_SSL_DEFAULT_CIPHERS == 1 -/* Python custom selection of sensible ciper suites +/* Python custom selection of sensible cipher suites * DEFAULT: OpenSSL's default cipher list. Since 1.0.2 the list is in sensible order. * !aNULL:!eNULL: really no NULL ciphers * !MD5:!3DES:!DES:!RC4:!IDEA:!SEED: no weak or broken algorithms on old OpenSSL versions. |