diff options
author | Henrik Nord <[email protected]> | 2011-11-10 11:45:26 +0100 |
---|---|---|
committer | Henrik Nord <[email protected]> | 2011-11-10 11:45:28 +0100 |
commit | 4e56fa97da6881458f3fef2b9a8756f45d54f3ec (patch) | |
tree | be1fc26fdb60c1817409fc9e2d12fb11ab28374a /erts/doc | |
parent | 15960e59aa69746660e885046c71ec47d2450178 (diff) | |
parent | 283e3abaaf3813bb579e31f912259bad6100f6f0 (diff) | |
download | otp-4e56fa97da6881458f3fef2b9a8756f45d54f3ec.tar.gz otp-4e56fa97da6881458f3fef2b9a8756f45d54f3ec.tar.bz2 otp-4e56fa97da6881458f3fef2b9a8756f45d54f3ec.zip |
Merge branch 'rj/fix-erlang-doc-style'
* rj/fix-erlang-doc-style:
Fixes module erlang doc style: option description
OTP-9697
Diffstat (limited to 'erts/doc')
-rw-r--r-- | erts/doc/src/erlang.xml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml index 5d7ff7613b..b923a5f1fc 100644 --- a/erts/doc/src/erlang.xml +++ b/erts/doc/src/erlang.xml @@ -802,8 +802,7 @@ false</pre> <type> <v>MonitorRef = reference()</v> <v>OptionList = [Option]</v> - <v>Option = flush</v> - <v>Option = info</v> + <v> Option = flush | info</v> </type> <desc> <p>The returned value is <c>true</c> unless <c>info</c> is part |