From 2d56595da89d9225d150912228cb158e80584f8e Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Thu, 16 May 2013 19:43:59 +0200
Subject: [snmp/agent] Updated documentation and release notes

---
 lib/snmp/doc/src/snmp_config.xml | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

(limited to 'lib/snmp/doc/src/snmp_config.xml')

diff --git a/lib/snmp/doc/src/snmp_config.xml b/lib/snmp/doc/src/snmp_config.xml
index 42831ecb34..4e2e932b46 100644
--- a/lib/snmp/doc/src/snmp_config.xml
+++ b/lib/snmp/doc/src/snmp_config.xml
@@ -337,7 +337,7 @@
       <marker id="agent_mib_server"></marker>
       <tag><c><![CDATA[mib_server() = [mib_server_opt()] <optional>]]></c></tag>
       <item>
-        <p><c>mib_server_opt() = {mibentry_override, mibentry_override()} |  {trapentry_override, trapentry_override()} |  {verbosity, verbosity()} | {cache, mibs_cache()} | {mob_data_mod, mib_data_mod()}</c></p>
+        <p><c>mib_server_opt() = {mibentry_override, mibentry_override()} |  {trapentry_override, trapentry_override()} |  {verbosity, verbosity()} | {cache, mibs_cache()} | {data_module, mib_data_module()}</c></p>
         <p>Defines options specific for the SNMP agent mib server. </p>
         <p>For defaults see the options in <c>mib_server_opt()</c>.</p>
       </item>
@@ -362,28 +362,35 @@
         <p>Default is <c>false</c>.</p>
       </item>
 
-      <marker id="agent_ms_cache"></marker>
-      <tag><c><![CDATA[mibs_cache() = bool() | mibs_cache_opts() <optional>]]></c></tag>
-      <item>
-        <p>Shall the agent utilize the mib server lookup cache or not.</p>
-        <p>Default is <c>true</c> (in which case the <c>mibs_cache_opts()</c> 
-          default values apply).</p>
-      </item>
-
-      <marker id="agent_ms_mib_data_mod"></marker>
-      <tag><c><![CDATA[mib_data_mod() = snmpa_mib_data_tttn | snmpa_mib_data_ttln | module() <optional>]]></c></tag>
+      <marker id="agent_ms_data_module"></marker>
+<!--
+      <tag><c><![CDATA[mib_data_module() = snmpa_mib_data_tttn | snmpa_mib_data_ttln | module() <optional>]]></c></tag>
+-->
+      <tag><c><![CDATA[mib_data_module() = snmpa_mib_data_tttn | module() <optional>]]></c></tag>
       <item>
         <p>Defines the backend mib_data storage module of the 
 	SNMP agent mib-server as defined by the 
 	<seealso marker="snmpa_mib_data">snmpa_mib_data</seealso> 
 	behaviour. </p>
+	<p>At present only the default module is provided with the agent,  
+	<c>snmpa_mib_data_tttn</c>. </p>
+<!--
 	<p>Two modules is provided with the agent 
 	<c>snmpa_mib_data_tttn</c> (this is the old implementation) and 
 	<c>snmpa_mib_data_ttln</c> (for a mib tree with many holes, 
-	this algorithm can be more price efficient). 
+	this algorithm can be more price efficient). </p>
+-->
         <p>Default module is <c>snmpa_mib_data_tttn</c>. </p>
       </item>
 
+      <marker id="agent_ms_cache"></marker>
+      <tag><c><![CDATA[mibs_cache() = bool() | mibs_cache_opts() <optional>]]></c></tag>
+      <item>
+        <p>Shall the agent utilize the mib server lookup cache or not.</p>
+        <p>Default is <c>true</c> (in which case the <c>mibs_cache_opts()</c> 
+          default values apply).</p>
+      </item>
+
       <marker id="agent_ms_cache_opts"></marker>
       <tag><c><![CDATA[mibs_cache_opts() = [mibs_cache_opt()] <optional>]]></c></tag>
       <item>
-- 
cgit v1.2.3