Merge doc fixes #14553 and #14552.

This commit is contained in:
R David Murray 2012-04-11 20:15:10 -04:00
commit df7ac06195
2 changed files with 4 additions and 4 deletions

View File

@ -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

View File

@ -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