doc: move routeserver.rst into bgp.rst

This is an incomplete stub of a chapter and goes under BGP docs anyway.
Also fix an include statement for RPKI.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

diff --git a/doc/user/bgp.rst b/doc/user/bgp.rst
index fbc14ca14052190c9b3bda0f43ed8cd5e277acad..ccc3192babe88ec9167e2de9854ff31bad6e8d50 100644 (file)
--- a/doc/user/bgp.rst
+++ b/doc/user/bgp.rst
@@ -2442,4 +2442,21 @@ flaws.
    set community additive 64512:3200
 
 
-@include rpki.texi
+.. _Configuring_FRR_as_a_Route_Server:
+
+Configuring FRR as a Route Server
+=================================
+
+The purpose of a Route Server is to centralize the peerings between BGP
+speakers. For example if we have an exchange point scenario with four BGP
+speakers, each of which maintaining a BGP peering with the other three
+(:ref:`fig:full-mesh`), we can convert it into a centralized scenario where
+each of the four establishes a single BGP peering against the Route Server
+(:ref:`fig:route-server`).
+
+We will first describe briefly the Route Server model implemented by FRR.
+We will explain the commands that have been added for configuring that
+model. And finally we will show a full example of FRR configured as Route
+Server.
+
+.. include:: rpki.rst

diff --git a/doc/user/index.rst b/doc/user/index.rst
index 57225fc25039b211d5b5bc70ee383363631c1e85..375b1d133335ec7b853ea1e76390f0acb6b1f6fe 100644 (file)
--- a/doc/user/index.rst
+++ b/doc/user/index.rst
@@ -16,7 +16,6 @@ Welcome to FRR's documentation!
    nhrpd
    bgp
    babeld
-   routeserver
    vnc
    vtysh
    filter

diff --git a/doc/user/routeserver.rst b/doc/user/routeserver.rst
deleted file mode 100644 (file)
index 9ebbe17..0000000
--- a/doc/user/routeserver.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-.. _Configuring_FRR_as_a_Route_Server:
-
-*********************************
-Configuring FRR as a Route Server
-*********************************
-
-The purpose of a Route Server is to centralize the peerings between BGP
-speakers. For example if we have an exchange point scenario with four BGP
-speakers, each of which maintaining a BGP peering with the other three
-(:ref:`fig:full-mesh`), we can convert it into a centralized scenario where
-each of the four establishes a single BGP peering against the Route Server
-(:ref:`fig:route-server`).
-
-We will first describe briefly the Route Server model implemented by FRR.
-We will explain the commands that have been added for configuring that
-model. And finally we will show a full example of FRR configured as Route
-Server.
-