aboutsummaryrefslogtreecommitdiff
path: root/shared
diff options
context:
space:
mode:
Diffstat (limited to 'shared')
-rw-r--r--shared/authors.adoc26
-rw-r--r--shared/contrib-additional.adoc2
-rw-r--r--shared/contrib-committers.adoc20
-rw-r--r--shared/contrib-develalumni.adoc2
-rw-r--r--shared/mirrors.adoc1
-rw-r--r--shared/releases.adoc4
-rw-r--r--shared/ru/urls.adoc40
7 files changed, 61 insertions, 34 deletions
diff --git a/shared/authors.adoc b/shared/authors.adoc
index 5745dee38d..a716c1e42a 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}>
@@ -1447,6 +1451,10 @@
:jadawin-email: jadawin@FreeBSD.org
:jadawin: {jadawin-name} <{jadawin-email}>
+:jaeyoon-name: Jaeyoon Choi
+:jaeyoon-email: jaeyoon@FreeBSD.org
+:jaeyoon: {jaeyoon-name} <{jaeyoon-email}>
+
:jah-name: Jason A. Harmening
:jah-email: jah@FreeBSD.org
:jah: {jah-name} <{jah-email}>
@@ -2543,6 +2551,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}>
@@ -3371,6 +3383,10 @@
:ticso-email: ticso@FreeBSD.org
:ticso: {ticso-name} <{ticso-email}>
+:tiga-name: Tiago Gasiba
+:tiga-email: tiga@FreeBSD.org
+:tiga: {tiga-name} <{tiga-email}>
+
:tijl-name: Tijl Coosemans
:tijl-email: tijl@FreeBSD.org
:tijl: {tijl-name} <{tijl-email}>
@@ -3563,6 +3579,10 @@
:vkashyap-email: vkashyap@FreeBSD.org
:vkashyap: {vkashyap-name} <{vkashyap-email}>
+:vladlen-name: Vladlen Popolitov
+:vladlen-email: vladlen@FreeBSD.org
+:vladlen: {vladlen-name} <{vladlen-email}>
+
:vmaffione-name: Vincenzo Maffione
:vmaffione-email: vmaffione@FreeBSD.org
:vmaffione: {vmaffione-name} <{vmaffione-email}>
@@ -3790,12 +3810,12 @@
:pkgmgr-members: {antoine}, {bdrewery}
// FreeBSD Ports Manager Team
-:portmgr-members: {mat}, {bapt}, {pizzamig}, {rene}, {tcberner}
+:portmgr-members: {mat}, {bapt}, {pizzamig}, {rene}, {tcberner}, {dvl}
// 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 457b596954..0f1fd3de5d 100644
--- a/shared/contrib-committers.adoc
+++ b/shared/contrib-committers.adoc
@@ -49,6 +49,7 @@
* {loader}
* {melifaro}
* {theraven}
+* {jaeyoon}
* {davidcs}
* {jrtc27}
* {marcus}
@@ -108,6 +109,7 @@
* {ultima}
* {gallatin}
* {avg}
+* {tiga}
* {beat}
* {sjg}
* {gibbs}
@@ -141,6 +143,7 @@
* {whu}
* {zlei}
* {jkh}
+* {aokblast}
* {shurd}
* {rhurlin}
* {davide}
@@ -165,6 +168,7 @@
* {jkim}
* {akiyano}
* {jceel}
+* {ronald}
* {kai}
* {corvink}
* {wulf}
@@ -212,6 +216,7 @@
* {dwmalone}
* {nobutaka}
* {amdmi3}
+* {christos}
* {emaste}
* {mm}
* {slavash}
@@ -245,6 +250,7 @@
* {gnn}
* {khng}
* {tychon}
+* {bnovkov}
* {obrien}
* {nick}
* {olgeni}
@@ -255,7 +261,6 @@
* {igoro}
* {dtxdf}
* {philip}
-* {zirias}
* {hiren}
* {yuripv}
* {fluffy}
@@ -273,6 +278,7 @@
* {0mp}
* {pizzamig}
* {rpokala}
+* {vladlen}
* {arrowd}
* {khorben}
* {kp}
@@ -299,6 +305,7 @@
* {samm}
* {hrs}
* {salvadore}
+* {dsl}
* {rscheff}
* {wosch}
* {cy}
@@ -374,28 +381,25 @@
* {naddy}
* {peter}
* {nwhitehorn}
+* {obiwac}
* {bwidawsk}
* {rew}
* {ivy}
* {def}
* {mw}
* {wollman}
-* {woodsb02}
* {joerg}
* {ygy}
* {emax}
* {yongari}
* {rcyu}
* {oshogbo}
+* {andy}
* {riggs}
* {egypcio}
* {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 03aff32e0a..86709f2367 100644
--- a/shared/contrib-develalumni.adoc
+++ b/shared/contrib-develalumni.adoc
@@ -1,3 +1,5 @@
+* {zirias} (2022 - 2025)
+* {woodsb02} (2016 - 2025)
* {timur} (2007 - 2025)
* {trociny} (2013 - 2025)
* {kwm} (2004 - 2025)
diff --git a/shared/mirrors.adoc b/shared/mirrors.adoc
index 74af944d83..1d45f01935 100644
--- a/shared/mirrors.adoc
+++ b/shared/mirrors.adoc
@@ -235,7 +235,6 @@
// South Africa mirrors
:mirrors-south-africa-www: http://www.za.FreeBSD.org/
-:mirrors-south-africa-ftp: ftp://ftp.za.FreeBSD.org/pub/FreeBSD/
:mirrors-south-africa-ftp2: ftp://ftp2.za.FreeBSD.org/pub/FreeBSD/
:mirrors-south-africa-ftp4: ftp://ftp4.za.FreeBSD.org/pub/FreeBSD/
:mirrors-south-africa-email: hostmaster@za.FreeBSD.org
diff --git a/shared/releases.adoc b/shared/releases.adoc
index 130a0dde47..f6a4976117 100644
--- a/shared/releases.adoc
+++ b/shared/releases.adoc
@@ -37,13 +37,13 @@
// Set to 'INCLUDE' when the schedule is available.
-:beta-upcoming: IGNORE
+:beta-upcoming: INCLUDE
// Set to 'INCLUDE' when the installation images are available.
:beta-testing: IGNORE
:betarel-current-major: 14
-:betarel-current: 14.3
+:betarel-current: 14.4
:betarel-vers: RELEASE
:u-betarel-schedule: https://www.FreeBSD.org/releases/{betarel-current}R/schedule/
diff --git a/shared/ru/urls.adoc b/shared/ru/urls.adoc
index 2165c22423..30f88fb263 100644
--- a/shared/ru/urls.adoc
+++ b/shared/ru/urls.adoc
@@ -14,48 +14,48 @@ ifndef::isonline[]
endif::[]
// books
-:dev-model: {main-site-en}/books/dev-model/
+:dev-model: {main-site}/books/dev-model/
:faq: {main-site}/books/faq/
:handbook: {main-site}/books/handbook/
:developers-handbook: {main-site}/books/developers-handbook/
:arch-handbook: {main-site}/books/arch-handbook/
:porters-handbook: {main-site}/books/porters-handbook/
:design-44bsd: {main-site}/books/design-44bsd/
-:fdp-primer: {main-site-en}/books/fdp-primer/
+:fdp-primer: {main-site}/books/fdp-primer/
// articles
-:bsdl-gpl: {main-site-en}/articles/bsdl-gpl/
-:building-products: {main-site-en}/articles/building-products/
+:bsdl-gpl: {main-site}/articles/bsdl-gpl/
+:building-products: {main-site}/articles/building-products/
:committers-guide: {main-site}/articles/committers-guide/
:contributing: {main-site}/articles/contributing/
-:contributors: {main-site-en}/articles/contributors/
+:contributors: {main-site}/articles/contributors/
:cups: {main-site}/articles/cups/
:explaining-bsd: {main-site}/articles/explaining-bsd/
-:filtering-bridges: {main-site-en}/articles/filtering-bridges/
+:filtering-bridges: {main-site}/articles/filtering-bridges/
:fonts: {main-site}/articles/fonts/
:freebsd-questions-article: {main-site}/articles/freebsd-questions/
-:freebsd-update-server: {main-site-en}/articles/freebsd-update-server/
+:freebsd-update-server: {main-site}/articles/freebsd-update-server/
:geom-class: {main-site}/articles/geom-class/
:gjournal-desktop: {main-site}/articles/gjournal-desktop/
:hubs: {main-site}/articles/hubs/
:ipsec-must: {main-site}/articles/ipsec-must/
-:ldap-auth: {main-site-en}/articles/ldap-auth/
-:leap-seconds: {main-site-en}/articles/leap-seconds/
-:linux-emulation: {main-site-en}/articles/linux-emulation/
-:linux-users: {main-site-en}/articles/linux-users/
+:ldap-auth: {main-site}/articles/ldap-auth/
+:leap-seconds: {main-site}/articles/leap-seconds/
+:linux-emulation: {main-site}/articles/linux-emulation/
+:linux-users: {main-site}/articles/linux-users/
:mailing-list-faq: {main-site}/articles/mailing-list-faq/
-:nanobsd: {main-site-en}/articles/nanobsd/
+:nanobsd: {main-site}/articles/nanobsd/
:new-users: {main-site}/articles/new-users/
:pam: {main-site}/articles/pam/
-:pgpkeys: {main-site-en}/articles/pgpkeys/
-:port-mentor-guidelines: {main-site-en}/articles/port-mentor-guidelines/
+:pgpkeys: {main-site}/articles/pgpkeys/
+:port-mentor-guidelines: {main-site}/articles/port-mentor-guidelines/
:pr-guidelines: {main-site}/articles/pr-guidelines/
:problem-reports: {main-site}/articles/problem-reports/
-:rc-scripting: {main-site-en}/articles/rc-scripting/
+:rc-scripting: {main-site}/articles/rc-scripting/
:releng: {main-site}/articles/releng/
-:freebsd-releng: {main-site-en}/articles/freebsd-releng/
-:remote-install: {main-site-en}/articles/remote-install/
-:serial-uart: {main-site-en}/articles/serial-uart/
+:freebsd-releng: {main-site}/articles/freebsd-releng/
+:remote-install: {main-site}/articles/remote-install/
+:serial-uart: {main-site}/articles/serial-uart/
:solid-state: {main-site}/articles/solid-state/
-:vinum: {main-site-en}/articles/vinum/
-:vm-design: {main-site}/articles/vm-design/
+:vinum: {main-site}/articles/vinum/
+:vm-design: {main-site}/articles/vm-design/