Merge 8e11ea1 into f39ee84

docs/appendix.rst

@@ -84,7 +84,7 @@ This documentation uses a few special terms to refer to Python types:
       in the current directory. Multiple connections files may exist in
       different directories. This allows connection definitions to be
       predefined and pywbemcli commands executed against them using only the
-      connection definition name (via the ``--name`` general option).
+      connection definition name (via the :ref:`--name general option`).
 
    MOF
       MOF (Managed Object Format) is the language used by the DMTF to
@@ -177,7 +177,8 @@ This documentation uses a few special terms to refer to Python types:
       the default connection is defined.
       A connection definition in the :term:`connections file` becomes the
       default connection on pywbemcli startup if it is specified using the
-      :ref:`connection select command` and the ``--default option`` is used.
+      :ref:`connection select command` and the
+      ``--default``/``-d`` command option is used.
 
    current connection
       The connection definition in pywbemcli that is currently active; it is the

docs/pywbemcli/cmdlineinterface.rst

@@ -63,7 +63,7 @@ begin with ``-``.
 Command groups are named after the objects the commands operate on
 (ex. ``class``, ``instance``, ``qualifier``, ``server``). Executing
 
-.. code-block::text
+.. code-block:: text
 
    $ pywbemcli --help
    ...
@@ -427,7 +427,7 @@ Pywbemcli terminates with one of the following program exit codes:
 
   These Python tracebacks should never happen and are always considered a
   reason to open a bug in the
-  `pywbemtools issue tracker <https://github.com/pywbem/pywbemtools/issues>`_`.
+  `pywbemtools issue tracker <https://github.com/pywbem/pywbemtools/issues>`_.
 
   Note that an error message with a traceback from a mock Python script does
   not fall into this category and is an issue in that Python script and not