Commit Graph

18 Commits

Author SHA1 Message Date
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
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