Commit 0949c01093770e66a5fd5354c166e1ae6bd6742c

Authored by Dmitriy Zaporozhets
2 parents 80f34cfb 36462d77

Merge branch 'markdown-styles' into 'master'

Markdown Styles
Showing 1 changed file with 9 additions and 3 deletions   Show diff stats
doc/install/installation.md
... ... @@ -56,9 +56,6 @@ Install the required packages:
56 56  
57 57 sudo apt-get install -y build-essential zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libreadline-dev libncurses5-dev libffi-dev curl openssh-server redis-server checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev logrotate
58 58  
59   - # For reStructuredText markup language support install required package:
60   - sudo apt-get install -y python-docutils
61   -
62 59 Make sure you have the right version of Git installed
63 60  
64 61 # Install Git
... ... @@ -353,6 +350,15 @@ nobody can access your GitLab by using this login information later on.
353 350  
354 351 # Advanced Setup Tips
355 352  
  353 +## Additional markup styles
  354 +
  355 +Apart from the always supported markdown style there are other rich text files that GitLab can display.
  356 +But you might have to install a depency to do so.
  357 +Please see the [github-markup gem readme](https://github.com/gitlabhq/markup#markups) for more information.
  358 +For example, reStructuredText markup language support requires python-docutils:
  359 +
  360 + sudo apt-get install -y python-docutils
  361 +
356 362 ## Custom Redis Connection
357 363  
358 364 If you'd like Resque to connect to a Redis server on a non-standard port or on
... ...