aboutsummaryrefslogtreecommitdiff
path: root/shared
diff options
context:
space:
mode:
Diffstat (limited to 'shared')
-rw-r--r--shared/contrib-committers.adoc1
-rw-r--r--shared/contrib-develalumni.adoc1
-rw-r--r--shared/releases.adoc18
-rw-r--r--shared/ru/urls.adoc40
4 files changed, 36 insertions, 24 deletions
diff --git a/shared/contrib-committers.adoc b/shared/contrib-committers.adoc
index c864608a34..0f1fd3de5d 100644
--- a/shared/contrib-committers.adoc
+++ b/shared/contrib-committers.adoc
@@ -261,7 +261,6 @@
* {igoro}
* {dtxdf}
* {philip}
-* {zirias}
* {hiren}
* {yuripv}
* {fluffy}
diff --git a/shared/contrib-develalumni.adoc b/shared/contrib-develalumni.adoc
index 93b7be08f3..86709f2367 100644
--- a/shared/contrib-develalumni.adoc
+++ b/shared/contrib-develalumni.adoc
@@ -1,3 +1,4 @@
+* {zirias} (2022 - 2025)
* {woodsb02} (2016 - 2025)
* {timur} (2007 - 2025)
* {trociny} (2013 - 2025)
diff --git a/shared/releases.adoc b/shared/releases.adoc
index 130a0dde47..8580845dd8 100644
--- a/shared/releases.adoc
+++ b/shared/releases.adoc
@@ -28,7 +28,7 @@
:beta2-local-where: IGNORE
:beta3-local-where: IGNORE
-:rel-head-major: 15
+:rel-head-major: 16
:rel-head: {rel-head-major}.0
// If there is no release currently in the release cycle (i.e. we
@@ -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/
@@ -83,6 +83,18 @@
// more (in addition to cleaning up this file) following the 11.3
// release (likely as part of the 11.3 announcement commit). -gjb
+//:rel150-current-major: 15
+:rel150-current: 15.0
+//:rel150-current-date: December 2, 2025
+//
+//:u-rel150-notes: https://www.FreeBSD.org/releases/{rel150-current}R/relnotes/
+//:u-rel150-announce: https://www.FreeBSD.org/releases/{rel150-current}R/announce/
+//:u-rel150-errata: https://www.FreeBSD.org/releases/{rel150-current}R/errata/
+//:u-rel150-hardware: https://www.FreeBSD.org/releases/{rel150-current}R/hardware/
+//:u-rel150-installation: https://www.FreeBSD.org/releases/{rel150-current}R/installation/
+//:u-rel150-readme: https://www.FreeBSD.org/releases/{rel150-current}R/readme/
+//:u-rel150-signatures: https://www.FreeBSD.org/releases/{rel150-current}R/signatures/
+
:rel143-current-major: 14
:rel143-current: 14.3
:rel143-current-date: June 10, 2025
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/