doc: Fix overfull hboxes errors that cause PDF build to return fail
* overfull hboxes cause texi2dvi to return fail, even if the PDf is written.
We hacked around this by running it with '... || true', but that
sucks for buildboting the docs.
Fix all the overfull hboxes.
* ospfd.texi: Long command definitions can cause hbox overruns in the
columnar command definitions index. This leads to strange errors
about "Missing number, treated as zero." when building the index -
very hard to figure out.
'show ip ospf database ...' was the culprit. Use a distinct deffnx
alias for each option instead of trying to stuff them into 1 line.
diff --git a/doc/main.texi b/doc/main.texi
index 849773b..6d42c04 100644
--- a/doc/main.texi
+++ b/doc/main.texi
@@ -355,11 +355,11 @@
when installing in the kernel.
@end deffn
-@example
The following creates a prefix-list that matches all addresses, a route-map
that sets the preferred source address, and applies the route-map to all
@command{rip} routes.
+@example
@group
ip prefix-list ANY permit 0.0.0.0/0 le 32
route-map RM1 permit 10
diff --git a/doc/nhrpd.texi b/doc/nhrpd.texi
index 6caf5a6..71d1ce9 100644
--- a/doc/nhrpd.texi
+++ b/doc/nhrpd.texi
@@ -91,8 +91,9 @@
@group
iptables -A FORWARD -i gre1 -o gre1 \
-m hashlimit --hashlimit-upto 4/minute --hashlimit-burst 1 \
- --hashlimit-mode srcip,dstip --hashlimit-srcmask 24 --hashlimit-dstmask 24 \
- --hashlimit-name loglimit-0 -j NFLOG --nflog-group 1 --nflog-range 128
+ --hashlimit-mode srcip,dstip --hashlimit-srcmask 24 \
+ --hashlimit-dstmask 24 --hashlimit-name loglimit-0 \
+ -j NFLOG --nflog-group 1 --nflog-range 128
@end group
@end example
diff --git a/doc/ospfd.texi b/doc/ospfd.texi
index 1cc7973..d60ecf2 100644
--- a/doc/ospfd.texi
+++ b/doc/ospfd.texi
@@ -613,14 +613,16 @@
@end deffn
@deffn {Command} {show ip ospf database} {}
-@end deffn
-
-@deffn {Command} {show ip ospf database (asbr-summary|external|network|router|summary)} {}
-@deffnx {Command} {show ip ospf database (asbr-summary|external|network|router|summary) @var{link-state-id}} {}
-@deffnx {Command} {show ip ospf database (asbr-summary|external|network|router|summary) @var{link-state-id} adv-router @var{adv-router}} {}
-@deffnx {Command} {show ip ospf database (asbr-summary|external|network|router|summary) adv-router @var{adv-router}} {}
-@deffnx {Command} {show ip ospf database (asbr-summary|external|network|router|summary) @var{link-state-id} self-originate} {}
-@deffnx {Command} {show ip ospf database (asbr-summary|external|network|router|summary) self-originate} {}
+@deffnx {Command} {show ip ospf database asbr-summary} {}
+@deffnx {Command} {show ip ospf database external} {}
+@deffnx {Command} {show ip ospf database network} {}
+@deffnx {Command} {show ip ospf database asbr-router} {}
+@deffnx {Command} {show ip ospf database summary} {}
+@deffnx {Command} {show ip ospf database @dots{} @var{link-state-id}} {}
+@deffnx {Command} {show ip ospf database @dots{} @var{link-state-id} adv-router @var{adv-router}} {}
+@deffnx {Command} {show ip ospf database @dots{} adv-router @var{adv-router}} {}
+@deffnx {Command} {show ip ospf database @dots{} @var{link-state-id} self-originate} {}
+@deffnx {Command} {show ip ospf database @dots{} self-originate} {}
@end deffn
@deffn {Command} {show ip ospf database max-age} {}
diff --git a/doc/snmptrap.texi b/doc/snmptrap.texi
index 3114563..6c67288 100644
--- a/doc/snmptrap.texi
+++ b/doc/snmptrap.texi
@@ -69,15 +69,21 @@
# get some vars from stdin
uptime=`echo $INPUT | cut -d' ' -f5`
- peer=`echo $INPUT | cut -d' ' -f8 | sed -e 's/SNMPv2-SMI::mib-2.15.3.1.14.//g'`
+ peer=`echo $INPUT | cut -d' ' -f8 | \
+ sed -e 's/SNMPv2-SMI::mib-2.15.3.1.14.//g'`
peerstate=`echo $INPUT | cut -d' ' -f13`
errorcode=`echo $INPUT | cut -d' ' -f9 | sed -e 's/\"//g'`
suberrorcode=`echo $INPUT | cut -d' ' -f10 | sed -e 's/\"//g'`
- remoteas=`snmpget -v2c -c $COMMUNITY localhost SNMPv2-SMI::mib-2.15.3.1.9.$peer | cut -d' ' -f4`
+ remoteas=`snmpget -v2c -c $COMMUNITY \
+ localhost SNMPv2-SMI::mib-2.15.3.1.9.$peer \
+ | cut -d' ' -f4`
- WHOISINFO=`whois -h whois.ripe.net " -r AS$remoteas" | egrep '(as-name|descr)'`
- asname=`echo "$WHOISINFO" | grep "^as-name:" | sed -e 's/^as-name://g' -e 's/ //g' -e 's/^ //g' | uniq`
- asdescr=`echo "$WHOISINFO" | grep "^descr:" | sed -e 's/^descr://g' -e 's/ //g' -e 's/^ //g' | uniq`
+ WHOISINFO=`whois -h whois.ripe.net " -r AS$remoteas" | \
+ egrep '(as-name|descr)'`
+ asname=`echo "$WHOISINFO" | grep "^as-name:" | \
+ sed -e 's/^as-name://g' -e 's/ //g' -e 's/^ //g' | uniq`
+ asdescr=`echo "$WHOISINFO" | grep "^descr:" | \
+ sed -e 's/^descr://g' -e 's/ //g' -e 's/^ //g' | uniq`
# if peer address is in $WARN_PEER, the email should also
# be sent to $EMAILADDR_WARN