One last update to NEWS and example

diff --git a/NEWS b/NEWS
index 34d22ec063c9764f4e89f6d17c3579f92437abbe..9d8e734a3ac599ccb0fbbc2b54d199850af6d6dc 100644 (file)
--- 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 51fcfb646e5b7a072e546794baa6f17f00742ebc..d7048b64ec8e432cc230a012408087d78ee610bc 100644 (file)
--- 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 {