summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2017-08-04 14:45:08 +0200
committerDavid Lamparter <equinox@opensourcerouting.org>2017-08-04 14:45:08 +0200
commit50ffbc124bca15b2ca09c1b8b2fd57de6c4d3da4 (patch)
tree805049f1fcb6f3d992aa7ea424f78f6d0fc08a7c /doc
parentdoc: stop using version.texi, fix URLs (diff)
downloadfrr-50ffbc124bca15b2ca09c1b8b2fd57de6c4d3da4.tar.xz
frr-50ffbc124bca15b2ca09c1b8b2fd57de6c4d3da4.zip
doc: work around weird texinfo bug
This inserts "\global \advance \brackcount by 1" into the frr.fn (function index) for some reason, which causes the PDF build to fail. It's somehow related to the [] brackets, but they work just fine in other locations... Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'doc')
-rw-r--r--doc/Makefile.am2
-rw-r--r--doc/bgpd.texi7
2 files changed, 6 insertions, 3 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 86138baf8..9016df737 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 "$@" $< || true
+ $(TEXI2PDF) -o "$@" $<
# 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 8e0da1294..d6b07a270 100644
--- a/doc/bgpd.texi
+++ b/doc/bgpd.texi
@@ -698,8 +698,11 @@ This command is deprecated and may be removed in a future release. Its
use should be avoided.
@end deffn
-@deffn {BGP} {neighbor @var{peer} next-hop-self [all]} {}
-@deffnx {BGP} {no neighbor @var{peer} next-hop-self [all]} {}
+@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} {}
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