summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-01-29 17:44:20 +0100
committerAndrey Andreev <narf@devilix.net>2015-01-29 17:44:20 +0100
commita92de4b8d6675c458e71f56b8e600e9e03af0430 (patch)
tree33650db0cd16ddfa89ad780b2ae69bbfeaf7d678 /user_guide_src/source
parent00c222db1e23ecc3692a5ca5664d8fc25f1789fc (diff)
parent56560be4c55cf624ab0160683a446259fd9d0b9d (diff)
Merge pull request #3531 from galdiolo/patch-6
[ci skip] Fix a changelog typo
Diffstat (limited to 'user_guide_src/source')
-rw-r--r--user_guide_src/source/changelog.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index f0202dd02..69cc8aca1 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -538,7 +538,7 @@ Release Date: Not Released
- Changed method ``load()`` to filter the language name with ``ctype_alpha()``.
- Changed method ``load()`` to also accept an array of language files.
- Added an optional second parameter to method ``line()`` to disable error logging for line keys that were not found.
- - Language files are now loaded in a cascading style with the one in **system/** always loaded and overriden afterwards, if another one is found.
+ - Language files are now loaded in a cascading style with the one in **system/** always loaded and overridden afterwards, if another one is found.
- :doc:`Hooks Library <general/hooks>` changes include: