diff options
Diffstat (limited to 'doc/manpages')
| -rw-r--r-- | doc/manpages/.gitignore | 1 | ||||
| -rw-r--r-- | doc/manpages/Makefile.am (renamed from doc/manpages/Makefile.in) | 7 | ||||
| -rw-r--r-- | doc/manpages/common-options.rst | 7 | ||||
| -rw-r--r-- | doc/manpages/zebra.rst | 8 |
4 files changed, 8 insertions, 15 deletions
diff --git a/doc/manpages/.gitignore b/doc/manpages/.gitignore index 2e7d8573f1..81c60dc0a3 100644 --- a/doc/manpages/.gitignore +++ b/doc/manpages/.gitignore @@ -1,3 +1,2 @@ /_templates /_build -!/Makefile.in diff --git a/doc/manpages/Makefile.in b/doc/manpages/Makefile.am index f28746cee6..009c723823 100644 --- a/doc/manpages/Makefile.in +++ b/doc/manpages/Makefile.am @@ -34,11 +34,6 @@ include @srcdir@/../frr-sphinx.mk # tags # ctags -# ignore these targets -EMPTY_AUTOMAKE_TARGETS = dvi pdf ps tags ctags distdir installdirs check installcheck install-dvi install-ps install-html install-pdf install-info install-exec -.PHONY: $(EMPTY_AUTOMAKE_TARGETS) -$(EMPTY_AUTOMAKE_TARGETS): - # These targets are automatically generated by Sphinx but conflict with # implicitly defined Automake rules, so we manually override them to nothing. # The other option is deleting the Sphinx-generated rules, which suppresses the @@ -51,5 +46,3 @@ all: man install-data: man install: install-data - -mostlyclean distclean maintainer-clean: clean diff --git a/doc/manpages/common-options.rst b/doc/manpages/common-options.rst index e433c720af..e9241b7438 100644 --- a/doc/manpages/common-options.rst +++ b/doc/manpages/common-options.rst @@ -157,10 +157,3 @@ frr supports optional dynamically loadable modules, although these can only be l The list of loaded modules can be inspected at runtime with the show modules VTY command. -ROUTES ------- - -.. option:: -r, --retain - - When the program terminates, retain routes added by the daemon. - diff --git a/doc/manpages/zebra.rst b/doc/manpages/zebra.rst index 4ddf989951..a8a9301588 100644 --- a/doc/manpages/zebra.rst +++ b/doc/manpages/zebra.rst @@ -42,6 +42,14 @@ OPTIONS available for the |DAEMON| command: Enable namespace VRF backend. By default, the VRF backend relies on VRF-lite support from the Linux kernel. This option permits discovering Linux named network namespaces and mapping it to FRR VRF contexts. +ROUTES +------ + +.. option:: -r, --retain + + When the program terminates, do not flush routes installed by zebra from the kernel. + + FILES ===== |