aboutsummaryrefslogtreecommitdiffstats
path: root/lib/edoc/src/edoc_wiki.erl
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2011-09-28 15:04:44 +0200
committerHenrik Nord <[email protected]>2011-09-28 15:04:44 +0200
commit530683905cc5d2d42c05802562bc8c1299ab2876 (patch)
tree1f4a59a917b4454dd508c878002a97e113f140de /lib/edoc/src/edoc_wiki.erl
parent12dd72928d588584b38e4835fc0bf96a02e4837c (diff)
parentb1736de28b8b4138c7282c780fafd984046dd53e (diff)
downloadotp-530683905cc5d2d42c05802562bc8c1299ab2876.tar.gz
otp-530683905cc5d2d42c05802562bc8c1299ab2876.tar.bz2
otp-530683905cc5d2d42c05802562bc8c1299ab2876.zip
Merge branch 'dev' into major
Diffstat (limited to 'lib/edoc/src/edoc_wiki.erl')
-rw-r--r--lib/edoc/src/edoc_wiki.erl12
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/edoc/src/edoc_wiki.erl b/lib/edoc/src/edoc_wiki.erl
index 2f2d14853c..5c71658af5 100644
--- a/lib/edoc/src/edoc_wiki.erl
+++ b/lib/edoc/src/edoc_wiki.erl
@@ -16,7 +16,7 @@
%%
%% @private
%% @copyright 2001-2003 Richard Carlsson
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
%% @see edoc
%% @end
%% =====================================================================
@@ -249,10 +249,20 @@ expand_triple([], L, _, L0) ->
expand_uri("http:/" ++ Cs, L, As) ->
expand_uri(Cs, L, "/:ptth", As);
+expand_uri("https:/" ++ Cs, L, As) ->
+ expand_uri(Cs, L, "/:sptth", As);
expand_uri("ftp:/" ++ Cs, L, As) ->
expand_uri(Cs, L, "/:ptf", As);
expand_uri("file:/" ++ Cs, L, As) ->
expand_uri(Cs, L, "/:elif", As);
+expand_uri("mailto:/" ++ Cs, L, As) ->
+ expand_uri(Cs, L, "/:otliam", As);
+expand_uri("nfs:/" ++ Cs, L, As) ->
+ expand_uri(Cs, L, "/:sfn", As);
+expand_uri("shttp:/" ++ Cs, L, As) ->
+ expand_uri(Cs, L, "/:ptths", As);
+expand_uri("xmpp:/" ++ Cs, L, As) ->
+ expand_uri(Cs, L, "/:ppmx", As);
expand_uri(Cs, L, As) ->
expand(Cs, L, [$[ | As]).