Merge remote-tracking branch 'upstream/master'

docs/helpful-guides/first-steps.md

@@ -30,7 +30,7 @@ Put this in your migration:
             $auth = Yii::$app->authManager;
                 
             // create a role named "administrator"
-            $administratorRole = $auth->createRole('administrator');
+            $administratorRole = $auth->createRole('admin');
             $administratorRole->description = 'Administrator';
             $auth->add($administratorRole);
 
@@ -65,7 +65,7 @@ Put this in your migration:
 
             // delete admin-user and administrator role
             $administratorRole = $auth->getRole("administrator");
-            $user = \Da\User\Model\User::findOne(['name'=>"admin"]);
+            $user = \Da\User\Model\User::findOne(['username'=>"admin"]);
             $auth->revoke($administratorRole, $user->id);
             $user->delete();
             $auth->remove($administratorRole);

docs/installation/configuration-options.md

@@ -220,5 +220,17 @@ Set to `true` to restrict user assignments to roles only.
 
 If `true` registration and last login IPs are not logged into users table, instead a dummy 127.0.0.1 is used
 
+#### minPasswordRequirements (type: `array`, default: `['lower' => 1, 'digit' => 1, 'upper' => 1]`)
+
+Minimum requirements when a new password is automatically generated.
+Array structure: `"requirement" => minimum_number_characters`.
+
+Possible array keys:
+- lower: minimum number of lowercase characters;
+- upper: minimum number of uppercase characters;
+- digit: minimum number of digits;
+- special: minimum number of special characters;
+- min: minimum number of characters (= minimum length).
+
 
 © [2amigos](http://www.2amigos.us/) 2013-2019