Merge pull request #4673 from Razer6/support_restructured_text

Add support for reStructured Text markup language

1 files changed, 12 insertions, 5 deletions

diff --git a/doc/update/5.4-to-6.0.md b/doc/update/5.4-to-6.0.md
index d7a5e964e24..37e8983df8f 100644
--- a/doc/update/5.4-to-6.0.md
+++ b/doc/update/5.4-to-6.0.md
@@ -39,7 +39,14 @@ sudo -u git -H git fetch
 sudo -u git -H git checkout 6-0-dev

 ```

 

-### 3. Install libs, migrations, etc.

+### 3. Install additional packages

+

+```bash

+# For reStructuredText markup language support install required package:

+sudo apt-get install python-docutils

+```

+

+### 4. Install libs, migrations, etc.

 

 ```bash

 cd /home/git/gitlab

@@ -57,12 +64,12 @@ sudo -u git -H bundle exec rake migrate_keys RAILS_ENV=production
 

 ```

 

-### 4. Update config files

+### 5. Update config files

 

 * Make `/home/git/gitlab/config/gitlab.yml` same as https://github.com/gitlabhq/gitlabhq/blob/5-3-stable/config/gitlab.yml.example but with your settings.

 * Make `/home/git/gitlab/config/puma.rb` same as https://github.com/gitlabhq/gitlabhq/blob/5-3-stable/config/puma.rb.example but with your settings.

 

-### 5. Update Init script

+### 6. Update Init script

 

 ```bash

 sudo rm /etc/init.d/gitlab

@@ -70,12 +77,12 @@ sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/5
 sudo chmod +x /etc/init.d/gitlab

 ```

 

-### 6. Start application

+### 7. Start application

 

     sudo service gitlab start

     sudo service nginx restart

 

-### 7. Check application status

+### 8. Check application status

 

 Check if GitLab and its environment are configured correctly: