From ff2025e7a31f3500182cf1b259eddf6b6e5c4e1b Mon Sep 17 00:00:00 2001
From: Steven Danna <steve@chef.io>
Date: Sat, 12 Sep 2015 00:14:03 +0100
Subject: Document eunit's default 5 second test timeout

---
 lib/eunit/doc/overview.edoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

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
-- 
cgit v1.2.3


From 5e476007bf9ede36911965b509598f76d9cf082a Mon Sep 17 00:00:00 2001
From: Magnus Henoch <magnus.henoch@erlang-solutions.com>
Date: Fri, 18 Sep 2015 15:59:52 +0100
Subject: Fix typos in crypto documentation

s/stong_rand_bytes/strong_rand_bytes/, s/bts/bits/
---
 lib/crypto/doc/src/crypto.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

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>
-- 
cgit v1.2.3