Skip to content

Commit

Permalink
Merge pull request saltstack#40414 from chaseadamsio/develop
Browse files Browse the repository at this point in the history
docs: fix typo in states/index.rst
  • Loading branch information
Mike Place authored Mar 30, 2017
2 parents 2f4b306 + f2d855b commit b62c8c2
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions doc/ref/states/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ The Salt States are files which contain the information about how to configure
Salt minions. The states are laid out in a directory tree and can be written in
many different formats.

The contents of the files and they way they are laid out is intended to be as
The contents of the files and the way they are laid out is intended to be as
simple as possible while allowing for maximum flexibility. The files are laid
out in states and contains information about how the minion needs to be
configured.
Expand Down Expand Up @@ -178,7 +178,7 @@ and the SLS files below it apply to all minions.

The second expression is a regular expression that will match all minions
with an ID matching ``saltmaster.*`` and specifies that for those minions, the
salt.master state should be applied. To
salt.master state should be applied.

.. important::
Since version 2014.7.0, the default matcher (when one is not explicitly
Expand Down

0 comments on commit b62c8c2

Please sign in to comment.