From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 13 Mar 2021 12:34:46 +0000 (-0800)
Subject: Update link to Django's Context class. (GH-24805) (#24841)
X-Git-Tag: v3.9.3~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5c674e44798ba3235e7786b3cf3bc43a4d4e8102;p=thirdparty%2FPython%2Fcpython.git

Update link to Django's Context class. (GH-24805) (#24841)

* Update link to Django's Context class.
* Update link to get-pip.py.
(cherry picked from commit d0a445490e2c0e1d2aef3005f14211d9a85196bf)

Co-authored-by: Mariusz Felisiak <felisiak.mariusz@gmail.com>
---

diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
index 2ffdb49dbe6d..4dc1b9fc2ec7 100644
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -128,7 +128,7 @@ The class can be used to simulate nested scopes and is useful in templating.
       writing to any mapping in the chain.
 
     * Django's `Context class
-      <https://github.com/django/django/blob/master/django/template/context.py>`_
+      <https://github.com/django/django/blob/main/django/template/context.py>`_
       for templating is a read-only chain of mappings.  It also features
       pushing and popping of contexts similar to the
       :meth:`~collections.ChainMap.new_child` method and the
diff --git a/Doc/library/venv.rst b/Doc/library/venv.rst
index 8abadc4df3ca..e020570896ac 100644
--- a/Doc/library/venv.rst
+++ b/Doc/library/venv.rst
@@ -400,7 +400,7 @@ subclass which installs setuptools and pip into a created virtual environment::
             :param context: The information for the virtual environment
                             creation request being processed.
             """
-            url = 'https://raw.github.com/pypa/pip/master/contrib/get-pip.py'
+            url = 'https://bootstrap.pypa.io/get-pip.py'
             self.install_script(context, 'pip', url)
 
     def main(args=None):