Add latest changes from gitlab-org/gitlab@master

5 files changed, 13 insertions, 11 deletions

diff --git a/doc/integration/jira_development_panel.md b/doc/integration/jira_development_panel.md
index 05a83e0987a..754c4a4148c 100644
--- a/doc/integration/jira_development_panel.md
+++ b/doc/integration/jira_development_panel.md
@@ -4,8 +4,10 @@
 
 Complementary to our [existing Jira][existing-jira] project integration, you're now able to integrate
 GitLab projects with [Jira Development Panel][jira-development-panel]. Both can be used
-simultaneously. This works with self-hosted GitLab or GitLab.com integrated with self-hosted Jira
-or cloud Jira.
+simultaneously. This works with self-managed GitLab or GitLab.com integrated with:
+
+- Jira hosted by you.
+- Cloud Jira.
 
 By doing this you can easily access related GitLab merge requests, branches, and commits directly from a Jira issue.
 
@@ -19,7 +21,7 @@ Note this is different from the [existing Jira][existing-jira] project integrati
 is one GitLab project to the entire Jira instance.
 
 We recommend that a GitLab group admin
-or instance admin (in the case of self-hosted GitLab) set up the integration,
+or instance admin (in the case of self-managed GitLab) set up the integration,
 in order to simplify administration.
 
 TIP: **Tip:**
@@ -28,9 +30,9 @@ regular users won't impact your integration.
 
 ## Requirements
 
-### Self-hosted GitLab
+### Self-managed GitLab
 
-If you are using self-hosted GitLab, make sure your GitLab instance is accessible by Jira.
+If you are using self-managed GitLab, make sure your GitLab instance is accessible by Jira.
 
 - If you are connecting to Jira Cloud, make sure your instance is accessible via the internet.
 - If you are using Jira Server, make sure your instance is accessible however your network is set up.
diff --git a/doc/integration/sourcegraph.md b/doc/integration/sourcegraph.md
index ae818f285b8..da384fa9528 100644
--- a/doc/integration/sourcegraph.md
+++ b/doc/integration/sourcegraph.md
@@ -46,13 +46,13 @@ sudo -u git -H bin/rails console RAILS_ENV=production
 
 Then run the following command to enable the feature flag:
 
-```
+```ruby
 Feature.enable(:sourcegraph)
 ```
 
 You can also enable the feature flag only for specific projects with:
 
-```
+```ruby
 Feature.enable(:sourcegraph, Project.find_by_full_path('my_group/my_project'))
 ```
 
diff --git a/doc/integration/twitter.md b/doc/integration/twitter.md
index cf6492d7372..8056c672d67 100644
--- a/doc/integration/twitter.md
+++ b/doc/integration/twitter.md
@@ -64,7 +64,7 @@ To enable the Twitter OmniAuth provider you must register your application with
 
    For installations from source:
 
-   ```
+   ```yaml
      - { name: 'twitter', app_id: 'YOUR_APP_ID',
        app_secret: 'YOUR_APP_SECRET' }
    ```
diff --git a/doc/integration/ultra_auth.md b/doc/integration/ultra_auth.md
index 091887d8eb8..3188213dac9 100644
--- a/doc/integration/ultra_auth.md
+++ b/doc/integration/ultra_auth.md
@@ -60,7 +60,7 @@ To get the credentials (a pair of Client ID and Client Secret), you must registe
 
    For installation from source:
 
-   ```
+   ```yaml
    - { name: 'ultraauth',
        app_id: 'OPENID_CLIENT_ID',
        app_secret: 'OPENID_CLIENT_SECRET',
diff --git a/doc/integration/vault.md b/doc/integration/vault.md
index 2afa1ba7e32..b3e77ce440d 100644
--- a/doc/integration/vault.md
+++ b/doc/integration/vault.md
@@ -36,7 +36,7 @@ The following assumes you already have Vault installed and running.
 
     You should see the following output in the terminal:
 
-    ```shell
+    ```plaintext
     Success! Enabled oidc auth method at: oidc/
     ```
 
@@ -113,7 +113,7 @@ The following assumes you already have Vault installed and running.
 
     The terminal will output:
 
-    ```
+    ```plaintext
     Success! You are now authenticated. The token information displayed below
     is already stored in the token helper. You do NOT need to run "vault login"
     again. Future Vault requests will automatically use this token.