From: Maria Matejka <mq@ucw.cz>
Date: Fri, 26 Jan 2024 22:27:33 +0000 (+0100)
Subject: Merge commit 'c1719316a840d268a09d5fe2c10b06e51bc77824' into thread-next
X-Git-Tag: v3.0.0~307
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=457a0873ab532d7d1f7770a596a39cb509e3fdd2;p=thirdparty%2Fbird.git

Merge commit 'c1719316a840d268a09d5fe2c10b06e51bc77824' into thread-next

Conflicts:
	doc/bird.sgml
---

457a0873ab532d7d1f7770a596a39cb509e3fdd2
diff --cc doc/bird.sgml
index 7d0819c6a,f5e57fec6..ffbbeb42f
--- a/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.