summaryrefslogtreecommitdiffstats
path: root/user_guide_src
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2017-11-09 16:29:42 +0100
committerAndrey Andreev <narf@devilix.net>2017-11-09 16:29:42 +0100
commit4fed06145e798fcff79bbe571a3ee3e262fa484a (patch)
tree37229e1445cdce4860fa8f4032f2075d2be93de4 /user_guide_src
parentf9133e2ea006a796fdaf39d5421d99f1a9a57c80 (diff)
parent4541bf930e715917622dc2d225bf5517f99db35a (diff)
Merge branch '3.1-stable' into develop
Diffstat (limited to 'user_guide_src')
-rw-r--r--user_guide_src/source/changelog.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index c4ffbf5d7..56e587e9b 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -126,8 +126,8 @@ Release Date: Not Released
- General Changes
- - Updated :doc:`Form Validation Library <libraries/form_validation>` rule ``valid_email`` to use ``INTL_IDNA_VARIANT_UCS46`` for non-ASCII domain names.
- - Updated :doc:`Email Library <libraries/email>` to use ``INTL_IDNA_VARIANT_UCS46`` for non-ASCII domain names.
+ - Updated :doc:`Form Validation Library <libraries/form_validation>` rule ``valid_email`` to use ``INTL_IDNA_VARIANT_UTS46`` for non-ASCII domain names.
+ - Updated :doc:`Email Library <libraries/email>` to use ``INTL_IDNA_VARIANT_UTS46`` for non-ASCII domain names.
- Deprecated usage of :doc:`CAPTCHA Helper <helpers/captcha_helper>` function :php:func:`create_captcha()` with parameters other than ``$data``.
Bug fixes for 3.1.7