From 34805dc064625eb7992aa812be3ddad03b37b956 Mon Sep 17 00:00:00 2001
From: Nick McCurdy <nick@nickmccurdy.com>
Date: Sat, 3 Oct 2020 20:38:19 -0400
Subject: [PATCH 1/3] Remove extra React Redux recipe stub from #588

---
 docs/example-react-redux.md | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 docs/example-react-redux.md

diff --git a/docs/example-react-redux.md b/docs/example-react-redux.md
deleted file mode 100644
index a0a01ca5f..000000000
--- a/docs/example-react-redux.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-id: example-react-redux
-title: React Redux
----
-
-Moved to
-[Writing Tests | Redux](https://redux.js.org/recipes/writing-tests#connected-components)

From 2b34e0286f3839ab8050da705e3ff18fee7027ee Mon Sep 17 00:00:00 2001
From: Nick McCurdy <nick@nickmccurdy.com>
Date: Sat, 3 Oct 2020 20:41:50 -0400
Subject: [PATCH 2/3] Remove duplicate redirect from #598 merge conflict

---
 netlify.toml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/netlify.toml b/netlify.toml
index ae464136b..f08278502 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -83,9 +83,6 @@
 [[redirects]]
   from = "/nightwatch/"
   to = "/docs/nightwatch-testing-library/intro"
-[[redirects]]
-  from = "https://testing-library.com/docs/example-react-redux"
-  to = "https://redux.js.org/recipes/writing-tests#connected-components"
 
 # Redirect screen error message to correct page
 [[redirects]]

From 2bbd457deb1a66e3b873b73a7cda003e9164eef6 Mon Sep 17 00:00:00 2001
From: Nick McCurdy <nick@nickmccurdy.com>
Date: Sat, 3 Oct 2020 20:46:49 -0400
Subject: [PATCH 3/3] Don't use hostnames in URLs for #611 error message

---
 netlify.toml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/netlify.toml b/netlify.toml
index f08278502..4a03f99c8 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -41,6 +41,11 @@
   from = "/docs/example-react-redux"
   to = "https://redux.js.org/recipes/writing-tests#connected-components"
 
+# Screen error message to correct page
+[[redirects]]
+  from = "/s/screen-global-error"
+  to = "/docs/dom-testing-library/api-queries#screen"
+
 # Reorganization (do not redirect if route is not 404)
 [[redirects]]
   from = "/docs/*"
@@ -83,8 +88,3 @@
 [[redirects]]
   from = "/nightwatch/"
   to = "/docs/nightwatch-testing-library/intro"
-
-# Redirect screen error message to correct page
-[[redirects]]
-  from = "https://testing-library.com/s/screen-global-error"
-  to = "https://testing-library.com/docs/dom-testing-library/api-queries#screen"