Merge commit '3a55459ea' into thread-next

diff --cc doc/bird.sgml
index 9c0d350efb0c669181f70779fce9c0bbff4c92b9,4efca00ddd9024d39835beead457b3854fb34137..e43533a563f528277e780e73bfc36012a5607675
--- 1/doc/bird.sgml
--- 2/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;