From nobody Wed Sep 16 12:05:06 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hlHdH0XvTz6t6Vw for ; Wed, 16 Sep 2026 12:05: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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hlHdG6Kzlz4L0P for ; Wed, 16 Sep 2026 12:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789560306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fdq54Vit9hrRb5Md8+xdsxYDAIEHJd0aDqxWXkIaO/c=; b=q5gJU2HCgGd3CY7AePPA1WK/7c/P5F+b7BALRVgtXOx7A2OJt5Cf5zyZqxkfTRdaEriaHe OP1lW2WWtMiv2hxxIHxEvt1e2z+E03h4EDyDQKEBLWa/k1CQGRxJiUfh2uezvxZTskCHXR nNYeayFoFZBSDhrk9LK3ZhPgKINKSpCd/yUJqfynVeY8FSkvaHV91H+xNjOfsN3uVn7OWF 4R1duSuNyvHjhMwbAsC87u51NsF/Q0NT/KYyS16UAIImTVXR+AIUAbSfXfOg0W8f+LiIRz LQxJdRUd8DRZMaTOCb1g527LRO5ijx/M/s7soMR7Qd/55pzqZ9FR7ql5RRqzvQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789560306; b=dfYY9h9Ue6PdNj0MqjIvhR3VaJ58xebmH9IQRYsWOqnjM7QT/oIWsl5SyGumtRG5ZxoBms UE4ArnxjvBCeKzosnpUdVkCLyisCW7T3oG5a8wrJinOqlcU9Jmr/Cc3pnNHHtPti3gqn4p hRGaIBoa4x5Z4YTTpYvM0iX+54AIG8tx1t96Kzbm+SfN1sV4uQ/WpnGpiVQCvCIGbFBwqH Toz9gKmgTN6BwbDnp2XkEYY2+vwqgKT5JTsYS0OUecEAyMVPD+O2g5v8hVn6ezPS6lgcFc ER2VG/Ga4ek9s7NaOlPqs3hKK9aqpAOJ5o0ilaKRooZtBH6318QMKW1k8wt1Rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789560306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fdq54Vit9hrRb5Md8+xdsxYDAIEHJd0aDqxWXkIaO/c=; b=MccDAflJcw2HNG00JZ4UMhm1GIODBkm6aw9OHw6HizvaT1/T5KdKu1N6mMz+uKxuxjs8yO jCp3XjYjeEDZUghQ6vchRmLVLozPz8+6P10ny19ppvtLBkWWxfKrCbkj1gi969vXS6b1kj GjTxqKuusy20LRwJDtKngylyfKauE+tgexw84+bkp9GWgmJKN5hhROW8x3zvkY2Jr7RWfr rkmQfF07ik5LIBR4TDmc4fU++lBsWS/tE49I7tAI/8ogK66NPO1iV+UV1igzDQ11hjGEMA 0WfStsnfYSBpmXU1g9bRD6fy2SFJJYon0e1CQM48vyHN/5hvv+7IilsnXrJsyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hlHdG5Pm9zmDS for ; Wed, 16 Sep 2026 12:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1dbb3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 16 Sep 2026 12:05:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 3bfbd1077668 - stable/15 - tun.4: Canonicalize SYNOPSIS and AUTHORS List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3bfbd107766890a102906bccbf00e7241b137794 Auto-Submitted: auto-generated Date: Wed, 16 Sep 2026 12:05:06 +0000 Message-Id: <6aaa85f2.1dbb3.3e258b50@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=3bfbd107766890a102906bccbf00e7241b137794 commit 3bfbd107766890a102906bccbf00e7241b137794 Author: Alexander Ziaee AuthorDate: 2026-09-04 17:42:39 +0000 Commit: Alexander Ziaee CommitDate: 2026-09-16 12:03:45 +0000 tun.4: Canonicalize SYNOPSIS and AUTHORS While here, s/PR#2411/NetBSD PR#2411/ in the comments for clarity. I had to go to netbsd sources to get this information. MFC after: 3 days Event: Berlin Hackathon 202609 (cherry picked from commit 555972c6c94721bffbff1ecb51d916977b5c85f7) --- share/man/man4/tun.4 | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/share/man/man4/tun.4 b/share/man/man4/tun.4 index 1c5bd35f0ab8..5621d2400e81 100644 --- a/share/man/man4/tun.4 +++ b/share/man/man4/tun.4 @@ -1,26 +1,18 @@ .\" $NetBSD: tun.4,v 1.1 1996/06/25 22:17:37 pk Exp $ -.\" Based on PR#2411 +.\" Based on NetBSD PR#2411 .\" -.Dd March 17, 2020 +.Dd September 5, 2026 .Dt TUN 4 .Os .Sh NAME .Nm tun .Nd tunnel software network interface .Sh SYNOPSIS -To compile this driver into the kernel, -place the following line in your -kernel configuration file: -.Bd -ragged -offset indent -.Cd "device tuntap" -.Ed +.Cd device tuntap .Pp -Alternatively, to load the driver as a -module at boot time, place the following lines in +In .Xr loader.conf 5 : -.Bd -literal -offset indent -if_tuntap_load="YES" -.Ed +.Cd if_tuntap_load="YES" .Sh DESCRIPTION The .Nm @@ -354,5 +346,4 @@ them pile up. .Xr tap 4 , .Xr ifconfig 8 .Sh AUTHORS -This manual page was originally obtained from -.Nx . +.An Paul Kranenburg Aq Mt pk@netbsd.org