Docs: use :command: role

docs/contributing.rst

@@ -469,7 +469,7 @@ the test suite by calling ``nosetests``:
 
     $ nosetests
 
-Some useful options to :program:`nosetests` are:
+Some useful options to :command:`nosetests` are:
 
 * :option:`-x`
 
@@ -724,7 +724,7 @@ is following the conventions.
 
 * Lines should not exceed 78 columns.
 
-  You can enforce this in :program:`vim` by setting the ``textwidth`` option:
+  You can enforce this in :command:`vim` by setting the ``textwidth`` option:
 
   .. code-block:: vim
 

docs/getting-started/brokers/rabbitmq.rst

@@ -35,7 +35,7 @@ see `Installing RabbitMQ on OS X`_.
 .. note::
 
     If you're getting `nodedown` errors after installing and using
-    :program:`rabbitmqctl` then this blog post can help you identify
+    :command:`rabbitmqctl` then this blog post can help you identify
     the source of the problem:
 
         http://somic.org/2009/02/19/on-rabbitmqctl-and-badrpcnodedown/
@@ -85,7 +85,7 @@ documentation`_:
 
     ruby -e "$(curl -fsSL https://raw.github.com/Homebrew/homebrew/go/install)"
 
-Finally, we can install rabbitmq using :program:`brew`:
+Finally, we can install rabbitmq using :command:`brew`:
 
 .. code-block:: console
 
@@ -109,7 +109,7 @@ If you're using a DHCP server that is giving you a random host name, you need
 to permanently configure the host name. This is because RabbitMQ uses the host name
 to communicate with nodes.
 
-Use the :program:`scutil` command to permanently set your host name:
+Use the :command:`scutil` command to permanently set your host name:
 
 .. code-block:: console
 
@@ -121,7 +121,7 @@ back into an IP address::
     127.0.0.1       localhost myhost myhost.local
 
 If you start the rabbitmq server, your rabbit node should now be `rabbit@myhost`,
-as verified by :program:`rabbitmqctl`:
+as verified by :command:`rabbitmqctl`:
 
 .. code-block:: console
 
@@ -159,8 +159,8 @@ you can also run it in the background by adding the :option:`-detached` option
 
     $ sudo rabbitmq-server -detached
 
-Never use :program:`kill` to stop the RabbitMQ server, but rather use the
-:program:`rabbitmqctl` command:
+Never use :command:`kill` (:manpage:`kill(1)`) to stop the RabbitMQ server,
+but rather use the :command:`rabbitmqctl` command:
 
 .. code-block:: console
 

docs/whatsnew-4.0.rst

@@ -640,7 +640,7 @@ In Other News
 
 - **Deployment**: Generic init scripts now support
   :envvar:`CELERY_SU`` and :envvar:`CELERYD_SU_ARGS` environment variables
-  to set the path and arguments for :manpage:`su(1)`.
+  to set the path and arguments for :command:`su` (:manpage:`su(1)`).
 
 - **Prefork**: Prefork pool now uses ``poll`` instead of ``select`` where
   available (Issue #2373).