diff options
| author | Hans Bolinder <[email protected]> | 2016-07-07 09:08:16 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2016-07-07 09:08:16 +0200 |
| commit | ca4000874a198b218fd62b90e842475d2a0bb8c7 (patch) | |
| tree | d5d77cf4a1fa0adb47a36346a89ac08af482c569 /lib/edoc/src/edoc_extract.erl | |
| parent | 62ef9f77d94563a03b8f1f5f1e8843f022329393 (diff) | |
| parent | 531708281a3a2cf336dc92651ede8d9d95f331cb (diff) | |
| download | otp-ca4000874a198b218fd62b90e842475d2a0bb8c7.tar.gz otp-ca4000874a198b218fd62b90e842475d2a0bb8c7.tar.bz2 otp-ca4000874a198b218fd62b90e842475d2a0bb8c7.zip | |
Merge branch 'hasse/erl_docgen/generated_type_links/ERL-120/OTP-13720' into maint
* hasse/erl_docgen/generated_type_links/ERL-120/OTP-13720:
wx: Prepare for using Erlang types and specs
syntax_tools: Improve types
syntax_tools: Improve seealso:s referring to types
erl_docgen: Allow 'seealso' in 'name'
erl_docgen: Generate type links in callback module creating erlref
erl_docgen: Correct callback module for creating erlref
erl_docgen: Improve callback module for creating erlref
edoc: Correct types
Diffstat (limited to 'lib/edoc/src/edoc_extract.erl')
| -rw-r--r-- | lib/edoc/src/edoc_extract.erl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/edoc/src/edoc_extract.erl b/lib/edoc/src/edoc_extract.erl index e7a4c36ca4..2d6cb04a6d 100644 --- a/lib/edoc/src/edoc_extract.erl +++ b/lib/edoc/src/edoc_extract.erl @@ -32,9 +32,9 @@ %% %% @headerfile "edoc.hrl" (disabled until it can be made private) -include("edoc.hrl"). -%% @type filename() = file:filename(). -%% @type proplist() = proplists:property(). -%% @type syntaxTree() = erl_syntax:syntaxTree(). +%% @type filename() = //kernel/file:filename(). +%% @type proplist() = //stdlib/proplists:property(). +%% @type syntaxTree() = //syntax_tools/erl_syntax:syntaxTree(). %% @spec source(File::filename(), Env::edoc_env(), Options::proplist()) %% -> {ModuleName, edoc:edoc_module()} @@ -639,11 +639,11 @@ file_macros(_Context, Env) -> %% %% The idea is to mimic how the @type tag works. %% Using @type: -%% @type t() = t1(). Some docs of t/0; -%% Further docs of t/0. +%%```@type t() = t1(). Some docs of t/0; +%% Further docs of t/0.''' %% The same thing using -type: -%% -type t() :: t1(). % Some docs of t/0; -%% Further docs of t/0. +%%```-type t() :: t1(). % Some docs of t/0; +%% Further docs of t/0.''' find_type_docs(Forms0, Comments, Env, File) -> Tree = erl_recomment:recomment_forms(Forms0, Comments), Forms = preprocess_forms(Tree), |