summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-05-25 16:22:46 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-05-25 16:22:46 -0400
commitfdde284c97b2563b097c0cc903d99aaaface9604 (patch)
tree1120515ebdab362cb424f1f106aea946dcf6b603
parent2651c8a9aaa27e3b66a820469cd5dafd4aec39d3 (diff)
downloadgitlab-ce-fdde284c97b2563b097c0cc903d99aaaface9604.tar.gz
Document expanded autolinking in doc/markdown/markdown.md
-rw-r--r--doc/markdown/markdown.md22
1 files changed, 16 insertions, 6 deletions
diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md
index 30c29084e34..9c7f723c06d 100644
--- a/doc/markdown/markdown.md
+++ b/doc/markdown/markdown.md
@@ -66,16 +66,26 @@ It is not reasonable to italicize just _part_ of a word, especially when you're
perform_complicated_task
do_this_and_do_that_and_another_thing
-perform_complicated_task
+perform_complicated_task
do_this_and_do_that_and_another_thing
## URL auto-linking
-GFM will autolink standard URLs you copy and paste into your text. So if you want to link to a URL (instead of a textural link), you can simply put the URL in verbatim and it will be turned into a link to that URL.
-
- http://www.google.com
-
-http://www.google.com
+GFM will autolink almost any URL you copy and paste into your text.
+
+ * http://www.google.com
+ * https://google.com/
+ * ftp://ftp.us.debian.org/debian/
+ * smb://foo/bar/baz
+ * irc://irc.freenode.net/gitlab
+ * http://localhost:3000
+
+* http://www.google.com
+* https://google.com/
+* ftp://ftp.us.debian.org/debian/
+* smb://foo/bar/baz
+* irc://irc.freenode.net/gitlab
+* http://localhost:3000
## Code and Syntax Highlighting