From 61c6577254568abd92c2d8d00c948cf230e602ca Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Mon, 14 Mar 2011 12:17:12 +0100
Subject: Used the wrong security property names in documentation.

---
 lib/inets/doc/src/httpd.xml             | 12 +++++------
 lib/inets/doc/src/mod_security.xml      |  4 ++--
 lib/inets/doc/src/notes.xml             | 37 +++++++++++++++++++++++++++++++++
 lib/inets/src/inets_app/inets.appup.src | 14 ++++++++++---
 lib/inets/vsn.mk                        |  2 +-
 5 files changed, 57 insertions(+), 12 deletions(-)

diff --git a/lib/inets/doc/src/httpd.xml b/lib/inets/doc/src/httpd.xml
index 62f4e18f82..91a55f6920 100644
--- a/lib/inets/doc/src/httpd.xml
+++ b/lib/inets/doc/src/httpd.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2010</year>
+      <year>1997</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -793,14 +793,14 @@ bytes
     <marker id="sdir_prop"></marker>
     <p> Here follows the valid properties for security directories</p>
     <taglist>
-      <tag>{security_data_file, path()}</tag>
+      <tag>{data_file, path()}</tag>
       
       <item>
 	Name of the security data file.  The filename can either
 	absolute or relative to the server_root. This file is used to
 	store persistent data for the mod_security module. </item>
 	  
-      <tag>{security_max_retries, integer()}</tag>
+      <tag>{max_retries, integer()}</tag>
 	  
       <item> Specifies the maximum number of tries to authenticate a
 	user has before the user is blocked out. If a user
@@ -810,13 +810,13 @@ bytes
 	server will return 401 (Unauthorized), for security
 	reasons. Defaults to 3 may also be set to infinity.</item>
 	
-      <tag>{security_block_time, integer()}</tag>
+      <tag>{block_time, integer()}</tag>
       
       <item> Specifies the number of minutes a user is blocked. After
 	this amount of time, he automatically regains access.
 	Defaults to 60</item>
       
-      <tag>{security_fail_expire_time, integer()}</tag>
+      <tag>{fail_expire_time, integer()}</tag>
       
       <item>
 	Specifies the number of minutes a failed user authentication
@@ -824,7 +824,7 @@ bytes
 	time, his previous failed authentications are
 	forgotten. Defaults to 30</item>
       
-      <tag>{security_auth_timeout, integer()}</tag>
+      <tag>{auth_timeout, integer()}</tag>
 
       <item>
 	Specifies the number of seconds a successful user
diff --git a/lib/inets/doc/src/mod_security.xml b/lib/inets/doc/src/mod_security.xml
index 2a871d29d8..a3c91dca5b 100644
--- a/lib/inets/doc/src/mod_security.xml
+++ b/lib/inets/doc/src/mod_security.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1998</year><year>2010</year>
+      <year>1998</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 5da9d98002..b7899400fa 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -32,6 +32,43 @@
     <file>notes.xml</file>
   </header>
   
+  <section><title>Inets 5.6</title>
+
+    <section><title>Improvements and New Features</title>
+    <p>-</p>
+
+<!--
+      <list>
+        <item>
+          <p>
+	    Miscellaneous inet6 related problems.</p>
+          <p>Own Id: OTP-8927</p>
+        </item>
+      </list>
+-->
+
+    </section>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>[httpd] Wrong 
+	  <seealso marker="httpd#sec_prop">security property</seealso> 
+	  names used in documentation. </p>
+	  <p><c>security_data_file</c> used <c>instead of data_file</c>.
+	  <c>security_max_retries</c> instead of <c>max_retries</c>.
+	  <c>security_block_time</c> instead of <c>block_time</c>.
+	  <c>security_fail_expire_time</c> instead of <c>fail_expire_time</c>.
+	  <c>security_auth_timeout</c> instead of <c>auth_timeout</c>.</p>
+	  <p>Garrett Smith</p>
+	  <p>Own Id: OTP-9131</p>
+        </item>
+      </list>
+    </section>
+
+  </section> <!-- 5.6 -->
+
+
   <section><title>Inets 5.5.2</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index 07da8ca961..e8a9601f4f 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -18,11 +18,15 @@
 
 {"%VSN%",
  [
-  {"5.5.1", 
+  {"5.5.2", 
    [
-    {load_module, http_chunk, soft_purge, soft_purge, []}
    ]
   }, 
+  {"5.5.1",
+   [
+    {load_module, http_chunk, soft_purge, soft_purge, []}
+   ]
+  },
   {"5.5",
    [
     {restart_application, inets}
@@ -34,7 +38,11 @@
    ]
   } 
  ],
- [	
+ [
+  {"5.5.2", 
+   [
+   ]
+  }, 
   {"5.5.1", 
    [
     {load_module, http_chunk, soft_purge, soft_purge, []}
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index b1de3fef43..c0e25a30e3 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 
 APPLICATION = inets
-INETS_VSN   = 5.5.2
+INETS_VSN   = 5.6
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"
 
-- 
cgit v1.2.3