[Python-checkins] cpython (merge 3.5 -> default): merge with 3.5

[georg.brandl]

https://hg.python.org/cpython/rev/6ee2e1bacf2d
changeset:   100364:6ee2e1bacf2d
parent:      100361:2b597e03f7f4
parent:      100363:ce714476ee21
user:        Georg Brandl <georg at python.org>
date:        Sun Feb 28 21:09:45 2016 +0100
summary:
  merge with 3.5

files:
  Doc/howto/argparse.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/howto/argparse.rst b/Doc/howto/argparse.rst
--- a/Doc/howto/argparse.rst
+++ b/Doc/howto/argparse.rst
@@ -511,7 +511,7 @@
 
 * Sadly, our help output isn't very informative on the new ability our script
   has acquired, but that can always be fixed by improving the documentation for
-  out script (e.g. via the ``help`` keyword argument).
+  our script (e.g. via the ``help`` keyword argument).
 
 * That last output exposes a bug in our program.
 

-- 
Repository URL: https://hg.python.org/cpython