diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index f66b055362..6ddc0ed7df 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -12,7 +12,7 @@ stepback: true
 # Actual testing tasks are marked with `type: test`
 command_type: system
 
-# Protect ourself against rogue test case, or curl gone wild, that runs forever
+# Protect ourselves against rogue test case, or curl gone wild, that runs forever
 # Good rule of thumb: the averageish length a task takes, times 5
 # That roughly accounts for variable system performance for various buildvariants
 exec_timeout_secs: 3600 # 60 minutes is the longest we'll ever run (primarily
@@ -1174,6 +1174,7 @@ tasks:
         - func: "build release"
           vars:
               VERSION: "3.7"
+        - func: "upload release"
 
     - name: "release-windows"
       tags: ["release_tag"]
diff --git a/doc/atlas.rst b/doc/atlas.rst
index 6685cf9fb8..19ba9732f2 100644
--- a/doc/atlas.rst
+++ b/doc/atlas.rst
@@ -35,7 +35,7 @@ Connections to Atlas require TLS/SSL.
 
   You can read more about TLS versions and their security implications here:
 
-  `<https://cheatsheetseries.owasp.org/cheatsheets/Transport_Layer_Protection_Cheat_Sheet.html#only-support-strong-protocols>`_
+  `<https://cheatsheetseries.owasp.org/cheatsheets/Transport_Layer_Security_Cheat_Sheet.html#only-support-strong-protocols>`_
 
 .. _python.org: https://www.python.org/downloads/
 .. _homebrew: https://brew.sh/
diff --git a/doc/compatibility-policy.rst b/doc/compatibility-policy.rst
index a20b9681eb..834f86ce54 100644
--- a/doc/compatibility-policy.rst
+++ b/doc/compatibility-policy.rst
@@ -59,4 +59,4 @@ deprecated PyMongo features.
 
 .. _the warnings module: https://docs.python.org/3/library/warnings.html
 
-.. _the -W command line option: https://docs.python.org/3/using/cmdline.html#cmdoption-w
+.. _the -W command line option: https://docs.python.org/3/using/cmdline.html#cmdoption-W
diff --git a/doc/examples/tls.rst b/doc/examples/tls.rst
index 557ee7d9b9..9241ac23e7 100644
--- a/doc/examples/tls.rst
+++ b/doc/examples/tls.rst
@@ -32,7 +32,7 @@ MongoDB.
 
   You can read more about TLS versions and their security implications here:
 
-  `<https://cheatsheetseries.owasp.org/cheatsheets/Transport_Layer_Protection_Cheat_Sheet.html#only-support-strong-protocols>`_
+  `<https://cheatsheetseries.owasp.org/cheatsheets/Transport_Layer_Security_Cheat_Sheet.html#only-support-strong-protocols>`_
 
 .. _python.org: https://www.python.org/downloads/
 .. _homebrew: https://brew.sh/
diff --git a/doc/tools.rst b/doc/tools.rst
index 7aea84cb0c..6dd0df8a4d 100644
--- a/doc/tools.rst
+++ b/doc/tools.rst
@@ -44,7 +44,7 @@ MincePy
    workflow as possible.
 
 Ming
-  `Ming <http://merciless.sourceforge.net/>`_ (the Merciless) is a
+  `Ming <https://ming.readthedocs.io/en/latest/>`_ is a
   library that allows you to enforce schemas on a MongoDB database in
   your Python application. It was developed by `SourceForge
   <http://sourceforge.net/>`_ in the course of their migration to
diff --git a/pymongo/collection.py b/pymongo/collection.py
index 7f4354e7d1..9630b83d91 100644
--- a/pymongo/collection.py
+++ b/pymongo/collection.py
@@ -2898,7 +2898,7 @@ def watch(
         .. seealso:: The MongoDB documentation on `changeStreams <https://mongodb.com/docs/manual/changeStreams/>`_.
 
         .. _change streams specification:
-            https://github.com/mongodb/specifications/blob/master/source/change-streams/change-streams.rst
+            https://github.com/mongodb/specifications/blob/master/source/change-streams/change-streams.md
         """
         return CollectionChangeStream(
             self,
diff --git a/pymongo/database.py b/pymongo/database.py
index 70cdee2dc3..a52b3a29a5 100644
--- a/pymongo/database.py
+++ b/pymongo/database.py
@@ -666,7 +666,7 @@ def watch(
         .. seealso:: The MongoDB documentation on `changeStreams <https://mongodb.com/docs/manual/changeStreams/>`_.
 
         .. _change streams specification:
-            https://github.com/mongodb/specifications/blob/master/source/change-streams/change-streams.rst
+            https://github.com/mongodb/specifications/blob/master/source/change-streams/change-streams.md
         """
         return DatabaseChangeStream(
             self,
diff --git a/pymongo/mongo_client.py b/pymongo/mongo_client.py
index 53d0ffda75..089f68b77a 100644
--- a/pymongo/mongo_client.py
+++ b/pymongo/mongo_client.py
@@ -1030,7 +1030,7 @@ def watch(
         .. seealso:: The MongoDB documentation on `changeStreams <https://mongodb.com/docs/manual/changeStreams/>`_.
 
         .. _change streams specification:
-            https://github.com/mongodb/specifications/blob/master/source/change-streams/change-streams.rst
+            https://github.com/mongodb/specifications/blob/master/source/change-streams/change-streams.md
         """
         return ClusterChangeStream(
             self.admin,