From: Vincent Bernat <bernat@luffy.cx>
Date: Sun, 3 Feb 2013 08:58:01 +0000 (+0100)
Subject: doc: add documentation about reading /etc/lldpd.conf and /etc/lldpd.d/*
X-Git-Tag: 0.7.2~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=290951985e0bbba689dd7d5cd389638123e05a88;p=thirdparty%2Flldpd.git

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

diff --git a/NEWS b/NEWS
index 4d291c1b..0ffd37ba 100644
--- 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 57520d14..49be54c9 100644
--- 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