aboutsummaryrefslogtreecommitdiff
path: root/documentation/content/en
diff options
context:
space:
mode:
Diffstat (limited to 'documentation/content/en')
-rw-r--r--documentation/content/en/articles/committers-guide/_index.adoc6
-rw-r--r--documentation/content/en/articles/pgpkeys/_index.adoc3
-rw-r--r--documentation/content/en/books/handbook/advanced-networking/_index.adoc4
-rw-r--r--documentation/content/en/books/handbook/network/_index.adoc2
4 files changed, 11 insertions, 4 deletions
diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc
index 2650a480ba..26bb41e98b 100644
--- a/documentation/content/en/articles/committers-guide/_index.adoc
+++ b/documentation/content/en/articles/committers-guide/_index.adoc
@@ -1395,7 +1395,7 @@ Here 'good' means:
. All the right files, and none of the wrong ones, were merged into contrib/glorbnitz.
. No other changes are in the tree.
. The commit messages look crossref:committers-guide[commit-log-message,good]. It should contain a summary of what's changed since the last merge to the FreeBSD `main` branch and any caveats.
-. UPDATING should be updated if there is anything of note, such as user visible changes, important upgrade concerns, etc.
+. `RELNOTES` and `UPDATING` should be updated if there is anything of note, such as user visible changes, important upgrade concerns, etc.
[NOTE]
====
@@ -2653,6 +2653,10 @@ We include the commit title so that the referenced commit can be located even in
|`Relnotes:`
|If the change is a candidate for inclusion in the release notes for the next release from the branch, set to `yes`.
+|Candidates are user-visible changes, new features, compatibility breaks, etc..
+|If you forget to set this line, or want to provide more details, add an entry to the `RELNOTES` file in the root of the src tree.
+|The `RELNOTES` file is used to generate release notes for the next release.
+|Do not use the `Relnotes:` line to describe the change: its only valid value is `yes`.
|`Security:`
|If the change is related to a security vulnerability or security exposure, include one or more references or a description of the issue. If possible, include a VuXML URL or a CVE ID.
diff --git a/documentation/content/en/articles/pgpkeys/_index.adoc b/documentation/content/en/articles/pgpkeys/_index.adoc
index c082f7feba..51469defd9 100644
--- a/documentation/content/en/articles/pgpkeys/_index.adoc
+++ b/documentation/content/en/articles/pgpkeys/_index.adoc
@@ -1080,6 +1080,9 @@ include::{include-path}jdp.key[]
=== `{krion}`
include::{include-path}krion.key[]
+=== `{vladlen}`
+include::{include-path}vladlen.key[]
+
=== `{sepotvin}`
include::{include-path}sepotvin.key[]
diff --git a/documentation/content/en/books/handbook/advanced-networking/_index.adoc b/documentation/content/en/books/handbook/advanced-networking/_index.adoc
index 6bade200be..42125e86d7 100644
--- a/documentation/content/en/books/handbook/advanced-networking/_index.adoc
+++ b/documentation/content/en/books/handbook/advanced-networking/_index.adoc
@@ -4,7 +4,7 @@ part: IV. Network Communication
prev: books/handbook/firewalls
next: books/handbook/partv
description: "Advanced networking in FreeBSD: basics of gateways and routes, CARP, how to configure multiple VLANs on FreeBSD, etc"
-tags: ["Advanced Networking", "Handbook", "gateway", "routes", "wireless", "tethering", "bluetooth", "bridging", "CARP", "VLAN"]
+tags: ["Advanced Networking", "Handbook", "gateway", "routes", "wireless", "tethering", "bluetooth", "bridging", "CARP", "VLAN", "WiFi"]
showBookMenu: true
weight: 39
params:
@@ -877,7 +877,7 @@ The Bluetooth stack in FreeBSD is implemented using the man:netgraph[4] framewor
A broad variety of Bluetooth USB dongles is supported by man:ng_ubt[4].
Broadcom BCM2033 based Bluetooth devices are supported by the man:ubtbcmfw[4] and man:ng_ubt[4] drivers.
The 3Com Bluetooth PC Card 3CRWB60-A is supported by the man:ng_bt3c[4] driver.
-Serial and UART based Bluetooth devices are supported by man:sio[4], man:ng_h4[4], and man:hcseriald[8].
+Serial and UART based Bluetooth devices are supported by man:ng_h4[4] and man:hcseriald[8].
Before attaching a device, determine which of the above drivers it uses, then load the driver.
For example, if the device uses the man:ng_ubt[4] driver:
diff --git a/documentation/content/en/books/handbook/network/_index.adoc b/documentation/content/en/books/handbook/network/_index.adoc
index bb49981b31..2dc5de6c38 100644
--- a/documentation/content/en/books/handbook/network/_index.adoc
+++ b/documentation/content/en/books/handbook/network/_index.adoc
@@ -4,7 +4,7 @@ part: Part I. Getting Started
prev: books/handbook/wayland
next: books/handbook/partii
description: This chapter delves into the topic of network configuration and performance, showcasing the robust networking capabilities of the FreeBSD operating system.
-tags: ["network", "ipv4", "ipv6", "wireless", "wpa_supplicant", "static ip", "dynamic ip"]
+tags: ["network", "ipv4", "ipv6", "wireless", "wpa_supplicant", "static ip", "dynamic ip", "WiFi"]
showBookMenu: true
weight: 9
params: