Add latest changes from gitlab-org/gitlab@master

3 files changed, 17 insertions, 17 deletions

diff --git a/doc/administration/operations/extra_sidekiq_processes.md b/doc/administration/operations/extra_sidekiq_processes.md
index fd5f9fe6c26..5cdd33ba507 100644
--- a/doc/administration/operations/extra_sidekiq_processes.md
+++ b/doc/administration/operations/extra_sidekiq_processes.md
@@ -55,7 +55,7 @@ To start extra Sidekiq processes, you must enable `sidekiq-cluster`:
 
 1. Save the file and reconfigure GitLab for the changes to take effect:
 
-   ```sh
+   ```shell
    sudo gitlab-ctl reconfigure
    ```
 
@@ -78,7 +78,7 @@ you list:
 
 1. Save the file and reconfigure GitLab for the changes to take effect:
 
-   ```sh
+   ```shell
    sudo gitlab-ctl reconfigure
    ```
 
@@ -113,7 +113,7 @@ use all of its resources to perform those operations. To set up a separate
 
 1. Save the file and reconfigure GitLab for the changes to take effect:
 
-   ```sh
+   ```shell
    sudo gitlab-ctl reconfigure
    ```
 
@@ -145,7 +145,7 @@ details.
 
 1. Save the file and reconfigure GitLab for the changes to take effect:
 
-   ```sh
+   ```shell
    sudo gitlab-ctl reconfigure
    ```
 
@@ -162,7 +162,7 @@ This will set the concurrency (number of threads) for the Sidekiq process.
 
 1. Save the file and reconfigure GitLab for the changes to take effect:
 
-   ```sh
+   ```shell
    sudo gitlab-ctl reconfigure
    ```
 
@@ -207,7 +207,7 @@ For debugging purposes, you can start extra Sidekiq processes by using the comma
 `/opt/gitlab/embedded/service/gitlab-rails/ee/bin/sidekiq-cluster`. This command
 takes arguments using the following syntax:
 
-```bash
+```shell
 /opt/gitlab/embedded/service/gitlab-rails/ee/bin/sidekiq-cluster [QUEUE,QUEUE,...] [QUEUE, ...]
 ```
 
@@ -225,14 +225,14 @@ For example, say you want to start 2 extra processes: one to process the
 `process_commit` queue, and one to process the `post_receive` queue. This can be
 done as follows:
 
-```bash
+```shell
 /opt/gitlab/embedded/service/gitlab-rails/ee/bin/sidekiq-cluster process_commit post_receive
 ```
 
 If you instead want to start one process processing both queues, you'd use the
 following syntax:
 
-```bash
+```shell
 /opt/gitlab/embedded/service/gitlab-rails/ee/bin/sidekiq-cluster process_commit,post_receive
 ```
 
@@ -240,7 +240,7 @@ If you want to have one Sidekiq process dealing with the `process_commit` and
 `post_receive` queues, and one process to process the `gitlab_shell` queue,
 you'd use the following:
 
-```bash
+```shell
 /opt/gitlab/embedded/service/gitlab-rails/ee/bin/sidekiq-cluster process_commit,post_receive gitlab_shell
 ```
 
@@ -272,7 +272,7 @@ The `sidekiq-cluster` command can store its PID in a file. By default no PID
 file is written, but this can be changed by passing the `--pidfile` option to
 `sidekiq-cluster`. For example:
 
-```bash
+```shell
 /opt/gitlab/embedded/service/gitlab-rails/ee/bin/sidekiq-cluster --pidfile /var/run/gitlab/sidekiq_cluster.pid process_commit
 ```
 
diff --git a/doc/administration/operations/fast_ssh_key_lookup.md b/doc/administration/operations/fast_ssh_key_lookup.md
index 96571b0a5d9..7d0fc43f810 100644
--- a/doc/administration/operations/fast_ssh_key_lookup.md
+++ b/doc/administration/operations/fast_ssh_key_lookup.md
@@ -60,7 +60,7 @@ AuthorizedKeysCommandUser git
 
 Reload OpenSSH:
 
-```bash
+```shell
 # Debian or Ubuntu installations
 sudo service ssh reload
 
diff --git a/doc/administration/operations/filesystem_benchmarking.md b/doc/administration/operations/filesystem_benchmarking.md
index b5922d9d99d..0a20e94a778 100644
--- a/doc/administration/operations/filesystem_benchmarking.md
+++ b/doc/administration/operations/filesystem_benchmarking.md
@@ -25,7 +25,7 @@ To install:
 
 Then run the following:
 
-```sh
+```shell
 fio --randrepeat=1 --ioengine=libaio --direct=1 --gtod_reduce=1 --name=test --filename=/path/to/git-data/testfile --bs=4k --iodepth=64 --size=4G --readwrite=randrw --rwmixread=75
 ```
 
@@ -78,32 +78,32 @@ executed, and then read the same 1,000 files.
    [repository storage path](../repository_storage_paths.md).
 1. Create a temporary directory for the test so it's easy to remove the files later:
 
-   ```sh
+   ```shell
    mkdir test; cd test
    ```
 
 1. Run the command:
 
-   ```sh
+   ```shell
    time for i in {0..1000}; do echo 'test' > "test${i}.txt"; done
    ```
 
 1. To benchmark read performance, run the command:
 
-   ```sh
+   ```shell
    time for i in {0..1000}; do cat "test${i}.txt" > /dev/null; done
    ```
 
 1. Remove the test files:
 
-  ```sh
+  ```shell
   cd ../; rm -rf test
   ```
 
 The output of the `time for ...` commands will look similar to the following. The
 important metric is the `real` time.
 
-```sh
+```shell
 $ time for i in {0..1000}; do echo 'test' > "test${i}.txt"; done
 
 real    0m0.116s