summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmc <jmc@openbsd.org>2012-08-29 20:15:19 +0000
committerjmc <jmc@openbsd.org>2012-08-29 20:15:19 +0000
commit37b05aaf55307345fc334cadcd5a733e9df0449d (patch)
treef47f27a34eb14989c1199d8fff9a13d82704aba7
parentMake sure the interrupt stack for the boot processor is properly aligned to (diff)
downloadwireguard-openbsd-37b05aaf55307345fc334cadcd5a733e9df0449d.tar.xz
wireguard-openbsd-37b05aaf55307345fc334cadcd5a733e9df0449d.zip
rfc 5036 obsoletes rfc 3036; ok claudio
-rw-r--r--usr.sbin/ldpd/ldpd.816
-rw-r--r--usr.sbin/ldpd/ldpd.conf.56
2 files changed, 14 insertions, 8 deletions
diff --git a/usr.sbin/ldpd/ldpd.8 b/usr.sbin/ldpd/ldpd.8
index 06e08d9d241..6d196ce0eb6 100644
--- a/usr.sbin/ldpd/ldpd.8
+++ b/usr.sbin/ldpd/ldpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ldpd.8,v 1.5 2010/05/24 19:44:23 jmc Exp $
+.\" $OpenBSD: ldpd.8,v 1.6 2012/08/29 20:15:19 jmc Exp $
.\"
.\" Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
.\" Copyright (c) 2004, 2005, 2006 Esben Norby <norby@openbsd.org>
@@ -15,7 +15,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: May 24 2010 $
+.Dd $Mdocdate: August 29 2012 $
.Dt LDPD 8
.Os
.Sh NAME
@@ -79,14 +79,20 @@ socket used for communication with
.Xr ldpctl 8 ,
.Xr rc.conf 8
.Rs
+.%A E. Rosen
+.%A A. Viswanathan
+.%A R. Callon
+.%D January 2001
.%R RFC 3031
.%T Multiprotocol Label Switching Architecture
-.%D January 2001
.Re
.Rs
-.%R RFC 3036
+.%A L. Andersson
+.%A I. Minei
+.%A B. Thomas
+.%D October 2007
+.%R RFC 5036
.%T LDP Specification
-.%D January 2001
.Re
.Sh HISTORY
The
diff --git a/usr.sbin/ldpd/ldpd.conf.5 b/usr.sbin/ldpd/ldpd.conf.5
index e8a0338fb39..4d1b548c915 100644
--- a/usr.sbin/ldpd/ldpd.conf.5
+++ b/usr.sbin/ldpd/ldpd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ldpd.conf.5,v 1.7 2012/04/24 14:56:09 jmc Exp $
+.\" $OpenBSD: ldpd.conf.5,v 1.8 2012/08/29 20:15:19 jmc Exp $
.\"
.\" Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
.\" Copyright (c) 2005, 2006 Esben Norby <norby@openbsd.org>
@@ -18,7 +18,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: April 24 2012 $
+.Dd $Mdocdate: August 29 2012 $
.Dt LDPD.CONF 5
.Os
.Sh NAME
@@ -27,7 +27,7 @@
.Sh DESCRIPTION
The
.Xr ldpd 8
-daemon implements the Label Distribution Protocol as described in RFC 3036.
+daemon implements the Label Distribution Protocol as described in RFC 5036.
.Sh SECTIONS
The
.Nm