Commit Graph

23 Commits

Author SHA1 Message Date
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
rallytime
9ae34b2329 Merge branch '2016.3' into 'carbon'
Conflicts:
  - doc/topics/beacons/index.rst
2016-10-10 10:19:50 -06:00
Justin Findlay
28b4e30009 doc.glossary: use parenthesis 2016-10-06 16:17:22 -06:00
Justin Findlay
82cf39db00 doc.glossary: add JID 2016-10-06 16:17:22 -06:00
Justin Findlay
cc071b75cb doc.glossary: add idempotent 2016-10-06 16:17:22 -06:00
Jεan Sacren
e39c3e29b4 Fix trivial grammar and spelling errors in the doc 2016-05-25 00:07:44 -06:00
rallytime
6559ea15b0 Merge branch '2015.5' into '2015.8'
Conflicts:
  - doc/glossary.rst
  - salt/config.py
  - tests/unit/modules/gpg_test.py
2016-03-06 10:59:46 -07:00
Mike Place
a75e146125 Add definition of job cache to glossary 2016-03-04 12:41:02 -07:00
Jacob Hammons
d939a38c8c release notes updates 2015-09-14 14:52:14 -06:00
Mike Place
7dae045b3c Remove overstate documentation 2015-06-12 13:00:08 -06:00
Nitin Madhok
2c13cf3302 Fixing more sphinx errors and warnings 2015-05-18 12:39:49 -04:00
Seth House
dc6eac4f69 Deprecate Halite from the Salt docs 2015-05-05 16:01:35 -06:00
Vynce Montgomery
0d2a0a3607 fix alphabetization
things appeared to be missing because they were out of order.
2015-04-15 15:39:10 -07:00
Thomas Jackson
f268bb8b4b Whitespace cleanup 2014-12-11 07:53:20 -08:00
Janek Warchoł
e11e42eb39 Fix external link formatting in glossary 2014-10-23 13:45:26 +02:00
Mike Place
c255b4ad13 Update glossary.rst
Re-word external pillar
2014-06-26 16:41:33 -06:00
Mike Place
0a42bf0678 External pillar glossary entry 2014-06-26 16:20:11 -06:00
Mike Place
126e84a081 Glossary entry for master tops 2014-06-26 16:13:57 -06:00
Mike Place
2c27cc1a34 Add __virtual__ to glossary 2014-06-26 16:07:30 -06:00
Seth House
9a95c6d7c3 Added links to each glossary entry; wrapped in glossary directive 2014-02-27 19:38:56 -07:00
Mike Place
e8b07d5c39 A glossary. 2014-02-18 15:59:56 -07:00