Merge branch 'master' of git://github.com/yiisoft/yii2 into typo-security

This commit is contained in:
José Fournier
2016-08-28 10:08:24 +02:00
4 changed files with 70 additions and 70 deletions

View File

@ -375,5 +375,5 @@ Auto-generating fixtures
------------------------
Yii also can auto-generate fixtures for you based on some template. You can generate your fixtures with different data on different languages and formats.
These feature is done by [Faker](https://github.com/fzaninotto/Faker) library and `yii2-faker` extension.
This feature is done by [Faker](https://github.com/fzaninotto/Faker) library and `yii2-faker` extension.
See extension [guide](https://github.com/yiisoft/yii2-faker) for more docs.

View File

@ -33,7 +33,7 @@ not be trivial, but a complete upgrade guide will be available.
### `2.x.Y`: minor releases
Patch releases, which should be 100% BC-compatible. Ideally, we hope they contain only changes that do not affect backwards compatibilty
Patch releases, which should be 100% BC-compatible. Ideally, we hope they contain only changes that do not affect backwards compatibility
however it is not always possible to keep 100% BC-compatible, so upgrade notes are recorded in `UPGRADE.md`.
Practically, since 2.0.x is released more frequently, we are also adding minor features
to it so that users can enjoy them earlier.