Commit dfbe233d by Carsten Brandt

Merge branch 'temp' of https://github.com/klevron/yii2

* 'temp' of https://github.com/klevron/yii2: Links fix [skip ci] Models link fix [skip ci] Install link fix [skip ci] Conflicts: docs/guide/intro-upgrade-from-v1.md
parents 98be88c7 3ffe3d06
...@@ -17,7 +17,7 @@ Installation ...@@ -17,7 +17,7 @@ Installation
Yii 2.0 fully embraces [Composer](https://getcomposer.org/), the de facto PHP package manager. Installation Yii 2.0 fully embraces [Composer](https://getcomposer.org/), the de facto PHP package manager. Installation
of the core framework, as well as extensions, are handled through Composer. Please refer to of the core framework, as well as extensions, are handled through Composer. Please refer to
the [Starting from Basic App](start-basic.md) section to learn how to install Yii 2.0. If you want to the [Installing Yii](start-installation.md) section to learn how to install Yii 2.0. If you want to
create new extensions, or turn your existing 1.1 extensions into 2.0-compatible extensions, please refer to create new extensions, or turn your existing 1.1 extensions into 2.0-compatible extensions, please refer to
the [Creating Extensions](extend-creating-extensions.md) section of the guide. the [Creating Extensions](extend-creating-extensions.md) section of the guide.
...@@ -203,7 +203,7 @@ In most cases, you do not need to override [[yii\base\Model::scenarios()|scenari ...@@ -203,7 +203,7 @@ In most cases, you do not need to override [[yii\base\Model::scenarios()|scenari
if the [[yii\base\Model::rules()|rules()]] method fully specifies the scenarios that will exist, and if there is no need to declare if the [[yii\base\Model::rules()|rules()]] method fully specifies the scenarios that will exist, and if there is no need to declare
`unsafe` attributes. `unsafe` attributes.
To learn more details about models, please refer to the [Models](basic-models.md) section. To learn more details about models, please refer to the [Models](structure-models.md) section.
Controllers Controllers
...@@ -322,7 +322,7 @@ public function behaviors() ...@@ -322,7 +322,7 @@ public function behaviors()
} }
``` ```
Please refer to the [Filtering](runtime-filtering.md) section for more details. Please refer to the [Filtering](structure-filters.md) section for more details.
Assets Assets
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment