Merge pull request #3290 from crtlib/master

docs/guide/intro-upgrade-from-v1.md

@@ -181,7 +181,7 @@ In the above, two scenarios are declared: `backend` and `frontend`. For the `bac
 The [[yii\base\Model::rules()|rules()]] method is still used to declare validation rules. Note that because
 of the introduction of [[yii\base\Model::scenarios()|scenarios()]], there is no more `unsafe` validator.
 
-In most cases, you do not need to overwrite [[yii\base\Model::scenarios()|scenarios()]]
+In most cases, you do not need to override [[yii\base\Model::scenarios()|scenarios()]]
 if the [[yii\base\Model::rules()|rules()]] method fully specifies the scenarios and there is no need to declare
 `unsafe` attributes.
 

framework/db/Migration.php

@@ -17,11 +17,11 @@ use yii\di\Instance;
  * Each child class of Migration represents an individual database migration which
  * is identified by the child class name.
  *
- * Within each migration, the [[up()]] method should be overwritten to contain the logic
+ * Within each migration, the [[up()]] method should be overridden to contain the logic
  * for "upgrading" the database; while the [[down()]] method for the "downgrading"
  * logic. The "yii migrate" command manages all available migrations in an application.
  *
- * If the database supports transactions, you may also overwrite [[safeUp()]] and
+ * If the database supports transactions, you may also override [[safeUp()]] and
  * [[safeDown()]] so that if anything wrong happens during the upgrading or downgrading,
  * the whole migration can be reverted in a whole.
  *
@@ -55,7 +55,7 @@ class Migration extends \yii\base\Component
 
     /**
      * This method contains the logic to be executed when applying this migration.
-     * Child classes may overwrite this method to provide actual migration logic.
+     * Child classes may override this method to provide actual migration logic.
      * @return boolean return a false value to indicate the migration fails
      * and should not proceed further. All other return values mean the migration succeeds.
      */