summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJarad Olson <brotherdust+github@gmail.com>2018-05-15 22:04:54 +0200
committerJarad Olson <brotherdust+github@gmail.com>2018-05-15 22:04:54 +0200
commitb2c8e6f84787ebac1c5fe67334af3e4b0ee35c00 (patch)
treecd02a1aa6f1a361386b052d54794270efdc88a4a /doc
parentAdd more detail around confiugration files (diff)
downloadfrr-b2c8e6f84787ebac1c5fe67334af3e4b0ee35c00.tar.xz
frr-b2c8e6f84787ebac1c5fe67334af3e4b0ee35c00.zip
Suggested changes by @qlyoung
- Changed hard-linked references to soft-link - Changed configuration options from code block to ``.. option::`` blocks Signed-off-by: Jarad Olson <brotherdust+github@gmail.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/developer/building-frr-on-ubuntu1804.rst23
1 files changed, 10 insertions, 13 deletions
diff --git a/doc/developer/building-frr-on-ubuntu1804.rst b/doc/developer/building-frr-on-ubuntu1804.rst
index afea8ba24..d9fc37c17 100644
--- a/doc/developer/building-frr-on-ubuntu1804.rst
+++ b/doc/developer/building-frr-on-ubuntu1804.rst
@@ -78,7 +78,9 @@ Download source
Configure
^^^^^^^^^
-Options below are provided as an example. See `User Guide/Installation <http://frrouting.readthedocs.io/en/latest/installation.html>` for more.
+Options below are provided as an example.
+
+.. seealso:: *Installation* section of user guide
::
@@ -109,19 +111,13 @@ Options below are provided as an example. See `User Guide/Installation <http://f
If optional packages were installed, the associated feature may now be
enabled.
-Protobuf
-~~~~~~~~
-
-::
-
- --enable-protobuf
+.. option:: --enable-protobuf
-ZeroMQ
-~~~~~~
+Enable support for protobuf transport
-::
+.. option:: --enable-zeromq
- --enable-zeromq
+Enable support for ZeroMQ transport
Compile
^^^^^^^
@@ -141,8 +137,9 @@ 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
configuration to a monolithic file, ``/etc/frr/frr.conf``, which is not
-recommended, according to the
-`user guide <http://frrouting.readthedocs.io/en/latest/vtysh.html>`.
+recommended
+.. seealso:: *VTYSH* section of user guide
+
The presence of ``/etc/frr/frr.conf`` on startup implicitly configures FRR to
ignore daemon-specific configuration files.