merge with 3.5

This commit is contained in:
Georg Brandl 2016-02-28 21:09:45 +01:00
commit a7f7232838

View file

@ -511,7 +511,7 @@ to count the number of occurrences of a specific optional arguments:
* Sadly, our help output isn't very informative on the new ability our script * 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 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. * That last output exposes a bug in our program.