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

Merge pull request #24632 from jacobhammons/bug-fixes

Browse source 
Doc bug fixes
This commit is contained in:
Mike Place 2015-06-17 12:40:02 -06:00
commit 3ff6eff546
5 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/ref/configuration/master.rst
View file

@ -337,11 +337,11 @@ communication.
``enable_gpu_grains``
---------------------
Default: ``False``
Default: ``True``
The master can take a while to start up when lspci and/or dmidecode is used
to populate the grains for the master. Enable if you want to see GPU hardware
data for your master.
Enable GPU hardware data for your master. Be aware that the master can
take a while to start up when lspci and/or dmidecode is used to populate the
grains for the master.
.. conf_master:: job_cache

6
doc/ref/states/all/salt.states.artifactory.rst
View file

@ -1,6 +1,6 @@
========================
salt.states.jboss7
========================
=======================
salt.states.artifactory
=======================
.. automodule:: salt.states.artifactory
:members:

13
doc/topics/tutorials/walkthrough.rst
View file

@ -33,11 +33,9 @@ configuration management system called ``Salt States``.
Installing Salt
---------------
SaltStack has been made to be very easy to install and get started. Setting up
Salt should be as easy as installing Salt via distribution packages on Linux or
via the Windows installer. The :doc:`installation documents
</topics/installation/index>` cover platform-specific installation in depth.
SaltStack has been made to be very easy to install and get started. The
:doc:`installation documents </topics/installation/index>` contain instructions
for all supported platforms.
Starting Salt
-------------
@ -636,9 +634,8 @@ Getting Deeper Into States
Two more in-depth States tutorials exist, which delve much more deeply into States
functionality.
1. Thomas' original states tutorial, :doc:`How Do I Use Salt
States?</topics/tutorials/starting_states>`, covers much more to get off the
ground with States.
1. :doc:`How Do I Use Salt States? </topics/tutorials/starting_states>`, covers much
more to get off the ground with States.
2. The :doc:`States Tutorial</topics/tutorials/states_pt1>` also provides a
fantastic introduction.

3
salt/modules/file.py
View file

@ -3301,6 +3301,9 @@ def manage_file(name,
This file is then grabbed and if it has template set, it renders the file to be placed
into the correct place on the system using salt.files.utils.copyfile()
ret
The initial state return data structure. Pass in ``None`` to use the default structure.
source
file reference on the master

11
salt/states/augeas.py
View file

@ -55,8 +55,15 @@ def change(name, context=None, changes=None, lens=None, **kwargs):
State name
context
The context to use. Set this to a file path, prefixed by ``/files``, to
avoid redundancy, e.g.:
A file path, prefixed by ``/files``. Should resolve to an actual file
(not an arbitrary augeas path). This is used to avoid duplicating the
file name for each item in the changes list (for example, ``set bind 0.0.0.0``
in the example below operates on the file specified by ``context``). If
``context`` is not specified, a file path prefixed by ``/files`` should be
included with the ``set`` command.
The file path is examined to determine if the
specified changes are already present.
.. code-block:: yaml