*: remove VTYNL, part 3 of 6

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

27 files changed, 100 insertions, 136 deletions

diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
index 603171138e..a76e499f8c 100644
--- a/bgpd/bgp_evpn_vty.c
+++ b/bgpd/bgp_evpn_vty.c
@@ -146,8 +146,7 @@ bgp_show_ethernet_vpn(struct vty *vty, struct prefix_rd *prd,
 								vty_out (vty,
 									"Status codes: s suppressed, d damped, h history, * valid, > best, i - internal\n");
 								vty_out (vty,
-									"Origin codes: i - IGP, e - EGP, ? - incomplete%s\n",
-									VTYNL);
+									"Origin codes: i - IGP, e - EGP, ? - incomplete\n\n");
 								vty_out(vty, V4_HEADER);
 							}
 						}
@@ -256,8 +255,7 @@ bgp_show_ethernet_vpn(struct vty *vty, struct prefix_rd *prd,
 		vty_out (vty, "No prefixes displayed, %ld exist\n",
 			  total_count);
 	else
-		vty_out (vty, "%sDisplayed %ld out of %ld total prefixes\n",
-			VTYNL, output_count, total_count);
+		vty_out (vty, "\nDisplayed %ld out of %ld total prefixes\n", output_count, total_count);
 	return CMD_SUCCESS;
 }
 
diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c
index 0a4d589b86..c1db9fed2f 100644
--- a/bgpd/bgp_mplsvpn.c
+++ b/bgpd/bgp_mplsvpn.c
@@ -641,8 +641,7 @@ bgp_show_mpls_vpn (struct vty *vty, afi_t afi, struct prefix_rd *prd,
 		                       inet_ntoa(bgp->router_id));
 		              vty_out (vty,
                                          "Status codes: s suppressed, d damped, h history, * valid, > best, i - internal\n");
-		              vty_out (vty, "Origin codes: i - IGP, e - EGP, ? - incomplete%s\n",
-		                       VTYNL);
+		              vty_out (vty, "Origin codes: i - IGP, e - EGP, ? - incomplete\n\n");
 		              vty_out (vty, V4_HEADER);
 		            }
                         }
@@ -749,8 +748,7 @@ bgp_show_mpls_vpn (struct vty *vty, afi_t afi, struct prefix_rd *prd,
       if (output_count == 0)
 	vty_out (vty, "No prefixes displayed, %ld exist\n", total_count);
       else
-	vty_out (vty, "%sDisplayed %ld routes and %ld total paths\n",
-		 VTYNL, output_count, total_count);
+	vty_out (vty, "\nDisplayed %ld routes and %ld total paths\n", output_count, total_count);
     }
 
   return CMD_SUCCESS;
diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c
index e2d93e9f37..45ccb37434 100644
--- a/bgpd/bgp_nexthop.c
+++ b/bgpd/bgp_nexthop.c
@@ -478,8 +478,7 @@ bgp_show_all_instances_nexthops_vty (struct vty *vty)
 
   for (ALL_LIST_ELEMENTS (bm->bgp, node, nnode, bgp))
     {
-      vty_out (vty, "%sInstance %s:\n",
-               VTYNL,
+      vty_out (vty, "\nInstance %s:\n",
                (bgp->inst_type == BGP_INSTANCE_TYPE_DEFAULT) ? "Default" : bgp->name);
       bgp_show_nexthops (vty, bgp, 0);
     }
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index b4bdab3161..80161412d4 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -6191,7 +6191,7 @@ route_vty_out_route (struct prefix *p, struct vty *vty)
 
   len = 17 - len;
   if (len < 1)
-    vty_out (vty, "%s%*s", VTYNL, 20, " ");
+    vty_out (vty, "\n%*s", 20, " ");
   else
     vty_out (vty, "%*s", len, " ");
 }
@@ -6415,7 +6415,7 @@ route_vty_out (struct vty *vty, struct prefix *p,
 		      len = 7 - len; /* len of IPv6 addr + max len of def ifname */
 
 		      if (len < 1)
-			vty_out (vty, "%s%*s", VTYNL, 45, " ");
+			vty_out (vty, "\n%*s", 45, " ");
 		      else
 			vty_out (vty, "%*s", len, " ");
 		    }
@@ -6428,7 +6428,7 @@ route_vty_out (struct vty *vty, struct prefix *p,
 		      len = 16 - len;
 
 		      if (len < 1)
-			vty_out (vty, "%s%*s", VTYNL, 36, " ");
+			vty_out (vty, "\n%*s", 36, " ");
 		      else
 			vty_out (vty, "%*s", len, " ");
 		    }
@@ -6442,7 +6442,7 @@ route_vty_out (struct vty *vty, struct prefix *p,
 		  len = 16 - len;
 
 		  if (len < 1)
-		    vty_out (vty, "%s%*s", VTYNL, 36, " ");
+		    vty_out (vty, "\n%*s", 36, " ");
 		  else
 		    vty_out (vty, "%*s", len, " ");
 		}
@@ -6630,7 +6630,7 @@ route_vty_out_tmp (struct vty *vty, struct prefix *p, struct attr *attr, safi_t
                              buf, BUFSIZ));
               len = 16 - len;
               if (len < 1)
-                vty_out (vty, "%s%*s", VTYNL, 36, " ");
+                vty_out (vty, "\n%*s", 36, " ");
               else
                 vty_out (vty, "%*s", len, " ");
             }
@@ -6884,7 +6884,7 @@ damp_route_vty_out (struct vty *vty, struct prefix *p, struct bgp_info *binfo,
   if (len < 1)
     {
       if (!use_json)
-        vty_out (vty, "%s%*s", VTYNL, 34, " ");
+        vty_out (vty, "\n%*s", 34, " ");
     }
   else
     {
@@ -6954,7 +6954,7 @@ flap_route_vty_out (struct vty *vty, struct prefix *p, struct bgp_info *binfo,
   if (len < 1)
     {
       if (!use_json)
-        vty_out (vty, "%s%*s", VTYNL, 33, " ");
+        vty_out (vty, "\n%*s", 33, " ");
     }
   else
     {
@@ -8043,8 +8043,7 @@ bgp_show_table (struct vty *vty, struct bgp *bgp, struct bgp_table *table,
                        total_count);
         }
       else
-        vty_out (vty, "%sDisplayed  %ld routes and %ld total paths\n",
-                 VTYNL, output_count, total_count);
+        vty_out (vty, "\nDisplayed  %ld routes and %ld total paths\n", output_count, total_count);
     }
 
   return CMD_SUCCESS;
@@ -8105,8 +8104,7 @@ bgp_show_all_instances_routes_vty (struct vty *vty, afi_t afi, safi_t safi,
         }
       else
         {
-          vty_out (vty, "%sInstance %s:\n",
-                   VTYNL,
+          vty_out (vty, "\nInstance %s:\n",
                    (bgp->inst_type == BGP_INSTANCE_TYPE_DEFAULT) ? "Default" : bgp->name);
         }
       bgp_show (vty, bgp, afi, safi, bgp_show_type_normal, NULL, use_json);
@@ -9422,8 +9420,7 @@ bgp_peer_counts (struct vty *vty, struct peer *peer, afi_t afi, safi_t safi, u_c
         }
 
       vty_out (vty, "PfxCt: %ld\n", peer->pcount[afi][safi]);
-      vty_out (vty, "%sCounts from RIB table walk:%s\n",
-               VTYNL, VTYNL);
+      vty_out (vty, "\nCounts from RIB table walk:\n\n");
 
       for (i = 0; i < PCOUNT_MAX; i++)
         vty_out (vty, "%20s: %-10d\n", pcount_strs[i], pcounts.count[i]);
@@ -9649,8 +9646,7 @@ show_adj_route (struct vty *vty, struct peer *peer, afi_t afi, safi_t safi,
           vty_out (vty, BGP_SHOW_SCODE_HEADER);
           vty_out (vty, BGP_SHOW_OCODE_HEADER);
 
-          vty_out (vty, "Originating default network 0.0.0.0%s\n",
-                   VTYNL);
+          vty_out (vty, "Originating default network 0.0.0.0\n\n");
         }
       header1 = 0;
     }
@@ -9757,8 +9753,7 @@ show_adj_route (struct vty *vty, struct peer *peer, afi_t afi, safi_t safi,
       if (use_json)
         json_object_int_add(json, "totalPrefixCounter", output_count);
       else
-        vty_out (vty, "%sTotal number of prefixes %ld\n",
-                 VTYNL, output_count);
+        vty_out (vty, "\nTotal number of prefixes %ld\n", output_count);
     }
   if (use_json)
     {
diff --git a/bgpd/bgp_updgrp_adv.c b/bgpd/bgp_updgrp_adv.c
index aa3a53098e..6524e8435a 100644
--- a/bgpd/bgp_updgrp_adv.c
+++ b/bgpd/bgp_updgrp_adv.c
@@ -250,8 +250,7 @@ subgrp_show_adjq_vty (struct update_subgroup *subgrp, struct vty *vty,
 	    }
 	}
   if (output_count != 0)
-    vty_out (vty, "%sTotal number of prefixes %ld\n",
-	     VTYNL, output_count);
+    vty_out (vty, "\nTotal number of prefixes %ld\n", output_count);
 }
 
 static int
diff --git a/bgpd/bgp_vpn.c b/bgpd/bgp_vpn.c
index e1fed31a11..c7f8ae3c0d 100644
--- a/bgpd/bgp_vpn.c
+++ b/bgpd/bgp_vpn.c
@@ -108,8 +108,7 @@ show_adj_route_vpn (struct vty *vty, struct peer *peer, struct prefix_rd *prd,
                                    inet_ntoa(bgp->router_id));
                           vty_out (vty,
                                      "Status codes: s suppressed, d damped, h history, * valid, > best, i - internal\n");
-                          vty_out (vty, "Origin codes: i - IGP, e - EGP, ? - incomplete%s\n",
-                                   VTYNL);
+                          vty_out (vty, "Origin codes: i - IGP, e - EGP, ? - incomplete\n\n");
                           vty_out (vty, V4_HEADER);
                         }
                       header = 0;
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 59fec7fb8a..e84a7f005e 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -6628,8 +6628,7 @@ DEFUN (show_bgp_vrfs,
   else
     {
       if (count)
-        vty_out (vty, "%sTotal number of VRFs (including default): %d%s",
-                 VTYNL, count, VTYNL);
+        vty_out (vty, "\nTotal number of VRFs (including default): %d%s", count, VTYNL);
     }
 
   return CMD_SUCCESS;
@@ -7111,7 +7110,7 @@ bgp_show_summary (struct vty *vty, struct bgp *bgp, int afi, int safi,
   else
     {
       if (count)
-        vty_out (vty, "%sTotal number of neighbors %d%s", VTYNL,
+        vty_out (vty, "\nTotal number of neighbors %d%s",
                 count, VTYNL);
       else
         {
@@ -7198,8 +7197,7 @@ bgp_show_summary_afi_safi (struct vty *vty, struct bgp *bgp, int afi, int safi,
                     }
                   else
                     {
-                      vty_out (vty, "%s%s Summary:%s",
-                               VTYNL, afi_safi_print(afi, safi), VTYNL);
+                      vty_out (vty, "\n%s Summary:%s", afi_safi_print(afi, safi), VTYNL);
                     }
                 }
               bgp_show_summary (vty, bgp, afi, safi, use_json, json);
@@ -7251,8 +7249,7 @@ bgp_show_all_instances_summary_vty (struct vty *vty, afi_t afi, safi_t safi,
         }
       else
         {
-          vty_out (vty, "%sInstance %s:%s",
-                   VTYNL,
+          vty_out (vty, "\nInstance %s:%s",
                    (bgp->inst_type == BGP_INSTANCE_TYPE_DEFAULT)
                    ? "Default" : bgp->name, VTYNL);
         }
@@ -8493,7 +8490,7 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js
 
                   if (CHECK_FLAG (p->cap, PEER_CAP_ENHE_RCV))
 		    {
-		      vty_out (vty, "      Address families by peer:%s        ", VTYNL);
+		      vty_out (vty, "      Address families by peer:\n        ");
                       for (safi = SAFI_UNICAST ; safi < SAFI_MAX ; safi++)
                         if (CHECK_FLAG (p->af_cap[AFI_IP][safi], PEER_CAP_ENHE_AF_RCV))
                           vty_out (vty, "           %s%s",
@@ -8564,7 +8561,7 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js
 
 		      vty_out (vty, "      Remote Restart timer is %d seconds%s",
 			       p->v_gr_restart, VTYNL);
-		      vty_out (vty, "      Address families by peer:%s        ", VTYNL);
+		      vty_out (vty, "      Address families by peer:\n        ");
 
 		      for (afi = AFI_IP ; afi < AFI_MAX ; afi++)
 		        for (safi = SAFI_UNICAST ; safi < SAFI_MAX ; safi++)
@@ -8865,7 +8862,7 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js
           if (p->last_reset_cause_size)
             {
               msg = p->last_reset_cause;
-              vty_out(vty, "  Message received that caused BGP to send a NOTIFICATION:%s    ", VTYNL);
+              vty_out(vty, "  Message received that caused BGP to send a NOTIFICATION:\n    ");
               for (i = 1; i <= p->last_reset_cause_size; i++)
                 {
                   vty_out(vty, "%02X", *msg++);
@@ -8874,7 +8871,7 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js
                     {
                       if (i % 16 == 0)
                         {
-                          vty_out(vty, "%s    ", VTYNL);
+                          vty_out(vty, "\n    ");
                         }
                       else if (i % 4 == 0)
                         {
@@ -9185,8 +9182,7 @@ bgp_show_all_instances_neighbors_vty (struct vty *vty, u_char use_json)
         }
       else
         {
-          vty_out (vty, "%sInstance %s:%s",
-                   VTYNL,
+          vty_out (vty, "\nInstance %s:%s",
                    (bgp->inst_type == BGP_INSTANCE_TYPE_DEFAULT)
                    ? "Default" : bgp->name,
                    VTYNL);
@@ -9403,8 +9399,7 @@ bgp_show_all_instances_updgrps_vty (struct vty *vty, afi_t afi, safi_t safi)
 
   for (ALL_LIST_ELEMENTS (bm->bgp, node, nnode, bgp))
     {
-      vty_out (vty, "%sInstance %s:%s",
-               VTYNL,
+      vty_out (vty, "\nInstance %s:%s",
                (bgp->inst_type == BGP_INSTANCE_TYPE_DEFAULT) ? "Default" : bgp->name,
                VTYNL);
       update_group_show(bgp, afi, safi, vty, 0);
@@ -9789,14 +9784,11 @@ bgp_show_one_peer_group (struct vty *vty, struct peer_group *group)
 
   if (conf->as_type == AS_SPECIFIED ||
       conf->as_type == AS_EXTERNAL) {
-  vty_out (vty, "%sBGP peer-group %s, remote AS %d%s",
-           VTYNL, group->name, conf->as, VTYNL);
+  vty_out (vty, "\nBGP peer-group %s, remote AS %d%s", group->name, conf->as, VTYNL);
   } else if (conf->as_type == AS_INTERNAL) {
-    vty_out (vty, "%sBGP peer-group %s, remote AS %d%s",
-	     VTYNL, group->name, group->bgp->as, VTYNL);
+    vty_out (vty, "\nBGP peer-group %s, remote AS %d%s", group->name, group->bgp->as, VTYNL);
   } else {
-    vty_out (vty, "%sBGP peer-group %s%s",
-	     VTYNL, group->name, VTYNL);
+    vty_out (vty, "\nBGP peer-group %s%s", group->name, VTYNL);
   }
 
   if ((group->bgp->as == conf->as) || (conf->as_type == AS_INTERNAL))
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 2dd81d4070..54d4a66ad3 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -7296,7 +7296,7 @@ bgp_config_write_family_header (struct vty *vty, afi_t afi, safi_t safi,
   if (*write)
     return;
 
-  vty_out (vty, " !%s address-family ", VTYNL);
+  vty_out (vty, " !\n address-family ");
 
   if (afi == AFI_IP)
     {
diff --git a/bgpd/rfapi/rfapi.c b/bgpd/rfapi/rfapi.c
index c78045d1e8..6e2f3f2b88 100644
--- a/bgpd/rfapi/rfapi.c
+++ b/bgpd/rfapi/rfapi.c
@@ -3837,8 +3837,7 @@ DEFUN (debug_rfapi_show_import,
               lni = lni_as_ptr;
               if (first_l2)
                 {
-                  vty_out (vty, "%sLNI-based Ethernet Tables:\n",
-                           VTYNL);
+                  vty_out (vty, "\nLNI-based Ethernet Tables:\n");
                   first_l2 = 0;
                 }
               snprintf (buf, BUFSIZ, "L2VPN LNI=%u", lni);
diff --git a/eigrpd/eigrp_dump.c b/eigrpd/eigrp_dump.c
index 7ba234d0ff..70716d1667 100644
--- a/eigrpd/eigrp_dump.c
+++ b/eigrpd/eigrp_dump.c
@@ -210,8 +210,7 @@ void
 show_ip_eigrp_interface_header (struct vty *vty, struct eigrp *eigrp)
 {
 
-  vty_out (vty, "%s%s%d%s%s%s %-10s %-10s %-10s %-6s %-12s %-7s %-14s %-12s %-8s %-8s %-8s%s %-39s %-12s %-7s %-14s %-12s %-8s\n",
-           VTYNL,
+  vty_out (vty, "\n%s%d%s%s%s %-10s %-10s %-10s %-6s %-12s %-7s %-14s %-12s %-8s %-8s %-8s%s %-39s %-12s %-7s %-14s %-12s %-8s\n",
            "EIGRP interfaces for AS(",eigrp->AS,")",VTYNL,VTYNL,
            "Interface", "Bandwidth", "Delay", "Peers", "Xmit Queue", "Mean",
            "Pacing Time", "Multicast", "Pending", "Hello", "Holdtime",
@@ -257,8 +256,7 @@ show_ip_eigrp_interface_detail (struct vty *vty, struct eigrp *eigrp,
 void
 show_ip_eigrp_neighbor_header (struct vty *vty, struct eigrp *eigrp)
 {
-  vty_out (vty, "%s%s%d%s%s%s%-3s %-17s %-20s %-6s %-8s %-6s %-5s %-5s %-5s%s %-41s %-6s %-8s %-6s %-4s %-6s %-5s \n",
-           VTYNL,
+  vty_out (vty, "\n%s%d%s%s%s%-3s %-17s %-20s %-6s %-8s %-6s %-5s %-5s %-5s%s %-41s %-6s %-8s %-6s %-4s %-6s %-5s \n",
            "EIGRP neighbors for AS(",eigrp->AS,")",VTYNL,VTYNL,
            "H", "Address", "Interface", "Hold", "Uptime",
            "SRTT", "RTO", "Q", "Seq", VTYNL
@@ -298,8 +296,7 @@ show_ip_eigrp_topology_header (struct vty *vty, struct eigrp *eigrp)
   struct in_addr router_id;
   router_id.s_addr = eigrp->router_id;
 
-  vty_out (vty, "%sEIGRP Topology Table for AS(%d)/ID(%s)%s\n",
-           VTYNL, eigrp->AS, inet_ntoa(router_id), VTYNL);
+  vty_out (vty, "\nEIGRP Topology Table for AS(%d)/ID(%s)%s\n", eigrp->AS, inet_ntoa(router_id), VTYNL);
   vty_out (vty, "Codes: P - Passive, A - Active, U - Update, Q - Query, "
            "R - Reply%s       r - reply Status, s - sia Status%s\n",
            VTYNL, VTYNL);
diff --git a/isisd/isis_te.c b/isisd/isis_te.c
index 47377bd7ae..e26bb6e46b 100644
--- a/isisd/isis_te.c
+++ b/isisd/isis_te.c
@@ -968,7 +968,7 @@ show_vty_unknown_tlv (struct vty *vty, struct subtlv_header *tlvh)
               vty_out (vty, " %#.2x", v[i]);
               if (rtn == 8)
                 {
-                  vty_out (vty, "%s             [%.2x]", VTYNL, i + 1);
+                  vty_out (vty, "\n             [%.2x]", i + 1);
                   rtn = 1;
                 }
               else
@@ -1299,7 +1299,7 @@ show_mpls_te_sub (struct vty *vty, struct interface *ifp)
       show_vty_subtlv_res_bw (vty, &mtc->res_bw);
       show_vty_subtlv_ava_bw (vty, &mtc->ava_bw);
       show_vty_subtlv_use_bw (vty, &mtc->use_bw);
-      vty_out (vty, "---------------%s\n", VTYNL);
+      vty_out (vty, "---------------\n\n");
     }
   else
     {
diff --git a/ldpd/ldp_vty_exec.c b/ldpd/ldp_vty_exec.c
index 476b9b1735..ed87e21387 100644
--- a/ldpd/ldp_vty_exec.c
+++ b/ldpd/ldp_vty_exec.c
@@ -211,7 +211,7 @@ show_discovery_msg(struct vty *vty, struct imsg *imsg,
 
 			vty_out(vty, "%-8s %-15s ", "Targeted", addr);
 			if (strlen(addr) > 15)
-				vty_out(vty, "%s%46s", VTYNL, " ");
+				vty_out(vty, "\n%46s", " ");
 			break;
 		}
 		vty_out (vty, "%9u\n", adj->holdtime);
@@ -511,7 +511,7 @@ show_nbr_msg(struct vty *vty, struct imsg *imsg, struct show_params *params)
 		    af_name(nbr->af), inet_ntoa(nbr->id),
 		    nbr_state_name(nbr->nbr_state), addr);
 		if (strlen(addr) > 15)
-			vty_out(vty, "%s%48s", VTYNL, " ");
+			vty_out(vty, "\n%48s", " ");
 		vty_out (vty, " %8s\n", log_time(nbr->uptime));
 		break;
 	case IMSG_CTL_END:
@@ -1021,7 +1021,7 @@ show_lib_msg(struct vty *vty, struct imsg *imsg, struct show_params *params)
 
 		vty_out(vty, "%-4s %-20s", af_name(rt->af), dstnet);
 		if (strlen(dstnet) > 20)
-			vty_out(vty, "%s%25s", VTYNL, " ");
+			vty_out(vty, "\n%25s", " ");
 		vty_out (vty, " %-15s %-11s %-13s %6s\n", inet_ntoa(rt->nexthop),
 		    log_label(rt->local_label), log_label(rt->remote_label),
 		    rt->in_use ? "yes" : "no");
diff --git a/lib/command.c b/lib/command.c
index ad197468a5..c9fbaf47be 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -1349,7 +1349,7 @@ DEFUN (show_version,
   vty_out (vty, "%s %s (%s).\n", FRR_FULL_NAME, FRR_VERSION,
 	   host.name ? host.name : "");
   vty_out (vty, "%s%s\n", FRR_COPYRIGHT, GIT_INFO);
-  vty_out (vty, "configured with:%s    %s\n", VTYNL,
+  vty_out (vty, "configured with:\n    %s\n",
            FRR_CONFIG_ARGS);
 
   return CMD_SUCCESS;
@@ -1374,20 +1374,18 @@ DEFUN (config_help,
        "Description of the interactive help system\n")
 {
   vty_out (vty,
-           "Quagga VTY provides advanced help feature.  When you need help,%s\
-anytime at the command line please press '?'.%s\
-%s\
-If nothing matches, the help list will be empty and you must backup%s\
- until entering a '?' shows the available options.%s\
-Two styles of help are provided:%s\
-1. Full help is available when you are ready to enter a%s\
-command argument (e.g. 'show ?') and describes each possible%s\
-argument.%s\
-2. Partial help is provided when an abbreviated argument is entered%s\
-   and you want to know what arguments match the input%s\
-   (e.g. 'show me?'.)%s\n", VTYNL, VTYNL, VTYNL,
-           VTYNL, VTYNL, VTYNL, VTYNL, VTYNL,
-           VTYNL, VTYNL, VTYNL, VTYNL);
+           "Quagga VTY provides advanced help feature.  When you need help,\n\
+anytime at the command line please press '?'.\n\
+\n\
+If nothing matches, the help list will be empty and you must backup\n\
+ until entering a '?' shows the available options.\n\
+Two styles of help are provided:\n\
+1. Full help is available when you are ready to enter a\n\
+command argument (e.g. 'show ?') and describes each possible\n\
+argument.\n\
+2. Partial help is provided when an abbreviated argument is entered\n\
+   and you want to know what arguments match the input\n\
+   (e.g. 'show me?'.)\n\n");
   return CMD_SUCCESS;
 }
 
@@ -1488,7 +1486,7 @@ vty_write_config (struct vty *vty)
 
   if (vty->type == VTY_TERM)
     {
-      vty_out (vty, "%sCurrent configuration:\n",VTYNL);
+      vty_out (vty, "\nCurrent configuration:\n");
       vty_out (vty, "!\n");
     }
 
diff --git a/lib/if.c b/lib/if.c
index e6a957a958..18da3f2f37 100644
--- a/lib/if.c
+++ b/lib/if.c
@@ -818,7 +818,7 @@ DEFUN (show_address_vrf_all,
       if (!vrf->iflist || !listcount (vrf->iflist))
         continue;
 
-      vty_out (vty, "%sVRF %u%s%s", VTYNL, vrf->vrf_id, VTYNL,
+      vty_out (vty, "\nVRF %u%s%s", vrf->vrf_id, VTYNL,
 	       VTYNL);
 
       for (ALL_LIST_ELEMENTS_RO (vrf->iflist, node, ifp))
diff --git a/lib/routemap.c b/lib/routemap.c
index 6e483234a6..5e5f804bf0 100644
--- a/lib/routemap.c
+++ b/lib/routemap.c
@@ -1003,7 +1003,7 @@ vty_show_route_map_entry (struct vty *vty, struct route_map *map)
 
       /* Description */
       if (index->description)
-	vty_out (vty, "  Description:%s    %s\n", VTYNL,
+	vty_out (vty, "  Description:\n    %s\n",
 		 index->description);
       
       /* Match clauses */
diff --git a/lib/vty.c b/lib/vty.c
index db0fbdd6d4..fea1842bf7 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -1759,8 +1759,7 @@ vty_create (int vty_sock, union sockunion *su)
   /* Say hello to the world. */
   vty_hello (vty);
   if (! no_password_check)
-    vty_out (vty, "%sUser Access Verification%s\n", VTYNL,
-               VTYNL);
+    vty_out (vty, "\nUser Access Verification\n\n");
 
   /* Setting up terminal. */
   vty_will_echo (vty);
@@ -2320,7 +2319,7 @@ vty_timeout (struct thread *thread)
 
   /* Clear buffer*/
   buffer_reset (vty->obuf);
-  vty_out (vty, "%sVty connection is timed out.\n", VTYNL);
+  vty_out (vty, "\nVty connection is timed out.\n");
 
   /* Close connection. */
   vty->status = VTY_CLOSE;
diff --git a/nhrpd/nhrp_vty.c b/nhrpd/nhrp_vty.c
index a11d109f39..01300cb5cb 100644
--- a/nhrpd/nhrp_vty.c
+++ b/nhrpd/nhrp_vty.c
@@ -731,7 +731,7 @@ DEFUN(show_ip_nhrp, show_ip_nhrp_cmd,
 	} else if (argv[3]->text[0] == 's') {
 		nhrp_shortcut_foreach(ctx.afi, show_ip_nhrp_shortcut, &ctx);
 	} else {
-		vty_out (vty, "Status: ok%s\n", VTYNL);
+		vty_out (vty, "Status: ok\n\n");
 		ctx.count++;
 		for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), node, ifp))
 			nhrp_cache_foreach(ifp, show_ip_opennhrp_cache, &ctx);
diff --git a/ospf6d/ospf6_lsa.c b/ospf6d/ospf6_lsa.c
index 90ba0dc74f..3f6263563d 100644
--- a/ospf6d/ospf6_lsa.c
+++ b/ospf6d/ospf6_lsa.c
@@ -58,7 +58,7 @@ ospf6_unknown_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
   for (current = start; current < end; current ++)
     {
       if ((current - start) % 16 == 0)
-        vty_out (vty, "%s        ", VTYNL);
+        vty_out (vty, "\n        ");
       else if ((current - start) % 4 == 0)
         vty_out (vty, " ");
 
@@ -66,7 +66,7 @@ ospf6_unknown_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
       vty_out (vty, "%s", byte);
     }
 
-  vty_out (vty, "%s%s", VTYNL, VTYNL);
+  vty_out (vty, "\n\n");
   return 0;
 }
 
@@ -451,7 +451,7 @@ ospf6_lsa_show_dump (struct vty *vty, struct ospf6_lsa *lsa)
   for (current = start; current < end; current ++)
     {
       if ((current - start) % 16 == 0)
-        vty_out (vty, "%s        ", VTYNL);
+        vty_out (vty, "\n        ");
       else if ((current - start) % 4 == 0)
         vty_out (vty, " ");
 
@@ -459,7 +459,7 @@ ospf6_lsa_show_dump (struct vty *vty, struct ospf6_lsa *lsa)
       vty_out (vty, "%s", byte);
     }
 
-  vty_out (vty, "%s%s", VTYNL, VTYNL);
+  vty_out (vty, "\n\n");
   return;
 }
 
diff --git a/ospf6d/ospf6d.c b/ospf6d/ospf6d.c
index a7153893c0..bee7828a9a 100644
--- a/ospf6d/ospf6d.c
+++ b/ospf6d/ospf6d.c
@@ -1157,8 +1157,7 @@ DEFUN (show_ipv6_ospf6_linkstate,
 
   for (ALL_LIST_ELEMENTS_RO (ospf6->area_list, node, oa))
     {
-      vty_out (vty, "%s        SPF Result in Area %s%s%s",
-               VTYNL, oa->name, VTYNL, VTYNL);
+      vty_out (vty, "\n        SPF Result in Area %s%s%s", oa->name, VTYNL, VTYNL);
       ospf6_linkstate_table_show (vty, idx_ipv4, argc, argv, oa->spf_table);
     }
 
@@ -1185,8 +1184,7 @@ DEFUN (show_ipv6_ospf6_linkstate_detail,
 
   for (ALL_LIST_ELEMENTS_RO (ospf6->area_list, node, oa))
     {
-      vty_out (vty, "%s        SPF Result in Area %s%s%s",
-               VTYNL, oa->name, VTYNL, VTYNL);
+      vty_out (vty, "\n        SPF Result in Area %s%s%s", oa->name, VTYNL, VTYNL);
       ospf6_linkstate_table_show (vty, idx_detail, argc, argv, oa->spf_table);
     }
 
diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c
index 61b4a2ff14..8707960aef 100644
--- a/ospfd/ospf_dump.c
+++ b/ospfd/ospf_dump.c
@@ -1568,7 +1568,7 @@ show_debugging_ospf_common (struct vty *vty, struct ospf *ospf)
   int i;
 
   if (ospf->instance)
-    vty_out (vty, "%sOSPF Instance: %d%s\n", VTYNL, ospf->instance,
+    vty_out (vty, "\nOSPF Instance: %d%s\n", ospf->instance,
              VTYNL);
 
   vty_out (vty, "OSPF debugging status:\n");
diff --git a/ospfd/ospf_te.c b/ospfd/ospf_te.c
index 5739578f55..c34d97ff29 100644
--- a/ospfd/ospf_te.c
+++ b/ospfd/ospf_te.c
@@ -2585,7 +2585,7 @@ show_mpls_te_link_sub (struct vty *vty, struct interface *ifp)
         show_vty_link_subtlv_ava_bw (vty, &lp->ava_bw.header);
       if (TLV_TYPE(lp->use_bw) != 0)
         show_vty_link_subtlv_use_bw (vty, &lp->use_bw.header);
-      vty_out (vty, "---------------%s\n", VTYNL);
+      vty_out (vty, "---------------\n\n");
     }
   else
     {
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 60fb352b97..e0cbc842ec 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -806,8 +806,7 @@ ospf_find_vl_data (struct ospf *ospf, struct ospf_vl_config_data *vl_config)
   if (area_id.s_addr == OSPF_AREA_BACKBONE)
     {
       vty_out (vty, 
-	       "Configuring VLs over the backbone is not allowed%s",
-               VTYNL);
+	       "Configuring VLs over the backbone is not allowed\n");
       return NULL;
     }
   area = ospf_area_get (ospf, area_id);
@@ -2748,7 +2747,7 @@ show_ip_ospf_area (struct vty *vty, struct ospf_area *area, json_object *json_ar
         }
       else
         {
-          vty_out (vty, "   It is an NSSA configuration. %s   Elected NSSA/ABR performs type-7/type-5 LSA translation. %s", VTYNL, VTYNL);
+          vty_out (vty, "   It is an NSSA configuration. \n   Elected NSSA/ABR performs type-7/type-5 LSA translation. \n");
           if (! IS_OSPF_ABR (area->ospf))
             vty_out (vty, "   It is not ABR, therefore not Translator. \n");
           else if (area->NSSATranslatorState)
@@ -2918,7 +2917,7 @@ show_ip_ospf_common (struct vty *vty, struct ospf *ospf, u_char use_json)
         }
       else
         {
-          vty_out (vty, "%sOSPF Instance: %d%s%s", VTYNL, ospf->instance,
+          vty_out (vty, "\nOSPF Instance: %d%s%s", ospf->instance,
                    VTYNL, VTYNL);
         }
     }
@@ -3517,7 +3516,7 @@ show_ip_ospf_interface_common (struct vty *vty, struct ospf *ospf, int argc,
       if (use_json)
         json_object_int_add(json, "ospfInstance", ospf->instance);
       else
-        vty_out (vty, "%sOSPF Instance: %d%s%s", VTYNL, ospf->instance,
+        vty_out (vty, "\nOSPF Instance: %d%s%s", ospf->instance,
                  VTYNL, VTYNL);
     }
 
@@ -3622,8 +3621,7 @@ DEFUN (show_ip_ospf_instance_interface,
 static void
 show_ip_ospf_neighbour_header (struct vty *vty)
 {
-  vty_out (vty, "%s%-15s %3s %-15s %9s %-15s %-20s %5s %5s %5s%s",
-           VTYNL,
+  vty_out (vty, "\n%-15s %3s %-15s %9s %-15s %-20s %5s %5s %5s%s",
            "Neighbor ID", "Pri", "State", "Dead Time",
            "Address", "Interface", "RXmtL", "RqstL", "DBsmL",
            VTYNL);
@@ -3715,7 +3713,7 @@ show_ip_ospf_neighbor_common (struct vty *vty, struct ospf *ospf, u_char use_jso
       if (use_json)
         json_object_int_add(json, "ospfInstance", ospf->instance);
       else
-        vty_out (vty, "%sOSPF Instance: %d%s%s", VTYNL, ospf->instance,
+        vty_out (vty, "\nOSPF Instance: %d%s%s", ospf->instance,
                  VTYNL, VTYNL);
     }
 
@@ -3795,7 +3793,7 @@ show_ip_ospf_neighbor_all_common (struct vty *vty, struct ospf *ospf, u_char use
       if (use_json)
         json_object_int_add(json, "ospfInstance", ospf->instance);
       else
-        vty_out (vty, "%sOSPF Instance: %d%s%s", VTYNL, ospf->instance,
+        vty_out (vty, "\nOSPF Instance: %d%s%s", ospf->instance,
                  VTYNL, VTYNL);
     }
 
@@ -3905,7 +3903,7 @@ show_ip_ospf_neighbor_int_common (struct vty *vty, struct ospf *ospf, int arg_ba
       if (use_json)
         json_object_int_add(json, "ospfInstance", ospf->instance);
       else
-        vty_out (vty, "%sOSPF Instance: %d%s%s", VTYNL, ospf->instance,
+        vty_out (vty, "\nOSPF Instance: %d%s%s", ospf->instance,
                  VTYNL, VTYNL);
     }
 
@@ -4280,7 +4278,7 @@ show_ip_ospf_neighbor_id_common (struct vty *vty, struct ospf *ospf,
       if (use_json)
         json_object_int_add(json, "ospfInstance", ospf->instance);
       else
-        vty_out (vty, "%sOSPF Instance: %d%s%s", VTYNL, ospf->instance,
+        vty_out (vty, "\nOSPF Instance: %d%s%s", ospf->instance,
                  VTYNL, VTYNL);
     }
 
@@ -4368,7 +4366,7 @@ show_ip_ospf_neighbor_detail_common (struct vty *vty, struct ospf *ospf, u_char
       if (use_json)
         json_object_int_add(json, "ospfInstance", ospf->instance);
       else
-        vty_out (vty, "%sOSPF Instance: %d%s%s", VTYNL, ospf->instance,
+        vty_out (vty, "\nOSPF Instance: %d%s%s", ospf->instance,
                  VTYNL, VTYNL);
     }
 
@@ -4460,7 +4458,7 @@ show_ip_ospf_neighbor_detail_all_common (struct vty *vty, struct ospf *ospf, u_c
       if (use_json)
         json_object_int_add(json, "ospfInstance", ospf->instance);
       else
-        vty_out (vty, "%sOSPF Instance: %d%s%s", VTYNL, ospf->instance,
+        vty_out (vty, "\nOSPF Instance: %d%s%s", ospf->instance,
                  VTYNL, VTYNL);
     }
 
@@ -4563,7 +4561,7 @@ show_ip_ospf_neighbor_int_detail_common (struct vty *vty, struct ospf *ospf,
       if (use_json)
         json_object_int_add(json, "ospfInstance", ospf->instance);
       else
-        vty_out (vty, "%sOSPF Instance: %d%s%s", VTYNL, ospf->instance,
+        vty_out (vty, "\nOSPF Instance: %d%s%s", ospf->instance,
                  VTYNL, VTYNL);
     }
 
@@ -5099,8 +5097,7 @@ show_lsa_detail (struct vty *vty, struct ospf *ospf, int type,
     default:
       for (ALL_LIST_ELEMENTS_RO (ospf->areas, node, area))
         {
-          vty_out (vty, "%s                %s (Area %s)%s%s",
-                   VTYNL, show_database_desc[type],
+          vty_out (vty, "\n                %s (Area %s)%s%s", show_database_desc[type],
                    ospf_area_desc_string (area), VTYNL, VTYNL);
           show_lsa_detail_proc (vty, AREA_LSDB (area, type), id, adv_router);
         }
@@ -5147,8 +5144,7 @@ show_lsa_detail_adv_router (struct vty *vty, struct ospf *ospf, int type,
     default:
       for (ALL_LIST_ELEMENTS_RO (ospf->areas, node, area))
         {
-          vty_out (vty, "%s                %s (Area %s)%s%s",
-                   VTYNL, show_database_desc[type],
+          vty_out (vty, "\n                %s (Area %s)%s%s", show_database_desc[type],
                    ospf_area_desc_string (area), VTYNL, VTYNL);
           show_lsa_detail_adv_router_proc (vty, AREA_LSDB (area, type),
                                            adv_router);
@@ -5229,8 +5225,7 @@ show_ip_ospf_database_maxage (struct vty *vty, struct ospf *ospf)
 {
   struct route_node *rn;
 
-  vty_out (vty, "%s                MaxAge Link States:%s%s",
-           VTYNL, VTYNL, VTYNL);
+  vty_out (vty, "\n                MaxAge Link States:\n\n");
 
   for (rn = route_top (ospf->maxage_lsa); rn; rn = route_next (rn))
     {
@@ -5277,10 +5272,10 @@ show_ip_ospf_database_common (struct vty *vty, struct ospf *ospf,
   struct in_addr id, adv_router;
 
   if (ospf->instance)
-    vty_out (vty, "%sOSPF Instance: %d%s", VTYNL, ospf->instance,
+    vty_out (vty, "\nOSPF Instance: %d%s", ospf->instance,
              VTYNL);
 
-  vty_out (vty, "%s       OSPF Router with ID (%s)%s%s", VTYNL,
+  vty_out (vty, "\n       OSPF Router with ID (%s)%s%s",
            inet_ntoa (ospf->router_id), VTYNL, VTYNL);
 
   /* Show all LSA. */
@@ -5436,10 +5431,10 @@ show_ip_ospf_database_type_adv_router_common (struct vty *vty, struct ospf *ospf
   struct in_addr adv_router;
 
   if (ospf->instance)
-    vty_out (vty, "%sOSPF Instance: %d%s", VTYNL, ospf->instance,
+    vty_out (vty, "\nOSPF Instance: %d%s", ospf->instance,
              VTYNL);
 
-  vty_out (vty, "%s       OSPF Router with ID (%s)%s%s", VTYNL,
+  vty_out (vty, "\n       OSPF Router with ID (%s)%s%s",
            inet_ntoa (ospf->router_id), VTYNL, VTYNL);
 
   /* Set database type to show. */
@@ -6952,8 +6947,7 @@ DEFUN (ip_ospf_area,
   if (OSPF_IF_PARAM_CONFIGURED(params, if_area))
     {
       vty_out (vty,
-               "Must remove previous area config before changing ospf area %s",
-               VTYNL);
+               "Must remove previous area config before changing ospf area \n");
       return CMD_WARNING;
     }
 
@@ -7982,7 +7976,7 @@ static int
 show_ip_ospf_border_routers_common (struct vty *vty, struct ospf *ospf)
 {
   if (ospf->instance)
-    vty_out (vty, "%sOSPF Instance: %d%s%s", VTYNL, ospf->instance,
+    vty_out (vty, "\nOSPF Instance: %d%s%s", ospf->instance,
              VTYNL, VTYNL);
 
   if (ospf->new_table == NULL)
@@ -8042,7 +8036,7 @@ static int
 show_ip_ospf_route_common (struct vty *vty, struct ospf *ospf)
 {
   if (ospf->instance)
-    vty_out (vty, "%sOSPF Instance: %d%s%s", VTYNL, ospf->instance,
+    vty_out (vty, "\nOSPF Instance: %d%s%s", ospf->instance,
              VTYNL, VTYNL);
 
   if (ospf->new_table == NULL)
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index a69e617b44..4bc367e408 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -1572,8 +1572,7 @@ pim_show_state(struct vty *vty, const char *src_or_group, const char *group, u_c
     json = json_object_new_object();
   } else {
     vty_out(vty, "Codes: J -> Pim Join, I -> IGMP Report, S -> Source, * -> Inherited from (*,G)");
-    vty_out (vty, "%sInstalled Source           Group            IIF      OIL\n",
-              VTYNL);
+    vty_out (vty, "\nInstalled Source           Group            IIF      OIL\n");
   }
 
   for (ALL_LIST_ELEMENTS_RO(pim_channel_oil_list, node, c_oil)) {
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index 02606b88a9..fe84e7ecb1 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -2529,7 +2529,7 @@ DEFUN (vtysh_write_terminal,
     fp = stdout;
 
   vty_out (vty, "Building configuration...\n");
-  vty_out (vty, "%sCurrent configuration:\n",VTYNL);
+  vty_out (vty, "\nCurrent configuration:\n");
   vty_out (vty, "!\n");
 
   for (i = 0; i < array_size(vtysh_client); i++)
diff --git a/zebra/interface.c b/zebra/interface.c
index 550f6fc247..171dcf69c6 100644
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -1077,7 +1077,7 @@ if_dump_vty (struct vty *vty, struct interface *ifp)
 	   ifp->ifindex, ifp->metric, ifp->mtu, ifp->speed);
   if (ifp->mtu6 != ifp->mtu)
     vty_out (vty, "mtu6 %d ", ifp->mtu6);
-  vty_out (vty, "%s  flags: %s\n", VTYNL,
+  vty_out (vty, "\n  flags: %s\n",
            if_flag_dump(ifp->flags));
   
   /* Hardware address. */
@@ -1458,7 +1458,7 @@ DEFUN (show_interface_desc_vrf_all,
   RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name)
     if (!list_isempty (vrf->iflist))
       {
-        vty_out (vty, "%s\tVRF %u%s\n", VTYNL, vrf->vrf_id,
+        vty_out (vty, "\n\tVRF %u%s\n", vrf->vrf_id,
 		 VTYNL);
         if_show_description (vty, vrf->vrf_id);
       }
diff --git a/zebra/zebra_fpm.c b/zebra/zebra_fpm.c
index b765b51b93..a6d022dd59 100644
--- a/zebra/zebra_fpm.c
+++ b/zebra/zebra_fpm.c
@@ -1451,7 +1451,7 @@ zfpm_show_stats (struct vty *vty)
   zfpm_stats_t total_stats;
   time_t elapsed;
 
-  vty_out (vty, "%s%-40s %10s     Last %2d secs%s\n", VTYNL, "Counter",
+  vty_out (vty, "\n%-40s %10s     Last %2d secs%s\n", "Counter",
 	   "Total", ZFPM_STATS_IVL_SECS, VTYNL);
 
   /*
@@ -1490,7 +1490,7 @@ zfpm_show_stats (struct vty *vty)
 
   elapsed = zfpm_get_elapsed_time (zfpm_g->last_stats_clear_time);
 
-  vty_out (vty, "%sStats were cleared %lu seconds ago\n", VTYNL,
+  vty_out (vty, "\nStats were cleared %lu seconds ago\n",
 	   (unsigned long)elapsed);
 }
 
diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index 0dad125d14..6e4c1b1850 100644
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -1183,7 +1183,7 @@ do_show_ip_route (struct vty *vty, const char *vrf_name, afi_t afi, safi_t safi,
                     vty_out (vty, SHOW_ROUTE_V6_HEADER);
 
                   if (zvrf_id (zvrf) != VRF_DEFAULT)
-                    vty_out (vty, "%sVRF %s:\n", VTYNL,
+                    vty_out (vty, "\nVRF %s:\n",
                                zvrf_name(zvrf));
 
                   first = 0;
@@ -1244,7 +1244,7 @@ DEFUN (show_ip_nht_vrf_all,
   RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name)
     if ((zvrf = vrf->info) != NULL)
       {
-        vty_out (vty, "%sVRF %s:\n", VTYNL, zvrf_name(zvrf));
+        vty_out (vty, "\nVRF %s:\n", zvrf_name(zvrf));
         zebra_print_rnh_table(zvrf_id (zvrf), AF_INET, vty, RNH_NEXTHOP_TYPE);
       }
 
@@ -1284,7 +1284,7 @@ DEFUN (show_ipv6_nht_vrf_all,
   RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name)
     if ((zvrf = vrf->info) != NULL)
       {
-        vty_out (vty, "%sVRF %s:\n", VTYNL, zvrf_name(zvrf));
+        vty_out (vty, "\nVRF %s:\n", zvrf_name(zvrf));
         zebra_print_rnh_table(zvrf_id (zvrf), AF_INET6, vty, RNH_NEXTHOP_TYPE);
       }