diff options
| author | Andrew <browner12@gmail.com> | 2014-02-11 09:55:48 +0100 |
|---|---|---|
| committer | Andrew <browner12@gmail.com> | 2014-02-11 09:55:48 +0100 |
| commit | b6d8b962e44202a74c9b9321a4a53f61a753fccf (patch) | |
| tree | 2d3c533a55964a0d124f7cd6bb1d3d98c7b84056 /user_guide_src/source/installation/upgrade_200.rst | |
| parent | 41713aaa665189dd0a191c333c73c4a7b9f37c78 (diff) | |
| parent | 29e12641a1bb952f493462db6757ae12c7da1f2c (diff) | |
Merge branch 'develop' into patch-1
Conflicts:
system/libraries/Calendar.php
Diffstat (limited to 'user_guide_src/source/installation/upgrade_200.rst')
| -rw-r--r-- | user_guide_src/source/installation/upgrade_200.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/user_guide_src/source/installation/upgrade_200.rst b/user_guide_src/source/installation/upgrade_200.rst index 29f44bd9e..948b1bc58 100644 --- a/user_guide_src/source/installation/upgrade_200.rst +++ b/user_guide_src/source/installation/upgrade_200.rst @@ -50,11 +50,11 @@ to :: Step 4: Update stored encrypted data ==================================== -.. note:: If your application does not use the Encryption library, does +.. note:: If your application does not use the Encrypt library, does not store Encrypted data permanently, or is on an environment that does not support Mcrypt, you may skip this step. -The Encryption library has had a number of improvements, some for +The Encrypt library has had a number of improvements, some for encryption strength and some for performance, that has an unavoidable consequence of making it no longer possible to decode encrypted data produced by the original version of this library. To help with the @@ -65,7 +65,7 @@ replace stale encrypted data with fresh in your applications, either on the fly or en masse. Please read `how to use this -method <../libraries/encryption.html#legacy>`_ in the Encryption library +method <../libraries/encrypt.html#legacy>`_ in the Encrypt library documentation. Step 5: Remove loading calls for the compatibility helper. |