doc: fix toctree warning in manpages

Forgot to add a couple includes to the exclude list. Also move
defines.txt to defines.rst since I know how to properly ignore things
now.

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

diff --git a/doc/manpages/bgpd.rst b/doc/manpages/bgpd.rst
index 73ca6b235149d5ca9ced8ff2a1d04af4fb9ec328..94213db4d75379800f66b256db329593bfc90467 100644 (file)
--- a/doc/manpages/bgpd.rst
+++ b/doc/manpages/bgpd.rst
@@ -2,7 +2,7 @@
 BGPD
 ****
 
-.. include:: defines.txt
+.. include:: defines.rst
 .. |DAEMON| replace:: bgpd
 
 SYNOPSIS

diff --git a/doc/manpages/conf.py b/doc/manpages/conf.py
index 6aa858803954193d83b852f86e795d42c52eeab6..403e86e55edc0e18d004ecdb4c76084e03c6a4c7 100644 (file)
--- a/doc/manpages/conf.py
+++ b/doc/manpages/conf.py
@@ -125,7 +125,7 @@ language = None
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['_build']
+exclude_patterns = ['_build', 'common-options.rst', 'epilogue.rst', 'defines.rst']
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.

diff --git a/doc/manpages/defines.rst b/doc/manpages/defines.rst
new file mode 100644 (file)
index 0000000..4b66d71
--- /dev/null
+++ b/doc/manpages/defines.rst
@@ -0,0 +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), ldpd(8), eigrpd(8)

diff --git a/doc/manpages/defines.txt b/doc/manpages/defines.txt
deleted file mode 100644 (file)
index 4b66d71..0000000
--- a/doc/manpages/defines.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-.. |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), ldpd(8), eigrpd(8)

diff --git a/doc/manpages/eigrpd.rst b/doc/manpages/eigrpd.rst
index ef269b1151e510f85d23a861cdbc3c7527ec2240..bc824468d063372e2eb90073b04dec2ed093b7a3 100644 (file)
--- a/doc/manpages/eigrpd.rst
+++ b/doc/manpages/eigrpd.rst
@@ -2,7 +2,7 @@
 EIGRPD
 ******
 
-.. include:: defines.txt
+.. include:: defines.rst
 .. |DAEMON| replace:: eigrpd
 
 SYNOPSIS

diff --git a/doc/manpages/isisd.rst b/doc/manpages/isisd.rst
index 6926d560513a1832e592f340b8d80d38375430b5..68761f642c331216a153b65c6e29f97535f86d48 100644 (file)
--- a/doc/manpages/isisd.rst
+++ b/doc/manpages/isisd.rst
@@ -2,7 +2,7 @@
 ISISD
 *****
 
-.. include:: defines.txt
+.. include:: defines.rst
 .. |DAEMON| replace:: isisd
 
 SYNOPSIS

diff --git a/doc/manpages/ldpd.rst b/doc/manpages/ldpd.rst
index e01027d1f776f6f2e8bc50a82f001b9a88120f54..113f06673ed975185c1aa9e672201c271f88caf5 100644 (file)
--- a/doc/manpages/ldpd.rst
+++ b/doc/manpages/ldpd.rst
@@ -2,7 +2,7 @@
 LDPD
 ****
 
-.. include:: defines.txt
+.. include:: defines.rst
 .. |DAEMON| replace:: ldpd
 
 SYNOPSIS

diff --git a/doc/manpages/nhrpd.rst b/doc/manpages/nhrpd.rst
index 8a2cb25611415f305fa978cfaef19f7125515e77..cae01c677bbbc42f0b58ccbfda1d4a15105cb040 100644 (file)
--- a/doc/manpages/nhrpd.rst
+++ b/doc/manpages/nhrpd.rst
@@ -2,7 +2,7 @@
 NHRPD
 *****
 
-.. include:: defines.txt
+.. include:: defines.rst
 .. |DAEMON| replace:: nhrpd
 
 SYNOPSIS

diff --git a/doc/manpages/ospf6d.rst b/doc/manpages/ospf6d.rst
index 2328d240aeef6acb360f366f68d2fac1074236b8..cfc6860d5c18a4d6749218960821e31cafe126b2 100644 (file)
--- a/doc/manpages/ospf6d.rst
+++ b/doc/manpages/ospf6d.rst
@@ -2,7 +2,7 @@
 OSPF6D
 ******
 
-.. include:: defines.txt
+.. include:: defines.rst
 .. |DAEMON| replace:: ospf6d
 
 SYNOPSIS

diff --git a/doc/manpages/ospfd.rst b/doc/manpages/ospfd.rst
index 50ee50373017f931806083d5c8f67fdf33c08c2a..6e4d093f69aa51e8a741b7311ade6ce111e8dd93 100644 (file)
--- a/doc/manpages/ospfd.rst
+++ b/doc/manpages/ospfd.rst
@@ -2,7 +2,7 @@
 OSPFD
 *****
 
-.. include:: defines.txt
+.. include:: defines.rst
 .. |DAEMON| replace:: ospfd
 
 SYNOPSIS

diff --git a/doc/manpages/pimd.rst b/doc/manpages/pimd.rst
index 98fd3a5c928d3a8c1227a6756e80d3e07187868c..d7582668d256b83bd258a4a6fb55bf13c23cba80 100644 (file)
--- a/doc/manpages/pimd.rst
+++ b/doc/manpages/pimd.rst
@@ -2,7 +2,7 @@
 PIMD
 ****
 
-.. include:: defines.txt
+.. include:: defines.rst
 .. |DAEMON| replace:: pimd
 
 SYNOPSIS

diff --git a/doc/manpages/ripd.rst b/doc/manpages/ripd.rst
index 01b022325158132a446f9f53b766a3b786c10f11..af4590c82402f1f7178f0ed7a8db7a42ff977eb8 100644 (file)
--- a/doc/manpages/ripd.rst
+++ b/doc/manpages/ripd.rst
@@ -2,7 +2,7 @@
 RIPD
 ****
 
-.. include:: defines.txt
+.. include:: defines.rst
 .. |DAEMON| replace:: ripd
 
 SYNOPSIS

diff --git a/doc/manpages/ripngd.rst b/doc/manpages/ripngd.rst
index 2a3e14ae6f586fb87b5bb1fcf0b87d8e261875d3..aedd689876f56f567b72ab23adce376571e2074c 100644 (file)
--- a/doc/manpages/ripngd.rst
+++ b/doc/manpages/ripngd.rst
@@ -2,7 +2,7 @@
 RIPNGD
 ******
 
-.. include:: defines.txt
+.. include:: defines.rst
 .. |DAEMON| replace:: ripngd
 
 SYNOPSIS

diff --git a/doc/manpages/vtysh.rst b/doc/manpages/vtysh.rst
index 341d5eae44319d3c759df81c0068f599c8235b86..38cb668e828f0337bd2c11a8ec98e2075258dfe9 100644 (file)
--- a/doc/manpages/vtysh.rst
+++ b/doc/manpages/vtysh.rst
@@ -2,7 +2,7 @@
 VTYSH
 *****
 
-.. include:: defines.txt
+.. include:: defines.rst
 .. |DAEMON| replace:: eigrpd
 
 SYNOPSIS

diff --git a/doc/manpages/watchfrr.rst b/doc/manpages/watchfrr.rst
index 5c18ac2e6abf386463350d06724025a138c365a4..f0b733298d54ab1483b8726f278d7c1d1a9cec1f 100644 (file)
--- a/doc/manpages/watchfrr.rst
+++ b/doc/manpages/watchfrr.rst
@@ -2,7 +2,7 @@
 WATCHFRR
 ********
 
-.. include:: defines.txt
+.. include:: defines.rst
 .. |DAEMON| replace:: watchfrr
 
 SYNOPSIS

diff --git a/doc/manpages/zebra.rst b/doc/manpages/zebra.rst
index 9e5d4deb07b433e4b2fe2053f0a068537fad53d6..268b1d8645c9957152f24edbf1c2bbb8517e173a 100644 (file)
--- a/doc/manpages/zebra.rst
+++ b/doc/manpages/zebra.rst
@@ -2,7 +2,7 @@
 ZEBRA
 *****
 
-.. include:: defines.txt
+.. include:: defines.rst
 .. |DAEMON| replace:: zebra
 
 SYNOPSIS