diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-03-01 17:10:01 +0100 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-03-01 17:10:01 +0100 |
| commit | a975744835bb87e3cf62701e13248d66f1dac1df (patch) | |
| tree | bca5ab1f29594688c43e0c36c9eb2f0c5c8e66c6 /doc/Makefile.am | |
| parent | debianpkg: disable pdf build by default (diff) | |
| parent | Merge pull request #1784 from donaldsharp/documentation (diff) | |
| download | frr-a975744835bb87e3cf62701e13248d66f1dac1df.tar.xz frr-a975744835bb87e3cf62701e13248d66f1dac1df.zip | |
Merge branch 'master' into docuser
* New manpage: mtracebis.rst
* Makefile.am includes mtracebis.rst
* configure.ac lines removed
* Debian packaging files updated
* Fixed up manpage |seealso-programs| in the process
* Centos7 build package list updated to include systemd-devel
* New paragraph on netns vrf support in zebra manpage
Conflicts:
configure.ac
debianpkg/backports/ubuntu14.04/debian/frr.install
debianpkg/frr.install
doc/Makefile.am
doc/developer/Building_FRR_on_CentOS7.rst
doc/zebra.8.in
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'doc/Makefile.am')
| -rw-r--r-- | doc/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 9d2285a44..d8244edca 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -11,6 +11,7 @@ man_MANS = $(MANPAGE_BUILDDIR)/frr.1 if PIMD man_MANS += $(MANPAGE_BUILDDIR)/pimd.8 +man_MANS += $(MANPAGE_BUILDDIR)/mtracebis.8 endif if BGPD @@ -108,6 +109,7 @@ EXTRA_DIST = manpages/defines.rst \ manpages/vtysh.rst \ manpages/nhrpd.rst \ manpages/pimd.rst \ + manpages/mtracebis.rst \ manpages/ripngd.rst \ manpages/frr.rst \ manpages/conf.py \ |