From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Sat, 29 Apr 2017 20:14:36 +0000 (+0200)
Subject: One last update to NEWS and example
X-Git-Tag: v2.0.0-pre1^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e25f7d229fcb6591e9cd96d3cc61767b3c8dea7;p=thirdparty%2Fbird.git

One last update to NEWS and example
---

diff --git a/NEWS b/NEWS
index 34d22ec06..9d8e734a3 100644
--- a/NEWS
+++ b/NEWS
@@ -13,9 +13,19 @@ Version 2.0.0-pre1 (2017-04-29)
   o Static: Minor overhaul
   o Netlink: Default kernel metric changed to 32
   o Flowspec: Limit tcp mask length to 12 bits
-  o Flows and ROAs no longer use phony next hops
   o Update of show route command
 
+  Notes:
+
+  Definitions of OSPFv2, OSPFv3 and RIP NG protocols now use keywords
+  'ospf v2', 'ospf v3' and 'rip ng' instead of 'ospf2', 'ospf3' and 'ripng'.
+
+  Flows and ROAs no longer use phony next hops, so there is no need to use
+  'drop' or 'unreachable' in their static route definitions.
+
+  See doc/bird.conf.example2 for configuration examples.
+
+
 Version 2.0.0-pre0 (2016-12-07)
   o Integrated IPv4 + IPv6 design
   o Major BGP protocol redesign
diff --git a/doc/bird.conf.example2 b/doc/bird.conf.example2
index 51fcfb646..d7048b64e 100644
--- a/doc/bird.conf.example2
+++ b/doc/bird.conf.example2
@@ -168,7 +168,7 @@ protocol pipe {
 	export where source = RTS_OSPF;
 }
 
-protocol ospf2 ospf4 {
+protocol ospf v2 ospf4 {
 #	ecmp;
 
 	ipv4 {
@@ -185,7 +185,7 @@ protocol ospf2 ospf4 {
 }
 
 
-protocol ospf3 ospf6 {
+protocol ospf v3 ospf6 {
 #	ecmp;
 
 	ipv6 {