Commit Graph

11 Commits

Author SHA1 Message Date
Benjamin Drung
a3c54b50f6 Fix various spelling mistakes
lintian found various spelling mistakes.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
2018-03-08 15:25:42 +01:00
Seth House
7ccaf1c9dd Add note about the jobs runner to the external job cache docs 2017-03-20 13:40:14 -06:00
rallytime
2595ac383d Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/config/__init__.py
  - salt/modules/docker.py
  - salt/states/docker.py
2017-02-22 16:24:36 -07:00
rallytime
c613d19e76 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/modules/dockerng.py
  - salt/states/dockerng.py
2017-02-21 13:59:14 -07:00
rallytime
e13febe58d Update external_cache docs with other configuration options
There are more places than just the minion config file to define
external job cache configuration settings for minions. This change
updates the docs to include some of those other places and the
order in which they're evaluated if the settings are defined in
more than one place.

Fixes #38762
2017-02-14 17:18:35 -07:00
rallytime
609e6e4b23 Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/config/__init__.py
  - salt/modules/win_lgpo.py
  - salt/utils/aws.py
  - tests/unit/utils/schema_test.py
2017-02-09 10:29:40 -07:00
rallytime
2f74dcf685 Various doc updates to fix warnings in doc build 2017-02-06 16:56:58 -07:00
Eric Radman
3f2e13d1fc Remove repeated words in docs (#37871)
Found using

find . -name '*.rst' | xargs igor -R -r
2016-11-23 14:53:17 -07:00
Denys Havrysh
aebc48163d Remove trailing white spaces in documentation files 2016-03-01 17:36:23 +02:00
Jacob Hammons
57dfa92d5a Fixed typos 2015-07-08 21:12:24 -06:00
Jacob Hammons
2f9e5b9125 Additional docs on external and master job cache, assorted doc fixes
Refs #25277
2015-07-08 20:33:34 -06:00