From ff2025e7a31f3500182cf1b259eddf6b6e5c4e1b Mon Sep 17 00:00:00 2001
From: Steven Danna
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(-)
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).
+cleanup). The default timeout for an individual test is 5 seconds.
`{inorder, Tests}'
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 39256c4d30de0866238a5b5534b2a9c3a63c7777 Mon Sep 17 00:00:00 2001
From: Josh Adams
Date: Mon, 14 Sep 2015 18:23:46 -0500
Subject: [typo] perspektive -> perspective
---
system/doc/tutorial/example.xmlsrc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/system/doc/tutorial/example.xmlsrc b/system/doc/tutorial/example.xmlsrc
index d49c7fe88c..91f09ec522 100644
--- a/system/doc/tutorial/example.xmlsrc
+++ b/system/doc/tutorial/example.xmlsrc
@@ -11,7 +11,7 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
@@ -19,7 +19,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
+
Problem Example
@@ -39,7 +39,7 @@
The functions are deliberately kept as simple as possible, for
readability reasons.
-
From an Erlang perspektive, it is preferable to be able to call
+
From an Erlang perspective, it is preferable to be able to call
foo and bar without having to bother about that
they are C functions:
--
cgit v1.2.3
From af2dae8fba475cd216bc3860c8b867e235eb8748 Mon Sep 17 00:00:00 2001
From: Constantin Rack
Date: Tue, 15 Sep 2015 17:29:01 +0200
Subject: Typos in documentation example of list_to_bitstring/1
---
erts/doc/src/erlang.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 37f0aa289e..39febba1ec 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -2143,10 +2143,10 @@ os_prompt%
<<1,2,3>>
> Bin2 = <<4,5>>.
<<4,5>>
-> Bin3 = <<6,7:4,>>.
-<<6>>
+> Bin3 = <<6,7:4>>.
+<<6,7:4>>
> list_to_bitstring([Bin1,1,[2,3,Bin2],4|Bin3]).
-<<1,2,3,1,2,3,4,5,4,6,7:46>>
+<<1,2,3,1,2,3,4,5,4,6,7:4>>
--
cgit v1.2.3
From 5e476007bf9ede36911965b509598f76d9cf082a Mon Sep 17 00:00:00 2001
From: Magnus Henoch
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(-)
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
- stong_rand_bytes/1 returns low_entropy
Initializes the state for use in streaming AES encryption using Counter mode (CTR).
- Key is the AES key and must be either 128, 192, or 256 bts long. IVec is
+ Key is the AES key and must be either 128, 192, or 256 bits long. IVec is
an arbitrary initializing vector of 128 bits (16 bytes). This state is for use with
stream_encrypt and
stream_decrypt.
--
cgit v1.2.3
From cd7fc3a2ad13ab82a365f3ce1b2a9687fe600fc2 Mon Sep 17 00:00:00 2001
From: Riccardo
Date: Wed, 23 Sep 2015 10:20:20 +0200
Subject: Fixed typo in otp design principles
---
system/doc/design_principles/des_princ.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/system/doc/design_principles/des_princ.xml b/system/doc/design_principles/des_princ.xml
index ba67a49585..0e087cf843 100644
--- a/system/doc/design_principles/des_princ.xml
+++ b/system/doc/design_principles/des_princ.xml
@@ -183,7 +183,7 @@ handle_cast({free, Ch}, Chs) ->
The server name, in this example the atom
ch2, is hidden from the users of the client functions. This
means that the name can be changed without affecting them.
- The protcol (messages sent to and received from the server)
+ The protocol (messages sent to and received from the server)
is also hidden. This is good programming practice and allows
one to change the protocol without changing the code using
the interface functions.
--
cgit v1.2.3