Skip to content

Commit

Permalink
bpo-34906: Doc: Fix typos (pythonGH-9712)
Browse files Browse the repository at this point in the history
(cherry picked from commit 07fbbfd)

Co-authored-by: Stéphane Wirtel <stephane@wirtel.be>
  • Loading branch information
matrixise authored and miss-islington committed Oct 5, 2018
1 parent 23fd846 commit ba9f9f4
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Doc/library/dis.rst
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Doc/library/ssl.rst
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion Doc/library/zipapp.rst
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion Doc/whatsnew/3.6.rst
Expand Up @@ -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>`_.)

Expand Down
2 changes: 1 addition & 1 deletion Lib/bdb.py
Expand Up @@ -74,7 +74,7 @@ def trace_dispatch(self, frame, event, arg):
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_*()
Expand Down
2 changes: 1 addition & 1 deletion Modules/_ssl.c
Expand Up @@ -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.
Expand Down

0 comments on commit ba9f9f4

Please sign in to comment.