Comma cleanup

doc/topics/tutorials/cloud_controller.rst

@@ -13,7 +13,7 @@ deployed.
 The main goal of Salt Virt is to facilitate a very fast and simple cloud. The
 cloud that can scale and fully featured. Salt Virt comes with the
 ability to set up and manage complex virtual machine networking, powerful
-image and disk management, as well as virtual machine migration with and without
+image, and disk management, as well as virtual machine migration with and without
 shared storage.
 
 This means that Salt Virt can be used to create a cloud from a blade center

doc/topics/tutorials/gitfs.rst

@@ -394,10 +394,10 @@ be searched first for the requested file; then, if it is not found on the
 master, each configured git remote will be searched.
 
 
-Branches, Environments and Top Files
+Branches, Environments, and Top Files
 ====================================
 
-When using the gitfs backend, branches and tags will be mapped to environments
+When using the gitfs backend, branches, and tags will be mapped to environments
 using the branch/tag name as an identifier.
 
 There is one exception to this rule: the ``master`` branch is implicitly mapped

doc/topics/tutorials/halite.rst

@@ -140,8 +140,7 @@ Configuring Halite Settings
 ===========================
 
 Once you've configured the permissions for Halite, you'll need to set up the
-Halite settings in the /etc/salt/master file. Halite supports CherryPy, Paste
-and Gevent out of the box.
+Halite settings in the /etc/salt/master file. Halite supports CherryPy, Paste, and Gevent out of the box.
 
 To configure cherrypy, add the following to the bottom of your /etc/salt/master file:
 

doc/topics/tutorials/http.rst

@@ -13,7 +13,7 @@ from the minion as an execution module, in addition to the master as a runner,
 it was abstracted into this multi-use library. This library can also be imported
 by 3rd-party programs wishing to take advantage of its extended functionality.
 
-Core functionality of the execution, state and runner modules is derived from
+Core functionality of the execution, state, and runner modules is derived from
 this library, so common usages between them are described here. Documentation
 specific to each module is described below.
 
@@ -245,7 +245,7 @@ If decoding is turned on, and references to JSON or XML cannot be found, then
 this module will default to plain text, and return the undecoded data as
 ``text`` (even if text is set to ``False``; see below).
 
-The ``query()`` function can return the HTTP status code, headers and/or text
+The ``query()`` function can return the HTTP status code, headers, and/or text
 as required. However, each must individually be turned on.
 
 .. code-block:: python
@@ -284,7 +284,7 @@ they are not specified, the minion defaults will be used as necessary.
 
 Because passing complete data structures from the command line can be tricky at
 best and dangerous (in terms of execution injection attacks) at worse, the
-``data_file`` and ``header_file`` are likely to see more use here.
+``data_file``, and ``header_file`` are likely to see more use here.
 
 All methods for the library are available in the execution module, as kwargs.
 

doc/topics/tutorials/multimaster.rst

@@ -36,7 +36,7 @@ already running, stop it. There is only one requirement when preparing a
 redundant master, which is that masters share the same private key. When the
 first master was created, the master's identifying key pair was generated and
 placed in the master's ``pki_dir``. The default location of the master's key
-pair is ``/etc/salt/pki/master/``. Take the private key, ``master.pem`` and
+pair is ``/etc/salt/pki/master/``. Take the private key, ``master.pem``, and
 copy it to the same location on the redundant master. Do the same for the
 master's public key, ``master.pub``. Assuming that no minions have yet been
 connected to the new redundant master, it is safe to delete any existing key

doc/topics/tutorials/starting_states.rst

@@ -475,7 +475,7 @@ and set them up to be mounted, and the ``salt`` object is used multiple
 times to call shell commands to gather data.
 
 
-Introducing the Python, PyDSL and the Pyobjects Renderers
+Introducing the Python, PyDSL, and the Pyobjects Renderers
 ---------------------------------------------------------
 
 Sometimes the chosen default renderer might not have enough logical power to

doc/topics/tutorials/states_pt2.rst

@@ -108,7 +108,7 @@ Verify that Apache is now serving your custom HTML.
 
 .. admonition:: ``require`` vs. ``watch``
 
-    There are two :ref:`requisite-declaration`, “require” and “watch”. Not
+    There are two :ref:`requisite-declaration`, “require”, and “watch”. Not
     every state supports “watch”. The :mod:`service state
     <salt.states.service>` does support “watch” and will restart a service
     based on the watch condition.
@@ -142,5 +142,5 @@ Verify that Apache is now serving your custom HTML.
 Next steps
 ==========
 
-In :doc:`part 3 <states_pt3>` we will discuss how to use includes, extends and
+In :doc:`part 3 <states_pt3>` we will discuss how to use includes, extends, and
 templating to make a more complete State Tree configuration.

doc/topics/tutorials/states_pt5.rst

@@ -214,7 +214,7 @@ Given the above setup, the OverState will be carried out as follows:
    minion IDs start with "web".
 
 3. Finally, the ``all`` stage will execute, running :mod:`state.highstate
-   <salt.modules.state.highstate>` on all systems, if and only if the ``mysql``
+   <salt.modules.state.highstate>` on all systems, if, and only if the ``mysql``
    and ``webservers`` stages completed without any failures.
 
 Any failure in the above steps would cause the requires to fail, preventing the

doc/topics/tutorials/walkthrough.rst

@@ -27,7 +27,7 @@ that can solve many specific problems in an infrastructure.
 
 The backbone of Salt is the remote execution engine, which creates a high-speed,
 secure and bi-directional communication net for groups of systems. On top of this
-communication system, Salt provides an extremely fast, flexible and easy-to-use
+communication system, Salt provides an extremely fast, flexible, and easy-to-use
 configuration management system called ``Salt States``.
 
 Installing Salt
@@ -184,7 +184,7 @@ master. To list the keys that are on the master:
 
     salt-key -L
 
-The keys that have been rejected, accepted and pending acceptance are listed.
+The keys that have been rejected, accepted, and pending acceptance are listed.
 The easiest way to accept the minion key is to accept all pending keys:
 
 .. code-block:: bash
@@ -398,7 +398,7 @@ Targeting
 
 Salt allows for minions to be targeted based on a wide range of criteria.  The
 default targeting system uses globular expressions to match minions, hence if
-there are minions named ``larry1``, ``larry2``, ``curly1`` and ``curly2``, a
+there are minions named ``larry1``, ``larry2``, ``curly1``, and ``curly2``, a
 glob of ``larry*`` will match ``larry1`` and ``larry2``, and a glob of ``*1``
 will match ``larry1`` and ``curly1``.
 

doc/topics/tutorials/walkthrough_macosx.rst

@@ -92,7 +92,7 @@ have to do it all over again. It also lets you *uninstall* things easily.
 .. note::
 
     Brew is a Ruby program (Ruby is installed by default with your Mac). Brew
-    downloads, compiles and links software. The linking phase is when compiled
+    downloads, compiles, and links software. The linking phase is when compiled
     software is deployed on your machine. It may conflict with manually
     installed software, especially in the /usr/local directory. It's ok,
     remove the manually installed version then refresh the link by typing