Merge branch 'maint'

Conflicts:
	lib/stdlib/src/otp_internal.erl

4 files changed, 16 insertions, 1 deletions

diff --git a/lib/sasl/doc/src/overload.xml b/lib/sasl/doc/src/overload.xml
index 5c3d00afeb..2f19cd9088 100644
--- a/lib/sasl/doc/src/overload.xml
+++ b/lib/sasl/doc/src/overload.xml
@@ -35,6 +35,12 @@
   <module>overload</module>
   <modulesummary>An Overload Regulation Process</modulesummary>
   <description>
+    <warning>
+      <p>
+	All functions in this module are deprecated and will be
+	removed in a future release.
+      </p>
+    </warning>
     <p><c>overload</c> is a process that indirectly regulates the CPU
       usage in the system. The idea is that a main application calls
       function 
diff --git a/lib/sasl/doc/src/sasl_app.xml b/lib/sasl/doc/src/sasl_app.xml
index 8d79251c7e..bcd446a868 100644
--- a/lib/sasl/doc/src/sasl_app.xml
+++ b/lib/sasl/doc/src/sasl_app.xml
@@ -34,7 +34,7 @@
     <p>The <c>SASL</c> application provides the following services:</p>
     <list type="bulleted">
       <item><c>alarm_handler</c></item>
-      <item><c>overload</c></item>
+      <item><c>overload</c> (deprecated)</item>
       <item><c>rb</c></item>
       <item><c>release_handler</c></item>
       <item><c>systools</c></item>
@@ -145,11 +145,15 @@
         <p>Specifies the maximum intensity
           for <seealso marker="overload"><c>overload</c></seealso>. Default
           is <c>0.8</c>.</p>
+	<p>Note that the <c>overload</c> module is deprected and
+	  will be removed in a future release.</p>
       </item>
       <tag><c><![CDATA[overload_weight = float() > 0 ]]></c></tag>
       <item>
         <p>Specifies the <seealso marker="overload"><c>overload</c></seealso>
         weight. Default is <c>0.1</c>.</p>
+	<p>Note that the <c>overload</c> module is deprected and
+	  will be removed in a future release.</p>
       </item>
       <tag><c><![CDATA[start_prg = string() ]]></c></tag>
       <item>
diff --git a/lib/sasl/src/overload.erl b/lib/sasl/src/overload.erl
index 61b925d219..bc8ab7d5e4 100644
--- a/lib/sasl/src/overload.erl
+++ b/lib/sasl/src/overload.erl
@@ -19,6 +19,8 @@
 %%
 -module(overload). 
 
+-deprecated(module).
+
 -export([start_link/0, request/0, set_config_data/2,
 	 get_overload_info/0]).
 
diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl
index 960c70f255..bc70c296da 100644
--- a/lib/stdlib/src/otp_internal.erl
+++ b/lib/stdlib/src/otp_internal.erl
@@ -647,6 +647,9 @@ obsolete_1(random, _, _) ->
 obsolete_1(code, rehash, 0) ->
     {deprecated, "deprecated because the code path cache feature has been removed"};
 
+obsolete_1(overload, _, _) ->
+    {deprecated, "deprecated; will be removed in OTP 19"};
+
 obsolete_1(_, _, _) ->
     no.