diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/developer/building-frr-for-freebsd10.rst | 4 | ||||
| -rw-r--r-- | doc/developer/building-frr-for-freebsd11.rst | 4 | ||||
| -rw-r--r-- | doc/user/bgp.rst | 7 |
3 files changed, 13 insertions, 2 deletions
diff --git a/doc/developer/building-frr-for-freebsd10.rst b/doc/developer/building-frr-for-freebsd10.rst index 5dde915f6a..a6539309a2 100644 --- a/doc/developer/building-frr-for-freebsd10.rst +++ b/doc/developer/building-frr-for-freebsd10.rst @@ -17,12 +17,14 @@ is first package install and asked) :: pkg install git autoconf automake libtool gmake gawk json-c pkgconf \ - bison flex py27-pytest c-ares python3 py-sphinx libyang + bison flex py27-pytest c-ares python3 py-sphinx Make sure there is no /usr/bin/flex preinstalled (and use the newly installed in /usr/local/bin): (FreeBSD frequently provides a older flex as part of the base OS which takes preference in path) +.. include:: building-libyang.rst + :: rm -f /usr/bin/flex diff --git a/doc/developer/building-frr-for-freebsd11.rst b/doc/developer/building-frr-for-freebsd11.rst index 9bef1fbfde..16d06e0a66 100644 --- a/doc/developer/building-frr-for-freebsd11.rst +++ b/doc/developer/building-frr-for-freebsd11.rst @@ -17,12 +17,14 @@ is first package install and asked) .. code-block:: shell pkg install git autoconf automake libtool gmake gawk json-c pkgconf \ - bison flex py27-pytest c-ares python3 py36-sphinx texinfo libyang + bison flex py27-pytest c-ares python3 py36-sphinx texinfo Make sure there is no /usr/bin/flex preinstalled (and use the newly installed in /usr/local/bin): (FreeBSD frequently provides a older flex as part of the base OS which takes preference in path) +.. include:: building-libyang.rst + .. code-block:: shell rm -f /usr/bin/flex diff --git a/doc/user/bgp.rst b/doc/user/bgp.rst index a27243ea77..5b453e75c3 100644 --- a/doc/user/bgp.rst +++ b/doc/user/bgp.rst @@ -968,6 +968,13 @@ Configuring Peers and will not be displayed as part of a `show run`. The no form of the command turns off this ability. +.. index:: [no] bgp default ipv4-unicast +.. clicmd:: [no] bgp default ipv4-unicast + + This command allows the user to specify that v4 peering is turned + on by default or not. This command defaults to on and is not displayed. + The `no bgp default ipv4-unicast` form of the command is displayed. + .. _bgp-peer-filtering: Peer Filtering |