Remove html_use_smartypants (deprecated)

doc/_static/conf.py.txt

@@ -167,11 +167,6 @@ html_static_path = ['_static']
 #
 # html_last_updated_fmt = None
 
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#
-# html_use_smartypants = True
-
 # Custom sidebar templates, maps document names to template names.
 #
 # html_sidebars = {}

doc/config.rst

@@ -765,18 +765,6 @@ that use Sphinx's HTMLWriter class.
    The empty string is equivalent to ``'%b %d, %Y'`` (or a
    locale-dependent equivalent).
 
-.. confval:: html_use_smartypants
-
-   If true, `SmartyPants <http://daringfireball.net/projects/smartypants/>`_
-   will be used to convert quotes and dashes to typographically correct
-   entities.  Default: ``True``.
-
-   .. deprecated:: 1.6
-      Use the `smart_quotes option`_ in the Docutils configuration file
-      (``docutils.conf``) instead.
-
-      .. _`smart_quotes option`: http://docutils.sourceforge.net/docs/user/config.html#smart-quotes
-
 .. confval:: html_add_permalinks
 
    Sphinx will add "permalinks" for each heading and description environment as

sphinx/builders/html.py

@@ -1346,7 +1346,6 @@ def setup(app):
     app.add_config_value('html_static_path', [], 'html')
     app.add_config_value('html_extra_path', [], 'html')
     app.add_config_value('html_last_updated_fmt', None, 'html', string_classes)
-    app.add_config_value('html_use_smartypants', None, 'html')
     app.add_config_value('html_sidebars', {}, 'html')
     app.add_config_value('html_additional_pages', {}, 'html')
     app.add_config_value('html_domain_indices', True, 'html', [list])

sphinx/environment/__init__.py

@@ -674,13 +674,7 @@ class BuildEnvironment(object):
         self.settings['gettext_compact'] = self.config.gettext_compact
         language = (self.config.language or 'en').replace('_', '-')
         self.settings['language_code'] = language
-        if self.config.html_use_smartypants is not None:
-            warnings.warn("html_use_smartypants option is deprecated. Use the "
-                          "smart_quotes option in docutils.conf instead.",
-                          RemovedInSphinx17Warning)
-            if language in smartchars.quotes:
-                self.settings['smart_quotes'] = self.config.html_use_smartypants
-        elif language in smartchars.quotes:  # We enable smartypants by default
+        if language in smartchars.quotes:  # We enable smartypants by default
             self.settings['smart_quotes'] = True
 
         docutilsconf = path.join(self.srcdir, 'docutils.conf')