From 56ab65848cb894bfe656022b17d1e1687811708a Mon Sep 17 00:00:00 2001
From: Hugo Herbelin
Date: Fri, 24 Jul 2020 22:35:17 +0200
Subject: Fixes #12752 (applying symbol escaping in index produced by coqdoc).

This is to avoid collision with the syntax of the host output language.
---
 tools/coqdoc/output.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/coqdoc/output.ml b/tools/coqdoc/output.ml
index def1cbbcf8..32cf05e1eb 100644
--- a/tools/coqdoc/output.ml
+++ b/tools/coqdoc/output.ml
@@ -838,7 +838,7 @@ module Html = struct
       printf "<a id=\"%s_%c\"></a><h2>%s %s</h2>\n" idx c (display_letter c) cat;
       List.iter
         (fun (id,(text,link,t)) ->
-           let id' = prepare_entry id t in
+           let id' = escaped (prepare_entry id t) in
            printf "<a href=\"%s\">%s</a> %s<br/>\n" link id' text) l;
       printf "<br/><br/>"
     end
-- 
cgit v1.2.3


From 23303e6d2129e4e63252643fc84f42ac8dcec48c Mon Sep 17 00:00:00 2001
From: Hugo Herbelin
Date: Fri, 24 Jul 2020 22:40:40 +0200
Subject: Adding change log for #12754.

---
 doc/changelog/08-tools/12754-master+fix-coqdoc-index-escaping.rst | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 doc/changelog/08-tools/12754-master+fix-coqdoc-index-escaping.rst

diff --git a/doc/changelog/08-tools/12754-master+fix-coqdoc-index-escaping.rst b/doc/changelog/08-tools/12754-master+fix-coqdoc-index-escaping.rst
new file mode 100644
index 0000000000..a05829b720
--- /dev/null
+++ b/doc/changelog/08-tools/12754-master+fix-coqdoc-index-escaping.rst
@@ -0,0 +1,6 @@
+- **Fixed:**
+  Special symbols now escaped in the index produced by coqdoc,
+  avoiding collision with the syntax of the output format
+  (`#12754 <https://github.com/coq/coq/pull/12754>`_,
+  fixes `#12752 <https://github.com/coq/coq/issues/12752>`_,
+  by Hugo Herbelin).
-- 
cgit v1.2.3