diff options
| author | Henrik Nord <[email protected]> | 2015-09-30 13:27:30 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2015-09-30 13:27:30 +0200 |
| commit | 382b1fde9f28090a41344d4e66bdbd5a1f4a7327 (patch) | |
| tree | d70220446cd0b2337e6f6976ae2c36355f836230 /lib | |
| parent | 93b506afd35cc9edeebbad5da0c1624e2d3c0d92 (diff) | |
| parent | 46178552c4622b29d5a70ca23d945e9036caa437 (diff) | |
| download | otp-382b1fde9f28090a41344d4e66bdbd5a1f4a7327.tar.gz otp-382b1fde9f28090a41344d4e66bdbd5a1f4a7327.tar.bz2 otp-382b1fde9f28090a41344d4e66bdbd5a1f4a7327.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/crypto/doc/src/crypto.xml | 4 | ||||
| -rw-r--r-- | lib/eunit/doc/overview.edoc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml index 385a583883..291a5145e4 100644 --- a/lib/crypto/doc/src/crypto.xml +++ b/lib/crypto/doc/src/crypto.xml @@ -617,7 +617,7 @@ RAND_seed function from openssl. Only use this if the system you are running on does not have enough "randomness" built in. Normally this is when <seealso marker="#strong_rand_bytes/1"> - stong_rand_bytes/1</seealso> returns <c>low_entropy</c></p> + strong_rand_bytes/1</seealso> returns <c>low_entropy</c></p> </desc> </func> @@ -710,7 +710,7 @@ </type> <desc> <p>Initializes the state for use in streaming AES encryption using Counter mode (CTR). - <c>Key</c> is the AES key and must be either 128, 192, or 256 bts long. <c>IVec</c> is + <c>Key</c> is the AES key and must be either 128, 192, or 256 bits long. <c>IVec</c> is an arbitrary initializing vector of 128 bits (16 bytes). This state is for use with <seealso marker="#stream_encrypt-2">stream_encrypt</seealso> and <seealso marker="#stream_decrypt-2">stream_decrypt</seealso>.</p> diff --git a/lib/eunit/doc/overview.edoc b/lib/eunit/doc/overview.edoc index df716cdeea..2789a05792 100644 --- a/lib/eunit/doc/overview.edoc +++ b/lib/eunit/doc/overview.edoc @@ -885,7 +885,7 @@ the timeout is exceeded, the unfinished tests will be forced to terminate. Note that if a timeout is set around a fixture, it includes the time for setup and cleanup, and if the timeout is triggered, the entire fixture is abruptly terminated (without running the -cleanup).</dd> +cleanup). The default timeout for an individual test is 5 seconds.</dd> <dt>`{inorder, Tests}'</dt> <dd>Runs the specified tests in strict order. Also see `{inparallel, Tests}'. By default, tests are neither marked as `inorder' or |