Merge branch 'ta/docsmaint' into maint

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

OTP-10245

10 files changed, 10 insertions, 10 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>>).
 
diff --git a/lib/common_test/doc/src/write_test_chapter.xml b/lib/common_test/doc/src/write_test_chapter.xml
index 1fae50577e..198f79126c 100644
--- a/lib/common_test/doc/src/write_test_chapter.xml
+++ b/lib/common_test/doc/src/write_test_chapter.xml
@@ -886,7 +886,7 @@
     of its sub-groups. If a timetrap value is defined by <c>group/1</c>
     for a sub-group, it overrides that of its higher level groups. Timetrap
     values set by individual test cases (by means of the test case info
-    function) overrides both group- and suite- level timetraps.</p>
+    function) override both group- and suite- level timetraps.</p>
     
     <p>It is also possible to dynamically set/reset a timetrap during the
     excution of a test case, or configuration function. This is done by calling
diff --git a/lib/compiler/doc/src/compile.xml b/lib/compiler/doc/src/compile.xml
index be9eb1cd75..27d750f929 100644
--- a/lib/compiler/doc/src/compile.xml
+++ b/lib/compiler/doc/src/compile.xml
@@ -316,7 +316,7 @@ module.beam: module.erl \
           <item>
             <p>Add <c>Dir</c> to the list of directories to be searched
               when including a file. When encountering an
-	      <c>-include</c> or <c>-include_dir</c> directive,
+	      <c>-include</c> or <c>-include_lib</c> directive,
 	      the compiler searches for header files in the following
 	      directories:</p>
             <list type="ordered">
diff --git a/lib/inets/src/http_client/httpc_handler.erl b/lib/inets/src/http_client/httpc_handler.erl
index 6fe05dec80..923213d34d 100644
--- a/lib/inets/src/http_client/httpc_handler.erl
+++ b/lib/inets/src/http_client/httpc_handler.erl
@@ -55,7 +55,7 @@
 	  status_line,               % {Version, StatusCode, ReasonPharse}
 	  headers,                   % #http_response_h{}
 	  body,                      % binary()
-	  mfa,                       % {Moduel, Function, Args}
+	  mfa,                       % {Module, Function, Args}
 	  pipeline = queue:new(),    % queue() 
 	  keep_alive = queue:new(),  % queue() 
 	  status,   % undefined | new | pipeline | keep_alive | close | ssl_tunnel
diff --git a/lib/kernel/doc/src/code.xml b/lib/kernel/doc/src/code.xml
index ee687511a3..214e61cc00 100644
--- a/lib/kernel/doc/src/code.xml
+++ b/lib/kernel/doc/src/code.xml
@@ -91,7 +91,7 @@
       of the additional library directories will override modules with
       the same name in OTP, except for modules in Kernel and
       STDLIB.</p>
-    <p>The environment variable <c>ERL_LIBS</c> (if defined) shold contain
+    <p>The environment variable <c>ERL_LIBS</c> (if defined) should contain
       a colon-separated (for Unix-like systems) or semicolon-separated
       (for Windows) list of additional libraries.</p>
     <p>Example: On an Unix-like system, <c>ERL_LIBS</c> could be set to
diff --git a/lib/reltool/doc/src/reltool.xml b/lib/reltool/doc/src/reltool.xml
index 9b43640d83..2567a72999 100644
--- a/lib/reltool/doc/src/reltool.xml
+++ b/lib/reltool/doc/src/reltool.xml
@@ -144,7 +144,7 @@
         value <c>include</c> implies that all applications and
         escripts that do not have any explicit <c>incl_cond</c>
         setting will be included. <c>exclude</c> implies that all
-        applications and escripts) that do not have any explicit
+        applications and escripts that do not have any explicit
         <c>incl_cond</c> setting will be excluded.</p>
       </item>
 
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index b39c995552..63731ee25c 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -150,7 +150,7 @@ run_client(Opts) ->
 	{ok, Socket} ->
 	    Pid ! { connected, Socket },
 	    test_server:format("Client: connected~n", []), 
-	    %% In specail cases we want to know the client port, it will
+	    %% In special cases we want to know the client port, it will
 	    %% be indicated by sending {port, 0} in options list!
 	    send_selected_port(Pid,  proplists:get_value(port, Options), Socket),
 	    {Module, Function, Args} = proplists:get_value(mfa, Opts),
diff --git a/lib/tools/doc/src/xref_chapter.xml b/lib/tools/doc/src/xref_chapter.xml
index 39c5545af9..169313cb9c 100644
--- a/lib/tools/doc/src/xref_chapter.xml
+++ b/lib/tools/doc/src/xref_chapter.xml
@@ -301,7 +301,7 @@
       and <c>|||</c>) are the only operators that accept both
       representations. This means that in order to analyze indirect
       calls using restriction, the <c>closure</c> operator (which creates the
-      <c>digraph</c> representation of graphs) has to been
+      <c>digraph</c> representation of graphs) has to be
       applied explicitly.
       </p>
     <p>As an example of analyzing indirect calls, the following Erlang