Add latest changes from gitlab-org/gitlab@master

1 files changed, 15 insertions, 18 deletions

diff --git a/doc/administration/auth/okta.md b/doc/administration/auth/okta.md
index 7b5effe3d77..c83645ffe74 100644
--- a/doc/administration/auth/okta.md
+++ b/doc/administration/auth/okta.md
@@ -42,21 +42,6 @@ Now that the Okta app is configured, it's time to enable it in GitLab.
 
 ## Configure GitLab
 
-1. On your GitLab server, open the configuration file:
-
-   **For Omnibus GitLab installations**
-
-   ```shell
-   sudo editor /etc/gitlab/gitlab.rb
-   ```
-
-   **For installations from source**
-
-   ```shell
-   cd /home/git/gitlab
-   sudo -u git -H editor config/gitlab.yml
-   ```
-
 1. See [Initial OmniAuth Configuration](../../integration/omniauth.md#initial-omniauth-configuration)
    for initial settings.
 
@@ -66,13 +51,19 @@ Now that the Okta app is configured, it's time to enable it in GitLab.
 
    **For Omnibus GitLab installations**
 
+   Edit `/etc/gitlab/gitlab.rb`:
+
    ```ruby
    gitlab_rails['omniauth_allow_single_sign_on'] = ['saml']
    gitlab_rails['omniauth_block_auto_created_users'] = false
    ```
 
+   ---
+
    **For installations from source**
 
+   Edit `config/gitlab.yml`:
+
    ```yaml
    allow_single_sign_on: ["saml"]
    block_auto_created_users: false
@@ -83,15 +74,21 @@ Now that the Okta app is configured, it's time to enable it in GitLab.
 
    **For Omnibus GitLab installations**
 
+   Edit `/etc/gitlab/gitlab.rb`:
+
    ```ruby
    gitlab_rails['omniauth_auto_link_saml_user'] = true
    ```
 
+   ---
+
    **For installations from source**
 
-   ```yaml
-   auto_link_saml_user: true
-   ```
+   Edit `config/gitlab.yml`:
+
+    ```yaml
+    auto_link_saml_user: true
+    ```
 
 1. Add the provider configuration.