]> git.puffer.fish Git - mirror/frr.git/commit
doc: additional merging
authorQuentin Young <qlyoung@cumulusnetworks.com>
Tue, 30 Jan 2018 20:52:16 +0000 (15:52 -0500)
committerQuentin Young <qlyoung@cumulusnetworks.com>
Tue, 30 Jan 2018 20:53:17 +0000 (15:53 -0500)
commita5a48dbf209fa2628704ad15cefe8d1ae8187737
tree4d4edef602737f7b7636076f58792b3ba257d0b6
parentd38549c99dd39a6f5df0acd3efa48284d077ea66
doc: additional merging

Manually merged:

6347ca161f94af4baa853bf09be7fff076e75491

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
doc/user/installation.rst
doc/user/routemap.rst
doc/user/rpki.rst
doc/user/vnc.rst