From 1ac2e7761c8157ede19d571ed75d7b36744920e5 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Tue, 29 Aug 2017 20:43:28 +0200 Subject: [PATCH] Revert "doc: work around weird texinfo bug" This reverts commit 50ffbc124bca15b2ca09c1b8b2fd57de6c4d3da4. The workaround stopped working :( Signed-off-by: David Lamparter --- doc/Makefile.am | 2 +- doc/bgpd.texi | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 9016df7372..86138baf82 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -52,7 +52,7 @@ info_TEXINFOS = frr.texi # because it cant just work from the png's directly it seems - contrary # to the documentation... frr.pdf: $(info_TEXINFOS) $(figures_pdf) $(frr_TEXINFOS) defines.texi - $(TEXI2PDF) -o "$@" $< + $(TEXI2PDF) -o "$@" $< || true # don't ask me why the info file is in srcdir $(srcdir)/frr.info: $(frr_TEXINFOS) defines.texi diff --git a/doc/bgpd.texi b/doc/bgpd.texi index d6b07a270f..8e0da12949 100644 --- a/doc/bgpd.texi +++ b/doc/bgpd.texi @@ -698,11 +698,8 @@ This command is deprecated and may be removed in a future release. Its use should be avoided. @end deffn -@c for some reason, using [all] here triggers a bug in texinfo... -@deffn {BGP} {neighbor @var{peer} next-hop-self} {} -@deffnx {BGP} {no neighbor @var{peer} next-hop-self} {} -@deffnx {BGP} {neighbor @var{peer} next-hop-self all} {} -@deffnx {BGP} {no neighbor @var{peer} next-hop-self all} {} +@deffn {BGP} {neighbor @var{peer} next-hop-self [all]} {} +@deffnx {BGP} {no neighbor @var{peer} next-hop-self [all]} {} This command specifies an announced route's nexthop as being equivalent to the address of the bgp router if it is learned via eBGP. If the optional keyword @code{all} is specified the modifiation is done -- 2.39.5