0
0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-03-21 22:07:03 +00:00

Merge commit '4a5eb284c9d51441e09976021d1bd93c21408d46' into integrated

This commit is contained in:
Ondrej Zajicek 2014-05-02 17:18:45 +02:00
commit 8d9c5b8c3a

View File

@ -289,7 +289,9 @@ protocol rip {
<p><descrip> <p><descrip>
<tag>include "<m/filename/"</tag> <tag>include "<m/filename/"</tag>
This statement causes inclusion of a new file. The maximal depth is set to 5. This statement causes inclusion of a new file. <m/Filename/ could also
be a wildcard. The maximal depth is 5. Note that this statement could be
used anywhere in the config file, not just as a top-level option.
<tag><label id="dsc-log">log "<m/filename/"|syslog [name <m/name/]|stderr all|{ <m/list of classes/ }</tag> <tag><label id="dsc-log">log "<m/filename/"|syslog [name <m/name/]|stderr all|{ <m/list of classes/ }</tag>
Set logging of messages having the given class (either <cf/all/ or <cf/{ Set logging of messages having the given class (either <cf/all/ or <cf/{
@ -695,6 +697,9 @@ This argument can be omitted if there exists only a single instance.
<tag>show static [<m/name/]</tag> <tag>show static [<m/name/]</tag>
Show detailed information about static routes. Show detailed information about static routes.
<tag>show bfd sessions [<m/name/]</tag>
Show information about BFD sessions.
<tag>show interfaces [summary]</tag> <tag>show interfaces [summary]</tag>
Show the list of interfaces. For each interface, print its type, state, MTU and addresses assigned. Show the list of interfaces. For each interface, print its type, state, MTU and addresses assigned.
@ -707,9 +712,6 @@ This argument can be omitted if there exists only a single instance.
that is routes, their metrics and (in case the <cf/all/ switch is given) that is routes, their metrics and (in case the <cf/all/ switch is given)
all their attributes. all their attributes.
<tag>show bfd sessions [<m/name/]</tag>
Show information about BFD sessions.
<p>You can specify a <m/prefix/ if you want to print routes for a <p>You can specify a <m/prefix/ if you want to print routes for a
specific network. If you use <cf>for <m/prefix or IP/</cf>, you'll get specific network. If you use <cf>for <m/prefix or IP/</cf>, you'll get
the entry which will be used for forwarding of packets to the given the entry which will be used for forwarding of packets to the given