Merge branch 'ta/docsmaint' into maint

* ta/docsmaint:
  Fix various doc typos for R15B02
  Fix various code typos for R15B02

OTP-10245

3 files changed, 3 insertions, 3 deletions

diff --git a/erts/doc/src/erlc.xml b/erts/doc/src/erlc.xml
index 3358b8f115..09ed4bd372 100644
--- a/erts/doc/src/erlc.xml
+++ b/erts/doc/src/erlc.xml
@@ -67,7 +67,7 @@
       <item>
         <p>Instructs the compiler to search for include files in
           the specified directory. When encountering an
-          <c><![CDATA[-include]]></c> or <c><![CDATA[-include_dir]]></c> directive, the
+          <c><![CDATA[-include]]></c> or <c><![CDATA[-include_lib]]></c> directive, the
           compiler searches for header files in the following
           directories:</p>
         <list type="ordered">
diff --git a/erts/emulator/beam/erl_time_sup.c b/erts/emulator/beam/erl_time_sup.c
index f90daadadc..a44401d7b1 100644
--- a/erts/emulator/beam/erl_time_sup.c
+++ b/erts/emulator/beam/erl_time_sup.c
@@ -351,7 +351,7 @@ static int clock_resolution;
 /*
 ** The clock resolution should really be the resolution of the 
 ** time function in use, which on most platforms 
-** is 1. On VxWorks the resolution shold be 
+** is 1. On VxWorks the resolution should be
 ** the number of ticks per second (or 1, which would work nicely to).
 **
 ** Setting lower resolutions is mostly interesting when timers are used
diff --git a/erts/preloaded/src/prim_file.erl b/erts/preloaded/src/prim_file.erl
index 0fc56c8c8e..ec158ba970 100644
--- a/erts/preloaded/src/prim_file.erl
+++ b/erts/preloaded/src/prim_file.erl
@@ -453,7 +453,7 @@ position(#file_descriptor{module = ?MODULE, data = {Port, _}}, At) ->
 	    {error, Reason}
     end.
 
-%% Returns {error, Reaseon} | ok.
+%% Returns {error, Reason} | ok.
 truncate(#file_descriptor{module = ?MODULE, data = {Port, _}}) ->
     drv_command(Port, <<?FILE_TRUNCATE>>).