summaryrefslogtreecommitdiffstats
path: root/doc/bird.conf.example
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2009-12-14 20:37:32 +0100
committerOndrej Zajicek <santiago@crfreenet.org>2009-12-14 20:37:32 +0100
commit63542845dfb6d2277f93f77ad9ca3ad8bbaddd09 (patch)
treef65e7c59057a3db2bd80126ac5095d37a42fc2ce /doc/bird.conf.example
parent34a877ccac25d38172716d3d2488449c870cad0b (diff)
parent8a7fb8858fa87bce6f2f15ee2bbb77704b5fff4e (diff)
downloadbird-63542845dfb6d2277f93f77ad9ca3ad8bbaddd09.tar
bird-63542845dfb6d2277f93f77ad9ca3ad8bbaddd09.zip
Merge branch 'dev' into ospf3
Conflicts: proto/ospf/lsreq.c proto/ospf/lsupd.c proto/ospf/rt.c
Diffstat (limited to 'doc/bird.conf.example')
-rw-r--r--doc/bird.conf.example1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/bird.conf.example b/doc/bird.conf.example
index 0a2aac7..6ab03a2 100644
--- a/doc/bird.conf.example
+++ b/doc/bird.conf.example
@@ -162,6 +162,7 @@ protocol static {
#protocol bgp {
# disabled;
+# description "My BGP uplink"
# local as 65000;
# neighbor 62.168.0.130 as 5588;
# multihop 20 via 62.168.0.13;