From f31898e18c5235f43cfd82f170d79ee5df3927bc Mon Sep 17 00:00:00 2001
From: Ed Morley <501702+edmorley@users.noreply.github.com>
Date: Fri, 31 Jul 2020 13:15:23 +0100
Subject: [PATCH 1/3] Fix typos in the docs about conflicting dependencies

Previously:
- the example wildcard version string was being rendered with a stray
  space (`== 3.1. *` instead of `== 3.1.*`) due to the markup being
  split over two lines
- the "Dependency Hell" Wikipedia URL 404ed due to the trailing `>`
---
 docs/html/user_guide.rst                          | 6 +++---
 news/AE707F60-0ABE-4DBA-98AA-59CE8F989386.trivial | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 news/AE707F60-0ABE-4DBA-98AA-59CE8F989386.trivial

diff --git a/docs/html/user_guide.rst b/docs/html/user_guide.rst
index 31887a2880c..4f276e46aa1 100644
--- a/docs/html/user_guide.rst
+++ b/docs/html/user_guide.rst
@@ -838,8 +838,8 @@ specifying package versions (e.g. ``~=`` or ``*``):
   semantic versioning.", "``~=3.1``: version ``3.1`` or later, but not version
   ``4.0`` or later. ``~=3.1.2``: version ``3.1.2`` or later, but not
   version ``3.2.0`` or later."
-  ``*``,Can be used at the end of a version number to represent "all", "``== 3.
-  1.*``: any version that starts with ``3.1``. Equivalent to ``~=3.1.0``."
+  ``*``,Can be used at the end of a version number to represent "all", "``== 3.1.*``:
+  any version that starts with ``3.1``. Equivalent to ``~=3.1.0``."
 
 The detailed specification of supported comparison operators can be
 found in :pep:`440`.
@@ -945,7 +945,7 @@ Unfortunately, **the pip team cannot provide support for individual
 dependency conflict errors**. Please *only* open a ticket on the `pip
 issue tracker`_ if you believe that your problem has exposed a bug in pip.
 
-.. _dependency hell: https://en.wikipedia.org/wiki/Dependency_hell>
+.. _dependency hell: https://en.wikipedia.org/wiki/Dependency_hell
 .. _Awesome Python: https://python.libhunt.com/
 .. _Python user Discourse: https://discuss.python.org/c/users/7
 .. _Python user forums: https://www.python.org/community/forums/
diff --git a/news/AE707F60-0ABE-4DBA-98AA-59CE8F989386.trivial b/news/AE707F60-0ABE-4DBA-98AA-59CE8F989386.trivial
new file mode 100644
index 00000000000..e69de29bb2d

From 22aec424d96f48e0054505070eb57b873f0089e0 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam <3275593+pradyunsg@users.noreply.github.com>
Date: Sun, 2 Aug 2020 07:46:54 +0530
Subject: [PATCH 2/3] Rewrap lines
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Nguyễn Gia Phong <mcsinyx@disroot.org>
---
 docs/html/user_guide.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/html/user_guide.rst b/docs/html/user_guide.rst
index 4f276e46aa1..b0b25677ee5 100644
--- a/docs/html/user_guide.rst
+++ b/docs/html/user_guide.rst
@@ -838,8 +838,9 @@ specifying package versions (e.g. ``~=`` or ``*``):
   semantic versioning.", "``~=3.1``: version ``3.1`` or later, but not version
   ``4.0`` or later. ``~=3.1.2``: version ``3.1.2`` or later, but not
   version ``3.2.0`` or later."
-  ``*``,Can be used at the end of a version number to represent "all", "``== 3.1.*``:
-  any version that starts with ``3.1``. Equivalent to ``~=3.1.0``."
+  ``*``, Can be used at the end of a version number to represent "all",
+  "``==3.1.*``: any version that starts with ``3.1``.
+  Equivalent to ``~=3.1.0``."
 
 The detailed specification of supported comparison operators can be
 found in :pep:`440`.

From 57ee51c2b187728d7fbff268907c33c369718a11 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam <3275593+pradyunsg@users.noreply.github.com>
Date: Tue, 4 Aug 2020 06:55:17 +0530
Subject: [PATCH 3/3] Un-rewrap lines

---
 docs/html/user_guide.rst | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/html/user_guide.rst b/docs/html/user_guide.rst
index b0b25677ee5..9680486b09a 100644
--- a/docs/html/user_guide.rst
+++ b/docs/html/user_guide.rst
@@ -838,9 +838,8 @@ specifying package versions (e.g. ``~=`` or ``*``):
   semantic versioning.", "``~=3.1``: version ``3.1`` or later, but not version
   ``4.0`` or later. ``~=3.1.2``: version ``3.1.2`` or later, but not
   version ``3.2.0`` or later."
-  ``*``, Can be used at the end of a version number to represent "all",
-  "``==3.1.*``: any version that starts with ``3.1``.
-  Equivalent to ``~=3.1.0``."
+  ``*``,Can be used at the end of a version number to represent "all", "``== 3.
+  1.*``: any version that starts with ``3.1``. Equivalent to ``~=3.1.0``."
 
 The detailed specification of supported comparison operators can be
 found in :pep:`440`.