saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Move note about using mode=insert with location options to mode section

Browse source
This commit is contained in:
rallytime 2016-11-04 09:57:27 -06:00
parent db0b0cefb8
commit b2615892eb
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
salt/modules/file.py
View file

@ -1415,13 +1415,6 @@ def line(path, content, match=None, mode=None, location=None,
arguments are required, as well as passing in one of the ``mode``
options.
.. note::
If ``mode=insert`` is used, at least one of the following
options must also be defined: ``location``, ``before``, or
``after``. If ``location`` is used, it takes precedence
over the other two options.
path
Filesystem path to the file to be edited.
@ -1449,9 +1442,16 @@ def line(path, content, match=None, mode=None, location=None,
- insert
Insert a line.
.. note::
If ``mode=insert`` is used, at least one of the following
options must also be defined: ``location``, ``before``, or
``after``. If ``location`` is used, it takes precedence
over the other two options.
location
Defines where to place content in the line. Note this option is only
used when ``mode=insert``. If location a location is passed in, it
used when ``mode=insert`` is specified. If a location is passed in, it
takes precedence over both the ``before`` and ``after`` kwargs. Valid
locations are: