Release note / additional fix for wagtail#6339

highbiza · Oct 5, 2020 · dd42d91 · dd42d91
1 parent 07a4b41
commit dd42d91
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -23,6 +23,7 @@ Changelog
  * The `BASE_URL` setting is now converted to a str, if it isn't already, when constructing API URLs (thenewguy)
  * Preview from 'pages awaiting moderation' now opens in a new window (Cynthia Kiser)
  * Add document extension validation if `WAGTAIL_DOCS_EXTENSIONS` is set (Meghana Bhange)
+ * Use `django-admin` command in place of `django-admin.py` (minusf)
  * Fix: Make page-level actions accessible to keyboard users in page listing tables (Jesse Menn)
  * Fix: `WAGTAILFRONTENDCACHE_LANGUAGES` was being interpreted incorrectly. It now accepts a list of strings, as documented (Karl Hobley)
  * Fix: Update oEmbed endpoints to use https where available (Matt Westcott)

diff --git a/docs/releases/2.11.rst b/docs/releases/2.11.rst
@@ -31,7 +31,8 @@ Other features
  * Add check to disallow StreamField block names that do not match Python variable syntax (François Poulain)
  * The ``BASE_URL`` setting is now converted to a str, if it isn't already, when constructing API URLs (thenewguy)
  * Preview from 'pages awaiting moderation' now opens in a new window (Cynthia Kiser)
- * Add document extension validation if `WAGTAIL_DOCS_EXTENSIONS` is set to a list of allowed extensions (Meghana Bhange)
+ * Add document extension validation if ``WAGTAIL_DOCS_EXTENSIONS`` is set to a list of allowed extensions (Meghana Bhange)
+ * Use ``django-admin`` command in place of ``django-admin.py`` (minusf)
 
 
 Bug fixes

diff --git a/etc/uwsgi.conf.sample b/etc/uwsgi.conf.sample
@@ -71,7 +71,7 @@ cheaper-step        = 1
 # Application environment.
 env                 = PATH=/home/mywagtail/venv/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
 env                 = HOME=/home/mywagtail
-# Set $PYTHONPATH so that 'django-admin.py' worker without needing the
+# Set $PYTHONPATH so that 'django-admin' works without needing the
 # virtualenv active.
 env                 = PYTHONPATH=/home/mywagtail/app/mywagtail
 # Settings module.