diff options
| author | Lukas Larsson <[email protected]> | 2019-05-20 10:51:04 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2019-05-20 10:51:04 +0200 |
| commit | fe48e23bcc2cb40e2fc63eea7d4fbaf6244adaff (patch) | |
| tree | 13ae64e32e156464f467a790f9b675cb041f031a | |
| parent | fe2b1323a3866ed0a9712e9d12e1f8f84793ec47 (diff) | |
| parent | 0aa68ff0e4b3c15c8f9cdccec8c2350dd12cdf5c (diff) | |
| download | otp-fe48e23bcc2cb40e2fc63eea7d4fbaf6244adaff.tar.gz otp-fe48e23bcc2cb40e2fc63eea7d4fbaf6244adaff.tar.bz2 otp-fe48e23bcc2cb40e2fc63eea7d4fbaf6244adaff.zip | |
Merge branch 'maint'
* maint:
fix typo in gen_statem.xml
Update erlang.xml
| -rw-r--r-- | erts/doc/src/erlang.xml | 1 | ||||
| -rw-r--r-- | lib/stdlib/doc/src/gen_statem.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml index a879cce840..68cde567c2 100644 --- a/erts/doc/src/erlang.xml +++ b/erts/doc/src/erlang.xml @@ -3105,6 +3105,7 @@ false</code> Map = #{42 => value_two,1337 => "value one","a" => 1}, map_get(Key,Map). "value one"</code> + <p>Allowed in guard tests.</p> </desc> </func> diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index 6f6849a19d..ef548ad643 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -40,7 +40,7 @@ <p> This reference manual describes types generated from the types in the <c>gen_statem</c> source code, so they are correct. - However, the generated descriptions also reflect the type hiearchy, + However, the generated descriptions also reflect the type hierarchy, which makes them kind of hard to read. </p> <p> |