File 0247-Fix-typos-in-lib-snmp.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0247-Fix-typos-in-lib-snmp.patch of Package erlang (Revision ddfbbd0efffaf9570a604d2e0f074ad7)

Currently displaying revision ddfbbd0efffaf9570a604d2e0f074ad7 , Show latest

From 3a77c9b8787368dd8e5b0b9dcb494fc444e4fd9e Mon Sep 17 00:00:00 2001
From: "Kian-Meng, Ang" <kianmeng@cpan.org>
Date: Thu, 30 Dec 2021 20:03:18 +0800
Subject: [PATCH] Fix typos in lib/snmp

---
 lib/snmp/bin/snmp-v2tov1.pl                   |  2 +-
 lib/snmp/doc/src/notes.xml                    | 18 +++----
 lib/snmp/doc/src/notes_history.xml            | 10 ++--
 lib/snmp/doc/src/snmp.xml                     |  2 +-
 lib/snmp/doc/src/snmp_app.xml                 |  6 +--
 lib/snmp/doc/src/snmp_config.xml              |  2 +-
 lib/snmp/doc/src/snmp_def_instr_functions.xml |  8 +--
 lib/snmp/doc/src/snmp_index.xml               |  2 +-
 lib/snmp/doc/src/snmp_manager_netif.xml       |  4 +-
 lib/snmp/doc/src/snmpa.xml                    | 12 ++---
 lib/snmp/doc/src/snmpa_mib_data.xml           |  2 +-
 lib/snmp/doc/src/snmpa_mpd.xml                |  2 +-
 lib/snmp/doc/src/snmpm.xml                    | 14 ++---
 lib/snmp/doc/src/structure.fig                |  2 +-
 lib/snmp/src/agent/modules.mk                 |  4 +-
 lib/snmp/src/agent/snmp_framework_mib.erl     |  2 +-
 lib/snmp/src/agent/snmp_generic.erl           |  4 +-
 lib/snmp/src/agent/snmp_generic_mnesia.erl    |  2 +-
 lib/snmp/src/agent/snmp_shadow_table.erl      |  4 +-
 lib/snmp/src/agent/snmp_target_mib.erl        |  4 +-
 lib/snmp/src/agent/snmp_user_based_sm_mib.erl |  6 +--
 .../src/agent/snmp_view_based_acm_mib.erl     |  6 +--
 lib/snmp/src/agent/snmpa_acm.erl              |  2 +-
 lib/snmp/src/agent/snmpa_agent.erl            |  4 +-
 lib/snmp/src/agent/snmpa_general_db.erl       |  2 +-
 lib/snmp/src/agent/snmpa_get.erl              |  4 +-
 lib/snmp/src/agent/snmpa_local_db.erl         |  4 +-
 lib/snmp/src/agent/snmpa_mib_data_ttln.erl    |  4 +-
 lib/snmp/src/agent/snmpa_mib_data_tttn.erl    |  4 +-
 lib/snmp/src/agent/snmpa_mib_lib.erl          |  2 +-
 lib/snmp/src/agent/snmpa_mib_storage.erl      |  2 +-
 lib/snmp/src/agent/snmpa_mpd.erl              |  4 +-
 lib/snmp/src/agent/snmpa_net_if.erl           |  8 +--
 .../agent/snmpa_network_interface_filter.erl  |  2 +-
 lib/snmp/src/agent/snmpa_set_lib.erl          |  4 +-
 lib/snmp/src/agent/snmpa_supervisor.erl       |  2 +-
 lib/snmp/src/agent/snmpa_svbl.erl             |  4 +-
 lib/snmp/src/agent/snmpa_target_cache.erl     |  6 +--
 lib/snmp/src/agent/snmpa_trap.erl             | 10 ++--
 lib/snmp/src/agent/snmpa_usm.erl              |  4 +-
 lib/snmp/src/agent/snmpa_vacm.erl             |  4 +-
 lib/snmp/src/app/snmp.config                  |  8 +--
 lib/snmp/src/app/snmp.erl                     |  4 +-
 lib/snmp/src/compile/snmpc.erl                |  2 +-
 lib/snmp/src/compile/snmpc.src                |  2 +-
 lib/snmp/src/compile/snmpc_lib.erl            |  2 +-
 lib/snmp/src/compile/snmpc_mib_gram.yrl       |  4 +-
 lib/snmp/src/compile/snmpc_mib_to_hrl.erl     |  2 +-
 lib/snmp/src/compile/snmpc_tok.erl            |  2 +-
 lib/snmp/src/manager/snmpm.erl                | 12 ++---
 lib/snmp/src/manager/snmpm_config.erl         |  2 +-
 lib/snmp/src/manager/snmpm_mpd.erl            | 10 ++--
 lib/snmp/src/manager/snmpm_net_if.erl         |  2 +-
 .../snmpm_network_interface_filter.erl        |  2 +-
 lib/snmp/src/manager/snmpm_server.erl         | 52 +++++++++----------
 lib/snmp/src/manager/snmpm_usm.erl            |  4 +-
 lib/snmp/src/misc/snmp_conf.erl               |  6 +--
 lib/snmp/src/misc/snmp_config.erl             | 22 ++++----
 lib/snmp/src/misc/snmp_log.erl                |  2 +-
 lib/snmp/src/misc/snmp_misc.erl               |  2 +-
 lib/snmp/src/misc/snmp_note_store.erl         |  8 +--
 lib/snmp/src/misc/snmp_usm.erl                |  4 +-
 lib/snmp/test/klas3.erl                       |  2 +-
 lib/snmp/test/snmp_agent_SUITE.erl            | 38 +++++++-------
 lib/snmp/test/snmp_agent_mibs_SUITE.erl       |  2 +-
 lib/snmp/test/snmp_agent_test_lib.erl         |  6 +--
 lib/snmp/test/snmp_compiler_SUITE.erl         |  4 +-
 lib/snmp/test/snmp_conf_SUITE.erl             |  2 +-
 lib/snmp/test/snmp_manager_SUITE.erl          | 16 +++---
 lib/snmp/test/snmp_manager_config_SUITE.erl   | 12 ++---
 lib/snmp/test/snmp_note_store_SUITE.erl       |  2 +-
 lib/snmp/test/snmp_test_data/RFC1213-MIB.mib  |  6 +--
 lib/snmp/test/snmp_test_data/SNMPv2-MIB.mib   |  2 +-
 .../test/snmp_test_data/Test-LLDP-MIB.mib     |  4 +-
 lib/snmp/test/snmp_test_data/TestTrapv2.mib   |  4 +-
 .../test/snmp_test_global_sys_monitor.erl     |  8 +--
 lib/snmp/test/snmp_test_lib.erl               | 16 +++---
 lib/snmp/test/snmp_test_manager.erl           |  2 +-
 .../test/snmp_test_mgr_counter_server.erl     |  2 +-
 lib/snmp/test/snmp_test_mgr_misc.erl          |  4 +-
 lib/snmp/test/snmp_test_server.erl            |  2 +-
 lib/snmp/test/snmp_to_snmpnet_SUITE.erl       |  2 +-
 .../snmp_to_snmpnet_SUITE_data/TestTrapv2.mib |  4 +-
 lib/snmp/test/test-mibs/RFC1213-MIB.mib       |  6 +--
 lib/snmp/test/test-mibs/SNMPv2-MIB.mib        |  4 +-
 lib/snmp/test/test-mibs/SNMPv2-TC.mib         |  2 +-
 lib/snmp/test/test-mibs/SNMPv2-test.mib       |  4 +-
 87 files changed, 252 insertions(+), 252 deletions(-)

diff --git a/lib/snmp/bin/snmp-v2tov1.pl b/lib/snmp/bin/snmp-v2tov1.pl
index f9ecfc9dd8..6f1e73087d 100644
--- a/lib/snmp/bin/snmp-v2tov1.pl
+++ b/lib/snmp/bin/snmp-v2tov1.pl
@@ -64,7 +64,7 @@ line: while (<>) {
 	next line;
 }
 
- # Translate TEXTUAL-CONVENTION into an ordinary type assignement.
+ # Translate TEXTUAL-CONVENTION into an ordinary type assignment.
 # Place comments around body.
 if (/TEXTUAL-CONVENTION/ && ($str == 0)) {
 	$textual = 1;
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 5022157968..fa3e2355a3 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -185,7 +185,7 @@
 
 	 [manager] In a function handling snmp errors, an unused
 	 result (_Error) could result in matching issues and
-	 therefor case clause runtime errors (crash). Note that
+	 therefore case clause runtime errors (crash). Note that
 	 this would only happen in *very* unusual error cases.
 
 	 Own Id: OTP-17161
@@ -1045,7 +1045,7 @@
 <list>
 <item>
 
-	 Improved cryptocraphic capability.
+	 Improved cryptographic capability.
 
 	 Own Id: OTP-12452
 </item>
@@ -1301,7 +1301,7 @@
 Add (atl) log conversion block option. 
 	 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
+	 This could be useful when converting an entire large log (when
 	 there is a chance it may otherwise wrap during conversion). 
 	 See
 	 agent
@@ -1772,7 +1772,7 @@
 
 <list type="bulleted">
 <item>
- [agent] Sematic fixes to SNMP-USER-BASED-SM-MIB.
+ [agent] Semantic 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.
@@ -1881,7 +1881,7 @@
 <item>
 [manager] Introduced a new transport module,
 	 <c>snmpm_net_if_mt</c>,
-	 which handles all incomming and outgoing
+	 which handles all incoming and outgoing
 	 traffic in newly created processes. The message/request is
 	 processed and then the process exits. 
 Own Id: OTP-9876
@@ -1895,7 +1895,7 @@
 
 <item>
 [agent] Improve error handling while reading agent config files.
-	 Some files contain mandatory information and is therefor themself
+	 Some files contain mandatory information and is therefore themself
 	 mandatory. 
 	 Own Id: OTP-9943
 </item>
@@ -2082,8 +2082,8 @@
 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
+ processes in rapid succession, the dumping could fail because the
+ different processes was simultaneously trying to write to the
 same file. This problem has been eliminated by creating a unique
 name for the temporary file. 
 Own Id: OTP-9851
@@ -2546,7 +2546,7 @@
 	 See
 	 <seeerl marker="snmpa#send_notification2">
 	 snmpa:send_notification2/3</seeerl> for more info.
-	 See also the incomming net-if messages when sending a
+	 See also the incoming net-if messages when sending a
 	 <seeguide marker="snmp_agent_netif#im_send_pdu">trap</seeguide>
 	 (send_pdu message) and
 	 <seeguide marker="snmp_agent_netif#im_send_pdu_req">
diff --git a/lib/snmp/doc/src/notes_history.xml b/lib/snmp/doc/src/notes_history.xml
index ed71a86e83..dc0f8fef84 100644
--- a/lib/snmp/doc/src/notes_history.xml
+++ b/lib/snmp/doc/src/notes_history.xml
@@ -438,7 +438,7 @@
 <item>
 [agent] The main agent type header file contained some miss-information 
 regarding the type of the entrytype field of the me-record, causing 
- unneccessary confusion.
+ unnecessary confusion.
 Own Id: OTP-8116
 	 Aux Id: Seq 11312
 </item>
@@ -490,7 +490,7 @@
 
 <item>
 [agent] A manager could no longer use the SNMPv3 user "initial" 
- as this was interpretated as the first step of the discovery. 
+ as this was interpreted as the first step of the discovery. 
 Introduced a new terminating option, <c>trigger_username</c> to
 make it possible to configure the username the agent reacts to. 
 Default is <c>""</c>. 
@@ -514,7 +514,7 @@
 <item>
 [agent] The main agent type header file contained some miss-information 
 regarding the type of the entrytype field of the me-record, causing 
- unneccessary confusion.
+ unnecessary confusion.
 Own Id: OTP-8116
 	 Aux Id: Seq 11312
 </item>
@@ -1397,7 +1397,7 @@
 
 <item>
 [agent] Uninstalling MEs when unloading mibs incorrect and 
- therefor never done. 
+ therefore never done. 
 Own Id: OTP-7153
 </item>
 
@@ -2175,7 +2175,7 @@
 <item>
 [manager] Improve handling of empty messages. Today 
 when receiving an empty (size = 0) udp message, this 
- will result in a decode failure (a catched function 
+ will result in a decode failure (a caught function 
 clause), which in turn will be passed on to the user, 
 via a call to the 
 <seeerl marker="snmpm_user#handle_error">handle_error</seeerl> 
diff --git a/lib/snmp/doc/src/snmp.xml b/lib/snmp/doc/src/snmp.xml
index 9a4e123cb2..cc866b9f99 100644
--- a/lib/snmp/doc/src/snmp.xml
+++ b/lib/snmp/doc/src/snmp.xml
@@ -381,7 +381,7 @@
 	<c>Stop</c> is the stop (last) date and time to which log 
 	events will be converted.
 	The <c>Block</c> argument indicates if the log should be blocked
-	during conversion. This could be usefull when converting large 
+	during conversion. This could be useful when converting large 
 	logs (when otherwise the log could wrap during conversion). 
 	Defaults to <c>true</c>. 
 	
diff --git a/lib/snmp/doc/src/snmp_app.xml b/lib/snmp/doc/src/snmp_app.xml
index 87002e8189..0613de3158 100644
--- a/lib/snmp/doc/src/snmp_app.xml
+++ b/lib/snmp/doc/src/snmp_app.xml
@@ -224,7 +224,7 @@ in the snmp_config file!
 	<note>
 	 Even with multi-threaded set to <c>extended</c>
 	 there is still a risk for 'reorder' when sending inform-requsts,
-	 which require a response (and may therefor require resending). 
+	 which require a response (and may therefore require resending). 
 	 Also, there is of course no way to guarantee order once the
 	 package is on the network. 
 	</note>
@@ -376,7 +376,7 @@ in the snmp_config file!
 	behaviour. 
 	Several entities (<c>mib-server</c> via the its data module and 
 	the <c>symbolic-store</c>) of the snmp agent uses this for storage 
-	of miscelaneous mib related data retrieved while loading a mib. 
+	of miscellaneous mib related data retrieved while loading a mib. 
 	There are several implementations provided with the agent: 
 	<c>snmpa_mib_storage_ets</c>, <c>snmpa_mib_storage_dets</c> and 
 	<c>snmpa_mib_storage_mnesia</c>. 
@@ -386,7 +386,7 @@ in the snmp_config file!
 <tag><marker id="agent_mst_options"></marker>
 <c><![CDATA[mib_storage_options() = list() <optional>]]></c></tag>
 <item>
- This is implementattion depended. That is, it depends on the 
+ This is implementation depended. That is, it depends on the 
 	module. For each module a specific set of options are valid. 
 	For the module provided with the app, these options are supported: 
 <list type="bulleted">
diff --git a/lib/snmp/doc/src/snmp_config.xml b/lib/snmp/doc/src/snmp_config.xml
index 4f3dcb6f02..0b8d786a2d 100644
--- a/lib/snmp/doc/src/snmp_config.xml
+++ b/lib/snmp/doc/src/snmp_config.xml
@@ -209,7 +209,7 @@
 	<note>
 	 Even with multi-threaded set to <c>extended</c>
 	 there is still a risk for 'reorder' when sending inform-requsts,
-	 which require a response (and may therefor require resending). 
+	 which require a response (and may therefore require resending). 
 	 Also, there is of course no way to guarantee order once the
 	 package is on the network. 
 	</note>
diff --git a/lib/snmp/doc/src/snmp_def_instr_functions.xml b/lib/snmp/doc/src/snmp_def_instr_functions.xml
index 5fbcfaf2db..5a59f1bae5 100644
--- a/lib/snmp/doc/src/snmp_def_instr_functions.xml
+++ b/lib/snmp/doc/src/snmp_def_instr_functions.xml
@@ -99,7 +99,7 @@
 </item>
 <item><c>genErr</c>. Used if an error occurred. Note,
 this should be an internal processing error, e.g. a caused
- by a programing fault somewhere. If the variable does not
+ by a programming fault somewhere. If the variable does not
 exist, use <c>{noValue, noSuchName}</c> or
 <c>{noValue, noSuchInstance}</c>.
 </item>
@@ -275,7 +275,7 @@
 </item>
 <item><c>genErr</c>. Used if an error occurred. Note that
 this should be an internal processing error, e.g. a caused
- by a programing fault somewhere. If some column does not
+ by a programming fault somewhere. If some column does not
 exist, use <c>{noValue, noSuchName}</c> or
 <c>{noValue, noSuchInstance}</c>.
 </item>
@@ -322,7 +322,7 @@
 <item><c>{NextOid, NextValue}</c>, where <c>NextOid</c>
 is the lexicographic next OBJECT IDENTIFIER for the
 corresponding column. This should be specified as the
- OBJECT IDENTIFER part following the table entry. This
+ OBJECT IDENTIFIER part following the table entry. This
 means that the first integer is the column number and
 the rest is a specification of the keys.
 <c>NextValue</c> is the value of this element.
@@ -336,7 +336,7 @@
 the column that caused the error. <c>Column</c> must be
 one of the columns in the <c>Cols</c> list. Note that
 this should be an internal processing error, e.g. a caused
- by a programing fault somewhere. If some column does not
+ by a programming fault somewhere. If some column does not
 exist, you must return the next accessible element (or
 <c>endOfTable</c>). 
 </item>
diff --git a/lib/snmp/doc/src/snmp_index.xml b/lib/snmp/doc/src/snmp_index.xml
index 9c8e6b8b33..d651d22882 100644
--- a/lib/snmp/doc/src/snmp_index.xml
+++ b/lib/snmp/doc/src/snmp_index.xml
@@ -123,7 +123,7 @@ get_next_pid(Oid, SnmpIndex) ->
 
 For example, if the SNMP table has two INDEX columns, the first
 one an OCTET STRING with size 2, and the second one an OBJECT
- IDENTIFER, the corresponding <c>key_types</c> parameter would be
+ IDENTIFIER, the corresponding <c>key_types</c> parameter would be
 <c>{fix_string, string}</c>.
 
 The <c>key()</c> type correlates to the <c>key_types()</c>
diff --git a/lib/snmp/doc/src/snmp_manager_netif.xml b/lib/snmp/doc/src/snmp_manager_netif.xml
index f6c9e642cf..cb7efe0699 100644
--- a/lib/snmp/doc/src/snmp_manager_netif.xml
+++ b/lib/snmp/doc/src/snmp_manager_netif.xml
@@ -63,8 +63,8 @@
 The (supervising) process simply sends a
 <seeguide marker="#im_ping">ping</seeguide> message and expects a
 <seeguide marker="#om_pong">pong</seeguide> message response
- (withing a specific time).
- The interval between each <c>ping/pong</c> exhange is user configurable.
+ (within a specific time).
+ The interval between each <c>ping/pong</c> exchange is user configurable.
 As is the time that is allowed for the
 <seeguide marker="#om_pong">pong</seeguide>
 message to arrive.
diff --git a/lib/snmp/doc/src/snmpa.xml b/lib/snmp/doc/src/snmpa.xml
index fb341f8f79..c7ddd10d67 100644
--- a/lib/snmp/doc/src/snmpa.xml
+++ b/lib/snmp/doc/src/snmpa.xml
@@ -587,7 +587,7 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
 	<c>LogName</c> defaults to "snmpa_log". 
 	<c>LogFile</c> defaults to "snmpa.log". 
 	The <c>Block</c> option indicates if the log should be blocked
-	during conversion. This could be usefull when converting large 
+	during conversion. This could be useful when converting large 
 	logs (when otherwise the log could wrap during conversion). 
 	Defaults to <c>true</c>. 
 	See <seeerl marker="snmp#log_to_txt">snmp:log_to_txt</seeerl> 
@@ -628,7 +628,7 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
 	<c>LogName</c> defaults to "snmpa_log". 
 	<c>LogFile</c> defaults to "snmpa.log".
 	The <c>Block</c> option indicates if the log should be blocked
-	during conversion. This could be usefull when converting large 
+	during conversion. This could be useful when converting large 
 	logs (when otherwise the log could wrap during conversion). 
 	Defaults to <c>true</c>. 
 	See <seeerl marker="snmp#log_to_io">snmp:log_to_io</seeerl> 
@@ -772,7 +772,7 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
 <v>Agent = pid() | atom()</v>
 </type>
 <desc>
- Retreive the size of the mib server cache. 
+ Retrieve the size of the mib server cache. 
 
 <marker id="gc_mibs_cache"></marker>
 </desc>
@@ -1104,7 +1104,7 @@ snmp_agent:register_subagent(SA1,[1,2,3], SA2).
 	</list>
 
 	The 'process oid' "tag" that can be provided with the
-	variable name / oids is indended to be used for oid post
+	variable name / oids is intended to be used for oid post
 	processing. The value '<c>keep</c>', which is the default, leaves
 	the oid as is. The value '<c>truncate</c>', will cause the oid
 	to be "truncated". That is, any trailing ".0" will be removed. 
@@ -1126,8 +1126,8 @@ snmp_agent:register_subagent(SA1,[1,2,3], SA2).
 	 of this data, with one exception: 
 	 Any tuple containing the atom 
 	 <c>snmpa_default_notification_extra_info</c> 
-	 may be used by the agent and is therefor reserved. 
-	 See the net-if incomming messages for sending a 
+	 may be used by the agent and is therefore reserved. 
+	 See the net-if incoming messages for sending a 
 	 <seeguide marker="snmp_agent_netif#im_send_pdu">
 	 trap</seeguide> and 
 	 <seeguide marker="snmp_agent_netif#im_send_pdu_req">
diff --git a/lib/snmp/doc/src/snmpa_mib_data.xml b/lib/snmp/doc/src/snmpa_mib_data.xml
index 1937e0f780..2dc15c8b57 100644
--- a/lib/snmp/doc/src/snmpa_mib_data.xml
+++ b/lib/snmp/doc/src/snmpa_mib_data.xml
@@ -363,7 +363,7 @@
 </type>
 <desc>
 Perform a backup of the mib-server data. 
- Note that its implementation dependant (and also 
+ Note that its implementation dependent (and also 
 	dependent on mib-storage is used) if a backup is possible. 
 
 <marker id="code_change"></marker>
diff --git a/lib/snmp/doc/src/snmpa_mpd.xml b/lib/snmp/doc/src/snmpa_mpd.xml
index e9294430bd..3cfdf68788 100644
--- a/lib/snmp/doc/src/snmpa_mpd.xml
+++ b/lib/snmp/doc/src/snmpa_mpd.xml
@@ -170,7 +170,7 @@
 <c>To</c> is a list of destination addresses and
 their corresponding security parameters. This value is
 received in the same message from the agent and then transformed
-	 trough <seeerl marker="#process_taddrs"><c>process_taddrs</c></seeerl>
+	 through <seeerl marker="#process_taddrs"><c>process_taddrs</c></seeerl>
 	 before passed to this function.
 
 <note>
diff --git a/lib/snmp/doc/src/snmpm.xml b/lib/snmp/doc/src/snmpm.xml
index 9371723a24..8807851518 100644
--- a/lib/snmp/doc/src/snmpm.xml
+++ b/lib/snmp/doc/src/snmpm.xml
@@ -130,7 +130,7 @@ sec_level() = noAuthNoPriv | authNoPriv | authPriv
 <item>
 During the start of a system, when a client application 
 could start prior to the SNMP manager but is dependent
- upon it, and therefor has to wait for it to start.
+ upon it, and therefore has to wait for it to start.
 </item>
 <item>
 When the SNMP manager has crashed, the dependent client 
@@ -943,7 +943,7 @@ priv_key = [integer()] (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
 	<c>LogName</c> defaults to "snmpm_log". 
 	<c>LogFile</c> defaults to "snmpm.log".
 	The <c>Block</c> argument indicates if the log should be blocked
-	during conversion. This could be usefull when converting large 
+	during conversion. This could be useful when converting large 
 	logs (when otherwise the log could wrap during conversion). 
 	Defaults to <c>true</c>. 
 	See <seeerl marker="snmp#log_to_txt">snmp:log_to_txt</seeerl> 
@@ -985,7 +985,7 @@ priv_key = [integer()] (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
 	<c>LogName</c> defaults to "snmpm_log". 
 	<c>LogFile</c> defaults to "snmpm.log".
 	The <c>Block</c> argument indicates if the log should be blocked
-	during conversion. This could be usefull when converting large 
+	during conversion. This could be useful when converting large 
 	logs (when otherwise the log could wrap during conversion). 
 	Defaults to <c>true</c>. 
 	See <seeerl marker="snmp#log_to_io">snmp:log_to_io</seeerl> 
@@ -1134,7 +1134,7 @@ priv_key = [integer()] (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
 <v>Reason = term()</v>
 </type>
 <desc>
- Retreive the type (asn1 bertype) of an oid.
+ Retrieve the type (asn1 bertype) of an oid.
 
 <marker id="backup"></marker>
 </desc>
@@ -1196,7 +1196,7 @@ priv_key = [integer()] (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
 </type>
 <desc>
 	Restart the indicated process (<c>Ref</c>). Note that its not
-	without risk to restart a process, and should therefor be used
+	without risk to restart a process, and should therefore be used
 	with care. 
 
 <marker id="format_reason"></marker>
@@ -1227,9 +1227,9 @@ priv_key = [integer()] (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
 <seeerl marker="snmpm_user#handle_error">handle_error</seeerl> user callback function.
 </item>
 </list>
- <c>Prefix</c> should either be an indention string
+ <c>Prefix</c> should either be an indentation string
 (e.g. a list of spaces) or a positive integer (which will be used
- to create the indention string of that length).
+ to create the indentation string of that length).
 </desc>
 </func>
 </funcs>
diff --git a/lib/snmp/doc/src/structure.fig b/lib/snmp/doc/src/structure.fig
index c7feff6f47..c50a5b74b3 100644
--- a/lib/snmp/doc/src/structure.fig
+++ b/lib/snmp/doc/src/structure.fig
@@ -30,7 +30,7 @@ Inches
 	 2400 900 8625 900 8625 6000 2400 6000 2400 900
 2 2 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 5
 	 8625 6000 8625 6000 8625 6000 8625 6000 8625 6000
-4 0 -1 0 0 0 12 0.0000 4 135 1230 3525 3000 Assosiacition file\001
+4 0 -1 0 0 0 12 0.0000 4 135 1230 3525 3000 Association file\001
 4 0 -1 0 0 0 12 0.0000 4 180 990 3750 1575 SNMP Agent\001
 4 0 -1 0 0 0 12 0.0000 4 135 345 4050 1950 MIB\001
 4 0 -1 0 0 0 12 0.0000 4 180 1080 3075 4275 snmp_local_db\001
diff --git a/lib/snmp/src/agent/modules.mk b/lib/snmp/src/agent/modules.mk
index 39c9aca1cd..2329bdd9d5 100644
--- a/lib/snmp/src/agent/modules.mk
+++ b/lib/snmp/src/agent/modules.mk
@@ -41,9 +41,9 @@ MIB_MODULES = \
 	snmp_view_based_acm_mib
 
 # snmpa is "plain" interface module but also defines some agent specific types
-# and therefor must be compiled before the modules that use them, including
+# and therefore must be compiled before the modules that use them, including
 # the behaviour modules...
-# Some of the MIB modules also define types used elsewhere and therefor
+# Some of the MIB modules also define types used elsewhere and therefore
 # has to be built before the other mods.
 # snmpa_mib_data_ttln
 MODULES = \
diff --git a/lib/snmp/src/agent/snmp_framework_mib.erl b/lib/snmp/src/agent/snmp_framework_mib.erl
index 5db686d29b..b24722b5be 100644
--- a/lib/snmp/src/agent/snmp_framework_mib.erl
+++ b/lib/snmp/src/agent/snmp_framework_mib.erl
@@ -474,7 +474,7 @@ delete_context(Key) ->
 
 %%-----------------------------------------------------------------
 %% Instrumentation functions
-%% Retreive functions are also used internally by the agent, so
+%% Retrieve functions are also used internally by the agent, so
 %% don't change the interface without changing those functions.
 %% Note that if these functions implementations are changed,
 %% an error can make the agent crash, as no error detection is
diff --git a/lib/snmp/src/agent/snmp_generic.erl b/lib/snmp/src/agent/snmp_generic.erl
index 429f78abd0..7bda794df6 100644
--- a/lib/snmp/src/agent/snmp_generic.erl
+++ b/lib/snmp/src/agent/snmp_generic.erl
@@ -134,7 +134,7 @@ table_max_col(NameDb, Col) -> % ret largest element in Col
 
 
 %%------------------------------------------------------------------
-%% Theses functions could be in the MIB for simple 
+%% These functions could be in the MIB for simple 
 %% variables or tables, i.e. vars without complex 
 %% set-operations. If there are complex set op, an
 %% extra layer-function should be added, and that
@@ -566,7 +566,7 @@ table_create_rest(Col, Max, StatusCol, Status, Cols, NoAccs) when Col =< Max->
 %% Defs is a list of {Col, DefVal}, in Column order.
 %% Returns a new row (a list of values) with the same values as
 %% InitRow, except if InitRow has value noinit in a column, and
-%% the corresponing Col has a DefVal in Defs, then the DefVal
+%% the corresponding Col has a DefVal in Defs, then the DefVal
 %% will be the new value.
 %%------------------------------------------------------------------
 table_defaults(InitRow, Defs) -> table_defaults(InitRow, 1, Defs).
diff --git a/lib/snmp/src/agent/snmp_generic_mnesia.erl b/lib/snmp/src/agent/snmp_generic_mnesia.erl
index 131b9b0368..cfca3d9da9 100644
--- a/lib/snmp/src/agent/snmp_generic_mnesia.erl
+++ b/lib/snmp/src/agent/snmp_generic_mnesia.erl
@@ -37,7 +37,7 @@
 %%%-----------------------------------------------------------------
 
 %%------------------------------------------------------------------
-%% Theses functions could be in the MIB for simple 
+%% These functions could be in the MIB for simple 
 %% variables or tables, i.e. vars without complex 
 %% set-operations. If there are complex set op, an
 %% extra layer-function should be added, and that
diff --git a/lib/snmp/src/agent/snmp_shadow_table.erl b/lib/snmp/src/agent/snmp_shadow_table.erl
index f9181f70a7..3b4b1f7fe7 100644
--- a/lib/snmp/src/agent/snmp_shadow_table.erl
+++ b/lib/snmp/src/agent/snmp_shadow_table.erl
@@ -93,9 +93,9 @@ update(Name, UpdateFunc, Interval) ->
 %% Args: Extra = {Name, SnmpKey, Attributes, Interval, UpdateFunc}
 %% Purpose: Instrumentation function for the table.
 %% Name is the name of the table
-%% SnmpKey is the snmpkey as it should be specifed in order
+%% SnmpKey is the snmpkey as it should be specified in order
 %% to create the Mnesia table as an SNMP table
-%% Attributes is the attributes as it should be specifed in order
+%% Attributes is the attributes as it should be specified in order
 %% to create the Mnesia table as an SNMP table
 %% Interval is the minimum time in milliseconds between two
 %% updates of the table
diff --git a/lib/snmp/src/agent/snmp_target_mib.erl b/lib/snmp/src/agent/snmp_target_mib.erl
index 22fd3acb84..7c0414f6fd 100644
--- a/lib/snmp/src/agent/snmp_target_mib.erl
+++ b/lib/snmp/src/agent/snmp_target_mib.erl
@@ -595,7 +595,7 @@ get_target_addr({Tab, mnesia}, Key) ->
 	 snmpTargetAddrRowStatus = ?'RowStatus_active'}} ->
 	 case get_target_params(Params) of
 		undefined ->
-		 config_err("Failed retreiving target params [~p]"
+		 config_err("Failed retrieving target params [~p]"
 			 "~n for ~p [~p]", [Params, Key, TAddress]),
 		 {error, {not_found, {target_params, Key, Params}}};
 		TargetParams ->
@@ -612,7 +612,7 @@ get_target_addr(TabDb, Key) ->
 	 _Storage, ?'RowStatus_active', _TargetEngineId,_TMask,_MMS} ->
 	 case get_target_params(Params) of
 		undefined ->
-		 config_err("Failed retreiving target params [~p]"
+		 config_err("Failed retrieving target params [~p]"
 			 "~n for target ~p [~p]", 
 			 [Params, Key, TAddress]),
 		 {error, {not_found, {target_params, Key, Params}}};
diff --git a/lib/snmp/src/agent/snmp_user_based_sm_mib.erl b/lib/snmp/src/agent/snmp_user_based_sm_mib.erl
index 0b94f4604a..e75cb7c5ce 100644
--- a/lib/snmp/src/agent/snmp_user_based_sm_mib.erl
+++ b/lib/snmp/src/agent/snmp_user_based_sm_mib.erl
@@ -830,7 +830,7 @@ validate_set(Error, _RowIndex, _Cols) ->
 %%-----------------------------------------------------------------
 %% Here's the alg: If this is the first time the CloneFrom is written,
 %% we must check that the CloneFrom row exists, so we can invoke the
-%% clone process in the set phase. Otherwise, the set succed, with
+%% clone process in the set phase. Otherwise, the set succeed, with
 %% no further checks.
 %%-----------------------------------------------------------------
 validate_clone_from(RowIndex, Cols) ->
@@ -902,7 +902,7 @@ validate_auth_protocol(RowIndex, Cols) ->
 %% now; set is ok if new protocol is usmNoAuthProtocol
 		 case AuthProtocol of
 			?usmNoAuthProtocol ->
-			 %% Check that the Priv protocl is noPriv
+			 %% Check that the Priv protocol is noPriv
 			 case get_priv_proto(RowIndex, Cols) of
 				?usmNoPrivProtocol -> ok;
 				_ -> inconsistentValue(?usmUserAuthProtocol)
@@ -928,7 +928,7 @@ validate_auth_protocol(RowIndex, Cols) ->
 		 %% hash function.
 		 case AuthProtocol of
 			?usmNoAuthProtocol ->
-			 %% Check that the Priv protocl is noPriv
+			 %% Check that the Priv protocol is noPriv
 			 case get_priv_proto(RowIndex, Cols) of
 				?usmNoPrivProtocol -> ok;
 				_ -> inconsistentValue(?usmUserAuthProtocol)
diff --git a/lib/snmp/src/agent/snmp_view_based_acm_mib.erl b/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
index a5a65d9326..897a4b5176 100644
--- a/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
+++ b/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
@@ -285,7 +285,7 @@ delete_sec2group(Key) ->
 	 {error, delete_failed}
 end.
 
-%% NOTE: This function must be used in conjuction with
+%% NOTE: This function must be used in conjunction with
 %% snmpa_vacm:dump_table.
 %% That is, when all access has been added, call
 %% snmpa_vacm:dump_table/0
@@ -357,7 +357,7 @@ init_vacm_mnesia() ->
 
 %% The 5 is intentional: It is a trick to get a tuple with the
 %% columns needed by the vacm ets-table (corresponding to the 
- %% tuple read from the config files). Therefor, 5 since it it
+ %% tuple read from the config files). Therefore, 5 since it it
 %% is not a real foi...
 snmp_generic:table_foreach({vacmAccessTable, mnesia}, F, 5).
 
@@ -1048,7 +1048,7 @@ imask2emask(IMask) ->
 imask2emask([], EMask) ->
 lists:reverse(EMask);
 imask2emask(IMask, EMask) ->
- %% Make sure we have atleast 8 bits
+ %% Make sure we have at least 8 bits
 %% (maybe extend with 1's)
 IMask2 = 
 	case length(IMask) of
diff --git a/lib/snmp/src/agent/snmpa_acm.erl b/lib/snmp/src/agent/snmpa_acm.erl
index de67df8a06..de550c590a 100644
--- a/lib/snmp/src/agent/snmpa_acm.erl
+++ b/lib/snmp/src/agent/snmpa_acm.erl
@@ -234,7 +234,7 @@ invalidate_ca_cache() ->
 
 %%-----------------------------------------------------------------
 %% NOTE: The do_get MUST be executed in the Master agents's 
-%% context. Therefor, force master-agent to do a GET to 
+%% context. Therefore, force master-agent to do a GET to 
 %% retrieve the value for snmpEnableAuthenTraps. 
 %% A user may have another impl. than default for this 
 %% variable.
diff --git a/lib/snmp/src/agent/snmpa_agent.erl b/lib/snmp/src/agent/snmpa_agent.erl
index 48630489fa..c1675e40f8 100644
--- a/lib/snmp/src/agent/snmpa_agent.erl
+++ b/lib/snmp/src/agent/snmpa_agent.erl
@@ -2133,7 +2133,7 @@ handle_discovery_response(#state{disco = #disco{target = TargetName,
 	 "~n ManagerEngineId: ~p", [TargetName, ManagerEngineId]),
 %% This is end of stage 1.
 %% So, first we need to update the database with the EngineId of the 
- %% manager and then deside if we should continue with stage 2. E.g.
+ %% manager and then decide if we should continue with stage 2. E.g.
 %% establish authenticated communication. 
 case snmp_target_mib:set_target_engine_id(TargetName, ManagerEngineId) of
 	true when Disco#disco.sec_level =:= ?'SnmpSecurityLevel_noAuthNoPriv' ->
@@ -2526,7 +2526,7 @@ validate_next_v1_2([], _MibView, Res) ->
 %% column, we'll try to find the next instance. This will be the
 %% next row in the table, which is a Counter64 value as well. This
 %% means that we will loop through the entire table, until we find
-%% a column that isn't a Counter64 column. We can optimze this by
+%% a column that isn't a Counter64 column. We can optimize this by
 %% adding 1 to the column-no in the oid of this instance.
 %% If the table is implemented by a subagent this does not help,
 %% we'll call that subagent many times. But it shouldn't be any
diff --git a/lib/snmp/src/agent/snmpa_general_db.erl b/lib/snmp/src/agent/snmpa_general_db.erl
index a1e91b2b3c..0ff1f0cd83 100644
--- a/lib/snmp/src/agent/snmpa_general_db.erl
+++ b/lib/snmp/src/agent/snmpa_general_db.erl
@@ -56,7 +56,7 @@
 %% Open or create a database table. In the mnesia/dets case, 
 %% where the table is stored on disc, it could be of interest
 %% to clear the table. This is controlled by the Action parameter.
-%% An empty node list ([]), is traslated into a list containing
+%% An empty node list ([]), is translated into a list containing
 %% only the own node.
 %% ---------------------------------------------------------------
 open({mnesia,Nodes,clear}, Name, RecName, Attr, Type) when is_list(Nodes) ->
diff --git a/lib/snmp/src/agent/snmpa_get.erl b/lib/snmp/src/agent/snmpa_get.erl
index c4f4f44095..99e4bb39f9 100644
--- a/lib/snmp/src/agent/snmpa_get.erl
+++ b/lib/snmp/src/agent/snmpa_get.erl
@@ -143,7 +143,7 @@ do_get_local([], Res, _IsNotification) ->
 %%-----------------------------------------------------------------
 %% Func: do_get_subagents/2
 %% Purpose: Loop the list of varbinds for different subagents.
-%% For each of them, call sub_agent_get to retreive
+%% For each of them, call sub_agent_get to retrieve
 %% the values for them.
 %% Returns: {noError, 0, ListOfNewVarbinds} |
 %% {ErrorStatus, ErrorIndex, []}
@@ -928,7 +928,7 @@ validate_tab_next_res(TooMany, [], Mfa, _Res, _, _, I) ->
 %%-----------------------------------------------------------------
 %% Func: get_next_sa/4
 %% Purpose: Loop the list of varbinds for the subagent.
-%% Call subagent_get_next to retreive
+%% Call subagent_get_next to retrieve
 %% the next varbinds.
 %% Returns: {ok, ListOfNewVbs, ListOfEndOfMibViewsVbs} |
 %% {ErrorStatus, ErrorIndex}
diff --git a/lib/snmp/src/agent/snmpa_local_db.erl b/lib/snmp/src/agent/snmpa_local_db.erl
index c9093fcdb9..188fd5ecda 100644
--- a/lib/snmp/src/agent/snmpa_local_db.erl
+++ b/lib/snmp/src/agent/snmpa_local_db.erl
@@ -663,7 +663,7 @@ code_change(_Vsn, State, _Extra) ->
 %%----------------------------------------------------------
 
 handle_backup(D, BackupDir) ->
- %% First check that we do not wrote to the corrent db-dir...
+ %% First check that we do not wrote to the current db-dir...
 ?vtrace("handle_backup -> entry with"
 	"~n D: ~p"
 	"~n BackupDir: ~p", [D, BackupDir]),
@@ -1215,7 +1215,7 @@ cast(Msg) ->
 
 %% ----------------------------------------------------------------
 %% DETS wrapper functions
-%% The purpose of these fuctions is basically to hide the shadow 
+%% The purpose of these functions is basically to hide the shadow 
 %% table.
 %% Changes are made both in dets and in the shadow table.
 %% Reads are made from the shadow table.
diff --git a/lib/snmp/src/agent/snmpa_mib_data_ttln.erl b/lib/snmp/src/agent/snmpa_mib_data_ttln.erl
index 959230b1dd..3a3fa35c77 100644
--- a/lib/snmp/src/agent/snmpa_mib_data_ttln.erl
+++ b/lib/snmp/src/agent/snmpa_mib_data_ttln.erl
@@ -753,7 +753,7 @@ find_node(_D, Node, _RestOfOid, _RevOid) ->
 %% {subagent, SubAgentPid, SAOid} |
 %% {variable, MibEntry, VarOid} |
 %% {table, TableOid, TableRestOid, MibEntry}
-%% If a variable is returnes, it is in the MibView.
+%% If a variable is returns, it is in the MibView.
 %% If a table or subagent is returned, it *may* be in the MibView.
 %%-----------------------------------------------------------------
 next(#mib_data{tree = T} = D, Oid, MibView) ->
@@ -778,7 +778,7 @@ next_node(_D, undefined_node, _Oid, _RevOidSoFar, _MibView) ->
 next_node(_D, {tree, Tree, {table_entry, _Id}}, [Int | _Oid], 
 	 _RevOidSoFar, _MibView)
 when Int+1 > size(Tree) ->
- ?vtrace("next_node(tree,table_entry) -> entry when not found whith"
+ ?vtrace("next_node(tree,table_entry) -> entry when not found within"
 	"~n Int: ~p"
 	"~n size(Tree): ~p", [Int, size(Tree)]),
 false;
diff --git a/lib/snmp/src/agent/snmpa_mib_data_tttn.erl b/lib/snmp/src/agent/snmpa_mib_data_tttn.erl
index 9b4493a03f..07dac6ac32 100644
--- a/lib/snmp/src/agent/snmpa_mib_data_tttn.erl
+++ b/lib/snmp/src/agent/snmpa_mib_data_tttn.erl
@@ -780,7 +780,7 @@ find_node(_D, Node, _RestOfOid, _RevOid) ->
 %% {subagent, SubAgentPid, SAOid} |
 %% {variable, MibEntry, VarOid} |
 %% {table, TableOid, TableRestOid, MibEntry}
-%% If a variable is returnes, it is in the MibView.
+%% If a variable is returns, it is in the MibView.
 %% If a table or subagent is returned, it *may* be in the MibView.
 %%-----------------------------------------------------------------
 next(#mib_data{tree = T} = D, Oid, MibView) ->
@@ -805,7 +805,7 @@ next_node(_D, undefined_node, _Oid, _RevOidSoFar, _MibView) ->
 next_node(_D, {tree, Tree, {table_entry, _Id}}, [Int | _Oid], 
 	 _RevOidSoFar, _MibView)
 when Int+1 > size(Tree) ->
- ?vtrace("next_node(tree,table_entry) -> entry when not found whith"
+ ?vtrace("next_node(tree,table_entry) -> entry when not found within"
 	"~n Int: ~p"
 	"~n size(Tree): ~p", [Int, size(Tree)]),
 false;
diff --git a/lib/snmp/src/agent/snmpa_mib_lib.erl b/lib/snmp/src/agent/snmpa_mib_lib.erl
index ecdf968458..fc424c09a1 100644
--- a/lib/snmp/src/agent/snmpa_mib_lib.erl
+++ b/lib/snmp/src/agent/snmpa_mib_lib.erl
@@ -56,7 +56,7 @@ table_del_row({Tab, Db} = TabDb, Key) ->
 
 
 %%%-----------------------------------------------------------------
-%%% Retreives the entire table. Used for debugging
+%%% Retrieves the entire table. Used for debugging
 %%%-----------------------------------------------------------------
 
 get_table(NameDb, FOI) ->
diff --git a/lib/snmp/src/agent/snmpa_mib_storage.erl b/lib/snmp/src/agent/snmpa_mib_storage.erl
index d46dab0be0..6662f84114 100644
--- a/lib/snmp/src/agent/snmpa_mib_storage.erl
+++ b/lib/snmp/src/agent/snmpa_mib_storage.erl
@@ -46,7 +46,7 @@
 %% (of the behaviour), this is done using the *Options* argument. 
 %% ---------------------------------------------------------------
 
-%% Options is callback module dependant
+%% Options is callback module dependent
 
 -callback open(Name :: atom(), 
 	 RecName :: atom(), 
diff --git a/lib/snmp/src/agent/snmpa_mpd.erl b/lib/snmp/src/agent/snmpa_mpd.erl
index 0d40840d35..d8c17f2765 100644
--- a/lib/snmp/src/agent/snmpa_mpd.erl
+++ b/lib/snmp/src/agent/snmpa_mpd.erl
@@ -53,7 +53,7 @@
 
 					
 %%%-----------------------------------------------------------------
-%%% This module implemets the Message Processing and Dispatch part of
+%%% This module implements the Message Processing and Dispatch part of
 %%% the multi-lingual SNMP agent.
 %%%
 %%% The MPD is responsible for:
@@ -70,7 +70,7 @@
 %%% the counters only, it does not provide instrumentation functions
 %%% for the counters.
 %%%
-%%% With the terms defined in rfc2271, this module implememts part
+%%% With the terms defined in rfc2271, this module implements part
 %%% of the Dispatcher and the Message Processing functionality.
 %%%-----------------------------------------------------------------
 init(Vsns) ->
diff --git a/lib/snmp/src/agent/snmpa_net_if.erl b/lib/snmp/src/agent/snmpa_net_if.erl
index 373b0e922f..1193c80de9 100644
--- a/lib/snmp/src/agent/snmpa_net_if.erl
+++ b/lib/snmp/src/agent/snmpa_net_if.erl
@@ -52,7 +52,7 @@
 %% Also, the request-reponder and trap-sender transport(s),
 %% has different needs.
 %% The trap-sender transport will send more data then it will receive.
-%% Therefor, we should be able to specify;
+%% Therefore, we should be able to specify;
 %% bind_to, no_reuse_address, recbuf and sndbuf individually:
 %% {intAgentTransports,
 %% [{transportDomainUdpIpv4, {{141,213,11,24}, PortInfo},
@@ -122,7 +122,7 @@
 %% Note that since informs require confirmation,
 %% an ephemeral socket cannot be removed immediately
 %% when it has been "used up".
-%% We need to keep it for some time to receive responces
+%% We need to keep it for some time to receive responses
 %% and in case a resend is needed!.
 %% </EPHEMERAL-FOR-FUTUR-USE>
 
@@ -573,7 +573,7 @@ loop(#state{transports = Transports,
 ?vdebug("loop(~p)", [S]),
 receive
 {udp, Socket, IpAddr, IpPort, Packet} = Msg ->
-	 ?vlog("got paket from ~w:~w on ~w", [IpAddr, IpPort, Socket]),
+	 ?vlog("got packet from ~w:~w on ~w", [IpAddr, IpPort, Socket]),
 	 case lists:keyfind(Socket, #transport.socket, Transports) of
 		#transport{socket = Socket, domain = Domain} = Transport ->
 		 From =
@@ -2111,7 +2111,7 @@ get_inet_backend(Opts, DefaultOpts) ->
 get_socket_opt(inet_backend, Opts, DefaultOpts, use_default).
 
 %% <EPHEMERAL-FOR-FUTUR-USE>
-%% This is not realy a socket option, but rather socket 'meta'
+%% This is not really a socket option, but rather socket 'meta'
 %% information. Its still put together with the actual socket
 %% options.
 %% get_ephemeral(SocketOpts) ->
diff --git a/lib/snmp/src/agent/snmpa_network_interface_filter.erl b/lib/snmp/src/agent/snmpa_network_interface_filter.erl
index 1524a6447b..80e082df4f 100644
--- a/lib/snmp/src/agent/snmpa_network_interface_filter.erl
+++ b/lib/snmp/src/agent/snmpa_network_interface_filter.erl
@@ -33,7 +33,7 @@ behaviour_info(_) ->
 
 
 %% accept_recv({domain(), address()}) -> boolean()
-%% Called at the receiption of a message 
+%% Called at the reception of a message 
 %% (before *any* processing has been done).
 %% 
 %% accept_send({domain(), address()}) -> boolean()
diff --git a/lib/snmp/src/agent/snmpa_set_lib.erl b/lib/snmp/src/agent/snmpa_set_lib.erl
index 89580ad8e1..75dcb947e6 100644
--- a/lib/snmp/src/agent/snmpa_set_lib.erl
+++ b/lib/snmp/src/agent/snmpa_set_lib.erl
@@ -37,7 +37,7 @@
 %% Input is a sorted Varbinds list.
 %% Output is either ok or {ErrIndex, ErrCode}.
 %%* 1) IF the variable is outside the mib view THEN noAccess.
-%%* 2a) IF the varaible doesn't exist THEN notWritable.
+%%* 2a) IF the variable doesn't exist THEN notWritable.
 %% 2b) IF mib isn't able to create instances of the variable (for 
 %% example in a table) THEN noCreation.
 %%* 3) IF the new value provided is of the wrong ASN.1 type THEN wrongType.
@@ -59,7 +59,7 @@
 %%
 %% SNMPv1 (see rfc1157:4.1.5)
 %%* 1) IF variable not available for set in the mibview THEN noSuchName.
-%%* 2) IF variable exists, but doesn't permit writeing THEN readOnly.
+%%* 2) IF variable exists, but doesn't permit writing THEN readOnly.
 %%* 3) IF provided value doesn't match ASN.1 type THEN badValue.
 %% 4) IF any other error THEN genErr.
 %% 5) Otherwise ok!
diff --git a/lib/snmp/src/agent/snmpa_supervisor.erl b/lib/snmp/src/agent/snmpa_supervisor.erl
index 7d5c6da2c8..2c5ee51544 100644
--- a/lib/snmp/src/agent/snmpa_supervisor.erl
+++ b/lib/snmp/src/agent/snmpa_supervisor.erl
@@ -259,7 +259,7 @@ init([AgentType, Opts]) ->
 
 %% -- mib storage --
 %% MibStorage has only one mandatory part: module
- %% Everything else is module dependent and therefor 
+ %% Everything else is module dependent and therefore 
 %% put in a special option: options
 MibStorage = 
 	case get_opt(mib_storage, Opts, [{module, snmpa_mib_storage_ets}]) of
diff --git a/lib/snmp/src/agent/snmpa_svbl.erl b/lib/snmp/src/agent/snmpa_svbl.erl
index 8955bed0f2..d187e7de68 100644
--- a/lib/snmp/src/agent/snmpa_svbl.erl
+++ b/lib/snmp/src/agent/snmpa_svbl.erl
@@ -91,7 +91,7 @@ insert_key(Key, Value, []) ->
 [{Key, [Value]}].
 
 %%-----------------------------------------------------------------
-%% Tranforms a list of {Oid, Vb} to a 2-tuple with all
+%% Transforms a list of {Oid, Vb} to a 2-tuple with all
 %% Oids and all Vbs. These lists will be reversed.
 %%-----------------------------------------------------------------
 sa_split(Vbs) -> sa_split(Vbs, [], []).
@@ -137,7 +137,7 @@ unpack(Rest, [Row | Rows], []) ->
 
 %% OrgIndex should not be present when we call the is_set_ok/set/undo
 %% table functions. They just see the list of cols, and if an error
-%% occurs, they return the column nunber.
+%% occurs, they return the column number.
 %% Also, delete duplicate columns. If a SET is performed with duplicate
 %% columns, it is undefined which column to use. We just pick one.
 delete_org_index([{RowIndex, Cols} | Rows]) ->
diff --git a/lib/snmp/src/agent/snmpa_target_cache.erl b/lib/snmp/src/agent/snmpa_target_cache.erl
index 72caf72b33..be81055115 100644
--- a/lib/snmp/src/agent/snmpa_target_cache.erl
+++ b/lib/snmp/src/agent/snmpa_target_cache.erl
@@ -200,7 +200,7 @@ do_init(Prio, Opts) ->
 
 %% 
 %% (1) As long as there are no _waiting_ or active write locks, 
-%% read-locks will allways be granted
+%% read-locks will always be granted
 %% (2) When there are no active readers, write-locks will be
 %% granted. 
 %% (3) When there are active readers (clients with read-locks),
@@ -490,7 +490,7 @@ handle_cast({unlock, Pid},
 				 writer = Writer, 
 				 waiting = StillWaiting}};
 
-	%% If we have no active lockers, this may be a bug and therefor
+	%% If we have no active lockers, this may be a bug and therefore
 	%% see if we can activate some of the waiting
 	_ when (State#state.active_count == 0) ->
 	 ?vdebug("unlock -> could not find locker", []),
@@ -661,7 +661,7 @@ handle_maybe_active_or_waiting_down(Pid,
 	[#locker{state = active, type = read}] when (Cnt == 1) ->
 	 %% 1) This means that the writer must be waiting
 	 %% 2) The last reader terminated, 
-	 %% time to activate the wating writer
+	 %% time to activate the waiting writer
 	 %% If this was the last one, then we must
 	 %% activate the waiting writer.
 	 ets:delete(?LOCKER_TAB, Pid),
diff --git a/lib/snmp/src/agent/snmpa_trap.erl b/lib/snmp/src/agent/snmpa_trap.erl
index cbe01399b9..be1a2a2a85 100644
--- a/lib/snmp/src/agent/snmpa_trap.erl
+++ b/lib/snmp/src/agent/snmpa_trap.erl
@@ -69,9 +69,9 @@
 %% operation, and so on, until eventually the MA will receive the
 %% info. The MA then fills in the gaps, and at this point all
 %% oids and types must be known, otherwise an error is signalled,
-%% and the opertaion is aborted. For the unknown values for some 
+%% and the operation is aborted. For the unknown values for some 
 %% oids, a get-operation is performed by the MA. This will
-%% retreive the missing values.
+%% retrieve the missing values.
 %% At this point, all oid, types and values are known, so the MA
 %% can distribute the traps according to the information in the
 %% internal tables.
@@ -123,7 +123,7 @@
 %% Initialize as many variables as possible.
 %% Returns: {ok, TrapRecord, <list of Var>} | error
 %% where Var is returned from initiate_vars.
-%% NOTE: Executed at the inital SA
+%% NOTE: Executed at the initial SA
 %%-----------------------------------------------------------------
 construct_trap(Trap, Varbinds) ->
 ?vdebug("construct_trap -> entry with"
@@ -213,7 +213,7 @@ alias2oid(Alias, Append) ->
 %% {{Process, VariableOid}, Value} |
 %% {{Process, VariableAtom}, Value} |
 %% {TableColAtom, RowIndex, Value}
-%% NOTE: Executed at the inital SA
+%% NOTE: Executed at the initial SA
 %%-----------------------------------------------------------------
 initiate_vars([{Oid, Asn1Type} | T], Varbinds) ->
 case delete_oid_from_varbinds(Oid, Varbinds) of
@@ -405,7 +405,7 @@ send_trap(TrapRec, NotifyName, ContextName, Recv, Vbs, ExtraInfo, NetIf) ->
 	 LocalEngineID, ExtraInfo, NetIf).
 
 %% The agent normally does not care about the result, 
-%% but since it can be usefull when debugging, add 
+%% but since it can be useful when debugging, add 
 %% some info when we fail to send the trap(s).
 send_trap(TrapRec, NotifyName, ContextName, Recv, Vbs, LocalEngineID, 
 	 ExtraInfo, NetIf) ->
diff --git a/lib/snmp/src/agent/snmpa_usm.erl b/lib/snmp/src/agent/snmpa_usm.erl
index c65fcf2f8c..3417bb1aa9 100644
--- a/lib/snmp/src/agent/snmpa_usm.erl
+++ b/lib/snmp/src/agent/snmpa_usm.erl
@@ -62,7 +62,7 @@
 %% Func: process_incoming_msg(Packet, Data, SecParams, SecLevel) ->
 %% {ok, {SecEngineID, SecName, ScopedPDUBytes, SecData}} |
 %% {error, Reason} | {error, Reason, ErrorInfo}
-%% Return value may be throwed.
+%% Return value may be thrown.
 %% Types: Reason -> term()
 %% Purpose: 
 %%-----------------------------------------------------------------
@@ -373,7 +373,7 @@ is_auth(AuthProtocol, AuthKey, AuthParams, Packet, SecName,
 				 (TermDiscoStage2 =:= plain)) -> %% 3.2.7a
 		 ?vtrace("is_auth -> terminating discovery stage 2 - plain",[]),
 		 %% This will *always* result in the manager *not* 
-		 %% beeing in timewindow
+		 %% being in timewindow
 		 authoritative(SecName, 
 				 MsgAuthEngineBoots, MsgAuthEngineTime, 
 				 LocalEngineID);
diff --git a/lib/snmp/src/agent/snmpa_vacm.erl b/lib/snmp/src/agent/snmpa_vacm.erl
index d7d588c30d..5540fb8d32 100644
--- a/lib/snmp/src/agent/snmpa_vacm.erl
+++ b/lib/snmp/src/agent/snmpa_vacm.erl
@@ -306,7 +306,7 @@ dump_table() ->
 %% time dumping the table.
 unique_table_name(Pre) ->
 %% We want something that is guaranteed to be unique, 
- %% therefor we use erlang:timestamp() instead of os:timestamp()
+ %% therefore we use erlang:timestamp() instead of os:timestamp()
 unique_table_name(Pre, erlang:timestamp()).
 
 unique_table_name(Pre, {_A, _B, C} = Now) ->
@@ -378,7 +378,7 @@ get_access_row(Key, GroupKey, ContextName, SecModel, SecLevel, Score, Found) ->
 		{ok, NScore} when NScore > Score ->
 		 get_access_row(NextKey, GroupKey, ContextName,
 				 SecModel, SecLevel, NScore, Row);
-		{ok, _} -> % e.g. a throwed {ok, 0}
+		{ok, _} -> % e.g. a thrown {ok, 0}
 		 get_access_row(NextKey, GroupKey, ContextName,
 				 SecModel, SecLevel, Score, Found);
 		false ->
diff --git a/lib/snmp/src/app/snmp.config b/lib/snmp/src/app/snmp.config
index f35a636157..f5222245f1 100644
--- a/lib/snmp/src/app/snmp.config
+++ b/lib/snmp/src/app/snmp.config
@@ -36,8 +36,8 @@
 %% {verbosity, verbosity()} | 
 %% {options, net_if_options()}
 %% net_if_options() -> [net_if_option()]
-%% net_if_option() -> Note that these are basically dependant on which net-if
-%% module is beeing used, but the options described here
+%% net_if_option() -> Note that these are basically dependent on which net-if
+%% module is being used, but the options described here
 %% are the ones that snmp_net_if (the default value for 
 %% the module option) handles:
 %% {bind_to, bool()} |
@@ -77,8 +77,8 @@
 %% {verbosity, verbosity()} |
 %% {options, mgr_net_if_options()}
 %% mgr_net_if_options() -> [mgr_net_if_option()]
-%% mgr_net_if_option() -> Note that these are basically dependant on which 
-%% net-if module is beeing used, but the options 
+%% mgr_net_if_option() -> Note that these are basically dependent on which 
+%% net-if module is being used, but the options 
 %% described here are the ones of the snmpm_net_if 
 %% (the default value for the module option):
 %% {recbuf, integer()} |
diff --git a/lib/snmp/src/app/snmp.erl b/lib/snmp/src/app/snmp.erl
index 5781fad8ff..7a017c267b 100644
--- a/lib/snmp/src/app/snmp.erl
+++ b/lib/snmp/src/app/snmp.erl
@@ -264,7 +264,7 @@ set_module_trace(Module, Opts) ->
 	 {value, {return_trace, false}} ->
 		[];
 	 _ ->
-		%% Default is allways to include return values
+		%% Default is always to include return values
 		[{return_trace}]
 	end,
 TraceRes = 
@@ -671,7 +671,7 @@ short_time({{Y,M,D},{H,Mi,S}}) ->
 [y1(Y), y2(Y), M, D, H, Mi, S, 0].
 
 %% This function will only be called if there has been some 
-%% validation error, and as it is strict, it allways returns 
+%% validation error, and as it is strict, it always returns 
 %% false. 
 strict_validation(_What, _Data) ->
 false.
diff --git a/lib/snmp/src/compile/snmpc.erl b/lib/snmp/src/compile/snmpc.erl
index 4249799195..ffee6a15db 100644
--- a/lib/snmp/src/compile/snmpc.erl
+++ b/lib/snmp/src/compile/snmpc.erl
@@ -1322,7 +1322,7 @@ define_cols([{#mc_object_type{name = NameOfCol,
 		 entrytype = table_column, 
 		 access = NewAccess,
 		 description = Description,
-		 units = Units, %% Propably not usefull
+		 units = Units, %% Probably not useful
 		 assocList = [{table_name,TableName} | Defval]}),
 define_cols(Rest,SubIndex+1,Fields,NameOfEntry,TableName,
 		[ColumnME|ColMEs]);
diff --git a/lib/snmp/src/compile/snmpc.src b/lib/snmp/src/compile/snmpc.src
index e64b6607c4..c9436abe62 100644
--- a/lib/snmp/src/compile/snmpc.src
+++ b/lib/snmp/src/compile/snmpc.src
@@ -355,7 +355,7 @@ usage() ->
 	 "~n For example snmp/mibs/ "
 	 "~n The current workin dir and the "
 	 "~n <snmp-home>/priv/mibs "
-	 "~n are always listed last the includ path. "
+	 "~n are always listed last the include path. "
 	 "~n --db <DB> - Database to used for the default instrumentation."
 	 "~n Defaults to volatile."
 	 "~n --sgc - This option (skip group check), if present, "
diff --git a/lib/snmp/src/compile/snmpc_lib.erl b/lib/snmp/src/compile/snmpc_lib.erl
index 0cff8c5456..635c2f07dd 100644
--- a/lib/snmp/src/compile/snmpc_lib.erl
+++ b/lib/snmp/src/compile/snmpc_lib.erl
@@ -903,7 +903,7 @@ test_index_positions(Line, Indexes, ColMEs) ->
 TLI = lists:filter(IsTLI, Indexes),
 test_index_positions_impl(Line, TLI, ColMEs).
 
-%% An table that augments another cannot conatin any index, 
+%% An table that augments another cannot contain any index, 
 %% so the first non-index column is always the first column.
 augments_first_non_index_column([]) ->
 none;
diff --git a/lib/snmp/src/compile/snmpc_mib_gram.yrl b/lib/snmp/src/compile/snmpc_mib_gram.yrl
index 14a668127e..35d0da27c7 100644
--- a/lib/snmp/src/compile/snmpc_mib_gram.yrl
+++ b/lib/snmp/src/compile/snmpc_mib_gram.yrl
@@ -453,7 +453,7 @@ variables -> objectname : ['$1'].
 variables -> variables ',' objectname : ['$3' | '$1'].
 
 implies -> '::=' : '$1'.
-implies -> ':' ':' '=' : w("Sloppy asignment on line ~p", [line_of('$1')]), '$1'.
+implies -> ':' ':' '=' : w("Sloppy assignment on line ~p", [line_of('$1')]), '$1'.
 descriptionfield -> string : lreverse(descriptionfield, val('$1')).
 descriptionfield -> '$empty' : undefined.
 description -> 'DESCRIPTION' string : lreverse(description, val('$2')).
@@ -1071,7 +1071,7 @@ bits_to_bytes([], 1, _Byte) -> % empty bitstring
 [];
 bits_to_bytes([], 256, _Byte) -> % correct; multiple of 8
 [];
-% If we are to support arbitrary length of bitstrings. This migth
+% If we are to support arbitrary length of bitstrings. This might
 % be needed in the new SMI.
 %bits_to_bytes([], N, Byte) ->
 % [Byte];
diff --git a/lib/snmp/src/compile/snmpc_mib_to_hrl.erl b/lib/snmp/src/compile/snmpc_mib_to_hrl.erl
index c214bca93c..b041a6414b 100644
--- a/lib/snmp/src/compile/snmpc_mib_to_hrl.erl
+++ b/lib/snmp/src/compile/snmpc_mib_to_hrl.erl
@@ -33,7 +33,7 @@
 %% Args: MibName = string() without extension.
 %% Purpose: Produce a .hrl file with oid for tables and variables,
 %% column numbers for columns and values for enums.
-%% Writes only the first occurence of a name. Prints a
+%% Writes only the first occurrence of a name. Prints a
 %% warning if a duplicate name is found.
 %% Returns: ok | {error, Reason}
 %% Note: The Mib must be compiled.
diff --git a/lib/snmp/src/compile/snmpc_tok.erl b/lib/snmp/src/compile/snmpc_tok.erl
index 9114cc90de..bca03d1e46 100644
--- a/lib/snmp/src/compile/snmpc_tok.erl
+++ b/lib/snmp/src/compile/snmpc_tok.erl
@@ -273,7 +273,7 @@ tokenise([10| T]) -> tokenise(T);
 tokenise([13| T]) -> tokenise(T);
 tokenise([32| T]) -> tokenise(T);
 
-%% Handle singe characters like { } [ ] + = ...
+%% Handle single characters like { } [ ] + = ...
 tokenise([Ch | T]) ->
 Atm = list_to_atom([Ch]),
 {{Atm, get(line)}, T};
diff --git a/lib/snmp/src/manager/snmpm.erl b/lib/snmp/src/manager/snmpm.erl
index a7109d6c18..6c6a22e1f1 100644
--- a/lib/snmp/src/manager/snmpm.erl
+++ b/lib/snmp/src/manager/snmpm.erl
@@ -324,7 +324,7 @@ restart(net_if = What) ->
 %% The manager entity responsible for a specific agent. 
 %% Module is the callback module (snmpm_user behaviour) which 
 %% will be called whenever something happens (detected 
-%% agent, incomming reply or incomming trap/notification).
+%% agent, incoming reply or incoming trap/notification).
 %% Note that this could have already been done as a 
 %% consequence of the node config.
 register_user(Id, Module, Data) ->
@@ -494,7 +494,7 @@ which_usm_users(EngineID) when is_list(EngineID) ->
 
 %% -- Requests --
 
-%% --- synchroneous get-request ---
+%% --- synchronous get-request ---
 %% 
 
 sync_get2(UserId, TargetName, Oids) ->
@@ -519,7 +519,7 @@ async_get2(UserId, TargetName, Oids, SendOpts)
 %% </BACKWARD-COMPAT>
 
 
-%% --- synchroneous get_next-request ---
+%% --- synchronous get_next-request ---
 %% 
 
 sync_get_next2(UserId, TargetName, Oids) ->
@@ -541,7 +541,7 @@ async_get_next2(UserId, TargetName, Oids, SendOpts)
 %% </BACKWARD-COMPAT>
 
 
-%% --- synchroneous set-request ---
+%% --- synchronous set-request ---
 %% 
 
 sync_set2(UserId, TargetName, VarsAndVals) ->
@@ -563,7 +563,7 @@ async_set2(UserId, TargetName, VarsAndVals, SendOpts)
 %% </BACKWARD-COMPAT>
 
 
-%% --- synchroneous get-bulk ---
+%% --- synchronous get-bulk ---
 %% 
 
 sync_get_bulk2(UserId, TargetName, NonRep, MaxRep, Oids) ->
@@ -836,7 +836,7 @@ sys_up_time() ->
 %%% printable string of the error reason received from either:
 %%% 
 %%% * If any of the sync/async get/get-next/set/get-bulk
-%%% returnes {error, Reason} 
+%%% returns {error, Reason} 
 %%% * The Reason parameter in the handle_error user callback 
 %%% function
 %%% 
diff --git a/lib/snmp/src/manager/snmpm_config.erl b/lib/snmp/src/manager/snmpm_config.erl
index 3d40646b5c..d5394d4298 100644
--- a/lib/snmp/src/manager/snmpm_config.erl
+++ b/lib/snmp/src/manager/snmpm_config.erl
@@ -2747,7 +2747,7 @@ stop_backup_server({Pid, _}) when is_pid(Pid) ->
 %%----------------------------------------------------------
 
 handle_backup(D, BackupDir) ->
- %% First check that we do not wrote to the corrent db-dir...
+ %% First check that we do not wrote to the current db-dir...
 ?vtrace("handle_backup -> entry with"
 "~n D: ~p"
 "~n BackupDir: ~p", [D, BackupDir]),
diff --git a/lib/snmp/src/manager/snmpm_mpd.erl b/lib/snmp/src/manager/snmpm_mpd.erl
index 85821ccb94..77e93cd0a3 100644
--- a/lib/snmp/src/manager/snmpm_mpd.erl
+++ b/lib/snmp/src/manager/snmpm_mpd.erl
@@ -46,7 +46,7 @@
 
 					
 %%%-----------------------------------------------------------------
-%%% This module implemets the Message Processing and Dispatch part of
+%%% This module implements the Message Processing and Dispatch part of
 %%% the multi-lingual SNMP agent.
 %%%
 %%% The MPD is responsible for:
@@ -63,7 +63,7 @@
 %%% the counters only, it does not provide instrumentation functions
 %%% for the counters.
 %%%
-%%% With the terms defined in rfc2271, this module implememts part
+%%% With the terms defined in rfc2271, this module implements part
 %%% of the Dispatcher and the Message Processing functionality.
 %%%-----------------------------------------------------------------
 init(Vsns) ->
@@ -585,7 +585,7 @@ sec_module(?SEC_USM) ->
 %% securityEngineID is set to the value of the target entity's
 %% snmpEngineID.
 %% 
-%% As we never send traps, the SecEngineID is allways the 
+%% As we never send traps, the SecEngineID is always the 
 %% snmpEngineID of the target entity!
 sec_engine_id(TargetName) ->
 case get_agent_engine_id(TargetName) of
@@ -600,7 +600,7 @@ sec_engine_id(TargetName) ->
 
 
 %% BMK BMK BMK
-%% This one looks very similar to lik generate_v1_v2c_response_msg!
+%% This one looks very similar to link generate_v1_v2c_response_msg!
 %% Common/shared? Should there be differences?
 %% 
 generate_v1_v2c_msg(Vsn, Pdu, Community, Log) ->
@@ -870,7 +870,7 @@ get_max_message_size() ->
 	{ok, MMS} ->
 	 MMS;
 	E ->
-	 user_err("failed retreiving engine max message size: ~w", [E]),
+	 user_err("failed retrieving engine max message size: ~w", [E]),
 	 484
 end.
 
diff --git a/lib/snmp/src/manager/snmpm_net_if.erl b/lib/snmp/src/manager/snmpm_net_if.erl
index af78308147..54772c2d64 100644
--- a/lib/snmp/src/manager/snmpm_net_if.erl
+++ b/lib/snmp/src/manager/snmpm_net_if.erl
@@ -782,7 +782,7 @@ maybe_handle_recv_msg(Domain, Addr, Bytes, State) ->
 fun (Pid, Class, Reason, Stacktrace) ->
 	 warning_msg(
 		 "Worker process (~p) terminated "
-		 "while processing (incomming) message from %s:~n"
+		 "while processing (incoming) message from %s:~n"
 		 "~w:~w at ~p",
 		 [Pid, snmp_conf:mk_addr_string({Domain, Addr}),
 		 Class, Reason, Stacktrace])
diff --git a/lib/snmp/src/manager/snmpm_network_interface_filter.erl b/lib/snmp/src/manager/snmpm_network_interface_filter.erl
index 35bec4e7e7..f12b64640c 100644
--- a/lib/snmp/src/manager/snmpm_network_interface_filter.erl
+++ b/lib/snmp/src/manager/snmpm_network_interface_filter.erl
@@ -33,7 +33,7 @@ behaviour_info(_) ->
 
 
 %% accept_recv(address(), port()) -> boolean() 
-%% Called at the receiption of a message 
+%% Called at the reception of a message 
 %% (before *any* processing has been done).
 %% 
 %% accept_send(address(), port()) -> boolean()
diff --git a/lib/snmp/src/manager/snmpm_server.erl b/lib/snmp/src/manager/snmpm_server.erl
index 07c3a335d8..0da35c9bb3 100644
--- a/lib/snmp/src/manager/snmpm_server.erl
+++ b/lib/snmp/src/manager/snmpm_server.erl
@@ -1337,14 +1337,14 @@ handle_snmp_error(#pdu{request_id = ReqId} = Pdu, Reason, State) ->
 		_ ->
 		 %% reply to outstanding request, for which there is no
 		 %% longer any owner (the user has unregistered).
-		 %% Therefor send it to the default user
+		 %% Therefore send it to the default user
 		 case snmpm_config:user_info() of
 			{ok, DefUserId, DefMod, DefData} ->
 			 handle_error(DefUserId, DefMod, Reason, ReqId, 
 					 DefData, State),
 			 maybe_delete(Disco, ReqId);
 			_ ->
-			 error_msg("failed retreiving the default user "
+			 error_msg("failed retrieving the default user "
 				 "info handling error [~w]: "
 				 "~n~w", [ReqId, Reason])
 		 end
@@ -1392,7 +1392,7 @@ handle_snmp_error(#pdu{request_id = ReqId} = Pdu, Reason, State) ->
 		 handle_error(DefUserId, DefMod, Reason, 
 				 ReqId, DefData, State);
 		_ ->
-		 error_msg("failed retreiving the default "
+		 error_msg("failed retrieving the default "
 			 "user info handling error [~w]: "
 			 "~n~w",[ReqId, Reason])
 	 end
@@ -1424,7 +1424,7 @@ handle_snmp_error(Domain, Addr, ReqId, Reason, State) ->
 			 handle_error(DefUserId, DefMod, Reason, 
 					 ReqId, DefData, State);
 			_Error2 ->
-			 error_msg("failed retreiving the default user "
+			 error_msg("failed retrieving the default user "
 				 "info handling snmp error "
 				 "<~p,~p>: ~n~w~n~w",
 				 [Domain, Addr, ReqId, Reason])
@@ -1436,7 +1436,7 @@ handle_snmp_error(Domain, Addr, ReqId, Reason, State) ->
 		 handle_error(DefUserId, DefMod, Reason, 
 				 ReqId, DefData, State);
 		_Error4 ->
-		 error_msg("failed retreiving the default user "
+		 error_msg("failed retrieving the default user "
 			 "info handling snmp error "
 			 "<~p,~p>: ~n~w~n~w",
 			 [Domain, Addr, ReqId, Reason])
@@ -1509,7 +1509,7 @@ handle_snmp_pdu(#pdu{type = 'get-response', request_id = ReqId} = Pdu,
 		_Error ->
 		 %% reply to outstanding request, for which there is no
 		 %% longer any owner (the user has unregistered).
-		 %% Therefor send it to the default user
+		 %% Therefore send it to the default user
 		 case snmpm_config:user_info() of
 			{ok, DefUserId, DefMod, DefData} ->
 			 handle_pdu(
@@ -1518,7 +1518,7 @@ handle_snmp_pdu(#pdu{type = 'get-response', request_id = ReqId} = Pdu,
 			 ReqId, SnmpResponse, DefData, State),
 			 maybe_delete(Disco, ReqId);
 			Error ->
-			 error_msg("failed retreiving the default user "
+			 error_msg("failed retrieving the default user "
 				 "info handling pdu from "
 				 "~p <~p,~p>: ~n~w~n~w",
 				 [Target, Domain, Addr, Error, Pdu])
@@ -1596,7 +1596,7 @@ handle_snmp_pdu(#pdu{type = 'get-response', request_id = ReqId} = Pdu,
 				 handle_error(DefUserId, DefMod, Reason, 
 						 ReqId, DefData, State);
 				Error ->
-				 error_msg("failed retreiving the default "
+				 error_msg("failed retrieving the default "
 					 "user info handling (old) "
 					 "pdu from "
 					 "<~p,~p>: ~n~w~n~w",
@@ -1623,7 +1623,7 @@ handle_snmp_pdu(#pdu{type = 'get-response', request_id = ReqId} = Pdu,
 			 pdu, ignore,
 			 SnmpInfo, DefData, State);
 			Error ->
-			 error_msg("failed retreiving the default user "
+			 error_msg("failed retrieving the default user "
 				 "info handling (old) pdu when no user "
 				 "found from "
 				 "<~p,~p>: ~n~w~n~w",
@@ -1893,7 +1893,7 @@ do_handle_snmp_trap(SnmpTrapInfo, Domain, Addr, State) ->
 		
 		Error1 ->
 		 %% User no longer exists, unregister agent
-		 ?vlog("[trap] failed retreiving user info for "
+		 ?vlog("[trap] failed retrieving user info for "
 			 "user ~p: "
 			 "~n ~p", [UserId, Error1]),
 		 case snmpm_config:unregister_agent(UserId, Target) of
@@ -1908,7 +1908,7 @@ do_handle_snmp_trap(SnmpTrapInfo, Domain, Addr, State) ->
 				 SnmpTrapInfo, DefData, State);
 				Error2 ->
 				 error_msg(
-				 "failed retreiving the default "
+				 "failed retrieving the default "
 				 "user info handling report from "
 				 "~p <~p,~p>: ~n~w~n~w",
 				 [Target, Domain, Addr,
@@ -1930,7 +1930,7 @@ do_handle_snmp_trap(SnmpTrapInfo, Domain, Addr, State) ->
 	
 	Error4 ->
 	 %% Unknown agent, pass it on to the default user
-	 ?vlog("[trap] failed retreiving user id for agent <~p,~p>: "
+	 ?vlog("[trap] failed retrieving user id for agent <~p,~p>: "
 		 "~n Error: ~p"
 		 "~n when"
 		 "~n Users: ~p"
@@ -1947,7 +1947,7 @@ do_handle_snmp_trap(SnmpTrapInfo, Domain, Addr, State) ->
 		 SnmpTrapInfo, DefData, State);
 		Error5 ->
 		 error_msg(
-		 "failed retreiving "
+		 "failed retrieving "
 		 "the default user info, handling trap from <~p,~p>:"
 "~n Error: ~p"
 "~n Trap Info: ~p",
@@ -2078,7 +2078,7 @@ handle_snmp_inform(
 		 case snmpm_config:unregister_agent(UserId, Target) of
 			ok ->
 			 %% Try use the default user
-			 ?vlog("[inform] failed retreiving user "
+			 ?vlog("[inform] failed retrieving user "
 				 "info for user ~p:"
 				 "~n ~p", [UserId, Error1]),
 			 case snmpm_config:user_info() of
@@ -2089,7 +2089,7 @@ handle_snmp_inform(
 				 inform, Ref, 
 				 SnmpInform, DefData, State);
 				Error2 ->
-				 error_msg("failed retreiving the default "
+				 error_msg("failed retrieving the default "
 					 "user info handling inform from "
 					 "~p <~p,~p>: ~n~w~n~w",
 					 [Target, Domain, Addr,
@@ -2110,7 +2110,7 @@ handle_snmp_inform(
 
 	Error4 ->
 	 %% Unknown agent, pass it on to the default user
-	 ?vlog("[inform] failed retreiving user id for agent <~p,~p>: "
+	 ?vlog("[inform] failed retrieving user id for agent <~p,~p>: "
 		 "~n ~p", [Domain, Addr, Error4]),
 	 case snmpm_config:user_info() of
 		{ok, DefUserId, DefMod, DefData} ->
@@ -2120,7 +2120,7 @@ handle_snmp_inform(
 		 inform, Ref, 
 		 SnmpInform, DefData, State);
 		Error5 ->
-		 error_msg("failed retreiving "
+		 error_msg("failed retrieving "
 			 "the default user info handling inform from "
 			 "<~p,~p>: ~n~w~n~w",
 			 [Domain, Addr, Error5, Pdu])
@@ -2280,7 +2280,7 @@ handle_snmp_report(
 				 SnmpReport, Data, State);
 		Error1 ->
 		 %% User no longer exists, unregister agent
-		 ?vlog("[report] failed retreiving user info "
+		 ?vlog("[report] failed retrieving user info "
 			 "for user ~p:"
 			 " ~n ~p", [UserId, Error1]),
 		 case snmpm_config:unregister_agent(UserId, Target) of
@@ -2294,7 +2294,7 @@ handle_snmp_report(
 						 SnmpReport, DefData, State);
 				
 				Error2 ->
-				 error_msg("failed retreiving the default "
+				 error_msg("failed retrieving the default "
 					 "user info handling report from "
 					 "~p <~p,~p>: ~n~w~n~w",
 					 [Target, Domain, Addr,
@@ -2315,7 +2315,7 @@ handle_snmp_report(
 		
 	Error4 ->
 	 %% Unknown agent, pass it on to the default user
-	 ?vlog("[report] failed retreiving user id for agent <~p,~p>: "
+	 ?vlog("[report] failed retrieving user id for agent <~p,~p>: "
 		 "~n ~p", [Domain, Addr, Error4]),
 	 case snmpm_config:user_info() of
 		{ok, DefUserId, DefMod, DefData} ->
@@ -2324,7 +2324,7 @@ handle_snmp_report(
 				 report, ignore, 
 				 SnmpReport, DefData, State);
 		Error5 ->
-		 error_msg("failed retreiving "
+		 error_msg("failed retrieving "
 			 "the default user info handling report from "
 			 "<~p,~p>: ~n~w~n~w",
 			 [Domain, Addr, Error5, Pdu])
@@ -2339,7 +2339,7 @@ handle_snmp_report(CrapReport, Domain, Addr, _State) ->
 
 %% This could be from a failed get-request, so we might have a user
 %% waiting for a reply here. If there is, we handle this as an failed
-%% get-response (except for tha data which is different). Otherwise,
+%% get-response (except for the data which is different). Otherwise,
 %% we handle it as an error (reported via the handle_error callback
 %% function).
 handle_snmp_report(
@@ -2412,7 +2412,7 @@ handle_snmp_report(
 					 Data, State);
 			Error ->
 			 %% Oh crap, use the default user
-			 ?vlog("[report] failed retreiving user info for "
+			 ?vlog("[report] failed retrieving user info for "
 				 "user ~p:"
 				 " ~n ~p", [UserId, Error]),
 			 case snmpm_config:user_info() of
@@ -2420,7 +2420,7 @@ handle_snmp_report(
 				 handle_error(DefUserId, DefMod, Reason, 
 						 ReqId, DefData, State);
 				Error ->
-				 error_msg("failed retreiving the "
+				 error_msg("failed retrieving the "
 					 "default user "
 					 "info handling report from "
 					 "<~p,~p>: ~n~w~n~w~n~w",
@@ -2430,7 +2430,7 @@ handle_snmp_report(
 		 end;
 		Error ->
 		 %% Unknown agent, pass it on to the default user
-		 ?vlog("[report] failed retreiving user id for "
+		 ?vlog("[report] failed retrieving user id for "
 			 "agent <~p,~p>: "
 			 "~n ~p", [Domain, Addr, Error]),
 		 case snmpm_config:user_info() of
@@ -2438,7 +2438,7 @@ handle_snmp_report(
 			 handle_error(DefUserId, DefMod, Reason, ReqId, 
 					 DefData, State);
 			Error ->
-			 error_msg("failed retreiving "
+			 error_msg("failed retrieving "
 				 "the default user info handling "
 				 "report from "
 				 "<~p,~p>: ~n~w~n~w~n~w",
diff --git a/lib/snmp/src/manager/snmpm_usm.erl b/lib/snmp/src/manager/snmpm_usm.erl
index 7ba91b86e7..08a70c6ca6 100644
--- a/lib/snmp/src/manager/snmpm_usm.erl
+++ b/lib/snmp/src/manager/snmpm_usm.erl
@@ -60,7 +60,7 @@ init() ->
 %% Func: process_incoming_msg(Packet, Data, SecParams, SecLevel) ->
 %% {ok, {SecEngineID, SecName, ScopedPDUBytes, SecData}} |
 %% {error, Reason} | {error, Reason, ErrorInfo}
-%% Return value may be throwed.
+%% Return value may be thrown.
 %% Types: Reason -> term()
 %% Purpose: 
 %%-----------------------------------------------------------------
@@ -331,7 +331,7 @@ try_decrypt(usmAesCfb128Protocol,
 %% SecData, SecLevel) ->
 %% {ok, {SecEngineID, SecName, ScopedPDUBytes, SecData}} |
 %% {error, Reason} | {error, Reason, ErrorInfo}
-%% Return value may be throwed.
+%% Return value may be thrown.
 %% Types: Reason -> term()
 %% Purpose: 
 %%-----------------------------------------------------------------
diff --git a/lib/snmp/src/misc/snmp_conf.erl b/lib/snmp/src/misc/snmp_conf.erl
index 39c18777c7..5fe33c041a 100644
--- a/lib/snmp/src/misc/snmp_conf.erl
+++ b/lib/snmp/src/misc/snmp_conf.erl
@@ -163,7 +163,7 @@ no_gen(_Dir, _R) -> [].
 no_order(_, _) -> true.
 no_filter(X) -> X.
 
-%% Order tuples on element N with Keys first in appearence order.
+%% Order tuples on element N with Keys first in appearance order.
 %%
 %% An ordering function (A, B) shall return true iff
 %% A is less than or equal to B i.e shall return
@@ -924,7 +924,7 @@ check_transport_address(transportDomainUdpIpv4 = _Domain,
 when ?is_ipv4_addr(A0, A1, A2, A3) ->
 case PortInfo of
 system ->
- %% The actual port number will be choosen
+ %% The actual port number will be chosen
 %% by the system (create with port = 0)
 %% when the socket is created.
 true;
@@ -946,7 +946,7 @@ check_transport_address(transportDomainUdpIpv6 = _Domain,
 when ?is_ipv6_addr(A0, A1, A2, A3, A4, A5, A6, A7) ->
 case PortInfo of
 system ->
- %% The actual port number will be choosen
+ %% The actual port number will be chosen
 %% by the system (create with port = 0)
 %% when the socket is created.
 true;
diff --git a/lib/snmp/src/misc/snmp_config.erl b/lib/snmp/src/misc/snmp_config.erl
index 928b469c06..44a9044a29 100644
--- a/lib/snmp/src/misc/snmp_config.erl
+++ b/lib/snmp/src/misc/snmp_config.erl
@@ -504,7 +504,7 @@ config_agent_transports(ID) ->
 config_agent_transports(ID, []).
 
 config_agent_transports(ID, []) ->
- i(ID ++ ". Configure atleast one transport: "),
+ i(ID ++ ". Configure at least one transport: "),
 T = config_agent_transport(ID),
 config_agent_transports(ID, [T]);
 config_agent_transports(ID, Acc) ->
@@ -1103,7 +1103,7 @@ verify_max_message_size(MMS) ->
 	I when is_integer(I) andalso (I >= 484) ->
 	 {ok, I};
 	I when is_integer(I) ->
-	 {error, "invalid max message size (must be atleast 484): " ++ MMS};
+	 {error, "invalid max message size (must be at least 484): " ++ MMS};
 	_ ->
 	 {error, "invalid max message size: " ++ MMS}
 end.
@@ -1167,7 +1167,7 @@ verify_db_init_error(R) ->
 
 verify_notif_type("trap") -> {ok, trap};
 verify_notif_type("inform") -> {ok, inform};
-verify_notif_type(NT) -> {error, "invalid notifcation type: " ++ NT}.
+verify_notif_type(NT) -> {error, "invalid notification type: " ++ NT}.
 
 
 verify_sec_type("none") -> {ok, none};
@@ -2648,7 +2648,7 @@ write_sys_config_file_agent_config_opt(Fid, {verbosity, Verb}) ->
 ok = io:format(Fid, "{verbosity, ~w}", [Verb]).
 
 
-%% This is only present if there is atleast one option
+%% This is only present if there is at least one option
 write_sys_config_file_agent_atl_opts(Fid, [Opt]) ->
 write_sys_config_file_agent_atl_opt(Fid, Opt),
 ok = io:format(Fid, "]", []),
@@ -2670,7 +2670,7 @@ write_sys_config_file_agent_atl_opt(Fid, {seqno, SeqNo}) ->
 ok = io:format(Fid, "{seqno, ~w}", [SeqNo]).
 
 
-%% These options are allways there
+%% These options are always there
 write_sys_config_file_agent_disco_opts(Fid, [Opt]) ->
 write_sys_config_file_agent_disco_opt(Fid, Opt),
 ok = io:format(Fid, "]", []),
@@ -2776,7 +2776,7 @@ write_sys_config_file_manager_config_opt(Fid, {verbosity, Verb}) ->
 ok = io:format(Fid, "{verbosity, ~w}", [Verb]).
 
 
-%% This is only present if there is atleast one option
+%% This is only present if there is at least one option
 write_sys_config_file_manager_atl_opts(Fid, [Opt]) ->
 write_sys_config_file_manager_atl_opt(Fid, Opt),
 ok = io:format(Fid, "]", []),
@@ -2807,7 +2807,7 @@ header() ->
 		 [?MODULE, ?version, Y, Mo, D, H, Mi, S]).
 
 
-%% *If* these functions are successfull, they successfully return
+%% *If* these functions are successful, they successfully return
 %% (value is ignored), but they fail preferably with
 %% throw({error, Reason}). Other exceptions are also handled.
 
@@ -2862,7 +2862,7 @@ write_config_file(Dir, FileName, Order, Check, Write, Entries)
 	 end
 catch
 	throw:E:S ->
-	 d("File write of ~s throwed: "
+	 d("File write of ~s thrown: "
 "~n ~p"
 "~n ~p"
 "~n", [FileName, E, S]),
@@ -2881,7 +2881,7 @@ write_config_file(Dir, FileName, Write, Entries, Fd) ->
 	 close_config_file(Dir, FileName, Fd)
 catch
 	throw:E:S ->
-	 d("File write of ~s throwed: "
+	 d("File write of ~s thrown: "
 "~n ~p"
 "~n ~p"
 "~n", [FileName, E, S]),
@@ -2954,7 +2954,7 @@ append_config_file(Dir, FileName, Order, Check, Write, Entries, Fd) ->
 	 close_config_file(Dir, FileName, Fd)
 catch
 	throw:E:S ->
-	 d("File append of ~s throwed: "
+	 d("File append of ~s thrown: "
 "~n ~p"
 "~n ~p"
 "~n", [FileName, E, S]),
@@ -2997,7 +2997,7 @@ read_config_file(Dir, FileName, Order, Check)
 		{ok, verify_lines(SortedLines, Check, undefined, [])}
 	 catch
 		throw:E:S ->
-		 d("File read of ~s throwed: "
+		 d("File read of ~s thrown: "
 "~n ~p"
 "~n ~p"
 "~n", [FileName, E, S]),
diff --git a/lib/snmp/src/misc/snmp_log.erl b/lib/snmp/src/misc/snmp_log.erl
index 8a4dfa621b..dbc54966d4 100644
--- a/lib/snmp/src/misc/snmp_log.erl
+++ b/lib/snmp/src/misc/snmp_log.erl
@@ -1068,7 +1068,7 @@ log_open2(Name, File, SeqNoGen, Size, Repair, Notify) ->
 end.
 
 
-%% We need to make sure we do not end up in an infinit loop
+%% We need to make sure we do not end up in an infinite loop
 %% Take the number of files of the wrap log and add 2 (for
 %% the index and size files).
 do_log_open(Name, File, {_, N} = Size, snmp_repair = _Repair, Notify) ->
diff --git a/lib/snmp/src/misc/snmp_misc.erl b/lib/snmp/src/misc/snmp_misc.erl
index b02cf9d82e..18d5800651 100644
--- a/lib/snmp/src/misc/snmp_misc.erl
+++ b/lib/snmp/src/misc/snmp_misc.erl
@@ -492,7 +492,7 @@ format_pdu(PDU, MiniMib) when is_record(PDU, pdu) ->
 	 (T =:= 'get-bulk-request') ->
 		 "";
 	 true ->
-		 io_lib:format("*!*!* An error occured. *!*!* ~n"
+		 io_lib:format("*!*!* An error occurred. *!*!* ~n"
 				 "Error status = ~w, index = ~w.~n",
 				 [ES, EI])
 	 end,
diff --git a/lib/snmp/src/misc/snmp_note_store.erl b/lib/snmp/src/misc/snmp_note_store.erl
index 606dd8ce4f..9143924973 100644
--- a/lib/snmp/src/misc/snmp_note_store.erl
+++ b/lib/snmp/src/misc/snmp_note_store.erl
@@ -156,7 +156,7 @@ handle_call({set_note, Lifetime, Key, Value}, _From,
 	 {reply, Val, NState};
 	_Crap ->
 	 ?vinfo("handle_call(set_note) -> "
-		 "failed retreiving system start time from ~w: "
+		 "failed retrieving system start time from ~w: "
 		 "~n ~p", [Mod, _Crap]),
 	 {reply, {error, failed_retreive_system_start_time}, State}
 end;
@@ -317,13 +317,13 @@ timer(Pid, passive, Timeout) ->
 	 ?MODULE:timer(Pid, passive, Timeout);
 
 	activate ->
-	 ?d("timer(deactive) -> activate request, send ack",[]),
+	 ?d("timer(deactivate) -> activate request, send ack",[]),
 	 Pid ! activated,
-	 ?d("timer(deactive) -> activate",[]),
+	 ?d("timer(deactivate) -> activate",[]),
 	 ?MODULE:timer(Pid, active, Timeout)		% code replacement
 after
 	Timeout ->
-	 ?d("timer(deactive) -> timeout",[]),
+	 ?d("timer(deactivate) -> timeout",[]),
 	 ?MODULE:timer(Pid, passive, Timeout)
 end;
 timer(Pid, active, Timeout) ->
diff --git a/lib/snmp/src/misc/snmp_usm.erl b/lib/snmp/src/misc/snmp_usm.erl
index 9652e3a3ff..9c05c7d616 100644
--- a/lib/snmp/src/misc/snmp_usm.erl
+++ b/lib/snmp/src/misc/snmp_usm.erl
@@ -411,7 +411,7 @@ des_decrypt(PrivKey, MsgPrivParams, EncData)
 DesKey = [A,B,C,D,E,F,G,H],
 Salt = MsgPrivParams,
 IV = list_to_binary(snmp_misc:str_xor(PreIV, Salt)),
- %% Whatabout errors here??? E.g. not a mulitple of 8!
+ %% Whatabout errors here??? E.g. not a multiple of 8!
 Data = binary_to_list(crypto:crypto_one_time(?BLOCK_CIPHER_DES, 
 DesKey, IV, EncData, false)),
 Data2 = snmp_pdus:strip_encrypted_scoped_pdu_data(Data),
@@ -438,7 +438,7 @@ aes_decrypt(PrivKey, MsgPrivParams, EncData, EngineBoots, EngineTime)
 AesKey = PrivKey,
 Salt = MsgPrivParams,
 IV = list_to_binary([?i32(EngineBoots), ?i32(EngineTime) | Salt]),
- %% Whatabout errors here??? E.g. not a mulitple of 8!
+ %% Whatabout errors here??? E.g. not a multiple of 8!
 Data = binary_to_list(crypto:crypto_one_time(?BLOCK_CIPHER_AES(AesKey),
 AesKey, IV, EncData, false)),
 Data2 = snmp_pdus:strip_encrypted_scoped_pdu_data(Data),
diff --git a/lib/snmp/test/klas3.erl b/lib/snmp/test/klas3.erl
index 9a5c388170..e27f361b51 100644
--- a/lib/snmp/test/klas3.erl
+++ b/lib/snmp/test/klas3.erl
@@ -131,7 +131,7 @@ ftab2(set, [2], _Cols) ->
 ftab2(set, _, _Cols) ->
 {noError, 0};
 
-%% Unfortunatly we can't force the undo - we don't know which var
+%% Unfortunately we can't force the undo - we don't know which var
 %% is tried first.
 %ftab2(undo, [3], Cols) ->
 % % bad column - In: col 2 & 3
diff --git a/lib/snmp/test/snmp_agent_SUITE.erl b/lib/snmp/test/snmp_agent_SUITE.erl
index adf24cbb99..e3f1d08c49 100644
--- a/lib/snmp/test/snmp_agent_SUITE.erl
+++ b/lib/snmp/test/snmp_agent_SUITE.erl
@@ -530,7 +530,7 @@ suite() ->
 [{ct_hooks, [ts_install_cth]}].
 
 all() -> 
- %% This is a temporary messure to ensure that we can 
+ %% This is a temporary measure to ensure that we can 
 %% test the socket backend without effecting *all*
 %% applications on *all* machines.
 %% This flag is set only for *one* host.
@@ -727,7 +727,7 @@ end_per_suite(Config0) when is_list(Config0) ->
 
 case snmp_test_mgr_counter_server:stop() of
 	{ok, Counters} ->
- 	 ?IPRINT("end_per_suite -> sucessfully stopped counter server"
+ 	 ?IPRINT("end_per_suite -> successfully stopped counter server"
 "~n Counters: ~p", [Counters]);
 
 	{error, Reason} ->
@@ -879,7 +879,7 @@ init_per_group2(GroupName, Config) ->
 
 init_per_group_ipv6(GroupName, Config, Init) ->
 %% <OS-CONDITIONAL-SKIP>
- %% This is a higly questionable test.
+ %% This is a highly questionable test.
 %% But until we have time to figure out what IPv6 issues
 %% are actually causing the failures...
 OSSkipable = [{unix, 
@@ -2616,7 +2616,7 @@ change_target_addr_config(Config) when is_list(Config) ->
 ?IPRINT("change_target_addr_config -> set trace verbosity for local_db"),
 ?line snmpa:verbosity(local_db,trace),
 
- %% First send some traps that will arive att the original manager
+ %% First send some traps that will arrive att the original manager
 ?IPRINT("change_target_addr_config -> send trap"),
 try_test(ma_trap1, [MA]),
 
@@ -2696,7 +2696,7 @@ dummy_manager_await_trap2_ack() ->
 	{received_trap, _Trap} ->
 	 ?IPRINT("dummy_manager_await_trap2 -> received trap: ~p", [_Trap]),
 	 %% Note: 
-	 %% Without this sleep the v2_inform_i testcase failes! There
+	 %% Without this sleep the v2_inform_i testcase fails! There
 	 %% is no relation between these two test cases as far as I
 	 %% able to figure out...
 	 ?SLEEP(60000),
@@ -4326,7 +4326,7 @@ mt_trap_test(MA, MT) ->
 
 %% multi-threaded = true
 %% This will *lock* the 'main thread' of a multi-threaded agent,
- %% the worker state will be 'busy'. Therefor when a new request
+ %% the worker state will be 'busy'. Therefore when a new request
 %% arrives a new *temporary* worker will be spawned.
 ?IPRINT("mt_trap_test(03) -> issue mtTrap (standard trap)", []),
 snmpa:send_trap(MA, mtTrap, "standard trap"),
@@ -5289,25 +5289,25 @@ command_handler([{_No, _Desc, Cmd}|Rest]) ->
 end
 catch
 C:E:S ->
- ?IPRINT("command_handler -> command ~w catched", [_No]),
+ ?IPRINT("command_handler -> command ~w caught", [_No]),
 SysEvs = snmp_test_global_sys_monitor:events(),
 if
 (SysEvs =:= []) ->
- ?EPRINT("command_handler -> ~w catched: "
+ ?EPRINT("command_handler -> ~w caught: "
 "~n Class: ~p"
 "~n Error: ~p"
 "~n Stack: ~p", [_No, C, E, S]),
 ?line ?FAIL({catched_command_result, {C, E, S}});
 true ->
 ?WPRINT("command_handler -> "
- "catched when we got system events: "
- "~n Catched: "
+ "caught when we got system events: "
+ "~n Caught: "
 "~n Class: ~p"
 "~n Error: ~p"
 "~n Stack: ~p"
 "~n Sys Events: ~p"
 "~n", [C, E, S, SysEvs]),
- ?SKIP([{catched, {C, E, S}}, {system_events, SysEvs}])
+ ?SKIP([{caught, {C, E, S}}, {system_events, SysEvs}])
 end
 end.
 
@@ -5427,7 +5427,7 @@ undo_test() ->
 ?line ?expect3(?v1_2(genErr, undoFailed), 1, any), 
 s([{[fStatus3, 4], 4}, {[fname3,0], "ok"}]),
 ?line ?expect3(?v1_2(genErr, commitFailed), 1, any), 
-% unfortunatly we don't know if we'll get undoFailed or commitFailed.
+% unfortunately we don't know if we'll get undoFailed or commitFailed.
 % it depends on which order the agent traverses the varbind list.
 % s([{[fStatus3, 4], 4}, {[fname3,0], "ufail"}]),
 % ?line expect(5, ?v1_2(genErr, undoFailed), 1, any),
@@ -5621,7 +5621,7 @@ snmpv2_mib_2(Config) when is_list(Config) ->
 ?DBG("snmpv2_mib_2 -> check counters",[]),
 try_test(std_mib_c, [Bad]),
 
- ?DBG("snmpv2_mib_2 -> get som counters",[]),
+ ?DBG("snmpv2_mib_2 -> get some counters",[]),
 try_test(snmpv2_mib_a),
 
 ?DBG("snmpv2_mib_2 -> enable auth traps, and await some",[]),
@@ -5779,7 +5779,7 @@ snmp_framework_mib_3(Config) when is_list(Config) ->
 %% the same as the number of seconds we sleep (5 in this case).
 %% But because, on some (slow or/and high loaded) hosts, the actual
 %% time we sleep could be a lot larger (due to, for instance, scheduling).
-%% Therefor we must take that into account when we check if the 
+%% Therefore we must take that into account when we check if the 
 %% Engine Time diff (between the two checks) is acceptably.
 snmp_framework_mib_test() ->
 
@@ -6019,7 +6019,7 @@ snmp_view_based_acm_mib() ->
 ?DBG("assign rights for 'no-rights'",[]),
 ?line try_test(use_no_rights, [], Opts),
 
- %% Create a mapping for another sec model, and make sure it dosn't
+ %% Create a mapping for another sec model, and make sure it doesn't
 %% give us access
 GRow2Status = [vacmSecurityToGroupStatus,[InvSecMod, 9,"no-rights"]],
 GRow2 = [{[vacmGroupName, [InvSecMod, 9, "no-rights"]], "initial"},
@@ -6045,7 +6045,7 @@ snmp_view_based_acm_mib() ->
 	 {[vacmAccessWriteViewName, ARow1Idx], WVName},
 	 {ARow1Status, ?createAndGo}],
 
- %% This access row would give acces, if InvSecMod was valid.
+ %% This access row would give access, if InvSecMod was valid.
 ARow2Idx = [15 | "no-rights-group"] ++ [0, InvSecMod, 1],
 ARow2Status = [vacmAccessStatus, ARow2Idx],
 ARow2 = [{[vacmAccessContextMatch, ARow2Idx], 1},
@@ -6488,7 +6488,7 @@ loop_mib_3(Config) when is_list(Config) ->
 loop_mib_1_test() ->
 ?IPRINT("loop_mib_1_test -> entry"),
 N = loop_it_1([1,1], 0),
- ?IPRINT("found ~w varibles", [N]),
+ ?IPRINT("found ~w variables", [N]),
 ?line N = if N < 100 -> 100;
 		 true -> N
 	 end.
@@ -6593,7 +6593,7 @@ loop_it_1(Oid, N) ->
 loop_mib_2_test() ->
 ?IPRINT("loop_mib_2_test -> entry"),
 N = loop_it_2([1,1], 0),
- ?IPRINT("found ~w varibles", [N]),
+ ?IPRINT("found ~w variables", [N]),
 ?line N = if N < 100 -> 100;
 		 true -> N
 	 end.
@@ -7157,7 +7157,7 @@ otp_2979_test() ->
 
 %%-----------------------------------------------------------------
 %% Ticket: OTP-3187
-%% Slogan: get-next on vacmAccessTable for colums > 5 returns
+%% Slogan: get-next on vacmAccessTable for columns > 5 returns
 %% endOfTable - should return value.
 %%-----------------------------------------------------------------
 otp_3187(suite) -> [];
diff --git a/lib/snmp/test/snmp_agent_mibs_SUITE.erl b/lib/snmp/test/snmp_agent_mibs_SUITE.erl
index 1486e5d800..9788b7edf5 100644
--- a/lib/snmp/test/snmp_agent_mibs_SUITE.erl
+++ b/lib/snmp/test/snmp_agent_mibs_SUITE.erl
@@ -873,7 +873,7 @@ mnesia_start(Opts) ->
 mnesia_start(Opts, [node()]).
 
 mnesia_start(Opts, Nodes) ->
- %% We can accept mnesia beeing loaded but *not* started.
+ %% We can accept mnesia being loaded but *not* started.
 %% If its started it *may* contain data that will invalidate
 %% this test case.
 ?IPRINT("mnesia_start -> try load mnesia when:"
diff --git a/lib/snmp/test/snmp_agent_test_lib.erl b/lib/snmp/test/snmp_agent_test_lib.erl
index 2f96a90235..19f7c21432 100644
--- a/lib/snmp/test/snmp_agent_test_lib.erl
+++ b/lib/snmp/test/snmp_agent_test_lib.erl
@@ -590,7 +590,7 @@ tc_run(Mod, Func, Args, Opts) ->
 ?SKIP([{reason, Reason}]);
 %% We have hosts (mostly *very* slooow VMs) that
 %% can timeout anything. Since we are basically
-%% testing communication, we therefor must check
+%% testing communication, we therefore must check
 %% for system events at every failure. Grrr!
 tc_run_skip_check(Mod, Func, Args, Reason, Cat) ->
 SysEvs = snmp_test_global_sys_monitor:events(),
@@ -601,7 +601,7 @@ tc_run_skip_sheck(Mod, Func, Args, Reason, Cat) ->
 "~n ~p~n", [Cat, Reason]),
 ?FAIL({apply_failed, {Mod, Func, Args}, Reason});
 true ->
- ?WPRINT("apply (~w) catched "
+ ?WPRINT("apply (~w) caught "
 "when we got system events: "
 "~n Reason: ~p"
 "~n Sys Events: ~p"
@@ -1279,7 +1279,7 @@ do_expect(Err, Idx, ExpVBs, To)
 when is_atom(Err) andalso 
 (is_integer(Idx) orelse is_list(Idx) orelse (Idx == any)) ->
 Check = fun(_, R) -> R end,
- io_format_expect("'get-response' withing ~w ms with"
+ io_format_expect("'get-response' within ~w ms with"
 "~n Error: ~p"
 "~n Index: ~p"
 "~n Varbinds: ~p", [To, Err, Idx, ExpVBs]),
diff --git a/lib/snmp/test/snmp_compiler_SUITE.erl b/lib/snmp/test/snmp_compiler_SUITE.erl
index f4ba914919..5235882432 100644
--- a/lib/snmp/test/snmp_compiler_SUITE.erl
+++ b/lib/snmp/test/snmp_compiler_SUITE.erl
@@ -277,7 +277,7 @@ agent_capabilities(Config) when is_list(Config) ->
 						 {verbosity, trace}]),
 ?line {ok, Mib2} = snmp_misc:read_mib(MibFile2), 
 MEDiff = Mib2#mib.mes -- Mib1#mib.mes,
- %% This is a rather pathetic test, but it is somthing...
+ %% This is a rather pathetic test, but it is something...
 ?IPRINT("agent_capabilities -> "
 "~n MEDiff: ~p"
 "~n Mib1: ~p"
@@ -318,7 +318,7 @@ module_compliance(Config) when is_list(Config) ->
 						 {verbosity, trace}]),
 ?line {ok, Mib2} = snmp_misc:read_mib(MibFile2), 
 MEDiff = Mib2#mib.mes -- Mib1#mib.mes,
- %% This is a rather pathetic test, but it is somthing...
+ %% This is a rather pathetic test, but it is something...
 ?IPRINT("module_compliance -> "
 "~n MEDiff: ~p"
 "~n Mib1: ~p"
diff --git a/lib/snmp/test/snmp_conf_SUITE.erl b/lib/snmp/test/snmp_conf_SUITE.erl
index 698cf2d6f3..2a78787f99 100644
--- a/lib/snmp/test/snmp_conf_SUITE.erl
+++ b/lib/snmp/test/snmp_conf_SUITE.erl
@@ -181,7 +181,7 @@ init_per_testcase(fd_leak_check = _Case, Config) when is_list(Config) ->
 %% Something strange happens when we use pfiles from within erlang,
 %% so skip the test for now
 
- %% For some reason even though 'which' exists (atleast in
+ %% For some reason even though 'which' exists (at least in
 %% a tcsh shell), it hangs when called via os:cmd/1.
 %% And type produces results that is not so easy to
 %% "analyze". So, we 'try it' and know that it starts 
diff --git a/lib/snmp/test/snmp_manager_SUITE.erl b/lib/snmp/test/snmp_manager_SUITE.erl
index fc4d73ac7f..27ae47016e 100644
--- a/lib/snmp/test/snmp_manager_SUITE.erl
+++ b/lib/snmp/test/snmp_manager_SUITE.erl
@@ -156,7 +156,7 @@ suite() ->
 [{ct_hooks, [ts_install_cth]}].
 
 all() -> 
- %% This is a temporary messure to ensure that we can 
+ %% This is a temporary measure to ensure that we can 
 %% test the socket backend without effecting *all*
 %% applications on *all* machines.
 %% This flag is set only for *one* host.
@@ -577,7 +577,7 @@ init_per_testcase(Case, Config) when is_list(Config) ->
 {skip, {Reason, Mod, Line}};
 C:E:_ when ((C =:= throw) orelse
 (C =:= exit)) ->
- {skip, {catched, C, E}}
+ {skip, {caught, C, E}}
 end
 	end,
 ?IPRINT("init_per_testcase end when"
@@ -4252,7 +4252,7 @@ do_inform1(Config) ->
 Commands = 
 	[
 	 {1, "Manager and agent info at start of test", Cmd1},
-	 {2, "Send notifcation [no receiver] from agent", Cmd2},
+	 {2, "Send notification [no receiver] from agent", Cmd2},
 	 {3, "Await first inform to manager - do not reply", Cmd3},
 	 {4, "Await second inform to manager - reply", Cmd4},
 	 {5, "Sleep some time (5 sec)", Cmd5},
@@ -4428,7 +4428,7 @@ do_inform2(Config) ->
 Commands = 
 	[
 	 {1, "Manager and agent info at start of test", Cmd1},
-	 {2, "Send notifcation [no receiver] from agent", Cmd2},
+	 {2, "Send notification [no receiver] from agent", Cmd2},
 	 {3, "Await inform-sent acknowledge from agent", Cmd3},
 	 {4, "Await first inform to manager - do not reply", Cmd4},
 	 {5, "Await second inform to manager - reply", Cmd5},
@@ -4567,7 +4567,7 @@ do_inform3(Config) ->
 Commands = 
 	[
 	 {1, "Manager and agent info at start of test", Cmd1},
-	 {2, "Send notifcation from agent", Cmd2},
+	 {2, "Send notification from agent", Cmd2},
 	 {3, "await inform-sent acknowledge from agent", Cmd3},
 	 {4, "Await first inform to manager - do not reply", Cmd4},
 	 {5, "Await first inform to manager - do not reply", Cmd4},
@@ -4693,7 +4693,7 @@ do_inform4(Config) ->
 Commands = 
 	[
 	 {1, "Manager and agent info at start of test", Cmd1},
-	 {2, "Send notifcation [no receiver] from agent", Cmd2},
+	 {2, "Send notification [no receiver] from agent", Cmd2},
 	 {3, "Await inform to manager", Cmd3},
 %% 	 {4, "Await error info (because of erroneous config)", Cmd4},
 	 {5, "Sleep some time (1 sec)", Cmd5},
@@ -4807,7 +4807,7 @@ do_inform_swarm(NumI, Config) ->
 Commands = 
 	[
 	 {1, "Manager and agent info at start of test", Cmd1},
-	 {2, ?F("Send ~p notifcation(s) from agent", [NumInforms]), Cmd2},
+	 {2, ?F("Send ~p notification(s) from agent", [NumInforms]), Cmd2},
 	 {3, "Await send-ack(s)/inform(s)/response(s)", Cmd3},
 	 {4, "Sleep some time (1 sec)", Cmd4},
 	 {5, "Manager and agent info after test completion", Cmd1}
@@ -4823,7 +4823,7 @@ inform_swarm_collector(N) ->
 
 %% Note that we need to deal with re-transmissions!
 %% That is, the agent did not receive the ack in time,
-%% and therefor did a re-transmit. This means that we
+%% and therefore did a re-transmit. This means that we
 %% expect to receive more inform's then we actually
 %% sent. So for success we assume:
 %%
diff --git a/lib/snmp/test/snmp_manager_config_SUITE.erl b/lib/snmp/test/snmp_manager_config_SUITE.erl
index c70040b2a7..ae47744fe8 100644
--- a/lib/snmp/test/snmp_manager_config_SUITE.erl
+++ b/lib/snmp/test/snmp_manager_config_SUITE.erl
@@ -308,7 +308,7 @@ end_per_testcase(_Case, Config) when is_list(Config) ->
 ?IPRINT("system events during test: "
 "~n ~p", [snmp_test_global_sys_monitor:events()]),
 
- %% The cleanup is removed due to some really discusting NFS behaviour...
+ %% The cleanup is removed due to some really disgusting NFS behaviour...
 %% Also, it can always be useful to retain "all the stuff" after
 %% the test case in case of debugging...
 Config.
@@ -1998,12 +1998,12 @@ simple_system_op(Conf) when is_list(Conf) ->
 ?IPRINT("start config"),
 ?line {ok, _Pid} = config_start(Opts),
 
- ?IPRINT("retreive various configs"),
+ ?IPRINT("retrieve various configs"),
 ?line {ok, _Time} = snmpm_config:system_start_time(),
 ?line {ok, _EngineId} = snmpm_config:get_engine_id(),
 ?line {ok, _MMS} = snmpm_config:get_engine_max_message_size(),
 
- ?IPRINT("attempt to retreive nonexisting"),
+ ?IPRINT("attempt to retrieve nonexisting"),
 ?line {error, not_found} = snmpm_config:system_info(kalle),
 
 ?line ok = config_stop(),
@@ -2245,7 +2245,7 @@ register_agent_using_function(Conf) when is_list(Conf) ->
 
 register_agent_failed_using_function1(suite) -> [];
 register_agent_failed_using_function1(doc) ->
- "Register agents failng using the API (function) with incorrect "
+ "Register agents failing using the API (function) with incorrect "
 	"config (1).";
 register_agent_failed_using_function1(Conf) when is_list(Conf) -> 
 put(tname, "REG-AG-FAIL-USING-FUNC-1"),
@@ -2595,7 +2595,7 @@ update_usm_user_info(Conf) when is_list(Conf) ->
 
 create_and_increment(suite) -> [];
 create_and_increment(doc) ->
- "Craete and increment counters.";
+ "Create and increment counters.";
 create_and_increment(Conf) when is_list(Conf) -> 
 put(tname, "CRE-AND-INC"),
 ?IPRINT("start"),
diff --git a/lib/snmp/test/snmp_note_store_SUITE.erl b/lib/snmp/test/snmp_note_store_SUITE.erl
index 3b6d9f9fcd..12b06a8155 100644
--- a/lib/snmp/test/snmp_note_store_SUITE.erl
+++ b/lib/snmp/test/snmp_note_store_SUITE.erl
@@ -239,7 +239,7 @@ do_notes({_, Pid}, _Config) ->
 info(suite) ->
 [];
 info(doc) ->
- ["Testing that we can retreive process info."];
+ ["Testing that we can retrieve process info."];
 info(Config) when is_list(Config) ->
 Pre = fun() ->
 ?IPRINT("try start note-store"),
diff --git a/lib/snmp/test/snmp_test_data/RFC1213-MIB.mib b/lib/snmp/test/snmp_test_data/RFC1213-MIB.mib
index 0421e64d62..eeb2535d7d 100644
--- a/lib/snmp/test/snmp_test_data/RFC1213-MIB.mib
+++ b/lib/snmp/test/snmp_test_data/RFC1213-MIB.mib
@@ -684,7 +684,7 @@
 Setting this object to a null string (one of zero
 length) has the effect of invaliding the
 corresponding entry in the atTable object. That
- is, it effectively dissasociates the interface
+ is, it effectively disassociates the interface
 identified with said entry from the mapping
 identified with said entry. It is an
 implementation-specific matter as to whether the
@@ -1256,7 +1256,7 @@
 Setting this object to the value invalid(2) has
 the effect of invalidating the corresponding entry
 in the ipRouteTable object. That is, it
- effectively dissasociates the destination
+ effectively disassociates the destination
 identified with said entry from the route
 identified with said entry. It is an
 implementation-specific matter as to whether the
@@ -1475,7 +1475,7 @@
 Setting this object to the value invalid(2) has
 the effect of invalidating the corresponding entry
 in the ipNetToMediaTable. That is, it effectively
- dissasociates the interface identified with said
+ disassociates the interface identified with said
 entry from the mapping identified with said entry.
 It is an implementation-specific matter as to
 whether the agent removes an invalidated entry
diff --git a/lib/snmp/test/snmp_test_data/SNMPv2-MIB.mib b/lib/snmp/test/snmp_test_data/SNMPv2-MIB.mib
index e45d9d91da..995be37f80 100644
--- a/lib/snmp/test/snmp_test_data/SNMPv2-MIB.mib
+++ b/lib/snmp/test/snmp_test_data/SNMPv2-MIB.mib
@@ -221,7 +221,7 @@ sysORUpTime OBJECT-TYPE
 STATUS current
 DESCRIPTION
 "The value of sysUpTime at the time this conceptual row was
- last instanciated."
+ last instantiated."
 ::= { sysOREntry 4 }
 
 
diff --git a/lib/snmp/test/snmp_test_data/Test-LLDP-MIB.mib b/lib/snmp/test/snmp_test_data/Test-LLDP-MIB.mib
index 40a9fc79e1..41b8057223 100644
--- a/lib/snmp/test/snmp_test_data/Test-LLDP-MIB.mib
+++ b/lib/snmp/test/snmp_test_data/Test-LLDP-MIB.mib
@@ -30,7 +30,7 @@ t-lldpMIB MODULE-IDENTITY
 "This is the ripped out bits and pieces of LLDP-MIB
 that triggered a compilation problem for Erlang/OTP's
 MIB compiler due to an AUGMENTS in lldpConfigManAddrEntry
- refering to a not yet defined OBJECT-TYPE lldpLocManAddrEntry.
+ referring to a not yet defined OBJECT-TYPE lldpLocManAddrEntry.
 	 Rip and rewrite done 2017.
 
 Management Information Base module for LLDP configuration,
@@ -199,7 +199,7 @@ lldpLocManAddrLen OBJECT-TYPE
 The management address length field is needed so that the
 receiving systems that do not implement SNMP will not be
 required to implement an iana family numbers/address length
- equivalency table in order to decode the management adress."
+ equivalency table in order to decode the management address."
 REFERENCE
 "IEEE 802.1AB-2005 9.5.9.2"
 ::= { lldpLocManAddrEntry 2 }
diff --git a/lib/snmp/test/snmp_test_data/TestTrapv2.mib b/lib/snmp/test/snmp_test_data/TestTrapv2.mib
index 679ddc14b0..2ba59451f5 100644
--- a/lib/snmp/test/snmp_test_data/TestTrapv2.mib
+++ b/lib/snmp/test/snmp_test_data/TestTrapv2.mib
@@ -44,14 +44,14 @@ tst OBJECT IDENTIFIER ::= { system 0 }
 testTrapv21 NOTIFICATION-TYPE
 STATUS current
 DESCRIPTION
- "This trap is exactly the v2 correspondance of testTrap1 in
+ "This trap is exactly the v2 correspondence of testTrap1 in
 	 TestTrap mib."
 ::= { snmp 1 }
 
 testTrapv22 NOTIFICATION-TYPE
 STATUS current
 DESCRIPTION
- "This trap is exactly the v2 correspondance of testTrap2 in
+ "This trap is exactly the v2 correspondence of testTrap2 in
 	 TestTrap mib."
 ::= { system 0 1 }
 
diff --git a/lib/snmp/test/snmp_test_global_sys_monitor.erl b/lib/snmp/test/snmp_test_global_sys_monitor.erl
index 1c90fff686..e3f59c05e4 100644
--- a/lib/snmp/test/snmp_test_global_sys_monitor.erl
+++ b/lib/snmp/test/snmp_test_global_sys_monitor.erl
@@ -199,7 +199,7 @@ cast(Msg) ->
 ok
 catch
 C:E:_ ->
- {error, {catched, C, E}}
+ {error, {caught, C, E}}
 end.
 
 %% call(Req) ->
@@ -217,7 +217,7 @@ cast(Msg) ->
 %% end
 %% catch
 %% C:E:_ ->
-%% {error, {catched, C, E}}
+%% {error, {caught, C, E}}
 %% end.
 
 call(Req, Timeout) when (Timeout =:= infinity) ->
@@ -229,7 +229,7 @@ call(Req, Timeout) when is_integer(Timeout) andalso (Timeout > 1000) ->
 call(Req, Timeout) when is_integer(Timeout) ->
 call(Req, Timeout, Timeout div 2).
 
-%% This peace of wierdness is because on some machines this call has
+%% This peace of weirdness is because on some machines this call has
 %% hung (in a call during end_per_testcase, which had a 1 min timeout,
 %% or if that was the total time for the test case).
 %% But because it hung there, we don't really know where it got stuck.
@@ -249,7 +249,7 @@ call(Req, Timeout1, Timeout2) ->
 end
 catch
 C:E:_ ->
- exit({error, {catched, C, E}})
+ exit({error, {caught, C, E}})
 end
 end,
 {Pid, Mon} = spawn_monitor(F),
diff --git a/lib/snmp/test/snmp_test_lib.erl b/lib/snmp/test/snmp_test_lib.erl
index 182debf412..e388a9415e 100644
--- a/lib/snmp/test/snmp_test_lib.erl
+++ b/lib/snmp/test/snmp_test_lib.erl
@@ -71,7 +71,7 @@
 %% conditions.
 %% Pre: A fun that is nominally part of the test case
 %% but is an initiation that must be "undone". This is
-%% done by the Post fun (regardless if the TC is successfull
+%% done by the Post fun (regardless if the TC is successful
 %% or not). Example: Starts a couple of nodes,
 %% TC: The test case fun
 %% Post: A fun that undo what was done by the Pre fun.
@@ -119,7 +119,7 @@ tc_try(Case, TCCond, Pre, TC, Post)
 (C =:= exit) ->
 tc_print("test case (~w) skip: try post", [C]),
 (catch Post(State)),
- tc_end( f("skipping(catched,~w,tc)", [C]) ),
+ tc_end( f("skipping(caught,~w,tc)", [C]) ),
 SKIP;
 C:E:S ->
 %% We always check the system events
@@ -130,7 +130,7 @@ tc_try(Case, TCCond, Pre, TC, Post)
 [] ->
 tc_print("test case failed: try post"),
 (catch Post(State)),
- tc_end( f("failed(catched,~w,tc)", [C]) ),
+ tc_end( f("failed(caught,~w,tc)", [C]) ),
 erlang:raise(C, E, S);
 SysEvs ->
 tc_print("System Events received during tc: "
@@ -150,7 +150,7 @@ tc_try(Case, TCCond, Pre, TC, Post)
 catch
 C:{skip, _} = SKIP when (C =:= throw) orelse
 (C =:= exit) ->
- tc_end( f("skipping(catched,~w,tc-pre)", [C]) ),
+ tc_end( f("skipping(caught,~w,tc-pre)", [C]) ),
 SKIP;
 C:E:S ->
 %% We always check the system events
@@ -162,7 +162,7 @@ tc_try(Case, TCCond, Pre, TC, Post)
 "~n E: ~p"
 "~n S: ~p",
 [C, E, S]),
- tc_end( f("auto-skip(catched,~w,tc-pre)", [C]) ),
+ tc_end( f("auto-skip(caught,~w,tc-pre)", [C]) ),
 SKIP = {skip, f("TC-Pre failure (~w)", [C])},
 SKIP;
 SysEvs ->
@@ -186,13 +186,13 @@ tc_try(Case, TCCond, Pre, TC, Post)
 exit({tc_cond_failed, Reason})
 catch
 C:{skip, _} = SKIP when ((C =:= throw) orelse (C =:= exit)) ->
- tc_end( f("skipping(catched,~w,cond)", [C]) ),
+ tc_end( f("skipping(caught,~w,cond)", [C]) ),
 SKIP;
 C:E:S ->
 %% We always check the system events before we accept a failure
 case snmp_test_global_sys_monitor:events() of
 [] ->
- tc_end( f("failed(catched,~w,cond)", [C]) ),
+ tc_end( f("failed(caught,~w,cond)", [C]) ),
 erlang:raise(C, E, S);
 SysEvs ->
 tc_print("System Events received: "
@@ -934,7 +934,7 @@ skip(Reason, Module, Line) ->
 exit({skip, String}).
 
 
-%% This function prints various host info, which might be usefull
+%% This function prints various host info, which might be useful
 %% when analyzing the test suite (results).
 %% It also returns a "factor" that can be used when deciding 
 %% the load for some test cases. Such as run time or number of
diff --git a/lib/snmp/test/snmp_test_manager.erl b/lib/snmp/test/snmp_test_manager.erl
index 38ec1d9ce3..1bd1351a76 100644
--- a/lib/snmp/test/snmp_test_manager.erl
+++ b/lib/snmp/test/snmp_test_manager.erl
@@ -155,7 +155,7 @@ parse_opts(Opts) ->
 MgrDir = get_opt(dir, get_opt(config, MgrOpts, [])),
 
 
- %% Retreive the agent configuration
+ %% Retrieve the agent configuration
 AgentConf = get_opt(agent_config, Opts),
 AgentTarget = get_opt(agent_target, Opts),
 {MgrDir, MgrConf, MgrOpts, AgentTarget, AgentConf}.
diff --git a/lib/snmp/test/snmp_test_mgr_counter_server.erl b/lib/snmp/test/snmp_test_mgr_counter_server.erl
index 697afdf799..e15e46b50b 100644
--- a/lib/snmp/test/snmp_test_mgr_counter_server.erl
+++ b/lib/snmp/test/snmp_test_mgr_counter_server.erl
@@ -23,7 +23,7 @@
 %% agent test suite is implemented in such a way that the 
 %% agent is started once and then used for several test cases.
 %% Each request is given a request id which *was* generated using 
-%% random! It is therefor possible, although unlikely, that a 
+%% random! It is therefore possible, although unlikely, that a 
 %% request may get a request id that has recently been used, 
 %% which will cause the agent to silently reject the request.
 %% For this reason, we start this server at the start of the
diff --git a/lib/snmp/test/snmp_test_mgr_misc.erl b/lib/snmp/test/snmp_test_mgr_misc.erl
index 2a20ebee42..abc763c5d5 100644
--- a/lib/snmp/test/snmp_test_mgr_misc.erl
+++ b/lib/snmp/test/snmp_test_mgr_misc.erl
@@ -390,7 +390,7 @@ handle_v1_or_v2_message(Mgr, _UdpId, Ip, UdpPort, _AgentIp,
 end.
 
 
-%% This function assumes that the agent and the manager (thats us) 
+%% This function assumes that the agent and the manager (that's us) 
 %% has the same version.
 check_discovery_result('version-3', DiscoReqMsg, DiscoRspMsg) ->
 ReqMsgID = getMsgID(DiscoReqMsg),
@@ -772,7 +772,7 @@ ensure_dead_kill(Pid, MRef, Timeout) ->
 
 
 display_incomming_message(M) ->
- display_message("Incomming",M).
+ display_message("Incoming",M).
 
 display_outgoing_message(M) ->
 display_message("Outgoing", M).
diff --git a/lib/snmp/test/snmp_test_server.erl b/lib/snmp/test/snmp_test_server.erl
index ac874e47be..ed77d8984b 100644
--- a/lib/snmp/test/snmp_test_server.erl
+++ b/lib/snmp/test/snmp_test_server.erl
@@ -322,7 +322,7 @@ display_failed(Failed) ->
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Verify that the actual result of a test case matches the exected one
+%% Verify that the actual result of a test case matches the expected one
 %% Returns the actual result
 %% Stores the result in the process dictionary if mismatch
 
diff --git a/lib/snmp/test/snmp_to_snmpnet_SUITE.erl b/lib/snmp/test/snmp_to_snmpnet_SUITE.erl
index 1152c8ec49..6a659e6aed 100644
--- a/lib/snmp/test/snmp_to_snmpnet_SUITE.erl
+++ b/lib/snmp/test/snmp_to_snmpnet_SUITE.erl
@@ -411,7 +411,7 @@ erlang_agent_netsnmp_get(Config) when is_list(Config) ->
 "~n ~s", [Rest]),
 throw({skip, Rest});
 Any ->
- ct:pal("Received unexpected reponse: "
+ ct:pal("Received unexpected response: "
 "~n ~p", [Any]),
 exit({unexpected, Any})
 end || Transport <- Transports],
diff --git a/lib/snmp/test/snmp_to_snmpnet_SUITE_data/TestTrapv2.mib b/lib/snmp/test/snmp_to_snmpnet_SUITE_data/TestTrapv2.mib
index 679ddc14b0..2ba59451f5 100644
--- a/lib/snmp/test/snmp_to_snmpnet_SUITE_data/TestTrapv2.mib
+++ b/lib/snmp/test/snmp_to_snmpnet_SUITE_data/TestTrapv2.mib
@@ -44,14 +44,14 @@ tst OBJECT IDENTIFIER ::= { system 0 }
 testTrapv21 NOTIFICATION-TYPE
 STATUS current
 DESCRIPTION
- "This trap is exactly the v2 correspondance of testTrap1 in
+ "This trap is exactly the v2 correspondence of testTrap1 in
 	 TestTrap mib."
 ::= { snmp 1 }
 
 testTrapv22 NOTIFICATION-TYPE
 STATUS current
 DESCRIPTION
- "This trap is exactly the v2 correspondance of testTrap2 in
+ "This trap is exactly the v2 correspondence of testTrap2 in
 	 TestTrap mib."
 ::= { system 0 1 }
 
diff --git a/lib/snmp/test/test-mibs/RFC1213-MIB.mib b/lib/snmp/test/test-mibs/RFC1213-MIB.mib
index 0421e64d62..eeb2535d7d 100644
--- a/lib/snmp/test/test-mibs/RFC1213-MIB.mib
+++ b/lib/snmp/test/test-mibs/RFC1213-MIB.mib
@@ -684,7 +684,7 @@
 Setting this object to a null string (one of zero
 length) has the effect of invaliding the
 corresponding entry in the atTable object. That
- is, it effectively dissasociates the interface
+ is, it effectively disassociates the interface
 identified with said entry from the mapping
 identified with said entry. It is an
 implementation-specific matter as to whether the
@@ -1256,7 +1256,7 @@
 Setting this object to the value invalid(2) has
 the effect of invalidating the corresponding entry
 in the ipRouteTable object. That is, it
- effectively dissasociates the destination
+ effectively disassociates the destination
 identified with said entry from the route
 identified with said entry. It is an
 implementation-specific matter as to whether the
@@ -1475,7 +1475,7 @@
 Setting this object to the value invalid(2) has
 the effect of invalidating the corresponding entry
 in the ipNetToMediaTable. That is, it effectively
- dissasociates the interface identified with said
+ disassociates the interface identified with said
 entry from the mapping identified with said entry.
 It is an implementation-specific matter as to
 whether the agent removes an invalidated entry
diff --git a/lib/snmp/test/test-mibs/SNMPv2-MIB.mib b/lib/snmp/test/test-mibs/SNMPv2-MIB.mib
index 0c5418b9ce..e07e5ae16b 100644
--- a/lib/snmp/test/test-mibs/SNMPv2-MIB.mib
+++ b/lib/snmp/test/test-mibs/SNMPv2-MIB.mib
@@ -221,7 +221,7 @@ sysORUpTime OBJECT-TYPE
 STATUS current
 DESCRIPTION
 "The value of sysUpTime at the time this conceptual row was
- last instanciated."
+ last instantiated."
 ::= { sysOREntry 4 }
 
 
@@ -375,7 +375,7 @@ tst OBJECT IDENTIFIER ::= { system 0 }
 testTrapv22 NOTIFICATION-TYPE
 STATUS current
 DESCRIPTION
- "This trap is exactly the v2 correspondance of testTrap2 in
+ "This trap is exactly the v2 correspondence of testTrap2 in
 TestTrap mib."
 ::= { system 0 1 }
 
diff --git a/lib/snmp/test/test-mibs/SNMPv2-TC.mib b/lib/snmp/test/test-mibs/SNMPv2-TC.mib
index 1d75c4bbd8..f6051f7a71 100644
--- a/lib/snmp/test/test-mibs/SNMPv2-TC.mib
+++ b/lib/snmp/test/test-mibs/SNMPv2-TC.mib
@@ -629,7 +629,7 @@ value | | see 1| ->C| ->D
 time should be long enough to allow for human response time
 (including `think time') between the creation of the
 conceptual row and the setting of the status to `active'.
- In the absense of such information in the DESCRIPTION
+ In the absence of such information in the DESCRIPTION
 clause, it is suggested that this period be approximately 5
 minutes in length. This removal action applies not only to
 newly-created rows, but also to previously active rows which
diff --git a/lib/snmp/test/test-mibs/SNMPv2-test.mib b/lib/snmp/test/test-mibs/SNMPv2-test.mib
index b02be09138..f435660b2c 100644
--- a/lib/snmp/test/test-mibs/SNMPv2-test.mib
+++ b/lib/snmp/test/test-mibs/SNMPv2-test.mib
@@ -163,7 +163,7 @@ sysQ OBJECT-TYPE
 MAX-ACCESS read-write
 STATUS current
 DESCRIPTION
- "The auxiliar the SYNTAX."
+ "The auxiliary the SYNTAX."
 DEFVAL { { a, b } }
 ::= { system 11 }
 
@@ -231,7 +231,7 @@ sysORUpTime OBJECT-TYPE
 STATUS current
 DESCRIPTION
 "The value of sysUpTime at the time this conceptual row was
- last instanciated."
+ last instantiated."
 ::= { sysOREntry 4 }
 
 
-- 
2.31.1

Places

File 0247-Fix-typos-in-lib-snmp.patch of Package erlang (Revision ddfbbd0efffaf9570a604d2e0f074ad7)

Places