Merge pull request yiisoft#8722 from faxriddin/master

structure_controllers
nikser · Jun 9, 2015 · 10d9bf1 · 10d9bf1
2 parents c378c8d + 302d040
commit 10d9bf1
Show file tree

Hide file tree

Showing 2 changed files with 437 additions and 1 deletion.
diff --git a/docs/guide-uz/intro-upgrade-from-v1.md b/docs/guide-uz/intro-upgrade-from-v1.md
@@ -83,7 +83,7 @@ class MyClass extends \yii\base\Object
 
 Yuqoridagi misolda oxirgi parametr obekt xususiyatlarini qiymatlovchi sozlashlar massivi ya'ni kalit-qiymat formatidagi juftlikdan iborat bo'lishi kerak. Siz sozlashlar qo'llanilganidan keyin initsializatsiya ishini amalga oshirish uchun oldindan [[yii\base\Object::init()|init()]] metod yaratib qo'yishingiz mumkin.
 
-Ushbu kelishuvga asoslanib siz sozlash massivi yordamida yangi obektlarni yaratish va sozlashingiz mumkin:
+Ushbu kelishuvga asoslanib siz sozlash massivi yordamida yangi obektlarni yaratishingiz va sozlashingiz mumkin:
 
 ```php
 $object = Yii::createObject([