OTP-9094: [httpc] Add support for upload body streaming (PUT and POST).

	  Filipe David Manana

OTP-9114: [ftp] Added (type) spec for all exported functions.

OTP-9123: mod_esi:deliver/2 made to accept binary data.
	  Bernard Duggan

OTP-9124: [httpd] Prevent XSS in error pages.
	  Michael Santos

OTP-9131: [httpd] Wrong security property names used in documentation.
	  Garrett Smith

OTP-9157: [httpd] Improved error messages.
	  Ricardo Catalinas Jim�nez

OTP-9158: [httpd] Fix timeout message generated by mod_esi.
	  Bernard Duggan

OTP-9202: [httpd] Extended support for file descriptors.
	  Attila Rajmund Nohl

OTP-9230: The default ssl kind has now been changed to essl.

OTP-9246: [httpc] httpc manager crash because of a handler retry
	  race condition.

Merge branch 'bmk/inets/inet56_integration' into dev

1 files changed, 38 insertions, 16 deletions

diff --git a/lib/inets/doc/src/inets.xml b/lib/inets/doc/src/inets.xml
index c367d7fa77..a2bf42320f 100644
--- a/lib/inets/doc/src/inets.xml
+++ b/lib/inets/doc/src/inets.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
@@ -32,8 +32,10 @@
   <modulesummary>The inets services API</modulesummary>
   <description>
     <p>This module provides the most basic API to the 
-      clients and servers, that are part of the Inets application,
-      such as start and stop. </p>
+    clients and servers, that are part of the Inets application,
+    such as start and stop. </p>
+
+    <marker id="common_data_types"></marker>
   </description>
 
   <section>
@@ -42,7 +44,10 @@
       this module: </p>
     <p><c> service() = ftpc | tftp | httpc | httpd</c></p>
     <p><c> property() = atom() </c></p>
+    <marker id="functions"></marker>
+    <marker id="services"></marker>
   </section>
+
   <funcs>
     <func>
       <name>services() -> [{Service, Pid}]</name>
@@ -54,11 +59,13 @@
       <desc>
         <p>Returns a list of currently running services.</p>
         <note>
-          <p>Services started as <c>stand_alone</c> will not
-            be listed.</p>
+	  <p>Services started as <c>stand_alone</c> will not be listed.</p>
         </note>
+
+	<marker id="services_info"></marker>
       </desc>
     </func>
+
     <func>
       <name>services_info() -> [{Service, Pid, Info}]</name>
       <fsummary>Returns a list of currently running services where
@@ -73,11 +80,13 @@
       </type>
       <desc>
         <p>Returns a list of currently running services where each
-          service is described by a [{Option, Value}] list. The
-          information given in the list is specific for each service
-          and it is probable that each service will have its own info
-          function that gives you even more details about the
-          service.</p>
+	service is described by a [{Option, Value}] list. The
+	information given in the list is specific for each service
+	and it is probable that each service will have its own info
+	function that gives you even more details about the
+	service.</p>
+
+	<marker id="service_names"></marker>
       </desc>
     </func>
     
@@ -89,6 +98,8 @@
       </type>
       <desc>
         <p>Returns a list of available service names.</p>
+
+	<marker id="start"></marker>
       </desc>
     </func>
     
@@ -101,18 +112,24 @@
       </type>
       <desc>
         <p>Starts the Inets application. Default type
-          is temporary. See also
-          <seealso marker="kernel:application">application(3)</seealso></p>
+	is temporary. See also
+	<seealso marker="kernel:application">application(3)</seealso>. </p>
+
+	<marker id="stop"></marker>
       </desc>
     </func>
+
     <func>
       <name>stop() -> ok </name>
       <fsummary>Stops the inets application.</fsummary>
       <desc>
         <p>Stops the inets application. See also
-          <seealso marker="kernel:application">application(3)</seealso></p>
+	<seealso marker="kernel:application">application(3)</seealso>. </p>
+	
+	<marker id="start2"></marker>
       </desc>
     </func>
+
     <func>
       <name>start(Service, ServiceConfig) -> {ok, Pid} | {error, Reason}</name>
       <name>start(Service, ServiceConfig, How) -> {ok, Pid} | {error, Reason}</name>
@@ -144,8 +161,11 @@
             some sense the calling process has now become the top
             supervisor.</p>
         </note>
+	
+	<marker id="stop2"></marker>
       </desc>
     </func>
+
     <func>
       <name>stop(Service, Reference) -> ok | {error, Reason} </name>
       <fsummary>Stops a started service of the inets application or takes
@@ -157,9 +177,11 @@
       </type>
       <desc>
         <p>Stops a started service of the inets application or takes
-          down a "stand_alone-service" gracefully. When the
-	  <c>stand_alone</c> option is used in start,
-	  only the pid is a valid argument to stop.</p>
+	down a "stand_alone-service" gracefully. When the
+	<c>stand_alone</c> option is used in start,
+	only the pid is a valid argument to stop.</p>
+	
+	<marker id="see_also"></marker>
       </desc>
     </func>
   </funcs>