From f5e38f401086d43e64f03db7e7fc7704ba18eee9 Mon Sep 17 00:00:00 2001
From: jfbu <jfbu@free.fr>
Date: Tue, 31 Jul 2018 09:27:55 +0200
Subject: [PATCH 1/2] LaTeX: avoid "The remreset package is obsolete" warnings
 in latex log

---
 sphinx/texinputs/sphinx.sty | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sphinx/texinputs/sphinx.sty b/sphinx/texinputs/sphinx.sty
index 2855f1a35..63faeb058 100644
--- a/sphinx/texinputs/sphinx.sty
+++ b/sphinx/texinputs/sphinx.sty
@@ -183,7 +183,10 @@
 % control caption around literal-block
 \RequirePackage{capt-of}
 \RequirePackage{needspace}
-\RequirePackage{remreset}% provides \@removefromreset
+% LaTeX 2018-04-01 and later provides \@removefromreset
+\ltx@ifundefined{@removefromreset}
+    {\RequirePackage{remreset}}
+    {}% avoid warning
 % to make pdf with correct encoded bookmarks in Japanese
 % this should precede the hyperref package
 \ifx\kanjiskip\@undefined

From cc6f0a26b1eb684157bddf74f1e9c2b369e86c17 Mon Sep 17 00:00:00 2001
From: jfbu <jfbu@free.fr>
Date: Tue, 31 Jul 2018 09:48:13 +0200
Subject: [PATCH 2/2] Update CHANGES

---
 CHANGES | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGES b/CHANGES
index 778df02e0..2f8f1fd9d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,6 +18,10 @@ Bugs fixed
 
 * #5198: document not in toctree warning when including files only for parallel
   builds
+* LaTeX: reduce "Token not allowed in a PDF string" hyperref warnings in latex
+  console output (refs: #5136)
+* LaTeX: suppress "remreset Warning: The remreset package is obsolete" in latex
+  console output with recent LaTeX (refs: #5137)
 
 Testing
 --------