diff options
| author | Rickard Green <rickard@erlang.org> | 2021-12-15 15:02:07 +0100 |
|---|---|---|
| committer | Rickard Green <rickard@erlang.org> | 2021-12-15 15:02:07 +0100 |
| commit | 97bba97d8f9583b9d66385449cde3c04eadc272d (patch) | |
| tree | 805b868c9676ea6cc2867f6c9ca3cd544b8dd947 /lib/erl_docgen | |
| parent | 09dd2c69ee4192fb2ef7d32754e236f2a29299ce (diff) | |
| parent | df48c260e74c3e9058ff8681ce9f554e6fa0fe34 (diff) | |
| download | erlang-97bba97d8f9583b9d66385449cde3c04eadc272d.tar.gz | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
# Conflicts:
# OTP_VERSION
# lib/crypto/doc/src/crypto.xml
# lib/kernel/src/kernel.app.src
Diffstat (limited to 'lib/erl_docgen')
| -rw-r--r-- | lib/erl_docgen/doc/src/notes.xml | 41 | ||||
| -rw-r--r-- | lib/erl_docgen/vsn.mk | 2 |
2 files changed, 41 insertions, 2 deletions
diff --git a/lib/erl_docgen/doc/src/notes.xml b/lib/erl_docgen/doc/src/notes.xml index e770ba6a0c..6aa1440596 100644 --- a/lib/erl_docgen/doc/src/notes.xml +++ b/lib/erl_docgen/doc/src/notes.xml @@ -31,7 +31,46 @@ </header> <p>This document describes the changes made to the <em>erl_docgen</em> application.</p> - <section><title>Erl_Docgen 1.1.2</title> + <section><title>Erl_Docgen 1.2</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Fix <c>codeinclude</c> tag to correctly respect the + <c>type</c> attribute.</p> + <p> + Own Id: OTP-17754 Aux Id: PR-5365 </p> + </item> + </list> + </section> + + + <section><title>Improvements and New Features</title> + <list> + <item> + <p> + The HTML documentation has been updated to collapse + better on small screens.</p> + <p> + Own Id: OTP-17687 Aux Id: PR-5197 </p> + </item> + <item> + <p> + All predefined types have been added to the <c>erlang</c> + module together with documentation.</p> + <p> + Any reference to a predefined type now links to that + documentation so that the user can view it.</p> + <p> + Own Id: OTP-17689 Aux Id: PR-5292 </p> + </item> + </list> + </section> + +</section> + +<section><title>Erl_Docgen 1.1.2</title> <section><title>Fixed Bugs and Malfunctions</title> <list> diff --git a/lib/erl_docgen/vsn.mk b/lib/erl_docgen/vsn.mk index 5009cba7a6..12cc2eecf4 100644 --- a/lib/erl_docgen/vsn.mk +++ b/lib/erl_docgen/vsn.mk @@ -1 +1 @@ -ERL_DOCGEN_VSN = 1.1.2 +ERL_DOCGEN_VSN = 1.2 |