Merge branch 'maint'

16 files changed, 221 insertions, 451 deletions

diff --git a/lib/snmp/doc/src/Makefile b/lib/snmp/doc/src/Makefile
index 9ea5dba0c5..3ebee792f9 100644
--- a/lib/snmp/doc/src/Makefile
+++ b/lib/snmp/doc/src/Makefile
@@ -1,9 +1,9 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
 # %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1997-2016. All Rights Reserved.
-# 
+#
+# Copyright Ericsson AB 1997-2017. All Rights Reserved.
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,7 +15,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# 
+#
 # %CopyrightEnd%
 
 include $(ERL_TOP)/make/target.mk
@@ -66,7 +66,6 @@ HTML_REF6_FILES = $(XML_REF6_FILES:%.xml=$(HTMLDIR)/%.html)
 HTML_CHAP_FILES = $(XML_CHAPTER_FILES:%.xml=$(HTMLDIR)/%.html)
 
 EXTRA_FILES = \
-        summary.html.src \
         $(DEFAULT_HTML_FILES)  \
         $(HTML_REF1_FILES)     \
         $(HTML_REF3_FILES)     \
@@ -85,18 +84,14 @@ HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
-INDEX_FILE   = index.html
-INDEX_SRC    = $(INDEX_FILE).src
-INDEX_TARGET = $(DOCDIR)/$(INDEX_FILE)
-
 GIF_TARGETS = $(GIF_FILES:%=$(HTMLDIR)/%)
 
 
 # ----------------------------------------------------
-# FLAGS 
+# FLAGS
 # ----------------------------------------------------
-XML_FLAGS += 
-DVIPS_FLAGS += 
+XML_FLAGS +=
+DVIPS_FLAGS +=
 
 # ----------------------------------------------------
 # Targets
@@ -106,21 +101,17 @@ $(HTMLDIR)/%.gif: %.gif			# Copy them to ../html
 
 docs: pdf html man
 
-ldocs: local_docs $(INDEX_TARGET)
+ldocs: local_docs
 
 $(TOP_PDF_FILE): $(XML_FILES)
 
 pdf: $(TOP_PDF_FILE)
 
 html: gifs $(HTML_REF_MAN_FILE)
-html2: html $(INDEX_TARGET)
 
 clean clean_docs: clean_html clean_man clean_pdf
 	rm -f errs core *~
 
-$(INDEX_TARGET): $(INDEX_SRC) ../../vsn.mk	# Create top make file 
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@	# inserting version number
-
 man: man1 man3 man6 man7
 
 man1: $(MAN1_FILES)
@@ -133,7 +124,7 @@ man7: $(MAN7_FILES)
 
 gifs: $(GIF_TARGETS)
 
-debug opt: 
+debug opt:
 
 clean_pdf:
 	@echo "cleaning pdf:"
@@ -149,7 +140,6 @@ clean_man:
 clean_html:
 	@echo "cleaning html:"
 	rm -rf $(HTMLDIR)/*
-	rm -f $(INDEX_TARGET)
 
 $(MAN7DIR)/%.7: $(MIBSDIR)/%.mib
 	@echo "processing $*"
@@ -162,7 +152,7 @@ $(MAN7DIR)/%.7: $(MIBSDIR)/%.mib
 
 # ----------------------------------------------------
 # Release Target
-# ---------------------------------------------------- 
+# ----------------------------------------------------
 
 $(MAN1DIR)/snmpc.1: snmpc_cmd.xml
 	date=`date +"%B %e %Y"`; \
@@ -194,7 +184,7 @@ info: info_xml info_man info_html
 	@echo "MAN6DIR: $(MAN6DIR)"
 	@echo "MAN7DIR: $(MAN7DIR)"
 
-info_man: 
+info_man:
 	@echo "man files:"
 	@echo "MAN1_FILES = $(MAN1_FILES)"
 	@echo "MAN3_FILES = $(MAN3_FILES)"
@@ -203,7 +193,7 @@ info_man:
 	@echo ""
 	@echo "MIB_FILES  = $(MIB_FILES)"
 
-info_xml: 
+info_xml:
 	@echo "xml files:"
 #	@echo "XML_REF1_FILES        = $(XML_REF1_FILES)"
 	@echo "XML_REF3_FILES        = $(XML_REF3_FILES)"
@@ -221,9 +211,7 @@ info_xml:
 info_html:
 	@echo "html files:"
 	@echo "DOCDIR = $(DOCDIR)"
-	@echo "INDEX_FILE = $(INDEX_FILE)"
-	@echo "INDEX_SRC = $(INDEX_SRC)"
-	@echo "INDEX_TARGET = $(INDEX_TARGET)"
+	@echo "HTML_REF_MAN_FILE = $(HTML_REF_MAN_FILE)"
 	@echo ""
 	@echo "HTMLDIR = $(HTMLDIR)"
 	@echo "HTML_APP_FILES  = $(HTML_APP_FILES)"
diff --git a/lib/snmp/doc/src/book.gif b/lib/snmp/doc/src/book.gif
deleted file mode 100644
index 94b3868792..0000000000
--- a/lib/snmp/doc/src/book.gif
+++ /dev/null
diff --git a/lib/snmp/doc/src/fascicules.xml b/lib/snmp/doc/src/fascicules.xml
deleted file mode 100644
index 37feca543f..0000000000
--- a/lib/snmp/doc/src/fascicules.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE fascicules SYSTEM "fascicules.dtd">
-
-<fascicules>
-  <fascicule file="part" href="part_frame.html" entry="no">
-    User's Guide
-  </fascicule>
-  <fascicule file="ref_man" href="ref_man_frame.html" entry="yes">
-    Reference Manual
-  </fascicule>
-  <fascicule file="part_notes" href="part_notes_frame.html" entry="no">
-    Release Notes
-  </fascicule>
-  <fascicule file="" href="../../../../doc/print.html" entry="no">
-    Off-Print
-  </fascicule>
-</fascicules>
-
diff --git a/lib/snmp/doc/src/files.mk b/lib/snmp/doc/src/files.mk
index 5aeae19105..f364cb6fa5 100644
--- a/lib/snmp/doc/src/files.mk
+++ b/lib/snmp/doc/src/files.mk
@@ -1,9 +1,9 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
 # %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2001-2016. All Rights Reserved.
-# 
+#
+# Copyright Ericsson AB 2001-2017. All Rights Reserved.
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,7 +15,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# 
+#
 # %CopyrightEnd%
 
 XML_APPLICATION_FILES = \
@@ -81,9 +81,7 @@ XML_REF3_FILES = \
 XML_REF6_FILES = snmp_app.xml
 
 XML_PART_FILES =  \
-	part.xml \
-	part_notes.xml \
-	part_notes_history.xml
+	part.xml
 
 XML_CHAPTER_FILES = \
 	snmp_intro.xml \
@@ -115,23 +113,16 @@ XML_FILES = $(BOOK_FILES)        \
             $(XML_REF6_FILES)    \
             $(XML_APPLICATION_FILES)
 
-GIF_FILES = book.gif \
+GIF_FILES = \
 	getnext1.gif \
 	getnext2.gif \
 	getnext3.gif \
 	getnext4.gif \
 	snmp_agent_netif_1.gif \
 	snmp_manager_netif_1.gif \
-	min_head.gif \
-	note.gif \
-	notes.gif \
-	ref_man.gif \
 	snmp-um-1-image-1.gif \
 	snmp-um-1-image-2.gif \
 	snmp-um-1-image-3.gif \
-	snmp.gif \
-	user_guide.gif \
-	warning.gif \
 	MIB_mechanism.gif
 
 PS_FILES = getnext1.ps \
diff --git a/lib/snmp/doc/src/index.html.src b/lib/snmp/doc/src/index.html.src
deleted file mode 100644
index e1b6be4d1f..0000000000
--- a/lib/snmp/doc/src/index.html.src
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<!-- This file is obsolete -->
-<HTML>
-<!-- 
- ``Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- 
- The Initial Developer of the Original Code is Ericsson Utvecklings AB.
- Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
- AB. All Rights Reserved.''
- 
-     $Id$
--->
-<HEAD>
-<TITLE>SNMP %VSN%</TITLE>
-</HEAD>
-
-<BODY BGCOLOR="#FFFFFF">
-
-<CENTER>
-<A HREF="http://www.erlang.se/"><IMG  ALT="Erlang/OTP" BORDER=0 SRC="html/min_head.gif"></A><BR>
-
-<FONT SIZE="-1">
-[<A HREF="../../../doc/index.html">Up</A> |
-<A HREF="http://www.erlang.se/">Erlang/OTP</A>]
-</FONT><BR>
-
-<P><FONT SIZE="+3">
-SNMP
-</FONT><BR>  
-Version %VSN%
-</CENTER>
-
-<P><TABLE>
-<TR>
-<TD>
-<IMG ALIGN=LEFT ALT="SNMP" SRC="html/snmp.gif">
-</TD>
-
-<TD>
-<P>A bilingual Simple Network Management Protocol application,
- featuring an Extensible Agent, a simple manager, a MIB compiler 
- and facilities for implementing SNMP MIBs etc.
-</TD>
-</TR>
-</TABLE>
-
-<P><CENTER>
-<TABLE CELLPADDING=15>
-<TR>
-<TD ALIGN=CENTER>
-<A HREF="html/users_guide.html"><IMG ALT="User's Guide" BORDER=0 SRC="html/user_guide.gif"></A><BR>
-<FONT SIZE="-1">
-<A HREF="html/users_guide.html">User's Guide</A>
-</FONT>
-</TD>
-
-<TD ALIGN=CENTER>
-<A HREF="html/index.html"><IMG ALT="Reference Manual" BORDER=0 SRC="html/ref_man.gif"></A><BR>
-<FONT SIZE="-1">
-<A HREF="html/index.html">Reference Manual</A>
-</FONT>
-</TD>
-
-<TD ALIGN=CENTER>
-<A HREF="html/release_notes.html"><IMG ALT="Release Notes" BORDER=0 SRC="html/notes.gif"></A><BR>
-<FONT SIZE="-1">
-<A HREF="html/release_notes.html">Release Notes</A>
-</FONT>
-</TD>
-
-<TD ALIGN=CENTER>
-<A HREF="pdf/snmp-%VSN%.pdf"><IMG ALT="Off-Print" BORDER=0 SRC="html/book.gif"></A><BR>
-<FONT SIZE="-1">
-<A HREF="pdf/snmp-%VSN%.pdf">Off-Print</A>
-</FONT>
-</TD>
-</TR>
-</TABLE>
-</CENTER>
-
-<P><CENTER>
-<HR>
-<FONT SIZE="-1">
-Copyright &copy; 1991-2001
-<A HREF="http://www.erlang.se/">Ericsson Utvecklings AB</A>
-</FONT>
-</CENTER>
-</BODY>
-</HTML>
diff --git a/lib/snmp/doc/src/min_head.gif b/lib/snmp/doc/src/min_head.gif
deleted file mode 100644
index 67948a6378..0000000000
--- a/lib/snmp/doc/src/min_head.gif
+++ /dev/null
diff --git a/lib/snmp/doc/src/note.gif b/lib/snmp/doc/src/note.gif
deleted file mode 100644
index 6fffe30419..0000000000
--- a/lib/snmp/doc/src/note.gif
+++ /dev/null
diff --git a/lib/snmp/doc/src/notes.gif b/lib/snmp/doc/src/notes.gif
deleted file mode 100644
index e000cca26a..0000000000
--- a/lib/snmp/doc/src/notes.gif
+++ /dev/null
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index e8527ded93..4705804759 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -11,7 +11,7 @@
       Licensed under the Apache License, Version 2.0 (the "License");
       you may not use this file except in compliance with the License.
       You may obtain a copy of the License at
- 
+
           http://www.apache.org/licenses/LICENSE-2.0
 
       Unless required by applicable law or agreed to in writing, software
@@ -19,7 +19,7 @@
       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
       See the License for the specific language governing permissions and
       limitations under the License.
-    
+
     </legalnotice>
 
     <title>SNMP Release Notes</title>
@@ -237,8 +237,8 @@
       <list type="bulleted">
         <item>
           <p>[compiler] Refinement of type Opaque was not allowed. </p>
-          <p>MIB constructs such as '<c>SYNTAX Opaque (SIZE(0..65535))</c>' 
-	  was previously not allowed, 
+          <p>MIB constructs such as '<c>SYNTAX Opaque (SIZE(0..65535))</c>'
+	  was previously not allowed,
 	  see the standard <c>ALARM-MIB</c> for eaxmple. </p>
           <p>Own Id: OTP-12066</p>
           <p>Aux Id: Seq 12669</p>
@@ -255,8 +255,8 @@
 <!--
       <list type="bulleted">
         <item>
-          <p>[agent] 
-	  see <seealso marker="snmpa#load_mibs">load_mibs</seealso> and 
+          <p>[agent]
+	  see <seealso marker="snmpa#load_mibs">load_mibs</seealso> and
 	  <seealso marker="snmpa#unload_mibs">unload_mibs</seealso>. </p>
           <p>Own Id: OTP-11216</p>
         </item>
@@ -387,18 +387,18 @@
 <!--
       <list type="bulleted">
         <item>
-          <p>Wrong block cypher type used for AES ('aes_cbf128' 
-	  instead of 'aes_cfb128') when performing AES block 
-	  encrypt/decrypt which breaks SNMP usmAesCfb128Protocol 
+          <p>Wrong block cypher type used for AES ('aes_cbf128'
+	  instead of 'aes_cfb128') when performing AES block
+	  encrypt/decrypt which breaks SNMP usmAesCfb128Protocol
 	  in agent and manager. </p>
           <p>Own Id: OTP-11412</p>
         </item>
 
         <item>
-          <p>[manager] When performing the AES encryption, invalid values for 
+          <p>[manager] When performing the AES encryption, invalid values for
 	  the EngineBoots and EngineTime was used. </p>
-	  <p>The values of the local agent was used, which would have produced 
-	  "some" values if an agent was actually running. 
+	  <p>The values of the local agent was used, which would have produced
+	  "some" values if an agent was actually running.
 	  If not it would have caused a crash. </p>
 	  <p>Own Id: OTP-11413</p>
         </item>
@@ -442,16 +442,16 @@
       <list type="bulleted">
         <item>
           <p>[agent] Enable SNMP to create missing database directories. </p>
-	  <p>Add 
+	  <p>Add
 	  <seealso marker="snmp_app#db_init_error">
-	  {db_init_error, create_db_and_dir}</seealso> option to SNMP 
-	  <seealso marker="snmp_app#manager_opts_and_types">manager</seealso> 
+	  {db_init_error, create_db_and_dir}</seealso> option to SNMP
+	  <seealso marker="snmp_app#manager_opts_and_types">manager</seealso>
 	  and
-	  <seealso marker="snmp_app#agent_opts_and_types">agent</seealso>. 
+	  <seealso marker="snmp_app#agent_opts_and_types">agent</seealso>.
 	  This allows them to create any missing parent directories for
-	  <c>db_dir</c>, rather than treating any missing directories 
+	  <c>db_dir</c>, rather than treating any missing directories
 	  as a fatal error.
-	  The default for <c>db_init_error</c>, which is <c>terminate</c>, 
+	  The default for <c>db_init_error</c>, which is <c>terminate</c>,
 	  is unchanged. </p>
 	  <p>Steve Vinoski</p>
           <p>Own Id: OTP-11352</p>
@@ -461,7 +461,7 @@
           <p>[manager] Improved handling of unexpected return values from
 	  <seealso marker="snmpm_user">snmpm_user</seealso>
 	  callback functions. </p>
-	  <p>Violations of the documented API (crashes or invalid return 
+	  <p>Violations of the documented API (crashes or invalid return
 	  values) will now result in an error message. </p>
           <p>Own Id: OTP-11307</p>
         </item>
@@ -469,16 +469,16 @@
         <item>
           <p>Add (atl) log conversion block option. </p>
 	  <p>It is now possible to request that the Audit Trail Log should
-	  be blocked during conversion (<c>log_to_txt</c> or <c>log_to_io</c>). 
-	  This could be usefull when coverting an entire large log (when 
+	  be blocked during conversion (<c>log_to_txt</c> or <c>log_to_io</c>).
+	  This could be usefull when coverting an entire large log (when
 	  there is a chance it may otherwise wrap during conversion). </p>
-	  <p>See 
-	  agent 
+	  <p>See
+	  agent
 	  <seealso marker="snmpa#log_to_txt">log_to_txt</seealso> and
-	  <seealso marker="snmpa#log_to_io">log_to_io</seealso> and also 
-	  manager 
+	  <seealso marker="snmpa#log_to_io">log_to_io</seealso> and also
+	  manager
 	  <seealso marker="snmpm#log_to_txt">log_to_txt</seealso> and
-	  <seealso marker="snmpm#log_to_io">log_to_io</seealso> 
+	  <seealso marker="snmpm#log_to_io">log_to_io</seealso>
 	  for details. </p>
           <p>Own Id: OTP-11396</p>
           <p>Own Id: seq12433</p>
@@ -487,9 +487,9 @@
         <item>
           <p>When converting an Audit Trail Log to text, a corrupt
 	  log entry could cause the entire conversion to fail. </p>
-	  <p>Also, for a log with sequence numbers, failing to 
+	  <p>Also, for a log with sequence numbers, failing to
 	  decode a log entry would cause the conversion to fail
-	  (not because of the failed decode, but because of the 
+	  (not because of the failed decode, but because of the
 	  failure to write the error message). </p>
           <p>Own Id: OTP-111453</p>
           <p>Aux Id: Seq 12459</p>
@@ -507,18 +507,18 @@
 
       <list type="bulleted">
         <item>
-          <p>Wrong block cypher type used for AES ('aes_cbf128' 
-	  instead of 'aes_cfb128') when performing AES block 
-	  encrypt/decrypt which breaks SNMP usmAesCfb128Protocol 
+          <p>Wrong block cypher type used for AES ('aes_cbf128'
+	  instead of 'aes_cfb128') when performing AES block
+	  encrypt/decrypt which breaks SNMP usmAesCfb128Protocol
 	  in agent and manager. </p>
           <p>Own Id: OTP-11412</p>
         </item>
 
         <item>
-          <p>[manager] When performing the AES encryption, invalid values for 
+          <p>[manager] When performing the AES encryption, invalid values for
 	  the EngineBoots and EngineTime was used. </p>
-	  <p>The values of the local agent was used, which would have produced 
-	  "some" values if an agent was actually running. 
+	  <p>The values of the local agent was used, which would have produced
+	  "some" values if an agent was actually running.
 	  If not it would have caused a crash. </p>
 	  <p>Own Id: OTP-11413</p>
         </item>
@@ -560,14 +560,14 @@
 
       <list type="bulleted">
         <item>
-          <p>[agent] Improved documentation for the functions for 
-	  loading and unloading mibs, 
-	  see <seealso marker="snmpa#load_mibs">load_mibs</seealso> and 
-	  <seealso marker="snmpa#unload_mibs">unload_mibs</seealso> for 
+          <p>[agent] Improved documentation for the functions for
+	  loading and unloading mibs,
+	  see <seealso marker="snmpa#load_mibs">load_mibs</seealso> and
+	  <seealso marker="snmpa#unload_mibs">unload_mibs</seealso> for
 	  more info. </p>
-          <p>Also added new functions for loading and unloading a single mib, 
-	  see <seealso marker="snmpa#load_mib">load_mib</seealso> and 
-	  <seealso marker="snmpa#unload_mib">unload_mib</seealso> for 
+          <p>Also added new functions for loading and unloading a single mib,
+	  see <seealso marker="snmpa#load_mib">load_mib</seealso> and
+	  <seealso marker="snmpa#unload_mib">unload_mib</seealso> for
 	  more info. </p>
           <p>Own Id: OTP-11216</p>
         </item>
@@ -583,8 +583,8 @@
 <!--
       <list type="bulleted">
         <item>
-          <p>[agent] 
-	  see <seealso marker="snmpa#load_mibs">load_mibs</seealso> and 
+          <p>[agent]
+	  see <seealso marker="snmpa#load_mibs">load_mibs</seealso> and
 	  <seealso marker="snmpa#unload_mibs">unload_mibs</seealso>. </p>
           <p>Own Id: OTP-11216</p>
         </item>
@@ -610,7 +610,7 @@
       </list>
 -->
     </section>
-    
+
   </section> <!-- 4.24.2 -->
 
 
@@ -643,29 +643,29 @@
 
       <list type="bulleted">
         <item>
-          <p>[agent] Reading the value of the vacmViewTreeFamilyMask returns 
+          <p>[agent] Reading the value of the vacmViewTreeFamilyMask returns
 	  it in the wrong (internal bitlist) format. </p>
 	  <p>The vacmViewTreeFamilyMask is defined as a bit string in the MIB
-	  (OCTET STRING). Internally a bitlist (list of 1's and 0's, 
+	  (OCTET STRING). Internally a bitlist (list of 1's and 0's,
 	  see <seealso marker="snmp_agent_config_files#vacm">vacm config file</seealso>
-	  for more info) is used. 
+	  for more info) is used.
 	  However, the MIB implementation assumed the latter, effectively
 	  rendering all attempts to read/set masks via SNMP unsuccessful. </p>
-	  <p>Since the mask is used in hot paths (e.g. access permission checks 
-	  for each SNMP operation, the bitlist representation of the mask has 
-	  benefits (e.g. faster processing). Reading/writing the view mask 
-	  objects is less time-critical. Therefore, to fix the issue, convert 
-	  between the bitlist (internal) representation and bitstring 
+	  <p>Since the mask is used in hot paths (e.g. access permission checks
+	  for each SNMP operation, the bitlist representation of the mask has
+	  benefits (e.g. faster processing). Reading/writing the view mask
+	  objects is less time-critical. Therefore, to fix the issue, convert
+	  between the bitlist (internal) representation and bitstring
 	  (external) when the vacmViewTreeFamilyMask objects are accessed. </p>
-	  <p>Also, the check of the vacm config file was invalid with 
-	  regard to the mask value. It was assumed to be a proper oid, which 
+	  <p>Also, the check of the vacm config file was invalid with
+	  regard to the mask value. It was assumed to be a proper oid, which
 	  is not strictly the case (see bitlist above). </p>
           <p>Own Id: OTP-11177</p>
 	  <p>Stefan Zegenhagen</p>
         </item>
 
         <item>
-          <p>[agent] The counter increment function in the local-db was  
+          <p>[agent] The counter increment function in the local-db was
 	  incorrect. It did not handle counter wrap correctly. </p>
           <p>Own Id: OTP-11192</p>
         </item>
@@ -712,26 +712,26 @@
         </item>
 
         <item>
-          <p>[agent] Introduced a documented behaviour for the mib-server 
-	  <seealso marker="snmpa_mib_data">mib-data backend</seealso>. 
+          <p>[agent] Introduced a documented behaviour for the mib-server
+	  <seealso marker="snmpa_mib_data">mib-data backend</seealso>.
 	  At present only the default module (<c>snmpa_mib_data_tttn</c>) is
 	  provided. </p>
-	  <p>A config option for the (agent) 
-	  <seealso marker="snmp_config#agent_mib_server">mib-servers</seealso> 
-	  mib-data backend module has been added to the agent config options, 
+	  <p>A config option for the (agent)
+	  <seealso marker="snmp_config#agent_mib_server">mib-servers</seealso>
+	  mib-data backend module has been added to the agent config options,
 	  <seealso marker="snmp_config#agent_ms_data_module">data_module</seealso>. </p>
 	  <p>Own Id: OTP-11101</p>
         </item>
 
         <item>
-          <p>[agent] Introduced a documented behaviour for the 
-	  <seealso marker="snmpa_mib_storage">mib storage</seealso>. 
-	  At present there are three simple modules 
-	  (<c>snmpa_mib_storage_ets</c>, <c>snmpa_mib_storage_dets</c> and 
+          <p>[agent] Introduced a documented behaviour for the
+	  <seealso marker="snmpa_mib_storage">mib storage</seealso>.
+	  At present there are three simple modules
+	  (<c>snmpa_mib_storage_ets</c>, <c>snmpa_mib_storage_dets</c> and
 	  <c>snmpa_mib_storage_mnesia</c>) implementing this behaviour,
 	  provided with the app. </p>
-	  <p>A config option for the (agent) 
-	  <seealso marker="snmp_config#agent_mib_storage">mib storage</seealso> 
+	  <p>A config option for the (agent)
+	  <seealso marker="snmp_config#agent_mib_storage">mib storage</seealso>
 	  has been added to the agent config options. </p>
 	  <p>Own Id: OTP-11107</p>
         </item>
@@ -789,14 +789,14 @@
       <list type="bulleted">
         <item>
           <p>[agent] Errors in <c>vacmAccessTable</c> RowStatus handling.
-	  There are problems with the handling of vacmAccessTableStatus 
+	  There are problems with the handling of vacmAccessTableStatus
 	  that cause some SNMP test suites to report errors.
-	  Most notably, erroneous set operations frequently cause "genErr" 
-	  errors to be returned. These "genErr" errors are usually caused 
-	  by badmatch exceptions coming from 
-	  <c>{ok, Row} = snmpa_vacm:get_row(RowIndex)</c> 
+	  Most notably, erroneous set operations frequently cause "genErr"
+	  errors to be returned. These "genErr" errors are usually caused
+	  by badmatch exceptions coming from
+	  <c>{ok, Row} = snmpa_vacm:get_row(RowIndex)</c>
 	  if the row does not exist. </p>
-	  <p>The semantics of the RowStatus handling in that table has 
+	  <p>The semantics of the RowStatus handling in that table has
 	  been adjusted to be compliant with the RowStatus
 	  textual description of SNPMv2-TC MIB. </p>
 	  <p>Stefan Zegenhagen</p>
@@ -820,7 +820,7 @@
         </item>
 
         <item>
-          <p>[compiler] The MIB compiler could not handle a table index 
+          <p>[compiler] The MIB compiler could not handle a table index
 	  that was defined later in the MIB. </p>
           <p>Own Id: OTP-10808</p>
         </item>
@@ -853,7 +853,7 @@
     <title>SNMP Development Toolkit 4.23</title>
 <!--
     <p>Version 4.23 supports code replacement in runtime from/to
-    version 4.22.1, 
+    version 4.22.1,
     4.22, 4.21.7 4.21.6 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1 and 4.21. </p>
 -->
 
@@ -865,14 +865,14 @@
 
       <list type="bulleted">
         <item>
-          <p>[manager] Polish return values of snmpm_user_default according 
+          <p>[manager] Polish return values of snmpm_user_default according
 	  to snmpm_user doc.</p>
 	  <p>Luca Favatella</p>
 	  <p>Own Id: OTP-10671</p>
         </item>
 
         <item>
-          <p>[agent] Remove runtime warning in snmpa_agent because of 
+          <p>[agent] Remove runtime warning in snmpa_agent because of
 	  tuple fun usage. </p>
 	  <p>Luca Favatella</p>
 	  <p>Own Id: OTP-10672</p>
@@ -894,10 +894,10 @@
       <!--
       <list type="bulleted">
         <item>
-          <p>[agent] Simultaneous 
-          <seealso marker="snmpa#backup">snmpa:backup/1,2</seealso> 
+          <p>[agent] Simultaneous
+          <seealso marker="snmpa#backup">snmpa:backup/1,2</seealso>
           calls can interfere.
-          The master agent did not check if a backup was already in 
+          The master agent did not check if a backup was already in
           progress when a backup request was accepted. </p>
           <p>Own Id: OTP-9884</p>
           <p>Aux Id: Seq 11995</p>
@@ -930,7 +930,7 @@
   <section>
     <title>SNMP Development Toolkit 4.22.1</title>
     <p>Version 4.22.1 supports code replacement in runtime from/to
-    version 4.22, 4.21.7 4.21.6 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1 and 
+    version 4.22, 4.21.7 4.21.6 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1 and
     4.21. </p>
 
     <section>
@@ -942,15 +942,15 @@
       <list type="bulleted">
         <item>
           <p>[agent] Sematic fixes to SNMP-USER-BASED-SM-MIB.
-	  The semantics allow the <c>usmUserAuthKeyChange</c> and 
-	  <c>usmUserPrivKeyChange</c> objects to be written to in the 
-	  same set requests that also creates and clones the user. 
-	  This was not possible beforehand, causing test tools checking 
+	  The semantics allow the <c>usmUserAuthKeyChange</c> and
+	  <c>usmUserPrivKeyChange</c> objects to be written to in the
+	  same set requests that also creates and clones the user.
+	  This was not possible beforehand, causing test tools checking
 	  semantic SNMPv3 behaviour to fail on a lot of test cases. </p>
-	  <p>Furthermore, once the user has been cloned by writing to an 
-	  instance of <c>usmUserCloneFrom</c>, further set-operations to 
-	  the same object will not return an error, but be no-ops. 
-	  Especially, it must be avoided to copy security parameters 
+	  <p>Furthermore, once the user has been cloned by writing to an
+	  instance of <c>usmUserCloneFrom</c>, further set-operations to
+	  the same object will not return an error, but be no-ops.
+	  Especially, it must be avoided to copy security parameters
 	  again (possibly even from a different user). </p>
 	  <p>Stefan Zegenhagen</p>
 	  <p>Own Id: OTP-10166</p>
@@ -958,14 +958,14 @@
 
         <item>
           <p>[agent] Errors in <c>vacmAccessTable</c> RowStatus handling.
-	  There are problems with the handling of vacmAccessTableStatus 
+	  There are problems with the handling of vacmAccessTableStatus
 	  that cause some SNMP test suites to report errors.
-	  Most notably, erroneous set operations frequently cause "genErr" 
-	  errors to be returned. These "genErr" errors are usually caused 
-	  by badmatch exceptions coming from 
-	  <c>{ok, Row} = snmpa_vacm:get_row(RowIndex)</c> 
+	  Most notably, erroneous set operations frequently cause "genErr"
+	  errors to be returned. These "genErr" errors are usually caused
+	  by badmatch exceptions coming from
+	  <c>{ok, Row} = snmpa_vacm:get_row(RowIndex)</c>
 	  if the row does not exist. </p>
-	  <p>The semantics of the RowStatus handling in that table has 
+	  <p>The semantics of the RowStatus handling in that table has
 	  been adjusted to be compliant with the RowStatus
 	  textual description of SNPMv2-TC MIB. </p>
 	  <p>Stefan Zegenhagen</p>
@@ -984,24 +984,24 @@
       <list type="bulleted">
         <item>
           <p>[agent] Fix walk over vacmAccessTable.
-	  Fix the get_next implementation of vacmAccessTable to 
+	  Fix the get_next implementation of vacmAccessTable to
 	  return all table entries. </p>
-	  <p>The get_next implementation of vacmAccessTable did not return 
-	  all available table data. Instead, it only returned the first 
+	  <p>The get_next implementation of vacmAccessTable did not return
+	  all available table data. Instead, it only returned the first
 	  column for each row, and all columns for the last row available. </p>
 	  <p>Stefan Zegenhagen</p>
           <p>Own Id: OTP-10165</p>
         </item>
 
         <item>
-          <p>[manager] 
-	  <seealso marker="snmpm#log_to_io">snmpm:log_to_io/6</seealso> 
+          <p>[manager]
+	  <seealso marker="snmpm#log_to_io">snmpm:log_to_io/6</seealso>
 	  did not use the LogName argument. </p>
           <p>Own Id: OTP-10066</p>
         </item>
 
         <item>
-          <p>Incorrect TimeTicks decode. Also bad handling of 
+          <p>Incorrect TimeTicks decode. Also bad handling of
 	  invalid encode (value outside of value range) for both
 	  <c>TimeTicks</c> and <c>Unsigned32</c>. </p>
           <p>Own Id: OTP-10132</p>
@@ -1032,38 +1032,38 @@
 
       <list type="bulleted">
         <item>
-          <p>[compiler] The table information the MIB compiler provides with 
-	  augmented tables has been extended with <c>nbr_of_cols</c>, 
+          <p>[compiler] The table information the MIB compiler provides with
+	  augmented tables has been extended with <c>nbr_of_cols</c>,
 	  <c>first_accessible</c> and <c>not_accessible</c>. </p>
           <p>Own Id: OTP-9969</p>
         </item>
 
         <item>
-          <p>Added the <c>log_to_io</c> audit-trail-log converter function 
-	  to the api modules of both the 
-	  <seealso marker="snmpm#log_to_io">manager</seealso> 
-	  and 
+          <p>Added the <c>log_to_io</c> audit-trail-log converter function
+	  to the api modules of both the
+	  <seealso marker="snmpm#log_to_io">manager</seealso>
+	  and
 	  <seealso marker="snmpa#log_to_io">agent</seealso>. </p>
           <p>Own Id: OTP-9940</p>
         </item>
 
         <item>
-          <p>[manager] Introduced a new transport module, 
-	  <c>snmpm_net_if_mt</c>, 
-	  which handles all incomming and outgoing 
+          <p>[manager] Introduced a new transport module,
+	  <c>snmpm_net_if_mt</c>,
+	  which handles all incomming and outgoing
 	  traffic in newly created processes. The message/request is
 	  processed and then the process exits. </p>
           <p>Own Id: OTP-9876</p>
 	</item>
 
         <item>
-          <p>[agent] Documenting previously existing but undocumented function, 
+          <p>[agent] Documenting previously existing but undocumented function,
 	  <seealso marker="snmp_generic#get_table_info">snmp_generic:get_table_info/2</seealso>. </p>
 	  <p>Own Id: OTP-9942</p>
         </item>
 
         <item>
-          <p>[agent] Improve error handling while reading agent config files. 
+          <p>[agent] Improve error handling while reading agent config files.
 	  Some files contain mandatory information and is therefor themself
 	  mandatory. </p>
 	  <p>Own Id: OTP-9943</p>
@@ -1079,10 +1079,10 @@
       <!--
       <list type="bulleted">
         <item>
-          <p>[agent] Simultaneous 
-          <seealso marker="snmpa#backup">snmpa:backup/1,2</seealso> 
+          <p>[agent] Simultaneous
+          <seealso marker="snmpa#backup">snmpa:backup/1,2</seealso>
           calls can interfere.
-          The master agent did not check if a backup was already in 
+          The master agent did not check if a backup was already in
           progress when a backup request was accepted. </p>
           <p>Own Id: OTP-9884</p>
           <p>Aux Id: Seq 11995</p>
@@ -1104,7 +1104,7 @@
   <section>
     <title>SNMP Development Toolkit 4.21.7</title>
     <p>Version 4.21.7 supports code replacement in runtime from/to
-    version 4.21.6, 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1, 4.21, 4.20.1 and 
+    version 4.21.6, 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1, 4.21, 4.20.1 and
     4.20. </p>
 
     <section>
@@ -1114,13 +1114,13 @@
       <!--
       <list type="bulleted">
         <item>
-          <p>[agent] DoS attack using GET-BULK with large value of 
+          <p>[agent] DoS attack using GET-BULK with large value of
           MaxRepetitions.
-          A preventive method has been implementing by simply 
-          limit the number of varbinds that can be included in 
-          a Get-BULK response message. This is specified by the 
-          new config option, 
-          <seealso marker="snmp_app#agent_gb_max_vbs">gb_max_vbs</seealso>. 
+          A preventive method has been implementing by simply
+          limit the number of varbinds that can be included in
+          a Get-BULK response message. This is specified by the
+          new config option,
+          <seealso marker="snmp_app#agent_gb_max_vbs">gb_max_vbs</seealso>.
           </p>
           <p>Own Id: OTP-9700</p>
         </item>
@@ -1138,10 +1138,10 @@
 
       <list type="bulleted">
         <item>
-          <p>[agent] Simultaneous 
-          <seealso marker="snmpa#backup">snmpa:backup/1,2</seealso> 
+          <p>[agent] Simultaneous
+          <seealso marker="snmpa#backup">snmpa:backup/1,2</seealso>
           calls can interfere.
-          The master agent did not check if a backup was already in 
+          The master agent did not check if a backup was already in
           progress when a backup request was accepted. </p>
           <p>Own Id: OTP-9884</p>
           <p>Aux Id: Seq 11995</p>
@@ -1162,7 +1162,7 @@
   <section>
     <title>SNMP Development Toolkit 4.21.6</title>
     <p>Version 4.21.6 supports code replacement in runtime from/to
-    version 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1, 4.21, 4.20.1 and 
+    version 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1, 4.21, 4.20.1 and
     4.20. </p>
 
     <section>
@@ -1173,13 +1173,13 @@
 
       <list type="bulleted">
         <item>
-          <p>[agent] DoS attack using GET-BULK with large value of 
+          <p>[agent] DoS attack using GET-BULK with large value of
           MaxRepetitions.
-          A preventive method has been implementing by simply 
-          limit the number of varbinds that can be included in 
-          a Get-BULK response message. This is specified by the 
-          new config option, 
-          <seealso marker="snmp_app#agent_gb_max_vbs">gb_max_vbs</seealso>. 
+          A preventive method has been implementing by simply
+          limit the number of varbinds that can be included in
+          a Get-BULK response message. This is specified by the
+          new config option,
+          <seealso marker="snmp_app#agent_gb_max_vbs">gb_max_vbs</seealso>.
           </p>
           <p>Own Id: OTP-9700</p>
         </item>
@@ -1196,11 +1196,11 @@
 
       <list type="bulleted">
         <item>
-          <p>[agent] Mib server cache gclimit update function incorrectly calls 
-          age update function. 
-          The gclimit update function, 
-          <seealso marker="snmpa#update_mibs_cache_gclimit">update_mibs_cache_gclimit/1</seealso>, 
-          <em>incorrectly</em> called the age update function, 
+          <p>[agent] Mib server cache gclimit update function incorrectly calls
+          age update function.
+          The gclimit update function,
+          <seealso marker="snmpa#update_mibs_cache_gclimit">update_mibs_cache_gclimit/1</seealso>,
+          <em>incorrectly</em> called the age update function,
           <seealso marker="snmpa#update_mibs_cache_age">update_mibs_cache_age/2</seealso>. </p>
           <p>Johan Claesson</p>
           <p>Own Id: OTP-9868</p>
@@ -1242,18 +1242,18 @@
     <section>
       <title>Fixed Bugs and Malfunctions</title>
 <!--
-      <p>-</p> 
+      <p>-</p>
 -->
 
       <list type="bulleted">
         <item>
-          <p>[agent] Repeated vacm table dumping fails due to file name 
-          conflict. When dumping the vacm table to disk, a temoporary 
-          file with a fixed name was used. If the table dumping 
-          (snmpa_vacm:dump_table/0) was initiated from several different 
-          processes in rapid succesion, the dumping could fail because the 
-          different processes was simultaniously trying to write to the 
-          same file. This problem has been eliminated by creating a unique 
+          <p>[agent] Repeated vacm table dumping fails due to file name
+          conflict. When dumping the vacm table to disk, a temoporary
+          file with a fixed name was used. If the table dumping
+          (snmpa_vacm:dump_table/0) was initiated from several different
+          processes in rapid succesion, the dumping could fail because the
+          different processes was simultaniously trying to write to the
+          same file. This problem has been eliminated by creating a unique
           name for the temporary file. </p>
           <p>Own Id: OTP-9851</p>
           <p>Aux Id: Seq 11980</p>
@@ -1294,7 +1294,7 @@
 <!--
       <list type="bulleted">
         <item>
-          <p>[compiler] Improved version info printout from the 
+          <p>[compiler] Improved version info printout from the
           <seealso marker="snmpc(command)#">MIB compiler frontend escript</seealso>. </p>
           <p>Own Id: OTP-9618</p>
         </item>
@@ -1307,7 +1307,7 @@
     <section>
       <title>Fixed Bugs and Malfunctions</title>
 <!--
-      <p>-</p> 
+      <p>-</p>
 -->
 
       <list type="bulleted">
@@ -1351,7 +1351,7 @@
 
       <list type="bulleted">
         <item>
-          <p>[compiler] Improved version info printout from the 
+          <p>[compiler] Improved version info printout from the
 	  <seealso marker="snmpc(command)#">MIB compiler frontend escript</seealso>. </p>
           <p>Own Id: OTP-9618</p>
         </item>
@@ -1363,27 +1363,27 @@
     <section>
       <title>Fixed Bugs and Malfunctions</title>
 <!--
-      <p>-</p> 
+      <p>-</p>
 -->
 
       <list type="bulleted">
         <item>
-          <p>[agent] Version 4.20 introduced a change that broke trap 
-	  sending from subagents. Due to a bug in the test code, 
+          <p>[agent] Version 4.20 introduced a change that broke trap
+	  sending from subagents. Due to a bug in the test code,
 	  this was not discovered, until that bug was fixed. </p>
           <p>Own Id: OTP-9745</p>
         </item>
 
         <item>
-          <p>[agent] When sending an error message (reply) regarding 
+          <p>[agent] When sending an error message (reply) regarding
 	  <c>snmpUnknownPDUHandlers</c>, the agent used the wrong OID. </p>
           <p>Own Id: OTP-9747</p>
         </item>
 
         <item>
-          <p>[compiler] Fix the <c>--warnings/--W</c> option parsing in the 
+          <p>[compiler] Fix the <c>--warnings/--W</c> option parsing in the
           <seealso marker="snmpc(command)#option_warnings">snmpc</seealso>
-          wrapper (e)script. 
+          wrapper (e)script.
           The short warning option was incorrectly <c>--w</c>, instead
           of as documented <c>--W</c>. This has now been corrected. </p>
           <p>*** POTENTIAL INCOMPATIBILITY ***</p>
@@ -1403,7 +1403,7 @@
 
       <list type="bulleted">
         <item>
-          <p>[compiler] The short warning option has been changed from 
+          <p>[compiler] The short warning option has been changed from
           <c>--w</c> to <c>--W</c> to comply with the documentation. </p>
           <p>Tuncer Ayaz</p>
           <p>Own Id: OTP-9718</p>
@@ -1427,7 +1427,7 @@
 <!--
       <list type="bulleted">
         <item>
-          <p>Bad note store GC timer deactivation. 
+          <p>Bad note store GC timer deactivation.
 	  Wrong field in the state record was set (timeout instead active). </p>
           <p>Stefan Grundmann</p>
           <p>Own Id: OTP-9690</p>
@@ -1441,12 +1441,12 @@
     <section>
       <title>Fixed Bugs and Malfunctions</title>
 <!--
-      <p>-</p> 
+      <p>-</p>
 -->
 
       <list type="bulleted">
         <item>
-          <p>Bad note store GC timer deactivation. 
+          <p>Bad note store GC timer deactivation.
 	  Wrong field in the state record was set (timeout instead active). </p>
           <p>Stefan Grundmann</p>
           <p>Own Id: OTP-9690</p>
@@ -1476,13 +1476,13 @@
 -->
       <list type="bulleted">
         <item>
-          <p>[compiler] Used wrong variable name (for 
-	  warnings-as-errors variable), which caused the 
+          <p>[compiler] Used wrong variable name (for
+	  warnings-as-errors variable), which caused the
 	  compiler to crash when using the snmpc (e)script. </p>
-	  <p>Also added the option 
+	  <p>Also added the option
 	  <seealso marker="snmpc(command)#option_werror">--Werror</seealso>
-	  for the SNMP MIB compiler (escript) frontend (to mimic 
-	  <seealso marker="erts:erlc">erlc</seealso>), 
+	  for the SNMP MIB compiler (escript) frontend (to mimic
+	  <seealso marker="erts:erlc">erlc</seealso>),
 	  which specifies whether warnings should be treated as errors. </p>
           <p>Own Id: OTP-9447</p>
         </item>
@@ -1497,12 +1497,12 @@
 
     <section>
       <title>Fixed Bugs and Malfunctions</title>
-      <p>-</p> 
+      <p>-</p>
 
 <!--
       <list type="bulleted">
         <item>
-          <p>The snmp config tool could not handle (manager) audit trail config 
+          <p>The snmp config tool could not handle (manager) audit trail config
 	  because the option seqno was not handled. </p>
 	  <p>Own Id: OTP-9354</p>
 	</item>
@@ -1532,15 +1532,15 @@
 -->
       <list type="bulleted">
         <item>
-          <p>[manager] There was no way to specify transport domain. 
+          <p>[manager] There was no way to specify transport domain.
 	  The transport domains was assumed to be IPv4 (transportDomainUdpIpv4).
-	  This has now been changed so that it can also be IPv6 
-	  (transportDomainUdpIpv6). 
-	  To facilitate this, the transport domain, <c>tdomain</c>, 
-	  is now a (new) valid option when 
+	  This has now been changed so that it can also be IPv6
+	  (transportDomainUdpIpv6).
+	  To facilitate this, the transport domain, <c>tdomain</c>,
+	  is now a (new) valid option when
 	  <seealso marker="snmpm#register_agent">registering</seealso>
-	  a new agent (and 
-	  <seealso marker="snmpm#update_agent_info">updating</seealso> 
+	  a new agent (and
+	  <seealso marker="snmpm#update_agent_info">updating</seealso>
 	  agent info). </p>
 	  <p>This also mean that the transport behaviour has changed. </p>
           <p>Own Id: OTP-9305</p>
@@ -1548,10 +1548,10 @@
         </item>
 
         <item>
-          <p>[compiler] Added the option 
-	  <seealso marker="snmpc#compile">warnings_as_errors</seealso> 
-	  (for the SNMP MIB compiler (escript) frontend, the option 
-	  <seealso marker="snmpc(command)#option_wae">--wae</seealso> is used) 
+          <p>[compiler] Added the option
+	  <seealso marker="snmpc#compile">warnings_as_errors</seealso>
+	  (for the SNMP MIB compiler (escript) frontend, the option
+	  <seealso marker="snmpc(command)#option_wae">--wae</seealso> is used)
 	  which specifies whether warnings should be treated as errors. </p>
           <p>Tuncer Ayaz</p>
           <p>Own Id: OTP-9437</p>
@@ -1563,12 +1563,12 @@
     <section>
       <title>Fixed Bugs and Malfunctions</title>
 <!--
-      <p>-</p> 
+      <p>-</p>
 -->
 
       <list type="bulleted">
         <item>
-          <p>The snmp config tool could not handle (manager) audit trail config 
+          <p>The snmp config tool could not handle (manager) audit trail config
 	  because the option seqno was not handled. </p>
 	  <p>Own Id: OTP-9354</p>
 	</item>
@@ -1622,11 +1622,11 @@
     <section>
       <title>Fixed Bugs and Malfunctions</title>
 <!--
-      <p>-</p> 
+      <p>-</p>
 -->
       <list type="bulleted">
         <item>
-          <p>[agent] Did not handle transport domains properly in some cases, 
+          <p>[agent] Did not handle transport domains properly in some cases,
 	  for instance trap sending. </p>
 	  <p>Own Id: OTP-9400</p>
 	</item>
@@ -1663,9 +1663,9 @@
       <list type="bulleted">
         <item>
           <p>[agent] Added support for sending traps to IPv6 targets. </p>
-	  <p>See the 
-	  <seealso marker="snmp_agent_config_files#target_addr">target address config file</seealso>, 
-	  the <seealso marker="snmpa_conf#target_addr_entry">target_addr_entry/11</seealso> function or 
+	  <p>See the
+	  <seealso marker="snmp_agent_config_files#target_addr">target address config file</seealso>,
+	  the <seealso marker="snmpa_conf#target_addr_entry">target_addr_entry/11</seealso> function or
 	  <seealso marker="snmp_target_mib#add_addr">add_addr/11</seealso> for more info. </p>
           <p>Own Id: OTP-9088</p>
           <p>Aux Id: Seq 11790</p>
@@ -1674,7 +1674,7 @@
 
         <item>
           <p>[agent] To be able to handle multiple engine-id(s) when
-	  sending trap(s), the function 
+	  sending trap(s), the function
           <seealso marker="snmp_community_mib#add_community">
 	  add_community/6</seealso> has been added. </p>
           <p>Own Id: OTP-9119</p>
@@ -1684,14 +1684,14 @@
         <item>
           <p>[manager] The API for snmp requests has been augmented to
 	  allow the caller to override some configuration. </p>
-	  <p>This has been done by introducing a new set of API functions, see 
-	  <seealso marker="snmpm#sync_get2">sync_get2/3,4</seealso>, 
-	  <seealso marker="snmpm#async_get2">async_get2/3,4</seealso>, 
-	  <seealso marker="snmpm#sync_get_next2">sync_get_next2/3,4</seealso>, 
-	  <seealso marker="snmpm#async_get_next2">async_get_next2/3,4</seealso>, 
-	  <seealso marker="snmpm#sync_get_bulk2">sync_get_bulk2/5,6</seealso>, 
-	  <seealso marker="snmpm#async_get_bulk2">async_get_bulk2/5,6</seealso>, 
-	  <seealso marker="snmpm#sync_set2">sync_set2/3,4</seealso> and 
+	  <p>This has been done by introducing a new set of API functions, see
+	  <seealso marker="snmpm#sync_get2">sync_get2/3,4</seealso>,
+	  <seealso marker="snmpm#async_get2">async_get2/3,4</seealso>,
+	  <seealso marker="snmpm#sync_get_next2">sync_get_next2/3,4</seealso>,
+	  <seealso marker="snmpm#async_get_next2">async_get_next2/3,4</seealso>,
+	  <seealso marker="snmpm#sync_get_bulk2">sync_get_bulk2/5,6</seealso>,
+	  <seealso marker="snmpm#async_get_bulk2">async_get_bulk2/5,6</seealso>,
+	  <seealso marker="snmpm#sync_set2">sync_set2/3,4</seealso> and
 	  <seealso marker="snmpm#async_set2">async_set2/3,4</seealso>
 	  for more info. </p>
           <p>Own Id: OTP-9162</p>
@@ -1699,8 +1699,8 @@
 
         <item>
           <p>[manager] The old API functions (for get and set
-	  requests: 
-	  snmpm:g/3,4,5,6,7, snmpm:ag/3,4,5,6,7, 
+	  requests:
+	  snmpm:g/3,4,5,6,7, snmpm:ag/3,4,5,6,7,
 	  snmpm:gn/3,4,5,6,7, snmpm:agn/3,4,5,6,7,
 	  snmpm:s/3,4,5,6,7, snmpm:s/3,4,5,6,7,
 	  snmpm:gb/5,6,7,8,9 and snmpm:agb/5,6,7,8,9)
@@ -1712,12 +1712,12 @@
         <item>
           <p>[agent] Pass extra info through the agent to the net-if
 	  process when sending notifications. </p>
-	  <p>See 
+	  <p>See
 	  <seealso marker="snmpa#send_notification2">
-	  snmpa:send_notification2/3</seealso> for more info. 
-	  See also the incomming net-if messages when sending a 
-	  <seealso marker="snmp_agent_netif#im_send_pdu">trap</seealso> 
-	  (send_pdu message) and 
+	  snmpa:send_notification2/3</seealso> for more info.
+	  See also the incomming net-if messages when sending a
+	  <seealso marker="snmp_agent_netif#im_send_pdu">trap</seealso>
+	  (send_pdu message) and
 	  <seealso marker="snmp_agent_netif#im_send_pdu_req">
 	  notification</seealso> (send_pdu_req message). </p>
           <p>Own Id: OTP-9183</p>
@@ -1735,15 +1735,15 @@
     <section>
       <title>Fixed Bugs and Malfunctions</title>
 <!--
-      <p>-</p> 
+      <p>-</p>
 -->
 
       <list type="bulleted">
         <item>
           <p>Fixed endode/decode of values of type <c>Counter32</c>. </p>
-	  <p>This type (<c>Counter32</c>) is an unsigned integer 32, 
-	  but is actually encoded as an signed integer 32. 
-	  The encode/decode functions however, treated it as if it was 
+	  <p>This type (<c>Counter32</c>) is an unsigned integer 32,
+	  but is actually encoded as an signed integer 32.
+	  The encode/decode functions however, treated it as if it was
 	  encodeded as an unsigned integer 32. </p>
 	  <p>Own Id: OTP-9022</p>
 	</item>
@@ -1758,12 +1758,4 @@
     </section>
 
   </section> <!-- 4.20 -->
-
-
-  <!-- section>
-    <title>Release notes history</title>
-    <p>For information about older versions see
-      <url href="part_notes_history_frame.html">release notes history</url>.</p>
-  </section -->
 </chapter>
-
diff --git a/lib/snmp/doc/src/part_notes.xml b/lib/snmp/doc/src/part_notes.xml
deleted file mode 100644
index d149044169..0000000000
--- a/lib/snmp/doc/src/part_notes.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>1997</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>SNMP Release Notes</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-    <file>part_notes.xml</file>
-  </header>
-  <description>
-    <p>A multilingual Simple Network Management Protocol application,
-      featuring an Extensible Agent, a simple manager and a MIB 
-      compiler and facilities for implementing SNMP MIBs etc.</p>
-    <p>For information about older versions see
-      <url href="part_notes_history_frame.html">release notes history</url>.</p>
-  </description>
-  <xi:include href="notes.xml"/>
-</part>
-
diff --git a/lib/snmp/doc/src/part_notes_history.xml b/lib/snmp/doc/src/part_notes_history.xml
deleted file mode 100644
index aa5276dc94..0000000000
--- a/lib/snmp/doc/src/part_notes_history.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part>
-  <header>
-    <copyright>
-      <year>2004</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>SNMP Release Notes History</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date></date>
-    <rev></rev>
-    <file>part_notes_history.xml</file>
-  </header>
-  <description>
-    <p>A multilingual Simple Network Management Protocol application,
-      featuring an Extensible Agent, a simple manager and a MIB 
-      compiler and facilities for implementing SNMP MIBs etc.</p>
-  </description>
-  <include file="notes_history"></include>
-</part>
-
diff --git a/lib/snmp/doc/src/ref_man.gif b/lib/snmp/doc/src/ref_man.gif
deleted file mode 100644
index b13c4efd53..0000000000
--- a/lib/snmp/doc/src/ref_man.gif
+++ /dev/null
diff --git a/lib/snmp/doc/src/snmp.gif b/lib/snmp/doc/src/snmp.gif
deleted file mode 100644
index d9985f990b..0000000000
--- a/lib/snmp/doc/src/snmp.gif
+++ /dev/null
diff --git a/lib/snmp/doc/src/summary.html.src b/lib/snmp/doc/src/summary.html.src
deleted file mode 100644
index 9bad4adbeb..0000000000
--- a/lib/snmp/doc/src/summary.html.src
+++ /dev/null
@@ -1 +0,0 @@
-Simple Network Management Protocol (SNMP) support including a MIB compiler, a simple SNMP manager and tools for creating SNMP agents
diff --git a/lib/snmp/doc/src/user_guide.gif b/lib/snmp/doc/src/user_guide.gif
deleted file mode 100644
index e6275a803d..0000000000
--- a/lib/snmp/doc/src/user_guide.gif
+++ /dev/null
diff --git a/lib/snmp/doc/src/warning.gif b/lib/snmp/doc/src/warning.gif
deleted file mode 100644
index 96af52360e..0000000000
--- a/lib/snmp/doc/src/warning.gif
+++ /dev/null