diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2018-09-12 21:58:39 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2018-09-12 21:58:39 +0200 |
| commit | e991eff5b5773e8a85c3f4c4f92c09fe30cf680b (patch) | |
| tree | ab98bf44cfc7611ad7cc699396674554f150db43 /doc/manpages/conf.py | |
| parent | 364fed6b074a702f21e190cb7aff33e13c65e808 (diff) | |
| parent | 7aab2afbad2f25c128e9e608766b407f6bd34c89 (diff) | |
Merge remote-tracking branch 'frr/master' into warnings
Conflicts:
zebra/if_ioctl_solaris.c
zebra/rtread_getmsg.c
Signed-off-by: David Lamparter <equinox@diac24.net>
Diffstat (limited to 'doc/manpages/conf.py')
| -rw-r--r-- | doc/manpages/conf.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/manpages/conf.py b/doc/manpages/conf.py index e540d236ea..f57bc1d278 100644 --- a/doc/manpages/conf.py +++ b/doc/manpages/conf.py @@ -333,6 +333,7 @@ man_pages = [ ('vtysh', 'vtysh', 'an integrated shell for FRRouting.', [], 1), ('frr', 'frr', 'a systemd interaction script', [], 1), ('bfdd', 'bfdd', fwfrr.format("a bfd"), [], 8), + ('fabricd', 'fabricd', fwfrr.format("an OpenFabric "), [], 8), ] # -- Options for Texinfo output ------------------------------------------- |