Merge branch 'main' into release

Author: ewdurbin

Diff for: base-requirements.txt

@@ -4,7 +4,7 @@ django-sitetree==1.17.0
 django-apptemplates==1.5
 django-admin-interface==0.24.2
 django-translation-aliases==0.1.0
-Django==2.2.24
+Django==2.2.28
 docutils==0.12
 Markdown==3.3.4
 cmarkgfm==0.6.0

Diff for: config/nginx.conf

@@ -50,10 +50,6 @@ http {
                   return 301 http://www.python.org/psf;
                 }
 
-                location /psf/codeofconduct {
-                  return 301 /psf/conduct;
-                }
-
                 location /topics/xml {
                   return 301 http://pyxml.sourceforge.net/topics;
                 }
@@ -314,19 +310,19 @@ http {
                   return 301 https://python.org/blogs/;
                 }
 
-                location ^/psf/archive/codeofconduct/?$ {
+                location ~ ^/psf/archive/codeofconduct/?$ {
                     return 302 https://policies.python.org/python.org/code-of-conduct/;
                 }
-                location ^/psf/codeofconduct/?$ {
+                location ~ ^/psf/codeofconduct/?$ {
                     return 302 https://policies.python.org/python.org/code-of-conduct/;
                 }
-                location ^/psf/conduct/?$ {
+                location ~ ^/psf/conduct/?$ {
                     return 302 https://policies.python.org/python.org/code-of-conduct/;
                 }
-                location ^/psf/conduct/enforcement/?$ {
+                location ~ ^/psf/conduct/enforcement/?$ {
                     return 302 https://policies.python.org/python.org/code-of-conduct/Enforcement-Procedures/;
                 }
-                location ^/psf/conduct/reporting/?$ {
+                location ~ ^/psf/conduct/reporting/?$ {
                     return 302 https://policies.python.org/python.org/code-of-conduct/Procedures-for-Reporting-Incidents/;
                 }