From 76bd149987eeee4840b13fd405e5138c97bc2a22 Mon Sep 17 00:00:00 2001 From: Quentin Young Date: Wed, 31 Jan 2018 16:43:53 -0500 Subject: [PATCH] doc: remove trailing whitespace Signed-off-by: Quentin Young --- doc/developer/Building_FRR_on_Debian8.rst | 4 +-- doc/developer/Building_FRR_on_Debian9.rst | 2 +- doc/developer/Building_FRR_on_Fedora24.rst | 2 +- doc/developer/Building_FRR_on_FreeBSD10.rst | 2 +- doc/developer/Building_FRR_on_FreeBSD11.rst | 2 +- doc/developer/Building_FRR_on_FreeBSD9.rst | 2 +- doc/developer/Building_FRR_on_NetBSD6.rst | 2 +- doc/developer/Building_FRR_on_NetBSD7.rst | 2 +- doc/developer/Building_FRR_on_OmniOS.rst | 6 ++--- doc/developer/Building_FRR_on_OpenBSD6.rst | 4 +-- doc/developer/Building_FRR_on_Ubuntu1204.rst | 22 +++++++-------- doc/developer/Building_FRR_on_Ubuntu1404.rst | 18 ++++++------- doc/developer/Building_FRR_on_Ubuntu1604.rst | 4 +-- doc/developer/memtypes.rst | 2 +- doc/developer/next-hop-tracking.rst | 28 ++++++++++---------- doc/user/bgp.rst | 22 +++++++-------- doc/user/rpki.rst | 2 +- doc/user/vtysh.rst | 2 +- 18 files changed, 64 insertions(+), 64 deletions(-) diff --git a/doc/developer/Building_FRR_on_Debian8.rst b/doc/developer/Building_FRR_on_Debian8.rst index af24539cb6..cde9df31ad 100644 --- a/doc/developer/Building_FRR_on_Debian8.rst +++ b/doc/developer/Building_FRR_on_Debian8.rst @@ -23,7 +23,7 @@ Install newer pytest (>3.0) from pip :: - sudo pip install pytest + sudo pip install pytest Get FRR, compile it and install it (from Git) --------------------------------------------- @@ -74,7 +74,7 @@ an example.) --enable-fpm \ --enable-ldpd \ --with-pkg-git-version \ - --with-pkg-extra-version=-MyOwnFRRVersion + --with-pkg-extra-version=-MyOwnFRRVersion make make check sudo make install diff --git a/doc/developer/Building_FRR_on_Debian9.rst b/doc/developer/Building_FRR_on_Debian9.rst index a3e3d7ff97..f16cf12dc6 100644 --- a/doc/developer/Building_FRR_on_Debian9.rst +++ b/doc/developer/Building_FRR_on_Debian9.rst @@ -62,7 +62,7 @@ an example.) --enable-fpm \ --enable-ldpd \ --with-pkg-git-version \ - --with-pkg-extra-version=-MyOwnFRRVersion + --with-pkg-extra-version=-MyOwnFRRVersion make make check sudo make install diff --git a/doc/developer/Building_FRR_on_Fedora24.rst b/doc/developer/Building_FRR_on_Fedora24.rst index 5ba4dd0e5f..29c7ee7b0a 100644 --- a/doc/developer/Building_FRR_on_Fedora24.rst +++ b/doc/developer/Building_FRR_on_Fedora24.rst @@ -69,7 +69,7 @@ an example.) --enable-eigrpd \ --enable-babeld \ --with-pkg-git-version \ - --with-pkg-extra-version=-MyOwnFRRVersion + --with-pkg-extra-version=-MyOwnFRRVersion make make check sudo make install diff --git a/doc/developer/Building_FRR_on_FreeBSD10.rst b/doc/developer/Building_FRR_on_FreeBSD10.rst index 94f2f27282..83e4513636 100644 --- a/doc/developer/Building_FRR_on_FreeBSD10.rst +++ b/doc/developer/Building_FRR_on_FreeBSD10.rst @@ -70,7 +70,7 @@ an example) --enable-rtadv \ --enable-fpm \ --with-pkg-git-version \ - --with-pkg-extra-version=-MyOwnFRRVersion + --with-pkg-extra-version=-MyOwnFRRVersion gmake gmake check sudo gmake install diff --git a/doc/developer/Building_FRR_on_FreeBSD11.rst b/doc/developer/Building_FRR_on_FreeBSD11.rst index de118093e6..ccd4596a75 100644 --- a/doc/developer/Building_FRR_on_FreeBSD11.rst +++ b/doc/developer/Building_FRR_on_FreeBSD11.rst @@ -70,7 +70,7 @@ an example) --enable-rtadv \ --enable-fpm \ --with-pkg-git-version \ - --with-pkg-extra-version=-MyOwnFRRVersion + --with-pkg-extra-version=-MyOwnFRRVersion gmake gmake check sudo gmake install diff --git a/doc/developer/Building_FRR_on_FreeBSD9.rst b/doc/developer/Building_FRR_on_FreeBSD9.rst index 2ccf56be13..b40696a095 100644 --- a/doc/developer/Building_FRR_on_FreeBSD9.rst +++ b/doc/developer/Building_FRR_on_FreeBSD9.rst @@ -83,7 +83,7 @@ an example) --enable-rtadv \ --enable-fpm \ --with-pkg-git-version \ - --with-pkg-extra-version=-MyOwnFRRVersion + --with-pkg-extra-version=-MyOwnFRRVersion gmake gmake check sudo gmake install diff --git a/doc/developer/Building_FRR_on_NetBSD6.rst b/doc/developer/Building_FRR_on_NetBSD6.rst index b4476127e3..c4292d7733 100644 --- a/doc/developer/Building_FRR_on_NetBSD6.rst +++ b/doc/developer/Building_FRR_on_NetBSD6.rst @@ -83,7 +83,7 @@ an example) --enable-rtadv \ --enable-fpm \ --with-pkg-git-version \ - --with-pkg-extra-version=-MyOwnFRRVersion + --with-pkg-extra-version=-MyOwnFRRVersion gmake gmake check sudo gmake install diff --git a/doc/developer/Building_FRR_on_NetBSD7.rst b/doc/developer/Building_FRR_on_NetBSD7.rst index e4ff1df8a5..6ce61d3871 100644 --- a/doc/developer/Building_FRR_on_NetBSD7.rst +++ b/doc/developer/Building_FRR_on_NetBSD7.rst @@ -74,7 +74,7 @@ an example) --enable-rtadv \ --enable-fpm \ --with-pkg-git-version \ - --with-pkg-extra-version=-MyOwnFRRVersion + --with-pkg-extra-version=-MyOwnFRRVersion gmake gmake check sudo gmake install diff --git a/doc/developer/Building_FRR_on_OmniOS.rst b/doc/developer/Building_FRR_on_OmniOS.rst index bc4ff45715..cd89f14e3c 100644 --- a/doc/developer/Building_FRR_on_OmniOS.rst +++ b/doc/developer/Building_FRR_on_OmniOS.rst @@ -14,7 +14,7 @@ Enable IP & IPv6 forwarding :: routeadm -e ipv4-forwarding - routeadm -e ipv6-forwarding + routeadm -e ipv6-forwarding Install required packages ------------------------- @@ -37,7 +37,7 @@ Add packages: library/idnkit/header-idnkit \ system/header \ system/library/math/header-math \ - git libtool gawk pkg-config + git libtool gawk pkg-config Add additional Solaris packages: @@ -128,7 +128,7 @@ an example) --enable-rtadv \ --enable-fpm \ --with-pkg-git-version \ - --with-pkg-extra-version=-MyOwnFRRVersion + --with-pkg-extra-version=-MyOwnFRRVersion gmake gmake check sudo gmake install diff --git a/doc/developer/Building_FRR_on_OpenBSD6.rst b/doc/developer/Building_FRR_on_OpenBSD6.rst index 0e51c8660c..b9bc19c070 100644 --- a/doc/developer/Building_FRR_on_OpenBSD6.rst +++ b/doc/developer/Building_FRR_on_OpenBSD6.rst @@ -69,7 +69,7 @@ an example) --enable-rtadv \ --enable-fpm \ --with-pkg-git-version \ - --with-pkg-extra-version=-MyOwnFRRVersion + --with-pkg-extra-version=-MyOwnFRRVersion gmake gmake check doas gmake install @@ -106,7 +106,7 @@ Add the following lines to the end of ``/etc/rc.conf``: :: - net.inet6.ip6.forwarding=1 # 1=Permit forwarding of IPv6 packets + net.inet6.ip6.forwarding=1 # 1=Permit forwarding of IPv6 packets net.inet6.ip6.mforwarding=1 # 1=Permit forwarding of IPv6 multicast packets net.inet6.ip6.multipath=1 # 1=Enable IPv6 multipath routing diff --git a/doc/developer/Building_FRR_on_Ubuntu1204.rst b/doc/developer/Building_FRR_on_Ubuntu1204.rst index 935d199842..0ecfbe7365 100644 --- a/doc/developer/Building_FRR_on_Ubuntu1204.rst +++ b/doc/developer/Building_FRR_on_Ubuntu1204.rst @@ -27,13 +27,13 @@ source is too old) wget http://archive.ubuntu.com/ubuntu/pool/main/b/bison/bison_3.0.2.dfsg-2.dsc wget http://archive.ubuntu.com/ubuntu/pool/main/b/bison/bison_3.0.2.dfsg.orig.tar.bz2 wget http://archive.ubuntu.com/ubuntu/pool/main/b/bison/bison_3.0.2.dfsg-2.debian.tar.gz - tar -jxvf bison_3.0.2.dfsg.orig.tar.bz2 + tar -jxvf bison_3.0.2.dfsg.orig.tar.bz2 cd bison-3.0.2.dfsg/ - tar xzf ../bison_3.0.2.dfsg-2.debian.tar.gz + tar xzf ../bison_3.0.2.dfsg-2.debian.tar.gz sudo apt-get build-dep bison debuild -b -uc -us cd .. - sudo dpkg -i ./libbison-dev_3.0.2.dfsg-2_amd64.deb ./bison_3.0.2.dfsg-2_amd64.deb + sudo dpkg -i ./libbison-dev_3.0.2.dfsg-2_amd64.deb ./bison_3.0.2.dfsg-2_amd64.deb cd .. rm -rf builddir @@ -110,7 +110,7 @@ an example.) --enable-rtadv \ --enable-fpm \ --with-pkg-git-version \ - --with-pkg-extra-version=-MyOwnFRRVersion + --with-pkg-extra-version=-MyOwnFRRVersion make make check sudo make install @@ -172,13 +172,13 @@ Enable daemons :: - zebra=yes - bgpd=yes - ospfd=yes - ospf6d=yes - ripd=yes - ripngd=yes - isisd=yes + zebra=yes + bgpd=yes + ospfd=yes + ospf6d=yes + ripd=yes + ripngd=yes + isisd=yes Start the init.d service ~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/developer/Building_FRR_on_Ubuntu1404.rst b/doc/developer/Building_FRR_on_Ubuntu1404.rst index 4a4e38ea30..6fc2f8d79a 100644 --- a/doc/developer/Building_FRR_on_Ubuntu1404.rst +++ b/doc/developer/Building_FRR_on_Ubuntu1404.rst @@ -65,7 +65,7 @@ an example.) --enable-fpm \ --enable-ldpd \ --with-pkg-git-version \ - --with-pkg-extra-version=-MyOwnFRRVersion + --with-pkg-extra-version=-MyOwnFRRVersion make make check sudo make install @@ -86,7 +86,7 @@ Create empty FRR configuration files sudo install -m 640 -o frr -g frr /dev/null /etc/frr/ripngd.conf sudo install -m 640 -o frr -g frr /dev/null /etc/frr/pimd.conf sudo install -m 640 -o frr -g frr /dev/null /etc/frr/ldpd.conf - sudo install -m 640 -o frr -g frr /dev/null /etc/frr/nhrpd.conf + sudo install -m 640 -o frr -g frr /dev/null /etc/frr/nhrpd.conf sudo install -m 640 -o frr -g frrvty /dev/null /etc/frr/vtysh.conf Enable IP & IPv6 forwarding @@ -124,13 +124,13 @@ Enable daemons :: - zebra=yes - bgpd=yes - ospfd=yes - ospf6d=yes - ripd=yes - ripngd=yes - isisd=yes + zebra=yes + bgpd=yes + ospfd=yes + ospf6d=yes + ripd=yes + ripngd=yes + isisd=yes Start the init.d service ~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/developer/Building_FRR_on_Ubuntu1604.rst b/doc/developer/Building_FRR_on_Ubuntu1604.rst index dccc37adcc..3c6e1ee96f 100644 --- a/doc/developer/Building_FRR_on_Ubuntu1604.rst +++ b/doc/developer/Building_FRR_on_Ubuntu1604.rst @@ -65,7 +65,7 @@ an example.) --enable-fpm \ --enable-systemd=yes \ --with-pkg-git-version \ - --with-pkg-extra-version=-MyOwnFRRVersion + --with-pkg-extra-version=-MyOwnFRRVersion make make check sudo make install @@ -86,7 +86,7 @@ Create empty FRR configuration files sudo install -m 640 -o frr -g frr /dev/null /etc/frr/ripngd.conf sudo install -m 640 -o frr -g frr /dev/null /etc/frr/pimd.conf sudo install -m 640 -o frr -g frr /dev/null /etc/frr/ldpd.conf - sudo install -m 640 -o frr -g frr /dev/null /etc/frr/nhrpd.conf + sudo install -m 640 -o frr -g frr /dev/null /etc/frr/nhrpd.conf sudo install -m 640 -o frr -g frrvty /dev/null /etc/frr/vtysh.conf Enable IPv4 & IPv6 forwarding diff --git a/doc/developer/memtypes.rst b/doc/developer/memtypes.rst index 62d211e864..d40ebe31cd 100644 --- a/doc/developer/memtypes.rst +++ b/doc/developer/memtypes.rst @@ -81,7 +81,7 @@ Definition >80% of cases. .. todo:: - + Daemons currently have ``daemon_memory.[ch]`` files listing all of their MTYPEs. This is not how it should be, most of these types should be moved into the appropriate files where they are used. diff --git a/doc/developer/next-hop-tracking.rst b/doc/developer/next-hop-tracking.rst index 1d65956f8c..284db1ef53 100644 --- a/doc/developer/next-hop-tracking.rst +++ b/doc/developer/next-hop-tracking.rst @@ -155,7 +155,7 @@ The next hop registration control flow is the following: | | register() | | | | zebra_add_rnh() | | | - + The next hop notification control flow is the following: @@ -201,7 +201,7 @@ encoded in the following way: . Nexthop prefix . . . +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - + ``ZEBRA_NEXTHOP_UPDATE`` message is encoded as follows: @@ -240,12 +240,12 @@ Legend: /\ struct bgp_node: a BGP destination/route/prefix \/ - + [ ] struct bgp_info: a BGP path (e.g. route received from a peer) - + _ (_) struct bgp_nexthop_cache: a BGP nexthop - + /\ NULL \/--+ ^ | : @@ -300,33 +300,33 @@ User interface changes resolved via kernel via 10.0.1.2, eth0 Client list: bgp(fd 12) - + frr# show ip bgp nexthop Current BGP nexthop cache: 3.3.3.3 valid [IGP metric 0], #paths 3 Last update: Wed Oct 16 04:43:49 2013 - + 11.0.0.10 valid [IGP metric 1], #paths 1 Last update: Wed Oct 16 04:43:51 2013 - + 11.0.0.18 valid [IGP metric 1], #paths 2 Last update: Wed Oct 16 04:43:47 2013 - + 11.11.11.11 valid [IGP metric 0], #paths 1 Last update: Wed Oct 16 04:43:47 2013 - + frr# show ipv6 nht frr# show ip bgp nexthop detail - + frr# debug bgp nht frr# debug zebra nht - + 6. Sample test cases - + r2----r3 / \ / r1----r4 - + - Verify that a change in IGP cost triggers NHT + shutdown the r1-r4 and r2-r4 links + no shut the r1-r4 and r2-r4 links and wait for OSPF to come back diff --git a/doc/user/bgp.rst b/doc/user/bgp.rst index 06f124679f..a29f22bbde 100644 --- a/doc/user/bgp.rst +++ b/doc/user/bgp.rst @@ -639,15 +639,15 @@ Defining Peer Creates a new neighbor whose remote-as is ASN. PEER can be an IPv4 address or an IPv6 address.:: - + router bgp 1 neighbor 10.0.0.1 remote-as 2 - + In this case my router, in AS-1, is trying to peer with AS-2 at 10.0.0.1. - + This command must be the first command used when configuring a neighbor. If the remote-as is not specified, *bgpd* will complain like this::: - + can't find neighbor 10.0.0.1 @@ -1066,14 +1066,14 @@ expanded community list. specified the specified community list's information is shown. :: - + # show ip community-list Named Community standard list CLIST permit 7675:80 7675:100 no-export deny internet Named Community expanded list EXPAND permit : - + # show ip community-list CLIST Named Community standard list CLIST permit 7675:80 7675:100 no-export @@ -1567,14 +1567,14 @@ Showing BGP information display all of IPv4 BGP routes. :: - + BGP table version is 0, local router ID is 10.1.1.1 Status codes: s suppressed, d damped, h history, * valid, > best, i - internal Origin codes: i - IGP, e - EGP, ? - incomplete - + Network Next Hop Metric LocPrf Weight Path \*> 1.1.1.1/32 0.0.0.0 0 32768 i - + Total number of prefixes 1 @@ -1863,7 +1863,7 @@ same time when BGP multiple instance feature is enabled. Make a new BGP instance. You can use arbitrary word for the `name`. :: - + bgp multiple-instance ! router bgp 1 @@ -1888,7 +1888,7 @@ only for exchanging BGP routing information. With this command, you can setup Route Server like below. :: - + bgp multiple-instance ! router bgp 1 view 1 diff --git a/doc/user/rpki.rst b/doc/user/rpki.rst index f3e8a85bb7..0889d6966a 100644 --- a/doc/user/rpki.rst +++ b/doc/user/rpki.rst @@ -165,7 +165,7 @@ Validating BGP Updates prefixes because invalid routes have a lower local preference. :: - + ! Allow for invalid routes in route selection process route bgp 60001 ! diff --git a/doc/user/vtysh.rst b/doc/user/vtysh.rst index eeb856cbd4..089540d589 100644 --- a/doc/user/vtysh.rst +++ b/doc/user/vtysh.rst @@ -160,4 +160,4 @@ in whose file the error is made. configuration (either in its individual configuration file, or in :file:`frr.conf`). This is particularly troublesome for route-maps and prefix lists, which would otherwise be synchronized between daemons. - + -- 2.39.5