summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien <damien@dam.io>2018-06-19 10:52:15 +0200
committerTim Graham <timograham@gmail.com>2018-06-19 09:14:36 -0400
commit56f1a3529a78733cb105765fe5f9ce4af16667d8 (patch)
tree4d046fc6fed93e19d06d9407e8981acc25df7451
parent037565fd6490c47c5e0325bc45009e53482d852c (diff)
downloaddjango-56f1a3529a78733cb105765fe5f9ce4af16667d8.tar.gz
[2.1.x] Clarified sentence about removal of inline flag support in url().
Backport of 7409d21a5ee7614db7276f06bfe412b24ff24059 from master
-rw-r--r--docs/internals/deprecation.txt4
-rw-r--r--docs/releases/2.1.txt3
2 files changed, 4 insertions, 3 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index 99a16f50fd..c8148e8433 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -85,8 +85,8 @@ details on these changes.
* The ``Model._meta.has_auto_field`` attribute will be removed.
-* Support for regular expression groups with ``iLmsu#`` in ``url()`` will be
- removed.
+* ``url()``'s support for inline flags in regular expression groups (``(?i)``,
+ ``(?L)``, ``(?m)``, ``(?s)``, and ``(?u)``) will be removed.
* Support for ``Widget.render()`` methods without the ``renderer`` argument
will be removed.
diff --git a/docs/releases/2.1.txt b/docs/releases/2.1.txt
index c68f673d84..2227187c90 100644
--- a/docs/releases/2.1.txt
+++ b/docs/releases/2.1.txt
@@ -456,7 +456,8 @@ to remove usage of these features.
* The ``Model._meta.has_auto_field`` attribute is removed.
-* Support for regular expression groups with ``iLmsu#`` in ``url()`` is removed.
+* ``url()``'s support for inline flags in regular expression groups (``(?i)``,
+ ``(?L)``, ``(?m)``, ``(?s)``, and ``(?u)``) is removed.
* Support for ``Widget.render()`` methods without the ``renderer`` argument
is removed.