diff options
| author | Quentin Young <qlyoung@users.noreply.github.com> | 2019-01-08 17:04:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-08 17:04:46 +0100 |
| commit | 2b5443c567b8c87d4149742c7af76de130a07784 (patch) | |
| tree | f1648355d6afb2cff17e6a159c17ce89bc118c4f /doc | |
| parent | Merge pull request #3566 from pguibert6WIND/fix_vrf_netns_broken (diff) | |
| parent | doc: Fix typos and grammar (diff) | |
| download | frr-2b5443c567b8c87d4149742c7af76de130a07784.tar.xz frr-2b5443c567b8c87d4149742c7af76de130a07784.zip | |
Merge pull request #3531 from marauderlabs/docs-fix
doc: Fix typos and grammar
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/user/installation.rst | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/user/installation.rst b/doc/user/installation.rst index 9654cc2eb..2decfcc4b 100644 --- a/doc/user/installation.rst +++ b/doc/user/installation.rst @@ -324,7 +324,7 @@ GNU/Linux, make sure that the current kernel configuration is what you want. FRR will run with any kernel configuration but some recommendations do exist. :makevar:`CONFIG_NETLINK` - Kernel/User Netlink socket. This is a enables an advanced interface between + Kernel/User Netlink socket. This enables an advanced interface between the Linux kernel and *zebra* (:ref:`kernel-interface`). :makevar:`CONFIG_RTNETLINK` @@ -356,9 +356,9 @@ Additional kernel modules are also needed to support MPLS forwarding. net.ipv6.conf.all.forwarding=1 :makevar:`MPLS forwarding` - Basic MPLS kernel support was introduced 4.1, additional capability - was introduced in 4.3 and 4.5. For some general information on Linux - MPLS support see + Basic MPLS support was introduced in the kernel in version 4.1 and + additional capability was introduced in 4.3 and 4.5. + For some general information on Linux MPLS support, see https://www.netdevconf.org/1.1/proceedings/slides/prabhu-mpls-tutorial.pdf. The following modules should be loaded to support MPLS forwarding, and are generally added to a configuration file such as @@ -418,7 +418,7 @@ Additional kernel modules are also needed to support MPLS forwarding. running these kernel versions, if unable to establish any VRF BGP adjacencies, either downgrade to 4.13 or set 'net.ipv4.tcp_l3mdev_accept=1'. The fix for this issue is planned to be - included in future kernel versions so upgrading your kernel may also + included in future kernel versions. So upgrading your kernel may also address this issue. @@ -440,7 +440,7 @@ the options you chose: --enable-watchfrr \ ... -After configuring the software, you are ready to build and install it for your +After configuring the software, you are ready to build and install it in your system. .. code-block:: shell |