Merge pull request #54894 from bryceml/2019.2.1_fix_docs

2019.2.1 fix docs

doc/Makefile

@@ -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

doc/_ext/saltdomain.py

@@ -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
@@ -290,7 +290,7 @@ class SaltDomain(python_domain.PythonDomain):
                     type, target, node, contnode)
 
 # Monkey-patch the Python domain remove the python module index
-python_domain.PythonDomain.indices = []
+python_domain.PythonDomain.indices = [SaltModuleIndex]
 
 
 def setup(app):

doc/_themes/saltstack2/layout.html

@@ -269,7 +269,7 @@
                                  <!--
                                  <a href="https://saltstack.com/saltstack-enterprise/" target="_blank"><img class="nolightbox footer-banner center" src="{{ pathto('_static/images/enterprise_ad.jpg', 1) }}"/></a>
                                  -->
-                                 <a href="http://saltconf.com/saltconf18-speakers/" target="_blank"><img class="nolightbox footer-banner center" src="{{ pathto('_static/images/DOCBANNER.png', 1) }}"/></a>
+                                 <a href="https://saltconf.com/ad" target="_blank"><img class="nolightbox footer-banner center" src="https://get.saltstack.com/rs/304-PHQ-615/images/Salt-docs-ad-330x330.png"/></a>
                             </div>
                             {% endif %}
                         </div>
@@ -291,6 +291,7 @@
                 {% else %}
                 <a href="http://saltstack.com/support" target="_blank"><img class="nolightbox sidebar-banner center" src="{{ pathto('_static/images/banner-support.png', 1) }}"/></a>
                 {% endif %}-->
+                <a href="https://saltconf.com/menu-ad" target="_blank"><img class="nolightbox sidebar-banner center" src="https://get.saltstack.com/rs/304-PHQ-615/images/Salt-docs-menu-ad-250x63.jpg"/></a>
 
 
                 {% if build_type=="next" %}

doc/conf.py

@@ -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: