valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1889 from herlo/master

Browse Source 
fixed 'recurse' typo in several locations
This commit is contained in:
Thomas S Hatch 2012-08-27 22:06:13 -07:00
commit 7ca15f47cf
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/man/salt.7
View File

@ -16793,7 +16793,7 @@ Return data to a redis data store
.SH STATE FILE BACKUPS .SH STATE FILE BACKUPS
.sp .sp
In 0.10.2 a new feature was added for backing up files that are replaced by In 0.10.2 a new feature was added for backing up files that are replaced by
the file.managed and file.recuse states. The new feature is called the backup the file.managed and file.recurse states. The new feature is called the backup
mode. Setting the backup mode is easy, but is can be set in a number of mode. Setting the backup mode is easy, but is can be set in a number of
places. places.
.sp .sp
@ -18733,7 +18733,7 @@ takes a few arguments:
Recursive directory management can also be set via the \fBrecurse\fP Recursive directory management can also be set via the \fBrecurse\fP
function. Recursive directory management allows for a directory on the salt function. Recursive directory management allows for a directory on the salt
master to be recursively copied down to the minion. This is a great tool for master to be recursively copied down to the minion. This is a great tool for
deploying large code and configuration systems. A recuse state would look deploying large code and configuration systems. A recurse state would look
something like this: something like this:
.sp .sp
.nf .nf
@ -23760,7 +23760,7 @@ but when enabled the cache is used to make grain matching from the salt command
more powerful, since the minions that will match can be pre determined. more powerful, since the minions that will match can be pre determined.
.SS Backup Files .SS Backup Files
.sp .sp
By default all files replaced by the file.managed and file.recuse states we By default all files replaced by the file.managed and file.recurse states we
simply deleted. 0.10.2 adds a new option. By setting the backup option to simply deleted. 0.10.2 adds a new option. By setting the backup option to
\fBminion\fP the files are backed up before they are replaced. \fBminion\fP the files are backed up before they are replaced.
.sp .sp
@ -24746,7 +24746,7 @@ Make a symlink.
.B file.recurse .B file.recurse
The recurse state function will recursively download a directory on the The recurse state function will recursively download a directory on the
master file server and place it on the minion. Any change in the files on master file server and place it on the minion. Any change in the files on
the master will be pushed to the minion. The recuse function is very the master will be pushed to the minion. The recurse function is very
powerful and has been tested by pushing out the full Linux kernel source. powerful and has been tested by pushing out the full Linux kernel source.
.sp .sp
.nf .nf

2
doc/ref/states/backup_mode.rst
View File

@ -3,7 +3,7 @@ State File Backups
================== ==================
In 0.10.2 a new feature was added for backing up files that are replaced by In 0.10.2 a new feature was added for backing up files that are replaced by
the file.managed and file.recuse states. The new feature is called the backup the file.managed and file.recurse states. The new feature is called the backup
mode. Setting the backup mode is easy, but is can be set in a number of mode. Setting the backup mode is easy, but is can be set in a number of
places. places.

2
doc/topics/releases/0.10.2.rst
View File

@ -49,7 +49,7 @@ more powerful, since the minions that will match can be pre determined.
Backup Files Backup Files
------------ ------------
By default all files replaced by the file.managed and file.recuse states we By default all files replaced by the file.managed and file.recurse states we
simply deleted. 0.10.2 adds a new option. By setting the backup option to simply deleted. 0.10.2 adds a new option. By setting the backup option to
``minion`` the files are backed up before they are replaced. ``minion`` the files are backed up before they are replaced.

2
doc/topics/releases/0.9.3.rst
View File

@ -196,7 +196,7 @@ file.symlink
file.recurse file.recurse
The recurse state function will recursively download a directory on the The recurse state function will recursively download a directory on the
master file server and place it on the minion. Any change in the files on master file server and place it on the minion. Any change in the files on
the master will be pushed to the minion. The recuse function is very the master will be pushed to the minion. The recurse function is very
powerful and has been tested by pushing out the full Linux kernel source. powerful and has been tested by pushing out the full Linux kernel source.
.. code-block:: yaml .. code-block:: yaml

2
salt/state.py
View File

@ -246,7 +246,7 @@ class State(object):
Check to see if the modules for this state instance need to be Check to see if the modules for this state instance need to be
updated, only update if the state is a file. If the function is updated, only update if the state is a file. If the function is
managed check to see if the file is a possible module type, e.g. a managed check to see if the file is a possible module type, e.g. a
python, pyx, or .so. Always refresh if the function is recuse, python, pyx, or .so. Always refresh if the function is recurse,
since that can lay down anything. since that can lay down anything.
''' '''
def _refresh(): def _refresh():

2
salt/states/file.py
View File

@ -66,7 +66,7 @@ takes a few arguments:
Recursive directory management can also be set via the ``recurse`` Recursive directory management can also be set via the ``recurse``
function. Recursive directory management allows for a directory on the salt function. Recursive directory management allows for a directory on the salt
master to be recursively copied down to the minion. This is a great tool for master to be recursively copied down to the minion. This is a great tool for
deploying large code and configuration systems. A recuse state would look deploying large code and configuration systems. A recurse state would look
something like this: something like this:
.. code-block:: yaml .. code-block:: yaml