From bfa8d573c5ff4088f53b97b923fc06f554e82266 Mon Sep 17 00:00:00 2001
From: Rens van der Heijden <rens.vanderheijden@uni-ulm.de>
Date: Wed, 21 Jan 2015 09:50:17 +0100
Subject: Added a note saying inline HTML is disabled by default

---
 doc/markdown/markdown.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md
index edb7a975503..7842fdc8f49 100644
--- a/doc/markdown/markdown.md
+++ b/doc/markdown/markdown.md
@@ -420,6 +420,8 @@ Quote break.
 
 You can also use raw HTML in your Markdown, and it'll mostly work pretty well.
 
+Note that inline HTML is disabled in the default Gitlab configuration, although it is [possible](https://github.com/gitlabhq/gitlabhq/pull/8007/commits) for the system administrator to enable it.
+
 ```no-highlight
 <dl>
   <dt>Definition list</dt>
-- 
cgit v1.2.3