diff options
author | Lukas Larsson <[email protected]> | 2018-04-12 10:16:41 +0200 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2018-04-12 10:16:41 +0200 |
commit | 0f4e092e58929a9a517eb17653f4ec217f2a9132 (patch) | |
tree | d7f9ecebec69ebf5f08018b60113a45f78453213 /lib/stdlib/doc | |
parent | cb9fb22d0798f162c8a580d2f6751d7de0ae63dd (diff) | |
parent | a26796d0552c737baf26e4916e8d9014215bc301 (diff) | |
download | otp-0f4e092e58929a9a517eb17653f4ec217f2a9132.tar.gz otp-0f4e092e58929a9a517eb17653f4ec217f2a9132.tar.bz2 otp-0f4e092e58929a9a517eb17653f4ec217f2a9132.zip |
Merge branch 'lukas/erl_docgen/add_github_contrib_link/OTP-14979'
* lukas/erl_docgen/add_github_contrib_link/OTP-14979:
erl_docgen: Remove git dependency in github link script
stdlib: Fix timer monotonic time link
erl_docgen: Use name based anchors where possible
erl_docgen: Change ghlink icon to pencil
erl_docgen: Fix ghlinks to .xmlsrc
erl_docgen: Add hover links for ghlink
erl_docgen: Add ghlink step for all non-generated doc xml files
Fix erlang:abs/2 type docs
Tickets missed in 9033a41375f3a31a18eb0cba3ea
OTP-14651: temp_alloc disabling
OTP-14652: msacc bugs
Diffstat (limited to 'lib/stdlib/doc')
-rw-r--r-- | lib/stdlib/doc/src/Makefile | 2 | ||||
-rw-r--r-- | lib/stdlib/doc/src/timer.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/stdlib/doc/src/Makefile b/lib/stdlib/doc/src/Makefile index af27efa6c1..508a4fa2de 100644 --- a/lib/stdlib/doc/src/Makefile +++ b/lib/stdlib/doc/src/Makefile @@ -163,7 +163,7 @@ clean clean_docs: rm -f errs core *~ $(SPECDIR)/specs_erl_id_trans.xml: - escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \ + $(gen_verbose)escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \ -o$(dir $@) -module erl_id_trans # ---------------------------------------------------- diff --git a/lib/stdlib/doc/src/timer.xml b/lib/stdlib/doc/src/timer.xml index 8e828f8f56..53107ade2c 100644 --- a/lib/stdlib/doc/src/timer.xml +++ b/lib/stdlib/doc/src/timer.xml @@ -270,7 +270,7 @@ <item> <p>Evaluates <c>apply(<anno>Module</anno>, <anno>Function</anno>, <anno>Arguments</anno>)</c> and measures the elapsed real time as - reported by <seealso marker="erlang#monotonic_time/0"> + reported by <seealso marker="erts:erlang#monotonic_time/0"> <c>erlang:monotonic_time/0</c></seealso>.</p> <p>Returns <c>{<anno>Time</anno>, <anno>Value</anno>}</c>, where <c><anno>Time</anno></c> is the elapsed real time in |