Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

app/views/profiles/two_factor_auths/new.html.haml

@@ -2,8 +2,10 @@
 
 %h2.page-title Two-Factor Authentication (2FA)
 %p
-  Download the Google Authenticator application from App Store for iOS or
-  Google Play for Android and scan this code.
+  Download the Google Authenticator application from App Store for iOS or Google
+  Play for Android and scan this code.
+
+  More information is available in the #{link_to('documentation', help_page_path('workflow', 'two_factor_authentication'))}.
 
 %hr
 
@@ -12,10 +14,9 @@
     .alert.alert-danger
       = @error
   .form-group
-    .col-sm-2
-    .col-sm-2
+    .col-lg-2.col-lg-offset-2
       = raw @qr_code
-    .col-sm-8.manual-instructions
+    .col-lg-7.col-lg-offset-1.manual-instructions
       %h3 Can't scan the code?
 
       %p
@@ -33,7 +34,7 @@
         %dd Yes
   .form-group
     = label_tag :pin_code, nil, class: "control-label"
-    .col-sm-10
+    .col-lg-10
       = text_field_tag :pin_code, nil, class: "form-control", required: true, autofocus: true
   .form-actions
     = submit_tag 'Submit', class: 'btn btn-success'

doc/workflow/two_factor_authentication.md

@@ -45,7 +45,7 @@ storage in a safe place. **Each code can be used only once** to log in to your
 account.
 
 If you lose the recovery codes or just want to generate new ones, you can do so
-from the **Profile Settings** > **Acount** page where you first enabled 2FA.
+from the **Profile Settings** > **Account** page where you first enabled 2FA.
 
 ## Logging in with 2FA Enabled
 
@@ -60,8 +60,8 @@ your phone's application or a recovery code to log in.
 
 1. Log in to your GitLab account.
 1. Go to your **Profile Settings**.
-1. Go to **Acount**.
+1. Go to **Account**.
 1. Click **Disable Two-factor Authentication**.
 
 [Google Authenticator]: https://support.google.com/accounts/answer/1066447?hl=en
-[FreeOTP]: https://fedorahosted.org/freeotp/
+[FreeOTP]: https://fedorahosted.org/freeotp/