From owner-dev-commits-src-all@freebsd.org Mon May 31 22:14:27 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7631663164B; Mon, 31 May 2021 22:14:27 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fv8hz1Zhqz3KRh; Mon, 31 May 2021 22:14:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1A764180EB; Mon, 31 May 2021 22:14:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14VMEQDV073882; Mon, 31 May 2021 22:14:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14VMEQfb073881; Mon, 31 May 2021 22:14:26 GMT (envelope-from git) Date: Mon, 31 May 2021 22:14:26 GMT Message-Id: <202105312214.14VMEQfb073881@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 8790fe3058c8 - main - Fix confusing example in paste(1) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8790fe3058c83f624ca2155fb0dbaac23c641237 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 May 2021 22:14:27 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8790fe3058c83f624ca2155fb0dbaac23c641237 commit 8790fe3058c83f624ca2155fb0dbaac23c641237 Author: jocki84 AuthorDate: 2018-07-12 17:22:29 +0000 Commit: Warner Losh CommitDate: 2021-05-31 22:12:44 +0000 Fix confusing example in paste(1) Paste's man page contains an example for a reimplementation of nl(1). This example uses the command line sed = myfile | paste -s -d '\t\n' - - in order to concatenate consecutive lines with an intervening tab. However, the way the example uses the switches -s and -d and two `dash` input files is redundant. There are in fact two equivalent but simpler ways to achieve the desired result: sed = myfile | paste -s -d '\t\n' - uses the same style as the previous example, while sed = myfile | paste - - is arguably even simpler and illustrates the final sentence of the DESCRIPTION. Reviewed by: imp@ Pull Request: https://github.com/freebsd/freebsd-src/pull/163 --- usr.bin/paste/paste.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/paste/paste.1 b/usr.bin/paste/paste.1 index 8bd02dd47097..73b10fcd79b7 100644 --- a/usr.bin/paste/paste.1 +++ b/usr.bin/paste/paste.1 @@ -120,7 +120,7 @@ Combine pairs of lines from a file into single lines: Number the lines in a file, similar to .Xr nl 1 : .Pp -.Dl "sed = myfile | paste -s -d '\et\en' - -" +.Dl "sed = myfile | paste - -" .Pp Create a colon-separated list of directories named .Pa bin ,