Comma cleanup

jacksontj · jacksontj · commit da3ea213e9cf · 2014-12-12T11:34:34.000-08:00
diff --git a/doc/ref/configuration/index.rst b/doc/ref/configuration/index.rst
@@ -8,7 +8,7 @@ setting up a :term:`minion` is to set the location of the master in the minion
 configuration file.
 
 The configuration files will be installed to :file:`/etc/salt` and are named
-after the respective components, :file:`/etc/salt/master` and
+after the respective components, :file:`/etc/salt/master`, and
 :file:`/etc/salt/minion`.
 
 Master Configuration
@@ -85,7 +85,7 @@ Running Salt
     To run Salt as another user, set the :conf_master:`user` parameter in the
     master config file.
 
-    Additionally, ownership and permissions need to be set such that the
+    Additionally, ownership, and permissions need to be set such that the
     desired user can read from and write to the following directories (and
     their subdirectories, where applicable):
 
diff --git a/doc/ref/configuration/master.rst b/doc/ref/configuration/master.rst
@@ -115,7 +115,7 @@ seeing on the console(and then salt-master crashes):
 By default this value will be the one of `ulimit -Hn`, i.e., the hard limit for
 max open files.
 
-To set a different value than the default one, uncomment and configure this
+To set a different value than the default one, uncomment, and configure this
 setting. Remember that this value CANNOT be higher than the hard limit. Raising
 the hard limit depends on the OS and/or distribution, a good way to find the
 limit is to search the internet for something like this:
@@ -444,7 +444,7 @@ performance of max_minions.
 
 Default: False
 
-When enabled the master regularly sends events of currently connected, lost
+When enabled the master regularly sends events of currently connected, lost,
 and newly connected minions on the eventbus.
 
 .. code-block:: yaml
@@ -905,8 +905,8 @@ Example:
 Default: ``md5``
 
 The hash_type is the hash to use when discovering the hash of a file on
-the master server. The default is md5, but sha1, sha224, sha256, sha384
-and sha512 are also supported.
+the master server. The default is md5, but sha1, sha224, sha256, sha384, and
+sha512 are also supported.
 
 .. code-block:: yaml
 
diff --git a/doc/ref/configuration/minion.rst b/doc/ref/configuration/minion.rst
@@ -773,7 +773,7 @@ the fileserver's environments. This parameter operates identically to the
 Default: ``md5``
 
 The hash_type is the hash to use when discovering the hash of a file on the
-local fileserver. The default is md5, but sha1, sha224, sha256, sha384 and
+local fileserver. The default is md5, but sha1, sha224, sha256, sha384, and
 sha512 are also supported.
 
 .. code-block:: yaml
diff --git a/doc/ref/configuration/nonroot.rst b/doc/ref/configuration/nonroot.rst
@@ -24,7 +24,7 @@ minion as an unprivileged user will keep it from making changes to things like
 users, installed packages, etc. unless access controls (sudo, etc.) are setup
 on the minion to permit the non-root user to make the needed changes.
 
-In order to allow Salt to successfully run as a non-root user, ownership and
+In order to allow Salt to successfully run as a non-root user, ownership, and
 permissions need to be set such that the desired user can read from and write
 to the following directories (and their subdirectories, where applicable):
 
