From owner-dev-commits-doc-all@freebsd.org Mon Apr 5 13:26:27 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F09AC5B9141 for ; Mon, 5 Apr 2021 13:26:27 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FDWdb6QjPz4YBX; Mon, 5 Apr 2021 13:26:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CDF92195C7; Mon, 5 Apr 2021 13:26:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 135DQRbw086635; Mon, 5 Apr 2021 13:26:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 135DQR6G086634; Mon, 5 Apr 2021 13:26:27 GMT (envelope-from git) Date: Mon, 5 Apr 2021 13:26:27 GMT Message-Id: <202104051326.135DQR6G086634@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: =?utf-8?B?RmVybmFuZG8gQXBlc3RlZ3XDrWE=?= Subject: git: 8f062277e2 - main - [handbook] Remove trailing whitespaces MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f062277e2d262e0d71000bb70d71f1180f79622 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Apr 2021 13:26:28 -0000 The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/doc/commit/?id=8f062277e2d262e0d71000bb70d71f1180f79622 commit 8f062277e2d262e0d71000bb70d71f1180f79622 Author: Fernando Apesteguía AuthorDate: 2021-04-03 18:11:16 +0000 Commit: Fernando Apesteguía CommitDate: 2021-04-05 13:19:05 +0000 [handbook] Remove trailing whitespaces In section 12.13 as reported by igor(1) Accepted by: gbe (mentor) Differential Revision: https://reviews.freebsd.org/D29568 --- documentation/content/en/books/handbook/config/_index.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/content/en/books/handbook/config/_index.adoc b/documentation/content/en/books/handbook/config/_index.adoc index 88b3cbec4c..9eaca96dd2 100644 --- a/documentation/content/en/books/handbook/config/_index.adoc +++ b/documentation/content/en/books/handbook/config/_index.adoc @@ -1311,7 +1311,7 @@ Using swap files requires that the module needed by man:md[4] has either been bu .... md99 none swap sw,file=/usr/swap0,late 0 0 .... -+ ++ The man:md[4] device [.filename]#md99# is used, leaving lower device numbers available for interactive use. . Swap space will be added on system startup. To add swap space immediately, use man:swapon[8]: + @@ -1505,7 +1505,7 @@ When submitting a problem report, include the following information: .... # acpidump -dt > name-system.asl .... -+ ++ Substitute the login name for _name_ and manufacturer/model for _system_. For example, use [.filename]#njl-FooCo6000.asl#. Most FreeBSD developers watch the {freebsd-current}, but one should submit problems to {freebsd-acpi} to be sure it is seen. Be patient when waiting for a response. If the bug is not immediately apparent, submit a bug report. When entering a PR, include the same information as requested above. This helps developers to track the problem and resolve it. Do not send a PR without emailing {freebsd-acpi} first as it is likely that the problem has been reported before. From owner-dev-commits-doc-all@freebsd.org Mon Apr 5 13:30:10 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B60CC5B93DE for ; Mon, 5 Apr 2021 13:30: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FDWjt32pTz4YpF; Mon, 5 Apr 2021 13:30:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 53ACF193EB; Mon, 5 Apr 2021 13:30:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 135DUAf0090638; Mon, 5 Apr 2021 13:30:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 135DUA2m090635; Mon, 5 Apr 2021 13:30:10 GMT (envelope-from git) Date: Mon, 5 Apr 2021 13:30:10 GMT Message-Id: <202104051330.135DUA2m090635@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: =?utf-8?B?RmVybmFuZG8gQXBlc3RlZ3XDrWE=?= Subject: git: b950b48ad7 - main - [handbook] Add reference to acpi_video(4) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b950b48ad7ac9e148e81ecffa9100494806b29a5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Apr 2021 13:30:10 -0000 The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/doc/commit/?id=b950b48ad7ac9e148e81ecffa9100494806b29a5 commit b950b48ad7ac9e148e81ecffa9100494806b29a5 Author: Fernando Apesteguía AuthorDate: 2021-04-03 17:56:40 +0000 Commit: Fernando Apesteguía CommitDate: 2021-04-05 13:24:10 +0000 [handbook] Add reference to acpi_video(4) Section 12.13.1 explains how to configure ACPI. Add a small paragraph explaining how to use the acpi_video(4) driver so some laptop brightness keys can work. Approved by: gbe (mentor) Differential Revision: https://reviews.freebsd.org/D29567 --- .../content/en/books/handbook/config/_index.adoc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/documentation/content/en/books/handbook/config/_index.adoc b/documentation/content/en/books/handbook/config/_index.adoc index 9eaca96dd2..364df797f9 100644 --- a/documentation/content/en/books/handbook/config/_index.adoc +++ b/documentation/content/en/books/handbook/config/_index.adoc @@ -1347,6 +1347,21 @@ ACPI and APM cannot coexist and should be used separately. The last one to load ACPI can be used to put the system into a sleep mode with `acpiconf`, the `-s` flag, and a number from `1` to `5`. Most users only need `1` (quick suspend to RAM) or `3` (suspend to RAM). Option `5` performs a soft-off which is the same as running `halt -p`. +The man:acpi_video[4] driver uses +link:https://uefi.org/specs/ACPI/6.4/Apx_B_Video_Extensions/Apx_B_Video_Extensions.html[ACPI +Video Extensions] to control display switching and backlight brightness. It must +be loaded after any of the DRM kernel modules. After loading the driver, +the kbd:[Fn] brightness keys will change the brightness of the screen. It is +possible to check the ACPI events by inspecting [.filename]#/var/run/devd.pipe#: + +[source,shell] +... +# cat /var/run/devd.pipe +!system=ACPI subsystem=Video type=brightness notify=62 +!system=ACPI subsystem=Video type=brightness notify=63 +!system=ACPI subsystem=Video type=brightness notify=64 +... + Other options are available using `sysctl`. Refer to man:acpi[4] and man:acpiconf[8] for more information. [[ACPI-comprob]] From owner-dev-commits-doc-all@freebsd.org Mon Apr 5 15:13:46 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E9CDB5BBF48 for ; Mon, 5 Apr 2021 15:13: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FDZ1Q68wSz4hNH; Mon, 5 Apr 2021 15:13:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C43B71AB55; Mon, 5 Apr 2021 15:13:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 135FDk58042271; Mon, 5 Apr 2021 15:13:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 135FDkYL042268; Mon, 5 Apr 2021 15:13:46 GMT (envelope-from git) Date: Mon, 5 Apr 2021 15:13:46 GMT Message-Id: <202104051513.135FDkYL042268@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Ryusuke SUZUKI Subject: git: 865a4b154a - main - Add 13.0-RC5 announcement MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ryusuke X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 865a4b154a616309564d18e064b2a83717f44cf5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Apr 2021 15:13:47 -0000 The branch main has been updated by ryusuke: URL: https://cgit.FreeBSD.org/doc/commit/?id=865a4b154a616309564d18e064b2a83717f44cf5 commit 865a4b154a616309564d18e064b2a83717f44cf5 Author: Ryusuke SUZUKI AuthorDate: 2021-04-05 15:13:26 +0000 Commit: Ryusuke SUZUKI CommitDate: 2021-04-05 15:13:26 +0000 Add 13.0-RC5 announcement --- website/data/ja/news/news.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/website/data/ja/news/news.toml b/website/data/ja/news/news.toml index fb318763de..00780c3b37 100644 --- a/website/data/ja/news/news.toml +++ b/website/data/ja/news/news.toml @@ -1,6 +1,11 @@ # Sort news by year, month and day # $FreeBSD$ +[[news]] +date = "2021-04-03" +title = "FreeBSD 13.0-RC5 公開" +description = "

FreeBSD 13.0 リリースサイクルから 5 回目のリリース候補版が公開されました (アナウンス)。 FreeBSD ミラーサイト から amd64, arm64, armv6, armv7, i386, powerpc, powerpc64, powerpcspe, powerpc64le および riscv64 アーキテクチャの ISO イメージを入手できます。

" + [[news]] date = "2021-03-29" title = "FreeBSD 13.0-RC4 公開" From owner-dev-commits-doc-all@freebsd.org Mon Apr 5 21:12:34 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 710A15C7872 for ; Mon, 5 Apr 2021 21:12: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FDjzQ2jbKz3k5Q; Mon, 5 Apr 2021 21:12:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 460BE1FD37; Mon, 5 Apr 2021 21:12:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 135LCYjI048712; Mon, 5 Apr 2021 21:12:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 135LCYYV048711; Mon, 5 Apr 2021 21:12:34 GMT (envelope-from git) Date: Mon, 5 Apr 2021 21:12:34 GMT Message-Id: <202104052112.135LCYYV048711@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: 9068516015 - main - x11: document the latest best advice about graphics 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: 906851601568d15595e6c181bae741805d4fb3d6 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Apr 2021 21:12:34 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=906851601568d15595e6c181bae741805d4fb3d6 commit 906851601568d15595e6c181bae741805d4fb3d6 Author: Warner Losh AuthorDate: 2021-04-05 21:10:43 +0000 Commit: Warner Losh CommitDate: 2021-04-05 21:11:18 +0000 x11: document the latest best advice about graphics Recommend PORTS_MODULES for drm and nvidia ports. Remove pkg suggestion because it doesn't work in too many cases. Provide example for make.conf. Comments from: adridg@, Juan Molina, rpokala@, greg at unrelenting technology, khng, and others on sparc64 and twitter Differential Revision: https://reviews.freebsd.org/D29479 --- .../content/en/books/handbook/x11/_index.adoc | 33 +++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/documentation/content/en/books/handbook/x11/_index.adoc b/documentation/content/en/books/handbook/x11/_index.adoc index f420bc9e54..b481c18773 100644 --- a/documentation/content/en/books/handbook/x11/_index.adoc +++ b/documentation/content/en/books/handbook/x11/_index.adoc @@ -205,7 +205,28 @@ The traditional single [.filename]#xorg.conf# still works, but is neither as cle [[x-config-video-cards]] === Video Cards -Because of changes made in recent versions of FreeBSD, it is now possible to use graphics drivers provided by the Ports framework or as packages. As such, users can use one of the following drivers available from package:graphics/drm-kmod[]. +The Ports framework provides the drm graphics drivers necessary for X11 operation on recent hardware. +Users can use one of the following drivers available from package:graphics/drm-kmod[]. +These drivers use interfaces in the kernel that are normally private. +As such, it is strongly recommended that the drivers be built via the ports system via the `PORTS_MODULES` variable. +With `PORTS_MODULES`, every time you build the kernel, the corresponding port(s) containing kernel modules are re-built against the updated sources. +This ensures the kernel module stays in-sync with the kernel itself. +The kernel and ports trees should be updated together for maximum compatibility. +You can add `PORTS_MODULES` to your [.filename]#/etc/make.conf# file to ensure all kernels you build rebuild this module. +Advanced users can add it to their kernel config files with the `makeoptions` directive. +If you run GENERIC and use freebsd-update, you can just build the [.filename]#graphics/drm-kmod# or [.filename]#x11/nvidia-driver# port after each `freebsd-update install` invocation. + +[example] +==== +[.filename]#/etc/make.conf# + +[.programlisting] +.... +SYSDIR=path/to/src/sys +PORTS_MODULES=graphics/drm-kmod x11/nvidia-driver +.... +This will rebuild everything, but can select one or the other depending on which GPU / graphics card you have. +==== [[x-config-video-cards-ports]] Intel KMS driver, Radeon KMS driver, AMD KMS driver:: @@ -244,6 +265,16 @@ NVIDIA:: Several NVIDIA drivers are available in the [.filename]#x11# category of the Ports Collection. Install the driver that matches the video card. + For reference, see https://en.wikipedia.org/wiki/List_of_Nvidia_graphics_processing_units[]. ++ +Kernel support for NVIDIA cards is found in either the [.filename]#x11/nvidia-driver# port or the [.filename]#x11/nvidia-driver-xxx# port. +Modern cards use the former. +Legacy cards use the -xxx ports, where xxx is one of 304, 340 or 390 indicating the version of the driver. +For those, fill in the `-xxx` using the http://download.nvidia.com/XFree86/FreeBSD-x86_64/465.19.01/README/[ Supported NvIDIA GPU Products ] page. +This page lists the devices supported by different versions of the driver. +Legacy drivers run on both i386 and amd64. +The current driver only supports amd64. +Read http://download.nvidia.com/XFree86/FreeBSD-x86_64/465.19.01/README/[installation and configuration of NVIDIA driver] for details. +While we recommend this driver be rebuilt with each kernel rebuild for maximum safety, it uses almost no private kernel interfaces and is usually safe across kernel updates. [[x-config-video-cards-hybrid]] Hybrid Combination Graphics:: From owner-dev-commits-doc-all@freebsd.org Tue Apr 6 10:03:24 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3C5E95C85EC for ; Tue, 6 Apr 2021 10:03: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FF34r1JNcz3vCk; Tue, 6 Apr 2021 10:03:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 14CB81CDD; Tue, 6 Apr 2021 10:03:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 136A3NkW043864; Tue, 6 Apr 2021 10:03:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 136A3N3E043863; Tue, 6 Apr 2021 10:03:23 GMT (envelope-from git) Date: Tue, 6 Apr 2021 10:03:23 GMT Message-Id: <202104061003.136A3N3E043863@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Emmanuel Vadot Subject: git: 07d43e86a8 - main - pgpkeys: Add my new gpg key MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 07d43e86a81a721b4f1186bf835666eda34a2880 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2021 10:03:24 -0000 The branch main has been updated by manu (ports, src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=07d43e86a81a721b4f1186bf835666eda34a2880 commit 07d43e86a81a721b4f1186bf835666eda34a2880 Author: Emmanuel Vadot AuthorDate: 2021-04-06 10:02:47 +0000 Commit: Emmanuel Vadot CommitDate: 2021-04-06 10:02:47 +0000 pgpkeys: Add my new gpg key --- documentation/static/pgpkeys/manu.key | 78 +++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 35 deletions(-) diff --git a/documentation/static/pgpkeys/manu.key b/documentation/static/pgpkeys/manu.key index c45e5708d9..7b3eab5cf8 100644 --- a/documentation/static/pgpkeys/manu.key +++ b/documentation/static/pgpkeys/manu.key @@ -1,14 +1,11 @@ -// $FreeBSD: head/share/pgpkeys/manu.key 48732 2016-04-24 14:53:01Z manu $ -// -// sh addkey.sh manu 49AFB38B7C929105 ; - +// sh addkey.sh manu 16000F7D5E8FA9ED ; [.literal-block-margin] .... -pub rsa2048/49AFB38B7C929105 2016-04-24 [SC] [expires: 2019-04-24] - Key fingerprint = DE79 F601 8D70 10E8 480E B918 49AF B38B 7C92 9105 -uid Emmanuel Vadot -sub rsa2048/519ED84504490990 2016-04-24 [E] [expires: 2019-04-24] +pub rsa3072/16000F7D5E8FA9ED 2021-04-06 [SC] [expires: 2024-04-05] + Key fingerprint = 3248 0F56 BDD1 9D42 B21D 640C 1600 0F7D 5E8F A9ED +uid Emmanuel Vadot +sub rsa3072/9F3A7307E0A60897 2021-04-06 [E] [expires: 2024-04-05] .... @@ -16,32 +13,43 @@ sub rsa2048/519ED84504490990 2016-04-24 [E] [expires: 2019-04-24] .... -----BEGIN PGP PUBLIC KEY BLOCK----- -mQENBFccxIIBCACxzAC7s/ulrbVyzYxJ28WSZfbuAdxRCVh3RGUZnD9v+CnMKX2f -l5ALW0Dlk4Llu2kFpLnjKsyFrZqTJzzPugWrxH5aUsHLCuANk4+Ky5Mu4HR0+nZg -vicA4cYO2Q9EsTW5hDbXlQAX26BC13TAqj6WbUb0cPhzFKHv17U2sp0YkeormjX6 -CdVpbnsyiOGqlXzqyTUGzL5fvM/L/23Jq87GRSuv2UAwnXwrprTdc8h+YqUyb+Vk -A0IK/JjmXgsmamzi7CUnnjraTXS/tm5oH1DepUcNX7aOlyMqGDGjneM9aTeXresM -5QvUAIFjvUXSYLEhOyf1fuEmplqz6Q2DCwdZABEBAAG0IUVtbWFudWVsIFZhZG90 -IDxtYW51QGZyZWVic2Qub3JnPokBPQQTAQoAJwUCVxzEggIbAwUJBaOagAULCQgH -AwUVCgkICwUWAwIBAAIeAQIXgAAKCRBJr7OLfJKRBdSEB/9ISdru6eoLnMnZ7h4G -CudbnGHVIkoIb/Q6C9AhZ3P1emiQdpEbl8ZX6KV4pcFyTayw7es5gUQkNAKoy54s -f9hUildNNYZ/9rctCV9y9bxNHYsRPlcVTxgEQ6Dr+Ouvimtz9Y9jgbWsiwp5m/Co -W/WZLzmjVj9IO+3ICD2P2pTXuDogiarKtbnAeDBWvhbgllEdozy9HdLhbZkrN6y3 -N0xyWLa25wFOnj/cqQWx4VUib0DeZr774yvyN0FVlmQylSPaYW1n4CMOz2561IN+ -ALjOpdmUYGCPkOVEubZ90mzUf1yJCQEcfr+LmyhID4S4SfkpxQNkkJ48OFuJeQMV -CaiyuQENBFccxIIBCADEOu5Gt1d8BvI/A7CszSrabMs09vZqjK9SKbSUPl+faYDv -ORA7L4qsifp41V1VN89hJGHFLFzTQZ0gURTmWEyvwo2vPzmi9zkDR7VEOhGPMZnM -z6Z7FNmEIb/14ZmQR2dr9wAGOEm9s1mEXJa0n8Xc1r0aCOzAi+6m7w/eq7MZhO9b -9mQdEe5R4osVA+Mx+u3dQnF8LndUe6jMtnXtCqqzVguLZn4FsU0j/o9zHOr8EyUe -gna60Gg3rqxUowGbXVHkizuE5UO2rRTmdSspG2d04246kVBR6ddyLPXGBC9ED1dS -bYYOz/8F8TAzFvk8bHVUyxncrxonLh58xqYZPT8JABEBAAGJASUEGAEKAA8FAlcc -xIICGwwFCQWjmoAACgkQSa+zi3ySkQX0xwf+OejGpkGOvPmuzvz3V/loYkl1wLTg -yIrI+7AGAAeRS1gOUyXD7BtIxPBKcjdrg4+ffHINI4VgZav0OeDuF7vxUZ1/eb+V -0woRf8HjyJ3UwkRwOMuMmADv3L9fqhU3uMRCHSruzUjceAJKRYjXgXceP0d3mpgm -eLYFV3wDI1/hF+/e8/Z9NegpZQ/hnJDVOZmehzzGWhXRKDVJ5KKDxnOYnyCcI1Rx -8acOSIOQRbvkvBxThCSXrSVl33Feerxe7uI7kYlBdwRBm53NOX0h8RsDo3DdZRmq -Cwn1lTHu7qLxs1k2sNuvC48YyrtPbjFu3B1w89OOmri1nalAFyiC4mm0BA== -=CrL6 +mQGNBGBsLtEBDADMfUPjecUOGbY5M5l/qRZ8NBcZwcfSOiapeBottjR8qS3Iu0Hq +Xi/+1m8XPNeFzJ0zXIlEmNw178GsBp47pLhlxodbOFJ6a9VeBycIixnEV/HeYB1O +bVbmnAChesHj7Zr2bJ/r3xXf+quDFSp4IyxPATEb+b6OSU9R2te7dGjJ1WP3QiN4 +SSMCFiQnZrMZuklR7AaOI1eouFajntvfR/jTx0PzwqqDrTfdGg+drBEKfvXWd7vP +8hNQpoTo5kzDXKdEPW0v/B+pGjNyKzqw40EvtRVHHN+PZFP7AgUhyKbLVheiq92+ +e49tCKlRZfKmAoMo3Z1iRul+GomRcx0BbWgLFoVQd1mLzulNKRLtHxDoLHce3YoT +ZwVMNLdeb6rOtS1gbpJ5EOWOC3ChP/NRpTWHo1nt5z2w8Ndtm6vrmaOOs1dnnFtm +EVGrUPJp2k513KNgCf8gJshbgSZzL9ft/0csKQtMISx2lYjbJVZ+xrpAYmWoedJH +APQmwRtaXBYq5V8AEQEAAbQhRW1tYW51ZWwgVmFkb3QgPG1hbnVARnJlZUJTRC5v +cmc+iQHUBBMBCgA+FiEEMkgPVr3RnUKyHWQMFgAPfV6Pqe0FAmBsLtECGwMFCQWj +moAFCwkIBwMFFQoJCAsFFgMCAQACHgECF4AACgkQFgAPfV6Pqe2Izgv+LLxvJQMK +vqyDnD6EAIqns4qFoMx/zg60R9IcWJePZwhoF+FvhWSEDTmnEBcjze9V3SIAHopb +s3R9Zmm3RDN7HQCO2Utelgew1rFK4QYplSJhDq02kflp6I2o0dJpgC/+UaNFxMFJ +QR/x5AliceCOTDqLPl8/fTNyB7gTlur/YyeWVyeiI1uqIzNCwDoaqh8OWXmzinBy +JDVzaJrQdsF1TyLu4lD3Ig30qZU4MUcX4RGWipPEys/Iqsg9ZTOB45Ren/TGCmt8 +jdPuK+P4FfjWB2JY1GaJPUO4V28LblXsbHAQdZsJzNZqScYdwKMmcBODbXkWmCaR +ATjJv7l6oKF3d7FUsHXeGkh40jdxj0oy/J8xeDhE7csF7DqHMlIyojwlknKvqO2y +xwdQ95o+7zrWJ23/2jfnRaojPvkcpfACkeeGCi5cgTbjUvDZwFPmvTmR9QYivDk6 +LYzHyJF90kO5UWakce4mtoVNBWY+x1DfX6QXH72s0fW0iGaiThv0H2PYuQGNBGBs +LtEBDADDcx0KYGBc/jVjrkNGZV7OZ/5ffZqnnRAw5ZV45JaFtQRvGBlIS9Aykfhp +7amYneTRLMnnn/4B62Z27IYhSHtrztjvFFNo+vPb6DyU5OnsK8zVqqpkvEp+waYl +m36qEq0b84wt39wJQ3B4UNYrq3N75qNP5XZQGA4SuKqVKBCiJlq45l1c+ozM2Hcu +QGscapkywFN5H8SrRWzryKjYWcYpWJaXNQIfN2JhfVC1Di5lfCyBtsDGFOXa72pG +wtFGoPUYvkscx8BXGiyX1D4QC6tiZpem6wtV5i5cyeiQC+/HDvJyhZX0BIeW/306 +ce+gsWofqNEYQ6BxGE4uOd6xNr9fiEcy8C7YaEuFS6PCYWMq83nY6K/vLE9Afbgr +9XeFhsmzQ28/rJuZSq91WJaY/845KZGSv1Zzpz1oC2pOhRSLV8PcKL7I9nGIuviv +VeqaAGPqi6UBbPpm+AEmlPMs26Jr2xATHIHYWqvD+2CDWNQ1oG184DqYS9VsXUsO +niZSb2kAEQEAAYkBvAQYAQoAJhYhBDJID1a90Z1Csh1kDBYAD31ej6ntBQJgbC7R +AhsMBQkFo5qAAAoJEBYAD31ej6nt9JsL/2VedCRcAFkWl3rvBgfnbMMxJgu+zepn +upYXigOv6T+aAXkucLvBJNrZuxqDfiScp6eb92oNaH9d3vz5Yr48BY7myeyjUvb8 +zZFe1uIEnvmZHxhvkemjHJ/9bucI4GhmWo6/3Hl0/VPOO2twF3HoZ5HA+DJqt9PI +cdGrhajepVE8ksIZfc1RFCAXiX4sP1PxHPnB8E3HC/25Xp94TCXX8l2m8Nuzz1NY +sJPpznEl+IwiGQJ81R5ADfXCg2pN9Qcl66vs7C5BVmok+NcE2NZTS2qZaIPKg/3Z +mN5/fdARv8CMjOmrrsvGwV3mljjMr/GloL5vvjx0NZO1lvSeY58crm01FEAsd3M7 +TeK3+nhGcK3htkWZ5A9xSRlqDfKtq81d9yFtKbj2RAkk482m0eQ6EM6uWKEIBbvx +pMHiP7lKlsgodkReNECQLXyPtQ3g9ADpkyJ01uO+2SKSl1tiG+xdPmMPFcGTSgZo +XkmXo+vWqxKunfvitPlm0YnBtt1NrMgj2Q== +=KECg -----END PGP PUBLIC KEY BLOCK----- .... - From owner-dev-commits-doc-all@freebsd.org Tue Apr 6 12:03:04 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3B9735CEB2B for ; Tue, 6 Apr 2021 12:03: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FF5kw1KLbz4gXL; Tue, 6 Apr 2021 12:03:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 20B9834C7; Tue, 6 Apr 2021 12:03:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 136C34u1006721; Tue, 6 Apr 2021 12:03:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 136C34af006720; Tue, 6 Apr 2021 12:03:04 GMT (envelope-from git) Date: Tue, 6 Apr 2021 12:03:04 GMT Message-Id: <202104061203.136C34af006720@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Ryusuke SUZUKI Subject: git: 46ec9ca0c6 - main - 9d42032f0 -> a3ee3d4e76 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ryusuke X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 46ec9ca0c6fd08a354a92341c0d886a8646b0efc Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2021 12:03:04 -0000 The branch main has been updated by ryusuke: URL: https://cgit.FreeBSD.org/doc/commit/?id=46ec9ca0c6fd08a354a92341c0d886a8646b0efc commit 46ec9ca0c6fd08a354a92341c0d886a8646b0efc Author: Ryusuke SUZUKI AuthorDate: 2021-04-06 12:02:32 +0000 Commit: Ryusuke SUZUKI CommitDate: 2021-04-06 12:02:32 +0000 9d42032f0 -> a3ee3d4e76 --- website/content/ja/where.adoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/website/content/ja/where.adoc b/website/content/ja/where.adoc index d23d74f159..ecf80598f2 100644 --- a/website/content/ja/where.adoc +++ b/website/content/ja/where.adoc @@ -148,10 +148,10 @@ a| * link:{url-rel}/riscv/riscv64/ISO-IMAGES/{rel130-current}/[riscv64] a| -* link:{url-rel}/VM-IMAGES/{rel130-current}-RC1/amd64/Latest/[amd64] -* link:{url-rel}/VM-IMAGES/{rel130-current}-RC1/i386/Latest/[i386] -* link:{url-rel}/VM-IMAGES/{rel130-current}-RC1/aarch64/Latest/[aarch64] -* link:{url-rel}/VM-IMAGES/{rel130-current}-RC1/riscv64/Latest/[riscv64] +* link:{url-rel}/VM-IMAGES/{rel130-current}-RC5/amd64/Latest/[amd64] +* link:{url-rel}/VM-IMAGES/{rel130-current}-RC5/i386/Latest/[i386] +* link:{url-rel}/VM-IMAGES/{rel130-current}-RC5/aarch64/Latest/[aarch64] +* link:{url-rel}/VM-IMAGES/{rel130-current}-RC5/riscv64/Latest/[riscv64] a| * aarch64 From owner-dev-commits-doc-all@freebsd.org Tue Apr 6 15:34:14 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 948F05D5AB2 for ; Tue, 6 Apr 2021 15:34:14 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFBQZ3qx0z3Q7K; Tue, 6 Apr 2021 15:34:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 768636A0E; Tue, 6 Apr 2021 15:34:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 136FYExk090691; Tue, 6 Apr 2021 15:34:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 136FYEfc090690; Tue, 6 Apr 2021 15:34:14 GMT (envelope-from git) Date: Tue, 6 Apr 2021 15:34:14 GMT Message-Id: <202104061534.136FYEfc090690@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Ed Maste Subject: git: 713410cb2c - main - Update advisory templates for Git 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: 713410cb2ca0a7dcdfd00fab203a16a0515b596f Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2021 15:34:14 -0000 The branch main has been updated by emaste (src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=713410cb2ca0a7dcdfd00fab203a16a0515b596f commit 713410cb2ca0a7dcdfd00fab203a16a0515b596f Author: Ed Maste AuthorDate: 2021-04-06 13:58:58 +0000 Commit: Ed Maste CommitDate: 2021-04-06 15:32:13 +0000 Update advisory templates for Git Reviewed by: gjb, markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D29596 --- website/static/security/advisory-template.txt | 29 +++++++++++++++++++++------ website/static/security/errata-template.txt | 29 +++++++++++++++++++-------- 2 files changed, 44 insertions(+), 14 deletions(-) diff --git a/website/static/security/advisory-template.txt b/website/static/security/advisory-template.txt index 71c4b4372a..6eb6edb6ef 100644 --- a/website/static/security/advisory-template.txt +++ b/website/static/security/advisory-template.txt @@ -114,19 +114,36 @@ VI. Correction details The following list contains the correction revision numbers for each affected branch. -Branch/path Revision +Branch/path Hash Revision ------------------------------------------------------------------------- -stable/13/ rXXXXXX -releng/13.0/ rXXXXXX +stable/13/ XXXXXXXXXXXX stable/13-nXXXXXX +releng/13.0/ XXXXXXXXXXXX releng/13.0-nXXXXXX stable/12/ rXXXXXX releng/12.2/ rXXXXXX stable/11/ rXXXXXX releng/11.4/ rXXXXXX ------------------------------------------------------------------------- -To see which files were modified by a particular revision, run the -following command, replacing NNNNNN with the revision number, on a -machine with Subversion installed: +For FreeBSD 13 and later: + +Run the following command to see which files were modified by a +particular commit: + +# git show --stat + +Or visit the following URL, replacing XXXXXX with the hash: + + + +To determine the commit count in a working tree (for comparison against +nNNNNNN in the table above), run: + +# git rev-list --count --first-parent HEAD + +For FreeBSD 12 and earlier: + +Run the following command to see which files were modified by a particular +revision, replacing NNNNNN with the revision number: # svn diff -cNNNNNN --summarize svn://svn.freebsd.org/base diff --git a/website/static/security/errata-template.txt b/website/static/security/errata-template.txt index 9d78362e6d..06433c318e 100644 --- a/website/static/security/errata-template.txt +++ b/website/static/security/errata-template.txt @@ -114,23 +114,36 @@ VI. Correction details The following list contains the correction revision numbers for each affected branch. -Branch/path Revision +Branch/path Hash Revision ------------------------------------------------------------------------- -stable/13/ rXXXXXX -releng/13.0/ rXXXXXX +stable/13/ XXXXXXXXXXXX stable/13-nXXXXXX +releng/13.0/ XXXXXXXXXXXX releng/13.0-nXXXXXX stable/12/ rXXXXXX releng/12.2/ rXXXXXX stable/11/ rXXXXXX releng/11.4/ rXXXXXX ------------------------------------------------------------------------- -To see which files were modified by a particular revision, run the -following command, replacing NNNNNN with the revision number, on a -machine with Subversion installed: +For FreeBSD 13 and later: -# svn diff -cNNNNNN --summarize svn://svn.freebsd.org/base +Run the following command to see which files were modified by a +particular commit: -Or visit the following URL, replacing NNNNNN with the revision number: +# git show --stat + +Or visit the following URL, replacing XXXXXX with the hash: + + + +To determine the commit count in a working tree (for comparison against +nNNNNNN in the table above), run: + +# git rev-list --count --first-parent HEAD + +For FreeBSD 12 and earlier: + +Run the following command to see which files were modified by a particular +revision, replacing NNNNNN with the revision number: From owner-dev-commits-doc-all@freebsd.org Tue Apr 6 17:56:42 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3A2295B25BB for ; Tue, 6 Apr 2021 17:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFFZy1Fphz4THh; Tue, 6 Apr 2021 17:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1E5891084A; Tue, 6 Apr 2021 17:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 136Hugfj081250; Tue, 6 Apr 2021 17:56:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 136Hugl5081249; Tue, 6 Apr 2021 17:56:42 GMT (envelope-from git) Date: Tue, 6 Apr 2021 17:56:42 GMT Message-Id: <202104061756.136Hugl5081249@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Ed Maste Subject: git: 01859ac01c - main - Add arm64 to freebsd-update section in advisory templates 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: 01859ac01cfb5881ef597781b63a81df185bf793 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2021 17:56:42 -0000 The branch main has been updated by emaste (src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=01859ac01cfb5881ef597781b63a81df185bf793 commit 01859ac01cfb5881ef597781b63a81df185bf793 Author: Ed Maste AuthorDate: 2021-04-06 15:50:12 +0000 Commit: Ed Maste CommitDate: 2021-04-06 17:50:05 +0000 Add arm64 to freebsd-update section in advisory templates Reviewed by: gordon, markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D29608 --- website/static/security/advisory-template.txt | 5 +++-- website/static/security/errata-template.txt | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/website/static/security/advisory-template.txt b/website/static/security/advisory-template.txt index 6eb6edb6ef..0926561512 100644 --- a/website/static/security/advisory-template.txt +++ b/website/static/security/advisory-template.txt @@ -59,8 +59,9 @@ Perform one of the following: 1) To update your vulnerable system via a binary patch: -Systems running a RELEASE version of FreeBSD on the i386 or amd64 -platforms can be updated via the freebsd-update(8) utility: +Systems running a RELEASE version of FreeBSD on the amd64, i386, or +(on FreeBSD 13 and later) arm64 platforms can be updated via the +freebsd-update(8) utility: # freebsd-update fetch # freebsd-update install diff --git a/website/static/security/errata-template.txt b/website/static/security/errata-template.txt index 06433c318e..3b83f37a80 100644 --- a/website/static/security/errata-template.txt +++ b/website/static/security/errata-template.txt @@ -59,8 +59,9 @@ Perform one of the following: 1) To update your system via a binary patch: -Systems running a RELEASE version of FreeBSD on the i386 or amd64 -platforms can be updated via the freebsd-update(8) utility: +Systems running a RELEASE version of FreeBSD on the amd64, i386, or +(on FreeBSD 13 and later) arm64 platforms can be updated via the +freebsd-update(8) utility: # freebsd-update fetch # freebsd-update install From owner-dev-commits-doc-all@freebsd.org Tue Apr 6 18:37:11 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7E8735B3F0E for ; Tue, 6 Apr 2021 18:37:11 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFGTg2vT8z4Y0V; Tue, 6 Apr 2021 18:37:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5692011395; Tue, 6 Apr 2021 18:37:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 136IbB8D035499; Tue, 6 Apr 2021 18:37:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 136IbBQ3035498; Tue, 6 Apr 2021 18:37:11 GMT (envelope-from git) Date: Tue, 6 Apr 2021 18:37:11 GMT Message-Id: <202104061837.136IbBQ3035498@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Ed Maste Subject: git: d1e24bf6b5 - main - Add missing text to errata template 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: d1e24bf6b5158b2f49f718cd2bf4567c9f89a10f Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2021 18:37:11 -0000 The branch main has been updated by emaste (src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=d1e24bf6b5158b2f49f718cd2bf4567c9f89a10f commit d1e24bf6b5158b2f49f718cd2bf4567c9f89a10f Author: Ed Maste AuthorDate: 2021-04-06 18:35:38 +0000 Commit: Ed Maste CommitDate: 2021-04-06 18:35:38 +0000 Add missing text to errata template I copied the "FreeBSD 12 and earlier" text from the security advisory template to the errata template, but missed a couple of lines. Fixes: 713410cb2ca0 ("Update advisory templates for Git") --- website/static/security/errata-template.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/website/static/security/errata-template.txt b/website/static/security/errata-template.txt index 3b83f37a80..c197f5c758 100644 --- a/website/static/security/errata-template.txt +++ b/website/static/security/errata-template.txt @@ -146,6 +146,10 @@ For FreeBSD 12 and earlier: Run the following command to see which files were modified by a particular revision, replacing NNNNNN with the revision number: +# svn diff -cNNNNNN --summarize svn://svn.freebsd.org/base + +Or visit the following URL, replacing NNNNNN with the revision number: + VII. References From owner-dev-commits-doc-all@freebsd.org Tue Apr 6 19:10:59 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B93135B508C for ; Tue, 6 Apr 2021 19:10:59 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFHDg4syHz4bbl; Tue, 6 Apr 2021 19:10:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9A1B3115FD; Tue, 6 Apr 2021 19:10:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 136JAxI1091667; Tue, 6 Apr 2021 19:10:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 136JAxtv091666; Tue, 6 Apr 2021 19:10:59 GMT (envelope-from git) Date: Tue, 6 Apr 2021 19:10:59 GMT Message-Id: <202104061910.136JAxtv091666@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Rene Ladan Subject: git: 3c9ef247f5 - main - Committers Guide: update the ports-specific sections to git. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3c9ef247f5ccea4a478670780aba89367a865c28 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2021 19:10:59 -0000 The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/doc/commit/?id=3c9ef247f5ccea4a478670780aba89367a865c28 commit 3c9ef247f5ccea4a478670780aba89367a865c28 Author: Rene Ladan AuthorDate: 2021-04-06 18:53:12 +0000 Commit: Rene Ladan CommitDate: 2021-04-06 18:53:12 +0000 Committers Guide: update the ports-specific sections to git. - Remove notes that the migration is in progress - Remove old branch names and URLs - Remove mention of psvn - Remove section about re-adding a deleted port, git add will do the right thingn natively (most of the times). - Remove section about repo-copies, git has no copy command. - Simplify instructions for moving a port. - Remove section about the mfh tool. Merges are now just cherry-picks. Reviewed by: crees, emaste, imp, lwhsu, mat Differential Revision: https://reviews.freebsd.org/D29450 --- .../en/articles/committers-guide/_index.adoc | 239 +++------------------ 1 file changed, 26 insertions(+), 213 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index e9ea2cb9c3..36f3f52baa 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -61,8 +61,8 @@ toc::[] |`_doc/_` Git Repository |`ssh://git@gitrepo.FreeBSD.org/doc.git` (see also <>). -|`_ports/_` Subversion Root -|`svn+ssh://repo.FreeBSD.org/ports` (see also <>). +|`_ports/_` Git Repository +|`ssh://git@gitrepo.FreeBSD.org/ports.git` (see also <>). |_Internal Mailing Lists_ |developers (technically called all-developers), doc-developers, doc-committers, ports-developers, ports-committers, src-developers, src-committers. (Each project repository has its own -developers and -committers mailing lists. Archives for these lists can be found in the files [.filename]#/local/mail/repository-name-developers-archive# and [.filename]#/local/mail/repository-name-committers-archive# on the `FreeBSD.org` cluster.) @@ -463,22 +463,14 @@ When you are done, report the bad version to the developer (or fix the bug yours Again, the git-bisect manual (linked above) is a good resource for when things go wrong or for unusual cases. ==== Ports Considerations -The ports migration is in progress, and some of this section may change before that is complete. The ports tree operates the same way. The branch names are different and the repositories are in different locations. -The legacy GitHub mirror is at https://github.com/freebsd/freebsd-ports.git . -The canonical cgit mirror is https://cgit-beta.freebsd.org/ports.git . -The production git repo will be https://git.freebsd.org/ports.git and ssh://anongit@git.FreeBSD.org/ports.git (or anongit@git.FreeBSD.org:ports.git) when the time comes. +The cgit repository web interface for use with web browsers is at https://cgit.freebsd.org/ports.git . +The production git repository is at https://git.freebsd.org/ports.git and at ssh://anongit@git.FreeBSD.org/ports.git (or anongit@git.FreeBSD.org:ports.git). -The 'current' branches are 'master' (legacy) and 'main' (new) respectively. -The quarterly branches are named the same as in FreeBSD's svn repo. - -[NOTE] -==== -The cgit repo for ports is considered beta. -The git hashes may change as problems are found in the conversion prior to the cutover. -==== +The 'current' branch is 'main' . +The quarterly branches are named 'yyyyQn' for year 'yyyy' and quarter 'n'. ==== Managing Local Changes This section addresses tracking local changes. @@ -2157,17 +2149,17 @@ A few noteworthy directories are: LANG above is the two character language code. All document source is encoded using Unicode. -[[svn-getting-started-ports-layout]] +[[git-getting-started-ports-layout]] ==== FreeBSD Ports Tree Branches and Layout -In `svn+ssh://repo.freebsd.org/ports`, _ports_ refers to the repository root of the ports tree. +In `ssh://gitrepo.freebsd.org/ports.git`, _ports_ refers to the repository root of the ports tree. -In general, most FreeBSD port work will be done within the [.filename]#head/# branch of the ports tree which is the actual ports tree used to install software. +In general, most FreeBSD port work will be done within the `main` branch of the ports tree which is the actual ports tree used to install software. Some other key locations are: -* /branches/RELENG_n_n_n which corresponds to `RELENG_n_n_n` is used to merge back security updates in preparation for a release. -* /tags/RELEASE_n_n_n which corresponds to `RELEASE_n_n_n` represents a release tag of the ports tree. -* /tags/RELEASE_n_EOL represents the end of life tag of a specific FreeBSD branch. +* `yyyyQn` (a branch), where `yyyy` represents the current year and `n` represents the current quarter (e.g. 2021Q2), which receives mostly security and bugfixes. +* release/`x.y.z` (a tag), which represents a release tag of the ports tree. +* `n`-eol (a tag), which represents the end of life tag of FreeBSD branch `n.X`. [[svn-daily-use]] === Daily Use @@ -2299,13 +2291,6 @@ To commit all changes in, for example, [.filename]#lib/libfetch/# and [.filename % svn commit lib/libfetch usr/bin/fetch .... -There is also a commit wrapper for the ports tree to handle the properties and sanity checking the changes: - -[source,shell] -.... -% /usr/ports/Tools/scripts/psvn commit -.... - [[svn-daily-use-adding-and-removing]] ==== Adding and Removing Files @@ -4142,7 +4127,7 @@ When using Git, consider using `git grep`, it is much faster than `grep -r`. + [.procedure] ==== -* Remove the port's files and directory with `svn remove`. +* Remove the port's files and directory with `git rm`. * Remove the `SUBDIR` listing of the port in the parent directory [.filename]#Makefile#. * Add an entry to [.filename]#ports/MOVED#. * Search for entries in [.filename]#ports/security/vuxml/vuln.xml# and adjust them accordingly. In particular, check for previous packages with the new name which version could include the new port. @@ -4153,99 +4138,16 @@ Alternatively, you can use the rmport script, from [.filename]#ports/Tools/scrip This script was written by {vd}. When sending questions about this script to the {freebsd-ports}, please also CC {crees}, the current maintainer. -[[ports-qa-re-adding]] -=== Re-adding a Deleted Port - -[[ports-qa-resurrect]] -==== How do I re-add a deleted port? - -This is essentially the reverse of deleting a port. - -[IMPORTANT] -==== -Do not use `svn add` to add the port. -Follow these steps. -If they are unclear, or are not working, ask for help, do not just `svn add` the port. -==== +[[ports-qa-move-port]] +=== How do I move a port to a new location? [.procedure] ==== -. Figure out when the port was removed. Use this link:https://people.freebsd.org/~crees/removed_ports/index.xml[list], or look for the port on link:http://www.freshports.org/[freshports], and then copy the last living revision of the port: -+ -[source,shell] -.... -% cd /usr/ports/category -% svn cp 'svn+ssh://repo.freebsd.org/ports/head/category/portname/@XXXXXX' portname -.... -+ -Pick the revision that is just before the removal. For example, if the revision where it was removed is 269874, use 269873. -+ -It is also possible to specify a date. In that case, pick a date that is before the removal but after the last commit to the port. -+ -[source,shell] -.... -% cd /usr/ports/category -% svn cp 'svn+ssh://repo.freebsd.org/ports/head/category/portname/@{YYYY-MM-DD}' portname -.... -+ -. Make the changes necessary to get the port working again. If it was deleted because the distfiles are no longer available, either volunteer to host the distfiles, or find someone else to do so. -. If some files have been added, or were removed during the resurrection process, use `svn add` or `svn remove` to make sure all the files in the port will be committed. -. Restore the `SUBDIR` listing of the port in the parent directory [.filename]#Makefile#, keeping the entries sorted. -. Delete the port entry from [.filename]#ports/MOVED#. -. If the port had an entry in [.filename]#ports/LEGAL#, restore it. -. `svn commit` these changes, preferably in one step. -==== - -[TIP] -==== -The `addport` script mentioned in <> now detects when the port to add has previously existed, and attempts to handle all except the `ports/LEGAL` step automatically. -==== - -[[ports-qa-repocopies]] -=== Repository Copies - -[[ports-qa-repocopy-when]] -==== When do we need a repository copy? - -When you want to add a port that is related to any port that is already in the tree in a separate directory, you have to do a repository copy. -Here related means it is a different version or a slightly modified version. -Examples are [.filename]#print/ghostscript*# (different versions) and [.filename]#x11-wm/windowmaker*# (English-only and internationalized version). - -Another example is when a port is moved from one subdirectory to another, or when the name of a directory must be changed because the authors renamed their software even though it is a descendant of a port already in a tree. - -[[ports-qa-repocopy-how]] -==== What do I need to do? - -With Subversion, a repo copy can be done by any committer: - -* Doing a repo copy: - -[.procedure] -==== -. Verify that the target directory does not exist. -. Use `svn up` to make certain the original files, directories, and checkout information is current. -. Use `svn move` or `svn copy` to do the repo copy. -. Upgrade the copied port to the new version. Remember to add or change the `PKGNAMEPREFIX` or `PKGNAMESUFFIX` so there are no duplicate ports with the same name. In some rare cases it may be necessary to change the `PORTNAME` instead of adding `PKGNAMEPREFIX` or `PKGNAMESUFFIX`, but this is only done when it is really needed — for example, using an existing port as the base for a very similar program with a different name, or upgrading a port to a new upstream version which actually changes the distribution name, like the transition from [.filename]#textproc/libxml# to [.filename]#textproc/libxml2#. In most cases, adding or changing `PKGNAMEPREFIX` or `PKGNAMESUFFIX` suffices. -. Add the new subdirectory to the `SUBDIR` listing in the parent directory [.filename]#Makefile#. You can run make checksubdirs in the parent directory to check this. -. If the port changed categories, modify the CATEGORIES line of the port's [.filename]#Makefile# accordingly -. Add an entry to [.filename]#ports/MOVED#, if you remove the original port. -. Commit all changes on one commit. -==== - -* When removing a port: - -[.procedure] -==== -. Perform a thorough check of the ports collection for any dependencies on the old port location/name, and update them. Running `grep` on [.filename]#INDEX# is not enough because some ports have dependencies enabled by compile-time options. A full `grep -r` of the ports collection is recommended. -. Remove the old port and the old `SUBDIR` entry. +. Perform a thorough check of the ports collection for any dependencies on the old port location/name, and update them. Running `grep` on [.filename]#INDEX# is not enough because some ports have dependencies enabled by compile-time options. A full `git grep` of the ports collection is recommended. +. Remove the `SUBDIR` entry from the old category Makefile and add a `SUBDIR` entry to the new category Makefile. . Add an entry to [.filename]#ports/MOVED#. -==== - -* After repo moves (“rename” operations where a port is copied and the old location is removed): - -[.procedure] -==== -* Follow the same steps that are outlined in the previous two entries, to activate the new location of the port and remove the old one. +. Move the port with `git mv`. +. Commit the changes. ==== [[ports-qa-freeze]] @@ -4328,106 +4230,17 @@ Commits that are not covered by these blanket approvals always require explicit [[ports-qa-misc-commit-mfh]] ==== What is the procedure for merging commits to the quarterly branch? -A script is provided to automate merging a specific commit: [.filename]#ports/Tools/scripts/mfh#. It is used as follows: - -[source,shell] -.... -% /usr/ports/Tools/scripts/mfh 380362 - U 2015Q1 -Checked out revision 380443. -A 2015Q1/security -Updating '2015Q1/security/rubygem-sshkit': -A 2015Q1/security/rubygem-sshkit -A 2015Q1/security/rubygem-sshkit/Makefile -A 2015Q1/security/rubygem-sshkit/distinfo -A 2015Q1/security/rubygem-sshkit/pkg-descr -Updated to revision 380443. ---- Merging r380362 into '2015Q1': -U 2015Q1/security/rubygem-sshkit/Makefile -U 2015Q1/security/rubygem-sshkit/distinfo ---- Recording mergeinfo for merge of r380362 into '2015Q1': - U 2015Q1 ---- Recording mergeinfo for merge of r380362 into '2015Q1/security': - G 2015Q1/security ---- Eliding mergeinfo from '2015Q1/security': - U 2015Q1/security ---- Recording mergeinfo for merge of r380362 into '2015Q1/security/rubygem-sshkit': - G 2015Q1/security/rubygem-sshkit ---- Eliding mergeinfo from '2015Q1/security/rubygem-sshkit': - U 2015Q1/security/rubygem-sshkit - M 2015Q1 -M 2015Q1/security/rubygem-sshkit/Makefile -M 2015Q1/security/rubygem-sshkit/distinfo -Index: 2015Q1/security/rubygem-sshkit/Makefile -=================================================================== ---- 2015Q1/security/rubygem-sshkit/Makefile (revision 380443) -+++ 2015Q1/security/rubygem-sshkit/Makefile (working copy) -@@ -2,7 +2,7 @@ - # $FreeBSD$ - - PORTNAME= sshkit --PORTVERSION= 1.6.1 -+PORTVERSION= 1.7.0 - CATEGORIES= security rubygems - MASTER_SITES= RG - -Index: 2015Q1/security/rubygem-sshkit/distinfo -=================================================================== ---- 2015Q1/security/rubygem-sshkit/distinfo (revision 380443) -+++ 2015Q1/security/rubygem-sshkit/distinfo (working copy) -@@ -1,2 +1,2 @@ --SHA256 (rubygem/sshkit-1.6.1.gem) = 8ca67e46bb4ea50fdb0553cda77552f3e41b17a5aa919877d93875dfa22c03a7 --SIZE (rubygem/sshkit-1.6.1.gem) = 135680 -+SHA256 (rubygem/sshkit-1.7.0.gem) = 90effd1813363bae7355f4a45ebc8335a8ca74acc8d0933ba6ee6d40f281a2cf -+SIZE (rubygem/sshkit-1.7.0.gem) = 136192 -Index: 2015Q1 -=================================================================== ---- 2015Q1 (revision 380443) -+++ 2015Q1 (working copy) - -Property changes on: 2015Q1 -___________________________________________________________________ -Modified: svn:mergeinfo - Merged /head:r380362 -Do you want to commit? (no = start a shell) [y/n] -.... - -At that point, the script will either open a shell for you to fix things, or open your text editor with the commit message all prepared and then commit the merge. - -The script assumes that you can connect to `repo.FreeBSD.org` with SSH directly, so if your local login name is different than your FreeBSD cluster account, you need a few lines in your [.filename]#~/.ssh/config#: - -[.programlisting] -.... -Host *.freebsd.org - User freebsd-login -.... - -[TIP] -==== -The script is also able to merge more than one revision at a time. -If there have been other updates to the port since the branch was created that have not been merged because they were not security related. -Add the different revisions in the order they were committed on the `mfh` line. -The new commit log message will contain the combined log messages from all the original commits. -These messages must be edited to show what is actually being done with the new commit. - +Merging commits to the quarterly branch is very similar to MFC'ing a commit in the src repository, so basically: [source,shell] .... -% /usr/ports/Tools/scripts/mfh r407208 r407713 r407722 r408567 r408943 r410728 +% git checkout 2021Q2 +% git cherry-pick -x $HASH +(verify everything is OK, for example by doing a build test) +% git push .... -==== - -[NOTE] -==== -The mfh script can also take an optional first argument, the branch where the merge is being done. -Only the latest quarterly branch is supported, so specifying the branch is discouraged. -To be safe, the script will give a warning if the quarterly branch is not the latest: -[source,shell] -.... -% /usr/ports/Tools/scripts/mfh 2016Q1 r407208 r407713 -/!\ The latest branch is 2016Q2, do you really want to commit to 2016Q1? [y/n] -.... -==== +where '$HASH' is the hash of the commit you want to copy over to the quarterly branch. +The -x parameter ensures the hash '$HASH' of the main branch is included in the new commit message of the quarterly branch. [[ports-qa-new-category]] === Creating a New Category From owner-dev-commits-doc-all@freebsd.org Tue Apr 6 19:11:00 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DA42A5B5016 for ; Tue, 6 Apr 2021 19:11: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFHDh5vmZz4bbp; Tue, 6 Apr 2021 19:11:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BDB56115FE; Tue, 6 Apr 2021 19:11:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 136JB0UA091701; Tue, 6 Apr 2021 19:11:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 136JB0xL091700; Tue, 6 Apr 2021 19:11:00 GMT (envelope-from git) Date: Tue, 6 Apr 2021 19:11:00 GMT Message-Id: <202104061911.136JB0xL091700@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Rene Ladan Subject: git: 7792f7607a - main - Update some links and branch names in the Problem Report article. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7792f7607a0444a8f6b69b0d4ecad707cf647a88 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2021 19:11:00 -0000 The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/doc/commit/?id=7792f7607a0444a8f6b69b0d4ecad707cf647a88 commit 7792f7607a0444a8f6b69b0d4ecad707cf647a88 Author: Rene Ladan AuthorDate: 2021-04-06 18:54:52 +0000 Commit: Rene Ladan CommitDate: 2021-04-06 18:54:52 +0000 Update some links and branch names in the Problem Report article. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D29450 --- documentation/content/en/articles/problem-reports/_index.adoc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/documentation/content/en/articles/problem-reports/_index.adoc b/documentation/content/en/articles/problem-reports/_index.adoc index 86dbb2d877..3294a5266e 100644 --- a/documentation/content/en/articles/problem-reports/_index.adoc +++ b/documentation/content/en/articles/problem-reports/_index.adoc @@ -100,7 +100,7 @@ For the base FreeBSD code, you should carefully study the contents of [.filename (This is vital information if you are upgrading from one version to another-especially if you are upgrading to the FreeBSD-CURRENT branch). + However, if the problem is in something that was installed as a part of the FreeBSD Ports Collection, you should refer to [.filename]#/usr/ports/UPDATING# (for individual ports) or [.filename]#/usr/ports/CHANGES# (for changes that affect the entire Ports Collection). -https://svnweb.freebsd.org/ports/head/UPDATING?view=log[https://svnweb.freebsd.org/ports/head/UPDATING?view=log] and https://svnweb.freebsd.org/ports/head/CHANGES?view=log[https://svnweb.freebsd.org/ports/head/CHANGES?view=log] are also available via svnweb. +https://cgit.freebsd.org/ports/tree/UPDATING[https://cgit.freebsd.org/ports/tree/UPDATING] and https://cgit.freebsd.org/ports/tree/CHANGES[https://cgit.freebsd.org/ports/tree/CHANGES] are also available via cgit. [[pr-writing]] == Writing the Problem Report @@ -117,7 +117,7 @@ Before we get into the mechanics of the program used to generate and submit PRs, * _If you are a maintainer, say so._ If you are maintaining a part of the source code (for instance, an existing port), you definitely should set the "Class" of your PR to `maintainer-update`. This way any committer that handles your PR will not have to check. * _Be specific._ The more information you supply about what problem you are having, the better your chance of getting a response. -** Include the version of FreeBSD you are running (there is a place to put that, see below) and on which architecture. You should include whether you are running from a release (e.g., from a CD-ROM or download), or from a system maintained by Subversion (and, if so, what revision number you are at). If you are tracking the FreeBSD-CURRENT branch, that is the very first thing someone will ask, because fixes (especially for high-profile problems) tend to get committed very quickly, and FreeBSD-CURRENT users are expected to keep up. +** Include the version of FreeBSD you are running (there is a place to put that, see below) and on which architecture. You should include whether you are running from a release (e.g., from a CD-ROM or download), or from a system maintained by Git (and, if so, what hash and branch you are at). If you are tracking the FreeBSD-CURRENT branch, that is the very first thing someone will ask, because fixes (especially for high-profile problems) tend to get committed very quickly, and FreeBSD-CURRENT users are expected to keep up. ** Include which global options you have specified in your [.filename]#make.conf#, [.filename]#src.conf#, and [.filename]#src-env.conf#. Given the infinite number of options, not every combination may be fully supported. ** If the problem can be reproduced easily, include information that will help a developer to reproduce it themselves. If a problem can be demonstrated with specific input then include an example of that input if possible, and include both the actual and the expected output. If this data is large or cannot be made public, then do try to create a minimal file that exhibits the same issue and that can be included within the PR. ** If this is a kernel problem, then be prepared to supply the following information. (You do not have to include these by default, which only tends to fill up the database, but you should include excerpts that you think might be relevant): @@ -152,8 +152,8 @@ Finally, if the submission is lengthy, prepare the work offline so that nothing [[pr-writing-attaching-patches]] == Attaching Patches or Files -When attaching a patch, be sure to use either `svn diff` or man:diff[1] with the `-u` option to create a unified diff and make sure to specify the SVN revision number of the repository against which you modified files, so the developers who read your report will be able to apply them easily. -For problems with the kernel or the base utilities, a patch against FreeBSD-CURRENT (the HEAD Subversion branch) is preferred since all new code should be applied and tested there first. +When attaching a patch, be sure to use either `git diff` or man:diff[1] with the `-u` option to create a unified diff and make sure to specify the Git hash and branch of the repository against which you modified files, so the developers who read your report will be able to apply them easily. +For problems with the kernel or the base utilities, a patch against FreeBSD-CURRENT (the main Git branch) is preferred since all new code should be applied and tested there first. After appropriate or substantial testing has been done, the code will be merged/migrated to the FreeBSD-STABLE branch. If you attach a patch inline, instead of as an attachment, note that the most common problem by far is the tendency of some email programs to render tabs as spaces, which will completely ruin anything intended to be part of a Makefile. @@ -249,7 +249,7 @@ There are a few ways to do so, ideally in the following order, with a few days b * Find the relevant FreeBSD mailing list for the problem report from the link:{handbook}#eresources-mail[list in the Handbook] and send a message to that list asking about assistance or comments on the problem report. * Join the relevant IRC channels. A partial listing is here: https://wiki.freebsd.org/IrcChannels[]. Inform the people in that channel about the problem report and ask for assistance. Be patient and stay in the channel after posting, so that the people from different time zones around the world have a chance to catch up. -* Find committers interested in the problem that was reported. If the problem was in a particular tool, binary, port, document, or source file, check the http://svnweb.FreeBSD.org[SVN Repository]. Locate the last few committers who made substantive changes to the file, and try to reach them via IRC or email. A list of committers and their emails can be found in the link:{contributors}[Contributors to FreeBSD] article. +* Find committers interested in the problem that was reported. If the problem was in a particular tool, binary, port, document, or source file, check the https://cgit.FreeBSD.org[Git Repository]. Locate the last few committers who made substantive changes to the file, and try to reach them via IRC or email. A list of committers and their emails can be found in the link:{contributors}[Contributors to FreeBSD] article. Remember that these people are volunteers, just like maintainers and users, so they might not be immediately available to assist with the problem report. Patience and consistency in the follow-ups is highly advised and appreciated. From owner-dev-commits-doc-all@freebsd.org Tue Apr 6 19:11:02 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 421BE5B467A for ; Tue, 6 Apr 2021 19:11:02 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFHDk11QPz4c2n; Tue, 6 Apr 2021 19:11:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E9D76112FB; Tue, 6 Apr 2021 19:11:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 136JB1Li091727; Tue, 6 Apr 2021 19:11:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 136JB1Mu091726; Tue, 6 Apr 2021 19:11:01 GMT (envelope-from git) Date: Tue, 6 Apr 2021 19:11:01 GMT Message-Id: <202104061911.136JB1Mu091726@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Rene Ladan Subject: git: a3ad91f11f - main - Handbook: adjust for the various git migrations. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a3ad91f11fea5cc457eb053c46c26e4dd43df599 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2021 19:11:02 -0000 The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/doc/commit/?id=a3ad91f11fea5cc457eb053c46c26e4dd43df599 commit a3ad91f11fea5cc457eb053c46c26e4dd43df599 Author: Rene Ladan AuthorDate: 2021-04-06 18:59:06 +0000 Commit: Rene Ladan CommitDate: 2021-04-06 19:00:09 +0000 Handbook: adjust for the various git migrations. - prefer to install git as a package over building it oneself. - update dates in in the introduction - let some Subversion URLs move to the src repository, as it is the only repository with an Subversion exporter active. - let the user install git instead of subversion for doing ports work. Reviewed by: emaste, mat Differential Revision: https://reviews.freebsd.org/D29450 --- .../en/books/handbook/cutting-edge/_index.adoc | 2 +- .../content/en/books/handbook/mirrors/_index.adoc | 21 ++++++++++--------- .../content/en/books/handbook/ports/_index.adoc | 24 +++++++++++----------- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/documentation/content/en/books/handbook/cutting-edge/_index.adoc b/documentation/content/en/books/handbook/cutting-edge/_index.adoc index ee11b2951b..fe9e5503fb 100644 --- a/documentation/content/en/books/handbook/cutting-edge/_index.adoc +++ b/documentation/content/en/books/handbook/cutting-edge/_index.adoc @@ -656,7 +656,7 @@ Read [.filename]#/usr/src/UPDATING#. Any manual steps that must be performed bef === Updating the Source FreeBSD source code is located in [.filename]#/usr/src/#. -The preferred method of updating this source is through the Subversion version control system. +The preferred method of updating this source is through the Git version control system. Verify that the source code is under version control: [source,shell] diff --git a/documentation/content/en/books/handbook/mirrors/_index.adoc b/documentation/content/en/books/handbook/mirrors/_index.adoc index dc6d122428..f0be132b3c 100644 --- a/documentation/content/en/books/handbook/mirrors/_index.adoc +++ b/documentation/content/en/books/handbook/mirrors/_index.adoc @@ -427,19 +427,19 @@ or as a package: [[git-install]] === Installation -Git can be installed from the Ports Collection: +Git can be installed as a package: [source,shell] .... -# cd /usr/ports/devel/git -# make install clean +# pkg install git .... -Git can also be installed as a package: +Git can also be installed from the Ports Collection: [source,shell] .... -# pkg install git +# cd /usr/ports/devel/git +# make install clean .... [[git-usage]] @@ -706,10 +706,11 @@ For more information, please refer to the "Commit message lists" section of C.2. [[svn-intro]] === Introduction -As of July 2012, FreeBSD uses Subversion as the only version control system for storing all of FreeBSD's Ports Collection. As of December 2020, FreeBSD uses git as the primary version control system for storing all of FreeBSD's source code and documentation. Changes from the git repo on the `stable/11`, `stable/12` and related releng branches are exported to the subversion repository. This export will continue through the life of these branches. +From July 2012 to March 2021, FreeBSD used Subversion as the only version control system for storing all of FreeBSD's Ports Collection. +As of April 2021, FreeBSD uses git as the only version control system for storing all of FreeBSD's Ports Collection. [NOTE] ==== @@ -778,7 +779,7 @@ Move or delete an existing destination directory before using `checkout` for the Checkout over an existing non-`svn` directory can cause conflicts between the existing files and those brought in from the repository. ==== -Subversion uses URLs to designate a repository, taking the form of _protocol://hostname/path_. The first component of the path is the FreeBSD repository to access. There are three different repositories, `base` for the FreeBSD base system source code, `ports` for the Ports Collection, and `doc` for documentation. For example, the URL `https://svn.FreeBSD.org/ports/head/` specifies the main branch of the ports repository, using the `https` protocol. +Subversion uses URLs to designate a repository, taking the form of _protocol://hostname/path_. The first component of the path is the FreeBSD repository to access. There are three different repositories, `base` for the FreeBSD base system source code, `ports` for the Ports Collection, and `doc` for documentation. For example, the URL `https://svn.FreeBSD.org/base/head/` specifies the main branch of the ports repository, using the `https` protocol. A checkout from a given repository is performed with a command like this: @@ -793,11 +794,11 @@ where: * _branch_ depends on the repository used. `ports` and `doc` are mostly updated in the `head` branch, while `base` maintains the latest version of -CURRENT under `head` and the respective latest versions of the -STABLE branches under `stable/9` (9._x_) and `stable/10` (10._x_). * _lwcdir_ is the target directory where the contents of the specified branch should be placed. This is usually [.filename]#/usr/ports# for `ports`, [.filename]#/usr/src# for `base`, and [.filename]#/usr/doc# for `doc`. -This example checks out the Ports Collection from the FreeBSD repository using the HTTPS protocol, placing the local working copy in [.filename]#/usr/ports#. If [.filename]#/usr/ports# is already present but was not created by `svn`, remember to rename or delete it before the checkout. +This example checks out the Source Tree from the FreeBSD repository using the HTTPS protocol, placing the local working copy in [.filename]#/usr/src#. If [.filename]#/usr/src# is already present but was not created by `svn`, remember to rename or delete it before the checkout. [source,shell] .... -# svn checkout https://svn.FreeBSD.org/ports/head /usr/ports +# svn checkout https://svn.FreeBSD.org/base/head /usr/src .... Because the initial checkout must download the full branch of the remote repository, it can take a while. Please be patient. @@ -813,7 +814,7 @@ To update [.filename]#/usr/ports# created in the example above, use: [source,shell] .... -# svn update /usr/ports +# svn update /usr/src .... The update is much quicker than a checkout, only transferring files that have changed. diff --git a/documentation/content/en/books/handbook/ports/_index.adoc b/documentation/content/en/books/handbook/ports/_index.adoc index 2da3bfaabc..7df5c7c6d4 100644 --- a/documentation/content/en/books/handbook/ports/_index.adoc +++ b/documentation/content/en/books/handbook/ports/_index.adoc @@ -610,40 +610,40 @@ When using `fetch`, the `extract` or the `update` operation may be run consecuti .... **** -[[ports-using-subversion-method]] +[[ports-using-git-method]] [.procedure] **** -*Procedure: Subversion Method* +*Procedure: Git Method* -If more control over the ports tree is needed or if local changes need to be maintained, Subversion can be used to obtain the Ports Collection. Refer to link:{committers-guide}#subversion-primer[the Subversion Primer] for a detailed description of Subversion. +If more control over the ports tree is needed or if local changes need to be maintained, Git can be used to obtain the Ports Collection. Refer to link:{committers-guide}#git-primer[the Git Primer] for a detailed description of Git. -. Subversion must be installed before it can be used to check out the ports tree. If a copy of the ports tree is already present, install Subversion like this: +. Git must be installed before it can be used to check out the ports tree. If a copy of the ports tree is already present, install Git like this: + [source,shell] .... -# cd /usr/ports/devel/subversion +# cd /usr/ports/devel/git # make install clean .... + -If the ports tree is not available, or pkg is being used to manage packages, Subversion can be installed as a package: +If the ports tree is not available, or pkg is being used to manage packages, Git can be installed as a package: + [source,shell] .... -# pkg install subversion +# pkg install git .... + . Check out a copy of the ports tree: + [source,shell] .... -# svn checkout https://svn.FreeBSD.org/ports/head /usr/ports +# git clone https://git.FreeBSD.org/ports.git /usr/ports .... + -. As needed, update [.filename]#/usr/ports# after the initial Subversion checkout: +. As needed, update [.filename]#/usr/ports# after the initial Git checkout: + [source,shell] .... -# svn update /usr/ports +# git -C /usr/ports pull .... **** @@ -806,7 +806,7 @@ It is recommended to read the messages as the port is uninstalled. If the port h Over time, newer versions of software become available in the Ports Collection. This section describes how to determine which software can be upgraded and how to perform the upgrade. -To determine if newer versions of installed ports are available, ensure that the latest version of the ports tree is installed, using the updating command described in either <> or <>. On FreeBSD 10 and later, or if the system has been converted to pkg, the following command will list the installed ports which are out of date: +To determine if newer versions of installed ports are available, ensure that the latest version of the ports tree is installed, using the updating command described in either <> or <>. On FreeBSD 10 and later, or if the system has been converted to pkg, the following command will list the installed ports which are out of date: [source,shell] .... @@ -1049,7 +1049,7 @@ Scanning //usr/share/certs/trusted for certificates... [source,shell] .... -# poudriere ports -c -p local -m svn+https +# poudriere ports -c -p local -m git+https [00:00:00] Creating local fs at /poudriere/ports/local... done [00:00:00] Checking out the ports tree... done .... From owner-dev-commits-doc-all@freebsd.org Tue Apr 6 19:11:04 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 69EDA5B467C for ; Tue, 6 Apr 2021 19:11: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFHDm0dn9z4bsL; Tue, 6 Apr 2021 19:11:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 19B1711B16; Tue, 6 Apr 2021 19:11:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 136JB3Es091750; Tue, 6 Apr 2021 19:11:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 136JB2QD091749; Tue, 6 Apr 2021 19:11:02 GMT (envelope-from git) Date: Tue, 6 Apr 2021 19:11:02 GMT Message-Id: <202104061911.136JB2QD091749@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Rene Ladan Subject: git: be5f234b0c - main - Porters Handbook: convert most instructions to git MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be5f234b0ccfbc05b6d112e51cdf95686a0ee43e Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2021 19:11:04 -0000 The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/doc/commit/?id=be5f234b0ccfbc05b6d112e51cdf95686a0ee43e commit be5f234b0ccfbc05b6d112e51cdf95686a0ee43e Author: Rene Ladan AuthorDate: 2021-04-06 19:09:41 +0000 Commit: Rene Ladan CommitDate: 2021-04-06 19:09:41 +0000 Porters Handbook: convert most instructions to git - mention cgit instead of svnweb - remove the $FreeBSD$ identifier from the example Makefile, git does not expand keywords. - update instructions to create a diff - update instructions to set up poudriere jails ad ports trees. Reviewed by: emaste, mat Differential Revision: https://reviews.freebsd.org/D29450 --- .../books/porters-handbook/keeping-up/_index.adoc | 4 +- .../books/porters-handbook/makefiles/_index.adoc | 2 +- .../en/books/porters-handbook/order/_index.adoc | 14 ----- .../porters-handbook/porting-samplem/_index.adoc | 5 -- .../porters-handbook/quick-porting/_index.adoc | 11 ++-- .../porters-handbook/slow-porting/_index.adoc | 2 - .../en/books/porters-handbook/special/_index.adoc | 2 +- .../en/books/porters-handbook/testing/_index.adoc | 14 ++--- .../books/porters-handbook/upgrading/_index.adoc | 62 ++++++++-------------- 9 files changed, 36 insertions(+), 80 deletions(-) diff --git a/documentation/content/en/books/porters-handbook/keeping-up/_index.adoc b/documentation/content/en/books/porters-handbook/keeping-up/_index.adoc index b95cd8488b..ea01a72767 100644 --- a/documentation/content/en/books/porters-handbook/keeping-up/_index.adoc +++ b/documentation/content/en/books/porters-handbook/keeping-up/_index.adoc @@ -40,10 +40,10 @@ To use FreshPorts, an account is required. Those with registered email addresses FreshPorts also has a sanity test feature which automatically tests each commit to the FreeBSD ports tree. If subscribed to this service, a committer will receive notifications of any errors which FreshPorts detects during sanity testing of their commits. -[[svnweb]] +[[cgit]] == The Web Interface to the Source Repository -It is possible to browse the files in the source repository by using a web interface. Changes that affect the entire port system are now documented in the http://svnweb.FreeBSD.org/ports/head/CHANGES[CHANGES] file. Changes that affect individual ports are now documented in the http://svnweb.FreeBSD.org/ports/head/UPDATING[UPDATING] file. However, the definitive answer to any question is undoubtedly to read the source code of http://svnweb.FreeBSD.org/ports/head/Mk/bsd.port.mk[bsd.port.mk], and associated files. +It is possible to browse the files in the source repository by using a web interface. Changes that affect the entire port system are now documented in the https://cgit.freebsd.org/ports/tree/CHANGES[CHANGES] file. Changes that affect individual ports are now documented in the https://cgit.FreeBSD.org/ports/tree/UPDATING[UPDATING] file. However, the definitive answer to any question is undoubtedly to read the source code of https://cgit.FreeBSD.org/ports/tree/Mk/bsd.port.mk[bsd.port.mk], and associated files. [[ports-mailing-list]] == The FreeBSD Ports Mailing List diff --git a/documentation/content/en/books/porters-handbook/makefiles/_index.adoc b/documentation/content/en/books/porters-handbook/makefiles/_index.adoc index f198adc83b..7b8b0ba0a4 100644 --- a/documentation/content/en/books/porters-handbook/makefiles/_index.adoc +++ b/documentation/content/en/books/porters-handbook/makefiles/_index.adoc @@ -1149,7 +1149,7 @@ MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= make .... -These values and variables are defined in https://svnweb.freebsd.org/ports/head/Mk/bsd.sites.mk?view=markup[Mk/bsd.sites.mk]. New entries are added often, so make sure to check the latest version of this file before submitting a port. +These values and variables are defined in https://cgit.freebsd.org/ports/tree/Mk/bsd.sites.mk[Mk/bsd.sites.mk]. New entries are added often, so make sure to check the latest version of this file before submitting a port. [TIP] ==== diff --git a/documentation/content/en/books/porters-handbook/order/_index.adoc b/documentation/content/en/books/porters-handbook/order/_index.adoc index ff8e404f44..0802c2e28a 100644 --- a/documentation/content/en/books/porters-handbook/order/_index.adoc +++ b/documentation/content/en/books/porters-handbook/order/_index.adoc @@ -31,20 +31,6 @@ toc::[] The first sections of the [.filename]#Makefile# must always come in the same order. This standard makes it so everyone can easily read any port without having to search for variables in a random order. -The first line of a [.filename]#Makefile# is always a comment containing the Subversion version control ID, followed by an empty line. In new ports, it looks like this: - -[.programlisting] -.... -# $FreeBSD$ -.... - -In existing ports, Subversion has expanded it to look like this: - -[.programlisting] -.... -# $FreeBSD: head/ports-mgmt/pkg/Makefile 437007 2017-03-26 21:25:47Z bapt $ -.... - [NOTE] ==== The sections and variables described here are mandatory in a ordinary port. In a slave port, many sections and variables can be skipped. diff --git a/documentation/content/en/books/porters-handbook/porting-samplem/_index.adoc b/documentation/content/en/books/porters-handbook/porting-samplem/_index.adoc index c835d0009b..0307f18a51 100644 --- a/documentation/content/en/books/porters-handbook/porting-samplem/_index.adoc +++ b/documentation/content/en/books/porters-handbook/porting-samplem/_index.adoc @@ -35,11 +35,6 @@ The format shown is the recommended one for ordering variables, empty lines betw [.programlisting] .... -# $FreeBSD$ -[ ^^^^^^^^^ This will be automatically replaced with RCS ID string by SVN -when it is committed to our repository. If upgrading a port, do not alter -this line back to "$FreeBSD$". SVN deals with it automatically.] - [section to describe the port itself and the master site - PORTNAME and PORTVERSION or the DISTVERSION* variables are always first, followed by CATEGORIES, and then MASTER_SITES, which can be followed diff --git a/documentation/content/en/books/porters-handbook/quick-porting/_index.adoc b/documentation/content/en/books/porters-handbook/quick-porting/_index.adoc index 27227a5b15..5f587c54e9 100644 --- a/documentation/content/en/books/porters-handbook/quick-porting/_index.adoc +++ b/documentation/content/en/books/porters-handbook/quick-porting/_index.adoc @@ -57,8 +57,6 @@ The minimal [.filename]#Makefile# would look something like this: [.programlisting] .... -# $FreeBSD$ - PORTNAME= oneko DISTVERSION= 1.1b CATEGORIES= games @@ -70,7 +68,7 @@ COMMENT= Cat chasing a mouse all over the screen .include .... -Try to figure it out. Do not worry about the contents of the `$FreeBSD$` line, it will be filled in automatically by Subversion when the port is imported to our main ports tree. A more detailed example is shown in the crossref:porting-samplem[porting-samplem,sample Makefile] section. +Try to figure it out. A more detailed example is shown in the crossref:porting-samplem[porting-samplem,sample Makefile] section. [[porting-desc]] == Writing the Description Files @@ -232,13 +230,12 @@ Next, create a man:patch[1], file. Assuming the port is called `oneko` and is in .Creating a [.filename]#.diff# for a New Port [example] ==== -Add all the files with `svn add`. `cd` to the base of the ports tree so full paths to the changed files are included in the diff, then generate the diff with `svn diff`. For example: +Add all the files with `git add .`, then generate the diff with `git diff`. For example: [source,shell] .... -% svn add . -% cd ../.. -% svn diff games/oneko > oneko.diff +% git add . +% git diff --staged > oneko.diff .... [IMPORTANT] diff --git a/documentation/content/en/books/porters-handbook/slow-porting/_index.adoc b/documentation/content/en/books/porters-handbook/slow-porting/_index.adoc index 0df377f3d1..e1c17a32fe 100644 --- a/documentation/content/en/books/porters-handbook/slow-porting/_index.adoc +++ b/documentation/content/en/books/porters-handbook/slow-porting/_index.adoc @@ -147,8 +147,6 @@ When generating patches for new, added files, `-N` is used to tell man:diff[1] t % diff -u -N newfile.orig newfile > patch-pathname-newfile .... -Do not add `$FreeBSD$` RCS strings in patches. When patches are added to the Subversion repository with `svn add`, the `fbsd:nokeywords` property is set to `yes` automatically so keywords in the patch are not modified when committed. The property can be added manually with `svn propset fbsd:nokeywords yes _files..._`. - Using the recurse (`-r`) option to man:diff[1] to generate patches is fine, but please look at the resulting patches to make sure there is no unnecessary junk in there. In particular, diffs between two backup files, [.filename]##Makefile##s when the port uses `Imake` or GNU `configure`, etc., are unnecessary and have to be deleted. If it was necessary to edit [.filename]#configure.in# and run `autoconf` to regenerate `configure`, do not take the diffs of `configure` (it often grows to a few thousand lines!). Instead, define `USES=autoreconf` and take the diffs of [.filename]#configure.in#. [[slow-patch-automatic-replacements]] diff --git a/documentation/content/en/books/porters-handbook/special/_index.adoc b/documentation/content/en/books/porters-handbook/special/_index.adoc index d01f331efa..10598628bd 100644 --- a/documentation/content/en/books/porters-handbook/special/_index.adoc +++ b/documentation/content/en/books/porters-handbook/special/_index.adoc @@ -2951,7 +2951,7 @@ The default value for `DATADIR` is [.filename]#${PREFIX}/share/${PORTNAME}#. It As for the choice of building Java ports from source or directly installing them from a binary distribution, there is no defined policy at the time of writing. However, people from the https://www.freebsd.org/java/[FreeBSD Java Project] encourage porters to have their ports built from source whenever it is a trivial task. -All the features that have been presented in this section are implemented in [.filename]#bsd.java.mk#. If the port needs more sophisticated Java support, please first have a look at the http://svnweb.FreeBSD.org/ports/head/Mk/bsd.java.mk?view=log[bsd.java.mk Subversion log] as it usually takes some time to document the latest features. Then, if the needed support that is lacking would be beneficial to many other Java ports, feel free to discuss it on the freebsd-java. +All the features that have been presented in this section are implemented in [.filename]#bsd.java.mk#. If the port needs more sophisticated Java support, please first have a look at the https://cgit.FreeBSD.org/ports/tree/Mk/bsd.java.mk[bsd.java.mk Git log] as it usually takes some time to document the latest features. Then, if the needed support that is lacking would be beneficial to many other Java ports, feel free to discuss it on the freebsd-java. Although there is a `java` category for PRs, it refers to the JDK porting effort from the FreeBSD Java project. Therefore, submit the Java port in the `ports` category as for any other port, unless the issue is related to either a JDK implementation or [.filename]#bsd.java.mk#. diff --git a/documentation/content/en/books/porters-handbook/testing/_index.adoc b/documentation/content/en/books/porters-handbook/testing/_index.adoc index 8e4c910ed3..25901637df 100644 --- a/documentation/content/en/books/porters-handbook/testing/_index.adoc +++ b/documentation/content/en/books/porters-handbook/testing/_index.adoc @@ -203,7 +203,7 @@ Fetch a `11.4-RELEASE` for `amd64` from the FTP server given by `FREEBSD_HOST` i [source,shell] .... -# poudriere jail -c -j 11i386 -v stable/11 -a i386 -m svn+https +# poudriere jail -c -j 11i386 -v stable/11 -a i386 -m git+https .... Create `tank/poudriere/jails/11i386`, mount it on [.filename]#/poudriere/jails/11i386#, then check out the tip of the Subversion branch of `FreeBSD-11-STABLE` from `SVN_HOST` in [.filename]#poudriere.conf# into [.filename]#/poudriere/jails/11i386/usr/src#, then complete a `buildworld` and install it into [.filename]#/poudriere/jails/11i386#. @@ -215,7 +215,7 @@ If a specific Subversion revision is needed, append it to the version string. Fo [source,shell] .... -# poudriere jail -c -j 11i386 -v stable/11@123456 -a i386 -m svn+https +# poudriere jail -c -j 11i386 -v stable/11@123456 -a i386 -m git+https .... ==== @@ -231,7 +231,7 @@ To create a Poudriere jail for `14.0-CURRENT`: [source,shell] .... -# poudriere jail -c -j 13amd64 -v head -a amd64 -m svn+https +# poudriere jail -c -j 14amd64 -v main -a amd64 -m git+https .... In order to run a `14.0-CURRENT` Poudriere jail you must be running `14.0-CURRENT`. In general, newer kernels can build and run older jails. For instance, a `14.0-CURRENT` kernel can build and run a `11.4-STABLE` Poudriere jail if the `COMPAT_FREEBSD11` kernel option was compiled in (on by default in `14.0-CURRENT`[.filename]#GENERIC# kernel config). @@ -268,7 +268,7 @@ updates the specified jail to the latest version available. For FreeBSD releases [TIP] ==== -For jails employing a `svn+*` method, it is helpful to add `-J _NumberOfParallelBuildJobs_` to speed up the build by increasing the number of parallel compile jobs used. For example, if the building machine has 6 CPUs, use: +For jails employing a `git+*` method, it is helpful to add `-J _NumberOfParallelBuildJobs_` to speed up the build by increasing the number of parallel compile jobs used. For example, if the building machine has 6 CPUs, use: [source,shell] .... @@ -291,16 +291,16 @@ or [source,shell] .... -# poudriere ports -c -m svn+https +# poudriere ports -c -m git+https .... -These commands create `tank/poudriere/ports/default`, mount it on [.filename]#/poudriere/ports/default#, and populate it using either man:portsnap[8] or Subversion. Afterward it is included in the list of known ports trees: +These commands create `tank/poudriere/ports/default`, mount it on [.filename]#/poudriere/ports/default#, and populate it using Git, man:portsnap[8], or Subversion. Afterward it is included in the list of known ports trees: [source,shell] .... # poudriere ports -l PORTSTREE METHOD TIMESTAMP PATH -default svn+https 2020-07-20 04:23:56 /poudriere/ports/default +default git+https 2020-07-20 04:23:56 /poudriere/ports/default .... [NOTE] diff --git a/documentation/content/en/books/porters-handbook/upgrading/_index.adoc b/documentation/content/en/books/porters-handbook/upgrading/_index.adoc index ed78762bfa..cff0c810d8 100644 --- a/documentation/content/en/books/porters-handbook/upgrading/_index.adoc +++ b/documentation/content/en/books/porters-handbook/upgrading/_index.adoc @@ -31,7 +31,7 @@ toc::[] When a port is not the most recent version available from the authors, update the local working copy of [.filename]#/usr/ports#. The port might have already been updated to the new version. -When working with more than a few ports, it will probably be easier to use Subversion to keep the whole ports collection up-to-date, as described in the link:{handbook}#ports-using/[Handbook]. This will have the added benefit of tracking all the port's dependencies. +When working with more than a few ports, it will probably be easier to use Git to keep the whole ports collection up-to-date, as described in the link:{handbook}#ports-using/[Handbook]. This will have the added benefit of tracking all the port's dependencies. The next step is to see if there is an update already pending. To do this, there are two options. There is a searchable interface to the https://bugs.freebsd.org/search/[FreeBSD Problem Report (PR) or bug database]. Select `Ports & Packages` in the `Product` multiple select menu, and enter the name of the port in the `Summary` field. @@ -48,18 +48,18 @@ To create a suitable `diff` for a single patch, copy the file that needs patchin % diff -u something.orig something > something.diff .... -Otherwise, either use the `svn diff` method (<>) or copy the contents of the port to an entire different directory and use the result of the recursive man:diff[1] output of the new and old ports directories (for example, if the modified port directory is called [.filename]#superedit# and the original is in our tree as [.filename]#superedit.bak#, then save the result of `diff -ruN superedit.bak superedit`). Either unified or context diff is fine, but port committers generally prefer unified diffs. Note the use of the `-N` option-this is the accepted way to force diff to properly deal with the case of new files being added or old files being deleted. Before sending us the diff, please examine the output to make sure all the changes make sense. (In particular, make sure to first clean out the work directories with `make clean`). +Otherwise, either use the `git diff` method (<>) or copy the contents of the port to an entire different directory and use the result of the recursive man:diff[1] output of the new and old ports directories (for example, if the modified port directory is called [.filename]#superedit# and the original is in our tree as [.filename]#superedit.bak#, then save the result of `diff -ruN superedit.bak superedit`). Either unified or context diff is fine, but port committers generally prefer unified diffs. Note the use of the `-N` option-this is the accepted way to force diff to properly deal with the case of new files being added or old files being deleted. Before sending us the diff, please examine the output to make sure all the changes make sense. (In particular, make sure to first clean out the work directories with `make clean`). [NOTE] ==== -If some files have been added, copied, moved, or removed, add this information to the problem report so that the committer picking up the patch will know what man:svn[1] commands to run. +If some files have been added, copied, moved, or removed, add this information to the problem report so that the committer picking up the patch will know what man:git[1] commands to run. ==== To simplify common operations with patch files, use `make makepatch` as described in crossref:slow-porting[slow-patch,Patching]. Other tools exists, like [.filename]#/usr/ports/Tools/scripts/patchtool.py#. Before using it, please read [.filename]#/usr/ports/Tools/scripts/README.patchtool#. If the port is unmaintained, and you are actively using it, please consider volunteering to become its maintainer. FreeBSD has over 4000 ports without maintainers, and this is an area where more volunteers are always needed. (For a detailed description of the responsibilities of maintainers, refer to the section in the link:{developers-handbook}#POLICIES-MAINTAINER[Developer's Handbook].) -To submit the diff, use the https://bugs.freebsd.org/submit/[bug submit form] (product `Ports & Packages`, component `Individual Port(s)`). Always include the category with the port name, followed by colon, and brief descripton of the issue. Examples: `_category/portname_: _add FOO option_`; `_category/portname_: _Update to X.Y_`. Please mention any added or deleted files in the message, as they have to be explicitly specified to man:svn[1] when doing a commit. Do not compress or encode the diff. +To submit the diff, use the https://bugs.freebsd.org/submit/[bug submit form] (product `Ports & Packages`, component `Individual Port(s)`). Always include the category with the port name, followed by colon, and brief descripton of the issue. Examples: `_category/portname_: _add FOO option_`; `_category/portname_: _Update to X.Y_`. Please mention any added or deleted files in the message, as they have to be explicitly specified to man:git[1] when doing a commit. Do not compress or encode the diff. Before submitting the bug, review the link:{problem-reports}#pr-writing/[ Writing the problem report] section in the Problem Reports article. It contains far more information about how to write useful problem reports. @@ -70,76 +70,56 @@ If the upgrade is motivated by security concerns or a serious fault in the curre [NOTE] ==== -Please use man:diff[1] or `svn diff` to create updates to existing ports. Other formats include the whole file and make it impossible to see just what has changed. When diffs are not included, the entire update might be ignored. +Please use man:diff[1] or `git diff` to create updates to existing ports. Other formats include the whole file and make it impossible to see just what has changed. When diffs are not included, the entire update might be ignored. ==== Now that all of that is done, read about how to keep up-to-date in crossref:keeping-up[keeping-up,Keeping Up]. -[[svn-diff]] -== Using Subversion to Make Patches +[[git-diff]] +== Using Git to Make Patches -When possible, please submit a man:svn[1] diff. They are easier to handle than diffs between "new and old" directories. It is easier to see what has changed, and to update the diff if something was modified in the Ports Collection since the work on it began, or if the committer asks for something to be fixed. Also, a patch generated with `svn diff` can be easily applied with `svn patch` and will save some time to the committer. +When possible, please submit a man:git[1] diff. They are easier to handle than diffs between "new and old" directories. It is easier to see what has changed, and to update the diff if something was modified in the Ports Collection since the work on it began, or if the committer asks for something to be fixed. Also, a patch generated with `git diff` can be easily applied with `git apply` and will save some time to the committer. [source,shell] .... -% cd ~/my_wrkdir <.> -% svn co https://svn.FreeBSD.org/ports/head/dns/pdnsd <.> -% cd ~/my_wrkdir/pdnsd +% cd ~/my_ports_wrkdir <.> +% git clone https://cgit.FreeBSD.org/ports.git <.> +% cd ~/my_wrkdir/dns/pdnsd .... <.> This can be anywhere, of course. Building ports is not limited to within [.filename]#/usr/ports/#. -<.> https://svn.FreeBSD.org/[svn.FreeBSD.org] is the FreeBSD public Subversion server. See link:{handbook}#svn-mirrors[Subversion mirror sites] for more information. +<.> https://cgit.FreeBSD.org/[cgit.FreeBSD.org] is the FreeBSD public Git server. See link:{handbook}#svn-mirrors[Subversion mirror sites] for more information. -While in the port directory, make any changes that are needed. If adding, copying, moving, or removing a file, use `svn` to track these changes: +While in the port directory, make any changes that are needed. If adding, moving, or removing a file, use `git` to track these changes: [source,shell] .... -% svn add new_file -% svn copy some_file file_copy -% svn move old_name new_name -% svn remove deleted_file +% git add new_file +% git mv old_name new_name +% git rm deleted_file .... Make sure to check the port using the checklist in crossref:quick-porting[porting-testing,Testing the Port] and crossref:quick-porting[porting-portlint,Checking the Port with `portlint`]. [source,shell] .... -% svn status -% svn update <.> +% git status --short +% git pull --rebase <.> .... -<.> This will attempt to merge the differences between the patch and current repository version. Watch the output carefully. The letter in front of each file name indicates what was done with it. See <> for a complete list. - -[[table-svn-up]] -.Subversion Update File Prefixes -[cols="10%,90%", frame="none"] -|=== -|U -|The file was updated without problems. - -|G -|The file was updated without problems (only when working against a remote repository). - -|M -|The file had been modified, and was merged without conflicts. - -|C -|The file had been modified, and was merged with conflicts. -|=== - -If `C` is displayed as a result of `svn update`, it means something changed in the Subversion repository and man:svn[1] was not able to merge the local changes with those from the repository. It is always a good idea to inspect the changes anyway, since man:svn[1] does not know anything about the structure of a port, so it might (and probably will) merge things that do not make sense. +<.> This will attempt to merge the differences between the patch and current repository version. Watch the output carefully. The letter in front of each file name indicates what was done with it. The last step is to make a unified man:diff[1] of the changes: [source,shell] .... -% svn diff > ../`make -VPKGNAME`.diff +% git diff . > ../`make -VPKGNAME`.diff .... [NOTE] ==== -If files have been added, copied, moved, or removed, include the man:svn[1] `add`, `copy`, `move`, and `remove` commands that were used. `svn move` or `svn copy` must be run before the patch can be applied. `svn add` or `svn remove` must be run after the patch is applied. +If files have been added, moved, or removed, include the man:git[1] `add`, `mv`, and `rm` commands that were used. `git mv` must be run before the patch can be applied. `git add` or `git rm` must be run after the patch is applied. ==== Send the patch following the link:{problem-reports}#pr-writing/[problem report submission guidelines]. From owner-dev-commits-doc-all@freebsd.org Tue Apr 6 19:28:31 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CFBB25B6538 for ; Tue, 6 Apr 2021 19:28:31 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFHcv5WQwz4gTC; Tue, 6 Apr 2021 19:28:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B071A11C34; Tue, 6 Apr 2021 19:28:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 136JSVKm011179; Tue, 6 Apr 2021 19:28:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 136JSVWt011178; Tue, 6 Apr 2021 19:28:31 GMT (envelope-from git) Date: Tue, 6 Apr 2021 19:28:31 GMT Message-Id: <202104061928.136JSVWt011178@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: =?utf-8?B?U3RlZmFuIEXDn2Vy?= Subject: git: dbbb680107 - main - [errata.adoc] The dc program fails to pop the operand of P MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dbbb680107bfcd2e34098ddf9841c0c51136e0e6 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2021 19:28:31 -0000 The branch main has been updated by se (ports, src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=dbbb680107bfcd2e34098ddf9841c0c51136e0e6 commit dbbb680107bfcd2e34098ddf9841c0c51136e0e6 Author: Stefan Eßer AuthorDate: 2021-04-06 19:16:38 +0000 Commit: Stefan Eßer CommitDate: 2021-04-06 19:28:21 +0000 [errata.adoc] The dc program fails to pop the operand of P This issue should be documented in an errata note. Approved by: re (gjb) --- website/content/en/releases/13.0R/errata.adoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/website/content/en/releases/13.0R/errata.adoc b/website/content/en/releases/13.0R/errata.adoc index da8ae2e854..89768cffd7 100644 --- a/website/content/en/releases/13.0R/errata.adoc +++ b/website/content/en/releases/13.0R/errata.adoc @@ -64,4 +64,6 @@ No open issues. [[late-news]] == Late-Breaking News -No late-breaking news. +[2021-04-05] A very late issue was discovered in the [.filename]#/usr/bin/dc# program. +The "P" command does not correctly pop the top of stack value and this will break complex scripts that continue after printing a result. +The [.filename]#/usr/bin/bc# program is not affected, since it does not depend on dc as its execution engine. From owner-dev-commits-doc-all@freebsd.org Tue Apr 6 19:43:26 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 76BD75B6C25 for ; Tue, 6 Apr 2021 19:43: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFHy62xDnz4hvp; Tue, 6 Apr 2021 19:43:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 57A5C11EF2; Tue, 6 Apr 2021 19:43:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 136JhQEV036666; Tue, 6 Apr 2021 19:43:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 136JhQPq036665; Tue, 6 Apr 2021 19:43:26 GMT (envelope-from git) Date: Tue, 6 Apr 2021 19:43:26 GMT Message-Id: <202104061943.136JhQPq036665@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Li-Wen Hsu Subject: git: 49630e4404 - main - Ports has been migrated from Subversion to Git MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49630e4404e96c05504430e29728ac75d9557e75 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2021 19:43:26 -0000 The branch main has been updated by lwhsu (ports, src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=49630e4404e96c05504430e29728ac75d9557e75 commit 49630e4404e96c05504430e29728ac75d9557e75 Author: Li-Wen Hsu AuthorDate: 2021-04-06 19:43:19 +0000 Commit: Li-Wen Hsu CommitDate: 2021-04-06 19:43:19 +0000 Ports has been migrated from Subversion to Git Approved by: carlavilla (implicitly) Sponsored by: The FreeBSD Foundation --- website/content/en/developers/cvs.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/content/en/developers/cvs.adoc b/website/content/en/developers/cvs.adoc index d14284bd5e..bbdf42d5b7 100644 --- a/website/content/en/developers/cvs.adoc +++ b/website/content/en/developers/cvs.adoc @@ -13,7 +13,7 @@ In December 2020, development of the base system migrated from Subversion to Git In December 2020, the FreeBSD Documentation Project moved from Subversion to Git. There is a https://cgit.FreeBSD.org/doc/[web interface] available for browsing the contents of the FreeBSD Documentation Project Git repository. -The FreeBSD Ports tree is planned to move from Subversion to Git at the end of March 2021. There is a https://cgit-dev.FreeBSD.org/ports/[web interface] for browsing the beta repository. +In April 2021, the FreeBSD Ports tree is moved from Subversion to Git. There is a https://cgit.FreeBSD.org/ports/[web interface] for browsing the repository. == Subversion @@ -21,6 +21,6 @@ https://subversion.apache.org/[Subversion] (SVN for short) is the legacy tool th In June 2008, development of the base system migrated from CVS to Subversion. Since December 2020, after development moved to Git, Subversion only receives translated commits from git2svn exporter in stable/11, stable/12 and supported release branches. The https://svnweb.FreeBSD.org/base/[web interface] is available for browsing the repository. -In May 2012, the FreeBSD Documentation Project moved from CVS to Subversion. The doc subversion repository does not receive any further updates after the development moved from Subversion to Git Since December 2020. There is a https://svnweb.FreeBSD.org/doc/[web interface] available for browsing the contents of the FreeBSD Documentation Project SVN repository. +In May 2012, the FreeBSD Documentation Project moved from CVS to Subversion. The doc subversion repository does not receive any further updates after the development moved from Subversion to Git since December 2020. There is a https://svnweb.FreeBSD.org/doc/[web interface] available for browsing the contents of the FreeBSD Documentation Project SVN repository. -In July 2012, the FreeBSD Ports tree moved from CVS to Subversion. There is a https://svnweb.FreeBSD.org/ports/[web interface] for browsing the repository. +In July 2012, the FreeBSD Ports tree moved from CVS to Subversion. The ports subversion repository does not receive any further updates after the development moved from Subversion to Git since April 2021. There is a https://svnweb.FreeBSD.org/ports/[web interface] for browsing the repository. From owner-dev-commits-doc-all@freebsd.org Tue Apr 6 19:44:15 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2FA965B6E94 for ; Tue, 6 Apr 2021 19:44: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFHz30tyTz4j2G; Tue, 6 Apr 2021 19:44:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 11B7211C71; Tue, 6 Apr 2021 19:44:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 136JiESP036835; Tue, 6 Apr 2021 19:44:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 136JiETU036834; Tue, 6 Apr 2021 19:44:14 GMT (envelope-from git) Date: Tue, 6 Apr 2021 19:44:14 GMT Message-Id: <202104061944.136JiETU036834@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Rene Ladan Subject: git: c9b990e272 - main - Committers Guide: fix some URLs and mention our GitHub mirror. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c9b990e272db88c3fd3ac3126874df1b6853b943 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2021 19:44:15 -0000 The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/doc/commit/?id=c9b990e272db88c3fd3ac3126874df1b6853b943 commit c9b990e272db88c3fd3ac3126874df1b6853b943 Author: Rene Ladan AuthorDate: 2021-04-06 19:42:02 +0000 Commit: Rene Ladan CommitDate: 2021-04-06 19:43:36 +0000 Committers Guide: fix some URLs and mention our GitHub mirror. Submitted by: lwhsu --- documentation/content/en/articles/committers-guide/_index.adoc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 36f3f52baa..8ddd8a7ab4 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -466,9 +466,10 @@ Again, the git-bisect manual (linked above) is a good resource for when things g The ports tree operates the same way. The branch names are different and the repositories are in different locations. -The cgit repository web interface for use with web browsers is at https://cgit.freebsd.org/ports.git . -The production git repository is at https://git.freebsd.org/ports.git and at ssh://anongit@git.FreeBSD.org/ports.git (or anongit@git.FreeBSD.org:ports.git). +The cgit repository web interface for use with web browsers is at https://cgit.FreeBSD.org/ports.git . +The production git repository is at https://git.FreeBSD.org/ports.git and at ssh://anongit@git.FreeBSD.org/ports.git (or anongit@git.FreeBSD.org:ports.git). +There is also a mirror on GitHub, see link:{handbook}mirrors/#mirrors[Exteral mirrors] for an overview. The 'current' branch is 'main' . The quarterly branches are named 'yyyyQn' for year 'yyyy' and quarter 'n'. From owner-dev-commits-doc-all@freebsd.org Tue Apr 6 19:45:37 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 90D8C5B6E2B for ; Tue, 6 Apr 2021 19:45:37 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFJ0d3dB5z4j58; Tue, 6 Apr 2021 19:45:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6F6F4120AB; Tue, 6 Apr 2021 19:45:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 136Jjbho037041; Tue, 6 Apr 2021 19:45:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 136JjbVG037040; Tue, 6 Apr 2021 19:45:37 GMT (envelope-from git) Date: Tue, 6 Apr 2021 19:45:37 GMT Message-Id: <202104061945.136JjbVG037040@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Li-Wen Hsu Subject: git: e20c2174c7 - main - Grammar fix MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e20c2174c7e02330fbc7d4f2c8d2d161fd7279b5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2021 19:45:37 -0000 The branch main has been updated by lwhsu (ports, src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=e20c2174c7e02330fbc7d4f2c8d2d161fd7279b5 commit e20c2174c7e02330fbc7d4f2c8d2d161fd7279b5 Author: Li-Wen Hsu AuthorDate: 2021-04-06 19:45:31 +0000 Commit: Li-Wen Hsu CommitDate: 2021-04-06 19:45:31 +0000 Grammar fix Approved by: carlavilla (implicitly) --- website/content/en/developers/cvs.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/en/developers/cvs.adoc b/website/content/en/developers/cvs.adoc index bbdf42d5b7..6d4fc63930 100644 --- a/website/content/en/developers/cvs.adoc +++ b/website/content/en/developers/cvs.adoc @@ -13,7 +13,7 @@ In December 2020, development of the base system migrated from Subversion to Git In December 2020, the FreeBSD Documentation Project moved from Subversion to Git. There is a https://cgit.FreeBSD.org/doc/[web interface] available for browsing the contents of the FreeBSD Documentation Project Git repository. -In April 2021, the FreeBSD Ports tree is moved from Subversion to Git. There is a https://cgit.FreeBSD.org/ports/[web interface] for browsing the repository. +In April 2021, the FreeBSD Ports tree has been moved from Subversion to Git. There is a https://cgit.FreeBSD.org/ports/[web interface] for browsing the repository. == Subversion From owner-dev-commits-doc-all@freebsd.org Tue Apr 6 19:47:11 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CFDAE5B6C4C for ; Tue, 6 Apr 2021 19:47:11 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFJ2R5XHbz4hxf; Tue, 6 Apr 2021 19:47:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B07B611EF7; Tue, 6 Apr 2021 19:47:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 136JlBTP037266; Tue, 6 Apr 2021 19:47:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 136JlBOi037265; Tue, 6 Apr 2021 19:47:11 GMT (envelope-from git) Date: Tue, 6 Apr 2021 19:47:11 GMT Message-Id: <202104061947.136JlBOi037265@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: 4011c596fd - main - Remove the subversion section from the committer's guide. 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: 4011c596fd6c81721138087a42011f839c034751 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2021 19:47:11 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=4011c596fd6c81721138087a42011f839c034751 commit 4011c596fd6c81721138087a42011f839c034751 Author: Warner Losh AuthorDate: 2021-04-06 17:04:28 +0000 Commit: Warner Losh CommitDate: 2021-04-06 19:45:16 +0000 Remove the subversion section from the committer's guide. FreeBSD committers no longer need to know how to use subversion. Remove the subversion primer from the committer's guide. Add a VCS history section. Suggestions by: lwhsu@ Differential Revision: https://reviews.freebsd.org/D29610 --- .../en/articles/committers-guide/_index.adoc | 848 +-------------------- 1 file changed, 6 insertions(+), 842 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 8ddd8a7ab4..091e3b5d14 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -2020,17 +2020,10 @@ git log refs/freebsd/vendor/zlib/1.2.10 would look at the log for the vendor branch for zlib starting at 1.2.10. -[[subversion-primer]] -== Subversion Primer +[[vcs-history]] +== Version Control History -New committers are assumed to already be familiar with the basic operation of Subversion. -If not, start by reading the http://svnbook.red-bean.com/[Subversion Book]. - -This section is relevant only for the ports tree. Information on Git is being worked into the handbook and other documents. -A draft version can be found at https://github.com/bsdimp/freebsd-git-docs/blob/main/SUMMARY.adoc - -[[svn-intro]] -=== Introduction +The project has moved to <>. The FreeBSD source repository switched from CVS to Subversion on May 31st, 2008. The first real SVN commit is __r179447__. @@ -2046,837 +2039,9 @@ The first real git commit hash is __3be01a475855e7511ad755b2defd2e0da5d58bbe__. The FreeBSD `ports` repository switched from CVS to Subversion on July 14th, 2012. The first real SVN commit is __r300894__. - -Subversion can be installed from the FreeBSD Ports Collection by issuing these commands: - -[source,shell] -.... -# pkg install subversion -.... - -[[svn-getting-started]] -=== Getting Started - -There are a few ways to obtain a working copy of the tree from Subversion. -This section will explain them. - -[[svn-getting-started-direct-checkout]] -==== Direct Checkout - -The first is to check out directly from the main repository. -For the `src` tree, use: - -[source,shell] -.... -% svn checkout svn+ssh://repo.freebsd.org/base/head /usr/src -.... - -For the `doc` tree, use: - -[source,shell] -.... -% svn checkout svn+ssh://repo.freebsd.org/doc/head /usr/doc -.... - -For the `ports` tree, use: - -[source,shell] -.... -% svn checkout svn+ssh://repo.freebsd.org/ports/head /usr/ports -.... - -[NOTE] -==== -Though the remaining examples in this document are written with the workflow of working with the `src` tree in mind, the underlying concepts are the same for working with the `doc` and the `ports` tree. -Ports related Subversion operations are listed in <>. -==== - -The above command will check out a `CURRENT` source tree as [.filename]#/usr/src/#, which can be any target directory on the local filesystem. -Omitting the final argument of that command causes the working copy, in this case, to be named "head", but that can be renamed safely. - -`svn+ssh` means the SVN protocol tunnelled over SSH. -The name of the server is `repo.freebsd.org`, `base` is the path to the repository, and `head` is the subdirectory within the repository. - -If your FreeBSD login name is different from the login name used on the local machine, either include it in the URL (for example `svn+ssh://jarjar@repo.freebsd.org/base/head`), or add an entry to [.filename]#~/.ssh/config# in the form: - -[.programlisting] -.... -Host repo.freebsd.org - User jarjar -.... - -This is the simplest method, but it is hard to tell just yet how much load it will place on the repository. - -[NOTE] -==== -The `svn diff` does not require access to the server as SVN stores a reference copy of every file in the working copy. -This, however, means that Subversion working copies are very large in size. -==== - -[[git-getting-started-base-layout]] -==== `RELENG_*` Branches and General Layout - -In `ssh://gitrepo.freebsd.org/src.git`, _src_ refers to the source tree. -Similarly, _ports_ refers to the ports tree, and so on. -These are separate repositories with their own change number sequences, access controls and commit mail. - -For the src repository, `main` refers to the -CURRENT tree. -For example, [.filename]#head/bin/ls# is what would go into [.filename]#/usr/src/bin/ls# in a release. -Some key branches are: - -* _main_ which corresponds to `HEAD`, also known as `-CURRENT`. -* _stable/n_ which corresponds to `RELENG_n`. -* _releng/n.n_ which corresponds to `RELENG_n_n`. -* _release/n.n.n_ which corresponds to `RELENG_n_n_n_RELEASE`. -* _vendor*_ is the vendor branch import work area. - -[[git-getting-started-doc-layout]] -==== FreeBSD Documentation Project Branches and Layout - -In `ssh://gitrepo.freebsd.org/doc.git`, _doc_ refers to the repository of the documentation tree. - -In general, most FreeBSD Documentation Project work will be done within the `main` branch of the documentation source tree. - -FreeBSD documentation is written and/or translated to various languages, each in a separate directory in the `main` branch. - -Each translation set contains several subdirectories for the various parts of the FreeBSD Documentation Project. -A few noteworthy directories are: - -* _documentation/_ contains all the source code for the documentation part of the tree. -* _documentation/content/LANG/articles/_ contains the source code for articles written by various FreeBSD contributors. -* _documentation/content/LANG/books/_ contains the source code for the different books, such as the FreeBSD Handbook. -* _website/_ contains the source code for the FreeBSD website. - -LANG above is the two character language code. -All document source is encoded using Unicode. - -[[git-getting-started-ports-layout]] -==== FreeBSD Ports Tree Branches and Layout - -In `ssh://gitrepo.freebsd.org/ports.git`, _ports_ refers to the repository root of the ports tree. - -In general, most FreeBSD port work will be done within the `main` branch of the ports tree which is the actual ports tree used to install software. -Some other key locations are: - -* `yyyyQn` (a branch), where `yyyy` represents the current year and `n` represents the current quarter (e.g. 2021Q2), which receives mostly security and bugfixes. -* release/`x.y.z` (a tag), which represents a release tag of the ports tree. -* `n`-eol (a tag), which represents the end of life tag of FreeBSD branch `n.X`. - -[[svn-daily-use]] -=== Daily Use - -This section will explain how to perform common day-to-day operations with Subversion. - -[[svn-daily-use-help]] -==== Help - -SVN has built in help documentation. -It can be accessed by typing: - -[source,shell] -.... -% svn help -.... - -Additional information can be found in the http://svnbook.red-bean.com/[Subversion Book]. - -[[svn-daily-use-checkout]] -==== Checkout - -As seen earlier, to check out the FreeBSD head branch: - -[source,shell] -.... -% svn checkout svn+ssh://repo.freebsd.org/base/head /usr/src -.... - -At some point, more than just `HEAD` will probably be useful, for instance when merging changes to stable/7. -Therefore, it may be useful to have a partial checkout of the complete tree (a full checkout would be very painful). - -To do this, first check out the root of the repository: - -[source,shell] -.... -% svn checkout --depth=immediates svn+ssh://repo.freebsd.org/base -.... - -This will give `base` with all the files it contains (at the time of writing, just [.filename]#ROADMAP.txt#) and empty subdirectories for `head`, `stable`, `vendor` and so on. - -Expanding the working copy is possible. -Just change the depth of the various subdirectories: - -[source,shell] -.... -% svn up --set-depth=infinity base/head -% svn up --set-depth=immediates base/release base/releng base/stable -.... - -The above command will pull down a full copy of `head`, plus empty copies of every `release` tag, every `releng` branch, and every `stable` branch. - -If at a later date merging to `7-STABLE` is required, expand the working copy: - -[source,shell] -.... -% svn up --set-depth=infinity base/stable/7 -.... - -Subtrees do not have to be expanded completely. -For instance, expanding only `stable/7/sys` and then later expand the rest of `stable/7`: - -[source,shell] -.... -% svn up --set-depth=infinity base/stable/7/sys -% svn up --set-depth=infinity base/stable/7 -.... - -Updating the tree with `svn update` will only update what was previously asked for (in this case, `head` and `stable/7`; it will not pull down the whole tree. - -[[svn-daily-use-anonymous-checkout]] -==== Anonymous Checkout - -It is possible to anonymously check out the FreeBSD repository with Subversion. -This will give access to a read-only tree that can be updated, but not committed back to the main repository. -To do this, use: - -[source,shell] -.... -% svn co https://svn.FreeBSD.org/base/head /usr/src -.... - -More details on using Subversion this way can be found in link:{handbook}#svn[Using Subversion]. - -[[svn-daily-use-updating-the-tree]] -==== Updating the Tree - -To update a working copy to either the latest revision, or a specific revision: - -[source,shell] -.... -% svn update -% svn update -r12345 -.... - -[[svn-daily-use-status]] -==== Status - -To view the local changes that have been made to the working copy: - -[source,shell] -.... -% svn status -.... - -To show local changes and files that are out-of-date do: - -[source,shell] -.... -% svn status --show-updates -.... - -[[svn-daily-use-editing-and-committing]] -==== Editing and Committing - -SVN does not need to be told in advance about file editing. - -To commit all changes in the current directory and all subdirectories: - -[source,shell] -.... -% svn commit -.... - -To commit all changes in, for example, [.filename]#lib/libfetch/# and [.filename]#usr/bin/fetch/# in a single operation: - -[source,shell] -.... -% svn commit lib/libfetch usr/bin/fetch -.... - -[[svn-daily-use-adding-and-removing]] -==== Adding and Removing Files - -[NOTE] -==== -Before adding files, get a copy of https://people.FreeBSD.org/~peter/auto-props.txt[auto-props.txt] (there is also a https://people.FreeBSD.org/~beat/cvs2svn/auto-props.txt[ports tree specific version]) and add it to [.filename]#~/.subversion/config# according to the instructions in the file. -If you added something before reading this, use `svn rm --keep-local` for just added files, fix your config file and re-add them again. -The initial config file is created when you first run a svn command, even something as simple as `svn help`. -==== - -Files are added to a SVN repository with `svn add`. -To add a file named __foo__, edit it, then: - -[source,shell] -.... -% svn add foo -.... - -[NOTE] -==== -Most new source files should include a `$FreeBSD$` string near the start of the file. -On commit, `svn` will expand the `$FreeBSD$` string, adding the file path, revision number, date and time of commit, and the username of the committer. -Files which cannot be modified may be committed without the `$FreeBSD$` string. -==== - -Files can be removed with `svn remove`: - -[source,shell] -.... -% svn remove foo -.... - -Subversion does not require deleting the file before using `svn rm`, and indeed complains if that happens. - -It is possible to add directories with `svn add`: - -[source,shell] -.... -% mkdir bar -% svn add bar -.... - -Although `svn mkdir` makes this easier by combining the creation of the directory and the adding of it: - -[source,shell] -.... -% svn mkdir bar -.... - -Like files, directories are removed with `svn rm`. -There is no separate command specifically for removing directories. - -[source,shell] -.... -% svn rm bar -.... - -[[svn-daily-use-copying-and-moving]] -==== Copying and Moving Files - -This command creates a copy of [.filename]#foo.c# named [.filename]#bar.c#, with the new file also under version control and with the full history of [.filename]#foo.c#: - -[source,shell] -.... -% svn copy foo.c bar.c -.... - -This is usually preferred to copying the file with `cp` and adding it to the repository with `svn add` because this way the new file does not inherit the original one's history. - -To move and rename a file: - -[source,shell] -.... -% svn move foo.c bar.c -.... - -[[svn-daily-use-log-and-annotate]] -==== Log and Annotate - -`svn log` shows revisions and commit messages, most recent first, for files or directories. -When used on a directory, all revisions that affected the directory and files within that directory are shown. - -`svn annotate`, or equally `svn praise` or `svn blame`, shows the most recent revision number and who committed that revision for each line of a file. - -[[svn-daily-use-diffs]] -==== Diffs - -`svn diff` displays changes to the working copy. -Diffs generated by SVN are unified and include new files by default in the diff output. - -`svn diff` can show the changes between two revisions of the same file: - -[source,shell] -.... -% svn diff -r179453:179454 ROADMAP.txt -.... - -It can also show all changes for a specific changeset. -This command shows what changes were made to the current directory and all subdirectories in changeset 179454: - -[source,shell] -.... -% svn diff -c179454 . -.... - -[[svn-daily-use-reverting]] -==== Reverting - -Local changes (including additions and deletions) can be reverted using `svn revert`. -It does not update out-of-date files, but just replaces them with pristine copies of the original version. - -[[svn-daily-use-conflicts]] -==== Conflicts - -If an `svn update` resulted in a merge conflict, Subversion will remember which files have conflicts and refuse to commit any changes to those files until explicitly told that the conflicts have been resolved. -The simple, not yet deprecated procedure is: - -[source,shell] -.... -% svn resolved foo -.... - -However, the preferred procedure is: - -[source,shell] -.... -% svn resolve --accept=working foo -.... - -The two examples are equivalent. -Possible values for `--accept` are: - -* `working`: use the version in your working directory (which one presumes has been edited to resolve the conflicts). -* `base`: use a pristine copy of the version you had before `svn update`, discarding your own changes, the conflicting changes, and possibly other intervening changes as well. -* `mine-full`: use what you had before `svn update`, including your own changes, but discarding the conflicting changes, and possibly other intervening changes as well. -* `theirs-full`: use the version that was retrieved when you did `svn update`, discarding your own changes. - -=== Advanced Use - -[[svn-advanced-use-sparse-checkouts]] -==== Sparse Checkouts - -SVN allows __sparse__, or partial checkouts of a directory by adding `--depth` to a `svn checkout`. - -Valid arguments to `--depth` are: - -* `empty`: the directory itself without any of its contents. -* `files`: the directory and any files it contains. -* `immediates`: the directory and any files and directories it contains, but none of the subdirectories' contents. -* `infinity`: anything. - -The `--depth` option applies to many other commands, including `svn commit`, `svn revert`, and `svn diff`. - -Since `--depth` is sticky, there is a `--set-depth` option for `svn update` that will change the selected depth. -Thus, given the working copy produced by the previous example: - -[source,shell] -.... -% cd ~/freebsd -% svn update --set-depth=immediates . -.... - -The above command will populate the working copy in _~/freebsd_ with [.filename]#ROADMAP.txt# and empty subdirectories, and nothing will happen when `svn update` is executed on the subdirectories. -However, this command will set the depth for _head_ (in this case) to infinity, and fully populate it: - -[source,shell] -.... -% svn update --set-depth=infinity head -.... - -[[svn-advanced-use-direct-operation]] -==== Direct Operation - -Certain operations can be performed directly on the repository without touching the working copy. -Specifically, this applies to any operation that does not require editing a file, including: - -* `log`, `diff` -* `mkdir` -* `remove`, `copy`, `rename` -* `propset`, `propedit`, `propdel` -* `merge` - -Branching is very fast. -This command would be used to branch `RELENG_8`: - -[source,shell] -.... -% svn copy svn+ssh://repo.freebsd.org/base/head svn+ssh://repo.freebsd.org/base/stable/8 -.... - -This is equivalent to these commands which take minutes and hours as opposed to seconds, depending on your network connection: - -[source,shell] -.... -% svn checkout --depth=immediates svn+ssh://repo.freebsd.org/base -% cd base -% svn update --set-depth=infinity head -% svn copy head stable/8 -% svn commit stable/8 -.... - -[[svn-advanced-use-merging]] -==== Merging with SVN - -This section deals with merging code from one branch to another (typically, from head to a stable branch). - -[NOTE] -==== -In all examples below, `$FSVN` refers to the location of the FreeBSD Subversion repository, `svn+ssh://repo.freebsd.org/base/`. -==== - -===== About Merge Tracking - -From the user's perspective, merge tracking information (or mergeinfo) is stored in a property called `svn:mergeinfo`, which is a comma-separated list of revisions and ranges of revisions that have been merged. -When set on a file, it applies only to that file. -When set on a directory, it applies to that directory and its descendants (files and directories) except for those that have their own `svn:mergeinfo`. - -It is _not_ inherited. -For instance, [.filename]#stable/6/contrib/openpam/# does not implicitly inherit mergeinfo from [.filename]#stable/6/#, or [.filename]#stable/6/contrib/#. Doing so would make partial checkouts very hard to manage. -Instead, mergeinfo is explicitly propagated down the tree. -For merging something into [.filename]#branch/foo/bar/#, these rules apply: - -. If [.filename]#branch/foo/bar/# does not already have a mergeinfo record, but a direct ancestor (for instance, [.filename]#branch/foo/#) does, then that record will be propagated down to [.filename]#branch/foo/bar/# before information about the current merge is recorded. -. Information about the current merge will _not_ be propagated back up that ancestor. -. If a direct descendant of [.filename]#branch/foo/bar/# (for instance, [.filename]#branch/foo/bar/baz/#) already has a mergeinfo record, information about the current merge will be propagated down to it. - -If you consider the case where a revision changes several separate parts of the tree (for example, [.filename]#branch/foo/bar/# and [.filename]#branch/foo/quux/#), but you only want to merge some of it (for example, [.filename]#branch/foo/bar/#), you will see that these rules make sense. -If mergeinfo was propagated up, it would seem like that revision had also been merged to [.filename]#branch/foo/quux/#, when in fact it had not been. - -[[merge-source]] -===== Selecting the Source and Target Branch When Merging - -Merging to `stable/` branches should originate from `head/`. For example: - -[source,shell] -.... -% svn merge -c r123456 ^/head/ stable/11 -% svn commit stable/11 -.... - -Merges to `releng/` branches should always originate from the corresponding `stable/` branch. -For example: - -[source,shell] -.... -% svn merge -c r123456 ^/stable/11 releng/11.0 -% svn commit releng/11.0 -.... - -[NOTE] -==== -Committers are only permitted to commit to the `releng/` branches during a release cycle after receiving approval from the Release Engineering Team, after which only the Security Officer may commit to a `releng/` branch for a Security Advisory or Errata Notice. -==== - -All merges are merged to and committed from the root of the branch. All merges look like: - -[source,shell] -.... -% svn merge -c r123456 ^/head/ checkout -% svn commit checkout -.... - -Note that _checkout_ must be a complete checkout of the branch to which the merge occurs. - -[source,shell] -.... -% svn merge -c r123456 ^/stable/10 releng/10.0 -.... - -===== Preparing the Merge Target - -Due to the mergeinfo propagation issues described earlier, it is very important to never merge changes into a sparse working copy. -Always use a full checkout of the branch being merged into. -For instance, when merging from HEAD to 7, use a full checkout of stable/7: - -[source,shell] -.... -% cd stable/7 -% svn up --set-depth=infinity -.... - -The target directory must also be up-to-date and must not contain any uncommitted changes or stray files. - -===== Identifying Revisions - -Identifying revisions to be merged is a must. -If the target already has complete mergeinfo, ask SVN for a list: - -[source,shell] -.... -% cd stable/6/contrib/openpam -% svn mergeinfo --show-revs=eligible $FSVN/head/contrib/openpam -.... - -If the target does not have complete mergeinfo, check the log for the merge source. - -===== Merging - -Now, let us start merging! - -====== The Principles - -For example, To merge: - -* revision `$R` -* in directory $target in stable branch $B -* from directory $source in head -* $FSVN is `svn+ssh://repo.freebsd.org/base` - -Assuming that revisions $P and $Q have already been merged, and that the current directory is an up-to-date working copy of stable/$B, the existing mergeinfo looks like this: - -[source,shell] -.... -% svn propget svn:mergeinfo -R $target -$target - /head/$source:$P,$Q -.... - -Merging is done like so: - -[source,shell] -.... -% svn merge -c$R $FSVN/head/$source $target -.... - -Checking the results of this is possible with `svn diff`. - -The svn:mergeinfo now looks like: - -[source,shell] -.... -% svn propget svn:mergeinfo -R $target -$target - head/$source:$P,$Q,$R -.... - -If the results are not exactly as shown, assistance may be required before committing as mistakes may have been made, or there may be something wrong with the existing mergeinfo, or there may be a bug in Subversion. - -====== Practical Example - -As a practical example, consider this scenario. -The changes to [.filename]#netmap.4# in r238987 are to be merged from CURRENT to 9-STABLE. -The file resides in [.filename]#head/shared/man/man4#. According to <>, this is also where to do the merge. -Note that in this example all paths are relative to the top of the svn repository. -For more information on the directory layout, see <>. - -The first step is to inspect the existing mergeinfo. - -[source,shell] -.... -% svn propget svn:mergeinfo -R stable/9/shared/man/man4 -.... - -Take a quick note of how it looks before moving on to the next step; doing the actual merge: - -[source,shell] -.... -% svn merge -c r238987 svn+ssh://repo.freebsd.org/base/head/shared/man/man4 stable/9/shared/man/man4 ---- Merging r238987 into 'stable/9/shared/man/man4': -U stable/9/shared/man/man4/netmap.4 ---- Recording mergeinfo for merge of r238987 into -'stable/9/shared/man/man4': - U stable/9/shared/man/man4 -.... - -Check that the revision number of the merged revision has been added. -Once this is verified, the only thing left is the actual commit. - -[source,shell] -.... -% svn commit stable/9/shared/man/man4 -.... - -===== Precautions Before Committing - -As always, build world (or appropriate parts of it). - -Check the changes with svn diff and `svn stat`. -Make sure all the files that should have been added or deleted were in fact added or deleted. - -Take a closer look at any property change (marked by a `M` in the second column of `svn stat`). -Normally, no svn:mergeinfo properties should be anywhere except the target directory (or directories). - -If something looks fishy, ask for help. - -===== Committing - -Make sure to commit a top level directory to have the mergeinfo included as well. -Do not specify individual files on the command line. -For more information about committing files in general, see the relevant section of this primer. - -[[svn-advanced-use-reverting-a-commit]] -==== Reverting a Commit - -Reverting a commit to a previous version is fairly easy: - -[source,shell] -.... -% svn merge -r179454:179453 ROADMAP.txt -% svn commit -.... - -Change number syntax, with negative meaning a reverse change, can also be used: - -[source,shell] -.... -% svn merge -c -179454 ROADMAP.txt -% svn commit -.... - -This can also be done directly in the repository: - -[source,shell] -.... -% svn merge -r179454:179453 svn+ssh://repo.freebsd.org/base/ROADMAP.txt -.... - -[NOTE] -==== -It is important to ensure that the mergeinfo is correct when reverting a file to permit `svn mergeinfo --eligible` to work as expected. -==== - -Reverting the deletion of a file is slightly different. -Copying the version of the file that predates the deletion is required. -For example, to restore a file that was deleted in revision N, restore version N-1: - -[source,shell] -.... -% svn copy svn+ssh://repo.freebsd.org/base/ROADMAP.txt@179454 -% svn commit -.... - -or, equally: - -[source,shell] -.... -% svn copy svn+ssh://repo.freebsd.org/base/ROADMAP.txt@179454 svn+ssh://repo.freebsd.org/base -.... - -Do _not_ simply recreate the file manually and `svn add` it-this will cause history to be lost. - -[[svn-advanced-use-fixing-mistakes]] -==== Fixing Mistakes - -While we can do surgery in an emergency, do not plan on having mistakes fixed behind the scenes. -Plan on mistakes remaining in the logs forever. -Be sure to check the output of `svn status` and `svn diff` before committing. - -Mistakes will happen but, they can generally be fixed without disruption. - -Take a case of adding a file in the wrong location. -The right thing to do is to `svn move` the file to the correct location and commit. -This causes just a couple of lines of metadata in the repository journal, and the logs are all linked up correctly. - -The wrong thing to do is to delete the file and then `svn add` an independent copy in the correct location. -Instead of a couple of lines of text, the repository journal grows an entire new copy of the file. -This is a waste. - -[[svn-getting-started-checkout-from-a-mirror]] -==== Using a Subversion Mirror - -There is a serious disadvantage to this method: every time something is to be committed, a `svn relocate` to the main repository has to be done, remembering to `svn relocate` back to the mirror after the commit. -Also, since `svn relocate` only works between repositories that have the same UUID, some hacking of the local repository's UUID has to occur before it is possible to start using it. - -[[svn-advanced-checkout-from-mirror]] -===== Checkout from a Mirror - -Check out a working copy from a mirror by substituting the mirror's URL for `svn+ssh://repo.freebsd.org/base`. -This can be an official mirror or a mirror maintained by using `svnsync`. - -[[svn-advanced-use-setting-up-svnsync]] -===== Setting up a svnsync Mirror - -Avoid setting up a svnsync mirror unless there is a very good reason for it. -Most of the time a `git` mirror is a better alternative. -Starting a fresh mirror from scratch takes a long time. -Expect a minimum of 10 hours for high speed connectivity. -If international links are involved, expect this to take four to ten times longer. - -One way to limit the time required is to grab a https://download.freebsd.org/ftp/development/subversion/[seed file]. -It is large (~1GB) but will consume less network traffic and take less time to fetch than svnsync will. - -Extract the file and update it: - -[source,shell] -.... -% tar xf svnmirror-base-r261170.tar.xz -% svnsync sync file:///home/svnmirror/base -.... - -Now, set that up to run from man:cron[8], do checkouts locally, set up a svnserve server for local machines to talk to, etc. - -The seed mirror is set to fetch from `svn://svn.freebsd.org/base`. -The configuration for the mirror is stored in `revprop 0` on the local mirror. -To see the configuration, try: - -[source,shell] -.... -% svn proplist -v --revprop -r 0 file:///home/svnmirror/base -.... - -Use `svn propset` to change things. - -[[svn-advanced-use-committing-high-ascii-data]] -==== Committing High-ASCII Data - -Files that have high-ASCII bits are considered binary files in SVN, so the pre-commit checks fail and indicate that the `mime-type` property should be set to `application/octet-stream`. -However, the use of this is discouraged, so please do not set it. -The best way is always avoiding high-ASCII data, so that it can be read everywhere with any text editor but if it is not avoidable, instead of changing the mime-type, set the `fbsd:notbinary` property with `propset`: - -[source,shell] -.... -% svn propset fbsd:notbinary yes foo.data -.... - -[[svn-advanced-use-maintaining-a-project-branch]] -==== Maintaining a Project Branch - -A project branch is one that is synced to head (or another branch) is used to develop a project then commit it back to head. -In SVN, "dolphin" branching is used for this. -A "dolphin" branch is one that diverges for a while and is finally committed back to the original branch. -During development code migration in one direction (from head to the branch only). -No code is committed back to head until the end. -After the branch is committed back at the end, it is dead (although a new branch with the same name can be created after the dead one is deleted). - -As per https://people.FreeBSD.org/\~peter/svn_notes.txt[https://people.FreeBSD.org/~peter/svn_notes.txt], work that is intended to be merged back into HEAD should be in [.filename]#base/projects/#. -If the work is beneficial to the FreeBSD community in some way but not intended to be merged directly back into HEAD then the proper location is [.filename]#base/user/username/#. -https://svnweb.freebsd.org/base/projects/GUIDELINES.txt[This page] contains further details. - -To create a project branch: - -[source,shell] -.... -% svn copy svn+ssh://repo.freebsd.org/base/head svn+ssh://repo.freebsd.org/base/projects/spif -.... - -To merge changes from HEAD back into the project branch: - -[source,shell] -.... -% cd copy_of_spif -% svn merge svn+ssh://repo.freebsd.org/base/head -% svn commit -.... - -It is important to resolve any merge conflicts before committing. - -=== Some Tips - -In commit logs etc., "rev 179872" is spelled "r179872" as per convention. - -Speeding up svn is possible by adding these entries to [.filename]#~/.ssh/config#: - -[source,shell] -.... -Host * -ControlPath ~/.ssh/sockets/master-l-r@h:p -ControlMaster auto -ControlPersist yes -.... - -and then typing - -[source,shell] -.... - mkdir ~/.ssh/sockets -.... - -Checking out a working copy with a stock Subversion client without FreeBSD-specific patches (`OPTIONS_SET=FREEBSD_TEMPLATE`) will mean that `$FreeBSD$` tags will not be expanded. -Once the correct version has been installed, trick Subversion into expanding them like so: - -[source,shell] -.... -% svn propdel -R svn:keywords . -% svn revert -R . -.... - -This will wipe out uncommitted patches. - -It is possible to automatically fill the "Sponsored by" and "MFC after" commit log fields by setting "freebsd-sponsored-by" and "freebsd-mfc-after" fields in the "[miscellany]" section of the [.filename]#~/.subversion/config# configuration file. -For example: - -[.programlisting] -.... -freebsd-sponsored-by = The FreeBSD Foundation -freebsd-mfc-after = 2 weeks -.... +The ports repository switched from Subversion to Git on April 6, 2021. +The last SVN commit is __r569609__ +The first real git commit hash is __ed8d3eda309dd863fb66e04bccaa513eee255cbf__. [[conventions]] == Setup, Conventions, and Traditions @@ -2892,7 +2057,6 @@ Those who have been given commit rights to the FreeBSD repositories must follow * Get mentor approval before committing each of these changes! * The [.filename]#.ent# and [.filename]#.xml# files mentioned below exist in the FreeBSD Documentation Project SVN repository at `svn+ssh://repo.FreeBSD.org/doc/`. -* New files that do not have the `FreeBSD=%H svn:keywords` property will be rejected when attempting to commit them to the repository. Be sure to read <> regarding adding and removing files. Verify that [.filename]#~/.subversion/config# contains the necessary "auto-props" entries from [.filename]#auto-props.txt# mentioned there. * All [.filename]#src# commits go to FreeBSD-CURRENT first before being merged to FreeBSD-STABLE. The FreeBSD-STABLE branch must maintain ABI and API compatibility with earlier versions of that branch. Do not merge changes that break this compatibility. [[commit-steps]] From owner-dev-commits-doc-all@freebsd.org Tue Apr 6 19:49:03 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 153C05B6B84 for ; Tue, 6 Apr 2021 19:49: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFJ4b06Tvz4j87; Tue, 6 Apr 2021 19:49:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EADF61211C; Tue, 6 Apr 2021 19:49:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 136Jn294037492; Tue, 6 Apr 2021 19:49:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 136Jn2xM037491; Tue, 6 Apr 2021 19:49:02 GMT (envelope-from git) Date: Tue, 6 Apr 2021 19:49:02 GMT Message-Id: <202104061949.136Jn2xM037491@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Li-Wen Hsu Subject: git: 09b4ba9b12 - main - handbook/mirrors: Add freebsd-ports mirrors MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09b4ba9b12e432f09ee1ec40ac1a674f5e3d1185 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2021 19:49:03 -0000 The branch main has been updated by lwhsu (ports, src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=09b4ba9b12e432f09ee1ec40ac1a674f5e3d1185 commit 09b4ba9b12e432f09ee1ec40ac1a674f5e3d1185 Author: Li-Wen Hsu AuthorDate: 2021-04-06 19:48:58 +0000 Commit: Li-Wen Hsu CommitDate: 2021-04-06 19:48:58 +0000 handbook/mirrors: Add freebsd-ports mirrors Approved by: carlavilla (implicitly) --- documentation/content/en/books/handbook/mirrors/_index.adoc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/documentation/content/en/books/handbook/mirrors/_index.adoc b/documentation/content/en/books/handbook/mirrors/_index.adoc index f0be132b3c..3ee176235b 100644 --- a/documentation/content/en/books/handbook/mirrors/_index.adoc +++ b/documentation/content/en/books/handbook/mirrors/_index.adoc @@ -674,14 +674,17 @@ The project workflow with those mirrors are still under discussion. ==== Codeberg - doc: https://codeberg.org/FreeBSD/freebsd-doc + - ports: https://codeberg.org/FreeBSD/freebsd-ports - src: https://codeberg.org/FreeBSD/freebsd-src ==== GitHub - doc: https://github.com/freebsd/freebsd-doc + - ports: https://github.com/freebsd/freebsd-ports - src: https://github.com/freebsd/freebsd-src ==== GitLab - doc: https://gitlab.com/FreeBSD/freebsd-doc + - ports: https://gitlab.com/FreeBSD/freebsd-ports - src: https://gitlab.com/FreeBSD/freebsd-src === Mailing lists From owner-dev-commits-doc-all@freebsd.org Tue Apr 6 20:13:55 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8DDBB5B73F0 for ; Tue, 6 Apr 2021 20:13: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFJdH3c5sz4l42; Tue, 6 Apr 2021 20:13:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6E5F11272A; Tue, 6 Apr 2021 20:13:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 136KDtgt077398; Tue, 6 Apr 2021 20:13:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 136KDtkd077397; Tue, 6 Apr 2021 20:13:55 GMT (envelope-from git) Date: Tue, 6 Apr 2021 20:13:55 GMT Message-Id: <202104062013.136KDtkd077397@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Gordon Tetlow Subject: git: 06731fae1b - main - Add EN-21:09, EN-21:10, and SA-21:08 through SA-21:10. Approved by: so MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 06731fae1bedfd833b102bbb3c81ba6f59b93168 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2021 20:13:55 -0000 The branch main has been updated by gordon (src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=06731fae1bedfd833b102bbb3c81ba6f59b93168 commit 06731fae1bedfd833b102bbb3c81ba6f59b93168 Author: Gordon Tetlow AuthorDate: 2021-04-06 20:12:54 +0000 Commit: Gordon Tetlow CommitDate: 2021-04-06 20:12:54 +0000 Add EN-21:09, EN-21:10, and SA-21:08 through SA-21:10. Approved by: so --- website/data/security/advisories.toml | 12 ++ website/data/security/errata.toml | 8 + .../security/advisories/FreeBSD-EN-21:09.pf.asc | 119 +++++++++++++++ .../security/advisories/FreeBSD-EN-21:10.lldb.asc | 119 +++++++++++++++ .../security/advisories/FreeBSD-SA-21:08.vm.asc | 166 ++++++++++++++++++++ .../advisories/FreeBSD-SA-21:09.accept_filter.asc | 168 ++++++++++++++++++++ .../advisories/FreeBSD-SA-21:10.jail_mount.asc | 170 +++++++++++++++++++++ website/static/security/patches/EN-21:09/pf.patch | 22 +++ .../static/security/patches/EN-21:09/pf.patch.asc | 16 ++ .../static/security/patches/EN-21:10/lldb.patch | 54 +++++++ .../security/patches/EN-21:10/lldb.patch.asc | 16 ++ .../security/patches/SA-21:08/vm_fault.11.patch | 37 +++++ .../patches/SA-21:08/vm_fault.11.patch.asc | 16 ++ .../security/patches/SA-21:08/vm_fault.12.patch | 37 +++++ .../patches/SA-21:08/vm_fault.12.patch.asc | 16 ++ .../security/patches/SA-21:08/vm_fault.13.patch | 47 ++++++ .../patches/SA-21:08/vm_fault.13.patch.asc | 16 ++ .../security/patches/SA-21:09/accept_filter.patch | 26 ++++ .../patches/SA-21:09/accept_filter.patch.asc | 16 ++ .../security/patches/SA-21:10/jail_mount.11.patch | 15 ++ .../patches/SA-21:10/jail_mount.11.patch.asc | 16 ++ .../security/patches/SA-21:10/jail_mount.12.patch | 17 +++ .../patches/SA-21:10/jail_mount.12.patch.asc | 16 ++ .../security/patches/SA-21:10/jail_mount.13.patch | 17 +++ .../patches/SA-21:10/jail_mount.13.patch.asc | 16 ++ 25 files changed, 1178 insertions(+) diff --git a/website/data/security/advisories.toml b/website/data/security/advisories.toml index 08e22e3be7..b3a4c14939 100644 --- a/website/data/security/advisories.toml +++ b/website/data/security/advisories.toml @@ -1,6 +1,18 @@ # Sort advisories by year, month and day # $FreeBSD$ +[[advisories]] +name = "FreeBSD-SA-21:10.jail_mount" +date = "2021-04-06" + +[[advisories]] +name = "FreeBSD-SA-21:09.accept_filter" +date = "2021-04-06" + +[[advisories]] +name = "FreeBSD-SA-21:08.vm" +date = "2021-04-06" + [[advisories]] name = "FreeBSD-SA-21:07.openssl" date = "2021-03-25" diff --git a/website/data/security/errata.toml b/website/data/security/errata.toml index d6a17c8a9b..bf235e7212 100644 --- a/website/data/security/errata.toml +++ b/website/data/security/errata.toml @@ -1,6 +1,14 @@ # Sort errata notices by year, month and day # $FreeBSD$ +[[notices]] +name = "FreeBSD-EN-21:10.lldb" +date = "2021-04-06" + +[[notices]] +name = "FreeBSD-EN-21:09.pf" +date = "2021-04-06" + [[notices]] name = "FreeBSD-EN-21:08.freebsd-update" date = "2021-02-24" diff --git a/website/static/security/advisories/FreeBSD-EN-21:09.pf.asc b/website/static/security/advisories/FreeBSD-EN-21:09.pf.asc new file mode 100644 index 0000000000..16e3bb7d68 --- /dev/null +++ b/website/static/security/advisories/FreeBSD-EN-21:09.pf.asc @@ -0,0 +1,119 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + +============================================================================= +FreeBSD-EN-21:09.pf Errata Notice + The FreeBSD Project + +Topic: net.pf.request_maxcount not settable from loader.conf(5) + +Category: core +Module: pf +Announced: 2021-04-06 +Affects: FreeBSD 12.2 +Corrected: 2020-12-15 08:29:45 UTC (stable/12, 12.2-STABLE) + 2021-04-06 19:21:24 UTC (releng/12.2, 12.2-RELEASE-p6) + +For general information regarding FreeBSD Errata Notices and Security +Advisories, including descriptions of the fields above, security +branches, and the following sections, please visit +. + +I. Background + +pf(4) is an Internet Protocol packet filter originally written for OpenBSD. + +II. Problem Description + +The net.pf.request_maxcount sysctl provides an upper bound on the amount of +memory used by pf(4) to store various types of state. Prior to FreeBSD 12.2 +this sysctl was read-only and could only be adjusted via loader.conf(5). In +FreeBSD 12.2, the sysctl was made writeable, but lost the ability to be +adjusted from loader.conf(5). + +III. Impact + +pf(4) may fail to load filtering rules if they cause the default +request_maxcount bound to be exceeded. Users that relied on loader.conf to +increase the request_maxcount value could see their rules fail to load. + +IV. Workaround + +The value of request_maxcount may be set via sysctl.conf(5). + +V. Solution + +Upgrade your system to a supported FreeBSD stable or release / security +branch (releng) dated after the correction date. + +Perform one of the following: + +1) To update your system via a binary patch: + +Systems running a RELEASE version of FreeBSD on the i386 or amd64 +platforms can be updated via the freebsd-update(8) utility: + +# freebsd-update fetch +# freebsd-update install + +2) To update your system via a source code patch: + +The following patches have been verified to apply to the applicable +FreeBSD release branches. + +a) Download the relevant patch from the location below, and verify the +detached PGP signature using your PGP utility. + +# fetch https://security.FreeBSD.org/patches/EN-21:09/pf.patch +# fetch https://security.FreeBSD.org/patches/EN-21:09/pf.patch.asc +# gpg --verify pf.patch.asc + +b) Apply the patch. Execute the following commands as root: + +# cd /usr/src +# patch < /path/to/patch + +c) Recompile the operating system using buildworld and installworld as +described in . + +VI. Correction details + +The following list contains the correction revision numbers for each +affected branch. + +Branch/path Revision +- ------------------------------------------------------------------------- +stable/12/ r368656 +releng/12.2/ r369554 +- ------------------------------------------------------------------------- + +To see which files were modified by a particular revision, run the +following command, replacing NNNNNN with the revision number, on a +machine with Subversion installed: + +# svn diff -cNNNNNN --summarize svn://svn.freebsd.org/base + +Or visit the following URL, replacing NNNNNN with the revision number: + + + +VII. References + +The latest revision of this advisory is available at + +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCgAdFiEE/A6HiuWv54gCjWNV05eS9J6n5cIFAmBswB8ACgkQ05eS9J6n +5cLYFw//fkTpjSXiflCHENinkk3u72W8Pxw4vvhDl9DBSHUdYi+fzB6t70xxUcnH +wsjJcyMe1nqU7BVYFYo+aIkDL2yeW+PlJVrVfLcuWn8OwX7R0WbCM13EF75WZmlM +Ty6YWPZkqYAWc0lbBYWiEtW+f6m5FTgdlvsXnTBENiz3iX2ddNkFK+qcEY9sasiJ +HjsIoM1bs41YAgiOByyuh1xqMr+ieB4QQQ3QAbBmkqqPqBu1Nk0Xcpmos0sBf6Sn +dSPDBMcKfJ4VelSGBnn98bXjjyLeiwbfBhNceCbI8eIgulTWboMJHg9XoUWMwWhJ +314OOq0D0CssWj9136dKLxQc+gWyu5xfszenfbA1k9rrFY5uKOBVUMgK8b9meWfH +WX1CscDTYe4wCp/YpT/oU31PJfm0foFNWnOel7hDrlNwe0t+ElVX56xyy19BLQ/9 +tgZ1CIZv6IihMxxBDnayU/SUVB5bJxfwHXZb845xjKB+owNYaw5pwHhEgLYWklAL +A6a6Lja5dzVn1KsrHfUb11KEzWvUvtqp0y6vaZv6UTSLI9FfaSL/xA6uy3Ft/r/E +OvD0qL/ShKmA/jvLG6vxJe0XQjU9JMI/FViPrs4YLCpFymRXthokoXoD1FyK6Hgn +aMBdWTVEGHuQFG37OZIxr7AvefR0d3MXPbReXVKnn367VdbZ1lw= +=7QHR +-----END PGP SIGNATURE----- diff --git a/website/static/security/advisories/FreeBSD-EN-21:10.lldb.asc b/website/static/security/advisories/FreeBSD-EN-21:10.lldb.asc new file mode 100644 index 0000000000..ac25f41455 --- /dev/null +++ b/website/static/security/advisories/FreeBSD-EN-21:10.lldb.asc @@ -0,0 +1,119 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + +============================================================================= +FreeBSD-EN-21:10.lldb Errata Notice + The FreeBSD Project + +Topic: lldb abort on print command + +Category: contrib +Module: lldb +Announced: 2021-04-06 +Affects: FreeBSD 12.2 +Corrected: 2020-10-31 18:42:03 UTC (stable/12, 12.2-STABLE) + 2021-04-06 19:21:27 UTC (releng/12.2, 12.2-RELEASE-p6) + +For general information regarding FreeBSD Errata Notices and Security +Advisories, including descriptions of the fields above, security +branches, and the following sections, please visit +. + +I. Background + +lldb is the debugger from the LLVM project. Version 10.0.1 is included +in FreeBSD 12.2. + +II. Problem Description + +Attempts to use lldb's `print` command (`p` alias) resulted in lldb +aborting. + +III. Impact + +Some common debugger functionality cannot be used. + +IV. Workaround + +No general workaround is available. Information provided by certain print +expressions may be available by using other commands, such as +`frame variable` (`fr v` alias). + +V. Solution + +Upgrade your system to a supported FreeBSD stable or release / security +branch (releng) dated after the correction date. + +Perform one of the following: + +1) To update your system via a binary patch: + +Systems running a RELEASE version of FreeBSD on the i386 or amd64 +platforms can be updated via the freebsd-update(8) utility: + +# freebsd-update fetch +# freebsd-update install + +2) To update your system via a source code patch: + +The following patches have been verified to apply to the applicable +FreeBSD release branches. + +a) Download the relevant patch from the location below, and verify the +detached PGP signature using your PGP utility. + +# fetch https://security.FreeBSD.org/patches/EN-21:10/lldb.patch +# fetch https://security.FreeBSD.org/patches/EN-21:10/lldb.patch.asc +# gpg --verify lldb.patch.asc + +b) Apply the patch. Execute the following commands as root: + +# cd /usr/src +# patch < /path/to/patch + +c) Recompile the operating system using buildworld and installworld as +described in . + +VI. Correction details + +The following list contains the correction revision numbers for each +affected branch. + +Branch/path Revision +- ------------------------------------------------------------------------- +stable/12/ r367228 +releng/12.2/ r369555 +- ------------------------------------------------------------------------- + +To see which files were modified by a particular revision, run the +following command, replacing NNNNNN with the revision number, on a +machine with Subversion installed: + +# svn diff -cNNNNNN --summarize svn://svn.freebsd.org/base + +Or visit the following URL, replacing NNNNNN with the revision number: + + + +VII. References + + + +The latest revision of this advisory is available at + +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCgAdFiEE/A6HiuWv54gCjWNV05eS9J6n5cIFAmBswDUACgkQ05eS9J6n +5cL7iRAAnlsryVy3aJFQIMghO7+rOwwpFnxlDponVvzIkeNH2x3c62V81eAhUIvj +q6TvEp2dNQdaTDoN6ytPoL+ek4sBh8WdVt0R8sWnUbEDf1BhvGQ3P9eT4q8Thx+Z +wB3L40pLQZFapINmpEIp7xwcWJv8xiKxmY2PDOcNkju5GWD4OatoMuCx5iMNwQ+g +7aYUL1gUhvcudSMghJ+jH6Pre2Yq+y+ziAhmGB0QOREOEoguXvJwgdO+clZHdFl2 +E1Yudhfr0v6afQFL9RzX+Ck6ft9KBPd9rzZwc2bTHfi08zmAy63FN3Bxvx/8O/EJ +9NXRJHv0zuVSOZePKJ6qv1ap5f7RLzLN7ztaUQMCxkqCoRsdV3UYsUCkE8NH/ZOT +NZ7zZCmL7zHpn17QX7tBqqYeAHtFJLAlXaBiSIxYOaKM87GMMmvpb+06f9frwtuu +lOxzY0l7H+iWsSakdsoUrtL+wNvOM3wFafHtDSXDyHbSUKWiWa3yubzl8szIgCrX +GhW84r3MdaVSm3EQQS2qQux+9HTLcx5Lh0+BVmeA36VBwNeG+wc8t5eZYc4xSlJh +jIv2CRPm97e5796O5gGtjqyiidSL2lfw9tHE3H/1gqn/2DLNFbM+DcwgI20Wfz4u +hdhN//GsIDiOA9BwClgIW6Vbs/V5B9uN8E/RH4lFggmJAkkPWGU= +=boNk +-----END PGP SIGNATURE----- diff --git a/website/static/security/advisories/FreeBSD-SA-21:08.vm.asc b/website/static/security/advisories/FreeBSD-SA-21:08.vm.asc new file mode 100644 index 0000000000..d9513f4eee --- /dev/null +++ b/website/static/security/advisories/FreeBSD-SA-21:08.vm.asc @@ -0,0 +1,166 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + +============================================================================= +FreeBSD-SA-21:08.vm Security Advisory + The FreeBSD Project + +Topic: Memory disclosure by stale virtual memory mapping + +Category: core +Module: vm +Announced: 2021-04-06 +Credits: Ryan Libby, Dell Inc. +Affects: All supported versions of FreeBSD. +Corrected: 2021-04-06 18:50:46 UTC (stable/13, 13.0-STABLE) + 2021-04-06 19:18:49 UTC (releng/13.0, 13.0-RC5-p1) + 2021-04-06 19:20:46 UTC (stable/12, 12.2-STABLE) + 2021-04-06 19:21:30 UTC (releng/12.2, 12.2-RELEASE-p6) + 2021-04-06 19:22:31 UTC (stable/11, 11.4-STABLE) + 2021-04-06 19:22:56 UTC (releng/11.4, 11.4-RELEASE-p9) +CVE Name: CVE-2021-29626 + +For general information regarding FreeBSD Security Advisories, +including descriptions of the fields above, security branches, and the +following sections, please visit . + +I. Background + +Memory mappings shared between processes are a feature of the FreeBSD +virtual memory system. They may be established by unprivileged +processes with the mmap(2), fork(2), and other system calls. + +II. Problem Description + +A particular case of memory sharing is mishandled in the virtual memory +system. It is possible and legal to establish a relationship where +multiple descendant processes share a mapping which shadows memory of an +ancestor process. In this scenario, when one process modifies memory +through such a mapping, the copy-on-write logic fails to invalidate +other mappings of the source page. These stale mappings may remain even +after the mapped pages have been reused for another purpose. + +III. Impact + +An unprivileged local user process can maintain a mapping of a page +after it is freed, allowing that process to read private data belonging +to other processes or the kernel. + +IV. Workaround + +No workaround is available. + +V. Solution + +Upgrade your vulnerable system to a supported FreeBSD stable or +release / security branch (releng) dated after the correction date +and reboot. + +Perform one of the following: + +1) To update your vulnerable system via a binary patch: + +Systems running a RELEASE version of FreeBSD on the amd64, i386, or +(on FreeBSD 13 and later) arm64 platforms can be updated via the +freebsd-update(8) utility: + +# freebsd-update fetch +# freebsd-update install +# shutdown -r +10min "Rebooting for a security update" + +2) To update your vulnerable system via a source code patch: + +The following patches have been verified to apply to the applicable +FreeBSD release branches. + +a) Download the relevant patch from the location below, and verify the +detached PGP signature using your PGP utility. + +[FreeBSD 13.0] +# fetch https://security.FreeBSD.org/patches/SA-21:08/vm_fault.13.patch +# fetch https://security.FreeBSD.org/patches/SA-21:08/vm_fault.13.patch.asc +# gpg --verify vm_fault.13.patch.asc + +[FreeBSD 12.2] +# fetch https://security.FreeBSD.org/patches/SA-21:08/vm_fault.12.patch +# fetch https://security.FreeBSD.org/patches/SA-21:08/vm_fault.12.patch.asc +# gpg --verify vm_fault.12.patch.asc + +[FreeBSD 11.4] +# fetch https://security.FreeBSD.org/patches/SA-21:08/vm_fault.11.patch +# fetch https://security.FreeBSD.org/patches/SA-21:08/vm_fault.11.patch.asc +# gpg --verify vm_fault.11.patch.asc + +b) Apply the patch. Execute the following commands as root: + +# cd /usr/src +# patch < /path/to/patch + +c) Recompile your kernel as described in + and reboot the +system. + +VI. Correction details + +The following list contains the correction revision numbers for each +affected branch. + +Branch/path Hash Revision +- ------------------------------------------------------------------------- +stable/13/ 2e08308d62f3 stable/13-n245117 +releng/13.0/ 724bc23da1a9 releng/13.0-n244728 +stable/12/ r369551 +releng/12.2/ r369556 +stable/11/ r369559 +releng/11.4/ r369561 +- ------------------------------------------------------------------------- + +For FreeBSD 13 and later: + +Run the following command to see which files were modified by a +particular commit: + +# git show --stat + +Or visit the following URL, replacing HHHHHH with the hash: + + + +To determine the commit count in a working tree (for comparison against +nNNNNNN in the table above), run: + +# git rev-list --count --first-parent HEAD + +For FreeBSD 12 and earlier: + +Run the following command to see which files were modified by a particular +revision, replacing NNNNNN with the revision number: + +# svn diff -cNNNNNN --summarize svn://svn.freebsd.org/base + +Or visit the following URL, replacing NNNNNN with the revision number: + + + +VII. References + + + +The latest revision of this advisory is available at + +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCgAdFiEE/A6HiuWv54gCjWNV05eS9J6n5cIFAmBsveMACgkQ05eS9J6n +5cJ0Xw/+JFP6UKPMxcYwmAmIoDS5YAsUzuDVQNooZzOQiltyVqPrHD3Dh/32+Tm3 +W6yeITNcnUbVhFBPli3x0pHldCCcj1JQNtzUYcS/DKNvD2LxjB4bhiiE0YHImaP9 +JWOMoc5rNYpOl4iKK5DZkQAxZsHu1zFSVt+0O/aL70bDCYupsslWBbRRkxgkeShW +wGFhSMhlJ1QnnygzsICbyK5GP4XYqfAWZ5dviznNcZLrOifCLG6HNxixfOG/vf33 +yZzwA7RSNpOyULC1AYmUqiEZWgABL63hOIiraD0sASteBhMY/DCjq/QLZKsaONsp +FYemSTnW1hs1MVfTm4ecwgZJEJf8bV7cQXrxA3bLJmRoN9CcTGHDQCjFKHvMVXSe +qU/n+CICO6Ly8nTmL0xYjpJLEQaQfC/98hXk2otpgIia8r5Gn1MOwooTdN+KWlfA +LHzuP0Wf5NIjo1QkbbBRUSfCjV+dbGzRxgCYTGj1dN+XbR0uxeVtWeKXU3WaDIYI +6sT3L41yUBvEce7h/449RunNjRb5nuWczh3YTIzqDA3dEStLPKxlzL790M8TId6e +XE+YclkxSTNMuxvCEw/vDJB4bZ2eOQ6noSzfrUqxjGnbtcuYP/RJGc3XrVZpiXbY +u+OuE4Owve9e/sNCRqZeEQ2CHnntCdji0sk/CAlbkHcdHYPbunI= +=rC4V +-----END PGP SIGNATURE----- diff --git a/website/static/security/advisories/FreeBSD-SA-21:09.accept_filter.asc b/website/static/security/advisories/FreeBSD-SA-21:09.accept_filter.asc new file mode 100644 index 0000000000..0e58b59b15 --- /dev/null +++ b/website/static/security/advisories/FreeBSD-SA-21:09.accept_filter.asc @@ -0,0 +1,168 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + +============================================================================= +FreeBSD-SA-21:09.accept_filter Security Advisory + The FreeBSD Project + +Topic: double free in accept_filter(9) socket configuration interface + +Category: core +Module: accept_filter +Announced: 2021-04-06 +Credits: Alexey Kulaev +Affects: FreeBSD 12.2 and later. +Corrected: 2021-03-28 00:24:15 UTC (stable/13, 13.0-STABLE) + 2021-03-28 15:03:37 UTC (releng/13.0, 13.0-RC4) + 2021-03-28 00:26:49 UTC (stable/12, 12.2-STABLE) + 2021-04-06 19:21:21 UTC (releng/12.2, 12.2-RELEASE-p6) +CVE Name: CVE-2021-29627 + +For general information regarding FreeBSD Security Advisories, +including descriptions of the fields above, security branches, and the +following sections, please visit . + +I. Background + +FreeBSD features an accept_filter(9) mechanism which allows an +application to request that the kernel pre-process incoming connections. +For example, the accf_http(9) accept filter prevents accept(2) from +returning until a full HTTP request has been buffered. + +No accept filters are enabled by default. A system administrator must +either compile the FreeBSD kernel with a particular accept filter option +(such as ACCEPT_FILTER_HTTP) or load the filter using kldload(8) in +order to utilize accept filters. + +II. Problem Description + +An unprivileged process can configure an accept filter on a listening +socket. This is done using the setsockopt(2) system call. The process +supplies the name of the accept filter which is to be attached to the +socket, as well as a string containing filter-specific information. + +If the filter implements the accf_create callback, the socket option +handler attempts to preserve the process-supplied argument string. A +bug in the socket option handler caused this string to be freed +prematurely, leaving a dangling pointer. Additional operations on the +socket can turn this into a double free or a use-after-free. + +III. Impact + +The bug may be exploited to trigger local privilege escalation or kernel +memory disclosure. + +IV. Workaround + +Systems not using accept filters, or using only the accept filters +included with the FreeBSD base system (accf_data(9), accf_dns(9), and +accf_http(9)) are unaffected. Note that no accept filters are loaded +in the kernel by default. + +Systems using a third-party accept filter module are affected if the +module defines an accf_create callback. In this case, the only +workaround is to ensure that the module is not loaded into the kernel. + +V. Solution + +Upgrade your vulnerable system to a supported FreeBSD stable or +release / security branch (releng) dated after the correction date +and reboot. + +Perform one of the following: + +1) To update your vulnerable system via a binary patch: + +Systems running a RELEASE version of FreeBSD on the amd64, i386, or +(on FreeBSD 13 and later) arm64 platforms can be updated via the +freebsd-update(8) utility: + +# freebsd-update fetch +# freebsd-update install +# shutdown -r +10min "Rebooting for a security update" + +2) To update your vulnerable system via a source code patch: + +The following patches have been verified to apply to the applicable +FreeBSD release branches. + +a) Download the relevant patch from the location below, and verify the +detached PGP signature using your PGP utility. + +# fetch https://security.FreeBSD.org/patches/SA-21:09/accept_filter.patch +# fetch https://security.FreeBSD.org/patches/SA-21:09/accept_filter.patch.asc +# gpg --verify accept_filter.patch.asc + +b) Apply the patch. Execute the following commands as root: + +# cd /usr/src +# patch < /path/to/patch + +c) Recompile your kernel as described in + and reboot the +system. + +VI. Correction details + +The following list contains the correction revision numbers for each +affected branch. + +Branch/path Hash Revision +- ------------------------------------------------------------------------- +stable/13/ c7d10e7ec872 stable/13-n245050 +releng/13.0/ af6611e5adc6 releng/13.0-n244711 +stable/12/ r369525 +releng/12.2/ r369553 +- ------------------------------------------------------------------------- + +For FreeBSD 13 and later: + +Run the following command to see which files were modified by a +particular commit: + +# git show --stat + +Or visit the following URL, replacing HHHHHH with the hash: + + + +To determine the commit count in a working tree (for comparison against +nNNNNNN in the table above), run: + +# git rev-list --count --first-parent HEAD + +For FreeBSD 12 and earlier: + +Run the following command to see which files were modified by a particular +revision, replacing NNNNNN with the revision number: + +# svn diff -cNNNNNN --summarize svn://svn.freebsd.org/base + +Or visit the following URL, replacing NNNNNN with the revision number: + + + +VII. References + + + + + +The latest revision of this advisory is available at + +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCgAdFiEE/A6HiuWv54gCjWNV05eS9J6n5cIFAmBsveMACgkQ05eS9J6n +5cIfkA//bD0wm/rhdTUkyCeKhDCocFC/elfC+g7FsiG/eNJFh0mAiuTrC9Ja9+TN +QU4xjZPx0kN6PxAgEzCqH2NgSL+MwW60ApxlH/kVhcFU/tOrUxmuFg8u9bk6/gU3 +xRcpHzT5M4iFzrdyimbc9UvKHZet1Hh7CkIQwQZWvdrJYL3p+lODe3DpS9OUXcaJ +S6eHGzMlTKQsV5m3vGEefRP1ByDNOT4w3q+w6s0K381ck8Y+k1SLQLLDZJuNR752 +ixZdUg/oE82PIosoH8SXP8bHklRcHFsa6DmTLYGxxpKh9l++CyiytiQThUIlClfY +2KOKh1Y4ND5FU001g98OdikgfRJhf9mQIk4ytNyBjey3c/aBFtcJHzydrV5uPg4u +SPvk59SEiRVZswQkR+kpXD8Maa7jkRTe6qbBhQ5+CiXEO/FWF108OVULn0saDycp +NtGNa6Htichm+RWPeHnbCo5OwSW0wDHKUB2yP/EcCOkJtBPOBpL8r3iJSnk5ZsrH +mTQeQzSrbzeD/pMOiEor6AIKjJoII2rWIT6v2RaofY5vb30kQl56/m7nrN1bm6n1 +aatAsvJvFIaE6LVKkCpIkKaHEEmgOpf5/p4n2xia8i6xUc1BN14nq0xEaqGskesS +bAe1TJZJnc6hHvdJVhuLxdT1CSStG56BrkJd2RtCAenwatJaRzQ= +=UfpF +-----END PGP SIGNATURE----- diff --git a/website/static/security/advisories/FreeBSD-SA-21:10.jail_mount.asc b/website/static/security/advisories/FreeBSD-SA-21:10.jail_mount.asc new file mode 100644 index 0000000000..dd5b048a37 --- /dev/null +++ b/website/static/security/advisories/FreeBSD-SA-21:10.jail_mount.asc @@ -0,0 +1,170 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + +============================================================================= +FreeBSD-SA-21:10.jail_mount Security Advisory + The FreeBSD Project + +Topic: jail escape possible by mounting over jail root + +Category: core +Module: jail +Announced: 2021-04-06 +Credits: Mateusz Guzik +Affects: All supported versions of FreeBSD. +Corrected: 2021-04-06 18:50:48 UTC (stable/13, 13.0-STABLE) + 2021-04-06 19:18:59 UTC (releng/13.0, 13.0-RC5-p1) + 2021-04-06 19:20:50 UTC (stable/12, 12.2-STABLE) + 2021-04-06 19:21:33 UTC (releng/12.2, 12.2-RELEASE-p6) + 2021-04-06 19:22:31 UTC (stable/11, 11.4-STABLE) + 2021-04-06 19:22:59 UTC (releng/11.4, 11.4-RELEASE-p9) +CVE Name: CVE-2020-25584 + +For general information regarding FreeBSD Security Advisories, +including descriptions of the fields above, security branches, and the +following sections, please visit . + +I. Background + +The jail(2) system call allows a system administrator to lock a process +and all of its descendants inside an environment with a very limited +ability to affect the system outside that environment, even for +processes with superuser privileges. It is an extension of, but +far more powerful than, the traditional UNIX chroot(2) system call. + +II. Problem Description + +Due to a race condition between lookup of ".." and remounting a filesystem, +a process running inside a jail might access filesystem hierarchy outside +of jail. + +III. Impact + +A process with superuser privileges running inside a jail configured +with the allow.mount permission (not enabled by default) could change the root +directory outside of the jail, and thus gain full read and write access +to all files and directories in the system. + +IV. Workaround + +As a workaround, disable allow.mount permission for all jails with untrusted +root users; see jail(1) and jail.conf(5) manual pages for details. + +Note that this permission is not enabled by default. + +V. Solution + +Upgrade your vulnerable system to a supported FreeBSD stable or +release / security branch (releng) dated after the correction date +and reboot. + +Perform one of the following: + +1) To update your vulnerable system via a binary patch: + +Systems running a RELEASE version of FreeBSD on the amd64, i386, or +(on FreeBSD 13 and later) arm64 platforms can be updated via the +freebsd-update(8) utility: + +# freebsd-update fetch +# freebsd-update install +# shutdown -r +10min "Rebooting for a security update" + +2) To update your vulnerable system via a source code patch: + +The following patches have been verified to apply to the applicable +FreeBSD release branches. + +a) Download the relevant patch from the location below, and verify the +detached PGP signature using your PGP utility. + +[FreeBSD 13.0] +# fetch https://security.FreeBSD.org/patches/SA-21:10/jail_mount.13.patch +# fetch https://security.FreeBSD.org/patches/SA-21:10/jail_mount.13.patch.asc +# gpg --verify jail_mount.13.patch.asc + +[FreeBSD 12.2] +# fetch https://security.FreeBSD.org/patches/SA-21:10/jail_mount.12.patch +# fetch https://security.FreeBSD.org/patches/SA-21:10/jail_mount.12.patch.asc +# gpg --verify jail_mount.12.patch.asc + +[FreeBSD 11.4] +# fetch https://security.FreeBSD.org/patches/SA-21:10/jail_mount.11.patch +# fetch https://security.FreeBSD.org/patches/SA-21:10/jail_mount.11.patch.asc +# gpg --verify jail_mount.11.patch.asc + +b) Apply the patch. Execute the following commands as root: + +# cd /usr/src +# patch < /path/to/patch + +c) Recompile your kernel as described in + and reboot the +system. + +VI. Correction details + +The following list contains the correction revision numbers for each +affected branch. + +Branch/path Hash Revision +- ------------------------------------------------------------------------- +stable/13/ 3ae17faa3704 stable/13-n245118 +releng/13.0/ 4710439ec594 releng/13.0-n244729 +stable/12/ r369552 +releng/12.2/ r369557 +stable/11/ r369560 +releng/11.4/ r369562 +- ------------------------------------------------------------------------- + +For FreeBSD 13 and later: + +Run the following command to see which files were modified by a +particular commit: + +# git show --stat + +Or visit the following URL, replacing HHHHHH with the hash: + + + +To determine the commit count in a working tree (for comparison against +nNNNNNN in the table above), run: + +# git rev-list --count --first-parent HEAD + +For FreeBSD 12 and earlier: + +Run the following command to see which files were modified by a particular +revision, replacing NNNNNN with the revision number: + +# svn diff -cNNNNNN --summarize svn://svn.freebsd.org/base + +Or visit the following URL, replacing NNNNNN with the revision number: + + + +VII. References + + + + + +The latest revision of this advisory is available at + +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCgAdFiEE/A6HiuWv54gCjWNV05eS9J6n5cIFAmBsveQACgkQ05eS9J6n +5cIujRAAoTOIB1bMhDN3w382izu+g4L4HATqhOyKlf3Ezwlnmckt4s+ERar7EWND +4MayXSogCYwYwb6gsfBsqEdAJwhID1zkBDmC9LaYKehOLMMdPOCbpemJ3xT0540m +S4MJ+vPBT2NZ8NsUGNNpIF/mZTgwDai4WSBCr/0OIyNDd+nzStOv0d8h3aNGNweW +p/pvETnf/FtR9kACZ2HuiHtOx2IvQv8+n4gjefl440fz8czb3nftdGHRXLc0Kkcy +T/l3Y0SgBvXmlhtmhGZmF787Bw/5No+fbKZ4AuTMms42OWz8y02ZjFCvwXEu7/tC +f9eeFUzpR+rjNr0MMFEm1GBPNgbdF4v/IhnUA4gWrhjp1sh+4SjHoFhS1tfdY6gf +W76eyT0B8oDOLK4Jo76iTjvN1sZ0wctOaq7yk+7rGbhSUFUohQmtsMbvGOfHIVxl +DlJ9faccWJLOjbeUAVhVMbowT3/QKqnbuRpkq6U7YIcs9P4cg8RUrokCOiGd5pBz +PD5zpNcRCe69c+d39XDGDiBjPm4mQK1VEOr90gcAlE5yioxUW6qlHkFrp/Mje6dX +25Sb1q1zwjn3rM1moIeRXmx+ioLAT9ZWpYs5IvKsuRw4VmppIjA6TWm8ECbjKQKG +yPuUgUyxoIoEJgQNmJaM2Rk/fKijyVjEG22jlDNwCxASE4vJ7Xw= +=g2On +-----END PGP SIGNATURE----- diff --git a/website/static/security/patches/EN-21:09/pf.patch b/website/static/security/patches/EN-21:09/pf.patch new file mode 100644 index 0000000000..7407c4494a --- /dev/null +++ b/website/static/security/patches/EN-21:09/pf.patch @@ -0,0 +1,22 @@ + MFC r368588: + + pf: Allow net.pf.request_maxcount to be set from loader.conf + + Mark request_maxcount as RWTUN so we can set it both at runtime and from + loader.conf. This avoids users getting caught out by the change from tunable to + run time configuration. + + Suggested by: Franco Fichtner + + (cherry picked from commit 08d13750ebdae45bcdb73d52665b823e9ba93db1) +--- sys/netpfil/pf/pf.c.orig ++++ sys/netpfil/pf/pf.c +@@ -382,7 +382,7 @@ + &pf_hashsize, 0, "Size of pf(4) states hashtable"); + SYSCTL_ULONG(_net_pf, OID_AUTO, source_nodes_hashsize, CTLFLAG_RDTUN, + &pf_srchashsize, 0, "Size of pf(4) source nodes hashtable"); +-SYSCTL_ULONG(_net_pf, OID_AUTO, request_maxcount, CTLFLAG_RW, ++SYSCTL_ULONG(_net_pf, OID_AUTO, request_maxcount, CTLFLAG_RWTUN, + &pf_ioctl_maxcount, 0, "Maximum number of tables, addresses, ... in a single ioctl() call"); + + VNET_DEFINE(void *, pf_swi_cookie); diff --git a/website/static/security/patches/EN-21:09/pf.patch.asc b/website/static/security/patches/EN-21:09/pf.patch.asc new file mode 100644 index 0000000000..1b708cc8a3 --- /dev/null +++ b/website/static/security/patches/EN-21:09/pf.patch.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE/A6HiuWv54gCjWNV05eS9J6n5cIFAmBswCIACgkQ05eS9J6n +5cL9LA/+JMfWVH4WcjeN+0mci/eV/7arH0CQWNHgBL5h6Jqgqbj+1rzIZoMxuzGM +bgrikYYRsjvGcikGOuToWx2sxxCPuCIGN2PQV3Z+rmQYUp+lHx33SZiJ/gwMLv43 +7aY3VB8Zpqar/MJbWHlJM9tRcrwEZIDaJZqUqsku57RWvAj5uPd7TMW3Ount0Dza +wbDy+qgO9MJZsP9IE2ePi0M7bHtqOkLhK4KcXoYmzNkZ5n3W+edUH6AKoLBddoCA +N6FC69MGJWAWY59bMGRLfexMB8LCal22orRe+zABWVelNM3Y36ymABaA1i/H4lYc +XbB9lwkkzttXyO10UBOq2jNMjZ0VG5MA59TjfyMtszaEFHsp3PEH7gEO1nmCO+hi +fiol4UGpcHUyufIwBQE3f8fj8iFWNDu7vHGMCmNoNjUP98TskhEQ6ZzW+fIrgIRh +oq8cFcGE5uHXACvlWpQ+PZrqGC/D/4t9OK0mOCYkekDJvG93ejFxz8Bck0zk2Tc4 +ICoduClnotLtTCP2wtkszXmrH0JYGvSrN0sxSMtEPY+6wnuEtrJnN6e3MKA/f2GP +KsAO7poiz9QEieimD5+Tw4WfCGuOTliRZNvrWO7B6GUF9cRP1Ttr2AIx7vdjhdVt +uUOd2R7FgFmVsCzLIhmyFh4aTZgwf3bXr91tHa5iD4wtw0h9Z/I= +=ESG4 +-----END PGP SIGNATURE----- diff --git a/website/static/security/patches/EN-21:10/lldb.patch b/website/static/security/patches/EN-21:10/lldb.patch new file mode 100644 index 0000000000..38f58bfa57 --- /dev/null +++ b/website/static/security/patches/EN-21:10/lldb.patch @@ -0,0 +1,54 @@ +--- contrib/llvm-project/lldb/source/Target/Target.cpp.orig ++++ contrib/llvm-project/lldb/source/Target/Target.cpp +@@ -2412,21 +2412,13 @@ + + llvm::Expected Target::GetEntryPointAddress() { + Module *exe_module = GetExecutableModulePointer(); +- llvm::Error error = llvm::Error::success(); +- assert(!error); // Check the success value when assertions are enabled. + +- if (!exe_module || !exe_module->GetObjectFile()) { +- error = llvm::make_error("No primary executable found", +- llvm::inconvertibleErrorCode()); +- } else { ++ // Try to find the entry point address in the primary executable. ++ const bool has_primary_executable = exe_module && exe_module->GetObjectFile(); ++ if (has_primary_executable) { + Address entry_addr = exe_module->GetObjectFile()->GetEntryPointAddress(); + if (entry_addr.IsValid()) + return entry_addr; +- +- error = llvm::make_error( +- "Could not find entry point address for executable module \"" + +- exe_module->GetFileSpec().GetFilename().GetStringRef() + "\"", +- llvm::inconvertibleErrorCode()); + } + + const ModuleList &modules = GetImages(); +@@ -2437,14 +2429,21 @@ + continue; + + Address entry_addr = module_sp->GetObjectFile()->GetEntryPointAddress(); +- if (entry_addr.IsValid()) { +- // Discard the error. +- llvm::consumeError(std::move(error)); ++ if (entry_addr.IsValid()) + return entry_addr; +- } + } + +- return std::move(error); ++ // We haven't found the entry point address. Return an appropriate error. ++ if (!has_primary_executable) ++ return llvm::make_error( ++ "No primary executable found and could not find entry point address in " ++ "any executable module", ++ llvm::inconvertibleErrorCode()); ++ ++ return llvm::make_error( ++ "Could not find entry point address for primary executable module \"" + ++ exe_module->GetFileSpec().GetFilename().GetStringRef() + "\"", ++ llvm::inconvertibleErrorCode()); + } + + lldb::addr_t Target::GetCallableLoadAddress(lldb::addr_t load_addr, diff --git a/website/static/security/patches/EN-21:10/lldb.patch.asc b/website/static/security/patches/EN-21:10/lldb.patch.asc new file mode 100644 index 0000000000..533380c6d0 --- /dev/null +++ b/website/static/security/patches/EN-21:10/lldb.patch.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE/A6HiuWv54gCjWNV05eS9J6n5cIFAmBswDUACgkQ05eS9J6n +5cKwUw/+LG+VaMCCQu9W9y0YfVoxcvGzSeBO9ZmdL1jrP+REZqHsVEIi4T+vV4JK +EEBf/Cnp45/86AP9oT6Txt/A+/dGNa91Dq3eB/SfdChGjQg3K5egCThmmQwZfQPI +VcPyhFSQXUCHfk0ozxQBiNCBZgIg49Nsj/jY3JQUmxF9olTKL2nKVvpOguujkdOC +FkkSffnQeJw2MUml4Bpn71BOf6XBLxDG5WimzVv5hRi/dwMqn/LU4VIg97LPIa+9 +mZotQDLszKLwyo2HA1iI5/Atg3XnB0PHDHfEAuHp/dReF6OzrG1ZvvLdbZM5WFnY +HXol3Nd7oafdjI29v6prAlHMTooJOzKJZ2X6Rg9SwPkKVcA0SJFNo5x/0HMMPgnr +Ybo4rvB7zdLn/SRtGXk0cWy41ahIcDNt/CbaztXm9a/QIHhb18jF2kdOSCvEXDlU +rMmZMLQ/Rfm2jA/WByK/5wR9E0YO23yMIdI5OW12I48x8IRKKcjdihkk6ilo2F3u ++1c+CvA2c0Lsua+BAMASxoDVvFel0jR9IONku/Bk+mAIWGa2XFCDiH3ssBM8h774 +Qu4IEbpw+EtbF5fMPBDLeycXrGM/P0IO9fd6tyUQFwlN64OPWwSw72nYn3bDD5hJ +XwzAbUf0aU7MiX8DvqdNB0lBhwicWvWHF6t5N4jRtWM3fadf2NM= +=XWab +-----END PGP SIGNATURE----- diff --git a/website/static/security/patches/SA-21:08/vm_fault.11.patch b/website/static/security/patches/SA-21:08/vm_fault.11.patch *** 391 LINES SKIPPED *** From owner-dev-commits-doc-all@freebsd.org Tue Apr 6 20:56:11 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7C4555BDD68 for ; Tue, 6 Apr 2021 20:56:11 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFKZ336Ypz4vSk; Tue, 6 Apr 2021 20:56:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5892612DCE; Tue, 6 Apr 2021 20:56:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 136KuBjj031282; Tue, 6 Apr 2021 20:56:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 136KuBpn031281; Tue, 6 Apr 2021 20:56:11 GMT (envelope-from git) Date: Tue, 6 Apr 2021 20:56:11 GMT Message-Id: <202104062056.136KuBpn031281@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 2c1a6b3977 - main - Add OpenSMTPD example for sending mail through FreeBSD mxs MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c1a6b3977da8446ba2232eb0d86fe713cbba65a Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2021 20:56:11 -0000 The branch main has been updated by bofh (ports committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=2c1a6b3977da8446ba2232eb0d86fe713cbba65a commit 2c1a6b3977da8446ba2232eb0d86fe713cbba65a Author: Muhammad Moinur Rahman AuthorDate: 2021-04-06 20:54:18 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2021-04-06 20:54:18 +0000 Add OpenSMTPD example for sending mail through FreeBSD mxs Adds an example on howto configure OpenSMPTD to forward locally sent mails to FreeBSD.org mail servers. Approved by: crees, imp Differential Revision: https://reviews.freebsd.org/D29574 --- .../en/articles/committers-guide/_index.adoc | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 091e3b5d14..fa65ede180 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -2210,6 +2210,30 @@ yourusername@FreeBSD.org yourlocalusername Where _yourlocalusername_ is the SASL username used to connect to the local instance of Postfix. ==== +[[smtp-setup-local-opensmtpd]] +.Using OpenSMTPD +[example] +==== + +To tell a local OpenSMTPD instance that anything from `_yourusername_@FreeBSD.org` should be forwarded to the FreeBSD.org servers, add this to your [.filename]#smtpd.conf#: + +[.programlisting] +.... +action "freebsd" relay host smtp+tls://freebsd@smtp.freebsd.org:587 auth +match from any auth yourlocalusername mail-from "_yourusername_@freebsd.org" for any action "freebsd" +.... + +Where _yourlocalusername_ is the SASL username used to connect to the local instance of OpenSMTPD. + +Create [.filename]#/usr/local/etc/mail/secrets# with the following content: + +[.programlisting] +.... +freebsd yourusername:yourpassword +.... + +==== + [[mentors]] === Mentors From owner-dev-commits-doc-all@freebsd.org Wed Apr 7 11:05:46 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1825E5D3222 for ; Wed, 7 Apr 2021 11:05: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFhQL0Cdpz4rwr; Wed, 7 Apr 2021 11:05:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EA1481E169; Wed, 7 Apr 2021 11:05:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 137B5jgA060443; Wed, 7 Apr 2021 11:05:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 137B5j9u060442; Wed, 7 Apr 2021 11:05:45 GMT (envelope-from git) Date: Wed, 7 Apr 2021 11:05:45 GMT Message-Id: <202104071105.137B5j9u060442@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Ryusuke SUZUKI Subject: git: 939e534a12 - main - 3845c83d66 -> cf77cf8be5 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ryusuke X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 939e534a12411a84d987913bea0fa66d24ce7110 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Apr 2021 11:05:46 -0000 The branch main has been updated by ryusuke: URL: https://cgit.FreeBSD.org/doc/commit/?id=939e534a12411a84d987913bea0fa66d24ce7110 commit 939e534a12411a84d987913bea0fa66d24ce7110 Author: Ryusuke SUZUKI AuthorDate: 2021-04-07 11:05:22 +0000 Commit: Ryusuke SUZUKI CommitDate: 2021-04-07 11:05:22 +0000 3845c83d66 -> cf77cf8be5 --- website/content/ja/developers/cvs.adoc | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/website/content/ja/developers/cvs.adoc b/website/content/ja/developers/cvs.adoc index db16f01d9f..9c0e920906 100644 --- a/website/content/ja/developers/cvs.adoc +++ b/website/content/ja/developers/cvs.adoc @@ -5,12 +5,32 @@ sidenav: developers = ソースコードリポジトリ +== Git + +FreeBSD プロジェクトは、ソースを管理するツールに +https://git-scm.com/[Git] を使っています。 +すべての変更は、(その変更目的を説明するログメッセージと共に) リポジトリに記録され、以下で述べるウェブインタフェースで簡単に見ることができます。 + +2020 年 12 月、ベースシステムの開発は Subversion から Git に移行しました。 +https://cgit.FreeBSD.org/src/[ウェブインタフェース] を利用してリポジトリを見ることができます。 + +2020 年 12 月、FreeBSD ドキュメンテーションプロジェクトは、Subversion から Git へと移行しました。 +https://cgit.FreeBSD.org/doc/[ウェブインタフェース] を利用して FreeBSD ドキュメンテーションプロジェクトの Git リポジトリの内容を見ることができます。 + +FreeBSD の Ports ツリーも、2021 年 3 月末に Subversion から Git へと移行予定です。 +https://cgit-dev.FreeBSD.org/ports/[ウェブインタフェース] を利用してベータ版のリポジトリを見ることができます。 + == Subversion -FreeBSD プロジェクトは、ソースを管理するツールとして https://subversion.apache.org/[Subversion] (略して SVN) を使っています。 すべての変更は、(その目的を説明するログメッセージと共に) リポジトリに記録され、 以下で述べるウェブインタフェースで簡単に見ることができます。 +FreeBSD プロジェクトは、ソースを管理するツールとして https://subversion.apache.org/[Subversion] (略して SVN) を使っていました。 +すべての変更は、(その目的を説明するログメッセージと共に) リポジトリに記録され、 以下で述べるウェブインタフェースで簡単に見ることができます。 -2008 年 6 月より、ベースシステムの開発は、CVS から Subversion に移行しました。 https://svnweb.FreeBSD.org/base/[ウェブインタフェース] を利用してリポジトリを見ることができます。 +2008 年 6 月に、ベースシステムの開発は CVS から Subversion に移行しました。 +2020 年 12 月に Git に開発が移行した後は、stable/11, stable/12 およびサポートしているリリースブランチに対する変更を git2svn によって変換したコミットのみ記録しています。 +https://svnweb.FreeBSD.org/base/[ウェブインタフェース] を利用してリポジトリを見ることができます。 -2012 年 5 月より、FreeBSD ドキュメンテーションプロジェクトは、CVS から Subversion へと移行しました。link:https://svnweb.FreeBSD.org/doc/[ウェブインタフェース] を利用して FreeBSD ドキュメンテーションプロジェクトの SVN リポジトリの内容を見ることができます。 +2012 年 5 月に、FreeBSD ドキュメンテーションプロジェクトは CVS から Subversion に移行しました。 +2020 年 12 月の Git への移行後、doc subversion リポジトリには変更は行われていません。 +link:https://svnweb.FreeBSD.org/doc/[ウェブインタフェース] を利用して FreeBSD ドキュメンテーションプロジェクトの SVN リポジトリの内容を見ることができます。 2012 年 6 月より、FreeBSD Ports ツリーは、CVS から Subversion へと移行しました。link:https://svnweb.FreeBSD.org/ports/[ウェブインタフェース] を利用してリポジトリの内容を見ることができます。 From owner-dev-commits-doc-all@freebsd.org Wed Apr 7 11:19:24 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B71D65D370D for ; Wed, 7 Apr 2021 11:19: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFhk44mHRz4t0k; Wed, 7 Apr 2021 11:19:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 967581E68C; Wed, 7 Apr 2021 11:19:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 137BJOGd074800; Wed, 7 Apr 2021 11:19:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 137BJO9m074799; Wed, 7 Apr 2021 11:19:24 GMT (envelope-from git) Date: Wed, 7 Apr 2021 11:19:24 GMT Message-Id: <202104071119.137BJO9m074799@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Ryusuke SUZUKI Subject: git: b3b90b4ff8 - main - 989d921f5d -> e20c2174c7 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ryusuke X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b3b90b4ff88b988cb809fdffd97c3794a95ae5af Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Apr 2021 11:19:24 -0000 The branch main has been updated by ryusuke: URL: https://cgit.FreeBSD.org/doc/commit/?id=b3b90b4ff88b988cb809fdffd97c3794a95ae5af commit b3b90b4ff88b988cb809fdffd97c3794a95ae5af Author: Ryusuke SUZUKI AuthorDate: 2021-04-07 11:18:59 +0000 Commit: Ryusuke SUZUKI CommitDate: 2021-04-07 11:18:59 +0000 989d921f5d -> e20c2174c7 --- website/content/ja/developers/cvs.adoc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/website/content/ja/developers/cvs.adoc b/website/content/ja/developers/cvs.adoc index 9c0e920906..ecf9edc84c 100644 --- a/website/content/ja/developers/cvs.adoc +++ b/website/content/ja/developers/cvs.adoc @@ -17,8 +17,8 @@ https://cgit.FreeBSD.org/src/[ウェブインタフェース] を利用してリ 2020 年 12 月、FreeBSD ドキュメンテーションプロジェクトは、Subversion から Git へと移行しました。 https://cgit.FreeBSD.org/doc/[ウェブインタフェース] を利用して FreeBSD ドキュメンテーションプロジェクトの Git リポジトリの内容を見ることができます。 -FreeBSD の Ports ツリーも、2021 年 3 月末に Subversion から Git へと移行予定です。 -https://cgit-dev.FreeBSD.org/ports/[ウェブインタフェース] を利用してベータ版のリポジトリを見ることができます。 +2021 年 4 月、FreeBSD の Ports ツリーは、Subversion から Git へと移行しました。 +https://cgit-dev.FreeBSD.org/ports/[ウェブインタフェース] を利用してリポジトリを見ることができます。 == Subversion @@ -30,7 +30,9 @@ FreeBSD プロジェクトは、ソースを管理するツールとして https https://svnweb.FreeBSD.org/base/[ウェブインタフェース] を利用してリポジトリを見ることができます。 2012 年 5 月に、FreeBSD ドキュメンテーションプロジェクトは CVS から Subversion に移行しました。 -2020 年 12 月の Git への移行後、doc subversion リポジトリには変更は行われていません。 -link:https://svnweb.FreeBSD.org/doc/[ウェブインタフェース] を利用して FreeBSD ドキュメンテーションプロジェクトの SVN リポジトリの内容を見ることができます。 +2020 年 12 月に Subversion から Git へ移行後、doc subversion リポジトリには変更は行われていません。 +https://svnweb.FreeBSD.org/doc/[ウェブインタフェース] を利用して FreeBSD ドキュメンテーションプロジェクトの SVN リポジトリの内容を見ることができます。 -2012 年 6 月より、FreeBSD Ports ツリーは、CVS から Subversion へと移行しました。link:https://svnweb.FreeBSD.org/ports/[ウェブインタフェース] を利用してリポジトリの内容を見ることができます。 +2012 年 6 月に、FreeBSD Ports ツリーは、CVS から Subversion に移行しました。 +2021 年 4 月に Subversion から Git へ移行後、ports subversion リポジトリには変更は行われていません。 +https://svnweb.FreeBSD.org/ports/[ウェブインタフェース] を利用してリポジトリの内容を見ることができます。 From owner-dev-commits-doc-all@freebsd.org Wed Apr 7 14:52:01 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B21845B94B8 for ; Wed, 7 Apr 2021 14:52:01 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFnRP4lDHz3RKk; Wed, 7 Apr 2021 14:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 95C17211AB; Wed, 7 Apr 2021 14:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 137Eq1Nl066772; Wed, 7 Apr 2021 14:52:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 137Eq1Ua066771; Wed, 7 Apr 2021 14:52:01 GMT (envelope-from git) Date: Wed, 7 Apr 2021 14:52:01 GMT Message-Id: <202104071452.137Eq1Ua066771@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Mathieu Arnold Subject: git: a4888aa345 - main - Document new USES=cmake argument PR: 254677 Submitted by: adridg MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mat X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a4888aa345f7eb52766d2753c697fb23df99b902 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Apr 2021 14:52:01 -0000 The branch main has been updated by mat: URL: https://cgit.FreeBSD.org/doc/commit/?id=a4888aa345f7eb52766d2753c697fb23df99b902 commit a4888aa345f7eb52766d2753c697fb23df99b902 Author: Adriaan de Groot AuthorDate: 2021-04-07 14:50:15 +0000 Commit: Mathieu Arnold CommitDate: 2021-04-07 14:51:35 +0000 Document new USES=cmake argument PR: 254677 Submitted by: adridg --- .../content/en/books/porters-handbook/uses/_index.adoc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/documentation/content/en/books/porters-handbook/uses/_index.adoc b/documentation/content/en/books/porters-handbook/uses/_index.adoc index 41d7a5f73a..fcfdfc1d46 100644 --- a/documentation/content/en/books/porters-handbook/uses/_index.adoc +++ b/documentation/content/en/books/porters-handbook/uses/_index.adoc @@ -194,16 +194,18 @@ Prevents the port from installing [.filename]#charset.alias#. This must be insta [[uses-cmake]] == `cmake` -Possible arguments: (none), `insource`, `noninja`, `run` +Possible arguments: (none), `insource`, `noninja`, `run`, `testing` -Uses CMake for configuring and building. +Use CMake for configuring the port and generating a build system. -By default an out-of-source build is performed, leaving the sources in `WRKSRC` free from build artifacts. With the `insource` argument, an in-source build will be performed instead. Setting it should be the exception when a regular out-of-source build does not work. +By default an out-of-source build is performed, leaving the sources in `WRKSRC` free from build artifacts. With the `insource` argument, an in-source build will be performed instead. This argument should be an exception, used only when a regular out-of-source build does not work. -By default Ninja is used for the build. In some cases this does not work correctly. With the `noninja` argument, the build will fallback to using regular `make` for builds. It should only be used if a Ninja-based build does not work. +By default Ninja (package:devel/ninja[]) is used for the build. In some cases this does not work correctly. With the `noninja` argument, the build will use regular `make` for builds. This argument should only be used if a Ninja-based build does not work. With the `run` argument, a run dependency is registered in addition to a build dependency. +With the `testing` argument, a test-target is added that uses CTest. When running tests the port will be re-configured for testing and re-built. + For more information see crossref:special[using-cmake,Using `cmake`]. [[uses-compiler]] From owner-dev-commits-doc-all@freebsd.org Thu Apr 8 01:03:34 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9847C5C9F00 for ; Thu, 8 Apr 2021 01:03: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FG3123zYXz3KZ3; Thu, 8 Apr 2021 01:03:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7B53F2940B; Thu, 8 Apr 2021 01:03:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13813YGJ082314; Thu, 8 Apr 2021 01:03:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13813YWF082313; Thu, 8 Apr 2021 01:03:34 GMT (envelope-from git) Date: Thu, 8 Apr 2021 01:03:34 GMT Message-Id: <202104080103.13813YWF082313@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: "Danilo G. Baio" Subject: git: b5f7b600ed - main - Add helper scripts for translations MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dbaio X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5f7b600edd24cd1eca235f8fab631821de98e78 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Apr 2021 01:03:34 -0000 The branch main has been updated by dbaio (ports committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=b5f7b600edd24cd1eca235f8fab631821de98e78 commit b5f7b600edd24cd1eca235f8fab631821de98e78 Author: Danilo G. Baio AuthorDate: 2021-04-08 00:54:11 +0000 Commit: Danilo G. Baio CommitDate: 2021-04-08 00:58:05 +0000 Add helper scripts for translations Already using them on Weblate FreeBSD, https://translate-dev.freebsd.org/. Approved by: bcr, gjb (doceng) Differential Revision: https://reviews.freebsd.org/D29569 --- tools/translate.sh | 78 +++++++++++++++++++++++++++++++ tools/update_translate_template.sh | 94 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 172 insertions(+) diff --git a/tools/translate.sh b/tools/translate.sh new file mode 100755 index 0000000000..cb4005611d --- /dev/null +++ b/tools/translate.sh @@ -0,0 +1,78 @@ +#!/bin/sh +# +# Copyright (c) 2021 Danilo G. Baio +# +# 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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. + + +if [ "$1" = "" ] || [ "$2" = "" ]; then + echo "Need to inform which component and|or language." + echo "$0 documentation|website pt_BR|es" + exit 1 +fi + +COMPONENT="$1" +LANGUAGE="$2" + +# po4a-translate option: -k, --keep +# Minimal threshold for translation percentage to keep (i.e. write) +# the resulting file (default: 80). I.e. by default, files have to be +# translated at least at 80% to get written. +# # KEEP_ENV=10 ./tools/translate.sh documentation pt_BR +KEEP="${KEEP_ENV:-80}" + +if [ "$LANGUAGE" = "en" ]; then + echo "Language 'en' can't be translated." + exit 1 +fi + +if [ ! -d "$COMPONENT/content/$LANGUAGE" ]; then + echo "$COMPONENT/content/$LANGUAGE does not exist." + exit 1 +fi + +for pofile in $(find "$COMPONENT/content/$LANGUAGE/" -name "*.po" ); do + name=$(basename -s .po "$pofile") + if [ "$name" = "chapters-order" ]; then + continue + fi + + dirbase=$(dirname "$pofile") + adoc_lang="$dirbase/$name.adoc" + adoc_orig=$(echo "$adoc_lang" | sed s,$COMPONENT/content/$LANGUAGE,$COMPONENT/content/en,) + + echo "....." + echo "$pofile" + + po4a-translate \ + --format asciidoc \ + --option compat=asciidoctor \ + --option yfm_keys=title,part \ + --master "$adoc_orig" \ + --master-charset "UTF-8" \ + --po "$pofile" \ + --localized "$adoc_lang" \ + --localized-charset "UTF-8" \ + --keep "$KEEP" + +done + diff --git a/tools/update_translate_template.sh b/tools/update_translate_template.sh new file mode 100755 index 0000000000..4bb5699d2e --- /dev/null +++ b/tools/update_translate_template.sh @@ -0,0 +1,94 @@ +#!/bin/sh +# +# Copyright (c) 2021 Danilo G. Baio +# +# 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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. + + +ALL_COMPONENTS="documentation +website" + +COMPONENTS="${1:-$ALL_COMPONENTS}" + +GIT_IGNORE_FILES="toc-examples.adoc +toc-figures.adoc +toc-tables.adoc +toc.adoc +toc-1.adoc +toc-2.adoc +toc-3.adoc +toc-4.adoc +toc-5.adoc" + +for remove_file in $GIT_IGNORE_FILES; do + find documentation/content/en/ -name "$remove_file" -delete -print || exit 1 +done + +for component in $COMPONENTS; do + + if [ ! -d "$component/content/en" ]; then + echo "Directory '$component/content/en' not found." + exit 1 + fi + + for document in $(find "$component/content/en/" -name "*.adoc" ); do + name=$(basename -s .adoc "$document") + + # Ignore some files + if [ "$name" = "chapters-order" ]; then + continue + fi + + if [ "$document" = "documentation/content/en/books/books.adoc" ]; then + continue + fi + + dirbase=$(dirname "$document") + echo "$document" + + if [ -f "$dirbase/$name.po" ]; then + po4a-updatepo \ + --format asciidoc \ + --option compat=asciidoctor \ + --option yfm_keys=title,part \ + --master "$document" \ + --master-charset "UTF-8" \ + --copyright-holder "The FreeBSD Project" \ + --package-name "FreeBSD Documentation" \ + --po "$dirbase/$name.po" + if [ -f "$dirbase/$name.po~" ]; then + rm -f "$dirbase/$name.po~" + fi + else + po4a-gettextize \ + --format asciidoc \ + --option compat=asciidoctor \ + --option yfm_keys=title,part \ + --master "$document" \ + --master-charset "UTF-8" \ + --copyright-holder "The FreeBSD Project" \ + --package-name "FreeBSD Documentation" \ + --po "$dirbase/$name.po" + fi + done +done + From owner-dev-commits-doc-all@freebsd.org Thu Apr 8 14:31:22 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5CADB5DDE42 for ; Thu, 8 Apr 2021 14:31:22 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FGNx61kgZz3L8j; Thu, 8 Apr 2021 14:31:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2EBEA408C; Thu, 8 Apr 2021 14:31:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 138EVMpj055425; Thu, 8 Apr 2021 14:31:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 138EVMXl055424; Thu, 8 Apr 2021 14:31:22 GMT (envelope-from git) Date: Thu, 8 Apr 2021 14:31:22 GMT Message-Id: <202104081431.138EVMXl055424@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Allan Jude Subject: git: 6e0e32a3e5 - main - Prune consultants list of inactive entities MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: allanjude X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e0e32a3e5d8bd7bfa97d9e58d264d14cef8c430 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Apr 2021 14:31:22 -0000 The branch main has been updated by allanjude: URL: https://cgit.FreeBSD.org/doc/commit/?id=6e0e32a3e5d8bd7bfa97d9e58d264d14cef8c430 commit 6e0e32a3e5d8bd7bfa97d9e58d264d14cef8c430 Author: Allan Jude AuthorDate: 2021-03-26 21:02:38 +0000 Commit: Allan Jude CommitDate: 2021-04-08 14:31:05 +0000 Prune consultants list of inactive entities Remove sites that no longer resolve/load, or which make no mention of FreeBSD at all. Reviewed by: emaste Sponsored by: Klara Inc. Differential Revision: https://reviews.freebsd.org/D29436 --- website/data/en/vendors/consulting.toml | 189 -------------------------------- 1 file changed, 189 deletions(-) diff --git a/website/data/en/vendors/consulting.toml b/website/data/en/vendors/consulting.toml index 5ca4a43575..24e59b398f 100644 --- a/website/data/en/vendors/consulting.toml +++ b/website/data/en/vendors/consulting.toml @@ -15,13 +15,6 @@ name = "A-Team Systems" url = "http://www.ateamsystems.com/" description = "A-Team Systems has over 15 years of experience helping clients leverage the power of in combination with other open source software such as PHP, MySQL and Apache in a secure, customized and cohesive way. We have been with since version 1.0! We can help you with your existing deployment or future plans: From encrypted backups to web and mail servers. Visit our website for more information." -[[consulting]] -id = "Adminia" -category = "europe" -name = "Adminia Sistemas" -url = "http://www.adminia.es/" -description = "Adminia offers technological consulting and professional system administration services, specializing in free software and virtualized high-availability environments. We have over 15 years experience in using and customizing FreeBSD systems in data processing centres, small and medium-sized businesses and universities. We are located in Madrid, Spain. Contact us for reliable and expert partnership via email or visit our website." - [[consulting]] id = "anonbsd" category = "samerica" @@ -50,13 +43,6 @@ name = "Black Point Arts Internet Solutions GmbH" url = "http://www.bpanet.de/" description = "Black Point Arts Internet Solutions GmbH is located in Germany (Frankfurt/Main). We have experiences with FreeBSD, Linux and Windows Servers. Our business activities include hosting/homing, programming and webdesign. We develop solutions for your intra-, extra- and internet needs. For more information you can visit our website or write an email to service@bpanet.de." -[[consulting]] -id = "catpipe" -category = "europe" -name = "catpipe Systems" -url = "http://www.catpipe.net/" -description = "catpipe Systems ApS provide managed services and support contracts for FreeBSD implemented on rackmountable servers preloaded with FreeBSD." - [[consulting]] id = "CloneConsulting" category = "nzealand" @@ -78,20 +64,6 @@ name = "Clue Computing, Inc." url = "http://www.clue.com/" description = "Clue Computing, Inc. has over 10 years of UNIX experience, specializing in system administration, networking, and security. Custom application development and testing available, including device drivers, kernel work, etc. We offer sales, assembly, and installation of FreeBSD systems for any application. For more information, email info@clue.com." -[[consulting]] -id = "CodeGen" -category = "namerica" -name = "CodeGen Inc." -url = "http://www.codegen.com/" -description = "CodeGen, Inc. provide consulting and programming services, specializing in embedded systems. For more information, email info@codegen.com." - -[[consulting]] -id = "DataPipe" -category = "namerica" -name = "DataPipe" -url = "http://www.datapipe.com/" -description = "Built on a rock-solid network and immediate live customer support, DataPipe is a trusted hosting company providing secure managed solutions. Our specialized teams of passionate professionals take a personal interest in each client's unique needs, enabling businesses to outsource with confidence. With world-class facilities strategically located in the New York Metropolitan & Silicon Valley areas, Hong Kong and London, UK, DataPipe offers custom FreeBSD solutions and expert FreeBSD support 24 hours a day, 365 days a year." - [[consulting]] id = "EscapeBox" category = "europe" @@ -99,13 +71,6 @@ name = "EscapeBox" url = "http://www.escapebox.net/en/" description = "More than 20 years of IT experience on demand! The EscapeBox Germany GmbH, founded in 2002, is a small but agile company that offers IT consulting services. We can support our clients both from remote and on location, as desired. So, if you are looking for capable freelancers for your projects, please do not hesitate to contact us today!" -[[consulting]] -id = "EssenzConsulting" -category = "namerica" -name = "Essenz Consulting" -url = "http://www.essenz.com" -description = "Essenz Consulting is a web services and products provider. We offer custom built High-Performance Intel based Workstations and Servers. These systems are 100% FreeBSD compatible. Our systems feature Ultra2-LVD SCSI, high speed networking, Dual Pentium III and Dual Pentium III XEON processors, and many other fault tolerant and backup features. For more information contact sales@essenz.com or visit us at http://www.essenz.com." - [[consulting]] id = "TheFreeBSDMall" category = "namerica" @@ -120,13 +85,6 @@ name = "HermeTek Network Solutions" url = "https://www.hermetek.com/" description = "HermeTek Network Solutions is a comprehensive network solutions provider with a strong focus on FreeBSD. HermeTek also offers support for other BSD and Linux operating systems, as well as fully managed hosting packages. Please visit our web site for more information." -[[consulting]] -id = "HerrinSoftware" -category = "namerica" -name = "Herrin Software Development" -url = "http://www.hsdi.com/" -description = "Herrin Software Development, Inc., creator of Qddb, provides custom software development, internet consulting, general computer consulting, and training services. For more information email us at info@hsdi.com or visit our web site." - [[consulting]] id = "GregLehey" category = "australia" @@ -134,13 +92,6 @@ name = "Greg Lehey" url = "http://www.lemis.com/grog/" description = "Greg Lehey has over 20 years industry experience in all system programming and systems administration disciplines, including device drivers, kernel debugging, compilers, libraries, performance analysis, and site planning. He is the author of The Vinum Volume Manager, a virtual disk driver which includes software RAID, and also the books Porting UNIX Software and The Complete FreeBSD. Contact him via Email, or visit his web site." -[[consulting]] -id = "innominate" -category = "europe" -name = "innominate AG" -url = "http://innominate.de/" -description = "innominate AGis a Linux, *BSD and Open Source service provider based in Berlin, Germany. Not only as consulting partner but also as system administrator, programmer, supporter and trainer we offer the full range of services with a heavy focus on Open Source products. Many of our tailor-made products are engineered using apache, Perl, Zope, MySQL and Oracle running on Linux and *BSD. For further information please contact info@innominate.de or visit our website." - [[consulting]] id = "ITSPro" category = "europe" @@ -225,20 +176,6 @@ name = "Omniscient Technologies" url = "http://www.omniscient.com/" description = "Omniscient Technologies is a Washington D.C. based consulting group with a broad array of experience in *BSD, Solaris, Linux and many other varieties of UNIX specializing in highly scalable systems, systems integration and network security. Custom application design also available. Please visit our website for more information." -[[consulting]] -id = "OpenSOS" -category = "asia" -name = "OpenSOS SB" -url = "http://www.opensos.net/" -description = "OpenSOS SB is a company which provides consulting and professional services for FreeBSD based solutions based in Kuala Lumpur, Malaysia. We also provide maintenance and support services in Malaysia. We can operate at short notice in any region in Asia for a truly professional quick-to-service operational capability. However we are willing to consider projects outside Malaysia. We are specialized in FreeBSD, MacOSX and basically in all kinds of UNIX systems." - -[[consulting]] -id = "Puryear" -category = "namerica" -name = "Puryear Information Technology, LLC" -url = "http://www.puryear-it.com" -description = "Puryear Information Technology, LLC provides open source application support, integration services, and technology management expertise to the Southeastern United States. Our company plays a pivotal role in the design and deployment of open source solutions--we have worked with companies to design and manage FreeBSD and Linux web farms; deployed open source-based clustering software to ensure high availability of critical network services; performed critical performance tuning and software integration for a popular spam filter appliance; and integrated Samba into Internet-accessible, VPN-based file services. Phone: +1-225-343-3056." - [[consulting]] id = "PeterDufault" category = "namerica" @@ -281,13 +218,6 @@ name = "SMLAN Software & Management Training" url = "https://www.smlan.de" description = "SMLan Software & Management Training is a learning center for IT-Trainings. Seminars for Open Source Systems like FreeBSD are offered to companies and individuals. Contact: 0049 30 4492545." -[[consulting]] -id = "SteubenTech" -category = "namerica" -name = "Steuben Technologies" -url = "http://www.steubentech.com/" -description = "Steuben Technologies is a consulting company offering support, administration, custom software development, legacy systems support and solutions tailored to your unique business model on a wide range of platforms including FreeBSD, NetBSD and most commercial UNIX platforms and much more. Please see our website or call us at (607)661-4431." - [[consulting]] id = "SysCare" category = "europe" @@ -316,20 +246,6 @@ name = "UnixPorting" url = "http://www.UnixPorting.com/" description = "UnixPorting.com specializes in the porting of existing software to new operating systems or hardware. In addition to porting, we specialize in C and Perl programming, Unix system administration and security, and open source technologies (FreeBSD, Perl, Apache, mod_perl, MySQL, etc.). For more information, please visit our web site." -[[consulting]] -id = "AspenWorks" -category = "namerica" -name = "AspenWorks, Ltd." -url = "http://www.aspenworks.com/" -description = "AspenWorks is an Aspen, Colorado based consulting company with offices in Portland, OR. We specialize in network applications, and Wireless Broadband management for ISPs and WISPs. AspenWorks has been in business since 1986. Telephone: 970-925-3355" - -[[consulting]] -id = "SecurityAudit" -category = "africa" -name = "Security Audit and Control Solutions" -url = "http://www.sacs.co.za/" -description = "Security Audit and Control Solutions (SACS) provides information security consultation and IT auditing services and offers professional FreeBSD support. SACS has developed a complete range of Technological Risk Management solutions using FreeBSD as an anchor for data analysis. Firewalls deployed using FreeBSD makes a cost effective solution in any organization and SACS can implement a secure FreeBSD firewall with caching engines, Network Address Translation (NAT) and proxies. For additional information please contact Mervin Pearce or visit http://www.sacs.co.za" - [[consulting]] id = "Raditex" category = "europe" @@ -337,13 +253,6 @@ name = "Raditex Control AB" url = "http://www.raditex.nu/" description = "Raditex Control AB are a firm of consultants and also do education in Unix. We have long experience with all kinds of Unix systems not only FreeBSD or Linux. For more information phone us at +46 19 450105 or give us an email at gorhas@raditex.nu or visit our web site." -[[consulting]] -id = "Mike_Meyer" -category = "namerica" -name = "Mike_Meyer" -url = "http://www.mired.org" -description = "Mike Meyer of Meyer Consulting has been providing Unix-based solutions since 1976, and web-based applications since 1992. These solutions range from chemical systems modeling to device drivers, and the web applications have ranged from community-building applications to web based software release systems. For more information, please contact mwm@mired.org." - [[consulting]] id = "Cybersource" category = "australia" @@ -351,13 +260,6 @@ name = "Cybersource Pty. Ltd" url = "http://www.cyber.com.au/" description = "Cybersource is Australia's leading IT Professional Services Company in the areas of Unix/FreeBSD/Linux, TCP/IP Datanetworking and Open Platform application development using these technologies. With around 40 staff, are based in Melbourne and have been successfully providing IT Professional Services for 10 years." -[[consulting]] -id = "Bilch" -category = "europe" -name = "Bilch International Consulting" -url = "http://www.bilch.com/" -description = "Bilch International Consulting, Hamburg is based in Germany. We are building fire walled servers and connect them to your ISDN, POTS, ATM or E1/T1 Line. BILCH Com is an ASP and application software developer. Please mail us at info@bilch.com." - [[consulting]] id = "Wirewalk" category = "namerica" @@ -379,13 +281,6 @@ name = "ZYTRAX, Inc" url = "http://www.zytrax.com/" description = "Zytrax, Inc. is based in Montreal, Canada and provides consulting, development, implementation, hosting and maintenance services specialising in the BSD platforms. Our skill base includes Apache, PHP, Ruby, DNS, Mail, LDAP, Samba, PostgeSQL/MySQL and embedded systems. Please email us at consulting@zytrax.com. We can be reached via telephone at +1.514.285.9088." -[[consulting]] -id = "Xetpoint" -category = "europe" -name = "Xetpoint" -url = "http://www.xetpoint.fi/" -description = "Xetpoint Oy is located in Pirkkala, Finland. We offer professional FreeBSD support, consulting, programming, maintenance and monitoring services. For more information, please visit our website." - [[consulting]] id = "oscillation" category = "europe" @@ -393,34 +288,6 @@ name = "os-cillation" url = "http://www.os-cillation.de" description = "os-cillation, located in Siegen/NRW, Germany. We offer a broad range in BSD-based software-development (C/C++/Java/HTML/PHP/Perl/SQL). Installation and support of FreeBSD based mail, web, firewall, database, news, dns and ftp servers. FreeBSD and Windows desktop integration. Also experienced with NetBSD, Solaris and Linux." -[[consulting]] -id = "tunix" -category = "europe" -name = "Tunix" -url = "http://www.tunix.nl/" -description = "For more than 10 years TUNIX - the only Dutch firewall developer - brings you a unique combination of security-services: high-level training on Internet-technology and tailor-made security solutions. TUNIX Security offers an end-to-end solution with a full range of services such as consultancy for developing a security-policy and design of a security-architecture, project-management, turn-key implementation of firewall-appliances, multi-level support and 24x7 management and monitoring. The security solutions are build on the TUNIX Firewall, a modular, FreeBSD based proxy-level firewall. For more information, please contact sales@tunix.nl or visit our website at www.firewall.nl." - -[[consulting]] -id = "improware" -category = "europe" -name = "ImproWare AG" -url = "http://www.imp.ch/" -description = "ImproWare AG focuses on Internet and Networking Services as well as System Integration and Consulting based on FreeBSD. We offer contract programming in all major programming languages with a focus on FreeBSD, userland and kernel." - -[[consulting]] -id = "netmaniacs" -category = "europe" -name = "NetManiacs" -url = "http://www.netmaniacs.nl/" -description = "NetManiacs is a dutch company based in Eindhoven. We provide consulting, (system administration) support, custom software and a broad range of (internet/business) server solutions. For more information visit www.netmaniacs.nl or contact us at info@netmaniacs.nl." - -[[consulting]] -id = "ArtisanComputerServicesLLC" -category = "namerica" -name = "Artisan Computer Services LLC" -url = "http://www.artisancomputer.com/" -description = "Artisan Computer Services LLC is based in Tucson, Arizona. We provide system administration and configuration for web, mail, DNS, database, and streaming video servers using FreeBSD. We also do computer consulting on a variety of platforms (Mac OS X, Windows, *BSD, Linux), with an emphasis on integration and security. You can reach us at info@artisancomputer.com, or our website, www.artisancomputer.com." - [[consulting]] id = "EnvescentLCC" category = "namerica" @@ -428,13 +295,6 @@ name = "Envescent, LLC" url = "http://www.envescent.com/" description = "Envescent is a leading provider of technology products and services focused on FreeBSD. We offer consulting, pre-installed workstations and servers, compatible hardware, outsourced system and network administration and implementation, security auditing, technical support and much more." -[[consulting]] -id = "RBJ-Consultants" -category = "europe" -name = "RBJ-Consultants" -url = "mailto:rbj@madeira.dyndns.org" -description = "Unix since 1990. Remote installation (Europe-webhosting, Brasil, USA) and local. We train, install, configure and admin FreeBSD, Linux (RedHat, Suse, Gentoo, Mandrake), Solaris. Inside network - MacOSX, Windows, etc (we support too). Contact: Rui Bento " - [[consulting]] id = "sheridan" category = "europe" @@ -449,20 +309,6 @@ name = "Ceintec" url = "http://www.ceintec.com" description = "Ceintec provides FreeBSD and unix-like operating systems learning courses in Spain (Instructor-Led courses). We also provide FreeBSD consulting and technical support for enterprises in Spain. For more information visit http://www.ceintec.com/empresas.html" -[[consulting]] -id = "Triona" -category = "europe" -name = "Triona - Information und Technologie GmbH" -url = "http://www.triona.de" -description = "Triona - Information und Technologie GmbH offers FreeBSD installation and administration services, individual software development, web-, application- and database-servers. The company is based in Mainz, Germany. For more information contact us via email bsd@triona.de or visit our web site." - -[[consulting]] -id = "ActivSupport" -category = "namerica" -name = "ActivSupport, Inc." -url = "http://www.activsupport.com/" -description = "ActivSupport is a network consulting firm located in the San Francisco Bay Area specializing in cross-platform environment support including FreeBSD. ActivSupport also provides network security, and business continuity consulting. Whether you are looking for a certified consultant or specific technical support solutions please contact us at 1-877.228.4863 for immediate assistance with your technical needs, or visit our web site for more information about services we are providing." - [[consulting]] id = "BSDPIE" category = "europe" @@ -498,20 +344,6 @@ name = "NetFence" url = "http://www.netfence.it" description = "NetFence deploys and maintains Internet/intranet servers based on FreeBSD and other open source software (including Apache web server, Squid, Samba, Cyrus IMAP, PostgreSQL, OpenVPN and others). Network and client-side hardware/software/support is also offered, as well as custom programming and security coverage. It is located in Bologna, Italy and can be reached at freebsd@netfence.it." -[[consulting]] -id = "unixconsulting" -category = "europe" -name = "Unix Consulting" -url = "http://www.unixconsulting.info" -description = "Based in London, England, we are focused on BSD/Linux and Open Source consultancy and support. Whether your business already runs Linux/FreeBSD/NetBSD/OpenBSD or you are considering the introduction of Open Source technology, Unix Consulting can help you every step of the way." - -[[consulting]] -id = "ironkeep" -category = "namerica" -name = "Ironkeep Technologies L.L.C." -url = "http://www.ironkeep.net" -description = "Ironkeep Technologies is a Traverse City based consulting firm, specializing in internet solutions, networks, vpns, software development, programming, web development, web design, application development, web hosting, consulting, and open source software including FreeBSD." - [[consulting]] id = "ethon" category = "europe" @@ -561,20 +393,6 @@ name = "Ouellet Consulting Inc." url = "http://sirius.danosoft.com/oci/index.html" description = "OCI specialize in systems/networks design, implementation and security solutions, including solutions meeting HIPPA requirements. We spec out, configure and support firewalls, proxy-arrays, servers, switches, mail systems, web servers, databases, etc. We are familiar with and support most Windows and Unix/Linux systems including FreeBSD. We offer remote administration services worldwide, on all supported platforms. We plan and assist with Active Directory migrations. For more information please contact us via e-mail or call us +1-850-510-6162. Please see our website for complete details on what we offer." -[[consulting]] -id = "corbesero" -category = "namerica" -name = "Stephen Corbesero" -url = "mailto:corbesero@fast.net" -description = "Stephen Corbesero has over 20 years of software and hardware computing experience in various flavors of Unix (FreeBSD since 2.2, SunOS, Solaris,...), C and C++, Perl, databases, networking, etc. He can provide system and network configuration and administration, some custom programming in the above languages, troubleshooting and repair. He is located in Eastern Pennsylvania. Please email him for more information." - -[[consulting]] -id = "corezone" -category = "europe" -name = "CORE ZONE s.r.o." -url = "http://corezone.cz" -description = "CORE ZONE s.r.o. is an outsourcing and consulting company focused on delivering the best IT solutions to its customers. We can take care of your IT infrastructure or help you with your IT projects. We install, administer and support systems based on FreeBSD, OpenBSD, or Linux (CentOS, Debian, Ubuntu). We are located in Prague, Czech Republic. Visit our webpage or contact us by e-mail." - [[consulting]] id = "hahnefeld" category = "europe" @@ -610,13 +428,6 @@ name = "The JMBG Network" url = "http://www.jmbg.net" description = "We believe in quality, reliable and innovative solutions so naturally we love FreeBSD. We are a Canadian electronic solutions provider servicing mainly South-Western Ontario. We also provide some solutions to clients in Canada and the United States. We offer a wide range of electronic solutions including consulting services and we most definitely support and recommend FreeBSD." -[[consulting]] -id = "thishosting" -category = "namerica" -name = "ThisHosting.Rocks" -url = "https://thishosting.rocks/support" -description = "THR Support offers 24/7 FreeBSD Support services. Including, but not limited to: setup, maintenance, configuration, updates, security patches and fixes, monitoring and more. Contact us at support@thishosting.rocks to request a quote." - [[consulting]] id = "afreebsdbrasil" category = "samerica" From owner-dev-commits-doc-all@freebsd.org Thu Apr 8 14:32:14 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B02EE5DE1A5 for ; Thu, 8 Apr 2021 14:32:14 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FGNy64gZ7z3LRv; Thu, 8 Apr 2021 14:32:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 940C03AFE; Thu, 8 Apr 2021 14:32:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 138EWEoX057948; Thu, 8 Apr 2021 14:32:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 138EWEW9057947; Thu, 8 Apr 2021 14:32:14 GMT (envelope-from git) Date: Thu, 8 Apr 2021 14:32:14 GMT Message-Id: <202104081432.138EWEW9057947@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Allan Jude Subject: git: fe42947944 - main - Add Klara to the consultants list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: allanjude X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe42947944f0328192ad23a2cc7298efe191db66 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Apr 2021 14:32:14 -0000 The branch main has been updated by allanjude: URL: https://cgit.FreeBSD.org/doc/commit/?id=fe42947944f0328192ad23a2cc7298efe191db66 commit fe42947944f0328192ad23a2cc7298efe191db66 Author: Allan Jude AuthorDate: 2021-03-26 20:04:29 +0000 Commit: Allan Jude CommitDate: 2021-04-08 14:31:46 +0000 Add Klara to the consultants list --- website/data/en/vendors/consulting.toml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/website/data/en/vendors/consulting.toml b/website/data/en/vendors/consulting.toml index 24e59b398f..6d0f2b738e 100644 --- a/website/data/en/vendors/consulting.toml +++ b/website/data/en/vendors/consulting.toml @@ -127,6 +127,13 @@ name = "Julian Stacey" url = "http://www.berklix.com/~jhs/cv/" description = "Net services & systems engineering, UNIX since 1978, Maintains a FreeBSD Commercial Consultants Index (sorted geographically & by full & part timers). Be sure to visit his page!" +[[consulting]] +id = "Klara" +category = "namerica" +name = "Klara Inc." +url = "https://klarasystems.com/freebsd-development/" +description = "FreeBSD Professional Services, Development and support for FreeBSD to customers around the globe." + [[consulting]] id = "Supportodua" category = "europe" From owner-dev-commits-doc-all@freebsd.org Thu Apr 8 18:15:42 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F25155BAC6E for ; Thu, 8 Apr 2021 18:15: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FGTvy6ZLBz3sft; Thu, 8 Apr 2021 18:15:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D46816DC5; Thu, 8 Apr 2021 18:15:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 138IFgQG049163; Thu, 8 Apr 2021 18:15:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 138IFgvi049162; Thu, 8 Apr 2021 18:15:42 GMT (envelope-from git) Date: Thu, 8 Apr 2021 18:15:42 GMT Message-Id: <202104081815.138IFgvi049162@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Kevin Bowling Subject: git: ea92863193 - main - relnotes: add smr MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea92863193b03e7cd2e5cddb3330f40365389a3a Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Apr 2021 18:15:43 -0000 The branch main has been updated by kbowling (ports committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=ea92863193b03e7cd2e5cddb3330f40365389a3a commit ea92863193b03e7cd2e5cddb3330f40365389a3a Author: Kevin Bowling AuthorDate: 2021-04-08 18:15:32 +0000 Commit: Kevin Bowling CommitDate: 2021-04-08 18:15:32 +0000 relnotes: add smr Reviewed by: emaste. mhorne --- website/content/en/releases/13.0R/relnotes.adoc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/website/content/en/releases/13.0R/relnotes.adoc b/website/content/en/releases/13.0R/relnotes.adoc index 2ee410642d..dc78d3a905 100644 --- a/website/content/en/releases/13.0R/relnotes.adoc +++ b/website/content/en/releases/13.0R/relnotes.adoc @@ -268,6 +268,12 @@ The GENERIC kernel for aarch64 now includes man:armv8crypto[4] to support accelerated software cryptography for man:geli[8] by default. gitref:074a91f746bd[repository=src] +Added Safe Memory Reclamation (SMR) to the kernel, a light weight variant of +epoch reclamation closely coupled to man:uma[9]. +This has been applied in parts of the VM subsystem and VFS layer to improve +scalability on high core count systems. +gitref:d4665eaa6638[repository=src] + [[drivers]] == Devices and Drivers From owner-dev-commits-doc-all@freebsd.org Thu Apr 8 18:41:20 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CA2035BBCDD for ; Thu, 8 Apr 2021 18:41: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FGVTX5SD2z3vr6; Thu, 8 Apr 2021 18:41:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AE4C37275; Thu, 8 Apr 2021 18:41:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 138IfKNA086119; Thu, 8 Apr 2021 18:41:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 138IfKSi086118; Thu, 8 Apr 2021 18:41:20 GMT (envelope-from git) Date: Thu, 8 Apr 2021 18:41:20 GMT Message-Id: <202104081841.138IfKSi086118@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Glen Barber Subject: git: 86d4fe5d51 - main - relnotes: document qat(4) driver addition MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 86d4fe5d511e99c04c8000d4f76f70c7213e94a7 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Apr 2021 18:41:20 -0000 The branch main has been updated by gjb: URL: https://cgit.FreeBSD.org/doc/commit/?id=86d4fe5d511e99c04c8000d4f76f70c7213e94a7 commit 86d4fe5d511e99c04c8000d4f76f70c7213e94a7 Author: Glen Barber AuthorDate: 2021-04-08 18:41:05 +0000 Commit: Glen Barber CommitDate: 2021-04-08 18:41:05 +0000 relnotes: document qat(4) driver addition Sponsored by: Rubicon Communications, LLC ("Netgate") --- website/content/en/releases/13.0R/relnotes.adoc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/website/content/en/releases/13.0R/relnotes.adoc b/website/content/en/releases/13.0R/relnotes.adoc index dc78d3a905..61d4a17dbb 100644 --- a/website/content/en/releases/13.0R/relnotes.adoc +++ b/website/content/en/releases/13.0R/relnotes.adoc @@ -302,6 +302,9 @@ Removed several network drivers for obsolete Ethernet adapters: * man:wb[4] Winbond W89C840F gitref:02fae06a11b4[repository=src] * man:xe[4] Xircom PCMCIA gitref:7a582e5374c8[repository=src] +The man:qat[4] driver has been added, supporting some of the cryptographic acceleration functions of the Intel QuickAssist (QAT) device. The man:qat[4] driver supports the QAT devices integrated with Atom C2000 and C3000 and Xeon C620 and D-1500 platforms, and the Intel QAT Adapter 8950. +gitref:72143e89bb43[repository=src] {{< sponsored "Rubicon Communications, LLC (\"Netgate\")" >}} + Removed the man:ubsec[4] driver for obsolete Broadcom BCM58xx crypto accelerators. gitref:97e251327f95[repository=src] {{< sponsored "Chelsio Communications" >}} From owner-dev-commits-doc-all@freebsd.org Thu Apr 8 18:56:55 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 45F705BC31D for ; Thu, 8 Apr 2021 18:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FGVqW1YYwz4R6n; Thu, 8 Apr 2021 18:56:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 243717A9E; Thu, 8 Apr 2021 18:56:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 138Iutsr002310; Thu, 8 Apr 2021 18:56:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 138Iuttf002309; Thu, 8 Apr 2021 18:56:55 GMT (envelope-from git) Date: Thu, 8 Apr 2021 18:56:55 GMT Message-Id: <202104081856.138Iuttf002309@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Mitchell Horne Subject: git: 79adfaa7f6 - main - relnotes: fix a gitref MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 79adfaa7f607f73e347d96b1c0637f3e4ef699c4 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Apr 2021 18:56:55 -0000 The branch main has been updated by mhorne (src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=79adfaa7f607f73e347d96b1c0637f3e4ef699c4 commit 79adfaa7f607f73e347d96b1c0637f3e4ef699c4 Author: Mitchell Horne AuthorDate: 2021-04-08 14:44:38 +0000 Commit: Mitchell Horne CommitDate: 2021-04-08 18:53:25 +0000 relnotes: fix a gitref --- website/content/en/releases/13.0R/relnotes.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/en/releases/13.0R/relnotes.adoc b/website/content/en/releases/13.0R/relnotes.adoc index 61d4a17dbb..3fccac6e42 100644 --- a/website/content/en/releases/13.0R/relnotes.adoc +++ b/website/content/en/releases/13.0R/relnotes.adoc @@ -210,7 +210,7 @@ regular expressions using these escapes. gitref:adeebf4cd47c[repository=src] New man:aio_readv[2] and man:aio_writev[2] system calls provide vectored -analogues of man:aio_read[2] and man:aio_write[2]. gitref:022ca2fc7fe0 +analogues of man:aio_read[2] and man:aio_write[2]. gitref:022ca2fc7fe0[repository=src] powerpc64 switched to ELFv2 ABI at the same time it switched to LLVM. This brings us to a parity with modern Linux distributions. This also makes the binaries from previous FreeBSD versions incompatible with 13.0-RELEASE. Kernel still supports ELFv1, so jails and chroots using older FreeBSD versions are still compatible. gitref:e4399d169acc[repository=src] From owner-dev-commits-doc-all@freebsd.org Thu Apr 8 18:56:56 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 646A05BC517 for ; Thu, 8 Apr 2021 18:56:56 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FGVqX2BsPz4QnW; Thu, 8 Apr 2021 18:56:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3E42676BD; Thu, 8 Apr 2021 18:56:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 138IuuXT002331; Thu, 8 Apr 2021 18:56:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 138IuuUL002330; Thu, 8 Apr 2021 18:56:56 GMT (envelope-from git) Date: Thu, 8 Apr 2021 18:56:56 GMT Message-Id: <202104081856.138IuuUL002330@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Mitchell Horne Subject: git: a26b996102 - main - relnotes: note sponsorship MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a26b996102b52cfb8777cf99457d4aa36f4e6e93 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Apr 2021 18:56:56 -0000 The branch main has been updated by mhorne (src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=a26b996102b52cfb8777cf99457d4aa36f4e6e93 commit a26b996102b52cfb8777cf99457d4aa36f4e6e93 Author: Mitchell Horne AuthorDate: 2021-04-05 21:59:34 +0000 Commit: Mitchell Horne CommitDate: 2021-04-08 18:53:41 +0000 relnotes: note sponsorship My work on this was sponsored by The FreeBSD Foundation. --- website/content/en/releases/13.0R/relnotes.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/en/releases/13.0R/relnotes.adoc b/website/content/en/releases/13.0R/relnotes.adoc index 3fccac6e42..759bcf17b2 100644 --- a/website/content/en/releases/13.0R/relnotes.adoc +++ b/website/content/en/releases/13.0R/relnotes.adoc @@ -321,7 +321,7 @@ The suite of VirtIO device drivers now support the VirtIO V1 spec. This improve A new man:ossl[4] driver supports optimized software cryptography on aarch64, amd64, and i386 using assembly routines from OpenSSL. gitref:ba610be90a7c[repository=src] {{< sponsored "Netflix" >}}, -gitref:22bd0c9731d7[repository=src] +gitref:22bd0c9731d7[repository=src] {{< sponsored "The FreeBSD Foundation" >}} The man:armv8crypto[4] driver which supports software cryptography on ARMv8 CPUs now supports AES-XTS which is used by man:geli[8]. From owner-dev-commits-doc-all@freebsd.org Thu Apr 8 18:56:59 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 120035BC328 for ; Thu, 8 Apr 2021 18:56:59 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FGVqZ6TpXz4Qnf; Thu, 8 Apr 2021 18:56:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A15D47872; Thu, 8 Apr 2021 18:56:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 138IuwPC002380; Thu, 8 Apr 2021 18:56:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 138IuwmY002379; Thu, 8 Apr 2021 18:56:58 GMT (envelope-from git) Date: Thu, 8 Apr 2021 18:56:58 GMT Message-Id: <202104081856.138IuwmY002379@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Mitchell Horne Subject: git: ffe526a580 - main - relnotes: note the updated LLVM version MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ffe526a580db52a1c86fe50470a5b4edb5cdfe0d Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Apr 2021 18:56:59 -0000 The branch main has been updated by mhorne (src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=ffe526a580db52a1c86fe50470a5b4edb5cdfe0d commit ffe526a580db52a1c86fe50470a5b4edb5cdfe0d Author: Mitchell Horne AuthorDate: 2021-04-05 21:13:41 +0000 Commit: Mitchell Horne CommitDate: 2021-04-08 18:55:36 +0000 relnotes: note the updated LLVM version Reviewed by: dim Differential Revision: https://reviews.freebsd.org/D29649 --- website/content/en/releases/13.0R/relnotes.adoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/content/en/releases/13.0R/relnotes.adoc b/website/content/en/releases/13.0R/relnotes.adoc index 42e0d4ee92..4ebd6307a6 100644 --- a/website/content/en/releases/13.0R/relnotes.adoc +++ b/website/content/en/releases/13.0R/relnotes.adoc @@ -186,6 +186,8 @@ The new versions do not depend on an external large number library, offer GNU bc They support POSIX message catalogs and come with localized messages in Chinese, Dutch, English, French, German, Japanese, Polish, Portugueze, and Russian. The previous implementation is still available in FreeBSD-13 and can be selected instead of the new one by the build option `WITHOUT_GH_BC`. gitref:c41fef90a7d[repository=src] +The clang, lld, and lldb utilities and compiler-rt, llvm, libunwind, and libc++ libraries have been updated to version 11.0.1. gitref:39b7445e15cd[repository=src] + [[userland-deprecated-programs]] === Deprecated Applications From owner-dev-commits-doc-all@freebsd.org Thu Apr 8 18:56:58 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E11605BC492 for ; Thu, 8 Apr 2021 18:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FGVqY5zRjz4R5V; Thu, 8 Apr 2021 18:56:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 867E67871; Thu, 8 Apr 2021 18:56:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 138IuvrO002355; Thu, 8 Apr 2021 18:56:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 138Iuv5v002354; Thu, 8 Apr 2021 18:56:57 GMT (envelope-from git) Date: Thu, 8 Apr 2021 18:56:57 GMT Message-Id: <202104081856.138Iuv5v002354@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Mitchell Horne Subject: git: a113441ded - main - relnotes: fix-up some section oddities MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a113441ded594645f480c724a96f75e7d0f9dc65 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Apr 2021 18:56:59 -0000 The branch main has been updated by mhorne (src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=a113441ded594645f480c724a96f75e7d0f9dc65 commit a113441ded594645f480c724a96f75e7d0f9dc65 Author: Mitchell Horne AuthorDate: 2021-04-07 20:59:38 +0000 Commit: Mitchell Horne CommitDate: 2021-04-08 18:53:46 +0000 relnotes: fix-up some section oddities Remove a duplicate section heading. Move some entries below the appropriate headings. Reviewed by: gjb Differential Revision: https://reviews.freebsd.org/D29648 --- website/content/en/releases/13.0R/relnotes.adoc | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/website/content/en/releases/13.0R/relnotes.adoc b/website/content/en/releases/13.0R/relnotes.adoc index 759bcf17b2..42e0d4ee92 100644 --- a/website/content/en/releases/13.0R/relnotes.adoc +++ b/website/content/en/releases/13.0R/relnotes.adoc @@ -348,6 +348,9 @@ man:cpld[4] driver was written for powerpc64 and powerpcspe. gitref:2a05eb9f3c4b This section covers changes and additions to file systems and other storage subsystems, both local and networked. +[[storage-general]] +=== General Storage + For man:iscsi[4] and man:ctld[8], support for specifying network QoS in the form of DiffServ Codepoints (DSCP) and Ethernet Priority Code Point (PCP) was added. gitref:ddf1072aac49[repository=src] {{< sponsored "NetApp" >}} The man:ctld[8] utility now supports the `-f` flag to test the validity of configuration files. gitref:7fcbecd004f[repository=src] @@ -392,9 +395,6 @@ gitref:92bbfe1f0d1f[repository=src] The ZFS implementation is now provided by OpenZFS. gitref:9e5787d2284e[repository=src] {{< sponsored "iXsystems" >}} -[[storage-general]] -=== General Storage - [[boot]] == Boot Loader Changes @@ -415,15 +415,15 @@ To update old ESP partitions, users should stop using the man:gpart[8] utility. Instead, ESP partitions should be mounted as MS-DOS filesystems as [.filename]#/boot/efi#, and [.filename]#/boot/loader.efi# should be copied to [.filename]#/boot/efi/efi/boot/bootx64.efi# if the default setup is use. If the man:efibootmgr[8] utility is used to customize the boot environment, this file should be copied to the location set with the `-l` flag. -[[boot-loader]] -=== Boot Loader Changes - [[network]] == Networking This section describes changes that affect networking in FreeBSD. +[[network-general]] +=== General Network + A new type of man:mbuf[9] (network data buffer) can represent multiple, unmapped physical pages as a single buffer. This improves the performance of man:sendfile[2] by reducing the length of @@ -465,9 +465,6 @@ SCTP support is now available as a new [.filename]#sctp.ko# kernel module and is no longer compiled into GENERIC by default. gitref:e64080e79c53[repository=src] {{< sponsored "The FreeBSD Foundation" >}} -[[network-general]] -=== General Network - [[hardware]] == Hardware Support From owner-dev-commits-doc-all@freebsd.org Thu Apr 8 23:43:00 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4848F5C4542 for ; Thu, 8 Apr 2021 23:43: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FGd9c12zNz4tmV; Thu, 8 Apr 2021 23:43:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 16B5713BE7; Thu, 8 Apr 2021 23:43:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 138NgxnH089331; Thu, 8 Apr 2021 23:42:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 138NgxnM089330; Thu, 8 Apr 2021 23:42:59 GMT (envelope-from git) Date: Thu, 8 Apr 2021 23:42:59 GMT Message-Id: <202104082342.138NgxnM089330@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Ed Maste Subject: git: 74677f33fb - main - Mention hashes and revision numbers in advisory template text 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: 74677f33fb470bdcb23d8238bc09b6d2eb43ed09 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Apr 2021 23:43:00 -0000 The branch main has been updated by emaste (src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=74677f33fb470bdcb23d8238bc09b6d2eb43ed09 commit 74677f33fb470bdcb23d8238bc09b6d2eb43ed09 Author: Ed Maste AuthorDate: 2021-04-06 18:49:40 +0000 Commit: Ed Maste CommitDate: 2021-04-08 23:42:10 +0000 Mention hashes and revision numbers in advisory template text Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D29656 --- website/static/security/advisory-template.txt | 4 ++-- website/static/security/errata-template.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/website/static/security/advisory-template.txt b/website/static/security/advisory-template.txt index 0926561512..4a5d401663 100644 --- a/website/static/security/advisory-template.txt +++ b/website/static/security/advisory-template.txt @@ -112,8 +112,8 @@ system. VI. Correction details -The following list contains the correction revision numbers for each -affected branch. +This issue is corrected by the corresponding Git commit hash or Subversion +revision number in the following stable and release branches: Branch/path Hash Revision ------------------------------------------------------------------------- diff --git a/website/static/security/errata-template.txt b/website/static/security/errata-template.txt index c197f5c758..ef1cad8464 100644 --- a/website/static/security/errata-template.txt +++ b/website/static/security/errata-template.txt @@ -112,8 +112,8 @@ system. VI. Correction details -The following list contains the correction revision numbers for each -affected branch. +This issue is corrected by the corresponding Git commit hash or Subversion +revision number in the following stable and release branches: Branch/path Hash Revision ------------------------------------------------------------------------- From owner-dev-commits-doc-all@freebsd.org Fri Apr 9 00:22:01 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1D3855C5730 for ; Fri, 9 Apr 2021 00:22:01 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FGf2d0N98z3D6M; Fri, 9 Apr 2021 00:22:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 00614143D9; Fri, 9 Apr 2021 00:22:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1390M039042017; Fri, 9 Apr 2021 00:22:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1390M0P6042016; Fri, 9 Apr 2021 00:22:00 GMT (envelope-from git) Date: Fri, 9 Apr 2021 00:22:00 GMT Message-Id: <202104090022.1390M0P6042016@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Glen Barber Subject: git: 831e7478ec - main - 13.0: update schedule to reflect RELEASE builds have started MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 831e7478ecd50d4ac9a0804c3808275bb0d85b5b Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Apr 2021 00:22:01 -0000 The branch main has been updated by gjb: URL: https://cgit.FreeBSD.org/doc/commit/?id=831e7478ecd50d4ac9a0804c3808275bb0d85b5b commit 831e7478ecd50d4ac9a0804c3808275bb0d85b5b Author: Glen Barber AuthorDate: 2021-04-09 00:04:52 +0000 Commit: Glen Barber CommitDate: 2021-04-09 00:04:52 +0000 13.0: update schedule to reflect RELEASE builds have started Sponsored by: Rubicon Communications, LLC ("Netgate") --- website/content/en/releases/13.0R/schedule.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/en/releases/13.0R/schedule.adoc b/website/content/en/releases/13.0R/schedule.adoc index e1b443280b..68e8dbd9d8 100644 --- a/website/content/en/releases/13.0R/schedule.adoc +++ b/website/content/en/releases/13.0R/schedule.adoc @@ -46,7 +46,7 @@ Announcements regarding the availability of the ALPHA snapshots will be sent to |RC3 builds begin |19 March 2021 |19 March 2021 |Third release candidate. |RC4 builds begin |26 March 2021 |29 March 2021 |Fourth release candidate. |RC5 builds begin |2 April 2021 |2 April 2021 |Fifth release candidate. -|RELEASE builds begin |9 April 2021 |- |{localRel}-RELEASE builds begin. +|RELEASE builds begin |9 April 2021 |9 April 2021 |{localRel}-RELEASE builds begin. |RELEASE announcement |13 April 2021 |- |{localRel}-RELEASE press release. |Turn over to the secteam |- |- |{localBranchReleng} branch is handed over to the FreeBSD Security Officer Team in one or two weeks after the announcement. |=== From owner-dev-commits-doc-all@freebsd.org Fri Apr 9 06:57:25 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AFE765CD2BF for ; Fri, 9 Apr 2021 06:57: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FGpps4b99z3tVT; Fri, 9 Apr 2021 06:57:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9078719912; Fri, 9 Apr 2021 06:57:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1396vPJA059776; Fri, 9 Apr 2021 06:57:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1396vPRW059775; Fri, 9 Apr 2021 06:57:25 GMT (envelope-from git) Date: Fri, 9 Apr 2021 06:57:25 GMT Message-Id: <202104090657.1396vPRW059775@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Ruey-Cherng Yu Subject: git: c088fa993b - main - - Traditional Chinese Translation of the news items ( Jan 2021) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rcyu X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c088fa993b836c0bfb6289f84011c5eb2f0514d5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Apr 2021 06:57:25 -0000 The branch main has been updated by rcyu: URL: https://cgit.FreeBSD.org/doc/commit/?id=c088fa993b836c0bfb6289f84011c5eb2f0514d5 commit c088fa993b836c0bfb6289f84011c5eb2f0514d5 Author: Ruey-Cherng Yu AuthorDate: 2021-04-09 06:57:38 +0000 Commit: Ruey-Cherng Yu CommitDate: 2021-04-09 06:57:38 +0000 - Traditional Chinese Translation of the news items ( Jan 2021) --- website/data/zh-tw/news/news.toml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/website/data/zh-tw/news/news.toml b/website/data/zh-tw/news/news.toml index 120908b14b..0dfda27dc9 100644 --- a/website/data/zh-tw/news/news.toml +++ b/website/data/zh-tw/news/news.toml @@ -1,6 +1,31 @@ # Sort news by year, month and day # $FreeBSD$ +[[news]] +date = "2021-01-27" +description = "新任 committer: Rajesh Kumar M A (src)" + +[[news]] +date = "2021-01-27" +description = "新任 committer: Nuno Teixeira (ports)" + +[[news]] +date = "2021-01-25" +description = "網站與文件系統轉換至 Hugo 與 AsciiDoctor" + +[[news]] +date = "2021-01-21" +description = "新任 committer: Lewis Cook (ports)" + +[[news]] +date = "2021-01-16" +title = "2020 第四季開發進度報告發布" +description = "The 2020 第四季開發進度報告 42 則條目現已發布。" + +[[news]] +date = "2021-01-14" +description = "新任 committer: Lutz Donnerhacke (src)" + [[news]] date = "2021-01-02" description = "新任 committer: Neel Chauhan (ports)" From owner-dev-commits-doc-all@freebsd.org Fri Apr 9 07:38:27 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D50C85CE363 for ; Fri, 9 Apr 2021 07:38:27 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FGqkC5hN2z3vj2; Fri, 9 Apr 2021 07:38:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B62741A11A; Fri, 9 Apr 2021 07:38:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1397cRWH012811; Fri, 9 Apr 2021 07:38:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1397cR8f012810; Fri, 9 Apr 2021 07:38:27 GMT (envelope-from git) Date: Fri, 9 Apr 2021 07:38:27 GMT Message-Id: <202104090738.1397cR8f012810@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Ruey-Cherng Yu Subject: git: 3225337fa6 - main - - Traditional Chinese Translation of the news items ( Feb 2021 ) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rcyu X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3225337fa6b396a20df70439e8677db2f17e9c02 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Apr 2021 07:38:27 -0000 The branch main has been updated by rcyu: URL: https://cgit.FreeBSD.org/doc/commit/?id=3225337fa6b396a20df70439e8677db2f17e9c02 commit 3225337fa6b396a20df70439e8677db2f17e9c02 Author: Ruey-Cherng Yu AuthorDate: 2021-04-09 07:39:10 +0000 Commit: Ruey-Cherng Yu CommitDate: 2021-04-09 07:39:10 +0000 - Traditional Chinese Translation of the news items ( Feb 2021 ) --- website/data/zh-tw/news/news.toml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/website/data/zh-tw/news/news.toml b/website/data/zh-tw/news/news.toml index 0dfda27dc9..68e4c85a2b 100644 --- a/website/data/zh-tw/news/news.toml +++ b/website/data/zh-tw/news/news.toml @@ -1,6 +1,30 @@ # Sort news by year, month and day # $FreeBSD$ +[[news]] +date = "2021-02-27" +title = "FreeBSD 13.0-BETA4 發布了" +description = "FreeBSD 13.0 的第四個 BETA 版本現已發布。用於 amd64、arm64、armv6、armv7、i386、powerpc、powerpc64、powerpcspe、powerpc64le 和 riscv64 的 ISO 映像檔案已經 發布，可以在多數的 FreeBSD 鏡像站取得。" + +[[news]] +date = "2021-02-20" +title = "FreeBSD 13.0-BETA3 發布了" +description = "FreeBSD 13.0 的第三個 BETA 版本現已發布。用於 amd64、arm64、armv6、armv7、i386、powerpc、powerpc64、powerpcspe、powerpc64le 和 riscv64 的 ISO 映像檔案已經 發布，可以在多數的 FreeBSD 鏡像站取得。" + +[[news]] +date = "2021-02-12" +title = "FreeBSD 13.0-BETA2 發布了" +description = "FreeBSD 13.0 的第二個 BETA 版本現已發布。用於 amd64、arm64、armv6、armv7、i386、powerpc、powerpc64、powerpcspe、powerpc64le 和 riscv64 的 ISO 映像檔案已經 發布，可以在多數的 FreeBSD 鏡像站取得。" + +[[news]] +date = "2021-02-06" +title = "FreeBSD 13.0-BETA1 發布了" +description = "FreeBSD 13.0 的第一個 BETA 版本現已發布。用於 amd64、arm64、armv6、armv7、i386、powerpc、powerpc64、powerpcspe、powerpc64le 和 riscv64 的 ISO 映像檔案已經 發布，可以在多數的 FreeBSD 鏡像站取得。" + +[[news]] +date = "2021-02-07" +description = "新任 committer: Fernando Apesteguia Santiago (doc)" + [[news]] date = "2021-01-27" description = "新任 committer: Rajesh Kumar M A (src)" From owner-dev-commits-doc-all@freebsd.org Fri Apr 9 09:31:09 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 421C55D1892 for ; Fri, 9 Apr 2021 09:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FGtDF1TWBz4W2c; Fri, 9 Apr 2021 09:31:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 25FCE1B2EB; Fri, 9 Apr 2021 09:31:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1399V9YB076403; Fri, 9 Apr 2021 09:31:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1399V975076402; Fri, 9 Apr 2021 09:31:09 GMT (envelope-from git) Date: Fri, 9 Apr 2021 09:31:09 GMT Message-Id: <202104090931.1399V975076402@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Marc Fonvieille Subject: git: 8d414d8a1d - Create tag release/13.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: blackend X-Git-Repository: doc X-Git-Refname: refs/tags/release/13.0.0 X-Git-Reftype: annotated tag X-Git-Commit: 8d414d8a1d1908d2f100e345f53d2b87c05e7285 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Apr 2021 09:31:09 -0000 The annotated tag release/13.0.0 has been created by blackend: URL: https://cgit.FreeBSD.org/doc/tag/?h=release/13.0.0 tag release/13.0.0 Tagger: Marc Fonvieille TaggerDate: 2021-04-09 08:37:29 +0000 FreeBSD docset for 13.0-RELEASE Approved by: doceng (implicit) commit 0cff342f42461c5081b98bce7581f43df319e4f4 Author: Xin LI AuthorDate: 2021-01-25 01:00:28 +0000 Commit: Xin LI CommitDate: 2021-01-25 17:22:34 +0000 Remove expired key. Approved by: doceng (gjb) From owner-dev-commits-doc-all@freebsd.org Fri Apr 9 10:24:01 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5E6535D4093 for ; Fri, 9 Apr 2021 10:24:01 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FGvPF2FrMz4Yq4; Fri, 9 Apr 2021 10:24:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 406921BFE0; Fri, 9 Apr 2021 10:24:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 139AO1No046188; Fri, 9 Apr 2021 10:24:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 139AO15H046187; Fri, 9 Apr 2021 10:24:01 GMT (envelope-from git) Date: Fri, 9 Apr 2021 10:24:01 GMT Message-Id: <202104091024.139AO15H046187@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Ryusuke SUZUKI Subject: git: 3b7f85b1e4 - main - 989d921f5d -> 985dccbda6 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ryusuke X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b7f85b1e4ab8cc04d48d26afb787073e0f232c4 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Apr 2021 10:24:01 -0000 The branch main has been updated by ryusuke: URL: https://cgit.FreeBSD.org/doc/commit/?id=3b7f85b1e4ab8cc04d48d26afb787073e0f232c4 commit 3b7f85b1e4ab8cc04d48d26afb787073e0f232c4 Author: Ryusuke SUZUKI AuthorDate: 2021-04-09 10:23:35 +0000 Commit: Ryusuke SUZUKI CommitDate: 2021-04-09 10:23:35 +0000 989d921f5d -> 985dccbda6 --- website/content/ja/security/_index.adoc | 1 - 1 file changed, 1 deletion(-) diff --git a/website/content/ja/security/_index.adoc b/website/content/ja/security/_index.adoc index 2e547619a6..f529058bf9 100644 --- a/website/content/ja/security/_index.adoc +++ b/website/content/ja/security/_index.adoc @@ -98,7 +98,6 @@ link:unsupported[これ以前の古いリリース] はサポートされませ |ブランチ |リリース |リリース日 |保守終了予定日 |stable/12 |n/a |n/a |2024 年 6 月 30 日 |releng/12.2 |12.2-RELEASE |2020 年 10 月 27 日 |12.3-RELEASE 公開から 3 ヵ月後 -|releng/12.1 |12.1-RELEASE |2019 年 11 月 4 日 |2021 年 1 月 31 日 |stable/11 |なし |なし |2021 年 9 月 30 日 |releng/11.4 |11.4-RELEASE |2020 年 6 月 16 日 |2021 年 9 月 30 日 |=== From owner-dev-commits-doc-all@freebsd.org Fri Apr 9 15:55:51 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 55D485BC952 for ; Fri, 9 Apr 2021 15:55:51 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FH2m720Q8z4rMr; Fri, 9 Apr 2021 15:55:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3764420C2A; Fri, 9 Apr 2021 15:55:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 139FtpfF085522; Fri, 9 Apr 2021 15:55:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 139Ftp31085519; Fri, 9 Apr 2021 15:55:51 GMT (envelope-from git) Date: Fri, 9 Apr 2021 15:55:51 GMT Message-Id: <202104091555.139Ftp31085519@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Marc Fonvieille Subject: git: ad5186a054 - Create tag PRE_ASCIIDOCTOR-HUGO MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: blackend X-Git-Repository: doc X-Git-Refname: refs/tags/PRE_ASCIIDOCTOR-HUGO X-Git-Reftype: annotated tag X-Git-Commit: ad5186a054df59c9d94960d61eeb0986a2b4cc84 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Apr 2021 15:55:51 -0000 The annotated tag PRE_ASCIIDOCTOR-HUGO has been created by blackend: URL: https://cgit.FreeBSD.org/doc/tag/?h=PRE_ASCIIDOCTOR-HUGO tag PRE_ASCIIDOCTOR-HUGO Tagger: Marc Fonvieille TaggerDate: 2021-04-09 15:53:54 +0000 Tag the tree just before the move to ASCIIDOCTOR and HUGO. Approved by: doceng (implicit) commit 0cff342f42461c5081b98bce7581f43df319e4f4 Author: Xin LI AuthorDate: 2021-01-25 01:00:28 +0000 Commit: Xin LI CommitDate: 2021-01-25 17:22:34 +0000 Remove expired key. Approved by: doceng (gjb) From owner-dev-commits-doc-all@freebsd.org Fri Apr 9 16:09:42 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6D48F5BD08E for ; Fri, 9 Apr 2021 16:09: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FH3462Wl2z4rj7; Fri, 9 Apr 2021 16:09:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4534C20DE6; Fri, 9 Apr 2021 16:09:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 139G9gMf099436; Fri, 9 Apr 2021 16:09:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 139G9gtk099435; Fri, 9 Apr 2021 16:09:42 GMT (envelope-from git) Date: Fri, 9 Apr 2021 16:09:42 GMT Message-Id: <202104091609.139G9gtk099435@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Marc Fonvieille Subject: git: 25cd4c9db5 - main - Readd a man:dd[1] lost during asciidoctor conversion. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: blackend X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 25cd4c9db5680cf33dc7fdd1eb3cc1158abeeb99 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Apr 2021 16:09:42 -0000 The branch main has been updated by blackend: URL: https://cgit.FreeBSD.org/doc/commit/?id=25cd4c9db5680cf33dc7fdd1eb3cc1158abeeb99 commit 25cd4c9db5680cf33dc7fdd1eb3cc1158abeeb99 Author: Marc Fonvieille AuthorDate: 2021-04-09 16:07:10 +0000 Commit: Marc Fonvieille CommitDate: 2021-04-09 16:07:10 +0000 Readd a man:dd[1] lost during asciidoctor conversion. --- documentation/content/en/books/handbook/bsdinstall/_index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/content/en/books/handbook/bsdinstall/_index.adoc b/documentation/content/en/books/handbook/bsdinstall/_index.adoc index c70efeef47..dee524f938 100644 --- a/documentation/content/en/books/handbook/bsdinstall/_index.adoc +++ b/documentation/content/en/books/handbook/bsdinstall/_index.adoc @@ -206,7 +206,7 @@ This example uses [.filename]#/dev/da0# as the target device where the image wil + If this command fails, verify that the USB stick is not mounted and that the device name is for the disk, not a partition. Some operating systems might require this command to be run with man:sudo[8]. -The syntax varies slightly across different platforms; for example, Mac OS(R) requires a lower-case `bs=1m`. +The man:dd[1] syntax varies slightly across different platforms; for example, Mac OS(R) requires a lower-case `bs=1m`. Systems like Linux(R) might buffer writes. To force all writes to complete, use man:sync[8]. **** From owner-dev-commits-doc-all@freebsd.org Fri Apr 9 16:21:20 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 364F15BD49C for ; Fri, 9 Apr 2021 16:21: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FH3KX0Ssdz4sFd; Fri, 9 Apr 2021 16:21:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 030F3211A3; Fri, 9 Apr 2021 16:21:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 139GLJiC021334; Fri, 9 Apr 2021 16:21:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 139GLJJQ021333; Fri, 9 Apr 2021 16:21:19 GMT (envelope-from git) Date: Fri, 9 Apr 2021 16:21:19 GMT Message-Id: <202104091621.139GLJJQ021333@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Marc Fonvieille Subject: git: 120f765371 - main - MFen: Update to 78a21ab12134ef50719e8576b0b2c34691c67f6e MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: blackend X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 120f765371ca450a6fd6f88b20e211f207c374a8 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Apr 2021 16:21:20 -0000 The branch main has been updated by blackend: URL: https://cgit.FreeBSD.org/doc/commit/?id=120f765371ca450a6fd6f88b20e211f207c374a8 commit 120f765371ca450a6fd6f88b20e211f207c374a8 Author: Marc Fonvieille AuthorDate: 2021-04-09 16:20:05 +0000 Commit: Marc Fonvieille CommitDate: 2021-04-09 16:20:05 +0000 MFen: Update to 78a21ab12134ef50719e8576b0b2c34691c67f6e --- .../content/fr/books/handbook/bsdinstall/_index.adoc | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/documentation/content/fr/books/handbook/bsdinstall/_index.adoc b/documentation/content/fr/books/handbook/bsdinstall/_index.adoc index 5924d2ffda..3954b31944 100644 --- a/documentation/content/fr/books/handbook/bsdinstall/_index.adoc +++ b/documentation/content/fr/books/handbook/bsdinstall/_index.adoc @@ -94,19 +94,24 @@ i386:: Les ordinateurs de bureau et portables plus anciens utilisent souvent cette architecture x86 32bits. + Presque tous les processeurs compatibles i386 avec une unité de calcul en virgule flottante sont supportés. Tous les processeurs Intel(R) 486 ou supérieurs sont supportés. +Néanmoins, les binaires publiés par le projet sont compilés pour le +processeur 686, une version spécifiquement compilée sera nécessaire pour +les systèmes 486 et 586. + FreeBSD utilisera le support de l'extension d'adresse physique ("Physical Address Extensions" ou PAE) sur les CPUs avec cette fonctionnalité. Un noyau avec la fonctionnalité PAE activée détectera la mémoire au-dessus de 4 Go et permettra son utilisation par le système. Néanmoins, utiliser PAE ajoutera des contraintes aux pilotes de périphériques et à d'autres fonctionnalités de FreeBSD. +arm64:: +La plupart des cartes embarquées sont des systèmes à base d'ARM 64bits. +De nombreux serveurs arm64 sont supportés. + +arm:: +Les anciennes cartes armv7 sont supportées. + powerpc:: Tous les systèmes Apple(R) Mac(R) utilisant une ROM"New World" avec l'USB intégré sont supportés. Le fonctionnement SMP (multi-processeurs) est supporté sur les machines dotées de plusieurs CPUs. + Un noyau 32bits ne peut utiliser que les 2 premiers Go de RAM. -sparc64:: -Les systèmes supportés par FreeBSD/sparc64 sont listés sur la page du link:https://www.FreeBSD.org/platforms/sparc/[Projet FreeBSD/sparc64]. -+ -Le SMP est supporté sur tous les systèmes possédant plus d'un processeur. Un disque dur dédié est nécessaire, étant donné qu'il n'est pas, à l'heure actuelle, possible de partager un disque dur avec un autre système d'exploitation. - [[bsdinstall-pre]] == Tâches de pré-installation @@ -507,9 +512,6 @@ Le partitionnement GPT est généralement le choix le plus approprié pour les o |MBR |Master Boot Record (http://en.wikipedia.org/wiki/Master_boot_record[http://en.wikipedia.org/wiki/Master_boot_record"]). - -|VTOC8 -|_Volume Table Of Contents_ utilisé par les ordinateurs Sun SPARC64 et UltraSPARC. |=== Après avoir choisi et créé le partitionnement, sélectionner à nouveau btn:[Create] créera les nouvelles partitions. La touche kbd:[Tab] est utilisée pour déplacer le curseur entre les différents champs. @@ -565,6 +567,8 @@ Par défaut, le programme [.filename]#gptboot# de FreeBSD s'attend à ce que la |`freebsd-boot` |`512K` +| +| |`freebsd-ufs` |`2G` From owner-dev-commits-doc-all@freebsd.org Fri Apr 9 16:50:07 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 61A405BDACD for ; Fri, 9 Apr 2021 16:50:07 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FH3yl2LTmz4tQg; Fri, 9 Apr 2021 16:50:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4383B21264; Fri, 9 Apr 2021 16:50:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 139Go70j054719; Fri, 9 Apr 2021 16:50:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 139Go7Z6054716; Fri, 9 Apr 2021 16:50:07 GMT (envelope-from git) Date: Fri, 9 Apr 2021 16:50:07 GMT Message-Id: <202104091650.139Go7Z6054716@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Marc Fonvieille Subject: git: e9e2952b46 - main - MFen: Update to b0fd96912189684a0ab542045c4560d1c72d60b2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: blackend X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9e2952b4685234a6e13cb1f29dd9dd4bd88e1fb Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Apr 2021 16:50:07 -0000 The branch main has been updated by blackend: URL: https://cgit.FreeBSD.org/doc/commit/?id=e9e2952b4685234a6e13cb1f29dd9dd4bd88e1fb commit e9e2952b4685234a6e13cb1f29dd9dd4bd88e1fb Author: Marc Fonvieille AuthorDate: 2021-04-09 16:49:21 +0000 Commit: Marc Fonvieille CommitDate: 2021-04-09 16:49:21 +0000 MFen: Update to b0fd96912189684a0ab542045c4560d1c72d60b2 --- .../content/fr/books/handbook/linuxemu/_index.adoc | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/documentation/content/fr/books/handbook/linuxemu/_index.adoc b/documentation/content/fr/books/handbook/linuxemu/_index.adoc index 32f1328d17..2510841864 100644 --- a/documentation/content/fr/books/handbook/linuxemu/_index.adoc +++ b/documentation/content/fr/books/handbook/linuxemu/_index.adoc @@ -114,6 +114,26 @@ Sur les machines 64bits, [.filename]#/etc/rc.d/abi# chargera automatiquement le Depuis qu'à été ajouté le support pour l'exécution des binaires Linux(R) 32 et 64 bits à la couche de compatibilité Linux(R) (sur les hôtes 64 bits de type x86), il n'est plus possible d'ajouter l'émulation en statique dans un noyau personnalisé. +Pour certaines applications, [.filename]#/compat/linux/proc#, +[.filename]#/compat/linux/sys#, et [.filename]#/compat/linux/dev/shm# +pourront nécessiter d'être montés. Ajoutez la ligne suivante au fichier +[.filename]#/etc/fstab#: + +.... +linprocfs /compat/linux/proc linprocfs rw 0 0 +linsysfs /compat/linux/sys linsysfs rw 0 0 +tmpfs /compat/linux/dev/shm tmpfs rw,mode=1777 0 0 +.... + +Puis montez les systèmes de fichiers en conséquence: + +[source,shell] +---- +# mount /compat/linux/sys +# mount /compat/linux/proc +# mount /compat/linux/dev/shm +---- + [[linuxemu-libs-manually]] === Installer des bibliothèques supplémentaires à la main From owner-dev-commits-doc-all@freebsd.org Fri Apr 9 17:04:01 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1104E5BE3C3 for ; Fri, 9 Apr 2021 17:04:01 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FH4Gm74c6z4v2M; Fri, 9 Apr 2021 17:04:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E645421B88; Fri, 9 Apr 2021 17:04:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 139H40fn078892; Fri, 9 Apr 2021 17:04:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 139H40u6078891; Fri, 9 Apr 2021 17:04:00 GMT (envelope-from git) Date: Fri, 9 Apr 2021 17:04:00 GMT Message-Id: <202104091704.139H40u6078891@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Marc Fonvieille Subject: git: 5eea7257a0 - main - Add translated compiz-troubleshooting section. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: blackend X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5eea7257a0ffda5d3d2cd73c10d25f0a631939ce Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Apr 2021 17:04:01 -0000 The branch main has been updated by blackend: URL: https://cgit.FreeBSD.org/doc/commit/?id=5eea7257a0ffda5d3d2cd73c10d25f0a631939ce commit 5eea7257a0ffda5d3d2cd73c10d25f0a631939ce Author: Marc Fonvieille AuthorDate: 2021-04-09 17:03:22 +0000 Commit: Marc Fonvieille CommitDate: 2021-04-09 17:03:22 +0000 Add translated compiz-troubleshooting section. --- .../content/fr/books/handbook/x11/_index.adoc | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/documentation/content/fr/books/handbook/x11/_index.adoc b/documentation/content/fr/books/handbook/x11/_index.adoc index dc9e3e746f..293170457c 100644 --- a/documentation/content/fr/books/handbook/x11/_index.adoc +++ b/documentation/content/fr/books/handbook/x11/_index.adoc @@ -1204,3 +1204,35 @@ Sous GNOME, il peut être trouvé dans le menu [.guimenuitem]#System#, puis [.gu ==== Si vous avez sélectionné "gconf support" lors de la compilation, vous pourrez également voir ces paramètres en utilisant `gconf-editor` sous `apps/compiz`. + +[[compiz-troubleshooting]] +=== Dépannage de Compiz Fusion + +==== J'ai installé Compiz Fusion, et après avoir lancé les commandes que vous +mentionnez, mes fenêtres n'ont plus de barre de titre et de boutons. +Qu'est-ce qui ne va pas? + +Il vous manque probablement une configuration dans +[.filename]#/etc/X11/xorg.conf#. Relisez avec attention ce fichier et +contrôlez tout particulièrement les directives `DefaultDepth` et +`AddARGBGLXVisuals`. + +==== Quand j'exécute la commande pour lancer Compiz Fusion, le serveur X +plante et je retourne à la console. Qu'est-ce qui ne va pas? + +Si vous contrôlez le contenu du fichier +[.filename]#/var/log/Xorg.0.log#, vous trouverez surement des messages +d'erreur lors du démarrage de X. Les plus courants seront: + +[source,shell] +.... +(EE) NVIDIA(0): Failed to initialize the GLX module; please check in your X +(EE) NVIDIA(0): log file that the GLX module has been loaded in your X +(EE) NVIDIA(0): server, and that the module is the NVIDIA GLX module. If +(EE) NVIDIA(0): you continue to encounter problems, Please try +(EE) NVIDIA(0): reinstalling the NVIDIA driver. +.... + +C'est généralement le cas quand vous mettez à jour Xorg. Vous devrez +réinstaller le paquet package:x11/nvidia-driver[] afin que le module glx +soit compilé à nouveau. From owner-dev-commits-doc-all@freebsd.org Fri Apr 9 17:31:34 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EDDC55BEF39 for ; Fri, 9 Apr 2021 17:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FH4tZ6V5Tz3BvP; Fri, 9 Apr 2021 17:31:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D258521E6E; Fri, 9 Apr 2021 17:31:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 139HVYPQ016544; Fri, 9 Apr 2021 17:31:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 139HVYZt016543; Fri, 9 Apr 2021 17:31:34 GMT (envelope-from git) Date: Fri, 9 Apr 2021 17:31:34 GMT Message-Id: <202104091731.139HVYZt016543@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Ed Maste Subject: git: 8923db09bb - main - Add arm64 as Tier-1 to 13.0 relnotes 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: 8923db09bb7cfec783d4c2f8efbba22effb61feb Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Apr 2021 17:31:35 -0000 The branch main has been updated by emaste (src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=8923db09bb7cfec783d4c2f8efbba22effb61feb commit 8923db09bb7cfec783d4c2f8efbba22effb61feb Author: Ed Maste AuthorDate: 2021-04-09 16:14:12 +0000 Commit: Ed Maste CommitDate: 2021-04-09 17:31:08 +0000 Add arm64 as Tier-1 to 13.0 relnotes Reviewed by: gjb Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D29678 --- website/content/en/releases/13.0R/relnotes.adoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/website/content/en/releases/13.0R/relnotes.adoc b/website/content/en/releases/13.0R/relnotes.adoc index 4ebd6307a6..30d996a403 100644 --- a/website/content/en/releases/13.0R/relnotes.adoc +++ b/website/content/en/releases/13.0R/relnotes.adoc @@ -479,6 +479,10 @@ The amd64 architecture now supports Hygon Dhyana Family 18h processors. gitref: The amd64 architecture now supports 57-bit virtual addresses (LA57) on supported CPUs. This permits user processes to use up to 56 bits of virtual address space. This also includes support for five layer nested page tables used by bhyve. gitref:9ce875d9b59d[repository=src] {{< sponsored "The FreeBSD Foundation" >}} [[ARM-ARM64]] +=== arm64 + +The 64-bit ARM architecture known as arm64 or AArch64 is promoted to Tier-1 status for FreeBSD 13. https://lists.freebsd.org/pipermail/freebsd-arm/2021-April/023602.html[Announcement] + === ARMv5 Removed support for version 5 of the 32-bit ARM architecture. From owner-dev-commits-doc-all@freebsd.org Fri Apr 9 20:16:52 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0E0255DB487 for ; Fri, 9 Apr 2021 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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FH8YH6qtBz4XVN; Fri, 9 Apr 2021 20:16:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DB23D240D3; Fri, 9 Apr 2021 20:16:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 139KGpeZ031379; Fri, 9 Apr 2021 20:16:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 139KGpY6031378; Fri, 9 Apr 2021 20:16:51 GMT (envelope-from git) Date: Fri, 9 Apr 2021 20:16:51 GMT Message-Id: <202104092016.139KGpY6031378@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Ed Maste Subject: git: f1086d6f8f - main - Update aarch64/arm64 to tier 1 in platforms 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: f1086d6f8f1b308d0f68fdd9fca74fb7e77be181 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Apr 2021 20:16:52 -0000 The branch main has been updated by emaste (src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=f1086d6f8f1b308d0f68fdd9fca74fb7e77be181 commit f1086d6f8f1b308d0f68fdd9fca74fb7e77be181 Author: Ed Maste AuthorDate: 2021-04-09 20:15:49 +0000 Commit: Ed Maste CommitDate: 2021-04-09 20:15:49 +0000 Update aarch64/arm64 to tier 1 in platforms list Reported by: jhb --- website/content/en/platforms/_index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/en/platforms/_index.adoc b/website/content/en/platforms/_index.adoc index 092ca0de84..6ab45d19ea 100644 --- a/website/content/en/platforms/_index.adoc +++ b/website/content/en/platforms/_index.adoc @@ -18,7 +18,7 @@ Here is a list of platforms supported by FreeBSD. |64-bit x86 |link:amd64[amd64] |Tier 1 |Tier 1 |Tier 1 |32-bit x86 |link:i386[i386] |Tier 1 |Tier 1 |Tier 2 |PC98 |link:pc98[pc98] |Tier 2 |Tier 4 |Tier 4 -|64-bit ARMv8 |link:arm[aarch64] |Tier 2 |Tier 2 |Tier 2 +|64-bit ARMv8 |link:arm[aarch64] |Tier 2 |Tier 2 |Tier 1 |32-bit ARMv4/5 |link:arm[arm] |Tier 2 |Tier 2 |Tier 4 |32-bit big-endian ARM |link:arm[armeb] |Tier 2 |Tier 4 |Tier 4 |32-bit ARMv6 |link:arm[armv6] |Tier 2 |Tier 2 |Tier 2 From owner-dev-commits-doc-all@freebsd.org Fri Apr 9 20:17:58 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 13FFE5DBA89 for ; Fri, 9 Apr 2021 20:17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FH8ZY6Hm3z4Xjs; Fri, 9 Apr 2021 20:17:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CA68724347; Fri, 9 Apr 2021 20:17:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 139KHvWg031643; Fri, 9 Apr 2021 20:17:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 139KHvhB031642; Fri, 9 Apr 2021 20:17:57 GMT (envelope-from git) Date: Fri, 9 Apr 2021 20:17:57 GMT Message-Id: <202104092017.139KHvhB031642@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: "George V. Neville-Neil" Subject: git: 6982d9119d - main - Add langauge and other simple updates from uqs MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gnn X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6982d9119d292a8202d4fdf61cb4709b91d167ec Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Apr 2021 20:17:58 -0000 The branch main has been updated by gnn (src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=6982d9119d292a8202d4fdf61cb4709b91d167ec commit 6982d9119d292a8202d4fdf61cb4709b91d167ec Author: George V. Neville-Neil AuthorDate: 2021-04-09 20:16:43 +0000 Commit: George V. Neville-Neil CommitDate: 2021-04-09 20:17:49 +0000 Add langauge and other simple updates from uqs --- .../en/articles/committers-guide/_index.adoc | 42 +++++++++++----------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 6142719316..5d3cd89afa 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -2021,9 +2021,9 @@ git log refs/freebsd/vendor/zlib/1.2.10 would look at the log for the vendor branch for zlib starting at 1.2.10. === Collaborating with Others -One of the keys to good software development on a project as large as FreeBSD is the ability to collaborate with others before you push your changes to the tree. The FreeBSD project's git repositories do not, yet, allow user created branches to be pushed to the repository, and therefore if you wish to share your changes with others you must use another mechanism, such as a hosted GitLab or github, in order to share changes in a user generate branch. +One of the keys to good software development on a project as large as FreeBSD is the ability to collaborate with others before you push your changes to the tree. The FreeBSD project's git repositories do not, yet, allow user created branches to be pushed to the repository, and therefore if you wish to share your changes with others you must use another mechanism, such as a hosted GitLab or GitHub, in order to share changes in a user generated branch. -The following instructions show how to set up a user generated branch, based on the FreeBSD main branch, and push it to github. +The following instructions show how to set up a user generated branch, based on the FreeBSD main branch, and push it to GitHub. Before you begin, make sure that your local git repo is up to date and has the correct origins set as shown above. @@ -2034,43 +2034,42 @@ freebsd https://git.freebsd.org/src.git (fetch) freebsd ssh://git@gitrepo.freebsd.org/src.git (push) ```` -The first step is to create a fork of https://github.com/freebsd/freebsd-src[FreeBSD] on github. -The destination of the fork should be your own, personal, github account (gvnn3 in my case). +The first step is to create a fork of https://github.com/freebsd/freebsd-src[FreeBSD] on GitHub. +The destination of the fork should be your own, personal, GitHub account (gvnn3 in my case). Now add a remote that points to your fork: .... -% git remote add collab git@github.com:gvnn3/freebsd-src.git +% git remote add github git@github.com:gvnn3/freebsd-src.git % git remote -v -collab git@github.com:gvnn3/freebsd-src.git (fetch) -collab git@github.com:gvnn3/freebsd-src.git (push) +github git@github.com:gvnn3/freebsd-src.git (fetch) +github git@github.com:gvnn3/freebsd-src.git (push) freebsd https://git.freebsd.org/src.git (fetch) freebsd ssh://git@gitrepo.freebsd.org/src.git (push) .... With this in place you can create a local branch as shown above. .... -% git checkout -b gnn-collab +% git checkout -b gnn-github .... Make whatever modifications you wish in your branch. Build, test, and once you're ready to collaborate with others it's time to push your changes into your hosted branch. Before you can push you'll have to set the appropriate upstream, as git will tell you the first time you -try to push to your +collab+ remote: +try to push to your +github+ remote: .... -% git push collab -fatal: The current branch gnn-collab has no upstream branch. +% git push github +fatal: The current branch gnn-github has no upstream branch. To push the current branch and set the remote as upstream, use - git push --set-upstream collab gnn-collab + git push --set-upstream github gnn-github .... -Setting the push as +git+ advises allows it so succeed: +Setting the push as +git+ advises allows it to succeed: .... -% git push --set-upstream collab gnn-collab -X11 forwarding request failed on channel 0 +% git push --set-upstream github gnn-feature Enumerating objects: 20486, done. Counting objects: 100% (20486/20486), done. Delta compression using up to 8 threads @@ -2079,19 +2078,18 @@ Writing objects: 100% (20180/20180), 56.25 MiB | 13.15 MiB/s, done. Total 20180 (delta 11316), reused 12972 (delta 7770), pack-reused 0 remote: Resolving deltas: 100% (11316/11316), completed with 247 local objects. remote: -remote: Create a pull request for 'gnn-collab' on GitHub by visiting: -remote: https://github.com/gvnn3/freebsd-src/pull/new/gnn-collab +remote: Create a pull request for 'gnn-feature' on GitHub by visiting: +remote: https://github.com/gvnn3/freebsd-src/pull/new/gnn-feature remote: To github.com:gvnn3/freebsd-src.git - * [new branch] gnn-collab -> gnn-collab -Branch 'gnn-collab' set up to track remote branch 'gnn-collab' from 'collab'. + * [new branch] gnn-feature -> gnn-feature +Branch 'gnn-feature' set up to track remote branch 'gnn-feature' from 'github'. .... Subsequent changes to the same branch will push correctly by default: .... % git push -X11 forwarding request failed on channel 0 Enumerating objects: 4, done. Counting objects: 100% (4/4), done. Delta compression using up to 8 threads @@ -2100,10 +2098,10 @@ Writing objects: 100% (3/3), 314 bytes | 1024 bytes/s, done. Total 3 (delta 1), reused 1 (delta 0), pack-reused 0 remote: Resolving deltas: 100% (1/1), completed with 1 local object. To github.com:gvnn3/freebsd-src.git - 9e5243d7b659..cf6aeb8d7dda gnn-collab -> gnn-collab + 9e5243d7b659..cf6aeb8d7dda gnn-feature -> gnn-feature .... -At this point your work is now in your branch on +github+ and you can +At this point your work is now in your branch on +GitHub+ and you can share the link with other collaborators. From owner-dev-commits-doc-all@freebsd.org Fri Apr 9 20:17:59 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4A5C55DB8E3 for ; Fri, 9 Apr 2021 20:17:59 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FH8Zb03KYz4Xk0; Fri, 9 Apr 2021 20:17:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DAF5C24348; Fri, 9 Apr 2021 20:17:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 139KHw6V031670; Fri, 9 Apr 2021 20:17:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 139KHwxq031669; Fri, 9 Apr 2021 20:17:58 GMT (envelope-from git) Date: Fri, 9 Apr 2021 20:17:58 GMT Message-Id: <202104092017.139KHwxq031669@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: "George V. Neville-Neil" Subject: git: 63584c7bba - main - Address points brought up by bsdimp MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gnn X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 63584c7bba7b5971b475a90e47cf083c0d538dd3 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Apr 2021 20:17:59 -0000 The branch main has been updated by gnn (src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=63584c7bba7b5971b475a90e47cf083c0d538dd3 commit 63584c7bba7b5971b475a90e47cf083c0d538dd3 Author: George V. Neville-Neil AuthorDate: 2021-04-09 20:16:49 +0000 Commit: George V. Neville-Neil CommitDate: 2021-04-09 20:17:49 +0000 Address points brought up by bsdimp --- .../content/en/articles/committers-guide/_index.adoc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 5d3cd89afa..5effac883f 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -288,6 +288,7 @@ They assume a basic understanding of git. There are many primers for git on the web, but the https://git-scm.com/book/en/v2[Git Book] provides one of the better treatments. ==== Keeping Current With The FreeBSD src Tree +[[keeping_current]] First step: cloning a tree. This downloads the entire tree. There are two ways to download. @@ -496,6 +497,7 @@ When you have anything non trivial, you'll likely be better off keeping a local Stashing is also integrated with the 'git pull' command: just add '--autostash' to the command line. ===== Keeping a local branch +[[keeping_a_local_branch]] It is much easier to keep a local branch with git than subversion. In subversion you need to merge the commit, and resolve the conflicts. This is manageable, but can lead to a convoluted history that's hard to upstream should that ever be necessary, or hard to replicate if you need to do so. @@ -2021,11 +2023,12 @@ git log refs/freebsd/vendor/zlib/1.2.10 would look at the log for the vendor branch for zlib starting at 1.2.10. === Collaborating with Others -One of the keys to good software development on a project as large as FreeBSD is the ability to collaborate with others before you push your changes to the tree. The FreeBSD project's git repositories do not, yet, allow user created branches to be pushed to the repository, and therefore if you wish to share your changes with others you must use another mechanism, such as a hosted GitLab or GitHub, in order to share changes in a user generated branch. +One of the keys to good software development on a project as large as FreeBSD is the ability to collaborate with others before you push your changes to the tree. +The FreeBSD project's git repositories do not, yet, allow user created branches to be pushed to the repository, and therefore if you wish to share your changes with others you must use another mechanism, such as a hosted GitLab or GitHub, in order to share changes in a user generated branch. The following instructions show how to set up a user generated branch, based on the FreeBSD main branch, and push it to GitHub. -Before you begin, make sure that your local git repo is up to date and has the correct origins set as shown above. +Before you begin, make sure that your local git repo is up to date and has the correct origins set <> [source,shell] ```` @@ -2034,10 +2037,10 @@ freebsd https://git.freebsd.org/src.git (fetch) freebsd ssh://git@gitrepo.freebsd.org/src.git (push) ```` -The first step is to create a fork of https://github.com/freebsd/freebsd-src[FreeBSD] on GitHub. +The first step is to create a fork of https://github.com/freebsd/freebsd-src[FreeBSD] on GitHub following these https://docs.github.com/en/github/getting-started-with-github/fork-a-repo[guidelines]. The destination of the fork should be your own, personal, GitHub account (gvnn3 in my case). -Now add a remote that points to your fork: +Now add a remote on your local system that points to your fork: .... % git remote add github git@github.com:gvnn3/freebsd-src.git % git remote -v @@ -2046,17 +2049,14 @@ github git@github.com:gvnn3/freebsd-src.git (push) freebsd https://git.freebsd.org/src.git (fetch) freebsd ssh://git@gitrepo.freebsd.org/src.git (push) .... -With this in place you can create a local branch as shown above. +With this in place you can create a <> .... % git checkout -b gnn-github .... -Make whatever modifications you wish in your branch. Build, test, and -once you're ready to collaborate with others it's time to push your -changes into your hosted branch. Before you can push you'll have to -set the appropriate upstream, as git will tell you the first time you -try to push to your +github+ remote: +Make whatever modifications you wish in your branch. Build, test, and once you're ready to collaborate with others it's time to push your changes into your hosted branch. +Before you can push you'll have to set the appropriate upstream, as git will tell you the first time you try to push to your +github+ remote: .... % git push github From owner-dev-commits-doc-all@freebsd.org Fri Apr 9 20:18:00 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 61EAE5DB8E7 for ; Fri, 9 Apr 2021 20:18: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FH8Zc1P3Zz4Xk2; Fri, 9 Apr 2021 20:18:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 126AE24349; Fri, 9 Apr 2021 20:18:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 139KHxsD031692; Fri, 9 Apr 2021 20:17:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 139KHxj6031691; Fri, 9 Apr 2021 20:17:59 GMT (envelope-from git) Date: Fri, 9 Apr 2021 20:17:59 GMT Message-Id: <202104092017.139KHxj6031691@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: "George V. Neville-Neil" Subject: git: a0fbda3eef - main - Rough draft on collaboration using github MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gnn X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a0fbda3eef0f5d647a3eb3724704c13238068d7b Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Apr 2021 20:18:00 -0000 The branch main has been updated by gnn (src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=a0fbda3eef0f5d647a3eb3724704c13238068d7b commit a0fbda3eef0f5d647a3eb3724704c13238068d7b Author: George V. Neville-Neil AuthorDate: 2021-04-09 20:16:53 +0000 Commit: George V. Neville-Neil CommitDate: 2021-04-09 20:17:49 +0000 Rough draft on collaboration using github --- documentation/content/en/articles/committers-guide/_index.adoc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 5effac883f..11af4b0088 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -2021,7 +2021,8 @@ git log refs/freebsd/vendor/zlib/1.2.10 .... would look at the log for the vendor branch for zlib starting at 1.2.10. -=== Collaborating with Others + +=== Collaborating with others One of the keys to good software development on a project as large as FreeBSD is the ability to collaborate with others before you push your changes to the tree. The FreeBSD project's git repositories do not, yet, allow user created branches to be pushed to the repository, and therefore if you wish to share your changes with others you must use another mechanism, such as a hosted GitLab or GitHub, in order to share changes in a user generated branch. @@ -2041,6 +2042,7 @@ The first step is to create a fork of https://github.com/freebsd/freebsd-src[Fre The destination of the fork should be your own, personal, GitHub account (gvnn3 in my case). Now add a remote on your local system that points to your fork: +[source,shell] .... % git remote add github git@github.com:gvnn3/freebsd-src.git % git remote -v @@ -2051,6 +2053,7 @@ freebsd ssh://git@gitrepo.freebsd.org/src.git (push) .... With this in place you can create a <> +[source,shell] .... % git checkout -b gnn-github .... @@ -2058,6 +2061,7 @@ With this in place you can create a <> Make whatever modifications you wish in your branch. Build, test, and once you're ready to collaborate with others it's time to push your changes into your hosted branch. Before you can push you'll have to set the appropriate upstream, as git will tell you the first time you try to push to your +github+ remote: +[source,shell] .... % git push github fatal: The current branch gnn-github has no upstream branch. @@ -2068,6 +2072,7 @@ To push the current branch and set the remote as upstream, use Setting the push as +git+ advises allows it to succeed: +[source,shell] .... % git push --set-upstream github gnn-feature Enumerating objects: 20486, done. @@ -2088,6 +2093,7 @@ Branch 'gnn-feature' set up to track remote branch 'gnn-feature' from 'github'. Subsequent changes to the same branch will push correctly by default: +[source,shell] .... % git push Enumerating objects: 4, done. From owner-dev-commits-doc-all@freebsd.org Fri Apr 9 20:17:56 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EB4D75DBA0C for ; Fri, 9 Apr 2021 20:17:56 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FH8ZX5FxHz4XJb; Fri, 9 Apr 2021 20:17:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A7FA92424F; Fri, 9 Apr 2021 20:17:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 139KHuBB031622; Fri, 9 Apr 2021 20:17:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 139KHugY031621; Fri, 9 Apr 2021 20:17:56 GMT (envelope-from git) Date: Fri, 9 Apr 2021 20:17:56 GMT Message-Id: <202104092017.139KHugY031621@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: "George V. Neville-Neil" Subject: git: e47e964a9d - main - Rough draft on collaboration using github MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gnn X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e47e964a9d36c7248d97aad74a080c5223fb9f7e Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Apr 2021 20:17:57 -0000 The branch main has been updated by gnn (src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=e47e964a9d36c7248d97aad74a080c5223fb9f7e commit e47e964a9d36c7248d97aad74a080c5223fb9f7e Author: George V. Neville-Neil AuthorDate: 2021-04-09 20:16:36 +0000 Commit: George V. Neville-Neil CommitDate: 2021-04-09 20:17:49 +0000 Rough draft on collaboration using github --- .../en/articles/committers-guide/_index.adoc | 87 ++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index fa65ede180..6142719316 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -2019,6 +2019,93 @@ git log refs/freebsd/vendor/zlib/1.2.10 .... would look at the log for the vendor branch for zlib starting at 1.2.10. +=== Collaborating with Others + +One of the keys to good software development on a project as large as FreeBSD is the ability to collaborate with others before you push your changes to the tree. The FreeBSD project's git repositories do not, yet, allow user created branches to be pushed to the repository, and therefore if you wish to share your changes with others you must use another mechanism, such as a hosted GitLab or github, in order to share changes in a user generate branch. + +The following instructions show how to set up a user generated branch, based on the FreeBSD main branch, and push it to github. + +Before you begin, make sure that your local git repo is up to date and has the correct origins set as shown above. + +[source,shell] +```` +% git remote -v +freebsd https://git.freebsd.org/src.git (fetch) +freebsd ssh://git@gitrepo.freebsd.org/src.git (push) +```` + +The first step is to create a fork of https://github.com/freebsd/freebsd-src[FreeBSD] on github. +The destination of the fork should be your own, personal, github account (gvnn3 in my case). + +Now add a remote that points to your fork: +.... +% git remote add collab git@github.com:gvnn3/freebsd-src.git +% git remote -v +collab git@github.com:gvnn3/freebsd-src.git (fetch) +collab git@github.com:gvnn3/freebsd-src.git (push) +freebsd https://git.freebsd.org/src.git (fetch) +freebsd ssh://git@gitrepo.freebsd.org/src.git (push) +.... +With this in place you can create a local branch as shown above. + +.... +% git checkout -b gnn-collab +.... + +Make whatever modifications you wish in your branch. Build, test, and +once you're ready to collaborate with others it's time to push your +changes into your hosted branch. Before you can push you'll have to +set the appropriate upstream, as git will tell you the first time you +try to push to your +collab+ remote: + +.... +% git push collab +fatal: The current branch gnn-collab has no upstream branch. +To push the current branch and set the remote as upstream, use + + git push --set-upstream collab gnn-collab +.... + +Setting the push as +git+ advises allows it so succeed: + +.... +% git push --set-upstream collab gnn-collab +X11 forwarding request failed on channel 0 +Enumerating objects: 20486, done. +Counting objects: 100% (20486/20486), done. +Delta compression using up to 8 threads +Compressing objects: 100% (12202/12202), done. +Writing objects: 100% (20180/20180), 56.25 MiB | 13.15 MiB/s, done. +Total 20180 (delta 11316), reused 12972 (delta 7770), pack-reused 0 +remote: Resolving deltas: 100% (11316/11316), completed with 247 local objects. +remote: +remote: Create a pull request for 'gnn-collab' on GitHub by visiting: +remote: https://github.com/gvnn3/freebsd-src/pull/new/gnn-collab +remote: +To github.com:gvnn3/freebsd-src.git + * [new branch] gnn-collab -> gnn-collab +Branch 'gnn-collab' set up to track remote branch 'gnn-collab' from 'collab'. +.... + +Subsequent changes to the same branch will push correctly by default: + +.... +% git push +X11 forwarding request failed on channel 0 +Enumerating objects: 4, done. +Counting objects: 100% (4/4), done. +Delta compression using up to 8 threads +Compressing objects: 100% (2/2), done. +Writing objects: 100% (3/3), 314 bytes | 1024 bytes/s, done. +Total 3 (delta 1), reused 1 (delta 0), pack-reused 0 +remote: Resolving deltas: 100% (1/1), completed with 1 local object. +To github.com:gvnn3/freebsd-src.git + 9e5243d7b659..cf6aeb8d7dda gnn-collab -> gnn-collab +.... + +At this point your work is now in your branch on +github+ and you can +share the link with other collaborators. + [[vcs-history]] == Version Control History From owner-dev-commits-doc-all@freebsd.org Sat Apr 10 02:19:37 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 45E9C5C79BC for ; Sat, 10 Apr 2021 02:19:37 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FHJbs1YNFz4tpm; Sat, 10 Apr 2021 02:19:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 288A7A6C; Sat, 10 Apr 2021 02:19:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13A2Jbh8010387; Sat, 10 Apr 2021 02:19:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13A2JbkT010386; Sat, 10 Apr 2021 02:19:37 GMT (envelope-from git) Date: Sat, 10 Apr 2021 02:19:37 GMT Message-Id: <202104100219.13A2JbkT010386@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Ryusuke SUZUKI Subject: git: a3c3b8a701 - main - 77822d511c -> f1086d6f8f MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ryusuke X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a3c3b8a701957579d58746a30b5867c512366511 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Apr 2021 02:19:37 -0000 The branch main has been updated by ryusuke: URL: https://cgit.FreeBSD.org/doc/commit/?id=a3c3b8a701957579d58746a30b5867c512366511 commit a3c3b8a701957579d58746a30b5867c512366511 Author: Ryusuke SUZUKI AuthorDate: 2021-04-10 02:19:09 +0000 Commit: Ryusuke SUZUKI CommitDate: 2021-04-10 02:19:09 +0000 77822d511c -> f1086d6f8f --- website/content/ja/platforms/_index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/ja/platforms/_index.adoc b/website/content/ja/platforms/_index.adoc index 6b600e9244..92db8a073f 100644 --- a/website/content/ja/platforms/_index.adoc +++ b/website/content/ja/platforms/_index.adoc @@ -18,7 +18,7 @@ include::shared/ja/urls.adoc[] |64-bit x86 |link:amd64[amd64] |Tier 1 |Tier 1 |Tier 1 |32-bit x86 |link:https://www.FreeBSD.org/platforms/i386[i386] |Tier 1 |Tier 1 |Tier 2 |PC98 |link:pc98[pc98] |Tier 2 |Tier 4 |Tier 4 -|64-bit ARMv8 |link:arm[aarch64] |Tier 2 |Tier 2 |Tier 2 +|64-bit ARMv8 |link:arm[aarch64] |Tier 2 |Tier 2 |Tier 1 |32-bit ARMv4/5 |link:arm[arm] |Tier 2 |Tier 2 |Tier 4 |32-bit big-endian ARM |link:arm[armeb] |Tier 2 |Tier 4 |Tier 4 |32-bit ARMv6 |link:arm[armv6] |Tier 2 |Tier 2 |Tier 2 From owner-dev-commits-doc-all@freebsd.org Sat Apr 10 04:20:40 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 75D195CEAC9 for ; Sat, 10 Apr 2021 04:20:40 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FHMHX2JcNz3Lpd; Sat, 10 Apr 2021 04:20:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 40A722953; Sat, 10 Apr 2021 04:20:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13A4Kedn078497; Sat, 10 Apr 2021 04:20:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13A4KeaP078496; Sat, 10 Apr 2021 04:20:40 GMT (envelope-from git) Date: Sat, 10 Apr 2021 04:20:40 GMT Message-Id: <202104100420.13A4KeaP078496@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: bde30a020c - main - mirrors: be consistent with git clone examples. 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: bde30a020ca16b58fc2bb07f940352797b6f43ad Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Apr 2021 04:20:40 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=bde30a020ca16b58fc2bb07f940352797b6f43ad commit bde30a020ca16b58fc2bb07f940352797b6f43ad Author: Warner Losh AuthorDate: 2021-04-10 04:18:42 +0000 Commit: Warner Losh CommitDate: 2021-04-10 04:19:13 +0000 mirrors: be consistent with git clone examples. Make sure that all the git clone examples have -o freebsd so that many of the other examples work. --- documentation/content/en/books/handbook/mirrors/_index.adoc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/documentation/content/en/books/handbook/mirrors/_index.adoc b/documentation/content/en/books/handbook/mirrors/_index.adoc index 3ee176235b..1ae2cc9cc0 100644 --- a/documentation/content/en/books/handbook/mirrors/_index.adoc +++ b/documentation/content/en/books/handbook/mirrors/_index.adoc @@ -487,7 +487,7 @@ To get started, clone a copy of the FreeBSD repository: [source,shell] .... -# git clone [ -b branch ] https://git.FreeBSD.org/repo.git wcdir +# git clone -o freebsd [ -b branch ] https://git.FreeBSD.org/repo.git wcdir .... where: @@ -497,6 +497,8 @@ where: `ports` and `doc` are mostly updated in the `main` branch, while `src` maintains the latest version of -CURRENT under `main` and the respective latest versions of the -STABLE branches under `stable/12` (12._x_) and `stable/13` (13._x_). * _wcdir_ is the target directory where the contents of the specified branch should be placed. This is usually [.filename]#/usr/ports# for `ports`, [.filename]#/usr/src# for `src`, and [.filename]#/usr/doc# for `doc`. +* _freebsd_ is the name of the origin to use. +By convention in the FreeBSD documentation, the origin is assumed to be `freebsd`. This example checks out the `main` branch of the system sources from the FreeBSD repository using the HTTPS protocol, placing the local working copy in [.filename]#/usr/src#. If [.filename]#/usr/src# is already present but was not created by `git`, remember to rename or delete it before the checkout. @@ -504,7 +506,7 @@ Git will refuse to do anything otherwise. [source,shell] .... -# git clone https://git.FreeBSD.org/src.git /usr/src +# git clone -o freebsd https://git.FreeBSD.org/src.git /usr/src .... Because the initial checkout must download the full branch of the remote repository, it can take a while. From owner-dev-commits-doc-all@freebsd.org Sat Apr 10 06:13:18 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DE80A5D5ED3 for ; Sat, 10 Apr 2021 06:13:18 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FHPnV625Zz4SxD; Sat, 10 Apr 2021 06:13:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C1B4A3AAC; Sat, 10 Apr 2021 06:13:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13A6DIGu029126; Sat, 10 Apr 2021 06:13:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13A6DI4N029125; Sat, 10 Apr 2021 06:13:18 GMT (envelope-from git) Date: Sat, 10 Apr 2021 06:13:18 GMT Message-Id: <202104100613.13A6DI4N029125@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Ryusuke SUZUKI Subject: git: 4d61bda301 - main - 7a74a12108 -> 0d4371e5cc MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ryusuke X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4d61bda301d492b3febebee1340ab20590b39277 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Apr 2021 06:13:18 -0000 The branch main has been updated by ryusuke: URL: https://cgit.FreeBSD.org/doc/commit/?id=4d61bda301d492b3febebee1340ab20590b39277 commit 4d61bda301d492b3febebee1340ab20590b39277 Author: Ryusuke SUZUKI AuthorDate: 2021-04-10 06:12:59 +0000 Commit: Ryusuke SUZUKI CommitDate: 2021-04-10 06:12:59 +0000 7a74a12108 -> 0d4371e5cc --- documentation/content/ja/books/handbook/bsdinstall/_index.adoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/documentation/content/ja/books/handbook/bsdinstall/_index.adoc b/documentation/content/ja/books/handbook/bsdinstall/_index.adoc index f1a19e9c6d..9f1e53e850 100644 --- a/documentation/content/ja/books/handbook/bsdinstall/_index.adoc +++ b/documentation/content/ja/books/handbook/bsdinstall/_index.adoc @@ -61,7 +61,8 @@ FreeBSD を入手して実行する方法は、環境に依存します。 以 [NOTE] ==== -グラフィカルなインストーラで FreeBSD をインストールしたいと考えているユーザは、 link:https://www.furybsd.org[FuryBSD], link:https://ghostbsd.org[GhostBSD] もしくは link:https://www.midnightbsd.org[MidnightBSD] に興味を持たれるでしょう。 +グラフィカルなインストーラで FreeBSD をインストールしたいと考えているユーザは、 +https://ghostbsd.org[GhostBSD], https://www.midnightbsd.org[MidnightBSD] または https://nomadbsd.org/[NomadBSD] に興味を持たれることでしょう。 ==== この章では、以下について説明します。 From owner-dev-commits-doc-all@freebsd.org Sat Apr 10 06:35:27 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DFFB25DB0EC for ; Sat, 10 Apr 2021 06:35:27 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FHQH35z6Dz4VpW; Sat, 10 Apr 2021 06:35:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BF7FB47CC; Sat, 10 Apr 2021 06:35:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13A6ZRR8055965; Sat, 10 Apr 2021 06:35:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13A6ZRQK055964; Sat, 10 Apr 2021 06:35:27 GMT (envelope-from git) Date: Sat, 10 Apr 2021 06:35:27 GMT Message-Id: <202104100635.13A6ZRQK055964@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Ryusuke SUZUKI Subject: git: ee0dbd9889 - main - 989d921f5d -> 25cd4c9db5 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ryusuke X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee0dbd988932da1e0726fecd411a354192b9824c Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Apr 2021 06:35:27 -0000 The branch main has been updated by ryusuke: URL: https://cgit.FreeBSD.org/doc/commit/?id=ee0dbd988932da1e0726fecd411a354192b9824c commit ee0dbd988932da1e0726fecd411a354192b9824c Author: Ryusuke SUZUKI AuthorDate: 2021-04-10 06:34:28 +0000 Commit: Ryusuke SUZUKI CommitDate: 2021-04-10 06:34:28 +0000 989d921f5d -> 25cd4c9db5 --- .../ja/books/handbook/bsdinstall/_index.adoc | 25 ++++++++++++++-------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/documentation/content/ja/books/handbook/bsdinstall/_index.adoc b/documentation/content/ja/books/handbook/bsdinstall/_index.adoc index 9f1e53e850..a6342dfc9f 100644 --- a/documentation/content/ja/books/handbook/bsdinstall/_index.adoc +++ b/documentation/content/ja/books/handbook/bsdinstall/_index.adoc @@ -96,19 +96,22 @@ i386:: 古いデスクトップおよびラップトップでは、 この 32 ビットの X86 アーキテクチャが用いられています。 + 浮動小数点演算ユニットを持つ i386 互換のほとんどのプロセッサに対応しています。 486 以上のすべての Intel(R) プロセッサに対応しています。 +ただし、プロジェクトで公開されているバイナリは、686 プロセッサでコンパイルされているので、486 および 586 システムに特化したビルドが必要となることがあります。 + FreeBSD は、Physical Address Extensions (PAE) に対応した CPU でこの機能を利用可能です。 PAE 機能を有効にしたカーネルでは、 4 ギガバイト以上のメモリを認識し、システムが利用できます。 しかしながら、PAE を使うと、 デバイスドライバや FreeBSD の他の機能に制限を課してしまいます。 +arm64:: +ほとんどの組み込み用のボードは、64 ビットの ARM コンピュータです。 +数多くの arm64 サーバに対応しています。 + +arm:: +古い armv7 ボードに対応しています。 + powerpc:: USB 内蔵のすべての New World ROM Apple(R) Mac(R) システムに対応しています。 複数の CPU を持つコンピュータは SMP に対応しています。 + 32-bit カーネルは、RAM の最初の 2 GB だけを利用できます。 -sparc64:: -FreeBSD/sparc64 が対応しているハードウェアの一覧については、 link:https://www.FreeBSD.org/ja/platforms/sparc/[FreeBSD/sparc64 プロジェクト] をご覧ください。 -+ -複数のプロセッサを搭載するすべてのシステムにおいて、 SMP に対応しています。現時点では、 他のオペレーティングシステムとディスクの共有ができないので、 FreeBSD/sparc64 専用のディスクが必要です。 - [[bsdinstall-pre]] == インストール前に行う作業 @@ -199,7 +202,12 @@ UEFI (Unified Extensible Firmware Interface) で起動するコンピュータ # dd if=FreeBSD-12.1-RELEASE-amd64-memstick.img of=/dev/da0 bs=1M conv=sync .... + -もし上記のコマンドに失敗するようでしたら、 USB スティックがマウントされていないことや、 デバイス名がディスクに対してのものであり、 パーティションではないことを確認してください。 オペレーティングシステムによっては、このコマンドを man:sudo[8] で実行することが求められる場合があります。 man:dd[1] の書式は、プラットフォームによって少し変わります。 たとえば Mac OS(R) では、小文字の `bs=1m` を使う必要があります。 Linux(R) のようなシステムでは、書き込みをバッファします。 すべての書き込みを完了させるには、 man:sync[8] を使用してください。 +もし上記のコマンドに失敗するようでしたら、USB スティックがマウントされていないことや、デバイス名がディスクに対してのものであり、パーティションではないことを確認してください。 +オペレーティングシステムによっては、このコマンドを man:sudo[8] で実行することが求められる場合があります。 +man:dd[1] の書式は、プラットフォームによって少し変わります。 +たとえば Mac OS(R) では、小文字の `bs=1m` を使う必要があります。 +Linux(R) のようなシステムでは、書き込みをバッファします。 +すべての書き込みを完了させるには、man:sync[8] を使用してください。 [.procedure] .Procedure: Windows(R) を使ってイメージを書き込む @@ -494,9 +502,6 @@ amd64 コンピュータでは、通常 GPT が最も適切な選択となりま |MBR |Master Boot Record (link:http://en.wikipedia.org/wiki/Master_boot_record[http://en.wikipedia.org/wiki/Master_boot_record]) - -|VTOC8 -|Volume Table Of Contents。 Sun SPARC64 および UltraSPARC コンピュータで使われます。 |=== パーティションスキームを選択して作成した後で、 もう一度 btn:[Create] を選択すると、 パーティションが作成されます。kbd:[Tab] キーを使ってカーソルをフィールド間で移動できます。 @@ -551,6 +556,8 @@ FreeBSD の [.filename]#gptboot# は、 デフォルトでは最初に見つか |`freebsd-boot` |`512K` +| +| |`freebsd-ufs` |`2G` From owner-dev-commits-doc-all@freebsd.org Sat Apr 10 11:43:21 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 925B45E36A6 for ; Sat, 10 Apr 2021 11:43:21 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FHY6K3R7Zz3CYp; Sat, 10 Apr 2021 11:43:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 68B31108EB; Sat, 10 Apr 2021 11:43:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13ABhLQf067868; Sat, 10 Apr 2021 11:43:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13ABhLgh067867; Sat, 10 Apr 2021 11:43:21 GMT (envelope-from git) Date: Sat, 10 Apr 2021 11:43:21 GMT Message-Id: <202104101143.13ABhLgh067867@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Marc Fonvieille Subject: git: 33b9d1eb12 - main - Add french version of this file. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: blackend X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 33b9d1eb123cb32b7f0143d7ba44c69036934f25 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Apr 2021 11:43:21 -0000 The branch main has been updated by blackend: URL: https://cgit.FreeBSD.org/doc/commit/?id=33b9d1eb123cb32b7f0143d7ba44c69036934f25 commit 33b9d1eb123cb32b7f0143d7ba44c69036934f25 Author: Marc Fonvieille AuthorDate: 2021-04-10 11:40:04 +0000 Commit: Marc Fonvieille CommitDate: 2021-04-10 11:42:35 +0000 Add french version of this file. --- website/themes/beastie/i18n/fr.toml | 604 ++++++++++++++++++++++++++++++++++++ 1 file changed, 604 insertions(+) diff --git a/website/themes/beastie/i18n/fr.toml b/website/themes/beastie/i18n/fr.toml new file mode 100644 index 0000000000..0d36e36883 --- /dev/null +++ b/website/themes/beastie/i18n/fr.toml @@ -0,0 +1,604 @@ +# Global +[freebsd] +other = "FreeBSD" + +[freebsdProject] +other = "Le Projet FreeBSD" + +[freebsdPowerServe] +other = "FreeBSD The Power to Serve" + +[freebsdFoundation] +other = "La fondation FreeBSD" + +[downloadFreeBSD] +other = "Télécharger FreeBSD" + +[production] +other = "Production" + +# Header +[donate] +other = "Faire un don à FreeBSD" + +[donateFoundation] +other = "Faire un don à la fondation FreeBSD" + +[search] +other = "Recherche" + +# Navigation +[home] +other = "Accueil" + +[about] +other = "A propos" + +[introduction] +other = "Introduction" + +[features] +other = "Fonctionnalités" + +[advocacy] +other = "Prosélytisme" + +[marketing] +other = "Marketing" + +[privacyPolicy] +other = "Politique de confidentialité" + +[getFreeBSD] +other = "Obtenir FreeBSD" + +[releaseInformation] +other = "Information sur les versions" + +[releaseEngineering] +other = "Production des versions" + +[documentation] +other = "Documentation" + +[faq] +other = "FAQ" + +[handbook] +other = "Manuel de référence" + +[porterHandbook] +other = "Manuel du porteur d'application" + +[developerHandbook] +other = "Manuel du développeur" + +[manualPages] +other = "Pages de manuel" + +[documentationProjectPrimer] +other = "Manuel d'introduction au projet de documentation" + +[allBooksArticles] +other = "Tous les livres et articles" + +[community] +other = "Communauté" + +[mailingLists] +other = "Listes de diffusion" + +[forums] +other = "Forums" + +[userGroups] +other = "Groupes d'utilisateurs" + +[events] +other = "Événements" + +[FreeBSDJournal] +other = "Journal FreeBSD" + +[QA] +other = "Q&R (externe)" + +[developers] +other = "Développeurs" + +[projectIdeas] +other = "Idées de project" + +[subversionRepository] +other = "Dépôt Subversion" + +[gitRepository] +other = "Dépôt Git" + +[gitMirror] +other = "Miroir GitHub" + +[phabricator] +other = "Code Review (Phabricator)" + +[wiki] +other = "Wiki" + +[CI] +other = "Continuous Integration Service" + +[support] +other = "Support" + +[vendors] +other = "Revendeurs" + +[securityInformation] +other = "Information de sécurité" + +[bugReports] +other = "Rapport de bogue" + +[submittingBugReports] +other = "Envoyer un rapport de bogue" + +[foundation] +other = "Fondation" + +[monetaryDonations] +other = "Don d'argent" + +[hardwareDonations] +other = "Don de matériel" + +#Main +[freebsdDescription1] +other = "FreeBSD est un système d'exploitation pour les plates-formes de +type serveur, station de travail et les systèmes embarqués" + +[freebsdDescription2] +other = "modernes." + +[freebsdDescription3] +other = "Une importante" + +[freebsdDescription4] +other = "communauté" + +[freebsdDescription5] +other="l'a développé continuellement pendant plus de trente ans. Ses +fonctionnalités réseau, de sécurité et de stockage avancées ont fait de +FreeBSD la plate-forme de choix de certains" + +[freebsdDescription6] +other = "des sites Web les plus visités" + +[freebsdDescription7] +other = "ainsi que pour la plupart des systèmes embarqués orientés +réseau et des systèmes de stockage les plus répandus." + +[learnMore] +other = "En apprendre plus" + +[getThe] +other = "Obtenir le" + +[journal] +other = "Journal FreeBSD" + +[25th-logo] +other = "25th Anniversary Logo" + +[supportedReleases] +other = "Versions supportées" + +[supportLifecycle] +other = "Cycle de vie du support des versions" + +[upcoming] +other = "A venir" + +[newFreeBSD] +other= "Débutant sous FreeBSD?" + +[shortcuts] +other = "SHORTCUTS" + +[reportingProblems] +other = "Rapporter un problème" + +[ports] +other = "Logiciels portés" + +[latestNews] +other = "Dernières nouvelles" + +[upcomingEvents] +other = "ÉVÉNEMENTS A VENIR" + +[press] +other = "DANS LA PRESSE" + +[securityAdvisories] +other = "AVIS DE SÉCURITÉ" + +[errataNotices] +other = "ERRATA" + +[moreNews] +other = "Plus de nouvelles" + +[moreEvents] +other = "Plus d'événements" + +[moreMedia] +other = "More Media" + +[moreErrata] +other = "Plus d'errata" + +[more] +other = "Plus" + +[rssNews] +other = "Flux RSS de nouvelles" + +[rssSecurity] +other = "Flux RSS des avis de sécurité et des errata" + +#404 +[pageNotFound] +other = "Page not found." + +[notFoundTitle] +other = "We could not find the page you requested." + +[notFoundDesc] +other = "Please try your request again, use one of the links in the navigation menu, or the search box at the top of the page." + +# Footer +[copyright] +other = "All rights reserved." + +[trademark] +other = "The mark FreeBSD is a registered trademark of The FreeBSD Foundation and is used by The FreeBSD Project with the permission of" + +[contact] +other = "Contact" + +[legalNotices] +other = "Legal Notices" + +# Ports form +[ports-search] +other = "Search ports for:" + +[all] +other = "Tout" + +[package-name] +other = "Nom du paquet" + +[description] +other = "Description" + +[long-description] +other = "Long description" + +[maintainer] +other = "Maintainer" + +[requires] +other = "Requires" + +[submit] +other = "Envoyer" + +# Months +[1] +other = "Janvier" + +[2] +other = "Février" + +[3] +other = "Mars" + +[4] +other = "Avril" + +[5] +other = "Mai" + +[6] +other = "Juin" + +[7] +other = "Juillet" + +[8] +other = "Août" + +[9] +other = "Septembre" + +[10] +other = "Octobre" + +[11] +other = "Novembre" + +[12] +other = "Décembre" + +# Security section +[data] +other = "Data" + +[errataNoticeName] +other = "Nom de l'errata" + +[advisoryName] +other = "Nom de l'avis de sécurité" + +# Events section +[currentEvents] +other = "Current/Upcoming Events:" + +[pastEvents] +other = "Événements passés:" + +[upcomingFreeBSDEvents] +other = "Événements à venir" + +# Continents, countries +[europe] +other = "Europe" + +[africa] +other = "Afrique" + +[australia] +other = "Australie" + +[newZealand] +other = "Nouvelle Zélande" + +[northAmerica] +other = "Amérique du nord" + +[asia] +other = "Asie" + +[southAmerica] +other = "Amérique du sud" + +[oceania] +other = "Océanie" + +[global] +other = "Global" + +# Commercial software +[databases] +other = "Bases de données" + +[developmentTools] +other = "Outils de développement" + +[ecommerce] +other = "Outils et solutions d'E-Commerce" + +[email] +other = "Logiciels de messagerie électronique" + +[misc] +other = "Divers" + +[network] +other = "Systèmes réseau et applications" + +[scientific] +other = "Outils scientifiques et linguistiques" + +[security] +other = "Sécurité" + +[isp] +other = "Administration système / FAI" + +# sidenav +[applications] +other = "Applications" + +[administration] +other = "Administration" + +[news] +other = "Nouvelles du projet" + +[pressSidenav] +other = "Presse" + +[multimedia] +other = "Multimedia" + +[art] +other = "Ressources artistique" + +[logo] +other = "Logo" + +[donations] +other = "Donations" + +[privacy] +other = "Politique de confidentialité" + +[mailinglists] +other = "Listes de diffusion" + +[newsgroups] +other = "Forums de discussion" + +[usergroups] +other = "Groupes d'utilisateurs" + +[sourceCodeRepositories] +other = "Dépôt des codes source" + +[releng] +other = "Production des versions" + +[platforms] +other = "Plates-formes" + +[ideas] +other = "Idées de projet" + +[contributing] +other = "Contribuer" + +[FAQ] +other = "FAQ" + +[man] +other = "Pages de manuel" + +[papers] +other = "Présentation et papiers" + +[booksArticles] +other = "Livres et articles en ligne" + +[publications] +other = "Publications" + +[newbies] +other = "Pour les débutants" + +[docproj] +other = "Projet de documentation" + +[archive] +other = "Archive" + +[releases] +other = "Information sur les versions" + +[productionRelease] +other = "Version de production" + +[upcomingRelease] +other = "Version à venir" + +[snapshotReleases] +other = "Instantanés" + +[portedApplications] +other = "Applications portées" + +[gnome] +other = "GNOME" + +[installationInstructions] +other = "Instructions d'installation" + +[upgradeInstructions] +other = "Instructions de mise à jour" + +[availableApplications] +other = "Applications disponibles" + +[howHelp] +other = "Comment participer" + +[reportingBug] +other = "Rapporter un bogue" + +[screenshots] +other = "Captures d'écran" + +[contactUs] +other = "Nous contacter" + +[HALFAQ] +other = "FAQ sur l'HAL" + +[upgradeFAQ] +other = "FAQ mise à jour 2.10 à 2.12" + +[developmentBranchFAQ] +other = "FAQ branche de développement" + +[creatingPorts] +other = "Création des logiciels portés" + +[knownIssues] +other = "Problèmes connus" + +[aboutPorts] +other = "À propos des logiciels portés" + +[installing] +other = "Installation" + +[updating] +other = "Mise à jour" + +[searching] +other = "Recherche" + +[categories] +other = "Catégories" + +[alphabetically] +other = "classées par ordre alphabétique" + +[logicalGroup] +other = "classées par groupes" + +[allPorts] +other = "Liste de tous les logiciels portés" + +[moreInformation] +other = "Pour plus d'informations" + +[software] +other = "Logiciel" + +[hardware] +other = "Matériel" + +[consulting] +other = "Consultants" + +[ispCommercial] +other = "Fournisseurs d'accès à Internet" + +[securityInfo] +other = "Information de sécurité" + +[advisories] +other = "Avis de sécurité" + +[errataNoticesSidenav] +other = "Errata" + +[unsupportedReleases] +other = "Versions non-supportées" + +[readSecurityAdvisories] +other = "Comment lire les avis de sécurité FreeBSD" + +[charterSecurityOfficerTeam] +other = "Charte de l'officier de Sécurité et de son équipe" + +[bugreports] +other = "Rapports de bogues" + +[submitPR] +other = "Envoyer un rapport de bogue" + +[webresources] +other = "Ressources Web" From owner-dev-commits-doc-all@freebsd.org Sat Apr 10 12:01:21 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 663435E40E2 for ; Sat, 10 Apr 2021 12:01:21 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FHYW52YTtz3DP8; Sat, 10 Apr 2021 12:01:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4AE8B1110E; Sat, 10 Apr 2021 12:01:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13AC1Lmg090453; Sat, 10 Apr 2021 12:01:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13AC1LSP090452; Sat, 10 Apr 2021 12:01:21 GMT (envelope-from git) Date: Sat, 10 Apr 2021 12:01:21 GMT Message-Id: <202104101201.13AC1LSP090452@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Marc Fonvieille Subject: git: 9639daa2fc - main - Fix wrapped lines which break the build. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: blackend X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9639daa2fc1ab344045fd60a3d68f24460557069 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Apr 2021 12:01:21 -0000 The branch main has been updated by blackend: URL: https://cgit.FreeBSD.org/doc/commit/?id=9639daa2fc1ab344045fd60a3d68f24460557069 commit 9639daa2fc1ab344045fd60a3d68f24460557069 Author: Marc Fonvieille AuthorDate: 2021-04-10 12:00:20 +0000 Commit: Marc Fonvieille CommitDate: 2021-04-10 12:00:20 +0000 Fix wrapped lines which break the build. --- website/themes/beastie/i18n/fr.toml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/website/themes/beastie/i18n/fr.toml b/website/themes/beastie/i18n/fr.toml index 0d36e36883..d1837ddad2 100644 --- a/website/themes/beastie/i18n/fr.toml +++ b/website/themes/beastie/i18n/fr.toml @@ -153,8 +153,7 @@ other = "Don de matériel" #Main [freebsdDescription1] -other = "FreeBSD est un système d'exploitation pour les plates-formes de -type serveur, station de travail et les systèmes embarqués" +other = "FreeBSD est un système d'exploitation pour les plates-formes de type serveur, station de travail et les systèmes embarqués" [freebsdDescription2] other = "modernes." @@ -166,16 +165,13 @@ other = "Une importante" other = "communauté" [freebsdDescription5] -other="l'a développé continuellement pendant plus de trente ans. Ses -fonctionnalités réseau, de sécurité et de stockage avancées ont fait de -FreeBSD la plate-forme de choix de certains" +other="l'a développé continuellement pendant plus de trente ans. Ses fonctionnalités réseau, de sécurité et de stockage avancées ont fait de FreeBSD la plate-forme de choix de certains" [freebsdDescription6] other = "des sites Web les plus visités" [freebsdDescription7] -other = "ainsi que pour la plupart des systèmes embarqués orientés -réseau et des systèmes de stockage les plus répandus." +other = "ainsi que pour la plupart des systèmes embarqués orientés réseau et des systèmes de stockage les plus répandus." [learnMore] other = "En apprendre plus" From owner-dev-commits-doc-all@freebsd.org Sat Apr 10 12:23:12 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C10465E535C for ; Sat, 10 Apr 2021 12:23: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FHZ0J58Gpz3Flc; Sat, 10 Apr 2021 12:23:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A3B0A11244; Sat, 10 Apr 2021 12:23:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13ACNCIU021116; Sat, 10 Apr 2021 12:23:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13ACNCNW021115; Sat, 10 Apr 2021 12:23:12 GMT (envelope-from git) Date: Sat, 10 Apr 2021 12:23:12 GMT Message-Id: <202104101223.13ACNCNW021115@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Marc Fonvieille Subject: git: f958fa6dd7 - main - Allow localization of Ports word on the homepage shortcuts. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: blackend X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f958fa6dd76a2847c9e8cd92450bac6f7a51a20d Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Apr 2021 12:23:12 -0000 The branch main has been updated by blackend: URL: https://cgit.FreeBSD.org/doc/commit/?id=f958fa6dd76a2847c9e8cd92450bac6f7a51a20d commit f958fa6dd76a2847c9e8cd92450bac6f7a51a20d Author: Marc Fonvieille AuthorDate: 2021-04-10 12:21:50 +0000 Commit: Marc Fonvieille CommitDate: 2021-04-10 12:21:50 +0000 Allow localization of Ports word on the homepage shortcuts. --- website/themes/beastie/layouts/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/themes/beastie/layouts/index.html b/website/themes/beastie/layouts/index.html index c0c0863aca..de9c6c5a9e 100755 --- a/website/themes/beastie/layouts/index.html +++ b/website/themes/beastie/layouts/index.html @@ -104,7 +104,7 @@ {{ i18n "handbook" }}
  • - Ports + {{ i18n "ports" }}
    • From owner-dev-commits-doc-all@freebsd.org Sat Apr 10 12:49:42 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AC70E5E5874 for ; Sat, 10 Apr 2021 12:49: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FHZZt4X0tz3GgN; Sat, 10 Apr 2021 12:49:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8E56D1184A; Sat, 10 Apr 2021 12:49:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13ACng3B047607; Sat, 10 Apr 2021 12:49:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13ACng0Y047606; Sat, 10 Apr 2021 12:49:42 GMT (envelope-from git) Date: Sat, 10 Apr 2021 12:49:42 GMT Message-Id: <202104101249.13ACng0Y047606@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: a88e73dd35 - main - Add routing work description MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a88e73dd3566928bbb0c4fd99fad30aa5f725b66 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Apr 2021 12:49:42 -0000 The branch main has been updated by melifaro (src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=a88e73dd3566928bbb0c4fd99fad30aa5f725b66 commit a88e73dd3566928bbb0c4fd99fad30aa5f725b66 Author: Alexander V. Chernikov AuthorDate: 2021-04-10 00:33:50 +0000 Commit: Alexander V. Chernikov CommitDate: 2021-04-10 00:33:50 +0000 Add routing work description Differential Revision: https://reviews.freebsd.org/D29275 Approved by: debdrup --- website/content/en/releases/13.0R/relnotes.adoc | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/content/en/releases/13.0R/relnotes.adoc b/website/content/en/releases/13.0R/relnotes.adoc index 30d996a403..48707f03ca 100644 --- a/website/content/en/releases/13.0R/relnotes.adoc +++ b/website/content/en/releases/13.0R/relnotes.adoc @@ -457,6 +457,9 @@ can be set to `1` to enable strictly packet conserving behavior (at most 1 segm The man:cc_cubic[4] man:tcp[4] congestion control algorithm aligns more closely with the standard in RFC8312. gitref:40f9078ff9d9[repository=src] {{< sponsored "NetApp" >}} +The amount of queued packets in for unresolved ARP/NDP entries has been increased to 16. gitref:0da3f8c98d17d9[repository=src] +Stacked VLAN (802.1ad) support has been added. gitref:c7cffd65c5d8[repository=src]. + The man:ping[8] utility now supports setting network QoS, with IP DSCP gitref:6034024daddb[repository=src] and Ethernet PCP gitref:81a6f4c7ae69[repository=src]. {{< sponsored "NetApp" >}} Merged the man:ping[8] and man:ping6[8] utilities. @@ -467,6 +470,25 @@ SCTP support is now available as a new [.filename]#sctp.ko# kernel module and is no longer compiled into GENERIC by default. gitref:e64080e79c53[repository=src] {{< sponsored "The FreeBSD Foundation" >}} +[[[network-routing]] +=== Routing +FreeBSD 13 features a rewritten routing stack. It is based on the introduction of nexthops - objects holding all necessary state to pass a packet to the desired destination. gitref:a666325282ea[repository=src] +Multipath routing support has been rewritten in more scalable fashion, featuring 64-wide multipath routes with O(1) lookup time. gitref:fedeb08b6a58[repository=src]. +The `RADIX_MPATH` kernel option got replaced with `ROUTE_MPATH`, which is turned on by default. Additionally, the `net.route.multipath` sysctl has been added to control the feature in runtime. gitref:d1d941c5b910[repository=src], gitref:d5fe384b4d41[repository=src] +Support for custom route lookup algorithms has been added. The framework decouples control-plane and data-plane, resulting in both faster lookups and better convergence times for large tables under load. gitref:f5baf8bb12f3[repository=src] +DPDK librte-based IPv4/IPv6 route lookup algorithms has been added, optimising control-plane and data-plane for large routing tables. gitref:537d13437314[repository=src] + +Interface fib is now used for proxyarp checks. gitref:66bc03d41566[repository=src] +Loopback route installation has been fixed for the interfaces in different fibs using the same prefix. gitref:9fdbf7eef5c0[repository=src] +Number of fibs can now be changed at runtime by controlling `net.fibs` sysctl. gitref:f5247a232a33[repository=src] +`net.add_addr_allfibs` sysctl default has been changed to 0. gitref:2d3982419593[repository=src] + +Temporal routes (routes with `-expire` time set) expiration have been for both IPv4 and IPv6. gitref:34a5582c47c7[repository=src] +Duplicate routes installation issue for /32 or /128 interface aliases has been fixed. gitref:81728a538d24[repository=src] +IPv6 interface routes are now marked with RTF_PINNED like their IPv4 counterparts. gitref:81728a538d24[repository=src] +The {{< manpage "route" "8">}} network auto-guessing has been eliminated by removing remnants of classful behavior. gitref:d28210b2c2aa[repository=src] +Sysctl `net.inet6.ip6.deembed_scopeid` , making it possible to disable IPv6 scope de-embedding, has been removed. gitref:bec053ffe01d[repository=src] + [[hardware]] == Hardware Support From owner-dev-commits-doc-all@freebsd.org Sat Apr 10 13:17:51 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 079F95E691C for ; Sat, 10 Apr 2021 13:17:51 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FHbCL6Tprz3JFM; Sat, 10 Apr 2021 13:17:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D138E12167; Sat, 10 Apr 2021 13:17:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13ADHoFE087900; Sat, 10 Apr 2021 13:17:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13ADHock087899; Sat, 10 Apr 2021 13:17:50 GMT (envelope-from git) Date: Sat, 10 Apr 2021 13:17:50 GMT Message-Id: <202104101317.13ADHock087899@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Marc Fonvieille Subject: git: a0c771f286 - main - Refine a translation with a shortest one. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: blackend X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a0c771f286545adae4ffe8bd5d52fe056f65e22d Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Apr 2021 13:17:51 -0000 The branch main has been updated by blackend: URL: https://cgit.FreeBSD.org/doc/commit/?id=a0c771f286545adae4ffe8bd5d52fe056f65e22d commit a0c771f286545adae4ffe8bd5d52fe056f65e22d Author: Marc Fonvieille AuthorDate: 2021-04-10 13:15:04 +0000 Commit: Marc Fonvieille CommitDate: 2021-04-10 13:15:04 +0000 Refine a translation with a shortest one. --- website/themes/beastie/i18n/fr.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/themes/beastie/i18n/fr.toml b/website/themes/beastie/i18n/fr.toml index d1837ddad2..6182531756 100644 --- a/website/themes/beastie/i18n/fr.toml +++ b/website/themes/beastie/i18n/fr.toml @@ -189,7 +189,7 @@ other = "25th Anniversary Logo" other = "Versions supportées" [supportLifecycle] -other = "Cycle de vie du support des versions" +other = "Cycle de vie des versions" [upcoming] other = "A venir" From owner-dev-commits-doc-all@freebsd.org Sat Apr 10 13:17:52 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 29B955E6921 for ; Sat, 10 Apr 2021 13:17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FHbCN0hKHz3J8Z; Sat, 10 Apr 2021 13:17:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0A06611FA8; Sat, 10 Apr 2021 13:17:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13ADHps8087924; Sat, 10 Apr 2021 13:17:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13ADHpck087923; Sat, 10 Apr 2021 13:17:51 GMT (envelope-from git) Date: Sat, 10 Apr 2021 13:17:51 GMT Message-Id: <202104101317.13ADHpck087923@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Marc Fonvieille Subject: git: 050c4420a0 - main - Add translated news titles for 2021. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: blackend X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 050c4420a002652196022b1b3e4d6913e770466d Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Apr 2021 13:17:52 -0000 The branch main has been updated by blackend: URL: https://cgit.FreeBSD.org/doc/commit/?id=050c4420a002652196022b1b3e4d6913e770466d commit 050c4420a002652196022b1b3e4d6913e770466d Author: Marc Fonvieille AuthorDate: 2021-04-10 13:16:39 +0000 Commit: Marc Fonvieille CommitDate: 2021-04-10 13:16:39 +0000 Add translated news titles for 2021. --- website/data/fr/news/news.toml | 89 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 88 insertions(+), 1 deletion(-) diff --git a/website/data/fr/news/news.toml b/website/data/fr/news/news.toml index 9e757f6f19..c624e7c985 100644 --- a/website/data/fr/news/news.toml +++ b/website/data/fr/news/news.toml @@ -1,6 +1,93 @@ # Sort news by year, month and day # $FreeBSD$ +[[news]] +date = "2021-04-03" +title = "FreeBSD 13.0-RC5 disponible" +description = "The fifth RC build for the FreeBSD 13.0 release cycle is now available. ISO images for the amd64, arm64, armv6, armv7, i386, powerpc, powerpc64, powerpcspe, powerpc64le, and riscv64 architectures are available on most of our FreeBSD mirror sites." + +[[news]] +date = "2021-03-29" +title = "FreeBSD 13.0-RC4 disponible" +description = "The fourth RC build for the FreeBSD 13.0 release cycle is now available. ISO images for the amd64, arm64, armv6, armv7, i386, powerpc, powerpc64, powerpcspe, powerpc64le, and riscv64 architectures are available on most of our FreeBSD mirror sites." + +[[news]] +date = "2021-03-21" +title = "Réouverture de Weblate pour les traductions" +description = "After the migration to Hugo/AsciiDoctor the weblate tool it's opened again. To get more information check the announcement." + +[[news]] +date = "2021-03-20" +title = "FreeBSD 13.0-RC3 disponible" +description = "The third RC build for the FreeBSD 13.0 release cycle is now available. ISO images for the amd64, arm64, armv6, armv7, i386, powerpc, powerpc64, powerpcspe, powerpc64le, and riscv64 architectures are available on most of our FreeBSD mirror sites." + +[[news]] +date = "2021-03-15" +description = "Nouveau participant: Ka Ho Ng (src)" + +[[news]] +date = "2021-03-12" +title = "FreeBSD 13.0-RC2 disponible" +description = "The second RC build for the FreeBSD 13.0 release cycle is now available. ISO images for the amd64, arm64, armv6, armv7, i386, powerpc, powerpc64, powerpcspe, powerpc64le, and riscv64 architectures are available on most of our FreeBSD mirror sites." + +[[news]] +date = "2021-03-06" +title = "FreeBSD 13.0-RC1 disponible" +description = "The first RC build for the FreeBSD 13.0 release cycle is now available. ISO images for the amd64, arm64, armv6, armv7, i386, powerpc, powerpc64, powerpcspe, powerpc64le, and riscv64 architectures are available on most of our FreeBSD mirror sites." + +[[news]] +date = "2021-02-27" +title = "FreeBSD 13.0-BETA4 disponible" +description = "The fourth BETA build for the FreeBSD 13.0 release cycle is now available. ISO images for the amd64, arm64, armv6, armv7, i386, powerpc, powerpc64, powerpcspe, powerpc64le, and riscv64 architectures are available on most of our FreeBSD mirror sites." + +[[news]] +date = "2021-02-20" +title = "FreeBSD 13.0-BETA3 disponible" +description = "The third BETA build for the FreeBSD 13.0 release cycle is now available. ISO images for the amd64, arm64, armv6, armv7, i386, powerpc, powerpc64, powerpcspe, powerpc64le, and riscv64 architectures are available on most of our FreeBSD mirror sites." + +[[news]] +date = "2021-02-12" +title = "FreeBSD 13.0-BETA2 disponible" +description = "The second BETA build for the FreeBSD 13.0 release cycle is now available. ISO images for the amd64, arm64, armv6, armv7, i386, powerpc, powerpc64, powerpcspe, powerpc64le, and riscv64 architectures are available on most of our FreeBSD mirror sites." + +[[news]] +date = "2021-02-06" +title = "FreeBSD 13.0-BETA1 disponible" +description = "The first BETA build for the FreeBSD 13.0 release cycle is now available. ISO images for the amd64, arm64, powerpc64, powerpcspe, powerpc64le, and riscv64 architectures are available on most of our FreeBSD mirror sites." + +[[news]] +date = "2021-02-07" +description = "Nouveau participant: Fernando Apesteguia Santiago (doc)" + +[[news]] +date = "2021-01-27" +description = "Nouveau participant: Rajesh Kumar M A (src)" + +[[news]] +date = "2021-01-27" +description = "Nouveau participant: Nuno Teixeira (ports)" + +[[news]] +date = "2021-01-25" +description = "Conversion du site Web et de la documentation vers Hugo et AsciiDoctor" + +[[news]] +date = "2021-01-21" +description = "Nouveau participant: Lewis Cook (ports)" + +[[news]] +date = "2021-01-16" +title = "Rapport de situation Octobre-Décembre 2020" +description = "Le Rapport de situation Octobre-Décembre 2020 est disponible avec 42 éléments." + +[[news]] +date = "2021-01-14" +description = "Nouveau participant: Lutz Donnerhacke (src)" + +[[news]] +date = "2021-01-02" +description = "Nouveau participant: Neel Chauhan (ports)" + [[news]] date = "2004-12-06" description = "Nouveau participant : Palle Girgensohn (ports)" @@ -96,7 +183,7 @@ description = "Nouveau Participant: Bjoern A. [[news]] date = "2004-07-26" -title = "Rapport de status Mai 2004 - Juin 2004" +title = "Rapport de situation Mai 2004 - Juin 2004" description = "

    Le rapport de status Mai-Juin est disponible. Voir la page des rapports de status pour plus d'informations.

    " [[news]] From owner-dev-commits-doc-all@freebsd.org Sat Apr 10 13:27:02 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 679C25E68EC for ; Sat, 10 Apr 2021 13:27:02 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FHbPy2XQmz3Jg9; Sat, 10 Apr 2021 13:27:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 49D9C1219F; Sat, 10 Apr 2021 13:27:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13ADR2Cp001437; Sat, 10 Apr 2021 13:27:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13ADR2vX001436; Sat, 10 Apr 2021 13:27:02 GMT (envelope-from git) Date: Sat, 10 Apr 2021 13:27:02 GMT Message-Id: <202104101327.13ADR2vX001436@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Marc Fonvieille Subject: git: 58ef7b9627 - main - Add link to the french version of the Website. Some parts still need updates. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: blackend X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 58ef7b9627e6be533a17cd76bb7d2f8e879027c9 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Apr 2021 13:27:02 -0000 The branch main has been updated by blackend: URL: https://cgit.FreeBSD.org/doc/commit/?id=58ef7b9627e6be533a17cd76bb7d2f8e879027c9 commit 58ef7b9627e6be533a17cd76bb7d2f8e879027c9 Author: Marc Fonvieille AuthorDate: 2021-04-10 13:23:40 +0000 Commit: Marc Fonvieille CommitDate: 2021-04-10 13:23:40 +0000 Add link to the french version of the Website. Some parts still need updates. --- website/themes/beastie/layouts/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/website/themes/beastie/layouts/index.html b/website/themes/beastie/layouts/index.html index de9c6c5a9e..37d9ae5396 100755 --- a/website/themes/beastie/layouts/index.html +++ b/website/themes/beastie/layouts/index.html @@ -82,6 +82,7 @@ -->
  • de
  • en
    • +
  • fr
  • ja
  • zh-cn
  • zh-tw
    • From owner-dev-commits-doc-all@freebsd.org Sat Apr 10 14:31:47 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 229965CDDF5 for ; Sat, 10 Apr 2021 14:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FHcrg0LtKz3Pbg; Sat, 10 Apr 2021 14:31:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F345A12CF0; Sat, 10 Apr 2021 14:31:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13AEVkcw091830; Sat, 10 Apr 2021 14:31:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13AEVkMg091829; Sat, 10 Apr 2021 14:31:46 GMT (envelope-from git) Date: Sat, 10 Apr 2021 14:31:46 GMT Message-Id: <202104101431.13AEVkMg091829@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Sergio Carlavilla Delgado Subject: git: aef48a9185 - main - Split the FDP Primer into different chapters 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: aef48a918535769311c2c93448f1920b7a3cf351 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Apr 2021 14:31:47 -0000 The branch main has been updated by carlavilla: URL: https://cgit.FreeBSD.org/doc/commit/?id=aef48a918535769311c2c93448f1920b7a3cf351 commit aef48a918535769311c2c93448f1920b7a3cf351 Author: Sergio Carlavilla Delgado AuthorDate: 2021-04-10 14:31:17 +0000 Commit: Sergio Carlavilla Delgado CommitDate: 2021-04-10 14:31:17 +0000 Split the FDP Primer into different chapters --- .../content/en/books/fdp-primer/_index.adoc | 97 +-------- .../fdp-primer/asciidoctor-primer/_index.adoc | 224 ++++++++++++++++++++ .../fdp-primer/asciidoctor-primer/chapter.adoc | 202 ------------------ .../content/en/books/fdp-primer/book.adoc | 114 ++++++++++ .../en/books/fdp-primer/chapters-order.adoc | 30 +-- .../doc-build/{chapter.adoc => _index.adoc} | 29 ++- .../editor-config/{chapter.adoc => _index.adoc} | 10 +- .../examples/{chapter.adoc => _index.adoc} | 9 +- .../manual-pages/{chapter.adoc => _index.adoc} | 102 ++++++--- .../overview/{chapter.adoc => _index.adoc} | 44 ++-- .../po-translations/{chapter.adoc => _index.adoc} | 72 +++++-- .../preface/{chapter.adoc => _index.adoc} | 9 +- .../rosetta/{chapter.adoc => _index.adoc} | 2 +- .../see-also/{chapter.adoc => _index.adoc} | 3 +- .../structure/{chapter.adoc => _index.adoc} | 76 +++++-- .../fdp-primer/tools/{chapter.adoc => _index.adoc} | 11 +- .../translations/{chapter.adoc => _index.adoc} | 90 +++++--- .../en/books/fdp-primer/working-copy/_index.adoc | 134 ++++++++++++ .../en/books/fdp-primer/working-copy/chapter.adoc | 113 ---------- .../en/books/fdp-primer/writing-style/_index.adoc | 231 +++++++++++++++++++++ .../en/books/fdp-primer/writing-style/chapter.adoc | 173 --------------- 21 files changed, 1038 insertions(+), 737 deletions(-) diff --git a/documentation/content/en/books/fdp-primer/_index.adoc b/documentation/content/en/books/fdp-primer/_index.adoc index 7428515fdf..3ec2036db2 100644 --- a/documentation/content/en/books/fdp-primer/_index.adoc +++ b/documentation/content/en/books/fdp-primer/_index.adoc @@ -3,113 +3,30 @@ title: FreeBSD Documentation Project Primer for New Contributors authors: - author: The FreeBSD Documentation Project copyright: 1998-2021 DocEng -releaseinfo: "$FreeBSD$" trademarks: ["general"] +next: books/fdp-primer/preface --- = FreeBSD Documentation Project Primer for New Contributors :doctype: book :toc: macro -:toclevels: 2 +:toclevels: 1 :icons: font -:xrefstyle: basic -:relfileprefix: ../ -:outfilesuffix: :sectnums: :sectnumlevels: 6 -:partnums: -:chapter-signifier: Chapter -:part-signifier: Part -:source-highlighter: rouge :experimental: -:skip-front-matter: -:book: true -:pdf: false - -ifeval::["{backend}" == "html5"] -include::shared/mirrors.adoc[] -include::shared/authors.adoc[] -include::shared/releases.adoc[] -include::shared/en/mailing-lists.adoc[] -include::shared/en/teams.adoc[] -include::shared/en/urls.adoc[] -:chapters-path: content/en/books/fdp-primer/ -endif::[] - -ifeval::["{backend}" == "pdf"] -include::../../../../shared/mirrors.adoc[] -include::../../../../shared/authors.adoc[] -include::../../../../shared/releases.adoc[] -include::../../../../shared/en/mailing-lists.adoc[] -include::../../../../shared/en/teams.adoc[] -include::../../../../shared/en/urls.adoc[] -:chapters-path: -endif::[] - -ifeval::["{backend}" == "epub3"] -include::../../../../shared/mirrors.adoc[] -include::../../../../shared/authors.adoc[] -include::../../../../shared/releases.adoc[] -include::../../../../shared/en/mailing-lists.adoc[] -include::../../../../shared/en/teams.adoc[] -include::../../../../shared/en/urls.adoc[] -:chapters-path: -endif::[] [.abstract-title] -[abstract] Abstract -Thank you for becoming a part of the FreeBSD Documentation Project. Your contribution is extremely valuable, and we appreciate it. +Thank you for becoming a part of the FreeBSD Documentation Project. +Your contribution is extremely valuable, and we appreciate it. This primer covers details needed to start contributing to the FreeBSD Documentation Project, or FDP, including tools, software, and the philosophy behind the Documentation Project. -This is a work in progress. Corrections and additions are always welcome. +This is a work in progress. +Corrections and additions are always welcome. ''' -toc::[] - -include::{chapters-path}toc-figures.adoc[] - -include::{chapters-path}toc-tables.adoc[] - -include::{chapters-path}toc-examples.adoc[] - -:sectnums!: - -include::{chapters-path}preface/chapter.adoc[leveloffset=+1, lines=7..-1] - -:sectnums: - -include::{chapters-path}overview/chapter.adoc[leveloffset=+1, lines=7..21; 25..-1] - -include::{chapters-path}tools/chapter.adoc[leveloffset=+1, lines=7..21; 25..-1] - -include::{chapters-path}working-copy/chapter.adoc[leveloffset=+1, lines=7..21; 25..-1] - -include::{chapters-path}structure/chapter.adoc[leveloffset=+1, lines=7..21; 25..-1] - -include::{chapters-path}doc-build/chapter.adoc[leveloffset=+1, lines=7..21; 25..-1] - -include::{chapters-path}asciidoctor-primer/chapter.adoc[leveloffset=+1, lines=7..21; 27..-1] - -include::{chapters-path}rosetta/chapter.adoc[leveloffset=+1, lines=7..21; 25..-1] - -include::{chapters-path}translations/chapter.adoc[leveloffset=+1, lines=7..21; 28..-1] - -include::{chapters-path}po-translations/chapter.adoc[leveloffset=+1, lines=7..21; 27..-1] - -include::{chapters-path}manual-pages/chapter.adoc[leveloffset=+1, lines=7..21; 25..-1] - -include::{chapters-path}writing-style/chapter.adoc[leveloffset=+1, lines=7..21; 27..-1] - -include::{chapters-path}editor-config/chapter.adoc[leveloffset=+1, lines=7..21; 25..-1] - -include::{chapters-path}see-also/chapter.adoc[leveloffset=+1, lines=7..21; 27..-1] - -:sectnums!: - -include::{chapters-path}examples/chapter.adoc[leveloffset=+1, lines=6..21; 25..-1] - -:sectnums: +include::content/en/books/fdp-primer/toc.adoc[] diff --git a/documentation/content/en/books/fdp-primer/asciidoctor-primer/_index.adoc b/documentation/content/en/books/fdp-primer/asciidoctor-primer/_index.adoc new file mode 100644 index 0000000000..947a42ca45 --- /dev/null +++ b/documentation/content/en/books/fdp-primer/asciidoctor-primer/_index.adoc @@ -0,0 +1,224 @@ +--- +title: Chapter 6. AsciiDoctor Primer +prev: books/fdp-primer/doc-build +next: books/fdp-primer/rosetta +--- + +[[asciidoctor-primer]] += AsciiDoctor Primer +:doctype: book +:toc: macro +:toclevels: 1 +:icons: font +:sectnums: +:sectnumlevels: 6 +:source-highlighter: rouge +:experimental: +:skip-front-matter: +:xrefstyle: basic +:relfileprefix: ../ +:outfilesuffix: +:sectnumoffset: 6 + +include::shared/en/urls.adoc[] + +toc::[] + +Most FDP documentation is written with AsciiDoc. +This chapter explains what that means, how to read and understand the documentation source, and the techniques used. +To get a complete reference of the AsciiDoctor capabilities please consult the link:https://docs.asciidoctor.org/home/[Asciidoctor documentation]. +Some of the examples used in this chapter have been taken from the link:https://docs.asciidoctor.org/asciidoc/latest/syntax-quick-reference[AsciiDoc Syntax Quick Reference]. + +[[asciidoctor-primer-overview]] +== Overview + +In the original days of computers, electronic text was simple. +There were a few character sets like ASCII or EBCDIC, but that was about it. +Text was text, and what you saw really was what you got. +No frills, no formatting, no intelligence. + +Inevitably, this was not enough. +When text is in a machine-usable format, machines are expected to be able to use and manipulate it intelligently. +Authors want to indicate that certain phrases should be emphasized, or added to a glossary, or made into hyperlinks. +Filenames could be shown in a “typewriter” style font for viewing on screen, but as “italics” when printed, or any of a myriad of other options for presentation. + +It was once hoped that Artificial Intelligence (AI) would make this easy. +The computer would read the document and automatically identify key phrases, filenames, text that the reader should type in, examples, and more. +Unfortunately, real life has not happened quite like that, and computers still require assistance before they can meaningfully process text. + +More precisely, they need help identifying what is what. +Consider this text: + +To remove [.filename]#/tmp/foo#, use man:rm[1]. + +[source,shell] +---- +% rm /tmp/foo +---- + +It is easy for the reader to see which parts are filenames, which are commands to be typed in, which parts are references to manual pages, and so on. +But the computer processing the document cannot reliably determine this. +For this we need markup. + +The previous example is actually represented in this document like this: + +.... +To remove [.filename]#/tmp/foo#, use man:rm[1]. + +[source,shell] +---- +% rm /tmp/foo +---- +.... + +[[asciidoctor-headings]] +== Headings + +AsciiDoctor supports six headings levels. +If the document type is `article` only one level 0 (`=`) can be used. +If the document type is `book` then there can be multiple level 0 (`=`) headings. + +This is an example of headings in an `article`. + +.... +\= Document Title (Level 0) + +\== Level 1 Section Title + +\=== Level 2 Section Title + +\==== Level 3 Section Title + +\===== Level 4 Section Title + +\====== Level 5 Section Title + +\== Another Level 1 Section Title +.... + +[WARNING] +==== +Section levels cannot be skipped when nesting sections. + +The following syntax is not correct. + +.... +\= Document Title + +\== Level 2 + +\==== Level 4 +.... +==== + +[[asciidoctor-paragraphs]] +== Paragraphs + +Paragraphs don't require special markup in AsciiDoc. +A paragraph is defined by one or more consecutive lines of text. +To create a new paragraph leave one blank line. + +For example, this is a heading with two paragraphs. + +.... +\= This is the heading + +This is the first paragraph. +This is also the first paragraph. + +And this is the second paragraph. +.... + +[[asciidoctor-lists]] +== Lists + +AsciiDoctor supports two type of lists: ordered and unordered. +To get more information about lists check link:https://docs.asciidoctor.org/asciidoc/latest/syntax-quick-reference/#lists[AsciiDoc Syntax Quick Reference] + +[[asciidoctor-ordered-lists]] +=== Ordered lists + +To create an ordered list use the `*` character. + +For example this is an ordered list. + +.... +* First item +* Second item +** Subsecond item +* Third item +.... + +And this would be rendered as. + +* First item +* Second item +** Subsecond item +* Third item + +[[asciidoctor-unordered-lists]] +=== Unordered lists + +To create an unordered list use the `.` character. + +For example this is an unordered list. + +.... +. First item +. Second item +.. Subsecond item +. Third item +.... + +And this would be rendered as. + +. First item +. Second item +.. Subsecond item +. Third item + +[[asciidoctor-links]] +== Links + +[[asciidoctor-links-external]] +=== External links + +To point to another website the `link` macro should be used. + +.... +link:https://www.FreeBSD.org[FreeBSD] +.... + +[NOTE] +==== +As the AsciiDoctor documentation describes, the `link` macro is not required when the target starts with a URL scheme like `https`. +However, it is a good practice to do this anyway to ensure that AsciiDoctor renders the link correctly, especially in non-latin languages like Japanese. +==== + +[[asciidoctor-links-internal]] +=== Internal link + +To point to another book or article the AsciiDoctor variables should be used. +For example, if we are in the `cups` article and we want to point to `ipsec-must` these steps should be used. + +. Include the [.filename]#urls.adoc# file from [.filename]#~/doc/shared# folder. ++ +.... +\include::shared/{lang}/urls.adoc[] +.... ++ +. Then create a link using the AsciiDoctor variable to the `ipsec-must` article. ++ +.... +link:{ipsec-must}[IPSec-Must article] +.... ++ +And this would be rendered as. ++ +link:{ipsec-must}[IPSec-Must article] + +[[asciidoctor-conclusion]] +== Conclusion + +This is the conclusion of this AsciiDoctor primer. +For reasons of space and complexity, several things have not been covered in depth (or at all). diff --git a/documentation/content/en/books/fdp-primer/asciidoctor-primer/chapter.adoc b/documentation/content/en/books/fdp-primer/asciidoctor-primer/chapter.adoc deleted file mode 100644 index d13a79de9c..0000000000 --- a/documentation/content/en/books/fdp-primer/asciidoctor-primer/chapter.adoc +++ /dev/null @@ -1,202 +0,0 @@ ---- -title: Chapter 6. AsciiDoctor Primer -prev: books/fdp-primer/doc-build -next: books/fdp-primer/rosetta ---- - -[[asciidoctor-primer]] -= AsciiDoctor Primer -:doctype: book -:toc: macro -:toclevels: 1 -:icons: font -:sectnums: -:sectnumlevels: 6 -:source-highlighter: rouge -:experimental: -:skip-front-matter: -:xrefstyle: basic -:relfileprefix: ../ -:outfilesuffix: -:sectnumoffset: 6 - -include::shared/en/urls.adoc[] - -toc::[] - -Most FDP documentation is written with AsciiDoc. This chapter explains what that means, how to read and understand the documentation source, and the techniques used. To get a complete reference of the AsciiDoctor capabilities please consult the link:https://docs.asciidoctor.org/home/[Asciidoctor documentation]. Some of the examples used in this chapter have been taken from the link:https://docs.asciidoctor.org/asciidoc/latest/syntax-quick-reference[AsciiDoc Syntax Quick Reference]. - -[[asciidoctor-primer-overview]] -== Overview - -In the original days of computers, electronic text was simple. There were a few character sets like ASCII or EBCDIC, but that was about it. Text was text, and what you saw really was what you got. No frills, no formatting, no intelligence. - -Inevitably, this was not enough. When text is in a machine-usable format, machines are expected to be able to use and manipulate it intelligently. Authors want to indicate that certain phrases should be emphasized, or added to a glossary, or made into hyperlinks. Filenames could be shown in a “typewriter” style font for viewing on screen, but as “italics” when printed, or any of a myriad of other options for presentation. - -It was once hoped that Artificial Intelligence (AI) would make this easy. The computer would read the document and automatically identify key phrases, filenames, text that the reader should type in, examples, and more. Unfortunately, real life has not happened quite like that, and computers still require assistance before they can meaningfully process text. - -More precisely, they need help identifying what is what. Consider this text: - -To remove [.filename]#/tmp/foo#, use man:rm[1]. - -[source,shell] ----- -% rm /tmp/foo ----- - -It is easy for the reader to see which parts are filenames, which are commands to be typed in, which parts are references to manual pages, and so on. But the computer processing the document cannot reliably determine this. For this we need markup. - - -The previous example is actually represented in this document like this: - -.... -To remove [.filename]#/tmp/foo#, use man:rm[1]. - -[source,shell] ----- -% rm /tmp/foo ----- -.... - -[[asciidoctor-headings]] -== Headings - -AsciiDoctor supports six headings levels. If the document type is `article` only one level 0 (`=`) can be used. If the document type is `book` then there can be multiple level 0 (`=`) headings. - -This is an example of headings in an `article`. - -.... -= Document Title (Level 0) - -== Level 1 Section Title - -=== Level 2 Section Title - -==== Level 3 Section Title - -===== Level 4 Section Title - -====== Level 5 Section Title - -== Another Level 1 Section Title -.... - -[WARNING] -==== -Section levels cannot be skipped when nesting sections. - -The following syntax is not correct. - -.... -= Document Title - -== Level 2 - -==== Level 4 -.... -==== - -[[asciidoctor-paragraphs]] -== Paragraphs - -Paragraphs don't require special markup in AsciiDoc. A paragraph is defined by one or more consecutive lines of text. To create a new paragraph leave one blank line. - -For example, this is a heading with two paragraphs. - -.... -= This is the heading - -This is the first paragraph. - -And this is the second paragraph. -.... - -[[asciidoctor-lists]] -== Lists - -AsciiDoctor supports two type of lists: ordered and unordered. To get more information about lists check link:https://docs.asciidoctor.org/asciidoc/latest/syntax-quick-reference/#lists[AsciiDoc Syntax Quick Reference] - -[[asciidoctor-ordered-lists]] -=== Ordered lists - -To create an ordered list use the `*` character. - -For example this is an ordered list. - -.... -* First item -* Second item -** Subsecond item -* Third item -.... - -And this would be rendered as. - -* First item -* Second item -** Subsecond item -* Third item - -[[asciidoctor-unordered-lists]] -=== Unordered lists - -To create an unordered list use the `.` character. - -For example this is an unordered list. - -.... -. First item -. Second item -.. Subsecond item -. Third item -.... - -And this would be rendered as. - -. First item -. Second item -.. Subsecond item -. Third item - -[[asciidoctor-links]] -== Links - -[[asciidoctor-links-external]] -=== External links - -To point to another website the `link` macro should be used. - -.... -link:https://www.FreeBSD.org[FreeBSD] -.... - -[NOTE] -==== -As the AsciiDoctor documentation describes, the `link` macro is not required when the target starts with a URL scheme like `https`. However, it is a good practice to do this anyway to ensure that AsciiDoctor renders the link correctly, especially in non-latin languages like Japanese. -==== - -[[asciidoctor-links-internal]] -=== Internal link - -To point to another book or article the AsciiDoctor variables should be used. For example, if we are in the `cups` article and we want to point to `ipsec-must` these steps should be used. - -. Include the [.filename]#urls.adoc# file from [.filename]#~/doc/shared# folder. -+ -.... -\include::shared/{lang}/urls.adoc[] -.... -+ -. Then create a link using the AsciiDoctor variable to the `ipsec-must` article. -+ -.... -link:{ipsec-must}[IPSec-Must article] -.... -+ -And this would be rendered as. -+ -link:{ipsec-must}[IPSec-Must article] - -[[asciidoctor-conclusion]] -== Conclusion - -This is the conclusion of this AsciiDoctor primer. For reasons of space and complexity, several things have not been covered in depth (or at all). diff --git a/documentation/content/en/books/fdp-primer/book.adoc b/documentation/content/en/books/fdp-primer/book.adoc new file mode 100644 index 0000000000..b12b59b48e --- /dev/null +++ b/documentation/content/en/books/fdp-primer/book.adoc @@ -0,0 +1,114 @@ +--- +title: FreeBSD Documentation Project Primer for New Contributors +authors: + - author: The FreeBSD Documentation Project +copyright: 1998-2021 DocEng +trademarks: ["general"] +--- + += FreeBSD Documentation Project Primer for New Contributors +:doctype: book +:toc: macro +:toclevels: 2 +:icons: font +:xrefstyle: basic +:relfileprefix: ../ +:outfilesuffix: +:sectnums: +:sectnumlevels: 6 +:partnums: +:chapter-signifier: Chapter +:part-signifier: Part +:source-highlighter: rouge +:experimental: +:skip-front-matter: +:book: true +:pdf: false + +ifeval::["{backend}" == "html5"] +include::shared/mirrors.adoc[] +include::shared/authors.adoc[] +include::shared/releases.adoc[] +include::shared/en/mailing-lists.adoc[] +include::shared/en/teams.adoc[] +include::shared/en/urls.adoc[] +:chapters-path: content/en/books/fdp-primer/ +endif::[] + +ifeval::["{backend}" == "pdf"] +include::../../../../shared/mirrors.adoc[] +include::../../../../shared/authors.adoc[] +include::../../../../shared/releases.adoc[] +include::../../../../shared/en/mailing-lists.adoc[] +include::../../../../shared/en/teams.adoc[] +include::../../../../shared/en/urls.adoc[] +:chapters-path: +endif::[] + +ifeval::["{backend}" == "epub3"] +include::../../../../shared/mirrors.adoc[] +include::../../../../shared/authors.adoc[] +include::../../../../shared/releases.adoc[] +include::../../../../shared/en/mailing-lists.adoc[] +include::../../../../shared/en/teams.adoc[] +include::../../../../shared/en/urls.adoc[] +:chapters-path: +endif::[] + +[.abstract-title] +[abstract] +Abstract + +Thank you for becoming a part of the FreeBSD Documentation Project. Your contribution is extremely valuable, and we appreciate it. + +This primer covers details needed to start contributing to the FreeBSD Documentation Project, or FDP, including tools, software, and the philosophy behind the Documentation Project. + +This is a work in progress. Corrections and additions are always welcome. + +''' + +toc::[] + +include::content/en/books/fdp-primer/toc-figures.adoc[] + +include::content/en/books/fdp-primer/toc-tables.adoc[] + +include::content/en/books/fdp-primer/toc-examples.adoc[] + +:sectnums!: + +include::{chapters-path}preface/_index.adoc[leveloffset=+1, lines=7..-1] + +:sectnums: + +include::{chapters-path}overview/_index.adoc[leveloffset=+1, lines=7..21; 25..-1] + +include::{chapters-path}tools/_index.adoc[leveloffset=+1, lines=7..21; 25..-1] + +include::{chapters-path}working-copy/_index.adoc[leveloffset=+1, lines=7..21; 25..-1] + +include::{chapters-path}structure/_index.adoc[leveloffset=+1, lines=7..21; 25..-1] + +include::{chapters-path}doc-build/_index.adoc[leveloffset=+1, lines=7..21; 25..-1] + +include::{chapters-path}asciidoctor-primer/_index.adoc[leveloffset=+1, lines=7..21; 27..-1] + +include::{chapters-path}rosetta/_index.adoc[leveloffset=+1, lines=7..21; 25..-1] + +include::{chapters-path}translations/_index.adoc[leveloffset=+1, lines=7..21; 28..-1] + +include::{chapters-path}po-translations/_index.adoc[leveloffset=+1, lines=7..21; 27..-1] + +include::{chapters-path}manual-pages/_index.adoc[leveloffset=+1, lines=7..21; 25..-1] + +include::{chapters-path}writing-style/_index.adoc[leveloffset=+1, lines=7..21; 27..-1] + +include::{chapters-path}editor-config/_index.adoc[leveloffset=+1, lines=7..21; 25..-1] + +include::{chapters-path}see-also/_index.adoc[leveloffset=+1, lines=7..21; 27..-1] + +:sectnums!: + +include::{chapters-path}examples/_index.adoc[leveloffset=+1, lines=6..21; 25..-1] + +:sectnums: diff --git a/documentation/content/en/books/fdp-primer/chapters-order.adoc b/documentation/content/en/books/fdp-primer/chapters-order.adoc index e0693a8503..e351e05521 100644 --- a/documentation/content/en/books/fdp-primer/chapters-order.adoc +++ b/documentation/content/en/books/fdp-primer/chapters-order.adoc @@ -1,15 +1,15 @@ -preface/chapter.adoc -overview/chapter.adoc -tools/chapter.adoc -working-copy/chapter.adoc -structure/chapter.adoc -doc-build/chapter.adoc -asciidoctor-primer/chapter.adoc -rosetta/chapter.adoc -translations/chapter.adoc -po-translations/chapter.adoc -manual-pages/chapter.adoc -writing-style/chapter.adoc -editor-config/chapter.adoc -see-also/chapter.adoc -examples/chapter.adoc +preface/_index.adoc +overview/_index.adoc +tools/_index.adoc +working-copy/_index.adoc +structure/_index.adoc +doc-build/_index.adoc +asciidoctor-primer/_index.adoc +rosetta/_index.adoc +translations/_index.adoc +po-translations/_index.adoc +manual-pages/_index.adoc +writing-style/_index.adoc +editor-config/_index.adoc +see-also/_index.adoc +examples/_index.adoc diff --git a/documentation/content/en/books/fdp-primer/doc-build/chapter.adoc b/documentation/content/en/books/fdp-primer/doc-build/_index.adoc similarity index 93% rename from documentation/content/en/books/fdp-primer/doc-build/chapter.adoc rename to documentation/content/en/books/fdp-primer/doc-build/_index.adoc index 13ceb60f53..04a3398b20 100644 --- a/documentation/content/en/books/fdp-primer/doc-build/chapter.adoc +++ b/documentation/content/en/books/fdp-primer/doc-build/_index.adoc @@ -45,7 +45,8 @@ Different types of output can be produced from a single AsciiDoc source file. |`epub` |EPUB -|Electronic Publication. ePub file format. +|Electronic Publication. +ePub file format. |=== [[doc-build-rendering-html]] @@ -123,7 +124,8 @@ There are three [.filename]#Makefile# files for building some or all of the docu * The [.filename]#Makefile# in the [.filename]#website# directory will build only the website. * The [.filename]#Makefile# at the top of the tree will build both the documentation and the website. -The [.filename]#Makefile# appearing in subdirectories also support `make run` to serve built content with Hugo's internal webserver. This webserver runs on port 1313 by default. +The [.filename]#Makefile# appearing in subdirectories also support `make run` to serve built content with Hugo's internal webserver. +This webserver runs on port 1313 by default. [[documentation-makefile]] === Documentation Makefile @@ -152,6 +154,14 @@ MAINTAINER=carlavilla@FreeBSD.org <.> PYTHON_CMD = /usr/local/bin/python3 <.> HUGO_CMD = /usr/local/bin/hugo <.> LANGUAGES = en,es,pt_BR,de,ja,zh_CN,zh_TW,ru,el,hu,it,mn,nl,pl,fr <.> +RUBYLIB = ../shared/lib +.export RUBYLIB + +.ifndef HOSTNAME +.HOST+=localhost +.else +.HOST+=$(HOSTNAME) +.endif .ORDER: all run<.> @@ -174,7 +184,7 @@ generate-books-toc: .PHONY <.> ${PYTHON_CMD} ./tools/books-toc-examples-creator.py -l ${LANGUAGES} run: .PHONY <.> - ${HUGO_CMD} server -D + ${HUGO_CMD} server -D --baseURL="http://$(.HOST):1313" build: .PHONY <.> ${HUGO_CMD} --minify @@ -217,6 +227,14 @@ MAINTAINER=carlavilla@FreeBSD.org <.> PYTHON_CMD = /usr/local/bin/python3 <.> HUGO_CMD = /usr/local/bin/hugo <.> +RUBYLIB = ../shared/lib +.export RUBYLIB + +.ifndef HOSTNAME +.HOST+=localhost +.else +.HOST+=$(HOSTNAME) +.endif .ORDER: all run<.> @@ -235,7 +253,7 @@ generate-releases: .PHONY <.> ${PYTHON_CMD} ./tools/releases-toml.py -p ./shared/releases.adoc run: .PHONY <.> - ${HUGO_CMD} server -D + ${HUGO_CMD} server -D --baseURL="http://$(.HOST):1313" build: .PHONY <.> ${HUGO_CMD} @@ -247,6 +265,7 @@ build: .PHONY <.> <.> `.ORDER` directives are used to ensure multiple make jobs may run without problem. <.> `all` target builds the website and puts the result in [.filename]#~/doc/website/public#. <.> `starting-message` shows a message in the CLI to show the user that the process is running. -<.> `generate-releases` calls the script used to convert from AsciiDoc variables to TOML variables. With this conversion, the releases variables can be used in AsciiDoc and in the Hugo custom templates. +<.> `generate-releases` calls the script used to convert from AsciiDoc variables to TOML variables. +With this conversion, the releases variables can be used in AsciiDoc and in the Hugo custom templates. <.> `run` runs hugo webserver on port 1313, or a random free port if that is already in use. <.> `build` builds the website and puts the result in the [.filename]#~/doc/website/public#. diff --git a/documentation/content/en/books/fdp-primer/editor-config/chapter.adoc b/documentation/content/en/books/fdp-primer/editor-config/_index.adoc similarity index 92% rename from documentation/content/en/books/fdp-primer/editor-config/chapter.adoc rename to documentation/content/en/books/fdp-primer/editor-config/_index.adoc index 0e8f4405c6..5f184292dd 100644 --- a/documentation/content/en/books/fdp-primer/editor-config/chapter.adoc +++ b/documentation/content/en/books/fdp-primer/editor-config/_index.adoc @@ -32,7 +32,8 @@ Install from package:editors/vim[], package:editors/vim-console[], or package:ed [[editor-config-vim-use]] === Use -Press kbd:[P] to reformat paragraphs or text that has been selected in Visual mode. Press kbd:[T] to replace groups of eight spaces with a tab. +Press kbd:[P] to reformat paragraphs or text that has been selected in Visual mode. +Press kbd:[T] to replace groups of eight spaces with a tab. [[editor-config-vim-config]] === Configuration @@ -89,7 +90,9 @@ Install from package:editors/emacs[] or package:editors/emacs-devel[]. [[editor-config-emacs-validation]] === Validation -Emacs's nxml-mode uses compact relax NG schemas for validating XML. A compact relax NG schema for FreeBSD's extension to DocBook 5.0 is included in the documentation repository. To configure nxml-mode to validate using this schema, create [.filename]#~/.emacs.d/schema/schemas.xml# and add these lines to the file: +Emacs's nxml-mode uses compact relax NG schemas for validating XML. +A compact relax NG schema for FreeBSD's extension to DocBook 5.0 is included in the documentation repository. +To configure nxml-mode to validate using this schema, create [.filename]#~/.emacs.d/schema/schemas.xml# and add these lines to the file: .... locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0" @@ -104,7 +107,8 @@ locatingRules [[editor-config-emacs-igor]] === Automated Proofreading with Flycheck and Igor -The Flycheck package is available from Milkypostman's Emacs Lisp Package Archive (MELPA). If MELPA is not already in Emacs's packages-archives, it can be added by evaluating +The Flycheck package is available from Milkypostman's Emacs Lisp Package Archive (MELPA). +If MELPA is not already in Emacs's packages-archives, it can be added by evaluating .... (add-to-list 'package-archives '("melpa" . "http://stable.melpa.org/packages/") t) diff --git a/documentation/content/en/books/fdp-primer/examples/chapter.adoc b/documentation/content/en/books/fdp-primer/examples/_index.adoc similarity index 86% rename from documentation/content/en/books/fdp-primer/examples/chapter.adoc rename to documentation/content/en/books/fdp-primer/examples/_index.adoc index fe89666d66..65a97518ef 100644 --- a/documentation/content/en/books/fdp-primer/examples/chapter.adoc +++ b/documentation/content/en/books/fdp-primer/examples/_index.adoc @@ -22,7 +22,8 @@ prev: books/fdp-primer/see-also/ toc::[] -These examples are not exhaustive - they do not contain all the elements that might be desirable to use, particularly in a document's front matter. For more examples of AsciiDoctor, examine the AsciiDoc source for this and other documents available in the Git `doc` repository, or available online starting at link:https://cgit.freebsd.org/doc/[https://cgit.freebsd.org/doc/]. +These examples are not exhaustive - they do not contain all the elements that might be desirable to use, particularly in a document's front matter. +For more examples of AsciiDoctor, examine the AsciiDoc source for this and other documents available in the Git `doc` repository, or available online starting at link:https://cgit.freebsd.org/doc/[https://cgit.freebsd.org/doc/]. [[examples-asciidoctor-book]] == AsciiDoctor `book` @@ -110,7 +111,7 @@ authors: trademarks: ["general"] --- -= An Example Article +\= An Example Article :doctype: article :toc: macro :toclevels: 1 @@ -124,11 +125,11 @@ trademarks: ["general"] toc::[] -== My First Section +\== My First Section This is the first section in my article. -== My First Sub-Section +\== My First Sub-Section This is the first sub-section in my article. diff --git a/documentation/content/en/books/fdp-primer/manual-pages/chapter.adoc b/documentation/content/en/books/fdp-primer/manual-pages/_index.adoc similarity index 65% rename from documentation/content/en/books/fdp-primer/manual-pages/chapter.adoc rename to documentation/content/en/books/fdp-primer/manual-pages/_index.adoc index 46b770a624..057e965a9d 100644 --- a/documentation/content/en/books/fdp-primer/manual-pages/chapter.adoc +++ b/documentation/content/en/books/fdp-primer/manual-pages/_index.adoc @@ -25,16 +25,20 @@ toc::[] [[manual-pages-introduction]] == Introduction -_Manual pages_, commonly shortened to _man pages_, were conceived as readily-available reminders for command syntax, device driver details, or configuration file formats. They have become an extremely valuable quick-reference from the command line for users, system administrators, and programmers. +_Manual pages_, commonly shortened to _man pages_, were conceived as readily-available reminders for command syntax, device driver details, or configuration file formats. +They have become an extremely valuable quick-reference from the command line for users, system administrators, and programmers. Although intended as reference material rather than tutorials, the EXAMPLES sections of manual pages often provide detailed use case. -Manual pages are generally shown interactively by the man:man[1] command. When the user types `man ls`, a search is performed for a manual page matching `ls`. The first matching result is displayed. +Manual pages are generally shown interactively by the man:man[1] command. +When the user types `man ls`, a search is performed for a manual page matching `ls`. +The first matching result is displayed. [[manual-pages-sections]] == Sections -Manual pages are grouped into _sections_. Each section contains manual pages for a specific category of documentation: +Manual pages are grouped into _sections_. +Each section contains manual pages for a specific category of documentation: [.informaltable] [cols="1,8", options="header"] @@ -74,16 +78,25 @@ Manual pages are grouped into _sections_. Each section contains manual pages for [[manual-pages-markup]] == Markup -Various markup forms and rendering programs have been used for manual pages. FreeBSD has used man:groff[7] and the newer man:mandoc[1]. Most existing FreeBSD manual pages, and all new ones, use the man:mdoc[7] form of markup. This is a simple line-based markup that is reasonably expressive. It is mostly semantic: parts of text are marked up for what they are, rather than for how they should appear when rendered. There is some appearance-based markup which is usually best avoided. +Various markup forms and rendering programs have been used for manual pages. +FreeBSD has used man:groff[7] and the newer man:mandoc[1]. +Most existing FreeBSD manual pages, and all new ones, use the man:mdoc[7] form of markup. +This is a simple line-based markup that is reasonably expressive. +It is mostly semantic: parts of text are marked up for what they are, rather than for how they should appear when rendered. +There is some appearance-based markup which is usually best avoided. -Manual page source is usually interpreted and displayed to the screen interactively. The source files can be ordinary text files or compressed with man:gzip[1] to save space. +Manual page source is usually interpreted and displayed to the screen interactively. +The source files can be ordinary text files or compressed with man:gzip[1] to save space. -Manual pages can also be rendered to other formats, including PostScript for printing or PDF generation. See man:man[1]. +Manual pages can also be rendered to other formats, including PostScript for printing or PDF generation. +See man:man[1]. [[manual-pages-markup-sections]] === Manual Page Sections -Manual pages are composed of several standard sections. Each section has a title in upper case, and the sections for a particular type of manual page appear in a specific order. For a category 1 General Command manual page, the sections are: +Manual pages are composed of several standard sections. +Each section has a title in upper case, and the sections for a particular type of manual page appear in a specific order. +For a category 1 General Command manual page, the sections are: [.informaltable] [cols="2,4", options="header"] @@ -129,12 +142,15 @@ Manual pages are composed of several standard sections. Each section has a title |People who created the command or wrote the manual page. |=== -Some sections are optional, and the combination of sections for a specific type of manual page vary. Examples of the most common types are shown later in this chapter. +Some sections are optional, and the combination of sections for a specific type of manual page vary. +Examples of the most common types are shown later in this chapter. [[manual-pages-markup-macros]] === Macros *** 1601 LINES SKIPPED *** From owner-dev-commits-doc-all@freebsd.org Sat Apr 10 14:46:08 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B766E5CE4DC for ; Sat, 10 Apr 2021 14:46: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FHd9D4np1z3QQg; Sat, 10 Apr 2021 14:46:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9370E13512; Sat, 10 Apr 2021 14:46:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13AEk87V008497; Sat, 10 Apr 2021 14:46:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13AEk8qJ008496; Sat, 10 Apr 2021 14:46:08 GMT (envelope-from git) Date: Sat, 10 Apr 2021 14:46:08 GMT Message-Id: <202104101446.13AEk8qJ008496@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Sergio Carlavilla Delgado Subject: git: a237bc3c64 - main - Fix outdated information in FDP 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: a237bc3c647392fee48479ddf67a6b86c2677f4a Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Apr 2021 14:46:08 -0000 The branch main has been updated by carlavilla: URL: https://cgit.FreeBSD.org/doc/commit/?id=a237bc3c647392fee48479ddf67a6b86c2677f4a commit a237bc3c647392fee48479ddf67a6b86c2677f4a Author: Sergio Carlavilla Delgado AuthorDate: 2021-04-10 14:44:30 +0000 Commit: Sergio Carlavilla Delgado CommitDate: 2021-04-10 14:44:30 +0000 Fix outdated information in FDP Submitted by: dbaio@ Approved by: bcr@, crees@, gjb@ Differential Revision: https://reviews.freebsd.org/D29573 --- .../fdp-primer/asciidoctor-primer/_index.adoc | 2 +- .../en/books/fdp-primer/doc-build/_index.adoc | 17 +++- .../en/books/fdp-primer/overview/_index.adoc | 2 +- .../books/fdp-primer/po-translations/_index.adoc | 102 +++++++++++---------- .../en/books/fdp-primer/translations/_index.adoc | 15 +-- .../en/books/fdp-primer/working-copy/_index.adoc | 7 +- 6 files changed, 82 insertions(+), 63 deletions(-) diff --git a/documentation/content/en/books/fdp-primer/asciidoctor-primer/_index.adoc b/documentation/content/en/books/fdp-primer/asciidoctor-primer/_index.adoc index 947a42ca45..6f689de0d1 100644 --- a/documentation/content/en/books/fdp-primer/asciidoctor-primer/_index.adoc +++ b/documentation/content/en/books/fdp-primer/asciidoctor-primer/_index.adoc @@ -133,7 +133,7 @@ And this is the second paragraph. == Lists AsciiDoctor supports two type of lists: ordered and unordered. -To get more information about lists check link:https://docs.asciidoctor.org/asciidoc/latest/syntax-quick-reference/#lists[AsciiDoc Syntax Quick Reference] +To get more information about lists check link:https://docs.asciidoctor.org/asciidoc/latest/syntax-quick-reference/#lists[AsciiDoc Syntax Quick Reference]. [[asciidoctor-ordered-lists]] === Ordered lists diff --git a/documentation/content/en/books/fdp-primer/doc-build/_index.adoc b/documentation/content/en/books/fdp-primer/doc-build/_index.adoc index 04a3398b20..83dc26045a 100644 --- a/documentation/content/en/books/fdp-primer/doc-build/_index.adoc +++ b/documentation/content/en/books/fdp-primer/doc-build/_index.adoc @@ -92,15 +92,26 @@ To render the documentation and the website to `html` use one of the following e To generate a document in `pdf` format use this command. In this example the English Handbook will be used. -In order to export the document correctly all the extensions should be passed used the `-r` argument. +In order to export the document correctly all the extensions should be passed using the `-r` argument. [[document-pdf-example]] -.Build the entire documentation project +.Build a document in pdf [example] ==== [source,shell] .... -asciidoctor-pdf -r ./shared/lib/man-macro.rb -r ./shared/lib/git-macro.rb -r ./shared/lib/packages-macro.rb -r ./shared/lib/inter-document-references-macro.rb -r ./shared/lib/sectnumoffset-treeprocessor.rb --doctype=book -a skip-front-matter -a pdf-theme=./themes/default-pdf-theme.yml content/en/books/handbook/book.adoc +% cd ~/doc/documentation +% asciidoctor-pdf \ + -r ./shared/lib/man-macro.rb \ + -r ./shared/lib/git-macro.rb \ + -r ./shared/lib/packages-macro.rb \ + -r ./shared/lib/inter-document-references-macro.rb \ + -r ./shared/lib/sectnumoffset-treeprocessor.rb \ + --doctype=book \ + -a skip-front-matter \ + -a pdf-theme=./themes/default-pdf-theme.yml \ + -o /tmp/handbook.pdf + content/en/books/handbook/book.adoc .... ==== diff --git a/documentation/content/en/books/fdp-primer/overview/_index.adoc b/documentation/content/en/books/fdp-primer/overview/_index.adoc index dbb08df9ce..ba37cba76e 100644 --- a/documentation/content/en/books/fdp-primer/overview/_index.adoc +++ b/documentation/content/en/books/fdp-primer/overview/_index.adoc @@ -80,7 +80,7 @@ Repeat until all of the errors are resolved. + [source,shell] .... -make +% make .... + . When changes are complete and tested, generate a "diff file": 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 d3625a19ff..c160fbd9cb 100644 --- a/documentation/content/en/books/fdp-primer/po-translations/_index.adoc +++ b/documentation/content/en/books/fdp-primer/po-translations/_index.adoc @@ -49,8 +49,7 @@ This example shows the creation of a Spanish translation of the short link:{leap + [source,shell] .... -# cd /usr/ports/editors/poedit -# make install clean +# pkg install poedit .... ==== @@ -61,22 +60,22 @@ This example shows the creation of a Spanish translation of the short link:{leap When a new translation is first created, the directory structure must be created or copied from the English original: -. Create a directory for the new translation. +. Create a directory for the new translation. The English article source is in [.filename]#~/doc/documentation/content/en/articles/leap-seconds/#. The Spanish translation will go in [.filename]#~/doc/documentation/content/es/articles/leap-seconds/#. The path is the same except for the name of the language directory. The English article source is in [.filename]#~/doc/en/articles/leap-seconds/#. The Spanish translation will go in [.filename]#~/doc/es/articles/leap-seconds/#. The path is the same except for the name of the language directory. + [source,shell] .... -% mkdir ~/doc/es/articles/leap-seconds/ +% mkdir ~/doc/documentation/content/es/articles/leap-seconds .... . Copy the [.filename]#_index.adoc# from the original document into the translation directory: + [source,shell] .... -% cp ~/doc/en/articles/leap-seconds/_index.adoc \ - ~/doc/es/articles/leap-seconds/ +% cp ~/doc/documentation/content/en/articles/leap-seconds/_index.adoc \ + ~/doc/documentation/content/es/articles/leap-seconds/ .... ==== @@ -92,18 +91,23 @@ These steps are repeated until the translator feels that enough of the document + [source,shell] .... -% cd ~/doc/es/articles/leap-seconds/ -% po4a-gettextize --format asciidoc --master _index.adoc --master-charset "UTF-8" >> es.pot +% cd ~/doc +% po4a-gettextize \ + --format asciidoc \ + --option compat=asciidoctor \ + --option yfm_keys=title,part \ + --master "documentation/content/en/articles/leap-seconds/_index.adoc" \ + --master-charset "UTF-8" \ + --copyright-holder "The FreeBSD Project" \ + --package-name "FreeBSD Documentation" \ + --po "documentation/content/es/articles/leap-seconds/_index.po" .... + . Use a PO editor to enter translations in the PO file. There are several different editors available. [.filename]#poedit# from package:editors/poedit[] is shown here. + -The PO file name is the language region code. -For Spanish, the file name is [.filename]#es.po#. -+ [source,shell] .... -% poedit es.po +% poedit documentation/content/es/articles/leap-seconds/_index.po .... ==== @@ -115,8 +119,17 @@ For Spanish, the file name is [.filename]#es.po#. + [source,shell] .... -% cd ~/doc/es/articles/leap-seconds/ -% po4a-translate -f asciidoc -m document.po -l document.po --keep 0 -p es.po -M UTF-8 +% cd ~/doc +% po4a-translate \ + --format asciidoc \ + --option compat=asciidoctor \ + --option yfm_keys=title,part \ + --master "documentation/content/en/articles/leap-seconds/_index.adoc" \ + --master-charset "UTF-8" \ + --po "documentation/content/es/articles/leap-seconds/_index.po" \ + --localized "documentation/content/es/articles/leap-seconds/_index.adoc" \ + --localized-charset "UTF-8" \ + --keep 0 .... + The name of the generated document matches the name of the English original, usually [.filename]#_index.adoc#. @@ -125,6 +138,7 @@ The name of the generated document matches the name of the English original, usu + [source,shell] .... +% cd ~/doc/documentation % make .... ==== @@ -143,113 +157,94 @@ _lang_ is a two-character lowercase code. | Language | Region | Translated Directory Name -| PO File Name |English |United States |[.filename]#en# -|[.filename]#en.po# |Bengali |Bangladesh |[.filename]#bn# -|[.filename]#bn.po# |Danish |Denmark |[.filename]#da# -|[.filename]#da.po# |German |Germany |[.filename]#de# -|[.filename]#de.po# |Greek |Greece |[.filename]#el# -|[.filename]#el.po# |Spanish |Spain |[.filename]#es# -|[.filename]#es.po# |French |France |[.filename]#fr# -|[.filename]#fr.po# |Hungarian |Hungary |[.filename]#hu# -|[.filename]#hu.po# |Italian |Italy |[.filename]#it# -|[.filename]#it.po# |Japanese |Japan |[.filename]#ja# -|[.filename]#ja.po# |Korean |Korea |[.filename]#ko# -|[.filename]#ko.po# |Mongolian |Mongolia |[.filename]#mn# -|[.filename]#mn.po# |Dutch |Netherlands |[.filename]#nl# -|[.filename]#nl.po# |Polish |Poland |[.filename]#pl# -|[.filename]#pl.po# |Portuguese |Brazil |[.filename]#pt-br# -|[.filename]#pt-br.po# |Russian |Russia |[.filename]#ru# -|[.filename]#ru.po# |Turkish |Turkey |[.filename]#tr# -|[.filename]#tr.po# |Chinese |China |[.filename]#zh-cn# -|[.filename]#zh-cn.po# |Chinese |Taiwan |[.filename]#zh-tw# -|[.filename]#zh-tw.po# |=== The translations are in subdirectories of the main documentation directory, -here assumed to be [.filename]#~/doc/# as shown in crossref:overview[overview-quick-start,Quick Start]. -For example, German translations are located in [.filename]#~/doc/de/#, and French translations are in [.filename]#~/doc/fr/#. +here assumed to be [.filename]#~/doc/documentation/# as shown in <>. +For example, German translations are located in [.filename]#~/doc/documentation/content/de/#, +and French translations are in [.filename]#~/doc/documentation/content/fr/#. Each language directory contains separate subdirectories named for the type of documents, usually [.filename]#articles/# and [.filename]#books/#. Combining these directory names gives the complete path to an article or book. -For example, the French translation of the NanoBSD article is in [.filename]#~/doc/fr/articles/nanobsd/#, -and the Mongolian translation of the Handbook is in [.filename]#~/doc/mn/books/handbook/#. +For example, the French translation of the NanoBSD article is in [.filename]#~/doc/documentation/content/fr/articles/nanobsd/#, +and the Mongolian translation of the Handbook is in [.filename]#~/doc/documentation/content/mn/books/handbook/#. A new language directory must be created when translating a document to a new language. If the language directory already exists, only a subdirectory in the [.filename]#articles/# or [.filename]#books/# directory is needed. @@ -259,16 +254,16 @@ If the language directory already exists, only a subdirectory in the [.filename] [example] ==== Create a new Spanish translation of the link:{porters-handbook}[Porter's Handbook]. -The original is a book in [.filename]#~/doc/en/books/porters-handbook/#. +The original is a book in [.filename]#~/doc/documentation/content/en/books/porters-handbook/#. [.procedure] ====== -. The Spanish language books directory [.filename]#~/doc/es/books/# already exists, so only a new subdirectory for the Porter's Handbook is needed: +. The Spanish language books directory [.filename]#~/doc/documentation/content/es/books/# already exists, so only a new subdirectory for the Porter's Handbook is needed: + [source,shell] .... -% cd ~/doc/es/books/ +% cd ~/doc/documentation/content/es/books % mkdir porters-handbook .... @@ -276,8 +271,8 @@ The original is a book in [.filename]#~/doc/en/books/porters-handbook/#. + [source,shell] .... -% cd ~/doc/es/books/porters-handbook -% cp ~/doc/en/books/porters-handbook/ . +% cd porters-handbook +% cp -R ~/doc/documentation/content/en/books/porters-handbook/* . .... + Now the document structure is ready for the translator to begin translating with `po4a` command. @@ -305,26 +300,35 @@ It contains all of the work that translators have done. .Translating the Porter's Handbook to Spanish [example] ==== -Enter Spanish translations of the contents of the Porter's Handbook. [.procedure] ====== -. Change to the Spanish Porter's Handbook directory and update the PO file. The generated PO file is called [.filename]#es_ES.po# as shown in <>. +. Change to the base directory and update all PO files. + [source,shell] .... -% cd ~/doc/es/books/porters-handbook -% po4a-gettextize --format asciidoc --master _index.adoc --master-charset "UTF-8" >> es.pot +% cd ~/doc +% po4a-gettextize \ + --format asciidoc \ + --option compat=asciidoctor \ + --option yfm_keys=title,part \ + --master "documentation/content/en/books/porters-handbook/_index.adoc" \ + --master-charset "UTF-8" \ + --copyright-holder "The FreeBSD Project" \ + --package-name "FreeBSD Documentation" \ + --po "documentation/content/es/books/porters-handbook/_index.po" .... . Enter translations using a PO editor: + [source,shell] .... -% poedit es.pot +% poedit documentation/content/es/books/porters-handbook/_index.po .... ====== +These steps are necessary for all `.adoc` files, excluding `chapters-order.adoc` and `toc-*.adoc`. + ==== [[po-translations-tips]] @@ -407,7 +411,7 @@ The diff files created by these examples can be attached to a https://bugs.freeb [source,shell] .... % cd ~/doc -% git diff es/articles/nanobsd/ > /tmp/es_nanobsd.diff +% git diff documentation/content/es/articles/nanobsd/ > /tmp/es_nanobsd.diff .... ====== diff --git a/documentation/content/en/books/fdp-primer/translations/_index.adoc b/documentation/content/en/books/fdp-primer/translations/_index.adoc index f300e85085..c257293d6a 100644 --- a/documentation/content/en/books/fdp-primer/translations/_index.adoc +++ b/documentation/content/en/books/fdp-primer/translations/_index.adoc @@ -65,10 +65,10 @@ This can be done by running: [source,shell] .... -% git clone https://cgit.FreeBSD.org/doc.git ~/doc +% git clone https://git.FreeBSD.org/doc.git ~/doc .... -https://cgit.FreeBSD.org/[cgit.FreeBSD.org] is a public `git` server. +https://git.FreeBSD.org/[git.FreeBSD.org] is a public `git` server. [NOTE] ==== @@ -78,14 +78,14 @@ This will require the package:git-lite[] package to be installed. You should be comfortable using git. This will allow you to see what has changed between different versions of the files that make up the documentation. -For example, to view the differences between revisions `832fed5c` and `11cd6edd` run: +For example, to view the differences between revisions `abff932fe8` and `2191c44469` of [.filename]#documentation/content/en/articles/committers-guide/_index.adoc#, run: [source,shell] .... -% git diff 832fed5c..11cd6edd +% git diff abff932fe8 2191c44469 documentation/content/en/articles/committers-guide/_index.adoc .... -Please see the complete explanation of using Git in FreeBSD in the link:{committers-guide}#git-primer[Git Primer]. +Please see the complete explanation of using Git in FreeBSD in the link:{handbook}mirrors/#git[FreeBSD Handbook]. == How do I find out who else might be translating to the same language? @@ -131,6 +131,9 @@ Hugo need the language codes in lowercase. For example, instead of `pt_BR` Hugo uses `pt-br`. ==== +Currently, the FreeBSD documentation is stored in a top level directory called [.filename]#documentation/#. +Directories below this are named according to the language code they are written in, as defined in ISO639 ([.filename]#/usr/share/misc/iso639# on a version of FreeBSD newer than 20th January 1999). + If your language can be encoded in different ways (for example, Chinese) then there should be directories below this, one for each encoding format you have provided. Finally, you should have directories for each document. @@ -144,7 +147,7 @@ documentation/ sv/ books/ faq/ - book.adoc + _index.adoc .... `sv` is the name of the translation, in [.filename]#lang# form. diff --git a/documentation/content/en/books/fdp-primer/working-copy/_index.adoc b/documentation/content/en/books/fdp-primer/working-copy/_index.adoc index facb05af1d..b6375a6e55 100644 --- a/documentation/content/en/books/fdp-primer/working-copy/_index.adoc +++ b/documentation/content/en/books/fdp-primer/working-copy/_index.adoc @@ -82,7 +82,8 @@ To update the local version with the changes that have been made to the main rep [source,shell] .... -% git pull ~/doc +% cd ~/doc +% git pull --ff-only .... Get in the protective habit of using `git pull` before editing document files. @@ -110,7 +111,7 @@ These _diff_ files are produced by redirecting the output of `git diff` into a f [source,shell] .... % cd ~/doc -% git diff doc-fix-spelling.diff +% git diff > doc-fix-spelling.diff .... Give the file a meaningful name that identifies the contents. @@ -124,7 +125,7 @@ If there are files in the working copy with edits that are not ready to be submi [source,shell] .... % cd ~/doc -% git diff disks/_index.adoc printers/_index.adoc disks-printers.diff +% git diff disks/_index.adoc printers/_index.adoc > disks-printers.diff .... [[working-copy-git-references]] From owner-dev-commits-doc-all@freebsd.org Sat Apr 10 21:21:58 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1354D5D893C for ; Sat, 10 Apr 2021 21:21: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FHnxy04q8z4StL; Sat, 10 Apr 2021 21:21:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E9F66182BD; Sat, 10 Apr 2021 21:21:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13ALLvWJ034582; Sat, 10 Apr 2021 21:21:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13ALLvAH034581; Sat, 10 Apr 2021 21:21:57 GMT (envelope-from git) Date: Sat, 10 Apr 2021 21:21:57 GMT Message-Id: <202104102121.13ALLvAH034581@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: =?utf-8?B?RmVybmFuZG8gQXBlc3RlZ3XDrWE=?= Subject: git: 0a8625aacc - main - [committers-guide] Add missing word MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a8625aacc5617be03cb50fea39c9eab600495af Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Apr 2021 21:21:58 -0000 The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/doc/commit/?id=0a8625aacc5617be03cb50fea39c9eab600495af commit 0a8625aacc5617be03cb50fea39c9eab600495af Author: Fernando Apesteguía AuthorDate: 2021-04-10 10:59:50 +0000 Commit: Fernando Apesteguía CommitDate: 2021-04-10 19:18:58 +0000 [committers-guide] Add missing word In section 5.8 Collaborating with others. Approved by: gbe Differential Revision: https://reviews.freebsd.org/D29693 --- documentation/content/en/articles/committers-guide/_index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 11af4b0088..19b83c68bb 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -2051,7 +2051,7 @@ github git@github.com:gvnn3/freebsd-src.git (push) freebsd https://git.freebsd.org/src.git (fetch) freebsd ssh://git@gitrepo.freebsd.org/src.git (push) .... -With this in place you can create a <> +With this in place you can create a branch <> [source,shell] .... From owner-dev-commits-doc-all@freebsd.org Sun Apr 11 02:40:35 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 089475DF7AE for ; Sun, 11 Apr 2021 02:40:35 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FHx1Z6nTBz4gpS; Sun, 11 Apr 2021 02:40:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DBDC31C350; Sun, 11 Apr 2021 02:40:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13B2eYK3054630; Sun, 11 Apr 2021 02:40:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13B2eYG2054629; Sun, 11 Apr 2021 02:40:34 GMT (envelope-from git) Date: Sun, 11 Apr 2021 02:40:34 GMT Message-Id: <202104110240.13B2eYG2054629@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Ryusuke SUZUKI Subject: git: 8b5b3a1ed3 - main - 0b689624bb -> 3b4e46a064 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ryusuke X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b5b3a1ed3a6fb4ef71dde647a871ab1b3da94c9 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Apr 2021 02:40:35 -0000 The branch main has been updated by ryusuke: URL: https://cgit.FreeBSD.org/doc/commit/?id=8b5b3a1ed3a6fb4ef71dde647a871ab1b3da94c9 commit 8b5b3a1ed3a6fb4ef71dde647a871ab1b3da94c9 Author: Ryusuke SUZUKI AuthorDate: 2021-04-11 02:40:12 +0000 Commit: Ryusuke SUZUKI CommitDate: 2021-04-11 02:40:12 +0000 0b689624bb -> 3b4e46a064 --- website/content/ja/support/webresources.adoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/website/content/ja/support/webresources.adoc b/website/content/ja/support/webresources.adoc index 51a317f9a4..f4ba621dd3 100644 --- a/website/content/ja/support/webresources.adoc +++ b/website/content/ja/support/webresources.adoc @@ -14,20 +14,20 @@ sidenav: support == 一般的な UNIX(R) 情報 * http://www.ugu.com/[Unix Guru Universe] -* https://www.ora.com/[O'Reilly & Associates, Inc.] +* https://www.oreilly.com/[O'Reilly & Associates, Inc.] [[xwin]] == X Window System * https://www.x.org/[X.Org] プロジェクトは、FreeBSD を含むさまざまな UNIX(R) システムのユーザに優れた X Window System を提供しています。 -* https://www.winehq.com/[WINE] プロジェクトは、FreeBSD, NetBSD, Linux のような Intel ベースの Unix システムで Microsoft Windows(R) ソフトウェアを実行する機能を提供するために作業しています。 +* https://www.winehq.org/[WINE] プロジェクトは、FreeBSD, NetBSD, Linux のような Intel ベースの Unix システムで Microsoft Windows(R) ソフトウェアを実行する機能を提供するために作業しています。 == 関連するオペレーティングシステムのプロジェクト * https://www.netbsd.org/[*NetBSD*] はフリーの 4.4BSD Lite ベースのオペレーティングシステムで、 いくつもの異なるアーキテクチャのマシンで動作します。 * https://www.openbsd.org/ja/[*OpenBSD*] は 4.4BSD から派生し、セキュリティに重点を置いています。 * https://www.kernel.org/[*Linux*] は、フリーの UNIX(R)-like なシステムです。 -* http://www.cs.utah.edu/flux/lites/html/[*Lites*] は、Mach ベースのシステムにフリーな UNIX(R) の機能を提供する 4.4BSD Lite ベースのサーバーとエミュレーションライブラリです。 -* http://www.gnu.org/software/hurd/hurd.html[*GNU Hurd*] プロジェクトは、フリーの UNIX(R)-like なオペレーティングシステムを開発しようとする取り組みです。 +* https://www.cs.utah.edu/flux/lites/html/[*Lites*] は、Mach ベースのシステムにフリーな UNIX(R) の機能を提供する 4.4BSD Lite ベースのサーバーとエミュレーションライブラリです。 +* https://www.gnu.org/software/hurd/hurd.html[*GNU Hurd*] プロジェクトは、フリーの UNIX(R)-like なオペレーティングシステムを開発しようとする取り組みです。 * https://www.dragonflybsd.org/[*DragonFly BSD*] は FreeBSD 4.X がベースとなっていますが、 FreeBSD とは異なった開発目標を掲げています。 * https://www.illumos.org[*illumos*] は、OpenSolaris からのオープンソースのフォークです。 このオペレーティングシステムのルーツは、 BSD に由来する SunOS です。 From owner-dev-commits-doc-all@freebsd.org Sun Apr 11 12:04:22 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9F6745CC112 for ; Sun, 11 Apr 2021 12:04:22 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FJ9X645vJz3Nnr; Sun, 11 Apr 2021 12:04:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7B89623BC7; Sun, 11 Apr 2021 12:04:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13BC4M6e000106; Sun, 11 Apr 2021 12:04:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13BC4MUH000105; Sun, 11 Apr 2021 12:04:22 GMT (envelope-from git) Date: Sun, 11 Apr 2021 12:04:22 GMT Message-Id: <202104111204.13BC4MUH000105@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Marc Fonvieille Subject: git: f86e96e387 - main - Add missing whitespace and correct tagging to one command. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: blackend X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f86e96e3879af69e79e14126e154e06f01033ca5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Apr 2021 12:04:22 -0000 The branch main has been updated by blackend: URL: https://cgit.FreeBSD.org/doc/commit/?id=f86e96e3879af69e79e14126e154e06f01033ca5 commit f86e96e3879af69e79e14126e154e06f01033ca5 Author: Marc Fonvieille AuthorDate: 2021-04-11 11:54:17 +0000 Commit: Marc Fonvieille CommitDate: 2021-04-11 11:54:17 +0000 Add missing whitespace and correct tagging to one command. --- documentation/content/en/articles/committers-guide/_index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 19b83c68bb..c6c518614a 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -694,7 +694,7 @@ Eventually, when you are ready to commit your work back to main, you can perform === MFC (Merge From Current) Procedures ==== Summary -MFC workflow can be summarized as `git cherry-pick -x` plus git commit--amend to adjust the commit message. +MFC workflow can be summarized as `git cherry-pick -x` plus `git commit --amend` to adjust the commit message. For multiple commits, use `git rebase -i` to squash them together and edit the commit message. ==== Single commit MFC From owner-dev-commits-doc-all@freebsd.org Sun Apr 11 12:04:23 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B1D275CC115 for ; Sun, 11 Apr 2021 12:04:23 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FJ9X74jZsz3NYb; Sun, 11 Apr 2021 12:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9518123BC8; Sun, 11 Apr 2021 12:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13BC4N2t000129; Sun, 11 Apr 2021 12:04:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13BC4Npb000128; Sun, 11 Apr 2021 12:04:23 GMT (envelope-from git) Date: Sun, 11 Apr 2021 12:04:23 GMT Message-Id: <202104111204.13BC4Npb000128@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Marc Fonvieille Subject: git: 05b8a96ab7 - main - Fix a typo and some word tagging. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: blackend X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 05b8a96ab738dd9506ec9972d3b1a70916a98a43 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Apr 2021 12:04:23 -0000 The branch main has been updated by blackend: URL: https://cgit.FreeBSD.org/doc/commit/?id=05b8a96ab738dd9506ec9972d3b1a70916a98a43 commit 05b8a96ab738dd9506ec9972d3b1a70916a98a43 Author: Marc Fonvieille AuthorDate: 2021-04-11 12:03:33 +0000 Commit: Marc Fonvieille CommitDate: 2021-04-11 12:03:33 +0000 Fix a typo and some word tagging. --- documentation/content/en/articles/committers-guide/_index.adoc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index c6c518614a..33187e64a3 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -822,7 +822,7 @@ This document aims to define best practices when merging source commits using gi In general, we aim to use git's native support to achieve these goals rather than enforcing practices built on subversion's model. One general note: due to technical differences with Git, we will not be using git "merge commits" (created via `git merge`) in stable or releng branches. -Instead, when this document refers to "merge commits", it means a commit originally made to `main` that is replicated or "landed" to a stable branch, or a commit from a stable branch that is replicated to a releng branch with some varation of `git cherry-pick`. +Instead, when this document refers to "merge commits", it means a commit originally made to `main` that is replicated or "landed" to a stable branch, or a commit from a stable branch that is replicated to a releng branch with some variation of `git cherry-pick`. ==== Finding Eligible Hashes to MFC @@ -1821,9 +1821,9 @@ HEAD is now at 869cbd3 Encourage contributions this produces the same effect, but I have to read a lot more and severed heads aren't an image I like to contemplate. -===== Ooops! I did a 'git pull' and it created a merge commit, what do I do? +===== Ooops! I did a `git pull` and it created a merge commit, what do I do? -**Q:** I was on autopilot and did a 'git pull' for my development tree and that created a merge commit on the mainline. +**Q:** I was on autopilot and did a `git pull` for my development tree and that created a merge commit on the mainline. How do I recover? **A:** This can happen when you invoke the pull with your development branch checked out. @@ -1845,10 +1845,10 @@ Then you simply reset your branch to the corresponding `HEAD^#`: git reset --hard HEAD^2 .... -**Q:** But I also need to fix my 'main' branch. How do I do that? +**Q:** But I also need to fix my `main` branch. How do I do that? **A:** Git keeps track of the remote repository branches in a `freebsd/` namespace. -To fix your 'main' branch, just make it point to the remote's 'main': +To fix your `main` branch, just make it point to the remote's `main`: [source,shell] .... From owner-dev-commits-doc-all@freebsd.org Sun Apr 11 14:19:45 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C3BBA5D013C for ; Sun, 11 Apr 2021 14:19:45 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FJDXK5C3jz3kwC; Sun, 11 Apr 2021 14:19:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A57A5250ED; Sun, 11 Apr 2021 14:19:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13BEJj4D071763; Sun, 11 Apr 2021 14:19:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13BEJjaS071762; Sun, 11 Apr 2021 14:19:45 GMT (envelope-from git) Date: Sun, 11 Apr 2021 14:19:45 GMT Message-Id: <202104111419.13BEJjaS071762@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: "Danilo G. Baio" Subject: git: 1a48f0f904 - main - books/fdp-primer: Fix table Language Names MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dbaio X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a48f0f90462cc7d4c9030a54888569fd6d4a309 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Apr 2021 14:19:45 -0000 The branch main has been updated by dbaio (ports committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=1a48f0f90462cc7d4c9030a54888569fd6d4a309 commit 1a48f0f90462cc7d4c9030a54888569fd6d4a309 Author: Danilo G. Baio AuthorDate: 2021-04-10 22:14:48 +0000 Commit: Danilo G. Baio CommitDate: 2021-04-11 14:16:03 +0000 books/fdp-primer: Fix table Language Names Column config was missed from D29573. Fix some escape chars introduced on a237bc3c647392fee48479ddf67a6b86c2677f4a. The \ is being printed in the output, adding a space at the beginning of the line trick the toc script (not messing the menu) and renders well. Approved by: carlavilla (doc) Differential Revision: https://reviews.freebsd.org/D29700 --- .../fdp-primer/asciidoctor-primer/_index.adoc | 28 +++++++++++----------- .../books/fdp-primer/po-translations/_index.adoc | 2 +- .../en/books/fdp-primer/rosetta/_index.adoc | 4 ++-- .../en/books/fdp-primer/translations/_index.adoc | 24 +++++++++---------- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/documentation/content/en/books/fdp-primer/asciidoctor-primer/_index.adoc b/documentation/content/en/books/fdp-primer/asciidoctor-primer/_index.adoc index 6f689de0d1..c2b5bc2ee8 100644 --- a/documentation/content/en/books/fdp-primer/asciidoctor-primer/_index.adoc +++ b/documentation/content/en/books/fdp-primer/asciidoctor-primer/_index.adoc @@ -81,19 +81,19 @@ If the document type is `book` then there can be multiple level 0 (`=`) headings This is an example of headings in an `article`. .... -\= Document Title (Level 0) + = Document Title (Level 0) -\== Level 1 Section Title + == Level 1 Section Title -\=== Level 2 Section Title + === Level 2 Section Title -\==== Level 3 Section Title + ==== Level 3 Section Title -\===== Level 4 Section Title + ===== Level 4 Section Title -\====== Level 5 Section Title + ====== Level 5 Section Title -\== Another Level 1 Section Title + == Another Level 1 Section Title .... [WARNING] @@ -103,11 +103,11 @@ Section levels cannot be skipped when nesting sections. The following syntax is not correct. .... -\= Document Title + = Document Title -\== Level 2 + == Level 2 -\==== Level 4 + ==== Level 4 .... ==== @@ -121,12 +121,12 @@ To create a new paragraph leave one blank line. For example, this is a heading with two paragraphs. .... -\= This is the heading + = This is the heading -This is the first paragraph. -This is also the first paragraph. + This is the first paragraph. + This is also the first paragraph. -And this is the second paragraph. + And this is the second paragraph. .... [[asciidoctor-lists]] 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 c160fbd9cb..b38f21a016 100644 --- a/documentation/content/en/books/fdp-primer/po-translations/_index.adoc +++ b/documentation/content/en/books/fdp-primer/po-translations/_index.adoc @@ -152,7 +152,7 @@ _lang_ is a two-character lowercase code. [[po-translations-language-names]] .Language Names -[cols="1,1,1,1", frame="none", options="header"] +[cols="1,1,1", frame="none", options="header"] |=== | Language | Region diff --git a/documentation/content/en/books/fdp-primer/rosetta/_index.adoc b/documentation/content/en/books/fdp-primer/rosetta/_index.adoc index 3a716db03f..b6221643aa 100644 --- a/documentation/content/en/books/fdp-primer/rosetta/_index.adoc +++ b/documentation/content/en/books/fdp-primer/rosetta/_index.adoc @@ -75,8 +75,8 @@ a| a| [source] ---- -[[id]] -\= Section 1 + [[id]] + = Section 1 ---- |*Unordered list* diff --git a/documentation/content/en/books/fdp-primer/translations/_index.adoc b/documentation/content/en/books/fdp-primer/translations/_index.adoc index c257293d6a..897e3d5c67 100644 --- a/documentation/content/en/books/fdp-primer/translations/_index.adoc +++ b/documentation/content/en/books/fdp-primer/translations/_index.adoc @@ -160,7 +160,7 @@ Use git diff command to generate a diff and send it to the link:reviews.freebsd. % git diff > sv-faq.diff .... -Either way, you should use Bugzilla to link:https://bugs.freebsd.org/bugzilla/enter_bug.cgi[submit a report] indicating that you have submitted the documentation. +You should use Bugzilla to link:https://bugs.freebsd.org/bugzilla/enter_bug.cgi[submit a report] indicating that you have submitted the documentation. It would be very helpful if you could get other people to look over your translation and double check it first, since it is unlikely that the person committing it will be fluent in the language. Someone (probably the Documentation Project Manager, currently {doceng}) will then take your translation and confirm that it builds. @@ -201,13 +201,13 @@ The header of the English version of each document will look something like this [.programlisting] .... ---- -title: Why you should use a BSD style license for your Open Source Project -releaseinfo: "$FreeBSD: head/en_US.ISO8859-1/articles/bsdl-gpl/article.xml 53942 2020-03-01 12:23:40Z carlavilla $" -trademarks: ["freebsd", "intel", "general"] ---- + --- + title: Why you should use a BSD style license for your Open Source Project + releaseinfo: "$FreeBSD: head/en_US.ISO8859-1/articles/bsdl-gpl/article.xml 53942 2020-03-01 12:23:40Z carlavilla $" + trademarks: ["freebsd", "intel", "general"] + --- -\= Why you should use a BSD style license for your Open Source Project + = Why you should use a BSD style license for your Open Source Project .... The exact boilerplate may change, but it will always include a $FreeBSD$ line and the phrase `The FreeBSD Documentation Project`. @@ -221,10 +221,10 @@ So, the Spanish version of this file might start: [.programlisting] .... ---- -title: Soporte para segundos intercalares en FreeBSD -releaseinfo: "$FreeBSD: head/es_ES.ISO8859-1/articles/leap-seconds/article.xml 53090 2019-06-01 17:52:59Z carlavilla $" ---- + --- + title: Soporte para segundos intercalares en FreeBSD + releaseinfo: "$FreeBSD: head/es_ES.ISO8859-1/articles/leap-seconds/article.xml 53090 2019-06-01 17:52:59Z carlavilla $" + --- -\= Soporte para segundos intercalares en FreeBSD + = Soporte para segundos intercalares en FreeBSD .... From owner-dev-commits-doc-all@freebsd.org Sun Apr 11 19:02:39 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E4F5F5D8B82 for ; Sun, 11 Apr 2021 19:02:39 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FJLpl6C7wz4T82; Sun, 11 Apr 2021 19:02:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C7E8E1337; Sun, 11 Apr 2021 19:02:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13BJ2dTj055448; Sun, 11 Apr 2021 19:02:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13BJ2dpa055447; Sun, 11 Apr 2021 19:02:39 GMT (envelope-from git) Date: Sun, 11 Apr 2021 19:02:39 GMT Message-Id: <202104111902.13BJ2dpa055447@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 43635078c3 - main - Move araujo@ ed@ and jpaetzel@ from committers to alumni after their bits have been safe kept. Approved by: core (with core-secretary@ hats on) Differential Revision: https://reviews.freebsd.org/D29705 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 43635078c3f71b7470ab800fb1f91f7a4c4d2c6f Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Apr 2021 19:02:40 -0000 The branch main has been updated by bofh (ports committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=43635078c3f71b7470ab800fb1f91f7a4c4d2c6f commit 43635078c3f71b7470ab800fb1f91f7a4c4d2c6f Author: Muhammad Moinur Rahman AuthorDate: 2021-04-11 18:59:45 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2021-04-11 19:02:24 +0000 Move araujo@ ed@ and jpaetzel@ from committers to alumni after their bits have been safe kept. Approved by: core (with core-secretary@ hats on) Differential Revision: https://reviews.freebsd.org/D29705 --- documentation/content/en/articles/contributors/contrib-committers.adoc | 3 --- .../content/en/articles/contributors/contrib-develalumni.adoc | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/documentation/content/en/articles/contributors/contrib-committers.adoc b/documentation/content/en/articles/contributors/contrib-committers.adoc index 0f5d685c59..e05603d321 100644 --- a/documentation/content/en/articles/contributors/contrib-committers.adoc +++ b/documentation/content/en/articles/contributors/contrib-committers.adoc @@ -7,7 +7,6 @@ * {will} * {dim} * {fernape} -* {araujo} * {mat} * {gavin} * {jwb} @@ -260,7 +259,6 @@ * {osa} * {rodrigo} * {philip} -* {jpaetzel} * {hiren} * {yuripv} * {fluffy} @@ -305,7 +303,6 @@ * {hrs} * {rscheff} * {wosch} -* {ed} * {cy} * {schweikh} * {matthew} diff --git a/documentation/content/en/articles/contributors/contrib-develalumni.adoc b/documentation/content/en/articles/contributors/contrib-develalumni.adoc index 02ff5410da..cfaf3e371e 100644 --- a/documentation/content/en/articles/contributors/contrib-develalumni.adoc +++ b/documentation/content/en/articles/contributors/contrib-develalumni.adoc @@ -1,4 +1,7 @@ +* {jpaetzel} (2008 - 2021) +* {araujo} (2007 - 2021) +* {ed} (2008 - 2020) * {mmokhi} (2017 - 2020) * {knu} (2000 - 2020) * {cpm} (2015 - 2020)