diff options
| author | Zandra Hird <[email protected]> | 2015-08-13 09:07:44 +0200 |
|---|---|---|
| committer | Zandra Hird <[email protected]> | 2015-08-13 09:07:44 +0200 |
| commit | 06177b40bac3cdf2c8715c8466e15b46d7c78498 (patch) | |
| tree | 3bc8c53971a8acdfda57a09720f0443d7ec5eb80 | |
| parent | f3769aa1f4f4ab05b8c49acbee7c5bb57928266d (diff) | |
| parent | 998663642c63d753d2c9284f5fda9447b59930d9 (diff) | |
| download | otp-06177b40bac3cdf2c8715c8466e15b46d7c78498.tar.gz otp-06177b40bac3cdf2c8715c8466e15b46d7c78498.tar.bz2 otp-06177b40bac3cdf2c8715c8466e15b46d7c78498.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/ssl/doc/src/ssl.xml | 3 | ||||
| -rw-r--r-- | lib/stdlib/doc/src/ets.xml | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml index f23b71e28b..52d68c1b4a 100644 --- a/lib/ssl/doc/src/ssl.xml +++ b/lib/ssl/doc/src/ssl.xml @@ -88,7 +88,8 @@ <item> <p><c>{verify, verify_type()}</c></p> <p><c>| {verify_fun, {fun(), term()}}</c></p> - <p><c>| {fail_if_no_peer_cert, boolean()} {depth, integer()}</c></p> + <p><c>| {fail_if_no_peer_cert, boolean()}</c></p> + <p><c>| {depth, integer()}</c></p> <p><c>| {cert, public_key:der_encoded()}</c></p> <p><c>| {certfile, path()}</c></p> <p><c>| {key, {'RSAPrivateKey'| 'DSAPrivateKey' | 'ECPrivateKey' diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml index ab1a5900b9..03b995e4de 100644 --- a/lib/stdlib/doc/src/ets.xml +++ b/lib/stdlib/doc/src/ets.xml @@ -610,7 +610,7 @@ ets:is_compiled_ms(Broken).</code> <p>Returns the last key <c><anno>Key</anno></c> according to Erlang term order in the table <c>Tab</c> of the <c>ordered_set</c> type. If the table is of any other type, the function is synonymous - to <c>first/2</c>. If the table is empty, + to <c>first/1</c>. If the table is empty, <c>'$end_of_table'</c> is returned.</p> <p>Use <c>prev/2</c> to find preceding keys in the table.</p> </desc> |