New upstream version 1.2.4 upstream upstream/1.2.4
authorBrett Parker <brettp@mythic-beasts.com>
Sat, 17 Mar 2018 15:30:37 +0000 (15:30 +0000)
committerBrett Parker <brettp@mythic-beasts.com>
Sat, 17 Mar 2018 15:30:37 +0000 (15:30 +0000)
12 files changed:
configure
configure.ac
doc/quagga.info
doc/quagga.info-1
doc/quagga.info-2
doc/stamp-vti
doc/version.texi
lib/thread.c
lib/version.h
lib/zebra.h
redhat/quagga.spec
tests/test-commands-defun.c

index 8663995c544c9af88bd0ce5781886c91bef2a5e7..04efb9e2bafd026702ffe11d621ce7443c1bcbe9 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Quagga 1.2.3.
+# Generated by GNU Autoconf 2.69 for Quagga 1.2.4.
 #
 # Report bugs to <https://bugzilla.quagga.net>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Quagga'
 PACKAGE_TARNAME='quagga'
-PACKAGE_VERSION='1.2.3'
-PACKAGE_STRING='Quagga 1.2.3'
+PACKAGE_VERSION='1.2.4'
+PACKAGE_STRING='Quagga 1.2.4'
 PACKAGE_BUGREPORT='https://bugzilla.quagga.net'
 PACKAGE_URL=''
 
@@ -1465,7 +1465,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Quagga 1.2.3 to adapt to many kinds of systems.
+\`configure' configures Quagga 1.2.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1536,7 +1536,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Quagga 1.2.3:";;
+     short | recursive ) echo "Configuration of Quagga 1.2.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1712,7 +1712,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Quagga configure 1.2.3
+Quagga configure 1.2.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2238,7 +2238,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Quagga $as_me 1.2.3, which was
+It was created by Quagga $as_me 1.2.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3222,7 +3222,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='quagga'
- VERSION='1.2.3'
+ VERSION='1.2.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13287,7 +13287,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-Quagga config.lt 1.2.3
+Quagga config.lt 1.2.4
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -26906,7 +26906,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Quagga $as_me 1.2.3, which was
+This file was extended by Quagga $as_me 1.2.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -26972,7 +26972,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Quagga config.status 1.2.3
+Quagga config.status 1.2.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
index ed279f483c50f4dc672ddff7ea7eeaac5a0a28ec..ebee6285ac758c8db331605eccce1a736420d0df 100755 (executable)
@@ -7,7 +7,7 @@
 ##
 AC_PREREQ(2.60)
 
-AC_INIT(Quagga, 1.2.3, [https://bugzilla.quagga.net])
+AC_INIT(Quagga, 1.2.4, [https://bugzilla.quagga.net])
 CONFIG_ARGS="$*"
 AC_SUBST(CONFIG_ARGS)
 AC_CONFIG_SRCDIR(lib/zebra.h)
index 9226003fbc2e1a92e41e4a35e471a5d75cf34f58..14332c734593557429857f1d2fe8205350fb0aac 100644 (file)
@@ -23,8 +23,8 @@ END-INFO-DIR-ENTRY
    This file documents the Quagga Software Routing Suite which manages
 common TCP/IP routing protocols.
 
-   This is Edition 1.2.3, last updated 4 February 2018 of 'The Quagga
-Manual', for Quagga Version 1.2.3.
+   This is Edition 1.2.4, last updated 19 February 2018 of 'The Quagga
+Manual', for Quagga Version 1.2.4.
 
    Copyright (C) 1999-2005 Kunihiro Ishiguro, et al.
 
@@ -44,224 +44,224 @@ Manual', for Quagga Version 1.2.3.
 
 \1f
 Indirect:
-quagga.info-1: 1937
-quagga.info-2: 302475
+quagga.info-1: 1938
+quagga.info-2: 302477
 \1f
 Tag Table:
 (Indirect)
-Node: Top\7f1937
-Node: Overview\7f3319
-Node: About Quagga\7f4753
-Node: System Architecture\7f7039
-Node: Supported Platforms\7f9728
-Node: Supported RFCs\7f10974
-Node: How to get Quagga\7f13155
-Node: Mailing List\7f13579
-Node: Bug Reports\7f14025
-Node: Installation\7f14901
-Node: Configure the Software\7f15335
-Node: The Configure script and its options\7f15583
-Node: Least-Privilege support\7f19470
-Node: Linux notes\7f21209
-Ref: Linux notes-Footnote-1\7f23067
-Node: Build the Software\7f23133
-Node: Install the Software\7f23683
-Node: Basic commands\7f25230
-Node: Config Commands\7f26004
-Node: Basic Config Commands\7f26862
-Node: Sample Config File\7f33228
-Node: Terminal Mode Commands\7f34001
-Node: Common Invocation Options\7f35132
-Node: Virtual Terminal Interfaces\7f36548
-Node: VTY Overview\7f37059
-Node: VTY Modes\7f38310
-Node: VTY View Mode\7f38760
-Node: VTY Enable Mode\7f39010
-Node: VTY Other Modes\7f39288
-Node: VTY CLI Commands\7f39464
-Node: CLI Movement Commands\7f39924
-Node: CLI Editing Commands\7f40447
-Node: CLI Advanced Commands\7f41208
-Node: Zebra\7f42088
-Node: Invoking zebra\7f42803
-Node: Interface Commands\7f43333
-Node: Standard Commands\7f43566
-Node: Link Parameters Commands\7f45127
-Node: Static Route Commands\7f47744
-Node: Multicast RIB Commands\7f51000
-Node: zebra Route Filtering\7f54132
-Node: zebra FIB push interface\7f55276
-Node: zebra Terminal Mode Commands\7f58791
-Node: RIP\7f60196
-Node: Starting and Stopping ripd\7f61263
-Node: RIP netmask\7f62691
-Node: RIP Configuration\7f63788
-Node: RIP Version Control\7f66786
-Node: How to Announce RIP route\7f68973
-Node: Filtering RIP Routes\7f71542
-Node: RIP Metric Manipulation\7f73009
-Node: RIP distance\7f73922
-Node: RIP route-map\7f74737
-Node: RIP Authentication\7f77286
-Node: RIP Timers\7f79531
-Node: Show RIP Information\7f80821
-Node: RIP Debug Commands\7f82197
-Node: RIPng\7f83193
-Node: Invoking ripngd\7f83539
-Node: ripngd Configuration\7f83788
-Node: ripngd Terminal Mode Commands\7f84539
-Node: ripngd Filtering Commands\7f84903
-Node: OSPFv2\7f85412
-Node: OSPF Fundamentals\7f86233
-Ref: OSPF LSA sequence number\7f93854
-Ref: OSPF Link-State LSA Example\7f99177
-Ref: OSPF Flooding\7f106822
-Ref: OSPF Areas\7f106863
-Node: Configuring ospfd\7f106898
-Node: OSPF router\7f107473
-Ref: ospf router-id\7f108020
-Ref: OSPF passive-interface\7f111231
-Ref: OSPF auto-cost reference-bandwidth\7f115696
-Ref: OSPF network command\7f116357
-Node: OSPF area\7f117508
-Ref: OSPF virtual-link\7f119855
-Ref: area authentication message-digest\7f123567
-Node: OSPF interface\7f123990
-Ref: OSPF ip ospf area command\7f124234
-Ref: ip ospf authentication message-digest\7f125131
-Ref: ip ospf message-digest-key\7f126116
-Ref: ip ospf dead-interval minimal\7f126935
-Node: Redistribute routes to OSPF\7f129353
-Ref: OSPF redistribute\7f130409
-Ref: ospf distribute-list\7f132320
-Node: Showing OSPF information\7f132763
-Ref: show ip ospf\7f132970
-Node: Opaque LSA\7f134212
-Node: OSPF Traffic Engineering\7f135474
-Node: Router Information\7f136624
-Node: Debugging OSPF\7f138117
-Node: OSPF Configuration Examples\7f139789
-Node: OSPFv3\7f143405
-Node: OSPF6 router\7f143811
-Node: OSPF6 area\7f146527
-Node: OSPF6 interface\7f146705
-Node: Redistribute routes to OSPF6\7f147775
-Node: Showing OSPF6 information\7f148091
-Node: OSPF6 Configuration Examples\7f148948
-Node: ISIS\7f149369
-Node: Configuring isisd\7f150045
-Node: ISIS router\7f150592
-Ref: router isis WORD\7f150916
-Ref: metric-style\7f152006
-Node: ISIS Timer\7f152376
-Node: ISIS region\7f154063
-Node: ISIS interface\7f154472
-Ref: ip router isis WORD\7f154708
-Node: Showing ISIS information\7f157883
-Node: ISIS Traffic Engineering\7f159294
-Node: Debugging ISIS\7f159975
-Node: ISIS Configuration Examples\7f161516
-Node: NHRP\7f163662
-Node: Routing Design\7f164465
-Node: Configuring NHRP\7f166118
-Node: Hub Functionality\7f166276
-Node: Integration with IKE\7f167625
-Node: NHRP Events\7f168305
-Node: Configuration Example\7f168458
-Node: BGP\7f168602
-Node: Starting BGP\7f169692
-Node: BGP router\7f170524
-Node: BGP distance\7f171824
-Node: BGP decision process\7f172345
-Ref: bgp bestpath as-path multipath-relax\7f174907
-Ref: bgp bestpath compare-routerid\7f175175
-Node: BGP route flap dampening\7f176142
-Node: BGP MED\7f176860
-Ref: bgp deterministic-med\7f188103
-Ref: bgp always-compare-med\7f188969
-Ref: BGP MED-Footnote-1\7f189589
-Node: BGP network\7f190272
-Node: BGP route\7f190500
-Node: Route Aggregation\7f191054
-Node: Redistribute to BGP\7f191625
-Node: BGP Peer\7f192154
-Node: Defining Peer\7f192383
-Node: BGP Peer commands\7f192998
-Node: Peer filtering\7f197522
-Node: BGP Peer Group\7f198313
-Node: BGP Address Family\7f198628
-Node: Autonomous System\7f199752
-Node: AS Path Regular Expression\7f200655
-Node: Display BGP Routes by AS Path\7f201897
-Node: AS Path Access List\7f202339
-Node: Using AS Path in Route Map\7f202808
-Node: Private AS Numbers\7f203280
-Node: BGP Communities Attribute\7f203440
-Node: BGP Community Lists\7f205915
-Node: Numbered BGP Community Lists\7f208567
-Node: BGP Community in Route Map\7f210156
-Node: Display BGP Routes by Community\7f212102
-Node: Using BGP Communities Attribute\7f213273
-Node: BGP Extended Communities Attribute\7f216844
-Node: BGP Extended Community Lists\7f218625
-Node: BGP Extended Communities in Route Map\7f220514
-Node: Displaying BGP routes\7f220977
-Node: Show IP BGP\7f221245
-Node: More Show IP BGP\7f221947
-Node: Capability Negotiation\7f223269
-Node: Route Reflector\7f226742
-Node: Route Server\7f227023
-Node: Multiple instance\7f228136
-Node: BGP instance and view\7f229983
-Node: Routing policy\7f231366
-Node: Viewing the view\7f232136
-Node: How to set up a 6-Bone connection\7f232423
-Node: Dump BGP packets and table\7f233797
-Node: BGP Configuration Examples\7f235424
-Node: Configuring Quagga as a Route Server\7f244381
-Node: Description of the Route Server model\7f245292
-Ref: fig:normal-processing\7f246885
-Ref: filter-delegation\7f247878
-Ref: Route Server tasks\7f249052
-Ref: Route-server path filter process\7f249423
-Ref: fig:rs-processing\7f251753
-Node: Commands for configuring a Route Server\7f254161
-Node: Example of Route Server Configuration\7f257206
-Node: Configuration of the BGP routers without Route Server\7f258128
-Node: Configuration of the BGP routers with Route Server\7f261012
-Node: Configuration of the Route Server itself\7f262314
-Node: Further considerations about Import and Export route-maps\7f267315
-Node: VTY shell\7f270363
-Node: VTY shell username\7f271032
-Node: VTY shell integrated configuration\7f271665
-Node: Filtering\7f273110
-Node: IP Access List\7f273491
-Node: IP Prefix List\7f273877
-Node: ip prefix-list description\7f276920
-Node: ip prefix-list sequential number control\7f277447
-Node: Showing ip prefix-list\7f277989
-Node: Clear counter of ip prefix-list\7f279095
-Node: Route Map\7f279534
-Node: Route Map Command\7f283005
-Node: Route Map Match Command\7f283314
-Node: Route Map Set Command\7f284037
-Ref: routemap set metric\7f284512
-Node: Route Map Call Command\7f284945
-Node: Route Map Exit Action Command\7f285276
-Node: Route Map Examples\7f285758
-Node: IPv6 Support\7f286270
-Node: Router Advertisement\7f286851
-Node: Kernel Interface\7f293188
-Node: SNMP Support\7f295145
-Node: Getting and installing an SNMP agent\7f295804
-Node: AgentX configuration\7f296615
-Node: SMUX configuration\7f298418
-Node: MIB and command reference\7f302475
-Node: Handling SNMP Traps\7f304000
-Node: Zebra Protocol\7f310106
-Node: Packet Binary Dump Format\7f314848
-Node: Command Index\7f327399
-Node: VTY Key Index\7f410565
-Node: Index\7f413554
+Node: Top\7f1938
+Node: Overview\7f3320
+Node: About Quagga\7f4754
+Node: System Architecture\7f7040
+Node: Supported Platforms\7f9729
+Node: Supported RFCs\7f10975
+Node: How to get Quagga\7f13156
+Node: Mailing List\7f13580
+Node: Bug Reports\7f14026
+Node: Installation\7f14902
+Node: Configure the Software\7f15336
+Node: The Configure script and its options\7f15584
+Node: Least-Privilege support\7f19471
+Node: Linux notes\7f21210
+Ref: Linux notes-Footnote-1\7f23068
+Node: Build the Software\7f23134
+Node: Install the Software\7f23684
+Node: Basic commands\7f25231
+Node: Config Commands\7f26005
+Node: Basic Config Commands\7f26863
+Node: Sample Config File\7f33229
+Node: Terminal Mode Commands\7f34002
+Node: Common Invocation Options\7f35133
+Node: Virtual Terminal Interfaces\7f36549
+Node: VTY Overview\7f37060
+Node: VTY Modes\7f38311
+Node: VTY View Mode\7f38761
+Node: VTY Enable Mode\7f39011
+Node: VTY Other Modes\7f39289
+Node: VTY CLI Commands\7f39465
+Node: CLI Movement Commands\7f39925
+Node: CLI Editing Commands\7f40448
+Node: CLI Advanced Commands\7f41209
+Node: Zebra\7f42089
+Node: Invoking zebra\7f42804
+Node: Interface Commands\7f43334
+Node: Standard Commands\7f43567
+Node: Link Parameters Commands\7f45128
+Node: Static Route Commands\7f47745
+Node: Multicast RIB Commands\7f51001
+Node: zebra Route Filtering\7f54133
+Node: zebra FIB push interface\7f55277
+Node: zebra Terminal Mode Commands\7f58792
+Node: RIP\7f60197
+Node: Starting and Stopping ripd\7f61264
+Node: RIP netmask\7f62692
+Node: RIP Configuration\7f63789
+Node: RIP Version Control\7f66787
+Node: How to Announce RIP route\7f68974
+Node: Filtering RIP Routes\7f71543
+Node: RIP Metric Manipulation\7f73010
+Node: RIP distance\7f73923
+Node: RIP route-map\7f74738
+Node: RIP Authentication\7f77287
+Node: RIP Timers\7f79532
+Node: Show RIP Information\7f80822
+Node: RIP Debug Commands\7f82198
+Node: RIPng\7f83194
+Node: Invoking ripngd\7f83540
+Node: ripngd Configuration\7f83789
+Node: ripngd Terminal Mode Commands\7f84540
+Node: ripngd Filtering Commands\7f84904
+Node: OSPFv2\7f85413
+Node: OSPF Fundamentals\7f86234
+Ref: OSPF LSA sequence number\7f93855
+Ref: OSPF Link-State LSA Example\7f99178
+Ref: OSPF Flooding\7f106823
+Ref: OSPF Areas\7f106864
+Node: Configuring ospfd\7f106899
+Node: OSPF router\7f107474
+Ref: ospf router-id\7f108021
+Ref: OSPF passive-interface\7f111232
+Ref: OSPF auto-cost reference-bandwidth\7f115697
+Ref: OSPF network command\7f116358
+Node: OSPF area\7f117509
+Ref: OSPF virtual-link\7f119856
+Ref: area authentication message-digest\7f123568
+Node: OSPF interface\7f123991
+Ref: OSPF ip ospf area command\7f124235
+Ref: ip ospf authentication message-digest\7f125132
+Ref: ip ospf message-digest-key\7f126117
+Ref: ip ospf dead-interval minimal\7f126936
+Node: Redistribute routes to OSPF\7f129354
+Ref: OSPF redistribute\7f130410
+Ref: ospf distribute-list\7f132321
+Node: Showing OSPF information\7f132764
+Ref: show ip ospf\7f132971
+Node: Opaque LSA\7f134213
+Node: OSPF Traffic Engineering\7f135475
+Node: Router Information\7f136625
+Node: Debugging OSPF\7f138118
+Node: OSPF Configuration Examples\7f139790
+Node: OSPFv3\7f143406
+Node: OSPF6 router\7f143812
+Node: OSPF6 area\7f146528
+Node: OSPF6 interface\7f146706
+Node: Redistribute routes to OSPF6\7f147776
+Node: Showing OSPF6 information\7f148092
+Node: OSPF6 Configuration Examples\7f148949
+Node: ISIS\7f149370
+Node: Configuring isisd\7f150046
+Node: ISIS router\7f150593
+Ref: router isis WORD\7f150917
+Ref: metric-style\7f152007
+Node: ISIS Timer\7f152377
+Node: ISIS region\7f154064
+Node: ISIS interface\7f154473
+Ref: ip router isis WORD\7f154709
+Node: Showing ISIS information\7f157884
+Node: ISIS Traffic Engineering\7f159295
+Node: Debugging ISIS\7f159976
+Node: ISIS Configuration Examples\7f161517
+Node: NHRP\7f163663
+Node: Routing Design\7f164466
+Node: Configuring NHRP\7f166119
+Node: Hub Functionality\7f166277
+Node: Integration with IKE\7f167626
+Node: NHRP Events\7f168306
+Node: Configuration Example\7f168459
+Node: BGP\7f168603
+Node: Starting BGP\7f169693
+Node: BGP router\7f170525
+Node: BGP distance\7f171825
+Node: BGP decision process\7f172346
+Ref: bgp bestpath as-path multipath-relax\7f174908
+Ref: bgp bestpath compare-routerid\7f175176
+Node: BGP route flap dampening\7f176143
+Node: BGP MED\7f176861
+Ref: bgp deterministic-med\7f188104
+Ref: bgp always-compare-med\7f188970
+Ref: BGP MED-Footnote-1\7f189590
+Node: BGP network\7f190273
+Node: BGP route\7f190501
+Node: Route Aggregation\7f191055
+Node: Redistribute to BGP\7f191626
+Node: BGP Peer\7f192155
+Node: Defining Peer\7f192384
+Node: BGP Peer commands\7f192999
+Node: Peer filtering\7f197523
+Node: BGP Peer Group\7f198314
+Node: BGP Address Family\7f198629
+Node: Autonomous System\7f199753
+Node: AS Path Regular Expression\7f200656
+Node: Display BGP Routes by AS Path\7f201898
+Node: AS Path Access List\7f202340
+Node: Using AS Path in Route Map\7f202809
+Node: Private AS Numbers\7f203281
+Node: BGP Communities Attribute\7f203441
+Node: BGP Community Lists\7f205916
+Node: Numbered BGP Community Lists\7f208568
+Node: BGP Community in Route Map\7f210157
+Node: Display BGP Routes by Community\7f212103
+Node: Using BGP Communities Attribute\7f213274
+Node: BGP Extended Communities Attribute\7f216845
+Node: BGP Extended Community Lists\7f218626
+Node: BGP Extended Communities in Route Map\7f220515
+Node: Displaying BGP routes\7f220978
+Node: Show IP BGP\7f221246
+Node: More Show IP BGP\7f221948
+Node: Capability Negotiation\7f223270
+Node: Route Reflector\7f226743
+Node: Route Server\7f227024
+Node: Multiple instance\7f228137
+Node: BGP instance and view\7f229984
+Node: Routing policy\7f231367
+Node: Viewing the view\7f232137
+Node: How to set up a 6-Bone connection\7f232424
+Node: Dump BGP packets and table\7f233798
+Node: BGP Configuration Examples\7f235425
+Node: Configuring Quagga as a Route Server\7f244382
+Node: Description of the Route Server model\7f245293
+Ref: fig:normal-processing\7f246886
+Ref: filter-delegation\7f247879
+Ref: Route Server tasks\7f249053
+Ref: Route-server path filter process\7f249424
+Ref: fig:rs-processing\7f251754
+Node: Commands for configuring a Route Server\7f254162
+Node: Example of Route Server Configuration\7f257207
+Node: Configuration of the BGP routers without Route Server\7f258129
+Node: Configuration of the BGP routers with Route Server\7f261013
+Node: Configuration of the Route Server itself\7f262315
+Node: Further considerations about Import and Export route-maps\7f267316
+Node: VTY shell\7f270364
+Node: VTY shell username\7f271033
+Node: VTY shell integrated configuration\7f271666
+Node: Filtering\7f273111
+Node: IP Access List\7f273492
+Node: IP Prefix List\7f273878
+Node: ip prefix-list description\7f276921
+Node: ip prefix-list sequential number control\7f277448
+Node: Showing ip prefix-list\7f277990
+Node: Clear counter of ip prefix-list\7f279096
+Node: Route Map\7f279535
+Node: Route Map Command\7f283006
+Node: Route Map Match Command\7f283315
+Node: Route Map Set Command\7f284038
+Ref: routemap set metric\7f284513
+Node: Route Map Call Command\7f284946
+Node: Route Map Exit Action Command\7f285277
+Node: Route Map Examples\7f285759
+Node: IPv6 Support\7f286271
+Node: Router Advertisement\7f286852
+Node: Kernel Interface\7f293189
+Node: SNMP Support\7f295146
+Node: Getting and installing an SNMP agent\7f295805
+Node: AgentX configuration\7f296616
+Node: SMUX configuration\7f298419
+Node: MIB and command reference\7f302477
+Node: Handling SNMP Traps\7f304002
+Node: Zebra Protocol\7f310108
+Node: Packet Binary Dump Format\7f314850
+Node: Command Index\7f327401
+Node: VTY Key Index\7f410567
+Node: Index\7f413556
 \1f
 End Tag Table
index 70380161094c64786ac4c1027208246b34f9948d..19e397cbadd2f05c7e0c0203be2c76ad430b8b69 100644 (file)
@@ -23,8 +23,8 @@ END-INFO-DIR-ENTRY
    This file documents the Quagga Software Routing Suite which manages
 common TCP/IP routing protocols.
 
-   This is Edition 1.2.3, last updated 4 February 2018 of 'The Quagga
-Manual', for Quagga Version 1.2.3.
+   This is Edition 1.2.4, last updated 19 February 2018 of 'The Quagga
+Manual', for Quagga Version 1.2.4.
 
    Copyright (C) 1999-2005 Kunihiro Ishiguro, et al.
 
@@ -49,7 +49,7 @@ Quagga
 ******
 
 Quagga is an advanced routing software package that provides a suite of
-TCP/IP based routing protocols.  This is the Manual for Quagga 1.2.3.
+TCP/IP based routing protocols.  This is the Manual for Quagga 1.2.4.
 Quagga is a fork of GNU Zebra.
 
    Copyright (C) 1999-2005 Kunihiro Ishiguro, et al.
@@ -1038,7 +1038,7 @@ all.
      Connected to localhost.
      Escape character is '^]'.
 
-     Hello, this is Quagga (version 1.2.3)
+     Hello, this is Quagga (version 1.2.4)
      Copyright (C) 1999-2005 Kunihiro Ishiguro, et al.
 
      User Access Verification
index c1e6a1b4225260522f024ab25a82db5d4228d8f3..9194c845c5fefa7cbc08620205743c7dcbc42428 100644 (file)
@@ -23,8 +23,8 @@ END-INFO-DIR-ENTRY
    This file documents the Quagga Software Routing Suite which manages
 common TCP/IP routing protocols.
 
-   This is Edition 1.2.3, last updated 4 February 2018 of 'The Quagga
-Manual', for Quagga Version 1.2.3.
+   This is Edition 1.2.4, last updated 19 February 2018 of 'The Quagga
+Manual', for Quagga Version 1.2.4.
 
    Copyright (C) 1999-2005 Kunihiro Ishiguro, et al.
 
index 9cd8fc2c8f5d3c4ce5053fbb6c1cc4d3ac3e0444..a5a514d055be71b3c8ef7432c40e880c81b4dea7 100644 (file)
@@ -1,4 +1,4 @@
-@set UPDATED 4 February 2018
+@set UPDATED 19 February 2018
 @set UPDATED-MONTH February 2018
-@set EDITION 1.2.3
-@set VERSION 1.2.3
+@set EDITION 1.2.4
+@set VERSION 1.2.4
index 9cd8fc2c8f5d3c4ce5053fbb6c1cc4d3ac3e0444..a5a514d055be71b3c8ef7432c40e880c81b4dea7 100644 (file)
@@ -1,4 +1,4 @@
-@set UPDATED 4 February 2018
+@set UPDATED 19 February 2018
 @set UPDATED-MONTH February 2018
-@set EDITION 1.2.3
-@set VERSION 1.2.3
+@set EDITION 1.2.4
+@set VERSION 1.2.4
index 55effaac9d6cd2d6dc4319091fa245a4b5a85e10..f7d1a5ff9aa40a661430283d5d82d780a9215dcc 100644 (file)
@@ -1276,7 +1276,12 @@ struct thread *thread_current = NULL;
 
 /* We check thread consumed time. If the system has getrusage, we'll
    use that to get in-depth stats on the performance of the thread in addition
-   to wall clock time stats from gettimeofday. */
+   to wall clock time stats from gettimeofday. 
+   'Dummy' threads (e.g.  see funcname_thread_execute) must have
+   thread->master == NULL.
+ */
+   
 static void
 thread_call (struct thread *thread)
 {
@@ -1336,8 +1341,10 @@ thread_call (struct thread *thread)
                 realtime/1000, cputime/1000);
     }
 #endif /* CONSUMED_TIME_CHECK */
+
   
-  thread_add_unuse (thread);
+  if (thread->master)
+    thread_add_unuse (thread);
 }
 
 /* Execute thread */
index cf8582f7d042e1bc3d316d5d70effd00bbf22599..1446bf820d50ea7b009871008bfd6a738a31dc3e 100644 (file)
@@ -37,7 +37,7 @@
 
 #define QUAGGA_PROGNAME   "Quagga"
 
-#define QUAGGA_VERSION     "1.2.3" GIT_SUFFIX
+#define QUAGGA_VERSION     "1.2.4" GIT_SUFFIX
 
 #define ZEBRA_BUG_ADDRESS "https://bugzilla.quagga.net"
 
index a405d46eb9f7372500b03462bdb38e3f8766ffac..1bb951fe8f6f749ec40ae49d2a2634e9badd080f 100644 (file)
@@ -130,16 +130,6 @@ typedef int socklen_t;
 #endif /* !va_copy */
 #endif /* !C99 */
 
-
-#ifdef HAVE_LCAPS
-#include <sys/capability.h>
-#include <sys/prctl.h>
-#endif /* HAVE_LCAPS */
-
-#ifdef HAVE_SOLARIS_CAPABILITIES
-#include <priv.h>
-#endif /* HAVE_SOLARIS_CAPABILITIES */
-
 /* network include group */
 
 #include <sys/socket.h>
@@ -224,6 +214,16 @@ typedef int socklen_t;
 #include <netinet6/nd6.h>
 #endif /* HAVE_NETINET6_ND6_H */
 
+/* Privileges / capabilities */
+#ifdef HAVE_LCAPS
+#include <sys/capability.h>
+#include <sys/prctl.h>
+#endif /* HAVE_LCAPS */
+
+#ifdef HAVE_SOLARIS_CAPABILITIES
+#include <priv.h>
+#endif /* HAVE_SOLARIS_CAPABILITIES */
+
 /* Some systems do not define UINT32_MAX, etc.. from inttypes.h
  * e.g. this makes life easier for FBSD 4.11 users.
  */
index a0e8bbbe70cc6b8175c1c774a18f30eb02d93e8b..94b5177e2e2d211b65cac9acf1c5f5dd39005e6b 100644 (file)
@@ -43,8 +43,8 @@
 
 #### Version String tweak
 # Remove invalid characters form version string and replace with _
-%{expand: %%global rpmversion %(echo '1.2.3' | tr [:blank:]- _ )}
-%define                quaggaversion   1.2.3
+%{expand: %%global rpmversion %(echo '1.2.4' | tr [:blank:]- _ )}
+%define                quaggaversion   1.2.4
 
 #### Check version of texi2html 
 # Old versions don't support "--number-footnotes" option.
 Summary: Routing daemon
 Name:                  quagga
 Version:               %{rpmversion}
-Release:               20180204%{release_rev}%{?dist}
+Release:               20180219%{release_rev}%{?dist}
 License:               GPLv2+
 Group:                 System Environment/Daemons
 Source0:               https://download.savannah.gnu.org/releases/quagga/%{name}-%{quaggaversion}.tar.gz
index b876225f54febf9b084c76ba57c83b11e06a34c7..2fbcda84257d5504cdf5f16425493a31a6704731 100644 (file)
 #include "command.h"
 #include "tests.h"
 
-DEFSH (0, no_bgp_graceful_restart_restart_time_val_cmd_vtysh, 
-       "no bgp graceful-restart restart-time <1-3600>", 
+DEFSH (0|0|0|0|0, no_match_interface_cmd_vtysh, 
+       "no match interface", 
        "Negate a command or set its defaults\n"
-       "BGP specific commands\n"
-       "Graceful restart capability parameters\n"
-       "Set the time to wait to delete stale routes before a BGP open message is received\n"
-       "Delay value (seconds)\n")
-
-DEFSH (0, ip_route_mask_flags_tag_distance_vrf_cmd_vtysh, 
-       "ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE) (reject|blackhole)  tag <1-4294967295> <1-255>" "vrf <0-65535>", 
-       "IP information\n"
-       "Establish static routes\n"
-       "IP destination prefix\n"
-       "IP destination prefix mask\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
-       "Set tag for this route\n"
-       "Tag value\n"
-       "Distance value for this route\n"
-       "Emit an ICMP unreachable when matched\n"
-       "Silently discard pkts when matched\n"
-       "Specify the VRF\nThe VRF ID\n")
+       "Match values from routing table\n"
+       "Match first hop interface of route\n")
 
-DEFSH (0, no_ipv6_access_list_any_cmd_vtysh, 
-       "no ipv6 access-list WORD (deny|permit) any", 
+DEFSH (0, no_debug_ripng_packet_cmd_vtysh, 
+       "no debug ripng packet", 
        "Negate a command or set its defaults\n"
-       "IPv6 information\n"
-       "Add an access list entry\n"
-       "IPv6 zebra access-list\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "Any prefixi to match\n")
+       "Debugging functions (see also 'undebug')\n"
+       "RIPng configuration\n"
+       "Debug option set for ripng packet\n")
 
-DEFSH (0, show_bgp_ipv4_encap_rd_neighbor_advertised_routes_cmd_vtysh, 
-       "show bgp ipv4 encap rd ASN:nn_or_IP-address:nn neighbors (A.B.C.D|X:X::X:X) advertised-routes", 
+DEFSH (0, show_bgp_ipv6_safi_neighbor_flap_cmd_vtysh, 
+       "show bgp ipv6 (encap|multicast|unicast|vpn) neighbors (A.B.C.D|X:X::X:X) flap-statistics", 
        "Show running system information\n"
        "BGP information\n"
-       "Address Family\n"
-       "Display ENCAP NLRI specific information\n"
-       "Display information for a route distinguisher\n"
-       "ENCAP Route Distinguisher\n"
+       "Address Family Modifier\n"
+       "Address Family Modifier\n"
+       "Address Family Modifier\n"
+       "Address Family Modifier\n"
        "Detailed information on TCP and BGP neighbor connections\n"
        "Neighbor to display information about\n"
        "Neighbor to display information about\n"
-       "Display the routes advertised to a BGP neighbor\n")
-
-DEFSH (0, no_ospf_priority_cmd_vtysh, 
-       "no ospf priority", 
-       "Negate a command or set its defaults\n"
-       "OSPF interface commands\n"
-       "Router priority\n")
+       "Display flap statistics of the routes learned from neighbor\n")
 
-DEFSH (0, show_ip_as_path_access_list_all_cmd_vtysh, 
-       "show ip as-path-access-list", 
-       "Show running system information\n"
-       "IP information\n"
-       "List AS path access lists\n")
+DEFSH (0, clear_bgp_ipv6_peer_group_soft_in_cmd_vtysh, 
+       "clear bgp ipv6 peer-group WORD soft in", 
+       "Reset functions\n"
+       "BGP information\n"
+       "Address family\n"
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       "Soft reconfig inbound and outbound updates\n"
+       "Send route-refresh unless using 'soft-reconfiguration inbound'\n")
 
-DEFSH (0, no_ospf_area_range_advertise_cmd_vtysh, 
-       "no area (A.B.C.D|<0-4294967295>) range A.B.C.D/M (advertise|not-advertise)", 
+DEFSH (0, no_bandwidth_if_val_cmd_vtysh, 
+       "no bandwidth <1-10000000>", 
        "Negate a command or set its defaults\n"
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Summarize routes matching address/mask (border routers only)\n"
-       "Area range prefix\n"
-       "Advertise this range (default)\n"
-       "DoNotAdvertise this range\n")
+       "Set bandwidth informational parameter\n"
+       "Bandwidth in kilobits\n")
 
-DEFSH (0, show_ipv6_ospf6_border_routers_detail_cmd_vtysh, 
-       "show ipv6 ospf6 border-routers (A.B.C.D|detail)", 
-       "Show running system information\n"
-       "IPv6 Information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Display routing table for ABR and ASBR\n"
-       "Specify Router-ID\n"
-       "Display Detail\n"
-      )
+DEFSH (0|0|0|0, ipv6_prefix_list_seq_le_cmd_vtysh, 
+       "ipv6 prefix-list WORD seq <1-4294967295> (deny|permit) X:X::X:X/M le <0-128>", 
+       "IPv6 information\n"
+       "Build a prefix list\n"
+       "Name of a prefix list\n"
+       "sequence number of an entry\n"
+       "Sequence number\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
+       "Maximum prefix length to be matched\n"
+       "Maximum prefix length\n")
 
-DEFSH (0, no_ip_route_flags_tag_distance_cmd_vtysh, 
-       "no ip route A.B.C.D/M (A.B.C.D|INTERFACE) (reject|blackhole) tag <1-4294967295> <1-255>", 
-       "Negate a command or set its defaults\n"
+DEFSH (0, ipv6_route_flags_pref_cmd_vtysh, 
+       "ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) (reject|blackhole) <1-255>", 
        "IP information\n"
        "Establish static routes\n"
-       "IP destination prefix (e.g. 10.0.0.0/8)\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
+       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
+       "IPv6 gateway address\n"
+       "IPv6 gateway interface name\n"
        "Emit an ICMP unreachable when matched\n"
        "Silently discard pkts when matched\n"
-       "Tag of this route\n"
-       "Tag value\n"
-       "Distance value for this route\n")
+       "Distance value for this prefix\n")
 
-DEFSH (0, ipv6_bgp_neighbor_advertised_route_cmd_vtysh, 
-       "show ipv6 bgp neighbors (A.B.C.D|X:X::X:X) advertised-routes", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "BGP information\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display the routes advertised to a BGP neighbor\n")
+DEFSH (0, ipv6_nd_homeagent_lifetime_cmd_vtysh, 
+       "ipv6 nd home-agent-lifetime <0-65520>", 
+       "Interface IPv6 config commands\n"
+       "Neighbor discovery\n"
+       "Home Agent lifetime\n"
+       "Home Agent lifetime in seconds (0 to track ra-lifetime)\n")
 
-DEFSH (0, no_ip_ospf_dead_interval_seconds_cmd_vtysh, 
-       "no ip ospf dead-interval <1-65535>", 
+DEFSH (0, no_ip_ssmpingd_cmd_vtysh, 
+       "no ip ssmpingd [A.B.C.D]", 
        "Negate a command or set its defaults\n"
-       "IP Information\n"
+       "IP information\n"
+       "Enable ssmpingd operation\n"
+       "Source address\n")
+
+DEFSH (0, clear_bgp_ipv6_external_soft_in_cmd_vtysh, 
+       "clear bgp ipv6 external soft in", 
+       "Reset functions\n"
+       "BGP information\n"
+       "Address family\n"
+       "Clear all external peers\n"
+       "Soft reconfig inbound and outbound updates\n"
+       "Send route-refresh unless using 'soft-reconfiguration inbound'\n")
+
+DEFSH (0, ospf_dead_interval_cmd_vtysh, 
+       "ospf dead-interval <1-65535>", 
        "OSPF interface commands\n"
        "Interval after which a neighbor is declared dead\n"
        "Seconds\n")
 
-DEFSH (0, ospf_area_vlink_authtype_md5_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(authentication|) "
-       "(message-digest-key|) <1-255> md5 KEY", 
-       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
-       "Enable authentication on this virtual link\n" "dummy string \n"
-       "Message digest authentication password (key)\n" "dummy string \n" "Key ID\n" "Use MD5 algorithm\n" "The OSPF password (key)")
+DEFSH (0, no_aggregate_address_summary_only_cmd_vtysh, 
+       "no aggregate-address A.B.C.D/M summary-only", 
+       "Negate a command or set its defaults\n"
+       "Configure BGP aggregate entries\n"
+       "Aggregate prefix\n"
+       "Filter more specific routes from updates\n")
 
-DEFSH (0, show_bgp_ipv4_community3_exact_cmd_vtysh, 
-       "show bgp ipv4 community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
-       "Show running system information\n"
-       "BGP information\n"
+DEFSH (0, ipv6_route_ifname_pref_tag_vrf_cmd_vtysh, 
+       "ipv6 route X:X::X:X/M X:X::X:X INTERFACE tag <1-4294967295> <1-255>" "vrf <0-65535>", 
        "IP information\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
+       "Establish static routes\n"
+       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
+       "IPv6 gateway address\n"
+       "IPv6 gateway interface name\n"
+       "Set tag for this route\n"
+       "Tag value\n"
+       "Distance value for this prefix\n"
+       "Specify the VRF\nThe VRF ID\n")
 
-DEFSH (0, no_debug_isis_err_cmd_vtysh, 
-       "no debug isis protocol-errors", 
-       "Disable debugging functions (see also 'debug')\n"
-       "IS-IS information\n"
-       "IS-IS LSP protocol errors\n")
+DEFSH (0, rip_distance_cmd_vtysh, 
+       "distance <1-255>", 
+       "Administrative distance\n"
+       "Distance value\n")
 
-DEFSH (0, ipv6_nd_prefix_val_rev_cmd_vtysh, 
-       "ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) "
-       "(<0-4294967295>|infinite) (no-autoconfig|) (off-link|)", 
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n"
-       "Valid lifetime in seconds\n"
-       "Infinite valid lifetime\n"
-       "Preferred lifetime in seconds\n"
-       "Infinite preferred lifetime\n"
-       "Do not use prefix for autoconfiguration\n"
-       "Do not use prefix for onlink determination\n")
+DEFSH (0, show_bgp_community_list_exact_cmd_vtysh, 
+       "show bgp community-list (<1-500>|WORD) exact-match", 
+       "Show running system information\n"
+       "BGP information\n"
+       "Display routes matching the community-list\n"
+       "community-list number\n"
+       "community-list name\n"
+       "Exact match of the communities\n")
 
-DEFSH (0, ip_route_flags_vrf_cmd_vtysh, 
-       "ip route A.B.C.D/M (A.B.C.D|INTERFACE) (reject|blackhole) " "vrf <0-65535>", 
+DEFSH (0, no_ipv6_route_flags_pref_tag_cmd_vtysh, 
+       "no ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) (reject|blackhole) tag <1-4294967295> <1-255>", 
+       "Negate a command or set its defaults\n"
        "IP information\n"
        "Establish static routes\n"
-       "IP destination prefix (e.g. 10.0.0.0/8)\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
+       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
+       "IPv6 gateway address\n"
+       "IPv6 gateway interface name\n"
        "Emit an ICMP unreachable when matched\n"
        "Silently discard pkts when matched\n"
-       "Specify the VRF\nThe VRF ID\n")
-
-DEFSH (0, ripng_offset_list_cmd_vtysh, 
-       "offset-list WORD (in|out) <0-16>", 
-       "Modify RIPng metric\n"
-       "Access-list name\n"
-       "For incoming updates\n"
-       "For outgoing updates\n"
-       "Metric value\n")
+       "Set tag for this route\n"
+       "Tag value\n"
+       "Distance value for this prefix\n")
 
-DEFSH (0, no_debug_pim_zebra_cmd_vtysh, 
-       "no debug pim zebra", 
-       "Negate a command or set its defaults\n"
+DEFSH (0, debug_zebra_fpm_cmd_vtysh, 
+       "debug zebra fpm", 
        "Debugging functions (see also 'undebug')\n"
-       "PIM protocol activity\n"
-       "ZEBRA protocol activity\n")
-
-DEFSH (0, no_key_chain_cmd_vtysh, 
-       "no key chain WORD", 
-       "Negate a command or set its defaults\n"
-       "Authentication key management\n"
-       "Key-chain management\n"
-       "Key-chain name\n")
-
-DEFSH (0, bgp_distance_source_access_list_cmd_vtysh, 
-       "distance <1-255> A.B.C.D/M WORD", 
-       "Define an administrative distance\n"
-       "Administrative distance\n"
-       "IP source prefix\n"
-       "Access list name\n")
+       "Zebra configuration\n"
+       "Debug zebra FPM events\n")
 
-DEFSH (0, send_lifetime_infinite_day_month_cmd_vtysh, 
-       "send-lifetime HH:MM:SS <1-31> MONTH <1993-2035> infinite", 
-       "Set send lifetime of the key\n"
-       "Time to start\n"
-       "Day of th month to start\n"
-       "Month of the year to start\n"
-       "Year to start\n"
-       "Never expires")
+DEFSH (0, show_bgp_ipv4_vpn_rd_neighbor_advertised_routes_cmd_vtysh, 
+       "show bgp ipv4 vpn rd ASN:nn_or_IP-address:nn neighbors (A.B.C.D|X:X::X:X) advertised-routes", 
+       "Show running system information\n"
+       "BGP information\n"
+       "Address Family\n"
+       "Display VPN NLRI specific information\n"
+       "Display information for a route distinguisher\n"
+       "VPN Route Distinguisher\n"
+       "Detailed information on TCP and BGP neighbor connections\n"
+       "Neighbor to display information about\n"
+       "Neighbor to display information about\n"
+       "Display the routes advertised to a BGP neighbor\n")
 
-DEFSH (0, ospf_max_metric_router_lsa_shutdown_cmd_vtysh, 
-       "max-metric router-lsa on-shutdown <5-86400>", 
-       "OSPF maximum / infinite-distance metric\n"
-       "Advertise own Router-LSA with infinite distance (stub router)\n"
-       "Advertise stub-router prior to full shutdown of OSPF\n"
-       "Time (seconds) to wait till full shutdown\n")
+DEFSH (0, clear_bgp_ipv6_peer_group_out_cmd_vtysh, 
+       "clear bgp ipv6 peer-group WORD out", 
+       "Reset functions\n"
+       "BGP information\n"
+       "Address family\n"
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       "Resend all outbound updates\n")
 
-DEFSH (0, interface_ip_pim_hello_cmd_vtysh, 
-       "ip pim hello <1-180>", 
+DEFSH (0, show_ip_bgp_ipv4_lcommunity2_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) large-community (AA:BB:CC) (AA:BB:CC)", 
+       "Show running system information\n"
        "IP information\n"
-       "PIM information\n"
-       "Hello Interval\n"
-       "Time in seconds for Hello Interval\n")
-
-DEFSH (0, link_params_maxbw_cmd_vtysh, 
-       "max-bw BANDWIDTH", 
-       "Maximum bandwidth that can be used\n"
-       "Bytes/second (IEEE floating point format)\n")
+       "BGP information\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Display routes matching the large-communities\n"
+       "large-community number\n"
+       "large-community number\n")
 
-DEFSH (0, no_match_peer_cmd_vtysh, 
-       "no match peer", 
-       "Negate a command or set its defaults\n"
-       "Match values from routing table\n"
-       "Match peer address\n")
+DEFSH (0, ipv6_ospf6_cost_cmd_vtysh, 
+       "ipv6 ospf6 cost <1-65535>", 
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Interface cost\n"
+       "Outgoing metric of this interface\n"
+       )
 
-DEFSH (0, show_bgp_instance_neighbors_peer_cmd_vtysh, 
-       "show bgp view WORD neighbors (A.B.C.D|X:X::X:X)", 
+DEFSH (0, show_bgp_ipv4_safi_neighbor_advertised_route_cmd_vtysh, 
+       "show bgp ipv4 (multicast|unicast) neighbors (A.B.C.D|X:X::X:X) advertised-routes", 
        "Show running system information\n"
        "BGP information\n"
-       "BGP view\n"
-       "View name\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
        "Detailed information on TCP and BGP neighbor connections\n"
        "Neighbor to display information about\n"
-       "Neighbor to display information about\n")
-
-DEFSH (0, ip_ospf_dead_interval_minimal_cmd_vtysh, 
-       "ip ospf dead-interval minimal hello-multiplier <1-10>", 
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Interval after which a neighbor is declared dead\n"
-       "Minimal 1s dead-interval with fast sub-second hellos\n"
-       "Hello multiplier factor\n"
-       "Number of Hellos to send each second\n")
-
-DEFSH (0, ipv6_nd_suppress_ra_cmd_vtysh, 
-       "ipv6 nd suppress-ra", 
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Suppress Router Advertisement\n")
+       "Neighbor to display information about\n"
+       "Display the routes advertised to a BGP neighbor\n")
 
-DEFSH (0, show_debugging_isis_cmd_vtysh, 
-       "show debugging isis", 
+DEFSH (0, show_bgp_ipv4_safi_rd_prefix_cmd_vtysh, 
+       "show bgp ipv4 (encap|vpn) rd ASN:nn_or_IP-address:nn A.B.C.D/M", 
        "Show running system information\n"
-       "State of each debugging option\n")
+       "BGP information\n"
+       "Address Family\n"
+       "Address Family Modifier\n"
+       "Address Family Modifier\n"
+       "Display information for a route distinguisher\n"
+       "ENCAP Route Distinguisher\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
 
-DEFSH (0, show_ipv6_route_summary_cmd_vtysh, 
-       "show ipv6 route summary", 
-       "Show running system information\n"
-       "IP information\n"
-       "IPv6 routing table\n"
-       "Summary of all IPv6 routes\n")
+DEFSH (0, clear_bgp_ipv6_all_in_prefix_filter_cmd_vtysh, 
+       "clear bgp ipv6 * in prefix-filter", 
+       "Reset functions\n"
+       "BGP information\n"
+       "Address family\n"
+       "Clear all peers\n"
+       "Send route-refresh unless using 'soft-reconfiguration inbound'\n"
+       "Push out prefix-list ORF and do inbound soft reconfig\n")
 
-DEFSH (0, isis_passive_cmd_vtysh, 
-       "isis passive", 
-       "IS-IS commands\n"
-       "Configure the passive mode for interface\n")
+DEFSH (0, debug_ospf6_interface_cmd_vtysh, 
+       "debug ospf6 interface", 
+       "Debugging functions (see also 'undebug')\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Debug OSPFv3 Interface\n"
+      )
 
-DEFSH (0, no_neighbor_remove_private_as_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "remove-private-AS", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Remove private AS number from outbound updates\n")
+DEFSH (0, ip_route_mask_flags_tag_vrf_cmd_vtysh, 
+       "ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE) (reject|blackhole) tag <1-4294967295>" "vrf <0-65535>", 
+       "IP information\n"
+       "Establish static routes\n"
+       "IP destination prefix\n"
+       "IP destination prefix mask\n"
+       "IP gateway address\n"
+       "IP gateway interface name\n"
+       "Emit an ICMP unreachable when matched\n"
+       "Silently discard pkts when matched\n"
+       "Set tag for this route\n"
+       "Tag value\n"
+       "Specify the VRF\nThe VRF ID\n")
 
-DEFSH (0, ipv6_route_flags_tag_cmd_vtysh, 
-       "ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) (reject|blackhole) tag <1-4294967295>", 
+DEFSH (0, ipv6_route_ifname_flags_pref_tag_vrf_cmd_vtysh, 
+       "ipv6 route X:X::X:X/M X:X::X:X INTERFACE (reject|blackhole) tag <1-4294967295> <1-255>" "vrf <0-65535>", 
        "IP information\n"
        "Establish static routes\n"
        "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
@@ -294,130 +254,114 @@ DEFSH (0, ipv6_route_flags_tag_cmd_vtysh,
        "Emit an ICMP unreachable when matched\n"
        "Silently discard pkts when matched\n"
        "Set tag for this route\n"
-       "Tag value\n")
+       "Tag value\n"
+       "Distance value for this prefix\n"
+       "Specify the VRF\nThe VRF ID\n")
 
-DEFSH (0, ipv6_bgp_neighbor_routes_cmd_vtysh, 
-       "show ipv6 bgp neighbors (A.B.C.D|X:X::X:X) routes", 
+DEFSH (0, show_bgp_route_map_cmd_vtysh, 
+       "show bgp route-map WORD", 
        "Show running system information\n"
-       "IPv6 information\n"
        "BGP information\n"
+       "Display routes matching the route-map\n"
+       "A route-map to match on\n")
+
+DEFSH (0, ipv6_mbgp_neighbor_received_routes_cmd_vtysh, 
+       "show ipv6 mbgp neighbors (A.B.C.D|X:X::X:X) received-routes", 
+       "Show running system information\n"
+       "IPv6 information\n"
+       "MBGP information\n"
        "Detailed information on TCP and BGP neighbor connections\n"
        "Neighbor to display information about\n"
        "Neighbor to display information about\n"
-       "Display routes learned from neighbor\n")
+       "Display the received routes from neighbor\n")
 
-DEFSH (0, show_bgp_ipv4_safi_prefix_list_cmd_vtysh, 
-       "show bgp ipv4 (encap|multicast|unicast|vpn) prefix-list WORD", 
+DEFSH (0, show_bgp_view_neighbor_received_routes_cmd_vtysh, 
+       "show bgp view WORD neighbors (A.B.C.D|X:X::X:X) received-routes", 
        "Show running system information\n"
        "BGP information\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Display routes conforming to the prefix-list\n"
-       "IP prefix-list name\n")
+       "BGP view\n"
+       "View name\n"
+       "Detailed information on TCP and BGP neighbor connections\n"
+       "Neighbor to display information about\n"
+       "Neighbor to display information about\n"
+       "Display the received routes from neighbor\n")
 
-DEFSH (0, no_debug_ospf_packet_all_cmd_vtysh, 
-       "no debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all)", 
+DEFSH (0, no_set_ecommunity_soo_cmd_vtysh, 
+       "no set extcommunity soo", 
        "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
-       "OSPF information\n"
-       "OSPF packets\n"
-       "OSPF Hello\n"
-       "OSPF Database Description\n"
-       "OSPF Link State Request\n"
-       "OSPF Link State Update\n"
-       "OSPF Link State Acknowledgment\n"
-       "OSPF all packets\n")
+       "Set values in destination routing protocol\n"
+       "BGP extended community attribute\n"
+       "Site-of-Origin extended community\n")
 
-DEFSH (0, show_ipv6_bgp_community2_exact_cmd_vtysh, 
-       "show ipv6 bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
-       "Show running system information\n"
-       "IPv6 information\n"
+DEFSH (0, debug_bgp_zebra_cmd_vtysh, 
+       "debug bgp zebra", 
+       "Debugging functions (see also 'undebug')\n"
        "BGP information\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
+       "BGP Zebra messages\n")
 
-DEFSH (0, clear_ip_bgp_external_soft_out_cmd_vtysh, 
-       "clear ip bgp external soft out", 
+DEFSH (0, no_ripng_redistribute_type_metric_cmd_vtysh, 
+       "no redistribute " "(kernel|connected|static|ospf6|isis|bgp|babel|nhrp)" " metric <0-16>", 
+       "Negate a command or set its defaults\n"
+       "Redistribute\n"
+       "Kernel routes (not installed via the zebra RIB)\n" "Connected routes (directly attached subnet or host)\n" "Statically configured routes\n" "Open Shortest Path First (IPv6) (OSPFv3)\n" "Intermediate System to Intermediate System (IS-IS)\n" "Border Gateway Protocol (BGP)\n" "Babel routing protocol (Babel)\n" "Next Hop Resolution Protocol (NHRP)\n"
+       "Metric\n"
+       "Metric value\n")
+
+DEFSH (0, clear_ip_bgp_peer_group_ipv4_soft_cmd_vtysh, 
+       "clear ip bgp peer-group WORD ipv4 (unicast|multicast) soft", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "Clear all external peers\n"
-       "Soft reconfig inbound and outbound updates\n"
-       "Resend all outbound updates\n")
-
-DEFSH (0, ospf_auto_cost_reference_bandwidth_cmd_vtysh, 
-       "auto-cost reference-bandwidth <1-4294967>", 
-       "Calculate OSPF interface cost according to bandwidth\n"
-       "Use reference bandwidth method to assign OSPF cost\n"
-       "The reference bandwidth in terms of Mbits per second\n")
-
-DEFSH (0, undebug_bgp_filter_cmd_vtysh, 
-       "undebug bgp filters", 
-       "Disable debugging functions (see also 'debug')\n"
-       "BGP information\n"
-       "BGP filters\n")
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Soft reconfig inbound and outbound updates\n")
 
-DEFSH (0, no_set_metric_type_cmd_vtysh, 
-       "no set metric-type", 
-       "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "Type of metric for destination routing protocol\n")
+DEFSH (0, debug_isis_adj_cmd_vtysh, 
+       "debug isis adj-packets", 
+       "Debugging functions (see also 'undebug')\n"
+       "IS-IS information\n"
+       "IS-IS Adjacency related packets\n")
 
-DEFSH (0, no_rip_default_metric_val_cmd_vtysh, 
-       "no default-metric <1-16>", 
-       "Negate a command or set its defaults\n"
-       "Set a metric of redistribute routes\n"
-       "Default metric\n")
+DEFSH (0, interface_ip_pim_ssm_cmd_vtysh, 
+       "ip pim ssm", 
+       "IP information\n"
+       "PIM information\n"
+       "Enable PIM SSM operation\n")
 
-DEFSH (0, show_ip_bgp_flap_cidr_only_cmd_vtysh, 
-       "show ip bgp flap-statistics cidr-only", 
+DEFSH (0, show_bgp_rsclient_cmd_vtysh, 
+       "show bgp rsclient (A.B.C.D|X:X::X:X)", 
        "Show running system information\n"
-       "IP information\n"
        "BGP information\n"
-       "Display flap statistics of routes\n"
-       "Display only routes with non-natural netmasks\n")
-
-DEFSH (0, show_isis_summary_cmd_vtysh, 
-       "show isis summary", 
-       "Show running system information\n" "IS-IS information\n" "IS-IS summary\n")
+       "Information about Route Server Client\n"
+       "Neighbor address\nIPv6 address\n")
 
-DEFSH (0, neighbor_capability_orf_prefix_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "capability orf prefix-list (both|send|receive)", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Advertise capability to the peer\n"
-       "Advertise ORF capability to the peer\n"
-       "Advertise prefixlist ORF capability to this neighbor\n"
-       "Capability to SEND and RECEIVE the ORF to/from this neighbor\n"
-       "Capability to RECEIVE the ORF from this neighbor\n"
-       "Capability to SEND the ORF to this neighbor\n")
+DEFSH (0, ip_route_tag_distance_cmd_vtysh, 
+       "ip route A.B.C.D/M (A.B.C.D|INTERFACE|null0) tag <1-4294967295> <1-255>", 
+       "IP information\n"
+       "Establish static routes\n"
+       "IP destination prefix (e.g. 10.0.0.0/8)\n"
+       "IP gateway address\n"
+       "IP gateway interface name\n"
+       "Null interface\n"
+       "Set tag for this route\n"
+       "Tag value\n"
+       "Distance value for this route\n")
 
-DEFSH (0, no_set_aspath_exclude_val_cmd_vtysh, 
-       "no set as-path exclude ." "<1-4294967295>", 
+DEFSH (0, no_ipv6_nd_ra_interval_msec_val_cmd_vtysh, 
+       "no ipv6 nd ra-interval msec <1-1800000>", 
        "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "Transform BGP AS_PATH attribute\n"
-       "Exclude from the as-path\n"
-       "AS number\n")
+       "Interface IPv6 config commands\n"
+       "Neighbor discovery\n"
+       "Router Advertisement interval\n"
+       "Router Advertisement interval in milliseconds\n")
 
-DEFSH (0, show_bgp_ipv4_safi_community2_exact_cmd_vtysh, 
-       "show bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
+DEFSH (0, show_bgp_community2_cmd_vtysh, 
+       "show bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
        "Show running system information\n"
        "BGP information\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
        "Display routes matching the communities\n"
        "community number\n"
        "Do not send outside local AS (well-known community)\n"
@@ -426,1165 +370,1341 @@ DEFSH (0, show_bgp_ipv4_safi_community2_exact_cmd_vtysh,
        "community number\n"
        "Do not send outside local AS (well-known community)\n"
        "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
+       "Do not export to next AS (well-known community)\n")
 
-DEFSH (0, no_match_aspath_cmd_vtysh, 
-       "no match as-path", 
+DEFSH (0, no_bgp_default_ipv4_unicast_cmd_vtysh, 
+       "no bgp default ipv4-unicast", 
        "Negate a command or set its defaults\n"
-       "Match values from routing table\n"
-       "Match BGP AS path list\n")
+       "BGP specific commands\n"
+       "Configure BGP defaults\n"
+       "Activate ipv4-unicast for a peer by default\n")
 
-DEFSH (0, clear_ip_bgp_peer_group_out_cmd_vtysh, 
-       "clear ip bgp peer-group WORD out", 
-       "Reset functions\n"
+DEFSH (0, ip_rip_split_horizon_cmd_vtysh, 
+       "ip rip split-horizon", 
        "IP information\n"
-       "BGP information\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n"
-       "Resend all outbound updates\n")
-
-DEFSH (0, rip_version_cmd_vtysh, 
-       "version <1-2>", 
-       "Set routing protocol version\n"
-       "version\n")
-
-DEFSH (0, no_debug_isis_lupd_cmd_vtysh, 
-       "no debug isis local-updates", 
-       "Disable debugging functions (see also 'debug')\n"
-       "IS-IS information\n"
-       "IS-IS local update packets\n")
-
-DEFSH (0, show_bgp_ipv6_neighbor_damp_cmd_vtysh, 
-       "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X) dampened-routes", 
-       "Show running system information\n"
-       "BGP information\n"
-       "Address family\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display the dampened routes received from neighbor\n")
-
-DEFSH (0, show_bgp_view_cmd_vtysh, 
-       "show bgp view WORD", 
-       "Show running system information\n"
-       "BGP information\n"
-       "BGP view\n"
-       "View name\n")
-
-DEFSH (0, access_list_extended_host_host_cmd_vtysh, 
-       "access-list (<100-199>|<2000-2699>) (deny|permit) ip host A.B.C.D host A.B.C.D", 
-       "Add an access list entry\n"
-       "IP extended access list\n"
-       "IP extended access list (expanded range)\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "Any Internet Protocol\n"
-       "A single source host\n"
-       "Source address\n"
-       "A single destination host\n"
-       "Destination address\n")
+       "Routing Information Protocol\n"
+       "Perform split horizon\n")
 
-DEFSH (0, show_bgp_view_route_cmd_vtysh, 
-       "show bgp view WORD X:X::X:X", 
+DEFSH (0, show_bgp_view_ipv6_safi_rsclient_cmd_vtysh, 
+       "show bgp view WORD ipv6 (unicast|multicast) rsclient (A.B.C.D|X:X::X:X)", 
        "Show running system information\n"
        "BGP information\n"
        "BGP view\n"
        "View name\n"
-       "Network in the BGP routing table to display\n")
-
-DEFSH (0, no_rip_redistribute_type_cmd_vtysh, 
-       "no redistribute " "(kernel|connected|static|ospf|isis|bgp|pim|babel|nhrp)", 
-       "Negate a command or set its defaults\n"
-       "Redistribute information from another routing protocol\n"
-       "Kernel routes (not installed via the zebra RIB)\n" "Connected routes (directly attached subnet or host)\n" "Statically configured routes\n" "Open Shortest Path First (OSPFv2)\n" "Intermediate System to Intermediate System (IS-IS)\n" "Border Gateway Protocol (BGP)\n" "Protocol Independent Multicast (PIM)\n" "Babel routing protocol (Babel)\n" "Next Hop Resolution Protocol (NHRP)\n")
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Information about Route Server Client\n"
+       "Neighbor address\nIPv6 address\n")
 
-DEFSH (0, interface_no_ip_igmp_cmd_vtysh, 
-       "no ip igmp", 
-       "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Enable IGMP operation\n")
+DEFSH (0, aggregate_address_summary_only_cmd_vtysh, 
+       "aggregate-address A.B.C.D/M summary-only", 
+       "Configure BGP aggregate entries\n"
+       "Aggregate prefix\n"
+       "Filter more specific routes from updates\n")
 
-DEFSH (0, no_ipv6_nd_other_config_flag_cmd_vtysh, 
-       "no ipv6 nd other-config-flag", 
-       "Negate a command or set its defaults\n"
+DEFSH (0, ipv6_nd_prefix_val_noauto_cmd_vtysh, 
+       "ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) "
+       "(<0-4294967295>|infinite) (no-autoconfig|)", 
        "Interface IPv6 config commands\n"
        "Neighbor discovery\n"
-       "Other statefull configuration flag\n")
+       "Prefix information\n"
+       "IPv6 prefix\n"
+       "Valid lifetime in seconds\n"
+       "Infinite valid lifetime\n"
+       "Preferred lifetime in seconds\n"
+       "Infinite preferred lifetime\n"
+       "Do not use prefix for autoconfiguration")
 
-DEFSH (0, ospf6_distance_ospf6_intra_external_cmd_vtysh, 
-       "distance ospf6 intra-area <1-255> external <1-255>", 
-       "Define an administrative distance\n"
-       "OSPF6 Administrative distance\n"
-       "Intra-area routes\n"
-       "Distance for intra-area routes\n"
-       "External routes\n"
-       "Distance for external routes\n")
+DEFSH (0, pce_address_cmd_vtysh, 
+       "pce address A.B.C.D", 
+       "PCE Router Information specific commands\n"
+       "Stable IP address of the PCE\n"
+       "PCE address in IPv4 address format\n")
 
-DEFSH (0, ip_route_mask_flags_vrf_cmd_vtysh, 
-       "ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE) (reject|blackhole) " "vrf <0-65535>", 
+DEFSH (0, clear_ip_bgp_all_encap_soft_in_cmd_vtysh, 
+       "clear ip bgp * encap unicast soft in", 
+       "Reset functions\n"
        "IP information\n"
-       "Establish static routes\n"
-       "IP destination prefix\n"
-       "IP destination prefix mask\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
-       "Emit an ICMP unreachable when matched\n"
-       "Silently discard pkts when matched\n"
-       "Specify the VRF\nThe VRF ID\n")
+       "BGP information\n"
+       "Clear all peers\n"
+       "Address family\n"
+       "Address Family Modifier\n"
+       "Soft reconfig\n"
+       "Soft reconfig inbound update\n")
 
-DEFSH (0, no_neighbor_strict_capability_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X) " "strict-capability-match", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nIPv6 address\n"
-       "Strict capability negotiation match\n")
+DEFSH (0, show_ip_bgp_route_cmd_vtysh, 
+       "show ip bgp A.B.C.D", 
+       "Show running system information\n"
+       "IP information\n"
+       "BGP information\n"
+       "Network in the BGP routing table to display\n")
 
-DEFSH (0, no_router_ospf6_cmd_vtysh, 
-       "no router ospf6", 
+DEFSH (0, no_isis_hello_multiplier_l2_cmd_vtysh, 
+       "no isis hello-multiplier level-2", 
        "Negate a command or set its defaults\n"
-       "Enable a routing process\n")
-
-DEFSH (0, no_ospf6_log_adjacency_changes_detail_cmd_vtysh, 
-       "no log-adjacency-changes detail", 
-              "Negate a command or set its defaults\n"
-              "Log changes in adjacency state\n"
-       "Log all state changes\n")
+       "IS-IS commands\n"
+       "Set multiplier for Hello holding time\n"
+       "Specify hello multiplier for level-2 IIHs\n")
 
-DEFSH (0, show_ipv6_mbgp_prefix_longer_cmd_vtysh, 
-       "show ipv6 mbgp X:X::X:X/M longer-prefixes", 
+DEFSH (0, show_ipv6_mbgp_community4_cmd_vtysh, 
+       "show ipv6 mbgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
        "Show running system information\n"
        "IPv6 information\n"
        "MBGP information\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
-       "Display route and more specific routes\n")
+       "Display routes matching the communities\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n")
 
-DEFSH (0|0|0|0|0, match_ip_address_prefix_list_cmd_vtysh, 
-       "match ip address prefix-list WORD", 
-       "Match values from routing table\n"
+DEFSH (0, no_ip_route_flags_distance2_cmd_vtysh, 
+       "no ip route A.B.C.D/M (reject|blackhole) <1-255>", 
+       "Negate a command or set its defaults\n"
        "IP information\n"
-       "Match address of route\n"
-       "Match entries of prefix-lists\n"
-       "IP prefix-list name\n")
+       "Establish static routes\n"
+       "IP destination prefix (e.g. 10.0.0.0/8)\n"
+       "Emit an ICMP unreachable when matched\n"
+       "Silently discard pkts when matched\n"
+       "Distance value for this route\n")
 
-DEFSH (0, show_ip_bgp_view_rsclient_prefix_cmd_vtysh, 
-       "show ip bgp view WORD rsclient (A.B.C.D|X:X::X:X) A.B.C.D/M", 
+DEFSH (0, no_debug_rip_zebra_cmd_vtysh, 
+       "no debug rip zebra", 
+       "Negate a command or set its defaults\n"
+       "Debugging functions (see also 'undebug')\n"
+       "RIP information\n"
+       "RIP and ZEBRA communication\n")
+
+DEFSH (0, show_ipv6_mbgp_community_list_exact_cmd_vtysh, 
+       "show ipv6 mbgp community-list WORD exact-match", 
        "Show running system information\n"
+       "IPv6 information\n"
+       "MBGP information\n"
+       "Display routes matching the community-list\n"
+       "community-list name\n"
+       "Exact match of the communities\n")
+
+DEFSH (0, ospf_distance_cmd_vtysh, 
+       "distance <1-255>", 
+       "Define an administrative distance\n"
+       "OSPF Administrative distance\n")
+
+DEFSH (0, no_rip_distance_source_cmd_vtysh, 
+       "no distance <1-255> A.B.C.D/M", 
+       "Negate a command or set its defaults\n"
+       "Administrative distance\n"
+       "Distance value\n"
+       "IP source prefix\n")
+
+DEFSH (0, spf_interval_l2_cmd_vtysh, 
+       "spf-interval level-2 <1-120>", 
+       "Minimum interval between SPF calculations\n"
+       "Set interval for level 2 only\n"
+       "Minimum interval between consecutive SPFs in seconds\n")
+
+DEFSH (0, aggregate_address_mask_cmd_vtysh, 
+       "aggregate-address A.B.C.D A.B.C.D", 
+       "Configure BGP aggregate entries\n"
+       "Aggregate address\n"
+       "Aggregate mask\n")
+
+DEFSH (0, no_ip_lcommunity_list_expanded_cmd_vtysh, 
+       "no ip large-community-list <100-500> (deny|permit) .LINE", 
+       "Negate a command or set its defaults\n"
        "IP information\n"
-       "BGP information\n"
-       "BGP view\n"
-       "View name\n"
-       "Information about Route Server Client\n"
-       "Neighbor address\nIPv6 address\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
+       "Add a large community list entry\n"
+       "Large Community list number (expanded)\n"
+       "Specify large community to reject\n"
+       "Specify large community to accept\n"
+       "An ordered list as a regular-expression\n")
 
-DEFSH (0, clear_ip_bgp_instance_all_soft_out_cmd_vtysh, 
-       "clear ip bgp view WORD * soft out", 
-       "Reset functions\n"
+DEFSH (0, ipv6_route_tag_cmd_vtysh, 
+       "ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) tag <1-4294967295>", 
        "IP information\n"
+       "Establish static routes\n"
+       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
+       "IPv6 gateway address\n"
+       "IPv6 gateway interface name\n"
+       "Set tag for this route\n"
+       "Tag value\n")
+
+DEFSH (0, no_spf_interval_l2_cmd_vtysh, 
+       "no spf-interval level-2", 
+       "Negate a command or set its defaults\n"
+       "Minimum interval between SPF calculations\n"
+       "Set interval for level 2 only\n")
+
+DEFSH (0, show_bgp_view_afi_safi_lcommunity4_cmd_vtysh, 
+       "show bgp view WORD (ipv4|ipv6) (unicast|multicast) large-community (AA:BB:CC) (AA:BB:CC) (AA:BB:CC) (AA:BB:CC)", 
+       "Show running system information\n"
        "BGP information\n"
        "BGP view\n"
-       "view name\n"
-       "Clear all peers\n"
-       "Soft reconfig inbound and outbound updates\n"
-       "Resend all outbound updates\n")
+       "View name\n"
+       "Address family\n"
+       "Address family\n"
+       "Address family modifier\n"
+       "Address family modifier\n"
+       "Display routes matching the large-communities\n"
+       "large-community number\n"
+       "large-community number\n"
+       "large-community number\n"
+       "large-community number\n")
 
-DEFSH (0, show_bgp_ipv4_safi_neighbor_advertised_route_cmd_vtysh, 
-       "show bgp ipv4 (multicast|unicast) neighbors (A.B.C.D|X:X::X:X) advertised-routes", 
+DEFSH (0, show_bgp_ipv6_safi_rsclient_prefix_cmd_vtysh, 
+       "show bgp ipv6 (unicast|multicast) rsclient (A.B.C.D|X:X::X:X) X:X::X:X/M", 
        "Show running system information\n"
        "BGP information\n"
+       "Address family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
+       "Information about Route Server Client\n"
+       "Neighbor address\nIPv6 address\n"
+       "IP prefix <network>/<length>,  e.g.,  3ffe::/16\n")
+
+DEFSH (0, no_neighbor_allowas_in_cmd_vtysh, 
+       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "allowas-in", 
+       "Negate a command or set its defaults\n"
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
+       "allow local ASN appears in aspath attribute\n")
+
+DEFSH (0, show_ip_bgp_view_neighbor_advertised_route_cmd_vtysh, 
+       "show ip bgp view WORD neighbors (A.B.C.D|X:X::X:X) advertised-routes", 
+       "Show running system information\n"
+       "IP information\n"
+       "BGP information\n"
+       "BGP view\n"
+       "View name\n"
        "Detailed information on TCP and BGP neighbor connections\n"
        "Neighbor to display information about\n"
        "Neighbor to display information about\n"
        "Display the routes advertised to a BGP neighbor\n")
 
-DEFSH (0, clear_ip_bgp_as_encap_soft_in_cmd_vtysh, 
-       "clear ip bgp " "<1-4294967295>" " encap unicast soft in", 
+DEFSH (0, clear_ip_bgp_peer_group_ipv4_out_cmd_vtysh, 
+       "clear ip bgp peer-group WORD ipv4 (unicast|multicast) out", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "Clear peers with the AS number\n"
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
        "Address family\n"
        "Address Family modifier\n"
-       "Soft reconfig\n"
-       "Soft reconfig inbound update\n")
+       "Address Family modifier\n"
+       "Resend all outbound updates\n")
 
-DEFSH (0, neighbor_route_map_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "route-map WORD (in|out|import|export)", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Apply route map to neighbor\n"
-       "Name of route map\n"
-       "Apply map to incoming routes\n"
-       "Apply map to outbound routes\n"
-       "Apply map to routes going into a Route-Server client's table\n"
-       "Apply map to routes coming from a Route-Server client")
+DEFSH (0, no_set_vpnv4_nexthop_val_cmd_vtysh, 
+       "no set vpnv4 next-hop A.B.C.D", 
+       "Negate a command or set its defaults\n"
+       "Set values in destination routing protocol\n"
+       "VPNv4 information\n"
+       "VPNv4 next-hop address\n"
+       "IP address of next hop\n")
 
-DEFSH (0, show_bgp_ipv6_safi_damp_flap_prefix_cmd_vtysh, 
-       "show bgp ipv6 (encap|multicast|unicast|vpn) dampening flap-statistics X:X::X:X/M", 
+DEFSH (0, show_ipv6_bgp_lcommunity3_cmd_vtysh, 
+       "show ipv6 bgp large-community (AA:BB:CC) (AA:BB:CC) (AA:BB:CC)", 
        "Show running system information\n"
+       "IPv6 information\n"
        "BGP information\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Display detailed information about dampening\n"
-       "Display flap statistics of routes\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
+       "Display routes matching the large-communities\n"
+       "large-community number\n"
+       "large-community number\n"
+       "large-community number\n")
 
-DEFSH (0, clear_bgp_ipv6_as_in_cmd_vtysh, 
-       "clear bgp ipv6 " "<1-4294967295>" " in", 
+DEFSH (0, no_neighbor_attr_unchanged10_cmd_vtysh, 
+       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "attribute-unchanged med as-path next-hop", 
+       "Negate a command or set its defaults\n"
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
+       "BGP attribute is propagated unchanged to this neighbor\n"
+       "Med attribute\n"
+       "As-path attribute\n"
+       "Nexthop attribute\n")
+
+DEFSH (0, clear_ip_bgp_instance_all_soft_in_cmd_vtysh, 
+       "clear ip bgp view WORD * soft in", 
        "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
-       "Address family\n"
-       "Clear peers with the AS number\n"
+       "BGP view\n"
+       "view name\n"
+       "Clear all peers\n"
+       "Soft reconfig inbound and outbound updates\n"
        "Send route-refresh unless using 'soft-reconfiguration inbound'\n")
 
-DEFSH (0, show_zebra_fpm_stats_cmd_vtysh, 
-       "show zebra fpm stats", 
+DEFSH (0, show_ipv6_route_protocol_cmd_vtysh, 
+       "show ipv6 route " "(kernel|connected|static|ripng|ospf6|isis|bgp|babel|nhrp)", 
        "Show running system information\n"
-       "Zebra information\n"
-       "Forwarding Path Manager information\n"
      "Statistics\n")
+       "IP information\n"
+       "IP routing table\n"
"Kernel routes (not installed via the zebra RIB)\n" "Connected routes (directly attached subnet or host)\n" "Statically configured routes\n" "Routing Information Protocol next-generation (IPv6) (RIPng)\n" "Open Shortest Path First (IPv6) (OSPFv3)\n" "Intermediate System to Intermediate System (IS-IS)\n" "Border Gateway Protocol (BGP)\n" "Babel routing protocol (Babel)\n" "Next Hop Resolution Protocol (NHRP)\n")
 
-DEFSH (0, no_access_list_extended_mask_any_cmd_vtysh, 
-       "no access-list (<100-199>|<2000-2699>) (deny|permit) ip A.B.C.D A.B.C.D any", 
-       "Negate a command or set its defaults\n"
-       "Add an access list entry\n"
-       "IP extended access list\n"
-       "IP extended access list (expanded range)\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "Any Internet Protocol\n"
-       "Source address\n"
-       "Source wildcard bits\n"
-       "Any destination host\n")
+DEFSH (0, vpnv4_network_route_map_cmd_vtysh, 
+       "network A.B.C.D/M rd ASN:nn_or_IP-address:nn tag WORD route-map WORD", 
+       "Specify a network to announce via BGP\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Specify Route Distinguisher\n"
+       "VPN Route Distinguisher\n"
+       "BGP tag\n"
+       "tag value\n"
+       "route map\n"
+       "route map name\n")
 
-DEFSH (0, ip_route_vrf_cmd_vtysh, 
-       "ip route A.B.C.D/M (A.B.C.D|INTERFACE|null0) " "vrf <0-65535>", 
+DEFSH (0, show_ip_ospf_neighbor_detail_cmd_vtysh, 
+       "show ip ospf neighbor detail", 
+       "Show running system information\n"
        "IP information\n"
-       "Establish static routes\n"
-       "IP destination prefix (e.g. 10.0.0.0/8)\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
-       "Null interface\n"
-       "Specify the VRF\nThe VRF ID\n")
+       "OSPF information\n"
+       "Neighbor list\n"
+       "detail of all neighbors\n")
 
-DEFSH (0, show_bgp_ipv6_neighbor_routes_cmd_vtysh, 
-       "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X) routes", 
+DEFSH (0, show_bgp_view_afi_safi_lcommunity_all_cmd_vtysh, 
+       "show bgp view WORD (ipv4|ipv6) (unicast|multicast) large-community", 
        "Show running system information\n"
        "BGP information\n"
+       "BGP view\n"
+       "View name\n"
        "Address family\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display routes learned from neighbor\n")
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Display routes matching the large-communities\n")
 
-DEFSH (0, ipv6_route_flags_tag_vrf_cmd_vtysh, 
-       "ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) (reject|blackhole) tag <1-4294967295>" "vrf <0-65535>", 
+DEFSH (0, rip_passive_interface_cmd_vtysh, 
+       "passive-interface (IFNAME|default)", 
+       "Suppress routing updates on an interface\n"
+       "Interface name\n"
+       "default for all interfaces\n")
+
+DEFSH (0, ipv6_nd_ra_lifetime_cmd_vtysh, 
+       "ipv6 nd ra-lifetime <0-9000>", 
+       "Interface IPv6 config commands\n"
+       "Neighbor discovery\n"
+       "Router lifetime\n"
+       "Router lifetime in seconds (0 stands for a non-default gw)\n")
+
+DEFSH (0, no_isis_priority_arg_cmd_vtysh, 
+       "no isis priority <0-127>", 
+       "Negate a command or set its defaults\n"
+       "IS-IS commands\n"
+       "Set priority for Designated Router election\n"
+       "Priority value\n")
+
+DEFSH (0, no_ip_address_cmd_vtysh, 
+       "no ip address A.B.C.D/M", 
+       "Negate a command or set its defaults\n"
+       "Interface Internet Protocol config commands\n"
+       "Set the IP address of an interface\n"
+       "IP Address (e.g. 10.0.0.1/8)")
+
+DEFSH (0, no_link_params_admin_grp_cmd_vtysh, 
+       "no admin-grp", 
+       "Negate a command or set its defaults\n"
+       "Disable Administrative group membership on this interface\n")
+
+DEFSH (0, ospf_passive_interface_addr_cmd_vtysh, 
+       "passive-interface IFNAME A.B.C.D", 
+       "Suppress routing updates on an interface\n"
+       "Interface's name\n")
+
+DEFSH (0, no_bgp_network_route_map_cmd_vtysh, 
+       "no network A.B.C.D/M route-map WORD", 
+       "Negate a command or set its defaults\n"
+       "Specify a network to announce via BGP\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Route-map to modify the attributes\n"
+       "Name of the route map\n")
+
+DEFSH (0, no_lsp_refresh_interval_l1_cmd_vtysh, 
+       "no lsp-refresh-interval level-1", 
+       "Negate a command or set its defaults\n"
+       "LSP refresh interval for Level 1 only in seconds\n")
+
+DEFSH (0, ip_community_list_standard_cmd_vtysh, 
+       "ip community-list <1-99> (deny|permit) .AA:NN", 
        "IP information\n"
-       "Establish static routes\n"
-       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
-       "IPv6 gateway address\n"
-       "IPv6 gateway interface name\n"
-       "Emit an ICMP unreachable when matched\n"
-       "Silently discard pkts when matched\n"
-       "Set tag for this route\n"
-       "Tag value\n"
-       "Specify the VRF\nThe VRF ID\n")
+       "Add a community list entry\n"
+       "Community list number (standard)\n"
+       "Specify community to reject\n"
+       "Specify community to accept\n"
+       "Community number in aa:nn format or internet|local-AS|no-advertise|no-export\n")
 
-DEFSH (0, ip_route_mask_flags_distance2_vrf_cmd_vtysh, 
-       "ip route A.B.C.D A.B.C.D (reject|blackhole) <1-255> " "vrf <0-65535>", 
+DEFSH (0, no_ipv6_forwarding_cmd_vtysh, 
+       "no ipv6 forwarding", 
+       "Negate a command or set its defaults\n"
+       "IPv6 information\n"
+       "Turn off IPv6 forwarding")
+
+DEFSH (0, clear_ip_bgp_external_ipv4_in_cmd_vtysh, 
+       "clear ip bgp external ipv4 (unicast|multicast) in", 
+       "Reset functions\n"
        "IP information\n"
-       "Establish static routes\n"
-       "IP destination prefix\n"
-       "IP destination prefix mask\n"
-       "Emit an ICMP unreachable when matched\n"
-       "Silently discard pkts when matched\n"
-       "Distance value for this route\n"
-       "Specify the VRF\nThe VRF ID\n")
+       "BGP information\n"
+       "Clear all external peers\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Send route-refresh unless using 'soft-reconfiguration inbound'\n")
 
-DEFSH (0, ospf_area_range_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) range A.B.C.D/M", 
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Summarize routes matching address/mask (border routers only)\n"
-       "Area range prefix\n")
+DEFSH (0, ip_irdp_debug_messages_cmd_vtysh, 
+       "ip irdp debug messages", 
+       "IP information\n"
+       "ICMP Router discovery debug Averts. and Solicits (short)\n")
 
-DEFSH (0, show_bgp_ipv4_safi_damp_flap_prefix_list_cmd_vtysh, 
-       "show bgp ipv4 (encap|multicast|unicast|vpn) dampening flap-statistics prefix-list WORD", 
+DEFSH (0, ospf_authentication_key_cmd_vtysh, 
+       "ospf authentication-key AUTH_KEY", 
+       "OSPF interface commands\n"
+       "Authentication password (key)\n"
+       "The OSPF password (key)")
+
+DEFSH (0, show_bgp_ipv6_safi_flap_route_map_cmd_vtysh, 
+       "show bgp ipv6 (encap|multicast|unicast|vpn) flap-statistics route-map WORD", 
        "Show running system information\n"
        "BGP information\n"
-       "IP information\n"
+       "IPv6 information\n"
        "Address Family Modifier\n"
        "Address Family Modifier\n"
        "Address Family Modifier\n"
        "Address Family Modifier\n"
-       "Display detailed information about dampening\n"
        "Display flap statistics of routes\n"
-       "Display routes conforming to the prefix-list\n"
-       "IP prefix-list name\n")
+       "Display routes matching the route-map\n"
+       "A route-map to match on\n")
 
-DEFSH (0, clear_ip_bgp_all_vpnv4_in_cmd_vtysh, 
-       "clear ip bgp * vpnv4 unicast in", 
+DEFSH (0, no_access_list_cmd_vtysh, 
+       "no access-list WORD (deny|permit) A.B.C.D/M", 
+       "Negate a command or set its defaults\n"
+       "Add an access list entry\n"
+       "IP zebra access-list name\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "Prefix to match. e.g. 10.0.0.0/8\n")
+
+DEFSH (0, show_ip_route_prefix_vrf_cmd_vtysh, 
+       "show ip route A.B.C.D/M " "vrf <0-65535>", 
+       "Show running system information\n"
+       "IP information\n"
+       "IP routing table\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Specify the VRF\nThe VRF ID\n")
+
+DEFSH (0, clear_ip_bgp_as_encap_in_cmd_vtysh, 
+       "clear ip bgp " "<1-4294967295>" " encap unicast in", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "Clear all peers\n"
+       "Clear peers with the AS number\n"
        "Address family\n"
-       "Address Family Modifier\n"
-       "Send route-refresh unless using 'soft-reconfiguration inbound'\n")
+       "Address Family modifier\n"
+       "Soft reconfig inbound update\n")
 
-DEFSH (0, ipv6_nd_managed_config_flag_cmd_vtysh, 
-       "ipv6 nd managed-config-flag", 
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Managed address configuration flag\n")
+DEFSH (0, show_bgp_ipv6_vpn_rd_tags_cmd_vtysh, 
+       "show bgp ipv6 vpn rd ASN:nn_or_IP-address:nn tags", 
+       "Show running system information\n"
+       "BGP information\n"
+       "Address Family\n"
+       "Display VPN NLRI specific information\n"
+       "Display information for a route distinguisher\n"
+       "VPN Route Distinguisher\n"
+       "Display BGP tags for prefixes\n")
 
-DEFSH (0, show_ip_pim_upstream_rpf_cmd_vtysh, 
-       "show ip pim upstream-rpf", 
+DEFSH (0, show_bgp_ipv4_safi_neighbor_received_prefix_filter_cmd_vtysh, 
+       "show bgp ipv4 (encap|multicast|unicast|vpn) neighbors (A.B.C.D|X:X::X:X) received prefix-filter", 
        "Show running system information\n"
+       "BGP information\n"
        "IP information\n"
-       "PIM information\n"
-       "PIM upstream source rpf\n")
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Detailed information on TCP and BGP neighbor connections\n"
+       "Neighbor to display information about\n"
+       "Neighbor to display information about\n"
+       "Display information received from a BGP neighbor\n"
+       "Display the prefixlist filter\n")
 
-DEFSH (0, show_bgp_ipv4_safi_community_cmd_vtysh, 
-       "show bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export)", 
+DEFSH (0, show_bgp_ipv4_safi_lcommunity_list_cmd_vtysh, 
+       "show bgp ipv4 (unicast|multicast) large-community-list (<1-500>|WORD)", 
        "Show running system information\n"
        "BGP information\n"
        "Address family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
-
-DEFSH (0, match_ipv6_next_hop_cmd_vtysh, 
-       "match ipv6 next-hop X:X::X:X", 
-       "Match values from routing table\n"
-       "IPv6 information\n"
-       "Match IPv6 next-hop address of route\n"
-       "IPv6 address of next hop\n")
+       "Display routes matching the large-community-list\n"
+       "large-community-list number\n"
+       "large-community-list name\n")
 
-DEFSH (0, no_ipv6_ripng_split_horizon_poisoned_reverse_cmd_vtysh, 
-       "no ipv6 ripng split-horizon poisoned-reverse", 
+DEFSH (0, no_debug_ospf6_spf_process_cmd_vtysh, 
+       "no debug ospf6 spf process", 
        "Negate a command or set its defaults\n"
-       "IPv6 information\n"
-       "Routing Information Protocol\n"
-       "Perform split horizon\n"
-       "With poisoned-reverse\n")
-
-DEFSH (0, isis_hello_multiplier_l2_cmd_vtysh, 
-       "isis hello-multiplier <2-100> level-2", 
-       "IS-IS commands\n"
-       "Set multiplier for Hello holding time\n"
-       "Hello multiplier value\n"
-       "Specify hello multiplier for level-2 IIHs\n")
+       "Debugging functions (see also 'undebug')\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Quit Debugging SPF Calculation\n"
+       "Quit Debugging Detailed SPF Process\n"
+      )
 
-DEFSH (0, show_ip_ospf_neighbor_id_cmd_vtysh, 
-       "show ip ospf neighbor A.B.C.D", 
+DEFSH (0, show_bgp_ipv4_prefix_longer_cmd_vtysh, 
+       "show bgp ipv4 A.B.C.D/M longer-prefixes", 
        "Show running system information\n"
+       "BGP information\n"
        "IP information\n"
-       "OSPF information\n"
-       "Neighbor list\n"
-       "Neighbor ID\n")
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Display route and more specific routes\n")
 
-DEFSH (0, ip_rip_receive_version_cmd_vtysh, 
-       "ip rip receive version (1|2)", 
+DEFSH (0, ip_rip_send_version_1_cmd_vtysh, 
+       "ip rip send version 1 2", 
        "IP information\n"
        "Routing Information Protocol\n"
-       "Advertisement reception\n"
+       "Advertisement transmission\n"
        "Version control\n"
        "RIP version 1\n"
        "RIP version 2\n")
 
-DEFSH (0, no_bgp_router_id_val_cmd_vtysh, 
-       "no bgp router-id A.B.C.D", 
-       "Negate a command or set its defaults\n"
+DEFSH (0, clear_ip_bgp_all_soft_cmd_vtysh, 
+       "clear ip bgp * soft", 
+       "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
-       "Override configured router identifier\n"
-       "Manually configured router identifier\n")
-
-DEFSH (0, bgp_network_mask_backdoor_cmd_vtysh, 
-       "network A.B.C.D mask A.B.C.D backdoor", 
-       "Specify a network to announce via BGP\n"
-       "Network number\n"
-       "Network mask\n"
-       "Network mask\n"
-       "Specify a BGP backdoor route\n")
-
-DEFSH (0, link_params_ava_bw_cmd_vtysh, 
-       "ava-bw BANDWIDTH", 
-       "Unidirectional Available Bandwidth\n"
-       "Bytes/second (IEEE floating point format)\n")
+       "Clear all peers\n"
+       "Soft reconfig inbound and outbound updates\n")
 
-DEFSH (0, clear_ip_bgp_all_soft_out_cmd_vtysh, 
-       "clear ip bgp * soft out", 
-       "Reset functions\n"
-       "IP information\n"
+DEFSH (0, show_bgp_instance_ipv6_rsclient_summary_cmd_vtysh, 
+       "show bgp view WORD ipv6 rsclient summary", 
+       "Show running system information\n"
        "BGP information\n"
-       "Clear all peers\n"
-       "Soft reconfig inbound and outbound updates\n"
-       "Resend all outbound updates\n")
+       "BGP view\n"
+       "View name\n"
+       "Address family\n"
+       "Information about Route Server Clients\n"
+       "Summary of all Route Server Clients\n")
 
-DEFSH (0, ip_community_list_name_standard_cmd_vtysh, 
-       "ip community-list standard WORD (deny|permit) .AA:NN", 
-       "IP information\n"
-       "Add a community list entry\n"
-       "Add a standard community-list entry\n"
-       "Community list name\n"
-       "Specify community to reject\n"
-       "Specify community to accept\n"
-       "Community number in aa:nn format or internet|local-AS|no-advertise|no-export\n")
+DEFSH (0, no_ospf_retransmit_interval_cmd_vtysh, 
+       "no ospf retransmit-interval", 
+       "Negate a command or set its defaults\n"
+       "OSPF interface commands\n"
+       "Time between retransmitting lost link state advertisements\n")
 
-DEFSH (0, undebug_bgp_update_cmd_vtysh, 
-       "undebug bgp updates", 
-       "Disable debugging functions (see also 'debug')\n"
-       "BGP information\n"
-       "BGP updates\n")
+DEFSH (0, ripng_timers_cmd_vtysh, 
+       "timers basic <0-65535> <0-65535> <0-65535>", 
+       "RIPng timers setup\n"
+       "Basic timer\n"
+       "Routing table update timer value in second. Default is 30.\n"
+       "Routing information timeout timer. Default is 180.\n"
+       "Garbage collection timer. Default is 120.\n")
 
-DEFSH (0, no_bgp_enforce_first_as_cmd_vtysh, 
-       "no bgp enforce-first-as", 
+DEFSH (0, no_isis_hello_interval_l1_cmd_vtysh, 
+       "no isis hello-interval level-1", 
        "Negate a command or set its defaults\n"
-       "BGP information\n"
-       "Enforce the first AS for EBGP routes\n")
+       "IS-IS commands\n"
+       "Set Hello interval\n"
+       "Specify hello-interval for level-1 IIHs\n")
 
-DEFSH (0, show_bgp_ipv4_encap_route_cmd_vtysh, 
-       "show bgp ipv4 encap A.B.C.D", 
-       "Show running system information\n"
-       "BGP information\n"
-       "IP information\n"
-       "Display ENCAP NLRI specific information\n"
-       "Network in the BGP routing table to display\n")
+DEFSH (0, aggregate_address_as_set_cmd_vtysh, 
+       "aggregate-address A.B.C.D/M as-set", 
+       "Configure BGP aggregate entries\n"
+       "Aggregate prefix\n"
+       "Generate AS set path information\n")
 
-DEFSH (0, ipv6_nd_prefix_val_noauto_cmd_vtysh, 
-       "ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) "
-       "(<0-4294967295>|infinite) (no-autoconfig|)", 
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n"
-       "Valid lifetime in seconds\n"
-       "Infinite valid lifetime\n"
-       "Preferred lifetime in seconds\n"
-       "Infinite preferred lifetime\n"
-       "Do not use prefix for autoconfiguration")
+DEFSH (0, debug_ripng_zebra_cmd_vtysh, 
+       "debug ripng zebra", 
+       "Debugging functions (see also 'undebug')\n"
+       "RIPng configuration\n"
+       "Debug option set for ripng and zebra communication\n")
 
-DEFSH (0, no_ip_route_flags_tag_distance2_vrf_cmd_vtysh, 
-       "no ip route A.B.C.D/M (reject|blackhole) tag <1-4294967295> <1-255>" "vrf <0-65535>", 
+DEFSH (0, ospf6_log_adjacency_changes_cmd_vtysh, 
+       "log-adjacency-changes", 
+       "Log changes in adjacency state\n")
+
+DEFSH (0, no_ip_route_mask_flags2_cmd_vtysh, 
+       "no ip route A.B.C.D A.B.C.D (reject|blackhole)", 
        "Negate a command or set its defaults\n"
        "IP information\n"
        "Establish static routes\n"
-       "IP destination prefix (e.g. 10.0.0.0/8)\n"
+       "IP destination prefix\n"
+       "IP destination prefix mask\n"
        "Emit an ICMP unreachable when matched\n"
-       "Silently discard pkts when matched\n"
-       "Tag of this route\n"
-       "Tag value\n"
-       "Distance value for this route\n"
-       "Specify the VRF\nThe VRF ID\n")
+       "Silently discard pkts when matched\n")
 
-DEFSH (0, show_bgp_ipv4_safi_summary_cmd_vtysh, 
-       "show bgp ipv4 (unicast|multicast) summary", 
-       "Show running system information\n"
+DEFSH (0, clear_ip_bgp_peer_group_ipv4_soft_out_cmd_vtysh, 
+       "clear ip bgp peer-group WORD ipv4 (unicast|multicast) soft out", 
+       "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
        "Address family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
-       "Summary of BGP neighbor status\n")
+       "Soft reconfig inbound and outbound updates\n"
+       "Resend all outbound updates\n")
 
-DEFSH (0, ospf_mpls_te_inter_as_area_cmd_vtysh, 
-       "mpls-te inter-as area (A.B.C.D|<0-4294967295>)", 
-       "MPLS-TE specific commands\n"
-       "Configure MPLS-TE Inter-AS support\n"
-       "AREA native mode self originate INTER_AS LSA with Type 10 (area flooding scope)\n"
-       "OSPF area ID in IP format\n"
-       "OSPF area ID as decimal value\n")
+DEFSH (0, no_ip_community_list_standard_all_cmd_vtysh, 
+       "no ip community-list <1-99>", 
+       "Negate a command or set its defaults\n"
+       "IP information\n"
+       "Add a community list entry\n"
+       "Community list number (standard)\n")
 
-DEFSH (0, show_ip_bgp_ipv4_prefix_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) A.B.C.D/M", 
-       "Show running system information\n"
+DEFSH (0, ip_rip_send_version_cmd_vtysh, 
+       "ip rip send version (1|2)", 
        "IP information\n"
-       "BGP information\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
+       "Routing Information Protocol\n"
+       "Advertisement transmission\n"
+       "Version control\n"
+       "RIP version 1\n"
+       "RIP version 2\n")
 
-DEFSH (0, clear_bgp_ipv6_as_cmd_vtysh, 
-       "clear bgp ipv6 " "<1-4294967295>", 
-       "Reset functions\n"
+DEFSH (0, old_ipv6_bgp_network_cmd_vtysh, 
+       "ipv6 bgp network X:X::X:X/M", 
+       "IPv6 information\n"
        "BGP information\n"
-       "Address family\n"
-       "Clear peers with the AS number\n")
-
-DEFSH (0, no_debug_ospf_zebra_sub_cmd_vtysh, 
-       "no debug ospf zebra (interface|redistribute)", 
-       "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
-       "OSPF information\n"
-       "OSPF Zebra information\n"
-       "Zebra interface\n"
-       "Zebra redistribute\n")
+       "Specify a network to announce via BGP\n"
+       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n")
 
-DEFSH (0, ipv6_nd_prefix_cmd_vtysh, 
-       "ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) "
-       "(<0-4294967295>|infinite) (off-link|) (no-autoconfig|) (router-address|)", 
+DEFSH (0, ipv6_nd_prefix_noval_rev_cmd_vtysh, 
+       "ipv6 nd prefix X:X::X:X/M (off-link|) (no-autoconfig|)", 
        "Interface IPv6 config commands\n"
        "Neighbor discovery\n"
        "Prefix information\n"
        "IPv6 prefix\n"
-       "Valid lifetime in seconds\n"
-       "Infinite valid lifetime\n"
-       "Preferred lifetime in seconds\n"
-       "Infinite preferred lifetime\n"
        "Do not use prefix for onlink determination\n"
-       "Do not use prefix for autoconfiguration\n"
-       "Set Router Address flag\n")
+       "Do not use prefix for autoconfiguration\n")
 
-DEFSH (0, debug_rip_packet_direct_cmd_vtysh, 
-       "debug rip packet (recv|send)", 
-       "Debugging functions (see also 'undebug')\n"
-       "RIP information\n"
-       "RIP packet\n"
-       "RIP receive packet\n"
-       "RIP send packet\n")
+DEFSH (0, neighbor_attr_unchanged1_cmd_vtysh, 
+       "neighbor (A.B.C.D|X:X::X:X|WORD) " "attribute-unchanged (as-path|next-hop|med)", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
+       "BGP attribute is propagated unchanged to this neighbor\n"
+       "As-path attribute\n"
+       "Nexthop attribute\n"
+       "Med attribute\n")
 
-DEFSH (0, no_neighbor_interface_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X) " "interface WORD", 
-       "Negate a command or set its defaults\n"
+DEFSH (0, neighbor_port_cmd_vtysh, 
+       "neighbor (A.B.C.D|X:X::X:X) " "port <0-65535>", 
        "Specify neighbor router\n"
        "Neighbor address\nIPv6 address\n"
-       "Interface\n"
-       "Interface name\n")
+       "Neighbor's BGP port\n"
+       "TCP port number\n")
 
-DEFSH (0, show_bgp_memory_cmd_vtysh, 
-       "show bgp memory", 
+DEFSH (0, neighbor_shutdown_cmd_vtysh, 
+       "neighbor (A.B.C.D|X:X::X:X|WORD) " "shutdown", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
+       "Administratively shut down this neighbor\n")
+
+DEFSH (0, show_ipv6_ospf6_linkstate_network_cmd_vtysh, 
+       "show ipv6 ospf6 linkstate network A.B.C.D A.B.C.D", 
+       "Show running system information\n"
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Display linkstate routing table\n"
+       "Display Network Entry\n"
+       "Specify Router ID as IPv4 address notation\n"
+       "Specify Link state ID as IPv4 address notation\n"
+      )
+
+DEFSH (0, show_bgp_ipv4_vpn_neighbor_routes_cmd_vtysh, 
+       "show bgp ipv4 vpn neighbors (A.B.C.D|X:X::X:X) routes", 
        "Show running system information\n"
        "BGP information\n"
-       "Global BGP memory statistics\n")
+       "Address Family\n"
+       "Display VPN NLRI specific information\n"
+       "Detailed information on TCP and BGP neighbor connections\n"
+       "Neighbor to display information about\n"
+       "Neighbor to display information about\n"
+       "Display routes learned from neighbor\n")
 
-DEFSH (0, no_rip_offset_list_ifname_cmd_vtysh, 
-       "no offset-list WORD (in|out) <0-16> IFNAME", 
-       "Negate a command or set its defaults\n"
-       "Modify RIP metric\n"
-       "Access-list name\n"
-       "For incoming updates\n"
-       "For outgoing updates\n"
-       "Metric value\n"
-       "Interface to match\n")
+DEFSH (0, debug_isis_rtevents_cmd_vtysh, 
+       "debug isis route-events", 
+       "Debugging functions (see also 'undebug')\n"
+       "IS-IS information\n"
+       "IS-IS Route related events\n")
 
-DEFSH (0, show_ip_route_addr_vrf_cmd_vtysh, 
-       "show ip route A.B.C.D " "vrf <0-65535>", 
+DEFSH (0, show_ip_route_prefix_longer_cmd_vtysh, 
+       "show ip route A.B.C.D/M longer-prefixes", 
        "Show running system information\n"
        "IP information\n"
        "IP routing table\n"
-       "Network in the IP routing table to display\n"
-       "Specify the VRF\nThe VRF ID\n")
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Show route matching the specified Network/Mask pair only\n")
 
-DEFSH (0, show_bgp_ipv4_encap_summary_cmd_vtysh, 
      "show bgp ipv4 encap summary", 
      "Show running system information\n"
      "BGP information\n"
      "IPv4\n"
      "Display ENCAP NLRI specific information\n"
      "Summary of BGP neighbor status\n")
+DEFSH (0, clear_nhrp_cmd_vtysh, 
"clear " "(ip|ipv6)" " nhrp (cache|shortcut)", 
"Reset functions\n"
"IP information\n" "IPv6 information\n"
"Next Hop Resolution Protocol functions\n"
"Dynamic cache entries\n"
"Shortcut entries\n")
 
-DEFSH (0, no_rip_timers_cmd_vtysh, 
-       "no timers basic", 
+DEFSH (0, debug_zebra_events_cmd_vtysh, 
+       "debug zebra events", 
+       "Debugging functions (see also 'undebug')\n"
+       "Zebra configuration\n"
+       "Debug option set for zebra events\n")
+
+DEFSH (0, no_ip_extcommunity_list_name_standard_all_cmd_vtysh, 
+       "no ip extcommunity-list standard WORD", 
        "Negate a command or set its defaults\n"
-       "Adjust routing timers\n"
-       "Basic routing protocol update timers\n")
+       "IP information\n"
+       "Add a extended community list entry\n"
+       "Specify standard extcommunity-list\n"
+       "Extended Community list name\n")
 
-DEFSH (0, show_bgp_route_cmd_vtysh, 
-       "show bgp X:X::X:X", 
+DEFSH (0, show_ip_bgp_vpnv4_all_route_cmd_vtysh, 
+       "show ip bgp vpnv4 all A.B.C.D", 
        "Show running system information\n"
+       "IP information\n"
        "BGP information\n"
+       "Display VPNv4 NLRI specific information\n"
+       "Display information about all VPNv4 NLRIs\n"
        "Network in the BGP routing table to display\n")
 
-DEFSH (0, ipv6_nd_prefix_val_rtaddr_cmd_vtysh, 
-       "ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) "
-       "(<0-4294967295>|infinite) (router-address|)", 
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n"
-       "Valid lifetime in seconds\n"
-       "Infinite valid lifetime\n"
-       "Preferred lifetime in seconds\n"
-       "Infinite preferred lifetime\n"
-       "Set Router Address flag\n")
+DEFSH (0, clear_ip_bgp_peer_ipv4_in_prefix_filter_cmd_vtysh, 
+       "clear ip bgp A.B.C.D ipv4 (unicast|multicast) in prefix-filter", 
+       "Reset functions\n"
+       "IP information\n"
+       "BGP information\n"
+       "BGP neighbor address to clear\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Send route-refresh unless using 'soft-reconfiguration inbound'\n"
+       "Push out the existing ORF prefix-list\n")
 
-DEFSH (0, clear_bgp_ipv6_peer_soft_out_cmd_vtysh, 
-       "clear bgp ipv6 (A.B.C.D|X:X::X:X) soft out", 
+DEFSH (0, no_set_aggregator_as_val_cmd_vtysh, 
+       "no set aggregator as " "<1-4294967295>" " A.B.C.D", 
+       "Negate a command or set its defaults\n"
+       "Set values in destination routing protocol\n"
+       "BGP aggregator attribute\n"
+       "AS number of aggregator\n"
+       "AS number\n"
+       "IP address of aggregator\n")
+
+DEFSH (0, clear_ip_bgp_as_vpnv4_out_cmd_vtysh, 
+       "clear ip bgp " "<1-4294967295>" " vpnv4 unicast out", 
        "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
+       "Clear peers with the AS number\n"
        "Address family\n"
-       "BGP neighbor address to clear\n"
-       "BGP IPv6 neighbor to clear\n"
-       "Soft reconfig inbound and outbound updates\n"
+       "Address Family modifier\n"
        "Resend all outbound updates\n")
 
-DEFSH (0, show_bgp_ipv4_encap_rd_neighbor_routes_cmd_vtysh, 
-       "show bgp ipv4 encap rd ASN:nn_or_IP-address:nn neighbors (A.B.C.D|X:X::X:X) routes", 
+DEFSH (0, show_bgp_ipv6_neighbors_peer_cmd_vtysh, 
+       "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X)", 
        "Show running system information\n"
        "BGP information\n"
-       "Address Family\n"
-       "Display ENCAP NLRI specific information\n"
-       "Display information for a route distinguisher\n"
-       "ENCAP Route Distinguisher\n"
+       "Address family\n"
        "Detailed information on TCP and BGP neighbor connections\n"
        "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display routes learned from neighbor\n")
+       "Neighbor to display information about\n")
 
-DEFSH (0, no_isis_priority_l2_cmd_vtysh, 
-       "no isis priority level-2", 
+DEFSH (0, ip_ospf_priority_cmd_vtysh, 
+       "ip ospf priority <0-255>", 
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Router priority\n"
+       "Priority\n")
+
+DEFSH (0, interface_no_ip_pim_ssm_cmd_vtysh, 
+       "no ip pim ssm", 
        "Negate a command or set its defaults\n"
-       "IS-IS commands\n"
-       "Set priority for Designated Router election\n"
-       "Specify priority for level-2 routing\n")
+       "IP information\n"
+       "PIM information\n"
+       "Enable PIM SSM operation\n")
 
-DEFSH (0, clear_bgp_peer_soft_in_cmd_vtysh, 
-       "clear bgp (A.B.C.D|X:X::X:X) soft in", 
+DEFSH (0, no_ipv6_route_ifname_flags_pref_cmd_vtysh, 
+       "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE (reject|blackhole) <1-255>", 
+       "Negate a command or set its defaults\n"
+       "IP information\n"
+       "Establish static routes\n"
+       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
+       "IPv6 gateway address\n"
+       "IPv6 gateway interface name\n"
+       "Emit an ICMP unreachable when matched\n"
+       "Silently discard pkts when matched\n"
+       "Distance value for this prefix\n")
+
+DEFSH (0, ospf_area_range_advertise_cost_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) range A.B.C.D/M advertise cost <0-16777215>", 
+       "OSPF area parameters\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n"
+       "Summarize routes matching address/mask (border routers only)\n"
+       "Area range prefix\n"
+       "Advertise this range (default)\n"
+       "User specified metric for this range\n"
+       "Advertised metric for this range\n")
+
+DEFSH (0, clear_bgp_peer_in_prefix_filter_cmd_vtysh, 
+       "clear bgp (A.B.C.D|X:X::X:X) in prefix-filter", 
        "Reset functions\n"
        "BGP information\n"
        "BGP neighbor address to clear\n"
        "BGP IPv6 neighbor to clear\n"
-       "Soft reconfig inbound and outbound updates\n"
-       "Send route-refresh unless using 'soft-reconfiguration inbound'\n")
+       "Send route-refresh unless using 'soft-reconfiguration inbound'\n"
+       "Push out the existing ORF prefix-list\n")
 
-DEFSH (0, match_ecommunity_cmd_vtysh, 
-       "match extcommunity (<1-99>|<100-500>|WORD)", 
-       "Match values from routing table\n"
-       "Match BGP/VPN extended community list\n"
-       "Extended community-list number (standard)\n"
-       "Extended community-list number (expanded)\n"
-       "Extended community-list name\n")
+DEFSH (0, no_terminal_monitor_cmd_vtysh, 
+       "no terminal monitor", 
+       "Negate a command or set its defaults\n"
+       "Set terminal line parameters\n"
+       "Copy debug output to the current terminal line\n")
 
-DEFSH (0, ospf6_distance_ospf6_intra_external_inter_cmd_vtysh, 
-       "distance ospf6 intra-area <1-255> external <1-255> inter-area <1-255>", 
-       "Define an administrative distance\n"
-       "OSPF6 Administrative distance\n"
-       "Intra-area routes\n"
-       "Distance for intra-area routes\n"
-       "External routes\n"
-       "Distance for external routes\n"
-       "Inter-area routes\n"
-       "Distance for inter-area routes\n")
+DEFSH (0, bgp_network_cmd_vtysh, 
+       "network A.B.C.D/M", 
+       "Specify a network to announce via BGP\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
 
-DEFSH (0, clear_bgp_ipv6_peer_out_cmd_vtysh, 
-       "clear bgp ipv6 (A.B.C.D|X:X::X:X) out", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Address family\n"
-       "BGP neighbor address to clear\n"
-       "BGP IPv6 neighbor to clear\n"
-       "Resend all outbound updates\n")
+DEFSH (0, no_access_list_extended_host_any_cmd_vtysh, 
+       "no access-list (<100-199>|<2000-2699>) (deny|permit) ip host A.B.C.D any", 
+       "Negate a command or set its defaults\n"
+       "Add an access list entry\n"
+       "IP extended access list\n"
+       "IP extended access list (expanded range)\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "Any Internet Protocol\n"
+       "A single source host\n"
+       "Source address\n"
+       "Any destination host\n")
 
-DEFSH (0, show_bgp_ipv4_safi_lcommunity3_cmd_vtysh, 
-       "show bgp ipv4 (unicast|multicast) large-community (AA:BB:CC) (AA:BB:CC) (AA:BB:CC)", 
+DEFSH (0, show_ip_bgp_ipv4_community_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export)", 
        "Show running system information\n"
+       "IP information\n"
        "BGP information\n"
        "Address family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
-       "Display routes matching the large-communities\n"
-       "large-community number\n"
-       "large-community number\n"
-       "large-community number\n")
+       "Display routes matching the communities\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n")
 
-DEFSH (0, show_ip_route_vrf_cmd_vtysh, 
-       "show ip route " "vrf <0-65535>", 
-       "Show running system information\n"
+DEFSH (0, ip_route_mask_flags_distance2_vrf_cmd_vtysh, 
+       "ip route A.B.C.D A.B.C.D (reject|blackhole) <1-255> " "vrf <0-65535>", 
        "IP information\n"
-       "IP routing table\n"
+       "Establish static routes\n"
+       "IP destination prefix\n"
+       "IP destination prefix mask\n"
+       "Emit an ICMP unreachable when matched\n"
+       "Silently discard pkts when matched\n"
+       "Distance value for this route\n"
        "Specify the VRF\nThe VRF ID\n")
 
-DEFSH (0, no_ipv6_nd_adv_interval_config_option_cmd_vtysh, 
-       "no ipv6 nd adv-interval-option", 
-       "Negate a command or set its defaults\n"
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Advertisement Interval Option\n")
+DEFSH (0, debug_ospf_packet_all_cmd_vtysh, 
+       "debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all)", 
+       "Debugging functions (see also 'undebug')\n"
+       "OSPF information\n"
+       "OSPF packets\n"
+       "OSPF Hello\n"
+       "OSPF Database Description\n"
+       "OSPF Link State Request\n"
+       "OSPF Link State Update\n"
+       "OSPF Link State Acknowledgment\n"
+       "OSPF all packets\n")
 
-DEFSH (0, no_ip_ssmpingd_cmd_vtysh, 
-       "no ip ssmpingd [A.B.C.D]", 
+DEFSH (0, no_rip_default_metric_cmd_vtysh, 
+       "no default-metric", 
        "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Enable ssmpingd operation\n"
-       "Source address\n")
-
-DEFSH (0, show_ip_bgp_damp_flap_prefix_list_cmd_vtysh, 
-       "show ip bgp dampening flap-statistics prefix-list WORD", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Display detailed information about dampening\n"
-       "Display flap statistics of routes\n"
-       "Display routes conforming to the prefix-list\n"
-       "IP prefix-list name\n")
+       "Set a metric of redistribute routes\n"
+       "Default metric\n")
 
-DEFSH (0, show_bgp_ipv4_safi_neighbor_received_routes_cmd_vtysh, 
-       "show bgp ipv4 (encap|multicast|unicast|vpn) neighbors (A.B.C.D|X:X::X:X) received-routes", 
+DEFSH (0, show_bgp_ipv4_safi_summary_cmd_vtysh, 
+       "show bgp ipv4 (unicast|multicast) summary", 
        "Show running system information\n"
        "BGP information\n"
        "Address family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display the received routes from neighbor\n")
+       "Summary of BGP neighbor status\n")
 
-DEFSH (0, debug_pim_packets_filter_cmd_vtysh, 
-       "debug pim packets (hello|joins)", 
-       "Debugging functions (see also 'undebug')\n"
-       "PIM protocol activity\n"
-       "PIM protocol packets\n"
-       "PIM Hello protocol packets\n"
-       "PIM Join/Prune protocol packets\n")
+DEFSH (0, no_ip_route_flags_tag_cmd_vtysh, 
+       "no ip route A.B.C.D/M (A.B.C.D|INTERFACE) (reject|blackhole) tag <1-4294967295>", 
+       "Negate a command or set its defaults\n"
+       "IP information\n"
+       "Establish static routes\n"
+       "IP destination prefix (e.g. 10.0.0.0/8)\n"
+       "IP gateway address\n"
+       "IP gateway interface name\n"
+       "Emit an ICMP unreachable when matched\n"
+       "Silently discard pkts when matched\n"
+       "Tag of this route\n"
+       "Tag value\n")
 
-DEFSH (0, linkdetect_cmd_vtysh, 
-       "link-detect [default]", 
-       "Enable link detection on interface\n"
-       "Leave link-detect to the default\n")
+DEFSH (0, send_lifetime_duration_month_day_cmd_vtysh, 
+       "send-lifetime HH:MM:SS MONTH <1-31> <1993-2035> duration <1-2147483646>", 
+       "Set send lifetime of the key\n"
+       "Time to start\n"
+       "Month of the year to start\n"
+       "Day of th month to start\n"
+       "Year to start\n"
+       "Duration of the key\n"
+       "Duration seconds\n")
 
-DEFSH (0, no_debug_ospf_nssa_cmd_vtysh, 
-       "no debug ospf nssa", 
-       "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
+DEFSH (0, show_ip_bgp_view_rsclient_prefix_cmd_vtysh, 
+       "show ip bgp view WORD rsclient (A.B.C.D|X:X::X:X) A.B.C.D/M", 
+       "Show running system information\n"
+       "IP information\n"
+       "BGP information\n"
+       "BGP view\n"
+       "View name\n"
+       "Information about Route Server Client\n"
+       "Neighbor address\nIPv6 address\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
+
+DEFSH (0, pce_cap_flag_cmd_vtysh, 
+       "pce flag BITPATTERN", 
+       "PCE Router Information specific commands\n"
+       "Capabilities of the PCE for path computation\n"
+       "32-bit Hexadecimal value\n")
+
+DEFSH (0, show_ip_ospf_route_cmd_vtysh, 
+       "show ip ospf route", 
+       "Show running system information\n"
+       "IP information\n"
        "OSPF information\n"
-       "OSPF nssa information\n")
+       "OSPF routing table\n")
 
-DEFSH (0, show_bgp_neighbor_routes_cmd_vtysh, 
-       "show bgp neighbors (A.B.C.D|X:X::X:X) routes", 
+DEFSH (0, show_ip_bgp_neighbor_received_routes_cmd_vtysh, 
+       "show ip bgp neighbors (A.B.C.D|X:X::X:X) received-routes", 
        "Show running system information\n"
+       "IP information\n"
        "BGP information\n"
        "Detailed information on TCP and BGP neighbor connections\n"
        "Neighbor to display information about\n"
        "Neighbor to display information about\n"
-       "Display routes learned from neighbor\n")
-
-DEFSH (0, no_ripng_default_metric_val_cmd_vtysh, 
-       "no default-metric <1-16>", 
-       "Negate a command or set its defaults\n"
-       "Set a metric of redistribute routes\n"
-       "Default metric\n")
-
-DEFSH (0, no_vty_login_cmd_vtysh, 
-       "no login", 
-       "Negate a command or set its defaults\n"
-       "Enable password checking\n")
-
-DEFSH (0, access_list_extended_host_any_cmd_vtysh, 
-       "access-list (<100-199>|<2000-2699>) (deny|permit) ip host A.B.C.D any", 
-       "Add an access list entry\n"
-       "IP extended access list\n"
-       "IP extended access list (expanded range)\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "Any Internet Protocol\n"
-       "A single source host\n"
-       "Source address\n"
-       "Any destination host\n")
+       "Display the received routes from neighbor\n")
 
-DEFSH (0, clear_ip_bgp_peer_in_cmd_vtysh, 
-       "clear ip bgp A.B.C.D in", 
-       "Reset functions\n"
-       "IP information\n"
+DEFSH (0, show_bgp_ipv6_safi_community_list_exact_cmd_vtysh, 
+       "show bgp ipv6 (encap|multicast|unicast|vpn) community-list (<1-500>|WORD) exact-match", 
+       "Show running system information\n"
        "BGP information\n"
-       "BGP neighbor address to clear\n"
-       "Send route-refresh unless using 'soft-reconfiguration inbound'\n")
+       "Address family\n"
+       "Address family modifier\n"
+       "Address family modifier\n"
+       "Address family modifier\n"
+       "Address family modifier\n"
+       "Display routes matching the community-list\n"
+       "community-list number\n"
+       "community-list name\n"
+       "Exact match of the communities\n")
 
-DEFSH (0, bgp_network_backdoor_cmd_vtysh, 
-       "network A.B.C.D/M backdoor", 
-       "Specify a network to announce via BGP\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Specify a BGP backdoor route\n")
+DEFSH (0, ipv6_nd_prefix_noval_cmd_vtysh, 
+       "ipv6 nd prefix X:X::X:X/M (no-autoconfig|) (off-link|)", 
+       "Interface IPv6 config commands\n"
+       "Neighbor discovery\n"
+       "Prefix information\n"
+       "IPv6 prefix\n"
+       "Do not use prefix for autoconfiguration\n"
+       "Do not use prefix for onlink determination\n")
 
-DEFSH (0, no_ipv6_ripng_split_horizon_cmd_vtysh, 
-       "no ipv6 ripng split-horizon", 
-       "Negate a command or set its defaults\n"
-       "IPv6 information\n"
-       "Routing Information Protocol\n"
-       "Perform split horizon\n")
+DEFSH (0, ospf_mpls_te_inter_as_cmd_vtysh, 
+       "mpls-te inter-as as", 
+       "MPLS-TE specific commands\n"
+       "Configure MPLS-TE Inter-AS support\n"
+       "AS native mode self originate INTER_AS LSA with Type 11 (as flooding scope)\n")
 
-DEFSH (0, isis_redistribute_cmd_vtysh, 
-      "redistribute (ipv4|ipv6) " "(kernel|connected|static|rip|ripng|ospf|ospf6|bgp|pim|babel|nhrp)"
-      " (level-1|level-2) {metric <0-16777215>|route-map WORD}", 
-      "Redistribute information from another routing protocol\n"
-      "Redistribute IPv4 routes\n"
-      "Redistribute IPv6 routes\n"
-      "Kernel routes (not installed via the zebra RIB)\n" "Connected routes (directly attached subnet or host)\n" "Statically configured routes\n" "Routing Information Protocol (RIP)\n" "Routing Information Protocol next-generation (IPv6) (RIPng)\n" "Open Shortest Path First (OSPFv2)\n" "Open Shortest Path First (IPv6) (OSPFv3)\n" "Border Gateway Protocol (BGP)\n" "Protocol Independent Multicast (PIM)\n" "Babel routing protocol (Babel)\n" "Next Hop Resolution Protocol (NHRP)\n"
-      "Redistribute into level-1\n"
-      "Redistribute into level-2\n"
-      "Metric for redistributed routes\n"
-      "ISIS default metric\n"
-      "Route map reference\n"
-      "Pointer to route-map entries\n")
+DEFSH (0, ripng_route_cmd_vtysh, 
+       "route IPV6ADDR", 
+       "Static route setup\n"
+       "Set static RIPng route announcement\n")
 
-DEFSH (0, clear_ip_bgp_external_ipv4_soft_cmd_vtysh, 
-       "clear ip bgp external ipv4 (unicast|multicast) soft", 
-       "Reset functions\n"
+DEFSH (0, show_ip_bgp_community2_cmd_vtysh, 
+       "show ip bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
+       "Show running system information\n"
        "IP information\n"
        "BGP information\n"
-       "Clear all external peers\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Soft reconfig inbound and outbound updates\n")
+       "Display routes matching the communities\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n")
 
-DEFSH (0, show_bgp_view_afi_safi_lcommunity_cmd_vtysh, 
-       "show bgp view WORD (ipv4|ipv6) (unicast|multicast) large-community (AA:BB:CC)", 
+DEFSH (0, show_bgp_ipv6_safi_summary_cmd_vtysh, 
+       "show bgp ipv6 (unicast|multicast) summary", 
        "Show running system information\n"
        "BGP information\n"
-       "BGP view\n"
-       "View name\n"
-       "Address family\n"
        "Address family\n"
-       "Address family modifier\n"
-       "Address family modifier\n"
-       "Display routes matching the large-communities\n"
-       "large-community number\n")
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Summary of BGP neighbor status\n")
 
-DEFSH (0, ipv6_route_ifname_pref_vrf_cmd_vtysh, 
-       "ipv6 route X:X::X:X/M X:X::X:X INTERFACE <1-255> " "vrf <0-65535>", 
-       "IP information\n"
-       "Establish static routes\n"
-       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
-       "IPv6 gateway address\n"
-       "IPv6 gateway interface name\n"
-       "Distance value for this prefix\n"
-       "Specify the VRF\nThe VRF ID\n")
+DEFSH (0, ospf6_stub_router_admin_cmd_vtysh, 
+       "stub-router administrative", 
+       "Make router a stub router\n"
+       "Advertise inability to be a transit router\n"
+       "Administratively applied,  for an indefinite period\n")
 
-DEFSH (0, show_bgp_view_ipv6_safi_rsclient_cmd_vtysh, 
-       "show bgp view WORD ipv6 (unicast|multicast) rsclient (A.B.C.D|X:X::X:X)", 
+DEFSH (0, show_bgp_ipv6_safi_prefix_longer_cmd_vtysh, 
+       "show bgp ipv6 (encap|multicast|unicast|vpn) X:X::X:X/M longer-prefixes", 
        "Show running system information\n"
        "BGP information\n"
-       "BGP view\n"
-       "View name\n"
        "Address family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
-       "Information about Route Server Client\n"
-       "Neighbor address\nIPv6 address\n")
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Display route and more specific routes\n")
 
-DEFSH (0, show_ip_pim_assert_cmd_vtysh, 
-       "show ip pim assert", 
-       "Show running system information\n"
-       "IP information\n"
-       "PIM information\n"
-       "PIM interface assert\n")
+DEFSH (0, ospf_max_metric_router_lsa_admin_cmd_vtysh, 
+       "max-metric router-lsa administrative", 
+       "OSPF maximum / infinite-distance metric\n"
+       "Advertise own Router-LSA with infinite distance (stub router)\n"
+       "Administratively applied,  for an indefinite period\n")
 
-DEFSH (0, no_ospf_default_information_originate_cmd_vtysh, 
-       "no default-information originate", 
-       "Negate a command or set its defaults\n"
-       "Control distribution of default information\n"
-       "Distribute a default route\n")
+DEFSH (0, ipv6_bgp_network_cmd_vtysh, 
+       "network X:X::X:X/M", 
+       "Specify a network to announce via BGP\n"
+       "IPv6 prefix <network>/<length>\n")
 
-DEFSH (0, no_ip_ospf_transmit_delay_cmd_vtysh, 
-       "no ip ospf transmit-delay", 
-       "Negate a command or set its defaults\n"
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Link state transmit delay\n")
+DEFSH (0, access_list_any_cmd_vtysh, 
+       "access-list WORD (deny|permit) any", 
+       "Add an access list entry\n"
+       "IP zebra access-list name\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "Prefix to match. e.g. 10.0.0.0/8\n")
 
-DEFSH (0|0|0|0, no_match_ip_next_hop_prefix_list_cmd_vtysh, 
-       "no match ip next-hop prefix-list", 
-       "Negate a command or set its defaults\n"
-       "Match values from routing table\n"
-       "IP information\n"
-       "Match next-hop address of route\n"
-       "Match entries of prefix-lists\n")
+DEFSH (0, aggregate_address_summary_as_set_cmd_vtysh, 
+       "aggregate-address A.B.C.D/M summary-only as-set", 
+       "Configure BGP aggregate entries\n"
+       "Aggregate prefix\n"
+       "Filter more specific routes from updates\n"
+       "Generate AS set path information\n")
 
-DEFSH (0, show_ip_pim_assert_internal_cmd_vtysh, 
-       "show ip pim assert-internal", 
-       "Show running system information\n"
-       "IP information\n"
-       "PIM information\n"
-       "PIM interface internal assert state\n")
-
-DEFSH (0, show_ip_bgp_view_neighbor_received_routes_cmd_vtysh, 
-       "show ip bgp view WORD neighbors (A.B.C.D|X:X::X:X) received-routes", 
-       "Show running system information\n"
+DEFSH (0, clear_ip_bgp_external_ipv4_out_cmd_vtysh, 
+       "clear ip bgp external ipv4 (unicast|multicast) out", 
+       "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "BGP view\n"
-       "View name\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display the received routes from neighbor\n")
-
-DEFSH (0, bgp_redistribute_ipv4_rmap_metric_cmd_vtysh, 
-       "redistribute " "(kernel|connected|static|rip|ospf|isis|pim|babel|nhrp)" " route-map WORD metric <0-4294967295>", 
-       "Redistribute information from another routing protocol\n"
-       "Kernel routes (not installed via the zebra RIB)\n" "Connected routes (directly attached subnet or host)\n" "Statically configured routes\n" "Routing Information Protocol (RIP)\n" "Open Shortest Path First (OSPFv2)\n" "Intermediate System to Intermediate System (IS-IS)\n" "Protocol Independent Multicast (PIM)\n" "Babel routing protocol (Babel)\n" "Next Hop Resolution Protocol (NHRP)\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n"
-       "Metric for redistributed routes\n"
-       "Default metric\n")
+       "Clear all external peers\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Resend all outbound updates\n")
 
-DEFSH (0, no_ipv6_access_list_cmd_vtysh, 
-       "no ipv6 access-list WORD (deny|permit) X:X::X:X/M", 
+DEFSH (0, no_aggregate_address_as_set_cmd_vtysh, 
+       "no aggregate-address A.B.C.D/M as-set", 
        "Negate a command or set its defaults\n"
-       "IPv6 information\n"
-       "Add an access list entry\n"
-       "IPv6 zebra access-list\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "Prefix to match. e.g. 3ffe:506::/32\n")
+       "Configure BGP aggregate entries\n"
+       "Aggregate prefix\n"
+       "Generate AS set path information\n")
 
-DEFSH (0, no_rip_distance_source_access_list_cmd_vtysh, 
-       "no distance <1-255> A.B.C.D/M WORD", 
+DEFSH (0, no_isis_hello_multiplier_l1_arg_cmd_vtysh, 
+       "no isis hello-multiplier <2-100> level-1", 
        "Negate a command or set its defaults\n"
-       "Administrative distance\n"
-       "Distance value\n"
-       "IP source prefix\n"
-       "Access list name\n")
+       "IS-IS commands\n"
+       "Set multiplier for Hello holding time\n"
+       "Hello multiplier value\n"
+       "Specify hello multiplier for level-1 IIHs\n")
 
-DEFSH (0, ospf_redistribute_source_cmd_vtysh, 
-       "redistribute " "(kernel|connected|static|rip|isis|bgp|pim|babel|nhrp)"
-         " {metric <0-16777214>|metric-type (1|2)|route-map WORD}", 
+DEFSH (0, rip_redistribute_type_routemap_cmd_vtysh, 
+       "redistribute " "(kernel|connected|static|ospf|isis|bgp|pim|babel|nhrp)" " route-map WORD", 
        "Redistribute information from another routing protocol\n"
-       "Kernel routes (not installed via the zebra RIB)\n" "Connected routes (directly attached subnet or host)\n" "Statically configured routes\n" "Routing Information Protocol (RIP)\n" "Intermediate System to Intermediate System (IS-IS)\n" "Border Gateway Protocol (BGP)\n" "Protocol Independent Multicast (PIM)\n" "Babel routing protocol (Babel)\n" "Next Hop Resolution Protocol (NHRP)\n"
-       "Metric for redistributed routes\n"
-       "OSPF default metric\n"
-       "OSPF exterior metric type for redistributed routes\n"
-       "Set OSPF External Type 1 metrics\n"
-       "Set OSPF External Type 2 metrics\n"
+       "Kernel routes (not installed via the zebra RIB)\n" "Connected routes (directly attached subnet or host)\n" "Statically configured routes\n" "Open Shortest Path First (OSPFv2)\n" "Intermediate System to Intermediate System (IS-IS)\n" "Border Gateway Protocol (BGP)\n" "Protocol Independent Multicast (PIM)\n" "Babel routing protocol (Babel)\n" "Next Hop Resolution Protocol (NHRP)\n"
        "Route map reference\n"
        "Pointer to route-map entries\n")
 
-DEFSH (0, ospf6_distance_ospf6_inter_intra_cmd_vtysh, 
-       "distance ospf6 inter-area <1-255> intra-area <1-255>", 
-       "Define an administrative distance\n"
-       "OSPF6 Administrative distance\n"
-       "Inter-area routes\n"
-       "Distance for inter-area routes\n"
-       "Intra-area routes\n"
-       "Distance for intra-area routes\n")
-
-DEFSH (0, show_ip_bgp_ipv4_community3_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
-       "Show running system information\n"
-       "IP information\n"
+DEFSH (0, clear_bgp_ipv6_peer_group_cmd_vtysh, 
+       "clear bgp ipv6 peer-group WORD", 
+       "Reset functions\n"
        "BGP information\n"
        "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n")
 
-DEFSH (0, show_ip_bgp_flap_route_map_cmd_vtysh, 
-       "show ip bgp flap-statistics route-map WORD", 
-       "Show running system information\n"
+DEFSH (0, ip_rip_authentication_mode_authlen_cmd_vtysh, 
+       "ip rip authentication mode (md5|text) auth-length (rfc|old-ripd)", 
        "IP information\n"
-       "BGP information\n"
-       "Display flap statistics of routes\n"
-       "Display routes matching the route-map\n"
-       "A route-map to match on\n")
+       "Routing Information Protocol\n"
+       "Authentication control\n"
+       "Authentication mode\n"
+       "Keyed message digest\n"
+       "Clear text authentication\n"
+       "MD5 authentication data length\n"
+       "RFC compatible\n"
+       "Old ripd compatible\n")
 
-DEFSH (0, show_ip_route_addr_cmd_vtysh, 
-       "show ip route A.B.C.D", 
-       "Show running system information\n"
+DEFSH (0, no_ipv6_route_ifname_flags_vrf_cmd_vtysh, 
+       "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE (reject|blackhole) " "vrf <0-65535>", 
+       "Negate a command or set its defaults\n"
        "IP information\n"
-       "IP routing table\n"
-       "Network in the IP routing table to display\n")
-
-DEFSH (0, csnp_interval_l2_cmd_vtysh, 
-       "isis csnp-interval <1-600> level-2", 
-       "IS-IS commands\n"
-       "Set CSNP interval in seconds\n"
-       "CSNP interval value\n"
-       "Specify interval for level-2 CSNPs\n")
+       "Establish static routes\n"
+       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
+       "IPv6 gateway address\n"
+       "IPv6 gateway interface name\n"
+       "Emit an ICMP unreachable when matched\n"
+       "Silently discard pkts when matched\n"
+       "Specify the VRF\nThe VRF ID\n")
 
-DEFSH (0, no_ripng_passive_interface_cmd_vtysh, 
-       "no passive-interface IFNAME", 
+DEFSH (0, no_ospf_default_metric_val_cmd_vtysh, 
+       "no default-metric <0-16777214>", 
        "Negate a command or set its defaults\n"
-       "Suppress routing updates on an interface\n"
-       "Interface name\n")
-
-DEFSH (0, ospf_area_vlink_md5_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(message-digest-key|) <1-255> md5 KEY", 
-       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
-       "Message digest authentication password (key)\n" "dummy string \n" "Key ID\n" "Use MD5 algorithm\n" "The OSPF password (key)")
-
-DEFSH (0, show_ip_bgp_flap_address_cmd_vtysh, 
-       "show ip bgp flap-statistics A.B.C.D", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Display flap statistics of routes\n"
-       "Network in the BGP routing table to display\n")
+       "Set metric of redistributed routes\n"
+       "Default metric\n")
 
-DEFSH (0, accept_lifetime_day_month_month_day_cmd_vtysh, 
-       "accept-lifetime HH:MM:SS <1-31> MONTH <1993-2035> HH:MM:SS MONTH <1-31> <1993-2035>", 
-       "Set accept lifetime of the key\n"
-       "Time to start\n"
-       "Day of th month to start\n"
-       "Month of the year to start\n"
-       "Year to start\n"
-       "Time to expire\n"
-       "Month of the year to expire\n"
-       "Day of th month to expire\n"
-       "Year to expire\n")
+DEFSH (0, no_neighbor_capability_dynamic_cmd_vtysh, 
+       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "capability dynamic", 
+       "Negate a command or set its defaults\n"
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
+       "Advertise capability to the peer\n"
+       "Advertise dynamic capability to this neighbor\n")
 
-DEFSH (0, neighbor_maximum_prefix_threshold_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "maximum-prefix <1-4294967295> <1-100>", 
+DEFSH (0, neighbor_override_capability_cmd_vtysh, 
+       "neighbor (A.B.C.D|X:X::X:X|WORD) " "override-capability", 
        "Specify neighbor router\n"
        "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Maximum number of prefix accept from this peer\n"
-       "maximum no. of prefix limit\n"
-       "Threshold value (%) at which to generate a warning msg\n")
+       "Override capability negotiation result\n")
 
-DEFSH (0, ip_community_list_standard_cmd_vtysh, 
-       "ip community-list <1-99> (deny|permit) .AA:NN", 
+DEFSH (0, show_ip_ospf_neighbor_all_cmd_vtysh, 
+       "show ip ospf neighbor all", 
+       "Show running system information\n"
        "IP information\n"
-       "Add a community list entry\n"
-       "Community list number (standard)\n"
-       "Specify community to reject\n"
-       "Specify community to accept\n"
-       "Community number in aa:nn format or internet|local-AS|no-advertise|no-export\n")
+       "OSPF information\n"
+       "Neighbor list\n"
+       "include down status neighbor\n")
 
-DEFSH (0, ospf_neighbor_cmd_vtysh, 
-       "neighbor A.B.C.D", 
-       "Specify neighbor router\n"
-       "Neighbor IP address\n")
+DEFSH (0, no_max_lsp_lifetime_l2_arg_cmd_vtysh, 
+       "no max-lsp-lifetime level-2 <350-65535>", 
+       "Negate a command or set its defaults\n"
+       "Maximum LSP lifetime for Level 2 only\n"
+       "LSP lifetime for Level 2 only in seconds\n")
 
-DEFSH (0|0|0, ospf6_routemap_match_address_prefixlist_cmd_vtysh, 
-       "match ipv6 address prefix-list WORD", 
-       "Match values\n"
-       "IPv6 information\n"
-       "Match address of route\n"
-       "Match entries of prefix-lists\n"
-       "IPv6 prefix-list name\n")
+DEFSH (0, no_ipv6_nd_ra_interval_cmd_vtysh, 
+       "no ipv6 nd ra-interval", 
+       "Negate a command or set its defaults\n"
+       "Interface IPv6 config commands\n"
+       "Neighbor discovery\n"
+       "Router Advertisement interval\n")
 
-DEFSH (0, clear_bgp_ipv6_external_soft_in_cmd_vtysh, 
-       "clear bgp ipv6 external soft in", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Address family\n"
-       "Clear all external peers\n"
-       "Soft reconfig inbound and outbound updates\n"
-       "Send route-refresh unless using 'soft-reconfiguration inbound'\n")
+DEFSH (0, access_list_extended_host_any_cmd_vtysh, 
+       "access-list (<100-199>|<2000-2699>) (deny|permit) ip host A.B.C.D any", 
+       "Add an access list entry\n"
+       "IP extended access list\n"
+       "IP extended access list (expanded range)\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "Any Internet Protocol\n"
+       "A single source host\n"
+       "Source address\n"
+       "Any destination host\n")
 
-DEFSH (0, no_debug_ssmpingd_cmd_vtysh, 
-       "no debug ssmpingd", 
+DEFSH (0, no_ospf_timers_min_ls_interval_cmd_vtysh, 
+       "no timers throttle lsa all", 
        "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
-       "PIM protocol activity\n"
-       "ssmpingd activity\n")
+       "Adjust routing timers\n"
+       "Throttling adaptive timer\n"
+       "LSA delay between transmissions\n")
 
-DEFSH (0, ip_irdp_shutdown_cmd_vtysh, 
-       "ip irdp shutdown", 
-       "IP information\n"
-       "ICMP Router discovery shutdown on this interface\n")
+DEFSH (0, no_rip_redistribute_type_metric_routemap_cmd_vtysh, 
+       "no redistribute " "(kernel|connected|static|ospf|isis|bgp|pim|babel|nhrp)"
+       " metric <0-16> route-map WORD", 
+       "Negate a command or set its defaults\n"
+       "Redistribute information from another routing protocol\n"
+       "Kernel routes (not installed via the zebra RIB)\n" "Connected routes (directly attached subnet or host)\n" "Statically configured routes\n" "Open Shortest Path First (OSPFv2)\n" "Intermediate System to Intermediate System (IS-IS)\n" "Border Gateway Protocol (BGP)\n" "Protocol Independent Multicast (PIM)\n" "Babel routing protocol (Babel)\n" "Next Hop Resolution Protocol (NHRP)\n"
+       "Metric\n"
+       "Metric value\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
 
-DEFSH (0, clear_ip_bgp_peer_vpnv4_soft_cmd_vtysh, 
-       "clear ip bgp A.B.C.D vpnv4 unicast soft", 
-       "Reset functions\n"
+DEFSH (0, ip_irdp_multicast_cmd_vtysh, 
+       "ip irdp multicast", 
        "IP information\n"
+       "ICMP Router discovery on this interface using multicast\n")
+
+DEFSH (0, no_debug_bgp_allow_martians_cmd_vtysh, 
+       "no debug bgp allow-martians", 
+       "Negate a command or set its defaults\n"
+       "Debugging functions (see also 'undebug')\n"
        "BGP information\n"
-       "BGP neighbor address to clear\n"
-       "Address family\n"
-       "Address Family Modifier\n"
-       "Soft reconfig inbound and outbound updates\n")
+       "BGP allow martian next hops\n")
 
-DEFSH (0, isis_hello_interval_cmd_vtysh, 
-       "isis hello-interval <1-600>", 
-       "IS-IS commands\n"
-       "Set Hello interval\n"
-       "Hello interval value\n"
-       "Holdtime 1 seconds,  interval depends on multiplier\n")
+DEFSH (0, no_ospf6_redistribute_route_map_cmd_vtysh, 
+       "no redistribute " "(kernel|connected|static|ripng|isis|bgp|babel|nhrp)" " route-map WORD", 
+       "Negate a command or set its defaults\n"
+       "Redistribute\n"
+       "Kernel routes (not installed via the zebra RIB)\n" "Connected routes (directly attached subnet or host)\n" "Statically configured routes\n" "Routing Information Protocol next-generation (IPv6) (RIPng)\n" "Intermediate System to Intermediate System (IS-IS)\n" "Border Gateway Protocol (BGP)\n" "Babel routing protocol (Babel)\n" "Next Hop Resolution Protocol (NHRP)\n"
+       "Route map reference\n"
+       "Route map name\n")
 
-DEFSH (0, rip_redistribute_type_metric_cmd_vtysh, 
-       "redistribute " "(kernel|connected|static|ospf|isis|bgp|pim|babel|nhrp)" " metric <0-16>", 
+DEFSH (0, isis_mpls_te_inter_as_cmd_vtysh, 
+       "mpls-te inter-as (level-1|level-1-2|level-2-only)", 
+       "MPLS-TE specific commands\n"
+       "Configure MPLS-TE Inter-AS support\n"
+       "AREA native mode self originate INTER-AS LSP with L1 only flooding scope)\n"
+       "AREA native mode self originate INTER-AS LSP with L1 and L2 flooding scope)\n"
+       "AS native mode self originate INTER-AS LSP with L2 only flooding scope\n")
+
+DEFSH (0, bgp_redistribute_ipv6_metric_rmap_cmd_vtysh, 
+       "redistribute " "(kernel|connected|static|ripng|ospf6|isis|babel|nhrp)" " metric <0-4294967295> route-map WORD", 
        "Redistribute information from another routing protocol\n"
-       "Kernel routes (not installed via the zebra RIB)\n" "Connected routes (directly attached subnet or host)\n" "Statically configured routes\n" "Open Shortest Path First (OSPFv2)\n" "Intermediate System to Intermediate System (IS-IS)\n" "Border Gateway Protocol (BGP)\n" "Protocol Independent Multicast (PIM)\n" "Babel routing protocol (Babel)\n" "Next Hop Resolution Protocol (NHRP)\n"
-       "Metric\n"
-       "Metric value\n")
+       "Kernel routes (not installed via the zebra RIB)\n" "Connected routes (directly attached subnet or host)\n" "Statically configured routes\n" "Routing Information Protocol next-generation (IPv6) (RIPng)\n" "Open Shortest Path First (IPv6) (OSPFv3)\n" "Intermediate System to Intermediate System (IS-IS)\n" "Babel routing protocol (Babel)\n" "Next Hop Resolution Protocol (NHRP)\n"
+       "Metric for redistributed routes\n"
+       "Default metric\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
 
-DEFSH (0, neighbor_filter_list_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "filter-list WORD (in|out)", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Establish BGP filters\n"
-       "AS path access-list name\n"
-       "Filter incoming routes\n"
-       "Filter outgoing routes\n")
+DEFSH (0, show_ipv6_ospf6_linkstate_router_cmd_vtysh, 
+       "show ipv6 ospf6 linkstate router A.B.C.D", 
+       "Show running system information\n"
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Display linkstate routing table\n"
+       "Display Router Entry\n"
+       "Specify Router ID as IPv4 address notation\n"
+      )
 
-DEFSH (0, show_ip_bgp_paths_cmd_vtysh, 
-       "show ip bgp paths", 
+DEFSH (0, undebug_bgp_normal_cmd_vtysh, 
+       "undebug bgp", 
+       "Disable debugging functions (see also 'debug')\n"
+       "BGP information\n")
+
+DEFSH (0|0|0|0, no_ipv6_prefix_list_cmd_vtysh, 
+       "no ipv6 prefix-list WORD", 
+       "Negate a command or set its defaults\n"
+       "IPv6 information\n"
+       "Build a prefix list\n"
+       "Name of a prefix list\n")
+
+DEFSH (0, no_debug_static_cmd_vtysh, 
+       "no debug static", 
+       "Negate a command or set its defaults\n"
+       "Debugging functions (see also 'undebug')\n"
+       "PIM Static Multicast Route activity\n")
+
+DEFSH (0, ip_ospf_hello_interval_cmd_vtysh, 
+       "ip ospf hello-interval <1-65535>", 
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Time between HELLO packets\n"
+       "Seconds\n")
+
+DEFSH (0, ip_ospf_authentication_addr_cmd_vtysh, 
+       "ip ospf authentication A.B.C.D", 
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Enable authentication on this interface\n"
+       "Address of interface")
+
+DEFSH (0, clear_bgp_peer_soft_out_cmd_vtysh, 
+       "clear bgp (A.B.C.D|X:X::X:X) soft out", 
+       "Reset functions\n"
+       "BGP information\n"
+       "BGP neighbor address to clear\n"
+       "BGP IPv6 neighbor to clear\n"
+       "Soft reconfig inbound and outbound updates\n"
+       "Resend all outbound updates\n")
+
+DEFSH (0, debug_nhrp_cmd_vtysh, 
+ "debug nhrp " "(all|common|event|interface|kernel|route|vici)", 
+ "Enable debug messages for specific or all parts.\n"
+ "NHRP information\n"
+ "All messages\n" "Common messages (default)\n" "Event manager messages\n" "Interface messages\n" "Kernel messages\n" "Route messages\n" "VICI messages\n")
+
+DEFSH (0, show_ip_bgp_neighbor_received_prefix_filter_cmd_vtysh, 
+       "show ip bgp neighbors (A.B.C.D|X:X::X:X) received prefix-filter", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
-       "Path information\n")
+       "Detailed information on TCP and BGP neighbor connections\n"
+       "Neighbor to display information about\n"
+       "Neighbor to display information about\n"
+       "Display information received from a BGP neighbor\n"
+       "Display the prefixlist filter\n")
 
-DEFSH (0, bgp_network_import_check_cmd_vtysh, 
-       "bgp network import-check", 
+DEFSH (0, clear_bgp_ipv6_peer_soft_out_cmd_vtysh, 
+       "clear bgp ipv6 (A.B.C.D|X:X::X:X) soft out", 
+       "Reset functions\n"
+       "BGP information\n"
+       "Address family\n"
+       "BGP neighbor address to clear\n"
+       "BGP IPv6 neighbor to clear\n"
+       "Soft reconfig inbound and outbound updates\n"
+       "Resend all outbound updates\n")
+
+DEFSH (0, no_debug_pim_packets_filter_cmd_vtysh, 
+       "no debug pim packets (hello|joins)", 
+       "Negate a command or set its defaults\n"
+       "Debugging functions (see also 'undebug')\n"
+       "PIM protocol activity\n"
+       "PIM protocol packets\n"
+       "PIM Hello protocol packets\n"
+       "PIM Join/Prune protocol packets\n")
+
+DEFSH (0, no_bgp_graceful_restart_stalepath_time_val_cmd_vtysh, 
+       "no bgp graceful-restart stalepath-time <1-3600>", 
+       "Negate a command or set its defaults\n"
        "BGP specific commands\n"
-       "BGP network command\n"
-       "Check BGP network route exists in IGP\n")
+       "Graceful restart capability parameters\n"
+       "Set the max time to hold onto restarting peer's stale paths\n"
+       "Delay value (seconds)\n")
 
-DEFSH (0, show_bgp_instance_ipv6_safi_summary_cmd_vtysh, 
-       "show bgp view WORD ipv6 (unicast|multicast) summary", 
+DEFSH (0, show_bgp_ipv6_community3_exact_cmd_vtysh, 
+       "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
        "Show running system information\n"
        "BGP information\n"
-       "BGP view\n"
-       "View name\n"
        "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Summary of BGP neighbor status\n")
+       "Display routes matching the communities\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
+       "Exact match of the communities")
 
-DEFSH (0, link_params_inter_as_cmd_vtysh, 
-       "neighbor A.B.C.D as <1-4294967295>", 
-       "Configure remote ASBR information (Neighbor IP address and AS number)\n"
-       "Remote IP address in dot decimal A.B.C.D\n"
-       "Remote AS number\n"
-       "AS number in the range <1-4294967295>\n")
+DEFSH (0, ip_multicast_mode_cmd_vtysh, 
+       "ip multicast rpf-lookup-mode (urib-only|mrib-only|mrib-then-urib|lower-distance|longer-prefix)", 
+       "IP information\n"
+       "Multicast options\n"
+       "RPF lookup behavior\n"
+       "Lookup in unicast RIB only\n"
+       "Lookup in multicast RIB only\n"
+       "Try multicast RIB first,  fall back to unicast RIB\n"
+       "Lookup both,  use entry with lower distance\n"
+       "Lookup both,  use entry with longer prefix\n")
 
-DEFSH (0, show_bgp_view_afi_safi_neighbor_adv_recd_routes_cmd_vtysh, 
-       "show bgp view WORD (ipv4|ipv6) (unicast|multicast) neighbors (A.B.C.D|X:X::X:X) (advertised-routes|received-routes)", 
+DEFSH (0, show_bgp_summary_1w_cmd_vtysh, 
+       "show bgp (ipv4|ipv6|unicast|multicast|vpn|encap) summary", 
        "Show running system information\n"
        "BGP information\n"
-       "BGP view\n"
-       "View name\n"
-       "Address family\n"
-       "Address family\n"
-       "Address family modifier\n"
-       "Address family modifier\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display the advertised routes to neighbor\n"
-       "Display the received routes from neighbor\n")
+       "IP information\n"
+       "IPv6 Information\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Summary of BGP neighbor status\n")
 
-DEFSH (0, show_ipv6_ospf6_database_type_cmd_vtysh, 
+DEFSH (0, show_ipv6_ospf6_database_type_id_router_cmd_vtysh, 
        "show ipv6 ospf6 database "
        "(router|network|inter-prefix|inter-router|as-external|"
-       "group-membership|type-7|link|intra-prefix)", 
+       "group-membership|type-7|link|intra-prefix) A.B.C.D A.B.C.D", 
        "Show running system information\n"
        "IPv6 information\n"
        "Open Shortest Path First (OSPF) for IPv6\n"
@@ -1598,143 +1718,152 @@ DEFSH (0, show_ipv6_ospf6_database_type_cmd_vtysh,
        "Display Type-7 LSAs\n"
        "Display Link LSAs\n"
        "Display Intra-Area-Prefix LSAs\n"
+       "Specify Link state ID as IPv4 address notation\n"
+       "Specify Advertising Router as IPv4 address notation\n"
       )
 
-DEFSH (0, show_bgp_ipv4_safi_rd_prefix_cmd_vtysh, 
-       "show bgp ipv4 (encap|vpn) rd ASN:nn_or_IP-address:nn A.B.C.D/M", 
+DEFSH (0, no_debug_ospf_te_cmd_vtysh, 
+       "no debug ospf te", 
+       "Negate a command or set its defaults\n"
+       "Debugging functions (see also 'undebug')\n"
+       "OSPF information\n"
+       "OSPF-TE information\n")
+
+DEFSH (0, bgp_graceful_restart_stalepath_time_cmd_vtysh, 
+       "bgp graceful-restart stalepath-time <1-3600>", 
+       "BGP specific commands\n"
+       "Graceful restart capability parameters\n"
+       "Set the max time to hold onto restarting peer's stale paths\n"
+       "Delay value (seconds)\n")
+
+DEFSH (0, show_bgp_ipv4_community3_exact_cmd_vtysh, 
+       "show bgp ipv4 community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
        "Show running system information\n"
        "BGP information\n"
-       "Address Family\n"
-       "Address Family Modifier\n"
-       "Address Family Modifier\n"
-       "Display information for a route distinguisher\n"
-       "ENCAP Route Distinguisher\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
-
-DEFSH (0, show_bgp_ipv4_vpn_tags_cmd_vtysh, 
-       "show bgp ipv4 vpn tags", 
-       "Show running system information\n"
-       "BGP information\n"
-       "Address Family\n"
-       "Display VPN NLRI specific information\n"
-       "Display BGP tags for prefixes\n")
-
-DEFSH (0, show_ipv6_ospf6_database_linkstate_id_cmd_vtysh, 
-       "show ipv6 ospf6 database linkstate-id A.B.C.D", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Display Link state database\n"
-       "Search by Link state ID\n"
-       "Specify Link state ID as IPv4 address notation\n"
-      )
+       "IP information\n"
+       "Display routes matching the communities\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
+       "Exact match of the communities")
 
-DEFSH (0, no_debug_pim_trace_cmd_vtysh, 
-       "no debug pim trace", 
-       "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
-       "PIM protocol activity\n"
-       "PIM internal daemon activity\n")
+DEFSH (0, ip_ospf_authentication_args_addr_cmd_vtysh, 
+       "ip ospf authentication (null|message-digest) A.B.C.D", 
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Enable authentication on this interface\n"
+       "Use null authentication\n"
+       "Use message-digest authentication\n"
+       "Address of interface")
 
-DEFSH (0, no_ipv6_bgp_network_route_map_cmd_vtysh, 
-       "no network X:X::X:X/M route-map WORD", 
+DEFSH (0, no_rip_neighbor_cmd_vtysh, 
+       "no neighbor A.B.C.D", 
        "Negate a command or set its defaults\n"
-       "Specify a network to announce via BGP\n"
-       "IPv6 prefix <network>/<length>\n"
-       "Route-map to modify the attributes\n"
-       "Name of the route map\n")
+       "Specify a neighbor router\n"
+       "Neighbor address\n")
 
-DEFSH (0|0|0|0|0, match_ip_address_cmd_vtysh, 
-       "match ip address (<1-199>|<1300-2699>|WORD)", 
-       "Match values from routing table\n"
-       "IP information\n"
-       "Match address of route\n"
-       "IP access-list number\n"
-       "IP access-list number (expanded range)\n"
-       "IP Access-list name\n")
+DEFSH (0, neighbor_maximum_prefix_warning_cmd_vtysh, 
+       "neighbor (A.B.C.D|X:X::X:X|WORD) " "maximum-prefix <1-4294967295> warning-only", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
+       "Maximum number of prefix accept from this peer\n"
+       "maximum no. of prefix limit\n"
+       "Only give warning message when limit is exceeded\n")
 
-DEFSH (0, show_bgp_ipv6_safi_dampened_paths_cmd_vtysh, 
-       "show bgp ipv6 (encap|multicast|unicast|vpn) dampened-paths", 
-       "Show running system information\n"
-       "BGP information\n"
-       "IPv6 information\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Display paths suppressed due to dampening\n")
+DEFSH (0, no_set_ecommunity_rt_cmd_vtysh, 
+       "no set extcommunity rt", 
+       "Negate a command or set its defaults\n"
+       "Set values in destination routing protocol\n"
+       "BGP extended community attribute\n"
+       "Route Target extended community\n")
 
-DEFSH (0, ospf_neighbor_poll_interval_priority_cmd_vtysh, 
-       "neighbor A.B.C.D poll-interval <1-65535> priority <0-255>", 
-       "Specify neighbor router\n"
-       "Neighbor address\n"
-       "OSPF dead-router polling interval\n"
-       "Seconds\n"
-       "OSPF priority of non-broadcast neighbor\n"
-       "Priority\n")
+DEFSH (0, vty_no_restricted_mode_cmd_vtysh, 
+       "no anonymous restricted", 
+       "Negate a command or set its defaults\n"
+       "Enable password checking\n")
 
-DEFSH (0, no_ip_ospf_mtu_ignore_cmd_vtysh, 
-      "no ip ospf mtu-ignore", 
-      "IP Information\n"
-      "OSPF interface commands\n"
-      "Disable mtu mismatch detection\n")
+DEFSH (0, no_access_list_remark_cmd_vtysh, 
+       "no access-list (<1-99>|<100-199>|<1300-1999>|<2000-2699>|WORD) remark", 
+       "Negate a command or set its defaults\n"
+       "Add an access list entry\n"
+       "IP standard access list\n"
+       "IP extended access list\n"
+       "IP standard access list (expanded range)\n"
+       "IP extended access list (expanded range)\n"
+       "IP zebra access-list\n"
+       "Access list entry comment\n")
 
-DEFSH (0|0|0|0, no_ipv6_prefix_list_le_cmd_vtysh, 
-       "no ipv6 prefix-list WORD (deny|permit) X:X::X:X/M le <0-128>", 
+DEFSH (0, no_ipv6_access_list_cmd_vtysh, 
+       "no ipv6 access-list WORD (deny|permit) X:X::X:X/M", 
        "Negate a command or set its defaults\n"
        "IPv6 information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
+       "Add an access list entry\n"
+       "IPv6 zebra access-list\n"
        "Specify packets to reject\n"
        "Specify packets to forward\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
-       "Maximum prefix length to be matched\n"
-       "Maximum prefix length\n")
-
-DEFSH (0|0|0, no_match_metric_cmd_vtysh, 
-       "no match metric", 
-       "Negate a command or set its defaults\n"
-       "Match values from routing table\n"
-       "Match metric of route\n")
+       "Prefix to match. e.g. 3ffe:506::/32\n")
 
-DEFSH (0, show_bgp_ipv6_safi_flap_prefix_cmd_vtysh, 
-       "show bgp ipv6 (encap|multicast|unicast|vpn) flap-statistics X:X::X:X/M", 
-       "Show running system information\n"
+DEFSH (0, clear_ip_bgp_peer_cmd_vtysh, 
+       "clear ip bgp (A.B.C.D|X:X::X:X)", 
+       "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Display flap statistics of routes\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
-
-DEFSH (0, set_community_none_cmd_vtysh, 
-       "set community none", 
-       "Set values in destination routing protocol\n"
-       "BGP community attribute\n"
-       "No community attribute\n")
+       "BGP neighbor IP address to clear\n"
+       "BGP IPv6 neighbor to clear\n")
 
-DEFSH (0, no_aggregate_address_as_set_summary_cmd_vtysh, 
-       "no aggregate-address A.B.C.D/M as-set summary-only", 
-       "Negate a command or set its defaults\n"
-       "Configure BGP aggregate entries\n"
-       "Aggregate prefix\n"
-       "Generate AS set path information\n"
-       "Filter more specific routes from updates\n")
+DEFSH (0, show_ipv6_ospf6_area_spf_tree_cmd_vtysh, 
+       "show ipv6 ospf6 area A.B.C.D spf tree", 
+       "Show running system information\n"
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Area information\n"
+       "Area ID (as an IPv4 notation)\n"
+       "Shortest Path First calculation\n"
+       "Show SPF tree\n")
 
-DEFSH (0, set_atomic_aggregate_cmd_vtysh, 
-       "set atomic-aggregate", 
-       "Set values in destination routing protocol\n"
-       "BGP atomic aggregate attribute\n" )
+DEFSH (0, ip_irdp_maxadvertinterval_cmd_vtysh, 
+       "ip irdp maxadvertinterval <4-1800>", 
+       "IP information\n"
+       "ICMP Router discovery on this interface\n"
+       "Set maximum time between advertisement\n"
+       "Maximum advertisement interval in seconds\n")
 
-DEFSH (0, show_bgp_community_list_cmd_vtysh, 
-       "show bgp community-list (<1-500>|WORD)", 
+DEFSH (0, show_debugging_ripng_cmd_vtysh, 
+       "show debugging ripng", 
        "Show running system information\n"
+       "Debugging functions (see also 'undebug')\n"
+       "RIPng configuration\n")
+
+DEFSH (0, clear_bgp_all_out_cmd_vtysh, 
+       "clear bgp * out", 
+       "Reset functions\n"
        "BGP information\n"
-       "Display routes matching the community-list\n"
-       "community-list number\n"
-       "community-list name\n")
+       "Clear all peers\n"
+       "Resend all outbound updates\n")
+
+DEFSH (0, no_debug_ssmpingd_cmd_vtysh, 
+       "no debug ssmpingd", 
+       "Negate a command or set its defaults\n"
+       "Debugging functions (see also 'undebug')\n"
+       "PIM protocol activity\n"
+       "ssmpingd activity\n")
+
+DEFSH (0, no_ip_rip_send_version_cmd_vtysh, 
+       "no ip rip send version", 
+       "Negate a command or set its defaults\n"
+       "IP information\n"
+       "Routing Information Protocol\n"
+       "Advertisement transmission\n"
+       "Version control\n")
 
 DEFSH (0, no_ipv6_access_list_exact_cmd_vtysh, 
        "no ipv6 access-list WORD (deny|permit) X:X::X:X/M exact-match", 
@@ -1747,260 +1876,119 @@ DEFSH (0, no_ipv6_access_list_exact_cmd_vtysh,
        "Prefix to match. e.g. 3ffe:506::/32\n"
        "Exact match of the prefixes\n")
 
-DEFSH (0, clear_ip_bgp_external_soft_cmd_vtysh, 
-       "clear ip bgp external soft", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "Clear all external peers\n"
-       "Soft reconfig inbound and outbound updates\n")
+DEFSH (0, no_ipv6_nd_managed_config_flag_cmd_vtysh, 
+       "no ipv6 nd managed-config-flag", 
+       "Negate a command or set its defaults\n"
+       "Interface IPv6 config commands\n"
+       "Neighbor discovery\n"
+       "Managed address configuration flag\n")
 
-DEFSH (0|0|0|0, ip_prefix_list_ge_cmd_vtysh, 
-       "ip prefix-list WORD (deny|permit) A.B.C.D/M ge <0-32>", 
-       "IP information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Minimum prefix length to be matched\n"
-       "Minimum prefix length\n")
+DEFSH (0, no_debug_ospf6_abr_cmd_vtysh, 
+       "no debug ospf6 abr", 
+       "Negate a command or set its defaults\n"
+       "Debugging functions (see also 'undebug')\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Debug OSPFv3 ABR function\n"
+      )
 
-DEFSH (0, show_bgp_ipv6_community4_cmd_vtysh, 
-       "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
+DEFSH (0, show_bgp_view_afi_safi_lcommunity3_cmd_vtysh, 
+       "show bgp view WORD (ipv4|ipv6) (unicast|multicast) large-community (AA:BB:CC) (AA:BB:CC) (AA:BB:CC)", 
        "Show running system information\n"
        "BGP information\n"
+       "BGP view\n"
+       "View name\n"
        "Address family\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
+       "Address family\n"
+       "Address family modifier\n"
+       "Address family modifier\n"
+       "Display routes matching the large-communities\n"
+       "large-community number\n"
+       "large-community number\n"
+       "large-community number\n")
 
-DEFSH (0, no_debug_bgp_events_cmd_vtysh, 
-       "no debug bgp events", 
+DEFSH (0, no_match_ecommunity_val_cmd_vtysh, 
+       "no match extcommunity (<1-99>|<100-500>|WORD)", 
        "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
-       "BGP information\n"
-       "BGP events\n")
+       "Match values from routing table\n"
+       "Match BGP/VPN extended community list\n"
+       "Extended community-list number (standard)\n"
+       "Extended community-list number (expanded)\n"
+       "Extended community-list name\n")
 
-DEFSH (0, no_terminal_monitor_cmd_vtysh, 
-       "no terminal monitor", 
+DEFSH (0, no_link_params_enable_cmd_vtysh, 
+       "no enable", 
        "Negate a command or set its defaults\n"
-       "Set terminal line parameters\n"
-       "Copy debug output to the current terminal line\n")
-
-DEFSH (0, debug_zebra_rib_cmd_vtysh, 
-       "debug zebra rib", 
-       "Debugging functions (see also 'undebug')\n"
-       "Zebra configuration\n"
-       "Debug RIB events\n")
-
-DEFSH (0, log_commands_cmd_vtysh, 
-       "log commands", 
-       "Logging control\n"
-       "Log all commands (can't be unset without restart)\n")
+       "Disable link parameters on this interface\n")
 
-DEFSH (0, show_ip_forwarding_cmd_vtysh, 
-       "show ip forwarding", 
+DEFSH (0, show_bgp_ipv6_safi_damp_flap_prefix_list_cmd_vtysh, 
+       "show bgp ipv6 (encap|multicast|unicast|vpn) dampening flap-statistics prefix-list WORD", 
        "Show running system information\n"
-       "IP information\n"
-       "IP forwarding status\n")
+       "BGP information\n"
+       "IPv6 information\n"
+       "Address Family Modifier\n"
+       "Address Family Modifier\n"
+       "Address Family Modifier\n"
+       "Address Family Modifier\n"
+       "Display detailed information about dampening\n"
+       "Display flap statistics of routes\n"
+       "Display routes conforming to the prefix-list\n"
+       "IP prefix-list name\n")
 
-DEFSH (0, show_bgp_ipv4_safi_neighbor_routes_cmd_vtysh, 
-       "show bgp ipv4 (multicast|unicast) neighbors (A.B.C.D|X:X::X:X) routes", 
+DEFSH (0, no_debug_isis_packet_dump_cmd_vtysh, 
+       "no debug isis packet-dump", 
+       "Disable debugging functions (see also 'debug')\n"
+       "IS-IS information\n"
+       "IS-IS packet dump\n")
+
+DEFSH (0, ipv6_mbgp_neighbor_routes_cmd_vtysh, 
+       "show ipv6 mbgp neighbors (A.B.C.D|X:X::X:X) routes", 
        "Show running system information\n"
-       "BGP information\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
+       "IPv6 information\n"
+       "MBGP information\n"
        "Detailed information on TCP and BGP neighbor connections\n"
        "Neighbor to display information about\n"
        "Neighbor to display information about\n"
        "Display routes learned from neighbor\n")
 
-DEFSH (0, no_access_list_exact_cmd_vtysh, 
-       "no access-list WORD (deny|permit) A.B.C.D/M exact-match", 
-       "Negate a command or set its defaults\n"
-       "Add an access list entry\n"
-       "IP zebra access-list name\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "Prefix to match. e.g. 10.0.0.0/8\n"
-       "Exact match of the prefixes\n")
-
-DEFSH (0|0|0|0, show_ipv6_prefix_list_detail_cmd_vtysh, 
-       "show ipv6 prefix-list detail", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Detail of prefix lists\n")
-
-DEFSH (0, show_ip_route_cmd_vtysh, 
-       "show ip route", 
-       "Show running system information\n"
-       "IP information\n"
-       "IP routing table\n")
-
-DEFSH (0, no_neighbor_description_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "description", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Neighbor specific description\n")
-
-DEFSH (0, ipv6_nd_prefix_val_nortaddr_cmd_vtysh, 
-       "ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) "
-       "(<0-4294967295>|infinite) (off-link|) (no-autoconfig|)", 
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n"
-       "Valid lifetime in seconds\n"
-       "Infinite valid lifetime\n"
-       "Preferred lifetime in seconds\n"
-       "Infinite preferred lifetime\n"
-       "Do not use prefix for onlink determination\n"
-       "Do not use prefix for autoconfiguration\n")
-
-DEFSH (0, neighbor_ebgp_multihop_ttl_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "ebgp-multihop <1-255>", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Allow EBGP neighbors not on directly connected networks\n"
-       "maximum hop count\n")
-
-DEFSH (0, show_bgp_ipv6_encap_route_cmd_vtysh, 
-       "show bgp ipv6 encap X:X::X:X", 
-       "Show running system information\n"
-       "BGP information\n"
-       "IPv6 Information\n"
-       "Display ENCAP NLRI specific information\n"
-       "Network in the BGP routing table to display\n")
-
-DEFSH (0, show_bgp_ipv4_safi_rsclient_prefix_cmd_vtysh, 
-       "show bgp ipv4 (unicast|multicast) rsclient (A.B.C.D|X:X::X:X) A.B.C.D/M", 
+DEFSH (0, show_bgp_view_ipv6_safi_rsclient_prefix_cmd_vtysh, 
+       "show bgp view WORD ipv6 (unicast|multicast) rsclient (A.B.C.D|X:X::X:X) X:X::X:X/M", 
        "Show running system information\n"
        "BGP information\n"
+       "BGP view\n"
+       "View name\n"
        "Address family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
        "Information about Route Server Client\n"
        "Neighbor address\nIPv6 address\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
+       "IP prefix <network>/<length>,  e.g.,  3ffe::/16\n")
 
-DEFSH (0, show_ip_ospf_route_cmd_vtysh, 
-       "show ip ospf route", 
+DEFSH (0, show_bgp_instance_ipv6_safi_summary_cmd_vtysh, 
+       "show bgp view WORD ipv6 (unicast|multicast) summary", 
        "Show running system information\n"
-       "IP information\n"
-       "OSPF information\n"
-       "OSPF routing table\n")
-
-DEFSH (0, rip_redistribute_type_routemap_cmd_vtysh, 
-       "redistribute " "(kernel|connected|static|ospf|isis|bgp|pim|babel|nhrp)" " route-map WORD", 
-       "Redistribute information from another routing protocol\n"
-       "Kernel routes (not installed via the zebra RIB)\n" "Connected routes (directly attached subnet or host)\n" "Statically configured routes\n" "Open Shortest Path First (OSPFv2)\n" "Intermediate System to Intermediate System (IS-IS)\n" "Border Gateway Protocol (BGP)\n" "Protocol Independent Multicast (PIM)\n" "Babel routing protocol (Babel)\n" "Next Hop Resolution Protocol (NHRP)\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
-
-DEFSH (0, clear_ip_bgp_peer_vpnv4_soft_out_cmd_vtysh, 
-       "clear ip bgp A.B.C.D vpnv4 unicast soft out", 
-       "Reset functions\n"
-       "IP information\n"
        "BGP information\n"
-       "BGP neighbor address to clear\n"
+       "BGP view\n"
+       "View name\n"
        "Address family\n"
-       "Address Family Modifier\n"
-       "Soft reconfig inbound and outbound updates\n"
-       "Resend all outbound updates\n")
-
-DEFSH (0, match_community_cmd_vtysh, 
-       "match community (<1-99>|<100-500>|WORD)", 
-       "Match values from routing table\n"
-       "Match BGP community list\n"
-       "Community-list number (standard)\n"
-       "Community-list number (expanded)\n"
-       "Community-list name\n")
-
-DEFSH (0, no_bgp_graceful_restart_restart_time_cmd_vtysh, 
-       "no bgp graceful-restart restart-time", 
-       "Negate a command or set its defaults\n"
-       "BGP specific commands\n"
-       "Graceful restart capability parameters\n"
-       "Set the time to wait to delete stale routes before a BGP open message is received\n")
-
-DEFSH (0, isis_circuit_type_cmd_vtysh, 
-       "isis circuit-type (level-1|level-1-2|level-2-only)", 
-       "IS-IS commands\n"
-       "Configure circuit type for interface\n"
-       "Level-1 only adjacencies are formed\n"
-       "Level-1-2 adjacencies are formed\n"
-       "Level-2 only adjacencies are formed\n")
-
-DEFSH (0, show_ipv6_mbgp_lcommunity2_cmd_vtysh, 
-       "show ipv6 mbgp large-community (AA:BB:CC) (AA:BB:CC)", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "MBGP information\n"
-       "Display routes matching the large-communities\n"
-       "large-community number\n"
-       "large-community number\n")
-
-DEFSH (0, debug_isis_upd_cmd_vtysh, 
-       "debug isis update-packets", 
-       "Debugging functions (see also 'undebug')\n"
-       "IS-IS information\n"
-       "IS-IS Update related packets\n")
-
-DEFSH (0, show_ip_bgp_vpnv4_rd_summary_cmd_vtysh, 
-       "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn summary", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Display VPNv4 NLRI specific information\n"
-       "Display information for a route distinguisher\n"
-       "VPN Route Distinguisher\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
        "Summary of BGP neighbor status\n")
 
-DEFSH (0, no_ip_community_list_expanded_cmd_vtysh, 
-       "no ip community-list <100-500> (deny|permit) .LINE", 
-       "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Add a community list entry\n"
-       "Community list number (expanded)\n"
-       "Specify community to reject\n"
-       "Specify community to accept\n"
-       "An ordered list as a regular-expression\n")
-
-DEFSH (0, ospf_area_vlink_authtype_args_md5_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(authentication|) (message-digest|null) "
-       "(message-digest-key|) <1-255> md5 KEY", 
-       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
-       "Enable authentication on this virtual link\n" "dummy string \n" "Use null authentication\n" "Use message-digest authentication\n"
-       "Message digest authentication password (key)\n" "dummy string \n" "Key ID\n" "Use MD5 algorithm\n" "The OSPF password (key)")
+DEFSH (0, neighbor_maximum_prefix_cmd_vtysh, 
+       "neighbor (A.B.C.D|X:X::X:X|WORD) " "maximum-prefix <1-4294967295>", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
+       "Maximum number of prefix accept from this peer\n"
+       "maximum no. of prefix limit\n")
 
-DEFSH (0, interface_no_ip_igmp_query_max_response_time_dsec_cmd_vtysh, 
-       "no" " " "ip igmp query-max-response-time-dsec", 
+DEFSH (0, ospf6_distance_cmd_vtysh, 
+       "distance <1-255>", 
        "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Enable IGMP operation\n"
-       "IGMP max query response value (deciseconds)\n")
+       "Define an administrative distance\n"
+       "OSPF6 Administrative distance\n")
 
-DEFSH (0, show_bgp_ipv6_community3_exact_cmd_vtysh, 
-       "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
+DEFSH (0, show_bgp_ipv6_community4_cmd_vtysh, 
+       "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
        "Show running system information\n"
        "BGP information\n"
        "Address family\n"
@@ -2017,512 +2005,440 @@ DEFSH (0, show_bgp_ipv6_community3_exact_cmd_vtysh,
        "Do not send outside local AS (well-known community)\n"
        "Do not advertise to any peer (well-known community)\n"
        "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
-
-DEFSH (0, no_set_vpnv4_nexthop_cmd_vtysh, 
-       "no set vpnv4 next-hop", 
-       "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "VPNv4 information\n"
-       "VPNv4 next-hop address\n")
-
-DEFSH (0, show_bgp_community_cmd_vtysh, 
-       "show bgp community (AA:NN|local-AS|no-advertise|no-export)", 
-       "Show running system information\n"
-       "BGP information\n"
-       "Display routes matching the communities\n"
        "community number\n"
        "Do not send outside local AS (well-known community)\n"
        "Do not advertise to any peer (well-known community)\n"
        "Do not export to next AS (well-known community)\n")
 
-DEFSH (0, clear_bgp_external_soft_in_cmd_vtysh, 
-       "clear bgp external soft in", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Clear all external peers\n"
-       "Soft reconfig inbound and outbound updates\n"
-       "Send route-refresh unless using 'soft-reconfiguration inbound'\n")
+DEFSH (0, no_neighbor_ebgp_multihop_cmd_vtysh, 
+       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "ebgp-multihop", 
+       "Negate a command or set its defaults\n"
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
+       "Allow EBGP neighbors not on directly connected networks\n")
 
-DEFSH (0, show_isis_interface_arg_cmd_vtysh, 
-       "show isis interface WORD", 
+DEFSH (0, show_ip_bgp_ipv4_neighbors_peer_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X)", 
        "Show running system information\n"
-       "ISIS network information\n"
-       "ISIS interface\n"
-       "ISIS interface name\n")
+       "IP information\n"
+       "BGP information\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Detailed information on TCP and BGP neighbor connections\n"
+       "Neighbor to display information about\n"
+       "Neighbor to display information about\n")
 
-DEFSH (0, if_nhrp_reg_flags_cmd_vtysh, 
- "(ip|ipv6)" " nhrp registration (no-unique)", 
- "IP information\n" "IPv6 information\n"
- "Next Hop Resolution Protocol functions\n"
- "Registration configuration\n"
- "Don't set unique flag\n")
+DEFSH (0, rip_offset_list_ifname_cmd_vtysh, 
+       "offset-list WORD (in|out) <0-16> IFNAME", 
+       "Modify RIP metric\n"
+       "Access-list name\n"
+       "For incoming updates\n"
+       "For outgoing updates\n"
+       "Metric value\n"
+       "Interface to match\n")
 
-DEFSH (0, show_ip_bgp_view_rsclient_route_cmd_vtysh, 
-       "show ip bgp view WORD rsclient (A.B.C.D|X:X::X:X) A.B.C.D", 
+DEFSH (0, ospf_passive_interface_default_cmd_vtysh, 
+       "passive-interface default", 
+       "Suppress routing updates on an interface\n"
+       "Suppress routing updates on interfaces by default\n")
+
+DEFSH (0, send_lifetime_month_day_month_day_cmd_vtysh, 
+       "send-lifetime HH:MM:SS MONTH <1-31> <1993-2035> HH:MM:SS MONTH <1-31> <1993-2035>", 
+       "Set send lifetime of the key\n"
+       "Time to start\n"
+       "Month of the year to start\n"
+       "Day of th month to start\n"
+       "Year to start\n"
+       "Time to expire\n"
+       "Month of the year to expire\n"
+       "Day of th month to expire\n"
+       "Year to expire\n")
+
+DEFSH (0, show_bgp_ipv6_safi_rd_route_cmd_vtysh, 
+       "show bgp ipv6 (encap|vpn) rd ASN:nn_or_IP-address:nn X:X::X:X", 
        "Show running system information\n"
-       "IP information\n"
        "BGP information\n"
-       "BGP view\n"
-       "View name\n"
-       "Information about Route Server Client\n"
-       "Neighbor address\nIPv6 address\n"
+       "Address Family\n"
+       "Address Family Modifier\n"
+       "Address Family Modifier\n"
+       "Display information for a route distinguisher\n"
+       "ENCAP Route Distinguisher\n"
        "Network in the BGP routing table to display\n")
 
-DEFSH (0, show_bgp_ipv4_safi_damp_flap_prefix_cmd_vtysh, 
-       "show bgp ipv4 (encap|multicast|unicast|vpn) dampening flap-statistics A.B.C.D/M", 
+DEFSH (0, show_ip_bgp_ipv4_community_exact_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) exact-match", 
        "Show running system information\n"
+       "IP information\n"
        "BGP information\n"
        "Address family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
+       "Display routes matching the communities\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
+       "Exact match of the communities")
+
+DEFSH (0, show_bgp_ipv6_safi_damp_flap_filter_list_cmd_vtysh, 
+       "show bgp ipv6 (encap|multicast|unicast|vpn) dampening flap-statistics filter-list WORD", 
+       "Show running system information\n"
+       "BGP information\n"
+       "IPv6 information\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
        "Display detailed information about dampening\n"
        "Display flap statistics of routes\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
-
-DEFSH (0, ospf6_distance_ospf6_external_cmd_vtysh, 
-       "distance ospf6 external <1-255>", 
-       "Define an administrative distance\n"
-       "OSPF6 Administrative distance\n"
-       "External routes\n"
-       "Distance for external routes\n")
+       "Display routes conforming to the filter-list\n"
+       "Regular expression access list name\n")
 
-DEFSH (0, no_debug_bgp_nht_cmd_vtysh, 
-       "no debug bgp nht", 
+DEFSH (0, no_debug_ospf_zebra_cmd_vtysh, 
+       "no debug ospf zebra", 
        "Negate a command or set its defaults\n"
        "Debugging functions (see also 'undebug')\n"
-       "BGP information\n"
-       "BGP nexthop tracking events\n")
+       "OSPF information\n"
+       "OSPF Zebra information\n")
 
-DEFSH (0, no_set_ipv6_nexthop_peer_cmd_vtysh, 
-       "no set ipv6 next-hop peer-address", 
+DEFSH (0, no_ospf6_distance_cmd_vtysh, 
+       "no distance <1-255>", 
        "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "IPv6 information\n"
-       "IPv6 next-hop address\n"
-       )
-
-DEFSH (0, clear_ip_bgp_all_vpnv4_out_cmd_vtysh, 
-       "clear ip bgp * vpnv4 unicast out", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "Clear all peers\n"
-       "Address family\n"
-       "Address Family Modifier\n"
-       "Resend all outbound updates\n")
-
-DEFSH (0, show_bgp_ipv4_safi_neighbor_received_prefix_filter_cmd_vtysh, 
-       "show bgp ipv4 (encap|multicast|unicast|vpn) neighbors (A.B.C.D|X:X::X:X) received prefix-filter", 
-       "Show running system information\n"
-       "BGP information\n"
-       "IP information\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display information received from a BGP neighbor\n"
-       "Display the prefixlist filter\n")
+       "Define an administrative distance\n"
+       "OSPF6 Administrative distance\n")
 
-DEFSH (0, debug_pim_packetdump_recv_cmd_vtysh, 
-       "debug pim packet-dump receive", 
+DEFSH (0, no_debug_ospf6_neighbor_cmd_vtysh, 
+       "no debug ospf6 neighbor", 
+       "Negate a command or set its defaults\n"
        "Debugging functions (see also 'undebug')\n"
-       "PIM protocol activity\n"
-       "PIM packet dump\n"
-       "Dump received packets\n")
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Debug OSPFv3 Neighbor\n"
+      )
 
-DEFSH (0, ipv6_route_ifname_flags_pref_tag_vrf_cmd_vtysh, 
-       "ipv6 route X:X::X:X/M X:X::X:X INTERFACE (reject|blackhole) tag <1-4294967295> <1-255>" "vrf <0-65535>", 
-       "IP information\n"
-       "Establish static routes\n"
-       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
-       "IPv6 gateway address\n"
-       "IPv6 gateway interface name\n"
-       "Emit an ICMP unreachable when matched\n"
-       "Silently discard pkts when matched\n"
-       "Set tag for this route\n"
-       "Tag value\n"
-       "Distance value for this prefix\n"
-       "Specify the VRF\nThe VRF ID\n")
+DEFSH (0, no_ripng_default_metric_val_cmd_vtysh, 
+       "no default-metric <1-16>", 
+       "Negate a command or set its defaults\n"
+       "Set a metric of redistribute routes\n"
+       "Default metric\n")
 
-DEFSH (0, show_bgp_ipv6_rsclient_route_cmd_vtysh, 
-       "show bgp ipv6 rsclient (A.B.C.D|X:X::X:X) X:X::X:X", 
+DEFSH (0, show_bgp_ipv6_safi_damp_flap_regexp_cmd_vtysh, 
+       "show bgp ipv6 (encap|multicast|unicast|vpn) dampening flap-statistics regexp .LINE", 
        "Show running system information\n"
        "BGP information\n"
-       "IPv6 Information\n"
-       "Information about Route Server Client\n"
-       "Neighbor address\nIPv6 address\n"
-       "Network in the BGP routing table to display\n")
+       "IPv6 information\n"
+       "Address Family Modifier\n"
+       "Address Family Modifier\n"
+       "Address Family Modifier\n"
+       "Address Family Modifier\n"
+       "Display detailed information about dampening\n"
+       "Display flap statistics of routes\n"
+       "Display routes matching the AS path regular expression\n"
+       "A regular-expression to match the BGP AS paths\n")
 
-DEFSH (0, bandwidth_if_cmd_vtysh, 
-       "bandwidth <1-10000000>", 
-       "Set bandwidth informational parameter\n"
-       "Bandwidth in kilobits\n")
+DEFSH (0, undebug_bgp_all_cmd_vtysh, 
+       "undebug all bgp", 
+       "Disable debugging functions (see also 'debug')\n"
+       "Enable all debugging\n"
+       "BGP information\n")
 
-DEFSH (0, clear_bgp_ipv6_peer_group_cmd_vtysh, 
-       "clear bgp ipv6 peer-group WORD", 
+DEFSH (0, clear_ip_bgp_all_rsclient_cmd_vtysh, 
+       "clear ip bgp * rsclient", 
        "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
-       "Address family\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n")
+       "Clear all peers\n"
+       "Soft reconfig for rsclient RIB\n")
 
-DEFSH (0, no_isis_metric_l2_arg_cmd_vtysh, 
-       "no isis metric <0-16777215> level-2", 
+DEFSH (0, no_ospf_area_authentication_cmd_vtysh, 
+       "no area (A.B.C.D|<0-4294967295>) authentication", 
+       "Negate a command or set its defaults\n"
+       "OSPF area parameters\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n"
+       "Enable authentication\n")
+
+DEFSH (0, no_psnp_interval_cmd_vtysh, 
+       "no isis psnp-interval", 
        "Negate a command or set its defaults\n"
        "IS-IS commands\n"
-       "Set default metric for circuit\n"
-       "Default metric value\n"
-       "Specify metric for level-2 routing\n")
+       "Set PSNP interval in seconds\n")
 
-DEFSH (0, clear_bgp_peer_group_in_prefix_filter_cmd_vtysh, 
-       "clear bgp peer-group WORD in prefix-filter", 
+DEFSH (0, no_debug_ospf6_asbr_cmd_vtysh, 
+       "no debug ospf6 asbr", 
+       "Negate a command or set its defaults\n"
+       "Debugging functions (see also 'undebug')\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Debug OSPFv3 ASBR function\n"
+      )
+
+DEFSH (0, debug_ospf6_zebra_cmd_vtysh, 
+       "debug ospf6 zebra", 
+       "Debugging functions (see also 'undebug')\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Debug connection between zebra\n"
+      )
+
+DEFSH (0, clear_ip_bgp_peer_group_ipv4_soft_in_cmd_vtysh, 
+       "clear ip bgp peer-group WORD ipv4 (unicast|multicast) soft in", 
        "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
        "Clear all members of peer-group\n"
        "BGP peer-group name\n"
-       "Send route-refresh unless using 'soft-reconfiguration inbound'\n"
-       "Push out prefix-list ORF and do inbound soft reconfig\n")
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Soft reconfig inbound and outbound updates\n"
+       "Send route-refresh unless using 'soft-reconfiguration inbound'\n")
 
-DEFSH (0, no_debug_igmp_cmd_vtysh, 
-       "no debug igmp", 
+DEFSH (0, no_bgp_distance_cmd_vtysh, 
+       "no distance bgp <1-255> <1-255> <1-255>", 
        "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
-       "IGMP protocol activity\n")
+       "Define an administrative distance\n"
+       "BGP distance\n"
+       "Distance for routes external to the AS\n"
+       "Distance for routes internal to the AS\n"
+       "Distance for local routes\n")
 
-DEFSH (0, no_psnp_interval_l2_arg_cmd_vtysh, 
-       "no isis psnp-interval <1-120> level-2", 
-       "Negate a command or set its defaults\n"
-       "IS-IS commands\n"
-       "Set PSNP interval in seconds\n"
-       "PSNP interval value\n"
-       "Specify interval for level-2 PSNPs\n")
+DEFSH (0, show_ip_bgp_vpnv4_all_neighbors_peer_cmd_vtysh, 
+       "show ip bgp vpnv4 all neighbors A.B.C.D", 
+       "Show running system information\n"
+       "IP information\n"
+       "BGP information\n"
+       "Display VPNv4 NLRI specific information\n"
+       "Display information about all VPNv4 NLRIs\n"
+       "Detailed information on TCP and BGP neighbor connections\n"
+       "Neighbor to display information about\n")
 
-DEFSH (0, no_spf_interval_l1_arg_cmd_vtysh, 
-       "no spf-interval level-1 <1-120>", 
+DEFSH (0, no_ripng_redistribute_ripng_cmd_vtysh, 
+       "no redistribute ripng", 
        "Negate a command or set its defaults\n"
-       "Minimum interval between SPF calculations\n"
-       "Set interval for level 1 only\n"
-       "Minimum interval between consecutive SPFs in seconds\n")
+       "Redistribute information from another routing protocol\n"
+       "RIPng route\n")
 
-DEFSH (0, show_ip_bgp_lcommunity_cmd_vtysh, 
-       "show ip bgp large-community (AA:BB:CC)", 
+DEFSH (0, show_ip_bgp_neighbors_cmd_vtysh, 
+       "show ip bgp neighbors", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
-       "Display routes matching the large-communities\n"
-       "large-community number\n")
+       "Detailed information on TCP and BGP neighbor connections\n")
 
-DEFSH (0, neighbor_maximum_prefix_threshold_warning_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "maximum-prefix <1-4294967295> <1-100> warning-only", 
+DEFSH (0, neighbor_strict_capability_cmd_vtysh, 
+       "neighbor (A.B.C.D|X:X::X:X) " "strict-capability-match", 
        "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Maximum number of prefix accept from this peer\n"
-       "maximum no. of prefix limit\n"
-       "Threshold value (%) at which to generate a warning msg\n"
-       "Only give warning message when limit is exceeded\n")
+       "Neighbor address\nIPv6 address\n"
+       "Strict capability negotiation match\n")
 
-DEFSH (0, show_bgp_ipv6_encap_cmd_vtysh, 
-       "show bgp ipv6 encap", 
+DEFSH (0, ip_route_mask_flags_tag_distance2_vrf_cmd_vtysh, 
+       "ip route A.B.C.D A.B.C.D (reject|blackhole) tag <1-4294967295> <1-255>" "vrf <0-65535>", 
+       "IP information\n"
+       "Establish static routes\n"
+       "IP destination prefix\n"
+       "IP destination prefix mask\n"
+       "Set tag for this route\n"
+       "Tag value\n"
+       "Distance value for this route\n"
+       "Emit an ICMP unreachable when matched\n"
+       "Silently discard pkts when matched\n"
+       "Specify the VRF\nThe VRF ID\n")
+
+DEFSH (0, no_ip_route_mask_flags_tag_distance_cmd_vtysh, 
+       "no ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE) (reject|blackhole) tag <1-4294967295> <1-255>", 
+       "Negate a command or set its defaults\n"
+       "IP information\n"
+       "Establish static routes\n"
+       "IP destination prefix\n"
+       "IP destination prefix mask\n"
+       "IP gateway address\n"
+       "IP gateway interface name\n"
+       "Emit an ICMP unreachable when matched\n"
+       "Silently discard pkts when matched\n"
+       "Tag of this route\n"
+       "Tag value\n"
+       "Distance value for this route\n")
+
+DEFSH (0, show_bgp_ipv6_community2_cmd_vtysh, 
+       "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
        "Show running system information\n"
        "BGP information\n"
-       "Address Family\n"
-       "Display ENCAP NLRI specific information\n")
+       "Address family\n"
+       "Display routes matching the communities\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n")
 
-DEFSH (0, ripng_network_cmd_vtysh, 
-       "network IF_OR_ADDR", 
-       "RIPng enable on specified interface or network.\n"
-       "Interface or address")
+DEFSH (0, ipv6_access_list_cmd_vtysh, 
+       "ipv6 access-list WORD (deny|permit) X:X::X:X/M", 
+       "IPv6 information\n"
+       "Add an access list entry\n"
+       "IPv6 zebra access-list\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "Prefix to match. e.g. 3ffe:506::/32\n")
 
-DEFSH (0, no_debug_ospf_lsa_cmd_vtysh, 
-       "no debug ospf lsa", 
+DEFSH (0, no_pce_domain_cmd_vtysh, 
+       "no pce domain as <0-65535>", 
        "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
-       "OSPF information\n"
-       "OSPF Link State Advertisement\n")
+       "PCE Router Information specific commands\n"
+       "Disable PCE domain AS number\n"
+       "AS number where the PCE as visibilities for path computation\n"
+       "AS number in decimal <0-65535>\n")
 
-DEFSH (0, no_debug_ospf_ism_cmd_vtysh, 
-       "no debug ospf ism", 
+DEFSH (0, interface_ip_igmp_query_max_response_time_dsec_cmd_vtysh, 
+       "ip igmp query-max-response-time-dsec" " <10-250>", 
+       "IP information\n"
+       "Enable IGMP operation\n"
+       "IGMP max query response value (deciseconds)\n"
+       "Query response value in deciseconds\n")
+
+DEFSH (0, ip_ospf_mtu_ignore_cmd_vtysh, 
+      "ip ospf mtu-ignore", 
+      "IP Information\n"
+      "OSPF interface commands\n"
+      "Disable mtu mismatch detection\n")
+
+DEFSH (0, no_ip_ospf_area_cmd_vtysh, 
+       "no ip ospf area [A.B.C.D]", 
        "Negate a command or set its defaults\n"
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Disable OSPF on this interface\n"
+       "Address of interface\n")
+
+DEFSH (0, ipv6_nd_prefix_cmd_vtysh, 
+       "ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) "
+       "(<0-4294967295>|infinite) (off-link|) (no-autoconfig|) (router-address|)", 
+       "Interface IPv6 config commands\n"
+       "Neighbor discovery\n"
+       "Prefix information\n"
+       "IPv6 prefix\n"
+       "Valid lifetime in seconds\n"
+       "Infinite valid lifetime\n"
+       "Preferred lifetime in seconds\n"
+       "Infinite preferred lifetime\n"
+       "Do not use prefix for onlink determination\n"
+       "Do not use prefix for autoconfiguration\n"
+       "Set Router Address flag\n")
+
+DEFSH (0, debug_zebra_nht_cmd_vtysh, 
+       "debug zebra nht", 
        "Debugging functions (see also 'undebug')\n"
-       "OSPF information\n"
-       "OSPF Interface State Machine")
+       "Zebra configuration\n"
+       "Debug option set for zebra next hop tracking\n")
 
-DEFSH (0, no_isis_circuit_type_cmd_vtysh, 
-       "no isis circuit-type (level-1|level-1-2|level-2-only)", 
+DEFSH (0, no_dynamic_hostname_cmd_vtysh, 
+       "no hostname dynamic", 
        "Negate a command or set its defaults\n"
-       "IS-IS commands\n"
-       "Configure circuit type for interface\n"
-       "Level-1 only adjacencies are formed\n"
-       "Level-1-2 adjacencies are formed\n"
-       "Level-2 only adjacencies are formed\n")
+       "Dynamic hostname for IS-IS\n"
+       "Dynamic hostname\n")
 
-DEFSH (0, clear_bgp_ipv6_as_soft_in_cmd_vtysh, 
-       "clear bgp ipv6 " "<1-4294967295>" " soft in", 
+DEFSH (0, show_bgp_instance_ipv6_summary_cmd_vtysh, 
+       "show bgp view WORD ipv6 summary", 
+       "Show running system information\n"
+       "BGP information\n"
+       "IPv6 information\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "BGP view\n"
+       "View name\n"
+       "Summary of BGP neighbor status\n")
+
+DEFSH (0, clear_bgp_ipv6_as_out_cmd_vtysh, 
+       "clear bgp ipv6 " "<1-4294967295>" " out", 
        "Reset functions\n"
        "BGP information\n"
        "Address family\n"
        "Clear peers with the AS number\n"
-       "Soft reconfig inbound and outbound updates\n"
-       "Send route-refresh unless using 'soft-reconfiguration inbound'\n")
-
-DEFSH (0|0|0|0|0, match_tag_cmd_vtysh, 
-       "match tag <1-4294967295>", 
-       "Match values from routing table\n"
-       "Match tag of route\n"
-       "Metric value\n")
+       "Resend all outbound updates\n")
 
-DEFSH (0, show_ipv6_ospf6_database_type_adv_router_linkstate_id_cmd_vtysh, 
-       "show ipv6 ospf6 database "
-       "(router|network|inter-prefix|inter-router|as-external|"
-       "group-membership|type-7|link|intra-prefix) "
-       "adv-router A.B.C.D linkstate-id A.B.C.D", 
-       "Show running system information\n"
+DEFSH (0|0|0|0, clear_ipv6_prefix_list_name_prefix_cmd_vtysh, 
+       "clear ipv6 prefix-list WORD X:X::X:X/M", 
+       "Reset functions\n"
        "IPv6 information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Display Link state database\n"
-       "Display Router LSAs\n"
-       "Display Network LSAs\n"
-       "Display Inter-Area-Prefix LSAs\n"
-       "Display Inter-Area-Router LSAs\n"
-       "Display As-External LSAs\n"
-       "Display Group-Membership LSAs\n"
-       "Display Type-7 LSAs\n"
-       "Display Link LSAs\n"
-       "Display Intra-Area-Prefix LSAs\n"
-       "Search by Advertising Router\n"
-       "Specify Advertising Router as IPv4 address notation\n"
-       "Search by Link state ID\n"
-       "Specify Link state ID as IPv4 address notation\n"
-      )
+       "Build a prefix list\n"
+       "Name of a prefix list\n"
+       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n")
 
-DEFSH (0, show_bgp_ipv6_vpn_rd_neighbor_advertised_routes_cmd_vtysh, 
-       "show bgp ipv6 vpn rd ASN:nn_or_IP-address:nn neighbors (A.B.C.D|X:X::X:X) advertised-routes", 
+DEFSH (0, show_ip_bgp_lcommunity2_cmd_vtysh, 
+       "show ip bgp large-community (AA:BB:CC) (AA:BB:CC)", 
        "Show running system information\n"
+       "IP information\n"
        "BGP information\n"
-       "Address Family\n"
-       "Display VPN NLRI specific information\n"
-       "Display information for a route distinguisher\n"
-       "VPN Route Distinguisher\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display the routes advertised to a BGP neighbor\n")
+       "Display routes matching the large-communities\n"
+       "large-community number\n"
+       "large-community number\n")
 
-DEFSH (0, clear_ip_bgp_peer_group_ipv4_soft_out_cmd_vtysh, 
-       "clear ip bgp peer-group WORD ipv4 (unicast|multicast) soft out", 
-       "Reset functions\n"
+DEFSH (0, no_ipv6_route_ifname_flags_tag_cmd_vtysh, 
+       "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE (reject|blackhole) tag <1-4294967295>", 
+       "Negate a command or set its defaults\n"
        "IP information\n"
-       "BGP information\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Soft reconfig inbound and outbound updates\n"
-       "Resend all outbound updates\n")
-
-DEFSH (0, show_ip_bgp_neighbor_advertised_route_cmd_vtysh, 
-       "show ip bgp neighbors (A.B.C.D|X:X::X:X) advertised-routes", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display the routes advertised to a BGP neighbor\n")
+       "Establish static routes\n"
+       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
+       "IPv6 gateway address\n"
+       "IPv6 gateway interface name\n"
+       "Emit an ICMP unreachable when matched\n"
+       "Silently discard pkts when matched\n"
+       "Set tag for this route\n"
+       "Tag value\n")
 
-DEFSH (0, no_neighbor_capability_dynamic_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "capability dynamic", 
+DEFSH (0, no_set_metric_type_cmd_vtysh, 
+       "no set metric-type", 
        "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Advertise capability to the peer\n"
-       "Advertise dynamic capability to this neighbor\n")
-
-DEFSH (0, show_ip_bgp_damp_flap_prefix_longer_cmd_vtysh, 
-       "show ip bgp dampening flap-statistics A.B.C.D/M longer-prefixes", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Display detailed information about dampening\n"
-       "Display flap statistics of routes\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Display route and more specific routes\n")
-
-DEFSH (0, no_area_export_list_cmd_vtysh, 
-       "no area A.B.C.D export-list NAME", 
-       "OSPFv6 area parameters\n"
-       "OSPFv6 area ID in IP address format\n"
-       "Unset the filter for networks announced to other areas\n"
-       "Name of the access-list\n")
+       "Set values in destination routing protocol\n"
+       "Type of metric for destination routing protocol\n")
 
-DEFSH (0, no_bgp_bestpath_med3_cmd_vtysh, 
-       "no bgp bestpath med missing-as-worst confed", 
-       "Negate a command or set its defaults\n"
+DEFSH (0, bgp_bestpath_med_cmd_vtysh, 
+       "bgp bestpath med (confed|missing-as-worst)", 
        "BGP specific commands\n"
        "Change the default bestpath selection\n"
        "MED attribute\n"
-       "Treat missing MED as the least preferred one\n"
-       "Compare MED among confederation paths\n")
-
-DEFSH (0, show_bgp_ipv4_encap_rd_cmd_vtysh, 
-       "show bgp ipv4 encap rd ASN:nn_or_IP-address:nn", 
-       "Show running system information\n"
-       "BGP information\n"
-       "Address Family\n"
-       "Display ENCAP NLRI specific information\n"
-       "Display information for a route distinguisher\n"
-       "ENCAP Route Distinguisher\n")
-
-DEFSH (0, debug_ospf6_lsa_hex_detail_cmd_vtysh, 
-       "debug ospf6 lsa (router|network|inter-prefix|inter-router|as-ext|grp-mbr|type7|link|intra-prefix|unknown) (originate|examine|flooding)", 
-       "Debugging functions (see also 'undebug')\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Debug Link State Advertisements (LSAs)\n"
-       "Specify LS type as Hexadecimal\n"
-      )
-
-DEFSH (0|0|0|0, clear_ipv6_prefix_list_cmd_vtysh, 
-       "clear ipv6 prefix-list", 
-       "Reset functions\n"
-       "IPv6 information\n"
-       "Build a prefix list\n")
-
-DEFSH (0, show_ipv6_bgp_community_list_cmd_vtysh, 
-       "show ipv6 bgp community-list WORD", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "BGP information\n"
-       "Display routes matching the community-list\n"
-       "community-list name\n")
-
-DEFSH (0, isis_hello_padding_cmd_vtysh, 
-       "isis hello padding", 
-       "IS-IS commands\n"
-       "Add padding to IS-IS hello packets\n"
-       "Pad hello packets\n"
-       "<cr>\n")
-
-DEFSH (0, ipv6_nd_homeagent_preference_cmd_vtysh, 
-       "ipv6 nd home-agent-preference <0-65535>", 
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Home Agent preference\n"
-       "preference value (default is 0,  least preferred)\n")
+       "Compare MED among confederation paths\n"
+       "Treat missing MED as the least preferred one\n")
 
-DEFSH (0, interface_no_ip_igmp_join_cmd_vtysh, 
-       "no ip igmp join A.B.C.D A.B.C.D", 
-       "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Enable IGMP operation\n"
-       "IGMP join multicast group\n"
-       "Multicast group address\n"
-       "Source address\n")
+DEFSH (0, ospf_area_vlink_authtype_args_md5_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+       "(authentication|) (message-digest|null) "
+       "(message-digest-key|) <1-255> md5 KEY", 
+       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
+       "Enable authentication on this virtual link\n" "dummy string \n" "Use null authentication\n" "Use message-digest authentication\n"
+       "Message digest authentication password (key)\n" "dummy string \n" "Key ID\n" "Use MD5 algorithm\n" "The OSPF password (key)")
 
-DEFSH (0|0|0|0, show_ipv6_prefix_list_detail_name_cmd_vtysh, 
-       "show ipv6 prefix-list detail WORD", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Detail of prefix lists\n"
-       "Name of a prefix list\n")
+DEFSH (0, ospf_area_range_substitute_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) range A.B.C.D/M substitute A.B.C.D/M", 
+       "OSPF area parameters\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n"
+       "Summarize routes matching address/mask (border routers only)\n"
+       "Area range prefix\n"
+       "Announce area range as another prefix\n"
+       "Network prefix to be announced instead of range\n")
 
-DEFSH (0, no_neighbor_attr_unchanged5_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "attribute-unchanged as-path next-hop med", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "As-path attribute\n"
-       "Nexthop attribute\n"
-       "Med attribute\n")
+DEFSH (0, debug_ospf_zebra_cmd_vtysh, 
+       "debug ospf zebra", 
+       "Debugging functions (see also 'undebug')\n"
+       "OSPF information\n"
+       "OSPF Zebra information\n")
 
-DEFSH (0, show_ip_bgp_ipv4_paths_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) paths", 
+DEFSH (0, show_ip_route_tag_vrf_cmd_vtysh, 
+       "show ip route tag <1-4294967295>" "vrf <0-65535>", 
        "Show running system information\n"
        "IP information\n"
-       "BGP information\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Path information\n")
-
-DEFSH (0, no_ipv6_route_pref_vrf_cmd_vtysh, 
-       "no ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) <1-255> " "vrf <0-65535>", 
-       "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Establish static routes\n"
-       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
-       "IPv6 gateway address\n"
-       "IPv6 gateway interface name\n"
-       "Distance value for this prefix\n"
-       "Specify the VRF\nThe VRF ID\n")
-
-DEFSH (0, ipv6_bgp_distance_source_cmd_vtysh, 
-       "distance <1-255> X:X::X:X/M", 
-       "Define an administrative distance\n"
-       "Administrative distance\n"
-       "IP source prefix\n")
-
-DEFSH (0, ipv6_route_flags_vrf_cmd_vtysh, 
-       "ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) (reject|blackhole) " "vrf <0-65535>", 
-       "IP information\n"
-       "Establish static routes\n"
-       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
-       "IPv6 gateway address\n"
-       "IPv6 gateway interface name\n"
-       "Emit an ICMP unreachable when matched\n"
-       "Silently discard pkts when matched\n"
+       "IP routing table\n"
+       "Show only routes with tag\n"
+       "Tag value\n"
        "Specify the VRF\nThe VRF ID\n")
 
-DEFSH (0, no_max_lsp_lifetime_l2_arg_cmd_vtysh, 
-       "no max-lsp-lifetime level-2 <350-65535>", 
-       "Negate a command or set its defaults\n"
-       "Maximum LSP lifetime for Level 2 only\n"
-       "LSP lifetime for Level 2 only in seconds\n")
-
-DEFSH (0, show_bgp_view_ipv6_neighbor_advertised_route_cmd_vtysh, 
-       "show bgp view WORD ipv6 neighbors (A.B.C.D|X:X::X:X) advertised-routes", 
-       "Show running system information\n"
-       "BGP information\n"
-       "BGP view\n"
-       "View name\n"
-       "Address family\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display the routes advertised to a BGP neighbor\n")
-
-DEFSH (0, debug_bgp_allow_martians_cmd_vtysh, 
-       "debug bgp allow-martians", 
-       "Debugging functions (see also 'undebug')\n"
-       "BGP information\n"
-       "BGP allow martian next hops\n")
-
-DEFSH (0, neighbor_local_as_no_prepend_replace_as_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "local-as " "<1-4294967295>" " no-prepend replace-as", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Specify a local-as number\n"
-       "AS number used as local AS\n"
-       "Do not prepend local-as to updates from ebgp peers\n"
-       "Do not prepend local-as to updates from ibgp peers\n")
-
-DEFSH (0, show_bgp_ipv6_safi_community3_cmd_vtysh, 
-       "show bgp ipv6 (encap|multicast|unicast|vpn) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
+DEFSH (0, show_ip_bgp_community3_cmd_vtysh, 
+       "show ip bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
        "Show running system information\n"
+       "IP information\n"
        "BGP information\n"
-       "Address family\n"
-       "Address family modifier\n"
-       "Address family modifier\n"
-       "Address family modifier\n"
-       "Address family modifier\n"
        "Display routes matching the communities\n"
        "community number\n"
        "Do not send outside local AS (well-known community)\n"
@@ -2537,142 +2453,121 @@ DEFSH (0, show_bgp_ipv6_safi_community3_cmd_vtysh,
        "Do not advertise to any peer (well-known community)\n"
        "Do not export to next AS (well-known community)\n")
 
-DEFSH (0, clear_ip_bgp_as_cmd_vtysh, 
-       "clear ip bgp " "<1-4294967295>", 
-       "Reset functions\n"
+DEFSH (0, rip_offset_list_cmd_vtysh, 
+       "offset-list WORD (in|out) <0-16>", 
+       "Modify RIP metric\n"
+       "Access-list name\n"
+       "For incoming updates\n"
+       "For outgoing updates\n"
+       "Metric value\n")
+
+DEFSH (0, ip_rip_split_horizon_poisoned_reverse_cmd_vtysh, 
+       "ip rip split-horizon poisoned-reverse", 
        "IP information\n"
-       "BGP information\n"
-       "Clear peers with the AS number\n")
+       "Routing Information Protocol\n"
+       "Perform split horizon\n"
+       "With poisoned-reverse\n")
 
-DEFSH (0, no_rip_default_information_originate_cmd_vtysh, 
-       "no default-information originate", 
-       "Negate a command or set its defaults\n"
-       "Control distribution of default route\n"
-       "Distribute a default route\n")
-
-DEFSH (0, no_ipv6_bgp_distance_source_cmd_vtysh, 
-       "no distance <1-255> X:X::X:X/M", 
-       "Negate a command or set its defaults\n"
-       "Define an administrative distance\n"
-       "Administrative distance\n"
-       "IP source prefix\n")
-
-DEFSH (0, undebug_bgp_keepalive_cmd_vtysh, 
-       "undebug bgp keepalives", 
-       "Disable debugging functions (see also 'debug')\n"
-       "BGP information\n"
-       "BGP keepalives\n")
-
-DEFSH (0, clear_isis_neighbor_cmd_vtysh, 
-       "clear isis neighbor", 
-       "Reset functions\n"
-       "Reset ISIS network information\n"
-       "Reset ISIS neighbor adjacencies\n")
+DEFSH (0, ospf_area_nssa_no_summary_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) nssa no-summary", 
+       "OSPF area parameters\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n"
+       "Configure OSPF area as nssa\n"
+       "Do not inject inter-area routes into nssa\n")
 
-DEFSH (0, no_lsp_refresh_interval_arg_cmd_vtysh, 
-       "no lsp-refresh-interval <1-65235>", 
-       "Negate a command or set its defaults\n"
-       "LSP refresh interval\n"
-       "LSP refresh interval in seconds\n")
+DEFSH (0, lsp_refresh_interval_l2_cmd_vtysh, 
+       "lsp-refresh-interval level-2 <1-65235>", 
+       "LSP refresh interval for Level 2 only\n"
+       "LSP refresh interval for Level 2 only in seconds\n")
 
-DEFSH (0, show_ip_bgp_ipv4_community4_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
+DEFSH (0, show_bgp_lcommunity4_cmd_vtysh, 
+       "show bgp large-community (AA:BB:CC) (AA:BB:CC) (AA:BB:CC) (AA:BB:CC)", 
        "Show running system information\n"
-       "IP information\n"
        "BGP information\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
+       "Display routes matching the large-communities\n"
+       "large-community number\n"
+       "large-community number\n"
+       "large-community number\n"
+       "large-community number\n")
 
-DEFSH (0, no_ospf_network_area_cmd_vtysh, 
-       "no network A.B.C.D/M area (A.B.C.D|<0-4294967295>)", 
+DEFSH (0, no_debug_zebra_fpm_cmd_vtysh, 
+       "no debug zebra fpm", 
        "Negate a command or set its defaults\n"
-       "Enable routing on an IP network\n"
-       "OSPF network prefix\n"
-       "Set the OSPF area ID\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n")
+       "Debugging functions (see also 'undebug')\n"
+       "Zebra configuration\n"
+       "Debug zebra FPM events\n")
 
-DEFSH (0, show_ipv6_mbgp_community_list_exact_cmd_vtysh, 
-       "show ipv6 mbgp community-list WORD exact-match", 
+DEFSH (0, show_ipv6_ospf6_database_adv_router_linkstate_id_cmd_vtysh, 
+       "show ipv6 ospf6 database adv-router A.B.C.D linkstate-id A.B.C.D", 
        "Show running system information\n"
        "IPv6 information\n"
-       "MBGP information\n"
-       "Display routes matching the community-list\n"
-       "community-list name\n"
-       "Exact match of the communities\n")
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Display Link state database\n"
+       "Search by Advertising Router\n"
+       "Specify Advertising Router as IPv4 address notation\n"
+       "Search by Link state ID\n"
+       "Specify Link state ID as IPv4 address notation\n"
+      )
 
-DEFSH (0, show_bgp_view_ipv4_safi_rsclient_cmd_vtysh, 
-       "show bgp view WORD ipv4 (unicast|multicast) rsclient (A.B.C.D|X:X::X:X)", 
+DEFSH (0, ipv6_nd_homeagent_preference_cmd_vtysh, 
+       "ipv6 nd home-agent-preference <0-65535>", 
+       "Interface IPv6 config commands\n"
+       "Neighbor discovery\n"
+       "Home Agent preference\n"
+       "preference value (default is 0,  least preferred)\n")
+
+DEFSH (0, show_bgp_neighbor_flap_cmd_vtysh, 
+       "show bgp neighbors (A.B.C.D|X:X::X:X) flap-statistics", 
        "Show running system information\n"
        "BGP information\n"
-       "BGP view\n"
-       "View name\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Information about Route Server Client\n"
-       "Neighbor address\nIPv6 address\n")
+       "Detailed information on TCP and BGP neighbor connections\n"
+       "Neighbor to display information about\n"
+       "Neighbor to display information about\n"
+       "Display flap statistics of the routes learned from neighbor\n")
 
-DEFSH (0, no_debug_rip_packet_direct_cmd_vtysh, 
-       "no debug rip packet (recv|send)", 
+DEFSH (0, no_set_ecommunity_rt_val_cmd_vtysh, 
+       "no set extcommunity rt .ASN:nn_or_IP-address:nn", 
        "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
-       "RIP information\n"
-       "RIP packet\n"
-       "RIP option set for receive packet\n"
-       "RIP option set for send packet\n")
+       "Set values in destination routing protocol\n"
+       "BGP extended community attribute\n"
+       "Route Target extended community\n"
+       "VPN extended community\n")
 
-DEFSH (0, no_area_lsp_mtu_cmd_vtysh, 
-      "no lsp-mtu", 
-      "Negate a command or set its defaults\n"
-      "Configure the maximum size of generated LSPs\n")
+DEFSH (0, no_bgp_fast_external_failover_cmd_vtysh, 
+       "no bgp fast-external-failover", 
+       "Negate a command or set its defaults\n"
+       "BGP information\n"
+       "Immediately reset session if a link to a directly connected external peer goes down\n")
 
-DEFSH (0, lsp_refresh_interval_l1_cmd_vtysh, 
-       "lsp-refresh-interval level-1 <1-65235>", 
-       "LSP refresh interval for Level 1 only\n"
-       "LSP refresh interval for Level 1 only in seconds\n")
+DEFSH (0, debug_ripng_packet_cmd_vtysh, 
+       "debug ripng packet", 
+       "Debugging functions (see also 'undebug')\n"
+       "RIPng configuration\n"
+       "Debug option set for ripng packet\n")
 
-DEFSH (0, show_bgp_ipv4_safi_damp_flap_regexp_cmd_vtysh, 
-       "show bgp ipv4 (encap|multicast|unicast|vpn) dampening flap-statistics regexp .LINE", 
-       "Show running system information\n"
+DEFSH (0, no_aggregate_address_mask_as_set_summary_cmd_vtysh, 
+       "no aggregate-address A.B.C.D A.B.C.D as-set summary-only", 
+       "Negate a command or set its defaults\n"
+       "Configure BGP aggregate entries\n"
+       "Aggregate address\n"
+       "Aggregate mask\n"
+       "Generate AS set path information\n"
+       "Filter more specific routes from updates\n")
+
+DEFSH (0, no_bgp_cluster_id_cmd_vtysh, 
+       "no bgp cluster-id", 
+       "Negate a command or set its defaults\n"
        "BGP information\n"
-       "IP information\n"
-       "Address Family Modifier\n"
-       "Address Family Modifier\n"
-       "Address Family Modifier\n"
-       "Address Family Modifier\n"
-       "Display detailed information about dampening\n"
-       "Display flap statistics of routes\n"
-       "Display routes matching the AS path regular expression\n"
-       "A regular-expression to match the BGP AS paths\n")
+       "Configure Route-Reflector Cluster-id\n")
 
-DEFSH (0, neighbor_unsuppress_map_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "unsuppress-map WORD", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Route-map to selectively unsuppress suppressed routes\n"
-       "Name of route map\n")
+DEFSH (0, lsp_refresh_interval_cmd_vtysh, 
+       "lsp-refresh-interval <1-65235>", 
+       "LSP refresh interval\n"
+       "LSP refresh interval in seconds\n")
 
-DEFSH (0, ipv6_route_flags_pref_tag_cmd_vtysh, 
-       "ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) (reject|blackhole) tag <1-4294967295> <1-255>", 
+DEFSH (0, ipv6_route_flags_pref_tag_vrf_cmd_vtysh, 
+       "ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) (reject|blackhole) tag <1-4294967295> <1-255>" "vrf <0-65535>"
        "IP information\n"
        "Establish static routes\n"
        "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
@@ -2682,92 +2577,160 @@ DEFSH (0, ipv6_route_flags_pref_tag_cmd_vtysh,
        "Silently discard pkts when matched\n"
        "Set tag for this route\n"
        "Tag value\n"
-       "Distance value for this prefix\n")
+       "Distance value for this prefix\n"
+       "Specify the VRF\nThe VRF ID\n")
 
-DEFSH (0, no_debug_bgp_allow_martians_cmd_vtysh, 
-       "no debug bgp allow-martians", 
-       "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
+DEFSH (0, clear_ip_bgp_peer_vpnv4_in_cmd_vtysh, 
+       "clear ip bgp A.B.C.D vpnv4 unicast in", 
+       "Reset functions\n"
+       "IP information\n"
        "BGP information\n"
-       "BGP allow martian next hops\n")
+       "BGP neighbor address to clear\n"
+       "Address family\n"
+       "Address Family Modifier\n"
+       "Send route-refresh unless using 'soft-reconfiguration inbound'\n")
 
-DEFSH (0, no_link_params_enable_cmd_vtysh, 
-       "no enable", 
+DEFSH (0, no_ip_ospf_authentication_key_addr_cmd_vtysh, 
+       "no ip ospf authentication-key A.B.C.D", 
        "Negate a command or set its defaults\n"
-       "Disable link parameters on this interface\n")
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Authentication password (key)\n"
+       "Address of interface")
 
-DEFSH (0, show_bgp_ipv4_community_list_cmd_vtysh, 
-       "show bgp ipv4 community-list (<1-500>|WORD)", 
-       "Show running system information\n"
-       "BGP information\n"
-       "IP information\n"
-       "Display routes matching the community-list\n"
-       "community-list number\n"
-       "community-list name\n")
+DEFSH (0|0|0|0, no_ipv6_prefix_list_seq_cmd_vtysh, 
+       "no ipv6 prefix-list WORD seq <1-4294967295> (deny|permit) (X:X::X:X/M|any)", 
+       "Negate a command or set its defaults\n"
+       "IPv6 information\n"
+       "Build a prefix list\n"
+       "Name of a prefix list\n"
+       "sequence number of an entry\n"
+       "Sequence number\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
+       "Any prefix match.  Same as \"::0/0 le 128\"\n")
 
-DEFSH (0, show_bgp_view_neighbor_advertised_route_cmd_vtysh, 
-       "show bgp view WORD neighbors (A.B.C.D|X:X::X:X) advertised-routes", 
-       "Show running system information\n"
-       "BGP information\n"
-       "BGP view\n"
-       "View name\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Display the routes advertised to a BGP neighbor\n")
+DEFSH (0, no_neighbor_port_val_cmd_vtysh, 
+       "no neighbor (A.B.C.D|X:X::X:X) " "port <0-65535>", 
+       "Negate a command or set its defaults\n"
+       "Specify neighbor router\n"
+       "Neighbor address\nIPv6 address\n"
+       "Neighbor's BGP port\n"
+       "TCP port number\n")
 
-DEFSH (0, show_bgp_ipv6_safi_community_cmd_vtysh, 
-       "show bgp ipv6 (encap|multicast|unicast|vpn) community (AA:NN|local-AS|no-advertise|no-export)", 
-       "Show running system information\n"
-       "BGP information\n"
-       "Address family\n"
-       "Address family modifier\n"
-       "Address family modifier\n"
-       "Address family modifier\n"
-       "Address family modifier\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
+DEFSH (0, debug_zebra_packet_detail_cmd_vtysh, 
+       "debug zebra packet (recv|send) detail", 
+       "Debugging functions (see also 'undebug')\n"
+       "Zebra configuration\n"
+       "Debug option set for zebra packet\n"
+       "Debug option set for receive packet\n"
+       "Debug option set for send packet\n"
+       "Debug option set detailed information\n")
 
-DEFSH (0, ip_route_mask_flags2_tag_vrf_cmd_vtysh, 
-       "ip route A.B.C.D A.B.C.D (reject|blackhole) tag <1-4294967295>" "vrf <0-65535>", 
+DEFSH (0, show_ipv6_ospf6_interface_cmd_vtysh, 
+       "show ipv6 ospf6 interface", 
+       "Show running system information\n"
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Interface information\n"
+       )
+
+DEFSH (0, show_bgp_ipv6_safi_prefix_pathtype_cmd_vtysh, 
+       "show bgp ipv6 (unicast|multicast) X:X::X:X/M (bestpath|multipath)", 
+       "Show running system information\n"
+       "BGP information\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
+       "Display only the bestpath\n"
+       "Display only multipaths\n")
+
+DEFSH (0, ip_ospf_authentication_args_cmd_vtysh, 
+       "ip ospf authentication (null|message-digest)", 
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Enable authentication on this interface\n"
+       "Use null authentication\n"
+       "Use message-digest authentication\n")
+
+DEFSH (0, clear_ip_bgp_all_encap_out_cmd_vtysh, 
+       "clear ip bgp * encap unicast out", 
+       "Reset functions\n"
+       "IP information\n"
+       "BGP information\n"
+       "Clear all peers\n"
+       "Address family\n"
+       "Address Family Modifier\n"
+       "Soft reconfig outbound update\n")
+
+DEFSH (0, undebug_pim_packets_cmd_vtysh, 
+       "undebug pim packets", 
+       "Disable debugging functions (see also 'debug')\n"
+       "PIM protocol activity\n"
+       "PIM protocol packets\n")
+
+DEFSH (0, ospf_area_nssa_translate_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) nssa (translate-candidate|translate-never|translate-always)", 
+       "OSPF area parameters\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n"
+       "Configure OSPF area as nssa\n"
+       "Configure NSSA-ABR for translate election (default)\n"
+       "Configure NSSA-ABR to never translate\n"
+       "Configure NSSA-ABR to always translate\n")
+
+DEFSH (0, ip_route_flags_distance_cmd_vtysh, 
+       "ip route A.B.C.D/M (A.B.C.D|INTERFACE) (reject|blackhole) <1-255>", 
        "IP information\n"
        "Establish static routes\n"
-       "IP destination prefix\n"
-       "IP destination prefix mask\n"
+       "IP destination prefix (e.g. 10.0.0.0/8)\n"
+       "IP gateway address\n"
+       "IP gateway interface name\n"
        "Emit an ICMP unreachable when matched\n"
        "Silently discard pkts when matched\n"
-       "Set tag for this route\n"
-       "Tag value\n"
-       "Specify the VRF\nThe VRF ID\n")
+       "Distance value for this route\n")
 
-DEFSH (0, show_ipv6_bgp_community3_exact_cmd_vtysh, 
-       "show ipv6 bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
+DEFSH (0, no_rip_network_cmd_vtysh, 
+       "no network (A.B.C.D/M|WORD)", 
+       "Negate a command or set its defaults\n"
+       "Enable routing on an IP network\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
+       "Interface name\n")
+
+DEFSH (0, show_ipv6_mbgp_community_all_cmd_vtysh, 
+       "show ipv6 mbgp community", 
        "Show running system information\n"
        "IPv6 information\n"
-       "BGP information\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
+       "MBGP information\n"
+       "Display routes matching the communities\n")
 
-DEFSH (0, show_ipv6_bgp_community4_exact_cmd_vtysh, 
-       "show ipv6 bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
+DEFSH (0, show_ipv6_route_prefix_vrf_all_cmd_vtysh, 
+       "show ipv6 route X:X::X:X/M " "vrf all", 
+       "Show running system information\n"
+       "IP information\n"
+       "IPv6 routing table\n"
+       "IPv6 prefix\n"
+       "Specify the VRF\nAll VRFs\n")
+
+DEFSH (0, debug_ospf6_lsa_hex_detail_cmd_vtysh, 
+       "debug ospf6 lsa (router|network|inter-prefix|inter-router|as-ext|grp-mbr|type7|link|intra-prefix|unknown) (originate|examine|flooding)", 
+       "Debugging functions (see also 'undebug')\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Debug Link State Advertisements (LSAs)\n"
+       "Specify LS type as Hexadecimal\n"
+      )
+
+DEFSH (0, show_bgp_ipv6_safi_community3_exact_cmd_vtysh, 
+       "show bgp ipv6 (encap|multicast|unicast|vpn) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
        "Show running system information\n"
-       "IPv6 information\n"
        "BGP information\n"
+       "Address family\n"
+       "Address family modifier\n"
+       "Address family modifier\n"
+       "Address family modifier\n"
+       "Address family modifier\n"
        "Display routes matching the communities\n"
        "community number\n"
        "Do not send outside local AS (well-known community)\n"
@@ -2781,864 +2744,744 @@ DEFSH (0, show_ipv6_bgp_community4_exact_cmd_vtysh,
        "Do not send outside local AS (well-known community)\n"
        "Do not advertise to any peer (well-known community)\n"
        "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
        "Exact match of the communities")
 
-DEFSH (0, clear_ip_bgp_as_ipv4_soft_cmd_vtysh, 
-       "clear ip bgp " "<1-4294967295>" " ipv4 (unicast|multicast) soft", 
+DEFSH (0, clear_bgp_instance_all_cmd_vtysh, 
+       "clear bgp view WORD *", 
        "Reset functions\n"
-       "IP information\n"
        "BGP information\n"
-       "Clear peers with the AS number\n"
-       "Address family\n"
-       "Address Family Modifier\n"
-       "Address Family Modifier\n"
-       "Soft reconfig inbound and outbound updates\n")
-
-DEFSH (0, no_ip_route_tag_cmd_vtysh, 
-       "no ip route A.B.C.D/M (A.B.C.D|INTERFACE|null0) tag <1-4294967295>", 
-       "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Establish static routes\n"
-       "IP destination prefix (e.g. 10.0.0.0/8)\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
-       "Null interface\n"
-       "Tag of this route\n"
-       "Tag value\n")
-
-DEFSH (0, ip_lcommunity_list_name_standard2_cmd_vtysh, 
-       "ip large-community-list standard WORD (deny|permit)", 
-       "IP information\n"
-       "Add a large community list entry\n"
-       "Specify standard large-community-list\n"
-       "Large Community list name\n"
-       "Specify large community to reject\n"
-       "Specify large community to accept\n")
-
-DEFSH (0, psnp_interval_l1_cmd_vtysh, 
-       "isis psnp-interval <1-120> level-1", 
-       "IS-IS commands\n"
-       "Set PSNP interval in seconds\n"
-       "PSNP interval value\n"
-       "Specify interval for level-1 PSNPs\n")
+       "BGP view\n"
+       "view name\n"
+       "Clear all peers\n")
 
-DEFSH (0, clear_ip_bgp_peer_soft_in_cmd_vtysh, 
-       "clear ip bgp A.B.C.D soft in", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "BGP neighbor address to clear\n"
-       "Soft reconfig inbound and outbound updates\n"
-       "Send route-refresh unless using 'soft-reconfiguration inbound'\n")
+DEFSH (0, accept_lifetime_month_day_day_month_cmd_vtysh, 
+       "accept-lifetime HH:MM:SS MONTH <1-31> <1993-2035> HH:MM:SS <1-31> MONTH <1993-2035>", 
+       "Set accept lifetime of the key\n"
+       "Time to start\n"
+       "Month of the year to start\n"
+       "Day of th month to start\n"
+       "Year to start\n"
+       "Time to expire\n"
+       "Day of th month to expire\n"
+       "Month of the year to expire\n"
+       "Year to expire\n")
 
-DEFSH (0, show_bgp_ipv4_safi_damp_flap_address_cmd_vtysh, 
-       "show bgp ipv4 (encap|multicast|unicast|vpn) dampening flap-statistics A.B.C.D", 
+DEFSH (0, show_bgp_ipv4_safi_cmd_vtysh, 
+       "show bgp ipv4 (unicast|multicast)", 
        "Show running system information\n"
        "BGP information\n"
        "Address family\n"
        "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Display detailed information about dampening\n"
-       "Display flap statistics of routes\n"
-       "Network in the BGP routing table to display\n")
+       "Address Family modifier\n")
 
-DEFSH (0, show_isis_topology_l2_cmd_vtysh, 
-       "show isis topology level-2", 
+DEFSH (0, show_ip_pim_dr_cmd_vtysh, 
+       "show ip pim designated-router", 
        "Show running system information\n"
-       "IS-IS information\n"
-       "IS-IS paths to Intermediate Systems\n"
-       "Paths to all level-2 routers in the domain\n")
-
-DEFSH (0, clear_ip_bgp_prefix_cmd_vtysh, 
-       "clear ip bgp prefix A.B.C.D/M", 
-       "Reset functions\n"
        "IP information\n"
-       "BGP information\n"
-       "Clear bestpath and re-advertise\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
-
-DEFSH (0, no_ospf_area_vlink_authkey_cmd_vtysh, 
-       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(authentication-key|)", 
-       "Negate a command or set its defaults\n"
-       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
-       "Authentication password (key)\n" "The OSPF password (key)")
+       "PIM information\n"
+       "PIM interface designated router\n")
 
-DEFSH (0, no_debug_ospf_te_cmd_vtysh, 
-       "no debug ospf te", 
+DEFSH (0, no_neighbor_attr_unchanged5_cmd_vtysh, 
+       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "attribute-unchanged as-path next-hop med", 
        "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
-       "OSPF information\n"
-       "OSPF-TE information\n")
-
-DEFSH (0, neighbor_update_source_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "update-source " "(A.B.C.D|X:X::X:X|WORD)", 
        "Specify neighbor router\n"
        "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Source of routing updates\n"
-       "IPv4 address\n" "IPv6 address\n" "Interface name (requires zebra to be running)\n")
-
-DEFSH (0, ospf_area_nssa_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) nssa", 
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Configure OSPF area as nssa\n")
+       "BGP attribute is propagated unchanged to this neighbor\n"
+       "As-path attribute\n"
+       "Nexthop attribute\n"
+       "Med attribute\n")
 
-DEFSH (0, show_ipv6_bgp_community_all_cmd_vtysh, 
-       "show ipv6 bgp community", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "BGP information\n"
-       "Display routes matching the communities\n")
-
-DEFSH (0, ip_ospf_authentication_cmd_vtysh, 
-       "ip ospf authentication", 
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Enable authentication on this interface\n")
-
-DEFSH (0, show_ipv6_bgp_prefix_longer_cmd_vtysh, 
-       "show ipv6 bgp X:X::X:X/M longer-prefixes", 
-       "Show running system information\n"
-       "IPv6 information\n"
-       "BGP information\n"
-       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
-       "Display route and more specific routes\n")
-
-DEFSH (0, show_ip_ospf_database_cmd_vtysh, 
-       "show ip ospf database", 
-       "Show running system information\n"
+DEFSH (0, no_ip_route_mask_flags_cmd_vtysh, 
+       "no ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE) (reject|blackhole)", 
+       "Negate a command or set its defaults\n"
        "IP information\n"
-       "OSPF information\n"
-       "Database summary\n")
+       "Establish static routes\n"
+       "IP destination prefix\n"
+       "IP destination prefix mask\n"
+       "IP gateway address\n"
+       "IP gateway interface name\n"
+       "Emit an ICMP unreachable when matched\n"
+       "Silently discard pkts when matched\n")
 
-DEFSH (0, ospf_area_vlink_param3_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535>", 
-       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
-       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n"
-       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n"
-       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n")
+DEFSH (0, no_ospf_timers_throttle_spf_cmd_vtysh, 
+       "no timers throttle spf", 
+       "Negate a command or set its defaults\n"
+       "Adjust routing timers\n"
+       "Throttling adaptive timer\n"
+       "OSPF SPF timers\n")
 
-DEFSH (0, debug_ospf_packet_send_recv_detail_cmd_vtysh, 
-       "debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all) (send|recv) (detail|)", 
-       "Debugging functions\n"
-       "OSPF information\n"
-       "OSPF packets\n"
-       "OSPF Hello\n"
-       "OSPF Database Description\n"
-       "OSPF Link State Request\n"
-       "OSPF Link State Update\n"
-       "OSPF Link State Acknowledgment\n"
-       "OSPF all packets\n"
-       "Packet sent\n"
-       "Packet received\n"
-       "Detail Information\n")
+DEFSH (0, ipv6_nd_reachable_time_cmd_vtysh, 
+       "ipv6 nd reachable-time <1-3600000>", 
+       "Interface IPv6 config commands\n"
+       "Neighbor discovery\n"
+       "Reachable time\n"
+       "Reachable time in milliseconds\n")
 
-DEFSH (0, ip_ospf_hello_interval_addr_cmd_vtysh, 
-       "ip ospf hello-interval <1-65535> A.B.C.D", 
-       "IP Information\n"
+DEFSH (0, no_bgp_cluster_id_arg_cmd_vtysh, 
+       "no bgp cluster-id A.B.C.D", 
+       "Negate a command or set its defaults\n"
+       "BGP information\n"
+       "Configure Route-Reflector Cluster-id\n"
+       "Route-Reflector Cluster-id in IP address format\n")
+
+DEFSH (0, no_ospf_cost_cmd_vtysh, 
+       "no ospf cost", 
+       "Negate a command or set its defaults\n"
        "OSPF interface commands\n"
-       "Time between HELLO packets\n"
-       "Seconds\n"
-       "Address of interface")
+       "Interface cost\n")
 
-DEFSH (0, clear_bgp_peer_group_out_cmd_vtysh, 
-       "clear bgp peer-group WORD out", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n"
-       "Resend all outbound updates\n")
+DEFSH (0, no_ipv6_nd_reachable_time_cmd_vtysh, 
+       "no ipv6 nd reachable-time", 
+       "Negate a command or set its defaults\n"
+       "Interface IPv6 config commands\n"
+       "Neighbor discovery\n"
+       "Reachable time\n")
 
-DEFSH (0, show_bgp_neighbors_cmd_vtysh, 
-       "show bgp neighbors", 
+DEFSH (0, show_bgp_ipv4_community2_exact_cmd_vtysh, 
+       "show bgp ipv4 community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
        "Show running system information\n"
        "BGP information\n"
-       "Detailed information on TCP and BGP neighbor connections\n")
+       "IP information\n"
+       "Display routes matching the communities\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
+       "Exact match of the communities")
 
-DEFSH (0, clear_ip_bgp_external_in_cmd_vtysh, 
-       "clear ip bgp external in", 
-       "Reset functions\n"
+DEFSH (0, show_ipv6_mroute_vrf_cmd_vtysh, 
+       "show ipv6 mroute " "vrf <0-65535>", 
+       "Show running system information\n"
        "IP information\n"
-       "BGP information\n"
-       "Clear all external peers\n"
-       "Send route-refresh unless using 'soft-reconfiguration inbound'\n")
+       "IPv6 Multicast routing table\n"
+       "Specify the VRF\nThe VRF ID\n")
 
-DEFSH (0, no_ospf6_distance_source_cmd_vtysh, 
-       "no distance <1-255> X:X::X:X/M", 
-       "Negate a command or set its defaults\n"
-       "Administrative distance\n"
-       "Distance value\n"
-       "IP source prefix\n")
+DEFSH (0, show_bgp_ipv4_vpn_rd_cmd_vtysh, 
+       "show bgp ipv4 vpn rd ASN:nn_or_IP-address:nn", 
+       "Show running system information\n"
+       "BGP information\n"
+       "Address Family\n"
+       "Display VPN NLRI specific information\n"
+       "Display information for a route distinguisher\n"
+       "VPN Route Distinguisher\n")
 
-DEFSH (0, if_no_nhrp_holdtime_cmd_vtysh, 
- "no " "(ip|ipv6)" " nhrp holdtime [1-65000]", 
- "Negate a command or set its defaults\n"
+DEFSH (0, if_nhrp_reg_flags_cmd_vtysh, 
+ "(ip|ipv6)" " nhrp registration (no-unique)", 
  "IP information\n" "IPv6 information\n"
  "Next Hop Resolution Protocol functions\n"
- "Specify NBMA address validity time\n"
- "Time in seconds that NBMA addresses are advertised valid\n")
-
-DEFSH (0, no_ospf_area_shortcut_cmd_vtysh, 
-       "no area (A.B.C.D|<0-4294967295>) shortcut (enable|disable)", 
-       "Negate a command or set its defaults\n"
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Deconfigure the area's shortcutting mode\n"
-       "Deconfigure enabled shortcutting through the area\n"
-       "Deconfigure disabled shortcutting through the area\n")
-
-DEFSH (0, no_key_cmd_vtysh, 
-       "no key <0-2147483647>", 
-       "Negate a command or set its defaults\n"
-       "Delete a key\n"
-       "Key identifier number\n")
-
-DEFSH (0, no_access_list_extended_any_host_cmd_vtysh, 
-       "no access-list (<100-199>|<2000-2699>) (deny|permit) ip any host A.B.C.D", 
-       "Negate a command or set its defaults\n"
-       "Add an access list entry\n"
-       "IP extended access list\n"
-       "IP extended access list (expanded range)\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "Any Internet Protocol\n"
-       "Any source host\n"
-       "A single destination host\n"
-       "Destination address\n")
+ "Registration configuration\n"
+ "Don't set unique flag\n")
 
-DEFSH (0, no_bgp_bestpath_med_cmd_vtysh, 
-       "no bgp bestpath med (confed|missing-as-worst)", 
+DEFSH (0, no_debug_bgp_fsm_cmd_vtysh, 
+       "no debug bgp fsm", 
        "Negate a command or set its defaults\n"
-       "BGP specific commands\n"
-       "Change the default bestpath selection\n"
-       "MED attribute\n"
-       "Compare MED among confederation paths\n"
-       "Treat missing MED as the least preferred one\n")
-
-DEFSH (0, show_isis_topology_l1_cmd_vtysh, 
-       "show isis topology level-1", 
-       "Show running system information\n"
-       "IS-IS information\n"
-       "IS-IS paths to Intermediate Systems\n"
-       "Paths to all level-1 routers in the area\n")
+       "Debugging functions (see also 'undebug')\n"
+       "BGP information\n"
+       "Finite State Machine\n")
 
-DEFSH (0, show_ip_ssmpingd_cmd_vtysh, 
-       "show ip ssmpingd", 
-       "Show running system information\n"
-       "IP information\n"
-       "ssmpingd operation\n")
+DEFSH (0, no_nhrp_nflog_group_cmd_vtysh, 
+ "no nhrp nflog-group [<1-65535>]", 
+ "Negate a command or set its defaults\n"
+ "Next Hop Resolution Protocol functions\n"
+ "Specify NFLOG group number\n"
+ "NFLOG group number\n")
 
-DEFSH (0, clear_ip_bgp_peer_encap_out_cmd_vtysh, 
-       "clear ip bgp A.B.C.D encap unicast out", 
+DEFSH (0, clear_ip_bgp_peer_vpnv4_out_cmd_vtysh, 
+       "clear ip bgp A.B.C.D vpnv4 unicast out", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
        "BGP neighbor address to clear\n"
        "Address family\n"
        "Address Family Modifier\n"
-       "Soft reconfig outbound update\n")
-
-DEFSH (0, ip_route_mask_vrf_cmd_vtysh, 
-       "ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE|null0) " "vrf <0-65535>", 
-       "IP information\n"
-       "Establish static routes\n"
-       "IP destination prefix\n"
-       "IP destination prefix mask\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
-       "Null interface\n"
-       "Specify the VRF\nThe VRF ID\n")
-
-DEFSH (0, spf_interval_l2_cmd_vtysh, 
-       "spf-interval level-2 <1-120>", 
-       "Minimum interval between SPF calculations\n"
-       "Set interval for level 2 only\n"
-       "Minimum interval between consecutive SPFs in seconds\n")
+       "Resend all outbound updates\n")
 
-DEFSH (0, show_ip_rpf_addr_vrf_cmd_vtysh, 
-       "show ip rpf A.B.C.D " "vrf <0-65535>", 
+DEFSH (0, show_ip_bgp_ipv4_neighbor_routes_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X) routes", 
        "Show running system information\n"
        "IP information\n"
-       "Display RPF information for multicast source\n"
-       "IP multicast source address (e.g. 10.0.0.0)\n"
-       "Specify the VRF\nThe VRF ID\n")
-
-DEFSH (0, clear_ip_bgp_peer_out_cmd_vtysh, 
-       "clear ip bgp A.B.C.D out", 
-       "Reset functions\n"
-       "IP information\n"
        "BGP information\n"
-       "BGP neighbor address to clear\n"
-       "Resend all outbound updates\n")
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Detailed information on TCP and BGP neighbor connections\n"
+       "Neighbor to display information about\n"
+       "Neighbor to display information about\n"
+       "Display routes learned from neighbor\n")
 
-DEFSH (0, ospf6_routemap_no_set_forwarding_cmd_vtysh, 
-       "no set forwarding-address X:X::X:X", 
-       "Negate a command or set its defaults\n"
-       "Set value\n"
-       "Forwarding Address\n"
-       "IPv6 Address\n")
-
-DEFSH (0, show_bgp_ipv6_encap_summary_cmd_vtysh, 
-       "show bgp ipv6 encap summary", 
+DEFSH (0, show_bgp_ipv6_encap_rd_neighbor_advertised_routes_cmd_vtysh, 
+       "show bgp ipv6 encap rd ASN:nn_or_IP-address:nn neighbors (A.B.C.D|X:X::X:X) advertised-routes", 
        "Show running system information\n"
        "BGP information\n"
-       "IPv6\n"
+       "Address Family\n"
        "Display ENCAP NLRI specific information\n"
-       "Summary of BGP neighbor status\n")
-
-DEFSH (0, no_bgp_multiple_instance_cmd_vtysh, 
-       "no bgp multiple-instance", 
-       "Negate a command or set its defaults\n"
-       "BGP information\n"
-       "BGP multiple instance\n")
+       "Display information for a route distinguisher\n"
+       "ENCAP Route Distinguisher\n"
+       "Detailed information on TCP and BGP neighbor connections\n"
+       "Neighbor to display information about\n"
+       "Neighbor to display information about\n"
+       "Display the routes advertised to a BGP neighbor\n")
 
-DEFSH (0, show_bgp_ipv6_safi_flap_route_map_cmd_vtysh, 
-       "show bgp ipv6 (encap|multicast|unicast|vpn) flap-statistics route-map WORD", 
-       "Show running system information\n"
-       "BGP information\n"
-       "IPv6 information\n"
-       "Address Family Modifier\n"
-       "Address Family Modifier\n"
-       "Address Family Modifier\n"
-       "Address Family Modifier\n"
-       "Display flap statistics of routes\n"
-       "Display routes matching the route-map\n"
-       "A route-map to match on\n")
+DEFSH (0, isis_passwd_cmd_vtysh, 
+       "isis password (md5|clear) WORD", 
+       "IS-IS commands\n"
+       "Configure the authentication password for a circuit\n"
+       "HMAC-MD5 authentication\n"
+       "Cleartext password\n"
+       "Circuit password\n")
 
-DEFSH (0, no_ospf_distance_cmd_vtysh, 
-       "no distance <1-255>", 
+DEFSH (0, no_synchronization_cmd_vtysh, 
+       "no synchronization", 
        "Negate a command or set its defaults\n"
-       "Define an administrative distance\n"
-       "OSPF Administrative distance\n")
+       "Perform IGP synchronization\n")
 
-DEFSH (0, show_bgp_ipv4_vpn_route_cmd_vtysh, 
-       "show bgp ipv4 vpn A.B.C.D", 
+DEFSH (0, show_ipv6_ospf6_route_longer_cmd_vtysh, 
+       "show ipv6 ospf6 route X:X::X:X/M longer", 
        "Show running system information\n"
-       "BGP information\n"
-       "Address Family\n"
-       "Display VPN NLRI specific information\n"
-       "Network in the BGP routing table to display\n")
-
-DEFSH (0, ipv6_ospf6_passive_cmd_vtysh, 
-       "ipv6 ospf6 passive", 
        "IPv6 Information\n"
        "Open Shortest Path First (OSPF) for IPv6\n"
-       "passive interface,  No adjacency will be formed on this interface\n"
+       "Routing Table\n"
+       "Specify IPv6 prefix\n"
+       "Display routes longer than the specified route\n"
        )
 
-DEFSH (0, bgp_bestpath_med_cmd_vtysh, 
-       "bgp bestpath med (confed|missing-as-worst)", 
-       "BGP specific commands\n"
-       "Change the default bestpath selection\n"
-       "MED attribute\n"
-       "Compare MED among confederation paths\n"
-       "Treat missing MED as the least preferred one\n")
+DEFSH (0, show_bgp_ipv6_vpn_rd_cmd_vtysh, 
+       "show bgp ipv6 vpn rd ASN:nn_or_IP-address:nn", 
+       "Show running system information\n"
+       "BGP information\n"
+       "Address Family\n"
+       "Display VPN NLRI specific information\n"
+       "Display information for a route distinguisher\n"
+       "VPN Route Distinguisher\n")
 
-DEFSH (0, ip_rip_send_version_1_cmd_vtysh, 
-       "ip rip send version 1 2", 
-       "IP information\n"
-       "Routing Information Protocol\n"
-       "Advertisement transmission\n"
-       "Version control\n"
-       "RIP version 1\n"
-       "RIP version 2\n")
+DEFSH (0, show_ipv6_bgp_summary_cmd_vtysh, 
+       "show ipv6 bgp summary", 
+       "Show running system information\n"
+       "IPv6 information\n"
+       "BGP information\n"
+       "Summary of BGP neighbor status\n")
 
-DEFSH (0, show_ip_pim_interface_cmd_vtysh, 
-       "show ip pim interface", 
+DEFSH (0, show_bgp_instance_neighbors_peer_cmd_vtysh, 
+       "show bgp view WORD neighbors (A.B.C.D|X:X::X:X)", 
        "Show running system information\n"
-       "IP information\n"
-       "PIM information\n"
-       "PIM interface information\n")
+       "BGP information\n"
+       "BGP view\n"
+       "View name\n"
+       "Detailed information on TCP and BGP neighbor connections\n"
+       "Neighbor to display information about\n"
+       "Neighbor to display information about\n")
 
-DEFSH (0, no_ripng_redistribute_type_cmd_vtysh, 
-       "no redistribute " "(kernel|connected|static|ospf6|isis|bgp|babel|nhrp)", 
+DEFSH (0, no_ip_rip_authentication_string_cmd_vtysh, 
+       "no ip rip authentication string", 
        "Negate a command or set its defaults\n"
-       "Redistribute\n"
-       "Kernel routes (not installed via the zebra RIB)\n" "Connected routes (directly attached subnet or host)\n" "Statically configured routes\n" "Open Shortest Path First (IPv6) (OSPFv3)\n" "Intermediate System to Intermediate System (IS-IS)\n" "Border Gateway Protocol (BGP)\n" "Babel routing protocol (Babel)\n" "Next Hop Resolution Protocol (NHRP)\n")
+       "IP information\n"
+       "Routing Information Protocol\n"
+       "Authentication control\n"
+       "Authentication string\n")
 
-DEFSH (0, debug_pim_trace_cmd_vtysh, 
-       "debug pim trace", 
-       "Debugging functions (see also 'undebug')\n"
-       "PIM protocol activity\n"
-       "PIM internal daemon activity\n")
+DEFSH (0|0|0|0|0|0, rmap_continue_index_cmd_vtysh, 
+      "continue <1-65536>", 
+      "Exit policy on matches\n"
+      "Goto Clause number\n")
 
-DEFSH (0, no_ip_route_tag_distance_cmd_vtysh, 
-       "no ip route A.B.C.D/M (A.B.C.D|INTERFACE|null0) tag <1-4294967295> <1-255>", 
+DEFSH (0, no_ospf_authentication_key_cmd_vtysh, 
+       "no ospf authentication-key", 
        "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Establish static routes\n"
-       "IP destination prefix (e.g. 10.0.0.0/8)\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
-       "Null interface\n"
-       "Tag of this route\n"
-       "Tag value\n"
-       "Distance value for this route\n")
+       "OSPF interface commands\n"
+       "Authentication password (key)\n")
 
-DEFSH (0, no_ospf_area_vlink_param4_cmd_vtysh, 
-       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval)", 
-       "Negate a command or set its defaults\n"
-       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
-       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n"
-       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n"
-       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n"
-       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n")
+DEFSH (0, show_bgp_instance_summary_cmd_vtysh, 
+       "show bgp view WORD summary", 
+       "Show running system information\n"
+       "BGP information\n"
+       "BGP view\n"
+       "View name\n"
+       "Summary of BGP neighbor status\n")
 
-DEFSH (0, show_ip_route_summary_vrf_cmd_vtysh, 
-       "show ip route summary " "vrf <0-65535>", 
+DEFSH (0|0|0|0, show_ip_prefix_list_name_cmd_vtysh, 
+       "show ip prefix-list WORD", 
        "Show running system information\n"
        "IP information\n"
-       "IP routing table\n"
-       "Summary of all routes\n"
-       "Specify the VRF\nThe VRF ID\n")
-
-DEFSH (0, debug_bgp_as4_segment_cmd_vtysh, 
-       "debug bgp as4 segment", 
-       "Debugging functions (see also 'undebug')\n"
-       "BGP information\n"
-       "BGP AS4 actions\n"
-       "BGP AS4 aspath segment handling\n")
+       "Build a prefix list\n"
+       "Name of a prefix list\n")
 
-DEFSH (0, show_bgp_ipv6_encap_tags_cmd_vtysh, 
-       "show bgp ipv6 encap tags", 
+DEFSH (0, show_isis_mpls_te_interface_cmd_vtysh, 
+       "show isis mpls-te interface [INTERFACE]", 
        "Show running system information\n"
-       "BGP information\n"
-       "Address Family\n"
-       "Display ENCAP NLRI specific information\n"
-       "Display BGP tags for prefixes\n")
+       "IS-IS information\n"
+       "MPLS-TE specific commands\n"
+       "Interface information\n"
+       "Interface name\n")
 
-DEFSH (0, bgp_network_route_map_cmd_vtysh, 
-       "network A.B.C.D/M route-map WORD", 
-       "Specify a network to announce via BGP\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Route-map to modify the attributes\n"
-       "Name of the route map\n")
+DEFSH (0, exec_timeout_min_cmd_vtysh, 
+       "exec-timeout <0-35791>", 
+       "Set timeout value\n"
+       "Timeout value in minutes\n")
 
-DEFSH (0, clear_bgp_peer_cmd_vtysh, 
-       "clear bgp (A.B.C.D|X:X::X:X)", 
-       "Reset functions\n"
-       "BGP information\n"
-       "BGP neighbor address to clear\n"
-       "BGP IPv6 neighbor to clear\n")
+DEFSH (0, no_isis_priority_cmd_vtysh, 
+       "no isis priority", 
+       "Negate a command or set its defaults\n"
+       "IS-IS commands\n"
+       "Set priority for Designated Router election\n")
 
-DEFSH (0, set_ip_nexthop_peer_cmd_vtysh, 
-       "set ip next-hop peer-address", 
-       "Set values in destination routing protocol\n"
-       "IP information\n"
-       "Next hop address\n"
-       "Use peer address (for BGP only)\n")
+DEFSH (0, show_ipv6_ospf6_database_type_adv_router_linkstate_id_cmd_vtysh, 
+       "show ipv6 ospf6 database "
+       "(router|network|inter-prefix|inter-router|as-external|"
+       "group-membership|type-7|link|intra-prefix) "
+       "adv-router A.B.C.D linkstate-id A.B.C.D", 
+       "Show running system information\n"
+       "IPv6 information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Display Link state database\n"
+       "Display Router LSAs\n"
+       "Display Network LSAs\n"
+       "Display Inter-Area-Prefix LSAs\n"
+       "Display Inter-Area-Router LSAs\n"
+       "Display As-External LSAs\n"
+       "Display Group-Membership LSAs\n"
+       "Display Type-7 LSAs\n"
+       "Display Link LSAs\n"
+       "Display Intra-Area-Prefix LSAs\n"
+       "Search by Advertising Router\n"
+       "Specify Advertising Router as IPv4 address notation\n"
+       "Search by Link state ID\n"
+       "Specify Link state ID as IPv4 address notation\n"
+      )
 
-DEFSH (0, show_ip_rib_cmd_vtysh, 
-       "show ip rib A.B.C.D", 
+DEFSH (0, show_ip_bgp_ipv4_prefix_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) A.B.C.D/M", 
        "Show running system information\n"
        "IP information\n"
-       "IP unicast routing table\n"
-       "Unicast address\n")
-
-DEFSH (0, ipv6_nd_reachable_time_cmd_vtysh, 
-       "ipv6 nd reachable-time <1-3600000>", 
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Reachable time\n"
-       "Reachable time in milliseconds\n")
+       "BGP information\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n")
 
-DEFSH (0, debug_ospf_ism_cmd_vtysh, 
-       "debug ospf ism", 
-       "Debugging functions (see also 'undebug')\n"
-       "OSPF information\n"
-       "OSPF Interface State Machine\n")
+DEFSH (0|0|0|0, ipv6_prefix_list_seq_cmd_vtysh, 
+       "ipv6 prefix-list WORD seq <1-4294967295> (deny|permit) (X:X::X:X/M|any)", 
+       "IPv6 information\n"
+       "Build a prefix list\n"
+       "Name of a prefix list\n"
+       "sequence number of an entry\n"
+       "Sequence number\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
+       "Any prefix match.  Same as \"::0/0 le 128\"\n")
 
-DEFSH (0, show_bgp_ipv6_safi_neighbor_routes_cmd_vtysh, 
-       "show bgp ipv6 (multicast|unicast) neighbors (A.B.C.D|X:X::X:X) routes", 
+DEFSH (0, no_ip_ospf_cost_inet4_cmd_vtysh, 
+       "no ip ospf cost A.B.C.D", 
+       "Negate a command or set its defaults\n"
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Interface cost\n"
+       "Address of interface")
+
+DEFSH (0, no_ospf_cost_inet4_cmd_vtysh, 
+       "no ospf cost A.B.C.D", 
+       "Negate a command or set its defaults\n"
+       "OSPF interface commands\n"
+       "Interface cost\n"
+       "Address of interface")
+
+DEFSH (0, ospf_mpls_te_router_addr_cmd_vtysh, 
+       "mpls-te router-address A.B.C.D", 
+       "MPLS-TE specific commands\n"
+       "Stable IP address of the advertising router\n"
+       "MPLS-TE router address in IPv4 address format\n")
+
+DEFSH (0, no_ospf_area_export_list_cmd_vtysh, 
+       "no area (A.B.C.D|<0-4294967295>) export-list NAME", 
+       "Negate a command or set its defaults\n"
+       "OSPF area parameters\n"
+       "OSPF area ID in IP address format\n"
+       "OSPF area ID as a decimal value\n"
+       "Unset the filter for networks announced to other areas\n"
+       "Name of the access-list\n")
+
+DEFSH (0, no_bgp_redistribute_ipv6_metric_rmap_cmd_vtysh, 
+       "no redistribute " "(kernel|connected|static|ripng|ospf6|isis|babel|nhrp)" " metric <0-4294967295> route-map WORD", 
+       "Negate a command or set its defaults\n"
+       "Redistribute information from another routing protocol\n"
+       "Kernel routes (not installed via the zebra RIB)\n" "Connected routes (directly attached subnet or host)\n" "Statically configured routes\n" "Routing Information Protocol next-generation (IPv6) (RIPng)\n" "Open Shortest Path First (IPv6) (OSPFv3)\n" "Intermediate System to Intermediate System (IS-IS)\n" "Babel routing protocol (Babel)\n" "Next Hop Resolution Protocol (NHRP)\n"
+       "Metric for redistributed routes\n"
+       "Default metric\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
+
+DEFSH (0, show_bgp_neighbor_advertised_route_cmd_vtysh, 
+       "show bgp neighbors (A.B.C.D|X:X::X:X) advertised-routes", 
        "Show running system information\n"
        "BGP information\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
        "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor address\nIPv6 address\n"
-       "Neighbor address\nIPv6 address\n"
-       "Display routes learned from neighbor\n")
+       "Neighbor to display information about\n"
+       "Neighbor to display information about\n"
+       "Display the routes advertised to a BGP neighbor\n")
 
-DEFSH (0, show_bgp_ipv4_safi_damp_flap_prefix_longer_cmd_vtysh, 
-       "show bgp ipv4 (encap|multicast|unicast|vpn) dampening flap-statistics A.B.C.D/M longer-prefixes", 
+DEFSH (0|0|0|0, clear_ip_prefix_list_cmd_vtysh, 
+       "clear ip prefix-list", 
+       "Reset functions\n"
+       "IP information\n"
+       "Build a prefix list\n")
+
+DEFSH (0, show_bgp_ipv4_safi_damp_flap_regexp_cmd_vtysh, 
+       "show bgp ipv4 (encap|multicast|unicast|vpn) dampening flap-statistics regexp .LINE", 
+       "Show running system information\n"
+       "BGP information\n"
+       "IP information\n"
+       "Address Family Modifier\n"
+       "Address Family Modifier\n"
+       "Address Family Modifier\n"
+       "Address Family Modifier\n"
+       "Display detailed information about dampening\n"
+       "Display flap statistics of routes\n"
+       "Display routes matching the AS path regular expression\n"
+       "A regular-expression to match the BGP AS paths\n")
+
+DEFSH (0, ospf_distance_ospf_cmd_vtysh, 
+       "distance ospf "
+         "{intra-area <1-255>|inter-area <1-255>|external <1-255>}", 
+       "Define an administrative distance\n"
+       "OSPF Administrative distance\n"
+       "Intra-area routes\n"
+       "Distance for intra-area routes\n"
+       "Inter-area routes\n"
+       "Distance for inter-area routes\n"
+       "External routes\n"
+       "Distance for external routes\n")
+
+DEFSH (0, no_bgp_redistribute_ipv4_rmap_metric_cmd_vtysh, 
+       "no redistribute " "(kernel|connected|static|rip|ospf|isis|pim|babel|nhrp)" " route-map WORD metric <0-4294967295>", 
+       "Negate a command or set its defaults\n"
+       "Redistribute information from another routing protocol\n"
+       "Kernel routes (not installed via the zebra RIB)\n" "Connected routes (directly attached subnet or host)\n" "Statically configured routes\n" "Routing Information Protocol (RIP)\n" "Open Shortest Path First (OSPFv2)\n" "Intermediate System to Intermediate System (IS-IS)\n" "Protocol Independent Multicast (PIM)\n" "Babel routing protocol (Babel)\n" "Next Hop Resolution Protocol (NHRP)\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n"
+       "Metric for redistributed routes\n"
+       "Default metric\n")
+
+DEFSH (0, show_bgp_view_ipv4_safi_rsclient_route_cmd_vtysh, 
+       "show bgp view WORD ipv4 (unicast|multicast) rsclient (A.B.C.D|X:X::X:X) A.B.C.D", 
        "Show running system information\n"
        "BGP information\n"
+       "BGP view\n"
+       "View name\n"
        "Address family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Display detailed information about dampening\n"
-       "Display flap statistics of routes\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Display route and more specific routes\n")
+       "Information about Route Server Client\n"
+       "Neighbor address\nIPv6 address\n"
+       "Network in the BGP routing table to display\n")
 
-DEFSH (0, clear_ip_bgp_all_ipv4_soft_in_cmd_vtysh, 
-       "clear ip bgp * ipv4 (unicast|multicast) soft in", 
+DEFSH (0, clear_ip_bgp_peer_group_ipv4_in_cmd_vtysh, 
+       "clear ip bgp peer-group WORD ipv4 (unicast|multicast) in", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "Clear all peers\n"
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
        "Address family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
-       "Soft reconfig inbound and outbound updates\n"
        "Send route-refresh unless using 'soft-reconfiguration inbound'\n")
 
-DEFSH (0, show_bgp_route_pathtype_cmd_vtysh, 
-       "show bgp X:X::X:X (bestpath|multipath)", 
-       "Show running system information\n"
-       "BGP information\n"
-       "Network in the BGP routing table to display\n"
-       "Display only the bestpath\n"
-       "Display only multipaths\n")
-
-DEFSH (0, set_ipv6_nexthop_peer_cmd_vtysh, 
-       "set ipv6 next-hop peer-address", 
-       "Set values in destination routing protocol\n"
-       "IPv6 information\n"
-       "Next hop address\n"
-       "Use peer address (for BGP only)\n")
+DEFSH (0, no_lsp_gen_interval_cmd_vtysh, 
+       "no lsp-gen-interval", 
+       "Negate a command or set its defaults\n"
+       "Minimum interval between regenerating same LSP\n")
 
-DEFSH (0, show_database_detail_cmd_vtysh, 
-       "show isis database detail", 
-       "Show running system information\n"
-       "IS-IS information\n"
-       "IS-IS link state database\n")
+DEFSH (0, ipv6_ospf6_passive_cmd_vtysh, 
+       "ipv6 ospf6 passive", 
+       "IPv6 Information\n"
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "passive interface,  No adjacency will be formed on this interface\n"
+       )
 
-DEFSH (0, no_debug_bgp_normal_cmd_vtysh, 
-       "no debug bgp", 
+DEFSH (0, no_debug_ospf6_neighbor_detail_cmd_vtysh, 
+       "no debug ospf6 neighbor (state|event)", 
        "Negate a command or set its defaults\n"
        "Debugging functions (see also 'undebug')\n"
-       "BGP information\n")
+       "Open Shortest Path First (OSPF) for IPv6\n"
+       "Debug OSPFv3 Neighbor\n"
+       "Debug OSPFv3 Neighbor State Change\n"
+       "Debug OSPFv3 Neighbor Event\n"
+      )
 
-DEFSH (0, show_bgp_ipv4_vpn_rd_cmd_vtysh, 
-       "show bgp ipv4 vpn rd ASN:nn_or_IP-address:nn", 
+DEFSH (0, show_bgp_ipv4_lcommunity3_cmd_vtysh, 
+       "show bgp ipv4 large-community (AA:BB:CC) (AA:BB:CC) (AA:BB:CC)", 
        "Show running system information\n"
        "BGP information\n"
-       "Address Family\n"
-       "Display VPN NLRI specific information\n"
-       "Display information for a route distinguisher\n"
-       "VPN Route Distinguisher\n")
+       "IP information\n"
+       "Display routes matching the large-communities\n"
+       "large-community number\n"
+       "large-community number\n"
+       "large-community number\n")
 
-DEFSH (0, debug_ripng_zebra_cmd_vtysh, 
-       "debug ripng zebra", 
-       "Debugging functions (see also 'undebug')\n"
-       "RIPng configuration\n"
-       "Debug option set for ripng and zebra communication\n")
+DEFSH (0, undebug_bgp_keepalive_cmd_vtysh, 
+       "undebug bgp keepalives", 
+       "Disable debugging functions (see also 'debug')\n"
+       "BGP information\n"
+       "BGP keepalives\n")
 
-DEFSH (0, no_ospf_area_vlink_authtype_authkey_cmd_vtysh, 
-       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(authentication|) "
-       "(authentication-key|)", 
+DEFSH (0, no_ipv6_nd_homeagent_lifetime_cmd_vtysh, 
+       "no ipv6 nd home-agent-lifetime", 
        "Negate a command or set its defaults\n"
-       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
-       "Enable authentication on this virtual link\n" "dummy string \n"
-       "Authentication password (key)\n" "The OSPF password (key)")
+       "Interface IPv6 config commands\n"
+       "Neighbor discovery\n"
+       "Home Agent lifetime\n")
 
-DEFSH (0, clear_bgp_ipv6_peer_group_out_cmd_vtysh, 
-       "clear bgp ipv6 peer-group WORD out", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Address family\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n"
-       "Resend all outbound updates\n")
+DEFSH (0, link_params_res_bw_cmd_vtysh, 
+       "res-bw BANDWIDTH", 
+       "Unidirectional Residual Bandwidth\n"
+       "Bytes/second (IEEE floating point format)\n")
 
-DEFSH (0, show_ipv6_mbgp_community_exact_cmd_vtysh, 
-       "show ipv6 mbgp community (AA:NN|local-AS|no-advertise|no-export) exact-match", 
+DEFSH (0, no_bgp_confederation_identifier_cmd_vtysh, 
+       "no bgp confederation identifier", 
+       "Negate a command or set its defaults\n"
+       "BGP specific commands\n"
+       "AS confederation parameters\n"
+       "AS number\n")
+
+DEFSH (0, show_ip_bgp_ipv4_community4_exact_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
        "Show running system information\n"
-       "IPv6 information\n"
-       "MBGP information\n"
+       "IP information\n"
+       "BGP information\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
        "Display routes matching the communities\n"
        "community number\n"
        "Do not send outside local AS (well-known community)\n"
        "Do not advertise to any peer (well-known community)\n"
        "Do not export to next AS (well-known community)\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
        "Exact match of the communities")
 
-DEFSH (0, no_set_aspath_prepend_cmd_vtysh, 
-       "no set as-path prepend", 
-       "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "Transform BGP AS_PATH attribute\n"
-       "Prepend to the as-path\n")
-
-DEFSH (0, neighbor_attr_unchanged2_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "attribute-unchanged as-path (next-hop|med)", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "As-path attribute\n"
-       "Nexthop attribute\n"
-       "Med attribute\n")
-
-DEFSH (0, show_bgp_ipv6_safi_damp_flap_filter_list_cmd_vtysh, 
-       "show bgp ipv6 (encap|multicast|unicast|vpn) dampening flap-statistics filter-list WORD", 
+DEFSH (0, show_ip_ospf_mpls_te_router_cmd_vtysh, 
+       "show ip ospf mpls-te router", 
        "Show running system information\n"
-       "BGP information\n"
-       "IPv6 information\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Display detailed information about dampening\n"
-       "Display flap statistics of routes\n"
-       "Display routes conforming to the filter-list\n"
-       "Regular expression access list name\n")
-
-DEFSH (0, no_neighbor_advertise_interval_cmd_vtysh, 
-       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "advertisement-interval", 
-       "Negate a command or set its defaults\n"
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Minimum interval between sending BGP routing updates\n")
+       "IP information\n"
+       "OSPF information\n"
+       "MPLS-TE information\n"
+       "MPLS-TE Router parameters\n")
 
-DEFSH (0, debug_bgp_nht_cmd_vtysh, 
-       "debug bgp nht", 
+DEFSH (0, debug_pim_trace_cmd_vtysh, 
+       "debug pim trace", 
        "Debugging functions (see also 'undebug')\n"
-       "BGP information\n"
-       "BGP nexthop tracking events\n")
+       "PIM protocol activity\n"
+       "PIM internal daemon activity\n")
 
-DEFSH (0, no_ospf_area_vlink_md5_cmd_vtysh, 
-       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(message-digest-key|) <1-255>", 
+DEFSH (0, no_debug_bgp_as4_segment_cmd_vtysh, 
+       "no debug bgp as4 segment", 
        "Negate a command or set its defaults\n"
-       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
-       "Message digest authentication password (key)\n" "dummy string \n" "Key ID\n" "Use MD5 algorithm\n" "The OSPF password (key)")
-
-DEFSH (0, isis_metric_l2_cmd_vtysh, 
-       "isis metric <0-16777215> level-2", 
-       "IS-IS commands\n"
-       "Set default metric for circuit\n"
-       "Default metric value\n"
-       "Specify metric for level-2 routing\n")
+       "Debugging functions (see also 'undebug')\n"
+       "BGP information\n"
+       "BGP AS4 actions\n"
+       "BGP AS4 aspath segment handling\n")
 
-DEFSH (0, no_bgp_confederation_identifier_arg_cmd_vtysh, 
-       "no bgp confederation identifier " "<1-4294967295>", 
+DEFSH (0, no_debug_bgp_filter_cmd_vtysh, 
+       "no debug bgp filters", 
        "Negate a command or set its defaults\n"
-       "BGP specific commands\n"
-       "AS confederation parameters\n"
-       "AS number\n"
-       "Set routing domain confederation AS\n")
+       "Debugging functions (see also 'undebug')\n"
+       "BGP information\n"
+       "BGP filters\n")
 
-DEFSH (0, show_bgp_instance_ipv6_neighbors_peer_cmd_vtysh, 
-       "show bgp view WORD ipv6 neighbors (A.B.C.D|X:X::X:X)", 
+DEFSH (0, show_bgp_ipv6_vpn_neighbor_advertised_routes_cmd_vtysh, 
+       "show bgp ipv6 vpn neighbors (A.B.C.D|X:X::X:X) advertised-routes", 
        "Show running system information\n"
        "BGP information\n"
-       "BGP view\n"
-       "View name\n"
-       "Address family\n"
+       "Address Family\n"
+       "Display VPN NLRI specific information\n"
        "Detailed information on TCP and BGP neighbor connections\n"
        "Neighbor to display information about\n"
-       "Neighbor to display information about\n")
+       "Display the routes advertised to a BGP neighbor\n")
 
-DEFSH (0, show_bgp_ipv6_safi_damp_flap_statistics_cmd_vtysh, 
-       "show bgp ipv6 (encap|multicast|unicast|vpn) dampening flap-statistics", 
+DEFSH (0, clear_bgp_instance_peer_rsclient_cmd_vtysh, 
+       "clear bgp view WORD (A.B.C.D|X:X::X:X) rsclient", 
+       "Reset functions\n"
+       "BGP information\n"
+       "BGP view\n"
+       "view name\n"
+       "BGP neighbor IP address to clear\n"
+       "BGP IPv6 neighbor to clear\n"
+       "Soft reconfig for rsclient RIB\n")
+
+DEFSH (0, show_bgp_view_route_cmd_vtysh, 
+       "show bgp view WORD X:X::X:X", 
        "Show running system information\n"
        "BGP information\n"
-       "Address Family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Display detailed information about dampening\n"
-       "Display flap statistics of routes\n")
+       "BGP view\n"
+       "View name\n"
+       "Network in the BGP routing table to display\n")
 
-DEFSH (0, clear_bgp_ipv6_as_soft_cmd_vtysh, 
-       "clear bgp ipv6 " "<1-4294967295>" " soft", 
-       "Reset functions\n"
+DEFSH (0, show_bgp_ipv6_community2_exact_cmd_vtysh, 
+       "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
+       "Show running system information\n"
        "BGP information\n"
        "Address family\n"
-       "Clear peers with the AS number\n"
-       "Soft reconfig inbound and outbound updates\n")
-
-DEFSH (0, isis_mpls_te_router_addr_cmd_vtysh, 
-       "mpls-te router-address A.B.C.D", 
-       "MPLS-TE specific commands\n"
-       "Stable IP address of the advertising router\n"
-       "MPLS-TE router address in IPv4 address format\n")
+       "Display routes matching the communities\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
+       "community number\n"
+       "Do not send outside local AS (well-known community)\n"
+       "Do not advertise to any peer (well-known community)\n"
+       "Do not export to next AS (well-known community)\n"
+       "Exact match of the communities")
 
-DEFSH (0, no_ripng_timers_cmd_vtysh, 
-       "no timers basic", 
+DEFSH (0|0|0|0, no_ip_prefix_list_description_cmd_vtysh, 
+       "no ip prefix-list WORD description", 
        "Negate a command or set its defaults\n"
-       "RIPng timers setup\n"
-       "Basic timer\n")
-
-DEFSH (0, ipv6_nd_prefix_noval_rtaddr_cmd_vtysh, 
-       "ipv6 nd prefix X:X::X:X/M (router-address|)", 
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n"
-       "Set Router Address flag\n")
-
-DEFSH (0, clear_ip_bgp_peer_group_cmd_vtysh, 
-       "clear ip bgp peer-group WORD", 
-       "Reset functions\n"
        "IP information\n"
-       "BGP information\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n")
+       "Build a prefix list\n"
+       "Name of a prefix list\n"
+       "Prefix-list specific description\n")
 
-DEFSH (0, clear_ip_bgp_peer_encap_soft_out_cmd_vtysh, 
-       "clear ip bgp A.B.C.D encap unicast soft out", 
-       "Reset functions\n"
-       "IP information\n"
-       "BGP information\n"
-       "BGP neighbor address to clear\n"
-       "Address family\n"
-       "Address Family Modifier\n"
-       "Soft reconfig\n"
-       "Soft reconfig outbound update\n")
+DEFSH (0, if_no_nhrp_reg_flags_cmd_vtysh, 
+ "no " "(ip|ipv6)" " nhrp registration (no-unique)", 
+ "Negate a command or set its defaults\n"
+ "IP information\n" "IPv6 information\n"
+ "Next Hop Resolution Protocol functions\n"
+ "Registration configuration\n"
+ "Don't set unique flag\n")
 
-DEFSH (0, no_psnp_interval_l2_cmd_vtysh, 
-       "no isis psnp-interval level-2", 
+DEFSH (0, no_isis_priority_l2_arg_cmd_vtysh, 
+       "no isis priority <0-127> level-2", 
        "Negate a command or set its defaults\n"
        "IS-IS commands\n"
-       "Set PSNP interval in seconds\n"
-       "Specify interval for level-2 PSNPs\n")
+       "Set priority for Designated Router election\n"
+       "Priority value\n"
+       "Specify priority for level-2 routing\n")
 
-DEFSH (0|0|0|0, no_ipv6_prefix_list_cmd_vtysh, 
-       "no ipv6 prefix-list WORD", 
+DEFSH (0, show_ipv6_route_summary_cmd_vtysh, 
+       "show ipv6 route summary", 
+       "Show running system information\n"
+       "IP information\n"
+       "IPv6 routing table\n"
+       "Summary of all IPv6 routes\n")
+
+DEFSH (0, no_ospf_timers_min_ls_arrival_cmd_vtysh, 
+       "no timers lsa arrival", 
        "Negate a command or set its defaults\n"
-       "IPv6 information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n")
+       "Adjust routing timers\n"
+       "Throttling link state advertisement delays\n"
+       "OSPF minimum arrival interval delay\n")
 
-DEFSH (0, undebug_bgp_nht_cmd_vtysh, 
-       "undebug bgp nht", 
-       "Disable debugging functions (see also 'debug')\n"
+DEFSH (0, clear_bgp_all_in_prefix_filter_cmd_vtysh, 
+       "clear bgp * in prefix-filter", 
+       "Reset functions\n"
        "BGP information\n"
-       "BGP next-hop tracking updates\n")
-
-DEFSH (0, debug_ospf6_spf_database_cmd_vtysh, 
-       "debug ospf6 spf database", 
-       "Debugging functions (see also 'undebug')\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Debug SPF Calculation\n"
-       "Log number of LSAs at SPF Calculation time\n"
-      )
+       "Clear all peers\n"
+       "Send route-refresh unless using 'soft-reconfiguration inbound'\n"
+       "Push out prefix-list ORF and do inbound soft reconfig\n")
 
-DEFSH (0, no_ipv6_ospf6_network_cmd_vtysh, 
-       "no ipv6 ospf6 network", 
+DEFSH (0, no_shutdown_if_cmd_vtysh, 
+       "no shutdown", 
        "Negate a command or set its defaults\n"
-       "IPv6 Information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Network Type\n"
-       "Default to whatever interface type system specifies"
-       )
+       "Shutdown the selected interface\n")
 
-DEFSH (0, access_list_standard_nomask_cmd_vtysh, 
-       "access-list (<1-99>|<1300-1999>) (deny|permit) A.B.C.D", 
-       "Add an access list entry\n"
-       "IP standard access list\n"
-       "IP standard access list (expanded range)\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "Address to match\n")
+DEFSH (0, no_debug_ospf_packet_send_recv_cmd_vtysh, 
+       "no debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all) (send|recv|detail)", 
+       "Negate a command or set its defaults\n"
+       "Debugging functions\n"
+       "OSPF information\n"
+       "OSPF packets\n"
+       "OSPF Hello\n"
+       "OSPF Database Description\n"
+       "OSPF Link State Request\n"
+       "OSPF Link State Update\n"
+       "OSPF Link State Acknowledgment\n"
+       "OSPF all packets\n"
+       "Packet sent\n"
+       "Packet received\n"
+       "Detail Information\n")
 
-DEFSH (0, show_ipv6_ospf6_database_id_router_cmd_vtysh, 
-       "show ipv6 ospf6 database * A.B.C.D A.B.C.D", 
+DEFSH (0, show_interface_cmd_vtysh, 
+       "show interface", 
        "Show running system information\n"
-       "IPv6 information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Display Link state database\n"
-       "Any Link state Type\n"
-       "Specify Link state ID as IPv4 address notation\n"
-       "Specify Advertising Router as IPv4 address notation\n"
-      )
-
-DEFSH (0, send_lifetime_day_month_day_month_cmd_vtysh, 
-       "send-lifetime HH:MM:SS <1-31> MONTH <1993-2035> HH:MM:SS <1-31> MONTH <1993-2035>", 
-       "Set send lifetime of the key\n"
-       "Time to start\n"
-       "Day of th month to start\n"
-       "Month of the year to start\n"
-       "Year to start\n"
-       "Time to expire\n"
-       "Day of th month to expire\n"
-       "Month of the year to expire\n"
-       "Year to expire\n")
-
-DEFSH (0, neighbor_disable_connected_check_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "disable-connected-check", 
-       "Specify neighbor router\n"
-       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "one-hop away EBGP peer using loopback address\n")
-
-DEFSH (0, aggregate_address_summary_only_cmd_vtysh, 
-       "aggregate-address A.B.C.D/M summary-only", 
-       "Configure BGP aggregate entries\n"
-       "Aggregate prefix\n"
-       "Filter more specific routes from updates\n")
-
-DEFSH (0, ospf_area_range_cost_cmd_vtysh, 
-       "area (A.B.C.D|<0-4294967295>) range A.B.C.D/M cost <0-16777215>", 
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Summarize routes matching address/mask (border routers only)\n"
-       "Area range prefix\n"
-       "User specified metric for this range\n"
-       "Advertised metric for this range\n")
+       "Interface status and configuration\n")
 
-DEFSH (0, show_ip_route_prefix_vrf_all_cmd_vtysh, 
-       "show ip route A.B.C.D/M " "vrf all", 
-       "Show running system information\n"
+DEFSH (0, no_ip_route_flags_tag_distance_cmd_vtysh, 
+       "no ip route A.B.C.D/M (A.B.C.D|INTERFACE) (reject|blackhole) tag <1-4294967295> <1-255>", 
+       "Negate a command or set its defaults\n"
        "IP information\n"
-       "IP routing table\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Specify the VRF\nAll VRFs\n")
+       "Establish static routes\n"
+       "IP destination prefix (e.g. 10.0.0.0/8)\n"
+       "IP gateway address\n"
+       "IP gateway interface name\n"
+       "Emit an ICMP unreachable when matched\n"
+       "Silently discard pkts when matched\n"
+       "Tag of this route\n"
+       "Tag value\n"
+       "Distance value for this route\n")
 
-DEFSH (0, debug_isis_rtevents_cmd_vtysh, 
-       "debug isis route-events", 
+DEFSH (0, no_set_origin_cmd_vtysh, 
+       "no set origin", 
+       "Negate a command or set its defaults\n"
+       "Set values in destination routing protocol\n"
+       "BGP origin code\n")
+
+DEFSH (0, debug_pim_packetdump_send_cmd_vtysh, 
+       "debug pim packet-dump send", 
        "Debugging functions (see also 'undebug')\n"
-       "IS-IS information\n"
-       "IS-IS Route related events\n")
+       "PIM protocol activity\n"
+       "PIM packet dump\n"
+       "Dump sent packets\n")
 
-DEFSH (0, no_debug_ospf6_neighbor_cmd_vtysh, 
-       "no debug ospf6 neighbor", 
+DEFSH (0, no_debug_pim_trace_cmd_vtysh, 
+       "no debug pim trace", 
        "Negate a command or set its defaults\n"
        "Debugging functions (see also 'undebug')\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Debug OSPFv3 Neighbor\n"
-      )
+       "PIM protocol activity\n"
+       "PIM internal daemon activity\n")
 
-DEFSH (0, debug_ospf_event_cmd_vtysh, 
-       "debug ospf event", 
-       "Debugging functions (see also 'undebug')\n"
-       "OSPF information\n"
-       "OSPF event information\n")
+DEFSH (0, show_ip_bgp_ipv4_rsclient_summary_cmd_vtysh, 
+      "show ip bgp ipv4 (unicast|multicast) rsclient summary", 
+       "Show running system information\n"
+       "IP information\n"
+       "BGP information\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Information about Route Server Clients\n"
+       "Summary of all Route Server Clients\n")
 
-DEFSH (0, ospf_network_cmd_vtysh, 
-       "ospf network (broadcast|non-broadcast|point-to-multipoint|point-to-point)", 
-       "OSPF interface commands\n"
-       "Network type\n"
-       "Specify OSPF broadcast multi-access network\n"
-       "Specify OSPF NBMA network\n"
-       "Specify OSPF point-to-multipoint network\n"
-       "Specify OSPF point-to-point network\n")
+DEFSH (0, undebug_bgp_update_cmd_vtysh, 
+       "undebug bgp updates", 
+       "Disable debugging functions (see also 'debug')\n"
+       "BGP information\n"
+       "BGP updates\n")
 
-DEFSH (0, ip_route_mask_tag_distance_vrf_cmd_vtysh, 
-       "ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE|null0) tag <1-4294967295> <1-255>" "vrf <0-65535>", 
+DEFSH (0, clear_bgp_ipv6_as_soft_out_cmd_vtysh, 
+       "clear bgp ipv6 " "<1-4294967295>" " soft out", 
+       "Reset functions\n"
+       "BGP information\n"
+       "Address family\n"
+       "Clear peers with the AS number\n"
+       "Soft reconfig inbound and outbound updates\n"
+       "Resend all outbound updates\n")
+
+DEFSH (0, no_ip_route_mask_tag_distance_cmd_vtysh, 
+       "no ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE|null0) tag <1-4294967295> <1-255>", 
+       "Negate a command or set its defaults\n"
        "IP information\n"
        "Establish static routes\n"
        "IP destination prefix\n"
@@ -3646,98 +3489,176 @@ DEFSH (0, ip_route_mask_tag_distance_vrf_cmd_vtysh,
        "IP gateway address\n"
        "IP gateway interface name\n"
        "Null interface\n"
-       "Set tag for this route\n"
+       "Tag of this route\n"
        "Tag value\n"
-       "Distance value for this route\n"
-       "Specify the VRF\nThe VRF ID\n")
+       "Distance value for this route\n")
 
-DEFSH (0, ospf_max_metric_router_lsa_startup_cmd_vtysh, 
-       "max-metric router-lsa on-startup <5-86400>", 
-       "OSPF maximum / infinite-distance metric\n"
-       "Advertise own Router-LSA with infinite distance (stub router)\n"
-       "Automatically advertise stub Router-LSA on startup of OSPF\n"
-       "Time (seconds) to advertise self as stub-router\n")
+DEFSH (0, ospf_default_metric_cmd_vtysh, 
+       "default-metric <0-16777214>", 
+       "Set metric of redistributed routes\n"
+       "Default metric\n")
 
-DEFSH (0, no_ip_route_mask_flags2_tag_cmd_vtysh, 
-       "no ip route A.B.C.D A.B.C.D (reject|blackhole) tag <1-4294967295>", 
+DEFSH (0, no_ospf_area_vlink_param2_cmd_vtysh, 
+       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) "
+       "(hello-interval|retransmit-interval|transmit-delay|dead-interval)", 
        "Negate a command or set its defaults\n"
-       "IP information\n"
-       "Establish static routes\n"
-       "IP destination prefix\n"
-       "IP destination prefix mask\n"
-       "Emit an ICMP unreachable when matched\n"
-       "Silently discard pkts when matched\n"
-       "Tag of this route\n"
-       "Tag value\n")
+       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
+       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n"
+       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n")
 
-DEFSH (0|0|0, no_match_metric_val_cmd_vtysh, 
-       "no match metric <0-4294967295>", 
-       "Negate a command or set its defaults\n"
-       "Match values from routing table\n"
-       "Match metric of route\n"
-       "Metric value\n")
+DEFSH (0, ospf_area_vlink_param3_cmd_vtysh, 
+       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
+       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
+       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535>", 
+       "OSPF area parameters\n" "OSPF area ID in IP address format\n" "OSPF area ID as a decimal value\n" "Configure a virtual link\n" "Router ID of the remote ABR\n"
+       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n"
+       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n"
+       "Time between HELLO packets\n" "Time between retransmitting lost link state advertisements\n" "Link state transmit delay\n" "Interval after which a neighbor is declared dead\n" "Seconds\n")
 
-DEFSH (0, show_bgp_ipv4_safi_damp_flap_route_map_cmd_vtysh, 
-       "show bgp ipv4 (encap|multicast|unicast|vpn) dampening flap-statistics route-map WORD", 
-       "Show running system information\n"
-       "BGP information\n"
+DEFSH (0, clear_ip_bgp_all_encap_in_cmd_vtysh, 
+       "clear ip bgp * encap unicast in", 
+       "Reset functions\n"
        "IP information\n"
+       "BGP information\n"
+       "Clear all peers\n"
+       "Address family\n"
        "Address Family Modifier\n"
-       "Address Family Modifier\n"
-       "Address Family Modifier\n"
-       "Address Family Modifier\n"
-       "Display detailed information about dampening\n"
-       "Display flap statistics of routes\n"
-       "Display routes matching the route-map\n"
-       "A route-map to match on\n")
+       "Soft reconfig inbound update\n")
 
-DEFSH (0, no_ip_rip_split_horizon_cmd_vtysh, 
-       "no ip rip split-horizon", 
+DEFSH (0, no_ipv6_route_flags_pref_cmd_vtysh, 
+       "no ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) (reject|blackhole) <1-255>", 
        "Negate a command or set its defaults\n"
        "IP information\n"
-       "Routing Information Protocol\n"
-       "Perform split horizon\n")
-
-DEFSH (0, interface_ip_igmp_query_interval_cmd_vtysh, 
-       "ip igmp query-interval" " <1-1800>", 
-       "IP information\n"
-       "Enable IGMP operation\n"
-       "IGMP host query interval\n"
-       "Query interval in seconds\n")
+       "Establish static routes\n"
+       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
+       "IPv6 gateway address\n"
+       "IPv6 gateway interface name\n"
+       "Emit an ICMP unreachable when matched\n"
+       "Silently discard pkts when matched\n"
+       "Distance value for this prefix\n")
 
-DEFSH (0, no_bgp_network_mask_route_map_cmd_vtysh, 
-       "no network A.B.C.D mask A.B.C.D route-map WORD", 
+DEFSH (0, no_ripng_route_cmd_vtysh, 
+       "no route IPV6ADDR", 
        "Negate a command or set its defaults\n"
-       "Specify a network to announce via BGP\n"
-       "Network number\n"
-       "Network mask\n"
-       "Network mask\n"
-       "Route-map to modify the attributes\n"
-       "Name of the route map\n")
+       "Static route setup\n"
+       "Delete static RIPng route announcement\n")
 
-DEFSH (0, clear_ip_bgp_peer_group_soft_cmd_vtysh, 
-       "clear ip bgp peer-group WORD soft", 
+DEFSH (0, clear_ip_bgp_peer_group_in_prefix_filter_cmd_vtysh, 
+       "clear ip bgp peer-group WORD in prefix-filter", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
        "Clear all members of peer-group\n"
        "BGP peer-group name\n"
-       "Soft reconfig inbound and outbound updates\n")
+       "Send route-refresh unless using 'soft-reconfiguration inbound'\n"
+       "Push out prefix-list ORF and do inbound soft reconfig\n")
 
-DEFSH (0|0, no_set_ipv6_nexthop_local_val_cmd_vtysh, 
-       "no set ipv6 next-hop local X:X::X:X", 
+DEFSH (0, show_ip_bgp_flap_filter_list_cmd_vtysh, 
+       "show ip bgp flap-statistics filter-list WORD", 
+       "Show running system information\n"
+       "IP information\n"
+       "BGP information\n"
+       "Display flap statistics of routes\n"
+       "Display routes conforming to the filter-list\n"
+       "Regular expression access list name\n")
+
+DEFSH (0, ospf_cost_u32_cmd_vtysh, 
+       "ospf cost <1-65535>", 
+       "OSPF interface commands\n"
+       "Interface cost\n"
+       "Cost")
+
+DEFSH (0, no_bgp_maxpaths_arg_cmd_vtysh, 
+       "no maximum-paths " "<" "1" "-" "1" ">", 
        "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "IPv6 information\n"
-       "IPv6 next-hop address\n"
-       "IPv6 local address\n"
-       "IPv6 address of next hop\n")
+       "Forward packets over multiple paths\n"
+       "Number of paths\n")
 
-DEFSH (0, show_ipv6_ospf6_database_type_self_originated_cmd_vtysh, 
-       "show ipv6 ospf6 database "
-       "(router|network|inter-prefix|inter-router|as-external|"
-       "group-membership|type-7|link|intra-prefix) self-originated", 
-       "Show running system information\n"
+DEFSH (0, show_bgp_ipv6_route_cmd_vtysh, 
+       "show bgp ipv6 X:X::X:X", 
+       "Show running system information\n"
+       "BGP information\n"
+       "Address family\n"
+       "Network in the BGP routing table to display\n")
+
+DEFSH (0, ospf_retransmit_interval_cmd_vtysh, 
+       "ospf retransmit-interval <3-65535>", 
+       "OSPF interface commands\n"
+       "Time between retransmitting lost link state advertisements\n"
+       "Seconds\n")
+
+DEFSH (0, no_net_cmd_vtysh, 
+       "no net WORD", 
+       "Negate a command or set its defaults\n"
+       "A Network Entity Title for this process (OSI only)\n"
+       "XX.XXXX. ... .XXX.XX  Network entity title (NET)\n")
+
+DEFSH (0, show_ipv6_bgp_filter_list_cmd_vtysh, 
+       "show ipv6 bgp filter-list WORD", 
+       "Show running system information\n"
+       "IPv6 information\n"
+       "BGP information\n"
+       "Display routes conforming to the filter-list\n"
+       "Regular expression access list name\n")
+
+DEFSH (0, clear_bgp_as_in_prefix_filter_cmd_vtysh, 
+       "clear bgp " "<1-4294967295>" " in prefix-filter", 
+       "Reset functions\n"
+       "BGP information\n"
+       "Clear peers with the AS number\n"
+       "Send route-refresh unless using 'soft-reconfiguration inbound'\n"
+       "Push out prefix-list ORF and do inbound soft reconfig\n")
+
+DEFSH (0, debug_ssmpingd_cmd_vtysh, 
+       "debug ssmpingd", 
+       "Debugging functions (see also 'undebug')\n"
+       "PIM protocol activity\n"
+       "ssmpingd activity\n")
+
+DEFSH (0, interface_no_ip_igmp_query_max_response_time_cmd_vtysh, 
+       "no" " " "ip igmp query-max-response-time", 
+       "Negate a command or set its defaults\n"
+       "IP information\n"
+       "Enable IGMP operation\n"
+       "IGMP max query response value (seconds)\n")
+
+DEFSH (0|0|0|0, no_match_ip_next_hop_prefix_list_val_cmd_vtysh, 
+       "no match ip next-hop prefix-list WORD", 
+       "Negate a command or set its defaults\n"
+       "Match values from routing table\n"
+       "IP information\n"
+       "Match next-hop address of route\n"
+       "Match entries of prefix-lists\n"
+       "IP prefix-list name\n")
+
+DEFSH (0|0|0|0, no_ipv6_prefix_list_seq_le_ge_cmd_vtysh, 
+       "no ipv6 prefix-list WORD seq <1-4294967295> (deny|permit) X:X::X:X/M le <0-128> ge <0-128>", 
+       "Negate a command or set its defaults\n"
+       "IPv6 information\n"
+       "Build a prefix list\n"
+       "Name of a prefix list\n"
+       "sequence number of an entry\n"
+       "Sequence number\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
+       "Maximum prefix length to be matched\n"
+       "Maximum prefix length\n"
+       "Minimum prefix length to be matched\n"
+       "Minimum prefix length\n")
+
+DEFSH (0, undebug_pim_cmd_vtysh, 
+       "undebug pim", 
+       "Disable debugging functions (see also 'debug')\n"
+       "PIM protocol activity\n")
+
+DEFSH (0, show_ipv6_ospf6_database_type_linkstate_id_cmd_vtysh, 
+       "show ipv6 ospf6 database "
+       "(router|network|inter-prefix|inter-router|as-external|"
+       "group-membership|type-7|link|intra-prefix) linkstate-id A.B.C.D", 
+       "Show running system information\n"
        "IPv6 information\n"
        "Open Shortest Path First (OSPF) for IPv6\n"
        "Display Link state database\n"
@@ -3750,371 +3671,393 @@ DEFSH (0, show_ipv6_ospf6_database_type_self_originated_cmd_vtysh,
        "Display Type-7 LSAs\n"
        "Display Link LSAs\n"
        "Display Intra-Area-Prefix LSAs\n"
-       "Display Self-originated LSAs\n"
+       "Search by Link state ID\n"
+       "Specify Link state ID as IPv4 address notation\n"
       )
 
-DEFSH (0|0|0|0, ip_prefix_list_le_cmd_vtysh, 
-       "ip prefix-list WORD (deny|permit) A.B.C.D/M le <0-32>", 
+DEFSH (0, no_ip_rip_authentication_key_chain_cmd_vtysh, 
+       "no ip rip authentication key-chain", 
+       "Negate a command or set its defaults\n"
        "IP information\n"
-       "Build a prefix list\n"
-       "Name of a prefix list\n"
-       "Specify packets to reject\n"
-       "Specify packets to forward\n"
-       "IP prefix <network>/<length>,  e.g.,  35.0.0.0/8\n"
-       "Maximum prefix length to be matched\n"
-       "Maximum prefix length\n")
+       "Routing Information Protocol\n"
+       "Authentication control\n"
+       "Authentication key-chain\n")
 
-DEFSH (0, bgp_confederation_identifier_cmd_vtysh, 
-       "bgp confederation identifier " "<1-4294967295>", 
-       "BGP specific commands\n"
-       "AS confederation parameters\n"
-       "AS number\n"
-       "Set routing domain confederation AS\n")
+DEFSH (0, link_params_delay_cmd_vtysh, 
+       "delay <0-16777215>", 
+       "Unidirectional Average Link Delay\n"
+       "Average delay in micro-second as decimal (0...16777215)\n")
 
-DEFSH (0, show_ip_bgp_lcommunity_all_cmd_vtysh, 
-       "show ip bgp large-community", 
-       "Show running system information\n"
-       "IP information\n"
-       "BGP information\n"
-       "Display routes matching the large-communities\n")
+DEFSH (0, if_no_nhrp_holdtime_cmd_vtysh, 
+ "no " "(ip|ipv6)" " nhrp holdtime [1-65000]", 
+ "Negate a command or set its defaults\n"
+ "IP information\n" "IPv6 information\n"
+ "Next Hop Resolution Protocol functions\n"
+ "Specify NBMA address validity time\n"
+ "Time in seconds that NBMA addresses are advertised valid\n")
 
-DEFSH (0, show_ip_bgp_ipv4_lcommunity3_cmd_vtysh, 
-       "show ip bgp ipv4 (unicast|multicast) large-community (AA:BB:CC) (AA:BB:CC) (AA:BB:CC)", 
+DEFSH (0, no_neighbor_attr_unchanged9_cmd_vtysh, 
+       "no neighbor (A.B.C.D|X:X::X:X|WORD) " "attribute-unchanged med next-hop as-path", 
+       "Negate a command or set its defaults\n"
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
+       "BGP attribute is propagated unchanged to this neighbor\n"
+       "Med attribute\n"
+       "Nexthop attribute\n"
+       "As-path attribute\n")
+
+DEFSH (0, show_bgp_view_afi_safi_route_cmd_vtysh, 
+       "show bgp view WORD (ipv4|ipv6) (encap|multicast|unicast|vpn) A.B.C.D", 
        "Show running system information\n"
-       "IP information\n"
        "BGP information\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Display routes matching the large-communities\n"
-       "large-community number\n"
-       "large-community number\n"
-       "large-community number\n")
+       "BGP view\n"
+       "View name\n"
+       "Address Family\n"
+       "Address Family\n"
+       "Address Family Modifier\n"
+       "Address Family Modifier\n"
+       "Address Family Modifier\n"
+       "Address Family Modifier\n"
+       "Network in the BGP routing table to display\n")
 
-DEFSH (0, show_ipv6_ospf6_neighbor_detail_cmd_vtysh, 
-       "show ipv6 ospf6 neighbor (detail|drchoice)", 
+DEFSH (0, ospf6_routemap_no_set_forwarding_cmd_vtysh, 
+       "no set forwarding-address X:X::X:X", 
+       "Negate a command or set its defaults\n"
+       "Set value\n"
+       "Forwarding Address\n"
+       "IPv6 Address\n")
+
+DEFSH (0, show_bgp_ipv6_encap_route_cmd_vtysh, 
+       "show bgp ipv6 encap X:X::X:X", 
        "Show running system information\n"
+       "BGP information\n"
        "IPv6 Information\n"
-       "Open Shortest Path First (OSPF) for IPv6\n"
-       "Neighbor list\n"
-       "Display details\n"
-       "Display DR choices\n"
-      )
+       "Display ENCAP NLRI specific information\n"
+       "Network in the BGP routing table to display\n")
 
-DEFSH (0, show_ipv6_route_addr_cmd_vtysh, 
-       "show ipv6 route X:X::X:X", 
-       "Show running system information\n"
-       "IP information\n"
-       "IPv6 routing table\n"
-       "IPv6 Address\n")
+DEFSH (0, no_router_isis_cmd_vtysh, 
+       "no router isis WORD", 
+       "no\n" "Enable a routing process\n" "ISO IS-IS\n" "ISO Routing area tag")
 
-DEFSH (0|0|0|0|0, no_set_tag_cmd_vtysh, 
-       "no set tag", 
+DEFSH (0, no_capability_opaque_cmd_vtysh, 
+       "no capability opaque", 
        "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "Tag value for routing protocol\n")
+       "Enable specific OSPF feature\n"
+       "Opaque LSA\n")
 
-DEFSH (0, show_ip_bgp_instance_ipv4_rsclient_summary_cmd_vtysh, 
-      "show ip bgp view WORD ipv4 (unicast|multicast) rsclient summary", 
-       "Show running system information\n"
-       "IP information\n"
+DEFSH (0, clear_bgp_all_soft_cmd_vtysh, 
+       "clear bgp * soft", 
+       "Reset functions\n"
        "BGP information\n"
-       "BGP view\n"
-       "View name\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Information about Route Server Clients\n"
-       "Summary of all Route Server Clients\n")
-
-DEFSH (0|0|0|0|0|0, no_rmap_description_cmd_vtysh, 
-       "no description", 
-       "Negate a command or set its defaults\n"
-       "Route-map comment\n")
+       "Clear all peers\n"
+       "Soft reconfig inbound and outbound updates\n")
 
-DEFSH (0, clear_ip_bgp_instance_all_in_prefix_filter_cmd_vtysh, 
-       "clear ip bgp view WORD * in prefix-filter", 
+DEFSH (0, clear_ip_bgp_dampening_address_mask_cmd_vtysh, 
+       "clear ip bgp dampening A.B.C.D A.B.C.D", 
        "Reset functions\n"
        "IP information\n"
        "BGP information\n"
-       "BGP view\n"
-       "view name\n"
-       "Clear all peers\n"
-       "Send route-refresh unless using 'soft-reconfiguration inbound'\n"
-       "Push out prefix-list ORF and do inbound soft reconfig\n")
+       "Clear route flap dampening information\n"
+       "Network to clear damping information\n"
+       "Network mask\n")
 
-DEFSH (0, ospf_cost_u32_cmd_vtysh, 
-       "ospf cost <1-65535>", 
-       "OSPF interface commands\n"
-       "Interface cost\n"
-       "Cost")
+DEFSH (0, if_no_nhrp_network_id_cmd_vtysh, 
+ "no " "(ip|ipv6)" " nhrp network-id [<1-4294967295>]", 
+ "Negate a command or set its defaults\n"
+ "IP information\n" "IPv6 information\n"
+ "Next Hop Resolution Protocol functions\n"
+ "Enable NHRP and specify network-id\n"
+ "System local ID to specify interface group\n")
 
-DEFSH (0, show_ipv6_route_protocol_vrf_all_cmd_vtysh, 
-       "show ipv6 route " "(kernel|connected|static|ripng|ospf6|isis|bgp|babel|nhrp)" " " "vrf all", 
+DEFSH (0, lsp_gen_interval_l1_cmd_vtysh, 
+       "lsp-gen-interval level-1 <1-120>", 
+       "Minimum interval between regenerating same LSP\n"
+       "Set interval for level 1 only\n"
+       "Minimum interval in seconds\n")
+
+DEFSH (0, show_bgp_ipv6_encap_summary_cmd_vtysh, 
+       "show bgp ipv6 encap summary", 
        "Show running system information\n"
-       "IP information\n"
-       "IP routing table\n"
-       "Kernel routes (not installed via the zebra RIB)\n" "Connected routes (directly attached subnet or host)\n" "Statically configured routes\n" "Routing Information Protocol next-generation (IPv6) (RIPng)\n" "Open Shortest Path First (IPv6) (OSPFv3)\n" "Intermediate System to Intermediate System (IS-IS)\n" "Border Gateway Protocol (BGP)\n" "Babel routing protocol (Babel)\n" "Next Hop Resolution Protocol (NHRP)\n"
-       "Specify the VRF\nAll VRFs\n")
+       "BGP information\n"
+       "IPv6\n"
+       "Display ENCAP NLRI specific information\n"
+       "Summary of BGP neighbor status\n")
 
-DEFSH (0, ip_irdp_debug_misc_cmd_vtysh, 
-       "ip irdp debug misc", 
-       "IP information\n"
-       "ICMP Router discovery debug Averts. and Solicits (short)\n")
-
-DEFSH (0, match_community_exact_cmd_vtysh, 
-       "match community (<1-99>|<100-500>|WORD) exact-match", 
-       "Match values from routing table\n"
-       "Match BGP community list\n"
-       "Community-list number (standard)\n"
-       "Community-list number (expanded)\n"
-       "Community-list name\n"
-       "Do exact matching of communities\n")
-
-DEFSH (0, no_match_ip_route_source_val_cmd_vtysh, 
-       "no match ip route-source (<1-199>|<1300-2699>|WORD)", 
+DEFSH (0, no_ipv6_route_flags_cmd_vtysh, 
+       "no ipv6 route X:X::X:X/M (X:X::X:X|INTERFACE) (reject|blackhole)", 
        "Negate a command or set its defaults\n"
-       "Match values from routing table\n"
        "IP information\n"
-       "Match advertising source address of route\n"
-       "IP access-list number\n"
-       "IP access-list number (expanded range)\n"
-       "IP standard access-list name\n")
+       "Establish static routes\n"
+       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
+       "IPv6 gateway address\n"
+       "IPv6 gateway interface name\n"
+       "Emit an ICMP unreachable when matched\n"
+       "Silently discard pkts when matched\n")
 
-DEFSH (0|0|0|0|0, no_match_ip_address_prefix_list_cmd_vtysh, 
-       "no match ip address prefix-list", 
+DEFSH (0, no_ip_ospf_transmit_delay_addr_cmd_vtysh, 
+       "no ip ospf transmit-delay A.B.C.D", 
        "Negate a command or set its defaults\n"
-       "Match values from routing table\n"
-       "IP information\n"
-       "Match address of route\n"
-       "Match entries of prefix-lists\n")
+       "IP Information\n"
+       "OSPF interface commands\n"
+       "Link state transmit delay\n"
+       "Address of interface")
 
-DEFSH (0, ospf_distance_ospf_cmd_vtysh, 
-       "distance ospf "
-         "{intra-area <1-255>|inter-area <1-255>|external <1-255>}", 
+DEFSH (0, no_ipv6_bgp_distance_source_cmd_vtysh, 
+       "no distance <1-255> X:X::X:X/M", 
+       "Negate a command or set its defaults\n"
        "Define an administrative distance\n"
-       "OSPF Administrative distance\n"
-       "Intra-area routes\n"
-       "Distance for intra-area routes\n"
-       "Inter-area routes\n"
-       "Distance for inter-area routes\n"
-       "External routes\n"
-       "Distance for external routes\n")
+       "Administrative distance\n"
+       "IP source prefix\n")
 
-DEFSH (0, show_bgp_statistics_view_vpnv4_cmd_vtysh, 
-       "show bgp view WORD (ipv4) (vpnv4) statistics", 
-       "Show running system information\n"
-       "BGP information\n"
-       "BGP view\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "BGP RIB advertisement statistics\n")
+DEFSH (0, no_bgp_timers_cmd_vtysh, 
+       "no timers bgp", 
+       "Negate a command or set its defaults\n"
+       "Adjust routing timers\n"
+       "BGP timers\n")
 
-DEFSH (0, no_spf_interval_l1_cmd_vtysh, 
-       "no spf-interval level-1", 
+DEFSH (0, lsp_refresh_interval_l1_cmd_vtysh, 
+       "lsp-refresh-interval level-1 <1-65235>", 
+       "LSP refresh interval for Level 1 only\n"
+       "LSP refresh interval for Level 1 only in seconds\n")
+
+DEFSH (0, no_set_src_cmd_vtysh, 
+       "no set src", 
        "Negate a command or set its defaults\n"
-       "Minimum interval between SPF calculations\n"
-       "Set interval for level 1 only\n")
+       "Set values in destination routing protocol\n"
+       "Source address for route\n")
 
-DEFSH (0, no_psnp_interval_l1_cmd_vtysh, 
-       "no isis psnp-interval level-1", 
+DEFSH (0, no_set_weight_cmd_vtysh, 
+       "no set weight", 
        "Negate a command or set its defaults\n"
-       "IS-IS commands\n"
-       "Set PSNP interval in seconds\n"
-       "Specify interval for level-1 PSNPs\n")
+       "Set values in destination routing protocol\n"
+       "BGP weight for routing table\n")
 
-DEFSH (0, show_bgp_ipv4_safi_route_cmd_vtysh, 
-       "show bgp ipv4 (unicast|multicast) A.B.C.D", 
+DEFSH (0, show_bgp_ipv4_safi_flap_prefix_list_cmd_vtysh, 
+       "show bgp ipv4 (encap|multicast|unicast|vpn) flap-statistics prefix-list WORD", 
        "Show running system information\n"
        "BGP information\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Network in the BGP routing table to display\n")
-
-DEFSH (0, no_ip_multicast_routing_cmd_vtysh, 
-       "no" " " "ip multicast-routing", 
-       "Negate a command or set its defaults\n"
        "IP information\n"
-       "Global IP configuration subcommands\n"
-       "Enable IP multicast forwarding\n")
+       "Address Family Modifier\n"
+       "Address Family Modifier\n"
+       "Address Family Modifier\n"
+       "Address Family Modifier\n"
+       "Display flap statistics of routes\n"
+       "Display routes conforming to the prefix-list\n"
+       "IP prefix-list name\n")
 
-DEFSH (0, interface_ip_igmp_cmd_vtysh, 
-       "ip igmp", 
-       "IP information\n"
-       "Enable IGMP operation\n")
+DEFSH (0, ipv6_nd_prefix_val_nortaddr_cmd_vtysh, 
+       "ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) "
+       "(<0-4294967295>|infinite) (off-link|) (no-autoconfig|)", 
+       "Interface IPv6 config commands\n"
+       "Neighbor discovery\n"
+       "Prefix information\n"
+       "IPv6 prefix\n"
+       "Valid lifetime in seconds\n"
+       "Infinite valid lifetime\n"
+       "Preferred lifetime in seconds\n"
+       "Infinite preferred lifetime\n"
+       "Do not use prefix for onlink determination\n"
+       "Do not use prefix for autoconfiguration\n")
 
-DEFSH (0, clear_bgp_peer_in_cmd_vtysh, 
-       "clear bgp (A.B.C.D|X:X::X:X) in", 
-       "Reset functions\n"
+DEFSH (0, ospf6_router_id_cmd_vtysh, 
+       "router-id A.B.C.D", 
+       "Configure OSPF Router-ID\n"
+       "specify by IPv4 address notation(e.g. 0.0.0.0)\n")
+
+DEFSH (0, old_ipv6_aggregate_address_cmd_vtysh, 
+       "ipv6 bgp aggregate-address X:X::X:X/M", 
+       "IPv6 information\n"
        "BGP information\n"
-       "BGP neighbor address to clear\n"
-       "BGP IPv6 neighbor to clear\n"
-       "Send route-refresh unless using 'soft-reconfiguration inbound'\n")
+       "Configure BGP aggregate entries\n"
+       "Aggregate prefix\n")
 
-DEFSH (0, no_set_overload_bit_cmd_vtysh, 
-       "no set-overload-bit", 
-       "Reset overload bit to accept transit traffic\n"
-       "Reset overload bit\n")
+DEFSH (0, rip_default_metric_cmd_vtysh, 
+       "default-metric <1-16>", 
+       "Set a metric of redistribute routes\n"
+       "Default metric\n")
 
-DEFSH (0, ip_protocol_cmd_vtysh, 
-       "ip protocol PROTO route-map ROUTE-MAP", 
-       "Negate a command or set its defaults\n"
-       "Apply route map to PROTO\n"
-       "Protocol name\n"
-       "Route map name\n")
+DEFSH (0, ipv6_route_ifname_pref_tag_cmd_vtysh, 
+       "ipv6 route X:X::X:X/M X:X::X:X INTERFACE tag <1-4294967295> <1-255>", 
+       "IP information\n"
+       "Establish static routes\n"
+       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
+       "IPv6 gateway address\n"
+       "IPv6 gateway interface name\n"
+       "Set tag for this route\n"
+       "Tag value\n"
+       "Distance value for this prefix\n")
 
-DEFSH (0, neighbor_enforce_multihop_cmd_vtysh, 
-       "neighbor (A.B.C.D|X:X::X:X|WORD) " "enforce-multihop", 
+DEFSH (0|0|0|0|0|0, rmap_call_cmd_vtysh, 
+       "call WORD", 
+       "Jump to another Route-Map after match+set\n"
+       "Target route-map name\n")
+
+DEFSH (0, neighbor_route_server_client_cmd_vtysh, 
+       "neighbor (A.B.C.D|X:X::X:X|WORD) " "route-server-client", 
        "Specify neighbor router\n"
        "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-       "Enforce EBGP neighbors perform multihop\n")
-
-DEFSH (0, show_ip_route_vrf_all_cmd_vtysh, 
-       "show ip route " "vrf all", 
-       "Show running system information\n"
-       "IP information\n"
-       "IP routing table\n"
-       "Specify the VRF\nAll VRFs\n")
+       "Configure a neighbor as Route Server client\n")
 
-DEFSH (0, no_debug_ospf6_zebra_sendrecv_cmd_vtysh, 
-       "no debug ospf6 zebra (send|recv)", 
-       "Negate a command or set its defaults\n"
+DEFSH (0, debug_ospf6_spf_database_cmd_vtysh, 
+       "debug ospf6 spf database", 
        "Debugging functions (see also 'undebug')\n"
        "Open Shortest Path First (OSPF) for IPv6\n"
-       "Debug connection between zebra\n"
-       "Debug Sending zebra\n"
-       "Debug Receiving zebra\n"
+       "Debug SPF Calculation\n"
+       "Log number of LSAs at SPF Calculation time\n"
       )
 
-DEFSH (0, isis_priority_l1_cmd_vtysh, 
-       "isis priority <0-127> level-1", 
-       "IS-IS commands\n"
-       "Set priority for Designated Router election\n"
-       "Priority value\n"
-       "Specify priority for level-1 routing\n")
-
-DEFSH (0, no_ospf6_distance_source_access_list_cmd_vtysh, 
-       "no distance <1-255> X:X::X:X/M WORD", 
-       "Negate a command or set its defaults\n"
-       "Administrative distance\n"
-       "Distance value\n"
-       "IP source prefix\n"
-       "Access list name\n")
+DEFSH (0, undebug_igmp_cmd_vtysh, 
+       "undebug igmp", 
+       "Disable debugging functions (see also 'debug')\n"
+       "IGMP protocol activity\n")
 
-DEFSH (0, no_spf_interval_l2_arg_cmd_vtysh, 
-       "no spf-interval level-2 <1-120>", 
-       "Negate a command or set its defaults\n"
-       "Minimum interval between SPF calculations\n"
-       "Set interval for level 2 only\n"
-       "Minimum interval between consecutive SPFs in seconds\n")
+DEFSH (0, router_info_area_cmd_vtysh, 
+       "router-info area A.B.C.D", 
+       "OSPF Router Information specific commands\n"
+       "Enable the Router Information functionality with Area flooding scope\n"
+       "OSPF area ID in IP format")
 
-DEFSH (0, aggregate_address_mask_summary_only_cmd_vtysh, 
-       "aggregate-address A.B.C.D A.B.C.D summary-only", 
-       "Configure BGP aggregate entries\n"
-       "Aggregate address\n"
-       "Aggregate mask\n"
-       "Filter more specific routes from updates\n")
+DEFSH (0, show_ip_mroute_count_cmd_vtysh, 
+       "show ip mroute count", 
+       "Show running system information\n"
+       "IP information\n"
+       "IP multicast routing table\n"
+       "Route and packet count data\n")
 
-DEFSH (0, bgp_graceful_restart_cmd_vtysh, 
-       "bgp graceful-restart", 
-       "BGP specific commands\n"
-       "Graceful restart capability parameters\n")
+DEFSH (0, debug_bgp_keepalive_cmd_vtysh, 
+       "debug bgp keepalives", 
+       "Debugging functions (see also 'undebug')\n"
+       "BGP information\n"
+       "BGP keepalives\n")
 
-DEFSH (0, no_metric_style_cmd_vtysh, 
-       "no metric-style", 
+DEFSH (0, no_ip_lcommunity_list_standard_cmd_vtysh, 
+       "no ip large-community-list <1-99> (deny|permit) .AA:.AA:NN", 
        "Negate a command or set its defaults\n"
-       "Use old-style (ISO 10589) or new-style packet formats\n")
-
-DEFSH (0, ip_rip_authentication_mode_cmd_vtysh, 
-       "ip rip authentication mode (md5|text)", 
        "IP information\n"
-       "Routing Information Protocol\n"
-       "Authentication control\n"
-       "Authentication mode\n"
-       "Keyed message digest\n"
-       "Clear text authentication\n")
-
-DEFSH (0, ospf6_log_adjacency_changes_cmd_vtysh, 
-       "log-adjacency-changes", 
-       "Log changes in adjacency state\n")
-
-DEFSH (0, set_overload_bit_cmd_vtysh, 
-       "set-overload-bit", 
-       "Set overload bit to avoid any transit traffic\n"
-       "Set overload bit\n")
-
-DEFSH (0, no_debug_ospf_zebra_cmd_vtysh, 
-       "no debug ospf zebra", 
-       "Negate a command or set its defaults\n"
-       "Debugging functions (see also 'undebug')\n"
-       "OSPF information\n"
-       "OSPF Zebra information\n")
-
-DEFSH (0, no_isis_metric_cmd_vtysh, 
-       "no isis metric", 
-       "Negate a command or set its defaults\n"
-       "IS-IS commands\n"
-       "Set default metric for circuit\n")
+       "Add a large community list entry\n"
+       "Large Community list number (standard)\n"
+       "Specify large community to reject\n"
+       "Specify large community to accept\n"
+       "large community in 'aa:bb:cc' format\n")
 
-DEFSH (0, link_params_delay_mm_cmd_vtysh, 
-       "delay <0-16777215> min <0-16777215> max <0-16777215>", 
-       "Unidirectional Average Link Delay (optionally Minimum and Maximum delays)\n"
-       "Average delay in micro-second as decimal (0...16777215)\n"
-       "Minimum delay\n"
-       "Minimum delay in micro-second as decimal (0...16777215)\n"
-       "Maximum delay\n"
-       "Maximum delay in micro-second as decimal (0...16777215)\n")
+DEFSH (0, ospf_rfc1583_flag_cmd_vtysh, 
+       "ospf rfc1583compatibility", 
+       "OSPF specific commands\n"
+       "Enable the RFC1583Compatibility flag\n")
 
-DEFSH (0, no_ip_ospf_network_cmd_vtysh, 
-       "no ip ospf network", 
+DEFSH (0, interface_no_ip_mroute_cmd_vtysh, 
+       "no ip mroute INTERFACE A.B.C.D", 
        "Negate a command or set its defaults\n"
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Network type\n")
+       "IP information\n"
+       "Add multicast route\n"
+       "Outgoing interface name\n"
+       "Group Address\n")
 
-DEFSH (0, no_ip_ospf_cost_cmd_vtysh, 
-       "no ip ospf cost", 
-       "Negate a command or set its defaults\n"
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Interface cost\n")
+DEFSH (0, clear_ip_bgp_peer_group_soft_cmd_vtysh, 
+       "clear ip bgp peer-group WORD soft", 
+       "Reset functions\n"
+       "IP information\n"
+       "BGP information\n"
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       "Soft reconfig inbound and outbound updates\n")
 
-DEFSH (0, ospf6_redistribute_routemap_cmd_vtysh, 
-       "redistribute " "(kernel|connected|static|ripng|isis|bgp|babel|nhrp)" " route-map WORD", 
-       "Redistribute\n"
-       "Kernel routes (not installed via the zebra RIB)\n" "Connected routes (directly attached subnet or host)\n" "Statically configured routes\n" "Routing Information Protocol next-generation (IPv6) (RIPng)\n" "Intermediate System to Intermediate System (IS-IS)\n" "Border Gateway Protocol (BGP)\n" "Babel routing protocol (Babel)\n" "Next Hop Resolution Protocol (NHRP)\n"
-       "Route map reference\n"
-       "Route map name\n"
-      )
+DEFSH (0, show_ipv6_mbgp_summary_cmd_vtysh, 
+       "show ipv6 mbgp summary", 
+       "Show running system information\n"
+       "IPv6 information\n"
+       "MBGP information\n"
+       "Summary of BGP neighbor status\n")
 
-DEFSH (0, no_set_metric_addsub_cmd_vtysh, 
-       "no set metric <+/-metric>", 
-       "Negate a command or set its defaults\n"
-       "Set values in destination routing protocol\n"
-       "Metric value for destination routing protocol\n"
-       "Add or subtract metric\n")
+DEFSH (0, ip_route_mask_flags_tag_distance2_cmd_vtysh, 
+       "ip route A.B.C.D A.B.C.D (reject|blackhole) tag <1-4294967295> <1-255>", 
+       "IP information\n"
+       "Establish static routes\n"
+       "IP destination prefix\n"
+       "IP destination prefix mask\n"
+       "Set tag for this route\n"
+       "Tag value\n"
+       "Distance value for this route\n"
+       "Emit an ICMP unreachable when matched\n"
+       "Silently discard pkts when matched\n")
 
-DEFSH (0, no_rip_version_val_cmd_vtysh, 
-       "no version <1-2>", 
-       "Negate a command or set its defaults\n"
-       "Set routing protocol version\n"
-       "version\n")
+DEFSH (0, area_passwd_clear_cmd_vtysh, 
+       "(area-password|domain-password) clear WORD", 
+       "Configure the authentication password for an area\n"
+       "Set the authentication password for a routing domain\n"
+       "Authentication type\n"
+       "Area password\n")
 
-DEFSH (0, show_ip_bgp_instance_summary_cmd_vtysh, 
-       "show ip bgp view WORD summary", 
+DEFSH (0, show_ip_bgp_summary_cmd_vtysh, 
+       "show ip bgp summary", 
        "Show running system information\n"
        "IP information\n"
        "BGP information\n"
-       "BGP view\n"
-       "View name\n"
        "Summary of BGP neighbor status\n")
 
-DEFSH (0, show_ip_bgp_community4_exact_cmd_vtysh, 
-       "show ip bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
+DEFSH (0, show_ipv6_route_protocol_vrf_all_cmd_vtysh, 
+       "show ipv6 route " "(kernel|connected|static|ripng|ospf6|isis|bgp|babel|nhrp)" " " "vrf all", 
        "Show running system information\n"
        "IP information\n"
+       "IP routing table\n"
+       "Kernel routes (not installed via the zebra RIB)\n" "Connected routes (directly attached subnet or host)\n" "Statically configured routes\n" "Routing Information Protocol next-generation (IPv6) (RIPng)\n" "Open Shortest Path First (IPv6) (OSPFv3)\n" "Intermediate System to Intermediate System (IS-IS)\n" "Border Gateway Protocol (BGP)\n" "Babel routing protocol (Babel)\n" "Next Hop Resolution Protocol (NHRP)\n"
+       "Specify the VRF\nAll VRFs\n")
+
+DEFSH (0, access_list_standard_any_cmd_vtysh, 
+       "access-list (<1-99>|<1300-1999>) (deny|permit) any", 
+       "Add an access list entry\n"
+       "IP standard access list\n"
+       "IP standard access list (expanded range)\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "Any source host\n")
+
+DEFSH (0, no_vty_login_cmd_vtysh, 
+       "no login", 
+       "Negate a command or set its defaults\n"
+       "Enable password checking\n")
+
+DEFSH (0, ripng_redistribute_type_routemap_cmd_vtysh, 
+       "redistribute " "(kernel|connected|static|ospf6|isis|bgp|babel|nhrp)" " route-map WORD", 
+       "Redistribute\n"
+       "Kernel routes (not installed via the zebra RIB)\n" "Connected routes (directly attached subnet or host)\n" "Statically configured routes\n" "Open Shortest Path First (IPv6) (OSPFv3)\n" "Intermediate System to Intermediate System (IS-IS)\n" "Border Gateway Protocol (BGP)\n" "Babel routing protocol (Babel)\n" "Next Hop Resolution Protocol (NHRP)\n"
+       "Route map reference\n"
+       "Pointer to route-map entries\n")
+
+DEFSH (0, show_bgp_ipv4_safi_community_list_cmd_vtysh, 
+       "show bgp ipv4 (unicast|multicast) community-list (<1-500>|WORD)", 
+       "Show running system information\n"
        "BGP information\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Display routes matching the community-list\n"
+       "community-list number\n"
+       "community-list name\n")
+
+DEFSH (0, accept_lifetime_infinite_month_day_cmd_vtysh, 
+       "accept-lifetime HH:MM:SS MONTH <1-31> <1993-2035> infinite", 
+       "Set accept lifetime of the key\n"
+       "Time to start\n"
+       "Month of the year to start\n"
+       "Day of th month to start\n"
+       "Year to start\n"
+       "Never expires")
+
+DEFSH (0, no_isis_circuit_type_cmd_vtysh, 
+       "no isis circuit-type (level-1|level-1-2|level-2-only)", 
+       "Negate a command or set its defaults\n"
+       "IS-IS commands\n"
+       "Configure circuit type for interface\n"
+       "Level-1 only adjacencies are formed\n"
+       "Level-1-2 adjacencies are formed\n"
+       "Level-2 only adjacencies are formed\n")
+
+DEFSH (0, show_ipv6_mbgp_community4_exact_cmd_vtysh, 
+       "show ipv6 mbgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match", 
+       "Show running system information\n"
+       "IPv6 information\n"
+       "MBGP information\n"
        "Display routes matching the communities\n"
        "community number\n"
        "Do not send outside local AS (well-known community)\n"
@@ -4134,214 +4077,159 @@ DEFSH (0, show_ip_bgp_community4_exact_cmd_vtysh,
        "Do not export to next AS (well-known community)\n"
        "Exact match of the communities")
 
-DEFSH (0, show_ip_bgp_neighbors_peer_cmd_vtysh, 
-       "show ip bgp neighbors (A.B.C.D|X:X::X:X)", 
+DEFSH (0, no_ipv6_route_ifname_tag_cmd_vtysh, 
+       "no ipv6 route X:X::X:X/M X:X::X:X INTERFACE tag <1-4294967295>", 
+       "Negate a command or set its defaults\n"
+       "IP information\n"
+       "Establish static routes\n"
+       "IPv6 destination prefix (e.g. 3ffe:506::/32)\n"
+       "IPv6 gateway address\n"
+       "IPv6 gateway interface name\n"
+       "Set tag for this route\n"
+       "Tag value\n")
+
+DEFSH (0, show_ip_igmp_sources_cmd_vtysh, 
+       "show ip igmp sources", 
        "Show running system information\n"
        "IP information\n"
-       "BGP information\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n")
+       "IGMP information\n"
+       "IGMP sources information\n")
 
-DEFSH (0, no_isis_metric_l1_arg_cmd_vtysh, 
-       "no isis metric <0-16777215> level-1", 
+DEFSH (0, no_ip_route_tag_distance_cmd_vtysh, 
+       "no ip route A.B.C.D/M (A.B.C.D|INTERFACE|null0) tag <1-4294967295> <1-255>", 
        "Negate a command or set its defaults\n"
-       "IS-IS commands\n"
-       "Set default metric for circuit\n"
-       "Default metric value\n"
-       "Specify metric for level-1 routing\n")
-
-DEFSH (0, show_bgp_ipv6_safi_community_list_cmd_vtysh, 
-       "show bgp ipv6 (encap|multicast|unicast|vpn) community-list (<1-500>|WORD)", 
-       "Show running system information\n"
-       "BGP information\n"
-       "Address family\n"
-       "Address family modifier\n"
-       "Address family modifier\n"
-       "Address family modifier\n"
-       "Address family modifier\n"
-       "Display routes matching the community-list\n"
-       "community-list number\n"
-       "community-list name\n")
+       "IP information\n"
+       "Establish static routes\n"
+       "IP destination prefix (e.g. 10.0.0.0/8)\n"
+       "IP gateway address\n"
+       "IP gateway interface name\n"
+       "Null interface\n"
+       "Tag of this route\n"
+       "Tag value\n"
+       "Distance value for this route\n")
 
-DEFSH (0, show_bgp_ipv6_community2_cmd_vtysh, 
-       "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)", 
+DEFSH (0, show_ip_bgp_ipv4_prefix_list_cmd_vtysh, 
+       "show ip bgp ipv4 (unicast|multicast) prefix-list WORD", 
        "Show running system information\n"
+       "IP information\n"
        "BGP information\n"
        "Address family\n"
-       "Display routes matching the communities\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "community number\n"
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
-
-DEFSH (0, show_ip_ospf_cmd_vtysh, 
-       "show ip ospf", 
-       "Show running system information\n"
-       "IP information\n"
-       "OSPF information\n")
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Display routes conforming to the prefix-list\n"
+       "IP prefix-list name\n")
 
-DEFSH (0, no_ospf_abr_type_cmd_vtysh, 
-       "no ospf abr-type (cisco|ibm|shortcut|standard)", 
+DEFSH (0|0|0|0, no_ipv6_prefix_list_le_ge_cmd_vtysh, 
+       "no ipv6 prefix-list WORD (deny|permit) X:X::X:X/M le <0-128> ge <0-128>", 
        "Negate a command or set its defaults\n"
-       "OSPF specific commands\n"
-       "Set OSPF ABR type\n"
-       "Alternative ABR,  cisco implementation\n"
-       "Alternative ABR,  IBM implementation\n"
-       "Shortcut ABR\n")
-
-DEFSH (0, no_ripng_default_metric_cmd_vtysh, 
-       "no default-metric", 
-       "Negate a command or set its defaults\n"
-       "Set a metric of redistribute routes\n"
-       "Default metric\n")
-
-DEFSH (0, clear_bgp_ipv6_external_soft_out_cmd_vtysh, 
-       "clear bgp ipv6 external soft out", 
-       "Reset functions\n"
-       "BGP information\n"
-       "Address family\n"
-       "Clear all external peers\n"
-       "Soft reconfig inbound and outbound updates\n"
-       "Resend all outbound updates\n")
+       "IPv6 information\n"
+       "Build a prefix list\n"
+       "Name of a prefix list\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n"
+       "Maximum prefix length to be matched\n"
+       "Maximum prefix length\n"
+       "Minimum prefix length to be matched\n"
+       "Minimum prefix length\n")
 
-DEFSH (0, show_ip_pim_secondary_cmd_vtysh, 
-       "show ip pim secondary", 
+DEFSH (0, show_ip_ospf_database_type_self_cmd_vtysh, 
+       "show ip ospf database (" "asbr-summary|external|network|router|summary" "|nssa-external" "|opaque-link|opaque-area|opaque-as" ") (self-originate|)", 
        "Show running system information\n"
        "IP information\n"
-       "PIM information\n"
-       "PIM neighbor addresses\n")
+       "OSPF information\n"
+       "Database summary\n"
+       "ASBR summary link states\n" "External link states\n" "Network link states\n" "Router link states\n" "Network summary link states\n" "NSSA external link state\n" "Link local Opaque-LSA\n" "Link area Opaque-LSA\n" "Link AS Opaque-LSA\n"
+       "Self-originated link states\n")
 
-DEFSH (0, no_bgp_rr_allow_outbound_policy_cmd_vtysh, 
-       "no bgp route-reflector allow-outbound-policy", 
+DEFSH (0, neighbor_attr_unchanged8_cmd_vtysh, 
+       "neighbor (A.B.C.D|X:X::X:X|WORD) " "attribute-unchanged next-hop as-path med", 
+       "Specify neighbor router\n"
+       "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
+       "BGP attribute is propagated unchanged to this neighbor\n"
+      &n