Commit Graph

12 Commits

Author SHA1 Message Date
Daniel Wozniak
9ac2604d40
Merge pull request #54555 from garethgreenaway/2019_2_1_port_52948
[master] Porting #52948 to master
2019-10-03 15:26:51 -07:00
Gareth J. Greenaway
a0718b36e5
Porting PR #52752 to 2019.2.1 2019-09-18 16:49:11 -07:00
Gareth J. Greenaway
f7b8984b4e
Porting PR #52948 to 2019.2.1 2019-09-18 16:46:53 -07:00
Erik Johnson
c34690e509
Don't import obsolete Directive class from Sphinx
Directive was apparently removed from Sphinx and made part of docutils.
For some reason, in this saltdomain extension, we were importing both
from docutils and sphinx. This worked well enough while Directive was
still only deprecated, but it appears to recently have been removed,
meaning that it now just causes an ImportError.

This commit removes the redundant import.
2018-11-12 14:54:38 -06:00
Mircea Ulinic
fd28d3385c Adding Jinja cross ref 2017-06-19 09:49:45 +00:00
Mircea Ulinic
240178d241 Add conf_proxy cross reference 2017-03-28 18:24:02 +03:00
Seth House
3515804fe6 Added directive for Salt events 2014-04-29 21:43:12 -06:00
Seth House
35d4b67fca Output warning if file cannot be found 2013-12-23 06:42:04 -07:00
Seth House
9f7fab6df0 Moved LiterateCoding directives into Salt domain 2013-12-23 06:02:12 -07:00
Seth House
034f35b93f Extended Sphinx domain with formula directives and roles 2013-12-23 06:02:12 -07:00
Seth House
cb8ed95992 Moved custom conf cross-references into Salt domain file 2013-12-13 22:45:48 -07:00
Seth House
c0f74f95aa Added minor Salt Sphinx domain 2013-12-13 22:45:48 -07:00