summaryrefslogtreecommitdiffstats
path: root/Doc/tutorial/inputoutput.rst
diff options
context:
space:
mode:
Diffstat (limited to 'Doc/tutorial/inputoutput.rst')
-rw-r--r--Doc/tutorial/inputoutput.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/tutorial/inputoutput.rst b/Doc/tutorial/inputoutput.rst
index 9b90323..eabf662 100644
--- a/Doc/tutorial/inputoutput.rst
+++ b/Doc/tutorial/inputoutput.rst
@@ -190,7 +190,7 @@ notation.::
This is particularly useful in combination with the new built-in :func:`vars`
function, which returns a dictionary containing all local variables.
-For a complete overview of string formating with :meth:`str.format`, see
+For a complete overview of string formatting with :meth:`str.format`, see
:ref:`formatstrings`.
1-16/+8 * Address a minor Coverity warning re: unchecked PyArg_ParseTuple callsGregory P. Smith2017-01-181-5/+7 * Add TCP_CONGESTION and TCP_USER_TIMEOUTVictor Stinner2016-11-291-0/+6 * Added the const qualifier to char* variables that refer to readonly internalSerhiy Storchaka2016-11-201-1/+1 * Replaced outdated macros _PyUnicode_AsString and _PyUnicode_AsStringAndSizeSerhiy Storchaka2016-11-201-1/+1 |\ | * Replaced outdated macros _PyUnicode_AsString and _PyUnicode_AsStringAndSizeSerhiy Storchaka2016-11-201-1/+1 * | Merge AIX fixes from 3.6Martin Panter2016-11-141-1/+3 |\ \ | |/ | * Merge AIX fixes from 3.5 into 3.6Martin Panter2016-11-141-1/+3 | |\ | | * Issue #28000: Fix gethostbyname_r() usage on AIX with _LINUX_SOURCE_COMPATMartin Panter2016-11-141-1/+3 * | | Issue #28480: Merge multithreading fixes from 3.6Martin Panter2016-10-201-0/+1 |\ \ \ | |/ / | * | Issue #28480: Avoid label at end of compound statement --without-threadsMartin Panter2016-10-201-0/+1 * | | Merge 3.6 (issue #28471)Yury Selivanov2016-10-181-9/+15 |\ \ \ | |/ / | * | Issue #28471: Fix crash (GIL state related) in socket.setblockingYury Selivanov2016-10-181-9/+15 * | | Issue #28332: Deprecated silent truncations in socket.htons and socket.ntohs.Serhiy Storchaka2016-10-021-14/+42 |/ / * | Issue #28139: Merge indentation fixes from 3.5 into 3.6Martin Panter2016-09-171-5/+6 |\ \ | |/ | * Issue #28139: Fix messed up indentationMartin Panter2016-09-171-5/+6 | * Issue #27895: Spelling fixes (Contributed by Ville Skyttä).Martin Panter2016-09-071-1/+1 * | Fix NULL check in sock_sendmsg_iovec. CID 1372885Christian Heimes2016-09-13