Merge remote-tracking branch 'upstream/master' into password_expiration

docs/helpful-guides/how-to-implement-two-factor-auth.md

@@ -1,18 +1,18 @@
-How to Implement Two-Factor Auth
-================================
+How to Implement Two Factor Auth (2FA)
+======================================
 
-Two-Factor Authentication products add an additional layer of security. Typically, users are asked to prove their 
+Two Factor Authentication products add an additional layer of security. Typically, users are asked to prove their 
 identity by providing simple credentials such as an email address and a password. A second factor (2F) adds an extra 
 layer of unauthorized access protection by prompting the user to provide an additional means of authentication such as 
 a physical token (e.g. a card) or an additional secret that only they know.
 
-With this module is quite easy. It basically implements two-factor authentication using the following 2amigos libraries: 
+With this module is quite easy. It basically implements two factor authentication using the following 2amigos libraries: 
 
 - [2amigos/2fa-library](https://github.com/2amigos/2fa-library)
 - [2amigos/qrcode-library](https://github.com/2amigos/qrcode-library)
 
 
-Enable Two-Factor 
+Enable Two Factor 
 -----------------
 
 We simply need to enable two factor authentication: 
@@ -26,7 +26,7 @@ We simply need to enable two factor authentication:
 ]
 ```
 
-Now, when the user go to its settings via `user/settings`, it will display the option to enable two-factor 
+Now, when the user go to its settings via `user/settings`, it will display the option to enable two factor 
 authentication or not. 
 
 When enabled, the module will show a modal with a QrCode that has to be scanned by the Google Authenticator App 
@@ -35,15 +35,15 @@ When enabled, the module will show a modal with a QrCode that has to be scanned
 [iTunes](https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8)). 
 
 The application will display a code that needs to be inserted into the modal input box. If code verification goes well, 
-it will enable the two-factor for the user. 
+it will enable the two factor for the user. 
 
-If a user has enabled the two-factor, and after successfully login via username and email, it will render a new section 
+If a user has enabled the two factor, and after successfully login via username and email, it will render a new section 
 where user will have to enter the code displayed on its Google Authenticator App in order to complete with the login 
 process. 
 
 
 ### Recommended Reading
 
-- [2amigos Two-Factor Library Docs]()http://2fa-library.readthedocs.io/en/latest/)
+- [2amigos Two Factor Library Docs]()http://2fa-library.readthedocs.io/en/latest/)
 
 © [2amigos](http://www.2amigos.us/) 2013-2017

docs/helpful-guides/social-network-authentication.md

@@ -31,7 +31,7 @@ After you need to configure the `authClientCollection::clients` on your Applicat
             'facebook' => [
                 'class' => 'Da\User\AuthClient\Facebook',
                 'clientId' => 'facebook_client_id',
-                'clientScret' => 'facebook_client_secret'
+                'clientSecret' => 'facebook_client_secret'
             ]
         ]
     ]