git: 01d3670c18 - main - articles/contributors: Correct an incorrectly merged entry

Ceri Davies ceri at FreeBSD.org
Sun May 23 15:21:12 UTC 2021


The branch main has been updated by ceri:

URL: https://cgit.FreeBSD.org/doc/commit/?id=01d3670c18632effda4785d8fe57b4da0d4260cb

commit 01d3670c18632effda4785d8fe57b4da0d4260cb
Author:     Ceri Davies <ceri at FreeBSD.org>
AuthorDate: 2021-05-23 15:12:57 +0000
Commit:     Ceri Davies <ceri at FreeBSD.org>
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 at valueclick.com[ask at valueclick.com]
 * Athanasios Douitsis mailto:aduitsis at cpan.org[aduitsis at cpan.org]
 * Atsushi Furuta mailto:furuta at sra.co.jp[furuta at sra.co.jp]
+* Atsushi Murai mailto:amurai at spec.co.jp[amurai at spec.co.jp]
 * Attila Nagy mailto:bra at fsn.hu[bra at fsn.hu]
 * Atushi Sakauchi mailto:sakauchi at yamame.to[sakauchi at yamame.to]
 * Autrijus Tang mailto:autrijus at autrijus.org[autrijus at autrijus.org]
@@ -1645,7 +1646,6 @@
 * No Name mailto:sumii at is.s.u-tokyo.ac.jp[sumii at is.s.u-tokyo.ac.jp]
 * No Name mailto:takas-su at is.aist-nara.ac.jp[takas-su at is.aist-nara.ac.jp]
 * No Name mailto:tjevans at raleigh.ibm.com[tjevans at raleigh.ibm.com]
-* No Name mailto:tony-o at iij.ad.jpamurai@spec.co.jp[tony-o at iij.ad.jpamurai@spec.co.jp]
 * No Name mailto:torii at tcd.hitachi.co.jp[torii at tcd.hitachi.co.jp]
 * No Name mailto:uenami at imasy.or.jp[uenami at imasy.or.jp]
 * No Name mailto:vode at hut.fi[vode at hut.fi]
@@ -2208,6 +2208,7 @@
 * Tony Shadwick mailto:numbski at hksilver.net[numbski at hksilver.net]
 * Tor Halvard "Squat" Furulund mailto:squat at squat.no[squat at squat.no]
 * Torbjorn Granlund mailto:tege at matematik.su.se[tege at matematik.su.se]
+* Toshiharu Ohno mailto:tony-o at iij.ad.jp[tony-o at iij.ad.jp]
 * Toshihiko SHIMOKAWA mailto:toshi at tea.forus.or.jp[toshi at tea.forus.or.jp]
 * Toshihiro Kanda mailto:candy at kgc.co.jp[candy at kgc.co.jp]
 * Toshiomi Moriki mailto:Toshiomi.Moriki at ma1.seikyou.ne.jp[Toshiomi.Moriki at ma1.seikyou.ne.jp]


More information about the dev-commits-doc-all mailing list