diff options
| author | Hans Bolinder <[email protected]> | 2016-09-02 08:39:12 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2016-09-02 08:39:12 +0200 |
| commit | db096ad15022ae4f9605fa42bf74780641dc6dac (patch) | |
| tree | 477e4ec79ce025e2af2ecef46536a6e80413b057 /system/doc/oam/oam_intro.xml | |
| parent | 068185ef518384c0141cc643820f3a2a103ff4c3 (diff) | |
| parent | ad6e765bcd4f35a282ef00e38ed9129f3a5c1d83 (diff) | |
| download | otp-db096ad15022ae4f9605fa42bf74780641dc6dac.tar.gz otp-db096ad15022ae4f9605fa42bf74780641dc6dac.tar.bz2 otp-db096ad15022ae4f9605fa42bf74780641dc6dac.zip | |
Merge branch 'hasse/doc/fix_editorial_changes' into maint
* hasse/doc/fix_editorial_changes:
doc: Correct errors introduced by Editorial changes
Diffstat (limited to 'system/doc/oam/oam_intro.xml')
| -rw-r--r-- | system/doc/oam/oam_intro.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/system/doc/oam/oam_intro.xml b/system/doc/oam/oam_intro.xml index cdcb6e3111..8b8d69e638 100644 --- a/system/doc/oam/oam_intro.xml +++ b/system/doc/oam/oam_intro.xml @@ -178,7 +178,7 @@ <section> <title>MIB Structure</title> <p>The top-level OTP MIB is called <c>OTP-REG</c> and it is - included in the <c>sasl</c> application. All other OTP MIBs + included in the SASL application. All other OTP MIBs import some objects from this MIB.</p> <p>Each MIB is contained in one application. The MIB text @@ -188,7 +188,7 @@ <c><![CDATA[include/<MIB>.hrl]]></c>, and the compiled MIBs are stored under <c><![CDATA[priv/mibs/<MIB>.bin]]></c>. For example, the <c>OTP-MIB</c> is included in the - <c>sasl</c> application:</p> + SASL application:</p> <code type="none"> sasl-1.3/mibs/OTP-MIB.mib @@ -211,11 +211,11 @@ snmp:c("MY-MIB", [{il, ["sasl/priv/mibs"]}]).</code> <p>The following MIBs are defined in the OTP system:</p> <list type="bulleted"> - <item><p><c>OTP-REG)</c> (in <c>sasl</c>) contains the top-level + <item><p><c>OTP-REG)</c> (in SASL) contains the top-level OTP registration objects, used by all other MIBs.</p></item> - <item><p><c>OTP-TC</c> (in <c>sasl</c>) contains the general + <item><p><c>OTP-TC</c> (in SASL) contains the general Textual Conventions, which can be used by any other MIB.</p></item> - <item><p><c>OTP-MIB</c> (in <c>sasl</c>) contains objects for + <item><p><c>OTP-MIB</c> (in SASL) contains objects for instrumentation of the Erlang nodes, the Erlang machines, and the applications in the system.</p></item> <item><p><c>OTP-OS-MON-MIB</c> (in <c>oc_mon</c>) contains |