Merge pull request #2146 from f0rk/f0rk/optional_arguments_docs

Generic keyword argument usage documentation
This commit is contained in:
Thomas S Hatch 2012-10-01 18:16:02 -07:00
commit f10cf33b83
2 changed files with 22 additions and 0 deletions

View File

@ -135,6 +135,22 @@ Calling the Function
The function to call on the specified target is placed after the target
specification.
.. versionadded:: 0.9.8
Functions may also accept arguments, space-delimited:
.. code-block:: bash
salt '*' cmd.exec_code python 'import sys; print sys.version'
Optional, keyword arguments are also supported:
.. code-block:: bash
salt '*' pip.install salt timeout=5 upgrade=True
They are always in the form of ``kwarg=argument``.
Finding available minion functions
``````````````````````````````````

View File

@ -65,3 +65,9 @@ arguments
Space-delimited arguments to the function::
salt '*' cmd.exec_code python 'import sys; print sys.version'
Optional, keyword arguments are also supported::
salt '*' pip.install salt timeout=5 upgrade=True
They are always in the form of ``kwarg=argument``.