summaryrefslogtreecommitdiffstats
path: root/Doc/tutorial
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2015-11-02 04:27:17 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2015-11-02 04:27:17 (GMT)
commite56a9191000d2ff15d7550b9c852fa6dee9b8f50 (patch)
tree20b3d1d4f881f7c9e9b3549f79719497070b530a /Doc/tutorial
parent9785261d68f62ce33968d15c7a0f10f1f8209807 (diff)
parentd2ad5718ad955a13cf570bacad1d7800d995da33 (diff)
downloadcpython-e56a9191000d2ff15d7550b9c852fa6dee9b8f50.zip
cpython-e56a9191000d2ff15d7550b9c852fa6dee9b8f50.tar.gz
cpython-e56a9191000d2ff15d7550b9c852fa6dee9b8f50.tar.bz2
Issue #25523: Merge a-to-an corrections from 3.5
Diffstat (limited to 'Doc/tutorial')
-rw-r--r--Doc/tutorial/errors.rst2
-rw-r--r--Doc/tutorial/introduction.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/tutorial/errors.rst b/Doc/tutorial/errors.rst
index d048ae9..351ee52 100644
--- a/Doc/tutorial/errors.rst
+++ b/Doc/tutorial/errors.rst
@@ -336,7 +336,7 @@ example::
A *finally clause* is always executed before leaving the :keyword:`try`
statement, whether an exception has occurred or not. When an exception has
occurred in the :keyword:`try` clause and has not been handled by an
-:keyword:`except` clause (or it has occurred in a :keyword:`except` or
+:keyword:`except` clause (or it has occurred in an :keyword:`except` or
:keyword:`else` clause), it is re-raised after the :keyword:`finally` clause has
been executed. The :keyword:`finally` clause is also executed "on the way out"
when any other clause of the :keyword:`try` statement is left via a
diff --git a/Doc/tutorial/introduction.rst b/Doc/tutorial/introduction.rst
index 531d06b..c5c1343 100644
--- a/Doc/tutorial/introduction.rst
+++ b/Doc/tutorial/introduction.rst
@@ -303,7 +303,7 @@ For non-negative indices, the length of a slice is the difference of the
indices, if both are within bounds. For example, the length of ``word[1:3]`` is
2.
-Attempting to use a index that is too large will result in an error::
+Attempting to use an index that is too large will result in an error::
>>> word[42] # the word only has 6 characters
Traceback (most recent call last):