From b6b77955f2e3363f3271a56ee323c836c81f8997 Mon Sep 17 00:00:00 2001
From: Julien Palard <julien@palard.fr>
Date: Sun, 9 Dec 2018 06:56:59 +0100
Subject: [3.7] Doc: Disable smartquotes for zh-tw, zh-cn, fr and ja
 translations (GH-9423) (GH-10344)

(cherry picked from commit c03bf0ae794c3bec9b56f38164535fd1f5bfc04a)
---
 Doc/conf.py       | 9 +++++++--
 Doc/docutils.conf | 2 --
 2 files changed, 7 insertions(+), 4 deletions(-)
 delete mode 100644 Doc/docutils.conf

diff --git a/Doc/conf.py b/Doc/conf.py
index b7bb5a0..124cb7a 100644
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -34,13 +34,18 @@ today_fmt = '%B %d, %Y'
 # By default, highlight as Python 3.
 highlight_language = 'python3'
 
-# Require Sphinx 1.2 for build.
-needs_sphinx = '1.2'
+# Require Sphinx 1.7 for build.
+needs_sphinx = '1.7'
 
 # Ignore any .rst files in the venv/ directory.
 venvdir = os.getenv('VENVDIR', 'venv')
 exclude_patterns = [venvdir+'/*', 'README.rst']
 
+# Disable Docutils smartquotes for several translations
+smartquotes_excludes = {
+    'languages': ['ja', 'fr', 'zh_TW', 'zh_CN'], 'builders': ['man', 'text'],
+}
+
 
 # Options for HTML output
 # -----------------------
diff --git a/Doc/docutils.conf b/Doc/docutils.conf
deleted file mode 100644
index bda4f5d..0000000
--- a/Doc/docutils.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[restructuredtext parser]
-smartquotes-locales: ja: ""''
-- 
cgit v0.12