23 files changed, 62 insertions, 62 deletions
diff --git a/doc/manpages/conf.py b/doc/manpages/conf.py
index e7813d8176..9121d38fe0 100644
--- a/doc/manpages/conf.py
+++ b/doc/manpages/conf.py
@@ -313,28 +313,28 @@ latex_documents = [
 fwfrr = "{0} routing engine for use with FRRouting."
 
 man_pages = [
-    ('bgpd', 'bgpd', fwfrr.format("a BGPv4, BGPv4+, BGPv4- "), [], 8),
-    ('eigrpd', 'eigrpd', fwfrr.format("an EIGRP "), [], 8),
-    ('ospf6d', 'ospf6d', fwfrr.format("an OSPFv3 "), [], 8),
-    ('ospfd', 'ospfd', fwfrr.format("an OSPFv2 "), [], 8),
-    ('isisd', 'isisd', fwfrr.format("an IS-IS "), [], 8),
-    ('ospfclient', 'ospfclient', 'an example ospf-api client', [], 8),
-    ('ldpd', 'ldpd', fwfrr.format("an LDP "), [], 8),
-    ('nhrpd', 'nhrpd', fwfrr.format("a Next Hop Routing Protocol "), [], 8),
-    ('pimd', 'pimd', fwfrr.format("a PIM "), [], 8),
-    ('pbrd', 'pbrd', fwfrr.format("a PBR "), [], 8),
-    ('sharpd', 'sharpd', fwfrr.format("a SHARP "), [], 8),
-    ('staticd', 'staticd', fwfrr.format("a static route manager "), [], 8),
-    ('mtracebis', 'mtracebis', "a multicast trace client", [], 8),
-    ('ripd', 'ripd', fwfrr.format("a RIP "), [], 8),
-    ('ripngd', 'ripngd', fwfrr.format("a RIPNG "), [], 8),
-    ('zebra', 'zebra', 'a routing manager for use with associated FRRouting components.', [], 8),
-    ('watchfrr', 'watchfrr', 'a program to monitor the status of FRRouting daemons', [], 8),
-    ('vtysh', 'vtysh', 'an integrated shell for FRRouting.', [], 1),
+    ('frr-bfdd',       'frr-bfdd', fwfrr.format("a bfd"), [], 8),
+    ('frr-bgpd',       'frr-bgpd', fwfrr.format("a BGPv4, BGPv4+, BGPv4-"), [], 8),
+    ('frr-eigrpd',     'frr-eigrpd', fwfrr.format("an EIGRP"), [], 8),
+    ('frr-fabricd',    'frr-fabricd', fwfrr.format("an OpenFabric"), [], 8),
+    ('frr-isisd',      'frr-isisd', fwfrr.format("an IS-IS"), [], 8),
+    ('frr-ldpd',       'frr-ldpd', fwfrr.format("an LDP"), [], 8),
+    ('frr-nhrpd',      'frr-nhrpd', fwfrr.format("a Next Hop Routing Protocol"), [], 8),
+    ('frr-ospf6d',     'frr-ospf6d', fwfrr.format("an OSPFv3"), [], 8),
+    ('frr-ospfclient', 'frr-ospfclient', 'an example ospf-api client', [], 8),
+    ('frr-ospfd',      'frr-ospfd', fwfrr.format("an OSPFv2"), [], 8),
+    ('frr-pbrd',       'frr-pbrd', fwfrr.format("a PBR"), [], 8),
+    ('frr-pimd',       'frr-pimd', fwfrr.format("a PIM"), [], 8),
+    ('frr-ripd',       'frr-ripd', fwfrr.format("a RIP"), [], 8),
+    ('frr-ripngd',     'frr-ripngd', fwfrr.format("a RIPNG"), [], 8),
+    ('frr-sharpd',     'frr-sharpd', fwfrr.format("a SHARP"), [], 8),
+    ('frr-staticd',    'frr-staticd', fwfrr.format("a static route manager"), [], 8),
+    ('frr-vrrpd',      'frr-vrrpd', fwfrr.format("a VRRP"), [], 8),
+    ('frr-watchfrr',   'frr-watchfrr', 'a program to monitor the status of FRRouting daemons', [], 8),
+    ('frr-zebra',      'frr-zebra', 'a routing manager for use with associated FRRouting components.', [], 8),
     ('frr', 'frr', 'a systemd interaction script', [], 1),
-    ('bfdd', 'bfdd', fwfrr.format("a bfd"), [], 8),
-    ('fabricd', 'fabricd', fwfrr.format("an OpenFabric "), [], 8),
-    ('vrrpd', 'vrrpd', fwfrr.format("a VRRP"), [], 8),
+    ('mtracebis',  'mtracebis', "a multicast trace client", [], 8),
+    ('vtysh', 'vtysh', 'an integrated shell for FRRouting.', [], 1),
 ]
 
 # -- Options for Texinfo output -------------------------------------------
diff --git a/doc/manpages/defines.rst b/doc/manpages/defines.rst
index 2a6a9fd1bd..ac24cfa8dc 100644
--- a/doc/manpages/defines.rst
+++ b/doc/manpages/defines.rst
@@ -1,3 +1,3 @@
 .. |synopsis-options| replace:: [-d|-t|-dt] [-C] [-f config-file] [-i pid-file] [-z zclient-path] [-u user] [-g group] [-A vty-addr] [-P vty-port] [-M module[:options]] [-N pathspace] [--vty_socket vty-path] [--moduledir module-path]
 .. |synopsis-options-hv| replace:: [-h] [-v]
-.. |seealso-programs| replace:: zebra(8), vtysh(1), ripd(8), ripngd(8), ospfd(8), ospf6d(8), bgpd(8), isisd(8), babeld(8), nhrpd(8), pimd(8), pbrd(8), ldpd(8), eigrpd(8), staticd(8), fabricd(8), vrrpd(8), mtracebis(8)
+.. |seealso-programs| replace:: frr-zebra(8), vtysh(1), frr-ripd(8), frr-ripngd(8), frr-ospfd(8), frr-ospf6d(8), frr-bgpd(8), frr-isisd(8), frr-babeld(8), frr-nhrpd(8), frr-pimd(8), frr-pbrd(8), frr-ldpd(8), frr-eigrpd(8), frr-staticd(8), frr-fabricd(8), frr-vrrpd(8), mtracebis(8)
diff --git a/doc/manpages/bfdd.rst b/doc/manpages/frr-bfdd.rst
index 1f8b1475f4..1f8b1475f4 100644
--- a/doc/manpages/bfdd.rst
+++ b/doc/manpages/frr-bfdd.rst
diff --git a/doc/manpages/bgpd.rst b/doc/manpages/frr-bgpd.rst
index f7e20265e5..f7e20265e5 100644
--- a/doc/manpages/bgpd.rst
+++ b/doc/manpages/frr-bgpd.rst
diff --git a/doc/manpages/eigrpd.rst b/doc/manpages/frr-eigrpd.rst
index bc824468d0..bc824468d0 100644
--- a/doc/manpages/eigrpd.rst
+++ b/doc/manpages/frr-eigrpd.rst
diff --git a/doc/manpages/fabricd.rst b/doc/manpages/frr-fabricd.rst
index c14c07661e..c14c07661e 100644
--- a/doc/manpages/fabricd.rst
+++ b/doc/manpages/frr-fabricd.rst
diff --git a/doc/manpages/isisd.rst b/doc/manpages/frr-isisd.rst
index 68761f642c..68761f642c 100644
--- a/doc/manpages/isisd.rst
+++ b/doc/manpages/frr-isisd.rst
diff --git a/doc/manpages/ldpd.rst b/doc/manpages/frr-ldpd.rst
index 113f06673e..113f06673e 100644
--- a/doc/manpages/ldpd.rst
+++ b/doc/manpages/frr-ldpd.rst
diff --git a/doc/manpages/nhrpd.rst b/doc/manpages/frr-nhrpd.rst
index cae01c677b..cae01c677b 100644
--- a/doc/manpages/nhrpd.rst
+++ b/doc/manpages/frr-nhrpd.rst
diff --git a/doc/manpages/ospf6d.rst b/doc/manpages/frr-ospf6d.rst
index cfc6860d5c..cfc6860d5c 100644
--- a/doc/manpages/ospf6d.rst
+++ b/doc/manpages/frr-ospf6d.rst
diff --git a/doc/manpages/ospfclient.rst b/doc/manpages/frr-ospfclient.rst
index c52b108767..c52b108767 100644
--- a/doc/manpages/ospfclient.rst
+++ b/doc/manpages/frr-ospfclient.rst
diff --git a/doc/manpages/ospfd.rst b/doc/manpages/frr-ospfd.rst
index 951a0229aa..951a0229aa 100644
--- a/doc/manpages/ospfd.rst
+++ b/doc/manpages/frr-ospfd.rst
diff --git a/doc/manpages/pbrd.rst b/doc/manpages/frr-pbrd.rst
index d9a80b1f84..d9a80b1f84 100644
--- a/doc/manpages/pbrd.rst
+++ b/doc/manpages/frr-pbrd.rst
diff --git a/doc/manpages/pimd.rst b/doc/manpages/frr-pimd.rst
index d7582668d2..d7582668d2 100644
--- a/doc/manpages/pimd.rst
+++ b/doc/manpages/frr-pimd.rst
diff --git a/doc/manpages/ripd.rst b/doc/manpages/frr-ripd.rst
index af4590c824..af4590c824 100644
--- a/doc/manpages/ripd.rst
+++ b/doc/manpages/frr-ripd.rst
diff --git a/doc/manpages/ripngd.rst b/doc/manpages/frr-ripngd.rst
index aedd689876..aedd689876 100644
--- a/doc/manpages/ripngd.rst
+++ b/doc/manpages/frr-ripngd.rst
diff --git a/doc/manpages/sharpd.rst b/doc/manpages/frr-sharpd.rst
index 016f3f9254..016f3f9254 100644
--- a/doc/manpages/sharpd.rst
+++ b/doc/manpages/frr-sharpd.rst
diff --git a/doc/manpages/staticd.rst b/doc/manpages/frr-staticd.rst
index ccbcf32e36..ccbcf32e36 100644
--- a/doc/manpages/staticd.rst
+++ b/doc/manpages/frr-staticd.rst
diff --git a/doc/manpages/vrrpd.rst b/doc/manpages/frr-vrrpd.rst
index 0e73b07cda..0e73b07cda 100644
--- a/doc/manpages/vrrpd.rst
+++ b/doc/manpages/frr-vrrpd.rst
diff --git a/doc/manpages/watchfrr.rst b/doc/manpages/frr-watchfrr.rst
index dceb423f82..dceb423f82 100644
--- a/doc/manpages/watchfrr.rst
+++ b/doc/manpages/frr-watchfrr.rst
diff --git a/doc/manpages/zebra.rst b/doc/manpages/frr-zebra.rst
index cfb368bf44..cfb368bf44 100644
--- a/doc/manpages/zebra.rst
+++ b/doc/manpages/frr-zebra.rst
diff --git a/doc/manpages/index.rst b/doc/manpages/index.rst
index 40f06efdfe..58a1d9e0db 100644
--- a/doc/manpages/index.rst
+++ b/doc/manpages/index.rst
@@ -6,25 +6,25 @@
 .. toctree::
    :maxdepth: 2
 
-   bfdd
-   bgpd
-   eigrpd
-   isisd
-   fabricd
-   ldpd
-   nhrpd
-   ospf6d
-   ospfclient
-   ospfd
-   pimd
-   pbrd
+   frr
+   frr-bfdd
+   frr-bgpd
+   frr-eigrpd
+   frr-isisd
+   frr-fabricd
+   frr-ldpd
+   frr-nhrpd
+   frr-ospf6d
+   frr-ospfclient
+   frr-ospfd
+   frr-pimd
+   frr-pbrd
+   frr-ripd
+   frr-ripngd
+   frr-sharpd
+   frr-staticd
+   frr-watchfrr
+   frr-zebra
+   frr-vrrpd
    mtracebis
-   ripd
-   ripngd
-   sharpd
-   staticd
-   watchfrr
-   zebra
    vtysh
-   vrrpd
-   frr
diff --git a/doc/manpages/subdir.am b/doc/manpages/subdir.am
index 19d2d8d6ae..9284212099 100644
--- a/doc/manpages/subdir.am
+++ b/doc/manpages/subdir.am
@@ -3,34 +3,34 @@
 #
 
 man_RSTFILES = \
-	doc/manpages/bgpd.rst \
+	doc/manpages/bfd-options.rst \
 	doc/manpages/common-options.rst \
 	doc/manpages/conf.py \
 	doc/manpages/defines.rst \
-	doc/manpages/eigrpd.rst \
 	doc/manpages/epilogue.rst \
-	doc/manpages/fabricd.rst \
+	doc/manpages/frr-bfdd.rst \
+	doc/manpages/frr-bgpd.rst \
+	doc/manpages/frr-eigrpd.rst \
+	doc/manpages/frr-fabricd.rst \
+	doc/manpages/frr-isisd.rst \
+	doc/manpages/frr-ldpd.rst \
+	doc/manpages/frr-nhrpd.rst \
+	doc/manpages/frr-ospf6d.rst \
+	doc/manpages/frr-ospfclient.rst \
+	doc/manpages/frr-ospfd.rst \
+	doc/manpages/frr-pbrd.rst \
+	doc/manpages/frr-pimd.rst \
+	doc/manpages/frr-ripd.rst \
+	doc/manpages/frr-ripngd.rst \
+	doc/manpages/frr-sharpd.rst \
+	doc/manpages/frr-staticd.rst \
+	doc/manpages/frr-vrrpd.rst \
+	doc/manpages/frr-watchfrr.rst \
+	doc/manpages/frr-zebra.rst \
 	doc/manpages/frr.rst \
 	doc/manpages/index.rst \
-	doc/manpages/isisd.rst \
-	doc/manpages/ldpd.rst \
 	doc/manpages/mtracebis.rst \
-	doc/manpages/nhrpd.rst \
-	doc/manpages/ospf6d.rst \
-	doc/manpages/ospfclient.rst \
-	doc/manpages/ospfd.rst \
-	doc/manpages/pimd.rst \
-	doc/manpages/ripd.rst \
-	doc/manpages/pbrd.rst \
-	doc/manpages/ripngd.rst \
-	doc/manpages/sharpd.rst \
-	doc/manpages/staticd.rst \
 	doc/manpages/vtysh.rst \
-	doc/manpages/watchfrr.rst \
-	doc/manpages/zebra.rst \
-	doc/manpages/bfdd.rst \
-	doc/manpages/bfd-options.rst \
-	doc/manpages/vrrpd.rst \
 	# end
 
 EXTRA_DIST += $(man_RSTFILES)