aboutsummaryrefslogtreecommitdiff
path: root/shared
diff options
context:
space:
mode:
Diffstat (limited to 'shared')
-rw-r--r--shared/authors.adoc12
-rw-r--r--shared/contrib-additional.adoc2
-rw-r--r--shared/contrib-committers.adoc15
-rw-r--r--shared/contrib-develalumni.adoc1
4 files changed, 21 insertions, 9 deletions
diff --git a/shared/authors.adoc b/shared/authors.adoc
index 5745dee38d..71528c877b 100644
--- a/shared/authors.adoc
+++ b/shared/authors.adoc
@@ -143,6 +143,10 @@
:alonso-email: alonso@FreeBSD.org
:alonso: {alonso-name} <{alonso-email}>
+:alven-name: Älven
+:alven-email: alven@FreeBSD.org
+:alven: {alven-name} <{alven-email}>
+
:am-name: Atul Mukker
:am-email: am@FreeBSD.org
:am: {am-name} <{am-email}>
@@ -2543,6 +2547,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}>
@@ -3794,8 +3802,8 @@
// FreeBSD Release Engineering Teams
:re: re@FreeBSD.org
-:re-members: {kib}, {dch}, {blackend}, {jhixson}, {delphij}, {emaste}, {mmokhi}, {cperciva}, {dfr}, {bofh}
-:re-members-email: {kib-email}, {dch-email}, {blackend-email}, {jhixson-email}, {delphij-email}, {emaste-email}, {mmokhi-email}, {cperciva-email}, {dfr-email}, {bofh-email}
+:re-members: {dch}, {blackend}, {jfree}, {delphij}, {emaste}, {mmokhi}, {cperciva}, {bofh}
+:re-members-email: {dch-email}, {blackend-email}, {jfree-email}, {delphij-email}, {emaste-email}, {mmokhi-email}, {cperciva-email}, {bofh-email}
// FreeBSD Security Officer
:so: {gordon}
diff --git a/shared/contrib-additional.adoc b/shared/contrib-additional.adoc
index e1f2365129..c7e711c9ed 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]>
@@ -2292,6 +2293,7 @@
* Vladimir A. Jakovenko <mailto:vovik@ntu-kpi.kiev.ua[vovik@ntu-kpi.kiev.ua]>
* Vladimir Chukharev <mailto:vladimir.chukharev@gmail.com[vladimir.chukharev@gmail.com]>
* Vladimir Gorelov <mailto:virtual.lark@gmail.com[virtual.lark@gmail.com]>
+* Vladimir Grebenshchikov <mailto:vova@zote.me[vova@zote.me]>
* Vladimir Kurtikov <mailto:vk@vk.pp.ru[vk@vk.pp.ru]>
* Vladimir Kushnir <mailto:kushn@mail.kar.net[kushn@mail.kar.net]>
* Vladimir Osintsev <mailto:oc@nm.ru[oc@nm.ru]>
diff --git a/shared/contrib-committers.adoc b/shared/contrib-committers.adoc
index a57942e9b3..b3328e5e05 100644
--- a/shared/contrib-committers.adoc
+++ b/shared/contrib-committers.adoc
@@ -11,7 +11,6 @@
* {jwb}
* {badger}
* {dbaio}
-* {timur}
* {jhb}
* {lbartoletti}
* {jbeich}
@@ -142,6 +141,7 @@
* {whu}
* {zlei}
* {jkh}
+* {aokblast}
* {shurd}
* {rhurlin}
* {davide}
@@ -166,6 +166,7 @@
* {jkim}
* {akiyano}
* {jceel}
+* {ronald}
* {kai}
* {corvink}
* {wulf}
@@ -213,6 +214,7 @@
* {dwmalone}
* {nobutaka}
* {amdmi3}
+* {christos}
* {emaste}
* {mm}
* {slavash}
@@ -246,6 +248,7 @@
* {gnn}
* {khng}
* {tychon}
+* {bnovkov}
* {obrien}
* {nick}
* {olgeni}
@@ -300,6 +303,7 @@
* {samm}
* {hrs}
* {salvadore}
+* {dsl}
* {rscheff}
* {wosch}
* {cy}
@@ -375,6 +379,7 @@
* {naddy}
* {peter}
* {nwhitehorn}
+* {obiwac}
* {bwidawsk}
* {rew}
* {ivy}
@@ -393,10 +398,6 @@
* {zec}
* {bz}
* {mizhka}
-* {tz}
-* {dsl}
-* {ronald}
-* {christos}
-* {bnovkov}
* {ziaee}
-* {aokblast}
+* {tz}
+* {alven}
diff --git a/shared/contrib-develalumni.adoc b/shared/contrib-develalumni.adoc
index 1e1918e0e8..03aff32e0a 100644
--- a/shared/contrib-develalumni.adoc
+++ b/shared/contrib-develalumni.adoc
@@ -1,3 +1,4 @@
+* {timur} (2007 - 2025)
* {trociny} (2013 - 2025)
* {kwm} (2004 - 2025)
* {dmgk} (2019 - 2024)