Polish up cmd.rst

6 files changed, 35 insertions, 39 deletions

diff --git a/coverage/report.py b/coverage/report.py
index d60a8c59..64678ff9 100644
--- a/coverage/report.py
+++ b/coverage/report.py
@@ -78,7 +78,7 @@ def get_analysis_to_report(coverage, morfs):
             # should_be_python() method.
             if fr.should_be_python():
                 if config.ignore_errors:
-                    msg = "Could not parse Python file '{}'".format(fr.filename)
+                    msg = "Couldn't parse Python file '{}'".format(fr.filename)
                     coverage._warn(msg, slug="couldnt-parse")
                 else:
                     raise
diff --git a/doc/cmd.rst b/doc/cmd.rst
index 4038fd82..8b0e2f24 100644
--- a/doc/cmd.rst
+++ b/doc/cmd.rst
@@ -13,8 +13,8 @@ When you install coverage.py, a command-line script simply called ``coverage``
 is placed in your Python scripts directory.  To help with multi-version
 installs, it will also create either a ``coverage2`` or ``coverage3`` alias,
 and a ``coverage-X.Y`` alias, depending on the version of Python you're using.
-For example, when installing on Python 2.7, you will be able to use
-``coverage``, ``coverage2``, or ``coverage-2.7`` on the command line.
+For example, when installing on Python 3.7, you will be able to use
+``coverage``, ``coverage3``, or ``coverage-3.7`` on the command line.
 
 Coverage.py has a number of commands which determine the action performed:
 
@@ -134,51 +134,47 @@ Warnings
 During execution, coverage.py may warn you about conditions it detects that
 could affect the measurement process.  The possible warnings include:
 
-* "Could not parse Python file XXX (couldnt-parse)"
-
+* ``Couldn't parse Python file XXX (couldnt-parse)`` |br|
   During reporting, a file was thought to be Python, but it couldn't be parsed
   as Python.
 
-* "Trace function changed, measurement is likely wrong: XXX (trace-changed)"
-
+* ``Trace function changed, measurement is likely wrong: XXX (trace-changed)``
+  |br|
   Coverage measurement depends on a Python setting called the trace function.
   Other Python code in your product might change that function, which will
   disrupt coverage.py's measurement.  This warning indicates that has happened.
   The XXX in the message is the new trace function value, which might provide
   a clue to the cause.
 
-* "Module XXX has no Python source (module-not-python)"
-
+* ``Module XXX has no Python source (module-not-python)`` |br|
   You asked coverage.py to measure module XXX, but once it was imported, it
   turned out not to have a corresponding .py file.  Without a .py file,
   coverage.py can't report on missing lines.
 
-* "Module XXX was never imported (module-not-imported)"
-
+* ``Module XXX was never imported (module-not-imported)`` |br|
   You asked coverage.py to measure module XXX, but it was never imported by
   your program.
 
-* "No data was collected (no-data-collected)"
-
+* ``No data was collected (no-data-collected)`` |br|
   Coverage.py ran your program, but didn't measure any lines as executed.
   This could be because you asked to measure only modules that never ran,
   or for other reasons.
 
-* "Module XXX was previously imported, but not measured (module-not-measured)"
-
+* ``Module XXX was previously imported, but not measured
+  (module-not-measured)``
+  |br|
   You asked coverage.py to measure module XXX, but it had already been imported
   when coverage started.  This meant coverage.py couldn't monitor its
   execution.
 
-* "Already imported a file that will be measured: XXX (already-imported)"
-
+* ``Already imported a file that will be measured: XXX (already-imported)``
+  |br|
   File XXX had already been imported when coverage.py started measurement. Your
   setting for ``--source`` or ``--include`` indicates that you wanted to
   measure that file.  Lines will be missing from the coverage report since the
   execution during import hadn't been measured.
 
-* "--include is ignored because --source is set (include-ignored)"
-
+* ``--include is ignored because --source is set (include-ignored)`` |br|
   Both ``--include`` and ``--source`` were specified while running code.  Both
   are meant to focus measurement on a particular part of your source code, so
   ``--include`` is ignored in favor of ``--source``.
@@ -202,7 +198,7 @@ can include a path to another directory.
 
 By default, each run of your program starts with an empty data set. If you need
 to run your program multiple times to get complete data (for example, because
-you need to supply disjoint options), you can accumulate data across runs with
+you need to supply different options), you can accumulate data across runs with
 the ``--append`` flag on the **run** command.
 
 To erase the collected data, use the **erase** command::
@@ -220,9 +216,8 @@ different versions of Python, or dependencies, or on different operating
 systems.  In these cases, you can collect coverage data for each test run, and
 then combine all the separate data files into one combined file for reporting.
 
-The **combine** command knows how to read a number of separate data files,
-match the data by source file name, and write a combined data file with all of
-the data.
+The **combine** command reads a number of separate data files, matches the data
+by source file name, and writes a combined data file with all of the data.
 
 Coverage normally writes data to a filed named ".coverage".  The ``run
 --parallel-mode`` switch (or ``[run] parallel=True`` configuration option)
@@ -249,7 +244,7 @@ current directory isn't searched if you use command-line arguments.  If you
 also want data from the current directory, name it explicitly on the command
 line.
 
-When coverage.py combines data file, it looks for files named the same as the
+When coverage.py combines data files, it looks for files named the same as the
 data file (defaulting to ".coverage"), with a dotted suffix.  Here are some
 examples of data files that can be combined::
 
@@ -262,12 +257,12 @@ An existing combined data file is ignored and re-written. If you want to use
 runs, use the ``--append`` switch on the **combine** command.  This behavior
 was the default before version 4.2.
 
-To combine data for a source file, coverage has to find its data
-in each of the data files.  Different test runs may run the same source file
-from different locations. For example, different operating systems will use
-different paths for the same file, or perhaps each Python version is run from a
-different subdirectory.  Coverage needs to know that different file paths are
-actually the same source file for reporting purposes.
+To combine data for a source file, coverage has to find its data in each of the
+data files.  Different test runs may run the same source file from different
+locations. For example, different operating systems will use different paths
+for the same file, or perhaps each Python version is run from a different
+subdirectory.  Coverage needs to know that different file paths are actually
+the same source file for reporting purposes.
 
 You can tell coverage.py how different source locations relate with a
 ``[paths]`` section in your configuration file (see :ref:`config_paths`).
@@ -275,7 +270,6 @@ It might be more convenient to use the ``[run] relative_files``
 setting to store relative file paths (see :ref:`relative_files
 <config_run_relative_files>`).
 
-
 If any of the data files can't be read, coverage.py will print a warning
 indicating the file and the problem.
 
@@ -364,7 +358,8 @@ command line::
     TOTAL                        76     10    87%
 
 The ``--skip-covered`` switch will skip any file with 100% coverage, letting
-you focus on the files that still need attention.
+you focus on the files that still need attention.  The ``--skip-empty`` switch
+will skip any file with no executable statements.
 
 If you have :ref:`recorded contexts <contexts>`, the ``--contexts`` option lets
 you choose which contexts to report on.  See :ref:`context_reporting` for
@@ -414,7 +409,8 @@ generate a new report into the same directory, coverage.py will skip
 generating unchanged pages, making the process faster.
 
 The ``--skip-covered`` switch will skip any file with 100% coverage, letting
-you focus on the files that still need attention.
+you focus on the files that still need attention.  The ``--skip-empty`` switch
+will skip any file with no executable statements.
 
 If you have :ref:`recorded contexts <contexts>`, the ``--contexts`` option lets
 you choose which contexts to report on, and the ``--show-contexts`` option will
diff --git a/doc/conf.py b/doc/conf.py
index ccdf7a65..09d613be 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -76,6 +76,10 @@ rst_epilog = """
 .. |release_date| replace:: {release_date}
 .. |coverage-equals-release| replace:: coverage=={release}
 .. |doc-url| replace:: https://coverage.readthedocs.io/en/coverage-{release}
+.. |br| raw:: html
+
+  <br/>
+
 """.format(release=release, release_date=release_date)
 
 # The language for content autogenerated by Sphinx. Refer to documentation
diff --git a/doc/index.rst b/doc/index.rst
index 214593da..c643324e 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -37,10 +37,6 @@ For Enterprise
    :class: tideliftlogo
    :target: https://tidelift.com/subscription/pkg/pypi-coverage?utm_source=pypi-coverage&utm_medium=referral&utm_campaign=readme
 
-.. |br| raw:: html
-
-  <br/>
-
 `Available as part of the Tidelift Subscription. <Tidelift Subscription_>`_ |br|
 Coverage and thousands of other packages are working with
 Tidelift to deliver one enterprise subscription that covers all of the open
diff --git a/tests/test_html.py b/tests/test_html.py
index 504c5e80..6c4c706c 100644
--- a/tests/test_html.py
+++ b/tests/test_html.py
@@ -352,7 +352,7 @@ class HtmlWithUnparsableFilesTest(HtmlTestHelpers, CoverageTest):
             1,
             "Expected a warning to be thrown when an invalid python file is parsed")
         self.assertIn(
-            "Could not parse Python file",
+            "Couldn't parse Python file",
             cov._warnings[0],
             "Warning message should be in 'invalid file' warning"
         )
diff --git a/tests/test_summary.py b/tests/test_summary.py
index d7ee28ba..8a59a7ed 100644
--- a/tests/test_summary.py
+++ b/tests/test_summary.py
@@ -580,7 +580,7 @@ class SummaryTest(UsingModulesMixin, CoverageTest):
         self.make_file("mycode.py", "This isn't python at all!")
         report = self.report_from_command("coverage report -i mycode.py")
 
-        # Coverage.py warning: Could not parse Python file blah_blah/mycode.py (couldnt-parse)
+        # Coverage.py warning: Couldn't parse Python file blah_blah/mycode.py (couldnt-parse)
         # Name     Stmts   Miss  Cover
         # ----------------------------
         # No data to report.