aboutsummaryrefslogtreecommitdiffstats
path: root/lib/edoc/src/edoc_lib.erl
diff options
context:
space:
mode:
authorRichard Carlsson <[email protected]>2011-08-02 13:11:23 +0200
committerHenrik Nord <[email protected]>2011-08-04 11:27:00 +0200
commit403d462964b773516a99726129ea8dcdcc9a96f5 (patch)
tree2a27d637402666c82236878b7a077a9183578936 /lib/edoc/src/edoc_lib.erl
parent07936436b8a8b18b80451a09e040283ebecbd43b (diff)
downloadotp-403d462964b773516a99726129ea8dcdcc9a96f5.tar.gz
otp-403d462964b773516a99726129ea8dcdcc9a96f5.tar.bz2
otp-403d462964b773516a99726129ea8dcdcc9a96f5.zip
synchronized with edoc development version
Diffstat (limited to 'lib/edoc/src/edoc_lib.erl')
-rw-r--r--lib/edoc/src/edoc_lib.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/edoc/src/edoc_lib.erl b/lib/edoc/src/edoc_lib.erl
index 585e30a2d2..1d35f8d094 100644
--- a/lib/edoc/src/edoc_lib.erl
+++ b/lib/edoc/src/edoc_lib.erl
@@ -40,7 +40,7 @@
-import(edoc_report, [report/2, warning/2]).
-include("edoc.hrl").
--include("xmerl.hrl").
+-include_lib("xmerl/include/xmerl.hrl").
-define(FILE_BASE, "/").
@@ -494,7 +494,7 @@ uri_get_file(File0) ->
uri_get_http(URI) ->
%% Try using option full_result=false
case catch {ok, httpc:request(get, {URI,[]}, [],
- [{full_result, false}])} of
+ [{full_result, false}])} of
{'EXIT', _} ->
uri_get_http_r10(URI);
Result ->