Merge branch 'bmk/snmp/agent/multi_engine_id_for_traps/OTP-9119' into bmk/agent/extra_info_notification/OTP-9183

Conflicts:
	lib/snmp/doc/src/notes.xml
	lib/snmp/src/app/snmp.appup.src

3 files changed, 17 insertions, 15 deletions

diff --git a/lib/inets/doc/src/http_server.xml b/lib/inets/doc/src/http_server.xml
index 47ed9cd229..959386e471 100644
--- a/lib/inets/doc/src/http_server.xml
+++ b/lib/inets/doc/src/http_server.xml
@@ -63,9 +63,9 @@
       technologies such as SOAP.</p>
     
     <p>Allmost all server functionality has been implemented using an
-      especially crafted server API, it is described in the Erlang Web
-      Server API. This API can be used to advantage by all who wants
-      to enhance the server core functionality, for example custom
+      especially crafted server API which is described in the Erlang Web
+      Server API. This API can be used to advantage by all who wish
+      to enhance the core server functionality, for example with custom
       logging and authentication.</p>
 
     <marker id="config"></marker>
@@ -472,7 +472,7 @@ http://your.server.org/eval?httpd_example:print(atom_to_list(apply(erlang,halt,[
         <tag><em>bytes</em></tag>
         <item>The content-length of the document transferred. </item>
       </taglist>
-      <p>Internal server errors are recorde in the error log file. The
+      <p>Internal server errors are recorded in the error log file. The
         format of this file is a more ad hoc format than the logs using
       Common Logfile Format, but conforms to the following syntax:
         </p>
diff --git a/lib/inets/doc/src/httpd.xml b/lib/inets/doc/src/httpd.xml
index 62f4e18f82..6470b6fac7 100644
--- a/lib/inets/doc/src/httpd.xml
+++ b/lib/inets/doc/src/httpd.xml
@@ -525,12 +525,13 @@ bytes
 	scheme scripts. A matching URL is mapped into a specific module
 	and function. For example:
 	
-	<code>{erl_script_alias, {"/cgi-bin/example" [httpd_example]}
+	<code>{erl_script_alias, {"/cgi-bin/example", [httpd_example]}
 	</code>
 	
 	and a request to
 	http://your.server.org/cgi-bin/example/httpd_example:yahoo
-	would refer to httpd_example:yahoo/2 and
+	would refer to httpd_example:yahoo/3 or, if that did not exist,
+	httpd_example:yahoo/2 and
 	http://your.server.org/cgi-bin/example/other:yahoo would
 	not be allowed to execute.
       </item>
diff --git a/lib/inets/doc/src/mod_esi.xml b/lib/inets/doc/src/mod_esi.xml
index 3c473d3f94..e81308a502 100644
--- a/lib/inets/doc/src/mod_esi.xml
+++ b/lib/inets/doc/src/mod_esi.xml
@@ -78,24 +78,24 @@
       </type>
       <desc>
         <p>The <c>Module</c> must be found in the code path and export
-          <c>Function</c> with an arity of two. An erlScriptAlias must
+          <c>Function</c> with an arity of three. An erlScriptAlias must
           also be set up in the configuration file for the Web server.</p>
-        <p>If the HTTP request is a post request and a body is sent
+        <p>If the HTTP request is a 'post' request and a body is sent
           then content_length will be the length of the posted
-          data. If get is used query_string will be the data after
+          data. If 'get' is used query_string will be the data after
           <em>?</em> in the url.</p>
         <p>ParsedHeader is the HTTP request as a key value tuple
           list. The keys in parsed header will be the in lower case.</p>
         <p>SessionID is a identifier
-          the server use when <c>deliver/2</c> is called, do not
-          assume any-thing about the datatype.</p>
+          the server uses when <c>deliver/2</c> is called; do not
+          assume anything about the datatype.</p>
         <p>Use this callback function to dynamically generate dynamic web
           content. when a part of the page is generated send the
           data back to the client through <c>deliver/2</c>. Note
           that the first chunk of data sent to the client must at
           least contain all HTTP header fields that the response
-          will generate. If the first chunk not contains 
-          <em>End of HTTP header</em> that is <c>"\r\n\r\n"</c> 
+          will generate. If the first chunk does not contain the
+          <em>End of HTTP the header</em>, that is <c>"\r\n\r\n",</c>
           the server will
           assume that no HTTP header fields will be generated.</p>
       </desc>
@@ -106,11 +106,12 @@
       <type>
         <v>Env  = [EnvironmentDirectives] ++ ParsedHeader</v>
         <v>EnvironmentDirectives = {Key,Value}</v>
-        <v>Key = query_string | content_length | server_software | gateway_interface | server_protocol | server_port | request_method | remote_addr | script_name. &lt;v>Input = string()</v>
+		  <v>Key = query_string | content_length | server_software | gateway_interface | server_protocol | server_port | request_method | remote_addr | script_name.</v>
+        <v>Input = string()</v>
         <v>Response = string()</v>
       </type>
       <desc>
-        <p>This callback format consumes quite much memory since the
+        <p>This callback format consumes a lot of memory since the
           whole response must be generated before it is sent to the
           user. This functions is deprecated and only keept for backwards
           compatibility.