doc: add documentation about reading /etc/lldpd.conf and /etc/lldpd.d/*

diff --git a/NEWS b/NEWS
index 4d291c1b442ee4f704d29c41bf28917b3f468aa6..0ffd37ba48db0c174e3a8319430c840f79f96365 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,12 @@
 lldpd (0.7.2)
   * Features
+    + lldpd can be configured through /etc/lldpd.conf and
+      /etc/lldpd.d. All commands accepted by lldpcli are accepted.
     + Lock BPF interfaces before handing them to chrooted process on
       BSD.
+  * Fixes:
+    + Driver whitelisting is done before checking if an interface has
+      a lower interface in Linux.
 
 lldpd (0.7.1)
   * Features

diff --git a/src/daemon/lldpd.8 b/src/daemon/lldpd.8
index 57520d148d3efd8a5f894694d6ab7c6b1bb5930e..49be54c9b32222a2a14360e8f0caa89dab0e055a 100644 (file)
--- a/src/daemon/lldpd.8
+++ b/src/daemon/lldpd.8
@@ -349,9 +349,21 @@ column tells that only one neighbor will be kept.
 .It /var/run/lldpd.socket
 Unix-domain socket used for communication with
 .Xr lldpctl 8 .
+.It /etc/lldpd.conf
+Configuration file for
+.Nm .
+Commands in this files are executed by
+.Xr lldpcli 8
+at start.
+.It /etc/lldpd.d
+Directory containing configuration files whose commands are executed
+by
+.Xr lldpcli 8
+at start.
 .El
 .Sh SEE ALSO
 .Xr lldpctl 8 ,
+.Xr lldpcli 8 ,
 .Xr snmpd 8
 .Sh HISTORY
 The