diff options
| author | Russ White <russ@riw.us> | 2018-03-30 11:13:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-30 11:13:02 -0400 |
| commit | 4120f644b9599bada1ae7256434c0babbd64efcc (patch) | |
| tree | 29c0d002d0aeba2a12767136dd2d0a3dc46d165a | |
| parent | d77d48b9ac8f1398e302c206978afd4f67418c48 (diff) | |
| parent | f22744c31ea838e819a2fc83ed785455419b2d45 (diff) | |
Merge pull request #1997 from qlyoung/fix-doc-nits-03-30
doc: cleanup documentation nits
| -rw-r--r-- | doc/developer/building.rst | 1 | ||||
| -rw-r--r-- | doc/user/routemap.rst | 7 |
2 files changed, 2 insertions, 6 deletions
diff --git a/doc/developer/building.rst b/doc/developer/building.rst index a10e4a245c..c7a53734d9 100644 --- a/doc/developer/building.rst +++ b/doc/developer/building.rst @@ -21,3 +21,4 @@ Building FRR building-frr-on-ubuntu1204 building-frr-on-ubuntu1404 building-frr-on-ubuntu1604 + building-frr-on-ubuntu1804 diff --git a/doc/user/routemap.rst b/doc/user/routemap.rst index 3e88dee905..97094c2d6b 100644 --- a/doc/user/routemap.rst +++ b/doc/user/routemap.rst @@ -232,7 +232,7 @@ Route Map Set Command .. index:: set ipv6 next-hop global IPV6_ADDRESS .. clicmd:: set ipv6 next-hop global IPV6_ADDRESS - Set the next-hop to the specified IPV6_ADDRESS. For both incoming and + Set the next-hop to the specified IPV6_ADDRESS for both incoming and outgoing route-maps. .. index:: set local-preference LOCAL_PREF @@ -260,11 +260,6 @@ Route Map Set Command Set the BGP community attribute. -.. index:: set ipv6 next-hop global IPV6_ADDRESS -.. clicmd:: set ipv6 next-hop global IPV6_ADDRESS - - Set the BGP-4+ global IPv6 nexthop address. - .. index:: set ipv6 next-hop local IPV6_ADDRESS .. clicmd:: set ipv6 next-hop local IPV6_ADDRESS |