Add latest changes from gitlab-org/gitlab@master

1 files changed, 33 insertions, 33 deletions

diff --git a/doc/administration/reply_by_email_postfix_setup.md b/doc/administration/reply_by_email_postfix_setup.md
index 56cd23b2eb8..3a28e37cfc0 100644
--- a/doc/administration/reply_by_email_postfix_setup.md
+++ b/doc/administration/reply_by_email_postfix_setup.md
@@ -14,7 +14,7 @@ The instructions make the assumption that you will be using the email address `i
 
 1. Install the `postfix` package if it is not installed already:
 
-   ```sh
+   ```shell
    sudo apt-get install postfix
    ```
 
@@ -22,7 +22,7 @@ The instructions make the assumption that you will be using the email address `i
 
 1. Install the `mailutils` package.
 
-   ```sh
+   ```shell
    sudo apt-get install mailutils
    ```
 
@@ -30,13 +30,13 @@ The instructions make the assumption that you will be using the email address `i
 
 1. Create a user for incoming email.
 
-   ```sh
+   ```shell
    sudo useradd -m -s /bin/bash incoming
    ```
 
 1. Set a password for this user.
 
-   ```sh
+   ```shell
    sudo passwd incoming
    ```
 
@@ -46,13 +46,13 @@ The instructions make the assumption that you will be using the email address `i
 
 1. Connect to the local SMTP server:
 
-   ```sh
+   ```shell
    telnet localhost 25
    ```
 
    You should see a prompt like this:
 
-   ```sh
+   ```shell
    Trying 127.0.0.1...
    Connected to localhost.
    Escape character is '^]'.
@@ -61,13 +61,13 @@ The instructions make the assumption that you will be using the email address `i
 
    If you get a `Connection refused` error instead, verify that `postfix` is running:
 
-   ```sh
+   ```shell
    sudo postfix status
    ```
 
    If it is not, start it:
 
-   ```sh
+   ```shell
    sudo postfix start
    ```
 
@@ -94,7 +94,7 @@ The instructions make the assumption that you will be using the email address `i
 
 1. Check if the `incoming` user received the email:
 
-   ```sh
+   ```shell
    su - incoming
    mail
    ```
@@ -108,13 +108,13 @@ The instructions make the assumption that you will be using the email address `i
 
    Quit the mail app:
 
-   ```sh
+   ```shell
    q
    ```
 
 1. Log out of the `incoming` account and go back to being `root`:
 
-   ```sh
+   ```shell
    logout
    ```
 
@@ -124,13 +124,13 @@ Courier, which we will install later to add IMAP authentication, requires mailbo
 
 1. Configure Postfix to use Maildir-style mailboxes:
 
-   ```sh
+   ```shell
    sudo postconf -e "home_mailbox = Maildir/"
    ```
 
 1. Restart Postfix:
 
-   ```sh
+   ```shell
    sudo /etc/init.d/postfix restart
    ```
 
@@ -139,7 +139,7 @@ Courier, which we will install later to add IMAP authentication, requires mailbo
    1. Follow steps 1 and 2 of _[Test the out-of-the-box setup](#test-the-out-of-the-box-setup)_.
    1. Check if the `incoming` user received the email:
 
-      ```sh
+      ```shell
       su - incoming
       MAIL=/home/incoming/Maildir
       mail
@@ -154,7 +154,7 @@ Courier, which we will install later to add IMAP authentication, requires mailbo
 
       Quit the mail app:
 
-      ```sh
+      ```shell
       q
       ```
 
@@ -166,7 +166,7 @@ Courier, which we will install later to add IMAP authentication, requires mailbo
 
 1. Log out of the `incoming` account and go back to being `root`:
 
-   ```sh
+   ```shell
    logout
    ```
 
@@ -174,25 +174,25 @@ Courier, which we will install later to add IMAP authentication, requires mailbo
 
 1. Install the `courier-imap` package:
 
-   ```sh
+   ```shell
    sudo apt-get install courier-imap
    ```
 
    And start `imapd`:
 
-   ```sh
+   ```shell
    imapd start
    ```
 
 1. The courier-authdaemon isn't started after installation. Without it, imap authentication will fail:
 
-   ```sh
+   ```shell
    sudo service courier-authdaemon start
    ```
 
    You can also configure courier-authdaemon to start on boot:
 
-   ```sh
+   ```shell
    sudo systemctl enable courier-authdaemon
    ```
 
@@ -200,7 +200,7 @@ Courier, which we will install later to add IMAP authentication, requires mailbo
 
 1. Let Postfix know about the domains that it should consider local:
 
-   ```sh
+   ```shell
    sudo postconf -e "mydestination = gitlab.example.com, localhost.localdomain, localhost"
    ```
 
@@ -208,25 +208,25 @@ Courier, which we will install later to add IMAP authentication, requires mailbo
 
    We'll assume `192.168.1.0/24` is your local LAN. You can safely skip this step if you don't have other machines in the same local network.
 
-   ```sh
+   ```shell
    sudo postconf -e "mynetworks = 127.0.0.0/8, 192.168.1.0/24"
    ```
 
 1. Configure Postfix to receive mail on all interfaces, which includes the internet:
 
-   ```sh
+   ```shell
    sudo postconf -e "inet_interfaces = all"
    ```
 
 1. Configure Postfix to use the `+` delimiter for sub-addressing:
 
-   ```sh
+   ```shell
    sudo postconf -e "recipient_delimiter = +"
    ```
 
 1. Restart Postfix:
 
-   ```sh
+   ```shell
    sudo service postfix restart
    ```
 
@@ -236,13 +236,13 @@ Courier, which we will install later to add IMAP authentication, requires mailbo
 
    1. Connect to the SMTP server:
 
-      ```sh
+      ```shell
       telnet gitlab.example.com 25
       ```
 
       You should see a prompt like this:
 
-      ```sh
+      ```shell
       Trying 123.123.123.123...
       Connected to gitlab.example.com.
       Escape character is '^]'.
@@ -269,7 +269,7 @@ Courier, which we will install later to add IMAP authentication, requires mailbo
 
    1. Check if the `incoming` user received the email:
 
-      ```sh
+      ```shell
       su - incoming
       MAIL=/home/incoming/Maildir
       mail
@@ -284,13 +284,13 @@ Courier, which we will install later to add IMAP authentication, requires mailbo
 
       Quit the mail app:
 
-      ```sh
+      ```shell
       q
       ```
 
    1. Log out of the `incoming` account and go back to being `root`:
 
-      ```sh
+      ```shell
       logout
       ```
 
@@ -298,13 +298,13 @@ Courier, which we will install later to add IMAP authentication, requires mailbo
 
    1. Connect to the IMAP server:
 
-      ```sh
+      ```shell
       telnet gitlab.example.com 143
       ```
 
       You should see a prompt like this:
 
-      ```sh
+      ```shell
       Trying 123.123.123.123...
       Connected to mail.example.gitlab.com.
       Escape character is '^]'.
@@ -327,7 +327,7 @@ Courier, which we will install later to add IMAP authentication, requires mailbo
 
    1. Disconnect from the IMAP server:
 
-      ```sh
+      ```shell
       a logout
       ```