aboutsummaryrefslogtreecommitdiff
path: root/shared
diff options
context:
space:
mode:
Diffstat (limited to 'shared')
-rw-r--r--shared/authors.adoc6
-rw-r--r--shared/contrib-additional.adoc1
-rw-r--r--shared/contrib-committers.adoc16
-rw-r--r--shared/contrib-develalumni.adoc3
4 files changed, 16 insertions, 10 deletions
diff --git a/shared/authors.adoc b/shared/authors.adoc
index 0e60711fa2..39aea31f6c 100644
--- a/shared/authors.adoc
+++ b/shared/authors.adoc
@@ -2543,6 +2543,10 @@
:nyan-email: nyan@FreeBSD.org
:nyan: {nyan-name} <{nyan-email}>
+:obiwac-name: Aymeric Wibo
+:obiwac-email: obiwac@FreeBSD.org
+:obiwac: {obiwac-name} <{obiwac-email}>
+
:obraun-name: Oliver Braun
:obraun-email: obraun@FreeBSD.org
:obraun: {obraun-name} <{obraun-email}>
@@ -3777,7 +3781,7 @@
:core-secretary-email: core-secretary@FreeBSD.org
// FreeBSD Doc Engineering Team
-:doceng-members: {blackend}, {fernape}, {hrs}, {ebrandi} (lurker)
+:doceng-members: {blackend}, {hrs}, {ebrandi}
:doceng-secretary-email: <doceng-secretary@FreeBSD.org>
// FreeBSD Donations Liaison
diff --git a/shared/contrib-additional.adoc b/shared/contrib-additional.adoc
index e1f2365129..d3346b96bb 100644
--- a/shared/contrib-additional.adoc
+++ b/shared/contrib-additional.adoc
@@ -1990,6 +1990,7 @@
* Sergey V. Dyatko <mailto:sergey.dyatko@gmail.com[sergey.dyatko@gmail.com]>
* Sergey Gershtein <mailto:sg@mplik.ru[sg@mplik.ru]>
* Sergey Glushchenko <mailto:deen@smz.com.ua[deen@smz.com.ua]>
+* Sergey Kiselev <mailto:root@dc365.ru[root@dc365.ru]>
* Sergey Kosyakov <mailto:ks@itp.ac.ru[ks@itp.ac.ru]>
* Sergey Lyubka <mailto:valenok@gmail.com[valenok@gmail.com]>
* Sergey Matveev <mailto:stargrave@stargrave.org[stargrave@stargrave.org]>
diff --git a/shared/contrib-committers.adoc b/shared/contrib-committers.adoc
index 157ee526a1..600b7e95f3 100644
--- a/shared/contrib-committers.adoc
+++ b/shared/contrib-committers.adoc
@@ -11,7 +11,6 @@
* {jwb}
* {badger}
* {dbaio}
-* {timur}
* {jhb}
* {lbartoletti}
* {jbeich}
@@ -114,7 +113,6 @@
* {gibbs}
* {girgen}
* {grembo}
-* {trociny}
* {danilo}
* {sg}
* {grehan}
@@ -143,6 +141,7 @@
* {whu}
* {zlei}
* {jkh}
+* {aokblast}
* {shurd}
* {rhurlin}
* {davide}
@@ -167,6 +166,7 @@
* {jkim}
* {akiyano}
* {jceel}
+* {ronald}
* {kai}
* {corvink}
* {wulf}
@@ -214,7 +214,7 @@
* {dwmalone}
* {nobutaka}
* {amdmi3}
-* {kwm}
+* {christos}
* {emaste}
* {mm}
* {slavash}
@@ -248,6 +248,7 @@
* {gnn}
* {khng}
* {tychon}
+* {bnovkov}
* {obrien}
* {nick}
* {olgeni}
@@ -302,6 +303,7 @@
* {samm}
* {hrs}
* {salvadore}
+* {dsl}
* {rscheff}
* {wosch}
* {cy}
@@ -377,6 +379,7 @@
* {naddy}
* {peter}
* {nwhitehorn}
+* {obiwac}
* {bwidawsk}
* {rew}
* {ivy}
@@ -395,10 +398,5 @@
* {zec}
* {bz}
* {mizhka}
-* {tz}
-* {dsl}
-* {ronald}
-* {christos}
-* {bnovkov}
* {ziaee}
-* {aokblast}
+* {tz}
diff --git a/shared/contrib-develalumni.adoc b/shared/contrib-develalumni.adoc
index 4b98dcb6f0..03aff32e0a 100644
--- a/shared/contrib-develalumni.adoc
+++ b/shared/contrib-develalumni.adoc
@@ -1,3 +1,6 @@
+* {timur} (2007 - 2025)
+* {trociny} (2013 - 2025)
+* {kwm} (2004 - 2025)
* {dmgk} (2019 - 2024)
* {karels} (2016 - 2024)
* {hselasky} (2010 - 2024)