From: Maria Matejka <mq@ucw.cz>
Date: Mon, 31 Mar 2025 11:58:51 +0000 (+0200)
Subject: Merge commit '3a55459ea' into thread-next
X-Git-Tag: v3.1.0~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fadbc9ddf86f770e809697f6dc671a4c30825eb;p=thirdparty%2Fbird.git

Merge commit '3a55459ea' into thread-next
---

4fadbc9ddf86f770e809697f6dc671a4c30825eb
diff --cc doc/bird.sgml
index 9c0d350ef,4efca00dd..e43533a56
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@@ -2699,23 -2597,18 +2699,23 @@@ with the appropriate unit: <m/number/ <
  are allowed as units, practical minimum values are usually in order of tens of
  milliseconds.
  
 +<p>Beware, all BFD instances pick up requests and sessions asynchronously, and
 +any instance can pick up any matching request, regardless of the order in the
 +configuration file. There may be a future update, allowing for strict matching,
 +yet for now, we do not have such an option.
 +
  <code>
- protocol bfd [&lt;name&gt;] {
+ protocol bfd [<name>] {
  	accept [ipv4|ipv6] [direct|multihop];
- 	strict bind &lt;switch&gt;;
- 	zero udp6 checksum rx &lt;switch&gt;;
- 	interface &lt;interface pattern&gt; {
- 		interval &lt;time&gt;;
- 		min rx interval &lt;time&gt;;
- 		min tx interval &lt;time&gt;;
- 		idle tx interval &lt;time&gt;;
- 		multiplier &lt;num&gt;;
- 		passive &lt;switch&gt;;
+ 	strict bind <switch>;
+ 	zero udp6 checksum rx <switch>;
+ 	interface <interface pattern> {
+ 		interval <time>;
+ 		min rx interval <time>;
+ 		min tx interval <time>;
+ 		idle tx interval <time>;
+ 		multiplier <number>;
+ 		passive <switch>;
  		authentication none;
  		authentication simple;
  		authentication [meticulous] keyed md5|sha1;