Merge commit 'c1719316a840d268a09d5fe2c10b06e51bc77824' into thread-next

Conflicts:
	doc/bird.sgml

diff --cc doc/bird.sgml
index 7d0819c6aff8c0fec9f4ece71097059dc9ddaad6,f5e57fec65ef724dfc9b52be60ea8da698fe915b..ffbbeb42f66566e3e29551107ce53ddb9a6921e2
--- 1/doc/bird.sgml
--- 2/doc/bird.sgml
+++ b/doc/bird.sgml
@@@ -1036,12 -1016,10 +1036,12 @@@ inherited from templates can be update
        <cf/none/ is for dropping all routes. Default: <cf/all/ (except for
        EBGP).
  
 -      <tag><label id="proto-export">export <m/filter/</tag>
 +      <tag><label id="proto-export">export [ in <m/prefix/ ] <m/filter/</tag>
        This is similar to the <cf>import</cf> keyword, except that it works in
 -      the direction from the routing table to the protocol. Default: <cf/none/
 -      (except for EBGP and L3VPN).
 +      the direction from the routing table to the protocol. If <cf/in/ keyword is used,
 +      only routes inside the given prefix are exported. Other routes are completely
 +      ignored (e.g. no logging and no statistics).
-       Default: <cf/none/ (except for EBGP).
++      Default: <cf/none/ (except for EBGP and L3VPN).
  
        <tag><label id="proto-import-keep-filtered">import keep filtered <m/switch/</tag>
        Usually, if an import filter rejects a route, the route is forgotten.