From nobody Wed May 17 10:05:33 2023 X-Original-To: dev-commits-src-branches@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 4QLpdT3VKrz49vx1; Wed, 17 May 2023 10:05:33 +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 4QLpdT2TQkz43k1; Wed, 17 May 2023 10:05:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684317933; 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=itCZBwY/Nt7FfkhumvlQsO85CEW+tF8vrtHfohqq9aA=; b=HsEAPOGrO07BZz9CKkIP+pRsnsRCBtpzuNQncT6CHcR+rhLfTitBD0DH4x/ZbqC/TQfGGF BtJFYRb8/173xCETfjMMobwpee5c4mSMtZ4JrG8W+INgejOU20ifEEnRDm/uUBtnKw7Bj3 m3QmpuMao04C/XWwTGml1MZQ83Ogjry/i21tvjZ/+8Qb1KbEKmrEOZ6NiYKicixdGWfy5R YgQNO+nbrpMxzva366MCwo5Qp74OYhotXzihXi/qR3aGvu9SLZWUM6g+8Jkpxrx6vp2mNK dZSgxjtQQJ20l3nIWoFAAYamxkbNzZYWhQUS1875uj0lQZOvpVvTNnOWCKsY5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684317933; 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=itCZBwY/Nt7FfkhumvlQsO85CEW+tF8vrtHfohqq9aA=; b=Wdc2GKNEoa4ceSmMW27Q7ZvBwXOjlP1DxEoJpbGAk8pZIBWmWhHeOYmghWn25XSZmgVLpl o9gDuBs58nm9z+Q+KLA0fR9zMBI5TdIX+xv0JcGLHboS4bc1l1GL2uMw1M3LxS4zUCWzdM Zn37d5dL9BmOadNhx5S7IHxDh9AgupxYmmy/3LQGW8lFYS4Q4TxJeUaS8JAC3SeUmthnTN AHbgf1QajRyDmDcRqXWtAn7b28i0uuebao0mVErF/bbcgEd5Q7p4shm67ofGUUFXMEWFQ4 2quvKH3llHOhrgZHjEGx4AB8WPWllI6OtY66W8gLGR3ATA7wWEJuJsoI/8QRog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684317933; a=rsa-sha256; cv=none; b=m2vMwhk98zMCM9fJrclAzJnUzpxzTrvC0Bu+B5lZFXtbTtXxyx4lMHcAhAK0rTYHFN0yyx nutJ8wFYZ9q8s4sas+wcqxxmD1SXjVPaJDAWVgFJdQs0+ARXyTkzELFtUqpfd0Pkf/wATt 3ho1m7CZWNtoYZHOegi3lSnW0Sggr2+/uj6w1YuKdQmqPN33XrD6TIb3WROA4QDXN3KNhX AThVAed1A/X/AhdR+77Qi+nYRf3lc0qB+w35eA4BRvCSFIZxTtrpHQT7MtbaqcmCSFHU7M 9xPUvWToWMwlmSswBeTqhGFWPJNBZnVRKoerD6iPFlcXq3ZUs+egZzTYkUuFFw== 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 4QLpdT1ZMMz10Sx; Wed, 17 May 2023 10:05:33 +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 34HA5Xc4056931; Wed, 17 May 2023 10:05:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34HA5Xs1056930; Wed, 17 May 2023 10:05:33 GMT (envelope-from git) Date: Wed, 17 May 2023 10:05:33 GMT Message-Id: <202305171005.34HA5Xs1056930@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: c0612a203c92 - stable/12 - elf.5: Fix conjugation of holds List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: c0612a203c92604d96cdac256b88d386cbe4bea7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=c0612a203c92604d96cdac256b88d386cbe4bea7 commit c0612a203c92604d96cdac256b88d386cbe4bea7 Author: Zhenlei Huang AuthorDate: 2023-04-25 10:21:52 +0000 Commit: Zhenlei Huang CommitDate: 2023-05-17 10:02:49 +0000 elf.5: Fix conjugation of holds MFC after: 1 week (cherry picked from commit 6f96b5487f4359199ceb8339d2d7063e2249f538) (cherry picked from commit 4d7d39b0f20874cda49771067f92e129840976fc) --- share/man/man5/elf.5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man5/elf.5 b/share/man/man5/elf.5 index df051adbf873..dad4fd79e87a 100644 --- a/share/man/man5/elf.5 +++ b/share/man/man5/elf.5 @@ -1020,7 +1020,7 @@ This section is of type The attribute used is .Sy SHF_ALLOC . .It .rodata1 -This section hold read-only data that typically contributes to a +This section holds read-only data that typically contributes to a non-writable segment in the process image. This section is of type .Sy SHT_PROGBITS .