Incorporated Fabrice's comments

Author: pabel-rh

assemblies/assembly-enable-authentication.adoc

@@ -22,14 +22,12 @@ include::assembly-enable-authentication-with-github.adoc[leveloffset=+1]
 
 include::assembly-enable-authentication-with-azure.adoc[leveloffset=+1]
 
+include::assembly-enable-authentication-with-gitlab-basic.adoc[leveloffset=+1]
 
 include::assembly-enable-service-to-service-authentication.adoc[leveloffset=+1]
 
 
 include::modules/authentication/proc-enable-auto-logout-for-inactive-users.adoc[leveloffset=+1]
 
 
-include::assembly-troubleshoot-authentication-issues.adoc[leveloffset=+1]
-
-//Including this here as I'm not sure how Jana would like the new title to be for the GitLab title. This will be done in RHDHBUGS-2640
-include::assembly-enable-authentication-with-gitlab-basic.adoc[leveloffset=+1]
+include::assembly-troubleshoot-authentication-issues.adoc[leveloffset=+1]

modules/authentication/proc-enable-user-authentication-with-gitlab-basic.adoc

@@ -4,7 +4,7 @@
 = Enable user authentication with GitLab
 
 [role="_abstract"]
-Add GitLab to your {product-very-short} deployment and use it as an authentication provider.
+You can enable authentication with GitLab to allow users to sign in to {product-short} using their GitLab credentials. This integration also allows you to provision user and group data from GitLab to the {product-short} software catalog, enabling features that rely on synchronized user and group data. 
 
 .Prerequisites
 include::snip-enable-user-authentication-with-gitlab-common-prerequisites.adoc[]

modules/authentication/snip-enable-user-authentication-with-gitlab-common-first-steps.adoc

@@ -21,8 +21,6 @@ Enable `email`, `profile`, `openid`, and `read_user`.
 * **OAuth 2 Client ID**, available in the *Application ID* field
 * **OAuth 2 Client secret**, accessible by selecting *Copy* in the *Secret* field
 
-. Create a link:https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html[GitLab personal access token] with the `read_api` scope. Save this token to use in your OpenShift secret.
-
 . Add your GitLab credentials to {configuring-book-link}#provisioning-your-custom-configuration[your {product-very-short} secrets] using the following key/value pairs.
 Use these environment variables in your {product-very-short} configuration files.
 
@@ -35,24 +33,13 @@ Enter the saved *OAuth 2 Client ID*.
 `GITLAB_CLIENT_SECRET`::
 Enter the saved *OAuth 2 Client Secret*.
 
-`GITLAB_TOKEN`::
-Enter your *GitLab personal access token*.
-
 `GITLAB_URL`::
 Enter the GitLab host domain: _`<gitlab_host_domain>`_.
 
 `GITLAB_PARENT_ORG`::
 Enter your GitLab organization name, such as `_<your_gitlab_organization_name>_`.
 
-. Configure the GitLab integration by adding the following section to your {product-very-short} `{my-app-config-file}` file:
-+
-[source,yaml,subs="+quotes,+attributes"]
-----
-integrations:
-  gitlab:
-    - host: $\{GITLAB_HOST}
-      token: $\{GITLAB_TOKEN}
-----
+. {integrating-with-github-book-link}##importing-multiple-repositories-from-gitlab[Configure the GitLab integration].
 
 . Enable the GitLab catalog provider plugin in your `dynamic-plugins.yaml` file to import GitLab users and groups to the {product-short} software catalog.
 +

modules/importing-repositories/proc-importing-multiple-repositories-from-gitlab.adoc

@@ -17,14 +17,31 @@ See: link:https://access.redhat.com/support/offerings/techpreview/[Technology Pr
 .Prerequisites
 * You have {configuring-dynamic-plugins-book-link}#bulk-importing-github-repositories[enabled the Bulk Import feature and given access to it].
 * You have set up a link:https://docs.gitlab.com/user/profile/personal_access_tokens/[GitLab personal access token (PAT)].
+* You configured the GitLab integration by adding the following section to your {product-very-short} `{my-app-config-file}` file:
++
+[source,yaml,subs="+quotes,+attributes"]
+----
+integrations:
+  gitlab:
+    - host: ${GITLAB_HOST}
+      token: ${GITLAB_TOKEN}
+----
+* You enabled the GitLab catalog provider plugin in your `dynamic-plugins.yaml` file to import GitLab users and groups:
++
+[source,yaml]
+----
+plugins:
+  - package: './dynamic-plugins/dist/backstage-plugin-catalog-backend-module-gitlab-org-dynamic'
+    disabled: false
+----
 
 .Procedure
-. Click *Bulk Import* in {product-short} left sidebar.
+. In the {product-short} left sidebar, click *Bulk Import*.
 . If your {product-very-short} instance has multiple source control tools configured, select GitLab as your *Source control tool* option.
 . Select the projects to import, and validate.
 +
 {product-short} creates a merge request in each selected project to add the required `catalog-info.yaml` file.
-. For each project to import, click on the *PR* link to review and merge the changes in Gitlab.
+. For each project to import, click the *PR* link to review and merge the changes in Gitlab.
 
 .Verification
 . Click *Bulk Import* in {product-short} left sidebar.