From e65066989d60ce305c9ad3708306316f08baba08 Mon Sep 17 00:00:00 2001
From: jmc <jmc@openbsd.org>
Date: Sat, 26 Nov 2022 07:26:43 +0000
Subject: [PATCH] - in SYNOPSIS, redo the formatting for "address" and "dest
 address" to avoid an ugly line split on narrower terminals - in usage(),
 match the output

---
 sbin/ifconfig/ifconfig.8 | 9 +++------
 sbin/ifconfig/ifconfig.c | 7 +++----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 678c87c8588..bc885b7446c 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ifconfig.8,v 1.386 2022/11/25 23:09:20 deraadt Exp $
+.\"	$OpenBSD: ifconfig.8,v 1.387 2022/11/26 07:26:43 jmc Exp $
 .\"	$NetBSD: ifconfig.8,v 1.11 1996/01/04 21:27:29 pk Exp $
 .\"     $FreeBSD: ifconfig.8,v 1.16 1998/02/01 07:03:29 steve Exp $
 .\"
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)ifconfig.8	8.4 (Berkeley) 6/1/94
 .\"
-.Dd $Mdocdate: November 25 2022 $
+.Dd $Mdocdate: November 26 2022 $
 .Dt IFCONFIG 8
 .Os
 .Sh NAME
@@ -43,10 +43,7 @@
 .Op Fl M Ar lladdr
 .Op Ar interface
 .Op Ar address_family
-.Oo
-.Ar address
-.Op Ar dest_address
-.Oc
+.Op Ar address Op Ar dest_address
 .Op Ar parameters
 .Sh DESCRIPTION
 The
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 2ba0bc39f16..1f699324839 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ifconfig.c,v 1.458 2022/11/25 23:09:20 deraadt Exp $	*/
+/*	$OpenBSD: ifconfig.c,v 1.459 2022/11/26 07:26:43 jmc Exp $	*/
 /*	$NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $	*/
 
 /*
@@ -6630,9 +6630,8 @@ __dead void
 usage(void)
 {
 	fprintf(stderr,
-	    "usage: ifconfig [-AaC] [-M lladdr] [interface] [address_family] "
-	    "[address [dest_address]]\n"
-	    "\t\t[parameters]\n");
+	    "usage: ifconfig [-AaC] [-M lladdr] [interface] [address_family]\n"
+	    "\t\t[address [dest_address]] [parameters]\n");
 	exit(1);
 }
 
-- 
2.20.1