From 33b760eca2138de3f7e5287493f9228e3c630c57 Mon Sep 17 00:00:00 2001 From: munawer Date: Tue, 4 Nov 2014 13:29:00 +0530 Subject: [PATCH] [ci skip] Guide typos fixed --- extensions/jui/CHANGELOG.md | 4 ++-- extensions/redis/README.md | 4 ++-- extensions/smarty/CHANGELOG.md | 2 +- framework/base/Security.php | 2 +- framework/console/controllers/FixtureController.php | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/extensions/jui/CHANGELOG.md b/extensions/jui/CHANGELOG.md index 27ba8fa..438e615 100644 --- a/extensions/jui/CHANGELOG.md +++ b/extensions/jui/CHANGELOG.md @@ -17,7 +17,7 @@ Yii Framework 2 jui extension Change Log --------------------------- - Chg #1551: Jui datepicker has a new property `$dateFormat` which is used to set the clientOption `dateFormat`. - The new property does not use the datepicker formatting synax anymore but uses the same as the `yii\i18n\Formatter` + The new property does not use the datepicker formatting syntax anymore but uses the same as the `yii\i18n\Formatter` class which is the ICU syntax for date formatting, you have to adjust all your DatePicker widgets to use the new property instead of setting the dateFormat in the clientOptions (cebe) @@ -27,7 +27,7 @@ Yii Framework 2 jui extension Change Log - Bug #1550: fixed the issue that JUI input widgets did not property input IDs. (qiangxue) - Bug #2514: Jui sortable clientEvents were not working because of wrong naming assumptions. (cebe) -- Enh #2573: Jui datepicker now uses the current appliaction language by default. (andy5) +- Enh #2573: Jui datepicker now uses the current application language by default. (andy5) 2.0.0-alpha, December 1, 2013 ----------------------------- diff --git a/extensions/redis/README.md b/extensions/redis/README.md index 0e76b00..c67fd98 100644 --- a/extensions/redis/README.md +++ b/extensions/redis/README.md @@ -2,7 +2,7 @@ Redis Cache, Session and ActiveRecord for Yii 2 =============================================== This extension provides the [redis](http://redis.io/) key-value store support for the Yii2 framework. -It includes a `Cache` and `Session` storage handler and implents the `ActiveRecord` pattern that allows +It includes a `Cache` and `Session` storage handler and implements the `ActiveRecord` pattern that allows you to store active records in redis. To use this extension, you have to configure the Connection class in your application configuration: @@ -87,7 +87,7 @@ return [ Using the Session component --------------------------- -To use the `Session` component, in addtition to configuring the connection as described above, +To use the `Session` component, in addition to configuring the connection as described above, you also have to configure the `session` component to be `yii\redis\Session`: ```php diff --git a/extensions/smarty/CHANGELOG.md b/extensions/smarty/CHANGELOG.md index 3c8a701..a32bed5 100644 --- a/extensions/smarty/CHANGELOG.md +++ b/extensions/smarty/CHANGELOG.md @@ -19,7 +19,7 @@ Yii Framework 2 smarty extension Change Log - Enh #4619 (samdark, hwmaier) - New functions: - `url` generates absolute URL. - - `set` allows setting commonly used view paramters: `title`, `theme` and `layout`. + - `set` allows setting commonly used view parameters: `title`, `theme` and `layout`. - `meta` registers meta tag. - `registerJsFile` registers JavaScript file. - `registerCssFile` registers CSS file. diff --git a/framework/base/Security.php b/framework/base/Security.php index eac00a5..55bfe2c 100644 --- a/framework/base/Security.php +++ b/framework/base/Security.php @@ -85,7 +85,7 @@ class Security extends Component * The encrypted data includes a keyed message authentication code (MAC) so there is no need * to hash input or output data. * > Note: Avoid encrypting with passwords wherever possible. Nothing can protect against - * poor-quality or compromosed passwords. + * poor-quality or compromised passwords. * @param string $data the data to encrypt * @param string $password the password to use for encryption * @return string the encrypted data diff --git a/framework/console/controllers/FixtureController.php b/framework/console/controllers/FixtureController.php index 2f83134..a1a6a36 100644 --- a/framework/console/controllers/FixtureController.php +++ b/framework/console/controllers/FixtureController.php @@ -423,7 +423,7 @@ class FixtureController extends Controller /** * Filters fixtures by splitting them in two categories: one that should be applied and not. * If fixture is prefixed with "-", for example "-User", that means that fixture should not be loaded, - * if it is not prefixed it is considered as one to be loaded. Returs array: + * if it is not prefixed it is considered as one to be loaded. Returns array: * * ~~~ * [