diff options
| author | David Smith <smithdc@gmail.com> | 2020-05-25 17:05:22 +0100 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2020-06-03 21:02:48 +0200 |
| commit | dbdc192ca30b70a9f22c6bc4b3155bbccd01c323 (patch) | |
| tree | bb8ddf9934dcf6ba05b9dd8e081a76f02f162a36 /docs/releases | |
| parent | 25352dc019d175dfa6e62a50de76cb3614955077 (diff) | |
Preferred usage of among/while to amongst/whilst.
Diffstat (limited to 'docs/releases')
| -rw-r--r-- | docs/releases/1.9.txt | 2 | ||||
| -rw-r--r-- | docs/releases/2.1.15.txt | 2 | ||||
| -rw-r--r-- | docs/releases/2.2.8.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/releases/1.9.txt b/docs/releases/1.9.txt index 69b41f1c08..07a75fc005 100644 --- a/docs/releases/1.9.txt +++ b/docs/releases/1.9.txt @@ -246,7 +246,7 @@ Minor features * The new :meth:`GDALRaster.warp() <django.contrib.gis.gdal.GDALRaster.warp>` method allows warping a raster by specifying target raster properties such as - origin, width, height, or pixel size (amongst others). + origin, width, height, or pixel size (among others). * The new :meth:`GDALRaster.transform() <django.contrib.gis.gdal.GDALRaster.transform>` method allows transforming a diff --git a/docs/releases/2.1.15.txt b/docs/releases/2.1.15.txt index 6715b369db..bb15f33d17 100644 --- a/docs/releases/2.1.15.txt +++ b/docs/releases/2.1.15.txt @@ -32,7 +32,7 @@ inlines in the admin form of an otherwise view-only parent model. Given the complexity of the Django admin, and in-particular the permissions related checks, it is the view of the Django security team that this change was necessary: that it is not currently feasible to maintain the existing behavior -whilst escaping the potential privilege escalation in a way that would avoid a +while escaping the potential privilege escalation in a way that would avoid a recurrence of similar issues in the future, and that would be compatible with Django's *safe by default* philosophy. diff --git a/docs/releases/2.2.8.txt b/docs/releases/2.2.8.txt index 76a6ad4f23..857ffff048 100644 --- a/docs/releases/2.2.8.txt +++ b/docs/releases/2.2.8.txt @@ -33,7 +33,7 @@ inlines in the admin form of an otherwise view-only parent model. Given the complexity of the Django admin, and in-particular the permissions related checks, it is the view of the Django security team that this change was necessary: that it is not currently feasible to maintain the existing behavior -whilst escaping the potential privilege escalation in a way that would avoid a +while escaping the potential privilege escalation in a way that would avoid a recurrence of similar issues in the future, and that would be compatible with Django's *safe by default* philosophy. |