Comma cleanup

jacksontj · jacksontj · commit fb7e5630d820 · 2014-12-12T11:39:40.000-08:00
diff --git a/doc/topics/development/conventions/documentation.rst b/doc/topics/development/conventions/documentation.rst
@@ -290,7 +290,7 @@ Settings
 --------
 
 Individual settings in the Salt Master or Salt Minion configuration files are
-cross-referenced using two custom roles, ``conf_master`` and ``conf_minion``.
+cross-referenced using two custom roles, ``conf_master``, and ``conf_minion``.
 
 .. code-block:: restructuredtext
 
diff --git a/doc/topics/development/conventions/formulas.rst b/doc/topics/development/conventions/formulas.rst
@@ -5,7 +5,7 @@ Salt Formulas
 =============
 
 Formulas are pre-written Salt States. They are as open-ended as Salt States
-themselves and can be used for tasks such as installing a package, configuring
+themselves and can be used for tasks such as installing a package, configuring,
 and starting a service, setting up users or permissions, and many other common
 tasks.
 
@@ -340,7 +340,7 @@ Pillar would replace the ``config`` value from the call above.
 .. note:: Protecting Expansion of Content with Special Characters
 
   When templating keep in mind that YAML does have special characters for
-  quoting, flows and other special structure and content.  When a Jinja
+  quoting, flows, and other special structure and content.  When a Jinja
   substitution may have special characters that will be incorrectly parsed by
   YAML care must be taken.  It is a good policy to use the ``yaml_encode`` or
   the ``yaml_dquote`` Jinja filters:
diff --git a/doc/topics/development/conventions/packaging.rst b/doc/topics/development/conventions/packaging.rst
@@ -29,7 +29,7 @@ distribution.
 Single Package
 ==============
 
-Shipping Salt as a single package, where the minion, master and all tools are
+Shipping Salt as a single package, where the minion, master, and all tools are
 together is perfectly acceptable and practiced by distributions such as
 FreeBSD.
 
diff --git a/doc/topics/development/hacking.rst b/doc/topics/development/hacking.rst
@@ -129,7 +129,7 @@ Edit the master config file:
 1.  Uncomment and change the ``user: root`` value to your own user.
 2.  Uncomment and change the ``root_dir: /`` value to point to
     ``/path/to/your/virtualenv``.
-3.  If you are running version 0.11.1 or older, uncomment and change the
+3.  If you are running version 0.11.1 or older, uncomment, and change the
     ``pidfile: /var/run/salt-master.pid`` value to point to
     ``/path/to/your/virtualenv/salt-master.pid``.
 4.  If you are also running a non-development version of Salt you will have to
@@ -139,7 +139,7 @@ Edit the minion config file:
 
 1.  Repeat the edits you made in the master config for the ``user`` and
     ``root_dir`` values as well as any port changes.
-2.  If you are running version 0.11.1 or older, uncomment and change the
+2.  If you are running version 0.11.1 or older, uncomment, and change the
     ``pidfile: /var/run/salt-minion.pid`` value to point to
     ``/path/to/your/virtualenv/salt-minion.pid``.
 3.  Uncomment and change the ``master: salt`` value to point at ``localhost``.
diff --git a/doc/topics/development/tests/index.rst b/doc/topics/development/tests/index.rst
@@ -245,7 +245,7 @@ minions. This allows the syndic interface to be tested and master/minion
 communication to be verified. All of the integration tests are executed as
 live salt commands sent through the started daemons.
 
-Integration tests are particularly good at testing modules, states and shell
+Integration tests are particularly good at testing modules, states, and shell
 commands.
 
 * :doc:`Writing integration tests <integration>`
diff --git a/doc/topics/development/tests/integration.rst b/doc/topics/development/tests/integration.rst
@@ -258,7 +258,7 @@ once the related tests have completed. For example, if a new user is created to
 test a module, the same user should be removed after the test is completed to
 maintain system integrity.
 
-To write a destructive test, import and use the destructiveTest decorator for
+To write a destructive test, import, and use the destructiveTest decorator for
 the test method:
 
 .. code-block:: python
@@ -380,7 +380,7 @@ preceded with the ``@expensiveTest`` decorator. The expensive test decorator is
 necessary because it signals to the test suite that the
 ``--cloud-provider-tests`` flag is required to run the cloud provider tests.
 
-To write a cloud provider test, import and use the expensiveTest decorator for
+To write a cloud provider test, import, and use the expensiveTest decorator for
 the test function:
 
 .. code-block:: python
