summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2009-12-22 01:34:01 +0100
committerOndrej Zajicek <santiago@crfreenet.org>2009-12-22 01:34:01 +0100
commit0ad19261bf551ef49a1565e21e384ec749ec16d4 (patch)
treecae1dd0568c032724faaf2c82ebe77512a2174a2
parentc4ae53858be1bce6798f31ee2fb46775a607085f (diff)
parent67b24e7c1991de345dcb14173943a28d499f6f85 (diff)
downloadbird-0ad19261bf551ef49a1565e21e384ec749ec16d4.tar
bird-0ad19261bf551ef49a1565e21e384ec749ec16d4.zip
Merge commit 'origin/master' into new
-rw-r--r--NEWS4
-rw-r--r--doc/bird.sgml2
2 files changed, 3 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 06c921f..d1ce33c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
-Version 1.1.7 (2009-12-21)
+Version 1.1.7 (2009-12-20)
o Implements BGP Route Refresh (RFC 2918).
- o Implements route reload feature.
+ o Implements route reload command.
o Deep changes and bugfixes in pipe protocol.
o Bugfix in OSPF premature aging of LSA.
o Bugfix in OSPF next hop calculation.
diff --git a/doc/bird.sgml b/doc/bird.sgml
index e894353..53d87b6 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -1536,7 +1536,7 @@ Default is <cf/metric of type 2 = 10000/ and <cf/tag = 0/.
<code>
protocol ospf MyOSPF {
- rfc1583compatibility yes;
+ rfc1583compat yes;
tick 2;
export filter {
if source = RTS_BGP then {