Change default database path and configuration directory
Now respectively ${LOCALSTATEDIR}/lib/ndn/ndns/ndns.db
and ${SYSCONFDIR}/ndn/ndns
Refs: #4810
Change-Id: I351a6a15f8daa0a032845cb26d5d76179faa7b27
diff --git a/docs/doxygen.conf.in b/docs/doxygen.conf.in
index 06122a5..5ba77c2 100644
--- a/docs/doxygen.conf.in
+++ b/docs/doxygen.conf.in
@@ -2024,19 +2024,12 @@
PREDEFINED = DOXYGEN=1 \
NDNS_LOG_INIT(x)= \
- NDNS_LOG_INCLASS_DEFINE(a,b)= \
- NDNS_LOG_INCLASS_TEMPLATE_SPECIALIZATION_DEFINE(a,b,c)= \
- NDNS_LOG_INCLASS_2TEMPLATE_SPECIALIZATION_DEFINE(a,b,c,d)= \
- BOOST_STATIC_ASSERT(x)= \
BOOST_CONCEPT_ASSERT(x)= \
BOOST_CONCEPT_REQUIRES(x)= \
- DECL_OVERRIDE=override \
- NDNS_VIRTUAL_WITH_TESTS=virtual \
- NDNS_PUBLIC_WITH_TESTS_ELSE_PROTECTED=public \
- NDNS_PUBLIC_WITH_TESTS_ELSE_PRIVATE=public \
- NDNS_PROTECTED_WITH_TESTS_ELSE_PRIVATE=protected \
- DECL_CLASS_FINAL=final \
- DECL_FINAL=final
+ NDNS_PUBLIC_WITH_TESTS_ELSE_PROTECTED=protected \
+ NDNS_PUBLIC_WITH_TESTS_ELSE_PRIVATE=private \
+ NDNS_PROTECTED_WITH_TESTS_ELSE_PRIVATE=private \
+ NDNS_VIRTUAL_WITH_TESTS=
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
# tag can be used to specify a list of macro names that should be expanded. The
diff --git a/docs/ndns-db-manage.rst b/docs/ndns-db-manage.rst
index 84c5abb..3518684 100644
--- a/docs/ndns-db-manage.rst
+++ b/docs/ndns-db-manage.rst
@@ -6,12 +6,12 @@
``sqlite3`` installed
-
Create the database
-------------------
-Set the attribute ``dbfile`` in the NDNS configuration file, e.g., ``${SYSCONFDIR}/ndn/ndns.conf`` (``/etc/ndn/ndns.conf``), to the desired path of the database file.
-By default, ``dbfile`` is assigned to ``${LOCALSTATEDIR}/lib/ndns/ndns.db`` (``/var/lib/ndns/ndns.db``).
+Set the attribute ``dbFile`` in the NDNS configuration file, e.g., ``${SYSCONFDIR}/ndn/ndns/ndns.conf``
+(``/etc/ndn/ndns/ndns.conf``), to the desired path of the database file. By default, ``dbFile`` is equal
+to ``${LOCALSTATEDIR}/lib/ndn/ndns/ndns.db`` (``/var/lib/ndn/ndns/ndns.db``).
When NDNS started, an empty database will be automatically created.