Merge branch 'bmk/snmp/add_compiler_support_agent_capabilities/OTP-8966' into bmk/snmp/snmpc/OTP-9004

Conflicts:
	lib/snmp/doc/src/notes.xml
	lib/snmp/vsn.mk

2 files changed, 77 insertions, 8 deletions

diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 1a84bad1ad..f84991aa79 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1996</year><year>2010</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -44,8 +44,28 @@
 -->
       <list type="bulleted">
         <item>
+          <p>[compiler] Added support for the textual convention 
+	  <c>AGENT-CAPABILITIES</c>, exported by the SNMPv2-CONF mib.</p>
+          <p>The <c>reference</c> and <c>modules</c> part(s) are
+	  stored in the <c>assocList</c> of the mib-entry record 
+	  (<c>me</c>). 
+	  Only handled <em>if</em> the option <c>agent_capabilities</c>
+	  is provided to the compiler. </p>
+	  <p>Also added ("full") support for MODULE-COMPLIANCE,
+	  which is handled in a similar way. 
+	  Only handled <em>if</em> the option <c>module_compliance</c>
+	  is provided to the compiler. </p>
+	  <p>See <seealso marker="snmpc#compile">compile/2</seealso> 
+	  for more info. </p>
+	  <p>For backward compatibillity, the MIBs provided with 
+	  this appliaction are <em>not</em> compiled with these 
+	  options. </p>
+          <p>Own Id: OTP-8966</p>
+        </item>
+
+        <item>
           <p>[snmpc] Added a MIB compiler escript, 
-	  <seealso marker="snmpc">snmpc</seealso>.</p>
+	  <seealso marker="snmpc">snmpc</seealso>. </p>
           <p>Own Id: OTP-9004</p>
         </item>
       </list>
@@ -70,18 +90,28 @@
       <title>Incompatibilities</title>
       <p>-</p>
     </section>
-  </section> <!-- 4.17.1 -->
+  </section> <!-- 4.19 -->
 
 
   <section><title>SNMP 4.18</title>
+    <section>
+      <title>Improvements and new features</title>
+      <p>-</p> 
+    </section>
+
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
         <item>
-          <p>Prep for R14B release.</p>
+          <p>Cosmetic prep for R14B (plain) release. </p>
         </item>
       </list>
     </section>
-  </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+    </section>
+  </section> <!-- 4.18 -->
 
   <section>
     <title>SNMP Development Toolkit 4.17.1</title>
diff --git a/lib/snmp/doc/src/snmpc.xml b/lib/snmp/doc/src/snmpc.xml
index fbd0950c69..e33828326a 100644
--- a/lib/snmp/doc/src/snmpc.xml
+++ b/lib/snmp/doc/src/snmpc.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2004</year><year>2010</year>
+      <year>2004</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -37,6 +37,7 @@
     <p>The module <c>snmpc</c> contains interface functions to the 
       SNMP toolkit MIB compiler.</p>
 
+    <marker id="compile"></marker>
   </description>
 
   <funcs>
@@ -47,7 +48,7 @@
       <type>
         <v>File = string()</v>
         <v>Options = [opt()]</v>
-        <v>opt() = db() | relaxed_row_name_assign_check() | deprecated() | description() | reference() | group_check() |  i() | il() | imports() | module() | module_identity() | outdir() |  no_defs() | verbosity() | warnings()</v>
+        <v>opt() = db() | relaxed_row_name_assign_check() | deprecated() | description() | reference() | group_check() |  i() | il() | imports() | module() | module_identity() | module_compliance() | agent_capabilities() | outdir() |  no_defs() | verbosity() | warnings()</v>
         <v>db() = {db, volatile|persistent|mnesia}</v>
         <v>deprecated() = {deprecated, bool()}</v>
         <v>relaxed_row_name_assign_check() = relaxed_row_name_assign_check</v>
@@ -59,6 +60,8 @@
         <v>imports() = imports</v>
         <v>module() = {module, atom()}</v>
         <v>module_identity() = module_identity</v>
+        <v>module_compliance() = module_compliance</v>
+        <v>agent_capabilities() = agent_capabilities</v>
         <v>no_defs() = no_defs</v>
         <v>outdir() = {outdir, dir()}</v>
         <v>verbosity() = {verbosity, silence|warning|info|log|debug|trace}</v>
@@ -77,6 +80,7 @@
 	      be used for the default instrumentation. </p>
 	    <p>Default is <c>volatile</c>. </p>
           </item>
+
           <item>
 	    <p>The option <c>deprecated</c> specifies if a deprecated 
               definition should be kept or not. If the option is 
@@ -84,6 +88,7 @@
               definitions. </p>
 	    <p>Default is <c>true</c>. </p>
           </item>
+
           <item>
 	    <p>The option <c>relaxed_row_name_assign_check</c>, if present,
 	      specifies that the row name assign check shall not be done 
@@ -94,12 +99,14 @@
 	    <p>By default it is not included, but if this option is present 
 	      it will be. </p>
           </item>
+
           <item>
 	    <p>The option <c>description</c> specifies if the text
               of the DESCRIPTION field will be included or not. </p>
 	    <p>By default it is not included, but if this option is 
 	      present it will be. </p>
           </item>
+
           <item>
 	    <p>The option <c>reference</c> specifies if the text
               of the REFERENCE field, when found in a table definition, 
@@ -108,18 +115,21 @@
 	      it will be. The reference text will be placed in the allocList 
 	      field of the mib-entry record (#me{}) for the table. </p>
           </item>
+
           <item>
 	    <p>The option <c>group_check</c> specifies whether the
 	      mib compiler should check the OBJECT-GROUP macro and
               the NOTIFICATION-GROUP macro for correctness or not.  </p>
 	    <p>Default is <c>true</c>. </p>
           </item>
+
           <item>
 	    <p>The option <c>i</c> specifies the path to search for
 	      imported (compiled) MIB files. The directories should be
               strings with a trailing directory delimiter. </p>
 	    <p>Default is <c>["./"]</c>. </p>
           </item>
+
           <item>
 	    <p>The option <c>il</c> (include_lib) also specifies a
               list of directories to search for imported MIBs. It
@@ -132,11 +142,13 @@
 	      <c><![CDATA[<snmp-home>/priv/mibs/]]></c>
               are always listed last in the include path. </p>
           </item>
+
           <item>
 	    <p>The option <c>imports</c>, if present, specifies that 
               the IMPORT statement of the MIB shall be included in the 
 	      compiled mib. </p>
           </item>
+
           <item>
 	    <p>The option <c>module</c>, if present, specifies the
               name of a module which implements all instrumentation
@@ -145,11 +157,29 @@
               functions must be the same as the corresponding managed
               object it implements. </p>
           </item>
+
           <item>
 	    <p>The option <c>module_identity</c>, if present, specifies 
               that the info part of the MODULE-IDENTITY statement of the MIB 
               shall be included in the compiled mib. </p>
           </item>
+
+          <item>
+	    <p>The option <c>module_compliance</c>, if present, specifies 
+              that the MODULE-COMPLIANCE statement of the MIB shall be included 
+              (with a mib-entry record) in the compiled mib. The mib-entry record 
+	      of the module-compliance will contain <c>reference</c> and <c>module</c> 
+	      part(s) this info in the <c>assocList</c> field). </p>
+          </item>
+
+          <item>
+	    <p>The option <c>agent_capabilities</c>, if present, specifies 
+              that the AGENT-CAPABILITIES statement of the MIB shall be included 
+              (with a mib-entry record) in the compiled mib. The mib-entry record 
+	      of the agent-capabilitie will contain <c>reference</c> and <c>modules</c> 
+	      part(s) this info in the <c>assocList</c> field). </p>
+          </item>
+
           <item>
 	    <p>The option <c>no_defs</c>, if present, specifies 
               that if a managed object does not have an instrumentation
@@ -157,6 +187,7 @@
               be used, instead this is reported as an error, and the
               compilation aborts. </p>
           </item>
+
           <item>
 	    <p>The option <c>verbosity</c> specifies the verbosity of
 	      the SNMP mib compiler. I.e. if warning, info, log, debug 
@@ -166,11 +197,13 @@
               option <c>verbosity</c> is <c>silence</c>, warning messages will
               still be shown. </p>
           </item>
+
           <item>
 	    <p>The option <c>warnings</c> specifies whether warning
               messages should be shown. </p>
 	    <p>Default is <c>true</c>. </p>
           </item>
+
         </list>
         <p>The MIB compiler understands both SMIv1 and SMIv2 MIBs.  It
           uses the <c>MODULE-IDENTITY</c> statement to determine if the MIB is
@@ -185,8 +218,11 @@
           have to be specified to <c>erlc</c> using the syntax 
           <c>+term</c>.  See <c>erlc(1)</c> for details.
           </p>
+
+	  <marker id="is_consistent"></marker>
       </desc>
     </func>
+
     <func>
       <name>is_consistent(Mibs) -> ok | {error, Reason}</name>
       <fsummary>Check for OID conflicts between MIBs</fsummary>
@@ -198,8 +234,11 @@
         <p>Checks for multiple usage of object identifiers and traps
           between MIBs.
           </p>
+
+	  <marker id="mib_to_hrl"></marker>
       </desc>
     </func>
+
     <func>
       <name>mib_to_hrl(MibName) -> ok | {error, Reason}</name>
       <fsummary>Generate constants for the objects in the MIB</fsummary>