From nobody Mon Jun 22 19:23:03 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gkdQN5KMrz6hs3Y for ; Mon, 22 Jun 2026 19:23:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gkdQN4kQDz41NQ for ; Mon, 22 Jun 2026 19:23:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782156188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R9VvtAX3B8tD+eIsR1TnZytoThuLkbPE6pD14lGkkcU=; b=fm1QFgBFjz1r4+vWGh11OCBlGgLx95n5PefOInKCccm2lu9k9EjZJb85KHSs3zTbNDK/jo ZZ4mBtJWCFtv3IswUuB0aaaZ9tVEq8wwy8v7lvilkuN9THkWZnEPWzmTh7iN0cOy9Rc/I3 IP5G+zvK1B6tyhAqcIinkIMAerK9O90b/aaYwJLC6bp27HpZqApHqQVjjSwtbYASpGaEYf AMPDdHhaDpdKGN7Ag/vZbmlxsNi7ZC6RvMkGAPQgXaG2ZKDiBYXp7QMjsYKeT6M622ilkK bw4r+QivtnN1ij7IL/Qwlf6Vy44fzjF1mfcyPpGIKJQuwR9qI+eaSTBxfhK6NA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782156188; a=rsa-sha256; cv=none; b=hbqhi3UDoS2v+ug8mZPTfrJk9j0ymcbXpll2KjDM6ORnrxViAyPFDt4kUrPVrz4i0uhVpD RAc/fTlbga5mCekTs+GlwLSwgK9TCZD7ckSwEP3+QeyOrQEbKaZTYYtJT/76xc2QzWNzub k2XJ7a160mB0WCPly8TO1uiM/mwEJVs/YjGW032jQVEkKl6hhALNFpmBBKniSU/FKBYDUY ZTLCkMDBv5Mq3QUDj9cdJbMPR0knRo7I4fvGa7589R53mrXXB+9rHgsqMqs5bfA06hSwAr WQPFRMYLysBpH14O4Jr6CmyvPL/4eDRMo7o7hIUZHE4oUUqAYBR7OXyWghHrbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782156188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R9VvtAX3B8tD+eIsR1TnZytoThuLkbPE6pD14lGkkcU=; b=Htf8CdglLzkDZQc9D+I0HhggEA0msHXkw8dfHz/3A+ugDirPWk4dxmg4khOljkIirGueE4 cc6/nguBVDOSSQcb7h6tDUYgsvxpG9bW/WJRnJM6/2rfgZh89ZAtQCK9MOzgJE6xj2K1no dSlAuVktPiaJOEpRaUXGSSXZwAUORoMBqPNaNfG+QPbVHVmyzWFsM2SIihBnTmke9XCzco vvJpHL3eewp1V9L3FJ5IMm2tjwWM19jSK5hW5dpsrPObw6iV6BVbY5f6S+//MhBwFBnBpL yeytjLkZYGAA6yik1d0hXoFOAHN57d2yb3LhRdKBhkMy8gvJiA94nhkQGSbq7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gkdQH3YgTz11WZ for ; Mon, 22 Jun 2026 19:23:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3864d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Jun 2026 19:23:03 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Andrey Zakhvatov Subject: git: 7f63db6539 - main - website/ru: Update administration.adoc List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andy X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f63db6539b5aebc5b9f60aff2f8f723ca3314ac Auto-Submitted: auto-generated Date: Mon, 22 Jun 2026 19:23:03 +0000 Message-Id: <6a398b97.3864d.70b43c60@gitrepo.freebsd.org> The branch main has been updated by andy: URL: https://cgit.FreeBSD.org/doc/commit/?id=7f63db6539b5aebc5b9f60aff2f8f723ca3314ac commit 7f63db6539b5aebc5b9f60aff2f8f723ca3314ac Author: Andrey Zakhvatov AuthorDate: 2026-06-22 19:21:30 +0000 Commit: Andrey Zakhvatov CommitDate: 2026-06-22 19:21:30 +0000 website/ru: Update administration.adoc Update to EN 6ae188e12756359415577a140603168756ec2758 --- website/content/ru/administration.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/content/ru/administration.adoc b/website/content/ru/administration.adoc index 0487c20750..eab8946902 100644 --- a/website/content/ru/administration.adoc +++ b/website/content/ru/administration.adoc @@ -85,7 +85,7 @@ https://www.freebsd.org/internal/doceng/[Устав Команды doceng] по https://www.freebsd.org/portmgr/charter/[Устав команды portmgr] подробно описывает обязанности и ответственность Команды управления портами. * {bapt} -* {mat} (Представитель команды администрирования кластера) +* {mat} (Представитель Команды администрирования кластера) * {pizzamig} * {rene} * {dvl} @@ -178,7 +178,7 @@ https://www.freebsd.org/ru/releng/charter/[Устав команды подго Секретарь Управляющей команды FreeBSD входит в Управляющую команду без права голоса и является ответственным за документирование работы, выполненной Управляющей командой, отслеживание текущей повестки для Управляющей команды, связь с участниками, не входящими в Управляющую команду, от её имени, а также отправку писем в адрес Управляющей команды и взаимодействие с Командой администрирования по вопросам согласования коммиттеров/учётных записей. Секретарь Управляющей команды также отвечает за написание и рассылку ежемесячных отчётов о состоянии работ сообществу разработчиков FreeBSD, содержащих сводку последних решений и действий Управляющей команды. -* {rene} +* (vacant) [[t-doceng-secretary]] == Секретарь Команды подготовки документации @@ -367,5 +367,5 @@ https://www.freebsd.org/ru/releng/charter/[Устав команды подго // // The FreeBSD Russian Documentation Project // -// Original EN revision (20.06.2026): 08381ccc9b0427793a78b525383f9c41217bef62 +// Original EN revision (21.06.2026): 6ae188e12756359415577a140603168756ec2758 // From nobody Mon Jun 22 19:55:09 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gkf7R0Zg2z6hvYd for ; Mon, 22 Jun 2026 19:55:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gkf7R03wGz44vK for ; Mon, 22 Jun 2026 19:55:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782158115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SG3Q6uDIb1dRbcaJ6mUYPYt9UGDBokMKuEEakfCElKw=; b=fhHB43DyqUYMzTVoa6tj54TCRKziV55FOmp71l/Yz77Snd667fKYmxt37Eheu7Qs8cYfTt KuJV6E5QxWA8KepdGd7+GimgWk9jgVo5BiuxSebfcnOQO6QWYEsWDNZ8h+Z91eg2SWwFAl tfMMTwglcUPaXLxajuO76cURGvXVo7xBPDGGCrT2YTh9mttvVatEH2LjssQU22gwO9DLqA 9rcEIagkCV+k7tptNPfOt0DIowsGRdgQGTkxYisYvcv5zkFpQplx67dYr62LrHc3f7Zt5A mgGwwURuNbQ7QbpNT1TPmQBgVYfeLL2C2D/gmst1KpyKKkA+yB4lgGKIyEWbOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782158115; a=rsa-sha256; cv=none; b=g+SYtEx9JAPp7gy1GjVNGK/kb7kHpefnoZyuT5J2ZUuSxpqACOvK1wGD6e0CWAT48t30xf vnAuyD1AXH3PkVbb2wxDuthlq6TPm+fWxG/14S4o9q/Fb+C+uZJWJ6KJqohylE5x6p/6HB jgqdkqgElES3ha8kmTkOIkTn/t/nSHo225kLZDQBr0FGHq1CIE5g7U6nApxRbLqpHjciM5 cx9socC3k+jD6FYF4J/k7wxyCFAltqNmD91jkWeohaFBQuS9FeAJ7muSbY8NcoJ9vRAcLS 9B0UbbdJTTBjvpR/0j+ky/ICKF6Bam5A+6wvFDCw4F9g+hVHcj1KjG8tRKhSjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782158115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SG3Q6uDIb1dRbcaJ6mUYPYt9UGDBokMKuEEakfCElKw=; b=iwT7aQVInVoNEdVs+OIjj0S2jrN5+oozFoNDjCKqj2Ti6OHRDACeDlcC2Aj0/31I+Q957F Pavr7TAfnAJAxrs5t8oKf1FuEqmygYi/cZcgBjS1ZTxoj84AdUfy+yd2sXD10nJNQCr+j2 D2vgB+/upQ4IfPqIbYQQqFTQrjWzMJSIzK+ALJExgHlCsAv80Z/Rhyd1rHZvZFKT55jS0g TjyRK2dEQiy86Yv+XxlGzzsf4lPNxLWl7URSDbon+vI7SdVVGMaawgqzblSspCV8I/2pL5 iTXWEDY+kYF0cc7Ov+JUMHGVLBh0s18/QaRbjzztXHXoqsABONkd2Pv2h4EVCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gkf7Q62zSz11sq for ; Mon, 22 Jun 2026 19:55:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b519 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Jun 2026 19:55:09 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Andrey Zakhvatov Subject: git: ac1bf24e83 - main - website/ru: Update releases/15.1R/errata.adoc List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andy X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac1bf24e83adeb6c776f1e276d827bd2f24dfd51 Auto-Submitted: auto-generated Date: Mon, 22 Jun 2026 19:55:09 +0000 Message-Id: <6a39931d.3b519.4378db2a@gitrepo.freebsd.org> The branch main has been updated by andy: URL: https://cgit.FreeBSD.org/doc/commit/?id=ac1bf24e83adeb6c776f1e276d827bd2f24dfd51 commit ac1bf24e83adeb6c776f1e276d827bd2f24dfd51 Author: Andrey Zakhvatov AuthorDate: 2026-06-22 19:53:59 +0000 Commit: Andrey Zakhvatov CommitDate: 2026-06-22 19:53:59 +0000 website/ru: Update releases/15.1R/errata.adoc Update to EN a4366bb091ae7ace1d2725a8218666fa29db9197 --- website/content/ru/releases/15.1R/errata.adoc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/website/content/ru/releases/15.1R/errata.adoc b/website/content/ru/releases/15.1R/errata.adoc index 4216c035ad..69cf8e5423 100644 --- a/website/content/ru/releases/15.1R/errata.adoc +++ b/website/content/ru/releases/15.1R/errata.adoc @@ -63,9 +63,13 @@ sidenav: download [[open-issues]] == Открытые проблемы -1. Клиент **man:nfs[4]** может вызвать аварийное завершение работы ядра в ситуации, когда сервер NFSv4.1 или NFSv4.2 перестаёт отвечать на запросы или находится в состоянии перезагрузки. После аварийного завершения работы система автоматически перезапустится. + +1. Клиент **man:nfs[4]** может вызывать аварийное завершение работы ядра в ситуации, когда сервер NFSv4.1 или NFSv4.2 перестаёт отвечать на запросы или находится в состоянии перезагрузки. После аварийного завершения работы система автоматически перезапустится. + **Обходное решение**: Избегайте использования параметров монтирования `soft` или `intr` для ресурсов NFSv4.1/4.2. Если аварийное завершение работы происходит часто, рассмотрите возможность перехода на использование NFSv3 до появления исправленной версии. + -**Статус**: исправлено в ветке main - https://bugs.freebsd.org/294925 +**Статус**: Исправлено в ветке main - https://bugs.freebsd.org/294925 + +2. Загрузка систем, имеющих зашифрованные пулы **man:zfs[4]** с наборами данных `keylocation=prompt`, может застопориться из-за ожидания ввода ключевой фразы, если в **man:rc[8]** активирован скрипт `zfskeys`, хотя ранее монтирование таких пулов пропускалось. + +**Обходное решение**: Используйте `zpool set cachefile=none `, чтобы при загрузке соответствующий пул не импортировался. + +**Статус**: Открыто - https://bugs.freebsd.org/296130 [[late-news]] == Актуальные новости @@ -75,5 +79,5 @@ sidenav: download // // The FreeBSD Russian Documentation Project // -// Original EN revision (15.06.2026): 9e5117bd9b2e04bbfbee53aac92e1a2ad59ad891 +// Original EN revision (21.06.2026): a4366bb091ae7ace1d2725a8218666fa29db9197 // From nobody Mon Jun 22 20:16:46 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gkfcN0mpjz6hxq6 for ; Mon, 22 Jun 2026 20:16:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gkfcM5sD6z47Gr for ; Mon, 22 Jun 2026 20:16:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782159411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pwxebUzLi5t483MWWgYNl+gNPoZ5qa7mtA4zJPxufOY=; b=b1N4l+Td9zu+wNDHAE1dZHKxavq1k0TOanoecyUZ7f4fuTYik1fgz/00cy7dVMVJeNknL7 IZ8NvsuvdtOng5CPl2hpWefG5vApXhw20WGq7kJhr31SWHqp0zrm+h/7I8xpx/968278sm rBm3SMs6+1DrIyBQ9DQYxK5k9JZvn7j4r9fSNhp3D9TlWLu9dLUyRGp8tK8JWHkm59nF4z iX/sKdE+Hh7wDnjSvdY3SKAjhEMeKSVTu+r1A65q2a9WeCjReHPhmRB+wR5YfAtbI/6z5g U8CqCLP7UW0H2KBOKks5S/DO7LjULwzwmXGYuTS9AnZ9R/lqmaDyJ24YIgkfXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782159411; a=rsa-sha256; cv=none; b=keXLSmZqwzG/JIEQ0w+VFSAp3vUXNrQaI4dxauLtDfYyDw1SBYZF9B/+/mYVyarxVaA2gi GBNxXlFZeAsvEDbNXzMg6XYMUAl0vrisOAiIYNHMdCXXHlT+00gzvSJC4pzN8kOFOIYUAp zPLw9kT/MYlJ8yAKtKqdkU5mS1fai/9OSyKG9YxP63UHINQPau90mh4RmDGva/dWLOETKr 4iGm/F411076pofnnZ0BNiSyIielelCV+1E0isYZ5viNTWapes8/QlCI7+H/xF+Th0OqrF Xg1IOr61ghZWaJvWI98aOQtyPRau608mSYojSDJ0FYOiBtJfNV2wYna8I1XJaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782159411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pwxebUzLi5t483MWWgYNl+gNPoZ5qa7mtA4zJPxufOY=; b=Hfdip0nNYFf8KSlWnpM/NxbOdPfmAVgundDxrgNhGKF6mrptPGh6Men7p9aFpud3IR416P vOiT/FiAbxK4hBhqvy/m6nEd8GBCkobzpVlLAPp69H3e7dP/eSSMyX3luiXIIyIWnJSlGI H5wLmPojrVqHoxfVT9I1AN2jcrd2HQznFbHHywp+kg+HB0VtDlaJlQ9koXoTHCScdPevxA zNqyvA4BGU4Lsul9i44MGLWxq3JlnlBKkBD8uSLoXax7OGJjvXOhMgOOcoNk8Zs3P4oubC IvPrm50WCwfnv5zq+nQNnzebO10K6qsDXsI9uyQlKVD8lSR+nJ71Qhaxu3oO9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gkfcM4szNz12yd for ; Mon, 22 Jun 2026 20:16:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b66d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Jun 2026 20:16:46 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Andrey Zakhvatov Subject: git: eeb699f427 - main - website/ru: Update releng/_index.adoc List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andy X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eeb699f42790688092cb169d5a10b77d9a36da4b Auto-Submitted: auto-generated Date: Mon, 22 Jun 2026 20:16:46 +0000 Message-Id: <6a39982e.3b66d.12ae9c7d@gitrepo.freebsd.org> The branch main has been updated by andy: URL: https://cgit.FreeBSD.org/doc/commit/?id=eeb699f42790688092cb169d5a10b77d9a36da4b commit eeb699f42790688092cb169d5a10b77d9a36da4b Author: Andrey Zakhvatov AuthorDate: 2026-06-22 20:15:59 +0000 Commit: Andrey Zakhvatov CommitDate: 2026-06-22 20:15:59 +0000 website/ru: Update releng/_index.adoc Update to EN 271dd1d2b598ef558236033d0292a473a44d9f0f --- website/content/ru/releng/_index.adoc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/website/content/ru/releng/_index.adoc b/website/content/ru/releng/_index.adoc index 69a72094a2..ab87214c7a 100644 --- a/website/content/ru/releng/_index.adoc +++ b/website/content/ru/releng/_index.adoc @@ -10,9 +10,9 @@ include::shared/ru/urls.adoc[] На этой странице находится информация о процессе подготовки релизов FreeBSD. -* <> +* <> * <> -* link:charter[Обязанности участников Группы подготовки релизов] +* link:charter[Устав Команды подготовки релизов] * <> * <> * <> @@ -22,9 +22,9 @@ include::shared/ru/urls.adoc[] //// [[schedule]] -== График предстоящих релизов +== График выпуска предстоящих релизов -//Note: Release dates are approximate and may be subject to schedule slippage. +//Примечание: Даты выпуска релизов являются приблизительными и могут сдвигаться. //По состоянию на 2024-06-04 следующий релиз ещё не был анонсирован. @@ -32,7 +32,6 @@ include::shared/ru/urls.adoc[] [cols=",,",options="header",] |=== |Дата |Событие |Информация -|Июнь 2026 |FreeBSD 15.1 |link:../releases/15.1R/schedule/[График подготовки] |Сентябрь 2026 |FreeBSD 14.5 |link:../../releases/14.5R/schedule/[График подготовки] |Декабрь 2026 |FreeBSD 15.2 | |Март 2027 |FreeBSD 14.6 | @@ -112,5 +111,5 @@ include::shared/ru/urls.adoc[] // // The FreeBSD Russian Documentation Project // -// Original EN revision (01.05.2026): aa570f12f85107e9de1051b8a342924a766d2600 +// Original EN revision (13.06.2026): 271dd1d2b598ef558236033d0292a473a44d9f0f // From nobody Tue Jun 23 04:24:42 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gksRG6Mncz6jGSQ for ; Tue, 23 Jun 2026 04:24:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gksRG3xDXz47L6 for ; Tue, 23 Jun 2026 04:24:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782188682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MZbnITDlBPzVGZJc0OogcR6rK/xY6XcLYuyo+A8z39U=; b=m7djkepCIpVRA8Fxr4MBq57Oe+MJ3VGc2Wf08dL2HgK7U1wUvDidroxz+/JKI28yfkIucL dmcsp+rNTHvSgyPllPCKBlTyXqEdePKRSGePRjBkqgZR+d3M5QlhQgMrZg9xlFRjtmln/e c4hPzF4TvaWLh+OR6J2lsOOXDKAllH7qwz82DkwyBMi/D5WQ50XJsv5Y23x6ckWvKbhL+s f8ytuhn5wYXuI+DMYumw3EhIqdPfvsHZnrz8h7xEEdrxGwR12gV4gonkgN7h4ktAhrMQjZ XXf+AdBG7TL0y0ovXQI69F7nbFtqsZ5CI8n0RzgHBx/PIQU15tor5Q5i/Xs8Xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782188682; a=rsa-sha256; cv=none; b=lKJQxatVGf3fwo9XdfRr7hrDrnMaRY50kszStMBPEkhJWgdp1sa2mBZW+lAo3vThQcBivz 5P8GEcn26CcL0vywyEQxYaDcfqn4vmJhPShSjjMOmrtNvUZkTv9ycKsVIHVdyiS65dlRHl HMO3vEdp+FwTrW49/lye1anLglw2ePfpkWhG+n4noDs5D9VloLGlc4gT2Y5cufRl/dMxlf /6PnUlUsUHebZXh+HJESgH5YehNbpcnydVXl7N0Llm2gOeN5GaPZFEMXWNHM3vnr8Ms0Ez /TWUhuiyqeVZdKZ/H6Jvw3Kl0EJhzLLbb7B+VXW+GF9jtpp2778OPm4aMDtQdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782188682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MZbnITDlBPzVGZJc0OogcR6rK/xY6XcLYuyo+A8z39U=; b=WVDmf/JGkL2UKMudPdpysANsY02inhvadNmpDXwsGQWQGMXrQKb1rRo9Zlp4ebuNzllUY5 fFPvs8ufVDQT6yHhwjWof4QuvibBexO/2vd6YZPm9lG4EB30yOzpAwxsmKMXf6q3R3bKE7 Cba20txRnHRVEpcgMQ7XDm8IatDchNBd2NHa1QKRChFa8ffZ1Qybv+VumoYzfVf3LlOegG iDAl5iYFgdAL6K3+LwreoHdIZPX2+4UKtvL1iJk5WzZd1ZzBJXLlbD609ESwpPluAclsVx q3UIpCCx1lW7Yqj7c8adrnOkpozu/PdP88HXXDryHPSDacYRP9tAMHmF1vjg6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gksRG2XRXz3Bx for ; Tue, 23 Jun 2026 04:24:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21f06 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 04:24:42 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Alexander Ziaee Subject: git: 01bfc34871 - main - website: Fix some anchor typos List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 01bfc34871146e3de912efc4afe374393d265417 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 04:24:42 +0000 Message-Id: <6a3a0a8a.21f06.62b6bb23@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/doc/commit/?id=01bfc34871146e3de912efc4afe374393d265417 commit 01bfc34871146e3de912efc4afe374393d265417 Author: Alexander Ziaee AuthorDate: 2026-06-23 01:47:44 +0000 Commit: Alexander Ziaee CommitDate: 2026-06-23 04:24:29 +0000 website: Fix some anchor typos These typos were revealed by passing verbose to asciidoctor. --- website/content/en/administration.adoc | 2 +- website/content/en/releases/11.1R/relnotes.adoc | 8 ++++---- website/content/en/releases/11.2R/relnotes.adoc | 2 +- website/content/en/releases/14.0R/errata.adoc | 1 - website/content/en/releases/15.1R/installation.adoc | 2 +- website/content/en/releases/15.1R/upgrading.adoc | 2 +- website/content/en/releases/9.1R/hardware.adoc | 2 +- website/content/en/releases/9.1R/relnotes-detailed.adoc | 3 ++- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/website/content/en/administration.adoc b/website/content/en/administration.adoc index 7e85505c9c..c07ba795c1 100644 --- a/website/content/en/administration.adoc +++ b/website/content/en/administration.adoc @@ -195,7 +195,7 @@ The Ports Management Team Secretary is also responsible for writing and sending * (vacant) -[[t-srctmgr-secretary]] +[[t-srcmgr-secretary]] == Source Management Team Secretary There is currently no Source Management Team Secretary appointed; emails are being forwarded to the Source Management Team. diff --git a/website/content/en/releases/11.1R/relnotes.adoc b/website/content/en/releases/11.1R/relnotes.adoc index 6d20c51968..6fd7a456f2 100644 --- a/website/content/en/releases/11.1R/relnotes.adoc +++ b/website/content/en/releases/11.1R/relnotes.adoc @@ -53,7 +53,7 @@ The release notes for FreeBSD 11.0-RELEASE contain a summary of the changes made * <> ** <> -[intro]] +[[intro]] == Introduction This document contains the release notes for FreeBSD 11.1-RELEASE. It describes recently added, changed, or deleted features of FreeBSD. It also provides some notes on upgrading from previous versions of FreeBSD. @@ -66,7 +66,7 @@ This document describes the most user-visible new or changed features in FreeBSD Typical release note items document recent security advisories issued after 11.0-RELEASE, new drivers or hardware support, new commands or options, major bug fixes, or contributed software upgrades. They may also list changes to major ports/packages or release engineering practices. Clearly the release notes cannot list every single change made to FreeBSD between releases; this document focuses primarily on security advisories, user-visible changes, and major architectural improvements. -[upgrade]] +[[upgrade]] == Upgrading from Previous Releases of FreeBSD [amd64,i386] Binary upgrades between RELEASE versions (and snapshots of the various security branches) are supported using the http://www.FreeBSD.org/cgi/man.cgi?query=freebsd-update&sektion=8&manpath=freebsd-release-ports[freebsd-update(8)] utility. The binary upgrade procedure will update unmodified userland utilities, as well as unmodified GENERIC kernels distributed as a part of an official FreeBSD release. The http://www.FreeBSD.org/cgi/man.cgi?query=freebsd-update&sektion=8&manpath=freebsd-release-ports[freebsd-update(8)] utility requires that the host being upgraded have Internet connectivity. @@ -101,7 +101,7 @@ This section lists the various Security Advisories and Errata Notices since 11.0 |https://www.FreeBSD.org/security/advisories/FreeBSD-SA-17:05.heimdal.asc[FreeBSD-SA-17:05.heimdal] |12 July 2017 |Fix KDC-REP service name validation vulnerability |=== -[errata]] +[[errata]] == Errata Notices [width="100%",cols="40%,30%,30%",options="header",] @@ -240,7 +240,7 @@ http://www.FreeBSD.org/cgi/man.cgi?query=byacc&sektion=1&manpath=freebsd-release bmake has been updated to version 20170510. http://svn.freebsd.org/viewvc/base?view=revision&revision=319884[(r319884)] -[userland-installer]] +[[userland-installer]] == Installation and Configuration Tools The installer, http://www.FreeBSD.org/cgi/man.cgi?query=bsdinstall&sektion=8&manpath=freebsd-release-ports[bsdinstall(8)], has been updated to include support for hidden wireless networks when configuring the http://www.FreeBSD.org/cgi/man.cgi?query=wlan&sektion=4&manpath=freebsd-release-ports[wlan(4)] interface. http://svn.freebsd.org/viewvc/base?view=revision&revision=311686[(r311686)] diff --git a/website/content/en/releases/11.2R/relnotes.adoc b/website/content/en/releases/11.2R/relnotes.adoc index 550e428087..ee73ba4fe7 100644 --- a/website/content/en/releases/11.2R/relnotes.adoc +++ b/website/content/en/releases/11.2R/relnotes.adoc @@ -246,7 +246,7 @@ Timezone data files have been updated to version 2018e. http://svn.freebsd.org/v The https://www.FreeBSD.org/cgi/man.cgi?query=libxo&sektion=3&manpath=freebsd-release-ports[libxo(3)] library has been updated to version 0.9.0. http://svn.freebsd.org/viewvc/base?view=revision&revision=334458[(r334458)] -[userland-installer]] +[[userland-installer]] == Installation and Configuration Tools [arm64] The https://www.FreeBSD.org/cgi/man.cgi?query=bsdinstall&sektion=8&manpath=freebsd-release-ports[bsdinstall(8)] installer has been updated to default to UEFI-only boot. http://svn.freebsd.org/viewvc/base?view=revision&revision=322254[(r322254)] [.contrib]#(Sponsored by The FreeBSD Foundation)# diff --git a/website/content/en/releases/14.0R/errata.adoc b/website/content/en/releases/14.0R/errata.adoc index 6c27c36c7c..24bb3a03de 100644 --- a/website/content/en/releases/14.0R/errata.adoc +++ b/website/content/en/releases/14.0R/errata.adoc @@ -24,7 +24,6 @@ This errata document for FreeBSD {release} will be maintained until the release * <> * <> * <> -* <> [[intro]] == Introduction diff --git a/website/content/en/releases/15.1R/installation.adoc b/website/content/en/releases/15.1R/installation.adoc index d759f1d5e8..89674edd26 100644 --- a/website/content/en/releases/15.1R/installation.adoc +++ b/website/content/en/releases/15.1R/installation.adoc @@ -36,7 +36,7 @@ If `/usr/bin/uname was not installed by a package` is shown, see <> If a package name is shown, such as `FreeBSD-runtime-15.0`, see <> below. -[upgrade-source] +[[upgrade-source]] If upgrading via source, see link:{handbook}cutting-edge/#makeworld[FreeBSD Handbook chapter on Updating FreeBSD from Source]. [[upgrade-fu]] diff --git a/website/content/en/releases/15.1R/upgrading.adoc b/website/content/en/releases/15.1R/upgrading.adoc index d759f1d5e8..89674edd26 100644 --- a/website/content/en/releases/15.1R/upgrading.adoc +++ b/website/content/en/releases/15.1R/upgrading.adoc @@ -36,7 +36,7 @@ If `/usr/bin/uname was not installed by a package` is shown, see <> If a package name is shown, such as `FreeBSD-runtime-15.0`, see <> below. -[upgrade-source] +[[upgrade-source]] If upgrading via source, see link:{handbook}cutting-edge/#makeworld[FreeBSD Handbook chapter on Updating FreeBSD from Source]. [[upgrade-fu]] diff --git a/website/content/en/releases/9.1R/hardware.adoc b/website/content/en/releases/9.1R/hardware.adoc index c45a41fc1d..1e5f4402e5 100644 --- a/website/content/en/releases/9.1R/hardware.adoc +++ b/website/content/en/releases/9.1R/hardware.adoc @@ -1977,7 +1977,7 @@ Both the 3C656 family of CardBus cards and the 3C556 family of MiniPCI cards hav ''''' -[[FDDI] +[[FDDI]] === FDDI Interfaces [i386, pc98] DEC DEFPA PCI (fpa[4] driver) diff --git a/website/content/en/releases/9.1R/relnotes-detailed.adoc b/website/content/en/releases/9.1R/relnotes-detailed.adoc index 2053758b7d..0f6f4537b7 100644 --- a/website/content/en/releases/9.1R/relnotes-detailed.adoc +++ b/website/content/en/releases/9.1R/relnotes-detailed.adoc @@ -523,7 +523,8 @@ The *zlib* library has been updated to version 1.2.7.[http://svn.freebsd.org/vie ''''' -=== [#releng]#2.5 Release Engineering and Integration# +[[releng]] +=== Release Engineering and Integration The supported version of the *KDE* desktop environment (http://svnweb.FreeBSD.org/ports/head/x11/kde4/pkg-descr?revision=HEAD[`x11/kde4`]) has been updated to 4.8.4. From nobody Tue Jun 23 04:24:41 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gksRL4Dx1z6jH63 for ; Tue, 23 Jun 2026 04:24:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gksRL23q3z47fx for ; Tue, 23 Jun 2026 04:24:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782188686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e90ad7bASiz3UltP9S8UpeLJZ1+zSrIcAPT/bz5lXy4=; b=dPMCEFVHaAgftOol+KzfYaFBC0TtWQzvhA5Bi9UNkUzGeKrpAPwhHi94PVo08w3I+w28m5 b6wjyUxKxHg4HH2/Rjtxa+KW63rhEQsK6zC7jPCYcN7j3NaSWUgYQ8wf5hAZh7hROScK03 HNNBkIab/8iX2FHtQykSE5rRYkeNPOh2syv6YdfHh/bOsXL6K6tPR89l+zpDPVa9PTyrbh WIRKVShxVne2NXls5l9hkuGsRTBqbAXNqxPAkbVy3JVwe57/hvzf8aTwFseeIZaAlHRS7s D/29pktyXAMDIA15xy3XjqOlzCtI+MhitotYwpiCglFt/MjeguQScC8aGMHIbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782188686; a=rsa-sha256; cv=none; b=uGN2OdEZt7vJQbCYVCkjT3lTWCFgOHjOySPUjlvQZ9sUBNEkKnWR4DM3s3y4w2Xwb8QGkw 5xWgnSoAc2b77e9gKh8rrZyfyPVskFzebTzeOWBi861yf58RrwQpqY0Gm+4kX752OyFoOL KsadA3vCfIAxTKhq6TIoBcvEYmkJLjY0GhLk/aDs8jAJ0Z4A2jj6pTm/omHubYKT7yaty6 XzM7sBQdlismQe3q2OiUZXV8Y0/b+X7ukJZ5qdJHglyFmBo22jyVaoHAKri8h7agU+oNkt XeqhmO0Jy27zeGScl0QBsG/HeyvFE5p8kIFRGko7n8P1p0ApVL1A33pcfXchyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782188686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e90ad7bASiz3UltP9S8UpeLJZ1+zSrIcAPT/bz5lXy4=; b=Q3krCZX7DZuUkgD87l6JEYYPC5iAHjbIULv8NA0rbnjrmzBW3Gq78cfBpf47RhWTY27tEH KNHub3ptilKKcP1yanlrOR5h0o2hcvfFerVdk2tWm4pHFoCnULRP7+qiiIUxa5FEWUmM/2 zoRqL2b6t/ZgCC4exeB/8RCYzppr+ZK8JSR1KdsKkC4ucNmeBaKvAmuRf2Goa8Ue9HeQj3 QtehGQjMAN+1GkH1WJRTSoTOo5phKKa20jK8iIJBtiY8aymaGMnVBPDM4ypofZ5W9UgR5P dxup6bMNSwMiRWw9oMvtJBP3tG2u7GO09yFenkr1Ml6EtEGsXnDX0b3AWeA2eg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gksRL0xrSz393 for ; Tue, 23 Jun 2026 04:24:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 226a1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 04:24:41 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Alexander Ziaee Subject: git: a6c9e2c560 - main - website: Turn on verbose asciidoctor build List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a6c9e2c560ac7343d82e3088816374776b9b912f Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 04:24:41 +0000 Message-Id: <6a3a0a89.226a1.2479df02@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/doc/commit/?id=a6c9e2c560ac7343d82e3088816374776b9b912f commit a6c9e2c560ac7343d82e3088816374776b9b912f Author: Alexander Ziaee AuthorDate: 2026-06-23 01:02:42 +0000 Commit: Alexander Ziaee CommitDate: 2026-06-23 04:24:29 +0000 website: Turn on verbose asciidoctor build This shows a lot of typos in anchors. Enable it globally so people see the typos as they are making them and can fix them. --- website/hugo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/website/hugo.toml b/website/hugo.toml index 1e73b65baa..1a0e5fadc1 100644 --- a/website/hugo.toml +++ b/website/hugo.toml @@ -15,6 +15,7 @@ enableGitInfo = true preserveTOC = true [markup.asciidocExt] + verbose = true preserveTOC = true extensions = ["man-macro", "inter-document-references-macro", "sectnumoffset-treeprocessor", "packages-macro", "git-macro"] From nobody Tue Jun 23 14:59:09 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gl7WL3T2Hz6hXrg for ; Tue, 23 Jun 2026 14:59:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl7WL10sZz44f0 for ; Tue, 23 Jun 2026 14:59:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782226750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gKD75BJaS0q4s9wa9zzXTvcVkvdsejUmNVoUvNkFqsc=; b=O7aWAQALfgZMKDtYFZrkoPrnL56bfog7bXXfLl+C69mJS30UTWX9MIZy8o8iyzdG0LJ0NJ eIN3d3/tR4b6891gAxNsdO3uWQFzia4HB71kCCY0cOfQWHzuitLDe7tECV+DxREtsBMiOu YehUDBzOjyfxxK5P30g11C6KD0QTEFzJvk1AWZL+NJCvR93C8DQ683JiuGo6w6mN5L8R8d TKWaCQNX+ZChR+q4ewFN02o6CZdAukelupQLkBbgnqeLXjqzDbCBimPe+RReH91lpCK8qY 0Xd2ecr2bdJKOpCEbpoFm5OjblfkwWdrikvONqLXG1ghH1I2uJVFWlvsZbBBfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782226750; a=rsa-sha256; cv=none; b=IOfbm2zN/sgMf2LpVrTYRl/N4jGmChJrF1rqPbkjhrdj/YkxzWNq/w7rcuffo44WUCv4Hr /FbhtbDKWLawDHZai0Ypf1JTsi79GS+b0WsGbw/cMqCABtL8DbwgRyQLfFNy4htRcEQmRc aYOTSolHxeILamKcMJPCUNyBy710p1zMNNLxvxhVzx+pMUfw5ZUWqHT7xVHQOJWrJJgiQ9 7D+BVj2qh5aX3gh+CfN/+atqkWVNnDDOMcnsf9QzZSl7MyUQ1QsCYjef00CnCsTWfdchLw vOKikyG8LDsKUwbdeWXqy7psqvfJnLhFBozxAOmfB1dl5F+4je2Dl9Jq4ZT6xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782226750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gKD75BJaS0q4s9wa9zzXTvcVkvdsejUmNVoUvNkFqsc=; b=fTN9LWH/mDnnsvXjLu3f6f4XJVMuJDswCzZDUvs9e60DrfpJH4LathZaPdnojNv0JMGYi3 8ftVM6wy/hKele30LILIh66lry0EQIZX+qNRheWbF0RPPfYvi28PAeSN0IxLQbeNnTwtoJ fHmcOxIK4VEljUQVpD1bCYr9mdtu6x4n0om9tf96nNRtDxE2J2jnBK2kenGf4IMFdSo9x4 SnvUq+Vf6ZL3B1LOPehDhVBwdfllOnKbyZFVDNri7mTpn3gZzmiD7MhMf+QWZJ1CDkQOLk ZcZ+5hPQcPXEXPCyZ3pf/OYBm0hVzQDYG6NBelDkHjSGQlKan2lzwtRXrE6/PQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl7WK6DYBzfGR for ; Tue, 23 Jun 2026 14:59:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d442 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 14:59:09 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org Cc: Alfredo Cruz From: Benedict Reuschling Subject: git: 9dfeda70dd - main - handbook/jails: Small fixes to the Linux jail section List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bcr X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9dfeda70dd59b61f43455b76afed50a6d52d9ced Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 14:59:09 +0000 Message-Id: <6a3a9f3d.1d442.4734390d@gitrepo.freebsd.org> The branch main has been updated by bcr: URL: https://cgit.FreeBSD.org/doc/commit/?id=9dfeda70dd59b61f43455b76afed50a6d52d9ced commit 9dfeda70dd59b61f43455b76afed50a6d52d9ced Author: Alfredo Cruz AuthorDate: 2026-06-23 14:48:30 +0000 Commit: Benedict Reuschling CommitDate: 2026-06-23 14:58:56 +0000 handbook/jails: Small fixes to the Linux jail section - Add missing containers/ path in one instance - Move the jail.conf creation to the beginning of this section (slightly modified from the original patch), because it fits better there instead of letting the reader know about it when starting the jail - Use sh as the shell executed when running jexec to ensure it is a jail that is present in Linux - Rephrase a sentence to avoid a comma and instead use "and" to connect the two packages to install (also modified from the original submission) Event: Halifax Hackathon 202606 PR: 295777 Differential Revision: https://reviews.freebsd.org/D57771 --- documentation/content/en/books/handbook/jails/_index.adoc | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/documentation/content/en/books/handbook/jails/_index.adoc b/documentation/content/en/books/handbook/jails/_index.adoc index f3e6eef17f..49f38720b2 100644 --- a/documentation/content/en/books/handbook/jails/_index.adoc +++ b/documentation/content/en/books/handbook/jails/_index.adoc @@ -818,6 +818,13 @@ The next step will be to create a jail as indicated above, for example in crossref:jails[creating-thin-jail-openzfs-snapshots, Creating a Thin Jail Using OpenZFS Snapshots], but *without* performing the configuration. FreeBSD Linux jails require a specific configuration that will be detailed below. +Create an empty [.filename]#/etc/jail.conf# to prevent failures when trying to stop the jail: + +[source,shell] +.... +# touch /etc/jail.conf +.... + Once the jail has been created as explained above, execute the following command to perform required configuration for the jail and start it: [source,shell] @@ -825,7 +832,7 @@ Once the jail has been created as explained above, execute the following command # jail -cm \ name=ubuntu \ host.hostname="ubuntu.example.com" \ - path="/usr/local/jails/ubuntu" \ + path="/usr/local/jails/containers/ubuntu" \ interface="em0" \ ip4.addr="192.168.1.150" \ exec.start="/bin/sh /etc/rc" \ @@ -848,10 +855,10 @@ Execute the following command to access the FreeBSD Linux jail: [source,shell] .... -# jexec -u root ubuntu +# jexec -u root ubuntu sh .... -Inside the jail, execute the following commands to install package:sysutils/debootstrap[] and prepare the Ubuntu environment: +Inside the jail, execute the following commands to install man:pkg[7] and package:sysutils/debootstrap[] to prepare the Ubuntu environment: [source,shell] .... From nobody Tue Jun 23 19:31:25 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4glFYV17mLz6hyTK for ; Tue, 23 Jun 2026 19:31:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glFYV06mJz437j for ; Tue, 23 Jun 2026 19:31:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782243086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FyZujx5k5ZDYt/XxBnedRaMLUijexZdRNcYK0y/ENOQ=; b=fg7wOK07Lp2/pchZmnphf4izyBQ8vtNfWO1yOMwu33ywN/5jxbCZi7OUbkCV1T0jLF1U3P QeTm3/VcoIHyTizvX4v9eYK9rCthF8W25oewQeJRi1Z0lqz+04PCdyfoPUIzwoeJfh52oE X52Xmm91sHFirORI2qlr7drEaLX77gk59LX996kgvcnIf8IOPJbNg50XwNJL7zSMHYIXW/ 4LE5tSaYpzj7+0g9XFxtwSn/QhDAW7UKJt7zxpnALpKnX5QO8UemzkaJW8m71mZwmPR87I bAc+FyludlsXj+gvMETiitPjzTe9NEB1wvZ6lIxHqssuMgUjc2rHJH4jW1xmeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782243086; a=rsa-sha256; cv=none; b=UvLJtlvpBRw/HjMS66XXpmyLHUKVfKTLGD7ZqG0yQ995O3KGEkBDvbBDuU4VpdKuLkp/CM yU/YAOXJXLcZRW2oe3JIpmCnE+7r3BR9crbRFAZxlTCf8HpZbSud2yaWsX/Wp5cd23FVjb ay4IGgltLFR0MJ/cYyAfcBTCFt61X1wOAzhLg4d5ynAdnA+FPbDPpFHF4nJ1ubDdsjG26j y8o4clM2nWUgQ8KTe6jExRi6Ro74m3RVTjpwTaSSZd8LPlqfv/gGWI2cW9yhXYA5NTCHwh c4Ag+khd0pcYoj1/K3URkvNJCva6EruoPBMpVTY3Wv4nEWH3KNzt3n7hpbi41Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782243086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FyZujx5k5ZDYt/XxBnedRaMLUijexZdRNcYK0y/ENOQ=; b=f3bhn0UQ7Sln58aE4aS5RdYNo1YCmeoFWSGrGkUZy7lNwJiPyGEhPUv9Fxynv3baqkfcID agmiXEjYi1TKhqVSz2S6SGZF/h3EYsQu3z3l4OIA1EXrcbJx26n+Mr5+CiLSe1CifQvvvM SDmZcIRKAUMqaOUxJ5jEaNcBkdlaTbDew+r4TFvJ8DI0vnHugzVJaVrRqAa03vrT8ByWiR jGRe/r6FMgehwiJS5C2x4/oejUekEafdL7AgJfURJzT+mQBrVDvVLQmgaiK5bbinmAB+Zz fWtbAt9DN7580T5TwQQMl/0ao6yNkBTHF+01BFUqfDRJS8wOfOug8CdZAUjoGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glFYT5jlnzng4 for ; Tue, 23 Jun 2026 19:31:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4262c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 19:31:25 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Andrey Zakhvatov Subject: git: 830bc8d6a6 - main - website/ru: Update administration.adoc List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andy X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 830bc8d6a6fc28720439783a98665aa675c3bcb6 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 19:31:25 +0000 Message-Id: <6a3adf0d.4262c.3ff18918@gitrepo.freebsd.org> The branch main has been updated by andy: URL: https://cgit.FreeBSD.org/doc/commit/?id=830bc8d6a6fc28720439783a98665aa675c3bcb6 commit 830bc8d6a6fc28720439783a98665aa675c3bcb6 Author: Andrey Zakhvatov AuthorDate: 2026-06-23 19:29:31 +0000 Commit: Andrey Zakhvatov CommitDate: 2026-06-23 19:29:31 +0000 website/ru: Update administration.adoc Update to EN 01bfc34871146e3de912efc4afe374393d265417 --- website/content/ru/administration.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/content/ru/administration.adoc b/website/content/ru/administration.adoc index eab8946902..c877def6f0 100644 --- a/website/content/ru/administration.adoc +++ b/website/content/ru/administration.adoc @@ -195,7 +195,7 @@ https://www.freebsd.org/ru/releng/charter/[Устав команды подго * (vacant) -[[t-srctmgr-secretary]] +[[t-srcmgr-secretary]] == Секретарь Команды управления исходным кодом В настоящее время секретарь Команды управления исходным кодом не назначен; письма пересылаются в Команду управления исходным кодом. @@ -367,5 +367,5 @@ https://www.freebsd.org/ru/releng/charter/[Устав команды подго // // The FreeBSD Russian Documentation Project // -// Original EN revision (21.06.2026): 6ae188e12756359415577a140603168756ec2758 +// Original EN revision (22.06.2026): 01bfc34871146e3de912efc4afe374393d265417 // From nobody Tue Jun 23 19:33:33 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4glFc25DsRz6hykM for ; Tue, 23 Jun 2026 19:33:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glFc24jhNz44LR for ; Tue, 23 Jun 2026 19:33:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782243218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e8tWYjCheoqBFhGsocmK+v84rpTiz0npSeWrpa2zS98=; b=KqJ5xp878xSltev4tsoU8tSkVVnGVVcPoX/0gV1V96xv+S5YpNtEvbwV3O9MG32bzuVllN KIcd1sdY0dZNyTUVhej0sA8s3QMRfHvO2GR83idJhx96LoZ7yLeZHAX4biHRaOifVjyxaO wEwF229joQMk1s1qK9wTWHSTgGC6pIaZH8PtfHLzxSkWpWpEcxJHbC5tDp2X9gf5nyvklA WfXu8a25TBi1pMxEFl0qSd0bvg0nwGLMoO5qgioxwua/fCR52bW8bgPa8yR6g3kYOU7Eo1 RRPTNopeoZ1R2rE6aieL04wYaOu0K4+ubKc7H/2IUICFRtUyNs+Sh9SupGEPlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782243218; a=rsa-sha256; cv=none; b=O3myw5v8/Bngc0vtVAvJQtZpdQsDS44IASNQG+mxoyBnFhjrPOlJi/WHs4IvYgQCwaWC8m TmBBVsWaig8cxISSJ5VxxL7UPXhYS1hCDXmMwDK6JAM9oS/6SanMOhpT/rILE7KqFXGUuL X5vcvGSMbs4TY9o0TLBtysx0NOkia3bfP8Z7/yD2AHvVksix98Q2SfhHnboBDbFGlOTE5u W1x1UoE4C01xvb2VNx7V4cmRM9L2Ye9MS3rJi3M0GyyaZN4i/QWxHrmiukM9sQQg5acHXj QtzPWakAtpvi9xfrQjy/JE4onkvwLawu24xN+eB9OejFboD6QHVtyOv7GItOiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782243218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e8tWYjCheoqBFhGsocmK+v84rpTiz0npSeWrpa2zS98=; b=fCQfkWFQkplsBxmGRPrPcwAet/ih0/iiKkSvmx+Ixub2bHRI6OOpwDBlrWoeGE4qVH6cvi ktrT5HQs1vaiK9ezxn2YweUK2+46KPROCM2xQjlCqLqyyayDIGg3o7b2Ol5t2Qu/QHQuLb +bsPOAGuEYJWkf/me97AizHzugSCkzMiMOtapdaL/znd4yW/VCAV+ayjC8G55e40X6UvIa a2FDFWRiJAhnoC6Fpe+dVydshuKChcCS0QcOg/MCH2dfLzCQ4/vk9yHGJNvDb398Hmdvgh No1bz/oes01zlJ47iFzHHksXl+idl+afFA6CO388BAzsVF+DbVeeDwIlSYje6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glFc23JkCznqB for ; Tue, 23 Jun 2026 19:33:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41b61 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 19:33:33 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Andrey Zakhvatov Subject: git: 3cf576fbc1 - main - website/ru: Update releases/15.1R/installation.adoc List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andy X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3cf576fbc1cefe3f3c1abd463391885abcc78899 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 19:33:33 +0000 Message-Id: <6a3adf8d.41b61.4c2bc8f9@gitrepo.freebsd.org> The branch main has been updated by andy: URL: https://cgit.FreeBSD.org/doc/commit/?id=3cf576fbc1cefe3f3c1abd463391885abcc78899 commit 3cf576fbc1cefe3f3c1abd463391885abcc78899 Author: Andrey Zakhvatov AuthorDate: 2026-06-23 19:32:19 +0000 Commit: Andrey Zakhvatov CommitDate: 2026-06-23 19:32:19 +0000 website/ru: Update releases/15.1R/installation.adoc Update to EN 01bfc34871146e3de912efc4afe374393d265417 --- website/content/ru/releases/15.1R/installation.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/content/ru/releases/15.1R/installation.adoc b/website/content/ru/releases/15.1R/installation.adoc index 00928bc49d..d184cdf0f0 100644 --- a/website/content/ru/releases/15.1R/installation.adoc +++ b/website/content/ru/releases/15.1R/installation.adoc @@ -36,7 +36,7 @@ pkg which /usr/bin/uname Если отображается имя пакета, например `FreeBSD-runtime-15.0`, см. раздел <> ниже. -[upgrade-source] +[[upgrade-source] Если выполняется обновление из исходных кодов, обратитесь к link:{handbook}cutting-edge/#makeworld[главе Руководства FreeBSD, посвящённой обновлению FreeBSD из исходных кодов]. [[upgrade-fu]] @@ -304,5 +304,5 @@ shutdown -r now // // The FreeBSD Russian Documentation Project // -// Original EN revision (16.06.2026): 489ad47db40841523813cc44e5396bee5468928a +// Original EN revision (22.06.2026): 01bfc34871146e3de912efc4afe374393d265417 // From nobody Tue Jun 23 20:27:59 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4glGpr6wV2z6j3rS for ; Tue, 23 Jun 2026 20:28:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glGpr6NQlz3Fcm for ; Tue, 23 Jun 2026 20:28:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782246484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lkjVg3usE+h+DE8S0xh4ZP5VHCuckANa8AasUmEDiOw=; b=aESlZPu7vYI/koDDyQJhbBs4/UFG3zTN630fEn/2kTef0BGZvw2qm5pHNNuCp9ZGpG2/fe jSBFVQ5qt3bE4bgUFYDikxEtgOWzj331N+Xw2DjLM8UyJQSDuDXpCMkc9VO75fv8TNv8JR bXSwO+LKIWEZEXAnwCHs+KCgxAgVymYKwzf5ewm2Esr8sJBKl1ecZ47EkBoITCZNMtLfW1 ryPK0I0OmNf2IXxMa9ZmkG87vmYaDYigUoWq5tMGRfipmzQSlssMf0Ry8Y5E3S9Klv4vTe bR1ng3P7STkCbBLVhw1/k66DMydFDTmWnjAJfn+MQqW351Fx5LHOXH7XeydRiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782246484; a=rsa-sha256; cv=none; b=hRFMnu9UHI45FbfWWtFSp96oPNgUJXUtGq/8bB8rGkFABrmSUl14Q1icVvSb/2cd3PWL0J nJ6DjWzFv9vVGHR1GdP6Di2GSufwDvUz26EG1v7ignEkUVj6aPGrGiDPRyex3tjNQ4OCv2 1XI4hpgijwFcqQSFEeoi5xHZ25KDwKI517PcwItDJUyob6LXgnJyJMKih6/lwzW8xRBbtQ W+DBahpPma0noZRhkG571g3MzLLYSslLul36Y3fBtfnkiiK5iFPHUnNSkGbJjYIJB7hOLS /gszJer4ThsDiySUU+BEEaUA5ANYqZR9kZzS6Mdanu2zTkJc0ys+vhOOXBjtLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782246484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lkjVg3usE+h+DE8S0xh4ZP5VHCuckANa8AasUmEDiOw=; b=SB9sopAGbL6sB7aYc770HYyjT53RabDo9iGsoFdpVRU/cI/dA57NbJ05GVlHn4cdoFU3OQ x5/8qv6is1c5KQzZFwK/P4DhhbFoAAqM/kQYSUL75s9w1k03UJ4J1QwRyP1B1uDsDDQhQ0 AOurR/Fw33kUaqSC6CNaUg23bPzJL4vZw2AF53Opr6fSoTC+iKpK2/OnMd5P3I7AKFksXO hChvHLLCjoaoAPAQ3HvGDPhsMUkIkKI4nRAVbusPh56cG3GV9/Q/XZeEFjfQqxf1zIYzC9 zJqzGXDLvXD6l7sbX58/8XmEzwbz7utvlJImykjW5ZFwqIXqFkajbHL3BwnXWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glGpr54LCzqHp for ; Tue, 23 Jun 2026 20:28:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47939 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 20:27:59 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Andrey Zakhvatov Subject: git: a6a14ee2d1 - main - website/ru: Update where.adoc List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andy X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a6a14ee2d1472a1d715792ba5fa7b952b63e000a Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 20:27:59 +0000 Message-Id: <6a3aec4f.47939.17d83d9a@gitrepo.freebsd.org> The branch main has been updated by andy: URL: https://cgit.FreeBSD.org/doc/commit/?id=a6a14ee2d1472a1d715792ba5fa7b952b63e000a commit a6a14ee2d1472a1d715792ba5fa7b952b63e000a Author: Andrey Zakhvatov AuthorDate: 2026-06-23 20:27:08 +0000 Commit: Andrey Zakhvatov CommitDate: 2026-06-23 20:27:08 +0000 website/ru: Update where.adoc Update to EN 271dd1d2b598ef558236033d0292a473a44d9f0f --- website/content/ru/where.adoc | 71 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 61 insertions(+), 10 deletions(-) diff --git a/website/content/ru/where.adoc b/website/content/ru/where.adoc index 108b463e15..8199992855 100644 --- a/website/content/ru/where.adoc +++ b/website/content/ru/where.adoc @@ -1,5 +1,5 @@ --- -title: "Старт с FreeBSD" +title: "Установка FreeBSD" sidenav: download --- @@ -13,7 +13,7 @@ include::shared/ru/urls.adoc[] [[choose-arch]] [[install]] [[past]] -= Старт с FreeBSD += Установка FreeBSD Операционная система FreeBSD доступна в виде образов, опубликованных на этой странице, а также напрямую у поставщиков облачных решений. Перед тем, как скачивать тот или иной образ, пожалуйста, прочтите link:{handbook}bsdinstall/[**руководство по установке**]. @@ -37,6 +37,61 @@ include::shared/ru/urls.adoc[] Продуктивные релизы являются самыми последними поддерживаемыми версиями, выпущенными в рамках процесса link:../releng[подготовки релизов] и предназначенными для новых инсталляций. +[[download-rel151]] +=== FreeBSD {rel151-current}-RELEASE + +[.tblbasic] +[.tblDownload] +[width="100%",cols="25%,25%,25%,25%",options="header",] +|=== +|Программа установки |Виртуальная машина |Карта памяти SD |Документация +a| +* link:{url-rel}/amd64/amd64/ISO-IMAGES/{rel151-current}/[amd64] +* link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel151-current}/[aarch64] +* link:{url-rel}/arm/armv7/ISO-IMAGES/{rel151-current}/[armv7] +* link:{url-rel}/powerpc/powerpc64/ISO-IMAGES/{rel151-current}/[powerpc64] +* link:{url-rel}/powerpc/powerpc64le/ISO-IMAGES/{rel151-current}/[powerpc64le] +* link:{url-rel}/riscv/riscv64/ISO-IMAGES/{rel151-current}/[riscv64] + +a| +* link:{url-rel}/VM-IMAGES/README.txt[README] +* link:{url-rel}/VM-IMAGES/{rel151-current}-RELEASE/amd64/Latest/[amd64] +* link:{url-rel}/VM-IMAGES/{rel151-current}-RELEASE/aarch64/Latest/[aarch64] +* link:{url-rel}/VM-IMAGES/{rel151-current}-RELEASE/riscv64/Latest/[riscv64] +* link:{url-rel}/CI-IMAGES/{rel151-current}-RELEASE/amd64/Latest/[amd64] (BASIC-CI) +* link:{url-rel}/CI-IMAGES/{rel151-current}-RELEASE/aarch64/Latest/[aarch64] (BASIC-CI) + +a| +* aarch64 +* {blank} +** link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel151-current}/[PINE64] +** link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel151-current}/[PINE64-LTS] +** link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel151-current}/[ROCK64] +** link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel151-current}/[ROCKPRO64] +** link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel151-current}/[RPI] (3/4) +* armv7 +* {blank} +** link:{url-rel}/arm/armv7/ISO-IMAGES/{rel151-current}/[GENERICSD] +* riscv64 +* {blank} +** link:{url-rel}/riscv/riscv64/ISO-IMAGES/{rel151-current}/[GENERICSD] + +a| +* {blank} +* link:../releases/#current[Дата релиза]: {rel151-current-date} +* link:../releases/15.1R/relnotes[Информация о релизе] +* link:../releases/15.1R/readme[Вводная информация] +* link:../releases/15.1R/hardware[Информация об аппаратной совместимости] +* link:../releases/15.1R/installation[Инструкции по установке] +* link:../releases/15.1R/errata[Исправления и дополнения] +* link:../releases/15.1R/signatures[Заверенные контрольные суммы] + +|=== + +== Старые продуктивные релизы + +Старые продуктивные релизы представляют из себя предыдущие релизы, которые всё ещё сопровождаются для обеспечения поддержки существующих инсталляций. + [[download-rel150]] === FreeBSD {rel150-current}-RELEASE @@ -54,7 +109,7 @@ a| * link:{url-rel}/riscv/riscv64/ISO-IMAGES/{rel150-current}/[riscv64] a| -* link:{url-rel}/VM-IMAGES/README.txt[Readme] +* link:{url-rel}/VM-IMAGES/README.txt[README] * link:{url-rel}/VM-IMAGES/{rel150-current}-RELEASE/amd64/Latest/[amd64] * link:{url-rel}/VM-IMAGES/{rel150-current}-RELEASE/aarch64/Latest/[aarch64] * link:{url-rel}/VM-IMAGES/{rel150-current}-RELEASE/riscv64/Latest/[riscv64] @@ -79,7 +134,7 @@ a| a| * {blank} * link:../releases/#current[Дата релиза]: {rel150-current-date} -* link:../releases/15.0R/relnotes[Описание релиза] +* link:../releases/15.0R/relnotes[Информация о релизе] * link:../releases/15.0R/readme[Вводная информация] * link:../releases/15.0R/hardware[Информация об аппаратной совместимости] * link:../releases/15.0R/installation[Инструкции по установке] @@ -134,7 +189,7 @@ a| a| * {blank} * link:../releases/#current[Дата релиза]: {rel144-current-date} -* link:../releases/14.4R/relnotes[Описание релиза] +* link:../releases/14.4R/relnotes[Информация о релизе] * link:../releases/14.4R/readme[Вводная информация] * link:../releases/14.4R/hardware[Информация об аппаратной совместимости] * link:../releases/14.4R/installation[Инструкции по установке] @@ -143,10 +198,6 @@ a| |=== -== Устаревающие продуктивные релизы - -Устаревающие продуктивные релизы представляют из себя предыдущие релизы, которые всё ещё сопровождаются для обеспечения поддержки существующих инсталляций. - [[download-rel143]] === FreeBSD {rel143-current}-RELEASE @@ -258,5 +309,5 @@ image::../../gifs/fastlyLogo-red-SVG.svg[Fastly Logo,120] // // The FreeBSD Russian Documentation Project // -// Original EN revision (22.05.2026): 1ca0b588b4436bed5d97c8372a06c3fe7b3d7564 +// Original EN revision (13.06.2026): 271dd1d2b598ef558236033d0292a473a44d9f0f // From nobody Tue Jun 23 23:08:38 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4glLND6XFgz6jJQd for ; Tue, 23 Jun 2026 23:08:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glLND4Pbjz3bxR for ; Tue, 23 Jun 2026 23:08:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782256124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1HQ6WX7p73oQhDMG9dlYTzeGSld34ZW2oNOiDHPR9Qc=; b=ZIzepgjDhrUNZj8qEVnw2S15ZiNF0ah2qGL1I3MothhzLXLC12lN1ojQdm1/JQUW4zUfEj X9XtjlAvtut+rlklayIOvXqTjKNNeYtGhfeykX9iZmHRxn0kK5EQiql+0ysD86ljalCVbV M+f98eNEqXM83iM4V7axaFU9ddys6z4/qvu6KSIfafnKWTjbYZ27j1J9zpiHUWbMS/k5J9 McAnqtesjg4RESl/7fZmR4puHcOJzsXlbElnULoiTdBcljDyxE7S3c8hkP7j+O8kxTqBVL LwchfjPgZXW64WoL0IlzrWZbmPz7j0Kc9BpGppefrYbMmWqIuI66zeNo1UbdZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782256124; a=rsa-sha256; cv=none; b=Vxdb89upDwAw3ciSjrmxbo+jbwGIV6VeeJvJSLo2C4kE9pw7pon8JqeUzwA0KiAZPU947x PXlNBDgF3WpFwb302pwvT8Uxg+jh6YpgC74pwa1hA2MiovVYXTZljjUgeIWTidKcYn91Hf ZXMOjGUYZadG8Wh/tTtHSCGFNj8+ua+4dHN8itiPhe78z2Aw6ptGYs2ZioXO2nlctCIZAM jxcql/5UifOblg9Rpmb6InsX6puClp1WclaIowIsRCkXMof/hLcNmmSajEIMQnn527XQAP c1vXafqQN40MGg8ucU03pvuT9Ub1bvietZFPqFaEwipVj+YM8Yi7y2/k2Zmpsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782256124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1HQ6WX7p73oQhDMG9dlYTzeGSld34ZW2oNOiDHPR9Qc=; b=wpMj3xZ6Rf3zmcWb7SSXGN6fPaBaVZ9IGSAo+EGQY3qsGzkxdWA0KT4sbYGhPEfFUeiQa3 7cnr8GEO7xb3h0ReD73oa2e9yOvOWMlzT4tp5CMMVmjdf0nZ5co3ZTSr73HxVE6oVNj3in drbPIu9ZTn/hZk3fgjUd4ErXnKOBG/NJyl3FT8GdHyZBOG9ZcKL9JikiUldoNooruSch2N h0Ci8VbmMli6qNYr2pFtHZ11E1zoJYGR6JMjEG7JXoZVtv1AHvMLupmGxdqryTkoPvRk73 rMgWRgqhJ1FobmFGt3W3Pzm65tBbvAfngPVP/WP66Lc+QeoGjYb7HoB0ZaJyJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glLND04RYzv8V for ; Tue, 23 Jun 2026 23:08:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 312e7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 23:08:38 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Colin Percival Subject: git: f3fafbb226 - main - 15.1: Hand off to so@ List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f3fafbb2269e32004327c79e90ba48fbdf545d0d Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 23:08:38 +0000 Message-Id: <6a3b11f6.312e7.216fb2e8@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/doc/commit/?id=f3fafbb2269e32004327c79e90ba48fbdf545d0d commit f3fafbb2269e32004327c79e90ba48fbdf545d0d Author: Colin Percival AuthorDate: 2026-06-23 23:08:06 +0000 Commit: Colin Percival CommitDate: 2026-06-23 23:08:35 +0000 15.1: Hand off to so@ The release engineering team is done with releng/15.1. Approved by: re (implicit) --- website/content/en/releng/_index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/en/releng/_index.adoc b/website/content/en/releng/_index.adoc index c05bfec390..637b29f073 100644 --- a/website/content/en/releng/_index.adoc +++ b/website/content/en/releng/_index.adoc @@ -50,7 +50,7 @@ This table lists the code freeze status for major branches of the `src/` reposit |Branch |Status |Contact |Notes |`main` |Open |committers |Active development branch for 16.0-CURRENT. |`stable/15` |Open |committers |Development branch for FreeBSD 15-STABLE. -|`releng/15.1` |Frozen |re@FreeBSD.org |FreeBSD 15.1 supported errata fix branch. +|`releng/15.1` |Frozen |security-officer@FreeBSD.org |FreeBSD 15.1 supported errata fix branch. |`releng/15.0` |Frozen |security-officer@FreeBSD.org |FreeBSD 15.0 supported errata fix branch. |`stable/14` |Open |committers |Development branch for FreeBSD 14-STABLE. |`releng/14.4` |Frozen |security-officer@FreeBSD.org |FreeBSD 14.4 supported errata fix branch. From nobody Tue Jun 23 23:58:01 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4glMTB5wvqz6h7rD for ; Tue, 23 Jun 2026 23:58:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glMTB5Q2cz3h0x for ; Tue, 23 Jun 2026 23:58:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782259086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nsd+Z7JDH4xBkAGScJumycR9hXIQ+vdIcNC+C5+TnoM=; b=tmhd36Okt2PZoTpoeaZxyeSa1+/vUN6c9Ghj3RX/2XYTB3Yz+92ZB+oZWfS1drLHQta3xi 5HSxG0rF0leaDq/I5pUqVLn4PJAw8epmsSV6FS1rzWxew10Gdu/fLqn9FeEnVjCwCMzZV8 Lts7+omm5/NKSjk42gAqLk9vpbYqOionREl5QspJFFWkRZIGzVK6jqKO4XSDrkCx328v/T I+h3cGeuXipmTDeIKCiSZsC+bsrRjjQxRBGKr+607FkY1pwUrtAPJduqncdCsExwW9OqIY GTGkpx7pDCB20tG2O9c1duTzuYnPOsW6NgE4REyr5P/ekda/jQOFceMl+ZYfXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782259086; a=rsa-sha256; cv=none; b=Wo9yO+zYe3siqF8GHKwP/TVufbzAYFxhGf7lBwJ24s9lq+xYYsLWfk6fUf/bpCzIU+H6iB 7BEv8uLELnPJZvoESGjRsFS2/IK9kz+iuDhICuVtwB6KX2rRoX6AH0TFt92KP1hSrf4UIg 9ozwfWhKZc4ksYRUByz6Z6E4VbddKL+npjQhQqyR9npPRGm5t+zdx/vZOJjtUqO4enGfM4 aJUlujlXyb7/q1k4r5hIxHvWm2DWFIBYquSDq++MRzOk5GDSpggFqbTs4it5iyjkZM5XaA buHCtM7+SPTEp4jbYyT/l6hjB5qb6PhehTYkGPMD0o52BJcZdh9/t+9EwH+gVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782259086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nsd+Z7JDH4xBkAGScJumycR9hXIQ+vdIcNC+C5+TnoM=; b=JA+0Vpj4GJNsuUqy78YIjBzH7eEBpi98P5y8/lNupwD210NHChDojWYn3hGuMdVnESyFhB p55ijRE/n+i/UwXFxyZFboayacWPcz0kHadwIh8ygHJBAcwhoVWXN+MLrAxZQ1RUfman6h b4au3KVDdYbrW1xs8GtyaNKzj3sUFcsMwp23tTSLycjFkDZg1H3kyQvvYw5jVYqkMSuNML 3bLW9CkXzfyUmS18/bPEEVumabmjKoXYK18nfgKXz1tCDOyTLfgUCcWWWEHCSwGhRQNX6M rVgX/5/zZbvomyB+h2n4ivppMLXzR8l4ZxK9TyaLrSyyQZZEYnmtH2PAWl+7GA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glMTB48bCzwBM for ; Tue, 23 Jun 2026 23:58:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 367a6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 23:58:01 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Alexander Ziaee Subject: git: d357e2acef - main - 15.1R: Use native redirect instead of duplication List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d357e2acefe52f4a767b5da0761b12892850b5ed Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 23:58:01 +0000 Message-Id: <6a3b1d89.367a6.6f0998c8@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/doc/commit/?id=d357e2acefe52f4a767b5da0761b12892850b5ed commit d357e2acefe52f4a767b5da0761b12892850b5ed Author: Alexander Ziaee AuthorDate: 2026-06-23 23:56:43 +0000 Commit: Alexander Ziaee CommitDate: 2026-06-23 23:56:56 +0000 15.1R: Use native redirect instead of duplication This will reduce maintenance burden going forward, also it serves to demonstrate that we can trivially implement redirects in the tree vs doing other things that are more labor intensive. Differential Revision: https://reviews.freebsd.org/D57792 --- .../content/en/releases/15.1R/installation.adoc | 303 --------------------- website/content/en/releases/15.1R/upgrading.adoc | 1 + 2 files changed, 1 insertion(+), 303 deletions(-) diff --git a/website/content/en/releases/15.1R/installation.adoc b/website/content/en/releases/15.1R/installation.adoc deleted file mode 100644 index 89674edd26..0000000000 --- a/website/content/en/releases/15.1R/installation.adoc +++ /dev/null @@ -1,303 +0,0 @@ ---- -title: "FreeBSD 15.1-RELEASE Upgrading Instructions" -sidenav: download ---- - -:releaseCurrent: 15.1-RELEASE -:releasePrev: 15.0-RELEASE -:releasePrevLegacy: 14.4-RELEASE -:localRel: 15.1 - -include::shared/en/urls.adoc[] - -= FreeBSD {releaseCurrent} Upgrading Instructions - -== Abstract - -This note details the procedure for upgrading existing installations to FreeBSD {releaseCurrent}. - -[[upgrade]] -== Introduction - -This document explains the procedure for upgrading existing {releasePrevLegacy} or {releasePrev} installations to {releaseCurrent}. -Systems running older releases must be upgraded incrementally to one of these releases before performing this upgrade. - -Before upgrading the operating system, back up _all_ filesystems, read the link:../errata[late-breaking errata] for known issues and workarounds, and the link:../relnotes[release note] for major changes and incompatibilities. - -The procedure for binary upgrades depends on the method used to manage the operating system. -To determine this, run the following command: - -[source,shell] ----- -pkg which /usr/bin/uname ----- - -If `/usr/bin/uname was not installed by a package` is shown, see <> below. - -If a package name is shown, such as `FreeBSD-runtime-15.0`, see <> below. - -[[upgrade-source]] -If upgrading via source, see link:{handbook}cutting-edge/#makeworld[FreeBSD Handbook chapter on Updating FreeBSD from Source]. - -[[upgrade-fu]] -== Upgrading with Distribution Sets - -Systems deployed via distribution sets are upgraded via man:freebsd-update[8]. -Systems running {releasePrevLegacy} or {releasePrev} can be upgraded as follows: - -. **Apply all Pending Patches**: -+ -Always fetch and apply all pending patches to the current system before upgrading: -+ -[source,shell] ----- -freebsd-update fetch -freebsd-update install ----- -+ -. **Upgrade the Kernel** -+ -Fetch and install the new kernel: -+ -[source,shell,subs="verbatim,attributes"] ----- -freebsd-update upgrade -r {localRel}-RELEASE -freebsd-update install ----- -+ -During this process man:freebsd-update[8] may ask for help in merging configuration files. -+ -. **Reboot into the new Kernel** -+ -Reboot into the new kernel before installing the new userland: -+ -[source,shell] ----- -shutdown -r +10min "Rebooting for a kernel upgrade" ----- -+ -. **Upgrade the Userland** -+ -After rebooting, run man:freebsd-update[8] again to install the new userland components: -+ -[source,shell] ----- -freebsd-update install ----- -+ -man:freebsd-update[8] may prompt to rebuild or reinstall all third-party software due to changes in system libraries. -Follow those instructions as needed. -+ -[TIP] -==== -If upgrading from {releasePrevLegacy} and reinstalling all third-party software is not possible, install the package:misc/compat14x[] package. -==== -+ -. **Remove Old Files** -+ -Run man:freebsd-update[8] again to remove stale base system files: -+ -[source,shell] ----- -freebsd-update install ----- -+ -. **Upgrade the Boot Loader** -+ -To determine which boot loader to update on your system, run the following command: -+ -[source,shell] ----- -sysctl machdep.bootmethod ----- -+ -Continue to <> or <> below. - -[[upgrade-pkg]] -== Upgrading with Base System Packages - -Systems deployed with a packaged base system are upgraded via man:pkg[8]. -Systems running {releasePrevLegacy} or {releasePrev} can be upgraded as follows: - -. **Snapshot the Current Installation** -+ -Take a recursive snapshot of the functioning system named with the current date: -+ -[source,shell,subs="verbatim,attributes"] ----- -bectl create -r pre-{localRel} ----- -+ -The boot loader offers a menu to boot from this if the upgrade needs to be rolled back. -+ -. **Upgrade the Package Manager** -+ -[source,shell] ----- -pkg upgrade -yr FreeBSD-ports pkg ----- -+ -. **Upgrade the Base System** -+ -[source,shell] ----- -pkg -oABI=FreeBSD:15:$(uname -p) -oOSVERSION=1501000 upgrade -r FreeBSD-base ----- -+ -After the upgrade, review any messages printed by `pkg(8)`. -Some packages may require additional configuration steps such as running `service setup`. -Follow those instructions as needed. -+ -. **Upgrade Third‑party Kernel Modules** -+ -Third party kernel modules must also be upgraded with the base system: -+ -[source,shell] ----- -pkg upgrade -r FreeBSD-ports-kmods ----- -+ -If the installation is not using these, man:pkg[8] will reply accordingly. -+ -. **Check for Failed Configuration Updates** -+ -If man:pkg[8] is unable to merge configuration file updates, it will install the new configuration as a `.pkgnew` file. -Check for them with the following command: -+ -[source,shell] ----- -find /etc /usr/local/etc -name '*.pkgnew' -ls ----- -+ -If they exist, compare them with the deployed version (e.g., `diff /etc/rc.conf /etc/rc.conf.pkgnew`) and merge any necessary changes. -+ -. **Upgrade the Boot Loader**: -+ -To determine which boot loader to update on your system, run the following command: -+ -[source,shell] ----- -sysctl machdep.bootmethod ----- -+ -Continue to <> or <> below. - -[[upgrade-loader-uefi]] -== Upgrading the UEFI Boot Loader - -[start=7] -. **Identifying the ESP** -+ -Identify the EFI System Partition (ESP) where the boot loader resides by executing the following command: -+ -[source,shell] ----- -efibootmgr -v ----- -+ -The output should be similar to the following: -+ -[source,shell] ----- - +Boot0000* FreeBSD HD(1,GPT,f859c46d-19ee-4e40-8975-3ad1ab00ac09,0x800,0x82000)/File(\EFI\freebsd\loader.efi) - nda0p1:/EFI/freebsd/loader.efi (null) ----- -+ -The active boot loader entry is preceded with a plus (+) character. -Note the location of the bootloader, in this case `EFI/freebsd/loader.efi` on `nda0p1`, though systems vary. -+ -. **Mounting the ESP** -+ -If the ESP is not already mounted at [.filename]#/boot/efi#, mount the partition listed in the `efibootmgr` output: -+ -[source,shell] ----- -mount_msdosfs /dev/nda0p1 /boot/efi ----- -+ -. **Install the Boot Loader** -+ -On AMD64 systems, upgrade the boot loader in the configured and default positions by executing the following commands: -+ -[source,shell] ----- -cp /boot/loader.efi /boot/efi/efi/freebsd/loader.efi -cp /boot/loader.efi /boot/efi/efi/boot/bootx64.efi ----- -+ -Note that some installations may not have `freebsd/loader.efi`. -+ -For AArch64 systems, execute the following commands instead: -+ -[source,shell] ----- -cp /boot/loader.efi /boot/efi/efi/freebsd/loader.efi -cp /boot/loader.efi /boot/efi/efi/boot/bootaa64.efi ----- -+ -Other architectures vary accordingly; consult man:loader.efi[8] if necessary. -+ -. **Finish** -+ -Reboot after completing the upgrade to FreeBSD {releaseCurrent}: -+ -[source,shell] ----- -shutdown -r +10min "Rebooting for a system upgrade" ----- - -[[upgrade-loader-bios]] -== Upgrading the BIOS Boot Loader - -For systems that boot via BIOS or UEFI CSM and use the GPT partition scheme, bootstrap upgrades are optional unless a ZFS root pool is upgraded (which is discouraged). -Upgrades are only possible if the `freebsd-boot` partition is at least 180K; 512K is now standard. - -[start=7] -. **Identify the freebsd-boot Partition** -+ -Identify the `freebsd-boot` device name and partition index by executing the following command: -+ -[source,shell] ----- -gpart show ----- -+ -The output should be similar to the following: -+ -[.screen] ----- - => 34 246162605 ada0 GPT (224G) - 34 1024 1 freebsd-boot (512K) ----- -+ -Note the name (`ada`) and index (`1`) of the `freebsd-boot` partition. -+ -. **Upgrade the Boot Loader** -+ -When using ZFS on BIOS, upgrade the bootcode by running the following command: -+ -[source,shell] ----- -gpart bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 1 ada0 ----- -+ -Where `1` is the index of the `freebsd-boot` partition. -+ -If booting from a storage array, repeat this step for all disks in the pool. -+ -When using UFS on BIOS, execute the following command instead: -+ -[source,shell] ----- -gpart bootcode -b /boot/pmbr -p /boot/gptboot -i 1 ada0 ----- -+ -. **Finish** -+ -Reboot after completing the upgrade to FreeBSD {releaseCurrent}: -+ -[source,shell] ----- -shutdown -r now ----- - diff --git a/website/content/en/releases/15.1R/upgrading.adoc b/website/content/en/releases/15.1R/upgrading.adoc index 89674edd26..5afe4eac94 100644 --- a/website/content/en/releases/15.1R/upgrading.adoc +++ b/website/content/en/releases/15.1R/upgrading.adoc @@ -1,6 +1,7 @@ --- title: "FreeBSD 15.1-RELEASE Upgrading Instructions" sidenav: download +aliases: installing --- :releaseCurrent: 15.1-RELEASE From nobody Wed Jun 24 01:01:05 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4glNsy6pkkz6hF2q for ; Wed, 24 Jun 2026 01:01:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glNsy6FDlz3qvJ for ; Wed, 24 Jun 2026 01:01:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782262870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=30I99bDo1XZlucIhl/NvVUpe7fA28aRyu45Xfq++/Ec=; b=bPiaG9Y6ELeapDZUYgYxJBkHid19rmd7HUDS5qLsd9v2bsaRm2yidKdalWeAVH3bvLzMho mX8iDRdKvb4lbs3sflpmgNEyR551bug+YdzGNLRc1lcjEHClyBtXWmKLOkn70hW8QK9fi1 TEOcC4Ama3VFOD1BUK/5E+h8DMGy9H9SsoDrR/TZcZ3xzhUP+qYi77PXS/qAXHsKCKty4h 8pdUuNgdQ0DmfGQw0OrveXabmVGjp5Ecok2OxVCHwO8F8HGfPck3wB/fKRfZencBLbn1lV XuXv9joJeE+YHGrJ/g54pbtyVhwJizzNyusAbMw4gyso6BUCZOwEh4gFwhhlsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782262870; a=rsa-sha256; cv=none; b=Ecogw1Nti2vCTWnlcTUYu129HnNiZYtpAq0nfInOpTpkDYYYkloOaC+sQsD0HxfhW+kTQv Ld5eO/NXMX5JGnWXXhBA+bIZfgv/ahrROUArDlFagLORJIKV/256FNMYbG/mGzsMOdh/IM Hl74nRT3KcKmPdGtW5HiFcUeCOzbIyrv4EKVOk+LoCjEO2R8uw25J3ASHCqVD4qqRvGaeQ SBbiXgf2RmDy7TR4QiPfd2C02OxjpRUvPBhwbfGUJpcNV7duTR63LnMuZfJ/iDqUPJRKXQ iz7gu4X3Hx6gvT4j57MKcRRcRlL9GlWkqEGP0ee8U1bsJ/Cy/QQHnLzo1XPzGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782262870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=30I99bDo1XZlucIhl/NvVUpe7fA28aRyu45Xfq++/Ec=; b=eD8BfFWkXU0IgwOpGNYPskTq9FZdrd1MXUpknHxZ+2oHOx07hoHAwzxl880EmfiQEOBOiw XJAMoy+Ri7aDru1TEldVvwIGV83mVbpV324TEy18mOYAAm4tOUmUSwK6H28sSCb0f0jYEj GKvM/Q3PTKlhoQ8KwmDT+LzSd8qeSokw65FwuzK0aRad6Pnz5qQV1ZIYZj3z8J2EaxFUdk 6NaFvkE8jaZmd+VU9sS4CiuImYxgdFtaI/hQsEroPikxrDDVsGiJqE+eQ79JoaQu8dFaeZ eR+Xv1zNBhebFg8ryoUzJpL7IIAbTMgSYslp9u/wBWY0wEIKrQwteVQQKPfr0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glNsy4ymMzxTg for ; Wed, 24 Jun 2026 01:01:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cf4c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Jun 2026 01:01:05 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Alexander Ziaee Subject: git: 4df494ffc4 - main - 15.1R: Fix typo in redirect List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4df494ffc469a8e3b8e4f760dc76e8223529143b Auto-Submitted: auto-generated Date: Wed, 24 Jun 2026 01:01:05 +0000 Message-Id: <6a3b2c51.3cf4c.a93a3bc@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/doc/commit/?id=4df494ffc469a8e3b8e4f760dc76e8223529143b commit 4df494ffc469a8e3b8e4f760dc76e8223529143b Author: Alexander Ziaee AuthorDate: 2026-06-24 00:57:52 +0000 Commit: Alexander Ziaee CommitDate: 2026-06-24 00:57:52 +0000 15.1R: Fix typo in redirect Fixes: d357e2acefe5 (15.1R: Use native redirect instead of duplication) --- website/content/en/releases/15.1R/upgrading.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/en/releases/15.1R/upgrading.adoc b/website/content/en/releases/15.1R/upgrading.adoc index 5afe4eac94..7588186f71 100644 --- a/website/content/en/releases/15.1R/upgrading.adoc +++ b/website/content/en/releases/15.1R/upgrading.adoc @@ -1,7 +1,7 @@ --- title: "FreeBSD 15.1-RELEASE Upgrading Instructions" sidenav: download -aliases: installing +aliases: installation --- :releaseCurrent: 15.1-RELEASE From nobody Wed Jun 24 18:38:41 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4glrLH04wTz6jd9d for ; Wed, 24 Jun 2026 18:38:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glrLG54dzz3lBX for ; Wed, 24 Jun 2026 18:38:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782326326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xfgfqmfBjl/xhumt/2/ACgLLxMbdvICij1cYDORknkE=; b=C8racs7f8mnaOqVJo9ikQbZDwiqHmgNCfdTIlmib4jML3EDvDBnbS7D/pPXXwnwHzOZjAW HIU4MfwG6V5SFt0O5J7BH8O7jAE8xS/8LTEzmouTHi24u/3IFEA/YPqWakOSgmfJgqJmUf ziDMsq1ZDc07vp1+J7+nwmcf7utG/afNKGDP4uFQsy4OoFjOrAAJr5bh2F3P9L+Q30NVqO G+egXzu6ZKKWMTUTDYqjRQn+uN8/0Q2tpIbcTBCLOFFxw+tpFw2WLLCIjE7W60AZ0DMJ4p axXBMiAoz4TP8e/GBWS6e5PO2XN/Mt2PDlLckns3wkoMjjO9+OvJAoiy97uZDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782326326; a=rsa-sha256; cv=none; b=hiDqppPHB78AqUEHfqL/RqjXzwhc+IWA+mc8xDY3fGcpRemQKZ4/zlUPI3WxxvTJ5ZeerK 7dnutHfpaUbgazoEcQRSroaF1SCMACF6yvOwbkk6R5zMjaJCqramFvEoLjIutrvDfc4vuf EmafPmNeQZF7tnQ04WZUI+VaOSkVjWwgAGJwX1Rg6VGL0kiiFZ12VUfwYWtLmy2bUVs84P VhRYZX/LrOkxNQjHne0QDOCtyGZVkla/MjbzqMfe2ml7O/PB1RNIomZC2LTPPCKhK6uhmE 79r17NvIvB5JRQHV6VjJ6CFfZ9x89owHojwDKfcaAWRtsg+ZKDdmDisLiYJ9Kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782326326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xfgfqmfBjl/xhumt/2/ACgLLxMbdvICij1cYDORknkE=; b=ZfclQkZJ5xZLahojLg5mc3iD2mfXdhkST+ZvtwegaYhP3dXamvg9NtFmAr4uaaBkzLdPj4 oiQm8HbXXgQ7tNWO3gmCNq03UCel9cjR+m4+y2kg2Ri5XPYKts/OdTRz6LRG7HTvI2a+mb abkwOJAt4WOPP8APH5AOveDNKgZmxeZbi2gt4prae+7MneOFapssDJoL6KkJGUca6iWAEP OSQ7WWIR5xbrnmd8WWKbFk/oX20IH7Z9ej3mGjIk/lH4T6CFOPUzFVsslnNM0FXg/dBHOr /Zo1kVymXKHLySEqr7jhKtVJ+SLdEclitCa921LucgQG7LX2bRRcvqglCbziqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glrLG3fX6zXQ8 for ; Wed, 24 Jun 2026 18:38:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3aa6d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Jun 2026 18:38:41 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org Cc: Mark Phillips From: Sergio Carlavilla Delgado Subject: git: f72bfbd898 - main - Website - Theme: Fix burger menu on mobile List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: carlavilla X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f72bfbd898298060a9e0400bc0b47bf7194625e4 Auto-Submitted: auto-generated Date: Wed, 24 Jun 2026 18:38:41 +0000 Message-Id: <6a3c2431.3aa6d.7f93e969@gitrepo.freebsd.org> The branch main has been updated by carlavilla: URL: https://cgit.FreeBSD.org/doc/commit/?id=f72bfbd898298060a9e0400bc0b47bf7194625e4 commit f72bfbd898298060a9e0400bc0b47bf7194625e4 Author: Mark Phillips AuthorDate: 2026-06-24 18:37:46 +0000 Commit: Sergio Carlavilla Delgado CommitDate: 2026-06-24 18:37:46 +0000 Website - Theme: Fix burger menu on mobile Differential Revision: D57739 --- website/themes/beastie/assets/styles/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/themes/beastie/assets/styles/main.css b/website/themes/beastie/assets/styles/main.css index c3fd154758..ee09ce3361 100644 --- a/website/themes/beastie/assets/styles/main.css +++ b/website/themes/beastie/assets/styles/main.css @@ -732,7 +732,7 @@ input[type='checkbox'] { } .sub-menu .title { - display: none; + display: block; border-bottom: none; } From nobody Wed Jun 24 18:51:59 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4glrdX1LpCz6jf5Z for ; Wed, 24 Jun 2026 18:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glrdX0Bnqz3mty for ; Wed, 24 Jun 2026 18:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782327120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1dn7uXKQTq+vFpduzU6zLP8QTWy3yC0UNxQ4JJbeKNk=; b=cBcf7QUUn2O4JTgLxe3pBv60sopHm7z1sYgHLyAaKOXSDWAh6SVcX4gSifCLXyj0l8KMtM GCdYuLB+OmWcTlrc9+HUMV1YTAKIsFovNqgPhUyZIm1CHXeTYvOKjzeNEnLEBbJAZn9vBg jxhDh+qLgpn/coVaCpfnluJHI13EoFVLNhXdquBVW2sRfaOeg0crvFFHHM5deioS3pnBa0 4mkOnTkMwVIX8Nh//8ngn2mnCvQOWVlFV2nS8k+Kw88P1amyM019AOCKPovBKqiKVjWS1B 8UGcY/uaCw55j3uWhyaAYLVH4n7vPgFHPLe4U986WJyDnEqPeumv9ycLgucqCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782327120; a=rsa-sha256; cv=none; b=ctI7ELqsqaY2Yi+LFvtaZrtNO3ByN8DmbNIYEIXULat0NIC5yFpQY8sbEHfiNRUGU1KKuL /Qky3DaU8e9t0TPB7s6DF8jOycnBkh+4pW5izCh3q7BMIXRTwBvm+w6jgr3PLLGBdBF4fV g1oE34w3aCaDqGL3VtAgkVmWnhZuyrpZDtdLLPe9HFJVCR6podPBwQlEpGgb1Ux23lSs0R wsO7Dy/M0/PUnWieoA2ZgHRzWWvZSG9ASTJqsfzCj1wCyKQslOl0M2hYLMrZ9femHwDppO LwIgEjZWRaejHkjcBDQxDC3UClLe1z29FvtNW8Bxj40unW6TQe3HYvEW6xXqVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782327120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1dn7uXKQTq+vFpduzU6zLP8QTWy3yC0UNxQ4JJbeKNk=; b=xnA0d+pi6zyVUH4cAQejPlk+bx8pF4SOHAMVZZYhiAyJB6YZwHBjTIOhLzwVXmOj14CIHs GpAhCIJOG4sPc7roIubOFeV8ZCqwKlJbghTllwOnl7iO5XzHw40TTfli6tdfsRu1If5A1R 5ihb/p0fW/cHV07JvmQK+WPZwJIaApE9mgstlYBydBf2+Fp9ewZoiBqn62nR7huwVejFbp OVd+o8R6JIYvqHfTtc9Tklt7OscXO5O1pbsagtkEB4OhOmK/1L38Bkf8aSBbDIhltCPlV1 +gza135hIg+hEpUoCq88svwjcHGR8IkzPvuZyGhq+d499outw8niHKrXZYwlWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glrdW5qnWzYrh for ; Wed, 24 Jun 2026 18:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e847 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Jun 2026 18:51:59 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Andrey Zakhvatov Subject: git: 2c4a9b371e - main - website/ru: Update releng/_index.adoc List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andy X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c4a9b371e7c738df47c7ad86ff2254e76925917 Auto-Submitted: auto-generated Date: Wed, 24 Jun 2026 18:51:59 +0000 Message-Id: <6a3c274f.3e847.23dbce57@gitrepo.freebsd.org> The branch main has been updated by andy: URL: https://cgit.FreeBSD.org/doc/commit/?id=2c4a9b371e7c738df47c7ad86ff2254e76925917 commit 2c4a9b371e7c738df47c7ad86ff2254e76925917 Author: Andrey Zakhvatov AuthorDate: 2026-06-24 18:50:52 +0000 Commit: Andrey Zakhvatov CommitDate: 2026-06-24 18:50:52 +0000 website/ru: Update releng/_index.adoc Update to EN f3fafbb2269e32004327c79e90ba48fbdf545d0d --- website/content/ru/releng/_index.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/content/ru/releng/_index.adoc b/website/content/ru/releng/_index.adoc index ab87214c7a..ed2fb3f9ca 100644 --- a/website/content/ru/releng/_index.adoc +++ b/website/content/ru/releng/_index.adoc @@ -50,7 +50,7 @@ include::shared/ru/urls.adoc[] |Ветка |Статус |Контакт |Примечания |`main` |Открыта |коммиттеры |Ветка активной разработки для 16.0-CURRENT. |`stable/15` |Открыта |коммиттеры |Ветка разработки для FreeBSD 15-STABLE. -|`releng/15.1` |Заморожена |re@FreeBSD.org |Поддерживаемая ветка FreeBSD 15.1 для исправления ошибок. +|`releng/15.1` |Заморожена |security-officer@FreeBSD.org |Поддерживаемая ветка FreeBSD 15.1 для исправления ошибок. |`releng/15.0` |Заморожена |security-officer@FreeBSD.org |Поддерживаемая ветка FreeBSD 15.0 для исправления ошибок. |`stable/14` |Открыта |коммиттеры |Ветка разработки для FreeBSD 14-STABLE. |`releng/14.4` |Заморожена |security-officer@FreeBSD.org |Поддерживаемая ветка FreeBSD 14.4 для исправления ошибок. @@ -111,5 +111,5 @@ include::shared/ru/urls.adoc[] // // The FreeBSD Russian Documentation Project // -// Original EN revision (13.06.2026): 271dd1d2b598ef558236033d0292a473a44d9f0f +// Original EN revision (23.06.2026): f3fafbb2269e32004327c79e90ba48fbdf545d0d // From nobody Wed Jun 24 19:11:14 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gls3r2JFFz6jgHh for ; Wed, 24 Jun 2026 19:11:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gls3r1KPpz3q8D for ; Wed, 24 Jun 2026 19:11:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782328280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sz++htGrV3z2D4BDeK/UG05F9iC608g9Ij1EIrqvvJ8=; b=egZEoJHyLVlwBufKcxWdyWckV5jbj63i/woe+jc+JDtcDG6pcKHxpDCCblIisuT537j4vg X6gGB0dZ6cvW6Oq6gznbizSvbp9h2YLvQs32/bG/OgS2cbyImLid+LHLF4CEQ6bpmnWlZ5 gr6NSXXMCWTgEATcYWK/W7ZtbSmqS/pWCjGLLaohPQOtMbZSDjvqtAYJfA5zDv/dAfdakU 3Mtmc+nkKmUK28h+uvWlrwsyAglbLMddLSh4FIg4SJT9HY1zFtgtdoDsmevy8KEGWOpNld w9T4BJ6QRZmkGMqHN9PK7oVSccRmC2pigNVTUFyptm6Qa93E3ISyRmZBZT0PQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782328280; a=rsa-sha256; cv=none; b=avYDwH4QiCxHjhHVyfZHepEfOBMaWGn6T75wd/Fy4znJsbMEJ1U8NQnontME+I6c5O3dm1 wzGt2GM+9dt6c+06+5IFVlt7DaUSTW54KeFYPo/syBwKTOXgYF8DyUoTVBJewniHtVL4XB Uf0TykXsZwhic8NMmASrJtlMbo/PhBSyZVC6JCIkT8W+giyc3mrWSXeUg7v87neby5VpGB RmDWvompoTm5T/ZaS7sFdT5buG+BZdoSpMYvTqFwox7mWvrzsWYnZ1prAdkK/CVm3IxDf3 8QIGHl92zQicHpG9J6N86D5b4Uu+BDlzKV2n+BrmvWsXBgOaO8/9eQBQ7qOZjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782328280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sz++htGrV3z2D4BDeK/UG05F9iC608g9Ij1EIrqvvJ8=; b=rVUqE4z94CiKUKnY/AM//AYbwtnYVJfAbpnd7o/JLl1Q3MwlPL5qsAiTJhxVQaJqh3Dy8X k2b+381pBBjArOTYClJPKDnOZaCpiTbO522afZdfq9XO+ms4yypoKo33p0raZ42052t/YY Hekz1ihkyeZut32T8MvWuvHcyzU5N73HZNav2uBjwMXAoXwIEaoh7D8aPmkngGwWGp2utl GtMw5zF0qDouAalrJl9GgKYcd04xATmmLD2UBCOH6Zc6ONWPufsT+Kf7dDtxobeCTtN2YO F2dzCaL2vi/t+icmhvqaCducw0NGhubUfmicTkA6BvLlsu1fUC7SCzTC9Y0QHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gls3r06r7zYx8 for ; Wed, 24 Jun 2026 19:11:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41a7b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Jun 2026 19:11:14 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Andrey Zakhvatov Subject: git: 8f53df87a8 - main - website/ru: Update releases/15.1R/upgrading.adoc List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andy X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f53df87a89f9078d7060714dedf87d973395782 Auto-Submitted: auto-generated Date: Wed, 24 Jun 2026 19:11:14 +0000 Message-Id: <6a3c2bd2.41a7b.37447f66@gitrepo.freebsd.org> The branch main has been updated by andy: URL: https://cgit.FreeBSD.org/doc/commit/?id=8f53df87a89f9078d7060714dedf87d973395782 commit 8f53df87a89f9078d7060714dedf87d973395782 Author: Andrey Zakhvatov AuthorDate: 2026-06-24 19:09:16 +0000 Commit: Andrey Zakhvatov CommitDate: 2026-06-24 19:09:16 +0000 website/ru: Update releases/15.1R/upgrading.adoc Update to EN 4df494ffc469a8e3b8e4f760dc76e8223529143b --- website/content/ru/releases/15.1R/upgrading.adoc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/website/content/ru/releases/15.1R/upgrading.adoc b/website/content/ru/releases/15.1R/upgrading.adoc index 6ea2742906..90cc00972e 100644 --- a/website/content/ru/releases/15.1R/upgrading.adoc +++ b/website/content/ru/releases/15.1R/upgrading.adoc @@ -1,6 +1,7 @@ --- -title: "Инструкция по обновлению до FreeBSD 15.1-RELEASE" +title: "Инструкции по обновлению до FreeBSD 15.1-RELEASE" sidenav: download +aliases: installation --- :releaseCurrent: 15.1-RELEASE @@ -10,7 +11,7 @@ sidenav: download include::shared/ru/urls.adoc[] -= Инструкция по обновлению до FreeBSD {releaseCurrent} += Инструкции по обновлению до FreeBSD {releaseCurrent} == Аннотация @@ -36,7 +37,7 @@ pkg which /usr/bin/uname Если отображается имя пакета, например `FreeBSD-runtime-15.0`, см. раздел <> ниже. -[upgrade-source] +[[upgrade-source]] Если выполняется обновление из исходных кодов, обратитесь к link:{handbook}cutting-edge/#makeworld[главе Руководства FreeBSD, посвящённой обновлению FreeBSD из исходных кодов]. [[upgrade-fu]] @@ -304,5 +305,5 @@ shutdown -r now // // The FreeBSD Russian Documentation Project // -// Original EN revision (15.06.2026): 63927b02bb470b0702cc85a2afe0bf39750d6671 +// Original EN revision (23.06.2026): 4df494ffc469a8e3b8e4f760dc76e8223529143b // From nobody Wed Jun 24 19:46:07 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4glsr41yTjz6jjkP for ; Wed, 24 Jun 2026 19:46:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glsr4189Yz3sYw for ; Wed, 24 Jun 2026 19:46:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782330372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bruQPJMxszjAZPoSSA40OAo69AidiPq1Fd5Vtr9pCPE=; b=uNB/MT5H+nJfNP7ZarkJ++2ztCGnbf3K7IUo6BWk6F98Y8e2WcFguEvNjZ0RftM/6D0xza DGRXu9MzIopubJYhtVQHWlhldEckfjBcnXrKISeoTlyg1zIzegIE4sxXtPLxAI8j/WOsHU 6T9oxnDYpzW3obd2kssD5DbZaBt8y3vhFfFqAfg4ZeuVtsWApMBM5XYh1N830VJQ0m+hv3 ZeDaUbLX9MwNrA77Lewb+bw8iua+Yykh75oM1Nkj6AUqWaTRoSXdh1McYC1ozMj2rmgvku lqj6mLlo7XnmDgjkKeXUyiorZRTFibVWL8/RZdo8+8Tz1Sd53F5jtxAz+BOCSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782330372; a=rsa-sha256; cv=none; b=OjoM9Zj5XRVoF8wLbWvBOIuMKUhVl1YoifSmvXtvGBxmCWd8okZNucMpiq8jQB8LcYKl7a i7zSsJNNL/lAeDzxHcQxdd2Sf0BTGVEue/xs3p7I2MphFLJuO4VLuseV3rFJyRA5dVjqlK rf6z4veJc6gDH9f2Q8Qtv1Qbtk9gSovSLQDyXzG2f2L3H0j2A1IlxnHviIbpmYYUt4BF91 RJ7u2cB3FWB5qSDXbXc9Hbrf88LzKKCDuR0j4XJYeilJ7HPinJRFYtK3QcmN2hxVWWhueC PynMlkC/U9b+IYI1ETncrHbqC5SPIPHYjrVXg/1GGuhp7HSwoSGA/qNHHSKHUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782330372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bruQPJMxszjAZPoSSA40OAo69AidiPq1Fd5Vtr9pCPE=; b=IDRirrehICpQWOGKU9j19VK8S5FyYjxECPJ4G7QIY7hmogC54aRn2n/EaJPiSUgcg0217+ 0Gi16LPnuBcdCl9tzLsNzLf/nDE73AeuxAc1boHA0NXE9XyAQzSw3ZOMdC5Diwp2yqQYQ3 G6zv6NM1nLh55gTORf4gwEHVlZCgp7x/TN7Qd/Np4gC3lArVMtpfPKg2y6g7JYyypazLVu 3RY4WIf6lknrlz9ehXg6KbzLlGyghQiCW3CztVUQv4dFU8WUaavmPIO3HB7bk/0oT35Y6i yvxtLc84MXvZgqKoHKGfVEM6fXKCnNuS0KAIpP0tqTBk4lHkdrC++wPPcwC+6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glsr40CGgzZpg for ; Wed, 24 Jun 2026 19:46:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44821 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Jun 2026 19:46:07 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Andrey Zakhvatov Subject: git: 1036728821 - main - website/ru: Update platforms/ppc.adoc List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andy X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10367288219f2bfd9ee7534dd5db54856cc677c8 Auto-Submitted: auto-generated Date: Wed, 24 Jun 2026 19:46:07 +0000 Message-Id: <6a3c33ff.44821.e6baa57@gitrepo.freebsd.org> The branch main has been updated by andy: URL: https://cgit.FreeBSD.org/doc/commit/?id=10367288219f2bfd9ee7534dd5db54856cc677c8 commit 10367288219f2bfd9ee7534dd5db54856cc677c8 Author: Andrey Zakhvatov AuthorDate: 2026-06-24 19:44:50 +0000 Commit: Andrey Zakhvatov CommitDate: 2026-06-24 19:44:50 +0000 website/ru: Update platforms/ppc.adoc Update to EN 9d7e125935722c62fb2d26fa8ac3ed489808ab92 --- website/content/ru/platforms/ppc.adoc | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/website/content/ru/platforms/ppc.adoc b/website/content/ru/platforms/ppc.adoc index 606c8ddea8..de2896539c 100644 --- a/website/content/ru/platforms/ppc.adoc +++ b/website/content/ru/platforms/ppc.adoc @@ -10,7 +10,7 @@ include::shared/ru/urls.adoc[] == Введение -Страницы проекта FreeBSD/ppc содержат информацию о портировании FreeBSD на архитектуру PowerPC(R). Как и сам порт, эти страницы все еще находятся в стадии разработки. +Страницы проекта FreeBSD/ppc содержат информацию о портировании FreeBSD на архитектуру PowerPC(R). Как и сам порт, эти страницы всё ещё находятся в стадии разработки. == Общая информация @@ -26,19 +26,19 @@ include::shared/ru/urls.adoc[] [[status]] == Статус -Порт FreeBSD/ppc по-прежнему является платформой link:{committers-guide}#archs[уровня 2]. Это означает, что он не получает полной поддержки от нашего Директора по информационной безопасности, инженеров по выпуску релизов и сопровождающих инструментальной цепочки. Тем не менее, он поддерживается portmgr (сборка пакетов). +Порт FreeBSD/ppc по-прежнему является платформой link:{committers-guide}#archs[уровня 2]. Это означает, что он не получает полной поддержки нашего Директора по информационной безопасности, инженеров по подготовке релизов и сопровождающих инструментальной цепочки. Тем не менее, он поддерживается со стороны portmgr (сборка пакетов). -Самая актуальная информация о поддерживаемом аппаратном обеспечении в настоящее время ведется https://wiki.freebsd.org/powerpc[в вики]. +Самая актуальная информация о поддерживаемом аппаратном обеспечении в настоящее время ведётся https://wiki.freebsd.org/powerpc[в вики]. ''''' [[news]] == Последние новости -* **13 апреля 2021**: Выпущен FreeBSD 13.0, представивший новую цель `powerpc64le` и LLVM в качестве основного компилятора. Добавлена поддержка драйверов дисков, сети и видеоконтроллера для современных машин POWER от Raptor Computing (Blackbird и Talos II) и IBM (LC922 и IC922). https://www.freebsd.org/releases/13.0R/relnotes/[Информация о релизе] -* **22 сентября 2020**: Была представлена новая цель `powerpc64le` (64-битная с обратным порядком байт) для процессоров POWER8 и новее. +* **13 апреля 2021**: Выпущена FreeBSD 13.0, представившая новую цель `powerpc64le` и LLVM в качестве основного компилятора. Добавлена поддержка драйверов дисков, сети и видеоконтроллера для современных машин POWER от Raptor Computing (Blackbird и Talos II) и IBM (LC922 и IC922). https://www.freebsd.org/releases/13.0R/relnotes/[Информация о релизе] +* **22 сентября 2020**: Была представлена новая цель `powerpc64le` (64-разрядная с обратным порядком байт) для процессоров POWER8 и новее. * **29 декабря 2019**: В релизе 13.0 для целей `powerpc`, `powerpcspe` и `powerpc64` компилятор GCC4 будет заменен на LLVM, а `powerpc64` будет использовать современную спецификацию ABI OpenPower 64-Bit ELF V2. -* **05 мая 2019**: FreeBSD был протестирован и, по всей видимости, работает на https://wiki.freebsd.org/powerpc/Raptor/Blackbird[Raptor Blackbird]. +* **05 мая 2019**: FreeBSD была протестирована и, по всей видимости, работает на https://wiki.freebsd.org/powerpc/Raptor/Blackbird[Raptor Blackbird]. ''''' @@ -54,29 +54,29 @@ include::shared/ru/urls.adoc[] === Как установить FreeBSD/ppc? Доступны ISO-образы FreeBSD {rel130-current} для загрузки. Подробности о том, как их получить, смотрите в link:../../releases/{rel130-current}R/announce/[анонсе релиза]. -FreeBSD 12.x больше не поддерживается, и его использование *категорически не рекомендуется*. Изменения в ABI делают 12.x бинарно несовместимым с 13.x и новее. +FreeBSD 12.x больше не поддерживается, и её использование *категорически не рекомендуется*. Изменения в ABI делают релиз 12.x бинарно несовместимым с 13.x и новее. [[ports]] === Как использовать порты на FreeBSD/ppc? -Обратитесь к Руководству: link:{handbook}ports#ports-using[использование коллекции портов]. +Обратитесь к Руководству: link:{handbook}ports#ports-using[использование Коллекции портов]. [[ppcppc64]] === Какую версию выбрать: powerpc, powerpcspe, powerpc64 или powerpc64le? -* 64-битные системы +* 64-разрядные системы -** *Пользователи 64-битных процессоров с двунаправленной порядком байт POWER8 и POWER9*: могут выбрать между FreeBSD/powerpc64 и FreeBSD/powerpc64le (от старшего к младшему и от младшего к старшему соответственно). FreeBSD/powerpc64 (от старшего к младшему) также поддерживает нативную работу 32-битных двоичных файлов, как и другие 64-битные платформы. -** *Пользователи 64-битных процессоров от старшего к младшему Apple G5 и POWER7*: следует установить FreeBSD/powerpc64. Пользователи Apple G5 также могут выбрать 32-битную FreeBSD/powerpc, но FreeBSD/powerpc64 предоставляет поддержку ZFS и возможность использования более 2 ГБ ОЗУ. +** *Пользователи 64-разрядных процессоров с двунаправленным порядком следования байтов POWER8 и POWER9*: можно выбрать между FreeBSD/powerpc64 и FreeBSD/powerpc64le (с прямым и обратным порядком следования байтов, соответственно). FreeBSD/powerpc64 (с прямым следованием байтов), как и другие 64-разрядные платформы, также поддерживает нативную работу 32-разрядных двоичных файлов. +** *Пользователи 64-разрядных процессоров с прямым следованием байтов Apple G5 и POWER7*: следует установить FreeBSD/powerpc64. Пользователи Apple G5 также могут выбрать 32-разрядную FreeBSD/powerpc, однако во FreeBSD/powerpc64 имеется поддержка ZFS и возможность использования более 2 ГБ ОЗУ. -* 32-битные системы -** *Пользователи 32-битных процессоров Apple G3/G4*: следует использовать FreeBSD/powerpc -** *Пользователи 32-битных процессоров Freescale MPC85XX (Routerboard RB800) и NXP QorIQ P1022 (AmigaOne A1222)*: следует использовать FreeBSD/powerpcspe +* 32-разрядные системы +** *Пользователи 32-разрядных процессоров Apple G3/G4*: следует использовать FreeBSD/powerpc +** *Пользователи 32-разрядных процессоров Freescale MPC85XX (Routerboard RB800) и NXP QorIQ P1022 (AmigaOne A1222)*: следует использовать FreeBSD/powerpcspe [[contact]] === С кем можно связаться? -Основным ресурсом является <>. +Основным источником информации является <>. ''''' @@ -157,7 +157,7 @@ OK load /boot/kernel/kernel.save [[doc]] == Документация, технические документы, утилиты -* http://www.freescale.com/files/product/doc/MPCFPE32B.pdf[Документация по 32-битным чипам PowerPC] +* http://www.freescale.com/files/product/doc/MPCFPE32B.pdf[Документация по 32-разрядным чипам PowerPC] * http://www.firmworks.com/QuickRef.html[Краткий справочник по Open Firmware] * https://developer.apple.com/legacy/library/technotes/tn/tn1061.html["TN1061: Основы Open Firmware, Часть 1 - Пользовательский интерфейс"] * https://developer.apple.com/legacy/library/technotes/tn/tn1062.html["TN1062: Основы Open Firmware, Часть 2 - Дерево устройств"] @@ -178,5 +178,5 @@ OK load /boot/kernel/kernel.save // // The FreeBSD Russian Documentation Project // -// Original EN revision (05.08.2024): 005854895639858b13987262f046d1861912f46f +// Original EN revision (04.04.2026): 9d7e125935722c62fb2d26fa8ac3ed489808ab92 // From nobody Fri Jun 26 07:59:07 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gmp3N6pnJz6j3t8 for ; Fri, 26 Jun 2026 07:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmp3N4Qvxz3kN7 for ; Fri, 26 Jun 2026 07:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782460752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bZTSELKwoV07NmdLwdFc0F6CY1k6+wpWBKWkfTLCyQU=; b=CKPLLhX7UZV8opRv9BCy6LNgUhB3qcelL9FwD7dFq7owWvCrnAh6qV4naWBOEi1JoeHa3B dFvK79igEVa3U2eqC32ButVzEAtlDbv+9jSjfNjxmgpvFopFc5C/UMd0ec4/D4wj3fsiz/ I+E7zOpRuDr7fCKgp4lULtJoGaLEajBrshxCor6sMKpyOCII7k7eHsoY0KcPEEjzTOykUx fkPkETVDo+nE18HovK1WFTCA0f2qm2fx3oCesZk5432oDX4fvVyo0pa5vTrrkfgKs7IREm +1R4Tb7V3H4AzsfdU82+ELNkG0/gDvcM2Ys0stI0BELyGyCmYBqAAMsf/dfmxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782460752; a=rsa-sha256; cv=none; b=QLvc5ER17Jyr8/qJ1XejhDxV6gmp2UJWxFnfrgjjXJeuvhrkoHoBifFWfscp7WF6W5tlQi 08oC7WeYRkR9gIbmi+Xi7s+JkY2vYmUy7JTu4pBE0fnUeJnmgyP62zTdzrMekLx6+Du8Gb cJuGMOGVldLceGg4FX4oi4OQD40GofxjZ2rFrKZcyh0q34pqfo8daI2AnheDIPZDyKOhQ/ CqORVsOpIaq1GUo2J7Rnz2GMLB3cR9SVNRg8f5uHoOd6bsFqZrvUn6CT0Pc55uOJ06JyuF GXBI9IZ0zjZBrlspjaPltNblWdNI94nZZ4XAJkYB1i3It9GcoOAT463oLO2SUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782460752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bZTSELKwoV07NmdLwdFc0F6CY1k6+wpWBKWkfTLCyQU=; b=jhc1ajQCtqwDgtvt9eRKOQIsQB2L31lIuia1YzMATyibISsuKup9WdlCTuNOwFi43A1bpc z9xFo/Pcry8Y0xHasppFnR+auyZ1elr7/p0mJd+mN8L/2vJGBOjnZ+2MbHHcACiCfyQmtN lPKiuAALMgB+P28Nqa4efzSPYdVAZHqEPzWINGEj6mf0WXwRFAvlpD5XStgazjmS8dRICd Ax7zOE7DB9C/RjSt811PS06p2dnVlPcbLk0md6Y/h5kTuDvGFfEx6vTprsMx0S0jR1ukoD DW5ZMy6KFvbEkH9n1oi7XlOrYOvb3OblTwlgvsAriXt2jbzGhhLwSSLNPfzghw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmp3N2tCWzCPg for ; Fri, 26 Jun 2026 07:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19cb5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 07:59:07 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org Cc: Lexi Winter From: Alexander Ziaee Subject: git: d9b67188b5 - main - 15.1: Improve upgrade instructions List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d9b67188b5ea2be67e355bb57494d5bceb61bd46 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 07:59:07 +0000 Message-Id: <6a3e314b.19cb5.2830ab1@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/doc/commit/?id=d9b67188b5ea2be67e355bb57494d5bceb61bd46 commit d9b67188b5ea2be67e355bb57494d5bceb61bd46 Author: Lexi Winter AuthorDate: 2026-06-26 07:47:17 +0000 Commit: Alexander Ziaee CommitDate: 2026-06-26 07:52:51 +0000 15.1: Improve upgrade instructions - Upgrading 14.x pkgbase to 15 is not supported - Upgrading pkg to upgrade the base system is not required - Third party kmods must only be upgraded if using them Reported by: markj (efi case varies, bectl is zfs only) Co-authored-by: Alexander Ziaee Differential Revision: https://reviews.freebsd.org/D57606 --- website/content/en/releases/15.1R/upgrading.adoc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/website/content/en/releases/15.1R/upgrading.adoc b/website/content/en/releases/15.1R/upgrading.adoc index 7588186f71..116d4fb437 100644 --- a/website/content/en/releases/15.1R/upgrading.adoc +++ b/website/content/en/releases/15.1R/upgrading.adoc @@ -118,11 +118,11 @@ Continue to <> or <> below. == Upgrading with Base System Packages Systems deployed with a packaged base system are upgraded via man:pkg[8]. -Systems running {releasePrevLegacy} or {releasePrev} can be upgraded as follows: +Systems running {releasePrev} can be upgraded as follows: . **Snapshot the Current Installation** + -Take a recursive snapshot of the functioning system named with the current date: +If booting from ZFS, take a recursive snapshot of the functioning system named with the current date: + [source,shell,subs="verbatim,attributes"] ---- @@ -131,11 +131,13 @@ bectl create -r pre-{localRel} + The boot loader offers a menu to boot from this if the upgrade needs to be rolled back. + -. **Upgrade the Package Manager** +. **Upgrade the Installed System** ++ +Before upgrading to a new release, ensure the installed system is up to date: + [source,shell] ---- -pkg upgrade -yr FreeBSD-ports pkg +pkg upgrade -r FreeBSD-base ---- + . **Upgrade the Base System** @@ -151,7 +153,7 @@ Follow those instructions as needed. + . **Upgrade Third‑party Kernel Modules** + -Third party kernel modules must also be upgraded with the base system: +If third party kernel modules are installed, they must also be upgraded with the base system: + [source,shell] ---- @@ -226,7 +228,7 @@ cp /boot/loader.efi /boot/efi/efi/freebsd/loader.efi cp /boot/loader.efi /boot/efi/efi/boot/bootx64.efi ---- + -Note that some installations may not have `freebsd/loader.efi`. +Note that some installations may have reversed case (e.g. `EFI/BOOT/BOOTX64.EFI`) or may not have `freebsd/loader.efi`. + For AArch64 systems, execute the following commands instead: + From nobody Fri Jun 26 10:55:26 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gmsyr0PZnz6jJxR for ; Fri, 26 Jun 2026 10:55:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmsyq6WBLz42WV for ; Fri, 26 Jun 2026 10:55:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782471331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a3HFVSjrZbv7fzet7DAjrI5x9iTq+prk2EsUCvxmmQc=; b=ag/KwmEjLqHiuvLhchGkAjhZBrpQY619M6EJOPA8pKODLv97oxdfd31KBiyKdu6/1eSePg 1KmyTxZzW1dLwvgkLMtgU3+NOovVQyRt1IcN7lzhMbGym3A/CYfTRRf7ofJYNdPA+VVkng 1YXxJJO2n4tBsGb01mN1VWCWoqYE06CuRVWO3sI57kkEkN4LANq+bYaKB/GSx3GWzJeoXu +9PNGX0Ik8Ra5uyT2mdMUXVSeFUuiz1v0ms/0f8Ie2GAdnj+bwrjcLRgF9khiA22E0ez9W +E3EyCsdisqNYNZrCK7wOgBL3Uq5g7GZ9H1/LPXi1C8IieJkjcfrbePBtxDcFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782471331; a=rsa-sha256; cv=none; b=dkjeV2VxCdiCUOvm5uI67BUU93XGWI3vyIy4i/9j3d26nznlJ8vKus71iBBK75+ZyfTd4+ XmzvBv0PT/Ao7jUXM+IBfTMGo0OGlCA6ndFwUCk+6aakQ6aE5DByv9GOiyQ7WhJLZQA3m5 ISdz1RNSxDpVtc6txbFbTAbylxGnepRaXYkkJojt3nZtuV6BYQ0OS1Sh9KaLxJT+HWft68 PSpGVXywjc6n+CdA1FhqV6x6YOUTH+v/n4yUlXLQIHRD/PpUfxZX46eBPT921Bv9oF4rt2 YHdmiyyYUIrlnuWIJx7USTSSsCk+JwVadcvmD13NaQyeKqm3OfVEmYEDoMvQpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782471331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a3HFVSjrZbv7fzet7DAjrI5x9iTq+prk2EsUCvxmmQc=; b=Qs8gsqjoVR9RqQC5T3Qjln3SU0QQhoQvrAlHKa7XLuas88R5TJDXX/7goF7jOW10S1AYSX wiFNHtF0EX3IgBM68JRLMjQUlxNhLQUHTjkFv/qCVzWf1sK5TyRjXkNH2gWYvoQgYJIdDH Q3hTRNbZh6FODVqPH/bo9S9zTh0jE3MR1v0GugEXrQ+cPP7e9brATIIedpalM2L1y09A1K S6sHTvZMEYRpXk49p1CW60BF9lOjHshb7jkB2e0jJyMojPPrY4xnyyPSkt6BKMI5FjtXcB Fz10nbNS2okft3i3eLHhpJGKdCg3MVsW4DLr0NQ6DaZIxfrqXDcyn9lc+huhOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmsyq5JSczZld for ; Fri, 26 Jun 2026 10:55:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3636e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 10:55:26 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Benedict Reuschling Subject: git: 6738c77707 - main - handbook/x11: Silence doc build warning by changing an example into programlisting List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bcr X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6738c777075117bd33355780fee21192e24a6724 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 10:55:26 +0000 Message-Id: <6a3e5a9e.3636e.4cdac8f6@gitrepo.freebsd.org> The branch main has been updated by bcr: URL: https://cgit.FreeBSD.org/doc/commit/?id=6738c777075117bd33355780fee21192e24a6724 commit 6738c777075117bd33355780fee21192e24a6724 Author: Benedict Reuschling AuthorDate: 2026-06-26 10:51:30 +0000 Commit: Benedict Reuschling CommitDate: 2026-06-26 10:55:22 +0000 handbook/x11: Silence doc build warning by changing an example into programlisting While here, remove whitespaces from end of lines. No content changes. Event: Halifax Hackathon 202606 --- .../content/en/books/handbook/x11/_index.adoc | 42 +++++++++++----------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/documentation/content/en/books/handbook/x11/_index.adoc b/documentation/content/en/books/handbook/x11/_index.adoc index 3ebc720005..0644e7aa30 100644 --- a/documentation/content/en/books/handbook/x11/_index.adoc +++ b/documentation/content/en/books/handbook/x11/_index.adoc @@ -627,27 +627,27 @@ The output should be similar to the following: .... Screen 0: minimum 320 x 200, current 2560 x 960, maximum 8192 x 8192 LVDS-1 connected 1280x800+0+0 (normal left inverted right x axis y axis) 261mm x 163mm - 1280x800 59.99*+ 59.81 59.91 50.00 - 1280x720 59.86 59.74 - 1024x768 60.00 - 1024x576 59.90 59.82 - 960x540 59.63 59.82 - 800x600 60.32 56.25 - 864x486 59.92 59.57 - 640x480 59.94 - 720x405 59.51 58.99 - 640x360 59.84 59.32 + 1280x800 59.99*+ 59.81 59.91 50.00 + 1280x720 59.86 59.74 + 1024x768 60.00 + 1024x576 59.90 59.82 + 960x540 59.63 59.82 + 800x600 60.32 56.25 + 864x486 59.92 59.57 + 640x480 59.94 + 720x405 59.51 58.99 + 640x360 59.84 59.32 VGA-1 connected primary 1280x960+1280+0 (normal left inverted right x axis y axis) 410mm x 257mm - 1280x1024 75.02 60.02 - 1440x900 74.98 60.07 - 1280x960 60.00* - 1280x800 74.93 59.81 - 1152x864 75.00 - 1024x768 75.03 70.07 60.00 - 832x624 74.55 - 800x600 72.19 75.00 60.32 56.25 - 640x480 75.00 72.81 66.67 59.94 - 720x400 70.08 + 1280x1024 75.02 60.02 + 1440x900 74.98 60.07 + 1280x960 60.00* + 1280x800 74.93 59.81 + 1152x864 75.00 + 1024x768 75.03 70.07 60.00 + 832x624 74.55 + 800x600 72.19 75.00 60.32 56.25 + 640x480 75.00 72.81 66.67 59.94 + 720x400 70.08 HDMI-1 disconnected (normal left inverted right x axis y axis) DP-1 disconnected (normal left inverted right x axis y axis) HDMI-2 disconnected (normal left inverted right x axis y axis) @@ -738,7 +738,7 @@ $ xinput Its output should be similar to the following: -[example] +[.programlisting] .... ⎡ Virtual core pointer id=2 [master pointer (3)] From nobody Fri Jun 26 17:14:11 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gn2Mm0CNkz6jp6Q for ; Fri, 26 Jun 2026 17:14:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn2Ml6cX6z4P2n for ; Fri, 26 Jun 2026 17:14:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782494051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OyzjfdxGaz3CCHU++aqwnhmY6hmQQtC8+HLYmwhkdHg=; b=M5qGHBNXTSUEzqqXpgFVGfo4Yt4NFniZa+imoHwCP5SKJokjfq5d7nTtAIsvMaOijL9I9M 56k62eNqqa92lcWCFZAheJZ4fx97t5ZGjFTY+hfBLxEhgcgEuQTH8T9CI3O/Fo2zBzaVLR jmquHmTfK2OQlTptdmC7+mV8XpTT+370vFBJ1U9XmNRdOZVbBq2/SWdeup4OPjeBQ7VM9K iet6qYzIe12BQsEtFh3ctpNtyRuvsKWZxCDAkP1f3qouALf+MMToxJ1rPUjabtDTQOoctK 3i+zesZ+ihog+KXchCSGwRj0Rf3hb5ydm2d8opMkksueeP1Z/cqOkvt5xglNww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782494051; a=rsa-sha256; cv=none; b=aqDC1zu8z8KkTrhwYyoLg5xd9I9lXA+CijpVVROJUbXKPfnOqsYQBi96pfgWMU+bf6z0KF Jbj9YpOpv/IblZRnbCPapApu/1BCv3HSm5n1YehYrc1rtR/AFIOTqj9ktUqL2qgrprdkNF ijW8zJsQWmZYwt2f5frkMcY23ZCShf03X1WyaDhKtZfXb2+qcRyYCG2EE4oby68BMmrhBR 0Uc3rRe1MAwIhyDK8y4DUIR61PCNcV5yHz2K+XOizVeCsZLk4HS42SL/W9vpzpXWvAQjJ8 xHwU5sWj904e5LgVsg7kpXUyjk0xyc12CfwE90EGyiqKpglKLgN7yioMo7gMMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782494051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OyzjfdxGaz3CCHU++aqwnhmY6hmQQtC8+HLYmwhkdHg=; b=clSqezaUNV7SnSZr+XlC1c1YDcu5ce5dGePsCzB0kk29KkAPsKdkBcKyZcemnAF1AbCMWT rcFclo1mh7jwWzl4vX/jd68pomdW9aeJ9p81j/aeflqegEtLDxnlcFvz5zKnWD/MoyOcCK GYdjd30SmklsV/KvBQz8hHc8Iyx6rKZqzHYD74+smYaz3lbllzyiyThtZXJDfR5Xym3U6o 63QrOkxsD/YebcA8bUl7XOpRbkOAHrjIV3ZDDMSsv87ouCzXHnV0JsuB4saULzAe9quc2P eYXdmU0OleNzONZ5nTSF6oOQ6OwnCPQXtZiPQ4efl3KvNVmwZNpF7tm7ACFO6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn2Ml5LkzzmpQ for ; Fri, 26 Jun 2026 17:14:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 381b6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 17:14:11 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: 072353ccfc - main - policy: Cross Repo Commit Policy List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 072353ccfc5ddb7e794d7633d44a585b32e4e175 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 17:14:11 +0000 Message-Id: <6a3eb363.381b6.6b0f67a9@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=072353ccfc5ddb7e794d7633d44a585b32e4e175 commit 072353ccfc5ddb7e794d7633d44a585b32e4e175 Author: Warner Losh AuthorDate: 2026-06-26 14:59:45 +0000 Commit: Warner Losh CommitDate: 2026-06-26 15:00:42 +0000 policy: Cross Repo Commit Policy Add Cross Repo Commit policy that was originally discussed in January 2023 by core, and ratified by the current core team on XXXX. Sponsored by: Netflix Reviewed by: ziaee, 0mp, kevans, glebius, adrian Approved by: core (24-hour rule) Differential Revision: https://reviews.freebsd.org/D57514 --- website/content/en/internal/cross-repo-commits.adoc | 21 +++++++++++++++++++++ website/content/en/internal/policies.adoc | 1 + 2 files changed, 22 insertions(+) diff --git a/website/content/en/internal/cross-repo-commits.adoc b/website/content/en/internal/cross-repo-commits.adoc new file mode 100644 index 0000000000..bb8019479e --- /dev/null +++ b/website/content/en/internal/cross-repo-commits.adoc @@ -0,0 +1,21 @@ +--- +title: "Cross Repo Commit Policy" +sidenav: docs +--- + += Cross Repo Commit Policy + +This policy provides flexibility for contributors to commit across repositories without heavyweight processes for small, low-impact changes, while ensuring larger changes still undergo normal review and oversight. + +== Policy Guidelines + +* *Obvious Fixes:* Anyone may make obvious, small changes (e.g., typo or build break fixes) to any repository, subject to repository-specific rules. +* *Repository Rules:* Committers must know, understand, and follow the specific rules and validation tools of the repositories they are modifying. +* *Cross-Repository Trust:* When committing outside their primary area, committers are trusted to use their best judgment based on the following framework: +** *Sufficient Review:* The change has received appropriate peer review for its size and complexity. +** *Expert Consultation:* Repository experts are consulted for non-trivial changes. +** *Stricter Rules:* The committer remains deferential to areas requiring formal oversight (e.g., the `ports/Mk` tree). +** *Scale:* The larger or more complex the change, the more critical it is to seek review and wait for explicit approval. +* *Accountability:* Committers must accept feedback on both process and content. If a mistake occurs, the default action is an immediate backout, followed by a more formal review, as appropriate. + +When in doubt, ask first and seek a sanity check. diff --git a/website/content/en/internal/policies.adoc b/website/content/en/internal/policies.adoc index 0012cb0a99..88a4a8f7db 100644 --- a/website/content/en/internal/policies.adoc +++ b/website/content/en/internal/policies.adoc @@ -27,6 +27,7 @@ It contains almost everything a new committer to the FreeBSD Project needs to kn * link:../software-license[Software License Policy] * link:../data[User Data Policy] * link:../members[FreeBSD Project Membership] +* link:../cross-repo-commits[Cross Repo Committing Policy] == *The FreeBSD Documentation Project* From nobody Fri Jun 26 17:14:12 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gn2Mn1xXGz6jpFR for ; Fri, 26 Jun 2026 17:14:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn2Mm6wdxz4NWs for ; Fri, 26 Jun 2026 17:14:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782494052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4mtVrU64lXJm8S3adcpzCi3e9uFruxU7pXovh6Wj4G4=; b=x3L+/xGHXNryFEJ3ZIQICQ4xEdSTYQBOA34Mjgji3yFCoVUik3pT4EAC2WGFPOLhy1gH3N 2vwiU0N6+FQZ7xVaWusO/5RVsMCU8bg8klUorzWq63ByNkDvQqhgjhldYM0JCaRTW8C2Ym j7deB2yAUYN8Ub3l6i4gr9T9GF59oO6okUBN0AlmLoKJ3iau8omMPAHRR69LPa2BwWfS2u /GifjcnV1s2P4xSIHw9ZjhhzQf8MRdOzhfv9chTDteRzqK1MfgBxHngiM3RiLU9RSOgZwv rhDS9eB6YJ9Ac1/PIJqxJT0mCtM4VLM1c+wmBKkfx4Q5/XKZoXjPc2W1xccEfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782494052; a=rsa-sha256; cv=none; b=s4qV4qBsA6VFXoQs6M9aMFzZ+Cehqea1N91EJNffZnWPVkEv0xVohKwvYfjx6mj61N6xSq Bq6GDCCIz5NdlUhdJdKCObkCO0oJbGXSGfyD5XYnolMJaELyqsRT0qbOnc/UNjIlmJbB7h NXRK22X6wGqstvOWMZMwPmJmRZnwRxW07qos+21kfYqvr43kmtXML5SjaNjf2R9z5owNVJ Tvu2jNwJNCwPgX70FDqXsGpJ9G41DVdMKFUg7BPsBi8wU6tekjXzwOfI1/CqJhlLuu9eAS z9PulD5sDo6Nr1YyyOdJVD3YUfgKLOC4LOYraSdoJD4IVIuT502PqGJqe7uUWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782494052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4mtVrU64lXJm8S3adcpzCi3e9uFruxU7pXovh6Wj4G4=; b=YicD8gFRTHcJl+6F0MGlCjNHMcJBaFW1cFZrRalxGuj5VWCS7F7a71kJofeZSXdtrRmvGf qILHx9Zoe4YLotiuIstCtswZpFcYRPCJIrFF1Cu3r3Y8eSlkLs7kobU+7bBcAIncXT2r3j DXFRhj8JAdiFHVJpbIakeUvxU9mhsntsLsLB5OxLzkx1XPDsd4maJQDfa3uj72BxQ0JH8o +BPu2hMfKGls5kJV+MVg6Byvvj0DJsMZC2O9hFmWjgrOiiGgFTcPGCWM9KMUPQTJjUFfHI 8pKEucYNxfmQj3NASET5Ykugl0oaHxASwfNVOysQH53L/Q2mXx9x8yyS3bc58w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn2Mm5vHZzmW7 for ; Fri, 26 Jun 2026 17:14:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 367d5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 17:14:12 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: 6bd5860091 - main - Move all the software license stuff to a central location. List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6bd5860091a3eb263d7d907bcca474b255100ea3 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 17:14:12 +0000 Message-Id: <6a3eb364.367d5.6df44bb9@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=6bd5860091a3eb263d7d907bcca474b255100ea3 commit 6bd5860091a3eb263d7d907bcca474b255100ea3 Author: Warner Losh AuthorDate: 2026-06-26 17:12:02 +0000 Commit: Warner Losh CommitDate: 2026-06-26 17:12:08 +0000 Move all the software license stuff to a central location. This leaves an appropriatesummary on the website pages, committer's guide and contributing pages, and augments license-guide with information that was on those pages (though the license exceptions moves to software-license). It's mostly word motion with light edits. Sponsored by: Netflix Reviewed by: ziaee, adrian Approved by: core (24 hour rule) Differential Revision: https://reviews.freebsd.org/D57340 --- .../en/articles/committers-guide/_index.adoc | 32 ++--- .../content/en/articles/contributing/_index.adoc | 2 +- .../content/en/articles/license-guide/_index.adoc | 50 +++++-- shared/bn-bd/urls.adoc | 1 + shared/da/urls.adoc | 1 + shared/de/urls.adoc | 1 + shared/el/urls.adoc | 1 + shared/en/urls.adoc | 1 + shared/es/urls.adoc | 1 + shared/fr/urls.adoc | 1 + shared/hu/urls.adoc | 1 + shared/id/urls.adoc | 1 + shared/it/urls.adoc | 1 + shared/ja/urls.adoc | 1 + shared/ko/urls.adoc | 1 + shared/mn/urls.adoc | 1 + shared/nl/urls.adoc | 1 + shared/pl/urls.adoc | 1 + shared/pt-br/urls.adoc | 1 + shared/ru/urls.adoc | 1 + shared/tr/urls.adoc | 1 + shared/zh-cn/urls.adoc | 1 + shared/zh-tw/urls.adoc | 1 + website/content/en/internal/members.adoc | 2 +- website/content/en/internal/policies.adoc | 2 +- website/content/en/internal/software-license.adoc | 145 +-------------------- 26 files changed, 84 insertions(+), 169 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 503fc7448c..45350e0ba2 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -2803,12 +2803,13 @@ Relnotes: yes [[pref-license]] == Preferred License for New Files -The FreeBSD Project's full license policy can be found at link:https://www.FreeBSD.org/internal/software-license/[https://www.FreeBSD.org/internal/software-license]. +The FreeBSD Project's full license policy is documented in the extref:{license-guide}[FreeBSD License Policies] article. The rest of this section is intended to help you get started. As a rule, when in doubt, ask. It is much easier to give advice than to fix the source tree. -The FreeBSD Project suggests and uses this text as the preferred license scheme: +SPDX-only license marking is strongly preferred. +The FreeBSD Project uses this text as the preferred license: [.programlisting] .... @@ -2816,18 +2817,16 @@ The FreeBSD Project suggests and uses this text as the preferred license scheme: * Copyright (c) [year] [your name] * * SPDX-License-Identifier: BSD-2-Clause - * */ .... -The FreeBSD project strongly discourages the so-called "advertising clause" in new code. -Due to the large number of contributors to the FreeBSD project, complying with this clause for many commercial vendors has become difficult. -If you have code in the tree with the advertising clause, please consider removing it. -In fact, please consider using the above license for your code. +The preferred order is the copyright notice first, followed by the SPDX-License-Identifier, but either order is acceptable. +New contributions to FreeBSD should use the BSD-2-Clause license. +The FreeBSD project does not allow the "advertising clause" in new code. +If you have code in the tree with the advertising clause, please consider switching to a license without it. The FreeBSD project discourages completely new licenses and variations on the standard licenses. -New licenses require the approval of {core-email} to reside in the `src` repository. -The more different licenses that are used in the tree, the more problems that this causes to those wishing to utilize this code, typically from unintended consequences from a poorly worded license. +New licenses require the approval of {core-email}. Project policy dictates that code under some non-BSD licenses must be placed only in specific sections of the repository, and in some cases, compilation must be conditional or even disabled by default. For example, the GENERIC kernel must be compiled under only licenses identical to or substantially similar to the BSD license. @@ -2865,16 +2864,11 @@ Access to data within the license archive will be available on request to the {c == SPDX Tags in the tree The project uses https://spdx.dev[SPDX] tags in our source base. -At present, these tags are indented to help automated tools reconstruct license requirements mechanically. -All _SPDX-License-Identifier_ tags in the tree should be considered to be informative. -All files in the FreeBSD source tree with these tags also have a copy of the license which governs use of that file. -In the event of a discrepancy, the verbatim license is controlling. -The project tries to follow the https://spdx.github.io/spdx-spec/v2.2.2/[SPDX Specification, Version 2.2]. -How to mark source files and valid algebraic expressions are found in https://spdx.github.io/spdx-spec/v2.2.2/SPDX-license-expressions/[Annex D] and https://spdx.github.io/spdx-spec/v2.2.2/using-SPDX-short-identifiers-in-source-files/[Annex E]. -The project draws identifiers from SPDX's list of valid https://spdx.org/licenses/[short license identifiers]. -The project uses only the _SPDX-License-Identifier_ tag. - -As of March 2021, approximately 25,000 out of 90,000 files in the tree have been marked. +SPDX-only license marking (without reproducing the full license text) is strongly preferred for new files. +When a file contains only a copyright notice and an SPDX-License-Identifier tag, the SPDX tag specifies the license for that file. +When a file contains both an SPDX-License-Identifier tag and the full verbatim license text, the SPDX tag is informative and the verbatim license is controlling in the event of a discrepancy. +The project draws identifiers from SPDX's list of valid https://spdx.org/licenses/[short license identifiers] and uses only the _SPDX-License-Identifier_ tag. +See the extref:{license-guide}[FreeBSD License Policies] article for the full specification of how SPDX expressions are used in the FreeBSD software collection. [[developer.relations]] == Developer Relations diff --git a/documentation/content/en/articles/contributing/_index.adoc b/documentation/content/en/articles/contributing/_index.adoc index e9d8475e75..85e398d4f5 100644 --- a/documentation/content/en/articles/contributing/_index.adoc +++ b/documentation/content/en/articles/contributing/_index.adoc @@ -270,7 +270,7 @@ If you do not have access to a web or FTP site, ask on an appropriate FreeBSD ma When working with large amounts of code, the touchy subject of copyrights also invariably comes up. FreeBSD prefers free software licenses such as BSD or ISC. Copyleft licenses such as GPLv2 are sometimes permitted. -The complete listing can be found on the link:https://www.FreeBSD.org/internal/software-license/[core team licensing policy] page. +The complete listing can be found in the extref:{license-guide}[FreeBSD License Policies] article. === Money or Hardware diff --git a/documentation/content/en/articles/license-guide/_index.adoc b/documentation/content/en/articles/license-guide/_index.adoc index 446af844c7..a5d12f5945 100644 --- a/documentation/content/en/articles/license-guide/_index.adoc +++ b/documentation/content/en/articles/license-guide/_index.adoc @@ -41,13 +41,17 @@ toc::[] [[intro]] +This policy applies to the FreeBSD source repository (src). +The ports and documentation repositories have their own licensing guidelines. + [[pref-license]] == Preferred License for New Files The rest of this section is intended to help you get started. As a rule, when in doubt, ask. -It is much easier to receive advice than to fix the source tree. +It is much easier to receive advice than to fix the source repository. The FreeBSD Project makes use of both explicit licenses (where the verbatim text of the license is reproduced in each file) and detached licenses (where a tag in the file specifies the license, as described in this document). +SPDX-only license marking (without reproducing the full license text) is preferred. The FreeBSD Project uses this text as the preferred license: @@ -60,6 +64,10 @@ The FreeBSD Project uses this text as the preferred license: */ .... +The preferred order is the copyright notice first, followed by the SPDX-License-Identifier, but either order is acceptable. +When both SPDX-License-Idnetifier and the full text of the license are present, the full takes takes priority and the SPDX-License-Identifier is informational only. +When both are present, the SPDX-License-Identifier will often preceed the copyright and license text. + The FreeBSD project does not allow using the "advertising clause" in new code. Due to the large number of contributors to the FreeBSD project, complying with this clause for many commercial vendors has become difficult. If you have code in the tree with the advertising clause, please consider switching to a license without it. @@ -106,39 +114,63 @@ Such would ease their more integral adoption into the FreeBSD operating system. === Policy +* The following are the SPDX-License-Identifiers that are considered BSD licenses for this policy +** BSD-1-Clause +** BSD-2-Clause +** BSD-2-Clause-first-lines +** BSD-3-Clause +** BSD-3-Clause-acpica +** BSD-3-Clause-flex +** BSD-3-Clause-LBNL +** BSD-3-Clause-Open-MPI +** BSD-3-Clause-Sun +** BSD-4.3RENO +** BSD-4.3TAHOE +** BSD-Source-beginning-file +** CMU-Mach +** ISC +** MIT +** MIT-CMU +** SSH-OpenSSH +** Vixie-Cron +** Zlib + * The import of new software licensed under any licenses other than the BSD license and BSD-Like Licenses (as defined below) requires the prior approval of the FreeBSD Core Team. Requests for import must include: ** A list of features or bug fixes that the new version or patches contain, along with evidence that our users need those features. PRs or references to mailing list discussions are ideal forms of evidence. ** This process should be used for all software imports, not just those that require Core Team review. -The mere existence of a new version does not justify an import of software to source or ports. +The mere existence of a new version does not justify an import of software to source. ** A list of FreeBSD branches that may be affected. Expansions of scope require a new request to and approval from the FreeBSD Core Team. -* The Apache License 2.0 is acceptable for use in some cases. +* The Apache License 2.0 (Apache-2.0) is acceptable for use in some cases. The Core Team must approve the import of new Apache License licensed components or the change of license of existing components to the Apache License. ** This license is approved for the following components: *** LLVM toolchain and (with LLVM Exceptions) runtime components. -* The BSD+Patent License is acceptable for use in some cases. +* The BSD+Patent License (BSD-2-Clause-Patent) is acceptable for use in some cases. The Core Team must approve the import of new BSD+Patent License licensed components or the change of license of existing components to the BSD+Patent License. ** This license is approved for the following components: *** EDK2 derived code related to UEFI functionality -* The Common Development and Distribution License (CDDL) is acceptable for use in some cases. +* The Common Development and Distribution License (CDDL-1.1) is acceptable for use in some cases. The Core Team must approve the import of new CDDL licensed components or the change of license of existing components to the CDDL. ** This license is approved for the following components: *** DTrace *** ZFS filesystem, including kernel support and userland utilities +* Initially, many items in the FreeBSD tree were marked with BSD-2-Clause-FreeBSD. +However, SPDX has obsoleted the license as a variant; and most files tagged with it should have been BSD-2-Clause since SPDX's license text was for something else. +Adding new files with this identifier is expressly prohibited. + +* The FreeBSD project discourages completely new licenses and variations on the standard licenses. + * Historically, the phrase 'All Rights Reserved.' was included in all copyright notices. All the BSD releases had it, to comply with the https://en.wikipedia.org/wiki/Buenos_Aires_Convention[Buenos Aires Convention of 1910] in the Americas. With the ratification of the https://en.wikipedia.org/wiki/Berne_Convention[Berne Convention] in 2000 by Nicaragua, the Buenos Aires Convention -- and the phrase -- became obsolete. As such, the FreeBSD project recommends that new code omit the phrase and encourages existing copyright holders to remove it. In 2018, the project updated its templates to remove it. -* Initially, many items in the FreeBSD tree were marked with BSD-2-Clause-FreeBSD. -However, SPDX has obsoleted the license as a variant; and the SPDX text of the obsolete tag differs enough from the standard FreeBSD license that it shouldn't be used. -A review of its current use is ongoing. ==== Acceptable licenses @@ -208,6 +240,8 @@ The FreeBSD Project currently does not make use of the `DEP5` files described in The FreeBSD Project has not marked all the files in the tree yet in accordance with this standard, as described later in this document. The FreeBSD Project has not yet included these files in its repositories since this policy is still evolving. +This section is a work in progress. + [[individual-files]] == Individual Files License diff --git a/shared/bn-bd/urls.adoc b/shared/bn-bd/urls.adoc index 436803811e..da7d59eaf9 100644 --- a/shared/bn-bd/urls.adoc +++ b/shared/bn-bd/urls.adoc @@ -42,6 +42,7 @@ endif::[] :ipsec-must: {main-site-en}/articles/ipsec-must/ :ldap-auth: {main-site-en}/articles/ldap-auth/ :leap-seconds: {main-site-en}/articles/leap-seconds/ +:license-guide: {main-site}/articles/license-guide/ :linux-emulation: {main-site-en}/articles/linux-emulation/ :linux-users: {main-site-en}/articles/linux-users/ :mailing-list-faq: {main-site-en}/articles/mailing-list-faq/ diff --git a/shared/da/urls.adoc b/shared/da/urls.adoc index a2baf6c540..5a97695226 100644 --- a/shared/da/urls.adoc +++ b/shared/da/urls.adoc @@ -41,6 +41,7 @@ endif::[] :ipsec-must: {main-site}/ipsec-must/ :ldap-auth: {main-site-en}/articles/ldap-auth/ :leap-seconds: {main-site-en}/articles/leap-seconds/ +:license-guide: {main-site}/articles/license-guide/ :linux-emulation: {main-site-en}/articles/linux-emulation/ :linux-users: {main-site-en}/articles/linux-users/ :mailing-list-faq: {main-site-en}/articles/mailing-list-faq/ diff --git a/shared/de/urls.adoc b/shared/de/urls.adoc index 2bd4c94c7f..c08994e84a 100644 --- a/shared/de/urls.adoc +++ b/shared/de/urls.adoc @@ -41,6 +41,7 @@ endif::[] :ipsec-must: {main-site-en}/articles/ipsec-must/ :ldap-auth: {main-site-en}/articles/ldap-auth/ :leap-seconds: {main-site}/articles/leap-seconds/ +:license-guide: {main-site}/articles/license-guide/ :linux-emulation: {main-site-en}/articles/linux-emulation/ :linux-users: {main-site}/articles/linux-users/ :mailing-list-faq: {main-site-en}/articles/mailing-list-faq/ diff --git a/shared/el/urls.adoc b/shared/el/urls.adoc index 9a093e8c4b..2528152348 100644 --- a/shared/el/urls.adoc +++ b/shared/el/urls.adoc @@ -41,6 +41,7 @@ endif::[] :ipsec-must: {main-site-en}/articles/ipsec-must/ :ldap-auth: {main-site-en}/articles/ldap-auth/ :leap-seconds: {main-site-en}/articles/leap-seconds/ +:license-guide: {main-site}/articles/license-guide/ :linux-emulation: {main-site-en}/articles/linux-emulation/ :linux-users: {main-site}/articles/linux-users/ :mailing-list-faq: {main-site}/articles/mailing-list-faq/ diff --git a/shared/en/urls.adoc b/shared/en/urls.adoc index a7d91bef33..bf937d4564 100644 --- a/shared/en/urls.adoc +++ b/shared/en/urls.adoc @@ -44,6 +44,7 @@ endif::[] :ipsec-must: {main-site}/articles/ipsec-must/ :ldap-auth: {main-site}/articles/ldap-auth/ :leap-seconds: {main-site}/articles/leap-seconds/ +:license-guide: {main-site}/articles/license-guide/ :linux-emulation: {main-site}/articles/linux-emulation/ :linux-users: {main-site}/articles/linux-users/ :mailing-list-faq: {main-site}/articles/mailing-list-faq/ diff --git a/shared/es/urls.adoc b/shared/es/urls.adoc index 2bfb2938fc..f5da24defa 100644 --- a/shared/es/urls.adoc +++ b/shared/es/urls.adoc @@ -41,6 +41,7 @@ endif::[] :ipsec-must: {main-site}/articles/ipsec-must/ :ldap-auth: {main-site-en}/articles/ldap-auth/ :leap-seconds: {main-site}/articles/leap-seconds/ +:license-guide: {main-site}/articles/license-guide/ :linux-emulation: {main-site-en}/articles/linux-emulation/ :linux-users: {main-site}/articles/linux-users/ :mailing-list-faq: {main-site}/articles/mailing-list-faq/ diff --git a/shared/fr/urls.adoc b/shared/fr/urls.adoc index 10a92f8b5a..a95d0a76fc 100644 --- a/shared/fr/urls.adoc +++ b/shared/fr/urls.adoc @@ -41,6 +41,7 @@ endif::[] :ipsec-must: {main-site}/articles/ipsec-must/ :ldap-auth: {main-site-en}/articles/ldap-auth/ :leap-seconds: {main-site}/articles/leap-seconds/ +:license-guide: {main-site}/articles/license-guide/ :linux-emulation: {main-site-en}/articles/linux-emulation/ :linux-users: {main-site}/articles/linux-users/ :mailing-list-faq: {main-site-en}/articles/mailing-list-faq/ diff --git a/shared/hu/urls.adoc b/shared/hu/urls.adoc index 0649b02474..baa70ce7a7 100644 --- a/shared/hu/urls.adoc +++ b/shared/hu/urls.adoc @@ -41,6 +41,7 @@ endif::[] :ipsec-must: {main-site-en}/articles/ipsec-must/ :ldap-auth: {main-site-en}/articles/ldap-auth/ :leap-seconds: {main-site-en}/articles/leap-seconds/ +:license-guide: {main-site}/articles/license-guide/ :linux-emulation: {main-site-en}/articles/linux-emulation/ :linux-users: {main-site}/articles/linux-users/ :mailing-list-faq: {main-site-en}/articles/mailing-list-faq/ diff --git a/shared/id/urls.adoc b/shared/id/urls.adoc index 178c033051..a9777eddf4 100644 --- a/shared/id/urls.adoc +++ b/shared/id/urls.adoc @@ -43,6 +43,7 @@ endif::[] :ipsec-must: {main-site-en}/articles/ipsec-must/ :ldap-auth: {main-site-en}/articles/ldap-auth/ :leap-seconds: {main-site-en}/articles/leap-seconds/ +:license-guide: {main-site}/articles/license-guide/ :linux-emulation: {main-site-en}/articles/linux-emulation/ :linux-users: {main-site-en}/articles/linux-users/ :mailing-list-faq: {main-site}/articles/mailing-list-faq/ diff --git a/shared/it/urls.adoc b/shared/it/urls.adoc index bf4456a22c..a72cbe14ff 100644 --- a/shared/it/urls.adoc +++ b/shared/it/urls.adoc @@ -41,6 +41,7 @@ endif::[] :ipsec-must: {main-site-en}/articles/ipsec-must/ :ldap-auth: {main-site-en}/articles/ldap-auth/ :leap-seconds: {main-site-en}/articles/leap-seconds/ +:license-guide: {main-site}/articles/license-guide/ :linux-emulation: {main-site-en}/articles/linux-emulation/ :linux-users: {main-site-en}/articles/linux-users/ :mailing-list-faq: {main-site-en}/articles/mailing-list-faq/ diff --git a/shared/ja/urls.adoc b/shared/ja/urls.adoc index 1d83477031..6297daf712 100644 --- a/shared/ja/urls.adoc +++ b/shared/ja/urls.adoc @@ -41,6 +41,7 @@ endif::[] :ipsec-must: {main-site}/articles/ipsec-must/ :ldap-auth: {main-site-en}/articles/ldap-auth/ :leap-seconds: {main-site}/articles/leap-seconds/ +:license-guide: {main-site}/articles/license-guide/ :linux-emulation: {main-site-en}/articles/linux-emulation/ :linux-users: {main-site-en}/articles/linux-users/ :mailing-list-faq: {main-site-en}/articles/mailing-list-faq/ diff --git a/shared/ko/urls.adoc b/shared/ko/urls.adoc index cb07b33587..df9dcb360c 100644 --- a/shared/ko/urls.adoc +++ b/shared/ko/urls.adoc @@ -41,6 +41,7 @@ endif::[] :ipsec-must: {main-site-en}/articles/ipsec-must/ :ldap-auth: {main-site-en}/articles/ldap-auth/ :leap-seconds: {main-site-en}/articles/leap-seconds/ +:license-guide: {main-site}/articles/license-guide/ :linux-emulation: {main-site-en}/articles/linux-emulation/ :linux-users: {main-site-en}/articles/linux-users/ :mailing-list-faq: {main-site-en}/articles/mailing-list-faq/ diff --git a/shared/mn/urls.adoc b/shared/mn/urls.adoc index ba5b5e73a7..2121cd3ad1 100644 --- a/shared/mn/urls.adoc +++ b/shared/mn/urls.adoc @@ -41,6 +41,7 @@ endif::[] :ipsec-must: {main-site-en}/articles/ipsec-must/ :ldap-auth: {main-site-en}/articles/ldap-auth/ :leap-seconds: {main-site-en}/articles/leap-seconds/ +:license-guide: {main-site}/articles/license-guide/ :linux-emulation: {main-site-en}/articles/linux-emulation/ :linux-users: {main-site-en}/articles/linux-users/ :mailing-list-faq: {main-site-en}/articles/mailing-list-faq/ diff --git a/shared/nl/urls.adoc b/shared/nl/urls.adoc index 071eb2d43d..833828b5e4 100644 --- a/shared/nl/urls.adoc +++ b/shared/nl/urls.adoc @@ -41,6 +41,7 @@ endif::[] :ipsec-must: {main-site-en}/articles/ipsec-must/ :ldap-auth: {main-site-en}/articles/ldap-auth/ :leap-seconds: {main-site}/articles/leap-seconds/ +:license-guide: {main-site}/articles/license-guide/ :linux-emulation: {main-site-en}/articles/linux-emulation/ :linux-users: {main-site-en}/articles/linux-users/ :mailing-list-faq: {main-site-en}/articles/mailing-list-faq/ diff --git a/shared/pl/urls.adoc b/shared/pl/urls.adoc index 54b2860684..f50d9a4bb1 100644 --- a/shared/pl/urls.adoc +++ b/shared/pl/urls.adoc @@ -41,6 +41,7 @@ endif::[] :ipsec-must: {main-site-en}/articles/ipsec-must/ :ldap-auth: {main-site-en}/articles/ldap-auth/ :leap-seconds: {main-site-en}/articles/leap-seconds/ +:license-guide: {main-site}/articles/license-guide/ :linux-emulation: {main-site-en}/articles/linux-emulation/ :linux-users: {main-site-en}/articles/linux-users/ :mailing-list-faq: {main-site-en}/articles/mailing-list-faq/ diff --git a/shared/pt-br/urls.adoc b/shared/pt-br/urls.adoc index 1ab8387e6d..3a9a905e93 100644 --- a/shared/pt-br/urls.adoc +++ b/shared/pt-br/urls.adoc @@ -41,6 +41,7 @@ endif::[] :ipsec-must: {main-site}/articles/ipsec-must/ :ldap-auth: {main-site}/articles/ldap-auth/ :leap-seconds: {main-site}/articles/leap-seconds/ +:license-guide: {main-site}/articles/license-guide/ :linux-emulation: {main-site}/articles/linux-emulation/ :linux-users: {main-site}/articles/linux-users/ :mailing-list-faq: {main-site}/articles/mailing-list-faq/ diff --git a/shared/ru/urls.adoc b/shared/ru/urls.adoc index 9b813055f4..2c17de0fbe 100644 --- a/shared/ru/urls.adoc +++ b/shared/ru/urls.adoc @@ -46,6 +46,7 @@ endif::[] :ipsec-must: {main-site}/articles/ipsec-must/ :ldap-auth: {main-site}/articles/ldap-auth/ :leap-seconds: {main-site}/articles/leap-seconds/ +:license-guide: {main-site}/articles/license-guide/ :linux-emulation: {main-site}/articles/linux-emulation/ :linux-users: {main-site}/articles/linux-users/ :mailing-list-faq: {main-site}/articles/mailing-list-faq/ diff --git a/shared/tr/urls.adoc b/shared/tr/urls.adoc index 8690fe28cd..09dad0dcb8 100644 --- a/shared/tr/urls.adoc +++ b/shared/tr/urls.adoc @@ -41,6 +41,7 @@ endif::[] :ipsec-must: {main-site-en}/articles/ipsec-must/ :ldap-auth: {main-site-en}/articles/ldap-auth/ :leap-seconds: {main-site-en}/articles/leap-seconds/ +:license-guide: {main-site}/articles/license-guide/ :linux-emulation: {main-site-en}/articles/linux-emulation/ :linux-users: {main-site-en}/articles/linux-users/ :mailing-list-faq: {main-site-en}/articles/mailing-list-faq/ diff --git a/shared/zh-cn/urls.adoc b/shared/zh-cn/urls.adoc index 784ae32d87..fb3922c297 100644 --- a/shared/zh-cn/urls.adoc +++ b/shared/zh-cn/urls.adoc @@ -41,6 +41,7 @@ endif::[] :ipsec-must: {main-site-en}/articles/ipsec-must/ :ldap-auth: {main-site-en}/articles/ldap-auth/ :leap-seconds: {main-site}/articles/leap-seconds/ +:license-guide: {main-site}/articles/license-guide/ :linux-emulation: {main-site-en}/articles/linux-emulation/ :linux-users: {main-site}/articles/linux-users/ :mailing-list-faq: {main-site-en}/articles/mailing-list-faq/ diff --git a/shared/zh-tw/urls.adoc b/shared/zh-tw/urls.adoc index 793f3395a3..d977fcc2ae 100644 --- a/shared/zh-tw/urls.adoc +++ b/shared/zh-tw/urls.adoc @@ -41,6 +41,7 @@ endif::[] :ipsec-must: {main-site-en}/articles/ipsec-must/ :ldap-auth: {main-site-en}/articles/ldap-auth/ :leap-seconds: {main-site}/articles/leap-seconds/ +:license-guide: {main-site}/articles/license-guide/ :linux-emulation: {main-site-en}/articles/linux-emulation/ :linux-users: {main-site-en}/articles/linux-users/ :mailing-list-faq: {main-site}/articles/mailing-list-faq/ diff --git a/website/content/en/internal/members.adoc b/website/content/en/internal/members.adoc index c806164edf..6d0e35c74a 100644 --- a/website/content/en/internal/members.adoc +++ b/website/content/en/internal/members.adoc @@ -34,7 +34,7 @@ All Members should ensure that all contributed material: * adheres to the Project's standards and practices. * is correctly attributed to its authors. -* has appropriate licensing. Where this is the original work of the Project Member, the standard FreeBSD license is preferred. +* has appropriate licensing. Where this is the original work of the Project Member, the standard FreeBSD license is preferred. See the link:{license-guide}[FreeBSD License Policies] for details. Members MUST create SSH and PGP keys in order to gain access to Project resources. diff --git a/website/content/en/internal/policies.adoc b/website/content/en/internal/policies.adoc index 88a4a8f7db..15d85cb7e2 100644 --- a/website/content/en/internal/policies.adoc +++ b/website/content/en/internal/policies.adoc @@ -24,7 +24,7 @@ It contains almost everything a new committer to the FreeBSD Project needs to kn * link:../i18n[Internationalization Policy] * link:../new-account[New Account Creation Procedure] * link:{pr-guidelines}[Problem Report Handling Guidelines] -* link:../software-license[Software License Policy] +* link:../software-license[Software License Policy] (see also the link:{license-guide}[full license policy]) * link:../data[User Data Policy] * link:../members[FreeBSD Project Membership] * link:../cross-repo-commits[Cross Repo Committing Policy] diff --git a/website/content/en/internal/software-license.adoc b/website/content/en/internal/software-license.adoc index 33ee535e95..1f2f6f308f 100644 --- a/website/content/en/internal/software-license.adoc +++ b/website/content/en/internal/software-license.adoc @@ -3,8 +3,14 @@ title: "Software License Policy" sidenav: docs --- +include::shared/en/urls.adoc[] + = Software License Policy +The canonical FreeBSD license policy, including preferred license templates, acceptable licenses, and SPDX usage, is documented in the link:{license-guide}[FreeBSD License Policies] article. + +What follows is a summary of the key points. + == Philosophy The FreeBSD Project aims to produce a complete, BSD-licensed operating system allowing consumers of the system to produce derivative products without constraint or further license obligations. @@ -20,142 +26,3 @@ Unless a special exception is made, no existing BSD-licensed components may be r We instead encourage FreeBSD and third party developers to seek the relicensing or reimplementation of critical components under the BSD license. Such would ease their more integral adoption into the FreeBSD operating system. -== Policy - -* The import of new software licensed under any licenses other than the BSD license and BSD-Like Licenses (as defined below) requires the prior approval of the FreeBSD Core Team. Requests for import must include: -** A list of features or bug fixes that the new version or patches contain, along with evidence that our users need those features. PRs or references to mailing list discussions are ideal forms of evidence. -** A list of FreeBSD branches that may be affected. Expansions of scope require a new request to and approval from the FreeBSD Core Team. - -* The Apache License 2.0 is acceptable for use in some cases. The Core Team must approve the import of new Apache License licensed components or the change of license of existing components to the Apache License. -** This license is approved for the following components: -*** LLVM toolchain and (with LLVM Exceptions) runtime components. -*** Subversion and its dependencies - -* The BSD+Patent License is acceptable for use in some cases. The Core Team must approve the import of new BSD+Patent License licensed components or the change of license of existing components to the BSD+Patent License. -** This license is approved for the following components: -*** EDK2 derived code related to UEFI functionality - -* The Common Development and Distribution License (CDDL) is acceptable for use in some cases. The Core Team must approve the import of new CDDL licensed components or the change of license of existing components to the CDDL. -** This license is approved for the following components: -*** DTrace -*** ZFS filesystem including kernel support and userland utilities - -* Historically, the phrase 'All Rights Reserved.' was included in all copyright notices. The BSD releases had it to comply with the Buenos Aires Convention of 1910 in the Americas. With the ratification of the Berne Convention in 2000, it became obsolete. As such, the FreeBSD project recommends that new code omit the phrase and encourages existing copyright holders to remove it. In 2018, the project updated its templates to remove it. - -=== Acceptable licenses - -The following licenses are considered to be acceptable BSD-Like Licenses for the purpose of this Policy. They must be reproduced verbatim on any new code. Deviations or the use of any other license must be approved by the FreeBSD Core Team: - -* The 2 clause version of the BSD license - -.... -/* - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) [year] [your name] - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -.... -* The 3 clause version of the BSD license - -.... -/* - * SPDX-License-Identifier: BSD-3-Clause - * - * Copyright (c) [year] [your name] - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the author nor the names of its contributors may - * be used to endorse or promote products derived from this software - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -.... -* The ISC License - -.... -/* - * SPDX-License-Identifier: ISC - * - * Copyright (c) [year] [copyright holder] - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -.... -* The MIT License - -.... -/* - * SPDX-License-Identifier: MIT - * - * Copyright (c) [year] [copyright holders] - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -.... - -* It is acceptable to use only the SPDX-License-Identifier -** See https://spdx.github.io/spdx-spec/[Annex D of SPDX Standard] for definition of standard SPDX-License-Identifier expressions used, how to interpret them and where to find the license text(s) that are applicable. From nobody Fri Jun 26 19:07:48 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gn4tr3wYcz6hjqG for ; Fri, 26 Jun 2026 19:07:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn4tr1RcCz3bPN for ; Fri, 26 Jun 2026 19:07:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782500868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aqyBo6Q+HeH6/RNSM82MkPD65soOw4KUHWfiq9y1REE=; b=RQraOM7agU5DrgMv0MC+BLCRffUbuCAFPKRmQavckQkmZ8sVChUhFtG/eCWPW+eVKiGLdY Mny5XYhXJlSMSl3c+73zcIVGxMsFfRVpGu7mvgGYIKeiwm9/YcRpA05veFz7wxDhZG/D7w 5qjmCbQJlVGEJh7nENRgVl4/uBkhpz00b7NXNfIVZSEMCXWGycBBegVn57Wm404GzG+984 1D55mWP1WvVbdujjpRsxpmnLk0+j5qx1cCMw5LG3Xkjc9jlZP0p1KKhvkUC0qcTUqWTUkR lRYtioc/DT6PV4lEn6/u0eEN+vKb3wEc7fWkru/rKMJb+CfeNyRm5ZQomzgifQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782500868; a=rsa-sha256; cv=none; b=rII07tQ5sWgzgFvGfAZ7NlPTqIBGepBw9sd8CNivYEsxon26s1VQ2cCZ0lzYCnxIliHFnC CARlP7hSX4azpLxoz7zbTzNBtABerxIKXfGwcTod3SLo0Rgs1+lTAImTSiGXkbZI1ndZXc yYtQkRM3EghudZ1nbbUY/o2DeCj5gRMSoY7Vv42qRCfK/88zrxDfs4u7Ix1pPCXY2ZdVnh aNQAh+jLCI6dVqGu0yMiD3aZM7XpXByVrGnKM9rlpHNmfPcn08FoVctA/VL3E75ggs8/9T PjyqqUIfS7NtQ9VC8h4j/Z0t0Ugpu1gQAeKm/CZHRsV7wSkB+vHuEsY49IPyYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782500868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aqyBo6Q+HeH6/RNSM82MkPD65soOw4KUHWfiq9y1REE=; b=e1Ssd7b4+95ido93RmhsRh+8ieggIQEPLCW9+JxbzXbfgZOosclQJjTnhrMsi7UKCbWS4J tUMgJ+V4M1CSIhGYEsT6VTbEtxxdCkkxYHzoW7m61sQqLEvpmvvkE3bht2vI45eljjioZR SwmO9H5kdGDKdAiqb4SKUOFRnKpS6ADEOakLe6lwWYpH9rAm+lFSsG2er+aaJiYA6ap63F julg2AIi9ibb6/4YGM7f/o/3Mkc4O38pxpWydgMm7QWyOGqeD9VP9ZxllNthIkZXYKupdE bEbNJWmC77m6L6Qx8Lv/7N/LpbZGSC8EugwVkik7LXq7Uie3MdNihzawSTQlUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn4tr01yZzrFC for ; Fri, 26 Jun 2026 19:07:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42809 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 19:07:48 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Benedict Reuschling Subject: git: c117bc4a90 - main - fdp-primer: Include context in the git format-patch for users to use List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bcr X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c117bc4a9077cec38ccd1fd86a38ad4e942c1b21 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 19:07:48 +0000 Message-Id: <6a3ece04.42809.29ebcf8c@gitrepo.freebsd.org> The branch main has been updated by bcr: URL: https://cgit.FreeBSD.org/doc/commit/?id=c117bc4a9077cec38ccd1fd86a38ad4e942c1b21 commit c117bc4a9077cec38ccd1fd86a38ad4e942c1b21 Author: Benedict Reuschling AuthorDate: 2026-06-26 18:11:05 +0000 Commit: Benedict Reuschling CommitDate: 2026-06-26 19:07:21 +0000 fdp-primer: Include context in the git format-patch for users to use The quick start section did not instruct the reader to include context in the git format-patch example. This is not ideal as it makes reviewing easier. Include this information with a bit of explanation below it. Event: Halifax Hackathon 202606 Location: A different chair than obiwac's Reviewed by: lwhsu Differential Revision: https://reviews.freebsd.org/D57891 --- documentation/content/en/books/fdp-primer/overview/_index.adoc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/documentation/content/en/books/fdp-primer/overview/_index.adoc b/documentation/content/en/books/fdp-primer/overview/_index.adoc index 4abdb3f084..7f3cca1aa9 100644 --- a/documentation/content/en/books/fdp-primer/overview/_index.adoc +++ b/documentation/content/en/books/fdp-primer/overview/_index.adoc @@ -309,10 +309,12 @@ Make sure that all required files are included, then commit the change to your l [source,shell] .... % git commit -% git format-patch origin/main +% git format-patch -U999999 origin/main .... + -Patch generated with `git format-patch` will include author identity and email addresses, +The `-U999999` parameter adds as much context to the patch as possible which makes reviewing easier. + +A patch file is generated as a result of `git format-patch` in the local directory which will include author identity and email addresses, making it easier for developers to apply (with `git am`) and give proper credit. + [IMPORTANT] From nobody Fri Jun 26 19:07:46 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gn4tw5G3Fz6hkHL for ; Fri, 26 Jun 2026 19:07:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn4tw3STXz3b7b for ; Fri, 26 Jun 2026 19:07:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782500872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gl4uxEkFW5U8o/dqAGrA/IdUQjifXF0eKKJ1uR2MdP0=; b=LqBHjUl5pLvRcv1uyYSI+OsgdDuqoHADqnfGSNcN9jWVetB+gV/bl8Gm/gM3/CsoQalNvO QFaRKE95dTBts0kuCCjvhQX1/gpSA3V1Bh+hPa/M7xkyn4cjA+KH+qk5/AOjrw+KxXuH5h 9fDJqGngo1yolK4RuN10dEiatpjW4GY3KhH/kaCq7ya4Oq6+yXbi5DXB5Zids7mn4/uZZl tZrsrzOQEEuYokOdvUQW3Dl9uypbD9VmYr4bEnohzF1rGl+jM7suKog6aWRnTUyvWtuIek kDRzCONAhsWQbwDLk8QwWcJaNwifCjpuJYii00i18q3hSkMsGVCxt8jrHsR8og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782500872; a=rsa-sha256; cv=none; b=KFTymwZ1xJuH9i6F7Z+itFBEptx2fe7G0Ae6BJnaoBjhEtjnwg/mB97mbSNLyWkW6qjUVJ gEUFfagNKRA/CiD5Ovg4boCH4JtBsw9bIiwaAdvt1wl9YPXL/CRqR10/DksthsBZFLt7An MxSe1++vllUuGvfNgztBI+en5BuEIKulO5g4knQMi6D8bsiUbr3gQm/rnyl1OSN11VkMsk yyUtjEZn9+iimiuUCLh3CtQYCx8fWaI+zsq0E+xBwe+JNCLDTwEj0m2EXNqTv+4/+bdfh1 qTZzvc/dembOTVuOL2pJFhwfk2J6StXvkgt3LCvzlXyrclWnk7DUoyccuaAUeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782500872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gl4uxEkFW5U8o/dqAGrA/IdUQjifXF0eKKJ1uR2MdP0=; b=jSgACLuv2ROY9FdtOIuwNTXApsMuIgR0rhjjk3kL8jYBhwVgTNZuraoaJ13tqV25ZnsQ/j f2kwLRdZPM3/PsjEDUaoZs0VFx35E9sDn/HVFr6Odu5GgjcxrPL9JhQXOdtHAehOd9uqlf t2LLNtoclNEXUN7fGmX9p2hgh5SxwokVvRRb4fLTaxzf0YsQhtsp6rgJg44NrwiiIctAie ZcN+xLAIlkQ5UX4VjNmS7bpcL4hvhTwz8G5uEDHW4c9uyOYJ4PhIOiPRkx7biojHF2NRmq 2YObl7etQVGw4o7S89DRcm8XyV+6kveZcOsyhJ7ysD5xglN3iGyK3S/X2m1FkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn4tw1JnqzqWq for ; Fri, 26 Jun 2026 19:07:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41749 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 19:07:46 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Benedict Reuschling Subject: git: 9ddc2f8625 - main - handbook/zfs: Add new section about ZFS native encryption List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bcr X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ddc2f8625bf8d59738c10c1370ba03eac0677af Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 19:07:46 +0000 Message-Id: <6a3ece02.41749.4fa5d59f@gitrepo.freebsd.org> The branch main has been updated by bcr: URL: https://cgit.FreeBSD.org/doc/commit/?id=9ddc2f8625bf8d59738c10c1370ba03eac0677af commit 9ddc2f8625bf8d59738c10c1370ba03eac0677af Author: Benedict Reuschling AuthorDate: 2026-06-26 17:22:42 +0000 Commit: Benedict Reuschling CommitDate: 2026-06-26 19:07:21 +0000 handbook/zfs: Add new section about ZFS native encryption This change adds a new section describing how to use ZFS native encryption including examples to the handbook. It is based on my own training material, the open-zfs.org documentation on the subject and the corresponding man pages (zfs-load-key(8), zfs-unload-key(8)). I ran my writeup through an AI for grammar, typo and active voice fixes, instructing it to not make any changes to the text itself. Event: Halifax Hackathon 202606 Differential Revision: https://reviews.freebsd.org/D57889 --- .../content/en/books/handbook/zfs/_index.adoc | 299 +++++++++++++++++++++ 1 file changed, 299 insertions(+) diff --git a/documentation/content/en/books/handbook/zfs/_index.adoc b/documentation/content/en/books/handbook/zfs/_index.adoc index e1738f9716..607d905fb8 100644 --- a/documentation/content/en/books/handbook/zfs/_index.adoc +++ b/documentation/content/en/books/handbook/zfs/_index.adoc @@ -2645,6 +2645,305 @@ Another restriction aimed at preventing abuse: non-`root` users must own the mou `zfs allow _someuser_ allow _mydataset_` gives the specified user the ability to assign any permission they have on the target dataset, or its children, to other users. If a user has the `snapshot` permission and the `allow` permission, that user can then grant the `snapshot` permission to other users. +[[zfs-native-encryption]] +== ZFS Native Encryption + +ZFS supports native encryption of datasets and the data stored within them. +This was not always the case, as previous solutions relied on FreeBSD's GELI-based encryption. +While this approach is secure, it was not as easily portable to non-FreeBSD systems that lacked GELI support. +With ZFS native encryption, encrypted datasets can be used on other systems that support this pool feature without relying on third-party components or operating system-native encryption. + +Another benefit of ZFS native encryption is that datasets do not need to be decrypted for administrative tasks such as snapshots, replication, or scrub operations. +ZFS data integrity checks work just as well with natively encrypted datasets, and compression also works encrypted datasets. + +Different datasets on the same pool can use separate keys independently. +Consider a central file server where different users store their data in encrypted home datasets. +User A has a different key than User B. +Both users can work side by side and choose to unencrypt their datasets as needed without knowing each other's decryption keys. +The decryption method can also differ completely between users without affecting one another. +This allows sensitive data from different users to be stored on the same pool while remaining protected by separate keys. + +Before using ZFS native encryption, be aware of the following: + +- Encryption is applied at the dataset level, not the pool level. +- Booting from encrypted ZFS pools is not yet supported on FreeBSD. +- Encryption can only be enabled when a dataset is created, not afterward. +- The block cipher, key length, and encryption mode can not be changed after they have been set. +- ZFS does not encrypt metadata. + +The last point may seem like a drawback compared to full-disk encryption. +However, it provides greater flexibility by allowing different keys to protect datasets within the same pool instead of requiring a single key or passphrase to unlock the entire pool. +Specifically, ZFS encrypts the following: + +* file and zvol data, +* file attributes, +* ACLs, +* permission bits, +* directory listings, +* FUID mappings, +* userused/groupused data, and +* deduplicated data + +Some ZFS metadata and information remains unencrypted, including the following: + +* pool structure and name, +* dataset and snapshot names, +* dataset hierarchy, +* properties, +* file size, +* file holes, and +* deduplication tables + +This unencrypted metadata allows ZFS to perform routine maintenance operations, such as `zfs scrub`, without first decrypting the data. +As a result, ZFS can detect and repair corrupted encrypted data that is encrypted data without accessing the unencrypted file contents. + +To encrypt existing unencrypted data, copy it to a dataset with encryption enabled. +This allows data to be migrated to a secure location within the pool, provided the passphrase is supplied to authorize access. +Typically, this is done by loading the encryption key into memory after confirming knowledge of a secret such as a passphrase. +Once the key has been loaded, the dataset contents become accessible for reading and writing. +To re-secure the dataset, unload the key from memory. +ZFS then makes the dataset inaccessible until the key is loaded again. + +When encryption is enabled, some ZFS operations behave differently. +ZFS applies compression before encryption to preserve compression ratios. +While ZFS normally uses 256-bit checksums, encryption replaces them with a 128-bit checksum and a 128-bit Message Authentication Code (MAC) provided by the encryption suite. +This provides additional protection against malicious data modification. + +When deduplication is used together with encryption, ZFS performs deduplication only within the encrypted dataset, its snapshots, and its clones. +This prevents information from leaking between encrypted datasets. +The tradeoff is lower deduplication efficiency because ZFS cannot compare checksums across the entire pool. +Even so, deduplication combined with encryption still reveals which blocks are identical and incurs additional CPU overhead for each block written. + +Other limitations apply when using ZFS encryption. +The `embedded_data` feature cannot be used with encryption. +Datasets with encryption enabled also cannot have the `copies` property set to 3, because the implementation stores encrypted metadata in the location where the third copy would normally reside. + +[[zfs-encrypted-dataset-creation]] +=== Creating an encrypted dataset + +ZFS encryption is enabled by setting the `encryption=on` property when creating a dataset. +Setting this property outside of a `zfs create` command does not enable encryption retroactively, as it only takes effect during dataset creation. +In the following example, a passphrase is used when mounting the encrypted dataset after it has been created. + +[source,shell] +.... +# zfs create -o encryption=on -o keyformat=passphrase -o keylocation=prompt zroot/secretdata +Enter passphrase: +Re-enter passphrase: +.... + +If the passphrase is shorter than eight characters, ZFS rejects it and does not create the dataset. +After the passphrase has been entered correctly twice, ZFS creates and mounts the dataset in the pool. + +Any data stored in the encrypted dataset remains encrypted while it resides there. +Copying data from an encrypted dataset to an unencrypted location decrypts the data during the copy operation. +The newly created dataset can then be mounted at a different location if necessary. + +[source,shell] +.... +# zfs set mountpoint=/secretdata zroot/secretdata +# echo "Hello FreeBSD!" > /secretdata/message +# cat /secretdata/message +Hello FreeBSD! +.... + +As expected, the data is currently available for reading and writing by anyone who has access to the dataset. + +[[zfs-encrypted-dataset-properties]] +=== Properties of encrypted datasets + +Listing the ZFS native encryption properties for a dataset is done with the following command: + +[source,shell] +.... +# zfs get encryption,keylocation,keyformat zroot/secretdata +NAME PROPERTY VALUE SOURCE +mypool/secretdata encryption aes-256-gcm - +mypool/secretdata keylocation prompt local +mypool/secretdata keyformat passphrase - +.... + +The `encryption` property shows `aes-256-gcm`, which is currently the default encryption method used by ZFS. +As indicated by the `SOURCE` column, neither this property nor the `keyformat` property can be changed using `zfs set` after the dataset has been created. +See the crossref:zfs-change-encryption-key[zfs-change-encryption-key, changing the encryption key] section for information on how to modify some of these properties. +The following table lists the encryption-related properties used by ZFS: + +[.informaltable] +[cols="10%,90%"] +|=== + +|[[zfs-term-encryptionroot]]encryptionroot +|The dataset from which the current dataset inherits its encryption key. +Dataset clones share the encryption key of their originating dataset. + +|[[zfs-term-keyformat]]keyformat +a|The format of the encryption key. Possible values are: `raw`, `hex`, and `passphrase`. Both `raw` and `hex` keys must be 32 bytes long and contain random values. +|[[zfs-term-encryption]]encryption +a|The cipher used for encryption, consisting of the block cipher, key length, and encryption mode. Both the `encryption` and `keyformat` properties must be specified when the dataset is created. Possible values for the `encryption` property are: + + * `off` (default), + * `on`, + * `aes-128-ccm`, + * `aes-192-ccm`, + * `aes-256-ccm`, + * `aes-128-gcm`, + * `aes-192-gcm`, and + * `aes-256-gcm` (current standard when `on` is set). + +This property cannot be changed once it has been set. + +|[[zfs-term-keystatus]]keystatus +a|Indicates whether an encryption key has been successfully loaded. Possible values are `none`, `available`, and `unavailable`. + +|[[zfs-term-keylocation]]keylocation +a|Specifies the location from which to load the encryption key. Possible values are: + +* `prompt`, +* `file://path/to/file`, +* `http://some.address`, and +* `https://other.address` + +|[[zfs-term-pbkdf2iters]]pbkdf2iters +a|The number of iterations used when deriving an encryption key from a passphrase. This forces an attacker to perform a large number of computationally expensive hash operations. As computing power increases, this value should also be increased from its current default of 350000. +|=== + +[[zfs-unload-encryption-key]] +=== Unloading the encryption key + +Protecting the data stored in an encrypted dataset requires two steps: first unmount the dataset, then unload the encryption key from memory. +This distinction is important. +An unmounted dataset is not protected if its encryption key remains loaded in memory. +Always run `zfs unload-key` to protect the data. +To access the dataset again, load the key and provide the passphrase as described in the crossref:zfs-load-encryption-key[zfs-load-encryption-key, loading the encryption key] section. +ZFS prevents `zfs unload-key` from running while the dataset is still mounted. + +[source,shell] +.... +# zfs unmount zroot/secretdata +# zfs unload-key zroot/secretdata +.... + +Running `zfs unload-key` multiple times results in an error indicating that the key has already been unloaded. + +[[zfs-load-encryption-key]] +=== Loading the encryption key + +Before an encrypted dataset can be used like any other dataset, its encryption key must be loaded and the passphrase provided. +At this point, the `keystatus` property is still set to `unavailable`, and mounting the dataset fails because the key has not yet been loaded: + +[source,shell] +.... +# zfs get keystatus zroot/secretdata +NAME PROPERTY VALUE SOURCE +zroot/secretdata keystatus unavailable - +# zfs mount zroot/secretdata +cannot mount 'zroot/secretdata': encryption key not loaded +.... + +This indicates that the dataset is encrypted and requires an encryption key. +To mount the dataset, run `zfs load-key` and provide the passphrase when prompted: + +[source,shell] +.... +# zfs load-key zroot/secretdata +Enter passphrase for 'zroot/secretdata': +# zfs get keystatus zroot/secretdata +NAME PROPERTY VALUE SOURCE +zroot/secretdata keystatus available - +.... + +Next, mount the dataset to make it accessible through the filesystem hierarchy: + +[source,shell] +.... +# zfs mount zroot/secretdata +# mount|grep secretdata +zroot/secretdata on /secretdata (zfs, local, noatime, nfsv4acls) +.... + +To load multiple encryption keys recursively, specify the `-r` option with `zfs load-key`. +If a key has already been loaded, ZFS reports this with an error message. + +[source,shell] +.... +# zfs load-key zroot/secretdata +Key load error: Key already loaded for 'zroot/secretdata'. +.... + +The `keystatus` property also confirms that the key has been loaded by reporting the value `available`. +To verify whether a passphrase is correct without loading the key, use the `-n` option to perform a dry run. + +[[zfs-change-encryption-key]] +=== Changing the encryption key + +ZFS also supports changing encryption keys, such as replacing a passphrase. +This operation does not require re-encrypting the dataset. +Run the following command to change the encryption passphrase: + +[source,shell] +.... +# zfs change-key zroot/secretdata +Enter new passphrase for 'zroot/secretdata': +Re-enter new passphrase for 'zroot/secretdata': +.... + +Running `zfs change-key` requires the current key to be loaded. If it is not, +ZFS still prompts for the new key but then displays a warning that the current key has not been loaded. + +The zfs change-key command can also modify the `keylocation`, `keyformat`, and `pbkdf2iters` properties by specifying them with the `-o` option. +Running `zfs change-key` on an encrypted child dataset makes it an encryption root if it is not one already. +To prevent this behavior and continue inheriting the parent's key, specify the `-i` option. + +Be aware that changing the encryption key of a parent dataset also changes the key for child datasets that inherit it. +Consequently, those child datasets continue to use the parent's encryption key. +If a child dataset should use a different key, either specify a different `keyformat` when creating it or run `zfs change-key` on the child dataset. +Doing so creates a new encryption root for the child and breaks its encryption inheritance from the parent. + +ZFS clones of an encrypted dataset always use the encryption key of their origin dataset. +As a result, the `keystatus`, `keyformat`, `keylocation`, and `pbkdf2iters` properties are not inherited like other dataset properties. +Instead, they use the values defined by the encryption root. +To determine the encryption root, use the read-only `encryptionroot` property. + +If an attacker compromises an encryption key, changing the passphrase with `zfs change-key` does not necessarily protect existing or newly written data. +New data continues to be encrypted with the same master key as the existing data. +If an attacker obtains both a user key and its corresponding wrapped master key, running `zfs change-key` does not overwrite the previous master key on disk. +As a result, the old master key may remain available for forensic analysis for an indeterminate period. + +If a master key has been compromised, the preferred solution is to securely erase the underlying storage devices and create a new pool. +Afterwards, restore the data from a backup to the new pool. +Alternatively, create a new encrypted dataset, migrate the data using `zfs send` and `zfs receive`, and then run `zpool trim --secure` to erase the freed space. +If the underlying hardware does not support secure TRIM, use `zpool initialize` instead. + +[[zfs-encrypted-send]] +=== Sending Encrypted Datasets + +ZFS replication is based on sending dataset snapshots, which can also be created from encrypted datasets. +The resulting snapshots remain encrypted. + +[source,shell] +.... +# zfs snapshot zroot/secretdata@snap1 +.... + +In addition to crossref:zfs-load-encryption-key[zfs-send-ssh, sending encrypted backups over SSH], using the `-w` (raw) option with `zfs send` transfers the encrypted data blocks to the target pool. +A raw send provides several advantages: + +* the receiving system never sees plaintext data. +* the receiving system does not require the passphrase since no decryption takes place. +* Backups can be sent without first loading the encryption key. +* an untrusted system can receive the encrypted data but cannot decrypt or modify it without the encryption key. + +To send the snapshot created above as a raw stream to the dataset `secret` in the pool `backup`, enter the following command: + +[source,shell] +.... +# zfs send -w zroot/secretdata@snap1 | zfs recv backup/secret +.... + +Without the `-w` option, `zfs send` transmits the data in unencrypted form. +The receiving system may then re-encrypt the data using a different key. +However, doing so prevents future incremental raw sends to that destination. + [[zfs-advanced]] == Advanced Topics From nobody Fri Jun 26 19:09:57 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gn4xL0dK9z6hkCL for ; Fri, 26 Jun 2026 19:09:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn4xL0D4Cz3bXF for ; Fri, 26 Jun 2026 19:09:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782500998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MJeJetoknAMnsfbKP//Ck3mwnzHvthd7YapT+DSpjoQ=; b=hsPb0uwRXVRmA9+U9Bp/3X6MArjbBi7Zi5rXjAVCkv3XXEvk6cdtsmZkOxfxfTEEGlQ70f eaKmpWNrkE5slaa+CPI0IfWZTHWLvxy8hvTwpPi58gwWiD8KKKkjKHwu8GuoLEWW4oPN/z mJy4GEpFKs3Vyk8RLfCrvHtCRaPTtds/OCje+m2atrKTZ7W7SZmtrS38qFtLUIikD9oC9S TbwPw37vZDn42Qb01oVOVJGaN0AlmRHXzNIwCnoQG4QmF3tsA8h6zM2fYe4l3seduhQzMw tLUyUEj1KOoeCm6WlsDMKgbq2vshZWvJjeXZEUx3/YDwHTojbYeos/Rqofqnjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782500998; a=rsa-sha256; cv=none; b=tMhmn6gpswKqNfgQu38fol8b3bv3Oq8ME6KzQONZHmD4Er02Y/8LTvs//snxq2g68URoRd jKURV9A1K5XJW/Wl3LZ2kh2DmbH6NUugKp+lyMMfmn20lcG7SR4ipDadlwCKhbECgTpzBd rI/nQ7a7ai9+a6SvPUCqBQJH0t4NkTJloytbpcispM/jVnrnbG5mxW2LDlPQapy2dkTZ8e zxdePdLU8kqrp3TyhjNvG4lrEDI49EqFP7U3CyoWa3qbzN4J2Hq7QThbQc39FjQP8GV7hC 7gdteTGPx7KES7fImH/t04WHb4Y9H9sgDSqNM7MrzpywHaFuNNgZykZ3IX3pPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782500998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MJeJetoknAMnsfbKP//Ck3mwnzHvthd7YapT+DSpjoQ=; b=mS7JHBBeMgzEP+uGwkWNDbT+ErRFkQz0gWeD1YCF8DjG6lPZftKpyAmQOC70bPiRWHRG8t dTlcbJKQFAqBwWkNGyfbEkOUjZCd/rpzK3xUCIlT0FclcSNMYQ/hAzNwiihxrxqMF1u90y 1fPhMIIvQwyfdnVaJpp7nznZryezr8zjRCih2EzCtXaXA3T2hXDVWXcurD06ZMMJzuje8G +bQ0sj/uprlOqYvIm5bGmhfvRhAXm70TKeLHgR7glz1sksv9y0vYRWQw0b99XN6pjZFjHY W+Y53cMFLdFbgAKfm/ry5owmVHaUcrJuZizzwbwVlPKVFc4CbtZyWfHGMnADsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn4xK5b3bzqj4 for ; Fri, 26 Jun 2026 19:09:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43600 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 19:09:57 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Benedict Reuschling Subject: git: d020202567 - main - Revert "handbook/zfs: Add new section about ZFS native encryption" List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bcr X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d020202567aa62090adf23d27862749d1f81ce11 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 19:09:57 +0000 Message-Id: <6a3ece85.43600.18d51852@gitrepo.freebsd.org> The branch main has been updated by bcr: URL: https://cgit.FreeBSD.org/doc/commit/?id=d020202567aa62090adf23d27862749d1f81ce11 commit d020202567aa62090adf23d27862749d1f81ce11 Author: Benedict Reuschling AuthorDate: 2026-06-26 19:09:36 +0000 Commit: Benedict Reuschling CommitDate: 2026-06-26 19:09:36 +0000 Revert "handbook/zfs: Add new section about ZFS native encryption" This reverts commit 9ddc2f8625bf8d59738c10c1370ba03eac0677af. Not approved yet. --- .../content/en/books/handbook/zfs/_index.adoc | 299 --------------------- 1 file changed, 299 deletions(-) diff --git a/documentation/content/en/books/handbook/zfs/_index.adoc b/documentation/content/en/books/handbook/zfs/_index.adoc index 607d905fb8..e1738f9716 100644 --- a/documentation/content/en/books/handbook/zfs/_index.adoc +++ b/documentation/content/en/books/handbook/zfs/_index.adoc @@ -2645,305 +2645,6 @@ Another restriction aimed at preventing abuse: non-`root` users must own the mou `zfs allow _someuser_ allow _mydataset_` gives the specified user the ability to assign any permission they have on the target dataset, or its children, to other users. If a user has the `snapshot` permission and the `allow` permission, that user can then grant the `snapshot` permission to other users. -[[zfs-native-encryption]] -== ZFS Native Encryption - -ZFS supports native encryption of datasets and the data stored within them. -This was not always the case, as previous solutions relied on FreeBSD's GELI-based encryption. -While this approach is secure, it was not as easily portable to non-FreeBSD systems that lacked GELI support. -With ZFS native encryption, encrypted datasets can be used on other systems that support this pool feature without relying on third-party components or operating system-native encryption. - -Another benefit of ZFS native encryption is that datasets do not need to be decrypted for administrative tasks such as snapshots, replication, or scrub operations. -ZFS data integrity checks work just as well with natively encrypted datasets, and compression also works encrypted datasets. - -Different datasets on the same pool can use separate keys independently. -Consider a central file server where different users store their data in encrypted home datasets. -User A has a different key than User B. -Both users can work side by side and choose to unencrypt their datasets as needed without knowing each other's decryption keys. -The decryption method can also differ completely between users without affecting one another. -This allows sensitive data from different users to be stored on the same pool while remaining protected by separate keys. - -Before using ZFS native encryption, be aware of the following: - -- Encryption is applied at the dataset level, not the pool level. -- Booting from encrypted ZFS pools is not yet supported on FreeBSD. -- Encryption can only be enabled when a dataset is created, not afterward. -- The block cipher, key length, and encryption mode can not be changed after they have been set. -- ZFS does not encrypt metadata. - -The last point may seem like a drawback compared to full-disk encryption. -However, it provides greater flexibility by allowing different keys to protect datasets within the same pool instead of requiring a single key or passphrase to unlock the entire pool. -Specifically, ZFS encrypts the following: - -* file and zvol data, -* file attributes, -* ACLs, -* permission bits, -* directory listings, -* FUID mappings, -* userused/groupused data, and -* deduplicated data - -Some ZFS metadata and information remains unencrypted, including the following: - -* pool structure and name, -* dataset and snapshot names, -* dataset hierarchy, -* properties, -* file size, -* file holes, and -* deduplication tables - -This unencrypted metadata allows ZFS to perform routine maintenance operations, such as `zfs scrub`, without first decrypting the data. -As a result, ZFS can detect and repair corrupted encrypted data that is encrypted data without accessing the unencrypted file contents. - -To encrypt existing unencrypted data, copy it to a dataset with encryption enabled. -This allows data to be migrated to a secure location within the pool, provided the passphrase is supplied to authorize access. -Typically, this is done by loading the encryption key into memory after confirming knowledge of a secret such as a passphrase. -Once the key has been loaded, the dataset contents become accessible for reading and writing. -To re-secure the dataset, unload the key from memory. -ZFS then makes the dataset inaccessible until the key is loaded again. - -When encryption is enabled, some ZFS operations behave differently. -ZFS applies compression before encryption to preserve compression ratios. -While ZFS normally uses 256-bit checksums, encryption replaces them with a 128-bit checksum and a 128-bit Message Authentication Code (MAC) provided by the encryption suite. -This provides additional protection against malicious data modification. - -When deduplication is used together with encryption, ZFS performs deduplication only within the encrypted dataset, its snapshots, and its clones. -This prevents information from leaking between encrypted datasets. -The tradeoff is lower deduplication efficiency because ZFS cannot compare checksums across the entire pool. -Even so, deduplication combined with encryption still reveals which blocks are identical and incurs additional CPU overhead for each block written. - -Other limitations apply when using ZFS encryption. -The `embedded_data` feature cannot be used with encryption. -Datasets with encryption enabled also cannot have the `copies` property set to 3, because the implementation stores encrypted metadata in the location where the third copy would normally reside. - -[[zfs-encrypted-dataset-creation]] -=== Creating an encrypted dataset - -ZFS encryption is enabled by setting the `encryption=on` property when creating a dataset. -Setting this property outside of a `zfs create` command does not enable encryption retroactively, as it only takes effect during dataset creation. -In the following example, a passphrase is used when mounting the encrypted dataset after it has been created. - -[source,shell] -.... -# zfs create -o encryption=on -o keyformat=passphrase -o keylocation=prompt zroot/secretdata -Enter passphrase: -Re-enter passphrase: -.... - -If the passphrase is shorter than eight characters, ZFS rejects it and does not create the dataset. -After the passphrase has been entered correctly twice, ZFS creates and mounts the dataset in the pool. - -Any data stored in the encrypted dataset remains encrypted while it resides there. -Copying data from an encrypted dataset to an unencrypted location decrypts the data during the copy operation. -The newly created dataset can then be mounted at a different location if necessary. - -[source,shell] -.... -# zfs set mountpoint=/secretdata zroot/secretdata -# echo "Hello FreeBSD!" > /secretdata/message -# cat /secretdata/message -Hello FreeBSD! -.... - -As expected, the data is currently available for reading and writing by anyone who has access to the dataset. - -[[zfs-encrypted-dataset-properties]] -=== Properties of encrypted datasets - -Listing the ZFS native encryption properties for a dataset is done with the following command: - -[source,shell] -.... -# zfs get encryption,keylocation,keyformat zroot/secretdata -NAME PROPERTY VALUE SOURCE -mypool/secretdata encryption aes-256-gcm - -mypool/secretdata keylocation prompt local -mypool/secretdata keyformat passphrase - -.... - -The `encryption` property shows `aes-256-gcm`, which is currently the default encryption method used by ZFS. -As indicated by the `SOURCE` column, neither this property nor the `keyformat` property can be changed using `zfs set` after the dataset has been created. -See the crossref:zfs-change-encryption-key[zfs-change-encryption-key, changing the encryption key] section for information on how to modify some of these properties. -The following table lists the encryption-related properties used by ZFS: - -[.informaltable] -[cols="10%,90%"] -|=== - -|[[zfs-term-encryptionroot]]encryptionroot -|The dataset from which the current dataset inherits its encryption key. -Dataset clones share the encryption key of their originating dataset. - -|[[zfs-term-keyformat]]keyformat -a|The format of the encryption key. Possible values are: `raw`, `hex`, and `passphrase`. Both `raw` and `hex` keys must be 32 bytes long and contain random values. -|[[zfs-term-encryption]]encryption -a|The cipher used for encryption, consisting of the block cipher, key length, and encryption mode. Both the `encryption` and `keyformat` properties must be specified when the dataset is created. Possible values for the `encryption` property are: - - * `off` (default), - * `on`, - * `aes-128-ccm`, - * `aes-192-ccm`, - * `aes-256-ccm`, - * `aes-128-gcm`, - * `aes-192-gcm`, and - * `aes-256-gcm` (current standard when `on` is set). - -This property cannot be changed once it has been set. - -|[[zfs-term-keystatus]]keystatus -a|Indicates whether an encryption key has been successfully loaded. Possible values are `none`, `available`, and `unavailable`. - -|[[zfs-term-keylocation]]keylocation -a|Specifies the location from which to load the encryption key. Possible values are: - -* `prompt`, -* `file://path/to/file`, -* `http://some.address`, and -* `https://other.address` - -|[[zfs-term-pbkdf2iters]]pbkdf2iters -a|The number of iterations used when deriving an encryption key from a passphrase. This forces an attacker to perform a large number of computationally expensive hash operations. As computing power increases, this value should also be increased from its current default of 350000. -|=== - -[[zfs-unload-encryption-key]] -=== Unloading the encryption key - -Protecting the data stored in an encrypted dataset requires two steps: first unmount the dataset, then unload the encryption key from memory. -This distinction is important. -An unmounted dataset is not protected if its encryption key remains loaded in memory. -Always run `zfs unload-key` to protect the data. -To access the dataset again, load the key and provide the passphrase as described in the crossref:zfs-load-encryption-key[zfs-load-encryption-key, loading the encryption key] section. -ZFS prevents `zfs unload-key` from running while the dataset is still mounted. - -[source,shell] -.... -# zfs unmount zroot/secretdata -# zfs unload-key zroot/secretdata -.... - -Running `zfs unload-key` multiple times results in an error indicating that the key has already been unloaded. - -[[zfs-load-encryption-key]] -=== Loading the encryption key - -Before an encrypted dataset can be used like any other dataset, its encryption key must be loaded and the passphrase provided. -At this point, the `keystatus` property is still set to `unavailable`, and mounting the dataset fails because the key has not yet been loaded: - -[source,shell] -.... -# zfs get keystatus zroot/secretdata -NAME PROPERTY VALUE SOURCE -zroot/secretdata keystatus unavailable - -# zfs mount zroot/secretdata -cannot mount 'zroot/secretdata': encryption key not loaded -.... - -This indicates that the dataset is encrypted and requires an encryption key. -To mount the dataset, run `zfs load-key` and provide the passphrase when prompted: - -[source,shell] -.... -# zfs load-key zroot/secretdata -Enter passphrase for 'zroot/secretdata': -# zfs get keystatus zroot/secretdata -NAME PROPERTY VALUE SOURCE -zroot/secretdata keystatus available - -.... - -Next, mount the dataset to make it accessible through the filesystem hierarchy: - -[source,shell] -.... -# zfs mount zroot/secretdata -# mount|grep secretdata -zroot/secretdata on /secretdata (zfs, local, noatime, nfsv4acls) -.... - -To load multiple encryption keys recursively, specify the `-r` option with `zfs load-key`. -If a key has already been loaded, ZFS reports this with an error message. - -[source,shell] -.... -# zfs load-key zroot/secretdata -Key load error: Key already loaded for 'zroot/secretdata'. -.... - -The `keystatus` property also confirms that the key has been loaded by reporting the value `available`. -To verify whether a passphrase is correct without loading the key, use the `-n` option to perform a dry run. - -[[zfs-change-encryption-key]] -=== Changing the encryption key - -ZFS also supports changing encryption keys, such as replacing a passphrase. -This operation does not require re-encrypting the dataset. -Run the following command to change the encryption passphrase: - -[source,shell] -.... -# zfs change-key zroot/secretdata -Enter new passphrase for 'zroot/secretdata': -Re-enter new passphrase for 'zroot/secretdata': -.... - -Running `zfs change-key` requires the current key to be loaded. If it is not, -ZFS still prompts for the new key but then displays a warning that the current key has not been loaded. - -The zfs change-key command can also modify the `keylocation`, `keyformat`, and `pbkdf2iters` properties by specifying them with the `-o` option. -Running `zfs change-key` on an encrypted child dataset makes it an encryption root if it is not one already. -To prevent this behavior and continue inheriting the parent's key, specify the `-i` option. - -Be aware that changing the encryption key of a parent dataset also changes the key for child datasets that inherit it. -Consequently, those child datasets continue to use the parent's encryption key. -If a child dataset should use a different key, either specify a different `keyformat` when creating it or run `zfs change-key` on the child dataset. -Doing so creates a new encryption root for the child and breaks its encryption inheritance from the parent. - -ZFS clones of an encrypted dataset always use the encryption key of their origin dataset. -As a result, the `keystatus`, `keyformat`, `keylocation`, and `pbkdf2iters` properties are not inherited like other dataset properties. -Instead, they use the values defined by the encryption root. -To determine the encryption root, use the read-only `encryptionroot` property. - -If an attacker compromises an encryption key, changing the passphrase with `zfs change-key` does not necessarily protect existing or newly written data. -New data continues to be encrypted with the same master key as the existing data. -If an attacker obtains both a user key and its corresponding wrapped master key, running `zfs change-key` does not overwrite the previous master key on disk. -As a result, the old master key may remain available for forensic analysis for an indeterminate period. - -If a master key has been compromised, the preferred solution is to securely erase the underlying storage devices and create a new pool. -Afterwards, restore the data from a backup to the new pool. -Alternatively, create a new encrypted dataset, migrate the data using `zfs send` and `zfs receive`, and then run `zpool trim --secure` to erase the freed space. -If the underlying hardware does not support secure TRIM, use `zpool initialize` instead. - -[[zfs-encrypted-send]] -=== Sending Encrypted Datasets - -ZFS replication is based on sending dataset snapshots, which can also be created from encrypted datasets. -The resulting snapshots remain encrypted. - -[source,shell] -.... -# zfs snapshot zroot/secretdata@snap1 -.... - -In addition to crossref:zfs-load-encryption-key[zfs-send-ssh, sending encrypted backups over SSH], using the `-w` (raw) option with `zfs send` transfers the encrypted data blocks to the target pool. -A raw send provides several advantages: - -* the receiving system never sees plaintext data. -* the receiving system does not require the passphrase since no decryption takes place. -* Backups can be sent without first loading the encryption key. -* an untrusted system can receive the encrypted data but cannot decrypt or modify it without the encryption key. - -To send the snapshot created above as a raw stream to the dataset `secret` in the pool `backup`, enter the following command: - -[source,shell] -.... -# zfs send -w zroot/secretdata@snap1 | zfs recv backup/secret -.... - -Without the `-w` option, `zfs send` transmits the data in unencrypted form. -The receiving system may then re-encrypt the data using a different key. -However, doing so prevents future incremental raw sends to that destination. - [[zfs-advanced]] == Advanced Topics From nobody Fri Jun 26 20:02:25 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gn65s5FFLz6hpC1 for ; Fri, 26 Jun 2026 20:02:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn65s4GdLz3lGN for ; Fri, 26 Jun 2026 20:02:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782504145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JUSHYZ5CXWy9pmnMADpify1VUiYpkzql9nCbybDKvOU=; b=aSQor6Sg/fOzWwVH36gnL4uDXkHp+HC6jY2LTVI079lYV8sZwuvje7g4BJrI/rpSdtNsW7 1teXQnfP2A7688loqXQ1qIZqBfp96gKkhXdQnbYQrGYPDHD4EUSlZzDHCUcZmzi+cUJaZu qn0ak+sWeAnhQT4BBtxGtY8Q3da/Fh3R1LhKOrQqUD/T6InfQpjTtNtkg9jmH/BPNgWeAG MmOTMJqNNKggLvo19M/d/4wdAUpe/L6qdQWu8VKVNb9imDBOytQSxcBmICN7GJs7VjxDkt 2IhLPpeXTEf38zrKY7grH3JB2vf258uWrz7MAnbZ2QdTcxkegGeCIsDfUbY3Gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782504145; a=rsa-sha256; cv=none; b=yFZHDQPqMNXjTyqtkETKV/pkh/x8V6sIPGWbK1abCsyZyPNrHWxHK4ccXL7dcGtLhpghsJ xkgE8b6CL84bQPdcNaeKke9XfgudXG3Icx1+NGuPj1HvRe7pwQ1sd3kpMkaVLsmMcflP4N 9qsK7lCe9EWPrXMwS/RhVB24ymQpHkxzZXw+kuVvdwELmnLfTtgy8zy9HRDT1TzIy10+xj R1AOZOFhCNF15duwrPsEVV7ch0PwrW9LptzM8nXp1uuVtP/3OTNozUgB184klVQff5nCQO iL4/Nil/ss400ZBZuCOBlWWfFF2ZbQtPAVJvBIeb61iPbYQIM8TP11PbpRY6fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782504145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JUSHYZ5CXWy9pmnMADpify1VUiYpkzql9nCbybDKvOU=; b=aCKV+AFWw1h0/Gk6oQcxYQwMyNph0Ee1KnMXf6OPLBzDbHT4ayPGPRFN0TT8q6O1KmImWo RIMU5SVv3UZdSnCbcJccCku2Fbv7kRnF8TXp8xbptyPfg1GctDoayK7C4BQ/C2+SF3SdgS x/WGUmvXDaL6qrpwSOVJAj+hDgOaowVe2wJVlX8p1Y4q6XFQRRaRZqhaoKE18RcJvpIiV5 KPQAKNDWQYzsstK64Ecg3aFtEkk1glolJnx3zJD9GQI+lKwD9n+qK7dZyrwhEGs3iHa2xG fP1g5XKc0gACOGofKw7uzC7IgjV+7/tWIeOg/p1DwnOc8qLKoMKvoCgJz8m3pg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn65s39gRzs5n for ; Fri, 26 Jun 2026 20:02:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47b44 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 20:02:25 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Benedict Reuschling Subject: git: 7dcf0bd633 - main - fdp-primer: Include context in the git format-patch for users to use List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bcr X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7dcf0bd6337554f7a57ca1fe4d1ef79a269a0a23 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 20:02:25 +0000 Message-Id: <6a3edad1.47b44.6e93f9df@gitrepo.freebsd.org> The branch main has been updated by bcr: URL: https://cgit.FreeBSD.org/doc/commit/?id=7dcf0bd6337554f7a57ca1fe4d1ef79a269a0a23 commit 7dcf0bd6337554f7a57ca1fe4d1ef79a269a0a23 Author: Benedict Reuschling AuthorDate: 2026-06-26 20:01:05 +0000 Commit: Benedict Reuschling CommitDate: 2026-06-26 20:01:05 +0000 fdp-primer: Include context in the git format-patch for users to use The quick start section did not instruct the reader to include context in the git format-patch example. This is not ideal as it makes reviewing easier. Include this information with a bit of explanation below it. Event: Halifax Hackathon 202606 Location: A different chair than obiwac's Reviewed by: lwhsu Differential Revision: https://reviews.freebsd.org/D57891 --- documentation/content/en/books/fdp-primer/overview/_index.adoc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/documentation/content/en/books/fdp-primer/overview/_index.adoc b/documentation/content/en/books/fdp-primer/overview/_index.adoc index 7f3cca1aa9..e14f2c8476 100644 --- a/documentation/content/en/books/fdp-primer/overview/_index.adoc +++ b/documentation/content/en/books/fdp-primer/overview/_index.adoc @@ -228,10 +228,12 @@ Make sure that all required files are included, then commit the change to your l [source,shell] .... % git commit -% git format-patch origin/main +% git format-patch -U999999 origin/main .... + -Patch generated with `git format-patch` will include author identity and email addresses, +The `-U999999` parameter adds as much context to the patch as possible which makes reviewing easier. + +A patch file is generated as a result of `git format-patch` in the local directory which will include author identity and email addresses, making it easier for developers to apply (with `git am`) and give proper credit. + [IMPORTANT] From nobody Fri Jun 26 20:22:50 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gn6YQ6Pgcz6hqSr for ; Fri, 26 Jun 2026 20:22:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn6YQ5R6sz3n2Y for ; Fri, 26 Jun 2026 20:22:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782505370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sErw/T5a3yzQSuuQ+YIcbKwnZuwLPg7JGHr3C3RkuEw=; b=hO20kLfxRNOudmCZXwjCOKkZPgyJqcwlckv6ekXgTIjzEhPggV777HhsVMjODvtXB6gxZ2 MUFkooxzO+64CMGNi4dqynPNCWYxrvAtcvRPS6fC/PbBiFe21y1NFIJNxcHmTR42huWs/k xgFHiBsYRrh3BZgRJlizxUNl5Bzag+R00vicG4dpBDhW6kqcXrkTjbsV1UpZXlPAGhx+dk Gt2BJ08e8QVQJ8oKQYBM3spiV2LOqfNNoo1tBgnG9ui+PLlX8K9/xIrID5bhRInOyAJYmS BK+8p4/nax9b0ZyVaANFWcO8ScqnowUn193GzhGQcoc7t3bL9v4wC4J37nv3HQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782505370; a=rsa-sha256; cv=none; b=T16A7W5XT1WIJysekxUyc9snKsQv+bBi0yr+1GsTlaySmEKA+KbWggtlhQruu2P/HBLqSO Dp0MlbJBPVA7+3d7+FQp9xYj4VEzv2O+1PrQcUdxijjufiKuVIgoJKubLY+tEcpOtI0+W8 6Yffj5N0SMRsZjzAw1MAL5xIB6qpLOF9yxFlX9S3IsGYOQTctDbuzBm/KILc4AL8f07eeN aURjEs28Pzho58Y9mWIX9zZDpmmjiUecASe4sd/4b7gOTqljCrFtQ12mx6ovOTuylIJRQ4 8be+W7uBQ9XLtU+A+2J6FEHN+X3K+zsdok2ovvquUmlfLmbBxCt5z9a0rJv8Cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782505370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sErw/T5a3yzQSuuQ+YIcbKwnZuwLPg7JGHr3C3RkuEw=; b=Ls/GAUihE176FhoTTKJjy6cq9CXEVmnLBBd7Hbbo1lsWHasPPbMllrRvSC7JMTpb+Epl3P NKxh7Q8HfM/4OdpD1pU9lmOGdEO5ApfQCxzD8OPcbpBhg5P30TpK0k7qka1M6UMc0TZd9g +sdmExtLikLA9fwntc74GCI6Deb0GrimhocvSex6eOvOG+JUjd1aQZYuldBWvkR7zrP++i 6ORVRtD3VUSHF0CdHqFx6ymnIiyXMR2RU4lq12+wZ4snEBBvHwNmwAqu8OTlcYASA4TEkQ NHhHZw/aUUW8dB+Xue/xX5ykcYBPK20HGBgfIqeB0z/YUgXCjK08jNDeO9RsIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn6YQ49NNzt8r for ; Fri, 26 Jun 2026 20:22:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a3ad by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 20:22:50 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org Cc: Alexey Shuvaev From: Benedict Reuschling Subject: git: 64b3126c0d - main - fdp-primer: Mention that .po files are generated nightly List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bcr X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64b3126c0db9dcc8cf9a2f003b3a52dbb76a7fd1 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 20:22:50 +0000 Message-Id: <6a3edf9a.1a3ad.3b55d9bd@gitrepo.freebsd.org> The branch main has been updated by bcr: URL: https://cgit.FreeBSD.org/doc/commit/?id=64b3126c0db9dcc8cf9a2f003b3a52dbb76a7fd1 commit 64b3126c0db9dcc8cf9a2f003b3a52dbb76a7fd1 Author: Alexey Shuvaev AuthorDate: 2026-06-26 20:15:24 +0000 Commit: Benedict Reuschling CommitDate: 2026-06-26 20:22:33 +0000 fdp-primer: Mention that .po files are generated nightly There is no need to generate the .po files manually as they are generated every night. Describe this fact in the PO translations chapter. PR: 295901 Event: Halifax Hackathon 202606 Location: Back in my old chair --- .../content/en/books/fdp-primer/po-translations/_index.adoc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/documentation/content/en/books/fdp-primer/po-translations/_index.adoc b/documentation/content/en/books/fdp-primer/po-translations/_index.adoc index 2391b8d257..5341057012 100644 --- a/documentation/content/en/books/fdp-primer/po-translations/_index.adoc +++ b/documentation/content/en/books/fdp-primer/po-translations/_index.adoc @@ -100,6 +100,8 @@ The path is the same except for the name of the language directory. % cp ~/doc/documentation/content/en/articles/leap-seconds/_index.po \ ~/doc/documentation/content/es/articles/leap-seconds/ .... +If you are making changes to the english version of the documentation, do not edit `.po` files! +They are regenerated automatically every night by Weblate. Suppose the document or language is also being translated via Weblate. In that case, it is good to get the `.po` file from there and upload the translation document back into the platform, centralizing the translating efforts via Weblate to avoid rework. @@ -285,7 +287,8 @@ Now the document structure is ready for the translator to begin translating with The gettext system greatly reduces the number of things that must be tracked by a translator. Strings to be translated are extracted from the original document into a PO file. -Then a PO editor is used to enter the translated versions of each string. +This is done automatically every night by Weblate, and there is no need to edit original `.po` files manually! +A PO editor is used to enter the translated versions of each string. The FreeBSD PO translation system does not overwrite PO files, so the extraction step can be run at any time to update the PO file. From nobody Fri Jun 26 21:32:09 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gn85P4TDCz6hyDT for ; Fri, 26 Jun 2026 21:32:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn85P3qfcz3fHL for ; Fri, 26 Jun 2026 21:32:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782509529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5XXRYQAHvkRWuKpgz0JOxTWAfWr7oRuHk+YyZ7KB/TI=; b=jBxm2YWDY8VqThsS/vdZS5wAQm+TYCyVcO6UKBrR6hha0z1iFSatpnTxMSHGZgbpjyyICb 6qrG/UZUouDKt7VtCVe1JIDtKKXd6yELJuCCeSxuLZIA/aqp4D6p0FhfsQcqv2j6I8+0Bf 2jr+MZgxjaexu3a+IcY8cnknZ6rvXrN2jbvGnAydAYCwQH5CXGDLfbFT/s777IwekRPgo/ EW81KlBouCFniJV19r4zfDboypkwyy4RDja4WnyiyEZOYE1BKl9BfjrbJbox458ogw5PjB rRKoMSozPTlqH+aBccSbFojO7Rb7G8F1sYR3OPlZblTdUUkDqEf0lujU6cYi4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782509529; a=rsa-sha256; cv=none; b=IyeMlPBo4hLDoaHFIBbyPmxbOAuHFNmllhWeC4kG2Rub9Fl71qT7aPgfvjX71DoVyVHk2V LYy2ewxkOfALLkE+gmEhM1FpBbWzNchCyaXPEiSfdb2gABoSqwHl2kaTE86NX1J16erAty wfUNlE2pwnUclay6ukh1jOKxyhEvLdhCYx3WL9KWjYHf21dvAQPi0Bg1dzqp+bDhbL8fTG ZWbSz4e8itr0I5GLhhSvvZI+6WC2koJMKYObLygPNPNqwr1a3Bo+GSxYttxPPMoaS75hce 5sQiJLmTgOojp+Cjt+ArhfKGAVoI8M+i4tgWGNz8iwayL5HWuA6ujJNTfYAVXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782509529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5XXRYQAHvkRWuKpgz0JOxTWAfWr7oRuHk+YyZ7KB/TI=; b=sbTYuHWor7GVdxXhvk+/rlv9GITLl66rq8udrWdzU+Xh2KI4DesQDXIPpAjQo7FRuq7Klq +3J0gGYcFtmXNlhKYFiw1X6uPoyRaTzcx5WEDPT84IUNyI3gdbgfslW79DUgF2MROD1i9a Ay3YfCbP9y+y9N6zA/yCpKfE2sr7MFEZVlRBK94Ec0Sn5LdAm6Rt8EnrdIeWLwZBLNTR2m y4cQWuESpFx2eWZfohufdq6WsatSZIhhsRFBX0bK6WTIY8foBUlA3CkcKK/GS8rslNWFfw cd8QWcKG7v7UJzE5wY3iSWXdOBIeNS/iW43J6iOmadGVW6fwFrKAn+XYIPnoOQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn85P2tQjzwR6 for ; Fri, 26 Jun 2026 21:32:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22f13 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 21:32:09 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Benedict Reuschling Subject: git: 108c7b0b96 - main - fdp-primer: Add context instructions to two other locations and fix formatting List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bcr X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 108c7b0b9672e91585430ac8c12cfa6ab5d443a3 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 21:32:09 +0000 Message-Id: <6a3eefd9.22f13.48efb09f@gitrepo.freebsd.org> The branch main has been updated by bcr: URL: https://cgit.FreeBSD.org/doc/commit/?id=108c7b0b9672e91585430ac8c12cfa6ab5d443a3 commit 108c7b0b9672e91585430ac8c12cfa6ab5d443a3 Author: Benedict Reuschling AuthorDate: 2026-06-26 21:24:47 +0000 Commit: Benedict Reuschling CommitDate: 2026-06-26 21:24:47 +0000 fdp-primer: Add context instructions to two other locations and fix formatting 7dcf0bd6337554f7a57ca1fe4d1ef79a269a0a23 only changed the instructions on how to add context to 'git format-patch' for Linux, leaving out the FreeBSD and macOS sections. Add the same instructions there, too. Additionally, I fixed the formatting of the enumerations I broke in the commit mentioned above. Event: Halifax Hackathon 202606 Location: Lying on the couch --- .../content/en/books/fdp-primer/overview/_index.adoc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/documentation/content/en/books/fdp-primer/overview/_index.adoc b/documentation/content/en/books/fdp-primer/overview/_index.adoc index e14f2c8476..5ea84496dc 100644 --- a/documentation/content/en/books/fdp-primer/overview/_index.adoc +++ b/documentation/content/en/books/fdp-primer/overview/_index.adoc @@ -160,9 +160,14 @@ Make sure that all required files are included, then commit the change to your l [source,shell] .... % git commit -% git format-patch origin/main +% git format-patch -U999999 origin/main .... + +The `-U999999` parameter adds as much context to the patch as possible which makes reviewing easier. ++ +A patch file is generated as a result of `git format-patch` in the local directory which will include author identity and email addresses, +making it easier for developers to apply (with `git am`) and give proper credit. ++ Patch generated with `git format-patch` will include author identity and email addresses, making it easier for developers to apply (with `git am`) and give proper credit. + @@ -232,7 +237,7 @@ Make sure that all required files are included, then commit the change to your l .... + The `-U999999` parameter adds as much context to the patch as possible which makes reviewing easier. - ++ A patch file is generated as a result of `git format-patch` in the local directory which will include author identity and email addresses, making it easier for developers to apply (with `git am`) and give proper credit. + @@ -315,7 +320,7 @@ Make sure that all required files are included, then commit the change to your l .... + The `-U999999` parameter adds as much context to the patch as possible which makes reviewing easier. - ++ A patch file is generated as a result of `git format-patch` in the local directory which will include author identity and email addresses, making it easier for developers to apply (with `git am`) and give proper credit. + From nobody Sat Jun 27 14:51:34 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gnb8k4vgJz6jh61 for ; Sat, 27 Jun 2026 14:51:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnb8k3rKzz3bvD for ; Sat, 27 Jun 2026 14:51:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782571894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k5E6SnQMOoUekwp8DP4oJB+o5AbrC2Iaocramtu73EQ=; b=w8g8HwHhbGGFyw/cxeWu73drTrzz3OawzRfB3rZqXe1OmUMI5uZGAanvgI2PL2HwTE59ij jS3+BAYNmVOsatxT1eh0Cv8+tEyhWRqDqKK7LtvsA04duVceth0Ae2oPm9KGUjz1prI/l+ XET5utW8v4BIrbV0p6iPQv4lb9FQ/Be4zwAYV9vbL2hgSZj+GF11BoLB2xAWIa+qoXIu+5 kOSPvI+Y6chJF07X+xxszMbOyjkIpM7fS6uz4Kbo48r92EN82A4ytJJZ7ullYoV0E0rlJZ WTNlMJDTWylQHAtWnqCTDIfgegqK2lmLrfnQTZ0OND/JgFDW4NscU6vF8XkXlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782571894; a=rsa-sha256; cv=none; b=Itupe/+CZspLldsxwpxA2uDTh5NBANXkSGrdftTkKI3QdANNXxVXXqD0xr90gQL0MojhuM URjjeDB6fMuzabevEh+HNoRkUEpUjxoIUuEFdH6CNl4xIPhmmvE4xAx6+e38GtkCWH9kIv ALEag4smZR80qeuFonA0TVTGeJ+iVltF1CITtuwpa8TRPZOI4qNo3NQwNL2nXD984FAo5h sS6XkmGfcYILikJTMzaWVR30i3jiXyZGLUmQMvwXasm+26EBeThwP+CI+qkXPgBR6vOUC6 FY5yVVz2kPKhU8T1wRVvcQ5AK3MZKBdGHurSoqPVBeoIB/Ekw7DCJ8cUVC1A7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782571894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k5E6SnQMOoUekwp8DP4oJB+o5AbrC2Iaocramtu73EQ=; b=VLbu1ROJz3oJ4OcOdqSop1rrFwk7RAR5SnEarXRc6/8RzQ+evaxlfut3kR/b9p3Occqapa qBClIPS7Duvje/engFbo/zomcWLD/FM36cDiHJTVU2U+ugn/Esq8719ki39hL4sGxQWzp7 bge1pK0Rvq2OsybVbqb7GuXvzYoOJAxakL0QTCPtYIQXegRrprFWnk6BQdzzSKHyMjguuA 8h1o770MvlGtNTddiTICXwTie4Kz2SWi6zhMNaGsrIrCLV5D312apYwR9R3aTSrp1MxRS5 i2hJh1lpPsODZ1y2bvMxNDH1rGypVFCH2dl7BKfLvCI/KlzmzUMMBxjPSpCBZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnb8k2prjzD4d for ; Sat, 27 Jun 2026 14:51:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20ea3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 27 Jun 2026 14:51:34 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Benedict Reuschling Subject: git: ee930e81a0 - main - handbook/disks: Update encrypted swap instructions for geli List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bcr X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee930e81a02548fe7a5881fdaf385754a3dff07d Auto-Submitted: auto-generated Date: Sat, 27 Jun 2026 14:51:34 +0000 Message-Id: <6a3fe376.20ea3.6623dfa5@gitrepo.freebsd.org> The branch main has been updated by bcr: URL: https://cgit.FreeBSD.org/doc/commit/?id=ee930e81a02548fe7a5881fdaf385754a3dff07d commit ee930e81a02548fe7a5881fdaf385754a3dff07d Author: Benedict Reuschling AuthorDate: 2026-06-27 14:16:39 +0000 Commit: Benedict Reuschling CommitDate: 2026-06-27 14:48:33 +0000 handbook/disks: Update encrypted swap instructions for geli Add instructions to initialize the geli swap device first. Also, be a bit clearer on the /etc/fstab line to add for geli. While here: fix a typo in the Camellia-CBC algorithm. PR: 282806 Reviewed by: carlavilla@ Event: Halifax Hackathon 202606 Location: Dalhousie CS Faculty building entrance hallway Differential Revision: https://reviews.freebsd.org/D57904 --- documentation/content/en/books/handbook/disks/_index.adoc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/documentation/content/en/books/handbook/disks/_index.adoc b/documentation/content/en/books/handbook/disks/_index.adoc index db966c3f67..1a83ba8f98 100644 --- a/documentation/content/en/books/handbook/disks/_index.adoc +++ b/documentation/content/en/books/handbook/disks/_index.adoc @@ -1912,7 +1912,7 @@ This control utility adds some features and uses a different scheme for doing cr It provides the following features: * Utilizes the man:crypto[9] framework and automatically uses cryptographic hardware when it is available. -* Supports multiple cryptographic algorithms such as AES-XTS, AES-CBC, and Camellia-CBCAES. +* Supports multiple cryptographic algorithms such as AES-XTS, AES-CBC, and Camellia-CBC. * Allows the root partition to be encrypted. The passphrase used to access the encrypted root partition will be requested during system boot. * Allows the use of two independent keys. * It is fast as it performs simple sector-to-sector encryption. @@ -2078,7 +2078,14 @@ To encrypt the swap partition using man:gbde[8], add the `.bde` suffix to the sw /dev/ada0s1b.bde none swap sw 0 0 .... -To instead encrypt the swap partition using man:geli[8], use the `.eli` suffix: +To instead encrypt the swap partition using man:geli[8], initialize the device with a onetime key: + +[source,shell] +.... +# geom eli onetime -d /dev/ada0s1b +.... + +Afterwards, add a line for the device with the `.eli` suffix to [.filename]#/etc/fstab#: [.programlisting] .... From nobody Sat Jun 27 17:10:19 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gnfDw3TDJz6jrf2 for ; Sat, 27 Jun 2026 17:10:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnfDw3F8Lz3sl6 for ; Sat, 27 Jun 2026 17:10:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782580224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gAT/c++XZTqhyww4TArY/NVqDsURGVs++gLk53Y+SEo=; b=NOXjd2lT1j+JZNLNOMEp0bx8eh8BbRwO3LVXN3IgZHGWnRVNZeMed7K4j12RYvlTXj8hJC p8yCUz/1pWdBmDhAJsPL7scTxEWdc5KsN0B4ChqTUKHUu2llP840KYNN19OwSYAbgy1GFR c6NU3IOaM6Tn0auEBGHwqHxHhwTsaBz2sMlDHRfx/hR5iGJ6gYNmwrRUGmtitdyMh5LOEZ JpRCz3XvSQ2rirLPzRanxkrZ+oGGh87T1CK0yTQ9MaWOSThRgyqFxE+hHpYIr1FoE9s6/6 xO1606OiuflhROlOzbYiAK+v1UkXtBxLxRRnFkz4eriKPxrdUFxB14i4JXWZsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782580224; a=rsa-sha256; cv=none; b=ZJ7QltOg4UYmk3y9J0umG1ASdZSN/viPnztqHmE6w4dnBcMKbwp7kOQpxY3ml2MM/VDVHf GvUUDvBywI9YlRktvjBqopHTNRojIoByI5Z0zvn870kPHmmpcA1qXWDagYcKWoDjEEj+Lt wbrDHBJr/DfV7c4e5dklMyZZH3f8UxZY5YFM5jXIVcGpbMQC61jlOPpTDUCN4BFENaTLhT ATpU6NilQt6lj7u+0ZYymWHpsP+3EtB3bYp4IzXqd0jze3PiljF9Qc7QTdyyHuc+WHTWQD WfmYqSKzbQ5rR9QsFAsTPn3OOI333wGte5DUbSIcZXSF0gNKEPUQGSoBT2sMLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782580224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gAT/c++XZTqhyww4TArY/NVqDsURGVs++gLk53Y+SEo=; b=SPQD3zC0Nat9vBTWpWI6o1jBNwGiPdSoR/I1Spg4d4jRpM/Y7DcI/6ijEbozxVp/suBBYw r+Vh37rPfyugP+5wTRvWCfkleoXhASeLV2nf8MH1CM2cNMGuYS2RFLBI8UYCWt7T9fpIIR XBdHL5Bs+d36ENqVVHk7QLnBHHfSUfvLoJ0j2vE0ltFXsraNGQEypnnJwGKCBnsDbRzDiq 3NPyWMoSZnoATtHnlJ3F0MJXtHJQ+oYXvqaJn6hpqikIuhn9NHts00Pa7rhtlc7Q6+3V1b s/HjH3YGPdNn39wsGjD+w3+VYUUzqEO9Sl6hy5JE5ejvWLqcMeMGtRSeR7uHBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnfDw2DrPzZCX for ; Sat, 27 Jun 2026 17:10:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38e6c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 27 Jun 2026 17:10:19 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Sergio Carlavilla Delgado Subject: git: a35cd2df15 - main - Website: Remove stale CSS files List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: carlavilla X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a35cd2df1581f36b821095be0dde0137e3a5cfdf Auto-Submitted: auto-generated Date: Sat, 27 Jun 2026 17:10:19 +0000 Message-Id: <6a4003fb.38e6c.5615714b@gitrepo.freebsd.org> The branch main has been updated by carlavilla: URL: https://cgit.FreeBSD.org/doc/commit/?id=a35cd2df1581f36b821095be0dde0137e3a5cfdf commit a35cd2df1581f36b821095be0dde0137e3a5cfdf Author: Sergio Carlavilla Delgado AuthorDate: 2026-06-27 17:10:04 +0000 Commit: Sergio Carlavilla Delgado CommitDate: 2026-06-27 17:10:04 +0000 Website: Remove stale CSS files --- website/content/en/releases/4.10R/docbook.css | 165 ---------- website/content/en/releases/4.11R/docbook.css | 165 ---------- website/content/en/releases/4.4R/docbook.css | 165 ---------- website/content/en/releases/4.5R/docbook.css | 165 ---------- website/content/en/releases/4.6.2R/docbook.css | 165 ---------- website/content/en/releases/4.6R/docbook.css | 165 ---------- website/content/en/releases/4.7R/docbook.css | 165 ---------- website/content/en/releases/4.8R/docbook.css | 165 ---------- website/content/en/releases/4.9R/docbook.css | 165 ---------- website/content/en/releases/5.0R/DP1/docbook.css | 161 --------- website/content/en/releases/5.0R/DP2/docbook.css | 161 --------- website/content/en/releases/5.0R/docbook.css | 161 --------- website/content/en/releases/5.1R/docbook.css | 161 --------- website/content/en/releases/5.2.1R/docbook.css | 165 ---------- website/content/en/releases/5.2R/docbook.css | 161 --------- website/content/en/releases/5.3R/docbook.css | 161 --------- website/content/en/releases/5.4R/docbook.css | 161 --------- website/content/en/releases/5.5R/docbook.css | 142 -------- website/content/en/releases/6.0R/docbook.css | 161 --------- website/content/en/releases/6.1R/docbook.css | 161 --------- website/content/en/releases/6.2R/docbook.css | 161 --------- website/content/en/releases/6.3R/docbook.css | 161 --------- website/content/en/releases/6.4R/docbook.css | 161 --------- website/content/en/releases/7.0R/docbook.css | 161 --------- website/content/en/releases/7.1R/docbook.css | 161 --------- website/content/en/releases/7.2R/docbook.css | 161 --------- website/content/en/releases/7.3R/docbook.css | 208 ------------ website/content/en/releases/7.4R/docbook.css | 208 ------------ website/content/en/releases/8.0R/docbook.css | 161 --------- website/content/en/releases/8.1R/docbook.css | 208 ------------ website/content/en/releases/8.2R/docbook.css | 208 ------------ website/content/en/releases/8.3R/docbook.css | 242 -------------- website/content/en/releases/8.4R/docbook.css | 403 ----------------------- 33 files changed, 5845 deletions(-) diff --git a/website/content/en/releases/4.10R/docbook.css b/website/content/en/releases/4.10R/docbook.css deleted file mode 100644 index f12ce2ad3e..0000000000 --- a/website/content/en/releases/4.10R/docbook.css +++ /dev/null @@ -1,165 +0,0 @@ -/* - * Copyright (c) 2001, 2003 The FreeBSD Documentation Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD: head/en_US.ISO8859-1/htdocs/releases/4.10R/docbook.css 38826 2012-05-17 19:12:14Z hrs $ - */ - -BODY ADDRESS { - line-height: 1.3; - margin: .6em 0; -} - -BODY BLOCKQUOTE { - margin-top: .75em; - line-height: 1.5; - margin-bottom: .75em; -} - -HTML BODY { - margin: 1em 8% 1em 10%; - line-height: 1.2; -} - -.LEGALNOTICE { - font-size: small; - font-variant: small-caps; -} - -BODY DIV { - margin: 0; -} - -DL { - margin: .8em 0; - line-height: 1.2; -} - -BODY FORM { - margin: .6em 0; -} - -H1, H2, H3, H4, H5, H6, -DIV.EXAMPLE P B, -.QUESTION, -DIV.TABLE P B, -DIV.PROCEDURE P B { - color: #990000; -} - -BODY H1 { - margin: .8em 0 0 -4%; - line-height: 1.3; -} - -BODY H2 { - margin: .8em 0 0 -4%; - line-height: 1.3; -} - -BODY H3 { - margin: .8em 0 0 -3%; - line-height: 1.3; -} - -BODY H4 { - margin: .8em 0 0 -3%; - line-height: 1.3; -} - -BODY H5 { - margin: .8em 0 0 -2%; - line-height: 1.3; -} - -BODY H6 { - margin: .8em 0 0 -1%; - line-height: 1.3; -} - -BODY HR { - margin: .6em -} - -BODY IMG.NAVHEADER { - margin: 0 0 0 -4%; -} - -OL { - margin: 0 0 0 5%; - line-height: 1.2; -} - -BODY P { - margin: .6em 0; - line-height: 1.2; -} - -BODY PRE { - margin: .75em 0; - line-height: 1.0; - color: #461b7e; -} - -BODY TD { - line-height: 1.2 -} - -BODY TH { - line-height: 1.2; -} - -UL, BODY DIR, BODY MENU { - margin: 0 0 0 5%; - line-height: 1.2; -} - -HTML { - margin: 0; - padding: 0; -} - - -.FILENAME { - color: #007a00; -} - -BODY H1, BODY H2, BODY H3, BODY H4, BODY H5, BODY H6 { - margin-left: 0 -} - -.GUIMENU, .GUIMENUITEM, .GUISUBMENU, -.GUILABEL, .INTERFACE, .GUIBUTTON, -.SHORTCUT, .SHORTCUT .KEYCAP { - background-color: #F0F0F0; -} - -.ACCEL { - background-color: #F0F0F0; - text-decoration: underline; -} - -.PROGRAMLISTING, .SCREEN { - margin-left: 3ex; -} diff --git a/website/content/en/releases/4.11R/docbook.css b/website/content/en/releases/4.11R/docbook.css deleted file mode 100644 index 4e1ee67967..0000000000 --- a/website/content/en/releases/4.11R/docbook.css +++ /dev/null @@ -1,165 +0,0 @@ -/* - * Copyright (c) 2001, 2003 The FreeBSD Documentation Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD: head/en_US.ISO8859-1/htdocs/releases/4.11R/docbook.css 38826 2012-05-17 19:12:14Z hrs $ - */ - -BODY ADDRESS { - line-height: 1.3; - margin: .6em 0; -} - -BODY BLOCKQUOTE { - margin-top: .75em; - line-height: 1.5; - margin-bottom: .75em; -} - -HTML BODY { - margin: 1em 8% 1em 10%; - line-height: 1.2; -} - -.LEGALNOTICE { - font-size: small; - font-variant: small-caps; -} - -BODY DIV { - margin: 0; -} - -DL { - margin: .8em 0; - line-height: 1.2; -} - -BODY FORM { - margin: .6em 0; -} - -H1, H2, H3, H4, H5, H6, -DIV.EXAMPLE P B, -.QUESTION, -DIV.TABLE P B, -DIV.PROCEDURE P B { - color: #990000; -} - -BODY H1 { - margin: .8em 0 0 -4%; - line-height: 1.3; -} - -BODY H2 { - margin: .8em 0 0 -4%; - line-height: 1.3; -} - -BODY H3 { - margin: .8em 0 0 -3%; - line-height: 1.3; -} - -BODY H4 { - margin: .8em 0 0 -3%; - line-height: 1.3; -} - -BODY H5 { - margin: .8em 0 0 -2%; - line-height: 1.3; -} - -BODY H6 { - margin: .8em 0 0 -1%; - line-height: 1.3; -} - -BODY HR { - margin: .6em -} - -BODY IMG.NAVHEADER { - margin: 0 0 0 -4%; -} - -OL { - margin: 0 0 0 5%; - line-height: 1.2; -} - -BODY P { - margin: .6em 0; - line-height: 1.2; -} - -BODY PRE { - margin: .75em 0; - line-height: 1.0; - color: #461b7e; -} - -BODY TD { - line-height: 1.2 -} - -BODY TH { - line-height: 1.2; -} - -UL, BODY DIR, BODY MENU { - margin: 0 0 0 5%; - line-height: 1.2; -} - -HTML { - margin: 0; - padding: 0; -} - - -.FILENAME { - color: #007a00; -} - -BODY H1, BODY H2, BODY H3, BODY H4, BODY H5, BODY H6 { - margin-left: 0 -} - -.GUIMENU, .GUIMENUITEM, .GUISUBMENU, -.GUILABEL, .INTERFACE, .GUIBUTTON, -.SHORTCUT, .SHORTCUT .KEYCAP { - background-color: #F0F0F0; -} - -.ACCEL { - background-color: #F0F0F0; - text-decoration: underline; -} - -.PROGRAMLISTING, .SCREEN { - margin-left: 3ex; -} diff --git a/website/content/en/releases/4.4R/docbook.css b/website/content/en/releases/4.4R/docbook.css deleted file mode 100644 index f12ce2ad3e..0000000000 --- a/website/content/en/releases/4.4R/docbook.css +++ /dev/null @@ -1,165 +0,0 @@ -/* - * Copyright (c) 2001, 2003 The FreeBSD Documentation Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD: head/en_US.ISO8859-1/htdocs/releases/4.10R/docbook.css 38826 2012-05-17 19:12:14Z hrs $ - */ - -BODY ADDRESS { - line-height: 1.3; - margin: .6em 0; -} - -BODY BLOCKQUOTE { - margin-top: .75em; - line-height: 1.5; - margin-bottom: .75em; -} - -HTML BODY { - margin: 1em 8% 1em 10%; - line-height: 1.2; -} - -.LEGALNOTICE { - font-size: small; - font-variant: small-caps; -} - -BODY DIV { - margin: 0; -} - -DL { - margin: .8em 0; - line-height: 1.2; -} - -BODY FORM { - margin: .6em 0; -} - -H1, H2, H3, H4, H5, H6, -DIV.EXAMPLE P B, -.QUESTION, -DIV.TABLE P B, -DIV.PROCEDURE P B { - color: #990000; -} - -BODY H1 { - margin: .8em 0 0 -4%; - line-height: 1.3; -} - -BODY H2 { - margin: .8em 0 0 -4%; - line-height: 1.3; -} - -BODY H3 { - margin: .8em 0 0 -3%; - line-height: 1.3; -} - -BODY H4 { - margin: .8em 0 0 -3%; - line-height: 1.3; -} - -BODY H5 { - margin: .8em 0 0 -2%; - line-height: 1.3; -} - -BODY H6 { - margin: .8em 0 0 -1%; - line-height: 1.3; -} - -BODY HR { - margin: .6em -} - -BODY IMG.NAVHEADER { - margin: 0 0 0 -4%; -} - -OL { - margin: 0 0 0 5%; - line-height: 1.2; -} - -BODY P { - margin: .6em 0; - line-height: 1.2; -} - -BODY PRE { - margin: .75em 0; - line-height: 1.0; - color: #461b7e; -} - -BODY TD { - line-height: 1.2 -} - -BODY TH { - line-height: 1.2; -} - -UL, BODY DIR, BODY MENU { - margin: 0 0 0 5%; - line-height: 1.2; -} - -HTML { - margin: 0; - padding: 0; -} - - -.FILENAME { - color: #007a00; -} - -BODY H1, BODY H2, BODY H3, BODY H4, BODY H5, BODY H6 { - margin-left: 0 -} - -.GUIMENU, .GUIMENUITEM, .GUISUBMENU, -.GUILABEL, .INTERFACE, .GUIBUTTON, -.SHORTCUT, .SHORTCUT .KEYCAP { - background-color: #F0F0F0; -} - -.ACCEL { - background-color: #F0F0F0; - text-decoration: underline; -} - -.PROGRAMLISTING, .SCREEN { - margin-left: 3ex; -} diff --git a/website/content/en/releases/4.5R/docbook.css b/website/content/en/releases/4.5R/docbook.css deleted file mode 100644 index f12ce2ad3e..0000000000 --- a/website/content/en/releases/4.5R/docbook.css +++ /dev/null @@ -1,165 +0,0 @@ -/* - * Copyright (c) 2001, 2003 The FreeBSD Documentation Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD: head/en_US.ISO8859-1/htdocs/releases/4.10R/docbook.css 38826 2012-05-17 19:12:14Z hrs $ - */ - -BODY ADDRESS { - line-height: 1.3; - margin: .6em 0; -} - -BODY BLOCKQUOTE { - margin-top: .75em; - line-height: 1.5; - margin-bottom: .75em; -} - -HTML BODY { - margin: 1em 8% 1em 10%; - line-height: 1.2; -} - -.LEGALNOTICE { - font-size: small; - font-variant: small-caps; -} - -BODY DIV { - margin: 0; -} - -DL { - margin: .8em 0; - line-height: 1.2; -} - -BODY FORM { - margin: .6em 0; -} - -H1, H2, H3, H4, H5, H6, -DIV.EXAMPLE P B, -.QUESTION, -DIV.TABLE P B, -DIV.PROCEDURE P B { - color: #990000; -} - -BODY H1 { - margin: .8em 0 0 -4%; - line-height: 1.3; -} - -BODY H2 { - margin: .8em 0 0 -4%; - line-height: 1.3; -} - -BODY H3 { - margin: .8em 0 0 -3%; - line-height: 1.3; -} - -BODY H4 { - margin: .8em 0 0 -3%; - line-height: 1.3; -} - -BODY H5 { - margin: .8em 0 0 -2%; - line-height: 1.3; -} - -BODY H6 { - margin: .8em 0 0 -1%; - line-height: 1.3; -} - -BODY HR { - margin: .6em -} - -BODY IMG.NAVHEADER { - margin: 0 0 0 -4%; -} - -OL { - margin: 0 0 0 5%; - line-height: 1.2; -} - -BODY P { - margin: .6em 0; - line-height: 1.2; -} - -BODY PRE { - margin: .75em 0; - line-height: 1.0; - color: #461b7e; -} - -BODY TD { - line-height: 1.2 -} - -BODY TH { - line-height: 1.2; -} - -UL, BODY DIR, BODY MENU { - margin: 0 0 0 5%; - line-height: 1.2; -} - -HTML { - margin: 0; - padding: 0; -} - - -.FILENAME { - color: #007a00; -} - -BODY H1, BODY H2, BODY H3, BODY H4, BODY H5, BODY H6 { - margin-left: 0 -} - -.GUIMENU, .GUIMENUITEM, .GUISUBMENU, -.GUILABEL, .INTERFACE, .GUIBUTTON, -.SHORTCUT, .SHORTCUT .KEYCAP { - background-color: #F0F0F0; -} - -.ACCEL { - background-color: #F0F0F0; - text-decoration: underline; -} - -.PROGRAMLISTING, .SCREEN { - margin-left: 3ex; -} diff --git a/website/content/en/releases/4.6.2R/docbook.css b/website/content/en/releases/4.6.2R/docbook.css deleted file mode 100644 index f12ce2ad3e..0000000000 --- a/website/content/en/releases/4.6.2R/docbook.css +++ /dev/null @@ -1,165 +0,0 @@ -/* - * Copyright (c) 2001, 2003 The FreeBSD Documentation Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD: head/en_US.ISO8859-1/htdocs/releases/4.10R/docbook.css 38826 2012-05-17 19:12:14Z hrs $ - */ - -BODY ADDRESS { - line-height: 1.3; - margin: .6em 0; -} - -BODY BLOCKQUOTE { - margin-top: .75em; - line-height: 1.5; - margin-bottom: .75em; -} - -HTML BODY { - margin: 1em 8% 1em 10%; - line-height: 1.2; -} - -.LEGALNOTICE { - font-size: small; - font-variant: small-caps; -} - -BODY DIV { - margin: 0; -} - -DL { - margin: .8em 0; - line-height: 1.2; -} - -BODY FORM { - margin: .6em 0; -} - -H1, H2, H3, H4, H5, H6, -DIV.EXAMPLE P B, -.QUESTION, -DIV.TABLE P B, -DIV.PROCEDURE P B { - color: #990000; -} - -BODY H1 { - margin: .8em 0 0 -4%; - line-height: 1.3; -} - -BODY H2 { - margin: .8em 0 0 -4%; - line-height: 1.3; -} - -BODY H3 { - margin: .8em 0 0 -3%; - line-height: 1.3; -} - -BODY H4 { - margin: .8em 0 0 -3%; - line-height: 1.3; -} - -BODY H5 { - margin: .8em 0 0 -2%; - line-height: 1.3; -} - -BODY H6 { - margin: .8em 0 0 -1%; - line-height: 1.3; -} - -BODY HR { - margin: .6em -} - -BODY IMG.NAVHEADER { - margin: 0 0 0 -4%; -} - -OL { - margin: 0 0 0 5%; - line-height: 1.2; -} - -BODY P { - margin: .6em 0; - line-height: 1.2; -} - -BODY PRE { - margin: .75em 0; - line-height: 1.0; - color: #461b7e; -} - -BODY TD { - line-height: 1.2 -} - -BODY TH { - line-height: 1.2; -} - -UL, BODY DIR, BODY MENU { - margin: 0 0 0 5%; - line-height: 1.2; -} - -HTML { - margin: 0; - padding: 0; -} - - -.FILENAME { - color: #007a00; -} - -BODY H1, BODY H2, BODY H3, BODY H4, BODY H5, BODY H6 { - margin-left: 0 -} - -.GUIMENU, .GUIMENUITEM, .GUISUBMENU, -.GUILABEL, .INTERFACE, .GUIBUTTON, -.SHORTCUT, .SHORTCUT .KEYCAP { - background-color: #F0F0F0; -} - -.ACCEL { - background-color: #F0F0F0; - text-decoration: underline; -} - -.PROGRAMLISTING, .SCREEN { - margin-left: 3ex; -} diff --git a/website/content/en/releases/4.6R/docbook.css b/website/content/en/releases/4.6R/docbook.css deleted file mode 100644 index f12ce2ad3e..0000000000 --- a/website/content/en/releases/4.6R/docbook.css +++ /dev/null @@ -1,165 +0,0 @@ -/* - * Copyright (c) 2001, 2003 The FreeBSD Documentation Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD: head/en_US.ISO8859-1/htdocs/releases/4.10R/docbook.css 38826 2012-05-17 19:12:14Z hrs $ - */ - -BODY ADDRESS { - line-height: 1.3; - margin: .6em 0; -} - -BODY BLOCKQUOTE { - margin-top: .75em; - line-height: 1.5; - margin-bottom: .75em; -} - -HTML BODY { - margin: 1em 8% 1em 10%; - line-height: 1.2; -} - -.LEGALNOTICE { - font-size: small; - font-variant: small-caps; -} - -BODY DIV { - margin: 0; -} - -DL { - margin: .8em 0; - line-height: 1.2; -} - -BODY FORM { - margin: .6em 0; -} - -H1, H2, H3, H4, H5, H6, -DIV.EXAMPLE P B, -.QUESTION, -DIV.TABLE P B, -DIV.PROCEDURE P B { - color: #990000; -} - -BODY H1 { - margin: .8em 0 0 -4%; - line-height: 1.3; -} - -BODY H2 { - margin: .8em 0 0 -4%; - line-height: 1.3; -} *** 5103 LINES SKIPPED *** From nobody Sat Jun 27 18:19:53 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gngnB4Jkpz6jxkY for ; Sat, 27 Jun 2026 18:19:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gngnB3ZDgz3yvH for ; Sat, 27 Jun 2026 18:19:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782584398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lu83UGWIKlOUpQwfClY7tCPfE4IfoW4Or7cE+Cklvks=; b=sszYlOwxIAhxzmVHzoQ2NDsesJ8Y0FpdgKtl4GHzxfnlV/nFdd6VkYPI8kZhFmN5AnVBy/ C8HgWrHkm1DTImRig6u2X46ZOUUx/btDHpu2iCS4M2j5esh4ISXaU6ZIjtVF3A/DkxNYgK aEi7tHeRWnDHOz5YMyBjYk9DDnVUEH9sFXyNeB0MTfcCSR17vDCNxK4nChffnWZbmCOuKR 7QU9cf+v5Aze5dmnB3BSBmvXTClkrO1ecsJvhOI+LRQ6hu9q7o4cwwW2BqNmeN8wR4eVb5 Ij8D4PYkGQs9RwRIylL7Z4IqeIyQ55dvzV9FH/cJXbcbC6calrKouVwDARK7Aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782584398; a=rsa-sha256; cv=none; b=hlfhe+uIU4C29rnPyInOorkzsWZoWHsQmrx0Gymw2Odo/262EVVI1G4/9BlfYavtIc/WSA kYikUFWV3DAGbUYg1XyzkpZDNAaZEA9zaPaAQzhsf1OqmNrFQJFrpW1Vp2PYBSVx6VnDGS iT7H0Ol9p1fLtP8CWVjDOX1HE3n4kDrpF/h2cHuSA7rLiRuBt9pJ2kv4ycDPEAfFn9Wqj3 0jXRL4BbAZuYwlpxT4MSe7T1ch6n2uS8SvzxFwBLOHwP0DjwTB/yAb+xT6EqTdq2pLx+Hy sGqbv46jg5MxwgaQbg3ktClQbNl8hhvNGTtLjJEsv9X/ix/bnK89TdQJzYRjDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782584398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lu83UGWIKlOUpQwfClY7tCPfE4IfoW4Or7cE+Cklvks=; b=HsW6FRJ4B5Z2QJmMhdg4LbmvE0s4/Vf4sMh4/0VY1lq397IApfWfUwr2putsdDXD49qgV8 1cSKcav8HflQop8E8hbncNmrbgBnQ1YW3HB/2lFZE5J/DuYZB9eaXgsneowW/GrWYjvDOq By3q9QIxO5zEmQBy35Lh/mhaaD5qMGVnqN0yzyhMOFsrogQDfjVXFxc9freZ5QthrDYrp9 OAx+luUw49ilR8COk/XnGH/lPfM7JHBc/dtNkEHXYfeHdUUPDiLGAhrxnVCZtYDZDwllpT Wde6tNznYCaazJ8bKq2i5cY4csiH+6T55vf8kLiszYjOYmdUYH42cPEo+aKu1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gngnB2KwXzbSD for ; Sat, 27 Jun 2026 18:19:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c26d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 27 Jun 2026 18:19:53 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Ed Maste Subject: git: 515f5dd90c - main - porters-handbook: Freshen up example dates List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 515f5dd90c0017586366224f69dd6460d143022f Auto-Submitted: auto-generated Date: Sat, 27 Jun 2026 18:19:53 +0000 Message-Id: <6a401449.3c26d.4660d70f@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/doc/commit/?id=515f5dd90c0017586366224f69dd6460d143022f commit 515f5dd90c0017586366224f69dd6460d143022f Author: Ed Maste AuthorDate: 2026-06-26 15:29:53 +0000 Commit: Ed Maste CommitDate: 2026-06-27 18:19:06 +0000 porters-handbook: Freshen up example dates Avoid looking like this document is over a decade old. Reviewed by: jrm, bcr Event: Halifax Hackathon 202606 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57900 --- .../content/en/books/porters-handbook/makefiles/_index.adoc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/documentation/content/en/books/porters-handbook/makefiles/_index.adoc b/documentation/content/en/books/porters-handbook/makefiles/_index.adoc index 092db269e2..801ffd5066 100644 --- a/documentation/content/en/books/porters-handbook/makefiles/_index.adoc +++ b/documentation/content/en/books/porters-handbook/makefiles/_index.adoc @@ -1535,19 +1535,19 @@ While trying to make a port for the bleeding edge version of pkg from the FreeBS [.programlisting] .... PORTNAME= pkg-devel -DISTVERSION= 1.3.0.a.20140411 +DISTVERSION= 2.7.4.20260626 USE_GITHUB= yes GH_ACCOUNT= freebsd GH_PROJECT= pkg -GH_TAGNAME= 6dbb17b +GH_TAGNAME= 2678d2b .... It will automatically have `MASTER_SITES` set to `GH` and `WRKSRC` to `${WRKDIR}/pkg-6dbb17b`. [TIP] **** -`20140411` is the date of the commit referenced in `GH_TAGNAME`, not the date the [.filename]#Makefile# is edited, or the date the commit is made. +`20260626` is the date of the commit referenced in `GH_TAGNAME`, not the date the [.filename]#Makefile# is edited, or the date the commit is made. **** ==== @@ -1582,7 +1582,7 @@ Create the port with a `DISTVERSION` of `g__YYYYMMDD__`, where `g` is for Git, a [.programlisting] .... PORTNAME= bar -DISTVERSION= g20140411 +DISTVERSION= g20260626 USE_GITHUB= yes GH_TAGNAME= c472d66b @@ -1593,7 +1593,7 @@ See crossref:makefiles[makefile-versions-ex-pkg-version, this secion on how to c [source,shell] .... -% pkg version -t g20140411 0 +% pkg version -t g20260626 0 < .... From nobody Sat Jun 27 18:33:15 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gnh4c40Jrz6jyRX for ; Sat, 27 Jun 2026 18:33:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnh4c3Swpz417K for ; Sat, 27 Jun 2026 18:33:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782585200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Bd8BIiW3Fs5TApO49S4RfysAOclvw0fylYKD7uUfhM=; b=I3KWY/LiusFPYNn9bvBEu9/01U+erwpiGEkdY2yZjuPbzpXQVb5TJw6e/1KYWt8/MZZgiM DcOOUF1ArL50yqlMjEgHoS+tPIxQjNQYQcmy2lDArrH/4qRiiRprunR7XTCGjlcotJlgTB g9rW6XbpbBQoZuvPYCEr6hUj9IqoBbOIgoeOywy6zxDs0s187C3P0nxGYttSv0NnAOmhWW KdSOu2i3NIa2PuhLTBacEYW2eyPTMsxQWDP+4R2kIoRgIwkh6Ui9v90pwcN/YMRadXi32i erumhBmaDwwqY3BtNyl1qewCoyAjb5+hepMEsq5vhzfBVgXy8wq3gXFMYjHOjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782585200; a=rsa-sha256; cv=none; b=Q0vZ479jqlH4PAAg601XxdFqeJ02xEyr6DibQGIDvyQSSuqbXA/nPJSQYaXI81y+vDCtew B7fkpWs/AnaILT2YlFy4VTmon4XZCGYob4p86DJYFbZ+K5GGLcoko3aJcathsqoqECpVUd j0IR9L/GsR956L9/QIy/XJ+cM9TIUyoJGFtlO7iOLJj2Nv6dbqmaHfBafzGmlJxzLtavjV X3NDGEYnenLyRv0OsQzqiB0nri4DzczRTRAoG2zo/Fqy/Up6NhqOcYjYQMfKv4/kieYteK x1orVnVjwk0mEu4V9gov4tPFcgeGBg+KYcGUHMVAyYZx4rsO0GOyeoNGEyDkRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782585200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Bd8BIiW3Fs5TApO49S4RfysAOclvw0fylYKD7uUfhM=; b=c8GP7nKqzFr3pPK2ibehCYn+WZQWg2pA/JvHpDzw349oEQeIJTpgDy15Ye56ZEDtHedS6f OJx/12Ji3qPEcGkwVxnDi2hRVHP0kAIHcFVds1nMpnFMh0LeocWrlRBV6nnuLiSUI9bywQ tPpaoTgTAFdg+/sTJ/G9mScgNS0x2tyUMUxt+TzGzxgb4sUsttOmSOK225/YhynvouTtyh 8DdnANkImMa4GQVXfLFbzUSL5TFtaOuGBdyRcv20Y1X+vMYURB1yqBQxkb8J+YOxjlcLej n3ryj9ZGJRCw3iMrCEKba4+VxT1fFl/vhsXlmT6DvA1PoGrfcyIEsj09e94Gug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnh4c28WdzcW0 for ; Sat, 27 Jun 2026 18:33:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40e8c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 27 Jun 2026 18:33:15 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Ed Maste Subject: git: d9a2dd465a - main - porters-handbook: Use full-length hashes in GH_TAGNAME List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d9a2dd465a3c89dd68211a7c0a7ec2c556c4c643 Auto-Submitted: auto-generated Date: Sat, 27 Jun 2026 18:33:15 +0000 Message-Id: <6a40176b.40e8c.56a5734e@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/doc/commit/?id=d9a2dd465a3c89dd68211a7c0a7ec2c556c4c643 commit d9a2dd465a3c89dd68211a7c0a7ec2c556c4c643 Author: Ed Maste AuthorDate: 2026-06-27 12:18:00 +0000 Commit: Ed Maste CommitDate: 2026-06-27 18:24:20 +0000 porters-handbook: Use full-length hashes in GH_TAGNAME Full hashes avoid possible conflicts, at the cost of a small increase in some path names. About 1/3 of the existing GH_TAGNAMEs in the ports tree are already full 40-character hashes. Reviewed by: bcr Event: Halifax Hackathon 202606 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57901 --- documentation/content/en/books/porters-handbook/makefiles/_index.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/content/en/books/porters-handbook/makefiles/_index.adoc b/documentation/content/en/books/porters-handbook/makefiles/_index.adoc index 801ffd5066..8415ede9a4 100644 --- a/documentation/content/en/books/porters-handbook/makefiles/_index.adoc +++ b/documentation/content/en/books/porters-handbook/makefiles/_index.adoc @@ -1540,7 +1540,7 @@ DISTVERSION= 2.7.4.20260626 USE_GITHUB= yes GH_ACCOUNT= freebsd GH_PROJECT= pkg -GH_TAGNAME= 2678d2b +GH_TAGNAME= 2678d2b6a8ca3cf80cb4dbc8da557a2998e1b5c0 .... It will automatically have `MASTER_SITES` set to `GH` and `WRKSRC` to `${WRKDIR}/pkg-6dbb17b`. @@ -1585,7 +1585,7 @@ PORTNAME= bar DISTVERSION= g20260626 USE_GITHUB= yes -GH_TAGNAME= c472d66b +GH_TAGNAME= c472d66b70dd603bf9e67607f0869639276796ce .... This creates a versioning scheme that increases over time, and that is still before version `0`. From nobody Sat Jun 27 18:51:21 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gnhTV5RlVz6k0gW for ; Sat, 27 Jun 2026 18:51:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnhTV4ympz42kl for ; Sat, 27 Jun 2026 18:51:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782586286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0XR1Ad+dDfaM0Et+79cKQoy/unxQb2m1/1hbLxuD/DM=; b=VyxOpBz+fazi3cKpUJY9K+Mzafy6zXWCYEiEjQ8SmyB/u4U76g3W9+GRxLV8FkcthCWvsB ehg0rDrZDK0F37XjOBRcZcXAkqoXnRZ/FXBSylbbs6BsoHtNM0Y+WjuYd9UjAqi5om8FjH XeDmDwPMiWcauKyvvEvBU1qmkwsY8c59kTkFzP39UEwz+sP5RQZRrco3hIbG8SfoxTZzA+ jt8ScpdeEN+zWsWINY179zdJDK1CgoRDlMeWkZj5kCmugyicKYbSIfzaqBUoDNKAFwOadO OQce7StP/oNYEPzCwINNbV6M4GYQZVepfj2AYcwBq8PjEGimQi1r3Tvam38kSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782586286; a=rsa-sha256; cv=none; b=CLSDpauSOHuZMFELPWSklCQ0CBy9qNtFwCs+OHM3EmXGqMrjrI67azxJQPeDvrqzY2CaeS 1aKLfC95UPaZtUGLk7nNqwEBXs9vXlEgSJ2ZcXslf0/sqDjwwYB1iyWLCYSaMVIQds+Okd jTN5fQpPQGM1KJfoH0+zLVH/XpD8U9FvPWpSYybSvLEW3fHnSzN1P+P3JMv/9LIkQdayAi eBGgJLBbW2Bqg8Ujyvhi7CkhX6sAta4d+Ld0YsQCPT53n3gwXFugERM28FZ/gjzg+G4VYi K7GX77b0E9DX6HZch1RBeRhz6jWptxmVePsyWnmmrUtjBaDWJao33HMzbab8Vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782586286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0XR1Ad+dDfaM0Et+79cKQoy/unxQb2m1/1hbLxuD/DM=; b=hlwYnIFNxseCITjLlocMaJAsPelHwBH1jJJ5umGofSLwXuP2vW1SODwg4U9R23daEg43hU pCrsNP5SN9X3u2XcPi2arOaUJRy2+k1pJDBaHTUOKtlVZUPf0Q8QFTiT2B4wXMPg3XcLjc tX/4KQmY6sPiNwbXjycC0wG+rmCAJdpmxmDqKZKkiMIp2d3wiK+E5z7rtaVt0NN2g+hFbk AUL3TJ3CgZiEnbz8PTOdlzTbFoXGih3lcExgUO34iSH7tyGzCDgWiJjA8O5tp9KmY2eKzb Qd0muEwX7Z4jZfqvxehlRj7lPOPZZbqyejPP4KhZlPMtgx2Gow+/S9ckrPalVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnhTV3XPfzcX4 for ; Sat, 27 Jun 2026 18:51:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41df5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 27 Jun 2026 18:51:21 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Benedict Reuschling Subject: git: 8f2581d087 - main - Revert "fdp-primer: Mention that .po files are generated nightly" List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bcr X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f2581d0872eb7a9fb06a65ce6640d86ebc306ed Auto-Submitted: auto-generated Date: Sat, 27 Jun 2026 18:51:21 +0000 Message-Id: <6a401ba9.41df5.c21fc67@gitrepo.freebsd.org> The branch main has been updated by bcr: URL: https://cgit.FreeBSD.org/doc/commit/?id=8f2581d0872eb7a9fb06a65ce6640d86ebc306ed commit 8f2581d0872eb7a9fb06a65ce6640d86ebc306ed Author: Benedict Reuschling AuthorDate: 2026-06-27 18:48:42 +0000 Commit: Benedict Reuschling CommitDate: 2026-06-27 18:48:42 +0000 Revert "fdp-primer: Mention that .po files are generated nightly" This reverts commit 64b3126c0db9dcc8cf9a2f003b3a52dbb76a7fd1. It turns out the information was wrong and the PO files are not created nightly. --- .../content/en/books/fdp-primer/po-translations/_index.adoc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/documentation/content/en/books/fdp-primer/po-translations/_index.adoc b/documentation/content/en/books/fdp-primer/po-translations/_index.adoc index 5341057012..2391b8d257 100644 --- a/documentation/content/en/books/fdp-primer/po-translations/_index.adoc +++ b/documentation/content/en/books/fdp-primer/po-translations/_index.adoc @@ -100,8 +100,6 @@ The path is the same except for the name of the language directory. % cp ~/doc/documentation/content/en/articles/leap-seconds/_index.po \ ~/doc/documentation/content/es/articles/leap-seconds/ .... -If you are making changes to the english version of the documentation, do not edit `.po` files! -They are regenerated automatically every night by Weblate. Suppose the document or language is also being translated via Weblate. In that case, it is good to get the `.po` file from there and upload the translation document back into the platform, centralizing the translating efforts via Weblate to avoid rework. @@ -287,8 +285,7 @@ Now the document structure is ready for the translator to begin translating with The gettext system greatly reduces the number of things that must be tracked by a translator. Strings to be translated are extracted from the original document into a PO file. -This is done automatically every night by Weblate, and there is no need to edit original `.po` files manually! -A PO editor is used to enter the translated versions of each string. +Then a PO editor is used to enter the translated versions of each string. The FreeBSD PO translation system does not overwrite PO files, so the extraction step can be run at any time to update the PO file. From nobody Sat Jun 27 19:27:55 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gnjHh75fnz6k3L3 for ; Sat, 27 Jun 2026 19:28:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnjHh6TFHz45fn for ; Sat, 27 Jun 2026 19:28:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782588480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CIVXlWPumkxrReBjfdWuuvehDAFjeIkgcWNAlBMTuAU=; b=pI7TqDe7LKeQQ5bQZGQjaQLsQOTGvTkl27uMfKcCl9Dm+/5o6XMcvX6VG5zU6No8isVzat 7QzMAjWw+LpKpICTkC3F7wDDJiHigclnyGTT1+yVdgjUk8UzaKA+QkQaL5gZEXovLf9QRP 5ddlewaBiQTj9sVyWGVJo0MzJe1JUGGAXV+FrqC8IvPenKunimHW5T88IGAWU5aCdLqIbq NUhVNwFcJabD9rNpF9kEIewLXA3ct7/Y8byQXSERuFqwRB35KnacrAvDJAArkuId3RteGq NNbvFKQLL28zbzLVM1AdKPqllXzrCFfrnlGK/tjK7ez4TlOziQYJaw8N1mYAow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782588480; a=rsa-sha256; cv=none; b=IfgHFtMRDsjZvd0LpzV9J6XN689JC11Z7qHxWebbzNXVTw0m4wBYUhAxzcSfPE6OjNzLS8 dd8XpyMzaI8vIo+93H6QE6g+NngXWszB5cjA3fFYic8gIKCfRuad/V7rvNMlhTygMHxBoq EK39Tr4TRpt6OmR3Dffrg3n5+EPXH+CSAliE3u8AtKPpR3bnraqc3qH0nASWLLS/ISvJYS ZwPnNassSSt0axODTaCE2d4g5h/jLc2nNDVeUyE7VcXYr0TR/dbknDwl/tWmHS9g7m6ABY pNyZyRrNZV26srDNL+G2fN2T2bDhIutlf7x0BN2dpKzK02vx5eUiyxAYB03Xuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782588480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CIVXlWPumkxrReBjfdWuuvehDAFjeIkgcWNAlBMTuAU=; b=o5HBXJ30RESxHv2xFlBG5JeDHJW+CTNOcaoE0+J5fmmJwpf0CxSspWVmiF4wB0XiE96WO3 K4lPOCQ7o/2qG50BTi1wV5VB45u9uZTPagBfBYUaLb0+L95hJGmeXXGW4wRuCEuxCs/mYh mjiz38iGcBoBskhtFCq7+QoYaqZLlqRrGf9i3bA1HZYkWn6ZuJxBfV+XJPlKBXMX5kHzIQ Fr4WMKJarFnymLqeZlQYlgiTUwCOBpNyYyXGSc1P+iqf39mKrMl2E52CjRFvi8YgRMmxva A/6Dzcz0KST3jr+C3E1s1TMI0Qnl6xeaolP+lqE521AXcjtQc+eXauzlf6fVgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnjHh5YFwzdl0 for ; Sat, 27 Jun 2026 19:28:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45cfc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 27 Jun 2026 19:27:55 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Kurt Jaeger Subject: git: 40d1da1ede - main - List wiki-admins List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pi X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 40d1da1ede3d1c81cbff2a9b916c60c5debc6066 Auto-Submitted: auto-generated Date: Sat, 27 Jun 2026 19:27:55 +0000 Message-Id: <6a40243b.45cfc.2b7e181@gitrepo.freebsd.org> The branch main has been updated by pi: URL: https://cgit.FreeBSD.org/doc/commit/?id=40d1da1ede3d1c81cbff2a9b916c60c5debc6066 commit 40d1da1ede3d1c81cbff2a9b916c60c5debc6066 Author: Kurt Jaeger AuthorDate: 2026-06-27 19:27:24 +0000 Commit: Kurt Jaeger CommitDate: 2026-06-27 19:27:24 +0000 List wiki-admins Approved-by: carlavilla --- website/content/en/administration.adoc | 6 +++++- website/content/ru/administration.adoc | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/website/content/en/administration.adoc b/website/content/en/administration.adoc index c07ba795c1..5c2b24b09b 100644 --- a/website/content/en/administration.adoc +++ b/website/content/en/administration.adoc @@ -362,4 +362,8 @@ Email to the Webmaster Team is currently forwarded to the Documentation Engineer The FreeBSD Wiki Team is responsible for keeping the FreeBSD https://wiki.FreeBSD.org/[Wiki] site up and running. They also shape the overall design and content structure. -Email to the Wiki Administrators is handled by the Cluster Administrators. +* {adrian} +* {carlavilla} +* {pi} + +Email to the Wiki Administrators is also handled by the Cluster Administrators. diff --git a/website/content/ru/administration.adoc b/website/content/ru/administration.adoc index c877def6f0..36d01cda92 100644 --- a/website/content/ru/administration.adoc +++ b/website/content/ru/administration.adoc @@ -362,6 +362,10 @@ https://www.freebsd.org/ru/releng/charter/[Устав команды подго Команда Вики FreeBSD отвечает за поддержание работоспособности сайта https://wiki.FreeBSD.org/[Вики] FreeBSD. Она также определяет общий дизайн и структуру контента. +* {adrian} +* {carlavilla} +* {pi} + Сообщения электронной почты, направляемые администраторам Вики, обрабатываются администраторами кластера. // From nobody Sat Jun 27 20:22:58 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gnkWC4KMHz6hdFk for ; Sat, 27 Jun 2026 20:23:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnkWC3mFVz3GHp for ; Sat, 27 Jun 2026 20:23:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782591783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e2vNTAdzTVjjVQj/fJW6OJ95WkT6DsDKdK8f0HuMcQ4=; b=ykazRd9Kg0kVQh4Ve4zlraEDmXL3LmrnTyGkwC+Jni95jI3u8ZkJWSSh8cY6nNkXEK8kSn yyzngJIo60GRkT9gvBkmlnAtjcmTRfCXYPeold6ByAjGGoJSywasLOZGPm4zoRMmEfBWtO QxtpS9xidoxTqkQV54UTyTHTewARkfoWS6Iv1rnsIUtA9MIXa1uU1c4uG/z0geUTU/GPub /LMRbzXqqhs/RZtD5ud9hR4N813cE6z/H8AJf//TD31VnvdEQkSZpGzPhkfttX6SEBz8d/ dO32hCCUvgvbAsmtQScKE0kL/WAB7U0zmKDgXxmUeR200HKqcTYMqbZvY7lQeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782591783; a=rsa-sha256; cv=none; b=O8FO8sXVpkZs8N4dw31ddHrCqUTJifpcYZDxV1K+GbiwH9zuJ/bbRKa7kpsdk07BZdI3wI pjeJbMjeLNTp5CLVDNqHglGmo/oWTLmRu9pIAJ/Lpt/lTjCLo0yllbbwkltx03Me0w167b 5IvxXVL+bBSGzx+TdGbEwyI+MOZhfhbDWYrTCKnByQGKQZediThLyi2tttgUscOfl/FDnK 2FWWSoWVf92iJcDauj0IED5cnW1b6xmrEt1vgoUf50XyYr9DLKzCJgzidKGzqWC9+61HVg 19R4pKWmAWAHO4SS+260/q6NKmTl+lH5EKlbn/fpITt3LpfjCiYaSAv2s8ZTVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782591783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e2vNTAdzTVjjVQj/fJW6OJ95WkT6DsDKdK8f0HuMcQ4=; b=R6DcoPw/8lb2i4rUOj968JF7+10+66pXu837E11onFMLeKPYyDvEhmlcuTC2p6q4Rl4jxD yXT7SnEBnLOwNvOfPwMP2T0wBLndaQ2/wrdp7txQihIbKlcfOkCHC/WyP+HihIQ48ReDRC +h3VeVMpwKk7E7cDiXUiOzr5FoQZUI25MAJOZ6lSj23Q1E4Ot4BzO1ylk/JDHwOhPzI76r VeBD2QDd47pxJ6aUTX5DSOPCvdsi8VHulNSzYxhLBilmJagp8MXXUIsGVwZhevk4rLW5q5 8Z41H3D8TT8WD3CU3w82EuAqSCzr3ynnbU+ZsrESGUFHeW7cW4I5X8Zbes4pkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnkWC2cNbzfrF for ; Sat, 27 Jun 2026 20:23:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d0b8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 27 Jun 2026 20:22:58 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Andrey Zakhvatov Subject: git: e8bd29521e - main - website/ru: Update releases/15.1R/upgrading.adoc List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andy X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e8bd29521e249f7758f7054b020cba0e2600055b Auto-Submitted: auto-generated Date: Sat, 27 Jun 2026 20:22:58 +0000 Message-Id: <6a403122.1d0b8.498a137b@gitrepo.freebsd.org> The branch main has been updated by andy: URL: https://cgit.FreeBSD.org/doc/commit/?id=e8bd29521e249f7758f7054b020cba0e2600055b commit e8bd29521e249f7758f7054b020cba0e2600055b Author: Andrey Zakhvatov AuthorDate: 2026-06-27 20:16:07 +0000 Commit: Andrey Zakhvatov CommitDate: 2026-06-27 20:22:31 +0000 website/ru: Update releases/15.1R/upgrading.adoc Update to EN d9b67188b5ea2be67e355bb57494d5bceb61bd46 --- website/content/ru/releases/15.1R/upgrading.adoc | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/website/content/ru/releases/15.1R/upgrading.adoc b/website/content/ru/releases/15.1R/upgrading.adoc index 90cc00972e..ff4b4f797c 100644 --- a/website/content/ru/releases/15.1R/upgrading.adoc +++ b/website/content/ru/releases/15.1R/upgrading.adoc @@ -117,25 +117,27 @@ sysctl machdep.bootmethod [[upgrade-pkg]] == Обновление с использованием пакетов базовой системы -Системы, развёрнутые с пакетной базовой системой, обновляются с помощью man:pkg[8]. -Системы, работающие под управлением {releasePrevLegacy} или {releasePrev}, могут быть обновлены следующим образом: +Системы, развёрнутые с применением пакетов базовой системы, обновляются с помощью man:pkg[8]. +Системы, работающие под управлением {releasePrev}, могут быть модернизированы следующим образом: -. **Создайте снимок текущей установки** +. **Создайте мгновенную копию установленной системы** + -Создайте рекурсивный снимок работающей системы с именем, содержащим текущую дату: +Если загрузка выполняется из файловой системы ZFS, создайте рекурсивную мгновенную копию работающей системы с именем, содержащим текущую дату: + [source,shell,subs="verbatim,attributes"] ---- bectl create -r pre-{localRel} ---- + -Загрузчик предоставляет меню для загрузки с этого снимка, если потребуется откат обновления. +В меню загрузчика имеется меню для загрузки с этой копии на случай, если потребуется отменить обновление. ++ +. **Обновите установленную систему** + -. **Обновите менеджер пакетов** +Перед тем, как выполнять модернизацию до нового релиза, обеспечьте актуальность установленной системы: + [source,shell] ---- -pkg upgrade -yr FreeBSD-ports pkg +pkg upgrade -r FreeBSD-base ---- + . **Обновите базовую систему** @@ -149,9 +151,9 @@ pkg -oABI=FreeBSD:15:$(uname -p) -oOSVERSION=1501000 upgrade -r FreeBSD-base Некоторые пакеты могут требовать дополнительных шагов по настройке, например выполнения `service setup`. Следуйте этим инструкциям по мере необходимости. + -. **Обновите сторонние модули ядра** +. **Обновите модули ядра сторонних разработчиков** + -Сторонние модули ядра также должны быть обновлены вместе с базовой системой: +Если установлены модули ядра сторонних разработчиков, то они также обязательно должны быть обновлены вместе с базовой системой: + [source,shell] ---- @@ -226,7 +228,7 @@ cp /boot/loader.efi /boot/efi/efi/freebsd/loader.efi cp /boot/loader.efi /boot/efi/efi/boot/bootx64.efi ---- + -Обратите внимание, что в некоторых установках может отсутствовать `freebsd/loader.efi`. +Заметьте, что в некоторых конфигурациях систем может наблюдаться другой порядок (к примеру, `EFI/BOOT/BOOTX64.EFI`), а также может отсутствовать `freebsd/loader.efi`. + Для систем AArch64 вместо этого выполните следующие команды: + @@ -305,5 +307,5 @@ shutdown -r now // // The FreeBSD Russian Documentation Project // -// Original EN revision (23.06.2026): 4df494ffc469a8e3b8e4f760dc76e8223529143b +// Original EN revision (26.06.2026): d9b67188b5ea2be67e355bb57494d5bceb61bd46 // From nobody Sun Jun 28 06:40:14 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gp0CR4sm2z6jhSG for ; Sun, 28 Jun 2026 06:40:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gp0CR3dJKz3L2y for ; Sun, 28 Jun 2026 06:40:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782628819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fF29R5W6B7icyPjVzAvDhXO9pEmieJv+TqGNHymmtxc=; b=q625LbnjZX7zJqnz10fqQhECA4w+6re7wHen/mKOUH79mhWQ/EKeR2ZAUEtJdfeZ/VYQPf zj3XtKmTGGDuTlxPWsTHQjeJGE6Hn7srlBGVN9A3WxOgQt7SVQYw+u/CGLSy/RyRa5VTJA 38aJUbpjbxkfcTiK+JJU+dVtGLocTCKNXVs0N6NCLz8o+YNF/7oSUUsvKJGgrLQJa2ZfQ7 GeEnhGkKFbOg1DTF/uTApr9Fsczpgx10CQU5dMG9ZV3mpT+oxPGlU4CfumUh5xCOI+/0MI Lpmct1ObKi0Rx6+JUM5+ZZXUDl11O0akym/mwwcinfrUvyFABXmyo3rDofcnKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782628819; a=rsa-sha256; cv=none; b=KZn0EBO/JxOZV/03/R59/6ABlP+avYJT4/iG/lvU3fIlyZP75XVaGwXhw6zhv6P8NTKZmN nBkSNR+aHUVB2gyczuCMAtUgzEuAdcv/ZsDQ2V49BN9fKJ+uQjpEPOnn81tTlDKnjMq2nQ tCoRL6/tehZLWFB+qOE8pH+VKtRsR7dW2T0IoJp0Y35Xgp00vjqc++GmX0xe+yiB22Z0y5 uMKTMZTVMgXbqjlrugx3AwNBNMIhs7otAx7Y/hIKF2QxmPmu5xuLf7CxwnTiTRiXbgjEmY /yyIcnMQkh7dt7HpuWFS8+IgzEXkyiAqeFdvE4QqozSObfKdpxw8zNX4U5n0ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782628819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fF29R5W6B7icyPjVzAvDhXO9pEmieJv+TqGNHymmtxc=; b=RR4jKzzebJtXKGoWC8eJ323XtJfZk0T8rQltdb9WGYhrJh+kgyE0b4MLO9996KeT4STmvK R5IJaNOZQx9u1xY/tVmO+dgT3jQ64qDNNrvMXwyYm5/kWcTqhV+54cxXphqF3LvC7CtsmJ i/DJptqUwiUvduaWh59+fO+nhFShq+WMMJLKHWmK5utScpW9MOryKyL+bFImW9dwF0OaKh cSXJtvahul40Ac1HCneFuCdQ/hgl921QAy9kbchVhLMUQxq9dF3ztHw7FWfOo81bUQQxRU iNkQOelWpxAE8O2S/dGjRHQ9t+J1APcwhWL8EfXdaUvxN5hLQbg1bMS8kIXciA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gp0CR2GmCzyDG for ; Sun, 28 Jun 2026 06:40:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4632b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 06:40:14 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org Cc: Marcel Weissenbach From: Sergio Carlavilla Delgado Subject: git: 09af4383cf - main - Handbook-multimedia: Replace moc and mplayer List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: carlavilla X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09af4383cfb75d13ea9c243110c7e785b84f9c9d Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 06:40:14 +0000 Message-Id: <6a40c1ce.4632b.1239f6bf@gitrepo.freebsd.org> The branch main has been updated by carlavilla: URL: https://cgit.FreeBSD.org/doc/commit/?id=09af4383cfb75d13ea9c243110c7e785b84f9c9d commit 09af4383cfb75d13ea9c243110c7e785b84f9c9d Author: Marcel Weissenbach AuthorDate: 2026-06-28 06:39:55 +0000 Commit: Sergio Carlavilla Delgado CommitDate: 2026-06-28 06:39:55 +0000 Handbook-multimedia: Replace moc and mplayer --- .../en/books/handbook/multimedia/_index.adoc | 78 +++++++++++++++++----- 1 file changed, 62 insertions(+), 16 deletions(-) diff --git a/documentation/content/en/books/handbook/multimedia/_index.adoc b/documentation/content/en/books/handbook/multimedia/_index.adoc index be717732ab..f1a56c3f13 100644 --- a/documentation/content/en/books/handbook/multimedia/_index.adoc +++ b/documentation/content/en/books/handbook/multimedia/_index.adoc @@ -306,9 +306,9 @@ This section introduces some of the software available from the FreeBSD Ports Co | package:multimedia/audacious[] | Qt -| MOC (music on console) +| cmus — C* Music Player | GPL 2.0 -| package:audio/moc[] +| package:audio/cmus[] | TUI |=== @@ -357,18 +357,18 @@ Audacious supports OSS natively, but must be configured in the settings on the A ==== [[moc-music-on-console]] -=== MOC (music on console) +[[cmus]] +=== cmus — C* Music Player -MOC (music on console) is a console audio player designed to be powerful and easy to use. +cmus is a small, fast and powerful console music player for Unix-like operating systems. -MOC plays smoothly, regardless of system or I/O load, because it handles the output buffer in a separate thread. -It does not cause gaps between files, because the next file to be played is pre-cached while playing the current file. +Beside various input and output plugins, it has support for CUE sheets, uses Unicode, supports scrobbling (to e.g. last.fm or libre.fm), can run external programs on selected files like tag-editors, can be controlled via UNIX sockets and many more. -To install MOC (music on console), execute: +To install cmus, execute: [source,shell] .... -# pkg install moc +# pkg install cmus .... [[video-ports]] @@ -381,9 +381,9 @@ This section introduces some of the software available from the FreeBSD Ports Co |=== | Name | License | Package | Toolkit -| MPlayer +| mpv | GPL 2.0 -| package:multimedia/mplayer[] +| package:multimedia/mpv[] | CLI | SMPlayer @@ -404,19 +404,65 @@ This section introduces some of the software available from the FreeBSD Ports Co |=== [[mplayer]] -=== MPlayer +[[mpv]] +=== mpv -MPlayer is a multimedia player and encoder suite which runs on many platforms and works on the command line. -It plays a terrific number of different file formats and codecs including popular DivX, XviD, H.264 streams as well as DVD and SVCDs along with many popular audio codecs. +mpv is a free (as in freedom) media player for the command line. It supports a wide variety of media file formats, audio and video codecs, and subtitle types. mpv can leverage most hardware decoding APIs on all platforms. -To install MPlayer, execute: +Also targeted towards vidoephile, it has several high quality up-/downscaling algorithms which can also be, like all settings, controlled via profiles. Profiles can be selected via command-line switches or based on conditions like the folder name. + +It also supports high quality HDR to SDR conversion with fine-grained control, enabling everyone to enjoy HDR content on any display. + +To install mpv, execute: [source,shell] .... -# pkg install mplayer +# pkg install mpv .... -For examples of how MPlayer works see man:mplayer[1]. +Here is a short sample [filename.]#~/.config/mpv/mpv.conf# + +[.programlisting] +.... +vo=gpu-next<.> +gpu-context=wayland<.> +hwdec=auto<.> +screenshot-jpeg-quality=100 +scale=ewa_lanczos4sharpest<.> +dscale=ewa_lanczos4sharpest + +[TTRPG]<.> +profile-cond=path:find('ttrpg')<.> +profile=fast<.> +save-position-on-quit=yes + +[hdr]<.> +scale=bilinear +dscale=bilinear +dither=no +correct-downscaling=no +linear-downscaling=no +sigmoid-upscaling=no +hdr-compute-peak=yes +hdr-peak-percentile=99.995 +hdr-contrast-recovery=0.30 +.... +<.> Use the new gpu-next video output. A lot of features need this and/or provide higher quality when enabled +<.> Wayland users should manually set this when seeing graphical glitches +<.> Automatically detect if GPU hardware decoding is available and uses it +<.> Best scaling algorithm. Disable if your hardware is not fast enough and videos start to skip frames +<.> Example profile for long videos of recorded TTRPG sessions +<.> Only apply when the path contains ttrpg +<.> Use the builtin fast profile for lowest possible CPU/GPU usage +<.> Example profile for users with a slow iGPU that still want to enjoy HDR content + +Example how a user with a iGPU would be able to watch HDR content with this sample config + +.... +$ mpv --profile=hdr hdr_video.mkv +.... + +For more examples on how mpv can be used, consult the mpv reference manual. [[smplayer]] === SMPlayer From nobody Sun Jun 28 11:13:10 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gp6GG6YJGz6k1y1 for ; Sun, 28 Jun 2026 11:13:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gp6GG5bBjz3rmG for ; Sun, 28 Jun 2026 11:13:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782645190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L9KSVyQcs4RnTxIBiT8uaotERTrOKilY53lbv3hICno=; b=eEZpiGIFZUuYeyF46p6VO2Mj4wGs05QtKFCDFxZnX2AJ7OJ/A/5y/YyqObUbWBpkZI3Dkx ieamJEL/RV2Rnptra16kj8duvyGe44UmJ+CiMUoN9UaoJSi+2qHsrSyRdgQf94eW14tGPv HnbyYP+gTc+vodNH/OQDCFpP2UesFsjTTEK6T2TUv+4EP1HqtBI5BiySBht5IGyLld4tmw P4oyFFT1GzLW8hPkZodEMgZc9+e3EOEJfgqSCsIB/jy+SdoOLtolEAvUAVNFrf6r93FYfw GvSgc4bvshtmoD8ZvwEAx1WhO6GPcuflQAbGw9EZKcZIofhsB2SFjiXRXzksww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782645190; a=rsa-sha256; cv=none; b=O2oXqWd2sE6hK0z3YRomAP8nWSn9caxhHvpal/hrUZ53geRzoarTKrb1rYZNuKAZ5IBPYm Uo21P5pebUDsyOdqWc3ZfME/apY6PtUV55ZlOaMsn1MnNwX5YJ/aHjTofSOEpDki2MBAi9 KyhFMZ166uq+Q5tj2NVAXUWMGLTQZF5G1Y6kdLU5MY5U7RpxjACrAkQKSw+Y+HeLLYa6+1 S9aQpkLNlFhfUARyXChQCuJNFkMhbjy8cm/9T4AI+NeWiCX9xblagVeDLj+bEHsBa34uDk 37pIaZG9oaKokncmYueuKXuBUrnxovnhShJqe3ozmyiZM0lhH0TLoEPyVhNVEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782645190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L9KSVyQcs4RnTxIBiT8uaotERTrOKilY53lbv3hICno=; b=L2zqlQQDgEOE+eYGLE0Aklrq8JfhX06mJH+GrrZdZA6gSx0uBRbT0vvDR4NLGy2+KrsDsD bKLj5HpL1N4cAJ+cwbqTBy9wmgbVU7/5bXiviW2NUDfycJYnW1mBBkzuUP4XuApezOzx5+ 2az5f2oSjvXQeg12CsGIjFFq3aH0PUToaK6Ig71YddeQ3dSPxCI3x2TvByVaekl0EWSSMy Zo0QzT3/i89lUwPmjmgqjDZlc2B8Nju/JEnO6S/AsajHpyNOFfYf9qRW6hi/JKc1U8kwTj lbHSw+JOR2b56Mg+RRek2a4FN/I4/tsVHd7oAuMR6W4XF8mdw9Z9qOxJfI7+fQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gp6GG4Y5Fz16d0 for ; Sun, 28 Jun 2026 11:13:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 398ff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 11:13:10 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Sergio Carlavilla Delgado Subject: git: 8a9521cd1d - main - Shared-authors: Set the new core team members List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: carlavilla X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a9521cd1da3e6ba6de68551847d165ba6042a3a Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 11:13:10 +0000 Message-Id: <6a4101c6.398ff.1cdae9e@gitrepo.freebsd.org> The branch main has been updated by carlavilla: URL: https://cgit.FreeBSD.org/doc/commit/?id=8a9521cd1da3e6ba6de68551847d165ba6042a3a commit 8a9521cd1da3e6ba6de68551847d165ba6042a3a Author: Sergio Carlavilla Delgado AuthorDate: 2026-06-28 11:12:26 +0000 Commit: Sergio Carlavilla Delgado CommitDate: 2026-06-28 11:12:26 +0000 Shared-authors: Set the new core team members --- shared/authors.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/authors.adoc b/shared/authors.adoc index 5e9faba48a..33d5e7718f 100644 --- a/shared/authors.adoc +++ b/shared/authors.adoc @@ -3833,7 +3833,7 @@ :bugmeister: {eadler}, {gavin}, {mva}, {koobs}, {gonzo} // FreeBSD Core Team -:core-members: {allanjude}, {dch}, {glebius}, {hrs}, {lwhsu}, {mat}, {olivier}, {tcberner} +:core-members: {adamw}, {adrian}, {bapt}, {glebius}, {hrs}, {imp}, {jrm}, {kevans}, {olivier} :core-secretary-email: core-secretary@FreeBSD.org // FreeBSD Doc Engineering Team From nobody Sun Jun 28 11:32:23 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gp6hS0wVQz6k33Z for ; Sun, 28 Jun 2026 11:32:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gp6hR6m3jz3t5x for ; Sun, 28 Jun 2026 11:32:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782646344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aCYJvHZptyvWlt+fq0LMJeieIKK3YtHtZkzKvYzR6Nc=; b=EFzoyZ4Kau+6+3NnJCaQCJkzYVgpkgtX2cnU3trC2u6/R9tqRgUxD2tL3w+TmbXLdEtGTP 6Dl0FGn96AqERxVHMCVljP2TNrwsMYLONWaBtVPuhFRpuxN/OW9kU4SmmWGj29o8bmfTpA o30VhHDh98khiuE9xz5xZwQzQXP1a06qMG0cObEuhSb3XluxetPPu/2LNSGyoPR+bL2/Zm XNh7lDEfA+/+PKl8xbXdjEv++RAW9wn42OPVbVDGpibhKwwn3+hHzHUs1VFxr006Ty0J86 o064oLNI3sQBzZiJvEmFOxBH7/RrjxkxkQY+mvkM/1877mYrvFvfnF5ftcQ91Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782646344; a=rsa-sha256; cv=none; b=DDVTU0zTqHVLmTURBXQjmXF2aHOX7iuU7/B+hD/+CgZRM8mckfbjXq1h8NW2WtHf4t+GBL 328xNgYDlnJ/WyrgFg86zOr8xcvF+XedAEi54gvFY0Qv3bycgzOAK0nufakB3q2ecQ03jw 2UoJ6TPxmSVq/hPQ9wYsbfBQjsCgGBDiYMwAkJ1EEl2FrzWBztmq/ztjGfSa9qpKrmIA+F ryZe8tgwyXKMUa2monVHXBcr4oxCMJHIP38bkc0nRRAq4YrWEUSOw/lSroRC2noYDOQxOz a30Qdiqel8rT31LkyEQZs313E6XFZbuKb9dTVXVSLCoyrpKUm+qk66pCuzZRHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782646344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aCYJvHZptyvWlt+fq0LMJeieIKK3YtHtZkzKvYzR6Nc=; b=jbGa6AnWWj5kFpNCh++pHcfvs8XZfpH7lFMx5woJI+yzyW85Uz9IxIC9XNeWh/wyjoYfnQ B07X7nJwRxzbZk47k/o3UWJ6Nej1vji9nPxIGLPDpPmcuLYDBk/SXXworYPn1a/pcKXBJE 23qq0CZIgoROT0m0lorrF/fUbdvJzq+vdVcrq4plMpZYBpZ1sC/gnMKhR65JIp2zYWVfH/ xhO/+ZSNUCklaFtfwTWNJXj/+og+hmqq0Hafy646mycjxEA1HpBoUIWlv6xOoHQ3G6Joka 4edVF+bbb6Pr1tGS2Z1TuvS6R53fjf4S4f6N2F2JVi+mTXjvce7SesiVT1RAyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gp6hR5WLfz17Bq for ; Sun, 28 Jun 2026 11:32:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cbda by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 11:32:23 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org Cc: Marcel Weissenbach From: Sergio Carlavilla Delgado Subject: git: f2bb76a105 - main - FDP-Overview: Update Debian installation instructions List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: carlavilla X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f2bb76a1054e2e1948ceab9ab7a022fa079fdedd Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 11:32:23 +0000 Message-Id: <6a410647.3cbda.2577ea44@gitrepo.freebsd.org> The branch main has been updated by carlavilla: URL: https://cgit.FreeBSD.org/doc/commit/?id=f2bb76a1054e2e1948ceab9ab7a022fa079fdedd commit f2bb76a1054e2e1948ceab9ab7a022fa079fdedd Author: Marcel Weissenbach AuthorDate: 2026-06-28 11:31:02 +0000 Commit: Sergio Carlavilla Delgado CommitDate: 2026-06-28 11:31:02 +0000 FDP-Overview: Update Debian installation instructions --- documentation/content/en/books/fdp-primer/overview/_index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/content/en/books/fdp-primer/overview/_index.adoc b/documentation/content/en/books/fdp-primer/overview/_index.adoc index 5ea84496dc..54534e991c 100644 --- a/documentation/content/en/books/fdp-primer/overview/_index.adoc +++ b/documentation/content/en/books/fdp-primer/overview/_index.adoc @@ -198,7 +198,7 @@ Consult your distribution's package manager if in doubt. + [source,shell] .... -# apt install hugo ruby-asciidoctor ruby-asciidoctor-pdf ruby-rouge git bmake +# apt install asciidoctor hugo ruby-asciidoctor-pdf ruby-rouge git bmake .... + . Install a local working copy of the documentation from the FreeBSD repository in [.filename]#~/doc# (see crossref:working-copy[working-copy,The Working Copy]). From nobody Sun Jun 28 15:58:50 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gpDbz4ghWz6jTMP for ; Sun, 28 Jun 2026 15:58:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpDbz3rcjz49ts for ; Sun, 28 Jun 2026 15:58:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782662335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=037XlCC5OKwwO11XHS3X/D/yDy1U2HG6ZzNAvTUAt3w=; b=Y+ds1BlIj8FF6vVmb87+F+7yfD7D//psjDTtfDaJgBUH8EIdYLRFrAbBr2c0hv4z/qeBzQ w7updfY1x8OjP8ST1nHxKP4Ih2ZhUQrsA6lzFDCdPkxgFL+JjRWnZgT0dKmcHZNmxwnt6b q6vIoIe5LrxKRgCb12R0TGXGdN/CZPYZ7NvNVJ0xtsw1+XhqgRi68j7PKEL1FwEQ1ZKLU/ s6gbOHj2Fj8URFgEHdznYdwt4ACjwJafTxVQoSA7QtI8XhXuwuNlipnFkLGJChkxNNkEfM S1sJQY8VL01hKgfDRyxC9FUUjMnf3ZYZm3QkSi1w/XzwHShmJtrQGGW0cgY+Ug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782662335; a=rsa-sha256; cv=none; b=AOk7lvQSnOWudOyDTqfd5jtXYynmDgV1fviC0fZtvSQjQZ9L34HBtNIf8Bg0/tLYgAMmOd wlwe4ZmulWEupzugWXrCN7GFXxCl8ODYDSys1+9y9NQTOZXzc8ENRBBqocvneWcDcW5wIc USBh9/GIjf6jZIgzGGuerUEzMyfzg7ZSYDx/j4JI1YOKACvWqJdz0sBDS9eXgsohYxcZ+H glgP9WE6G6MkLe4evNuSlJMeO/DotIeWXJS7UFWdG0HoeMEbykyOwDruaqTQKZJjFQ+3ZZ 8xCX55Y4TF2IC23MyK0Xp7rN2H9aTafgr9MLV2u29QYxbTzV0oIJXwdoHYT+CQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782662335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=037XlCC5OKwwO11XHS3X/D/yDy1U2HG6ZzNAvTUAt3w=; b=IG/PAV7+ksGl+kUN/POkmC+LAzJdunJRatO/Hve4LRVlHYRE0mDoSIIE9lB9rfcX6iAEXl yGC3y+JcBUdoqqtC0XVRccWBtyhTMR4M29C3Ux+3Qr1ZkHoGKnBHUpj46cI2/jktd/Ty92 1XT/6bkxG/ktizATI1Kq04U5aC34qdxxFLTqc7DU2D3FgkA4NX6if/uNIX48XjNFMOTIIX 26YTJ3lNYvvny3Fl9fSp5VqJ2/zY2DEqsyNgUCuQslt2wt2Vn5PMr5y3vfcfVAgQAUjNms gHeydQmoY5skMiB774LyzmFSX3nz8QYluN/WG9vg+No8f6T4l+y0ilvZWrx/yQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpDbz2ML9z2FF for ; Sun, 28 Jun 2026 15:58:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3230f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 15:58:50 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org Cc: Marcel Weissenbach From: Sergio Carlavilla Delgado Subject: git: faed907f34 - main - Handbook-multimedia: Adding resampling audio List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: carlavilla X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: faed907f34b215b8459d25dd32385226750441ad Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 15:58:50 +0000 Message-Id: <6a4144ba.3230f.710ff5d@gitrepo.freebsd.org> The branch main has been updated by carlavilla: URL: https://cgit.FreeBSD.org/doc/commit/?id=faed907f34b215b8459d25dd32385226750441ad commit faed907f34b215b8459d25dd32385226750441ad Author: Marcel Weissenbach AuthorDate: 2026-06-28 15:57:37 +0000 Commit: Sergio Carlavilla Delgado CommitDate: 2026-06-28 15:57:37 +0000 Handbook-multimedia: Adding resampling audio --- .../en/books/handbook/multimedia/_index.adoc | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/documentation/content/en/books/handbook/multimedia/_index.adoc b/documentation/content/en/books/handbook/multimedia/_index.adoc index f1a56c3f13..fb6f696f35 100644 --- a/documentation/content/en/books/handbook/multimedia/_index.adoc +++ b/documentation/content/en/books/handbook/multimedia/_index.adoc @@ -237,6 +237,37 @@ Keep in mind that these values are for the example indicated above. They may vary depending on the system. ==== +[[resampling-quality]] +=== Resampling Quality + +The process of changing the sample rate of an audio stream is called resampling. + +This usually happens automatically in situations like recording audio with an DI or simply when playing back audio files with very low resolution. + +Example: DI (Digital Interface) uses 192000 kHz, application only accepts 48000 kHz (or the other way around). + +If possible, this should be adjusted outside the sound device driver, but for cases where this is not possible (Or the hardware is bad at resampling), you have influence over the quality that is used for resampling. + +Should you be unsure if you need this, for normal music listening, doing meetings and so on the default value is totally fine and most applications use 48000 kHz anyway, so resampling rarely happens. + +When making music, recording sounds otherwise where quality matters or you are an audiophile, you can increase the resampling quality. + +For the highest possible resample quality, execute the following command: + +[source,shell] +.... +# sysctl hw.snd.feeder_rate_quality=4<.> +# sysctl hw.snd.feeder_rate_round=0<.> +.... +<.> 100dB stopband, 164 taps and 97% bandwidth +<.> Large prime divisions for high accuracy + +To keep these values after reboots, they can be added to the `/etc/sysctl.conf`. + +It is important to keep in mind that adjusting the resample quality has influence on CPU usage and delay. + +More details about resampling can be read in man:sound[4] + [[troubleshooting-sound]] === Troubleshooting Sound From nobody Sun Jun 28 18:07:28 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gpHSK3t8sz6jh1D for ; Sun, 28 Jun 2026 18:07:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpHSK05kwz3VJZ for ; Sun, 28 Jun 2026 18:07:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782670049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zRsXlkgGVXPUWIrwpwh2jDrZuHjoJKKa3w2g/5ANVr0=; b=m7dSfFJ06z3ZdfBnI2qa6vzmBzYSL1AnDn6y5gCg6FScxAdc03GdAk3V8zx4ZuWt1L2wVS hHxsCy/BE0GhoTZ7un+RdbSqBlRIyZMwp01sH0Tn8JGJeqjYAKNXIFHTTRw310VtkuGDsA 88eDBc38eITE+r4YdXTFFkiHapkt6M9Ih3GhUoetGwzYu13hK5rftQYa+cNthFuim6X1YY MuPoOEUe0W6aPD9r5pPU7i/HqBG0aEdv1S8FMOXcB9CrUAly7VEfWvMk1/uT17DxG1/s96 yyAJxzESj8ugPi/nNRGEhJyoop4PvREn1ZFCgL7aE6NdIM6bFXLLBiKZZGB3ZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782670049; a=rsa-sha256; cv=none; b=hPdqZh00TujjviQrfLqr+W4Gyx1ZmnOk4jj5HKXe0C/pExF89Tx0RhEqyqRclXekm1tgRj JAUGIfst3Zc5eq3M8E2bhP8aklqgUOHTpQZeYinmpjW0+lLFC1tp8nnFgjenRIkPg0wFvg Hl3wzHOSsS8GdWRTPDk0Ci1XAcHkhXoPFDvLSU/qJGiBLWLAblimw53UnrZRV9BPop8b7w MSRm+G5i8etBENRt/HpARMFArJsQcz/ptC9+l+dYaV0kMjhnwpW7Zc4ABUVZOITn0R2B9Z MGGtpHeyAdTbs5/rVAyiI5bRjbDmzP6aFrQWZSTvrb+459fMvdVUD0ICMZ9t/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782670049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zRsXlkgGVXPUWIrwpwh2jDrZuHjoJKKa3w2g/5ANVr0=; b=ejWIvgW8u3jRKX5HKcbx1gIPKUJ4LPo6jaq/4dE+PKUhlSF59xWytGv7h8JWVqGVZfb99z aFA4hOor4Yk2AmPvOSu2haZWskn6P0ncu656slk3wj/rjlBMe7MP21L3lC0jW8lse2bvXf XBEOf7NINeHWA3DusiAPlWb91+Fgvjj5O3Dj7kaNFEoEKLh3ixSWU6cnYdgZRgVY3Jf6dH WrPgCKM8L4+A9nujforrVyPlVqoJ8E/HckVfyNuXHIbOm+bc9MX7Poj5r2JsTXFxL7gTmt Yx6XisBoOUxBqDrncpKdefuKP7as8gk/6GUn9HAiXmBLIZJ7IwVmLm/FL4H18w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpHSJ5dh5z5dQ for ; Sun, 28 Jun 2026 18:07:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3efbb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:07:28 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Benedict Reuschling Subject: git: 3d133dfd29 - main - handbook/multimedia: Move explanation of abbreviation to first time it appears List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bcr X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d133dfd294d719e808e99562f091e16ecf529f8 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:07:28 +0000 Message-Id: <6a4162e0.3efbb.614c0f79@gitrepo.freebsd.org> The branch main has been updated by bcr: URL: https://cgit.FreeBSD.org/doc/commit/?id=3d133dfd294d719e808e99562f091e16ecf529f8 commit 3d133dfd294d719e808e99562f091e16ecf529f8 Author: Benedict Reuschling AuthorDate: 2026-06-28 18:05:55 +0000 Commit: Benedict Reuschling CommitDate: 2026-06-28 18:05:55 +0000 handbook/multimedia: Move explanation of abbreviation to first time it appears The abbreviation of DI is used before before it is explained later. Move the later to the first use instead. While here, fix some whitespace after the sentence stop. Event: Halifax Hackathon 202606 Location: Lounge --- documentation/content/en/books/handbook/multimedia/_index.adoc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/documentation/content/en/books/handbook/multimedia/_index.adoc b/documentation/content/en/books/handbook/multimedia/_index.adoc index fb6f696f35..f2fc5b3697 100644 --- a/documentation/content/en/books/handbook/multimedia/_index.adoc +++ b/documentation/content/en/books/handbook/multimedia/_index.adoc @@ -227,7 +227,7 @@ Add the following lines to [.filename]#/boot/device.hints#: [.programlisting] .... -hint.hdac.0.cad0.nid22.config="as=1 seq=15 device=Headphones" +hint.hdac.0.cad0.nid22.config="as=1 seq=15 device=Headphones" hint.hdac.0.cad0.nid26.config="as=2 seq=0 device=speakers" .... @@ -242,9 +242,9 @@ They may vary depending on the system. The process of changing the sample rate of an audio stream is called resampling. -This usually happens automatically in situations like recording audio with an DI or simply when playing back audio files with very low resolution. +This usually happens automatically in situations like recording audio with a DI (Digital Interface) or simply when playing back audio files with very low resolution. -Example: DI (Digital Interface) uses 192000 kHz, application only accepts 48000 kHz (or the other way around). +Example: DI uses 192000 kHz, application only accepts 48000 kHz (or the other way around). If possible, this should be adjusted outside the sound device driver, but for cases where this is not possible (Or the hardware is bad at resampling), you have influence over the quality that is used for resampling. @@ -427,7 +427,7 @@ This section introduces some of the software available from the FreeBSD Ports Co | package:multimedia/vlc[] | Qt -| Kodi (XBMC) +| Kodi (XBMC) | GPL 2.0 | package:multimedia/kodi[] | X11 @@ -736,7 +736,7 @@ iProduct = 0x0002 bNumConfigurations = 0x0001 .... -Once the `idVendor` and the `idProduct` have been obtained, it is necessary to check in the link:http://www.sane-project.org/lists/sane-mfgs-cvs.html[list of supported devices of SANE] if the scanner is supported by filtering by the idProduct. +Once the `idVendor` and the `idProduct` have been obtained, it is necessary to check in the link:http://www.sane-project.org/lists/sane-mfgs-cvs.html[list of supported devices of SANE] if the scanner is supported by filtering by the idProduct. [[_sane_configuration]] === SANE Configuration From nobody Sun Jun 28 18:15:26 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gpHdc0nBpz6jhB2 for ; Sun, 28 Jun 2026 18:15:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpHdc0GD5z3Vt4 for ; Sun, 28 Jun 2026 18:15:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782670532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xHDFQKC/fOWI5nnBytEarHIwabD6DQBrKMwWHGT/iHo=; b=hUq7wUjpKwYYJDE98+tVC3bue4PWyqjIBSJtcYG0JkO1FOG8B3Ol7alTNE98dIbWs/eeYH IwsL5D6qses1tWvl4eSOIxH5ejPfHLli+/JpnfeWZEpnW6Ey7Z201gRGAxsIvFKxAyqTOS tw9L52umAa7rSEkd2ZjLAay1tz1CUqNJLXorQwRRpmnFRNU2Xq4LDW2CkXbajJnuj8re+4 dHbP9FOqvsJaLStMSrXli3aofy60FqRpnuvgk4KqBURvBUK3rnUrzixByjoHqPOy4j5SUT +m9E1f0haODgDdWmwTUC2RT7RzpJ1w9eVHoy+Y7CiNy/wmdUyb2GwSjXYcNH4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782670532; a=rsa-sha256; cv=none; b=B2tanvKLka/6TdPqJk73yez3GoaJphrjW0DMKsGMtg6fTfm5CGEdWzP1w59Ci/UcrAvce2 TGoUNTqMuiK928Npmab3uwxQrjNvZ2EzPznx1lAu02JbkODey46D48gCGTKiny1gUJjbfR h52Hdg4tYitTT5ZQ23klRs565qWfVWUH/tTy0N+64TRijc7oZH69NrWqDnaZ9sLOtG2Trs /rkxfg7jkKJHrNmHfM3mlW1qLb+MSFN2Pi1/AyOZQe+KCFqfjHBkoURESLV515sPUSU5EB la7qSjYMWyGB92bFnGRzIjeV++gYVBsxJTEuSjbpjxJCcQvB7nhSopymCps/Ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782670532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xHDFQKC/fOWI5nnBytEarHIwabD6DQBrKMwWHGT/iHo=; b=f98MMbVmkaz+7Z3vIuTGtYIFsxZ+vh/3tEHjybZd9WfCr3smV1BTcx76kTYCa/YWVG9Qhe o0owpwsJrqE0BczVFzLURbmxa2kEnWamisTq76klTRMZlyKjabw5TOUBvg9+vEOJTF9nu0 8MDPkqLvRW78fFRN+wmoAw4iLV3flQlWFt1DtfzvYZsLvJEqcqwBz7ywWy71wSzHCZ/AIF GmCPGPk5V+bdF29/jOMlWK81p/q/EwyjYTfcizxyfgPmdCzg8igL17gjpGQW91Ha0DW6TQ PY4AU0weY9E1Vf4LZLZz9ktjaVV0dAZevo0PTJxS1gQ8l41iLxVJ82J3r9HiAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpHdb6MYxz6h0 for ; Sun, 28 Jun 2026 18:15:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18997 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:15:26 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Benedict Reuschling Subject: git: 15ebfdab22 - main - fdp-primer: Remove duplicate sentence from FreeBSD Quickstart instructions List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bcr X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 15ebfdab226e0275172b4e9f3309c86a102d2e2e Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:15:26 +0000 Message-Id: <6a4164be.18997.28cadb07@gitrepo.freebsd.org> The branch main has been updated by bcr: URL: https://cgit.FreeBSD.org/doc/commit/?id=15ebfdab226e0275172b4e9f3309c86a102d2e2e commit 15ebfdab226e0275172b4e9f3309c86a102d2e2e Author: Benedict Reuschling AuthorDate: 2026-06-28 18:13:34 +0000 Commit: Benedict Reuschling CommitDate: 2026-06-28 18:13:34 +0000 fdp-primer: Remove duplicate sentence from FreeBSD Quickstart instructions The sentence was extended in a previous commit, but this fragment remained and only appeared in this section. --- documentation/content/en/books/fdp-primer/overview/_index.adoc | 3 --- 1 file changed, 3 deletions(-) diff --git a/documentation/content/en/books/fdp-primer/overview/_index.adoc b/documentation/content/en/books/fdp-primer/overview/_index.adoc index 54534e991c..5576184c49 100644 --- a/documentation/content/en/books/fdp-primer/overview/_index.adoc +++ b/documentation/content/en/books/fdp-primer/overview/_index.adoc @@ -168,9 +168,6 @@ The `-U999999` parameter adds as much context to the patch as possible which mak A patch file is generated as a result of `git format-patch` in the local directory which will include author identity and email addresses, making it easier for developers to apply (with `git am`) and give proper credit. + -Patch generated with `git format-patch` will include author identity and email addresses, -making it easier for developers to apply (with `git am`) and give proper credit. -+ [IMPORTANT] ====== To make it easier for committers to apply the patch on their working copy of the documentation tree, From nobody Sun Jun 28 20:43:42 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gpLwZ4NjDz6jvZB for ; Sun, 28 Jun 2026 20:43:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpLwZ3b6hz41x9 for ; Sun, 28 Jun 2026 20:43:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782679422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FU3z69lnIHHO4bN85AEOeQWFsSr3L5EKeuylyP46yxM=; b=fs9kGfCLiwTwSObY2sjkRUPlIn+X1jCaJLMmCbvND/scSE6qj8RiNcNZ8/eANVQf0ZOFiV PjRT5ojO5vdgz3Z58fgw0YFFovT0m7iNaPmyGCZ574012sVMtczMOvdKrgn4g51+/t7d5i s02vhSgNPeinWC2dGJeNu5y0qShN10FVw1u1a8EEIVdy+p+3p7VDuCFL3GSnovkqmIoveX wHz6DbfTMWzOYgF+2V5y6LKgYHX3OUUvnk3tEkO2XFrTtjjrVSmsVZCKyoPLqMu7xp7lBc Hn7LUA9H3fZkJ6P4w3Ix1xc40NrqBhAB+7kcK5tCTwG590bD+nRzyOpM31YyXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782679422; a=rsa-sha256; cv=none; b=nRXBA8hecNeD+0PlIXAtqhv75f931MDByeJ5w2hJQsI1jKLioNBs0vTb5kroB5eqYmHWo5 0L5YwOYc4TWlDu+7i1v7cTxZga0EoHeSirFRoJZHSvKQa7LVjM4GmkzQ2l2tc8SdoL6veP spCQtPffCzTPx/3HLkGORqrwlzNtD1NThhzrNDvQnfqDQZiveeJTT26yj3phtDxAx/TwpA oNApeysegIgWo+ceyq7of0hgc2Z+yMlZFdJTCdQP1EO+27m+zECTU4sCW9Bt/h5Qh4iIih 4/KZmkL7kj5mfUlNQhR++N6E2rYFLMKJ6xFTyFPgiGdDLgacyZsd97UnujhSlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782679422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FU3z69lnIHHO4bN85AEOeQWFsSr3L5EKeuylyP46yxM=; b=q1/C1vK/dsUUpJ6gKBEneoCDLO1SHBrrufHr/j3/VUxDm3SkE0egV5czOVwdd18TMVBhbv UyddzRNYBB+5U2ty4F8zonveQB5BNxJuuQO/ppPS0HD3uAMl0IWUoI83Erv+sJrUgOQV0T y0avt45H66af/vqehs8lPYmMhTqZ3zie8+1wPmlxqgHlN2noIPhgym7G04ghZBCHZmGATS 9K0nZeU642WNQD/7ST/S8IxGRdUiiK0Wx0/jYQ1gGxNblb0dnoxROqBSqg+ml8byU1lNMq vPhwC1Cn9NP/aT9BccNe6SNoKCbSmtgnc+JqU5f9msF0lA8LtFzHKw9S7DzDSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpLwZ2W64zBSx for ; Sun, 28 Jun 2026 20:43:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27dba by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 20:43:42 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Andrey Zakhvatov Subject: git: 99aa6e6f81 - main - website/ru: Update usergroups/_index.adoc List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andy X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 99aa6e6f815d934ad08649782486cf8ca42d7af2 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 20:43:42 +0000 Message-Id: <6a41877e.27dba.573ae51d@gitrepo.freebsd.org> The branch main has been updated by andy: URL: https://cgit.FreeBSD.org/doc/commit/?id=99aa6e6f815d934ad08649782486cf8ca42d7af2 commit 99aa6e6f815d934ad08649782486cf8ca42d7af2 Author: Andrey Zakhvatov AuthorDate: 2026-06-28 20:42:07 +0000 Commit: Andrey Zakhvatov CommitDate: 2026-06-28 20:42:07 +0000 website/ru: Update usergroups/_index.adoc Update to EN 112de27dfbb1a260d0e1f8059cb8f47e2237f65d --- website/content/ru/usergroups/_index.adoc | 74 ++++++++++++------------------- 1 file changed, 29 insertions(+), 45 deletions(-) diff --git a/website/content/ru/usergroups/_index.adoc b/website/content/ru/usergroups/_index.adoc index 4bc8f98672..ab8b6c9f89 100644 --- a/website/content/ru/usergroups/_index.adoc +++ b/website/content/ru/usergroups/_index.adoc @@ -1,17 +1,11 @@ --- -title: "User Groups" +title: "Пользовательские сообщества" sidenav: community --- -// -// The FreeBSD Russian Documentation Project -// -// Original EN revision (24.09.2025): ed9fed7680ffb50fd5735cd6fe6a1454551c19e1 -// - -= Группы пользователей += Сообщества пользователей -Широкая популярность FreeBSD породила ряд групп пользователей по всему миру. +Широкая популярность FreeBSD привела к появлению множества пользовательских сообществ по всему миру. Если вы знаете о группе пользователей FreeBSD, не указанной здесь, пожалуйста, заполните link:../support/bugreports[отчет о проблеме] в категории Documentation->Website со следующей информацией: @@ -20,14 +14,14 @@ sidenav: community . Краткое (один абзац) описание группы пользователей. В духе FreeBSD мы отдаем предпочтение активным группам пользователей, которые ведут свою деятельность открыто. -Если локальной группы нет, для поиска заинтересованных лиц поблизости можно использовать http://bsd.meetup.com/. +Если местного сообщества нет, то для поиска заинтересованных лиц поблизости можно использовать https://meetup.com/. -Подумайте о создании собственной группы пользователей! +Подумайте о формировании собственного пользовательского сообщества! == Регионы -Группы пользователей FreeBSD можно найти по всему миру, они объединяют энтузиастов и профессионалов, разделяющих страсть к этой универсальной операционной системе. -Присоединяйтесь к группе пользователей FreeBSD в вашем регионе и станьте частью этого vibrant сообщества, устанавливайте связи и учитесь у единомышленников-энтузиастов FreeBSD рядом с вами. +Пользовательские сообщества FreeBSD можно найти по всему миру, они объединяют энтузиастов и профессионалов, разделяющих страсть к этой универсальной операционной системе. +Присоединяйтесь к сообществу пользователей FreeBSD в вашем регионе и станьте частью этого живого сообщества, устанавливайте связи и учитесь у единомышленников-энтузиастов FreeBSD рядом с вами. [[europe]] === Европа @@ -60,9 +54,9 @@ link:http://www.augusta.de/[Augusta]:: У нас представлены все виды BSD, но в основном FreeBSD и Mac OS X. Расположена в Германии, Аугсбург. link:http://www.bsdhh.org/bsdhh-de-index.html[BSD User Group Hamburg (BSDHH)]:: -Группа пользователей BSD Гамбурга (BSDHH) встречается в первую среду месяца в 19:00 в ресторане _Léon_ (Koppel 1, 20099 Hamburg). -Большинство участников — пользователи FreeBSD, хотя пользователи всех вариантов BSD приветствуются. -Расположена в Германии, Гамбург. +Сообщество пользователей BSD Гамбурга (BSDHH) link:https://www.bsdhh.org/bsdhh-de-treffen.html[проводит встречи в первую среду каждого месяца в 19:00] в ресторане Shanghai House (по адресу Borsteler Chaussee 110, 22453 Hamburg). +Большинство участников являются пользователями FreeBSD, но мы рады пользователям всех вариантов BSD. +Находится в Германии, Гамбург. link:https://bsd.nrw/[BSD User Group Düsseldorf/NRW (BSD.NRW)]:: BSD.NRW находится в Дюссельдорфе, Северный Рейн-Вестфалия, Германия. @@ -85,16 +79,11 @@ link:http://berklix.org/bim/[Berkeley in Munich (BIM)]:: Berkeley in Munich (BIM) обслуживает пользователей систем на базе BSD в Верхней Баварии. Расположена в Германии, Мюнхен. -link:http://www.u-bus.de[Ulmer BSD User Stammtisch]:: -U-BUS встречается каждый последний четверг месяца. -Для получения дополнительной информации о встречах и связанных вопросах, пожалуйста, проверьте веб-страницу (link:http://www.u-bus.de[u-bus]). -Расположена в Германии, Ульм. - link:http://www.bluefrogs.de/[Bluefrogs e.V.]:: -Группа пользователей Unix и Linux в Бергиш-Гладбахе (близ Кёльна), Германия. +Сообщество пользователей Unix и Linux в Бергиш-Гладбахе (близ Кёльна), Германия. Встречи проводятся два раза в месяц. Мы работаем со всеми производными Open Source Unix: FreeBSD, NetBSD, OpenBSD, Linux и другими. -Мы проводим workshops, лекции, доклады и установочные вечеринки. +Мы читаем лекции, проводим рабочие семинары и встречи по установке системы, а также просто разговариваем. Для получения дополнительной информации напишите нам по адресу: link:mailto:info@bluefrogs.de[info@bluefrogs.de]. link:http://bse.42.org/[BSE München]:: @@ -171,16 +160,6 @@ link:https://lists.stacken.kth.se/mailman/listinfo/bus[BSD Users Sweden (BUS)]:: Чтобы присоединиться, отправьте электронное письмо на link:mailto:majordomo@stacken.kth.se[majordomo@stacken.kth.se] с текстом `subscribe bus` в теле письма. Расположена в Швеции. -link:http://www.bsdgroups.org.uk/manchester[Manchester BSD Users Group]:: -Манчестерская группа пользователей BSD встречается достаточно часто в пабе Lass O'Gowrie на Чарльз-стрит, Манчестер. -Свяжитесь с link:mailto:sams@bsdgroups.org.uk[Сэмом Смитом] для получения дополнительной информации. -Расположена в Великобритании, Манчестер. - -link:http://mailman.uk.freebsd.org/mailman/listinfo/ukfreebsd[FreeBSD UK Users group (FreeBSD UKUG)]:: -Группа пользователей FreeBSD Великобритании (FreeBSD UKUG) существует для пользы пользователей FreeBSD в Соединенном Королевстве. -Пожалуйста, перейдите по ссылке для получения дополнительной информации. -Расположена в Великобритании. - link:https://twitter.com/bsdbelfast[The BSD in Belfast Group]:: Встречайтесь с группой BSD Белфаста в третью пятницу месяца. Мы — группа академических и промышленных пользователей и поклонников BSD. @@ -193,6 +172,9 @@ link:https://freebsd.web.tr/[FreeBSD Türkiye]:: link:https://ossmalta.eu/[Open Source Society Malta]:: Общество открытого исходного кода Мальты — это локальное сообщество для инициативы открытого исходного кода на Мальте, поддерживающее энтузиастов и профессионалов открытого исходного кода. +link:https://unix-freunde.mro.name/[UNIX-Freunde Süd-Ost-Oberbayern]:: +Ежемесячная встреча (вместо чтения документации) в пабе между Розенхаймом и Зальцбургом. + [[north-america]] === Северная Америка @@ -255,20 +237,17 @@ link:http://www.wplug.org[Western Pennsylvania Linux Users Group (WPLUG)]:: Смотрите нашу домашнюю страницу (link:http://www.wplug.org[http://www.wplug.org]) для получения информации о регулярных встречах и присоединяйтесь к спискам рассылки. Расположена в Пенсильвании. -link:mailto:pdx-freebsd@toybox.placo.com[Portland (Oregon) FreeBSD Users Group]:: -Группа пользователей FreeBSD Портленда (Орегон) встречается в третий четверг каждого месяца. -Пишите на link:mailto:pdx-freebsd@toybox.placo.com[адрес группы пользователей FreeBSD Портленда]. -Расположена в Портленде, Орегон. +link:https://bsd.pizza[Portland (Oregon) FreeBSD Users Group]:: +Сообщество пользователей FreeBSD Портленда (Орегон) встречается в третий четверг каждого месяца. +Если вы находитесь в этом месте и хотите присоединиться, поищите link:https://calagator.org/events/search?query=%22bsd+pizza+night%22["BSD Pizza Night" на сайте Calagator], посвящённом технологическим событиям Портленда. +Посетите link:https://bsd.pizza[https://bsd.pizza] для получения контактной информации. +Находится в Портленде, штат Орегон. link:http://www.rlug.org[Reno Linux Users Group (RLUG)]:: Группа пользователей Linux Рено (RLUG) собирается ежемесячно в Рено, Невада, и обсуждает использование BSD и Linux. Посетите link:http://www.rlug.org[наш веб-сайт] для получения дополнительной информации, где вы также можете присоединиться к нашему списку рассылки. Расположена в Рено, Невада. -link:http://www.seabug.org[Seattle BSD Users Group (SeaBUG)]:: -Группа пользователей BSD Сиэтла (SeaBUG) встречается время от времени. Посетите наш веб-сайт для получения более подробной информации и сведений о том, как присоединиться к нашему списку рассылки. -Расположена в Сиэтле, Вашингтон. - link:https://sdbug.org/[San Diego BSD Users Group (SDBUG)]:: Группа пользователей BSD Сан-Диего (SDBUG) встречается в первый четверг каждого месяца, обычно в пивоварне AleSmith на Мирамар-Роуд. Сверяйтесь с link:https://sdbug.org/[веб-сайтом] и списками рассылки для уточнения деталей. @@ -320,6 +299,9 @@ link:https://www.fug.com.br/[The Brazilian FreeBSD User Group (FUG-BR)]:: В настоящее время в группе более 800 участников, и наш список рассылки имеет среднюю нагрузку 80 сообщений в день. Чтобы присоединиться к списку рассылки FUG-BR, посетите https://www.fug.com.br/mailman/listinfo/www +link:https://bsdsul.com.br[BsdSul - Grupo de Usuários de FreeBSD do Sul do Brasil]:: +Сообщество BSDSul, созданное в 2006 году и возобновившее свою работу в 2025 году после паузы в несколько лет, вернулось к активному участию в мероприятиях, проводимых, в частности, в южных районах Бразилии, помогая пользователям открывать мир FreeBSD. + [[asia]] === Азия @@ -334,10 +316,6 @@ link:https://www.ebug.jp/[The Echigo BSD Users Group (EBUG)]:: Группа пользователей BSD Этиго (EBUG) — это группа пользователей для пользователей BSD в районе Этиго (также известном как Ниигата). Для получения дополнительной информации о наших мероприятиях и списках рассылки, пожалуйста, проверьте веб-сайт EBUG. -link:mailto:22961476@students.ukdw.ac.id[The Jogja FreeBSD Users Group]:: -Группа пользователей FreeBSD Джокьякарты базируется в городе Джокьякарта, Индонезия. -Отправьте электронное письмо на 22961476@students.ukdw.ac.id для получения дополнительной информации. - link:http://www.meetbsd.ir[meetBSD Iran]:: meetbsd.ir — это иранская группа пользователей BSD, которая предоставляет конференции, iso, электронные книги и PKG для местных пользователей BSD. @@ -388,3 +366,9 @@ link:https://metabug.org/[The Global BSD User Groups]:: Организация глобальных групп пользователей BSD была основана для помощи в продвижении местных групп пользователей BSD путем обмена идеями и опытом с другими организациями BUG. Наши цели: Мы работаем над способами обеспечения удаленного участия через потоковое видео презентаций. Вы можете проверить наш link:https://metabug.org/[веб-сайт] или связаться с нами через link:mailto:info@metabug[электронную почту]. + +// +// The FreeBSD Russian Documentation Project +// +// Original EN revision (22.05.2026): 112de27dfbb1a260d0e1f8059cb8f47e2237f65d +// From nobody Sun Jun 28 21:25:03 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gpMrP191hz6jyjD for ; Sun, 28 Jun 2026 21:25:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpMrP0Psgz48RT for ; Sun, 28 Jun 2026 21:25:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782681909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MMwc1uK9drufOhv8w/iir3HfFCL9/QCfpUQqI4b5zHs=; b=SMyt5ugBEH6n38G7dc966PxL4Rv0Pvhv3popcXH43wGDy6cYdeH4qxssHOdH/qSopKhy4U 0EsdEw/y9+XqqeKyfJ03AdYxGRmpYFlfO3K4nGdp9B91FVeJkeRIJTCLmWDAZ4tA7+7waT WeDRJcq+wYctkikTctVbz7z1QqPwpsHa2IzfmZ7ktQY0uAxwkIdklyUm3lVdALNQI1lq0+ ZjTQEYe1Js9+ZONXSEVYq2MF5GmeAy1ShfcDE0h0IbowZNguvXQEqFs0cBKxOqEaAOCOg9 ol+6SHP2ZrIFcci9GKlBOKoQzqm35blxjNdh7QkXzD1KAzDo/trX36C4IkIc6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782681909; a=rsa-sha256; cv=none; b=YwYFAFskzjRZdxcjr30gtkF64xKXVBwxYKrZZV92jwzEqsVgjU4OYwQfperRLZ3v3q4bZz PG0NCcY4aSlNCKoZ2taPssAuoSaOScndWitW0eq6saK7PPFrA+B5JgH4YboeF/1rgCIiQw k/Qu9dkiHF+aHW3CUUL9CdK4+kcdkmTiZKQEzolbHCr0PYomFdmvliwZee3AfU/wBIK7Gj xLyMlKR+RP+jVouC3uceOqXZyaNDpGKlW9l3Nq3H/H5jRwFWI+UohpsF6Mr8StBI0v1SFW tPWsHBnaXip7Es/lyYiLLgpXPsQOb6TfM30H2yPIzxwpcwaf4EE/XzuwiBZNIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782681909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MMwc1uK9drufOhv8w/iir3HfFCL9/QCfpUQqI4b5zHs=; b=A+0ihrN72z12+m6c+BMM1MdhdcjHsHiukvBZfkSmvIaUW8vr34eSND1dzPLQCEfSlUMfKs RUMnsYg6mdf1iMRX0BI5DEyNTRopV8biuioLO3earXwe7bDIfWVwpITbc827X0wVcLoR0n tUfDmGvX9PZhvNUzQvNqorBEsg7rUOTyz2YXonCTJe3bN+MC9mSPFqylRxHUYgzn0fNr6q +F9Kiqmld8CZwOb2nKtOPhxUoY4WSZh8XiA2QAUpeBpyceq9zb8br+MyLsdfyuIN2juoDt dx64CwNxuDkvgiYaaTUPP8/Se+4/2Fxd6GzAeYNFUibq6gEX+GgfSU0s3dA3MA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpMrN6SPSzCr7 for ; Sun, 28 Jun 2026 21:25:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35e23 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 21:25:03 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Alexander Ziaee Subject: git: 20a5fc7b54 - main - Shared-authors: Sync doceng and bugmeister List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 20a5fc7b5419e25ec23a97ceb998411dc4800686 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 21:25:03 +0000 Message-Id: <6a41912f.35e23.714dc324@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/doc/commit/?id=20a5fc7b5419e25ec23a97ceb998411dc4800686 commit 20a5fc7b5419e25ec23a97ceb998411dc4800686 Author: Alexander Ziaee AuthorDate: 2026-06-28 21:23:46 +0000 Commit: Alexander Ziaee CommitDate: 2026-06-28 21:23:46 +0000 Shared-authors: Sync doceng and bugmeister --- shared/authors.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shared/authors.adoc b/shared/authors.adoc index 33d5e7718f..6fd59cc0fd 100644 --- a/shared/authors.adoc +++ b/shared/authors.adoc @@ -3830,14 +3830,14 @@ // Below we list the various hats. // FreeBSD Bugmeister -:bugmeister: {eadler}, {gavin}, {mva}, {koobs}, {gonzo} +:bugmeister: {linimon}, {siva}, {ziaee} // FreeBSD Core Team :core-members: {adamw}, {adrian}, {bapt}, {glebius}, {hrs}, {imp}, {jrm}, {kevans}, {olivier} :core-secretary-email: core-secretary@FreeBSD.org // FreeBSD Doc Engineering Team -:doceng-members: {blackend}, {hrs}, {ebrandi} +:doceng-members: {blackend}, {hrs}, {ebrandi}, {ziaee} :doceng-secretary-email: // FreeBSD Donations Liaison