aboutsummaryrefslogtreecommitdiffstats
path: root/lib/snmp/doc/src/snmp_app.xml
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2013-11-26 16:12:46 +0100
committerMicael Karlberg <[email protected]>2013-11-26 16:12:46 +0100
commit0f13b20298fd6f63a08d6fa1d1159a91d79fa1f6 (patch)
treea0e2ca49909defa1da5af2b7eaf24faf14f32a2c /lib/snmp/doc/src/snmp_app.xml
parent6dd7c114b018ac412ed0d5c3423e988094aa9655 (diff)
parent8852c947d413e8814d663c9319f7b8932b05a7ad (diff)
downloadotp-0f13b20298fd6f63a08d6fa1d1159a91d79fa1f6.tar.gz
otp-0f13b20298fd6f63a08d6fa1d1159a91d79fa1f6.tar.bz2
otp-0f13b20298fd6f63a08d6fa1d1159a91d79fa1f6.zip
Merge branch 'maint'
Conflicts: lib/snmp/doc/src/snmpm_user.xml
Diffstat (limited to 'lib/snmp/doc/src/snmp_app.xml')
-rw-r--r--lib/snmp/doc/src/snmp_app.xml7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/snmp/doc/src/snmp_app.xml b/lib/snmp/doc/src/snmp_app.xml
index e14f03e55a..86f0981988 100644
--- a/lib/snmp/doc/src/snmp_app.xml
+++ b/lib/snmp/doc/src/snmp_app.xml
@@ -763,12 +763,15 @@
</item>
<marker id="db_init_error"></marker>
- <tag><c>db_init_error() = terminate | create</c></tag>
+ <tag><c>db_init_error() = terminate | create | create_db_and_dir</c></tag>
<item>
<p>Defines what to do if the agent or manager is unable to open an
existing database file. <c>terminate</c> means that the
agent/manager will terminate and <c>create</c> means that the
- agent/manager will remove the faulty file(s) and create new ones.</p>
+ agent/manager will remove the faulty file(s) and create new ones,
+ and <c>create_db_and_dir</c> means that the agent/manager will
+ create the database file along with any missing parent directories
+ for the database file.</p>
<p>Default is <c>terminate</c>.</p>
</item>