From 9492db6eeab7c8d29d7f4374fdbafe659149b231 Mon Sep 17 00:00:00 2001
From: Clément Pit-Claudel
Date: Mon, 20 May 2019 17:32:59 -0400
Subject: [refman] Remove workaround for sphinx-doc/sphinx#4983

---
 doc/README.md                 | 2 +-
 doc/sphinx/conf.py            | 2 +-
 doc/tools/coqrst/coqdomain.py | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'doc')

diff --git a/doc/README.md b/doc/README.md
index 7fa6f5cf3d..e749bcf5d1 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -30,7 +30,7 @@ To produce the complete documentation in HTML, you will need Coq dependencies
 listed in [`INSTALL.md`](../INSTALL.md). Additionally, the Sphinx-based
 reference manual requires Python 3, and the following Python packages:
 
-  - sphinx >= 1.7.8
+  - sphinx >= 1.8.0
   - sphinx_rtd_theme >= 0.2.5b2
   - beautifulsoup4 >= 4.0.6
   - antlr4-python3-runtime >= 4.7.1
diff --git a/doc/sphinx/conf.py b/doc/sphinx/conf.py
index 98272810f6..3d77d07061 100755
--- a/doc/sphinx/conf.py
+++ b/doc/sphinx/conf.py
@@ -46,7 +46,7 @@ with open("refman-preamble.rst") as s:
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-needs_sphinx = '1.7.8'
+needs_sphinx = '1.8.0'
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
diff --git a/doc/tools/coqrst/coqdomain.py b/doc/tools/coqrst/coqdomain.py
index b92c94fe2c..f631707e32 100644
--- a/doc/tools/coqrst/coqdomain.py
+++ b/doc/tools/coqrst/coqdomain.py
@@ -493,9 +493,7 @@ class ProductionObject(CoqObject):
         pass
 
     def _target_id(self, name):
-        # Use `name[1]` instead of ``nodes.make_id(name[1])`` to work around
-        # https://github.com/sphinx-doc/sphinx/issues/4983
-        return 'grammar-token-{}'.format(name[1])
+        return 'grammar-token-{}'.format(nodes.make_id(name[1]))
 
     def _record_name(self, name, targetid):
         env = self.state.document.settings.env
-- 
cgit v1.2.3