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

Porting PR #52752 to 2019.2.1

Browse source
This commit is contained in:
Gareth J. Greenaway 2019-09-18 16:49:11 -07:00 • committed by Bryce Larson
parent c7b74740ed
commit 94a1e3bf25
No known key found for this signature in database
GPG key ID: 131C38B0F02DB4CA
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/Makefile
View file

@ -147,8 +147,7 @@ pdf: check_sphinx-build translations
fi
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo "Running LaTeX files through xelatex..."
perl -pi -e 's!pdflatex!xelatex!' $(BUILDDIR)/latex/Makefile
$(MAKE) -C $(BUILDDIR)/latex -i LATEXOPTS="-interaction=nonstopmode"
$(MAKE) -C $(BUILDDIR)/latex -i "PDFLATEX=latexmk" "LATEXMKOPTS=-xelatex -interaction=nonstopmode -f -quiet"
@echo "xelatex finished; the PDF files are in $(BUILDDIR)/latex."
cheatsheet: translations

8
doc/_ext/saltdomain.py
View file

@ -10,7 +10,7 @@ from sphinx import addnodes
from sphinx.directives import ObjectDescription
from sphinx.domains import Domain, ObjType
from sphinx.domains.python import PyObject
from sphinx.locale import l_, _
from sphinx.locale import _
from sphinx.roles import XRefRole
from sphinx.util.nodes import make_refnode
from sphinx.util.nodes import nested_parse_with_titles
@ -240,8 +240,8 @@ class SLSXRefRole(XRefRole):
class SaltModuleIndex(python_domain.PythonModuleIndex):
name = 'modindex'
localname = l_('Salt Module Index')
shortname = l_('all salt modules')
localname = _('Salt Module Index')
shortname = _('all salt modules')
class SaltDomain(python_domain.PythonDomain):
@ -251,7 +251,7 @@ class SaltDomain(python_domain.PythonDomain):
object_types = python_domain.PythonDomain.object_types
object_types.update({
'state': ObjType(l_('state'), 'state'),
'state': ObjType(_('state'), 'state'),
})
directives = python_domain.PythonDomain.directives

2
doc/conf.py
View file

@ -387,7 +387,7 @@ html_short_title = 'Salt'
html_static_path = ['_static']
html_logo = None # specified in the theme layout.html
html_favicon = 'favicon.ico'
html_use_smartypants = False
smartquotes = False
# Use Google customized search or use Sphinx built-in JavaScript search
if on_saltstack: