Skip to content

Commit

Permalink
Merge pull request #3313 from qlyoung/doc-strip-whitespace
Browse files Browse the repository at this point in the history
doc: strip trailing whitespace
  • Loading branch information
louberger authored Nov 13, 2018
2 parents 43881be + 4c97fd1 commit 50daf9a
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion doc/developer/building-frr-for-ubuntu1804.rst
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ Create empty FRR configuration files
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Although not strictly necessary, it's good practice to create empty
configuration files _before_ starting FRR. This assures that the permissions
configuration files _before_ starting FRR. This assures that the permissions
are correct. If the files are not already present, FRR will create them.

It's also important to consider _which_ files to create. FRR supports writing
Expand Down
6 changes: 3 additions & 3 deletions doc/developer/modules.rst
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ standard entry point for loadable modules.
Command line parameters
-----------------------

Command line parameters can be passed directly to a module by appending a
colon to the module name when loading it, e.g. ``-M mymodule:myparameter``.
The text after the colon will be accessible in the module's code through
Command line parameters can be passed directly to a module by appending a
colon to the module name when loading it, e.g. ``-M mymodule:myparameter``.
The text after the colon will be accessible in the module's code through
``THIS_MODULE->load_args``. For example, see how the format parameter is
configured in the ``zfpm_init()`` function inside ``zebra_fpm.c``.

Expand Down
2 changes: 1 addition & 1 deletion doc/developer/next-hop-tracking.rst
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ RNH table::
O O
/ \
O O

struct rnh
{
uint8_t flags;
Expand Down
4 changes: 2 additions & 2 deletions doc/developer/process-architecture.rst
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ The following diagram illustrates a simplified version of this infrastructure.
.. todo: replace these with SVG
.. figure:: ../figures/threadmaster-single.png
:align: center

Lifecycle of a program using a single threadmaster.

The series of "task" boxes represents the current ready task queue. The various
Expand Down Expand Up @@ -183,7 +183,7 @@ running their own ``threadmaster``-based event loop.
.. todo: replace these with SVG
.. figure:: ../figures/threadmaster-multiple.png
:align: center

Lifecycle of a program using multiple pthreads, each running their own
``threadmaster``

Expand Down
4 changes: 2 additions & 2 deletions doc/user/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ Additional kernel modules are also needed to support MPLS forwarding.
appropriate value.

:makevar:`VRF forwarding`
General information on Linux VRF support can be found in
General information on Linux VRF support can be found in
https://www.kernel.org/doc/Documentation/networking/vrf.txt. Kernel
support for VRFs was introduced in 4.3 and improved upon through
4.13, which is the version most used in FRR testing (as of June
Expand Down Expand Up @@ -421,7 +421,7 @@ Additional kernel modules are also needed to support MPLS forwarding.
included in future kernel versions so upgrading your kernel may also
address this issue.


Building
^^^^^^^^

Expand Down
6 changes: 3 additions & 3 deletions doc/user/static.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ of static routes.

.. _starting-static:

Starting STATIC
Starting STATIC
===============

Default configuration file for *staticd* is :file:`staticd.conf`. The typical
Expand Down Expand Up @@ -45,11 +45,11 @@ a static prefix and gateway.
initial form of the command. GATEWAY is gateway for the prefix it currently
must match the v4 or v6 route type specified at the start of the command.
GATEWAY can also be treated as an interface name. If the interface name
is ``null0`` then zebra installs a blackhole route. TABLENO
is ``null0`` then zebra installs a blackhole route. TABLENO
is an optional parameter for namespaces that allows you to create the
route in a specified table associated with the vrf namespace. table will
be rejected if you are not using namespace based vrfs. ``nexthop-vrf``
allows you to create a leaked route with a nexthop in the specified VRFNAME
allows you to create a leaked route with a nexthop in the specified VRFNAME
vrf VRFNAME allows you to create the route in a specified vrf.
``nexthop-vrf`` cannot be currently used with namespace based vrfs
currently as well.
Expand Down
2 changes: 1 addition & 1 deletion doc/user/zebra.rst
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ Standard Commands
Enable/disable link-detect on platforms which support this. Currently only
Linux and Solaris, and only where network interface drivers support
reporting link-state via the ``IFF_RUNNING`` flag.

In FRR, link-detect is on by default.

.. _link-parameters-commands:
Expand Down

0 comments on commit 50daf9a

Please sign in to comment.