diff options
author | Henrik Nord <[email protected]> | 2011-08-29 17:25:25 +0200 |
---|---|---|
committer | Henrik Nord <[email protected]> | 2011-08-29 17:25:25 +0200 |
commit | 1a2fbf178614f752f04fd5c7499bb659293adf10 (patch) | |
tree | 32243efc57c967e31f3f2b239a70bb1e827cdd4b /lib/edoc/src/edoc_specs.erl | |
parent | b9ef73203a1b7f1400dc6d302827d7d732bab3f4 (diff) | |
parent | 7f5f7b08a8f0ed55126192beaed9d748f14c8f0a (diff) | |
download | otp-1a2fbf178614f752f04fd5c7499bb659293adf10.tar.gz otp-1a2fbf178614f752f04fd5c7499bb659293adf10.tar.bz2 otp-1a2fbf178614f752f04fd5c7499bb659293adf10.zip |
Merge branch 'dev' into major
Diffstat (limited to 'lib/edoc/src/edoc_specs.erl')
-rw-r--r-- | lib/edoc/src/edoc_specs.erl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/edoc/src/edoc_specs.erl b/lib/edoc/src/edoc_specs.erl index bfb17515be..5acf8ac0d5 100644 --- a/lib/edoc/src/edoc_specs.erl +++ b/lib/edoc/src/edoc_specs.erl @@ -27,7 +27,6 @@ -include("edoc.hrl"). -include("edoc_types.hrl"). --type proplist() :: [proplists:property()]. -type syntaxTree() :: erl_syntax:syntaxTree(). -define(TOP_TYPE, term). @@ -99,7 +98,7 @@ docs(Forms, CommentFun) -> -type entry() :: #entry{}. -type module_info() :: #module{}. -type entries() :: [entry()]. --spec add_data(Entries::entries(), Options::proplist(), +-spec add_data(Entries::entries(), Options::proplists:proplist(), File::file:filename(), Module::module_info()) -> entries(). %% @doc Create tags a la EDoc for Erlang specifications and types. |