aboutsummaryrefslogtreecommitdiffstats
path: root/lib/snmp/doc/src/snmpm.xml
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2012-08-01 14:37:59 +0200
committerMicael Karlberg <[email protected]>2012-08-01 14:37:59 +0200
commit9e0ddde74738ab55bc1472e2d214f71322ebafbb (patch)
tree53121684fa604e8094edf55130d34f2b13e1b727 /lib/snmp/doc/src/snmpm.xml
parent740b2bac736a9472c9e87fe0ac9e574467f1c35e (diff)
parent34ba5c9094b884873875fa178469e029d7b6743e (diff)
downloadotp-9e0ddde74738ab55bc1472e2d214f71322ebafbb.tar.gz
otp-9e0ddde74738ab55bc1472e2d214f71322ebafbb.tar.bz2
otp-9e0ddde74738ab55bc1472e2d214f71322ebafbb.zip
Merge branch 'bmk/snmp/bad_decode_TimeTicks/maint/OTP-10132' into bmk/snmp/snmp4221_integration
Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src
Diffstat (limited to 'lib/snmp/doc/src/snmpm.xml')
-rw-r--r--lib/snmp/doc/src/snmpm.xml14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/snmp/doc/src/snmpm.xml b/lib/snmp/doc/src/snmpm.xml
index 9bbb6cdbdb..8ab3be8e18 100644
--- a/lib/snmp/doc/src/snmpm.xml
+++ b/lib/snmp/doc/src/snmpm.xml
@@ -173,16 +173,16 @@ sec_level() = noAuthNoPriv | authNoPriv | authPriv
</type>
<desc>
<p>Register the manager entity (=user) responsible for specific
- agent(s). </p>
+ agent(s). </p>
<p><c>Module</c> is the callback module (snmpm_user behaviour) which
- will be called whenever something happens (detected
- agent, incoming reply or incoming trap/notification).
- Note that this could have already been done as a
- consequence of the node config. (see users.conf).</p>
+ will be called whenever something happens (detected
+ agent, incoming reply or incoming trap/notification).
+ Note that this could have already been done as a
+ consequence of the node config. (see users.conf).</p>
- <p>The argument <c>DefaultAgentConfig</c> is used as default values when
- this user register agents.</p>
+ <p>The argument <c>DefaultAgentConfig</c> is used as default
+ values when this user register agents.</p>
<p>The type of <c>Val</c> depends on <c>Item</c>: </p>
<code type="none"><![CDATA[