diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-03 01:45:51 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-03 01:45:51 -0700 |
| commit | 8886b900cad751273044d40d9d0eefbe1ea81616 (patch) | |
| tree | 081fbe0c20c5fe63dafbb91aad9f7751648ae11b /doc | |
| parent | 2d681c0d1ed14bf23c041aa04fa3e77caceda9a1 (diff) | |
| parent | b9717ba45e3b306c091946c43718f6019aed7b33 (diff) | |
| download | gitlab-ce-8886b900cad751273044d40d9d0eefbe1ea81616.tar.gz | |
Merge pull request #4673 from Razer6/support_restructured_text
Add support for reStructured Text markup language
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/install/installation.md | 3 | ||||
| -rw-r--r-- | doc/update/5.4-to-6.0.md | 17 |
2 files changed, 15 insertions, 5 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md index 2311b89cdeb..c0809b69703 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -71,6 +71,9 @@ Make sure you have the right version of Python installed. # If you get a "command not found" error create a link to the python binary sudo ln -s /usr/bin/python /usr/bin/python2 + # For reStructuredText markup language support install required package: + sudo apt-get install python-docutils + **Note:** In order to receive mail notifications, make sure to install a mail server. By default, Debian is shipped with exim4 whereas Ubuntu does not ship with one. The recommended mail server is postfix and you can install it with: 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:
|