Merge branch 'maint'

5 files changed, 23 insertions, 23 deletions

diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index 63ab2532ab..ec4a0dee05 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -371,7 +371,7 @@
           path, similar to <c><![CDATA[code:add_pathsa/1]]></c>. See
           <seealso marker="kernel:code">code(3)</seealso>.
 	  As an alternative to <c>-pa</c>, if several directories are
-	  to be prepended to the code and the directories have a
+	  to be prepended to the code path and the directories have a
 	  common parent directory, that parent directory could be
 	  specified in the <c>ERL_LIBS</c> environment variable.
 	  See <seealso marker="kernel:code">code(3)</seealso>.</p>
@@ -1184,7 +1184,7 @@
 	    disables this feature, which also is the default.
 	    </p>
 	    <p>This feature has been introduced as a temporary workaround
-	    for lengthy executing native code, and native code that do not
+	    for long-executing native code, and native code that does not
 	    bump reductions properly in OTP. When these bugs have be fixed
 	    the <c>+sfwi</c> flag will be removed.
 	    </p>
@@ -1210,7 +1210,7 @@
 	    balance scheduler utilization between schedulers. That is,
 	    strive for equal scheduler utilization on all schedulers.
 	    <br/>&nbsp;&nbsp;&nbsp;<c>+sub true</c> is only supported on
-	    systems where the runtime system detects and use a monotonically
+      systems where the runtime system detects and uses a monotonically
 	    increasing high resolution clock. On other systems, the runtime
 	    system will fail to start.
 	    <br/>&nbsp;&nbsp;&nbsp;<c>+sub true</c> implies
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 3927339b2b..026d245a1c 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -1001,15 +1001,15 @@
           can be used instead of
           <c>demonitor(<anno>MonitorRef</anno>)</c> if this cleanup is wanted.</p>
         <note>
-          <p>Before OTP R11B (<c>ERTS</c> 5.5), <c>demonitor/1</c>
-            behaved asynchronous, that is, the monitor was active
-            until the "demonitor signal" reached the monitored entity.
-            This had an undesirable effect, as you could never know when
-            you were guaranteed <em>not</em> to receive a <c>DOWN</c>
-            message because of the monitor.</p>
-          <p>The current behavior can be viewed as two combined operations:
-            asynchronously send a "demonitor signal" to the monitored
-            entity and ignore any future results of the monitor.</p>
+          <p>Prior to OTP release R11B (ERTS version 5.5) <c>demonitor/1</c>
+            behaved completely asynchronously, i.e., the monitor was active
+            until the "demonitor signal" reached the monitored entity. This
+            had one undesirable effect. You could never know when
+            you were guaranteed <em>not</em> to receive a <c>DOWN</c> message
+            due to the monitor.</p>
+          <p>Current behavior can be viewed as two combined operations:
+            asynchronously send a "demonitor signal" to the monitored entity
+            and ignore any future results of the monitor. </p>
         </note>
         <p>Failure: It is an error if <c><anno>MonitorRef</anno></c> refers to a
           monitoring started by another process. Not all such cases are
@@ -7877,9 +7877,9 @@ timestamp() ->
     Secs = ErlangSystemTime div 1000000 - MegaSecs*1000000,
     MicroSecs = ErlangSystemTime rem 1000000,
     {MegaSecs, Secs, MicroSecs}.</code>
-        <p>The BIF uses a native implementation which does
-	not build garbage on the heap and with slightly better
-	performance.</p>
+    <p>It, however, uses a native implementation which does
+    not build garbage on the heap and with slightly better
+    performance.</p>
 
 	<note><p>This time is <em>not</em> a monotonically increasing time
 	in the general case. For more information, see the documentation of
@@ -8812,8 +8812,8 @@ timestamp() ->
             true
     end</code>
         <note>
-          <p>Before OTP R11B (<c>ERTS</c> 5.5) <c>unlink/1</c>
-            behaved asynchronous, that is, the link was active
+          <p>Prior to OTP release R11B (ERTS version 5.5) <c>unlink/1</c>
+            behaved completely asynchronously, i.e., the link was active
             until the "unlink signal" reached the linked entity. This
             had an undesirable effect, as you could never know when
             you were guaranteed <em>not</em> to be effected by the link.</p>
diff --git a/lib/kernel/doc/src/code.xml b/lib/kernel/doc/src/code.xml
index 4e3be35079..eb0f4b7a06 100644
--- a/lib/kernel/doc/src/code.xml
+++ b/lib/kernel/doc/src/code.xml
@@ -230,7 +230,7 @@
      <c>-code_path_choice Choice</c>. If the flag is set to <c>relaxed</c>,
      the code server will instead choose a suitable directory
      depending on the actual file structure. If there exists a regular
-     application ebin directory,situation it will be chosen. But if it does
+     application ebin directory, it will be chosen. But if it does
      not exist, the ebin directory in the archive is chosen if it
      exists. If neither of them exists the original directory will be
      chosen.</p>
@@ -282,9 +282,9 @@
 
     <p>From the R12B release, functions in this module will generally fail with an
     exception if they are passed an incorrect type (for instance, an integer or a tuple
-    where an atom was expected). An error tuple will be returned if type of argument
+    where an atom was expected). An error tuple will be returned if the type of the argument
     was correct, but there was some other error (for instance, a non-existing directory
-    given to <c>set_path/1</c>.</p>
+    was given to <c>set_path/1</c>).</p>
   </section>
 
   <datatypes>
diff --git a/lib/kernel/doc/src/file.xml b/lib/kernel/doc/src/file.xml
index 9cd4cfa712..831ef1c22a 100644
--- a/lib/kernel/doc/src/file.xml
+++ b/lib/kernel/doc/src/file.xml
@@ -1194,8 +1194,8 @@
           and <c>read_line/1</c> are the only ways to read from a file
           opened in raw mode (although they work for normally opened
           files, too).</p>
-	  <p>For files where <c>encoding</c> is set to something else than <c>latin1</c>, one character might be represented by more than one byte on the file. The parameter <c>Number</c> always denotes the number of <em>characters</em> read from the file, why the position in the file might be moved a lot more than this number when reading a Unicode file.</p>
-	  <p>Also if <c>encoding</c> is set to something else than <c>latin1</c>, the <c>read/3</c> call will fail if the data contains characters larger than 255, why the <seealso marker="stdlib:io">io(3)</seealso> module is to be preferred when reading such a file.</p> 
+	  <p>For files where <c>encoding</c> is set to something else than <c>latin1</c>, one character might be represented by more than one byte on the file. The parameter <c>Number</c> always denotes the number of <em>characters</em> read from the file, while the position in the file might be moved much more than this number when reading a Unicode file.</p>
+	  <p>Also, if <c>encoding</c> is set to something else than <c>latin1</c>, the <c>read/3</c> call will fail if the data contains characters larger than 255, which is why the <seealso marker="stdlib:io">io(3)</seealso> module is to be preferred when reading such a file.</p> 
 	  <p>The function returns:</p>
         <taglist>
           <tag><c>{ok, <anno>Data</anno>}</c></tag>
diff --git a/lib/stdlib/doc/src/random.xml b/lib/stdlib/doc/src/random.xml
index a1bf67d332..d3d7c90c31 100644
--- a/lib/stdlib/doc/src/random.xml
+++ b/lib/stdlib/doc/src/random.xml
@@ -148,7 +148,7 @@ random:seed(erlang:phash2([node()]),
     <p>The implementation changed in R15. Upgrading to R15 will break
       applications that expect a specific output for a given seed. The output
       is still deterministic number series, but different compared to releases
-      older than R15. The seed <c>{0,0,0}</c> will for example no longer
+      older than R15. The seed <c>{0,0,0}</c> will, for example, no longer
       produce a flawed series of only zeros.</p>
   </section>
 </erlref>