summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2012-04-12 00:15:10 (GMT)
committerR David Murray <rdmurray@bitdance.com>2012-04-12 00:15:10 (GMT)
commitdf7ac0619563e3e92efadf3e429c58d3fb4b5016 (patch)
tree5dbc1b286b41f06b3e1ae79aaa88302e45c376af /Doc
parentd268109ae32bfadabc0ab75fcb4528f50fde5a87 (diff)
parente7bade568ebb04c607caf0cfce02a36765dad02e (diff)
downloadcpython-df7ac0619563e3e92efadf3e429c58d3fb4b5016.zip
cpython-df7ac0619563e3e92efadf3e429c58d3fb4b5016.tar.gz
cpython-df7ac0619563e3e92efadf3e429c58d3fb4b5016.tar.bz2
Merge doc fixes #14553 and #14552.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/http.server.rst2
-rw-r--r--Doc/library/test.rst6
2 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/http.server.rst b/Doc/library/http.server.rst
index d9aaa72..06670b8 100644
--- a/Doc/library/http.server.rst
+++ b/Doc/library/http.server.rst
@@ -352,7 +352,7 @@ the current directory. ::
httpd.serve_forever()
:mod:`http.server` can also be invoked directly using the :option:`-m`
-switch of the interpreter a with ``port number`` argument. Similar to
+switch of the interpreter with a ``port number`` argument. Similar to
the previous example, this serves files relative to the current directory. ::
python -m http.server 8000
diff --git a/Doc/library/test.rst b/Doc/library/test.rst
index 152b7b1..8b998f6 100644
--- a/Doc/library/test.rst
+++ b/Doc/library/test.rst
@@ -172,9 +172,9 @@ only print whether the test passed or failed.
Running :mod:`test` directly allows what resources are available for
tests to use to be set. You do this by using the ``-u`` command-line
-option. Run :program:`python -m test -uall` to turn on all
-resources; specifying ``all`` as an option for ``-u`` enables all
-possible resources. If all but one resource is desired (a more common case), a
+option. Specifying ``all`` as the value for the ``-u`` option enables all
+possible resources: :program:`python -m test -uall`.
+If all but one resource is desired (a more common case), a
comma-separated list of resources that are not desired may be listed after
``all``. The command :program:`python -m test -uall,-audio,-largefile`
will run :mod:`test` with all resources except the ``audio`` and