From nobody Wed Aug 5 15:56:00 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hFZl52cXdz6nT5K for ; Wed, 05 Aug 2026 15:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hFZl46Z7zz3Hw2 for ; Wed, 05 Aug 2026 15:56:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785945360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=odI0c03VyFMXVHUhXzkcuIwOzp6oGtLj828b7wAgtyU=; b=I0mOFIQzn1DRK4gZ9J47XXhm8wc2QCCpncjYu5rqmtfOalSDYGepiUQLJqITu2jC/vnQfF 7OFYmbmOIgg6jiOG5CG5tZ1Kn8g9Oc6k4iuVg1/i7wujruC6OLBq7BCdzyH0rrpOxVgyfM 3t/oK6syCYoG96MJjg9AnXjCO/rv6nvX9tVrNEf4yVr1Fwu5JsNn8RANJGm5cHX0BmFoTS vUvUFq3OOw5LpaIUWX/7ejgSHkHLZJtVXdZkkDPjVzK71o2oIjjOlmN2ibsjNW4DOtMsVO WE0Yr8ZwgfDdS/LJTpUkwmuqaWbrwjro5c1sd3hwN96r+Vh4bsGuW0hRXw0SxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785945360; a=rsa-sha256; cv=none; b=RQ5txwGUGMdzbwk51F/LuFXE3dyY9TwhMdVAlCCa3VjhbgSu45anD6QkkCPVP8VLkiuuHR N5s2E2y7myi8tGIZMuQPNnPmEhBWVbQQcef/jQFL+5qNsJqfbywOEcwz9mcfi9pTNyPxVZ ykyAggJKyl8TuOrRy/K6GNb8JUZhaHt1ozi61CADVE4p0hu29tnukos81p+Z9fuAAW6+Ev Mov5IG/PLZKGwycwoZg6Hg6569ShyCYQLj/2VEvNmrW73e+vRHlQjtzm6ogf1Y84kfdOV3 eGKo30dC+f+O9IcBjf3ePapiZ4lSqRrA+ssaOsmvqixu5l3N0EO7u6Q3FDHMtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785945360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=odI0c03VyFMXVHUhXzkcuIwOzp6oGtLj828b7wAgtyU=; b=w2eR1rN8zT8LzoadJwq2q5J7RoqxraD5VPa6ldzkFL5qE/1ASJ9zQ3StFQn7AI/iwCXscq ZnSsnKqR+SM/eXR5DOHmxuLLuSsg7+gLLIsCg5sEDCIpP/Kk7x2859515hfUNVxjNnqPSd kDHBoTulTxiMq8aIY6iL8wg6xgxgVQRAtBMdaYwtoLYnxhhF+Vj3nc2g07k4iQb2hBgnG/ rWtJdDE3pOIRMN5UfRce69LVGbdsFwrFvAv5sK5Mufc64Mem564VL+ExXQbFiXO+uXI84i s5etul+PGmZxSYEZ+18GYMB7Rs7009glbvAH8I/3V3gWqYVG685pcQHD7P+lkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hFZl44y81zhH3 for ; Wed, 05 Aug 2026 15:56:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18efc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 05 Aug 2026 15:56:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 70c87c092c33 - stable/15 - ctfmerge.1: Fix uniqlabel typos List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 70c87c092c33d702643599816db44d53bfed0235 Auto-Submitted: auto-generated Date: Wed, 05 Aug 2026 15:56:00 +0000 Message-Id: <6a735d10.18efc.4232b325@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=70c87c092c33d702643599816db44d53bfed0235 commit 70c87c092c33d702643599816db44d53bfed0235 Author: Alexander Ziaee AuthorDate: 2026-06-30 14:12:03 +0000 Commit: Alexander Ziaee CommitDate: 2026-08-05 15:54:25 +0000 ctfmerge.1: Fix uniqlabel typos The flag is -D, but it was written as a second -d. Add a period too. MFC after: 3 days (cherry picked from commit 4f293e32e4529617dd05bd64fd3c22a57a56a355) --- cddl/usr.bin/ctfmerge/ctfmerge.1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cddl/usr.bin/ctfmerge/ctfmerge.1 b/cddl/usr.bin/ctfmerge/ctfmerge.1 index 1e371e62c9c5..fecbedb6e467 100644 --- a/cddl/usr.bin/ctfmerge/ctfmerge.1 +++ b/cddl/usr.bin/ctfmerge/ctfmerge.1 @@ -92,9 +92,9 @@ to store the merged CTF data. .It Fl d Ar uniqfile Uniquify against .Ar uniqfile . -.It Fl d Ar uniqlabel +.It Fl D Ar uniqlabel Uniquify against label -.Ar uniqlabel +.Ar uniqlabel . .It Fl w Ar withfile Additive merge with .Ar withfile .