diff options
| author | Péter Dimitrov <[email protected]> | 2019-02-04 11:56:40 +0100 |
|---|---|---|
| committer | Péter Dimitrov <[email protected]> | 2019-02-04 11:56:40 +0100 |
| commit | 4bdbb313f621d54038a9c17c6d9895650d539eab (patch) | |
| tree | af62ecd980b7ae1a5a0989fa6f3edddfe06f2199 /erts/doc/src | |
| parent | 784fb8d859fe3277435c8046b55a65a80313c6f5 (diff) | |
| parent | 92704cd85673cca525e772d3ef8118925b86ef8c (diff) | |
| download | otp-4bdbb313f621d54038a9c17c6d9895650d539eab.tar.gz otp-4bdbb313f621d54038a9c17c6d9895650d539eab.tar.bz2 otp-4bdbb313f621d54038a9c17c6d9895650d539eab.zip | |
Merge branch 'maint'
* maint:
Fix typo in erlang.xml
inets: Ignore bracket option in format_address
Change-Id: I8a215d3872ae74e08d7a17b70ba53535947c032f
Diffstat (limited to 'erts/doc/src')
| -rw-r--r-- | erts/doc/src/erlang.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml index b5c59847f6..e78ded4ae1 100644 --- a/erts/doc/src/erlang.xml +++ b/erts/doc/src/erlang.xml @@ -8387,7 +8387,7 @@ Metadata = #{ pid => pid(), system time</seealso> that is used by the runtime system.</p> <p>The list contains two-tuples with <c>Key</c>s as first element, and <c>Value</c>s as second element. The - order if these tuples is undefined. The following + order of these tuples is undefined. The following tuples can be part of the list, but more tuples can be introduced in the future:</p> <taglist> |