diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-10-30 05:52:29 -0700 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-10-30 05:52:29 -0700 |
| commit | be5e48abecd137b47e4493a8fd616186c61f48f7 (patch) | |
| tree | 4184faeca4bb606af98deb606d9b53db3ac314b4 /doc/zebra.8 | |
| parent | 526e17284570266dcdd606ff163a614e6b3655a5 (diff) | |
| parent | 2bed4e86e378334341e01f3afe33784ef2713e83 (diff) | |
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
Conflicts:
zebra/rib.h
zebra/zebra_rib.c
zebra/zebra_vty.c
Diffstat (limited to 'doc/zebra.8')
| -rw-r--r-- | doc/zebra.8 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/zebra.8 b/doc/zebra.8 index a40909a699..cb431da0aa 100644 --- a/doc/zebra.8 +++ b/doc/zebra.8 @@ -90,12 +90,12 @@ Note that this affects Linux only. Print the version and exit. .SH FILES .TP -.BI /usr/local/sbin/zebra +.BI /usr/lib/quagga/zebra The default location of the .B zebra binary. .TP -.BI /usr/local/etc/zebra.conf +.BI /etc/quagga/zebra.conf The default location of the .B zebra config file. |