Merge commit '32427c9c' into thread-next

diff --cc doc/bird.sgml
Simple merge

diff --cc nest/config.Y
index f19ea596057d78897eed820fec5da5358bbb6307,ce45d98d57a23ddd6445c154495ca4fe8d16d6c2..e186c85164b30df0d8d647e56786c5840d0bb543
--- 1/nest/config.Y
--- 2/nest/config.Y
+++ b/nest/config.Y
@@@ -154,6 -154,8 +154,8 @@@ CF_ENUM_PX(T_ENUM_AF, AF_, AFI_, IPV4, 
  
  CF_GRAMMAR
  
 -kw_sym: MIN | MAX ;
++toksym: MIN | MAX ;
+ 
  /* Setting of router ID */
  
  conf: rtrid ;