Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-12 18:00:09 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-12 18:00:09 +0400
commit0949c01093770e66a5fd5354c166e1ae6bd6742c (patch)
tree5449d9c6b1e85dd2939e682a55b4fca12db42ad7 /doc
parent80f34cfbc79da8380aa93fab469fb00e5e6d62a6 (diff)
parent36462d77b56d2ed94c6dcd95ef3c529b6edf96d4 (diff)
Merge branch 'markdown-styles' into 'master'
Markdown Styles
Diffstat (limited to 'doc')
-rw-r--r--doc/install/installation.md12
1 files changed, 9 insertions, 3 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md
index cc2641f6f37..8cee78b03d5 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -56,9 +56,6 @@ Install the required packages:
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
- # For reStructuredText markup language support install required package:
- sudo apt-get install -y python-docutils
-
Make sure you have the right version of Git installed
# Install Git
@@ -353,6 +350,15 @@ nobody can access your GitLab by using this login information later on.
# Advanced Setup Tips
+## Additional markup styles
+
+Apart from the always supported markdown style there are other rich text files that GitLab can display.
+But you might have to install a depency to do so.
+Please see the [github-markup gem readme](https://github.com/gitlabhq/markup#markups) for more information.
+For example, reStructuredText markup language support requires python-docutils:
+
+ sudo apt-get install -y python-docutils
+
## Custom Redis Connection
If you'd like Resque to connect to a Redis server on a non-standard port or on