summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2016-02-02 23:04:56 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2016-02-02 23:04:56 (GMT)
commit71e8134f20adbd2f89ac21738390fb7668073548 (patch)
tree2f366866ff3e5c752f617caff8baefac9272cfbc
parent65aaef423bb826dd4b4628b1df748bc286ad9888 (diff)
parent3df11b2bd6df1940636683ea67ce5721974bb4ed (diff)
downloadcpython-71e8134f20adbd2f89ac21738390fb7668073548.zip
cpython-71e8134f20adbd2f89ac21738390fb7668073548.tar.gz
cpython-71e8134f20adbd2f89ac21738390fb7668073548.tar.bz2
Merge with 3.5
-rw-r--r--Doc/library/typing.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst
index 0fe1167..41f594e 100644
--- a/Doc/library/typing.rst
+++ b/Doc/library/typing.rst
@@ -20,7 +20,7 @@ The function below takes and returns a string and is annotated as follows::
def greeting(name: str) -> str:
return 'Hello ' + name
-In the function ``greeting``, the argument ``name`` is expected to by of type
+In the function ``greeting``, the argument ``name`` is expected to be of type
:class:`str` and the return type :class:`str`. Subtypes are accepted as
arguments.