From owner-dev-commits-doc-all@freebsd.org Sun May 23 15:21:12 2021 Return-Path: Delivered-To: dev-commits-doc-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 39BBC649DA7 for ; Sun, 23 May 2021 15:21:12 +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 4Fp3vr19m7z4Ywd; Sun, 23 May 2021 15:21:12 +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 11C5F19624; Sun, 23 May 2021 15:21:12 +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 14NFLBW5083440; Sun, 23 May 2021 15:21:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14NFLBk5083439; Sun, 23 May 2021 15:21:11 GMT (envelope-from git) Date: Sun, 23 May 2021 15:21:11 GMT Message-Id: <202105231521.14NFLBk5083439@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Ceri Davies Subject: git: 01d3670c18 - main - articles/contributors: Correct an incorrectly merged entry MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ceri X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 01d3670c18632effda4785d8fe57b4da0d4260cb Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 May 2021 15:21:12 -0000 The branch main has been updated by ceri: URL: https://cgit.FreeBSD.org/doc/commit/?id=01d3670c18632effda4785d8fe57b4da0d4260cb commit 01d3670c18632effda4785d8fe57b4da0d4260cb Author: Ceri Davies AuthorDate: 2021-05-23 15:12:57 +0000 Commit: Ceri Davies CommitDate: 2021-05-23 15:12:57 +0000 articles/contributors: Correct an incorrectly merged entry There is a single entry which refers to two individuals and with a syntactically incorrect email address. This was incorrect and causing issues with a PDF build of this article, so split it into two correct entries, using information from our ppp(8) manpage. Approved by: blackend (mentor) --- documentation/content/en/articles/contributors/contrib-additional.adoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/documentation/content/en/articles/contributors/contrib-additional.adoc b/documentation/content/en/articles/contributors/contrib-additional.adoc index 431880211b..5ce5753984 100644 --- a/documentation/content/en/articles/contributors/contrib-additional.adoc +++ b/documentation/content/en/articles/contributors/contrib-additional.adoc @@ -249,6 +249,7 @@ * Ask Bjoern Hansen mailto:ask@valueclick.com[ask@valueclick.com] * Athanasios Douitsis mailto:aduitsis@cpan.org[aduitsis@cpan.org] * Atsushi Furuta mailto:furuta@sra.co.jp[furuta@sra.co.jp] +* Atsushi Murai mailto:amurai@spec.co.jp[amurai@spec.co.jp] * Attila Nagy mailto:bra@fsn.hu[bra@fsn.hu] * Atushi Sakauchi mailto:sakauchi@yamame.to[sakauchi@yamame.to] * Autrijus Tang mailto:autrijus@autrijus.org[autrijus@autrijus.org] @@ -1645,7 +1646,6 @@ * No Name mailto:sumii@is.s.u-tokyo.ac.jp[sumii@is.s.u-tokyo.ac.jp] * No Name mailto:takas-su@is.aist-nara.ac.jp[takas-su@is.aist-nara.ac.jp] * No Name mailto:tjevans@raleigh.ibm.com[tjevans@raleigh.ibm.com] -* No Name mailto:tony-o@iij.ad.jpamurai@spec.co.jp[tony-o@iij.ad.jpamurai@spec.co.jp] * No Name mailto:torii@tcd.hitachi.co.jp[torii@tcd.hitachi.co.jp] * No Name mailto:uenami@imasy.or.jp[uenami@imasy.or.jp] * No Name mailto:vode@hut.fi[vode@hut.fi] @@ -2208,6 +2208,7 @@ * Tony Shadwick mailto:numbski@hksilver.net[numbski@hksilver.net] * Tor Halvard "Squat" Furulund mailto:squat@squat.no[squat@squat.no] * Torbjorn Granlund mailto:tege@matematik.su.se[tege@matematik.su.se] +* Toshiharu Ohno mailto:tony-o@iij.ad.jp[tony-o@iij.ad.jp] * Toshihiko SHIMOKAWA mailto:toshi@tea.forus.or.jp[toshi@tea.forus.or.jp] * Toshihiro Kanda mailto:candy@kgc.co.jp[candy@kgc.co.jp] * Toshiomi Moriki mailto:Toshiomi.Moriki@ma1.seikyou.ne.jp[Toshiomi.Moriki@ma1.seikyou.ne.jp]