From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 21 Sep 2017 12:50:52 +0000 (-0400)
Subject: Merge pull request #1153 from nkukard/docs-ip-bgp-master
X-Git-Tag: frr-4.0-dev~290
X-Git-Url: https://git.proxmox.com/?p=mirror_frr.git;a=commitdiff_plain;h=f637575a9b696f50a3303d0b9e0e5ced7c7dbe76

Merge pull request #1153 from nkukard/docs-ip-bgp-master

doc: updates for master, cherry-picked from my 3.0 branch
---

f637575a9b696f50a3303d0b9e0e5ced7c7dbe76