[Python-checkins] cpython (3.4): Closes #12148: clarify "or's together option flags" in doctest docs.

[georg.brandl]

https://hg.python.org/cpython/rev/1439619daf42
changeset:   92854:1439619daf42
branch:      3.4
parent:      92852:bfaf434a6f10
user:        Georg Brandl <georg at python.org>
date:        Mon Oct 06 16:56:43 2014 +0200
summary:
  Closes #12148: clarify "or's together option flags" in doctest docs.

files:
  Doc/library/doctest.rst |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst
--- a/Doc/library/doctest.rst
+++ b/Doc/library/doctest.rst
@@ -865,8 +865,8 @@
    nothing at the end.  In verbose mode, the summary is detailed, else the summary
    is very brief (in fact, empty if all tests passed).
 
-   Optional argument *optionflags* or's together option flags.  See section
-   :ref:`doctest-options`.
+   Optional argument *optionflags* (default value 0) takes the bitwise-or of
+   option flags.  See section :ref:`doctest-options`.
 
    Optional argument *raise_on_error* defaults to false.  If true, an exception is
    raised upon the first failure or unexpected exception in an example.  This
@@ -1097,7 +1097,7 @@
 
    Set the :mod:`doctest` reporting flags to use.
 
-   Argument *flags* or's together option flags.  See section
+   Argument *flags* takes the bitwise-or of option flags.  See section
    :ref:`doctest-options`.  Only "reporting flags" can be used.
 
    This is a module-global setting, and affects all future doctests run by module

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